diff --git a/_maps/_mod_celadon/map_files/generic/blank.dmm b/_maps/_mod_celadon/map_files/generic/blank.dmm index f9cdb54fceb8..68387ebb43f4 100644 --- a/_maps/_mod_celadon/map_files/generic/blank.dmm +++ b/_maps/_mod_celadon/map_files/generic/blank.dmm @@ -155,7 +155,7 @@ /obj/effect/turf_decal/corner/opaque/green{ dir = 4 }, -/obj/machinery/newscaster/directional/south, +/obj/machinery/newscaster/directional/north, /turf/open/floor/plasteel, /area/centcom/control) "aB" = ( @@ -308,17 +308,16 @@ /turf/open/floor/plasteel, /area/centcom/control) "aW" = ( -/obj/structure/chair{ - dir = 1 +/obj/structure/bed/roller, +/obj/machinery/iv_drip, +/obj/effect/turf_decal/corner/opaque/blue{ + dir = 4 }, -/obj/effect/turf_decal/corner/opaque/green, -/obj/effect/turf_decal/corner/opaque/green{ +/obj/effect/turf_decal/corner/opaque/blue{ dir = 8 }, -/obj/machinery/newscaster/directional/north{ - pixel_y = -30 - }, -/turf/open/floor/plasteel, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/plasteel/white, /area/centcom/control) "aX" = ( /obj/machinery/computer/security{ @@ -586,9 +585,6 @@ /obj/structure/table/wood, /obj/item/folder/red, /obj/item/lighter, -/obj/machinery/newscaster/directional/north{ - pixel_y = -30 - }, /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 }, @@ -599,6 +595,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, +/obj/machinery/newscaster/directional/south, /turf/open/floor/plasteel/dark, /area/tdome/tdomeadmin) "ce" = ( @@ -904,7 +901,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/plasteel/dark, /area/centcom/control) "dg" = ( @@ -947,7 +944,7 @@ /obj/item/clothing/gloves/fingerless, /obj/item/clothing/gloves/color/black, /obj/item/clothing/glasses/eyepatch, -/obj/machinery/firealarm/directional/east, +/obj/machinery/firealarm/directional/west, /turf/open/floor/plasteel/grimy, /area/centcom/ferry) "dm" = ( @@ -966,17 +963,6 @@ }, /turf/open/floor/plasteel/dark, /area/centcom/ferry) -"do" = ( -/obj/effect/turf_decal/corner/opaque/brown{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/brown, -/obj/effect/turf_decal/corner/opaque/brown{ - dir = 8 - }, -/obj/machinery/firealarm/directional/west, -/turf/open/floor/plasteel, -/area/centcom/supply) "dp" = ( /obj/structure/table/reinforced, /obj/structure/sign/poster/contraband/gec{ @@ -1093,7 +1079,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/machinery/newscaster/directional/east, +/obj/machinery/newscaster/directional/west, /turf/open/floor/plasteel/dark, /area/centcom/ferry) "dJ" = ( @@ -1509,7 +1495,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/machinery/newscaster/directional/east, +/obj/machinery/newscaster/directional/west, /turf/open/floor/plasteel/dark, /area/tdome/tdomeobserve) "fg" = ( @@ -1561,7 +1547,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/plasteel/dark, /area/centcom/ferry) "fr" = ( @@ -1661,7 +1647,7 @@ "fL" = ( /obj/machinery/light/directional/east, /obj/machinery/light_switch{ - dir = 4; + dir = 8; pixel_x = 23 }, /turf/open/floor/plasteel/grimy, @@ -1904,7 +1890,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/machinery/firealarm/directional/north, +/obj/machinery/firealarm/directional/south, /turf/open/floor/plasteel/dark, /area/centcom/supply) "gH" = ( @@ -2564,7 +2550,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/machinery/newscaster/directional/south, +/obj/machinery/newscaster/directional/north, /turf/open/floor/plasteel/dark, /area/centcom/control) "iE" = ( @@ -2685,7 +2671,6 @@ /area/tdome/tdomeobserve) "je" = ( /obj/machinery/light_switch{ - dir = 1; pixel_y = 23 }, /turf/open/floor/wood, @@ -2771,7 +2756,7 @@ /obj/effect/turf_decal/corner/transparent/bar{ dir = 1 }, -/obj/machinery/firealarm/directional/east, +/obj/machinery/firealarm/directional/west, /turf/open/floor/plasteel, /area/tdome/tdomeobserve) "jA" = ( @@ -2949,7 +2934,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/machinery/firealarm/directional/north, +/obj/machinery/firealarm/directional/south, /turf/open/floor/plasteel/dark, /area/centcom/ferry) "kk" = ( @@ -4396,7 +4381,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/machinery/firealarm/directional/east, +/obj/machinery/firealarm/directional/west, /turf/open/floor/plasteel/dark, /area/centcom/control) "pH" = ( @@ -5095,7 +5080,7 @@ /obj/effect/turf_decal/corner/opaque/blue{ dir = 8 }, -/obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/plasteel/white, /area/centcom/control) "sp" = ( @@ -6262,8 +6247,8 @@ /obj/effect/turf_decal/industrial/warning{ dir = 5 }, -/obj/structure/extinguisher_cabinet/directional/west, -/obj/machinery/firealarm/directional/south, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/firealarm/directional/north, /turf/open/floor/plasteel, /area/centcom/ferry) "wg" = ( @@ -6459,9 +6444,6 @@ /obj/machinery/computer/security{ dir = 1 }, -/obj/machinery/newscaster/directional/north{ - pixel_y = -30 - }, /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 }, @@ -6472,6 +6454,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, +/obj/machinery/newscaster/directional/south, /turf/open/floor/plasteel/dark, /area/centcom/control) "wV" = ( @@ -6781,7 +6764,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/machinery/newscaster/directional/south, +/obj/machinery/newscaster/directional/north, /turf/open/floor/plasteel/dark, /area/tdome/tdomeobserve) "yh" = ( @@ -6833,9 +6816,6 @@ /obj/structure/table/wood, /obj/item/folder/red, /obj/item/lighter, -/obj/machinery/newscaster/directional/north{ - pixel_y = -30 - }, /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 }, @@ -6846,6 +6826,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, +/obj/machinery/newscaster/directional/south, /turf/open/floor/plasteel/dark, /area/centcom/ferry) "yw" = ( @@ -6945,7 +6926,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/machinery/firealarm/directional/north, +/obj/machinery/firealarm/directional/south, /turf/open/floor/plasteel/dark, /area/centcom/control) "yO" = ( @@ -7035,7 +7016,7 @@ dir = 4 }, /obj/machinery/light/directional/east, -/obj/machinery/firealarm/directional/west, +/obj/machinery/firealarm/directional/east, /turf/open/floor/plasteel, /area/centcom/control) "zb" = ( @@ -7248,7 +7229,7 @@ /turf/open/floor/plasteel/dark, /area/centcom/ferry) "zE" = ( -/obj/structure/extinguisher_cabinet/directional/south, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/wood, /area/centcom/holding) "zF" = ( @@ -7583,7 +7564,8 @@ "AW" = ( /obj/structure/closet/crate/bin, /obj/machinery/light_switch{ - pixel_y = -23 + pixel_y = -23; + dir = 1 }, /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 @@ -7628,7 +7610,8 @@ icon_state = "plant-22" }, /obj/machinery/light_switch{ - pixel_y = -23 + pixel_y = -23; + dir = 1 }, /turf/open/floor/wood, /area/centcom/ferry) @@ -7761,9 +7744,6 @@ /area/centcom/control) "Bw" = ( /obj/machinery/vending/coffee, -/obj/machinery/newscaster/directional/north{ - pixel_y = -30 - }, /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 }, @@ -7774,6 +7754,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, +/obj/machinery/newscaster/directional/south, /turf/open/floor/plasteel/dark, /area/centcom/control) "By" = ( @@ -7821,7 +7802,7 @@ pixel_x = -4 }, /obj/effect/turf_decal/industrial/warning, -/obj/machinery/firealarm/directional/south, +/obj/machinery/firealarm/directional/north, /turf/open/floor/plasteel, /area/centcom/ferry) "BG" = ( @@ -7926,9 +7907,6 @@ /turf/open/floor/plasteel, /area/centcom/holding) "BX" = ( -/obj/machinery/newscaster/directional/north{ - pixel_y = -30 - }, /obj/machinery/computer/med_data{ dir = 1 }, @@ -7942,13 +7920,11 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, +/obj/machinery/newscaster/directional/south, /turf/open/floor/plasteel/dark, /area/centcom/control) "BZ" = ( /obj/machinery/vending/cigarette, -/obj/machinery/newscaster/directional/north{ - pixel_y = -30 - }, /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 }, @@ -7959,6 +7935,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, +/obj/machinery/newscaster/directional/south, /turf/open/floor/plasteel/dark, /area/centcom/control) "Cb" = ( @@ -8197,7 +8174,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/machinery/newscaster/directional/west, +/obj/machinery/newscaster/directional/east, /turf/open/floor/plasteel/dark, /area/centcom/ferry) "Da" = ( @@ -8420,7 +8397,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/machinery/newscaster/directional/west, +/obj/machinery/newscaster/directional/east, /turf/open/floor/plasteel/dark, /area/centcom/evac) "DQ" = ( @@ -8540,7 +8517,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/machinery/firealarm/directional/west, +/obj/machinery/firealarm/directional/east, /turf/open/floor/plasteel/dark, /area/centcom/control) "Eh" = ( @@ -9070,7 +9047,7 @@ /obj/effect/turf_decal/industrial/warning{ dir = 1 }, -/obj/machinery/firealarm/directional/north, +/obj/machinery/firealarm/directional/south, /turf/open/floor/plasteel, /area/centcom/ferry) "FV" = ( @@ -10107,7 +10084,7 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/newscaster/directional/west, +/obj/machinery/newscaster/directional/east, /turf/open/floor/plasteel/grimy, /area/centcom/control) "JB" = ( @@ -10148,7 +10125,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/machinery/firealarm/directional/east, +/obj/machinery/firealarm/directional/west, /turf/open/floor/plasteel/dark, /area/tdome/tdomeadmin) "JG" = ( @@ -10177,7 +10154,7 @@ /turf/open/floor/plasteel/dark, /area/centcom/ferry) "JL" = ( -/obj/machinery/firealarm/directional/west, +/obj/machinery/firealarm/directional/east, /turf/open/floor/plasteel/white, /area/tdome/tdomeobserve) "JN" = ( @@ -10594,7 +10571,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/machinery/newscaster/directional/south, +/obj/machinery/newscaster/directional/north, /turf/open/floor/plasteel/dark, /area/centcom/ferry) "KP" = ( @@ -10686,7 +10663,6 @@ /obj/item/kirbyplants{ icon_state = "plant-22" }, -/obj/structure/extinguisher_cabinet/directional/north, /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 }, @@ -10697,6 +10673,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/plasteel/dark, /area/centcom/control) "Lj" = ( @@ -11032,7 +11009,6 @@ /area/centcom) "My" = ( /obj/structure/closet/crate/bin, -/obj/structure/extinguisher_cabinet/directional/north, /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 }, @@ -11043,7 +11019,8 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/machinery/firealarm/directional/west, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/firealarm/directional/east, /turf/open/floor/plasteel/dark, /area/centcom/ferry) "Mz" = ( @@ -11380,16 +11357,11 @@ /turf/open/floor/plasteel, /area/centcom/supplypod/loading/ert) "NH" = ( -/obj/effect/turf_decal/corner/opaque/brown{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/brown{ - dir = 4 - }, +/obj/effect/turf_decal/corner/opaque/brown, /obj/effect/turf_decal/corner/opaque/brown{ dir = 8 }, -/obj/machinery/firealarm/directional/north, +/obj/machinery/firealarm/directional/south, /turf/open/floor/plasteel, /area/centcom/supply) "NL" = ( @@ -11401,7 +11373,7 @@ dir = 8 }, /obj/machinery/light/directional/east, -/obj/machinery/newscaster/directional/west, +/obj/machinery/newscaster/directional/east, /turf/open/floor/plasteel/grimy, /area/centcom/control) "NN" = ( @@ -11540,7 +11512,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/plasteel/dark, /area/centcom/control) "Oh" = ( @@ -11838,7 +11810,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/machinery/firealarm/directional/west, +/obj/machinery/firealarm/directional/east, /turf/open/floor/plasteel/dark, /area/centcom/ferry) "Pw" = ( @@ -12038,7 +12010,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/machinery/firealarm/directional/north, +/obj/machinery/firealarm/directional/south, /turf/open/floor/plasteel/dark, /area/centcom/control) "Qi" = ( @@ -12162,7 +12134,7 @@ /turf/open/floor/plasteel, /area/centcom/control) "QF" = ( -/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/wood, /area/centcom/holding) "QG" = ( @@ -12594,6 +12566,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, +/obj/machinery/firealarm/directional/east, /turf/open/floor/plasteel/dark, /area/centcom/supply) "RU" = ( @@ -12665,7 +12638,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, -/obj/machinery/firealarm/directional/west, +/obj/machinery/firealarm/directional/east, /turf/open/floor/plasteel/grimy, /area/centcom/ferry) "Sj" = ( @@ -12873,7 +12846,6 @@ /obj/item/kirbyplants{ icon_state = "plant-21" }, -/obj/structure/extinguisher_cabinet/directional/north, /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 }, @@ -12884,6 +12856,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/plasteel/dark, /area/centcom/ferry) "Th" = ( @@ -12897,9 +12870,6 @@ /obj/item/book/manual/wiki/drinks, /obj/item/reagent_containers/food/drinks/shaker, /obj/item/reagent_containers/glass/rag, -/obj/machinery/newscaster/directional/north{ - pixel_y = -30 - }, /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 }, @@ -12910,6 +12880,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, +/obj/machinery/newscaster/directional/south, /turf/open/floor/plasteel/dark, /area/tdome/tdomeobserve) "Tj" = ( @@ -13369,7 +13340,7 @@ /area/centcom/holding) "UI" = ( /obj/machinery/light_switch{ - dir = 8; + dir = 4; pixel_x = -23 }, /turf/open/floor/plasteel/grimy, @@ -13729,7 +13700,7 @@ /obj/item/crowbar/power, /obj/item/storage/belt/security/full, /obj/effect/turf_decal/industrial/warning, -/obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/plasteel, /area/centcom/ferry) "Wi" = ( @@ -14226,7 +14197,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/machinery/firealarm/directional/east, +/obj/machinery/firealarm/directional/west, /turf/open/floor/plasteel/dark, /area/centcom/control) "XK" = ( @@ -14247,7 +14218,7 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/plasteel/dark, /area/centcom/evac) "XM" = ( @@ -14422,7 +14393,7 @@ /obj/machinery/atmospherics/components/unary/tank/air{ dir = 1 }, -/obj/machinery/firealarm/directional/north, +/obj/machinery/firealarm/directional/south, /turf/open/floor/plasteel, /area/centcom/ferry) "Yr" = ( @@ -14470,7 +14441,7 @@ /obj/effect/turf_decal/corner/opaque/blue{ dir = 8 }, -/obj/machinery/firealarm/directional/west, +/obj/machinery/firealarm/directional/east, /turf/open/floor/plasteel/white, /area/centcom/control) "Yy" = ( @@ -14672,11 +14643,11 @@ /turf/open/floor/plasteel, /area/tdome/arena) "Zf" = ( -/obj/structure/extinguisher_cabinet/directional/west, /obj/effect/turf_decal/industrial/warning{ dir = 4 }, /obj/machinery/light/directional/east, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/plasteel, /area/centcom/control) "Zh" = ( @@ -22061,12 +22032,12 @@ mq KR oS mq -gS -tB NH +tB +RM CI CI -do +nG tB qT Ks @@ -24405,9 +24376,9 @@ az lK lK lK -aW +Pw me -tt +aW lK RJ GF @@ -25936,7 +25907,7 @@ MY Kl LT aH -OC +Nu yh yh yh @@ -27484,7 +27455,7 @@ xt NM JA xt -Nu +OC yh Ke ez