Fixes dead PKborgs having active dampener fields

This commit is contained in:
CitadelStationBot
2017-06-13 02:24:06 -05:00
parent 32c576b7cf
commit 9c31812e5b
3 changed files with 8 additions and 0 deletions
+2
View File
@@ -630,3 +630,5 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
/obj/item/proc/microwave_act(obj/machinery/microwave/M)
if(M && M.dirty < 100)
M.dirty++
/obj/item/proc/on_mob_death(mob/living/L, gibbed)
@@ -578,6 +578,10 @@
. = ..()
host = loc
/obj/item/borg/projectile_dampen/on_mob_death()
deactivate_field()
. = ..()
/obj/item/borg/projectile_dampen/process()
process_recharge()
process_usage()
+2
View File
@@ -50,6 +50,8 @@
tod = worldtime2text()
var/turf/T = get_turf(src)
var/area/A = get_area(T)
for(var/obj/item/I in contents)
I.on_mob_death(src, gibbed)
if(mind && mind.name && mind.active && (!(T.flags & NO_DEATHRATTLE)))
var/rendered = "<span class='deadsay'><b>[mind.name]</b> has died at <b>[A.name]</b>.</span>"
deadchat_broadcast(rendered, follow_target = src, turf_target = T, message_type=DEADCHAT_DEATHRATTLE)