From 5d9f6d4ccd9ee984a778359ff0a272c7a310cfe5 Mon Sep 17 00:00:00 2001
From: "aranclanos@hotmail.com"
 <aranclanos@hotmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Sat, 17 Nov 2012 03:50:45 +0000
Subject: [PATCH] - Fixes the ugly runtimes caused in r5087 about dismantling
 walls. - Fixed the mineral of the silver walls. It was by default, metal. -
 Fixed a runtime about building airlocks/walls/false walls with only 2 sheets.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5095 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/game/objects/structures/door_assembly.dm | 11 +++++----
 code/game/objects/structures/girders.dm       |  5 ++--
 code/game/turfs/simulated/walls.dm            | 23 +++++++++++++------
 code/game/turfs/simulated/walls_mineral.dm    |  1 +
 4 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm
index 6331c0341fe..0759b0b7b86 100644
--- a/code/game/objects/structures/door_assembly.dm
+++ b/code/game/objects/structures/door_assembly.dm
@@ -390,16 +390,17 @@ obj/structure/door_assembly
 						src.airlock_type = /obj/machinery/door/airlock/glass
 						src.base_icon_state = "door_as_g" //this will be applied to the icon_state with the correct state number at the proc's end.
 				else if(istype(G, /obj/item/stack/sheet/mineral))
+					var/M = G.sheettype
 					if(G.amount>=2)
 						playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
 						user.visible_message("[user] adds [G.name] to the airlock assembly.", "You start to install [G.name] into the airlock assembly.")
 						if(do_after(user, 40))
-							user << "\blue You installed [G.sheettype] plating into the airlock assembly!"
+							user << "\blue You installed [M] plating into the airlock assembly!"
 							G.use(2)
-							src.mineral = "[G.sheettype]"
-							src.name = "Near finished [G.sheettype] Airlock Assembly"
-							src.airlock_type = text2path ("/obj/machinery/door/airlock/[G.sheettype]")
-							src.base_icon_state = "door_as_[G.sheettype]"
+							src.mineral = "[M]"
+							src.name = "Near finished [M] Airlock Assembly"
+							src.airlock_type = text2path ("/obj/machinery/door/airlock/[M]")
+							src.base_icon_state = "door_as_[M]"
 
 	else if(istype(W, /obj/item/weapon/screwdriver) && state == 2 )
 		playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index 4c0e6efb857..b50225838e6 100644
--- a/code/game/objects/structures/girders.dm
+++ b/code/game/objects/structures/girders.dm
@@ -121,11 +121,12 @@
 							return
 
 			if(S.sheettype)
+				var/M = S.sheettype
 				if(!anchored)
 					if(S.amount < 2) return
 					S.use(2)
 					user << "\blue You create a false wall! Push on it to open or close the passage."
-					var/F = text2path("/obj/structure/falsewall/[S.sheettype]")
+					var/F = text2path("/obj/structure/falsewall/[M]")
 					new F (src.loc)
 					del(src)
 				else
@@ -136,7 +137,7 @@
 						S.use(2)
 						user << "\blue You added the plating!"
 						var/turf/Tsrc = get_turf(src)
-						Tsrc.ChangeTurf(text2path("/turf/simulated/wall/mineral/[S.sheettype]"))
+						Tsrc.ChangeTurf(text2path("/turf/simulated/wall/mineral/[M]"))
 						for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
 							if(X)	X.add_hiddenprint(usr)
 						del(src)
diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm
index 32a3b977075..5b4740a0665 100644
--- a/code/game/turfs/simulated/walls.dm
+++ b/code/game/turfs/simulated/walls.dm
@@ -35,14 +35,23 @@
 		if(!devastated)
 			playsound(src.loc, 'sound/items/Welder.ogg', 100, 1)
 			new /obj/structure/girder(src)
-			var/M = text2path("/obj/item/stack/sheet/mineral/[mineral]")
-			new M( src )
-			new M( src )
+			if (mineral == "metal")
+				new /obj/item/stack/sheet/metal( src )
+				new /obj/item/stack/sheet/metal( src )
+			else
+				var/M = text2path("/obj/item/stack/sheet/mineral/[mineral]")
+				new M( src )
+				new M( src )
 		else
-			var/M = text2path("/obj/item/stack/sheet/mineral/[mineral]")
-			new M( src )
-			new M( src )
-			new /obj/item/stack/sheet/metal( src )
+			if (mineral == "metal")
+				new /obj/item/stack/sheet/metal( src )
+				new /obj/item/stack/sheet/metal( src )
+				new /obj/item/stack/sheet/metal( src )
+			else
+				var/M = text2path("/obj/item/stack/sheet/mineral/[mineral]")
+				new M( src )
+				new M( src )
+				new /obj/item/stack/sheet/metal( src )
 
 	for(var/obj/O in src.contents) //Eject contents!
 		if(istype(O,/obj/effect/decal/poster))
diff --git a/code/game/turfs/simulated/walls_mineral.dm b/code/game/turfs/simulated/walls_mineral.dm
index 098b5be722b..60666a67a07 100644
--- a/code/game/turfs/simulated/walls_mineral.dm
+++ b/code/game/turfs/simulated/walls_mineral.dm
@@ -19,6 +19,7 @@
 	desc = "A wall with silver plating. Shiny!"
 	icon_state = "silver0"
 	walltype = "silver"
+	mineral = "silver"
 	//var/electro = 0.75
 	//var/shocked = null