From c8a2ec99414542eb5bfddbaee0a3d42670406f9b Mon Sep 17 00:00:00 2001
From: Aylong <69762909+Aylong220@users.noreply.github.com>
Date: Sat, 24 Jun 2023 15:12:45 +0300
Subject: [PATCH] Fix: Buttons under windows (#151)

* Fix: Rusted r_wall and wall icon_state

* layer fix

* Update cyberiad.dmm

* Fix: layer constantify

---------

Co-authored-by: Furior <furiorg@gmail.com>
---
 _maps/map_files/cyberiad/cyberiad.dmm         | 40 +++++++++----------
 code/game/machinery/doors/airlock_control.dm  |  2 +
 .../airlock_controllers.dm                    |  2 +
 code/game/turfs/simulated/walls_misc.dm       |  4 +-
 4 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
index ea975e7af4d..82dba341771 100644
--- a/_maps/map_files/cyberiad/cyberiad.dmm
+++ b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -7674,10 +7674,6 @@
 	name = "Cell 1";
 	req_access = list(2)
 	},
-/obj/item/radio/intercom{
-	name = "west station intercom (General)";
-	pixel_x = -28
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable{
@@ -8336,6 +8332,11 @@
 	},
 /area/security/prison/cell_block/A)
 "avY" = (
+/obj/machinery/door_timer/cell_1{
+	dir = 1;
+	layer = 4;
+	pixel_y = 32
+	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "rampbottom"
@@ -8619,6 +8620,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/machinery/door_timer/cell_2{
+	layer = 4
+	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "rampbottom"
@@ -9029,9 +9033,6 @@
 	},
 /area/security/prison/cell_block/A)
 "axH" = (
-/obj/machinery/door_timer/cell_2{
-	layer = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
@@ -9040,6 +9041,10 @@
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /obj/machinery/light,
+/obj/item/radio/intercom{
+	name = "south station intercom (General)";
+	pixel_y = -28
+	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "darkredcorners"
@@ -9613,10 +9618,6 @@
 	name = "Cell 2";
 	req_access = list(2)
 	},
-/obj/item/radio/intercom{
-	name = "west station intercom (General)";
-	pixel_x = -28
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable{
@@ -10512,9 +10513,6 @@
 	},
 /area/security/prison/cell_block/A)
 "aBa" = (
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
@@ -70122,12 +70120,11 @@
 	},
 /area/medical/medbreak)
 "ieF" = (
-/obj/machinery/door_timer/cell_1{
-	dir = 1;
-	layer = 4;
-	pixel_y = 32
-	},
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/item/radio/intercom{
+	name = "north station intercom (General)";
+	pixel_y = 28
+	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "darkredcorners"
@@ -76739,7 +76736,8 @@
 	},
 /obj/item/reagent_containers/food/drinks/flask/detflask{
 	pixel_y = 4;
-	pixel_x = -8
+	pixel_x = -8;
+	initialized = 1
 	},
 /obj/item/flashlight/lamp/green{
 	on = 0;
@@ -132232,7 +132230,7 @@ axP
 aza
 aoq
 aBa
-asZ
+aAx
 aAx
 aEt
 axe
diff --git a/code/game/machinery/doors/airlock_control.dm b/code/game/machinery/doors/airlock_control.dm
index 58a0d7fdb48..e01d2e2f91a 100644
--- a/code/game/machinery/doors/airlock_control.dm
+++ b/code/game/machinery/doors/airlock_control.dm
@@ -150,6 +150,7 @@
 	anchored = 1
 	resistance_flags = FIRE_PROOF
 	power_channel = ENVIRON
+	layer = 3.3
 
 	var/id_tag
 	var/master_tag
@@ -231,6 +232,7 @@
 	name = "access button"
 	anchored = 1
 	power_channel = ENVIRON
+	layer = ABOVE_WINDOW_LAYER
 
 	var/master_tag
 	frequency = AIRLOCK_FREQ
diff --git a/code/game/machinery/embedded_controller/airlock_controllers.dm b/code/game/machinery/embedded_controller/airlock_controllers.dm
index 8288cefd09b..6e2d2978cad 100644
--- a/code/game/machinery/embedded_controller/airlock_controllers.dm
+++ b/code/game/machinery/embedded_controller/airlock_controllers.dm
@@ -20,6 +20,7 @@
 /obj/machinery/embedded_controller/radio/airlock/airlock_controller
 	name = "Airlock Controller"
 	tag_secure = 1
+	layer = ABOVE_WINDOW_LAYER
 
 /obj/machinery/embedded_controller/radio/airlock/airlock_controller/Initialize(mapload, given_id_tag, given_frequency, given_tag_exterior_door, given_tag_interior_door, given_tag_airpump, given_tag_chamber_sensor)
 	if(given_id_tag)
@@ -70,6 +71,7 @@
 /obj/machinery/embedded_controller/radio/airlock/access_controller
 	icon = 'icons/obj/machines/airlock_machines.dmi'
 	icon_state = "access_control_standby"
+	layer = 3.3
 
 	name = "Access Controller"
 	tag_secure = 1
diff --git a/code/game/turfs/simulated/walls_misc.dm b/code/game/turfs/simulated/walls_misc.dm
index f1d6df49693..277efc14871 100644
--- a/code/game/turfs/simulated/walls_misc.dm
+++ b/code/game/turfs/simulated/walls_misc.dm
@@ -44,13 +44,13 @@
 	name = "rusted wall"
 	desc = "A rusted metal wall."
 	icon = 'icons/turf/walls/rusty_wall.dmi'
-	icon_state = "arust"
+	icon_state = "wall"
 
 /turf/simulated/wall/r_wall/rust
 	name = "rusted reinforced wall"
 	desc = "A huge chunk of rusted reinforced metal."
 	icon = 'icons/turf/walls/rusty_reinforced_wall.dmi'
-	icon_state = "rrust"
+	icon_state = "r_wall"
 
 /turf/simulated/wall/r_wall/coated			//Coated for heat resistance
 	name = "coated reinforced wall"