diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index f0232622f8e..8ca57e828c6 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -2165,7 +2165,7 @@ if(!istype(M)) to_chat(usr, "This can only be used on instances of type /mob/living") 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]") diff --git a/code/modules/mob/living/silicon/robot/death.dm b/code/modules/mob/living/silicon/robot/death.dm index a70763363db..11b0cc600d8 100644 --- a/code/modules/mob/living/silicon/robot/death.dm +++ b/code/modules/mob/living/silicon/robot/death.dm @@ -29,8 +29,8 @@ return FALSE notransform = 1 canmove = 0 - icon = null invisibility = 101 + dust_animation() if(mmi) qdel(mmi) //Delete the MMI first so that it won't go popping out. GLOB.dead_mob_list -= src