Merge remote-tracking branch 'upstream/master' into dev

.travis.yml

@@ -0,0 +1,19 @@
+language: dm
+
+env:
+  BYOND_MAJOR="503"
+  BYOND_MINOR="1224"
+
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install libc6:i386 libgcc1:i386 libstdc++6:i386 -qq
+
+install:
+  - curl "http://www.byond.com/download/build/${BYOND_MAJOR}/${BYOND_MAJOR}.${BYOND_MINOR}_byond_linux.zip" -o byond.zip
+  - unzip byond.zip
+  - cd byond
+  - sudo make install
+  - cd ..
+
+script:
+  - DreamMaker baystation12.dme

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"

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)