Reverting registered_name change. Reverting area name changes. Reverts Plasma Steel and object changes.

code/defines/area/Space Station 13 areas.dm

@@ -651,20 +651,24 @@ proc/process_ghost_teleport_locs()
 	name = "Courtroom"
 	icon_state = "courtroom"
 
-/area/crew_quarters/heads
+/area/crew_quarters/heads/hop
 	name = "Head of Personnel's Quarters"
 	icon_state = "head_quarters"
 
-/area/crew_quarters/hor
-	name = "Research Director's Office"
+/area/crew_quarters/heads/hor
+	name = "Research Director's Quarters"
+	icon_state = "head_quarters"
+
+/area/crew_quarters/heads/ce
+	name = "Chief Engineer's Quarters"
+	icon_state = "head_quarters"
+
+/area/crew_quarters/heads/hos
+	name = "Head of Security's Quarters"
 	icon_state = "head_quarters"
 
 /area/crew_quarters/heads/cmo
-	name = "Chief Medical Officer's Office"
-	icon_state = "head_quarters"
-
-/area/crew_quarters/chief
-	name = "Chief Engineer's Office"
+	name = "Chief Medical Officer's Quarters"
 	icon_state = "head_quarters"
 
 /area/mint

code/defines/obj.dm

@@ -422,6 +422,7 @@
 	var/twohanded = 0 // Two handed and wielded off by default, nyoro~n -Agouri
 	var/force_unwielded = 0
 	var/force_wielded = 0
+	var/protective_temperature = 0 // Placing this here to avoid runtime errors, due to tiny items being allowed on ears and being queried for this variable
 	flags = FPRINT | TABLEPASS
 	pass_flags = PASSTABLE
 	pressure_resistance = 50
@@ -1312,6 +1313,31 @@
 	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/clothing.dm

@@ -9,7 +9,6 @@
 
 	var/body_parts_covered = 0 //see setup.dm for appropriate bit flags
 
-	var/protective_temperature = 0
 	var/heat_transfer_coefficient = 1 //0 prevents all transfers, 1 is invisible
 	var/gas_transfer_coefficient = 1 // for leaking gas from turf to mask and vice-versa (for masks right now, but at some point, i'd like to include space helmets)
 	var/permeability_coefficient = 1 // for chemicals/diseases

code/defines/obj/storage.dm

@@ -337,7 +337,7 @@
 
 /obj/item/weapon/storage/gl_kit
 	name = "Prescription Glasses"
-	desc = "This box contains nerd glasses."
+	desc = "This box contains vison correcting glasses."
 	icon_state = "glasses"
 	item_state = "syringe_kit"
 	foldable = /obj/item/stack/sheet/cardboard	//BubbleWrap

code/defines/obj/weapon.dm

@@ -515,7 +515,7 @@
 	icon_state = "id"
 	item_state = "card-id"
 	var/access = list()
-	var/registered = null
+	var/registered_name = null
 	var/assignment = null
 //	var/obj/item/weapon/photo/PHOTO = null
 	var/over_jumpsuit = 1 // If set to 0, it won't display on top of the mob's jumpsuit
@@ -536,7 +536,7 @@
 /obj/item/weapon/card/id/syndicate_command
 	name = "syndicate ID card"
 	desc = "An ID straight from the Syndicate."
-	registered = "Syndicate"
+	registered_name = "Syndicate"
 	assignment = "Syndicate Overlord"
 	access = list(access_syndicate)
 
@@ -545,7 +545,7 @@
 	desc = "The spare ID of the High Lord himself."
 	icon_state = "gold"
 	item_state = "gold_id"
-	registered = "Captain"
+	registered_name = "Captain"
 	assignment = "Captain"
 	New()
 		access = get_access("Captain")
@@ -555,7 +555,7 @@
 	name = "\improper CentCom. ID"
 	desc = "An ID straight from Cent. Com."
 	icon_state = "centcom"
-	registered = "Central Command"
+	registered_name = "Central Command"
 	assignment = "General"
 	New()
 		access = get_all_centcom_access()
@@ -914,7 +914,6 @@
 	var/list/stamped
 	var/see_face = 1
 	var/body_parts_covered = HEAD
-	var/protective_temperature = 0
 	var/heat_transfer_coefficient = 0.99
 	var/gas_transfer_coefficient = 1
 	var/permeability_coefficient = 0.99