From f99648ec462fe53db562013172c6a0af14f08f0b Mon Sep 17 00:00:00 2001 From: Kammerjunk Date: Mon, 17 Oct 2016 10:16:25 +0200 Subject: [PATCH] Giving easier admin punishment (#12237) * In which I get back at IAAs for faxing their butts Drop-Bomb a SHIT but this is better * PP menu works but is lacking content I guess SOMEONE will make that eventually maybe who knows --- code/WorkInProgress/kilakk/fax.dm | 2 +- code/modules/admin/admin.dm | 13 +++++++++++-- code/modules/admin/topic.dm | 19 +++++++++++++++++++ code/modules/admin/verbs/pray.dm | 2 +- 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/code/WorkInProgress/kilakk/fax.dm b/code/WorkInProgress/kilakk/fax.dm index e7553213fdc..c59c68a3dff 100644 --- a/code/WorkInProgress/kilakk/fax.dm +++ b/code/WorkInProgress/kilakk/fax.dm @@ -207,7 +207,7 @@ var/list/alldepartments = list("Central Command") /proc/Centcomm_fax(var/obj/item/weapon/paper/sent, var/sentname, var/mob/Sender) //why the fuck doesnt the thing show as orange - var/msg = "CENTCOMM FAX: [key_name(Sender, 1)] (PP) (VV) (SM) (JMP) (CA) (RPLY): Receiving '[sentname]' via secure connection ... view message" + var/msg = "CENTCOMM FAX: [key_name(Sender, 1)] (PP) (VV) (SM) (JMP) (CA) (BSA) (RPLY): Receiving '[sentname]' via secure connection ... view message" for (var/client/C in admins) if(C.prefs.special_popup) C << output(msg, "window1.msay_output")//if i get told to make this a proc imma be fuckin mad diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index d7c37d74fe9..6f2264228a7 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -97,6 +97,17 @@ var/global/floorIsLava = 0 Subtle message "} + if(istype(M, /mob/living/carbon/human)) + body += {"

+ Punishments: +
"} + body += {" + BSA | + Inflict Cancer | + Make Catbeast | + Make Cluwne | + "} + // Mob-specific controls. body += M.player_panel_controls(usr) @@ -127,7 +138,6 @@ var/global/floorIsLava = 0 Make MoMMI | Make Alien | Make slime | - Make Cluwne | "} //Simple Animals @@ -206,7 +216,6 @@ var/global/floorIsLava = 0 Thunderdome Red | Thunderdome Admin | Thunderdome Observer | - Inflict Cancer | "} // language toggles diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 1b05a47cde0..caab4ed6a03 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1811,6 +1811,25 @@ usr = M //We probably transformed ourselves show_player_panel(M) + else if(href_list["makecatbeast"]) + if(!check_rights(R_SPAWN)) + return + + var/mob/living/carbon/human/H = locate(href_list["makecatbeast"]) + if(!istype(H)) + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + return + + if(alert(src.owner, "Are you sure you wish to catbeast [key_name(H)]?", "Catbeast?" , "Yes" , "No") != "Yes") + return + + if(H) + H.set_species("Tajaran", force_organs=1) + H.regenerate_icons() + add_gamelogs(usr, "turned [key_name(H)] into a catbeast", tp_link = FALSE) + else + to_chat(usr, "Failed! Something went wrong.") + else if(href_list["makerobot"]) if(!check_rights(R_SPAWN)) return diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index 8164be8864e..be07ee72ab4 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -20,7 +20,7 @@ var/orig_message = msg var/image/cross = image('icons/obj/storage.dmi',"bible") - msg = "[bicon(cross)] PRAY (DEITY:[ticker.Bible_deity_name]): [key_name(src, 1)] (?) (PP) (VV) (SM) (JMP) (CA) (SC) (CA): [msg]" + msg = "[bicon(cross)] PRAY (DEITY:[ticker.Bible_deity_name]): [key_name(src, 1)] (?) (PP) (VV) (SM) (JMP) (CA) (SC) (BSA): [msg]" send_prayer_to_admins(msg, 'sound/effects/prayer.ogg')