From 1138d9e6da7499dac164072fd4f8046ebd4cc43c Mon Sep 17 00:00:00 2001 From: MadmanMartian <30557196+MadmanMartian@users.noreply.github.com> Date: Fri, 12 Jan 2018 01:20:09 +0000 Subject: [PATCH] adds a brain damage button to prayer and player panel (#17047) --- code/modules/admin/admin.dm | 1 + code/modules/admin/topic.dm | 13 +++++++++++++ code/modules/admin/verbs/pray.dm | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 704469dfaa4..91ed1df924f 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -107,6 +107,7 @@ var/global/floorIsLava = 0 Make Catbeast | Make Cluwne | Assplode | + Deal brain damage | "} // Mob-specific controls. diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index a54e2bb28be..7e6f45ff038 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -2346,6 +2346,19 @@ else to_chat(usr, "This target has already lost their butt in some unfortunate circumstance.") + else if(href_list["DealBrainDam"]) + if(!check_rights(R_ADMIN|R_FUN)) + return + var/mob/living/M = locate(href_list["DealBrainDam"]) + if(!isliving(M)) + to_chat(usr, "\The [M] is not of type /mob/living.") + return + var/choice = input("How much brain damage would you like to deal to the subject?", "Instant Lobotomy", 1) as null|num + if(choice) + log_admin("[key_name(M)] was dealt [choice] amount of brain damage by [src.owner]") + message_admins("[key_name(M)] was dealt [choice] amount of brain damage by [src.owner]") + M.adjustBrainLoss(choice) + else if (href_list["PrayerReply"]) if(!check_rights(R_ADMIN)) return diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index 99731fd109e..ff35534b94d 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/storage.dmi',"bible") - msg = "[bicon(cross)] PRAY (DEITY:[ticker.Bible_deity_name]): [key_name(src, 1)] (?) (PP) (VV) (JMP) (CA) (SC) (BSA) (ASS) (RPLY): [msg]" + msg = "[bicon(cross)] PRAY (DEITY:[ticker.Bible_deity_name]): [key_name(src, 1)] (?) (PP) (VV) (JMP) (CA) (SC) (BSA) (ASS) (BRAIN) (RPLY): [msg]" send_prayer_to_admins(msg, 'sound/effects/prayer.ogg')