Dead people can emote!

This commit is contained in:
Markolie
2015-10-02 03:59:03 +02:00
parent 7197a893e6
commit e27f84df7d
11 changed files with 20 additions and 45 deletions
+2 -1
View File
@@ -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)
@@ -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 = {"
<b>Implant Specifications:</b><BR>
<b>Name:</b> Robust Corp RX-79 Deadman Switch Implant<BR>
<b>Life:</b> Activates upon death.<BR>
@@ -14,23 +14,22 @@
<b>Implant Details:</b><BR>
<b>Function:</b> Contains a compact, electric signaller that activates upon host death.<BR>
<b>Integrity:</b> 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 <B>[signaler.frequency]</B> using encryption <B>[signaler.code]</B>.", 0, 0)
usr << "Deadman switch will broadcast signal on <B>[signaler.frequency]</B> using encryption <B>[signaler.code]</B>."
/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 <B>[signaler.frequency]</B> using encryption <B>[signaler.code]</B>.", 0, 0)
usr << "Deadman switch will broadcast signal on <B>[signaler.frequency]</B> using encryption <B>[signaler.code]</B>."
/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
/obj/item/weapon/implant/deadman/islegal()
return 0
@@ -116,7 +116,6 @@ Implant Specifics:<BR>"}
<b>Integrity:</b> 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")
@@ -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)
@@ -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)
@@ -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
@@ -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)
@@ -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)
-3
View File
@@ -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)
@@ -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."
@@ -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)