From 909928f3f9925222c7dd1a09d3a6bcfb25d9f71c Mon Sep 17 00:00:00 2001 From: Loganbacca Date: Sat, 11 Jan 2014 18:14:51 +1300 Subject: [PATCH 1/3] Plasma glass stacking fix --- code/game/objects/items/stacks/sheets/glass.dm | 2 +- code/modules/mining/machine_stacking.dm | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 5d5c9415d43..0e79b891898 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 ccdcc56e642..86f844f6237 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) From 2944fed3a14bd71c762dadc1380cc02343e785e7 Mon Sep 17 00:00:00 2001 From: Loganbacca Date: Sun, 12 Jan 2014 20:35:37 +1300 Subject: [PATCH 2/3] Supermatter draw layer - fixes #4255 Supermatter draw layer was set to 70. Changed it to 4 so it's still on top of other objects but not UI layers. --- maps/tgstation2.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/tgstation2.dmm b/maps/tgstation2.dmm index a9870ceb45c..c6fb8919c03 100644 --- a/maps/tgstation2.dmm +++ b/maps/tgstation2.dmm @@ -6399,7 +6399,7 @@ "ctc" = (/obj/machinery/power/emitter{anchored = 1; dir = 4; state = 2},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/engine{name = "Engine Room"}) "ctd" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/poddoor/shutters{id = "EngineShutter"; name = "Engine Shutters"},/turf/simulated/floor/plating,/area/engine{name = "Engine Room"}) "cte" = (/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/engine{name = "Engine Room"}) -"ctf" = (/obj/machinery/power/supermatter{layer = 70},/obj/machinery/mass_driver{id = "enginecore"},/turf/simulated/floor/greengrid,/area/engine{name = "Engine Room"}) +"ctf" = (/obj/machinery/power/supermatter{layer = 4},/obj/machinery/mass_driver{id = "enginecore"},/turf/simulated/floor/greengrid,/area/engine{name = "Engine Room"}) "ctg" = (/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/engine{name = "Engine Room"}) "cth" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/poddoor/shutters{dir = 8; id = "EngineShutter"; name = "Engine Shutters"},/turf/simulated/floor/plating,/area/engine{name = "Engine Room"}) "cti" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/engine{name = "Engine Room"}) From 9ae2e42268e1ae9e69b1956bb84739966eb057c0 Mon Sep 17 00:00:00 2001 From: Mloc Date: Sun, 12 Jan 2014 19:20:28 +0000 Subject: [PATCH 3/3] Added a .travis.yml file for Travis. Signed-off-by: Mloc --- .travis.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000000..a3287d2074d --- /dev/null +++ b/.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