From b02ce067bf67a584d5c4407557fe27c16d688075 Mon Sep 17 00:00:00 2001 From: Burzah <116982774+Burzah@users.noreply.github.com> Date: Mon, 9 Oct 2023 11:00:29 -0700 Subject: [PATCH] Adds a nugget smite for admins (#22637) * new smites * part dos * just nugget * msg update * forgot to move this * Review * added logmsg * Update code/modules/mob/living/carbon/human/human_death.dm Tested and applied! Co-authored-by: Farie82 --------- Co-authored-by: Farie82 --- code/modules/admin/topic.dm | 8 ++++++++ code/modules/mob/living/carbon/human/human_death.dm | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index ea112029149..324eba31f54 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -2065,6 +2065,7 @@ ptypes += "Crew Traitor" ptypes += "Floor Cluwne" ptypes += "Shamebrero" + ptypes += "Nugget" var/punishment = input(owner, "How would you like to smite [M]?", "Its good to be baaaad...", "") as null|anything in ptypes if(!(punishment in ptypes)) return @@ -2180,6 +2181,13 @@ var/obj/item/clothing/head/sombrero/shamebrero/S = new(H.loc) H.equip_to_slot_or_del(S, SLOT_HUD_HEAD) logmsg = "shamebrero" + if("Nugget") + H.Weaken(12 SECONDS, TRUE) + H.AdjustJitter(40 SECONDS) + to_chat(H, "You feel as if your limbs are being ripped from your body!") + addtimer(CALLBACK(H, TYPE_PROC_REF(/mob/living/carbon/human, make_nugget)), 6 SECONDS) + logmsg = "nugget" + if(logmsg) log_admin("[key_name(owner)] smited [key_name(M)] with: [logmsg]") message_admins("[key_name_admin(owner)] smited [key_name_admin(M)] with: [logmsg]") diff --git a/code/modules/mob/living/carbon/human/human_death.dm b/code/modules/mob/living/carbon/human/human_death.dm index 8954337b3e3..6a0e9f7a0df 100644 --- a/code/modules/mob/living/carbon/human/human_death.dm +++ b/code/modules/mob/living/carbon/human/human_death.dm @@ -169,3 +169,10 @@ update_body() update_mutantrace() UpdateAppearance() // reset hair from DNA + +/mob/living/carbon/human/proc/make_nugget(mob/living) + for(var/obj/item/organ/external/limb as anything in bodyparts) + if(limb.body_part == LEG_RIGHT || limb.body_part == LEG_LEFT || limb.body_part == ARM_RIGHT || limb.body_part == ARM_LEFT) + limb.droplimb() + emote("scream") + playsound(src, 'sound/misc/desceration-03.ogg', 70)