diff --git a/code/game/objects/effects/temporary_visuals/clockcult.dm b/code/game/objects/effects/temporary_visuals/clockcult.dm index 1dc126faa6c..5fee4398002 100644 --- a/code/game/objects/effects/temporary_visuals/clockcult.dm +++ b/code/game/objects/effects/temporary_visuals/clockcult.dm @@ -43,14 +43,14 @@ /obj/effect/temp_visual/ratvar/window icon_state = "ratvarwindowglow" - layer = ABOVE_OBJ_LAYER + layer = ABOVE_WINDOW_LAYER /obj/effect/temp_visual/ratvar/window/single icon_state = "ratvarwindowglow_s" /obj/effect/temp_visual/ratvar/gear icon_state = "ratvargearglow" - layer = BELOW_OBJ_LAYER + layer = ABOVE_OBJ_LAYER /obj/effect/temp_visual/ratvar/grille icon_state = "ratvargrilleglow" diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 1e260cf9e92..a2d13ad8afb 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -702,21 +702,17 @@ reinf = FALSE var/made_glow = FALSE -/obj/structure/window/reinforced/clockwork/Initialize(mapload, direct) - . = ..() - if(fulltile) - made_glow = TRUE - if(fulltile) - new /obj/effect/temp_visual/ratvar/window(get_turf(src)) - /obj/structure/window/reinforced/clockwork/spawnDebris(location) . = list() . += new /obj/item/stack/tile/brass(location, (fulltile ? 2 : 1)) /obj/structure/window/reinforced/clockwork/setDir(direct) if(!made_glow) - var/obj/effect/E = new /obj/effect/temp_visual/ratvar/window/single(get_turf(src)) - E.setDir(direct) + if(fulltile) + new /obj/effect/temp_visual/ratvar/window(get_turf(src)) + else + var/obj/effect/E = new /obj/effect/temp_visual/ratvar/window/single(get_turf(src)) + E.setDir(direct) made_glow = TRUE ..() diff --git a/code/game/turfs/simulated/walls_misc.dm b/code/game/turfs/simulated/walls_misc.dm index a841f06665e..b5026e64673 100644 --- a/code/game/turfs/simulated/walls_misc.dm +++ b/code/game/turfs/simulated/walls_misc.dm @@ -52,9 +52,8 @@ hardness = 10 slicing_duration = 80 sheet_type = /obj/item/stack/tile/brass - sheet_amount = 1 + sheet_amount = 2 girder_type = /obj/structure/clockwork/wall_gear - baseturf = /turf/simulated/floor/clockwork/reebe var/heated var/obj/effect/clockwork/overlay/wall/realappearance @@ -77,25 +76,6 @@ animate(src, color = previouscolor, time = 8) addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8) -/turf/simulated/wall/clockwork/dismantle_wall(devastated=0, explode=0) - if(devastated) - devastate_wall() - ChangeTurf(baseturf) - else - playsound(src, 'sound/items/welder.ogg', 100, 1) - var/newgirder = break_wall() - if(newgirder) //maybe we want a gear! - transfer_fingerprints_to(newgirder) - ChangeTurf(baseturf) - - for(var/obj/O in src) //Eject contents! - if(istype(O, /obj/structure/sign/poster)) - var/obj/structure/sign/poster/P = O - P.roll_and_drop(src) - else - O.forceMove(src) - return TRUE - /turf/simulated/wall/clockwork/devastate_wall() for(var/i in 1 to 2) new/obj/item/clockwork/alloy_shards/large(src) @@ -116,4 +96,3 @@ if(heated) to_chat(M.occupant, "The wall's intense heat completely reflects your [M.name]'s attack!") M.take_damage(20, BURN) - diff --git a/code/modules/reagents/chemistry/reagents/misc.dm b/code/modules/reagents/chemistry/reagents/misc.dm index a489685a340..4cd7da11874 100644 --- a/code/modules/reagents/chemistry/reagents/misc.dm +++ b/code/modules/reagents/chemistry/reagents/misc.dm @@ -133,7 +133,6 @@ color = "#A8A8A8" // rgb: 168, 168, 168 taste_description = "a CPU" - /datum/reagent/copper name = "Copper" id = "copper" @@ -141,6 +140,13 @@ color = "#6E3B08" // rgb: 110, 59, 8 taste_description = "copper" +/datum/reagent/copper/reaction_obj(obj/O, volume) + if(istype(O, /obj/item/stack/sheet/metal)) + var/obj/item/stack/sheet/metal/M = O + volume = round(min(volume, M.amount), 1) + new /obj/item/stack/tile/brass(get_turf(M), volume) + M.use(volume) + /datum/reagent/chromium name = "Chromium" id = "chromium" diff --git a/icons/effects/clockwork_effects.dmi b/icons/effects/clockwork_effects.dmi index 5d6082dc2bd..f4eec4c8fcc 100644 Binary files a/icons/effects/clockwork_effects.dmi and b/icons/effects/clockwork_effects.dmi differ