diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index cc3c86fb3ae..33de5be0fc1 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -52120,9 +52120,6 @@ /area/security/permabrig) "fWD" = ( /obj/effect/decal/warning_stripes/west, -/obj/structure/cable{ - icon_state = "4-8" - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -57769,21 +57766,6 @@ icon_state = "greencorner" }, /area/medical/virology/lab) -"hmo" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "Brig_lockdown"; - name = "Brig Lockdown"; - opacity = 0 - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id_tag = "SecPilotPriv" - }, -/turf/simulated/floor/plating, -/area/security/podbay) "hmq" = ( /obj/structure/window/reinforced{ dir = 4 @@ -61608,15 +61590,8 @@ }, /area/atmos) "ihp" = ( -/obj/machinery/door/poddoor/multi_tile/two_tile_ver{ - id_tag = "secpilot"; - req_access = list(71) - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "1-8" +/obj/structure/spacepoddoor{ + luminosity = 3 }, /obj/machinery/door/poddoor{ density = 0; @@ -61625,8 +61600,9 @@ name = "Brig Lockdown"; opacity = 0 }, -/obj/structure/spacepoddoor{ - luminosity = 3 +/obj/machinery/door/poddoor/multi_tile/two_tile_ver{ + id_tag = "secpilot"; + req_access = list(71) }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -77222,24 +77198,6 @@ /obj/effect/landmark/tiles/damageturf, /turf/simulated/floor/plating, /area/maintenance/asmaint4) -"maX" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "Brig_lockdown"; - name = "Brig Lockdown"; - opacity = 0 - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id_tag = "SecPilotPriv" - }, -/turf/simulated/floor/plating, -/area/security/podbay) "mbm" = ( /obj/machinery/light/small{ dir = 1 @@ -113767,9 +113725,6 @@ }, /area/security/warden) "uoA" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/structure/cable{ icon_state = "1-8" }, @@ -126819,9 +126774,6 @@ }, /area/maintenance/starboard) "xqr" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; @@ -191973,10 +191925,10 @@ aaq aaq coE wyD -maX +wyD xqr ihp -hmo +wyD wyD coE ylx diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 449e2a2dcf2..3da9233b265 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -72,6 +72,7 @@ name = "alarm" icon = 'icons/obj/machines/monitors.dmi' icon_state = "alarm0" + layer = ABOVE_WINDOW_LAYER anchored = 1 use_power = IDLE_POWER_USE idle_power_usage = 4 diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm index 65e7021595d..9f3748594e4 100644 --- a/code/game/machinery/door_control.dm +++ b/code/game/machinery/door_control.dm @@ -3,6 +3,7 @@ desc = "A remote control-switch for a door." icon = 'icons/obj/stationobjs.dmi' icon_state = "doorctrl" + layer = ABOVE_WINDOW_LAYER power_channel = ENVIRON var/id = null var/safety_z_check = 1 diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index 8513004f3de..37b69e888f3 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -11,6 +11,7 @@ FIRE ALARM desc = "\"Pull this in case of emergency\". Thus, keep pulling it forever." icon = 'icons/obj/machines/monitors.dmi' icon_state = "fire0" + layer = ABOVE_WINDOW_LAYER var/detecting = 1.0 var/working = 1.0 var/time = 10.0 diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm index 27d19fb519e..2b387872e46 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -6,6 +6,7 @@ desc = "It turns lights on and off. What are you, simple?" icon = 'icons/obj/engines_and_power/power.dmi' icon_state = "light1" + layer = ABOVE_WINDOW_LAYER anchored = 1.0 var/on = 1 var/area/area = null diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index fe4f28b8f86..d5e86a9b263 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -42,6 +42,7 @@ GLOBAL_LIST_EMPTY(allRequestConsoles) anchored = TRUE icon = 'icons/obj/machines/terminals.dmi' icon_state = "req_comp0" + layer = ABOVE_WINDOW_LAYER max_integrity = 300 armor = list("melee" = 70, "bullet" = 30, "laser" = 30, "energy" = 30, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90) var/department = "Unknown" //The list of all departments on the station (Determined from this variable on each unit) Set this to the same thing if you want several consoles in one department diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 24b9f7b9ed0..052128a793f 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -11,6 +11,7 @@ desc = "Talk through this." icon = 'icons/obj/intercom.dmi' icon_state = INTERCOM_BASE_ICON_STATE + layer = ABOVE_WINDOW_LAYER anchored = TRUE w_class = WEIGHT_CLASS_BULKY canhear_range = 2 diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 420e8adff3f..4eeec3e3cfc 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -554,6 +554,7 @@ name = "window tint control" icon = 'icons/obj/stationobjs.dmi' icon_state = "polarizer-0" + layer = ABOVE_WINDOW_LAYER desc = "A remote control switch for polarized windows." anchored = TRUE var/range = 7 diff --git a/code/modules/newscaster/obj/newscaster.dm b/code/modules/newscaster/obj/newscaster.dm index 843b3b7d6f3..61232d1709a 100644 --- a/code/modules/newscaster/obj/newscaster.dm +++ b/code/modules/newscaster/obj/newscaster.dm @@ -19,6 +19,7 @@ desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. All the news you absolutely have no use for, in one place!" icon = 'icons/obj/machines/terminals.dmi' icon_state = "newscaster_normal" + layer = ABOVE_WINDOW_LAYER max_integrity = 200 integrity_failure = 50 light_range = 0 diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 4d692f0678a..a64ec3cdcd5 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -51,6 +51,7 @@ name = "area power controller" desc = "A control terminal for the area electrical systems." icon_state = "apc0" + layer = ABOVE_WINDOW_LAYER use_power = NO_POWER_USE max_integrity = 200 integrity_failure = 50