diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 5d5c9415d4..0e79b89189 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -305,7 +305,7 @@ /obj/item/stack/sheet/glass/plasmaglass name = "plasma glass" desc = "A very strong and very resistant sheet of a plasma-glass alloy." - singular_name = "glass sheet" + singular_name = "plasma glass sheet" icon_state = "sheet-plasmaglass" g_amt = 7500 origin_tech = "materials=3;plasma=2" diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index ccdcc56e64..86f844f623 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -273,14 +273,6 @@ ore_uranium+= O:amount del(O) continue - if (istype(O,/obj/item/stack/sheet/glass)) - ore_glass+= O:amount - del(O) - continue - if (istype(O,/obj/item/stack/sheet/rglass)) - ore_rglass+= O:amount - del(O) - continue if (istype(O,/obj/item/stack/sheet/glass/plasmaglass)) ore_plasmaglass+= O:amount del(O) @@ -289,6 +281,14 @@ ore_plasmarglass+= O:amount del(O) continue + if (istype(O,/obj/item/stack/sheet/glass)) + ore_glass+= O:amount + del(O) + continue + if (istype(O,/obj/item/stack/sheet/rglass)) + ore_rglass+= O:amount + del(O) + continue if (istype(O,/obj/item/stack/sheet/plasteel)) ore_plasteel+= O:amount del(O)