From 437634c957b2e70e7da95f246e047d37b2e0cef6 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 24 Apr 2017 20:54:36 -0500 Subject: [PATCH] Fixes turfs on Omegastation --- _maps/map_files/OmegaStation/OmegaStation.dmm | 415 ++++++++++++------ 1 file changed, 292 insertions(+), 123 deletions(-) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index cf8c406eb5..1d6e417a5d 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -2398,10 +2398,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, -/turf/open/floor/plating{ - tag = "icon-plating_warn_side (EAST)"; - icon_state = "plating_warn_side" - }, +/turf/open/floor/plasteel, /area/quartermaster/storage) "aea" = ( /obj/machinery/conveyor{ @@ -2415,10 +2412,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, -/turf/open/floor/plating{ - tag = "icon-plating_warn_side (EAST)"; - icon_state = "plating_warn_side" - }, +/turf/open/floor/plasteel, /area/quartermaster/storage) "aeb" = ( /obj/machinery/conveyor{ @@ -2429,10 +2423,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, -/turf/open/floor/plating{ - tag = "icon-plating_warn_side (EAST)"; - icon_state = "plating_warn_side" - }, +/turf/open/floor/plasteel, /area/quartermaster/storage) "aec" = ( /obj/machinery/conveyor{ @@ -2448,10 +2439,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, -/turf/open/floor/plating{ - tag = "icon-plating_warn_side (EAST)"; - icon_state = "plating_warn_side" - }, +/turf/open/floor/plasteel, /area/quartermaster/storage) "aed" = ( /obj/machinery/conveyor{ @@ -2461,10 +2449,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, -/turf/open/floor/plating{ - tag = "icon-plating_warn_side (EAST)"; - icon_state = "plating_warn_side" - }, +/turf/open/floor/plasteel, /area/quartermaster/storage) "aee" = ( /obj/machinery/conveyor{ @@ -2483,10 +2468,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, -/turf/open/floor/plating{ - tag = "icon-plating_warn_side (EAST)"; - icon_state = "plating_warn_side" - }, +/turf/open/floor/plasteel, /area/quartermaster/storage) "aef" = ( /obj/machinery/conveyor{ @@ -4519,9 +4501,10 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/stripes/end{ - dir = 8 +/obj/effect/turf_decal/stripes/line{ + dir = 9 }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating{ tag = "icon-plating_warn_end (WEST)"; icon_state = "plating_warn_end" @@ -4537,10 +4520,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, -/turf/open/floor/plating{ - tag = "icon-plating_warn_side (EAST)"; - icon_state = "plating_warn_side" +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, +/turf/open/floor/plasteel, /area/quartermaster/storage) "ahp" = ( /obj/machinery/conveyor{ @@ -4551,10 +4534,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, -/turf/open/floor/plating{ - tag = "icon-plating_warn_side (EAST)"; - icon_state = "plating_warn_side" +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, +/turf/open/floor/plasteel, /area/quartermaster/storage) "ahq" = ( /obj/machinery/conveyor{ @@ -4569,6 +4552,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plating{ tag = "icon-plating_warn_side (EAST)"; icon_state = "plating_warn_side" @@ -4584,6 +4570,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plating{ tag = "icon-plating_warn_side (EAST)"; icon_state = "plating_warn_side" @@ -4606,6 +4595,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plating{ tag = "icon-plating_warn_side (EAST)"; icon_state = "plating_warn_side" @@ -5036,6 +5028,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plating, /area/quartermaster/storage) "aif" = ( @@ -11429,9 +11424,7 @@ dir = 4 }, /turf/open/floor/plasteel/green/side{ - dir = 5; - initial_gas_mix = "n2=100;TEMP=80"; - tag = "SERVER" + dir = 5 }, /area/atmos) "arz" = ( @@ -12047,7 +12040,7 @@ layer = 2.9 }, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/shuttle/mining) "asv" = ( /turf/open/floor/engine/n2, @@ -26169,7 +26162,7 @@ }, /obj/structure/shuttle/engine/heater, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/shuttle/escape) "aPF" = ( /obj/structure/window/reinforced{ @@ -26178,7 +26171,7 @@ /obj/structure/shuttle/engine/heater, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/shuttle/escape) "aPG" = ( /obj/structure/grille, @@ -26758,7 +26751,7 @@ "aQE" = ( /obj/structure/shuttle/engine/propulsion, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/shuttle/escape) "aQF" = ( /obj/machinery/light{ @@ -27771,10 +27764,7 @@ /obj/effect/turf_decal/stripes/end{ dir = 8 }, -/turf/open/floor/plasteel/white{ - tag = "icon-white_warn_end (WEST)"; - icon_state = "white_warn_end" - }, +/turf/open/floor/plasteel, /area/medical/research{ name = "Research Division" }) @@ -27788,10 +27778,7 @@ /obj/effect/turf_decal/stripes/end{ dir = 4 }, -/turf/open/floor/plasteel/white{ - tag = "icon-white_warn_end (EAST)"; - icon_state = "white_warn_end" - }, +/turf/open/floor/plasteel, /area/medical/research{ name = "Research Division" }) @@ -29350,7 +29337,8 @@ }) "aVC" = ( /turf/open/floor/plasteel/vault{ - dir = 8 + dir = 8; + initial_gas_mix = "n2=100;TEMP=80" }, /area/medical/research{ name = "Research Division" @@ -29802,7 +29790,8 @@ dir = 4 }, /turf/open/floor/plasteel/vault{ - dir = 8 + dir = 8; + initial_gas_mix = "n2=100;TEMP=80" }, /area/medical/research{ name = "Research Division" @@ -37061,10 +37050,7 @@ /obj/effect/turf_decal/stripes/end{ dir = 8 }, -/turf/open/floor/plasteel/white{ - tag = "icon-white_warn_end (WEST)"; - icon_state = "white_warn_end" - }, +/turf/open/floor/plasteel, /area/toxins/xenobiology) "biD" = ( /obj/machinery/shower{ @@ -37080,10 +37066,7 @@ /obj/effect/turf_decal/stripes/end{ dir = 4 }, -/turf/open/floor/plasteel/white{ - tag = "icon-white_warn_end (EAST)"; - icon_state = "white_warn_end" - }, +/turf/open/floor/plasteel, /area/toxins/xenobiology) "biE" = ( /obj/structure/sign/xenobio, @@ -37583,7 +37566,8 @@ "bjw" = ( /obj/machinery/atmospherics/pipe/manifold/general/hidden, /turf/open/floor/plasteel/vault{ - dir = 8 + dir = 8; + initial_gas_mix = "n2=100;TEMP=80" }, /area/toxins/xenobiology) "bjx" = ( @@ -37593,7 +37577,8 @@ dir = 9 }, /turf/open/floor/plasteel/vault{ - dir = 8 + dir = 8; + initial_gas_mix = "n2=100;TEMP=80" }, /area/toxins/xenobiology) "bjy" = ( @@ -37757,7 +37742,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/shuttle/arrival) "bjO" = ( /turf/closed/wall/mineral/plastitanium, @@ -37914,7 +37899,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/shuttle/arrival) "bjX" = ( /obj/structure/grille, @@ -38933,14 +38918,7 @@ "bmh" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 1; - external_pressure_bound = 0; - frequency = 1441; - id_tag = "o2_out"; - initialize_directions = 1; - internal_pressure_bound = 4000; - on = 1; - pressure_checks = 2; - pump_direction = 0 + on = 1 }, /turf/open/floor/plasteel, /area/hallway/secondary/exit{ @@ -41743,6 +41721,197 @@ "bvf" = ( /turf/closed/wall/r_wall, /area/engine/supermatter) +"bvg" = ( +/turf/open/floor/plating/airless/astplate, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"bvh" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/airless/astplate, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"bvi" = ( +/turf/open/floor/plating/airless/astplate, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"bvj" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/airless/astplate, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"bvk" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/airless/astplate, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"bvl" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/airless/astplate, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"bvm" = ( +/turf/open/floor/plating/airless/astplate, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"bvn" = ( +/turf/open/floor/plating/airless/astplate, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"bvo" = ( +/obj/structure/girder, +/turf/open/floor/plating/airless, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"bvp" = ( +/obj/structure/girder, +/turf/open/floor/plating/airless, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"bvq" = ( +/turf/open/floor/plating/airless/astplate, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"bvr" = ( +/obj/structure/girder, +/turf/open/floor/plating/airless, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"bvs" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/airless/astplate, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"bvt" = ( +/obj/structure/girder, +/turf/open/floor/plating/airless, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"bvu" = ( +/obj/structure/girder, +/turf/open/floor/plating/airless, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"bvv" = ( +/obj/structure/girder, +/turf/open/floor/plating/airless, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"bvw" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/airless/astplate, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"bvx" = ( +/turf/open/floor/plating/airless/astplate, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"bvy" = ( +/turf/open/floor/plating/airless/astplate, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"bvz" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/airless/astplate, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"bvA" = ( +/obj/structure/girder, +/turf/open/floor/plating/airless, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"bvB" = ( +/obj/structure/girder, +/turf/open/floor/plating/airless, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"bvC" = ( +/obj/structure/girder, +/turf/open/floor/plating/airless, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"bvD" = ( +/obj/structure/girder, +/turf/open/floor/plating/airless, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"bvE" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/airless/astplate, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"bvF" = ( +/obj/structure/girder, +/turf/open/floor/plating/airless, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"bvG" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/airless/astplate, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"bvH" = ( +/turf/open/floor/plating/airless/astplate, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"bvI" = ( +/obj/item/weapon/pickaxe/emergency, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"bvJ" = ( +/turf/open/floor/plating/airless/astplate, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"bvK" = ( +/turf/open/floor/plating/airless/astplate, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"bvL" = ( +/turf/open/floor/plating/airless/astplate, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"bvM" = ( +/turf/open/floor/plating/airless/astplate, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"bvN" = ( +/turf/open/floor/plating/airless/astplate, +/area/ruin/unpowered{ + name = "Asteroid" + }) (1,1,1) = {" aaa @@ -71389,7 +71558,7 @@ aad aad aad aad -aac +abj aaW aad aad @@ -71646,7 +71815,7 @@ aad aad aad abi -aac +abj abi abi aad @@ -71683,9 +71852,9 @@ aJp aRF aSP aEt -abi +bvo aad -abi +bvr aad abi aad @@ -71903,8 +72072,8 @@ aad abi aik aaW -aac -aac +abj +abj abu abP aad @@ -72158,11 +72327,11 @@ aac aad aad aad -aac -aac +abj +abj abS -aac -aac +abj +abj acD aad abi @@ -72201,11 +72370,11 @@ aUR aVL aUR aUQ -abi +bvu ahu aad aac -acD +bvI aad aac aad @@ -72415,9 +72584,9 @@ aac aad aad aaW -aac +abj abu -ajP +aaV aad abS aad @@ -72445,11 +72614,11 @@ aHl aIi aJs aKz -buX +buW aMR buZ -bva -bvb +buZ +buW aQL aRI aSS @@ -72458,10 +72627,10 @@ aUS aUU aWz aVL -abi +bvv ahu -abP -abu +bvG +bvH aad aad aad @@ -72676,7 +72845,7 @@ abu abu aad aad -aac +abj abi anx anx @@ -72706,7 +72875,7 @@ aLP aMS aMS aOC -bvc +buW aQM aRJ aST @@ -72715,8 +72884,8 @@ aUR aUU aWz aUQ -abP -abi +bvw +bvD aad aad aad @@ -72930,9 +73099,9 @@ aad aad aad abu -aac +abj aad -ajP +aaV abP amG anx @@ -72972,8 +73141,8 @@ aUS aUU aWz aVL -abu -abP +bvx +bvE aad aad aad @@ -73229,8 +73398,8 @@ aUT aUU aUU aUQ -abu -abi +bvy +bvF aad aad aad @@ -73486,7 +73655,7 @@ aUS aUU aWz aVL -abP +bvz aad aad aad @@ -73734,7 +73903,7 @@ aLT aMW aMW aOD -bve +buW aQQ aRN aSX @@ -73743,7 +73912,7 @@ aUR aUU aWz aUQ -abi +bvA aad aad aad @@ -73987,11 +74156,11 @@ aHr aIo aJw aKE -buY +buW aMX aMX aMX -bvf +buW aQR aRO aSY @@ -74000,7 +74169,7 @@ aUS aUU aWz aVL -abi +bvB aOH aZo baj @@ -74767,11 +74936,11 @@ aQT aRR aTa aEt -abi -abu -abP -abi -abi +bvp +bvq +bvs +bvt +bvC aOH aZr bam @@ -88596,9 +88765,9 @@ aaa aad aad aad -abu -abP -abP +bvg +bvh +bvj adn aec aeS @@ -88665,7 +88834,7 @@ bhj bhT aRz aad -abu +bvN aac aad aad @@ -88854,7 +89023,7 @@ aaa aac aac aac -abu +bvi aad adn aed @@ -88921,7 +89090,7 @@ bgv bhk bhU aRy -abu +bvJ aac aaa aaa @@ -89178,7 +89347,7 @@ bgw bhl bhV aRy -abu +bvK aaa aaa aaa @@ -89387,9 +89556,9 @@ acv aph aqp abt -abP -abP -abu +bvk +bvl +bvn aac aac aae @@ -89645,7 +89814,7 @@ api amD amC amC -abu +bvm aac aae aae @@ -89692,7 +89861,7 @@ bgy bhk bhX aRy -abu +bvL aaa aaa aaa @@ -89949,7 +90118,7 @@ bgz bhk bgw aRy -abu +bvM aac aaa aaa