diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index a9559ea01f6..d61e1ec37f1 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -263,7 +263,8 @@ L.emote("roar") else if(ishuman(L)) //For humans L.adjustBruteLoss(DOOR_CRUSH_DAMAGE) - L.emote("scream") + if(L.stat == CONSCIOUS) + L.emote("scream") L.Weaken(5) else //for simple_animals & borgs L.adjustBruteLoss(DOOR_CRUSH_DAMAGE) diff --git a/code/game/objects/items/weapons/implants/deadman.dm b/code/game/objects/items/weapons/implants/deadman.dm index 1759a4f4531..29433380d7e 100644 --- a/code/game/objects/items/weapons/implants/deadman.dm +++ b/code/game/objects/items/weapons/implants/deadman.dm @@ -4,8 +4,8 @@ var/obj/item/device/assembly/signaler/signaler icon_state = "implant_evil" - get_data() - var/dat = {" +/obj/item/weapon/implant/deadman/get_data() + var/dat = {" Implant Specifications:
Name: Robust Corp RX-79 Deadman Switch Implant
Life: Activates upon death.
@@ -14,23 +14,22 @@ Implant Details:
Function: Contains a compact, electric signaller that activates upon host death.
Integrity: Implant will occasionally be degraded by the body's immune system and thus will occasionally malfunction."} - return dat + return dat - implanted(mob/source as mob) - signaler = new /obj/item/device/assembly/signaler(src) - signaler.interact(source) - usr.mind.store_memory("Deadman switch will broadcast signal on [signaler.frequency] using encryption [signaler.code].", 0, 0) - usr << "Deadman switch will broadcast signal on [signaler.frequency] using encryption [signaler.code]." +/obj/item/weapon/implant/deadman/implanted(mob/source as mob) + signaler = new /obj/item/device/assembly/signaler(src) + signaler.interact(source) + usr.mind.store_memory("Deadman switch will broadcast signal on [signaler.frequency] using encryption [signaler.code].", 0, 0) + usr << "Deadman switch will broadcast signal on [signaler.frequency] using encryption [signaler.code]." +/obj/item/weapon/implant/deadman/trigger(emote, source as mob) + if(emote == "deathgasp") + src.activate("death") + return - trigger(emote, source as mob) - if(emote == "deathgasp") - src.activate("death") - return +/obj/item/weapon/implant/deadman/activate(var/cause) + if((!cause) || (!src.imp_in)) return 0 + signaler.signal() - activate(var/cause) - if((!cause) || (!src.imp_in)) return 0 - signaler.signal() - - islegal() - return 0 \ No newline at end of file +/obj/item/weapon/implant/deadman/islegal() + return 0 \ No newline at end of file diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 447e862c751..b93db8244e2 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -116,7 +116,6 @@ Implant Specifics:
"} Integrity: Implant will occasionally be degraded by the body's immune system and thus will occasionally malfunction."} return dat - /obj/item/weapon/implant/dexplosive/trigger(emote, source as mob) if(emote == "deathgasp") src.activate("death") diff --git a/code/modules/mob/living/carbon/alien/humanoid/emote.dm b/code/modules/mob/living/carbon/alien/humanoid/emote.dm index 69d1eb600dc..a80a0d5892c 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/emote.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/emote.dm @@ -1,7 +1,4 @@ /mob/living/carbon/alien/humanoid/emote(var/act,var/m_type=1,var/message = null) - if(stat) - return - var/param = null if (findtext(act, "-", 1, null)) var/t1 = findtext(act, "-", 1, null) diff --git a/code/modules/mob/living/carbon/alien/larva/emote.dm b/code/modules/mob/living/carbon/alien/larva/emote.dm index 134350e2517..88437be1392 100644 --- a/code/modules/mob/living/carbon/alien/larva/emote.dm +++ b/code/modules/mob/living/carbon/alien/larva/emote.dm @@ -1,7 +1,4 @@ /mob/living/carbon/alien/larva/emote(var/act,var/m_type=1,var/message = null) - if(stat) - return - var/param = null if (findtext(act, "-", 1, null)) var/t1 = findtext(act, "-", 1, null) diff --git a/code/modules/mob/living/carbon/brain/emote.dm b/code/modules/mob/living/carbon/brain/emote.dm index 054a9b6e71c..0441eb00ac4 100644 --- a/code/modules/mob/living/carbon/brain/emote.dm +++ b/code/modules/mob/living/carbon/brain/emote.dm @@ -1,7 +1,4 @@ /mob/living/carbon/brain/emote(var/act,var/m_type=1,var/message = null) - if(stat) - return - if(!(container && istype(container, /obj/item/device/mmi)))//No MMI, no emotes return diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index f7e988f3a70..414335a243e 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -1,7 +1,4 @@ -/mob/living/carbon/human/emote(var/act,var/m_type=1,var/message = null) - if(stat) - return - +/mob/living/carbon/human/emote(var/act,var/m_type=1,var/message = null,var/force) var/param = null if (findtext(act, "-", 1, null)) var/t1 = findtext(act, "-", 1, null) diff --git a/code/modules/mob/living/carbon/metroid/emote.dm b/code/modules/mob/living/carbon/metroid/emote.dm index 3c95bea1a43..fa7e5c07466 100644 --- a/code/modules/mob/living/carbon/metroid/emote.dm +++ b/code/modules/mob/living/carbon/metroid/emote.dm @@ -1,7 +1,4 @@ /mob/living/carbon/slime/emote(var/act, var/m_type=1, var/message = null) - if(stat) - return - if (findtext(act, "-", 1, null)) var/t1 = findtext(act, "-", 1, null) //param = copytext(act, t1 + 1, length(act) + 1) diff --git a/code/modules/mob/living/silicon/emote.dm b/code/modules/mob/living/silicon/emote.dm index 8c28d407ede..f7ead12e4cc 100644 --- a/code/modules/mob/living/silicon/emote.dm +++ b/code/modules/mob/living/silicon/emote.dm @@ -1,7 +1,4 @@ /mob/living/silicon/emote(var/act, var/m_type=1, var/message = null) - if(stat) - return - var/param = null if (findtext(act, "-", 1, null)) var/t1 = findtext(act, "-", 1, null) diff --git a/code/modules/mob/living/silicon/pai/emote.dm b/code/modules/mob/living/silicon/pai/emote.dm index 2fce92f2883..a8eeac8cbb7 100644 --- a/code/modules/mob/living/silicon/pai/emote.dm +++ b/code/modules/mob/living/silicon/pai/emote.dm @@ -1,7 +1,4 @@ /mob/living/silicon/pai/emote(var/act, var/m_type=1, var/message = null) - if(stat) - return - switch(act) if ("help") src << "ping, beep, buzz." diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index 45a086f0fe7..9c01f9ee5ec 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -1,7 +1,4 @@ /mob/living/silicon/robot/emote(var/act, var/m_type=1, var/message = null) - if(stat) - return - var/param = null if (findtext(act, "-", 1, null)) var/t1 = findtext(act, "-", 1, null)