From 8d1f152d19a3e65c7943fe4f46f1eddc85c7475c Mon Sep 17 00:00:00 2001
From: kane-f <57303506+kane-f@users.noreply.github.com>
Date: Sat, 30 Apr 2022 23:12:29 +0100
Subject: [PATCH] [Revival] Plasteel tiles weld back into plasteel (#32458)

* plasteel tiles weld back into plasteel

* it's still copypaste but the words are correct now

* Saner way to do this

* Why was this deleted

* Oh it just got moved

* Even better way

* Simplifies this, already a var apparently

Co-authored-by: SonixApache <soniixapache@hotmail.com>
Co-authored-by: kanef <kanef9x@protonmail.com>
---
 code/game/objects/items/stacks/tiles/tiles.dm | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/code/game/objects/items/stacks/tiles/tiles.dm b/code/game/objects/items/stacks/tiles/tiles.dm
index f20d685cf8a..6c41107a42e 100644
--- a/code/game/objects/items/stacks/tiles/tiles.dm
+++ b/code/game/objects/items/stacks/tiles/tiles.dm
@@ -14,9 +14,8 @@
 	flags = FPRINT
 	siemens_coefficient = 1
 	max_amount = 60
-	var/active
-
 	material = "metal"
+	var/active
 
 /obj/item/stack/tile/metal/New(var/loc, var/amount=null)
 	. = ..()
@@ -81,11 +80,11 @@
 			return
 
 		if(WT.remove_fuel(0,user))
-			var/obj/item/stack/sheet/metal/M = new /obj/item/stack/sheet/metal
+			var/obj/item/stack/sheet/metal/M = new sheet_type
 			M.amount = 1
 			M.forceMove(get_turf(usr)) //This is because new() doesn't call forceMove, so we're forcemoving the new sheet to make it stack with other sheets on the ground.
-			user.visible_message("<span class='warning'>[src] is shaped into metal by [user.name] with the welding tool.</span>", \
-			"<span class='warning'>You shape the [src] into metal with the welding tool.</span>", \
+			user.visible_message("<span class='warning'>[src] is shaped into [M.name] sheets by [user.name] with the welding tool.</span>", \
+			"<span class='warning'>You shape the [src] into [M.name] sheets with the welding tool.</span>", \
 			"<span class='warning'>You hear welding.</span>")
 			var/obj/item/stack/tile/metal/R = src
 			src = null
@@ -178,5 +177,5 @@
 	starting_materials = list(MAT_IRON = 937.5, MAT_PLASMA = 937.5)
 	melt_temperature = MELTPOINT_PLASMA
 	throwforce = 15
-
-	material = "plasteel"
\ No newline at end of file
+	sheet_type = /obj/item/stack/sheet/plasteel
+	material = "plasteel"