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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds a nugget smite for admins #22637

Merged
merged 9 commits into from
Oct 9, 2023
Merged

Adds a nugget smite for admins #22637

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
24028c3
new smites
Burzah Sep 14, 2023
7fae9a5
part dos
Burzah Sep 16, 2023
8b231ae
just nugget
Burzah Sep 28, 2023
006c629
msg update
Burzah Sep 28, 2023
718459e
Merge branch 'master' into new-smite-options
Burzah Sep 28, 2023
9eec278
forgot to move this
Burzah Sep 28, 2023
499cec1
Review
Burzah Sep 29, 2023
9c78751
added logmsg
Burzah Sep 30, 2023
fbeb7ce
Update code/modules/mob/living/carbon/human/human_death.dm
Burzah Oct 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions code/modules/admin/topic.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2055,6 +2055,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
Expand Down Expand Up @@ -2169,6 +2170,13 @@
var/obj/item/clothing/head/sombrero/shamebrero/S = new(H.loc)
H.equip_to_slot_or_del(S, slot_head)
logmsg = "shamebrero"
if("Nugget")
H.KnockDown(15 SECONDS, TRUE)
H.Stun(15 SECONDS, TRUE)
Burzah marked this conversation as resolved.
Show resolved Hide resolved
H.AdjustJitter(40 SECONDS)
to_chat(H, "<span class='danger'>You feel as if your limbs are being ripped from your body!</span>")
addtimer(CALLBACK(H, TYPE_PROC_REF(/mob/living/carbon/human, make_nugget)), 6 SECONDS)

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]")
Expand Down
8 changes: 8 additions & 0 deletions code/modules/mob/living/carbon/human/human_death.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,3 +169,11 @@
update_body()
update_mutantrace()
UpdateAppearance() // reset hair from DNA

/mob/living/carbon/human/proc/make_nugget(mob/living)
for(var/limb in bodyparts)
var/obj/item/organ/external/limbs = limb
if(limbs.body_part == LEG_RIGHT || limbs.body_part == LEG_LEFT || limbs.body_part == ARM_RIGHT || limbs.body_part == ARM_LEFT)
limbs.droplimb()
Burzah marked this conversation as resolved.
Show resolved Hide resolved
emote("scream")
playsound(src, 'sound/misc/desceration-03.ogg', 70)