From 7172979792825ed941274ecaa31f301f53f05c12 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 24 Apr 2017 20:54:39 -0500 Subject: [PATCH 1/3] Removes active turfs from Pubby, Box and Crashed Ship ruin --- _maps/RandomRuins/SpaceRuins/crashedship.dmm | 3 +- _maps/map_files/PubbyStation/PubbyStation.dmm | 129 +++++++++++------- _maps/map_files/TgStation/tgstation.2.1.3.dmm | 16 +-- .../TgStation/tgstation.2.1.3.dmm.rej | 71 ++-------- 4 files changed, 96 insertions(+), 123 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/crashedship.dmm b/_maps/RandomRuins/SpaceRuins/crashedship.dmm index 192657641f..b4d65c7bd9 100644 --- a/_maps/RandomRuins/SpaceRuins/crashedship.dmm +++ b/_maps/RandomRuins/SpaceRuins/crashedship.dmm @@ -2184,7 +2184,8 @@ /turf/open/floor/plating/airless, /area/awaymission/BMPship/Fore) "ge" = ( -/turf/closed/mineral/random, +/obj/machinery/door/airlock/silver, +/turf/open/floor/plating, /area/awaymission/BMPship/Midship) "gf" = ( /obj/machinery/light{ diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 631433a5a7..e0e721840d 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -29590,9 +29590,7 @@ pixel_x = -32 }, /turf/open/floor/plasteel/whiteblue/side{ - dir = 9; - initial_gas_mix = "n2=100;TEMP=80"; - tag = "icon-whiteblue (NORTHWEST)" + dir = 9 }, /area/medical/medbay3) "bhO" = ( @@ -29631,9 +29629,7 @@ pixel_x = -32 }, /turf/open/floor/plasteel/whiteblue/side{ - dir = 9; - initial_gas_mix = "n2=100;TEMP=80"; - tag = "icon-whiteblue (NORTHWEST)" + dir = 9 }, /area/medical/medbay) "bhS" = ( @@ -48652,17 +48648,23 @@ pixel_y = 24 }, /obj/structure/cable, -/turf/open/floor/plasteel/black, +/turf/open/floor/plasteel/black{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "bTt" = ( /obj/machinery/power/terminal{ icon_state = "term"; dir = 1 }, -/turf/open/floor/plasteel/black, +/turf/open/floor/plasteel/black{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "bTu" = ( -/turf/open/floor/plasteel/black, +/turf/open/floor/plasteel/black{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "bTv" = ( /obj/machinery/telecomms/bus/preset_three, @@ -48726,20 +48728,28 @@ /obj/machinery/light{ dir = 8 }, -/turf/open/floor/plasteel/darkred/side, +/turf/open/floor/plasteel/darkred/side{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "bTD" = ( -/turf/open/floor/plasteel/darkpurple/side, +/turf/open/floor/plasteel/darkpurple/side{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "bTE" = ( -/turf/open/floor/plasteel/darkgreen/side, +/turf/open/floor/plasteel/darkgreen/side{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "bTF" = ( /obj/machinery/light{ dir = 4; icon_state = "tube1" }, -/turf/open/floor/plasteel/darkgreen/side, +/turf/open/floor/plasteel/darkgreen/side{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "bTG" = ( /turf/closed/indestructible{ @@ -48826,17 +48836,20 @@ dir = 8 }, /turf/open/floor/plasteel/darkblue/side{ - dir = 1 + dir = 1; + initial_gas_mix = "n2=100;TEMP=80" }, /area/tcommsat/server) "bTS" = ( /turf/open/floor/plasteel/darkblue/side{ - dir = 1 + dir = 1; + initial_gas_mix = "n2=100;TEMP=80" }, /area/tcommsat/server) "bTT" = ( /turf/open/floor/plasteel/darkyellow/side{ - dir = 1 + dir = 1; + initial_gas_mix = "n2=100;TEMP=80" }, /area/tcommsat/server) "bTU" = ( @@ -48845,7 +48858,8 @@ icon_state = "tube1" }, /turf/open/floor/plasteel/darkyellow/side{ - dir = 1 + dir = 1; + initial_gas_mix = "n2=100;TEMP=80" }, /area/tcommsat/server) "bTV" = ( @@ -48896,7 +48910,9 @@ /obj/item/weapon/stock_parts/subspace/amplifier, /obj/item/weapon/stock_parts/subspace/analyzer, /obj/item/weapon/stock_parts/subspace/analyzer, -/turf/open/floor/plasteel/black, +/turf/open/floor/plasteel/black{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "bUc" = ( /obj/structure/table, @@ -48904,7 +48920,9 @@ /obj/item/weapon/stock_parts/subspace/ansible, /obj/item/weapon/stock_parts/subspace/crystal, /obj/item/weapon/stock_parts/subspace/crystal, -/turf/open/floor/plasteel/black, +/turf/open/floor/plasteel/black{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "bUd" = ( /obj/structure/table, @@ -48912,7 +48930,9 @@ /obj/item/weapon/stock_parts/subspace/filter, /obj/item/weapon/stock_parts/subspace/transmitter, /obj/item/weapon/stock_parts/subspace/transmitter, -/turf/open/floor/plasteel/black, +/turf/open/floor/plasteel/black{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "bUe" = ( /obj/machinery/camera/motion{ @@ -48921,7 +48941,6 @@ network = list("SS13","Telecoms") }, /turf/open/floor/plasteel/black{ - name = "Mainframe Floor"; initial_gas_mix = "n2=100;TEMP=80" }, /area/tcommsat/server) @@ -48931,7 +48950,9 @@ /obj/item/weapon/stock_parts/subspace/treatment, /obj/item/weapon/stock_parts/manipulator, /obj/item/weapon/stock_parts/manipulator, -/turf/open/floor/plasteel/black, +/turf/open/floor/plasteel/black{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "bUg" = ( /obj/structure/table, @@ -48939,13 +48960,17 @@ /obj/item/weapon/stock_parts/console_screen, /obj/item/weapon/stock_parts/micro_laser, /obj/item/weapon/stock_parts/micro_laser, -/turf/open/floor/plasteel/black, +/turf/open/floor/plasteel/black{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "bUh" = ( /obj/structure/table, /obj/item/weapon/stock_parts/scanning_module, /obj/item/weapon/stock_parts/scanning_module, -/turf/open/floor/plasteel/black, +/turf/open/floor/plasteel/black{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "bUi" = ( /obj/machinery/camera/motion{ @@ -83827,33 +83852,33 @@ bQl bQC bQN bQZ -bRg -bRg -bRg -bRE -bRg -bRg -bRg -bRg -bRE -bRg -bRg -bRg -bRg -bRE -bRg -bRg -bRg -bRg -bRE -bRg -bRg -bRg -bRg -bRE -bRg -bRg -bRg +aeZ +aeZ +aeZ +afy +aeZ +aeZ +aeZ +aeZ +afy +aeZ +aeZ +aeZ +aeZ +afy +aeZ +aeZ +aeZ +aeZ +afy +aeZ +aeZ +aeZ +aeZ +afy +aeZ +aeZ +aeZ bSp bSu bSC @@ -97895,7 +97920,7 @@ aaa aaa aGT aOx -cii +aPw aKE aPw aSs diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm index 791838bbb2..f2bf5eb504 100644 --- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm +++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm @@ -13854,7 +13854,7 @@ dir = 4; icon_state = "burst_r" }, -/turf/open/floor/plasteel/black, +/turf/open/floor/plating/airless, /area/shuttle/arrival) "aEy" = ( /obj/structure/shuttle/engine/heater{ @@ -13864,7 +13864,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/turf/open/floor/plasteel/black, +/turf/open/floor/plating/airless, /area/shuttle/arrival) "aEz" = ( /obj/machinery/power/apc{ @@ -14389,7 +14389,7 @@ dir = 4; icon_state = "propulsion" }, -/turf/open/floor/plasteel/black, +/turf/open/floor/plating/airless, /area/shuttle/arrival) "aFG" = ( /turf/open/floor/plasteel/arrival{ @@ -16553,7 +16553,7 @@ dir = 4; icon_state = "burst_l" }, -/turf/open/floor/plasteel/black, +/turf/open/floor/plating/airless, /area/shuttle/arrival) "aKj" = ( /obj/machinery/door/firedoor, @@ -57576,7 +57576,7 @@ dir = 8; icon_state = "propulsion_l" }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/shuttle/transport) "cxu" = ( /turf/closed/wall/mineral/titanium, @@ -57631,7 +57631,7 @@ dir = 4; pixel_x = 0 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/shuttle/transport) "cxE" = ( /obj/machinery/door/airlock/titanium, @@ -59635,7 +59635,7 @@ dir = 1; pixel_y = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/shuttle/transport) "cCz" = ( /obj/machinery/door/airlock/external, @@ -61361,7 +61361,7 @@ name = "arrivals"; width = 7 }, -/turf/open/floor/plasteel/black, +/turf/open/floor/plating/airless, /area/shuttle/arrival) "cIh" = ( /obj/machinery/door/airlock/external{ diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm.rej b/_maps/map_files/TgStation/tgstation.2.1.3.dmm.rej index 1da00842b6..71674b8da6 100644 --- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm.rej +++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm.rej @@ -1,63 +1,10 @@ diff a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm (rejected hunks) -@@ -93201,11 +93199,11 @@ cpy - cDv - cDD - cqU --cMF -+cMD - cEu - cMI --cMJ --cML -+cMI -+cMD - cFL - cGf - cGw -@@ -93457,12 +93455,12 @@ chV - cDq - cqf - cqD --cME -+cMD - crs - cEv - cEv - cFe --cMM -+cMD - cFM - czE - cGx -@@ -93975,7 +93973,7 @@ cqZ - crt - cMH - cAm --cMK -+cMH - cMN - cFO - csC -@@ -94490,7 +94488,7 @@ crv - cEy - cEy - cFh --cMO -+cMD - cFQ - czE - cGx -@@ -94743,11 +94741,11 @@ cDr - cDw - cDE - cEa --cMG -+cMD - cEz - cEz - cEz --cMP -+cMD - cFR - cGf - cGz +@@ -58816,7 +58816,7 @@ + dir = 8 + }, + /obj/structure/window/reinforced, +-/turf/open/floor/plating, ++/turf/open/floor/plating/airless, + /area/shuttle/transport) + "cxz" = ( + /obj/machinery/computer/shuttle/ferry/request, From 4ea582ddef724c6cd24f8117306c56e29cbfed28 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 25 Apr 2017 01:00:20 -0500 Subject: [PATCH 2/3] Update tgstation.2.1.3.dmm.rej --- _maps/map_files/TgStation/tgstation.2.1.3.dmm.rej | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm.rej b/_maps/map_files/TgStation/tgstation.2.1.3.dmm.rej index 71674b8da6..8b13789179 100644 --- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm.rej +++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm.rej @@ -1,10 +1 @@ -diff a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm (rejected hunks) -@@ -58816,7 +58816,7 @@ - dir = 8 - }, - /obj/structure/window/reinforced, --/turf/open/floor/plating, -+/turf/open/floor/plating/airless, - /area/shuttle/transport) - "cxz" = ( - /obj/machinery/computer/shuttle/ferry/request, + From d78e5c196d64158cfbcc74001cefd2d5240cd7ab Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 25 Apr 2017 01:01:11 -0500 Subject: [PATCH 3/3] Rename tgstation.2.1.3.dmm.rej to broken.rej --- _maps/map_files/TgStation/{tgstation.2.1.3.dmm.rej => broken.rej} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename _maps/map_files/TgStation/{tgstation.2.1.3.dmm.rej => broken.rej} (100%) diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm.rej b/_maps/map_files/TgStation/broken.rej similarity index 100% rename from _maps/map_files/TgStation/tgstation.2.1.3.dmm.rej rename to _maps/map_files/TgStation/broken.rej