From bd42e162c5fe531a6f6b7503214a5afddfc42c63 Mon Sep 17 00:00:00 2001 From: AnturK Date: Fri, 3 Nov 2017 23:37:05 +0100 Subject: [PATCH] Fixes golem shells breaking spawners menu (#32342) --- code/datums/spawners_menu.dm | 2 ++ code/game/objects/structures/ghost_role_spawners.dm | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/datums/spawners_menu.dm b/code/datums/spawners_menu.dm index a9fd77d1e2..e4b4d1fe8b 100644 --- a/code/datums/spawners_menu.dm +++ b/code/datums/spawners_menu.dm @@ -40,6 +40,8 @@ var/spawner_ref = pick(GLOB.mob_spawners[params["name"]]) var/obj/effect/mob_spawn/MS = locate(spawner_ref) in GLOB.poi_list + if(!MS) + return switch(action) if("jump") diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index 380c1c35b0..ea7ba25118 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -122,10 +122,10 @@ golems, so that no golem may ever be forced to serve again." /obj/effect/mob_spawn/human/golem/Initialize(mapload, datum/species/golem/species = null, mob/creator = null) - . = ..() - if(species) + if(species) //spawners list uses object name to register so this goes before ..() name += " ([initial(species.prefix)])" mob_species = species + . = ..() var/area/A = get_area(src) if(!mapload && A) notify_ghosts("\A [initial(species.prefix)] golem shell has been completed in \the [A.name].", source = src, action=NOTIFY_ATTACK, flashwindow = FALSE)