From 1ccbf75ac9d60135b399d8201dd814c9466e9bbd Mon Sep 17 00:00:00 2001 From: Cyantime Date: Sun, 9 Aug 2020 22:11:20 -0400 Subject: [PATCH] Fix mob_spawner death checking --- code/game/objects/mob_spawner_vr.dm | 4 ++-- code/modules/mob/living/death.dm | 5 +++++ code/modules/mob/living/living_defines_vr.dm | 1 - 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/code/game/objects/mob_spawner_vr.dm b/code/game/objects/mob_spawner_vr.dm index 23ec38c907e..a3f01c53718 100644 --- a/code/game/objects/mob_spawner_vr.dm +++ b/code/game/objects/mob_spawner_vr.dm @@ -30,7 +30,7 @@ /obj/structure/mob_spawner/Destroy() STOP_PROCESSING(SSobj, src) for(var/mob/living/L in spawned_mobs) - L.source_spawner = null + L.nest = null spawned_mobs.Cut() return ..() @@ -57,7 +57,7 @@ if(!ispath(mob_path)) return 0 var/mob/living/L = new mob_path(get_turf(src)) - L.source_spawner = src + L.nest = src spawned_mobs.Add(L) last_spawn = world.time if(total_spawns > 0) diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm index 809b82af54c..b33a5d39457 100644 --- a/code/modules/mob/living/death.dm +++ b/code/modules/mob/living/death.dm @@ -10,6 +10,11 @@ if(istype(nest, /obj/structure/blob/factory)) var/obj/structure/blob/factory/F = nest F.spores -= src + //VOREStation Edit Start + if(istype(nest, /obj/structure/mob_spawner)) + var/obj/structure/mob_spawner/S = nest + S.get_death_report(src) + //VOREStation Edit End nest = null for(var/s in owned_soul_links) diff --git a/code/modules/mob/living/living_defines_vr.dm b/code/modules/mob/living/living_defines_vr.dm index 8b99c7aefb9..e959d0c5a1c 100644 --- a/code/modules/mob/living/living_defines_vr.dm +++ b/code/modules/mob/living/living_defines_vr.dm @@ -3,7 +3,6 @@ /mob/living var/ooc_notes = null - var/obj/structure/mob_spawner/source_spawner = null appearance_flags = TILE_BOUND|PIXEL_SCALE|KEEP_TOGETHER var/hunger_rate = DEFAULT_HUNGER_FACTOR