From b1691e0dfa206932181c9a789541d1cfa7fc8c40 Mon Sep 17 00:00:00 2001 From: TripleShades Date: Mon, 6 Dec 2021 23:11:00 -0500 Subject: [PATCH 1/9] Update PubbyStation.dmm --- _maps/map_files/PubbyStation/PubbyStation.dmm | 1 + 1 file changed, 1 insertion(+) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 791e6d1368..4078c690d4 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -29637,6 +29637,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/item/cautery, /turf/open/floor/plasteel/white, /area/science/robotics/lab) "btb" = ( From f6fcee118e86798c745c422ffb39cd00a557d0a3 Mon Sep 17 00:00:00 2001 From: TripleShades Date: Sun, 19 Dec 2021 03:25:23 -0500 Subject: [PATCH 2/9] Update FestiveStation.dmm --- .../map_files/FestiveBall/FestiveStation.dmm | 707 +++++++++--------- 1 file changed, 358 insertions(+), 349 deletions(-) diff --git a/_maps/map_files/FestiveBall/FestiveStation.dmm b/_maps/map_files/FestiveBall/FestiveStation.dmm index 8f11493862..52f9d5b15e 100644 --- a/_maps/map_files/FestiveBall/FestiveStation.dmm +++ b/_maps/map_files/FestiveBall/FestiveStation.dmm @@ -1292,10 +1292,9 @@ /turf/open/floor/wood, /area/command/heads_quarters/hop/private) "adQ" = ( -/obj/structure/bed, -/obj/item/bedsheet/hop, /obj/effect/decal/festive/red_stockings, -/obj/effect/landmark/start/head_of_personnel, +/obj/structure/bed/double, +/obj/item/bedsheet/hop/double, /turf/open/floor/wood, /area/command/heads_quarters/hop/private) "adR" = ( @@ -1396,6 +1395,7 @@ dir = 4; light_color = "#c1caff" }, +/obj/effect/landmark/start/head_of_personnel, /turf/open/floor/wood, /area/command/heads_quarters/hop/private) "aeh" = ( @@ -2057,57 +2057,6 @@ }, /turf/open/floor/plasteel/dark, /area/command/gateway) -"afE" = ( -/obj/machinery/gateway{ - dir = 9 - }, -/obj/effect/turf_decal/bot_white/right, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/command/gateway) -"afF" = ( -/obj/machinery/gateway{ - dir = 1 - }, -/obj/effect/turf_decal/bot_white, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/command/gateway) -"afG" = ( -/obj/machinery/gateway{ - dir = 5 - }, -/obj/effect/turf_decal/bot_white/left, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/command/gateway) "afH" = ( /obj/machinery/light{ dir = 4 @@ -2322,31 +2271,11 @@ "age" = ( /turf/open/floor/plasteel/dark, /area/command/gateway) -"agf" = ( -/obj/machinery/gateway{ - dir = 8 - }, -/obj/effect/turf_decal/bot_white, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/command/gateway) "agg" = ( -/obj/machinery/gateway/centerstation, +/obj/machinery/gateway, /turf/open/floor/plasteel/dark, /area/command/gateway) "agh" = ( -/obj/machinery/gateway{ - dir = 4 - }, /obj/effect/turf_decal/bot_white, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -2588,9 +2517,6 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/command/storage/eva) "agH" = ( -/obj/machinery/gateway{ - dir = 10 - }, /obj/effect/turf_decal/bot_white/left, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -2605,7 +2531,6 @@ /turf/open/floor/plasteel/dark, /area/command/gateway) "agI" = ( -/obj/machinery/gateway, /obj/structure/cable{ icon_state = "0-2" }, @@ -2623,9 +2548,6 @@ /turf/open/floor/plasteel/dark, /area/command/gateway) "agJ" = ( -/obj/machinery/gateway{ - dir = 6 - }, /obj/effect/turf_decal/bot_white/right, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -3112,8 +3034,7 @@ /turf/open/floor/plasteel, /area/command/gateway) "ahL" = ( -/obj/structure/table, -/obj/item/paper/pamphlet/gateway, +/obj/machinery/computer/gateway_control, /turf/open/floor/plasteel, /area/command/gateway) "ahM" = ( @@ -3198,8 +3119,12 @@ /turf/open/floor/festive/wooden/wooden1, /area/command/corporate_showroom) "ahV" = ( -/obj/structure/bed, -/obj/item/bedsheet/captain, +/obj/item/bedsheet/captain/double{ + dir = 1 + }, +/obj/structure/bed/double{ + dir = 1 + }, /turf/open/floor/wood, /area/command/heads_quarters/captain/private) "ahW" = ( @@ -3355,6 +3280,8 @@ name = "Station Intercom (General)"; pixel_x = -30 }, +/obj/item/paper/pamphlet/gateway, +/obj/structure/table, /turf/open/floor/plasteel, /area/command/gateway) "ail" = ( @@ -4796,7 +4723,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 1 }, /turf/open/floor/festive/alleyway, @@ -4808,7 +4735,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 1 }, /turf/open/floor/festive/alleyway, @@ -4837,7 +4764,7 @@ /turf/open/floor/festive/alleyway, /area/maintenance/starboard/fore) "amo" = ( -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 1 }, /turf/open/floor/festive/alleyway, @@ -5131,11 +5058,7 @@ /turf/open/floor/festive/alleyway, /area/maintenance/starboard/fore) "anb" = ( -/obj/machinery/suit_storage_unit/ce, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/command/heads_quarters/ce) "anc" = ( /obj/machinery/button/door{ @@ -5147,16 +5070,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, /turf/open/floor/plasteel/dark, /area/command/heads_quarters/ce) "and" = ( @@ -5167,30 +5080,10 @@ }, /obj/item/stock_parts/cell/high/plus, /obj/item/reagent_containers/pill/patch/silver_sulf, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, /turf/open/floor/plasteel/dark, /area/command/heads_quarters/ce) "ane" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, /mob/living/simple_animal/parrot/Poly, /turf/open/floor/plasteel/dark, /area/command/heads_quarters/ce) @@ -5208,16 +5101,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/item/key/CE, /turf/open/floor/plasteel/dark, @@ -5635,6 +5518,9 @@ /obj/machinery/newscaster/security_unit{ pixel_y = 32 }, +/obj/item/storage/fancy/donut_box{ + pixel_y = 8 + }, /turf/open/floor/carpet/red, /area/command/heads_quarters/hos) "aod" = ( @@ -6127,7 +6013,7 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 8 }, /turf/open/floor/festive/alleyway, @@ -7109,13 +6995,11 @@ /turf/open/floor/wood, /area/security/warden) "arF" = ( -/obj/item/bedsheet/hos, -/obj/structure/bed, -/obj/effect/landmark/start/head_of_security, -/obj/item/storage/fancy/donut_box, +/obj/structure/bed/double, /obj/structure/sign/poster/official/nt_storm_officer{ pixel_y = 32 }, +/obj/item/bedsheet/hos/double, /turf/open/floor/carpet/red, /area/command/heads_quarters/hos) "arG" = ( @@ -7563,8 +7447,7 @@ "asL" = ( /obj/structure/fence, /obj/structure/streetdecor/lampfestive{ - pixel_x = 16; - pixel_y = 10 + pixel_x = 16 }, /turf/open/floor/grass/snow/edina, /area/edina) @@ -8205,7 +8088,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 8 }, /turf/open/floor/festive/alleyway, @@ -8658,8 +8541,7 @@ "avz" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible/layer1, /obj/machinery/atmospherics/components/unary/portables_connector/layer3{ - dir = 1; - pixel_x = 10 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/yellow/visible, /turf/open/floor/plasteel, @@ -9102,11 +8984,12 @@ /turf/open/floor/wood, /area/security/processing) "awA" = ( -/obj/machinery/door/airlock/external{ - name = "Gulag Shuttle Airlock" +/obj/effect/decal/festive/fairylights, +/obj/structure/chair/sofa/corner{ + dir = 4 }, /turf/open/floor/wood, -/area/security/processing) +/area/command/heads_quarters/ce) "awB" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible/layer1, /obj/machinery/atmospherics/components/binary/pump, @@ -9381,9 +9264,7 @@ dir = 8; node1_concentration = 0.21; node2_concentration = 0.79; - piping_layer = 1; - pixel_x = -5; - pixel_y = -5 + piping_layer = 1 }, /obj/machinery/atmospherics/pipe/simple/yellow{ dir = 5 @@ -9930,7 +9811,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/light/small, +/obj/machinery/light, /turf/open/floor/festive/alleyway, /area/maintenance/starboard/fore) "ayK" = ( @@ -9943,17 +9824,12 @@ /turf/open/floor/festive/alleyway, /area/maintenance/starboard/fore) "ayL" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 2; - height = 5; - id = "laborcamp_home"; - name = "fore bay 1"; - roundstart_template = /datum/map_template/shuttle/labour/delta; - width = 9 +/obj/machinery/door/airlock/external{ + name = "Gulag Shuttle Airlock"; + req_access_txt = "63" }, -/turf/open/floor/grass/snow/edina, -/area/edina) +/turf/open/floor/wood, +/area/security/processing) "ayM" = ( /obj/machinery/door/airlock/security/glass, /obj/machinery/door/firedoor, @@ -10037,12 +9913,10 @@ /turf/open/floor/wood, /area/security/processing) "ayY" = ( -/obj/machinery/door/airlock/external{ - name = "Gulag Shuttle Airlock"; - req_access_txt = "63" - }, +/obj/effect/decal/festive/fairylights, +/obj/structure/chair/sofa/left, /turf/open/floor/wood, -/area/security/processing) +/area/command/heads_quarters/ce) "ayZ" = ( /obj/effect/decal/festive/fairylights, /turf/open/floor/engine/plasma, @@ -10385,8 +10259,7 @@ /area/engineering/atmos) "azX" = ( /obj/machinery/atmospherics/components/unary/portables_connector/layer3{ - dir = 8; - pixel_y = 10 + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 8 @@ -10950,13 +10823,12 @@ /turf/open/floor/plasteel, /area/engineering/atmos) "aBM" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/layer3{ - dir = 4; - pixel_y = 10 - }, /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/portables_connector/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "aBN" = ( @@ -13223,16 +13095,15 @@ /turf/open/floor/engine/vacuum, /area/engineering/atmos) "aIc" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/layer3{ - dir = 8; - pixel_y = 10 - }, /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/cyan/visible/layer1{ dir = 10 }, +/obj/machinery/atmospherics/components/unary/portables_connector/layer3{ + dir = 8 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "aId" = ( @@ -14423,13 +14294,13 @@ /turf/open/floor/wood, /area/maintenance/bar) "aKW" = ( -/obj/machinery/light/small{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/light{ + dir = 8 + }, /turf/open/floor/festive/alleyway, /area/service/bar/atrium) "aKX" = ( @@ -15064,10 +14935,9 @@ /turf/closed/festive/whitebrick, /area/science/lab) "aMH" = ( -/obj/structure/grille, -/obj/structure/festive/whitebrick/windowNSRightEnd, -/turf/open/floor/plasteel, -/area/science/lab) +/obj/effect/decal/festive/fairylights, +/turf/open/floor/wood, +/area/command/heads_quarters/ce) "aMI" = ( /obj/structure/grille, /obj/structure/festive/whitebrick/windowNSMiddle, @@ -16147,10 +16017,10 @@ /turf/open/floor/festive/alleyway, /area/service/bar/atrium) "aPt" = ( -/obj/machinery/light/small, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/light, /turf/open/floor/festive/alleyway, /area/service/bar/atrium) "aPu" = ( @@ -18302,7 +18172,6 @@ pixel_y = -32 }, /obj/machinery/vending/cola/random, -/obj/machinery/light, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 }, @@ -18574,7 +18443,9 @@ /area/science/explab) "aVy" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/obj/machinery/light/small, +/obj/machinery/light/small{ + dir = 8 + }, /turf/open/floor/carpet/red, /area/science/robotics) "aVz" = ( @@ -19455,9 +19326,6 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, -/obj/machinery/light/small{ - dir = 1 - }, /turf/open/indestructible/hotelwood, /area/service/chapel/office) "aXM" = ( @@ -20130,7 +19998,7 @@ /turf/open/floor/festive/alleyway, /area/medical/medbay/aft) "aZC" = ( -/obj/machinery/light/small, +/obj/machinery/light, /turf/open/indestructible/hotelwood, /area/service/chapel/office) "aZD" = ( @@ -21767,11 +21635,11 @@ /obj/machinery/light{ dir = 4 }, -/obj/structure/bed, -/obj/item/bedsheet/rd, /obj/machinery/status_display{ pixel_x = 32 }, +/obj/item/bedsheet/rd/double, +/obj/structure/bed/double, /turf/open/floor/holofloor/wood, /area/command/heads_quarters/rd/private) "bet" = ( @@ -27441,8 +27309,8 @@ }, /area/service/chapel/main/monastery) "bsn" = ( -/obj/structure/bed, -/obj/item/bedsheet/black, +/obj/item/bedsheet/chaplain/double, +/obj/structure/bed/double, /turf/open/floor/carpet{ icon_state = "carpetsymbol" }, @@ -28149,7 +28017,6 @@ /area/cargo/miningoffice) "btM" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/landmark/start/shaft_miner, /turf/open/floor/plasteel, /area/cargo/miningoffice) "btN" = ( @@ -28227,10 +28094,6 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 32 }, -/obj/machinery/light/small{ - dir = 1; - light_color = "#ffc1c1" - }, /turf/open/indestructible/hotelwood, /area/service/chapel/main/monastery) "btX" = ( @@ -28261,13 +28124,12 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/light/small{ - dir = 1; - light_color = "#ffc1c1" - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 }, +/obj/machinery/light{ + dir = 1 + }, /turf/open/indestructible/hotelwood, /area/service/chapel/main/monastery) "bua" = ( @@ -29317,9 +29179,9 @@ /turf/open/floor/carpet/green, /area/service/chapel/main/monastery) "bww" = ( -/obj/machinery/light/small, -/turf/open/floor/carpet/green, -/area/service/chapel/main/monastery) +/obj/structure/mineral_door/wood, +/turf/open/floor/wood, +/area/command/heads_quarters/ce) "bwx" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -29612,16 +29474,16 @@ /turf/open/floor/plasteel/dark, /area/medical/medbay/aft) "bxn" = ( -/obj/structure/chair/wood/normal, /obj/effect/decal/festive/christmas_ivy_string, +/obj/structure/chair/pew/left, /turf/open/floor/carpet/green, /area/medical/surgery) "bxo" = ( -/obj/structure/chair/wood/normal, /obj/machinery/light{ dir = 1 }, /obj/effect/decal/festive/christmas_ivy_string, +/obj/structure/chair/pew, /turf/open/floor/carpet/green, /area/medical/surgery) "bxp" = ( @@ -29955,7 +29817,7 @@ /turf/open/floor/plasteel/dark, /area/medical/medbay/aft) "byk" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/pew/left, /turf/open/floor/carpet/green, /area/medical/surgery) "byl" = ( @@ -30522,42 +30384,34 @@ /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) "bzN" = ( -/obj/machinery/computer/operating, /obj/structure/sign/warning/nosmoking{ pixel_x = -28 }, +/obj/structure/table, +/obj/item/book/manual/wiki/surgery, +/obj/item/razor{ + pixel_y = 5 + }, /turf/open/floor/plasteel, /area/medical/surgery) "bzO" = ( -/obj/structure/table, -/obj/item/hemostat, -/obj/item/surgicaldrill, /obj/effect/decal/festive/fairylights, +/obj/structure/table/optable, /turf/open/floor/plasteel/white/side, /area/medical/surgery) "bzP" = ( -/obj/structure/table, -/obj/item/cautery{ - pixel_x = 4 - }, -/obj/item/razor{ - pixel_y = 5 - }, -/obj/item/scalpel{ - pixel_y = 12 - }, /obj/effect/decal/festive/fairylights, +/obj/machinery/computer/operating, /turf/open/floor/plasteel/white/side, /area/medical/surgery) "bzQ" = ( /obj/structure/table, -/obj/item/retractor, -/obj/item/circular_saw, /obj/structure/window/reinforced{ dir = 4; layer = 2.9 }, /obj/effect/decal/festive/fairylights, +/obj/item/storage/backpack/duffelbag/med/surgery, /turf/open/floor/plasteel, /area/medical/surgery) "bzR" = ( @@ -30566,10 +30420,9 @@ /area/medical/surgery) "bzS" = ( /obj/structure/table, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/mask/surgical, -/obj/item/clothing/suit/apron/surgical, -/obj/machinery/light, +/obj/machinery/light{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/medical/surgery) "bzT" = ( @@ -30749,15 +30602,35 @@ /obj/machinery/light{ dir = 8 }, +/obj/machinery/light_switch{ + pixel_x = -28; + pixel_y = 17 + }, /turf/open/floor/plasteel/white/side{ dir = 4 }, /area/medical/surgery) "bAv" = ( /obj/effect/landmark/start/medical_doctor, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/medical/surgery) "bAw" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/white, /area/medical/surgery) "bAx" = ( @@ -30765,12 +30638,13 @@ icon_state = "0-2" }, /obj/structure/table, -/obj/item/surgical_drapes, /obj/structure/window/reinforced{ dir = 4; layer = 2.9 }, -/obj/item/book/manual/wiki/surgery, +/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/mask/surgical, +/obj/item/clothing/suit/apron/surgical, /turf/open/floor/plasteel/white/side{ dir = 8 }, @@ -31211,25 +31085,17 @@ pixel_x = -12; pixel_y = 2 }, +/obj/structure/mirror{ + pixel_x = -24 + }, /turf/open/floor/plasteel/white, /area/medical/surgery) "bBo" = ( -/obj/structure/table/optable, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ +/obj/structure/chair/sofa/right{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/surgery) +/turf/open/floor/wood, +/area/command/heads_quarters/ce) "bBp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -31725,17 +31591,9 @@ /turf/open/floor/plasteel/white, /area/medical/surgery) "bCe" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, -/obj/machinery/light_switch{ - pixel_x = -28 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -32545,6 +32403,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/medical/surgery) "bDi" = ( @@ -39486,7 +39347,6 @@ }, /obj/machinery/power/apc{ areastring = "/area/medical/chemistry"; - dir = 1; name = "Chemistry Lab APC"; pixel_y = -24 }, @@ -41798,9 +41658,8 @@ /turf/open/floor/plasteel/white, /area/medical/genetics) "bXA" = ( -/obj/structure/bed, -/obj/item/bedsheet/cmo, -/obj/effect/landmark/start/chief_medical_officer, +/obj/structure/bed/double, +/obj/item/bedsheet/cmo/double, /turf/open/floor/carpet/royalblack, /area/command/heads_quarters/cmo) "bXB" = ( @@ -45105,8 +44964,8 @@ /turf/open/floor/festive/cobblestone, /area/edina/street/primary/perimeter) "ceU" = ( -/obj/structure/bed, -/obj/item/bedsheet/qm, +/obj/item/bedsheet/qm/double, +/obj/structure/bed/double, /turf/open/floor/carpet/orange, /area/cargo/qm) "ceV" = ( @@ -47264,13 +47123,13 @@ /turf/open/floor/carpet/blue, /area/commons/cryopod) "cjT" = ( -/obj/structure/streetdecor/lampfestive{ - pixel_x = -8; - pixel_y = -5 - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, +/obj/structure/streetdecor/lampfestive{ + pixel_x = -8; + pixel_y = 25 + }, /turf/open/floor/festive/sidewalk, /area/edina/street/primary/perimeter) "cjU" = ( @@ -52782,9 +52641,9 @@ /turf/open/floor/wood, /area/maintenance/bar) "cyx" = ( -/obj/structure/floodlight_frame{ - density = 0; - name = "dancing pole" +/mob/living/simple_animal/hostile/tree/festivus{ + pixel_x = -17; + pixel_y = -13 }, /turf/open/floor/festive/trainplatform, /area/maintenance/bar) @@ -53294,7 +53153,9 @@ /area/maintenance/bar) "cAs" = ( /obj/structure/table/glass, -/obj/machinery/chem_dispenser/drinks/beer/fullupgrade, +/obj/machinery/chem_dispenser/drinks/beer/fullupgrade{ + dir = 1 + }, /obj/machinery/light{ light_color = "#c9d3e8" }, @@ -53302,7 +53163,9 @@ /area/maintenance/bar) "cAu" = ( /obj/structure/table/glass, -/obj/machinery/chem_dispenser/drinks/fullupgrade, +/obj/machinery/chem_dispenser/drinks/fullupgrade{ + dir = 1 + }, /turf/open/floor/wood, /area/maintenance/bar) "cAv" = ( @@ -53615,6 +53478,13 @@ dir = 1 }, /area/commons/dorms) +"cIQ" = ( +/obj/structure/streetdecor/lampfestive{ + pixel_x = 8; + pixel_y = 16 + }, +/turf/open/floor/festive/sidewalk, +/area/edina/street/intersection/princessperimeter/south) "cKl" = ( /obj/machinery/light/small, /obj/structure/closet/crate, @@ -53649,6 +53519,12 @@ }, /turf/open/floor/wood, /area/maintenance/bar) +"cTr" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/wood, +/area/science) "cUs" = ( /obj/structure/flora/ausbushes/ppflowers, /turf/open/floor/grass, @@ -53775,6 +53651,13 @@ /obj/item/chair/wood, /turf/open/floor/wood, /area/commons/dorms) +"ejZ" = ( +/obj/structure/bookcase/random/reference, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/festive/wooden/wooden1, +/area/commons/lounge) "emA" = ( /turf/open/floor/wood{ icon_state = "wood-broken4" @@ -53986,6 +53869,11 @@ }, /turf/open/floor/festive/alleyway, /area/edina) +"fyx" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp, +/turf/open/floor/wood, +/area/command/heads_quarters/ce) "fBZ" = ( /mob/living/simple_animal/crab, /turf/open/floor/holofloor/beach, @@ -53994,6 +53882,13 @@ /obj/effect/decal/festive/christmas_ivy_string, /turf/open/floor/carpet/blue, /area/commons/cryopod) +"fGL" = ( +/obj/machinery/suit_storage_unit/ce, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plasteel/white, +/area/command/heads_quarters/ce) "fIm" = ( /obj/structure/fence, /obj/structure/cable{ @@ -54023,6 +53918,10 @@ /mob/living/simple_animal/crab/kreb, /turf/open/floor/holofloor/beach, /area/edina/crew_quarters/store/pet) +"fUG" = ( +/obj/structure/table/wood, +/turf/open/floor/carpet/orange, +/area/command/heads_quarters/ce) "fVP" = ( /obj/structure/streetdecor/lampfestive{ pixel_x = 16; @@ -54146,6 +54045,15 @@ }, /turf/open/floor/wood, /area/commons/dorms) +"hgb" = ( +/obj/machinery/atmospherics/pipe/simple/yellow/visible{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/portables_connector/layer3{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "hie" = ( /obj/structure/bookcase/random/adult, /turf/open/floor/wood, @@ -54228,6 +54136,10 @@ }, /turf/open/floor/festive/wooden/wooden1, /area/edina/crew_quarters/store/pet) +"hBk" = ( +/obj/effect/landmark/start/chief_engineer, +/turf/open/floor/carpet/orange, +/area/command/heads_quarters/ce) "hER" = ( /obj/machinery/rnd/production/circuit_imprinter, /obj/effect/decal/festive/christmas_ivy_string, @@ -54242,6 +54154,22 @@ /obj/item/hatchet, /turf/open/floor/carpet/orange, /area/commons/storage/tools) +"hKj" = ( +/obj/docking_port/stationary{ + dir = 4; + dwidth = 2; + height = 5; + id = "laborcamp_home"; + name = "fore bay 1"; + roundstart_template = /datum/map_template/shuttle/labour/delta; + width = 9 + }, +/turf/open/floor/grass/snow/edina, +/area/edina) +"hLe" = ( +/obj/structure/chair/pew, +/turf/open/floor/carpet/green, +/area/medical/surgery) "hMn" = ( /obj/structure/streetdecor/lampfestive{ pixel_x = 16; @@ -54418,6 +54346,14 @@ }, /turf/open/floor/plasteel/cafeteria, /area/maintenance/bar/cafe) +"iQh" = ( +/obj/structure/table/wood/fancy/blue, +/obj/item/flashlight/lamp{ + pixel_x = 4; + pixel_y = 8 + }, +/turf/open/floor/carpet/blue, +/area/commons/cryopod) "jdx" = ( /obj/machinery/door/airlock/wood/glass{ name = "Hotel" @@ -54525,6 +54461,11 @@ }, /turf/open/floor/wood, /area/commons/dorms) +"kaF" = ( +/obj/effect/decal/festive/christmas_ivy_string, +/obj/structure/chair/pew, +/turf/open/floor/carpet/green, +/area/medical/surgery) "kda" = ( /obj/structure/window/reinforced{ dir = 8 @@ -54850,6 +54791,13 @@ /obj/effect/decal/festive/christmas_ivy_string, /turf/open/floor/circuit/off, /area/science) +"mRs" = ( +/obj/structure/bookcase/random/religion, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/festive/wooden/wooden1, +/area/commons/lounge) "mRx" = ( /obj/machinery/light/floor{ alpha = 0; @@ -55033,6 +54981,11 @@ /obj/item/coin/iron, /turf/open/floor/wood, /area/commons/dorms) +"okc" = ( +/obj/effect/decal/festive/christmas_ivy_string, +/obj/structure/chair/pew/right, +/turf/open/floor/carpet/green, +/area/medical/surgery) "olL" = ( /obj/structure/fireplace, /turf/open/floor/wood, @@ -55115,6 +55068,13 @@ /mob/living/simple_animal/jacq/car_spawner, /turf/open/floor/festive/sidewalk, /area/edina/street/primary/servitor) +"oWb" = ( +/obj/machinery/light/small{ + brightness = 3; + dir = 4 + }, +/turf/open/floor/plasteel, +/area/commons/fitness/recreation) "oWw" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 1 @@ -55218,6 +55178,15 @@ /obj/item/phone, /turf/open/floor/wood, /area/maintenance/bar) +"pyF" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 8 + }, +/obj/structure/streetdecor/lampfestive{ + pixel_y = 16 + }, +/turf/open/floor/festive/sidewalk, +/area/edina/street/primary/perimeter) "pBd" = ( /mob/living/simple_animal/jacq/car_spawner, /turf/open/floor/festive/alleyway, @@ -55278,6 +55247,10 @@ color = "#967832" }, /area/edina/backstreet/supply) +"pRa" = ( +/obj/structure/chair/pew/right, +/turf/open/floor/carpet/green, +/area/medical/surgery) "pRU" = ( /obj/structure/table/plasmaglass, /obj/item/integrated_electronics/analyzer, @@ -55388,6 +55361,10 @@ /obj/structure/closet/secure_closet/freezer/kitchen/maintenance, /turf/open/floor/wood, /area/maintenance/bar) +"qUP" = ( +/obj/structure/dresser, +/turf/open/floor/wood, +/area/command/heads_quarters/ce) "qVq" = ( /obj/effect/decal/festive/red_stockings, /turf/closed/indestructible/riveted/boss, @@ -55539,6 +55516,9 @@ }, /turf/open/floor/festive/alleyway, /area/science) +"rGH" = ( +/turf/open/floor/wood, +/area/command/heads_quarters/ce) "rKc" = ( /obj/structure/sign/poster/contraband/lusty_xenomorph{ pixel_x = 32 @@ -55765,6 +55745,15 @@ /obj/structure/table, /turf/open/floor/plasteel/white, /area/commons/dorms) +"toY" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/layer3{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/yellow/visible{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "twg" = ( /obj/structure/fence{ dir = 4 @@ -55869,6 +55858,10 @@ /mob/living/simple_animal/mouse/white, /turf/open/floor/festive/wooden/wooden2, /area/edina/crew_quarters/store/pet) +"ulj" = ( +/obj/structure/table/wood, +/turf/open/floor/wood, +/area/command/heads_quarters/ce) "uma" = ( /obj/structure/bonfire, /turf/open/floor/wood, @@ -55886,6 +55879,10 @@ /obj/effect/decal/festive/fairylights, /turf/open/indestructible/airblock, /area/science) +"uyg" = ( +/obj/effect/landmark/start/head_of_security, +/turf/open/floor/carpet/red, +/area/command/heads_quarters/hos) "uAY" = ( /turf/closed/festive/redbrick/redbrickcornersw, /area/commons/dorms) @@ -55962,6 +55959,9 @@ "uZS" = ( /turf/open/indestructible/cobble, /area/edina) +"vdN" = ( +/turf/open/floor/carpet/orange, +/area/command/heads_quarters/ce) "vgD" = ( /obj/structure/sign/directions/cells, /turf/closed/wall/mineral/iron, @@ -56352,6 +56352,15 @@ /obj/item/phone, /turf/open/floor/wood, /area/maintenance/bar) +"xFf" = ( +/obj/structure/bed/double{ + dir = 1 + }, +/obj/item/bedsheet/ce/double{ + dir = 1 + }, +/turf/open/floor/wood, +/area/command/heads_quarters/ce) "xGM" = ( /obj/structure/table/wood/fancy/red, /obj/item/reagent_containers/food/snacks/waffles, @@ -64542,13 +64551,13 @@ aoQ aoQ azc aoQ -azX +hgb aoQ aoQ aoQ azc aoQ -azX +hgb aoQ aoQ aoQ @@ -65544,12 +65553,12 @@ aal aal aad aad -aad -aad -aad -aad -aad -aad +amu +amu +amu +amu +amu +amu akI aoQ atB @@ -65801,12 +65810,12 @@ aal aal aad aad -aad -aad -aad -aad -aad -aad +amu +awA +bBo +rGH +xFf +fyx akI aoQ atA @@ -66058,12 +66067,12 @@ aal aal aad aad -aad -aad -aad -aad -aad -aad +amu +ayY +fUG +vdN +vdN +ulj akI asK aoQ @@ -66141,7 +66150,7 @@ bqC bqA btZ bvn -bww +bwv bqA aal aal @@ -66315,12 +66324,12 @@ aal aal aad aad -aad -aad -aad -aad -aad -aad +amu +aMH +vdN +hBk +vdN +qUP ajK ajK ajK @@ -66572,12 +66581,12 @@ aal aal aal aad -aad -aad -aad -aad -aad -aad +amu +aMH +rGH +rGH +rGH +fGL ajK arf arS @@ -66830,7 +66839,7 @@ aal aal aad amu -amu +bww amu amu amu @@ -68407,7 +68416,7 @@ aCM aoQ aoQ aoQ -aBM +toY aoQ aIf aoQ @@ -70770,7 +70779,10 @@ aIz aGl aGl aGl -ckP +aGl +aGl +aGl +aIz aGl aGl aGl @@ -70788,9 +70800,6 @@ aGl aGl aGl aGl -aGl -aGl -aGl ckP aGl aGl @@ -72608,7 +72617,7 @@ aWt aRT aFK aVo -ckP +aGl biS chD chP @@ -73122,7 +73131,7 @@ aVo aZH aFK bdM -aGl +ckP aGl acQ acQ @@ -74921,7 +74930,7 @@ aVo aQG aFK aVo -ckP +aGl cpE chJ chU @@ -75435,7 +75444,7 @@ aVo aQG aUY aVo -aGl +ckP cpE chK bdI @@ -75911,10 +75920,10 @@ bjY bdd bdd bdd +oWb bdd bdd -bdd -bdd +oWb bdd bdd bdd @@ -78409,11 +78418,11 @@ amF amF amF amF -amF asL amF amF amF +amF adw aFq aLG @@ -79250,11 +79259,11 @@ aTt aUh bwE bxo -byk +hLe bzd bzO bAv -bBo +bBp bCf bDe bbR @@ -79478,7 +79487,7 @@ aPL aMb aSD aTf -aSG +cTr aUe aUH aMb @@ -79506,8 +79515,8 @@ aVt aTt aUh bwE -bxn -byk +kaF +hLe bzd bzP bAw @@ -79763,8 +79772,8 @@ aVt aTt aUh bwD -bxn -byk +okc +pRa bze bzQ bAx @@ -80432,8 +80441,8 @@ aal aal aal aeY -afE -agf +agJ +agh agH ahn ahL @@ -80689,7 +80698,7 @@ aal acZ aal aeY -afF +agh agg agI aho @@ -80946,7 +80955,7 @@ aal aal aal aeY -afG +agH agh agJ ahn @@ -83645,10 +83654,10 @@ bUf bUR bUS bWT -bXO +mRs bXO bWT -caa +ejZ caa bUf cnO @@ -88977,7 +88986,7 @@ aKo aMv aKT aws -aMH +aRF aNw aOm aPj @@ -91514,7 +91523,7 @@ aEA aEA aEA aEA -aEW +aEA aEA aEA aEA @@ -91626,7 +91635,7 @@ ctv ctz cts ctF -ctH +cIQ pVt wQO bvU @@ -93314,7 +93323,7 @@ aCT aCT aCT aCT -aFa +aCT aCT aCT aCT @@ -93829,7 +93838,7 @@ aED aED aED aED -aED +aEG alo akz akQ @@ -94697,7 +94706,7 @@ ccV ccV ccV rxL -cdh +iQh cjR cde cde @@ -95474,14 +95483,14 @@ cde cde ccV cnO -aGl +coI aQG aFK aVo aQG aFK aVo -aGl +bfc cpF aal aal @@ -96245,14 +96254,14 @@ cde cde ctf cnO -coI +aGl aQG aFK aVo aQG aFK bdM -bfc +aGl cpF cxA cyb @@ -97794,7 +97803,7 @@ aFK aFK aFK aVo -beB +pyF cpF cxA cxA @@ -98308,7 +98317,7 @@ aWt aQG aFK aVo -cxs +beB cpF cnB cxA @@ -104097,7 +104106,7 @@ amm amX ano arF -apb +uyg apb aqB ard @@ -106485,7 +106494,7 @@ bSl bSl bnY bpb -bqw +btL bqw bqw bqw @@ -107448,11 +107457,11 @@ amz amz amz amd -awA +awz amd amd amd -ayY +awz amd amd amd @@ -107704,13 +107713,13 @@ aal aal aal aal -aal +amd ayL +amd aal -aal -aal -aal -aal +amd +ayL +amd aal aal aal @@ -107962,7 +107971,7 @@ aal aal aal aal -aal +hKj aal aal aal From f92ea0c54b9a0b420e398cd6eb76aba49085e26c Mon Sep 17 00:00:00 2001 From: TripleShades Date: Sun, 19 Dec 2021 17:23:28 -0500 Subject: [PATCH 3/9] Update FestiveStation.dmm --- .../map_files/FestiveBall/FestiveStation.dmm | 669 ++++++++++++------ 1 file changed, 461 insertions(+), 208 deletions(-) diff --git a/_maps/map_files/FestiveBall/FestiveStation.dmm b/_maps/map_files/FestiveBall/FestiveStation.dmm index 52f9d5b15e..6c1a3bad62 100644 --- a/_maps/map_files/FestiveBall/FestiveStation.dmm +++ b/_maps/map_files/FestiveBall/FestiveStation.dmm @@ -17723,9 +17723,9 @@ /turf/open/floor/festive/cobblestone, /area/edina/street/intersection/princessperimeter/north) "aTy" = ( -/obj/effect/festive/street/sidewalkn, -/turf/open/floor/festive/cobblestone, -/area/edina/street/primary/perimeter) +/obj/machinery/door/airlock/wood/glass, +/turf/open/floor/wood, +/area/commons/dorms) "aTz" = ( /turf/closed/festive/greybrick, /area/commons/dorms) @@ -37750,6 +37750,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/indestructible, /area/cargo/warehouse) "bOP" = ( @@ -40461,6 +40464,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/festive/white_alleyway{ color = "#967832" }, @@ -40752,13 +40756,14 @@ /turf/closed/festive/greybrick, /area/service/janitor) "bVp" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/floor/festive/white_alleyway{ - color = "#967832" +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 }, -/area/edina/backstreet/supply) +/turf/open/floor/festive/sidewalk, +/area/edina/street/primary/perimeter) "bVq" = ( /obj/effect/festive/street/streetlinesw, /turf/open/floor/festive/cobblestone, @@ -40867,6 +40872,7 @@ "bVF" = ( /obj/structure/grille, /obj/structure/festive/redbrick/windowNSRightEnd, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/festive/redbrick, /area/security/checkpoint/supply) "bVG" = ( @@ -42986,12 +42992,9 @@ /turf/open/floor/festive/alleyway, /area/edina/backstreet/supply) "caz" = ( -/obj/structure/streetdecor/lampfestive{ - pixel_x = -8; - pixel_y = -5 - }, -/turf/open/floor/festive/sidewalk, -/area/edina/street/primary/perimeter) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/festive/alleyway, +/area/science) "caA" = ( /obj/machinery/door/airlock/public/glass{ name = "Hydroponics"; @@ -46854,6 +46857,9 @@ /area/edina/street/primary/servitor) "cjv" = ( /obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/festive/white_alleyway{ color = "#967832" }, @@ -49236,17 +49242,15 @@ /turf/open/floor/festive/sidewalk, /area/edina/street/intersection/servsuppaux) "coI" = ( -/obj/structure/streetdecor/lampfestive{ - pixel_x = 8 - }, -/turf/open/floor/festive/sidewalk, -/area/edina/street/primary/perimeter) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/festive/alleyway, +/area/edina/backstreet/med) "coJ" = ( -/obj/structure/streetdecor/lampfestive{ - pixel_x = -8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, -/turf/open/floor/festive/sidewalk, -/area/edina/street/primary/perimeter) +/turf/open/floor/festive/alleyway, +/area/edina/backstreet/med) "coK" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -49369,6 +49373,9 @@ /obj/structure/streetdecor/lampfestive{ pixel_x = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/festive/sidewalk, /area/edina/street/intersection/servsuppaux) "cpb" = ( @@ -49376,6 +49383,9 @@ /obj/effect/turf_decal/arrows/white{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/festive/cobblestone, /area/edina/street/intersection/servsuppaux) "cpc" = ( @@ -49551,6 +49561,9 @@ /area/edina/street/primary/perimeter) "cpJ" = ( /obj/effect/festive/street/streetlineeast, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/festive/cobblestone, /area/edina/street/intersection/servsuppaux) "cpK" = ( @@ -49703,6 +49716,9 @@ /obj/structure/streetdecor/lampfestive{ pixel_x = -8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/festive/sidewalk, /area/edina/street/intersection/servsuppaux) "cqk" = ( @@ -50024,6 +50040,9 @@ /area/edina/street/primary/servitor) "crd" = ( /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/festive/sidewalk, /area/edina/street/intersection/servsuppaux) "cre" = ( @@ -50429,6 +50448,9 @@ pixel_x = -8; pixel_y = 20 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/festive/sidewalk, /area/edina/street/intersection/princessservitor) "csk" = ( @@ -50964,16 +50986,25 @@ pixel_x = 8; pixel_y = 16 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/festive/sidewalk, /area/edina/street/intersection/servsuppaux) "ctL" = ( /obj/effect/festive/street/streetlinewest, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/festive/cobblestone, /area/edina/street/intersection/servsuppaux) "ctM" = ( /obj/effect/festive/street/streetlineeast, /obj/effect/turf_decal/arrows/white, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/festive/cobblestone, /area/edina/street/intersection/servsuppaux) "ctN" = ( @@ -50981,6 +51012,9 @@ pixel_x = -8; pixel_y = 16 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/festive/sidewalk, /area/edina/street/intersection/servsuppaux) "ctO" = ( @@ -51817,9 +51851,11 @@ /turf/closed/wall/mineral/wood/nonmetal, /area/maintenance/bar) "cvT" = ( -/obj/effect/festive/street/sidewalkn, -/turf/open/floor/festive/cobblestone, -/area/edina/street/intersection/princessperimeter/south) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, +/turf/open/floor/festive/alleyway, +/area/edina/backstreet/med) "cvU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, @@ -52045,6 +52081,9 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, /turf/open/floor/plasteel, /area/cargo/storage) "cwA" = ( @@ -52176,6 +52215,9 @@ /obj/effect/turf_decal/arrows/white{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/festive/cobblestone, /area/edina/street/intersection/princessperimeter/south) "cwU" = ( @@ -52184,6 +52226,9 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/festive/cobblestone, /area/edina/street/primary/perimeter) "cwV" = ( @@ -52370,10 +52415,11 @@ /turf/open/floor/festive/wooden/wooden1, /area/maintenance/bar/cafe) "cxF" = ( -/obj/machinery/door/airlock/wood, -/obj/effect/decal/festive/christmas_reef, -/turf/open/floor/wood, -/area/maintenance/bar) +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/festive/cobblestone, +/area/edina/street/intersection/servsuppaux) "cxG" = ( /obj/machinery/light{ dir = 8; @@ -52591,47 +52637,46 @@ /turf/open/floor/wood, /area/maintenance/bar) "cyr" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/festive/sidewalk, +/area/edina/street/intersection/servsuppaux) +"cys" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/decal/festive/fairylights, /obj/structure/chair/sofa/left{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/decal/festive/fairylights, -/turf/open/floor/wood, -/area/maintenance/bar) -"cys" = ( -/obj/structure/table/glass, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/decal/festive/fairylights, /turf/open/floor/wood, /area/maintenance/bar) "cyt" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 + dir = 10 }, -/obj/machinery/airalarm/directional/north, -/obj/effect/decal/festive/fairylights, -/turf/open/floor/wood, -/area/maintenance/bar) +/turf/open/floor/festive/sidewalk, +/area/edina/street/primary/servitor) "cyu" = ( -/obj/structure/table/glass, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, /obj/effect/decal/festive/fairylights, +/obj/machinery/vending/boozeomat{ + pixel_y = 31 + }, /turf/open/floor/wood, /area/maintenance/bar) "cyv" = ( -/obj/structure/chair/sofa/right{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/festive/fairylights, +/obj/structure/table/glass, /turf/open/floor/wood, /area/maintenance/bar) "cyw" = ( @@ -52768,20 +52813,19 @@ /turf/open/floor/wood, /area/maintenance/bar) "cyW" = ( -/obj/structure/table/glass, -/turf/open/floor/wood, -/area/maintenance/bar) +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/indestructible, +/area/cargo/storage) "cyX" = ( -/obj/structure/table/glass, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, /turf/open/floor/wood, /area/maintenance/bar) "cyY" = ( -/obj/structure/chair/sofa{ - dir = 8 - }, +/obj/structure/table/glass, /turf/open/floor/wood, /area/maintenance/bar) "cyZ" = ( @@ -53019,19 +53063,18 @@ /turf/open/floor/wood, /area/maintenance/bar) "czP" = ( -/obj/structure/chair/sofa{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/wood, -/area/maintenance/bar) +/turf/open/indestructible, +/area/cargo/storage) "czQ" = ( -/obj/structure/table/glass, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/structure/chair/sofa/right{ + dir = 4 + }, /turf/open/floor/wood, /area/maintenance/bar) "czR" = ( @@ -53039,15 +53082,16 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, +/obj/machinery/chem_dispenser/drinks/fullupgrade{ + dir = 1 + }, /turf/open/floor/wood, /area/maintenance/bar) "czS" = ( -/obj/structure/chair/sofa{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/structure/table/glass, /turf/open/floor/wood, /area/maintenance/bar) "czT" = ( @@ -53146,41 +53190,33 @@ /turf/open/floor/wood, /area/maintenance/bar) "cAr" = ( -/obj/structure/chair/sofa/right{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/wood, -/area/maintenance/bar) +/turf/open/indestructible, +/area/cargo/storage) "cAs" = ( -/obj/structure/table/glass, -/obj/machinery/chem_dispenser/drinks/beer/fullupgrade{ - dir = 1 - }, /obj/machinery/light{ light_color = "#c9d3e8" }, /turf/open/floor/wood, /area/maintenance/bar) "cAu" = ( -/obj/structure/table/glass, -/obj/machinery/chem_dispenser/drinks/fullupgrade{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 }, -/turf/open/floor/wood, -/area/maintenance/bar) +/turf/open/indestructible, +/area/cargo/storage) "cAv" = ( -/obj/structure/table/glass, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, /turf/open/floor/wood, /area/maintenance/bar) "cAw" = ( -/obj/structure/chair/sofa/left{ - dir = 8 - }, -/turf/open/floor/wood, -/area/maintenance/bar) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/indestructible, +/area/cargo/storage) "cAx" = ( /turf/closed/festive/greybrick/greybrickcornersw, /area/edina/street/primary/perimeter) @@ -53456,6 +53492,18 @@ }, /turf/open/floor/plasteel, /area/engineering/main) +"cDt" = ( +/obj/effect/turf_decal/weather/snow/corner{ + color = "#FFFFFF"; + dir = 4 + }, +/obj/effect/turf_decal/weather/snow/corner{ + color = "#FFFFFE"; + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/festive/alleyway, +/area/edina/backstreet/supply) "cGh" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 4 @@ -53559,6 +53607,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/edina) +"dhz" = ( +/obj/machinery/door/airlock/wood, +/obj/effect/decal/festive/christmas_reef, +/turf/open/floor/wood, +/area/maintenance/bar) "dkq" = ( /obj/item/reagent_containers/food/snacks/cheesewedge, /turf/open/floor/festive/wooden/wooden2, @@ -53663,6 +53716,20 @@ icon_state = "wood-broken4" }, /area/commons/dorms) +"enm" = ( +/obj/effect/turf_decal/weather/snow/corner{ + color = "#FFFFFF"; + dir = 4 + }, +/obj/effect/turf_decal/weather/snow/corner{ + color = "#FFFFFE"; + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 + }, +/turf/open/floor/festive/alleyway, +/area/edina/backstreet/supply) "eoy" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -53857,6 +53924,10 @@ }, /turf/open/floor/wood, /area/maintenance/bar) +"ftC" = ( +/obj/structure/flora/tree/dead, +/turf/open/floor/grass, +/area/edina) "fwK" = ( /turf/open/floor/plasteel/white, /area/commons/dorms) @@ -53878,6 +53949,13 @@ /mob/living/simple_animal/crab, /turf/open/floor/holofloor/beach, /area/edina/crew_quarters/store/pet) +"fCo" = ( +/obj/effect/festive/street/streetlinenorth, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, +/turf/open/floor/festive/cobblestone, +/area/edina/street/primary/perimeter) "fCF" = ( /obj/effect/decal/festive/christmas_ivy_string, /turf/open/floor/carpet/blue, @@ -54069,6 +54147,16 @@ /mob/living/simple_animal/mouse/gray, /turf/open/floor/festive/wooden/wooden2, /area/edina/crew_quarters/store/pet) +"hkj" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/decal/festive/fairylights, +/obj/structure/chair/sofa/right{ + dir = 8 + }, +/turf/open/floor/wood, +/area/maintenance/bar) "hlu" = ( /obj/machinery/seed_extractor, /obj/effect/turf_decal/tile/green, @@ -54247,6 +54335,15 @@ /obj/effect/decal/festive/holly, /turf/closed/indestructible/riveted/boss, /area/science) +"inO" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/festive/sidewalk, +/area/edina/street/primary/perimeter) "ior" = ( /obj/machinery/light/floor{ alpha = 0; @@ -54303,6 +54400,15 @@ }, /turf/open/indestructible/airblock, /area/science) +"iCT" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/chair/sofa/left{ + dir = 8 + }, +/turf/open/floor/wood, +/area/maintenance/bar) "iFP" = ( /mob/living/simple_animal/jacq/car_spawner, /turf/open/floor/grass/snow/edina, @@ -54447,6 +54553,10 @@ /obj/effect/decal/festive/christmas_ivy_string, /turf/open/floor/circuit/off, /area/science) +"jSU" = ( +/obj/structure/flora/grass/green, +/turf/open/floor/grass, +/area/edina) "jUo" = ( /obj/structure/table/plasmaglass, /turf/open/floor/circuit/off, @@ -54539,6 +54649,16 @@ }, /turf/open/floor/festive/alleyway, /area/edina/street/secondary/castle) +"kBi" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/table/glass, +/obj/machinery/chem_dispenser/drinks/beer/fullupgrade{ + dir = 1 + }, +/turf/open/floor/wood, +/area/maintenance/bar) "kSC" = ( /obj/structure/toilet{ dir = 4 @@ -54766,6 +54886,13 @@ /obj/structure/chair/wood/normal, /turf/open/floor/carpet/orange, /area/maintenance/bar) +"mtg" = ( +/obj/effect/turf_decal/weather/snow/corner, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 + }, +/turf/open/floor/festive/alleyway, +/area/edina/backstreet/supply) "mua" = ( /turf/open/floor/carpet/royalblack, /area/maintenance/bar) @@ -54821,6 +54948,10 @@ /obj/item/stock_parts/cell/hyper, /turf/open/floor/circuit/off, /area/science) +"mTB" = ( +/obj/structure/flora/grass/both, +/turf/open/floor/grass, +/area/edina) "mUg" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/machinery/light{ @@ -54941,6 +55072,10 @@ }, /turf/open/floor/holofloor/beach, /area/edina/crew_quarters/store/pet) +"nXv" = ( +/obj/structure/flora/grass/brown, +/turf/open/floor/grass, +/area/edina) "nZW" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 8 @@ -55301,6 +55436,13 @@ }, /turf/open/floor/circuit/off, /area/science) +"qcq" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/table/glass, +/turf/open/floor/wood, +/area/maintenance/bar) "qkz" = ( /obj/effect/decal/festive/fairylights, /turf/open/floor/carpet/royalblue, @@ -55336,6 +55478,12 @@ }, /turf/open/floor/circuit/off, /area/science) +"qzx" = ( +/obj/structure/chair/sofa{ + dir = 8 + }, +/turf/open/floor/wood, +/area/maintenance/bar) "qzA" = ( /obj/structure/table/glass, /obj/item/stack/sheet/bone, @@ -55637,6 +55785,18 @@ /obj/effect/decal/festive/christmas_reef, /turf/open/floor/wood, /area/service/cafeteria/lunchroom) +"szb" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/table/glass, +/obj/item/reagent_containers/food/drinks/shaker{ + pixel_x = -9; + pixel_y = 7 + }, +/obj/item/reagent_containers/rag, +/turf/open/floor/wood, +/area/maintenance/bar) "sEK" = ( /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; @@ -55658,6 +55818,17 @@ /obj/effect/decal/festive/fairylights, /turf/open/indestructible, /area/cargo) +"sOG" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/decal/festive/fairylights, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/wood, +/area/maintenance/bar) "sQo" = ( /turf/open/floor/plasteel/white/side{ dir = 4 @@ -55764,6 +55935,13 @@ /obj/effect/decal/festive/green_stockings, /turf/closed/indestructible/riveted/hierophant, /area/science) +"txb" = ( +/obj/effect/turf_decal/weather/snow/corner, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/festive/alleyway, +/area/edina/backstreet/supply) "tyL" = ( /obj/structure/streetdecor/lampfestive{ pixel_x = 8 @@ -55808,6 +55986,13 @@ /obj/item/bedsheet/random, /turf/open/floor/festive/wooden/wooden1, /area/maintenance/bar) +"tRh" = ( +/obj/structure/flora/tree/pine/xmas{ + pixel_x = 2; + pixel_y = 14 + }, +/turf/open/floor/carpet, +/area/commons/dorms) "tRk" = ( /obj/machinery/nanite_programmer, /turf/open/floor/circuit/off, @@ -55816,6 +56001,16 @@ /obj/structure/chair/wood/wings, /turf/open/floor/carpet/royalblack, /area/maintenance/bar) +"tTe" = ( +/obj/effect/turf_decal/weather/snow/corner{ + color = "#FFFFFF"; + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 + }, +/turf/open/floor/festive/alleyway, +/area/edina/backstreet/supply) "tTL" = ( /obj/machinery/door/window/westleft, /turf/open/floor/carpet/royalblue, @@ -55824,6 +56019,16 @@ /mob/living/simple_animal/kiwi, /turf/open/floor/grass, /area/edina) +"tWU" = ( +/obj/effect/festive/street/streetlinenorth, +/obj/effect/turf_decal/arrows/white{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/festive/cobblestone, +/area/edina/street/primary/perimeter) "tXg" = ( /obj/structure/table/glass, /obj/item/toy/fluff/tennis_poly/tri/squeak/rainbow, @@ -55886,6 +56091,10 @@ "uAY" = ( /turf/closed/festive/redbrick/redbrickcornersw, /area/commons/dorms) +"uBp" = ( +/obj/structure/flora/rock/pile/icy, +/turf/open/floor/grass, +/area/edina) "uBB" = ( /obj/structure/closet/crate/freezer{ desc = "A small crate with a cooling system, keeps fresh produce chilled."; @@ -56284,6 +56493,16 @@ }, /turf/open/floor/festive/alleyway, /area/edina) +"xcA" = ( +/obj/effect/festive/street/streetlinewest, +/obj/effect/turf_decal/arrows/white{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/festive/cobblestone, +/area/edina/street/primary/perimeter) "xkz" = ( /obj/effect/festive/street/streetlineem, /mob/living/simple_animal/jacq/car_spawner, @@ -56329,11 +56548,22 @@ }, /turf/open/floor/plating/beach/sand, /area/edina) +"xyb" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/closed/festive/whitebrick{ + color = "#967832" + }, +/area/cargo/storage) "xyu" = ( /obj/effect/decal/festive/fairylights, /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/indestructible, /area/cargo/warehouse) "xzs" = ( @@ -56437,6 +56667,29 @@ /obj/item/phone, /turf/open/floor/carpet/red, /area/maintenance/bar) +"yiY" = ( +/obj/structure/table/glass, +/obj/item/reagent_containers/food/drinks/bottle/patron{ + pixel_x = -6; + pixel_y = 16 + }, +/obj/item/reagent_containers/food/drinks/bottle/absinthe/premium{ + pixel_x = 7; + pixel_y = 14 + }, +/obj/item/reagent_containers/food/drinks/bottle/fernet{ + pixel_y = 11 + }, +/obj/item/reagent_containers/food/drinks/bottle/gin{ + pixel_x = -7; + pixel_y = 3 + }, +/obj/item/reagent_containers/food/drinks/bottle/whiskey{ + pixel_x = 7; + pixel_y = 4 + }, +/turf/open/floor/wood, +/area/maintenance/bar) "yjk" = ( /obj/structure/table, /obj/item/reagent_containers/food/condiment/saltshaker{ @@ -72521,7 +72774,7 @@ aVf aZr aTU bco -aJq +bVp bfl bkl brV @@ -72533,8 +72786,8 @@ bkl bkl brV bkl -aGl -aGl +bkl +bkl bkl bkl bkl @@ -72552,7 +72805,7 @@ bkl bkl bkl bkl -caz +brV bkl bkl bkl @@ -72563,7 +72816,7 @@ brV bkl bkl bkl -aGl +bkl cfb cgD cjT @@ -76162,7 +76415,7 @@ bel bfC aVv bFs -bFu +coJ bNb bNb bNb @@ -76419,7 +76672,7 @@ bem bfC aVv bFs -bFu +coJ bNt bNt bNt @@ -76676,7 +76929,7 @@ aYd bfD aVv bFs -bHZ +bHQ bNu bkF blD @@ -76933,7 +77186,7 @@ aYd bfE aVv bFs -bHZ +bHQ bNw bkG blE @@ -77190,7 +77443,7 @@ ben bfF aVv bFs -bHZ +bHQ bNu bkH blF @@ -77447,7 +77700,7 @@ beo bfG aVv bFs -bHZ +bHQ bNu bkI blG @@ -77704,7 +77957,7 @@ bep bfH aVv bFs -bHZ +bHQ bNu bkJ blH @@ -77961,7 +78214,7 @@ aYe bfI aVv bFs -bHZ +bHQ bNu bkG blI @@ -78218,7 +78471,7 @@ bbw aVv aVv bFs -bHZ +bHQ bNu bkF blJ @@ -78469,13 +78722,13 @@ cdw cdw cdw cdw -ezS -aKT -ezS +cdw +caz cdw cdw -bFu -bFu +cdw +coI +cvT bNb bkK blK @@ -89895,7 +90148,7 @@ alv aTz apa apa -apa +aTy apa apa apa @@ -91951,7 +92204,7 @@ alv aTz apa apa -apa +aTy apa apa apa @@ -93659,7 +93912,7 @@ cra cpr crE crS -clh +bke csC clt clt @@ -93684,8 +93937,8 @@ clt clt clt cvN -ctH -cvT +cvQ +cvR ctu cty ctu @@ -93941,8 +94194,8 @@ csP ccV csW cnO -aGl -aQG +bdS +coU aFK aVo aZH @@ -94198,8 +94451,8 @@ cde cde csX cnO -aGl -aQG +bdS +coU aFK cpq aQG @@ -94456,7 +94709,7 @@ cde ctf cnO bdS -aQG +coU aFK aVo aQG @@ -94713,7 +94966,7 @@ cde ccV cnH bdS -aQG +coU aFK aVo aQG @@ -94969,8 +95222,8 @@ cdf cdf ctg cvO -aGl -aQG +bdS +coU aUm aVo aQG @@ -95226,8 +95479,8 @@ cdi cdi cto bgn -aGl -aQG +bdS +coU aFK aVo aQG @@ -95483,8 +95736,8 @@ cde cde ccV cnO -coI -aQG +cow +coU aFK aVo aQG @@ -95741,7 +95994,7 @@ cde csX cnO bdS -aQG +coU aFK aVo aQG @@ -95789,7 +96042,7 @@ aTz aTz bKC cbh -apa +aTy alv cgU ciL @@ -95965,7 +96218,7 @@ cdy cdy cdy clw -coH +cre crf cpc crW @@ -95998,7 +96251,7 @@ cde ctp cnO bdS -aQG +coU aFK aVo aQG @@ -96254,8 +96507,8 @@ cde cde ctf cnO -aGl -aQG +bdS +coU aFK aVo aQG @@ -96511,8 +96764,8 @@ evB evB ccV cnO -aGl -aQG +bdS +coU aFK aVo aQG @@ -96736,7 +96989,7 @@ ceL ceL ceL clL -cpc +cxF cpc cpc cpc @@ -96769,7 +97022,7 @@ ccV ccV cnO bdS -aSB +tWU aFK aWt aQG @@ -97000,7 +97253,7 @@ cpc cpc cpc crW -coH +cre coH clv cmk @@ -97025,7 +97278,7 @@ clv clv clv cvP -aHh +inO cwU cwZ cwZ @@ -97282,8 +97535,8 @@ clz clz clz bgn -coI -aQG +cow +coU aFK aVo aZH @@ -97539,8 +97792,8 @@ cmB cmB cmB coh -aMl -aSw +xcA +coY aFK aYV aSw @@ -97771,7 +98024,7 @@ cpc cpc cpc cpc -cpc +cxF ctS cmg cmg @@ -97796,8 +98049,8 @@ cmg cmg cmg cnM -aFK -aFK +cht +ceP aFK aFK aFK @@ -98053,8 +98306,8 @@ cmh cmh cnF cnN -aIO -aPv +cox +coZ aFK aVe aPv @@ -98310,8 +98563,8 @@ clz clz clz bgn -coJ -aSB +coy +tWU aFK aWt aQG @@ -98542,7 +98795,7 @@ cuI cuJ cuH cuK -cuF +cyr cuL cuM aZa @@ -98567,8 +98820,8 @@ cmi cmi cmi coi -aGl -aTy +bdS +coX cpo aTV aTV @@ -99853,7 +100106,7 @@ cat ceZ cok coK -aQG +coW aFK aVo aQG @@ -101369,7 +101622,7 @@ crb cmv bQG crb -ckO +cyt csN ciz cuN @@ -102668,7 +102921,7 @@ bSv bSR bTv bDN -bQO +mtg bVF cej cer @@ -102925,7 +103178,7 @@ bSv bSR bTw bDN -bQO +txb bVG cek ces @@ -103182,7 +103435,7 @@ cjL cjN bOM bDN -bQO +txb bVG cel cet @@ -103439,7 +103692,7 @@ cbC cjv bDB bEP -bQO +txb bVI cem ceu @@ -103696,7 +103949,7 @@ cbC cjv bEP bEP -bQO +txb bVJ bVJ bVJ @@ -103708,7 +103961,7 @@ cwP cwP cwQ cwS -aQG +fCo aFK aVo aQG @@ -103717,11 +103970,11 @@ aVo aGl cpF cvS -cyr -cyQ -cyQ -czP -cAr +cym +cwl +cwl +czM +cwl cvS brL cAM @@ -103953,9 +104206,9 @@ cbC cjv bEV bEV -bEV -cqC -cqC +tTe +cDt +enm cqC cqC cqC @@ -103975,10 +104228,10 @@ aGl cpF cvS cys -cyW -cyW +cyQ +cyQ czQ -cyW +cwl cvS brL cAM @@ -104212,7 +104465,7 @@ bTz bTQ bUt bDF -bDF +xyb bDF bDF bDF @@ -104230,11 +104483,11 @@ aFK aVo aGl aGl -cxF -cyl -cwl -cwl -czM +cvS +qcq +cyY +cyY +czS cAs cvS brL @@ -104464,7 +104717,7 @@ ciJ bDF cjJ cck -bQQ +cAr bQQ bQQ bQQ @@ -104487,12 +104740,12 @@ aFK aVo aGl cpF -cvS -cyt +dhz +cym cwl cwl -czM -cyW +kBi +cwl cvS brL cAM @@ -104721,7 +104974,7 @@ bDF bDF cjK ccM -bQQ +cAr bQQ bQQ bQQ @@ -104745,11 +104998,11 @@ aVo bfd cpF cvS -cyn +sOG +yiY cwl +szb cwl -czM -cAu cvS brL cAM @@ -104977,12 +105230,12 @@ cbb cjw cjx bOQ -bQQ -bQQ -bQQ -bQQ -bQQ -bQQ +cyW +cAu +cAw +cAw +cAw +cAw bWK bXE bYs @@ -105004,7 +105257,7 @@ cpF cvS cyu cyX -cyW +cwl czR cAv cvS @@ -105263,7 +105516,7 @@ cyv cyY cyY czS -cAw +cwl cvS brL cAM @@ -105491,7 +105744,7 @@ ceX bDF cjz bQQ -bQQ +cyW bQQ bOR bQQ @@ -105516,10 +105769,10 @@ coO coO cpM cvS -cym -cwl -cwl -czM +hkj +qzx +qzx +iCT cwl cvS brL @@ -105748,7 +106001,7 @@ bVL bNy bOQ bQQ -bQQ +cyW bQQ bQQ bQQ @@ -105995,7 +106248,7 @@ bBN bCQ bSt bUG -bVp +bSu bSu bSu bSu @@ -106005,7 +106258,7 @@ bSu bSU bTx caD -bQQ +czP bQQ bOR bQQ @@ -106795,7 +107048,7 @@ aal cvS bSj ccO -cwl +czT cwq cwB cwJ @@ -111158,7 +111411,7 @@ cqD aEQ aTz cpt -cpt +jSU aad aad aad @@ -111416,7 +111669,7 @@ crJ aTz cpt cpt -cpt +uBp aad aad aad @@ -111672,7 +111925,7 @@ aER crK aTz cpt -cpt +rKC cpt aad aad @@ -112184,7 +112437,7 @@ apa apa adO apa -apa +aTy cpt cpt cpt @@ -112700,7 +112953,7 @@ cqH aDn aTz cpt -cpt +ftC cpt aad aad @@ -112950,7 +113203,7 @@ aad aad aTz cnl -cnl +tRh apa cqf aDn @@ -113470,7 +113723,7 @@ aTz aTz aTz aTz -cpt +nXv cpt aad aad @@ -113722,7 +113975,7 @@ aad aad aad aad -cpt +mTB cpt cpt cpt From 226a299aff06a8819a26f38936d7ff5c004978c2 Mon Sep 17 00:00:00 2001 From: TripleShades Date: Sun, 19 Dec 2021 17:29:01 -0500 Subject: [PATCH 4/9] Update dirt.dm --- code/game/turfs/simulated/floor/plating/dirt.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/game/turfs/simulated/floor/plating/dirt.dm b/code/game/turfs/simulated/floor/plating/dirt.dm index b9bcc0937b..f7f4633254 100644 --- a/code/game/turfs/simulated/floor/plating/dirt.dm +++ b/code/game/turfs/simulated/floor/plating/dirt.dm @@ -19,3 +19,11 @@ /turf/open/floor/plating/dirt/try_replace_tile(obj/item/stack/tile/T, mob/user, params) return + +/turf/open/floor/plating/dirt/space + baseturfs = /turf/baseturf_bottom + planetary_atmos = FALSE + desc = "Upon closer examination there's plating beneath the dirt." + +/turf/open/floor/plating/dirt/space/airless + initial_gas_mix = AIRLESS_ATMOS From a13f15660e8a47889786581b472735aca0ee4e1b Mon Sep 17 00:00:00 2001 From: TripleShades Date: Sun, 19 Dec 2021 17:42:11 -0500 Subject: [PATCH 5/9] Update FestiveStation.dmm --- .../map_files/FestiveBall/FestiveStation.dmm | 1992 ++++++++--------- 1 file changed, 972 insertions(+), 1020 deletions(-) diff --git a/_maps/map_files/FestiveBall/FestiveStation.dmm b/_maps/map_files/FestiveBall/FestiveStation.dmm index 6c1a3bad62..48597498e3 100644 --- a/_maps/map_files/FestiveBall/FestiveStation.dmm +++ b/_maps/map_files/FestiveBall/FestiveStation.dmm @@ -4571,9 +4571,7 @@ color = "#FFFFFE"; dir = 9 }, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "alL" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -4594,9 +4592,7 @@ color = "#FFFFFE"; dir = 5 }, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "alO" = ( /obj/effect/spawner/structure/window/plasma/reinforced, @@ -4779,9 +4775,7 @@ dir = 4 }, /obj/structure/festive/trainplatform/secorner, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "amr" = ( /obj/effect/turf_decal/stripes/line{ @@ -4794,9 +4788,7 @@ /area/ai_monitored/command/storage/eva) "ams" = ( /obj/structure/festive/trainplatform/edge_west, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "amt" = ( /turf/open/floor/festive/stairs/stairseast, @@ -6135,9 +6127,7 @@ /obj/structure/fence{ dir = 4 }, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "apJ" = ( /obj/effect/turf_decal/weather/snow/corner{ @@ -6146,9 +6136,7 @@ /obj/structure/fence{ dir = 4 }, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "apK" = ( /obj/machinery/door/airlock/command{ @@ -23675,9 +23663,7 @@ /obj/structure/fence{ dir = 4 }, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "bjT" = ( /obj/effect/festive/street/streetlineeast, @@ -27109,17 +27095,13 @@ /obj/structure/fence{ dir = 4 }, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "brL" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 1 }, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "brM" = ( /obj/effect/festive/trainrails/north{ @@ -27128,9 +27110,7 @@ /obj/structure/fence{ dir = 4 }, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "brN" = ( /obj/structure/chair/wood/normal, @@ -29645,9 +29625,7 @@ /area/command/heads_quarters/cmo) "bxO" = ( /obj/structure/festive/trainplatform/edge_east, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "bxP" = ( /obj/effect/turf_decal/tile/blue{ @@ -33704,9 +33682,7 @@ /obj/structure/fence{ dir = 4 }, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "bGr" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -34606,27 +34582,21 @@ width = 20 }, /obj/structure/festive/trainplatform/edge_west, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "bIe" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 4 }, /obj/structure/festive/trainplatform/necorner, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "bIf" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 1 }, /obj/structure/fence, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "bIg" = ( /obj/effect/festive/street/sidewalkwem, @@ -35549,9 +35519,7 @@ roundstart_template = /datum/map_template/shuttle/mining/delta; width = 7 }, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "bKg" = ( /obj/structure/festive/greybrick/windowWELeftEnd, @@ -35953,16 +35921,12 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 5 }, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "bKY" = ( /obj/effect/festive/trainrails/north, /obj/structure/fence, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "bKZ" = ( /obj/effect/festive/street/sidewalke, @@ -36381,9 +36345,7 @@ dir = 4 }, /obj/structure/festive/trainplatform/edge_west, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "bLR" = ( /obj/structure/table/wood, @@ -36558,9 +36520,7 @@ "bMl" = ( /obj/effect/festive/trainrails/south, /obj/structure/fence, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "bMm" = ( /obj/structure/closet/cardboard, @@ -36890,9 +36850,7 @@ "bMR" = ( /obj/effect/turf_decal/weather/snow/corner, /obj/structure/fence, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "bMS" = ( /obj/structure/table/wood, @@ -37816,9 +37774,7 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 1 }, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "bOZ" = ( /obj/effect/turf_decal/weather/snow/corner{ @@ -40220,9 +40176,7 @@ name = "Cargo Bay"; width = 12 }, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "bTZ" = ( /obj/structure/toilet/secret/low_loot, @@ -43665,9 +43619,7 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 8 }, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "cbK" = ( /obj/structure/grille, @@ -44220,9 +44172,7 @@ dir = 1 }, /obj/structure/festive/trainplatform/nwcorner, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "cdo" = ( /obj/effect/turf_decal/weather/snow/corner, @@ -45240,9 +45190,7 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 1 }, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "cfF" = ( /obj/structure/sign/poster/official/walk{ @@ -46014,9 +45962,7 @@ color = "#FFFFFF"; dir = 4 }, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "cht" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -51030,18 +50976,14 @@ /area/edina/street/intersection/servsuppaux) "ctQ" = ( /obj/effect/turf_decal/weather/snow/corner, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "ctR" = ( /obj/effect/turf_decal/weather/snow/corner, /obj/effect/turf_decal/weather/snow/corner{ dir = 4 }, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "ctS" = ( /obj/effect/festive/street/sidewalkwem, @@ -53283,24 +53225,18 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "cAI" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 1 }, /obj/structure/festive/trainplatform/necorner, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "cAJ" = ( /obj/structure/festive/trainplatform/edge_south, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "cAL" = ( /obj/structure/fluff/lightpost/light, @@ -53308,65 +53244,49 @@ /area/maintenance/bar) "cAM" = ( /obj/effect/festive/trainrails/north, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "cAN" = ( /obj/effect/festive/trainrails/north, /obj/effect/festive/trainrails/north, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "cAO" = ( /obj/effect/festive/trainrails/north, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "cAP" = ( /obj/effect/festive/trainrails/north{ icon_state = "trainrails_turn_int" }, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "cAQ" = ( /obj/effect/festive/trainrails/south, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "cAR" = ( /obj/effect/festive/trainrails/south, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "cAS" = ( /obj/effect/festive/trainrails/north{ icon_state = "trainrails_turn_ext" }, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "cAT" = ( /obj/effect/turf_decal/weather/snow/corner, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "cAV" = ( /obj/structure/cable{ @@ -54132,6 +54052,12 @@ }, /turf/open/floor/plasteel, /area/engineering/atmos) +"hgH" = ( +/obj/effect/festive/trainrails/north{ + icon_state = "trainrails_east" + }, +/turf/open/floor/plating/dirt/space, +/area/edina) "hie" = ( /obj/structure/bookcase/random/adult, /turf/open/floor/wood, @@ -54233,6 +54159,12 @@ /obj/effect/decal/festive/christmas_ivy_string, /turf/open/floor/circuit/off, /area/science) +"hHm" = ( +/obj/effect/festive/trainrails/north{ + icon_state = "trainrails_west" + }, +/turf/open/floor/plating/dirt/space, +/area/edina) "hHy" = ( /obj/structure/closet/crate, /obj/item/storage/fancy/candle_box, @@ -54896,6 +54828,9 @@ "mua" = ( /turf/open/floor/carpet/royalblack, /area/maintenance/bar) +"mvh" = ( +/turf/open/floor/plating/dirt/space, +/area/edina) "mwL" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -55125,6 +55060,12 @@ /obj/structure/fireplace, /turf/open/floor/wood, /area/commons/dorms) +"onZ" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 4 + }, +/turf/open/floor/plating/dirt/space, +/area/edina) "orN" = ( /obj/machinery/light/small, /turf/open/floor/mineral/titanium/blue, @@ -55382,6 +55323,13 @@ color = "#967832" }, /area/edina/backstreet/supply) +"pQH" = ( +/obj/effect/turf_decal/weather/snow/corner{ + color = "#FFFFFE"; + dir = 8 + }, +/turf/open/floor/plating/dirt/space, +/area/edina) "pRa" = ( /obj/structure/chair/pew/right, /turf/open/floor/carpet/green, @@ -56221,9 +56169,7 @@ /area/edina) "vAa" = ( /obj/structure/fluff/lightpost/light, -/turf/open/floor/plating/dirt{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, +/turf/open/floor/plating/dirt/space, /area/edina) "vBV" = ( /obj/structure/window/reinforced{ @@ -56503,6 +56449,12 @@ }, /turf/open/floor/festive/cobblestone, /area/edina/street/primary/perimeter) +"xjW" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 8 + }, +/turf/open/floor/plating/dirt/space, +/area/edina) "xkz" = ( /obj/effect/festive/street/streetlineem, /mob/living/simple_animal/jacq/car_spawner, @@ -60543,7 +60495,7 @@ aad aad aac aZu -btg +mvh cAM cAQ aac @@ -60800,10 +60752,10 @@ aad aad aac aZu -btg +mvh cAM cAQ -btg +mvh aZu aac aac @@ -61057,10 +61009,10 @@ aad aad aac aZu -btg +mvh cAM cAQ -btg +mvh aZu aac aac @@ -61314,10 +61266,10 @@ aad aad aac aZu -btg +mvh cAM cAQ -btg +mvh aZu aac aac @@ -61571,10 +61523,10 @@ aal aad aad aZu -btg +mvh cAM cAQ -btg +mvh aZu aac aac @@ -67949,54 +67901,54 @@ bqA bqA aal alK -btf -btf -btf +pQH +pQH +pQH bjS +pQH +pQH +pQH +pQH +pQH +pQH +pQH +pQH +pQH +pQH +pQH +pQH +pQH +pQH +pQH +pQH +pQH btf -btf -btf -btf -btf -btf -btf -btf -btf -btf -btf -btf -btf -btf -btf -btf -btf -btf -btf -btf -btf -btf -btf -btf -btf -btf -btf -btf -btf -btf -btf -btf -btf -btf -btf -btf -btf -btf -btf -btf -btf -btf -btf -btg +pQH +pQH +pQH +pQH +pQH +pQH +pQH +pQH +pQH +pQH +pQH +pQH +pQH +pQH +pQH +pQH +pQH +pQH +pQH +pQH +pQH +pQH +pQH +pQH +pQH +mvh cAM cAQ ctQ @@ -68206,54 +68158,54 @@ bqA aal aal brL -aaf -aaf -aaf +hHm +hHm +hHm brK -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm cAM cAQ ctQ @@ -68463,54 +68415,54 @@ bqH aal aal brL -aag -aag -aag +hgH +hgH +hgH brM +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH cAM cAQ ctQ @@ -68763,11 +68715,11 @@ ams ams ams bIe -aah -aah -aah -aah -btg +onZ +onZ +onZ +onZ +mvh cAM cAQ ctQ @@ -96009,7 +95961,7 @@ bAd bAd bAd byv -btg +mvh cAM cAQ ctQ @@ -96266,7 +96218,7 @@ cxA cxA cxA aSx -btg +mvh cAM cAQ ctQ @@ -96523,7 +96475,7 @@ czg cyc cxA aSx -btg +mvh cAM cAQ ctQ @@ -96780,7 +96732,7 @@ cyc cyc cxA aSx -btg +mvh cAM cAQ ctQ @@ -97037,7 +96989,7 @@ cyd cyd cxC aSx -btg +mvh cAM cAQ ctQ @@ -97294,7 +97246,7 @@ cye cye cxD aSx -btg +mvh cAM cAQ ctQ @@ -97551,7 +97503,7 @@ czh czh cxD aSx -btg +mvh cAM cAQ ctQ @@ -97808,7 +97760,7 @@ cyc cyc cxE aSx -btg +mvh cAM cAQ ctQ @@ -98065,7 +98017,7 @@ czi czi cAk aSx -btg +mvh cAM cAQ ctQ @@ -98322,7 +98274,7 @@ cyM cyM cxA aSx -btg +mvh cAM cAQ ctQ @@ -98579,7 +98531,7 @@ czj cyM cxA aSx -btg +mvh cAM cAQ ctQ @@ -98836,7 +98788,7 @@ cyM cyM cxA aSx -btg +mvh cAM cAQ ctQ @@ -99093,7 +99045,7 @@ czk cxA cxA aSx -btg +mvh cAM cAQ ctQ @@ -99350,7 +99302,7 @@ cyM czG cxA cAE -btg +mvh cAM cAQ ctQ @@ -99607,7 +99559,7 @@ czl czl cxA cAF -btg +mvh cAM cAQ ctQ @@ -99864,7 +99816,7 @@ cxA cxA cxA cAG -btg +mvh cAM cAQ ctQ @@ -108056,19 +108008,19 @@ aal aal aal bOY -aae -aae -aae -aae +xjW +xjW +xjW +xjW bTY -aae -aae -aae -aae -aae -aae -aae -aae +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW cbJ aal aal @@ -108195,9 +108147,9 @@ aac aac aac aac -btg -btg -btg +mvh +mvh +mvh ctQ aal aal @@ -108313,19 +108265,19 @@ aal aal aal brL -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh ctQ aal aal @@ -108428,38 +108380,38 @@ aad aad aac aZu -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh aac -btg -btg -btg -btg -aae -aae -aae -aae +mvh +mvh +mvh +mvh +xjW +xjW +xjW +xjW bxO bxO bxO @@ -108467,142 +108419,142 @@ bxO bxO bxO bxO -aae -aae -aae +xjW +xjW +xjW apI -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW apI -aae -aae -aae -aae -aae -aae -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae +xjW +xjW +xjW +xjW +xjW +xjW +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW apI -aae -aae -btg +xjW +xjW +mvh bKf -btg -aae -aae -aae +mvh +xjW +xjW +xjW apI -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW apI -aae -aae -aae -aae -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -aae -btg +xjW +xjW +xjW +xjW +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +xjW +mvh cAM cAQ ctQ @@ -108685,181 +108637,181 @@ aad aad aac aZu -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm +hHm cAP cAQ ctQ @@ -108942,182 +108894,182 @@ aad aad aac aZu -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH +hgH cAS ctQ aal @@ -109199,38 +109151,38 @@ aad aad aac aZu -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh aac -btg -btg -btg -btg -aah -aah -aah -aah +mvh +mvh +mvh +mvh +onZ +onZ +onZ +onZ bLQ bLQ bLQ @@ -109238,144 +109190,144 @@ bLQ bLQ bLQ bLQ -aah -aah -aah +onZ +onZ +onZ apJ -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ apJ -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ apJ -aah -aah -aah -aah -aah -aah -aah -aah +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ apJ -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ apJ -aah -aah -aah -aah -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -btg -btg -btg +onZ +onZ +onZ +onZ +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +onZ +mvh +mvh +mvh ctQ aad aad @@ -109481,8 +109433,8 @@ aac aac aac aac -btg -btg +mvh +mvh ctQ aal aal @@ -109598,19 +109550,19 @@ aal aal aal brL -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg -btg +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh +mvh ctQ aal aal @@ -109631,8 +109583,8 @@ aad aad aad brL -btg -btg +mvh +mvh ctQ aad aad @@ -109889,7 +109841,7 @@ aad aad brL vAa -btg +mvh ctQ aad aad @@ -110145,8 +110097,8 @@ aad aad aad brL -btg -btg +mvh +mvh ctQ aad aad @@ -110402,8 +110354,8 @@ aad aad aad brL -btg -btg +mvh +mvh ctQ aad aad @@ -110659,8 +110611,8 @@ aad aad aad brL -btg -btg +mvh +mvh ctQ aad aad From d0eb0e1e3a00a7c55290d6456314f9e5c3cdbd76 Mon Sep 17 00:00:00 2001 From: TripleShades Date: Sun, 19 Dec 2021 18:40:15 -0500 Subject: [PATCH 6/9] Update FestiveStation.dmm --- .../map_files/FestiveBall/FestiveStation.dmm | 1862 ++++++++--------- 1 file changed, 931 insertions(+), 931 deletions(-) diff --git a/_maps/map_files/FestiveBall/FestiveStation.dmm b/_maps/map_files/FestiveBall/FestiveStation.dmm index 48597498e3..deef713ccc 100644 --- a/_maps/map_files/FestiveBall/FestiveStation.dmm +++ b/_maps/map_files/FestiveBall/FestiveStation.dmm @@ -53523,6 +53523,12 @@ /obj/item/reagent_containers/rag/towel, /turf/open/floor/plasteel/cafeteria, /area/maintenance/bar/cafe) +"dgn" = ( +/obj/effect/festive/trainrails/north{ + icon_state = "trainrails_east" + }, +/turf/open/floor/plating/dirt/space, +/area/edina) "dgB" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, @@ -53933,6 +53939,12 @@ /obj/item/clothing/head/festive, /turf/open/floor/carpet/orange, /area/maintenance/bar) +"fXg" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 8 + }, +/turf/open/floor/plating/dirt/space, +/area/edina) "fZm" = ( /obj/structure/chair/sofa/left{ dir = 1; @@ -53969,6 +53981,12 @@ }, /turf/open/floor/festive/alleyway, /area/edina/street/secondary/castle) +"gnR" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 4 + }, +/turf/open/floor/plating/dirt/space, +/area/edina) "gpj" = ( /obj/structure/bed/dogbed, /mob/living/simple_animal/pet/fox, @@ -54052,12 +54070,6 @@ }, /turf/open/floor/plasteel, /area/engineering/atmos) -"hgH" = ( -/obj/effect/festive/trainrails/north{ - icon_state = "trainrails_east" - }, -/turf/open/floor/plating/dirt/space, -/area/edina) "hie" = ( /obj/structure/bookcase/random/adult, /turf/open/floor/wood, @@ -54159,12 +54171,6 @@ /obj/effect/decal/festive/christmas_ivy_string, /turf/open/floor/circuit/off, /area/science) -"hHm" = ( -/obj/effect/festive/trainrails/north{ - icon_state = "trainrails_west" - }, -/turf/open/floor/plating/dirt/space, -/area/edina) "hHy" = ( /obj/structure/closet/crate, /obj/item/storage/fancy/candle_box, @@ -54536,6 +54542,9 @@ /obj/effect/decal/festive/holly, /turf/open/indestructible/airblock, /area/science) +"kld" = ( +/turf/open/floor/plating/dirt/space, +/area/edina) "klL" = ( /obj/structure/bed, /obj/item/bedsheet, @@ -54828,9 +54837,6 @@ "mua" = ( /turf/open/floor/carpet/royalblack, /area/maintenance/bar) -"mvh" = ( -/turf/open/floor/plating/dirt/space, -/area/edina) "mwL" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -55060,12 +55066,6 @@ /obj/structure/fireplace, /turf/open/floor/wood, /area/commons/dorms) -"onZ" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 4 - }, -/turf/open/floor/plating/dirt/space, -/area/edina) "orN" = ( /obj/machinery/light/small, /turf/open/floor/mineral/titanium/blue, @@ -55306,6 +55306,13 @@ /obj/effect/decal/festive/green_stockings, /turf/closed/indestructible/riveted/boss, /area/science) +"pNf" = ( +/obj/effect/turf_decal/weather/snow/corner{ + color = "#FFFFFE"; + dir = 8 + }, +/turf/open/floor/plating/dirt/space, +/area/edina) "pOy" = ( /obj/effect/turf_decal/bot, /obj/machinery/hydroponics/constructable, @@ -55323,13 +55330,6 @@ color = "#967832" }, /area/edina/backstreet/supply) -"pQH" = ( -/obj/effect/turf_decal/weather/snow/corner{ - color = "#FFFFFE"; - dir = 8 - }, -/turf/open/floor/plating/dirt/space, -/area/edina) "pRa" = ( /obj/structure/chair/pew/right, /turf/open/floor/carpet/green, @@ -55982,6 +55982,12 @@ /obj/item/toy/fluff/tennis_poly/tri/squeak/rainbow, /turf/open/floor/carpet/royalblue, /area/edina/crew_quarters/store/pet) +"ucp" = ( +/obj/effect/festive/trainrails/north{ + icon_state = "trainrails_west" + }, +/turf/open/floor/plating/dirt/space, +/area/edina) "udo" = ( /obj/structure/chair, /turf/open/floor/plating/beach/sand, @@ -56449,12 +56455,6 @@ }, /turf/open/floor/festive/cobblestone, /area/edina/street/primary/perimeter) -"xjW" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 8 - }, -/turf/open/floor/plating/dirt/space, -/area/edina) "xkz" = ( /obj/effect/festive/street/streetlineem, /mob/living/simple_animal/jacq/car_spawner, @@ -60495,7 +60495,7 @@ aad aad aac aZu -mvh +kld cAM cAQ aac @@ -60752,10 +60752,10 @@ aad aad aac aZu -mvh +kld cAM cAQ -mvh +kld aZu aac aac @@ -61009,10 +61009,10 @@ aad aad aac aZu -mvh +kld cAM cAQ -mvh +kld aZu aac aac @@ -61266,10 +61266,10 @@ aad aad aac aZu -mvh +kld cAM cAQ -mvh +kld aZu aac aac @@ -61523,10 +61523,10 @@ aal aad aad aZu -mvh +kld cAM cAQ -mvh +kld aZu aac aac @@ -67901,54 +67901,54 @@ bqA bqA aal alK -pQH -pQH -pQH +pNf +pNf +pNf bjS -pQH -pQH -pQH -pQH -pQH -pQH -pQH -pQH -pQH -pQH -pQH -pQH -pQH -pQH -pQH -pQH -pQH +pNf +pNf +pNf +pNf +pNf +pNf +pNf +pNf +pNf +pNf +pNf +pNf +pNf +pNf +pNf +pNf +pNf btf -pQH -pQH -pQH -pQH -pQH -pQH -pQH -pQH -pQH -pQH -pQH -pQH -pQH -pQH -pQH -pQH -pQH -pQH -pQH -pQH -pQH -pQH -pQH -pQH -pQH -mvh +pNf +pNf +pNf +pNf +pNf +pNf +pNf +pNf +pNf +pNf +pNf +pNf +pNf +pNf +pNf +pNf +pNf +pNf +pNf +pNf +pNf +pNf +pNf +pNf +pNf +kld cAM cAQ ctQ @@ -68158,54 +68158,54 @@ bqA aal aal brL -hHm -hHm -hHm +ucp +ucp +ucp brK -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp cAM cAQ ctQ @@ -68415,54 +68415,54 @@ bqH aal aal brL -hgH -hgH -hgH +dgn +dgn +dgn brM -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn aag -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn cAM cAQ ctQ @@ -68715,11 +68715,11 @@ ams ams ams bIe -onZ -onZ -onZ -onZ -mvh +gnR +gnR +gnR +gnR +kld cAM cAQ ctQ @@ -95961,7 +95961,7 @@ bAd bAd bAd byv -mvh +kld cAM cAQ ctQ @@ -96218,7 +96218,7 @@ cxA cxA cxA aSx -mvh +kld cAM cAQ ctQ @@ -96475,7 +96475,7 @@ czg cyc cxA aSx -mvh +kld cAM cAQ ctQ @@ -96732,7 +96732,7 @@ cyc cyc cxA aSx -mvh +kld cAM cAQ ctQ @@ -96989,7 +96989,7 @@ cyd cyd cxC aSx -mvh +kld cAM cAQ ctQ @@ -97246,7 +97246,7 @@ cye cye cxD aSx -mvh +kld cAM cAQ ctQ @@ -97503,7 +97503,7 @@ czh czh cxD aSx -mvh +kld cAM cAQ ctQ @@ -97760,7 +97760,7 @@ cyc cyc cxE aSx -mvh +kld cAM cAQ ctQ @@ -98017,7 +98017,7 @@ czi czi cAk aSx -mvh +kld cAM cAQ ctQ @@ -98274,7 +98274,7 @@ cyM cyM cxA aSx -mvh +kld cAM cAQ ctQ @@ -98531,7 +98531,7 @@ czj cyM cxA aSx -mvh +kld cAM cAQ ctQ @@ -98788,7 +98788,7 @@ cyM cyM cxA aSx -mvh +kld cAM cAQ ctQ @@ -99045,7 +99045,7 @@ czk cxA cxA aSx -mvh +kld cAM cAQ ctQ @@ -99302,7 +99302,7 @@ cyM czG cxA cAE -mvh +kld cAM cAQ ctQ @@ -99559,7 +99559,7 @@ czl czl cxA cAF -mvh +kld cAM cAQ ctQ @@ -99816,7 +99816,7 @@ cxA cxA cxA cAG -mvh +kld cAM cAQ ctQ @@ -108008,19 +108008,19 @@ aal aal aal bOY -xjW -xjW -xjW -xjW +fXg +fXg +fXg +fXg bTY -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg cbJ aal aal @@ -108147,9 +108147,9 @@ aac aac aac aac -mvh -mvh -mvh +kld +kld +kld ctQ aal aal @@ -108265,19 +108265,19 @@ aal aal aal brL -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld ctQ aal aal @@ -108380,38 +108380,38 @@ aad aad aac aZu -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld aac -mvh -mvh -mvh -mvh -xjW -xjW -xjW -xjW +kld +kld +kld +kld +fXg +fXg +fXg +fXg bxO bxO bxO @@ -108419,142 +108419,142 @@ bxO bxO bxO bxO -xjW -xjW -xjW +fXg +fXg +fXg apI -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg apI -xjW -xjW -xjW -xjW -xjW -xjW -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW +fXg +fXg +fXg +fXg +fXg +fXg +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg apI -xjW -xjW -mvh +fXg +fXg +kld bKf -mvh -xjW -xjW -xjW +kld +fXg +fXg +fXg apI -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg apI -xjW -xjW -xjW -xjW -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -xjW -mvh +fXg +fXg +fXg +fXg +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +fXg +kld cAM cAQ ctQ @@ -108637,181 +108637,181 @@ aad aad aac aZu -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm -hHm +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp +ucp cAP cAQ ctQ @@ -108894,182 +108894,182 @@ aad aad aac aZu -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH -hgH +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn +dgn cAS ctQ aal @@ -109151,38 +109151,38 @@ aad aad aac aZu -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld aac -mvh -mvh -mvh -mvh -onZ -onZ -onZ -onZ +kld +kld +kld +kld +gnR +gnR +gnR +gnR bLQ bLQ bLQ @@ -109190,144 +109190,144 @@ bLQ bLQ bLQ bLQ -onZ -onZ -onZ +gnR +gnR +gnR apJ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR apJ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR apJ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR apJ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR apJ -onZ -onZ -onZ -onZ -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -onZ -mvh -mvh -mvh +gnR +gnR +gnR +gnR +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +gnR +kld +kld +kld ctQ aad aad @@ -109433,8 +109433,8 @@ aac aac aac aac -mvh -mvh +kld +kld ctQ aal aal @@ -109550,19 +109550,19 @@ aal aal aal brL -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh -mvh +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld +kld ctQ aal aal @@ -109583,8 +109583,8 @@ aad aad aad brL -mvh -mvh +kld +kld ctQ aad aad @@ -109841,7 +109841,7 @@ aad aad brL vAa -mvh +kld ctQ aad aad @@ -110097,8 +110097,8 @@ aad aad aad brL -mvh -mvh +kld +kld ctQ aad aad @@ -110354,8 +110354,8 @@ aad aad aad brL -mvh -mvh +kld +kld ctQ aad aad @@ -110611,8 +110611,8 @@ aad aad aad brL -mvh -mvh +kld +kld ctQ aad aad From 0089b44df23c40e03e916efdf867931a245f8066 Mon Sep 17 00:00:00 2001 From: TripleShades Date: Thu, 23 Dec 2021 17:57:15 -0500 Subject: [PATCH 7/9] a --- .../map_files/FestiveBall/FestiveStation.dmm | 187 +++++++++--------- code/__DEFINES/atmospherics.dm | 3 + modular_citadel/code/modules/festive/turfs.dm | 4 +- 3 files changed, 101 insertions(+), 93 deletions(-) diff --git a/_maps/map_files/FestiveBall/FestiveStation.dmm b/_maps/map_files/FestiveBall/FestiveStation.dmm index deef713ccc..1b500dbde2 100644 --- a/_maps/map_files/FestiveBall/FestiveStation.dmm +++ b/_maps/map_files/FestiveBall/FestiveStation.dmm @@ -3886,13 +3886,6 @@ /turf/open/floor/festive/cobblestone, /area/edina/street/secondary/command) "ajN" = ( -/obj/machinery/button/door{ - id = "parkcomm"; - name = "Command Parking"; - pixel_x = 28; - pixel_y = 7; - req_one_access_txt = "2;19" - }, /obj/machinery/light/small{ dir = 4; light_color = "#d8b1b1" @@ -17390,6 +17383,7 @@ pixel_y = 32 }, /obj/item/storage/box/donkpockets, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, /turf/open/floor/wood, /area/science) "aSF" = ( @@ -33656,20 +33650,14 @@ /area/commons/dorms) "bGo" = ( /obj/machinery/button/door{ - id = "rdgarage"; - name = "Director's Garage Door"; - pixel_x = -7; - pixel_y = 26; - req_access_txt = "30" + id = "parkcomm"; + name = "Command Parking"; + pixel_x = -4; + pixel_y = 7; + req_one_access_txt = "2;19" }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 8 - }, -/turf/open/floor/festive/alleyway, -/area/edina/backstreet/med) +/turf/closed/festive/whitebrick, +/area/edina/street) "bGp" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 1 @@ -37862,6 +37850,13 @@ "bPj" = ( /obj/effect/festive/street/streetlineem, /obj/effect/festive/street/streetlinewm, +/obj/machinery/button/door{ + id = "chemistry_shutters"; + name = "chemical factory garage"; + pixel_x = 24; + pixel_y = 7; + req_access_txt = "5; 33" + }, /turf/open/floor/plasteel, /area/medical/chemistry) "bPk" = ( @@ -38895,6 +38890,7 @@ }, /obj/effect/turf_decal/tile/yellow, /obj/machinery/power/apc/auto_name{ + dir = 4; pixel_x = 30 }, /obj/structure/cable/yellow{ @@ -39810,20 +39806,15 @@ /turf/open/floor/festive/alleyway, /area/edina/backstreet/med) "bTk" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 1 - }, /obj/machinery/button/door{ - id = "weewoo"; - name = "Ambulance Garage button"; - pixel_y = 28; - req_access_txt = "5" + id = "rdgarage"; + name = "Director's Garage Door"; + pixel_x = -7; + pixel_y = -6; + req_access_txt = "30" }, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/festive/alleyway, -/area/medical/cryo) +/turf/closed/festive/whitebrick, +/area/command/heads_quarters/rd) "bTl" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 1 @@ -40303,16 +40294,12 @@ /area/commons/dorms) "bUs" = ( /obj/machinery/button/door{ - id = "qm_warehouse"; - name = "Warehouse Door Control"; - pixel_y = 24; - req_access_txt = "31" + id = "QMgarage"; + name = "Garage door button"; + pixel_y = -4 }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 1 - }, -/turf/open/floor/festive/alleyway, -/area/edina/backstreet/supply) +/turf/closed/festive/greybrick, +/area/service/kitchen) "bUt" = ( /obj/structure/grille, /obj/structure/festive/whitebrick/windowWELeftEnd, @@ -45912,22 +45899,16 @@ /turf/open/floor/festive/sidewalk, /area/edina/street/primary/servitor) "cho" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 1 - }, /obj/machinery/button/door{ - id = "QMgarage"; - name = "Garage door button"; - pixel_y = 28 + id = "qm_warehouse"; + name = "Warehouse Door Control"; + pixel_y = -8; + req_access_txt = "31" }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/turf/closed/festive/whitebrick{ + color = "#967832" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/festive/sidewalk, -/area/edina/street/primary/servitor) +/area/cargo/warehouse) "chp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -48849,22 +48830,17 @@ /turf/open/floor/festive/sidewalk, /area/edina/street/primary/perimeter) "cnS" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /obj/machinery/button/door{ - id = "clowngarage"; - name = "Garage Door"; - pixel_y = 28 + id = "chemistry_shutters"; + name = "chemical factory garage"; + pixel_x = -8; + pixel_y = -6; + req_access_txt = "5; 33" }, -/turf/open/floor/festive/sidewalk, -/area/edina/street/primary/perimeter) +/turf/closed/festive/whitebrick{ + color = "#ffe6a8" + }, +/area/medical/chemistry) "cnT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -52628,10 +52604,7 @@ /turf/open/floor/wood, /area/maintenance/bar) "cyx" = ( -/mob/living/simple_animal/hostile/tree/festivus{ - pixel_x = -17; - pixel_y = -13 - }, +/obj/effect/landmark/xmastree/rdrod, /turf/open/floor/festive/trainplatform, /area/maintenance/bar) "cyA" = ( @@ -52854,13 +52827,11 @@ /turf/open/floor/light, /area/maintenance/bar) "czq" = ( -/obj/structure/festive/trainplatform/edge_south, /obj/structure/chair/stool/bar, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/light, /area/maintenance/bar) "czr" = ( -/obj/structure/festive/trainplatform/edge_south, /obj/structure/chair/stool/bar, /turf/open/floor/light, /area/maintenance/bar) @@ -54600,6 +54571,15 @@ }, /turf/open/floor/wood, /area/maintenance/bar) +"kJH" = ( +/obj/machinery/button/door{ + id = "weewoo"; + name = "Ambulance Garage button"; + pixel_y = -5; + req_access_txt = "5" + }, +/turf/closed/festive/whitebrick, +/area/medical/cryo) "kSC" = ( /obj/structure/toilet{ dir = 4 @@ -54633,6 +54613,12 @@ }, /turf/open/floor/wood, /area/maintenance/bar) +"kYC" = ( +/obj/structure/festive/trainplatform/edge_north{ + pixel_y = -7 + }, +/turf/open/floor/festive/trainplatform, +/area/maintenance/bar) "kZN" = ( /obj/machinery/light, /turf/open/floor/plasteel/white/side{ @@ -54962,6 +54948,16 @@ /obj/machinery/chem_dispenser/drinks/beer/fullupgrade, /turf/open/floor/wood, /area/maintenance/bar) +"nxe" = ( +/obj/machinery/button/door{ + id = "clowngarage"; + name = "Garage Door"; + pixel_y = -4 + }, +/turf/closed/festive/whitebrick{ + color = "#fff200" + }, +/area/service/theater) "nzc" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -55498,6 +55494,13 @@ /obj/item/gun/magic/staff/healing, /turf/open/floor/circuit/off, /area/science) +"rgc" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/festive/trainplatform/edge_north{ + pixel_y = -7 + }, +/turf/open/floor/festive/trainplatform, +/area/maintenance/bar) "rgC" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 1 @@ -76142,7 +76145,7 @@ bIi bIi bIi bIi -bIi +cnS cjY bHZ bUJ @@ -79483,8 +79486,8 @@ bFw bNM bPs bRk -bnJ -bTk +kJH +bTl akc cub aGl @@ -79946,10 +79949,10 @@ aOP aOP aOP aOP -aMb +aRW aSE -aTg -aTg +aUf +aUf aUf aUI beI @@ -81505,8 +81508,8 @@ aYf aVO aVO aVO -aVO -bGo +bTk +bFZ bHZ bjZ bkO @@ -83093,8 +83096,8 @@ bUd ecw bUd ecw -bUd -cnS +nxe +cnO bdS coU aFK @@ -83207,7 +83210,7 @@ aal aba acj acj -aba +bGo aba aba aeG @@ -101822,8 +101825,8 @@ bWs bWs bwz bWs -bWs -cho +bUs +ccr ckO cmv bQG @@ -105683,8 +105686,8 @@ byT byT byT byT -byT -bUs +cho +bDN bUE bUH bUC @@ -107007,7 +107010,7 @@ cwJ bcC cwV cwV -cwV +rgc czq czT cAq @@ -107264,7 +107267,7 @@ aZh bdu cxH cyx -cwK +kYC czr cwl cAn @@ -107521,7 +107524,7 @@ cwL cwK cwK cwK -cwK +kYC czr cwl cwl diff --git a/code/__DEFINES/atmospherics.dm b/code/__DEFINES/atmospherics.dm index 1c6b7c21d4..c1e4f0af9b 100644 --- a/code/__DEFINES/atmospherics.dm +++ b/code/__DEFINES/atmospherics.dm @@ -160,6 +160,9 @@ //SNOSTATION #define ICEMOON_DEFAULT_ATMOS "ICEMOON_ATMOS" +//FESTIVESTATION +#define FESTIVE_ATMOS "o2=22;n2=82;TEMP=266" //this goes here right putnam?? + //ATMOSIA GAS MONITOR TAGS #define ATMOS_GAS_MONITOR_INPUT_O2 "o2_in" #define ATMOS_GAS_MONITOR_OUTPUT_O2 "o2_out" diff --git a/modular_citadel/code/modules/festive/turfs.dm b/modular_citadel/code/modules/festive/turfs.dm index baf33cc696..d48b7e4d79 100644 --- a/modular_citadel/code/modules/festive/turfs.dm +++ b/modular_citadel/code/modules/festive/turfs.dm @@ -9,7 +9,9 @@ light_color = "#00111a" //The light can technically cycle on a timer worldwide, but no daynight cycle. baseturfs = /turf/open/floor/grass/snow/edina //If we explode or die somehow, we just make more! Ahahaha!!! tiled_dirt = 0 //NO TILESMOOTHING DIRT/DIRT SPAWNS OR SOME SHIT - initial_gas_mix = OPENTURF_DEFAULT_ATMOS //DO NOT FREEZE EVERYONE TO DEATH ON CHRISTMAS + //initial_gas_mix = OPENTURF_DEFAULT_ATMOS //DO NOT FREEZE EVERYONE TO DEATH ON CHRISTMAS + initial_gas_mix = FESTIVE_ATMOS + planetary_atmos = 1 //Uses new!!! planetmos wow!!! maybe? //lets people build /turf/open/floor/grass/snow/edina/attackby(obj/item/C, mob/user, params) From 2de8cafa493e01717c5a6459185dc8aabdcd678f Mon Sep 17 00:00:00 2001 From: TripleShades Date: Fri, 24 Dec 2021 20:31:17 -0500 Subject: [PATCH 8/9] fuck --- .../map_files/FestiveBall/FestiveStation.dmm | 230 +++++++++--------- modular_citadel/code/modules/festive/turfs.dm | 25 ++ 2 files changed, 139 insertions(+), 116 deletions(-) diff --git a/_maps/map_files/FestiveBall/FestiveStation.dmm b/_maps/map_files/FestiveBall/FestiveStation.dmm index 1b500dbde2..dda657c782 100644 --- a/_maps/map_files/FestiveBall/FestiveStation.dmm +++ b/_maps/map_files/FestiveBall/FestiveStation.dmm @@ -811,14 +811,14 @@ id = "parkcomm"; name = "Command Parking" }, -/turf/open/floor/festive/cobblestone, +/turf/open/floor/festive/cobblestone/safe, /area/edina/street) "ack" = ( /obj/machinery/light/small{ dir = 1; light_color = "#ffc1c1" }, -/turf/open/floor/festive/cobblestone, +/turf/open/floor/festive/cobblestone/safe, /area/edina/street) "acl" = ( /obj/structure/table/reinforced, @@ -1064,7 +1064,7 @@ dir = 4; light_color = "#c1caff" }, -/turf/open/floor/festive/cobblestone, +/turf/open/floor/festive/cobblestone/safe, /area/edina/street) "acY" = ( /obj/machinery/light/floor, @@ -1163,7 +1163,7 @@ /area/command/heads_quarters/hop/private) "adr" = ( /obj/effect/festive/street/streetlinenm, -/turf/open/floor/festive/cobblestone, +/turf/open/floor/festive/cobblestone/safe, /area/edina/street) "ads" = ( /obj/machinery/light{ @@ -1302,7 +1302,7 @@ /obj/vehicle/sealed/vectorcraft/auto{ dir = 8 }, -/turf/open/floor/festive/cobblestone, +/turf/open/floor/festive/cobblestone/safe, /area/edina/street) "adS" = ( /obj/machinery/airalarm/directional/west, @@ -1401,7 +1401,7 @@ "aeh" = ( /obj/effect/festive/street/streetlinenm, /obj/effect/festive/street/streetlinesm, -/turf/open/floor/festive/cobblestone, +/turf/open/floor/festive/cobblestone/safe, /area/edina/street) "aei" = ( /obj/structure/table/wood/fancy/black, @@ -1508,11 +1508,11 @@ /obj/vehicle/sealed/vectorcraft/hop{ dir = 1 }, -/turf/open/floor/festive/cobblestone, +/turf/open/floor/festive/cobblestone/safe, /area/edina/street) "aev" = ( /obj/effect/turf_decal/delivery/white, -/turf/open/floor/festive/cobblestone, +/turf/open/floor/festive/cobblestone/safe, /area/edina/street) "aew" = ( /obj/structure/reagent_dispensers/water_cooler, @@ -4622,7 +4622,7 @@ /turf/open/floor/wood, /area/maintenance/starboard/fore) "alT" = ( -/turf/open/floor/festive/cobblestone, +/turf/open/floor/festive/cobblestone/safe, /area/edina/street) "alU" = ( /obj/effect/turf_decal/weather/snow/corner{ @@ -4706,7 +4706,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "ami" = ( /obj/structure/cable/yellow{ @@ -4715,7 +4715,7 @@ /obj/machinery/light{ dir = 1 }, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "amj" = ( /obj/structure/cable/yellow{ @@ -4727,14 +4727,14 @@ /obj/machinery/light{ dir = 1 }, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "amk" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/machinery/door/airlock/security/glass, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "aml" = ( /obj/structure/cable/yellow{ @@ -4743,20 +4743,20 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "amm" = ( -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "amn" = ( /obj/machinery/door/airlock/security/glass, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "amo" = ( /obj/machinery/light{ dir = 1 }, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "amp" = ( /obj/effect/festive/street/sidewalkw, @@ -4926,12 +4926,12 @@ /obj/effect/spawner/lootdrop/maintenance, /obj/structure/table, /obj/item/poster/random_official, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "amM" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/structure/closet/wardrobe/mixed, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "amN" = ( /obj/structure/cable/yellow{ @@ -4940,7 +4940,7 @@ /obj/effect/spawner/lootdrop/maintenance, /obj/structure/table, /obj/item/poster/random_official, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "amO" = ( /obj/structure/cable/yellow{ @@ -4951,7 +4951,7 @@ }, /obj/effect/spawner/lootdrop/maintenance, /obj/structure/closet/emcloset, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "amP" = ( /obj/structure/cable/yellow{ @@ -4963,7 +4963,7 @@ /obj/effect/spawner/lootdrop/maintenance, /obj/structure/table, /obj/item/poster/random_official, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "amQ" = ( /obj/structure/cable/yellow{ @@ -4974,7 +4974,7 @@ }, /obj/effect/spawner/lootdrop/maintenance, /obj/structure/closet/wardrobe/mixed, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "amR" = ( /obj/structure/cable/yellow{ @@ -4987,7 +4987,7 @@ /obj/structure/closet/crate{ icon_state = "crateopen" }, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "amS" = ( /obj/structure/cable/yellow{ @@ -4995,13 +4995,13 @@ }, /obj/effect/spawner/lootdrop/maintenance, /obj/structure/closet/wardrobe/mixed, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "amT" = ( /obj/machinery/light/small{ dir = 4 }, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "amU" = ( /obj/structure/cable/yellow, @@ -5011,36 +5011,36 @@ name = "Starboard Bow Maintenance APC"; pixel_y = -24 }, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "amV" = ( /obj/machinery/light/small{ dir = 8 }, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "amW" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/structure/rack, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "amX" = ( /obj/machinery/space_heater, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "amY" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/structure/closet/firecloset, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "amZ" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/structure/closet/emcloset, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "ana" = ( /obj/structure/reagent_dispensers/watertank, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "anb" = ( /turf/open/floor/plasteel/dark, @@ -5116,7 +5116,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "anl" = ( /turf/closed/wall/mineral/iron, @@ -5512,7 +5512,7 @@ /obj/structure/sign/poster/contraband/donut_corp{ pixel_y = -32 }, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "aoe" = ( /turf/closed/wall/mineral/iron, @@ -5540,7 +5540,7 @@ "aoh" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/structure/rack, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/service/bar/atrium) "aoi" = ( /obj/structure/closet/secure_closet/detective, @@ -6001,13 +6001,13 @@ /obj/machinery/light{ dir = 8 }, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "app" = ( /obj/structure/cable/yellow{ icon_state = "2-8" }, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "apq" = ( /obj/machinery/light{ @@ -6325,7 +6325,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "aqj" = ( /obj/effect/spawner/structure/window/reinforced, @@ -6922,7 +6922,7 @@ name = "8maintenance loot spawner" }, /obj/structure/table, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "arx" = ( /obj/structure/weightmachine/weightlifter, @@ -7769,7 +7769,7 @@ icon_state = "1-2" }, /obj/structure/closet/toolcloset, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "atD" = ( /obj/machinery/washing_machine, @@ -8072,14 +8072,14 @@ /obj/machinery/light{ dir = 8 }, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "aus" = ( /obj/structure/cable/yellow{ icon_state = "1-4" }, /obj/structure/closet/toolcloset, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "aut" = ( /obj/effect/turf_decal/tile/green, @@ -8642,7 +8642,7 @@ "avQ" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/structure/table, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "avR" = ( /obj/effect/turf_decal/tile/green{ @@ -9535,7 +9535,7 @@ }, /obj/effect/spawner/lootdrop/maintenance, /obj/structure/rack, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "ayb" = ( /obj/structure/cable/yellow{ @@ -9548,7 +9548,7 @@ /obj/structure/closet/wardrobe/mixed, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "ayc" = ( /obj/structure/cable/yellow{ @@ -9559,7 +9559,7 @@ }, /obj/effect/spawner/lootdrop/maintenance, /obj/structure/closet/cardboard, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "ayd" = ( /obj/structure/cable/yellow{ @@ -9568,7 +9568,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "aye" = ( /obj/structure/cable/yellow{ @@ -9579,7 +9579,7 @@ }, /obj/structure/table, /obj/item/flashlight/lamp, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "ayf" = ( /obj/structure/cable/yellow{ @@ -9591,7 +9591,7 @@ /obj/structure/table, /obj/item/folder/white, /obj/item/pen, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "ayg" = ( /obj/structure/cable/yellow{ @@ -9603,7 +9603,7 @@ pixel_y = 5 }, /obj/item/storage/fancy/donut_box, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "ayh" = ( /obj/effect/spawner/lootdrop/maintenance, @@ -9612,32 +9612,32 @@ lootcount = 8; name = "8maintenance loot spawner" }, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "ayi" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/structure/closet/wardrobe/mixed, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "ayj" = ( /obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "ayk" = ( /obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "ayl" = ( -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/security/brig) "aym" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/security/brig) "ayn" = ( /obj/structure/closet/secure_closet/brig{ @@ -9786,14 +9786,14 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "ayJ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/machinery/light, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "ayK" = ( /obj/structure/cable/yellow{ @@ -9802,7 +9802,7 @@ /obj/structure/chair/office/dark{ dir = 1 }, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "ayL" = ( /obj/machinery/door/airlock/external{ @@ -9817,13 +9817,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/maintenance/starboard/fore) "ayN" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/security/brig) "ayO" = ( /obj/structure/cable/yellow{ @@ -9836,7 +9836,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/security/brig) "ayP" = ( /obj/item/radio/intercom{ @@ -10274,7 +10274,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/security/brig) "aAb" = ( /obj/machinery/door/poddoor/preopen{ @@ -10296,7 +10296,7 @@ name = "Labor Shuttle"; req_access_txt = "63" }, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/security/processing) "aAd" = ( /obj/effect/turf_decal/delivery, @@ -10380,7 +10380,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/security/processing) "aAp" = ( /obj/effect/turf_decal/delivery, @@ -10439,7 +10439,7 @@ /turf/open/floor/festive/cobblestone, /area/science/robotics/mechbay) "aAy" = ( -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/security/processing) "aAz" = ( /obj/machinery/light, @@ -10472,7 +10472,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/service/bar/atrium) "aAF" = ( /obj/effect/festive/street/streetlinenorth, @@ -10521,7 +10521,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/security/processing) "aAL" = ( /obj/effect/spawner/structure/window/reinforced, @@ -10604,7 +10604,7 @@ /obj/item/radio/intercom{ pixel_x = -26 }, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/security/processing) "aBb" = ( /obj/machinery/light, @@ -10906,7 +10906,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/security/office) "aCa" = ( /turf/open/floor/engine/n2o, @@ -11052,7 +11052,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/service/bar/atrium) "aCx" = ( /obj/machinery/door/airlock/security/glass, @@ -11580,7 +11580,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/service/bar/atrium) "aEn" = ( /obj/structure/disposalpipe/segment{ @@ -11607,7 +11607,7 @@ /area/edina/street/secondary/command) "aEr" = ( /obj/effect/festive/street/sidewalknsm, -/turf/open/floor/festive/cobblestone, +/turf/open/floor/festive/cobblestone/safe, /area/edina/street) "aEs" = ( /obj/structure/chair/stool, @@ -13693,7 +13693,7 @@ /turf/open/floor/festive/sidewalk, /area/edina/street/primary/perimeter) "aJr" = ( -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/service/bar/atrium) "aJs" = ( /obj/structure/table/wood, @@ -13956,7 +13956,7 @@ /obj/effect/spawner/lootdrop/maintenance, /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/service/bar/atrium) "aJZ" = ( /obj/structure/table/wood, @@ -14216,7 +14216,7 @@ /obj/effect/spawner/lootdrop/maintenance, /obj/structure/closet/wardrobe/mixed, /obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/service/bar/atrium) "aKK" = ( /obj/machinery/chem_dispenser/drinks, @@ -14282,7 +14282,7 @@ /obj/machinery/light{ dir = 8 }, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/service/bar/atrium) "aKX" = ( /obj/machinery/chem_dispenser/drinks/beer, @@ -14525,7 +14525,7 @@ /obj/effect/spawner/lootdrop/maintenance, /obj/effect/spawner/lootdrop/maintenance, /obj/structure/rack, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/service/bar/atrium) "aLG" = ( /obj/structure/streetdecor/lampfestive{ @@ -15665,12 +15665,12 @@ "aOy" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/structure/table, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/service/bar/atrium) "aOz" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/structure/closet/firecloset, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/service/bar/atrium) "aOA" = ( /obj/effect/festive/street/streetliftedtile2, @@ -15678,7 +15678,7 @@ /area/edina/street/intersection/princessperimeter/north) "aOB" = ( /obj/structure/reagent_dispensers/watertank, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/service/bar/atrium) "aOC" = ( /obj/effect/spawner/lootdrop/maintenance, @@ -15687,16 +15687,16 @@ lootcount = 8; name = "8maintenance loot spawner" }, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/service/bar/atrium) "aOD" = ( /obj/machinery/portable_atmospherics/canister/air, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/service/bar/atrium) "aOE" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/structure/closet/wardrobe/mixed, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/service/bar/atrium) "aOF" = ( /obj/structure/cable/yellow{ @@ -15995,14 +15995,14 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/service/bar/atrium) "aPt" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/light, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/service/bar/atrium) "aPu" = ( /obj/machinery/door/airlock/security/glass{ @@ -16013,7 +16013,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/festive/alleyway, +/turf/open/floor/festive/alleyway/safe, /area/service/bar/atrium) "aPv" = ( /obj/effect/festive/street/streetlinene, @@ -19812,7 +19812,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/festive/trainplatform, +/turf/open/floor/festive/trainplatform/safe, /area/maintenance/bar) "aZi" = ( /turf/closed/festive/whitebrick, @@ -20979,7 +20979,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/festive/trainplatform, +/turf/open/floor/festive/trainplatform/safe, /area/maintenance/bar) "bcD" = ( /obj/machinery/chem_master/condimaster, @@ -21284,7 +21284,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/turf/open/floor/festive/trainplatform, +/turf/open/floor/festive/trainplatform/safe, /area/maintenance/bar) "bdv" = ( /obj/machinery/light{ @@ -22683,7 +22683,7 @@ /turf/open/indestructible/hotelwood, /area/service/chapel/main) "bgY" = ( -/turf/open/floor/festive/cobblestone, +/turf/open/floor/festive/cobblestone/safe, /area/cargo) "bgZ" = ( /obj/machinery/light/small{ @@ -29044,7 +29044,7 @@ /turf/open/floor/plasteel/cafeteria, /area/service/kitchen) "bwk" = ( -/turf/open/floor/festive/cobblestone, +/turf/open/floor/festive/cobblestone/safe, /area/cargo/qm) "bwl" = ( /obj/machinery/door/airlock/mining/glass{ @@ -29694,7 +29694,7 @@ id = "QMgarage"; name = "QM's Garage" }, -/turf/open/floor/festive/cobblestone, +/turf/open/floor/festive/cobblestone/safe, /area/cargo/qm) "bxZ" = ( /obj/effect/festive/street/streetlinenw, @@ -30915,7 +30915,7 @@ name = "Cargo Loading dock" }, /obj/machinery/door/firedoor, -/turf/open/floor/festive/cobblestone, +/turf/open/floor/festive/cobblestone/safe, /area/cargo) "bAY" = ( /obj/effect/turf_decal/loading_area{ @@ -32140,7 +32140,7 @@ pixel_x = 6; pixel_y = 16 }, -/turf/open/floor/festive/cobblestone, +/turf/open/floor/festive/cobblestone/safe, /area/cargo) "bCO" = ( /obj/machinery/light{ @@ -36132,17 +36132,15 @@ }, /area/commons/locker) "bLv" = ( -/obj/machinery/button/door{ - id = "idquarters"; - name = "Privacy Control"; - pixel_x = -26; - pixel_y = -26; - req_access_txt = "30" - }, /obj/machinery/light/small, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, +/obj/machinery/button/door{ + id = "patientA"; + name = "Privacy Shutters"; + pixel_y = -25 + }, /turf/open/floor/carpet/purple, /area/medical/storage) "bLw" = ( @@ -37298,7 +37296,7 @@ "bNT" = ( /obj/effect/spawner/structure/window, /obj/machinery/door/poddoor/shutters/preopen{ - id = "loungeshutters"; + id = "patientB"; name = "privacy shutters" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -45958,7 +45956,7 @@ pixel_x = -28 }, /obj/effect/festive/street/streetlinenm, -/turf/open/floor/festive/cobblestone, +/turf/open/floor/festive/cobblestone/safe, /area/cargo/qm) "chv" = ( /obj/effect/turf_decal/weather/snow/corner{ @@ -46443,7 +46441,7 @@ /obj/vehicle/sealed/vectorcraft/auto{ dir = 8 }, -/turf/open/floor/festive/cobblestone, +/turf/open/floor/festive/cobblestone/safe, /area/cargo/qm) "ciI" = ( /obj/structure/window/reinforced{ @@ -52022,7 +52020,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/festive/trainplatform, +/turf/open/floor/festive/trainplatform/safe, /area/maintenance/bar) "cwD" = ( /turf/open/floor/plating/beach/sand, @@ -52060,17 +52058,17 @@ dir = 1 }, /obj/effect/decal/festive/christmas_ivy_string, -/turf/open/floor/festive/trainplatform, +/turf/open/floor/festive/trainplatform/safe, /area/maintenance/bar) "cwK" = ( -/turf/open/floor/festive/trainplatform, +/turf/open/floor/festive/trainplatform/safe, /area/maintenance/bar) "cwL" = ( /obj/machinery/light{ dir = 1 }, /obj/effect/decal/festive/christmas_ivy_string, -/turf/open/floor/festive/trainplatform, +/turf/open/floor/festive/trainplatform/safe, /area/maintenance/bar) "cwM" = ( /obj/structure/festive/trainplatform/edge_east, @@ -52151,7 +52149,7 @@ /area/edina/street/primary/perimeter) "cwV" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/festive/trainplatform, +/turf/open/floor/festive/trainplatform/safe, /area/maintenance/bar) "cwW" = ( /obj/structure/festive/trainplatform/edge_east, @@ -52184,7 +52182,7 @@ /area/maintenance/bar) "cxb" = ( /obj/effect/festive/street/streetlineem, -/turf/open/floor/festive/cobblestone, +/turf/open/floor/festive/cobblestone/safe, /area/edina/street) "cxc" = ( /obj/effect/festive/street/sidewalknsm, @@ -52347,7 +52345,7 @@ /area/maintenance/bar) "cxH" = ( /obj/effect/landmark/start/assistant, -/turf/open/floor/festive/trainplatform, +/turf/open/floor/festive/trainplatform/safe, /area/maintenance/bar) "cxI" = ( /obj/structure/grille, @@ -52605,7 +52603,7 @@ /area/maintenance/bar) "cyx" = ( /obj/effect/landmark/xmastree/rdrod, -/turf/open/floor/festive/trainplatform, +/turf/open/floor/festive/trainplatform/safe, /area/maintenance/bar) "cyA" = ( /obj/structure/grille, @@ -54617,7 +54615,7 @@ /obj/structure/festive/trainplatform/edge_north{ pixel_y = -7 }, -/turf/open/floor/festive/trainplatform, +/turf/open/floor/festive/trainplatform/safe, /area/maintenance/bar) "kZN" = ( /obj/machinery/light, @@ -55499,7 +55497,7 @@ /obj/structure/festive/trainplatform/edge_north{ pixel_y = -7 }, -/turf/open/floor/festive/trainplatform, +/turf/open/floor/festive/trainplatform/safe, /area/maintenance/bar) "rgC" = ( /obj/effect/turf_decal/weather/snow/corner{ diff --git a/modular_citadel/code/modules/festive/turfs.dm b/modular_citadel/code/modules/festive/turfs.dm index d48b7e4d79..cc426ed924 100644 --- a/modular_citadel/code/modules/festive/turfs.dm +++ b/modular_citadel/code/modules/festive/turfs.dm @@ -40,6 +40,13 @@ icon_state = "unsmooth" smooth = SMOOTH_MORE | SMOOTH_BORDER canSmoothWith = list(/turf/open/floor/festive/cobblestone) + initial_gas_mix = FESTIVE_ATMOS + planetary_atmos = 1 + +/turf/open/floor/festive/cobblestone/safe //this is literally cobblestone but safe for inside use because I don't want to fuck with aesthetics + baseturfs = /turf/open/floor/festive/cobblestone/safe + initial_gas_mix = OPENTURF_DEFAULT_ATMOS + planetary_atmos = FALSE /turf/open/floor/festive/sidewalk name = "sidewalk" @@ -48,6 +55,8 @@ icon_state = "unsmooth" smooth = SMOOTH_MORE | SMOOTH_BORDER canSmoothWith = list(/turf/open/floor/festive/sidewalk) + initial_gas_mix = FESTIVE_ATMOS + planetary_atmos = 1 /turf/open/floor/festive/alleyway name = "alleyway bricks" @@ -56,6 +65,13 @@ icon_state = "unsmooth" smooth = SMOOTH_MORE | SMOOTH_BORDER canSmoothWith = list(/turf/open/floor/festive/alleyway, /turf/open/floor/festive/white_alleyway) + initial_gas_mix = FESTIVE_ATMOS + planetary_atmos = 1 + +/turf/open/floor/festive/alleyway/safe //this is literally alleyway but safe for inside use because I don't want to fuck with aesthetics + baseturfs = /turf/open/floor/festive/alleyway/safe + initial_gas_mix = OPENTURF_DEFAULT_ATMOS + planetary_atmos = FALSE /turf/open/floor/festive/white_alleyway name = "alleyway bricks" @@ -64,6 +80,8 @@ icon_state = "unsmooth" smooth = SMOOTH_MORE | SMOOTH_BORDER canSmoothWith = list(/turf/open/floor/festive/alleyway, /turf/open/floor/festive/white_alleyway) + initial_gas_mix = FESTIVE_ATMOS + planetary_atmos = 1 /turf/open/floor/festive/trainplatform name = "trainplatform" @@ -72,6 +90,13 @@ icon_state = "unsmooth" smooth = SMOOTH_MORE | SMOOTH_BORDER canSmoothWith = list(/turf/open/floor/festive/trainplatform) + initial_gas_mix = FESTIVE_ATMOS + planetary_atmos = 1 + +/turf/open/floor/festive/trainplatform/safe //this is literally train platform but safe for inside use because I don't want to remap the strip club + baseturfs = /turf/open/floor/festive/trainplatform/safe + initial_gas_mix = OPENTURF_DEFAULT_ATMOS + planetary_atmos = FALSE /turf/open/floor/festive/stairs/stairsnorth name = "stairs north" From b3d71081b788628f07235f4cac204e9bc3260b68 Mon Sep 17 00:00:00 2001 From: TripleShades Date: Sat, 25 Dec 2021 16:59:48 -0500 Subject: [PATCH 9/9] Update turfs.dm --- modular_citadel/code/modules/festive/turfs.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modular_citadel/code/modules/festive/turfs.dm b/modular_citadel/code/modules/festive/turfs.dm index cc426ed924..dd119a25e7 100644 --- a/modular_citadel/code/modules/festive/turfs.dm +++ b/modular_citadel/code/modules/festive/turfs.dm @@ -45,8 +45,8 @@ /turf/open/floor/festive/cobblestone/safe //this is literally cobblestone but safe for inside use because I don't want to fuck with aesthetics baseturfs = /turf/open/floor/festive/cobblestone/safe - initial_gas_mix = OPENTURF_DEFAULT_ATMOS - planetary_atmos = FALSE + initial_gas_mix = OPENTURF_DEFAULT_ATMOS + planetary_atmos = FALSE /turf/open/floor/festive/sidewalk name = "sidewalk" @@ -70,8 +70,8 @@ /turf/open/floor/festive/alleyway/safe //this is literally alleyway but safe for inside use because I don't want to fuck with aesthetics baseturfs = /turf/open/floor/festive/alleyway/safe - initial_gas_mix = OPENTURF_DEFAULT_ATMOS - planetary_atmos = FALSE + initial_gas_mix = OPENTURF_DEFAULT_ATMOS + planetary_atmos = FALSE /turf/open/floor/festive/white_alleyway name = "alleyway bricks" @@ -95,8 +95,8 @@ /turf/open/floor/festive/trainplatform/safe //this is literally train platform but safe for inside use because I don't want to remap the strip club baseturfs = /turf/open/floor/festive/trainplatform/safe - initial_gas_mix = OPENTURF_DEFAULT_ATMOS - planetary_atmos = FALSE + initial_gas_mix = OPENTURF_DEFAULT_ATMOS + planetary_atmos = FALSE /turf/open/floor/festive/stairs/stairsnorth name = "stairs north"