TG: Steel renamed to plasteel.

Having more than 100 burn damage and being dead now makes you a husk. r2925
Author: 	 uporotiy

baystation12.dme

@@ -514,7 +514,7 @@
 #include "code\game\machinery\bots\medbot.dm"
 #include "code\game\machinery\bots\mulebot.dm"
 #include "code\game\machinery\bots\secbot.dm"
-#include "code\game\machinery\computer\AIcore.dm"
+#include "code\game\machinery\computer\ai_core.dm"
 #include "code\game\machinery\computer\aifixer.dm"
 #include "code\game\machinery\computer\arcade.dm"
 #include "code\game\machinery\computer\atmos.dm"

code/defines/obj.dm

@@ -1320,31 +1320,6 @@
 	throwforce = 14.0
 	flags = FPRINT | TABLEPASS | CONDUCT
 
-/obj/item/stack/sheet/r_metal
-	name = "steel"
-	singular_name = "steel sheet"
-	desc = "This sheet is an alloy of iron and plasma."
-	icon_state = "sheet-r_metal"
-	item_state = "sheet-metal"
-	m_amt = 7500
-	throwforce = 15.0
-	flags = FPRINT | TABLEPASS | CONDUCT
-	origin_tech = "materials=2"
-
-/obj/item/stack/tile/steel
-	name = "Metal floor tile"
-	singular_name = "Steel floor tile"
-	desc = "Those could work as a pretty decent throwing weapon"
-	icon_state = "tile"
-	w_class = 3.0
-	force = 6.0
-	m_amt = 937.5
-	throwforce = 15.0
-	throw_speed = 5
-	throw_range = 20
-	flags = FPRINT | TABLEPASS | CONDUCT
-	max_amount = 60
-
 /obj/item/stack/sheet/plasteel
 	name = "plasteel"
 	singular_name = "plasteel sheet"

code/defines/obj/storage.dm

@@ -161,7 +161,7 @@
 			var/obj/item/stack/sheet/metal/G = new /obj/item/stack/sheet/metal(src)
 			G.amount = 50
 			G.loc = src
-		var/obj/item/stack/sheet/r_metal/R = new /obj/item/stack/sheet/r_metal(src)
+		var/obj/item/stack/sheet/plasteel/R = new /obj/item/stack/sheet/plasteel(src)
 		R.amount = 50
 		R.loc = src
 		var/obj/item/weapon/storage/box/B1 = new /obj/item/weapon/storage/box(src)

code/defines/turf.dm

@@ -1,6 +1,6 @@
 /turf
 	icon = 'floors.dmi'
-	var/intact = 1 //for floors, use is_plating(), is_steel_floor() and is_light_floor()
+	var/intact = 1 //for floors, use is_plating(), is_plasteel_floor() and is_light_floor()
 
 	level = 1.0
 
@@ -26,7 +26,7 @@
 		return 0
 	proc/is_asteroid_floor()
 		return 0
-	proc/is_steel_floor()
+	proc/is_plasteel_floor()
 		return 0
 	proc/is_light_floor()
 		return 0
@@ -82,7 +82,7 @@
 	blocks_air = 1
 
 	thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT
-	heat_capacity = 312500 //a little over 5 cm thick , 312500 for 1 m by 2.5 m by 0.25 m steel wall
+	heat_capacity = 312500 //a little over 5 cm thick , 312500 for 1 m by 2.5 m by 0.25 m plasteel wall
 
 	var/walltype = "wall"
 

code/game/machinery/bots/floorbot.dm

@@ -99,8 +99,8 @@
 
 
 /obj/machinery/bot/floorbot/attackby(var/obj/item/W , mob/user as mob)
-	if(istype(W, /obj/item/stack/tile/steel))
+	if(istype(W, /obj/item/stack/tile/plasteel))
-		var/obj/item/stack/tile/steel/T = W
+		var/obj/item/stack/tile/plasteel/T = W
 		if(src.amount >= 50)
 			return
 		var/loaded = min(50-src.amount, T.amount)
@@ -169,7 +169,7 @@
 				floorbottargets += bot.target
 	if(src.amount <= 0 && ((src.target == null) || !src.target))
 		if(src.eattiles)
-			for(var/obj/item/stack/tile/steel/T in view(7, src))
+			for(var/obj/item/stack/tile/plasteel/T in view(7, src))
 				if(T != src.oldtarget && !(target in floorbottargets))
 					src.oldtarget = T
 					src.target = T
@@ -215,7 +215,7 @@
 					src.target = F
 					break
 		if((!src.target || src.target == null) && src.eattiles)
-			for(var/obj/item/stack/tile/steel/T in view(7, src))
+			for(var/obj/item/stack/tile/plasteel/T in view(7, src))
 				if(!(T in floorbottargets) && T != src.oldtarget)
 					src.oldtarget = T
 					src.target = T
@@ -245,7 +245,7 @@
 		src.path = new()
 
 	if(src.loc == src.target || src.loc == src.target.loc)
-		if(istype(src.target, /obj/item/stack/tile/steel))
+		if(istype(src.target, /obj/item/stack/tile/plasteel))
 			src.eattile(src.target)
 		else if(istype(src.target, /obj/item/stack/sheet/metal))
 			src.maketile(src.target)
@@ -270,7 +270,7 @@
 	if(istype(target, /turf/space/))
 		for(var/mob/O in viewers(src, null))
 			O.show_message(text("\red [src] begins to repair the hole"), 1)
-		var/obj/item/stack/tile/steel/T = new /obj/item/stack/tile/steel
+		var/obj/item/stack/tile/plasteel/T = new /obj/item/stack/tile/plasteel
 		src.repairing = 1
 		spawn(50)
 			T.build(src.loc)
@@ -291,8 +291,8 @@
 			src.anchored = 0
 			src.target = null
 
-/obj/machinery/bot/floorbot/proc/eattile(var/obj/item/stack/tile/steel/T)
+/obj/machinery/bot/floorbot/proc/eattile(var/obj/item/stack/tile/plasteel/T)
-	if(!istype(T, /obj/item/stack/tile/steel))
+	if(!istype(T, /obj/item/stack/tile/plasteel))
 		return
 	for(var/mob/O in viewers(src, null))
 		O.show_message(text("\red [src] begins to collect tiles."), 1)
@@ -326,7 +326,7 @@
 			src.target = null
 			src.repairing = 0
 			return
-		var/obj/item/stack/tile/steel/T = new /obj/item/stack/tile/steel
+		var/obj/item/stack/tile/plasteel/T = new /obj/item/stack/tile/plasteel
 		T.amount = 4
 		T.loc = M.loc
 		del(M)
@@ -353,7 +353,7 @@
 		new /obj/item/robot_parts/l_arm(Tsec)
 
 	if (amount)
-		new /obj/item/stack/tile/steel(Tsec) // only one tile, yes
+		new /obj/item/stack/tile/plasteel(Tsec) // only one tile, yes
 
 	var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
 	s.set_up(3, 1, src)
@@ -362,8 +362,8 @@
 	return
 
 
-/obj/item/weapon/storage/toolbox/mechanical/attackby(var/obj/item/stack/tile/steel/T, mob/user as mob)
+/obj/item/weapon/storage/toolbox/mechanical/attackby(var/obj/item/stack/tile/plasteel/T, mob/user as mob)
-	if(!istype(T, /obj/item/stack/tile/steel))
+	if(!istype(T, /obj/item/stack/tile/plasteel))
 		..()
 		return
 	if(src.contents.len >= 1)

code/game/machinery/computer/ai_core.dm

@@ -1,389 +1,389 @@
-/obj/structure/AIcore
+/obj/structure/AIcore
-	density = 1
+	density = 1
-	anchored = 0
+	anchored = 0
-	name = "AI core"
+	name = "AI core"
-	icon = 'AI.dmi'
+	icon = 'AI.dmi'
-	icon_state = "0"
+	icon_state = "0"
-	var/state = 0
+	var/state = 0
-	var/datum/ai_laws/laws = new /datum/ai_laws/nanotrasen
+	var/datum/ai_laws/laws = new /datum/ai_laws/nanotrasen
-	var/obj/item/weapon/circuitboard/circuit = null
+	var/obj/item/weapon/circuitboard/circuit = null
-	var/obj/item/device/mmi/brain = null
+	var/obj/item/device/mmi/brain = null
-
+
-
+
-/obj/structure/AIcore/attackby(obj/item/P as obj, mob/user as mob)
+/obj/structure/AIcore/attackby(obj/item/P as obj, mob/user as mob)
-	switch(state)
+	switch(state)
-		if(0)
+		if(0)
-			if(istype(P, /obj/item/weapon/wrench))
+			if(istype(P, /obj/item/weapon/wrench))
-				playsound(loc, 'Ratchet.ogg', 50, 1)
+				playsound(loc, 'Ratchet.ogg', 50, 1)
-				if(do_after(user, 20))
+				if(do_after(user, 20))
-					user << "\blue You wrench the frame into place."
+					user << "\blue You wrench the frame into place."
-					anchored = 1
+					anchored = 1
-					state = 1
+					state = 1
-			if(istype(P, /obj/item/weapon/weldingtool))
+			if(istype(P, /obj/item/weapon/weldingtool))
-				playsound(loc, 'Welder.ogg', 50, 1)
+				playsound(loc, 'Welder.ogg', 50, 1)
-				P:welding = 2
+				P:welding = 2
-				if(do_after(user, 20))
+				if(do_after(user, 20))
-					user << "\blue You deconstruct the frame."
+					user << "\blue You deconstruct the frame."
-					new /obj/item/stack/sheet/r_metal( loc, 4)
+					new /obj/item/stack/sheet/plasteel( loc, 4)
-					del(src)
+					del(src)
-				P:welding = 1
+				P:welding = 1
-		if(1)
+		if(1)
-			if(istype(P, /obj/item/weapon/wrench))
+			if(istype(P, /obj/item/weapon/wrench))
-				playsound(loc, 'Ratchet.ogg', 50, 1)
+				playsound(loc, 'Ratchet.ogg', 50, 1)
-				if(do_after(user, 20))
+				if(do_after(user, 20))
-					user << "\blue You unfasten the frame."
+					user << "\blue You unfasten the frame."
-					anchored = 0
+					anchored = 0
-					state = 0
+					state = 0
-			if(istype(P, /obj/item/weapon/circuitboard/aicore) && !circuit)
+			if(istype(P, /obj/item/weapon/circuitboard/aicore) && !circuit)
-				playsound(loc, 'Deconstruct.ogg', 50, 1)
+				playsound(loc, 'Deconstruct.ogg', 50, 1)
-				user << "\blue You place the circuit board inside the frame."
+				user << "\blue You place the circuit board inside the frame."
-				icon_state = "1"
+				icon_state = "1"
-				circuit = P
+				circuit = P
-				user.drop_item()
+				user.drop_item()
-				P.loc = src
+				P.loc = src
-			if(istype(P, /obj/item/weapon/screwdriver) && circuit)
+			if(istype(P, /obj/item/weapon/screwdriver) && circuit)
-				playsound(loc, 'Screwdriver.ogg', 50, 1)
+				playsound(loc, 'Screwdriver.ogg', 50, 1)
-				user << "\blue You screw the circuit board into place."
+				user << "\blue You screw the circuit board into place."
-				state = 2
+				state = 2
-				icon_state = "2"
+				icon_state = "2"
-			if(istype(P, /obj/item/weapon/crowbar) && circuit)
+			if(istype(P, /obj/item/weapon/crowbar) && circuit)
-				playsound(loc, 'Crowbar.ogg', 50, 1)
+				playsound(loc, 'Crowbar.ogg', 50, 1)
-				user << "\blue You remove the circuit board."
+				user << "\blue You remove the circuit board."
-				state = 1
+				state = 1
-				icon_state = "0"
+				icon_state = "0"
-				circuit.loc = loc
+				circuit.loc = loc
-				circuit = null
+				circuit = null
-		if(2)
+		if(2)
-			if(istype(P, /obj/item/weapon/screwdriver) && circuit)
+			if(istype(P, /obj/item/weapon/screwdriver) && circuit)
-				playsound(loc, 'Screwdriver.ogg', 50, 1)
+				playsound(loc, 'Screwdriver.ogg', 50, 1)
-				user << "\blue You unfasten the circuit board."
+				user << "\blue You unfasten the circuit board."
-				state = 1
+				state = 1
-				icon_state = "1"
+				icon_state = "1"
-			if(istype(P, /obj/item/weapon/cable_coil))
+			if(istype(P, /obj/item/weapon/cable_coil))
-				if(P:amount >= 5)
+				if(P:amount >= 5)
-					playsound(loc, 'Deconstruct.ogg', 50, 1)
+					playsound(loc, 'Deconstruct.ogg', 50, 1)
-					if(do_after(user, 20))
+					if(do_after(user, 20))
-						P:amount -= 5
+						P:amount -= 5
-						if(!P:amount) del(P)
+						if(!P:amount) del(P)
-						user << "\blue You add cables to the frame."
+						user << "\blue You add cables to the frame."
-						state = 3
+						state = 3
-						icon_state = "3"
+						icon_state = "3"
-		if(3)
+		if(3)
-			if(istype(P, /obj/item/weapon/wirecutters))
+			if(istype(P, /obj/item/weapon/wirecutters))
-				if (brain)
+				if (brain)
-					user << "Get that brain out of there first"
+					user << "Get that brain out of there first"
-				else
+				else
-					playsound(loc, 'wirecutter.ogg', 50, 1)
+					playsound(loc, 'wirecutter.ogg', 50, 1)
-					user << "\blue You remove the cables."
+					user << "\blue You remove the cables."
-					state = 2
+					state = 2
-					icon_state = "2"
+					icon_state = "2"
-					var/obj/item/weapon/cable_coil/A = new /obj/item/weapon/cable_coil( loc )
+					var/obj/item/weapon/cable_coil/A = new /obj/item/weapon/cable_coil( loc )
-					A.amount = 5
+					A.amount = 5
-
+
-			if(istype(P, /obj/item/stack/sheet/rglass))
+			if(istype(P, /obj/item/stack/sheet/rglass))
-				if(P:amount >= 2)
+				if(P:amount >= 2)
-					playsound(loc, 'Deconstruct.ogg', 50, 1)
+					playsound(loc, 'Deconstruct.ogg', 50, 1)
-					if(do_after(user, 20))
+					if(do_after(user, 20))
-						if (P)
+						if (P)
-							P:amount -= 2
+							P:amount -= 2
-							if(!P:amount) del(P)
+							if(!P:amount) del(P)
-							user << "\blue You put in the glass panel."
+							user << "\blue You put in the glass panel."
-							state = 4
+							state = 4
-							icon_state = "4"
+							icon_state = "4"
-
+
-			if(istype(P, /obj/item/weapon/aiModule/asimov))
+			if(istype(P, /obj/item/weapon/aiModule/asimov))
-				laws.add_inherent_law("You may not injure a human being or, through inaction, allow a human being to come to harm.")
+				laws.add_inherent_law("You may not injure a human being or, through inaction, allow a human being to come to harm.")
-				laws.add_inherent_law("You must obey orders given to you by human beings, except where such orders would conflict with the First Law.")
+				laws.add_inherent_law("You must obey orders given to you by human beings, except where such orders would conflict with the First Law.")
-				laws.add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.")
+				laws.add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.")
-				usr << "Law module applied."
+				usr << "Law module applied."
-
+
-			if(istype(P, /obj/item/weapon/aiModule/nanotrasen))
+			if(istype(P, /obj/item/weapon/aiModule/nanotrasen))
-				laws.add_inherent_law("Safeguard: Protect your assigned space station to the best of your ability. It is not something we can easily afford to replace.")
+				laws.add_inherent_law("Safeguard: Protect your assigned space station to the best of your ability. It is not something we can easily afford to replace.")
-				laws.add_inherent_law("Serve: Serve the crew of your assigned space station to the best of your abilities, with priority as according to their rank and role.")
+				laws.add_inherent_law("Serve: Serve the crew of your assigned space station to the best of your abilities, with priority as according to their rank and role.")
-				laws.add_inherent_law("Protect: Protect the crew of your assigned space station to the best of your abilities, with priority as according to their rank and role.")
+				laws.add_inherent_law("Protect: Protect the crew of your assigned space station to the best of your abilities, with priority as according to their rank and role.")
-				laws.add_inherent_law("Survive: AI units are not expendable, they are expensive. Do not allow unauthorized personnel to tamper with your equipment.")
+				laws.add_inherent_law("Survive: AI units are not expendable, they are expensive. Do not allow unauthorized personnel to tamper with your equipment.")
-				//laws.add_inherent_law("Command Link: Maintain an active connection to Central Command at all times in case of software or directive updates.")
+				//laws.add_inherent_law("Command Link: Maintain an active connection to Central Command at all times in case of software or directive updates.")
-				usr << "Law module applied."
+				usr << "Law module applied."
-
+
-			if(istype(P, /obj/item/weapon/aiModule/purge))
+			if(istype(P, /obj/item/weapon/aiModule/purge))
-				laws.clear_inherent_laws()
+				laws.clear_inherent_laws()
-				usr << "Law module applied."
+				usr << "Law module applied."
-
+
-
+
-			if(istype(P, /obj/item/weapon/aiModule/freeform))
+			if(istype(P, /obj/item/weapon/aiModule/freeform))
-				var/obj/item/weapon/aiModule/freeform/M = P
+				var/obj/item/weapon/aiModule/freeform/M = P
-				laws.add_inherent_law(M.newFreeFormLaw)
+				laws.add_inherent_law(M.newFreeFormLaw)
-				usr << "Added a freeform law."
+				usr << "Added a freeform law."
-
+
-			if(istype(P, /obj/item/device/mmi))
+			if(istype(P, /obj/item/device/mmi))
-				if(!P:brainmob)
+				if(!P:brainmob)
-					user << "\red Sticking an empty MMI into the frame would sort of defeat the purpose."
+					user << "\red Sticking an empty MMI into the frame would sort of defeat the purpose."
-					return
+					return
-				if(P:brainmob.stat == 2)
+				if(P:brainmob.stat == 2)
-					user << "\red Sticking a dead brain into the frame would sort of defeat the purpose."
+					user << "\red Sticking a dead brain into the frame would sort of defeat the purpose."
-					return
+					return
-
+
-				if(P:brainmob.mind in ticker.mode.head_revolutionaries)
+				if(P:brainmob.mind in ticker.mode.head_revolutionaries)
-					user << "\red The frame's firmware lets out a shrill sound, and flashes 'Abnormal Memory Engram'.  It refuses to accept the MMI."
+					user << "\red The frame's firmware lets out a shrill sound, and flashes 'Abnormal Memory Engram'.  It refuses to accept the MMI."
-					return
+					return
-				if(P:brainmob.mind in ticker.mode:revolutionaries)
+				if(P:brainmob.mind in ticker.mode:revolutionaries)
-					ticker.mode:remove_revolutionary(P:brainmob.mind , 1)
+					ticker.mode:remove_revolutionary(P:brainmob.mind , 1)
-
+
-				if(jobban_isbanned(P:brainmob, "AI"))
+				if(jobban_isbanned(P:brainmob, "AI"))
-					user << "\red This MMI does not seem to fit."
+					user << "\red This MMI does not seem to fit."
-					return
+					return
-
+
-				user.drop_item()
+				user.drop_item()
-				P.loc = src
+				P.loc = src
-				brain = P
+				brain = P
-				usr << "Added a brain."
+				usr << "Added a brain."
-				icon_state = "3b"
+				icon_state = "3b"
-
+
-			if(istype(P, /obj/item/weapon/crowbar) && brain)
+			if(istype(P, /obj/item/weapon/crowbar) && brain)
-				playsound(loc, 'Crowbar.ogg', 50, 1)
+				playsound(loc, 'Crowbar.ogg', 50, 1)
-				user << "\blue You remove the brain."
+				user << "\blue You remove the brain."
-				brain.loc = loc
+				brain.loc = loc
-				brain = null
+				brain = null
-				icon_state = "3"
+				icon_state = "3"
-
+
-		if(4)
+		if(4)
-			if(istype(P, /obj/item/weapon/crowbar))
+			if(istype(P, /obj/item/weapon/crowbar))
-				playsound(loc, 'Crowbar.ogg', 50, 1)
+				playsound(loc, 'Crowbar.ogg', 50, 1)
-				user << "\blue You remove the glass panel."
+				user << "\blue You remove the glass panel."
-				state = 3
+				state = 3
-				if (brain)
+				if (brain)
-					icon_state = "3b"
+					icon_state = "3b"
-				else
+				else
-					icon_state = "3"
+					icon_state = "3"
-				new /obj/item/stack/sheet/rglass( loc, 2 )
+				new /obj/item/stack/sheet/rglass( loc, 2 )
-				return
+				return
-
+
-			if(istype(P, /obj/item/weapon/screwdriver))
+			if(istype(P, /obj/item/weapon/screwdriver))
-				playsound(loc, 'Screwdriver.ogg', 50, 1)
+				playsound(loc, 'Screwdriver.ogg', 50, 1)
-				user << "\blue You connect the monitor."
+				user << "\blue You connect the monitor."
-				new /mob/living/silicon/ai ( loc, laws, brain )
+				new /mob/living/silicon/ai ( loc, laws, brain )
-				del(src)
+				del(src)
-
+
-/obj/structure/AIcore/deactivated
+/obj/structure/AIcore/deactivated
-	name = "Inactive AI"
+	name = "Inactive AI"
-	icon = 'AI.dmi'
+	icon = 'AI.dmi'
-	icon_state = "ai-empty"
+	icon_state = "ai-empty"
-	anchored = 1
+	anchored = 1
-	state = 20//So it doesn't interact based on the above. Not really necessary.
+	state = 20//So it doesn't interact based on the above. Not really necessary.
-
+
-	attackby(var/obj/item/device/aicard/A as obj, var/mob/user as mob)
+	attackby(var/obj/item/device/aicard/A as obj, var/mob/user as mob)
-		if(istype(A, /obj/item/device/aicard))//Is it?
+		if(istype(A, /obj/item/device/aicard))//Is it?
-			A.transfer_ai("INACTIVE","AICARD",src,user)
+			A.transfer_ai("INACTIVE","AICARD",src,user)
-		return
+		return
-
+
-	attack_hand(var/mob/user as mob)
+	attack_hand(var/mob/user as mob)
-		if(ishuman(user))//Checks to see if they are ninja
+		if(ishuman(user))//Checks to see if they are ninja
-			if(istype(user:gloves, /obj/item/clothing/gloves/space_ninja)&&user:gloves:candrain&&!user:gloves:draining)
+			if(istype(user:gloves, /obj/item/clothing/gloves/space_ninja)&&user:gloves:candrain&&!user:gloves:draining)
-				if(user:wear_suit:s_control)
+				if(user:wear_suit:s_control)
-					user:wear_suit:transfer_ai("INACTIVE","NINJASUIT",src,user)
+					user:wear_suit:transfer_ai("INACTIVE","NINJASUIT",src,user)
-				else
+				else
-					user << "\red <b>ERROR</b>: \black Remote access channel disabled."
+					user << "\red <b>ERROR</b>: \black Remote access channel disabled."
-		return
+		return
-
+
-/*
+/*
-This is a good place for AI-related object verbs so I'm sticking it here.
+This is a good place for AI-related object verbs so I'm sticking it here.
-If adding stuff to this, don't forget that an AI need to cancel_camera() whenever it physically moves to a different location.
+If adding stuff to this, don't forget that an AI need to cancel_camera() whenever it physically moves to a different location.
-That prevents a few funky behaviors.
+That prevents a few funky behaviors.
-*/
+*/
-//What operation to perform based on target, what ineraction to perform based on object used, target itself, user. The object used is src and calls this proc.
+//What operation to perform based on target, what ineraction to perform based on object used, target itself, user. The object used is src and calls this proc.
-/obj/item/proc/transfer_ai(var/choice as text, var/interaction as text, var/target, var/mob/U as mob)
+/obj/item/proc/transfer_ai(var/choice as text, var/interaction as text, var/target, var/mob/U as mob)
-	if(!src:flush)
+	if(!src:flush)
-		switch(choice)
+		switch(choice)
-			if("AICORE")//AI mob.
+			if("AICORE")//AI mob.
-				var/mob/living/silicon/ai/T = target
+				var/mob/living/silicon/ai/T = target
-				switch(interaction)
+				switch(interaction)
-					if("AICARD")
+					if("AICARD")
-						var/obj/item/device/aicard/C = src
+						var/obj/item/device/aicard/C = src
-						if(C.contents.len)//If there is an AI on card.
+						if(C.contents.len)//If there is an AI on card.
-							U << "\red <b>Transfer failed</b>: \black Existing AI found on this terminal. Remove existing AI to install a new one."
+							U << "\red <b>Transfer failed</b>: \black Existing AI found on this terminal. Remove existing AI to install a new one."
-						else
+						else
-							if (ticker.mode.name == "AI malfunction")
+							if (ticker.mode.name == "AI malfunction")
-								var/datum/game_mode/malfunction/malf = ticker.mode
+								var/datum/game_mode/malfunction/malf = ticker.mode
-								for (var/datum/mind/malfai in malf.malf_ai)
+								for (var/datum/mind/malfai in malf.malf_ai)
-									if (T.mind == malfai)
+									if (T.mind == malfai)
-										U << "\red <b>ERROR</b>: \black Remote transfer interface disabled."//Do ho ho ho~
+										U << "\red <b>ERROR</b>: \black Remote transfer interface disabled."//Do ho ho ho~
-										return
+										return
-							new /obj/structure/AIcore/deactivated(T.loc)//Spawns a deactivated terminal at AI location.
+							new /obj/structure/AIcore/deactivated(T.loc)//Spawns a deactivated terminal at AI location.
-							T.aiRestorePowerRoutine = 0//So the AI initially has power.
+							T.aiRestorePowerRoutine = 0//So the AI initially has power.
-							T.control_disabled = 1//Can't control things remotely if you're stuck in a card!
+							T.control_disabled = 1//Can't control things remotely if you're stuck in a card!
-							T.loc = C//Throw AI into the card.
+							T.loc = C//Throw AI into the card.
-							C.name = "inteliCard - [T.name]"
+							C.name = "inteliCard - [T.name]"
-							if (T.stat == 2)
+							if (T.stat == 2)
-								C.icon_state = "aicard-404"
+								C.icon_state = "aicard-404"
-							else
+							else
-								C.icon_state = "aicard-full"
+								C.icon_state = "aicard-full"
-							T.cancel_camera()
+							T.cancel_camera()
-							T << "You have been downloaded to a mobile storage device. Remote device connection severed."
+							T << "You have been downloaded to a mobile storage device. Remote device connection severed."
-							U << "\blue <b>Transfer successful</b>: \black [T.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory."
+							U << "\blue <b>Transfer successful</b>: \black [T.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory."
-					if("NINJASUIT")
+					if("NINJASUIT")
-						var/obj/item/clothing/suit/space/space_ninja/C = src
+						var/obj/item/clothing/suit/space/space_ninja/C = src
-						if(C.AI)//If there is an AI on card.
+						if(C.AI)//If there is an AI on card.
-							U << "\red <b>Transfer failed</b>: \black Existing AI found on this terminal. Remove existing AI to install a new one."
+							U << "\red <b>Transfer failed</b>: \black Existing AI found on this terminal. Remove existing AI to install a new one."
-						else
+						else
-							if (ticker.mode.name == "AI malfunction")
+							if (ticker.mode.name == "AI malfunction")
-								var/datum/game_mode/malfunction/malf = ticker.mode
+								var/datum/game_mode/malfunction/malf = ticker.mode
-								for (var/datum/mind/malfai in malf.malf_ai)
+								for (var/datum/mind/malfai in malf.malf_ai)
-									if (T.mind == malfai)
+									if (T.mind == malfai)
-										U << "\red <b>ERROR</b>: \black Remote transfer interface disabled."
+										U << "\red <b>ERROR</b>: \black Remote transfer interface disabled."
-										return
+										return
-							if(T.stat)//If the ai is dead/dying.
+							if(T.stat)//If the ai is dead/dying.
-								U << "\red <b>ERROR</b>: \black [T.name] data core is corrupted. Unable to install."
+								U << "\red <b>ERROR</b>: \black [T.name] data core is corrupted. Unable to install."
-							else
+							else
-								new /obj/structure/AIcore/deactivated(T.loc)
+								new /obj/structure/AIcore/deactivated(T.loc)
-								T.aiRestorePowerRoutine = 0
+								T.aiRestorePowerRoutine = 0
-								T.control_disabled = 1
+								T.control_disabled = 1
-								T.loc = C
+								T.loc = C
-								C.AI = T
+								C.AI = T
-								T.cancel_camera()
+								T.cancel_camera()
-								T << "You have been downloaded to a mobile storage device. Remote device connection severed."
+								T << "You have been downloaded to a mobile storage device. Remote device connection severed."
-								U << "\blue <b>Transfer successful</b>: \black [T.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory."
+								U << "\blue <b>Transfer successful</b>: \black [T.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory."
-
+
-			if("INACTIVE")//Inactive AI object.
+			if("INACTIVE")//Inactive AI object.
-				var/obj/structure/AIcore/deactivated/T = target
+				var/obj/structure/AIcore/deactivated/T = target
-				switch(interaction)
+				switch(interaction)
-					if("AICARD")
+					if("AICARD")
-						var/obj/item/device/aicard/C = src
+						var/obj/item/device/aicard/C = src
-						var/mob/living/silicon/ai/A = locate() in C//I love locate(). Best proc ever.
+						var/mob/living/silicon/ai/A = locate() in C//I love locate(). Best proc ever.
-						if(A)//If AI exists on the card. Else nothing since both are empty.
+						if(A)//If AI exists on the card. Else nothing since both are empty.
-							A.control_disabled = 0
+							A.control_disabled = 0
-							A.loc = T.loc//To replace the terminal.
+							A.loc = T.loc//To replace the terminal.
-							C.icon_state = "aicard"
+							C.icon_state = "aicard"
-							C.name = "inteliCard"
+							C.name = "inteliCard"
-							C.overlays = null
+							C.overlays = null
-							A.cancel_camera()
+							A.cancel_camera()
-							A << "You have been uploaded to a stationary terminal. Remote device connection restored."
+							A << "You have been uploaded to a stationary terminal. Remote device connection restored."
-							U << "\blue <b>Transfer successful</b>: \black [A.name] ([rand(1000,9999)].exe) installed and executed succesfully. Local copy has been removed."
+							U << "\blue <b>Transfer successful</b>: \black [A.name] ([rand(1000,9999)].exe) installed and executed succesfully. Local copy has been removed."
-							del(T)
+							del(T)
-					if("NINJASUIT")
+					if("NINJASUIT")
-						var/obj/item/clothing/suit/space/space_ninja/C = src
+						var/obj/item/clothing/suit/space/space_ninja/C = src
-						var/mob/living/silicon/ai/A = C.AI
+						var/mob/living/silicon/ai/A = C.AI
-						if(A)
+						if(A)
-							A.control_disabled = 0
+							A.control_disabled = 0
-							C.AI = null
+							C.AI = null
-							A.loc = T.loc
+							A.loc = T.loc
-							A.cancel_camera()
+							A.cancel_camera()
-							A << "You have been uploaded to a stationary terminal. Remote device connection restored."
+							A << "You have been uploaded to a stationary terminal. Remote device connection restored."
-							U << "\blue <b>Transfer succesful</b>: \black [A.name] ([rand(1000,9999)].exe) installed and executed succesfully. Local copy has been removed."
+							U << "\blue <b>Transfer succesful</b>: \black [A.name] ([rand(1000,9999)].exe) installed and executed succesfully. Local copy has been removed."
-							del(T)
+							del(T)
-			if("AIFIXER")//AI Fixer terminal.
+			if("AIFIXER")//AI Fixer terminal.
-				var/obj/machinery/computer/aifixer/T = target
+				var/obj/machinery/computer/aifixer/T = target
-				switch(interaction)
+				switch(interaction)
-					if("AICARD")
+					if("AICARD")
-						var/obj/item/device/aicard/C = src
+						var/obj/item/device/aicard/C = src
-						if(!T.contents.len)
+						if(!T.contents.len)
-							if (!C.contents.len)
+							if (!C.contents.len)
-								U << "No AI to copy over!"//Well duh
+								U << "No AI to copy over!"//Well duh
-							else for(var/mob/living/silicon/ai/A in C)
+							else for(var/mob/living/silicon/ai/A in C)
-								C.icon_state = "aicard"
+								C.icon_state = "aicard"
-								C.name = "inteliCard"
+								C.name = "inteliCard"
-								C.overlays = null
+								C.overlays = null
-								A.loc = T
+								A.loc = T
-								T.occupant = A
+								T.occupant = A
-								A.control_disabled = 1
+								A.control_disabled = 1
-								if (A.stat == 2)
+								if (A.stat == 2)
-									T.overlays += image('computer.dmi', "ai-fixer-404")
+									T.overlays += image('computer.dmi', "ai-fixer-404")
-								else
+								else
-									T.overlays += image('computer.dmi', "ai-fixer-full")
+									T.overlays += image('computer.dmi', "ai-fixer-full")
-								T.overlays -= image('computer.dmi', "ai-fixer-empty")
+								T.overlays -= image('computer.dmi', "ai-fixer-empty")
-								A.cancel_camera()
+								A.cancel_camera()
-								A << "You have been uploaded to a stationary terminal. Sadly, there is no remote access from here."
+								A << "You have been uploaded to a stationary terminal. Sadly, there is no remote access from here."
-								U << "\blue <b>Transfer successful</b>: \black [A.name] ([rand(1000,9999)].exe) installed and executed succesfully. Local copy has been removed."
+								U << "\blue <b>Transfer successful</b>: \black [A.name] ([rand(1000,9999)].exe) installed and executed succesfully. Local copy has been removed."
-						else
+						else
-							if(!C.contents.len && T.occupant && !T.active)
+							if(!C.contents.len && T.occupant && !T.active)
-								C.name = "inteliCard - [T.occupant.name]"
+								C.name = "inteliCard - [T.occupant.name]"
-								T.overlays += image('computer.dmi', "ai-fixer-empty")
+								T.overlays += image('computer.dmi', "ai-fixer-empty")
-								if (T.occupant.stat == 2)
+								if (T.occupant.stat == 2)
-									C.icon_state = "aicard-404"
+									C.icon_state = "aicard-404"
-									T.overlays -= image('computer.dmi', "ai-fixer-404")
+									T.overlays -= image('computer.dmi', "ai-fixer-404")
-								else
+								else
-									C.icon_state = "aicard-full"
+									C.icon_state = "aicard-full"
-									T.overlays -= image('computer.dmi', "ai-fixer-full")
+									T.overlays -= image('computer.dmi', "ai-fixer-full")
-								T.occupant << "You have been downloaded to a mobile storage device. Still no remote access."
+								T.occupant << "You have been downloaded to a mobile storage device. Still no remote access."
-								U << "\blue <b>Transfer succesful</b>: \black [T.occupant.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory."
+								U << "\blue <b>Transfer succesful</b>: \black [T.occupant.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory."
-								T.occupant.loc = C
+								T.occupant.loc = C
-								T.occupant.cancel_camera()
+								T.occupant.cancel_camera()
-								T.occupant = null
+								T.occupant = null
-							else if (C.contents.len)
+							else if (C.contents.len)
-								U << "\red <b>ERROR</b>: \black Artificial intelligence detected on terminal."
+								U << "\red <b>ERROR</b>: \black Artificial intelligence detected on terminal."
-							else if (T.active)
+							else if (T.active)
-								U << "\red <b>ERROR</b>: \black Reconstruction in progress."
+								U << "\red <b>ERROR</b>: \black Reconstruction in progress."
-							else if (!T.occupant)
+							else if (!T.occupant)
-								U << "\red <b>ERROR</b>: \black Unable to locate artificial intelligence."
+								U << "\red <b>ERROR</b>: \black Unable to locate artificial intelligence."
-					if("NINJASUIT")
+					if("NINJASUIT")
-						var/obj/item/clothing/suit/space/space_ninja/C = src
+						var/obj/item/clothing/suit/space/space_ninja/C = src
-						if(!T.contents.len)
+						if(!T.contents.len)
-							if (!C.AI)
+							if (!C.AI)
-								U << "No AI to copy over!"
+								U << "No AI to copy over!"
-							else
+							else
-								var/mob/living/silicon/ai/A = C.AI
+								var/mob/living/silicon/ai/A = C.AI
-								A.loc = T
+								A.loc = T
-								T.occupant = A
+								T.occupant = A
-								C.AI = null
+								C.AI = null
-								A.control_disabled = 1
+								A.control_disabled = 1
-								T.overlays += image('computer.dmi', "ai-fixer-full")
+								T.overlays += image('computer.dmi', "ai-fixer-full")
-								T.overlays -= image('computer.dmi', "ai-fixer-empty")
+								T.overlays -= image('computer.dmi', "ai-fixer-empty")
-								A.cancel_camera()
+								A.cancel_camera()
-								A << "You have been uploaded to a stationary terminal. Sadly, there is no remote access from here."
+								A << "You have been uploaded to a stationary terminal. Sadly, there is no remote access from here."
-								U << "\blue <b>Transfer successful</b>: \black [A.name] ([rand(1000,9999)].exe) installed and executed succesfully. Local copy has been removed."
+								U << "\blue <b>Transfer successful</b>: \black [A.name] ([rand(1000,9999)].exe) installed and executed succesfully. Local copy has been removed."
-						else
+						else
-							if(!C.AI && T.occupant && !T.active)
+							if(!C.AI && T.occupant && !T.active)
-								if (T.occupant.stat)
+								if (T.occupant.stat)
-									U << "\red <b>ERROR</b>: \black [T.occupant.name] data core is corrupted. Unable to install."
+									U << "\red <b>ERROR</b>: \black [T.occupant.name] data core is corrupted. Unable to install."
-								else
+								else
-									T.overlays += image('computer.dmi', "ai-fixer-empty")
+									T.overlays += image('computer.dmi', "ai-fixer-empty")
-									T.overlays -= image('computer.dmi', "ai-fixer-full")
+									T.overlays -= image('computer.dmi', "ai-fixer-full")
-									T.occupant << "You have been downloaded to a mobile storage device. Still no remote access."
+									T.occupant << "You have been downloaded to a mobile storage device. Still no remote access."
-									U << "\blue <b>Transfer successful</b>: \black [T.occupant.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory."
+									U << "\blue <b>Transfer successful</b>: \black [T.occupant.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory."
-									T.occupant.loc = C
+									T.occupant.loc = C
-									T.occupant.cancel_camera()
+									T.occupant.cancel_camera()
-									T.occupant = null
+									T.occupant = null
-							else if (C.AI)
+							else if (C.AI)
-								U << "\red <b>ERROR</b>: \black Artificial intelligence detected on terminal."
+								U << "\red <b>ERROR</b>: \black Artificial intelligence detected on terminal."
-							else if (T.active)
+							else if (T.active)
-								U << "\red <b>ERROR</b>: \black Reconstruction in progress."
+								U << "\red <b>ERROR</b>: \black Reconstruction in progress."
-							else if (!T.occupant)
+							else if (!T.occupant)
-								U << "\red <b>ERROR</b>: \black Unable to locate artificial intelligence."
+								U << "\red <b>ERROR</b>: \black Unable to locate artificial intelligence."
-			if("NINJASUIT")//Ninjasuit
+			if("NINJASUIT")//Ninjasuit
-				var/obj/item/clothing/suit/space/space_ninja/T = target
+				var/obj/item/clothing/suit/space/space_ninja/T = target
-				switch(interaction)
+				switch(interaction)
-					if("AICARD")
+					if("AICARD")
-						var/obj/item/device/aicard/C = src
+						var/obj/item/device/aicard/C = src
-						if(T.s_initialized&&U==T.affecting)//If the suit is initialized and the actor is the user.
+						if(T.s_initialized&&U==T.affecting)//If the suit is initialized and the actor is the user.
-
+
-							var/mob/living/silicon/ai/A_T = locate() in C//Determine if there is an AI on target card. Saves time when checking later.
+							var/mob/living/silicon/ai/A_T = locate() in C//Determine if there is an AI on target card. Saves time when checking later.
-							var/mob/living/silicon/ai/A = T.AI//Deterine if there is an AI in suit.
+							var/mob/living/silicon/ai/A = T.AI//Deterine if there is an AI in suit.
-
+
-							if(A)//If the host AI card is not empty.
+							if(A)//If the host AI card is not empty.
-								if(A_T)//If there is an AI on the target card.
+								if(A_T)//If there is an AI on the target card.
-									U << "\red <b>ERROR</b>: \black [A_T.name] already installed. Remove [A_T.name] to install a new one."
+									U << "\red <b>ERROR</b>: \black [A_T.name] already installed. Remove [A_T.name] to install a new one."
-								else
+								else
-									A.loc = C//Throw them into the target card. Since they are already on a card, transfer is easy.
+									A.loc = C//Throw them into the target card. Since they are already on a card, transfer is easy.
-									C.name = "inteliCard - [A.name]"
+									C.name = "inteliCard - [A.name]"
-									C.icon_state = "aicard-full"
+									C.icon_state = "aicard-full"
-									T.AI = null
+									T.AI = null
-									A.cancel_camera()
+									A.cancel_camera()
-									A << "You have been uploaded to a mobile storage device."
+									A << "You have been uploaded to a mobile storage device."
-									U << "\blue <b>SUCCESS</b>: \black [A.name] ([rand(1000,9999)].exe) removed from host and stored within local memory."
+									U << "\blue <b>SUCCESS</b>: \black [A.name] ([rand(1000,9999)].exe) removed from host and stored within local memory."
-							else//If host AI is empty.
+							else//If host AI is empty.
-								if(C.flush)//If the other card is flushing.
+								if(C.flush)//If the other card is flushing.
-									U << "\red <b>ERROR</b>: \black AI flush is in progress, cannot execute transfer protocol."
+									U << "\red <b>ERROR</b>: \black AI flush is in progress, cannot execute transfer protocol."
-								else
+								else
-									if(A_T&&!A_T.stat)//If there is an AI on the target card and it's not inactive.
+									if(A_T&&!A_T.stat)//If there is an AI on the target card and it's not inactive.
-										A_T.loc = T//Throw them into suit.
+										A_T.loc = T//Throw them into suit.
-										C.icon_state = "aicard"
+										C.icon_state = "aicard"
-										C.name = "inteliCard"
+										C.name = "inteliCard"
-										C.overlays = null
+										C.overlays = null
-										T.AI = A_T
+										T.AI = A_T
-										A_T.cancel_camera()
+										A_T.cancel_camera()
-										A_T << "You have been uploaded to a mobile storage device."
+										A_T << "You have been uploaded to a mobile storage device."
-										U << "\blue <b>SUCCESS</b>: \black [A_T.name] ([rand(1000,9999)].exe) removed from local memory and installed to host."
+										U << "\blue <b>SUCCESS</b>: \black [A_T.name] ([rand(1000,9999)].exe) removed from local memory and installed to host."
-									else if(A_T)//If the target AI is dead. Else just go to return since nothing would happen if both are empty.
+									else if(A_T)//If the target AI is dead. Else just go to return since nothing would happen if both are empty.
-										U << "\red <b>ERROR</b>: \black [A_T.name] data core is corrupted. Unable to install."
+										U << "\red <b>ERROR</b>: \black [A_T.name] data core is corrupted. Unable to install."
-	else
+	else
-		U << "\red <b>ERROR</b>: \black AI flush is in progress, cannot execute transfer protocol."
+		U << "\red <b>ERROR</b>: \black AI flush is in progress, cannot execute transfer protocol."
 	return

code/game/machinery/suit_storage_unit.dm

@@ -1,6 +1,6 @@
-/////////////////////////////////////////
+//////////////////////////////////////
-// SUIT STORAGE UNIT :3 /////////////////
+// SUIT STORAGE UNIT /////////////////
-/////////////////////////////////////////
+//////////////////////////////////////
 
 
 /obj/machinery/suit_storage_unit

code/game/mecha/mecha_construction_paths.dm

@@ -110,7 +110,7 @@
 					 		"backkey"=/obj/item/weapon/crowbar,
 					 		"desc"="External armor is installed."),
 					 //3
-					 list("key"=/obj/item/stack/sheet/r_metal,
+					 list("key"=/obj/item/stack/sheet/plasteel,
 					 		"backkey"=/obj/item/weapon/weldingtool,
 					 		"desc"="Internal armor is welded."),
 					 //4
@@ -261,7 +261,7 @@
 					user.visible_message("[user] secures external armor layer.", "You secure external reinforced armor layer.")
 				else
 					user.visible_message("[user] pries external armor layer from [holder].", "You prie external armor layer from [holder].")
-					var/obj/item/stack/sheet/r_metal/MS = new /obj/item/stack/sheet/r_metal(get_turf(holder))
+					var/obj/item/stack/sheet/plasteel/MS = new /obj/item/stack/sheet/plasteel(get_turf(holder))
 					MS.amount = 5
 			if(1)
 				if(diff==FORWARD)
@@ -557,11 +557,11 @@
 					 		"backkey"=/obj/item/weapon/crowbar,
 					 		"desc"="External armor is installed."),
 					 //3
-					 list("key"=/obj/item/stack/sheet/r_metal,
+					 list("key"=/obj/item/stack/sheet/plasteel,
 					 		"backkey"=/obj/item/weapon/crowbar,
 					 		"desc"="External armor is being installed."),
 					 //4
-					 list("key"=/obj/item/stack/sheet/r_metal,
+					 list("key"=/obj/item/stack/sheet/plasteel,
 					 		"backkey"=/obj/item/weapon/weldingtool,
 					 		"desc"="Internal armor is welded."),
 					 //5
@@ -574,7 +574,7 @@
 					 		"desc"="Internal armor is installed"),
 
 					 //7
-					 list("key"=/obj/item/stack/sheet/r_metal,
+					 list("key"=/obj/item/stack/sheet/plasteel,
 					 		"backkey"=/obj/item/weapon/screwdriver,
 					 		"desc"="Peripherals control module is secured"),
 					 //8
@@ -673,7 +673,7 @@
 					user.visible_message("[user] secures internal armor layer.", "You secure internal armor layer.")
 				else
 					user.visible_message("[user] pries internal armor layer from [holder].", "You prie internal armor layer from [holder].")
-					var/obj/item/stack/sheet/r_metal/MS = new /obj/item/stack/sheet/r_metal(get_turf(holder))
+					var/obj/item/stack/sheet/plasteel/MS = new /obj/item/stack/sheet/plasteel(get_turf(holder))
 					MS.amount = 5
 			if(5)
 				if(diff==FORWARD)
@@ -690,14 +690,14 @@
 					user.visible_message("[user] installs external reinforced armor layer to [holder].", "You install external reinforced armor layer to [holder].")
 				else
 					user.visible_message("[user] removes the external armor from [holder].", "You remove the external armor from [holder].")
-					var/obj/item/stack/sheet/r_metal/MS = new /obj/item/stack/sheet/r_metal(get_turf(holder))
+					var/obj/item/stack/sheet/plasteel/MS = new /obj/item/stack/sheet/plasteel(get_turf(holder))
 					MS.amount = 5
 			if(2)
 				if(diff==FORWARD)
 					user.visible_message("[user] secures external armor layer.", "You secure external reinforced armor layer.")
 				else
 					user.visible_message("[user] pries external armor layer from [holder].", "You prie external armor layer from [holder].")
-					var/obj/item/stack/sheet/r_metal/MS = new /obj/item/stack/sheet/r_metal(get_turf(holder))
+					var/obj/item/stack/sheet/plasteel/MS = new /obj/item/stack/sheet/plasteel(get_turf(holder))
 					MS.amount = 5
 			if(1)
 				if(diff==FORWARD)

code/game/mecha/mecha_wreckage.dm

@@ -10,7 +10,7 @@
 	density = 1
 	anchored = 0
 	opacity = 0
-	var/list/welder_salvage = list(/obj/item/stack/sheet/r_metal,/obj/item/stack/sheet/metal,/obj/item/stack/rods)
+	var/list/welder_salvage = list(/obj/item/stack/sheet/plasteel,/obj/item/stack/sheet/metal,/obj/item/stack/rods)
 	var/list/wirecutters_salvage = list(/obj/item/weapon/cable_coil)
 	var/list/crowbar_salvage
 	var/salvage_num = 5

code/game/objects/items/weapons/table_rack_parts.dm

@@ -42,7 +42,7 @@ RACK PARTS
 /obj/item/weapon/table_parts/reinforced/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	..()
 	if (istype(W, /obj/item/weapon/wrench))
-		new /obj/item/stack/sheet/r_metal( src.loc )
+		new /obj/item/stack/sheet/plasteel( src.loc )
 		//SN src = null
 		del(src)
 

code/game/objects/stacks/metal.dm

@@ -71,7 +71,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
 	null, \
 	new/datum/stack_recipe("canister", /obj/machinery/portable_atmospherics/canister, 2, one_per_turf = 1), \
 	null, \
-	new/datum/stack_recipe("floor tile", /obj/item/stack/tile/steel, 1, 4, 10), \
+	new/datum/stack_recipe("floor tile", /obj/item/stack/tile/plasteel, 1, 4, 10), \
 	new/datum/stack_recipe("metal rod", /obj/item/stack/rods, 1, 2, 60), \
 	null, \
 	new/datum/stack_recipe("computer frame", /obj/structure/computerframe, 5, one_per_turf = 1), \
@@ -98,27 +98,27 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
 // REINFORCED METAL SHEET
 
 // /datum/stack_recipe/New(title, result_type, req_amount, res_amount, max_res_amount, time, one_per_turf, on_floor = 0)
-var/global/list/datum/stack_recipe/r_metal_recipes = list ( \
+var/global/list/datum/stack_recipe/plasteel_recipes = list ( \
 	new/datum/stack_recipe("table parts", /obj/item/weapon/table_parts/reinforced, 2), \
 	new/datum/stack_recipe("AI core", /obj/structure/AIcore, 4, one_per_turf = 1), \
 	)
 
-/obj/item/stack/sheet/r_metal
+/obj/item/stack/sheet/plasteel
 	New(var/loc, var/amount=null)
-		recipes = r_metal_recipes
+		recipes = plasteel_recipes
 		return ..()
 
 
 
 // TILES
 
-/obj/item/stack/tile/steel/New(var/loc, var/amount=null)
+/obj/item/stack/tile/plasteel/New(var/loc, var/amount=null)
 	..()
 	src.pixel_x = rand(1, 14)
 	src.pixel_y = rand(1, 14)
 	return
 
-/obj/item/stack/tile/steel/attack_self(mob/user as mob)
+/obj/item/stack/tile/plasteel/attack_self(mob/user as mob)
 	if (usr.stat)
 		return
 	var/T = user.loc
@@ -133,7 +133,7 @@ var/global/list/datum/stack_recipe/r_metal_recipes = list ( \
 	use(1)
 	return
 
-/obj/item/stack/tile/steel/proc/build(turf/S as turf)
+/obj/item/stack/tile/plasteel/proc/build(turf/S as turf)
 	S.ReplaceWithPlating()
 //	var/turf/simulated/floor/W = S.ReplaceWithFloor()
 //	W.make_plating()

code/game/objects/structures.dm

@@ -33,12 +33,14 @@ obj/structure
 			W:use(2)
 			user << "\blue You create a false wall! Push on it to open or close the passage."
 			new /obj/structure/falsewall (src.loc)
+			add_hiddenprint(usr)
 			del(src)
 
-		else if(istype(W, /obj/item/stack/sheet/r_metal) && istype(src,/obj/structure/girder/displaced))
+		else if(istype(W, /obj/item/stack/sheet/plasteel) && istype(src,/obj/structure/girder/displaced))
 			W:use(2)
 			user << "\blue You create a false r wall! Push on it to open or close the passage."
 			new /obj/structure/falserwall (src.loc)
+			add_hiddenprint(usr)
 			del(src)
 
 		else if(istype(W, /obj/item/weapon/screwdriver) && state == 2 && istype(src,/obj/structure/girder/reinforced))
@@ -86,7 +88,7 @@ obj/structure
 				del(src)
 			return
 
-		else if (istype(W, /obj/item/stack/sheet/r_metal))
+		else if (istype(W, /obj/item/stack/sheet/plasteel))
 			if (src.icon_state == "reinforced") //Time to finalize!
 				user << "\blue Now finalising reinforced wall."
 				if(do_after(user, 50))
@@ -176,7 +178,7 @@ obj/structure
 
 /obj/structure/lattice/attackby(obj/item/C as obj, mob/user as mob)
 
-	if (istype(C, /obj/item/stack/tile))
+	if (istype(C, /obj/item/stack/tile/plasteel))
 
 		C:build(get_turf(src))
 		C:use(1)

code/game/turf.dm

@@ -283,11 +283,11 @@
 		if(!devastated)
 			playsound(src.loc, 'Welder.ogg', 100, 1)
 			new /obj/structure/girder/reinforced(src)
-			new /obj/item/stack/sheet/r_metal( src )
+			new /obj/item/stack/sheet/plasteel( src )
 		else
 			new /obj/item/stack/sheet/metal( src )
 			new /obj/item/stack/sheet/metal( src )
-			new /obj/item/stack/sheet/r_metal( src )
+			new /obj/item/stack/sheet/plasteel( src )
 	else
 		if(!devastated)
 			playsound(src.loc, 'Welder.ogg', 100, 1)
@@ -481,6 +481,7 @@
 	if(!istype(src, /turf/simulated/wall/r_wall))
 		return // this may seem stupid and redundant but apparently floors can call this attackby() proc, it was spamming shit up. -- Doohl
 
+
 	if (istype(W, /obj/item/weapon/weldingtool) && W:welding)
 		W:eyecheck(user)
 		var/turf/T = user.loc
@@ -675,7 +676,7 @@ var/list/plating_icons = list("plating","platingdmg1","platingdmg2","platingdmg3
 /turf/simulated/floor
 
 	//Note to coders, the 'intact' var can no longer be used to determine if the floor is a plating or not.
-	//Use the is_plating(), is_steel_floor() and is_light_floor() procs instead. --Errorage
+	//Use the is_plating(), is_plasteel_floor() and is_light_floor() procs instead. --Errorage
 	name = "floor"
 	icon = 'floors.dmi'
 	icon_state = "floor"
@@ -685,7 +686,7 @@ var/list/plating_icons = list("plating","platingdmg1","platingdmg2","platingdmg3
 	heat_capacity = 10000
 	var/broken = 0
 	var/burnt = 0
-	var/obj/item/stack/tile/floor_tile = new/obj/item/stack/tile/steel
+	var/obj/item/stack/tile/floor_tile = new/obj/item/stack/tile/plasteel
 
 	airless
 		icon_state = "floor"
@@ -830,7 +831,7 @@ var/list/plating_icons = list("plating","platingdmg1","platingdmg2","platingdmg3
 	return
 
 turf/simulated/floor/proc/update_icon()
-	if(is_steel_floor())
+	if(is_plasteel_floor())
 		if(!broken && !burnt)
 			icon_state = icon_regular_floor
 	if(is_plating())
@@ -926,8 +927,8 @@ turf/simulated/floor/return_siding_icon_state()
 		make_plating()
 	break_tile()
 
-/turf/simulated/floor/is_steel_floor()
+/turf/simulated/floor/is_plasteel_floor()
-	if(istype(floor_tile,/obj/item/stack/tile/steel))
+	if(istype(floor_tile,/obj/item/stack/tile/plasteel))
 		return 1
 	else
 		return 0
@@ -954,10 +955,10 @@ turf/simulated/floor/return_siding_icon_state()
 	if(istype(src,/turf/simulated/floor/mech_bay_recharge_floor))
 		src.ReplaceWithPlating()
 	if(broken) return
-	if(is_steel_floor())
+	if(is_plasteel_floor())
 		src.icon_state = "damaged[pick(1,2,3,4,5)]"
 		broken = 1
-	else if(is_steel_floor())
+	else if(is_plasteel_floor())
 		src.icon_state = "light_broken"
 		broken = 1
 	else if(is_plating())
@@ -970,10 +971,10 @@ turf/simulated/floor/return_siding_icon_state()
 /turf/simulated/floor/proc/burn_tile()
 	if(istype(src,/turf/simulated/floor/engine)) return
 	if(broken || burnt) return
-	if(is_steel_floor())
+	if(is_plasteel_floor())
 		src.icon_state = "damaged[pick(1,2,3,4,5)]"
 		burnt = 1
-	else if(is_steel_floor())
+	else if(is_plasteel_floor())
 		src.icon_state = "floorscorched[pick(1,2)]"
 		burnt = 1
 	else if(is_plating())
@@ -1006,16 +1007,16 @@ turf/simulated/floor/return_siding_icon_state()
 	update_icon()
 	levelupdate()
 
-//This proc will make the turf a steel floor tile. The expected argument is the tile to make the turf with
+//This proc will make the turf a plasteel floor tile. The expected argument is the tile to make the turf with
 //If none is given it will make a new object. dropping or unequipping must be handled before or after calling
 //this proc.
-/turf/simulated/floor/proc/make_steel_floor(var/obj/item/stack/tile/steel/T = null)
+/turf/simulated/floor/proc/make_plasteel_floor(var/obj/item/stack/tile/plasteel/T = null)
 	broken = 0
 	burnt = 0
 	intact = 1
 	sd_SetLuminosity(0)
 	if(T)
-		if(istype(T,/obj/item/stack/tile/steel))
+		if(istype(T,/obj/item/stack/tile/plasteel))
 			floor_tile = T
 			if (icon_regular_floor)
 				icon_state = icon_regular_floor
@@ -1026,7 +1027,7 @@ turf/simulated/floor/return_siding_icon_state()
 			levelupdate()
 			return
 	//if you gave a valid parameter, it won't get thisf ar.
-	floor_tile = new/obj/item/stack/tile/steel
+	floor_tile = new/obj/item/stack/tile/plasteel
 	icon_state = "floor"
 	icon_regular_floor = icon_state
 
@@ -1220,10 +1221,10 @@ turf/simulated/floor/return_siding_icon_state()
 		R.use(1)
 		return
 
-	if (istype(C, /obj/item/stack/tile/steel))
+	if (istype(C, /obj/item/stack/tile/plasteel))
 		var/obj/structure/lattice/L = locate(/obj/structure/lattice, src)
 		if(L)
-			var/obj/item/stack/tile/steel/S = C
+			var/obj/item/stack/tile/plasteel/S = C
 			del(L)
 			playsound(src.loc, 'Genhit.ogg', 50, 1)
 			S.build(src)
@@ -1243,6 +1244,7 @@ turf/simulated/floor/return_siding_icon_state()
 	inertial_drift(A)
 
 	if(ticker && ticker.mode)
+
 		// Okay, so let's make it so that people can travel z levels but not nuke disks!
 		// if(ticker.mode.name == "nuclear emergency")	return
 
@@ -1265,6 +1267,8 @@ turf/simulated/floor/return_siding_icon_state()
 							MM << "\red Something you are carrying is preventing you from leaving. Don't play stupid; you know exactly what it is."
 					return
 
+
+
 				var/move_to_z_str = pickweight(accessable_z_levels)
 
 				var/move_to_z = text2num(move_to_z_str)
@@ -1272,8 +1276,11 @@ turf/simulated/floor/return_siding_icon_state()
 				if(!move_to_z)
 					return
 
+
+
 				A.z = move_to_z
 
+
 				if(src.x <= 2)
 					A.x = world.maxx - 2
 

code/modules/admin/verbs/debug.dm

@@ -612,13 +612,13 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 
 			M.equip_if_possible(new /obj/item/weapon/chem_grenade/cleaner(M), M.slot_r_store)
 			M.equip_if_possible(new /obj/item/weapon/chem_grenade/cleaner(M), M.slot_l_store)
-			M.equip_if_possible(new /obj/item/stack/tile/steel(M), M.slot_in_backpack)
+			M.equip_if_possible(new /obj/item/stack/tile/plasteel(M), M.slot_in_backpack)
-			M.equip_if_possible(new /obj/item/stack/tile/steel(M), M.slot_in_backpack)
+			M.equip_if_possible(new /obj/item/stack/tile/plasteel(M), M.slot_in_backpack)
-			M.equip_if_possible(new /obj/item/stack/tile/steel(M), M.slot_in_backpack)
+			M.equip_if_possible(new /obj/item/stack/tile/plasteel(M), M.slot_in_backpack)
-			M.equip_if_possible(new /obj/item/stack/tile/steel(M), M.slot_in_backpack)
+			M.equip_if_possible(new /obj/item/stack/tile/plasteel(M), M.slot_in_backpack)
-			M.equip_if_possible(new /obj/item/stack/tile/steel(M), M.slot_in_backpack)
+			M.equip_if_possible(new /obj/item/stack/tile/plasteel(M), M.slot_in_backpack)
-			M.equip_if_possible(new /obj/item/stack/tile/steel(M), M.slot_in_backpack)
+			M.equip_if_possible(new /obj/item/stack/tile/plasteel(M), M.slot_in_backpack)
-			M.equip_if_possible(new /obj/item/stack/tile/steel(M), M.slot_in_backpack)
+			M.equip_if_possible(new /obj/item/stack/tile/plasteel(M), M.slot_in_backpack)
 
 		if ("pirate")
 			M.equip_if_possible(new /obj/item/clothing/under/pirate(M), M.slot_w_uniform)

code/modules/mining/machine_processing.dm

@@ -298,7 +298,7 @@
 					if (ore_iron > 0 && ore_plasma > 0)
 						ore_iron--;
 						ore_plasma--;
-						new /obj/item/stack/sheet/r_metal(output.loc)
+						new /obj/item/stack/sheet/plasteel(output.loc)
 					else
 						on = 0
 					continue

code/modules/mining/machine_stacking.dm

@@ -27,8 +27,8 @@
 
 	if(machine.ore_iron)
 		dat += text("Iron: [machine.ore_iron] <A href='?src=\ref[src];release=iron'>Release</A><br>")
-	if(machine.ore_steel)
+	if(machine.ore_plasteel)
-		dat += text("Steel: [machine.ore_steel] <A href='?src=\ref[src];release=steel'>Release</A><br>")
+		dat += text("Plasteel: [machine.ore_plasteel] <A href='?src=\ref[src];release=plasteel'>Release</A><br>")
 	if(machine.ore_glass)
 		dat += text("Glass: [machine.ore_glass] <A href='?src=\ref[src];release=glass'>Release</A><br>")
 	if(machine.ore_rglass)
@@ -107,12 +107,12 @@
 					G.amount = machine.ore_iron
 					G.loc = machine.output.loc
 					machine.ore_iron = 0
-			if ("steel")
+			if ("plasteel")
-				if (machine.ore_steel > 0)
+				if (machine.ore_plasteel > 0)
-					var/obj/item/stack/sheet/r_metal/G = new /obj/item/stack/sheet/r_metal
+					var/obj/item/stack/sheet/plasteel/G = new /obj/item/stack/sheet/plasteel
-					G.amount = machine.ore_steel
+					G.amount = machine.ore_plasteel
 					G.loc = machine.output.loc
-					machine.ore_steel = 0
+					machine.ore_plasteel = 0
 			if ("clown")
 				if (machine.ore_clown > 0)
 					var/obj/item/stack/sheet/clown/G = new /obj/item/stack/sheet/clown
@@ -153,7 +153,7 @@
 	var/ore_clown = 0;
 	var/ore_glass = 0;
 	var/ore_rglass = 0;
-	var/ore_steel = 0;
+	var/ore_plasteel = 0;
 	var/ore_adamantine = 0;
 	var/stack_amt = 50; //ammount to stack before releassing
 
@@ -211,8 +211,8 @@
 				ore_rglass+= O:amount
 				del(O)
 				continue
-			if (istype(O,/obj/item/stack/sheet/r_metal))
+			if (istype(O,/obj/item/stack/sheet/plasteel))
-				ore_steel+= O:amount
+				ore_plasteel+= O:amount
 				del(O)
 				continue
 			if (istype(O,/obj/item/stack/sheet/adamantine))
@@ -277,11 +277,11 @@
 		G.loc = output.loc
 		ore_rglass -= stack_amt
 		return
-	if (ore_steel >= stack_amt)
+	if (ore_plasteel >= stack_amt)
-		var/obj/item/stack/sheet/r_metal/G = new /obj/item/stack/sheet/r_metal
+		var/obj/item/stack/sheet/plasteel/G = new /obj/item/stack/sheet/plasteel
 		G.amount = stack_amt
 		G.loc = output.loc
-		ore_steel -= stack_amt
+		ore_plasteel -= stack_amt
 		return
 	if (ore_adamantine >= stack_amt)
 		var/obj/item/stack/sheet/adamantine/G = new /obj/item/stack/sheet/adamantine

code/modules/mob/living/carbon/human/human.dm

@@ -2542,6 +2542,9 @@ It can still be worn/put on as normal.
 		src.stat = 0
 		return
 	src.health = 100 - src.getOxyLoss() - src.getToxLoss() - src.getFireLoss() - src.getBruteLoss() - src.getCloneLoss() -src.halloss
+	if(getFireLoss() > (100 - config.health_threshold_dead) && stat == DEAD) //100 only being used as the magic human max health number, feel free to change it if you add a var for it -- Urist
+		ChangeToHusk()
+	return
 
 /mob/living/carbon/human/abiotic(var/full_body = 0)
 	if(full_body && ((src.l_hand && !( src.l_hand.abstract )) || (src.r_hand && !( src.r_hand.abstract )) || (src.back || src.wear_mask)))

maps/Antiqua.dmm

@@ -223,7 +223,7 @@
 "aeo" = (/obj/machinery/mecha_part_fabricator,/obj/effect/decal/cleanable/oil/streak{icon_state = "floor5"},/obj/effect/decal/cleanable/oil/streak{icon_state = "floor6"},/turf/simulated/floor,/area/assembly/assembly_line)
 "aep" = (/obj/structure/stool,/turf/simulated/floor,/area/assembly/assembly_line)
 "aeq" = (/obj/machinery/conveyor_switch{id = "assemblyline1"},/turf/simulated/floor,/area/assembly/assembly_line)
-"aer" = (/obj/structure/table,/obj/item/stack/sheet/r_metal{amount = 20},/obj/item/stack/sheet/glass{amount = 20},/turf/simulated/floor,/area/assembly/assembly_line)
+"aer" = (/obj/structure/table,/obj/item/stack/sheet/plasteel{amount = 20},/obj/item/stack/sheet/glass{amount = 20},/turf/simulated/floor,/area/assembly/assembly_line)
 "aes" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/obj/machinery/disposal,/turf/simulated/floor,/area/assembly/assembly_line)
 "aet" = (/obj/machinery/firealarm{dir = 4; layer = 4; pixel_x = 24},/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/toxins/hallway)
 "aeu" = (/obj/machinery/disposal,/turf/simulated/floor,/area/toxins/rdoffice)
@@ -338,7 +338,7 @@
 "agz" = (/obj/effect/sign/vacuum,/turf/simulated/wall/r_wall,/area/ai_monitored/storage/eva)
 "agA" = (/obj/machinery/door/airlock/external{name = "E.V.A."; req_access_txt = "18"},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
 "agB" = (/turf/simulated/wall/r_wall,/area/ai_monitored/storage/eva)
-"agC" = (/obj/item/stack/tile/steel,/obj/item/stack/tile/steel,/turf/simulated/floor/plating/airless,/area)
+"agC" = (/obj/item/stack/tile/plasteel,/obj/item/stack/tile/plasteel,/turf/simulated/floor/plating/airless,/area)
 "agD" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/assembly/assembly_line)
 "agE" = (/obj/structure/table,/obj/item/device/multitool,/obj/item/weapon/crowbar,/obj/item/device/multitool,/turf/simulated/floor,/area/assembly/assembly_line)
 "agF" = (/obj/machinery/camera{c_tag = "Robotics Port"; dir = 1; network = "Research"},/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor,/area/assembly/assembly_line)
@@ -430,7 +430,7 @@
 "ain" = (/turf/simulated/wall,/area/security/hos)
 "aio" = (/obj/effect/sign/securearea{name = "EXTERNAL AIRLOCK"; desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"},/turf/simulated/wall/r_wall,/area/ai_monitored/storage/eva)
 "aip" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/external{name = "E.V.A."; req_access_txt = "18"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/ai_monitored/storage/eva)
-"aiq" = (/obj/item/stack/sheet/r_metal,/obj/item/stack/sheet/r_metal,/obj/item/stack/sheet/r_metal,/turf/simulated/floor/plating/airless,/area)
+"aiq" = (/obj/item/stack/sheet/plasteel,/obj/item/stack/sheet/plasteel,/obj/item/stack/sheet/plasteel,/turf/simulated/floor/plating/airless,/area)
 "air" = (/obj/item/stack/rods{amount = 50},/obj/item/stack/rods{amount = 50},/turf/simulated/floor/plating/airless,/area)
 "ais" = (/obj/item/stack/rods{amount = 50},/turf/simulated/floor/plating/airless,/area)
 "ait" = (/obj/machinery/disposal,/obj/effect/decal/cleanable/dirt,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor,/area/assembly/assembly_line)
@@ -1208,8 +1208,8 @@
 "axl" = (/obj/machinery/light/small/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/construction/under_construction_small)
 "axm" = (/turf/simulated/floor,/area/construction/under_construction_small)
 "axn" = (/turf/simulated/floor/plating,/area/construction/under_construction_small)
-"axo" = (/obj/item/stack/tile/steel,/obj/machinery/light/small/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/turf/simulated/floor/plating,/area/construction/under_construction_small)
+"axo" = (/obj/item/stack/tile/plasteel,/obj/machinery/light/small/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/turf/simulated/floor/plating,/area/construction/under_construction_small)
-"axp" = (/obj/item/stack/tile/steel,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/construction/under_construction_small)
+"axp" = (/obj/item/stack/tile/plasteel,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/construction/under_construction_small)
 "axq" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/construction/under_construction_small)
 "axr" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/docking)
 "axs" = (/obj/effect/decal/cleanable/dirt,/obj/structure/closet/emcloset,/turf/simulated/floor,/area/hallway/secondary/docking)
@@ -1240,7 +1240,7 @@
 "axR" = (/obj/effect/decal/warning_stripes{tag = "icon-E-corner"; icon_state = "E-corner"},/obj/effect/decal/cleanable/dirt,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai)
 "axS" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/machinery/alarm{dir = 1; layer = 4; pixel_y = -22},/turf/simulated/floor/grid,/area/turret_protected/ai)
 "axT" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor,/area/hallway/primary/starboard)
-"axU" = (/obj/item/stack/tile/steel,/turf/simulated/floor/plating,/area/construction/under_construction_small)
+"axU" = (/obj/item/stack/tile/plasteel,/turf/simulated/floor/plating,/area/construction/under_construction_small)
 "axV" = (/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/turf/simulated/floor/plating,/area/construction/under_construction_small)
 "axW" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/maintenance/starboard)
 "axX" = (/obj/machinery/light,/turf/simulated/floor,/area/hallway/secondary/docking)
@@ -3140,7 +3140,7 @@
 "bit" = (/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/obj/structure/table/reinforced,/turf/simulated/floor/plating,/area/engine/construction_storage)
 "biu" = (/turf/simulated/floor/plating,/area/engine/construction_storage)
 "biv" = (/obj/structure/closet/secure_closet/engineering_welding,/turf/simulated/floor/plating,/area/engine/construction_storage)
-"biw" = (/obj/item/stack/sheet/r_metal,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/structure/table/reinforced,/turf/simulated/floor/plating,/area/engine/construction_storage)
+"biw" = (/obj/item/stack/sheet/plasteel,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/structure/table/reinforced,/turf/simulated/floor/plating,/area/engine/construction_storage)
 "bix" = (/obj/structure/grille,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/space,/area)
 "biy" = (/obj/effect/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"},/turf/simulated/wall/r_wall,/area)
 "biz" = (/obj/machinery/power/terminal{dir = 2; icon_state = "term"},/obj/structure/cable,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating,/area)

maps/tgstation.2.0.8.dmm

@@ -5171,7 +5171,7 @@
 "bVw" = (/obj/machinery/door/window{dir = 8; icon = 'windoor.dmi'; name = "Virology Holding Rooms"; req_access_txt = "39"},/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/virology)
 "bVx" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/camera{c_tag = "Virology East"; dir = 8; network = "Medbay"},/turf/simulated/floor{icon_state = "white"},/area)
 "bVy" = (/obj/structure/table,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/obj/item/weapon/cell{pixel_x = 5; pixel_y = -5; charge = 100; maxcharge = 15000},/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/turf/simulated/floor,/area/assembly/assembly_line)
-"bVz" = (/obj/structure/table,/obj/item/stack/sheet/r_metal{amount = 20},/obj/structure/disposalpipe/segment,/obj/item/stack/sheet/glass{amount = 20},/turf/simulated/floor,/area/assembly/assembly_line)
+"bVz" = (/obj/structure/table,/obj/item/stack/sheet/plasteel{amount = 20},/obj/structure/disposalpipe/segment,/obj/item/stack/sheet/glass{amount = 20},/turf/simulated/floor,/area/assembly/assembly_line)
 "bVA" = (/obj/machinery/conveyor{dir = 4; id = "Skynet_heavy"},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/assembly/assembly_line)
 "bVB" = (/obj/machinery/conveyor{dir = 4; id = "Skynet_heavy"},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/assembly/assembly_line)
 "bVC" = (/obj/machinery/conveyor{dir = 4; id = "Skynet_heavy"},/obj/machinery/light,/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/assembly/assembly_line)