From 47c3589d4f1a7d1df6e4affa35db57e3f5f71b11 Mon Sep 17 00:00:00 2001 From: skoglol <33292112+kriskog@users.noreply.github.com> Date: Fri, 1 May 2020 07:29:03 +0200 Subject: [PATCH] Adds a few more smites (#50689) * Adds a few more smites * Apply suggestions from code review Co-authored-by: Rohesie Co-authored-by: Rohesie --- code/__DEFINES/admin.dm | 3 +++ code/modules/admin/verbs/randomverbs.dm | 33 ++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/code/__DEFINES/admin.dm b/code/__DEFINES/admin.dm index 89a210acf37..e65b3e60ebd 100644 --- a/code/__DEFINES/admin.dm +++ b/code/__DEFINES/admin.dm @@ -75,6 +75,9 @@ #define ADMIN_PUNISHMENT_SUPPLYPOD "Supply Pod" #define ADMIN_PUNISHMENT_MAZING "Puzzle" #define ADMIN_PUNISHMENT_IMMERSE "Fully Immerse" +#define ADMIN_PUNISHMENT_FAT "Fatten up" +#define ADMIN_PUNISHMENT_FAKEBWOINK "Fake bwoink" +#define ADMIN_PUNISHMENT_NUGGET "Nugget" #define AHELP_ACTIVE 1 #define AHELP_CLOSED 2 diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index df288141525..3340502f93e 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1054,7 +1054,20 @@ 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, ADMIN_PUNISHMENT_IMMERSE) + 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_IMMERSE, + ADMIN_PUNISHMENT_FAT, + ADMIN_PUNISHMENT_FAKEBWOINK, + ADMIN_PUNISHMENT_NUGGET + ) var/punishment = input("Choose a punishment", "DIVINE SMITING") as null|anything in sortList(punishment_list) @@ -1120,6 +1133,24 @@ Traitors and the like can also be revived with the previous role mostly intact. return if(ADMIN_PUNISHMENT_IMMERSE) immerse_player(target) + if(ADMIN_PUNISHMENT_FAT) + target.set_nutrition(NUTRITION_LEVEL_FAT*2) + if(ADMIN_PUNISHMENT_FAKEBWOINK) + SEND_SOUND(target, 'sound/effects/adminhelp.ogg') + if(ADMIN_PUNISHMENT_NUGGET) + if(!iscarbon(target)) + to_chat(usr,"This must be used on a carbon mob.", confidential = TRUE) + return + var/mob/living/carbon/C = target + var/timer = 2 SECONDS + for(var/obj/item/bodypart/thing in C.bodyparts) + if(thing.body_part == HEAD || thing.body_part == CHEST) + continue + addtimer(CALLBACK(thing, /obj/item/bodypart/.proc/dismember), timer) + addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, C, 'sound/effects/cartoon_pop.ogg', 70), timer) + addtimer(CALLBACK(C, /mob/living/.proc/spin, 4, 1), timer - 0.4 SECONDS) + timer += 2 SECONDS + punish_log(target, punishment)