Merge pull request #9225 from VOREStation/upstream-merge-7708

[MIRROR] Makes wall-mounted machines layer above windows

code/game/machinery/air_alarm.dm

@@ -29,8 +29,7 @@
 	desc = "Used to control various station atmospheric systems. The light indicates the current air status of the area."
 	icon = 'icons/obj/monitors_vr.dmi' //CHOMPEdit: Continues using new air alarm sprite, contrary to YW
 	icon_state = "alarm0"
-	plane = TURF_PLANE
-	layer = ABOVE_TURF_LAYER
+	layer = ABOVE_WINDOW_LAYER
 	anchored = 1
 	use_power = USE_POWER_IDLE
 	idle_power_usage = 80

code/game/machinery/buttons.dm

@@ -2,8 +2,7 @@
 	name = "button"
 	icon = 'icons/obj/objects.dmi'
 	icon_state = "launcherbtt"
-//	plane = TURF_PLANE //Can't have them under tables, oh well.
-//	layer = ABOVE_TURF_LAYER
+	layer = ABOVE_WINDOW_LAYER
 	desc = "A remote control switch for something."
 	var/id = null
 	var/active = 0

code/game/machinery/computer/camera.dm

@@ -59,8 +59,7 @@
 	name = "Telescreen"
 	desc = "Used for watching an empty arena."
 	icon_state = "wallframe"
-	plane = TURF_PLANE
-	layer = ABOVE_TURF_LAYER
+	layer = ABOVE_WINDOW_LAYER
 	icon_keyboard = null
 	icon_screen = null
 	light_range_on = 0

code/game/machinery/computer/guestpass.dm

@@ -79,8 +79,7 @@
 	name = "guest pass terminal"
 	desc = "Used to print temporary passes for people. Handy!"
 	icon_state = "guest"
-	plane = TURF_PLANE
-	layer = ABOVE_TURF_LAYER
+	layer = ABOVE_WINDOW_LAYER
 	icon_keyboard = null
 	icon_screen = "pass"
 	density = 0

code/game/machinery/doors/airlock_control.dm

@@ -148,6 +148,7 @@ obj/machinery/door/airlock/Destroy()
 obj/machinery/airlock_sensor
 	icon = 'icons/obj/airlock_machines.dmi'
 	icon_state = "airlock_sensor_off"
+	layer = ABOVE_WINDOW_LAYER
 	name = "airlock sensor"
 	desc = "Sends atmospheric readings to a nearby controller."
 
@@ -233,6 +234,7 @@ obj/machinery/airlock_sensor/airlock_exterior/shuttle/return_air()
 obj/machinery/access_button
 	icon = 'icons/obj/airlock_machines.dmi'
 	icon_state = "access_button_standby"
+	layer = ABOVE_WINDOW_LAYER
 	name = "access button"
 
 	anchored = 1

code/game/machinery/doors/brigdoors.dm

@@ -22,6 +22,7 @@
 	name = "Door Timer"
 	icon = 'icons/obj/status_display.dmi'
 	icon_state = "frame"
+	layer = ABOVE_WINDOW_LAYER
 	desc = "A remote control for a door."
 	req_access = list(access_brig)
 	anchored = 1.0		// can't pick it up

code/game/machinery/embedded_controller/airlock_controllers.dm

@@ -15,6 +15,7 @@
 	var/list/dummy_terminals = list()
 	var/cycle_to_external_air = 0
 	valid_actions = list("cycle_ext", "cycle_int", "force_ext", "force_int", "abort", "purge", "secure")
+	layer = ABOVE_WINDOW_LAYER
 
 /obj/machinery/embedded_controller/radio/airlock/Destroy()
 	// TODO - Leshana - Implement dummy terminals

code/game/machinery/fire_alarm.dm

@@ -6,8 +6,7 @@ FIRE ALARM
 	desc = "<i>\"Pull this in case of emergency\"</i>. Thus, keep pulling it forever."
 	icon = 'icons/obj/monitors.dmi'
 	icon_state = "fire0"
-	plane = TURF_PLANE
-	layer = ABOVE_TURF_LAYER
+	layer = ABOVE_WINDOW_LAYER
 	var/detecting = 1.0
 	var/working = 1.0
 	var/time = 10.0

code/game/machinery/flasher.dm

@@ -4,6 +4,7 @@
 	desc = "A wall-mounted flashbulb device."
 	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "mflash1"
+	layer = ABOVE_WINDOW_LAYER
 	var/id = null
 	var/range = 2 //this is roughly the size of brig cell
 	var/disable = 0

code/game/machinery/igniter.dm

@@ -48,6 +48,7 @@
 	desc = "A wall-mounted ignition device."
 	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "migniter"
+	layer = ABOVE_WINDOW_LAYER
 	var/id = null
 	var/disable = 0
 	var/last_spark = 0

code/game/machinery/lightswitch.dm

@@ -6,6 +6,7 @@
 	desc = "It turns lights on and off. What are you, simple?"
 	icon = 'icons/obj/power_vr.dmi' // VOREStation Edit
 	icon_state = "light1"
+	layer = ABOVE_WINDOW_LAYER
 	anchored = 1.0
 	use_power = USE_POWER_IDLE
 	idle_power_usage = 10

code/game/machinery/neonsign.dm

@@ -4,6 +4,7 @@
 	desc = "Small wall-mounted electronic sign"
 	icon = 'icons/obj/neonsigns.dmi'
 	icon_state = "sign_off"
+	layer = ABOVE_WINDOW_LAYER
 	plane = MOB_PLANE
 	use_power = USE_POWER_IDLE
 	idle_power_usage = 2

code/game/machinery/newscaster.dm

@@ -126,8 +126,7 @@ GLOBAL_LIST_BOILERPLATE(allCasters, /obj/machinery/newscaster)
 	desc = "A standard newsfeed handler for use on commercial space stations. All the news you absolutely have no use for, in one place!"
 	icon = 'icons/obj/terminals_vr.dmi' //VOREStation Edit
 	icon_state = "newscaster_normal"
-	plane = TURF_PLANE
-	layer = ABOVE_TURF_LAYER
+	layer = ABOVE_WINDOW_LAYER
 	var/isbroken = 0  //1 if someone banged it with something heavy
 	var/ispowered = 1 //starts powered, changes with power_change()
 	//var/list/datum/feed_channel/channel_list = list() //This list will contain the names of the feed channels. Each name will refer to a data region where the messages of the feed channels are stored.

code/game/machinery/requests_console.dm

@@ -28,8 +28,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 	anchored = 1
 	icon = 'icons/obj/terminals_vr.dmi' //VOREStation Edit
 	icon_state = "req_comp0"
-	plane = TURF_PLANE
-	layer = ABOVE_TURF_LAYER
+	layer = ABOVE_WINDOW_LAYER
 	circuit = /obj/item/weapon/circuitboard/request
 	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
 	var/list/message_log = list() //List of all messages

code/game/machinery/status_display.dm

@@ -13,7 +13,7 @@
 	icon = 'icons/obj/status_display.dmi'
 	icon_state = "frame"
 	plane = TURF_PLANE
-	layer = ABOVE_TURF_LAYER
+	layer = ABOVE_WINDOW_LAYER
 	name = "status display"
 	anchored = 1
 	density = 0

code/game/machinery/status_display_ai.dm

@@ -59,6 +59,7 @@ var/list/ai_status_emotions = list(
 /obj/machinery/ai_status_display
 	icon = 'icons/obj/status_display.dmi'
 	icon_state = "frame"
+	layer = ABOVE_WINDOW_LAYER
 	name = "AI display"
 	anchored = 1
 	density = 0

code/game/machinery/vending_machines.dm

@@ -396,6 +396,7 @@
 	description_fluff = "NanoMed is NanoTrasen's medical science division, and provides almost all of the modern medbay essentials in-house at no extra charge. By using this vending machine, employees accept liability for products that may or may not be temporarily replaced by placebos or experimental treatments."
 	product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?"
 	icon_state = "wallmed"
+	layer = ABOVE_WINDOW_LAYER
 	density = 0 //It is wall-mounted, and thus, not dense. --Superxpdude
 	products = list(/obj/item/stack/medical/bruise_pack = 2,
 				/obj/item/stack/medical/ointment = 2,
@@ -413,6 +414,7 @@
 	desc = "A wall-mounted version of the NanoMed, containing only vital first aid equipment."
 	description_fluff = "NanoMed is NanoTrasen's medical science division, and provides almost all of the modern medbay essentials in-house at no extra charge. By using this vending machine, employees accept liability for products that may or may not be temporarily replaced by placebos or experimental treatments."
 	icon_state = "wallmed"
+	layer = ABOVE_WINDOW_LAYER
 	density = 0 //It is wall-mounted, and thus, not dense. --Superxpdude
 	products = list(/obj/item/weapon/reagent_containers/hypospray/autoinjector = 5,
 				/obj/item/weapon/reagent_containers/syringe/antitoxin = 3,

code/game/objects/items/devices/radio/intercom.dm

@@ -3,8 +3,7 @@
 	desc = "Talk through this."
 	icon = 'icons/obj/radio_vr.dmi' //VOREStation Edit - New Icon
 	icon_state = "intercom"
-	plane = TURF_PLANE
-	layer = ABOVE_TURF_LAYER
+	layer = ABOVE_WINDOW_LAYER
 	anchored = 1
 	w_class = ITEMSIZE_LARGE
 	canhear_range = 7 //VOREStation Edit

code/game/objects/items/weapons/storage/secure.dm

@@ -178,6 +178,7 @@
 	desc = "It doesn't seem all that secure. Oh well, it'll do."
 	icon = 'icons/obj/storage.dmi'
 	icon_state = "safe"
+	layer = ABOVE_WINDOW_LAYER
 	icon_opened = "safe0"
 	icon_locking = "safeb"
 	icon_sparking = "safespark"

code/game/objects/structures/extinguisher.dm

@@ -3,8 +3,7 @@
 	desc = "A small wall mounted cabinet designed to hold a fire extinguisher."
 	icon = 'icons/obj/closet.dmi'
 	icon_state = "extinguisher_closed"
-	plane = TURF_PLANE
-	layer = ABOVE_TURF_LAYER
+	layer = ABOVE_WINDOW_LAYER
 	anchored = 1
 	density = 0
 	var/obj/item/weapon/extinguisher/has_extinguisher

code/game/objects/structures/fireaxe.dm

@@ -5,6 +5,7 @@
 	var/obj/item/weapon/material/twohanded/fireaxe/fireaxe
 	icon = 'icons/obj/closet.dmi'	//Not bothering to move icons out for now. But its dumb still.
 	icon_state = "fireaxe1000"
+	layer = ABOVE_WINDOW_LAYER
 	anchored = 1
 	density = 0
 	var/open = 0

code/game/objects/structures/mirror.dm

@@ -4,6 +4,7 @@
 	desc = "A SalonPro Nano-Mirror(TM) brand mirror! The leading technology in hair salon products, utilizing nano-machinery to style your hair just right."
 	icon = 'icons/obj/watercloset.dmi'
 	icon_state = "mirror"
+	layer = ABOVE_WINDOW_LAYER
 	density = 0
 	anchored = 1
 	var/shattered = 0

code/modules/holodeck/HolodeckObjects.dm

@@ -406,6 +406,7 @@ datum/unarmed_attack/holopugilism/unarmed_override(var/mob/living/carbon/human/u
 	desc = "This device is used to declare ready. If all devices in an area are ready, the event will begin!"
 	icon = 'icons/obj/monitors.dmi'
 	icon_state = "auth_off"
+	layer = ABOVE_WINDOW_LAYER
 	var/ready = 0
 	var/area/currentarea = null
 	var/eventstarted = 0

code/modules/holomap/station_holomap.dm

@@ -6,6 +6,7 @@
 	desc = "A virtual map of the surrounding station."
 	icon = 'icons/obj/machines/stationmap.dmi'
 	icon_state = "station_map"
+	layer = ABOVE_WINDOW_LAYER
 	anchored = 1
 	density = 0
 	use_power = USE_POWER_IDLE
@@ -19,9 +20,6 @@
 	var/light_range_on = 2
 	light_color = "#64C864"
 
-	plane = TURF_PLANE
-	layer = ABOVE_TURF_LAYER
-
 	var/mob/watching_mob = null
 	var/image/small_station_map = null
 	var/image/floor_markings = null

code/modules/mining/machine_processing.dm

@@ -8,6 +8,7 @@
 	name = "production machine console"
 	icon = 'icons/obj/machines/mining_machines_vr.dmi' // VOREStation Edit
 	icon_state = "console"
+	layer = ABOVE_WINDOW_LAYER
 	density = TRUE
 	anchored = TRUE
 

code/modules/mining/machine_stacking.dm

@@ -4,6 +4,7 @@
 	name = "stacking machine console"
 	icon = 'icons/obj/machines/mining_machines_vr.dmi'  // VOREStation Edit
 	icon_state = "console"
+	layer = ABOVE_WINDOW_LAYER
 	density = 1
 	anchored = 1
 	var/obj/machinery/mineral/stacking_machine/machine = null

code/modules/modular_computers/computers/subtypes/dev_telescreen.dm

@@ -3,6 +3,7 @@
 	desc = "A wall-mounted touchscreen computer."
 	icon = 'icons/obj/modular_telescreen.dmi'
 	icon_state = "telescreen"
+	layer = ABOVE_WINDOW_LAYER
 	icon_state_unpowered = "telescreen"
 	icon_state_menu = "menu"
 	icon_state_screensaver = "standby"

code/modules/overmap/ships/computers/helm.dm

@@ -274,6 +274,7 @@ GLOBAL_LIST_EMPTY(all_waypoints)
 
 /obj/machinery/computer/ship/navigation/telescreen	//little hacky but it's only used on one ship so it should be okay
 	icon_state = "tele_nav"
+	layer = ABOVE_WINDOW_LAYER
 	icon_keyboard = null
 	icon_screen = null
 	circuit = /obj/item/weapon/circuitboard/nav/tele

code/modules/persistence/noticeboard.dm

@@ -3,6 +3,7 @@
 	desc = "A board for pinning important notices upon."
 	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "nboard00"
+	layer = ABOVE_WINDOW_LAYER
 	density = 0
 	anchored = 1
 	var/list/notices

code/modules/power/apc.dm

@@ -80,8 +80,7 @@ GLOBAL_LIST_EMPTY(apcs)
 	desc = "A control terminal for the area electrical systems."
 	icon = 'icons/obj/power.dmi'
 	icon_state = "apc0"
-	plane = TURF_PLANE
-	layer = ABOVE_TURF_LAYER
+	layer = ABOVE_WINDOW_LAYER
 	anchored = 1
 	use_power = USE_POWER_OFF
 	clicksound = "switch"

code/modules/security levels/keycard authentication.dm

@@ -3,6 +3,7 @@
 	desc = "This device is used to trigger station functions, which require more than one ID card to authenticate."
 	icon = 'icons/obj/monitors.dmi'
 	icon_state = "auth_off"
+	layer = ABOVE_WINDOW_LAYER
 	circuit = /obj/item/weapon/circuitboard/keycard_auth
 	var/active = 0 //This gets set to 1 on all devices except the one where the initial request was made.
 	var/event = ""

html/changelogs/Meghan Rossi - wall machine layering.yml

@@ -0,0 +1,4 @@
+author: Meghan-Rossi
+delete-after: True
+changes: 
+  - bugfix: "If you place wall-mounted machines such as status displays on a window, they will no longer be hidden underneath the window."