From 5de5ada0cd9548e31eb23e13dc3f534aceaf3c2c Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Sat, 21 Jan 2017 19:06:24 -0500 Subject: [PATCH] Proselytizers can now convert lattices (#23146) --- .../clock_helpers/proselytizer_helpers.dm | 16 +++++++++++++++- code/game/objects/structures/lattice.dm | 4 ++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/clock_cult/clock_helpers/proselytizer_helpers.dm b/code/game/gamemodes/clock_cult/clock_helpers/proselytizer_helpers.dm index 9663351f841..885ca815c0d 100644 --- a/code/game/gamemodes/clock_cult/clock_helpers/proselytizer_helpers.dm +++ b/code/game/gamemodes/clock_cult/clock_helpers/proselytizer_helpers.dm @@ -210,6 +210,20 @@ /obj/structure/grille/ratvar/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer) return FALSE +//Lattice conversion +/obj/structure/lattice/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer) + return list("operation_time" = 0, "new_obj_type" = /obj/structure/lattice/clockwork, "power_cost" = 0, "spawn_dir" = SOUTH, "no_target_deletion" = TRUE) + +/obj/structure/lattice/clockwork/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer) + ratvar_act() //just in case we're the wrong type for some reason?? + return FALSE + +/obj/structure/lattice/catwalk/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer) + return list("operation_time" = 0, "new_obj_type" = /obj/structure/lattice/catwalk/clockwork, "power_cost" = 0, "spawn_dir" = SOUTH, "no_target_deletion" = TRUE) + +/obj/structure/lattice/catwalk/clockwork/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer) + return FALSE + //Girder conversion /obj/structure/girder/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer) var/prosel_cost = POWER_GEAR - (POWER_METAL * 2) @@ -264,7 +278,7 @@ user.visible_message("[user]'s [proselytizer.name] stops covering [src] with glowing orange energy.", \ "You finish repairing [src]. It is now at [obj_integrity]/[max_integrity] integrity.") -//Convert shards and replicant alloy directly to liquid alloy +//Convert shards and replicant alloy directly to power /obj/item/clockwork/alloy_shards/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer) return list("operation_time" = 0, "new_obj_type" = /obj/effect/overlay/temp/ratvar/beam/itemconsume, "power_cost" = -POWER_STANDARD, "spawn_dir" = SOUTH) diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index 6295d8aa182..b37d37bebde 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -63,6 +63,10 @@ desc = "A lightweight support lattice. These hold the Justicar's station together." icon = 'icons/obj/smooth_structures/lattice_clockwork.dmi' +/obj/structure/lattice/clockwork/New() + ..() + ratvar_act() + /obj/structure/lattice/clockwork/ratvar_act() if(IsOdd(x+y)) new/obj/structure/lattice/clockwork/large(loc)