Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Admin] Non Lethal Smiting #8540

Merged
merged 2 commits into from May 23, 2020
Merged

[Admin] Non Lethal Smiting #8540

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aebd344
Admin Pie Time
JamieD1 May 16, 2020
16fbde2
Nice tidy is good code
JamieD1 May 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions code/__DEFINES/admin.dm
View file
Open in desktop
Expand Up @@ -72,6 +72,7 @@
#define ADMIN_PUNISHMENT_SUPPLYPOD_QUICK "Supply Pod (Quick)"
#define ADMIN_PUNISHMENT_SUPPLYPOD "Supply Pod"
#define ADMIN_PUNISHMENT_MAZING "Puzzle"
#define ADMIN_PUNISHMENT_PIE "Pie"

#define AHELP_ACTIVE 1
#define AHELP_CLOSED 2
Expand Down
15 changes: 13 additions & 2 deletions code/modules/admin/verbs/randomverbs.dm
View file
Open in desktop
Expand Up @@ -163,7 +163,7 @@

if( !msg )
return

msg = to_utf8(msg, src)

to_chat(M, msg)
Expand Down Expand Up @@ -1082,7 +1082,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(!check_rights(R_ADMIN) || !check_rights(R_FUN))
return

var/list/punishment_list = list(ADMIN_PUNISHMENT_LIGHTNING, ADMIN_PUNISHMENT_BRAINDAMAGE, ADMIN_PUNISHMENT_GIB, ADMIN_PUNISHMENT_BSA, ADMIN_PUNISHMENT_FIREBALL, ADMIN_PUNISHMENT_ROD, ADMIN_PUNISHMENT_SUPPLYPOD_QUICK, ADMIN_PUNISHMENT_SUPPLYPOD, ADMIN_PUNISHMENT_MAZING)
var/list/punishment_list = list(ADMIN_PUNISHMENT_LIGHTNING, ADMIN_PUNISHMENT_BRAINDAMAGE, ADMIN_PUNISHMENT_GIB, ADMIN_PUNISHMENT_BSA, ADMIN_PUNISHMENT_FIREBALL, ADMIN_PUNISHMENT_ROD, ADMIN_PUNISHMENT_SUPPLYPOD_QUICK, ADMIN_PUNISHMENT_SUPPLYPOD, ADMIN_PUNISHMENT_MAZING, ADMIN_PUNISHMENT_PIE)

var/punishment = input("Choose a punishment", "DIVINE SMITING") as null|anything in punishment_list

Expand Down Expand Up @@ -1147,6 +1147,12 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(!puzzle_imprison(target))
to_chat(usr,"<span class='warning'>Imprisonment failed!</span>", confidential=TRUE)
return
if(ADMIN_PUNISHMENT_PIE)
var/mob/living/carbon/C = target
var/confirm = alert(usr, "Send honk message?", "Honk Message", "Yes", "No")
if(confirm == "Yes")
JamieD1 marked this conversation as resolved.
Show resolved Hide resolved
to_chat(target, "<span class='clown'>Honk! You probably did something stupid..</span>")
C.adminpie(target)
punish_log(target, punishment)

/client/proc/punish_log(var/whom, var/punishment)
Expand Down Expand Up @@ -1223,3 +1229,8 @@ Traitors and the like can also be revived with the previous role mostly intact.
else
message_admins("[key_name_admin(usr)] has [newstate ? "activated" : "deactivated"] job exp exempt status on [key_name_admin(C)]")
log_admin("[key_name(usr)] has [newstate ? "activated" : "deactivated"] job exp exempt status on [key_name(C)]")

/mob/living/carbon/proc/adminpie(mob/user)
var/obj/item/reagent_containers/food/snacks/pie/cream/p = new (get_turf(pick(oview(3,user))))
p.pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE | PASSBLOB | PASSCLOSEDTURF | LETPASSTHROW
p.throw_at(user, 10, 0.5, usr)