From 77f37760e75b8d115eace49d7d3c0b6045b20194 Mon Sep 17 00:00:00 2001
From: Vi3trice <80771500+Vi3trice@users.noreply.github.com>
Date: Fri, 2 Jun 2023 14:52:40 -0400
Subject: [PATCH] Make various machinery properly update their icons on init
 (#21177)

* All of those Inits, and you choose to not update

* Update requests_console.dm
---
 code/game/machinery/doors/airlock.dm    |  2 +-
 code/game/machinery/doors/door.dm       | 10 ++++++----
 code/game/machinery/requests_console.dm |  1 +
 code/game/machinery/status_display.dm   |  1 +
 code/game/machinery/vendors/vending.dm  |  1 +
 code/modules/mapping/mapping_helpers.dm |  1 +
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 44764308833..451071feb5b 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -559,7 +559,7 @@ GLOBAL_LIST_EMPTY(airlock_emissive_underlays)
 	overlays += damag_overlay
 	overlays += note_overlay
 
-	check_unres()
+	overlays += check_unres()
 
 	//EMISSIVE ICONS
 	if(buttons_underlay != old_buttons_underlay)
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index 067d7a15ed9..70d8ccc45ae 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -60,6 +60,7 @@
 	real_explosion_block = explosion_block
 	explosion_block = EXPLOSION_BLOCK_PROC
 
+	update_icon()
 	air_update_turf(1)
 
 /obj/machinery/door/proc/set_init_door_layer()
@@ -464,23 +465,24 @@
 
 /obj/machinery/door/proc/check_unres() //unrestricted sides. This overlay indicates which directions the player can access even without an ID
 	if(hasPower() && unres_sides)
+		. = list()
 		set_light(l_range = 1, l_power = 1, l_color = "#00FF00")
 		if(unres_sides & NORTH)
 			var/image/I = image(icon='icons/obj/doors/airlocks/station/overlays.dmi', icon_state="unres_n") //layer=src.layer+1
 			I.pixel_y = 32
-			add_overlay(I)
+			. += I
 		if(unres_sides & SOUTH)
 			var/image/I = image(icon='icons/obj/doors/airlocks/station/overlays.dmi', icon_state="unres_s") //layer=src.layer+1
 			I.pixel_y = -32
-			add_overlay(I)
+			. += I
 		if(unres_sides & EAST)
 			var/image/I = image(icon='icons/obj/doors/airlocks/station/overlays.dmi', icon_state="unres_e") //layer=src.layer+1
 			I.pixel_x = 32
-			add_overlay(I)
+			. += I
 		if(unres_sides & WEST)
 			var/image/I = image(icon='icons/obj/doors/airlocks/station/overlays.dmi', icon_state="unres_w") //layer=src.layer+1
 			I.pixel_x = -32
-			add_overlay(I)
+			. += I
 
 /obj/machinery/door/morgue
 	icon = 'icons/obj/doors/doormorgue.dmi'
diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index de308d78313..c2f25998052 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -118,6 +118,7 @@ GLOBAL_LIST_EMPTY(allRequestConsoles)
 	if(departmentType & RC_INFO)
 		GLOB.req_console_information |= department
 
+	update_icon()
 	// NOT BOOLEAN. DO NOT CONVERT.
 	set_light(1)
 
diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm
index f0c9602ed58..4da41171a6b 100644
--- a/code/game/machinery/status_display.dm
+++ b/code/game/machinery/status_display.dm
@@ -36,6 +36,7 @@ GLOBAL_LIST_EMPTY(status_displays)
 /obj/machinery/status_display/Initialize()
 	. = ..()
 	GLOB.status_displays |= src
+	update_icon(UPDATE_OVERLAYS)
 
 /obj/machinery/status_display/Destroy()
 	GLOB.status_displays -= src
diff --git a/code/game/machinery/vendors/vending.dm b/code/game/machinery/vendors/vending.dm
index 89708ff3def..e66c6afaa5b 100644
--- a/code/game/machinery/vendors/vending.dm
+++ b/code/game/machinery/vendors/vending.dm
@@ -191,6 +191,7 @@
 		for(var/typepath in subtypesof(/datum/vendor_crit))
 			all_possible_crits[typepath] = new typepath()
 
+	update_icon(UPDATE_OVERLAYS)
 	reconnect_database()
 	power_change()
 
diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm
index 1c22838e419..6cffe6da19d 100644
--- a/code/modules/mapping/mapping_helpers.dm
+++ b/code/modules/mapping/mapping_helpers.dm
@@ -122,6 +122,7 @@
 
 /obj/effect/mapping_helpers/airlock/unres/payload(obj/machinery/door/airlock)
 	airlock.unres_sides ^= dir
+	airlock.update_icon()
 
 /obj/effect/mapping_helpers/airlock/autoname
 	name = "airlock autoname helper"