Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

code/game/objects/items/stacks/sheets/glass.dm

@@ -2,8 +2,8 @@
  * Contains:
  *		Glass sheets
  *		Reinforced glass sheets
- *		Plasma Glass Sheets
- *		Reinforced Plasma Glass Sheets (AKA Holy fuck strong windows)
+ *		Phoron Glass Sheets
+ *		Reinforced Phoron Glass Sheets (AKA Holy fuck strong windows)
  *		Glass shards - TODO: Move this into code/game/object/item/weapons
  */
 
@@ -310,25 +310,25 @@
 
 
 /*
- * Plasma Glass sheets
+ * Phoron Glass sheets
  */
-/obj/item/stack/sheet/glass/plasmaglass
-	name = "plasma glass"
-	desc = "A very strong and very resistant sheet of a plasma-glass alloy."
-	singular_name = "plasma glass sheet"
-	icon_state = "sheet-plasmaglass"
+/obj/item/stack/sheet/glass/phoronglass
+	name = "phoron glass"
+	desc = "A very strong and very resistant sheet of a phoron-glass alloy."
+	singular_name = "phoron glass sheet"
+	icon_state = "sheet-phoronglass"
 	g_amt = 7500
-	origin_tech = "materials=3;plasma=2"
-	created_window = /obj/structure/window/plasmabasic
+	origin_tech = "materials=3;phoron=2"
+	created_window = /obj/structure/window/phoronbasic
 
-/obj/item/stack/sheet/glass/plasmaglass/attack_self(mob/user as mob)
+/obj/item/stack/sheet/glass/phoronglass/attack_self(mob/user as mob)
 	construct_window(user)
 
-/obj/item/stack/sheet/glass/plasmaglass/attackby(obj/item/W, mob/user)
+/obj/item/stack/sheet/glass/phoronglass/attackby(obj/item/W, mob/user)
 	..()
 	if( istype(W, /obj/item/stack/rods) )
 		var/obj/item/stack/rods/V  = W
-		var/obj/item/stack/sheet/glass/plasmarglass/RG = new (user.loc)
+		var/obj/item/stack/sheet/glass/phoronrglass/RG = new (user.loc)
 		RG.add_fingerprint(user)
 		RG.add_to_stacks(user)
 		V.use(1)
@@ -342,17 +342,17 @@
 		return ..()
 
 /*
- * Reinforced plasma glass sheets
+ * Reinforced phoron glass sheets
  */
-/obj/item/stack/sheet/glass/plasmarglass
-	name = "reinforced plasma glass"
-	desc = "Plasma glass which seems to have rods or something stuck in them."
-	singular_name = "reinforced plasma glass sheet"
-	icon_state = "sheet-plasmarglass"
+/obj/item/stack/sheet/glass/phoronrglass
+	name = "reinforced phoron glass"
+	desc = "Phoron glass which seems to have rods or something stuck in them."
+	singular_name = "reinforced phoron glass sheet"
+	icon_state = "sheet-phoronrglass"
 	g_amt = 7500
 	m_amt = 1875
-	origin_tech = "materials=4;plasma=2"
-	created_window = /obj/structure/window/plasmareinforced
+	origin_tech = "materials=4;phoron=2"
+	created_window = /obj/structure/window/phoronreinforced
 
-/obj/item/stack/sheet/glass/plasmarglass/attack_self(mob/user as mob)
+/obj/item/stack/sheet/glass/phoronrglass/attack_self(mob/user as mob)
 	construct_window(user)

code/game/objects/items/stacks/sheets/mineral.dm

@@ -4,7 +4,7 @@ Mineral Sheets
 		- Sandstone
 		- Diamond
 		- Uranium
-		- Plasma
+		- Phoron
 		- Gold
 		- Silver
 		- Clown
@@ -90,26 +90,26 @@ var/global/list/datum/stack_recipe/uranium_recipes = list ( \
 	..()
 
 /*
- * Plasma
+ * Phoron
  */
-/obj/item/stack/sheet/mineral/plasma
-	name = "solid plasma"
-	icon_state = "sheet-plasma"
+/obj/item/stack/sheet/mineral/phoron
+	name = "solid phoron"
+	icon_state = "sheet-phoron"
 	force = 5.0
 	throwforce = 5
 	w_class = 3.0
 	throw_speed = 3
 	throw_range = 3
-	origin_tech = "plasmatech=2;materials=2"
+	origin_tech = "phorontech=2;materials=2"
 	perunit = 2000
-	sheettype = "plasma"
+	sheettype = "phoron"
 
-var/global/list/datum/stack_recipe/plasma_recipes = list ( \
-	new/datum/stack_recipe("plasma door", /obj/structure/mineral_door/transparent/plasma, 10, one_per_turf = 1, on_floor = 1), \
+var/global/list/datum/stack_recipe/phoron_recipes = list ( \
+	new/datum/stack_recipe("phoron door", /obj/structure/mineral_door/transparent/phoron, 10, one_per_turf = 1, on_floor = 1), \
 	)
 
-/obj/item/stack/sheet/mineral/plasma/New(var/loc, var/amount=null)
-	recipes = plasma_recipes
+/obj/item/stack/sheet/mineral/phoron/New(var/loc, var/amount=null)
+	recipes = phoron_recipes
 	pixel_x = rand(0,4)-4
 	pixel_y = rand(0,4)-4
 	..()

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -108,7 +108,7 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list ( \
 /obj/item/stack/sheet/plasteel
 	name = "plasteel"
 	singular_name = "plasteel sheet"
-	desc = "This sheet is an alloy of iron and plasma."
+	desc = "This sheet is an alloy of iron and phoron."
 	icon_state = "sheet-plasteel"
 	item_state = "sheet-metal"
 	m_amt = 7500