Makes cyborgs have a dust animation, allows admins to dust smite anything (#16392)

* Makes cyborgs have a dust animation, allows admins to dust smite anything

* Apply suggestions from code review

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>

* whoops

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
This commit is contained in:
Qwertytoforty
2021-07-26 13:04:23 -04:00
committed by GitHub
parent 5572044395
commit ca9b3af9be
2 changed files with 5 additions and 6 deletions
+4 -5
View File
@@ -2165,7 +2165,7 @@
if(!istype(M))
to_chat(usr, "<span class='warning'>This can only be used on instances of type /mob/living</span>")
return
var/ptypes = list("Lightning bolt", "Fire Death", "Gib")
var/ptypes = list("Lightning bolt", "Fire Death", "Gib", "Dust")
if(ishuman(M))
H = M
ptypes += "Brain Damage"
@@ -2180,7 +2180,6 @@
ptypes += "Crew Traitor"
ptypes += "Floor Cluwne"
ptypes += "Shamebrero"
ptypes += "Dust"
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
@@ -2203,6 +2202,9 @@
if("Gib")
M.gib(FALSE)
logmsg = "gibbed."
if("Dust")
M.dust()
logmsg = "dust"
// These smiting types are only valid for ishuman() mobs
if("Brain Damage")
@@ -2292,9 +2294,6 @@
var/obj/item/clothing/head/sombrero/shamebrero/S = new(H.loc)
H.equip_to_slot_or_del(S, slot_head)
logmsg = "shamebrero"
if("Dust")
H.dust()
logmsg = "dust"
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]")