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 7b0896218eb..8596e729ce2 100644 --- a/code/game/gamemodes/clock_cult/clock_helpers/proselytizer_helpers.dm +++ b/code/game/gamemodes/clock_cult/clock_helpers/proselytizer_helpers.dm @@ -229,6 +229,9 @@ /obj/item/clockwork/alloy_shards/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer) return list("operation_time" = 5, "new_obj_type" = /obj/effect/overlay/temp/ratvar/beam/itemconsume, "alloy_cost" = -REPLICANT_STANDARD, "spawn_dir" = SOUTH) +/obj/item/clockwork/alloy_shards/medium/gear_bit/large/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer) + return list("operation_time" = 3, "new_obj_type" = /obj/effect/overlay/temp/ratvar/beam/itemconsume, "alloy_cost" = -(REPLICANT_ALLOY_UNIT*0.08), "spawn_dir" = SOUTH) + /obj/item/clockwork/alloy_shards/large/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer) return list("operation_time" = 2, "new_obj_type" = /obj/effect/overlay/temp/ratvar/beam/itemconsume, "alloy_cost" = -(REPLICANT_ALLOY_UNIT*0.06), "spawn_dir" = SOUTH) diff --git a/code/game/gamemodes/clock_cult/clock_items/clock_components.dm b/code/game/gamemodes/clock_cult/clock_items/clock_components.dm index 98223f2b5c6..2c174e52fe2 100644 --- a/code/game/gamemodes/clock_cult/clock_items/clock_components.dm +++ b/code/game/gamemodes/clock_cult/clock_items/clock_components.dm @@ -146,7 +146,7 @@ /obj/item/clockwork/alloy_shards name = "replicant alloy shards" desc = "Broken shards of some oddly malleable metal. They occasionally move and seem to glow." - clockwork_desc = "Broken shards of replicant alloy. Could probably be proselytized into replicant alloy, though there's not much left." + clockwork_desc = "Broken shards of replicant alloy. Could be proselytized for liquified replicant alloy." icon_state = "alloy_shards" resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF var/randomsinglesprite = FALSE @@ -155,13 +155,16 @@ /obj/item/clockwork/alloy_shards/New() ..() if(randomsinglesprite) - name = "replicant alloy shard" - desc = "A broken shard of some oddly malleable metal. It occasionally moves and seems to glow." - clockwork_desc = "A broken shard of replicant alloy. Could probably be proselytized into replicant alloy, though there's not much left." + replace_name_desc() icon_state = "[icon_state][rand(1, randomspritemax)]" pixel_x = rand(-9, 9) pixel_y = rand(-9, 9) +/obj/item/clockwork/alloy_shards/proc/replace_name_desc() + name = "replicant alloy shard" + desc = "A broken shard of some oddly malleable metal. It occasionally moves and seems to glow." + clockwork_desc = "A broken shard of replicant alloy. Could be proselytized for liquified replicant alloy." + /obj/item/clockwork/alloy_shards/large randomsinglesprite = TRUE icon_state = "shard_large" @@ -170,6 +173,21 @@ randomsinglesprite = TRUE icon_state = "shard_medium" +/obj/item/clockwork/alloy_shards/medium/gear_bit + randomspritemax = 4 + icon_state = "gear_bit" + +/obj/item/clockwork/alloy_shards/medium/gear_bit/replace_name_desc() + name = "gear bit" + desc = "A broken chunk of a gear. You want it." + clockwork_desc = "A broken chunk of a gear. Could be proselytized for liquified replicant alloy." + +/obj/item/clockwork/alloy_shards/medium/gear_bit/large //gives more alloy + +/obj/item/clockwork/alloy_shards/medium/gear_bit/large/replace_name_desc() + ..() + name = "complex gear bit" + /obj/item/clockwork/alloy_shards/small randomsinglesprite = TRUE randomspritemax = 3 diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 30db71b6d6d..3cb4c6f3db0 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -300,7 +300,7 @@ explosion_block = 1 /obj/machinery/door/window/clockwork - name = "clockwork door" + name = "brass windoor" desc = "A thin door with translucent brass paneling." icon_state = "clockwork" base_state = "clockwork" @@ -311,7 +311,8 @@ /obj/machinery/door/window/clockwork/New(loc, set_dir) ..() - debris += new/obj/item/stack/sheet/brass(src, 2) + for(var/i in 1 to 2) + debris += new/obj/item/clockwork/alloy_shards/medium/gear_bit/large(src) change_construction_value(2) /obj/machinery/door/window/clockwork/setDir(direct) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 7af3a67c9c0..14c6cdeb3f5 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -449,17 +449,19 @@ for(var/obj/item/I in debris) debris -= I qdel(I) + var/amount_of_gears = 2 if(!fulltile) if(direct) var/obj/effect/E = PoolOrNew(/obj/effect/overlay/temp/ratvar/window/single, get_turf(src)) setDir(direct) E.setDir(direct) made_glow = TRUE - debris += new/obj/item/stack/sheet/brass(src, 1) else PoolOrNew(/obj/effect/overlay/temp/ratvar/window, get_turf(src)) made_glow = TRUE - debris += new/obj/item/stack/sheet/brass(src, 2) + amount_of_gears = 4 + for(var/i in 1 to amount_of_gears) + debris += new/obj/item/clockwork/alloy_shards/medium/gear_bit() change_construction_value(fulltile ? 2 : 1) /obj/structure/window/reinforced/clockwork/setDir(direct) diff --git a/icons/obj/clockwork_objects.dmi b/icons/obj/clockwork_objects.dmi index f337fd8b776..2ef2b0fd717 100644 Binary files a/icons/obj/clockwork_objects.dmi and b/icons/obj/clockwork_objects.dmi differ