From 773b44e799bf610f67678616673af9c9bb344a56 Mon Sep 17 00:00:00 2001 From: Ashe Higgs Date: Wed, 25 Oct 2017 22:45:34 -0400 Subject: [PATCH 1/2] Cogscarab shells/construct chassis on spawn menu (#32048) --- code/datums/spawners_menu.dm | 8 ++++++-- .../gamemodes/clock_cult/clock_items/construct_chassis.dm | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/code/datums/spawners_menu.dm b/code/datums/spawners_menu.dm index cc031d70bb..a9fd77d1e2 100644 --- a/code/datums/spawners_menu.dm +++ b/code/datums/spawners_menu.dm @@ -23,8 +23,12 @@ for(var/spawner_obj in GLOB.mob_spawners[spawner]) this["refs"] += "\ref[spawner_obj]" if(!this["desc"]) - var/obj/effect/mob_spawn/MS = spawner_obj - this["desc"] = MS.flavour_text + if(istype(spawner_obj, /obj/effect/mob_spawn)) + var/obj/effect/mob_spawn/MS = spawner_obj + this["desc"] = MS.flavour_text + else + var/obj/O = spawner_obj + this["desc"] = O.desc this["amount_left"] = LAZYLEN(GLOB.mob_spawners[spawner]) data["spawners"] += list(this) diff --git a/code/game/gamemodes/clock_cult/clock_items/construct_chassis.dm b/code/game/gamemodes/clock_cult/clock_items/construct_chassis.dm index 0b7738961a..ee782b1127 100644 --- a/code/game/gamemodes/clock_cult/clock_items/construct_chassis.dm +++ b/code/game/gamemodes/clock_cult/clock_items/construct_chassis.dm @@ -15,11 +15,14 @@ . = ..() var/area/A = get_area(src) if(A && construct_type) - notify_ghosts("A [construct_name] chassis has been created in [A.name]!", 'sound/magic/clockwork/fellowship_armory.ogg', source = src, action = NOTIFY_ORBIT, flashwindow = FALSE) + notify_ghosts("A [construct_name] chassis has been created in [A.name]!", 'sound/magic/clockwork/fellowship_armory.ogg', source = src, action = NOTIFY_ATTACK, flashwindow = FALSE) GLOB.poi_list += src + LAZYADD(GLOB.mob_spawners[name], src) /obj/item/clockwork/construct_chassis/Destroy() GLOB.poi_list -= src + var/list/spawners = GLOB.mob_spawners[name] + LAZYREMOVE(spawners, src) . = ..() /obj/item/clockwork/construct_chassis/examine(mob/user) @@ -37,6 +40,7 @@ if(!SSticker.mode) to_chat(user, "You cannot use that before the game has started.") return + user.forceMove(get_turf(src)) //If we attack through the alert, jump to the chassis so we know what we're getting into if(alert(user, "Become a [construct_name]? You can no longer be cloned!", construct_name, "Yes", "Cancel") == "Cancel") return if(QDELETED(src))