From 976ebf123cdfaae5c6828aa2a08965a9ad8aad94 Mon Sep 17 00:00:00 2001
From: Vi3trice <80771500+Vi3trice@users.noreply.github.com>
Date: Sat, 26 Feb 2022 07:55:09 -0500
Subject: [PATCH] Fix - Clockwork walls have the proper icons, regular and
 brass windoors can be properly disassembled, fix a windoor runtime and text
 (#17449)

* This is brass

* I reviewed myself and wound up finding more issues

* Whoa, lots of places where it calls it an airlock instead of a windoor
---
 code/game/machinery/doors/windowdoor.dm       | 36 ++++++++++++++++++-
 .../objects/structures/windoor_assembly.dm    | 12 +++----
 code/game/turfs/simulated/walls_misc.dm       |  3 ++
 3 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
index 3289767d82c..97cd0b1ca8a 100644
--- a/code/game/machinery/doors/windowdoor.dm
+++ b/code/game/machinery/doors/windowdoor.dm
@@ -280,7 +280,10 @@
 				WA.setDir(dir)
 				WA.ini_dir = dir
 				WA.update_icon()
-				WA.created_name = name
+				if(WA.secure)
+					WA.name = "secure wired windoor assembly"
+				else
+					WA.name = "wired windoor assembly"
 
 				to_chat(user, "<span class='notice'>You remove the airlock electronics.</span>")
 
@@ -342,9 +345,40 @@
 	base_state = "clockwork"
 	shards = 0
 	rods = 0
+	cable = 0
 	resistance_flags = ACID_PROOF | FIRE_PROOF
 	var/made_glow = FALSE
 
+/obj/machinery/door/window/clockwork/crowbar_act(mob/user, obj/item/I)
+	if(operating)
+		return
+	if(flags & NODECONSTRUCT)
+		return
+	. = TRUE
+	if(!I.tool_use_check(user, 0))
+		return
+	try_to_crowbar(user, I)
+
+/obj/machinery/door/window/clockwork/welder_act(mob/user, obj/item/I)
+	if(operating)
+		return
+	if(flags & NODECONSTRUCT)
+		return
+	if(!panel_open)
+		return
+	. = TRUE
+	if(!I.tool_use_check(user, 0))
+		return
+	WELDER_ATTEMPT_SLICING_MESSAGE
+	if(!I.use_tool(src, user, 40, volume = I.tool_volume))
+		return
+	if(!panel_open && operating && !loc)
+		return
+	WELDER_FLOOR_SLICE_SUCCESS_MESSAGE
+	var/obj/item/stack/tile/brass/B = new (get_turf(src), 2)
+	B.add_fingerprint(user)
+	qdel(src)
+
 /obj/machinery/door/window/clockwork/spawnDebris(location)
 	. = ..()
 	. = new /obj/item/stack/tile/brass(location, 2)
diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm
index 11943049e1e..96b9c26525b 100644
--- a/code/game/objects/structures/windoor_assembly.dm
+++ b/code/game/objects/structures/windoor_assembly.dm
@@ -133,7 +133,7 @@
 			//Adding airlock electronics for access. Step 6 complete.
 			if(istype(W, /obj/item/airlock_electronics) && !istype(W, /obj/item/airlock_electronics/destroyed))
 				playsound(loc, W.usesound, 100, 1)
-				user.visible_message("[user] installs the electronics into the airlock assembly.", "You start to install electronics into the airlock assembly...")
+				user.visible_message("[user] installs the electronics into the windoor assembly.", "You start to install electronics into the windoor assembly...")
 				user.drop_item()
 				W.forceMove(src)
 
@@ -141,7 +141,7 @@
 					if(!src || electronics)
 						W.forceMove(loc)
 						return
-					to_chat(user, "<span class='notice'>You install the airlock electronics.</span>")
+					to_chat(user, "<span class='notice'>You install the windoor electronics.</span>")
 					name = "near finished windoor assembly"
 					electronics = W
 				else
@@ -213,13 +213,13 @@
 		windoor.close()
 
 /obj/structure/windoor_assembly/screwdriver_act(mob/user, obj/item/I)
-	if(state != "02" || electronics)
+	if(state != "02" || !electronics)
 		return
 	. = TRUE
 	if(!I.tool_use_check(user, 0))
 		return
-	user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to uninstall electronics from the airlock assembly...")
-	if(!I.use_tool(src, user, 40, volume = I.tool_volume) || electronics)
+	user.visible_message("[user] removes the electronics from the windoor assembly.", "You start to uninstall the electronics from the windoor assembly...")
+	if(!I.use_tool(src, user, 40, volume = I.tool_volume))
 		return
 	to_chat(user, "<span class='notice'>You remove the airlock electronics.</span>")
 	name = "wired windoor assembly"
@@ -234,7 +234,7 @@
 	. = TRUE
 	if(!I.tool_use_check(user, 0))
 		return
-	user.visible_message("[user] cuts the wires from the airlock assembly.", "You start to cut the wires from airlock assembly...")
+	user.visible_message("[user] cuts the wires from the windoor assembly.", "You start to cut the wires from windoor assembly...")
 	if(!I.use_tool(src, user, 40, volume = I.tool_volume) || state != "02")
 		return
 	to_chat(user, "<span class='notice'>You cut the windoor wires.</span>")
diff --git a/code/game/turfs/simulated/walls_misc.dm b/code/game/turfs/simulated/walls_misc.dm
index f5f33ec7728..dcd00f1221c 100644
--- a/code/game/turfs/simulated/walls_misc.dm
+++ b/code/game/turfs/simulated/walls_misc.dm
@@ -53,6 +53,9 @@
 /turf/simulated/wall/clockwork
 	name = "clockwork wall"
 	desc = "A huge chunk of warm metal. The clanging of machinery emanates from within."
+	icon = 'icons/turf/walls/clockwork_wall.dmi'
+	icon_state = "clockwork_wall-0"
+	base_icon_state = "clockwork_wall"
 	explosion_block = 2
 	hardness = 10
 	slicing_duration = 80