From c494509258dfb84e75d1745e56d12ea5e6537986 Mon Sep 17 00:00:00 2001 From: "DESKTOP-M4GD565\\LME" Date: Thu, 5 Oct 2023 21:56:41 -0700 Subject: [PATCH 01/26] fixes and spriting --- _maps/map_files/Mining/Oshan.dmm | 22 +- _maps/map_files/Oshan/oshan.dmm | 297 ++++++++++-------- config/maps.txt | 2 +- .../code/modules/conveyor/code/conveyor.dm | 43 +++ tgstation.dme | 1 + 5 files changed, 235 insertions(+), 130 deletions(-) create mode 100644 monkestation/code/modules/conveyor/code/conveyor.dm diff --git a/_maps/map_files/Mining/Oshan.dmm b/_maps/map_files/Mining/Oshan.dmm index 3bc29a42195d..b2ab5288cf39 100644 --- a/_maps/map_files/Mining/Oshan.dmm +++ b/_maps/map_files/Mining/Oshan.dmm @@ -365,6 +365,26 @@ "pu" = ( /turf/closed/wall, /area/station/security/prison/mess) +"pH" = ( +/obj/structure/rack, +/obj/item/gps/mining{ + pixel_x = 8; + pixel_y = -2 + }, +/obj/item/gps/mining{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/gps/mining{ + pixel_x = -6; + pixel_y = -2 + }, +/obj/item/gps/mining{ + pixel_x = 8; + pixel_y = 4 + }, +/turf/open/floor/iron, +/area/mine/production) "qe" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -24900,7 +24920,7 @@ mt nW nW nW -bE +pH Jq Ev Hv diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index 99bb93b3be96..5134a529a9d7 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -279,6 +279,12 @@ dir = 4 }, /area/station/science/lab) +"aeW" = ( +/obj/machinery/conveyor/auto/inside_corners{ + dir = 6 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/central) "afg" = ( /obj/structure/disposalpipe/junction/yjunction, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -1915,8 +1921,8 @@ /area/station/command/bridge) "aYq" = ( /obj/structure/lattice, -/obj/machinery/conveyor/auto{ - dir = 3 +/obj/machinery/conveyor/auto/inside_corners{ + dir = 10 }, /turf/open/floor/plating/ocean, /area/ocean/near_station_powered) @@ -3254,6 +3260,7 @@ /area/station/commons/fitness/recreation) "bDv" = ( /obj/effect/landmark/start/scientist, +/obj/structure/cable, /turf/open/floor/iron, /area/station/science/xenobiology) "bDw" = ( @@ -3367,17 +3374,6 @@ /obj/machinery/camera/directional/west, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) -"bFY" = ( -/obj/structure/lattice, -/obj/structure/disposalpipe/segment{ - dir = 4; - invisibility = 101 - }, -/obj/machinery/conveyor/auto{ - dir = 8 - }, -/turf/open/floor/plating/ocean, -/area/ocean/near_station_powered) "bGe" = ( /obj/structure/rack, /obj/item/circuitboard/machine/teleporter_hub{ @@ -6998,11 +6994,12 @@ /turf/open/floor/wood, /area/station/service/hydroponics/upper) "dyB" = ( +/obj/structure/lattice, /obj/machinery/conveyor/auto{ - dir = 7 + dir = 9 }, -/turf/open/floor/plating, -/area/station/maintenance/port/central) +/turf/open/floor/plating/ocean, +/area/ocean/near_station_powered) "dyN" = ( /obj/machinery/door/airlock/public/glass{ name = "Central Access" @@ -7730,6 +7727,13 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) +"dTu" = ( +/obj/structure/lattice, +/obj/machinery/conveyor/auto/inside_corners{ + dir = 10 + }, +/turf/open/floor/plating/ocean, +/area/ocean) "dTv" = ( /obj/machinery/firealarm/directional/north, /obj/machinery/light/directional/north, @@ -11936,6 +11940,7 @@ /area/station/engineering/atmos) "fYW" = ( /obj/effect/turf_decal/delivery, +/obj/structure/cable, /turf/open/floor/iron/dark/textured, /area/station/science/xenobiology) "fZc" = ( @@ -13051,6 +13056,7 @@ /area/station/science/ordnance/office) "gCe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/iron, /area/station/science/xenobiology) "gCo" = ( @@ -13318,6 +13324,7 @@ "gKd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/iron, /area/station/science/xenobiology) "gKx" = ( @@ -13380,7 +13387,8 @@ }, /obj/effect/turf_decal/trimline/blue/corner, /obj/machinery/door/airlock/medical/glass{ - name = "Cryogenics Bay" + id_tag = "MedbayFoyer"; + name = "Medbay Clinic" }, /obj/effect/mapping_helpers/airlock/unres{ dir = 1 @@ -14291,6 +14299,17 @@ }, /turf/open/floor/iron/dark/textured, /area/station/security/brig) +"hiO" = ( +/obj/structure/lattice, +/obj/structure/disposalpipe/segment{ + dir = 4; + invisibility = 101 + }, +/obj/machinery/conveyor/auto/inside_corners{ + dir = 10 + }, +/turf/open/floor/plating/ocean, +/area/ocean/near_station_powered) "hiP" = ( /obj/structure/table/reinforced, /obj/item/multitool, @@ -14952,7 +14971,8 @@ }, /obj/effect/turf_decal/trimline/blue/warning, /obj/machinery/door/airlock/medical/glass{ - name = "Cryogenics Bay" + id_tag = "MedbayFoyer"; + name = "Medbay Clinic" }, /obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/effect/mapping_helpers/airlock/unres{ @@ -17102,15 +17122,6 @@ /obj/effect/turf_decal/tile/brown/anticorner/contrasted, /turf/open/floor/iron/dark, /area/station/cargo/sorting) -"iKF" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/machinery/conveyor/auto{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/maintenance/port/central) "iKK" = ( /obj/structure/disposalpipe/segment, /obj/machinery/conveyor{ @@ -17403,13 +17414,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/security/brig) -"iRT" = ( -/obj/structure/lattice, -/obj/machinery/conveyor/auto{ - dir = 9 - }, -/turf/open/floor/plating/ocean, -/area/ocean/near_station_powered) "iSb" = ( /obj/effect/turf_decal/delivery, /obj/structure/cable, @@ -20504,6 +20508,13 @@ }, /turf/open/floor/iron/dark/textured, /area/station/security/interrogation) +"kwO" = ( +/obj/structure/lattice, +/obj/machinery/conveyor/auto/inside_corners{ + dir = 9 + }, +/turf/open/floor/plating/ocean, +/area/ocean/near_station_powered) "kwP" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -20905,6 +20916,15 @@ }, /turf/open/floor/iron/dark/textured, /area/station/engineering/main) +"kGh" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/machinery/conveyor/auto/inside_corners{ + dir = 5 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/central) "kGi" = ( /obj/machinery/duct/industrial/waste, /obj/structure/disposalpipe/segment{ @@ -24190,6 +24210,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/textured, /area/station/commons/storage/primary) +"moW" = ( +/obj/structure/lattice, +/obj/structure/disposalpipe/segment{ + dir = 4; + invisibility = 101 + }, +/obj/machinery/conveyor/auto/inside_corners{ + dir = 9 + }, +/turf/open/floor/plating/ocean, +/area/ocean/near_station_powered) "mqy" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/warning{ dir = 9 @@ -24416,6 +24447,10 @@ }, /turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) +"muE" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/science/xenobiology) "muW" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -24636,6 +24671,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/iron, /area/station/science/xenobiology) "mCO" = ( @@ -25483,6 +25519,7 @@ name = "Maximum Security Test Chamber"; req_access = list("xenobiology") }, +/obj/structure/cable, /turf/open/floor/engine, /area/station/science/xenobiology) "mYo" = ( @@ -25701,13 +25738,6 @@ }, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) -"ndA" = ( -/obj/effect/spawner/random/trash, -/obj/machinery/conveyor/auto{ - dir = 3 - }, -/turf/open/floor/plating, -/area/station/maintenance/port/central) "ndO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -27379,6 +27409,7 @@ "nUK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/iron/dark/textured, /area/station/science/xenobiology) "nUL" = ( @@ -28642,7 +28673,9 @@ /area/station/security/office) "ozj" = ( /obj/machinery/light/small/directional/south, -/obj/structure/closet/crate/coffin, +/obj/structure/bodycontainer/morgue{ + dir = 2 + }, /turf/open/floor/iron/dark, /area/station/service/chapel/office) "ozl" = ( @@ -28757,6 +28790,13 @@ /obj/effect/turf_decal/trimline/purple/filled/mid_joiner, /turf/open/floor/iron/dark/herringbone, /area/station/science/server) +"oDq" = ( +/obj/structure/lattice, +/obj/machinery/conveyor/auto/inside_corners{ + dir = 6 + }, +/turf/open/floor/plating/ocean, +/area/ocean/near_station_powered) "oDx" = ( /obj/machinery/light/directional/south, /turf/open/floor/plating, @@ -30141,8 +30181,11 @@ /turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "pqM" = ( -/obj/structure/closet/crate/coffin, /obj/structure/extinguisher_cabinet/directional/south, +/obj/structure/bodycontainer/crematorium{ + dir = 1; + id = "crematoriumChapel" + }, /turf/open/floor/carpet/lone/star, /area/station/service/chapel/office) "pqN" = ( @@ -31002,9 +31045,7 @@ /turf/open/floor/iron/white, /area/station/medical/surgery/theatre) "pMX" = ( -/obj/machinery/conveyor/auto{ - dir = 7 - }, +/obj/machinery/conveyor/auto, /obj/structure/disposalpipe/segment{ dir = 4; invisibility = 101 @@ -31957,6 +31998,7 @@ "qkC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /obj/effect/turf_decal/delivery, +/obj/structure/cable, /turf/open/floor/iron/dark/textured, /area/station/science/xenobiology) "qkH" = ( @@ -31995,6 +32037,12 @@ /obj/structure/cable, /turf/open/floor/iron/white/textured, /area/station/medical/surgery/aft) +"qlS" = ( +/obj/machinery/conveyor/auto/inside_corners{ + dir = 10 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/central) "qmb" = ( /obj/effect/turf_decal/stripes{ dir = 8 @@ -33416,15 +33464,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/engineering/main) -"qWx" = ( -/obj/structure/lattice, -/obj/structure/disposalpipe/segment{ - dir = 4; - invisibility = 101 - }, -/obj/machinery/conveyor/auto, -/turf/open/floor/plating/ocean, -/area/ocean/near_station_powered) "qWy" = ( /obj/machinery/door/airlock/external{ name = "Escape Airlock"; @@ -34066,12 +34105,6 @@ }, /turf/open/floor/wood, /area/station/commons/lounge) -"rnF" = ( -/obj/machinery/conveyor/auto{ - dir = 3 - }, -/turf/open/floor/plating/ocean, -/area/ocean) "rnM" = ( /obj/structure/chair/sofa/left, /obj/machinery/computer/security/telescreen/entertainment/directional/east, @@ -40230,6 +40263,12 @@ /obj/item/radio/intercom/chapel/directional/west, /turf/open/floor/iron/dark/textured, /area/station/hallway/secondary/entry) +"uyW" = ( +/obj/machinery/conveyor/auto/inside_corners{ + dir = 5 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/central) "uzj" = ( /turf/closed/wall/r_wall, /area/station/science/robotics) @@ -43687,12 +43726,6 @@ dir = 4 }, /area/station/service/chapel) -"wlA" = ( -/obj/machinery/conveyor/auto{ - dir = 3 - }, -/turf/open/floor/plating, -/area/station/maintenance/port/central) "wlU" = ( /obj/machinery/duct/industrial/waste, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -44433,6 +44466,13 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/engineering/storage/tech) +"wHC" = ( +/obj/effect/spawner/random/trash, +/obj/machinery/conveyor/auto/inside_corners{ + dir = 10 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/central) "wIn" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -46684,6 +46724,7 @@ /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/ai) "xNX" = ( +/obj/structure/cable, /turf/open/floor/iron/stairs{ dir = 8 }, @@ -70106,7 +70147,7 @@ pkw fGs aFY aFY -aFY +uyW ske meJ meJ @@ -70399,12 +70440,12 @@ aah meJ meJ rvq -vHZ +kwO fCx fCx fCx fCx -iRT +dyB cfz etN meJ @@ -73230,8 +73271,8 @@ meJ rvq rvq rvq -naN -vHZ +aYq +kBN sRh byf tKt @@ -73485,9 +73526,9 @@ pHU etN rvq rvq +aYq naN -naN -vHZ +kBN sRh sRh ewQ @@ -73741,8 +73782,8 @@ meJ pHU gBb rvq -naN -vHZ +aYq +kBN asA asA sRh @@ -73997,8 +74038,8 @@ meJ meJ fXF gBb -naN -vHZ +aYq +kBN asA asA mqy @@ -74253,8 +74294,8 @@ meJ meJ meJ fXF -qWx -vHZ +hiO +kBN asA asA elt @@ -77594,8 +77635,8 @@ aah aah meJ fXF -bFY -iRT +moW +dyB asA asA qPs @@ -77852,8 +77893,8 @@ aah meJ fXF gBb -vHZ -iRT +kwO +dyB asA asA fkr @@ -78110,8 +78151,8 @@ meJ pHU gBb rvq -vHZ -iRT +kwO +dyB asA asA pla @@ -78327,7 +78368,7 @@ xCU uVK bva twr -iKF +kGh kND meJ meJ @@ -78368,9 +78409,9 @@ pHU etN rvq rvq -vHZ +kwO fCx -iRT +dyB pla pla cZm @@ -78627,8 +78668,8 @@ meJ rvq rvq rvq -vHZ -iRT +kwO +dyB pla euG uHj @@ -79142,9 +79183,9 @@ meJ meJ meJ rvq -vHZ +kwO fCx -iRT +dyB pla pla kDN @@ -79401,8 +79442,8 @@ meJ rvq rvq rvq -vHZ -iRT +kwO +dyB pla pla wqQ @@ -79659,8 +79700,8 @@ meJ meJ rvq rvq -vHZ -iRT +kwO +dyB pla pla pla @@ -79917,8 +79958,8 @@ meJ meJ rvq rvq -vHZ -iRT +kwO +dyB rDE lCF cTE @@ -80675,9 +80716,9 @@ jDJ jDJ uCz kND -wlA +qlS heN -vXo +oDq gBb meJ meJ @@ -80897,10 +80938,10 @@ tYA xmh xCU tMK -dyB -dyB -dyB -jOH +xzf +xzf +xzf +aeW kND ske ske @@ -81158,13 +81199,13 @@ bva bva rUd tMK -dyB -dyB -dyB -dyB -dyB -dyB -jOH +xzf +xzf +xzf +xzf +xzf +xzf +aeW ske ske meJ @@ -81197,12 +81238,12 @@ meJ meJ meJ mdW -rnF -aYq -aYq -aYq -aYq -aYq +dTu +naN +naN +naN +naN +naN kBN rDE ccv @@ -81422,7 +81463,7 @@ qTR bva rUd tMK -jOH +aeW kND kND kND @@ -81430,7 +81471,7 @@ gmQ qgs ske kND -ndA +wHC xzf xzf xzf @@ -81680,13 +81721,13 @@ mSq vnz rUd tMK -dyB -dyB -dyB +xzf +xzf +xzf pMX -dyB -dyB -dyB +xzf +xzf +xzf bPH csW xCU @@ -100385,7 +100426,7 @@ gro dNu tvt iri -iri +muE iri tvt aZB @@ -100642,7 +100683,7 @@ ahl eRl wUP iri -iri +muE iri atC gaz diff --git a/config/maps.txt b/config/maps.txt index 3cf1094af8ef..2afc25e39f72 100644 --- a/config/maps.txt +++ b/config/maps.txt @@ -14,7 +14,6 @@ Format: endmap map metastation - #default minplayers 25 #voteweight 0.5 votable @@ -51,5 +50,6 @@ map multiz_debug endmap map oshan + default votable endmap diff --git a/monkestation/code/modules/conveyor/code/conveyor.dm b/monkestation/code/modules/conveyor/code/conveyor.dm new file mode 100644 index 000000000000..a8ea1f260864 --- /dev/null +++ b/monkestation/code/modules/conveyor/code/conveyor.dm @@ -0,0 +1,43 @@ +/obj/machinery/conveyor/auto/inside_corners //use me for mapping + icon = 'monkestation/code/modules/conveyor/icon/conveyor.dmi' + + +/obj/machinery/conveyor/auto/inside_corners/update_move_direction() + switch(dir) + if(NORTH) + forwards = NORTH + backwards = SOUTH + if(SOUTH) + forwards = SOUTH + backwards = NORTH + if(EAST) + forwards = EAST + backwards = WEST + if(WEST) + forwards = WEST + backwards = EAST + if(NORTHEAST) + forwards = NORTH + backwards = WEST + if(NORTHWEST) + forwards = WEST + backwards = SOUTH + if(SOUTHEAST) + forwards = EAST + backwards = NORTH + if(SOUTHWEST) + forwards = SOUTH + backwards = EAST + if(inverted) + var/temp = forwards + forwards = backwards + backwards = temp + if(flipped) + var/temp = forwards + forwards = backwards + backwards = temp + if(operating == 1) //I dont want to redefine I am lazy + movedir = forwards + else + movedir = backwards + update() diff --git a/tgstation.dme b/tgstation.dme index 49113bf3d44a..f9738f24fb8b 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5759,6 +5759,7 @@ #include "monkestation\code\modules\coin-events\challenges\challenge\heavy_bleeder.dm" #include "monkestation\code\modules\coin-events\challenges\challenge\no_healing.dm" #include "monkestation\code\modules\coin-events\challenges\challenge\no_sprint.dm" +#include "monkestation\code\modules\conveyor\code\conveyor.dm" #include "monkestation\code\modules\cryopods\_cryopod.dm" #include "monkestation\code\modules\cryopods\ai_cryo.dm" #include "monkestation\code\modules\cryopods\cryo_admin_helpers.dm" From 76e03c67841d69190a61035ca070a4eb478dd011 Mon Sep 17 00:00:00 2001 From: "DESKTOP-M4GD565\\LME" Date: Thu, 5 Oct 2023 23:46:43 -0700 Subject: [PATCH 02/26] mining gps --- _maps/map_files/Mining/Oshan.dmm | 42 ++++++++++++++++---------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/_maps/map_files/Mining/Oshan.dmm b/_maps/map_files/Mining/Oshan.dmm index b2ab5288cf39..bf7b9cf1b91f 100644 --- a/_maps/map_files/Mining/Oshan.dmm +++ b/_maps/map_files/Mining/Oshan.dmm @@ -120,6 +120,26 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/prison/visit) +"hs" = ( +/obj/structure/rack, +/obj/item/gps/mining{ + pixel_x = 8; + pixel_y = -2 + }, +/obj/item/gps/mining{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/gps/mining{ + pixel_x = -6; + pixel_y = -2 + }, +/obj/item/gps/mining{ + pixel_x = 8; + pixel_y = 4 + }, +/turf/open/floor/iron, +/area/mine/production) "hC" = ( /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable, @@ -365,26 +385,6 @@ "pu" = ( /turf/closed/wall, /area/station/security/prison/mess) -"pH" = ( -/obj/structure/rack, -/obj/item/gps/mining{ - pixel_x = 8; - pixel_y = -2 - }, -/obj/item/gps/mining{ - pixel_x = -6; - pixel_y = 4 - }, -/obj/item/gps/mining{ - pixel_x = -6; - pixel_y = -2 - }, -/obj/item/gps/mining{ - pixel_x = 8; - pixel_y = 4 - }, -/turf/open/floor/iron, -/area/mine/production) "qe" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -24920,7 +24920,7 @@ mt nW nW nW -pH +hs Jq Ev Hv From 9e2241a928297f48a409c624f89d90a45c4e0deb Mon Sep 17 00:00:00 2001 From: "DESKTOP-M4GD565\\LME" Date: Thu, 5 Oct 2023 23:51:33 -0700 Subject: [PATCH 03/26] why do you hate singular nouns --- .../code/modules/conveyor/code/conveyor.dm | 2 +- .../code/modules/conveyor/icons/conveyor.dmi | Bin 0 -> 13074 bytes 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 monkestation/code/modules/conveyor/icons/conveyor.dmi diff --git a/monkestation/code/modules/conveyor/code/conveyor.dm b/monkestation/code/modules/conveyor/code/conveyor.dm index a8ea1f260864..c77e49a4edd0 100644 --- a/monkestation/code/modules/conveyor/code/conveyor.dm +++ b/monkestation/code/modules/conveyor/code/conveyor.dm @@ -1,5 +1,5 @@ /obj/machinery/conveyor/auto/inside_corners //use me for mapping - icon = 'monkestation/code/modules/conveyor/icon/conveyor.dmi' + icon = 'monkestation/code/modules/conveyor/icons/conveyor.dmi' /obj/machinery/conveyor/auto/inside_corners/update_move_direction() diff --git a/monkestation/code/modules/conveyor/icons/conveyor.dmi b/monkestation/code/modules/conveyor/icons/conveyor.dmi new file mode 100644 index 0000000000000000000000000000000000000000..81cbbe90b634e929d2defb4e09754cbce9dcf783 GIT binary patch literal 13074 zcmX}TcUV)+^FEwFfP@-)C!rTnkRm80gbvb+A}CEdN>@-yLg*k;L1vt*0KokJ4lwyu z$?Tej=hX#aVql>~BB8I}RJMHZSV&O(by7x%<&Ex8DmG5Ot9o{BI7vn23;;+107(4& z(*Qs<06@69S5Vl$I&*VhwT;32UA__p2ACO{1JwRbyIeg~ytJ?i&~)~H?C0(i;O^}O z00d>5-}CW%c6wy)vwyrIare5!VE>SLwWaik?81`dkb!s~!0%OJlcKDd?3k=RJbNj% zE7bySE`A$PCD|Z@?Ny6QkQJ^g;}COc@6NoJmXSs6$nE$^uIuwCNbLRlH&zfQuC>ff zxPyUUz(@P&a4%~k7bMbydY`_hDngFIWT@ioPZwDs0bs_H2XSJ5yKwTg7E_)_qbLsm zn16dW9FhO%Jpcd)=xHJ?g0i)js9_TD3_#=Xyaxg&NU8J70%KT70^UUtLWF zft05Ep?y6%4<>6Z?yns-r!nl*!xKbOCL{Ru~O z1V+k~oSpspcFZt}0-QNeoiXC2ekHBOEQY-#m)>5{ZTvk2OdH+T9VpqT?8u)F62gsd}Foe=)5o9fVBhgyU`Ji4X01fp?p_V(3qA(|NA>PJa^Z3PsH9m0C}rt76+~`20OLe0?(Lns9OZsy^{dly<*(jwi*rrd z@|&V21%PI5KuH^Y*Zy%OOTE;UnRT6dp%XsyJgFR@E!lfk(a_#-XLVl3Bn5;7z1ybh z18O`i;y~u->V^FEXo#QT!&RbUcjxf@g&t)N6^uK3?`%#SMev)ej}5ojTTDq%+_zH= z(0xhNZKVE+)WlIHwQ6Co6M7JMap84kP;X8&EH(ww2Y7ZJDN{kLiwO)Z!vz=VKpCod z0k`lSrYn)6oRzhjBD=x0Wx;bLM9?ohkF&Bm4|3qK@$LkoOF=cBQ>CftCP=$4@g)9a;j%@Wt@8JS_Q`|*w8hW45EU6ThSt0|Jw zh3OH`S(PoN^!d`_LQnVUCax!i94l~Hqs7KhHAOP0Zu{TJ zEVSRA8?mLmIuz?oH)c$zd~xrMH^mIt9fB5Vd;QKrdhayZ`Qa1Pn_-f82=7HOXh$96 zP|e>CbGbL0)2>2_J5i7!gmUDLz>;KwkE!-GNE*@qzTBpOGSSL1tY_Yu7f0TxjXWHc z^32iiz9@QO-AKF>RtkA`FUvZmP9*ht1-XOE5H4jwFd-+CxSltTvtF-$j3iiIYSN`9 z7*77=rPRfB$B*7X4O&kvRk&vIF}UVt1&2t!Y?z)tjaV;>c*{iuVJs-a4Ow5QSU(*E z>h3hUoqOcLDCKT-{p6IE$h+&(Feh$b6e>*(|0Ni9k2BVDnhxUe!UB!G7m-4CT3$`| z@v)5qJAieeN@RMTcgXdU4!+fr08iK2bNbNHj%$1E{T^P#P}(6J?(=oNyN9B!_$hjh zD3bgSEK!S8!|R!4o04Bs{S%{FfbbyO52FsQ3pxDYRr^#fb{7ayVN+p9UF;Cy3tRZ` zI+_w_e1sIx0wjTxVf+AZIF}rdKG_yCt~Mhe_DMaaB9I9bEnk1aYhFZW?@%C(4xk%- zT1{DqGY74|c=ckVN3vR(VO|%?!%_XW=HC9D#4I4RzC9pAsydTF?k7KNco|x3R!Hl6 z>8cq0XLOen<@w8M%{TusKL^s7JoX~Luok-)NNw^m?PZ1jPgRot`ykanO2T(QnHO|N z?e_rhA2q_btb(jc#@hY3x%$^__*p)g*Lj)M$XsF#~``i zzb;8-HD7M@;&eP;pbi*O1VCoBjEndLA#~q9>b~oe3{Tbqts5kP&GZZ;@?YM(&#F;J z-IrOvR&ZysFq=se(F-W(S;`AGCmI#h|9t^JuS**eicJ)>3dRLV~2QLijc7piR5xnBlie?_`YfiyzA{gka>JI@?Xr%%Uov{G?mHclldn# zX+TS2MU2HFT}X%|&;~4leW&JHDS;fm7~lPRd?u*OsHzRE#ugL=P)@pX+J-6~iSozq z<+Z>pG+k_lB~ExVwo4H92Q-=^0 zIbHuHEsroU`SPX37JJVD`jfpNSFF*&pmF*Zpjc*7O9)N{(h zlSrD_PO9i1XwC=mfK?#u(>P^etOlx#z(cTmP8vv8iy%=uQh;XQs|>8hvp1N z?Ziim5H>^R%#Xy)gcqs6r#4$W4+qI2{_*#G^I+vP1?mZ z)QzcX_NZO*AC7uwKsD}uV)LcsKVSHk=)F3v@9rl$Deyo@?93$igiw5emRP$367iXTIBeFsI0T+QSd4`v?;Hada$c#*xveA;-)8NZ_~ z3x|81=htHrLZ<)8Dr)JQmnsk)D0QxC_WJ}0j zIwNQD&>gT9)GaY$$+NUk(W#Xs8o7Oxi|D8P_#l)e=n$;lA)50oOQ}CSF4;eD z;#~vmx%weQJ?=$LaZrl8FGfvi)Gp#klTDXTG*)@co$`~rVvX7UfDpKJwZihFA|JBQ zy@I%mM~*=pt11BGK(-TSRixs_{77GnrlmQvWvlG-vF=evregVe=4)f%J5Q-zrC}QG zd^ipUJVa!~a8%7>;Lb|zxFa(t!-mk8bwqgn#GG-P;j5b!$>-S5A!&Uhe@dd35E~2PMZJ9B(0~auT=plQT8N6sE-umHnq*=gq0~ zd^`}5lp)356R9>0L$dxjjkqysCvBmQFWTJlwm8XtT$@HPeGQj>_4Gv<47jd1N_cx3s&WcX;`iQYxo&xynB=W^|LD-f^^fc`DDS4&rmUlK6 z%iJ#W97Di{x0NaD1V|wuhNwL_lI7_#jmx;FSwKicA%^dG*uAMn9PFIN?NDuu<$0vm zVK2B&6pWaUXJ=tiJ98%rMQ1K+>=X7?0J=@rW_k)9lnt>=Y2Ov>SFCwTL&v08u{yWy zEfA6tI#QtVoTFbS+|!;E5JedAXbzsnX`W5CwXTUhE~VLJe|ajO`+T)IhF}+ulJz-g!F!8A zMl;^Xd>@|}xE*oyND>K|S}G2cS%@U_C~XN~D()DZ@&1Z|`?gxzRBSqoWmzHebO^dlnlEH{(#e@omcQvR)zc_Hj+Lg;;?EAKn2lLiq7yukbp z1X6^Ifcolxbx=X_U%fcrTP7_Y=S#0}VpDlt+7^H!=2WMAfpjI03S#?o}|^ zLFHLfG|eL{2uTqp^vIVO z_oyD=A|SfgH7{d#gSlS8VYBX(X7$3}E>IfJwp&V|Kc;AU!Qy#*)WNyz z6I6qX*KjT1p*^ZD`XCfv2(a4;<1Yu;`jJKwq};f^VD)}YF^F%{rqsUVXd$^;kcJa& z)s8&KEAD^u+*Ke8{k~3re&zR1F#abBudz7?Wr7#n%pV!?MKN~zq%=aJ@IueW?l+wl z?x?!Wu2pOhM^-(ecK_L?ossx$e9=SzVvyf0PTxdt76&f=nYV#0{vD*WYN~ToWysJr zRfL5rx}uz#c^8ql*s3=do~#S+uyZK~x_(gJC?iG|{5wL-s}r6PYxk5-auHP35~h~E z{sQ${8MU~j&ldH8k01Oxs+MNlhq(p5Uz7!=HYi`~w#)klPOVvYgjFn6MlK7ny#TTZ zXNWBT`*$15XlYgIb?;>=oKw8?3(*F?yxeVoGt4Z$mZzKofUj4sKCh$B^nB5S%VI2E z^&f2BQz80iojJ!1&E2l<_Pc$809wIWk?OxI!AypWHILL0tm}x;NCix_f@trwcfl&v zdEz|>__H$rV6eRCANYwd?zTdn zm_TfG4=3;uUJV0{2E$QG>c=pr#=J(nvkB&TSQ_orBniimW=+!w^*kR zjA1utu61|lq%|Iwi}!e@M4KhR!O|dnZ2BnCKIiVWLom~H!hhj`&Mj6p>t0b1B)TH* zWqiKu;#q$TS`z3Hkm}&;_hy40yp-t=!&Hcb6@XZ`vCHPP69KQTpK?h)OmNCe&`I{X zX-|0&t$jUOUrfP$sb4k2;rZVB4Qe@u>uL+eEB+I16m?QchzRbd(w*pk$n6(bK>~!z za*le05|U5h4Jx5F8EMXp0GLIZfl>zOt?`DK!F~mqWPUpB7hmg!IJ&wVZdIAfg_7Uu z`LKMi#^*g!bp>o@`;;S2kR6na=Syl=77sj`$?RQnIuF)`UVEn;N^?qfG$kt@0YAv* z*S%hpC;wB#?IVct8bumh%ws-m7>u-Bfg&ZY-9&E5Ye7lw!L8M;eY`GXaE9tL6SV!Prbl{(UXR4ONXA$vHet2X` zsG(C{9p#DXhI;;CfjQ}Fn7Sl+Nn|_Wmfrtl((i70PgYZWH9;kl9GFwT;i#5=&EjaG zM>f;27w0glpqhlO$NzDRkBG*_2uo5d+@!mLak5EiZ{RygXF2I|*8#P%m>`Oo`a^nL zg7q9h7=-qI?<63WFR;_E{yaxC5$N8>s60hkJkKmeq@aQc5llzT5@Bgc%}Ql$gcVLUUON1)QVIB z!5((K>CNeNLY~P$e+lG5zp*|^;Rsm~+16H)BSAf=Y=Kd$dRT_&@V$=w5^|rk3Gpam zbG>^G91$!FyOT6;?XaVs+=63UyJENsnVoQ&f$L5SGy1uquQG?9f)7?S&iaDQw8)~c z><8%1K81^>KHTgF<}`hrz}i;e_-oIsv!|#ZLt!-22RWP0f0K+&wzVc+`zj#6S2u21 zHDP%&!8Z+wHNmK8bK+m?SwhbIm;CV3k@CI?<+qml(4mf=eLR&jr*qq?{U)^d8Kk}G{{LA5F&pu zruO(h_VLlJe#(iWL4P^N@Ld@UEg*&De~n`M*LAR2_^f_7@0ugViMtHA#FcLCX@1jN zEBV``OLTJve5TI>t<9WaU3u^3>@wX+1jwz`dOPmBk9^kNV`dN~W7|u|#hb$fgcj4v z+UW%W4*YtbboV4e3?ZT>O-=Qe*RKh^Ln^4+#W5@iDtxwACrPT!G{-v2PG#*cL%X!B zPZR<~$ahKN@8KV3`6O{v6dT`w_M7}Go_{P!fit+SgQp>t?^;L%#AX>`Vv}L#9Px^n zO&BTNe%C~DohEKfP@VonhcMtKVPY>X)XI!Jd>@IR4UE{ka~k&mQ=T?F-jl-pB{p%her zieX|A%7BE)k)+yk7gW>=z<{*!rhKsLG&TEtfZ@GKxA!~A3UUdw$s%! zCMvaPJ)K5i%M6xK=md!JF*)8&ZFcp^#GQ<46!!Uc_6`BxZsMEIYr{<0&#$xFc){^5hILpyd`w&CtZMA#5>f=jDzRMJ zt``fUU~5IB4~KOu+3=&g$-Yk@RP!B5pg1<6N>qD9^0|B&(t`M5XkOm{VQs@k^a`yS z2?}#R2l+dk|69}u-CJK>v$LWmgeIG{iea3rg858N8b=z+Iv^5^$m}GM!Fe;6nmSON zNbUvgn)ib2TPZZ0aat}}g2O%;*bG?!vBsG~1;|-gkuCtOYt1j4SOiJWH>yT=;b5^O zFq4*rtMq^=WY{g@V+hcP2^kzg?hz|2)pnnBvOe^u9J~Z2sOkek3h8pkyIAR4`|RwM zne%=Y-ynpC`M+=KsLP-{)OiueDU?k|pYS*LmHb|u$dg)PK7hPr7+w&V`#7-hhT6hV z0i#oU4B7mi<3~-}y_u(0MyN7-;(Jr$MqCHcg>id@sQ1urnaL@AD4RH_DYp?JI2T5R z=VrMGH-Q$DGltwd?_baRjJy*H!ohWm>LCJTUez$CifBK~tCIY9*t?ai0MF!HNkj63swJ%yVXL3_41hzk$u)J?{vonc90&U)+}uOAal$PBfO5a z{}%q~?5axfei^fNQ(#ydh2{5*_{pB0nON-D5EGxdun!vLB zG%-Vw!itg>_JSKqq${nWx4p^mg>6I^=BD54F((QjSWM#$9cBe%RO}EIC+3-JItx19 z^TKBhX#Uj0X@3SU?eTT{Z%<&e@=dS~3Ld0X)8P##=BJmx9z{yA;@Z6-Npt)N=~NYs zOfv(FejV1AwJDrnYNeJtf|@zbb42;y!Z~&{5ZCIl1?oT9YY_)~$7@o{Rd~&Fz0-)_ zxHVc4`Lg0|Z;zv=+4!ifq$eSdF6!1|h{oS|3qC1S%H#<5W`24QW3)lPK2?LL-8)`4 zc7$Ejy?V=ONahI)zHlo)hzeiCW%?dfm4rj{`m>)LP{}MLN&P3mFBVh zzAN(Cz2KS2rnuqAn5jY*i>7gPCO*|bQNagpHH|q90rI(q#Q;^E_!?nb;Zks|MBi5~ zPj|F_kS;Wur)%?{+*VHKwlCq=u;m(;S*+aCWzvzn-P94;B zE!dDIzsPA|>5&)q7s_#Pi_QUBr>ZRjwEp5}&|3*yisU}h6ba1L zgz_0@fJOrSK52`F-pA;_+3kLNmRyma0ml8C*OJyc)fnJyDNhvjZXz71nbHS*#j-&BnwLKcHoF94c*qJ>Q0C%B$(dA! z=TTIPApYnDIW-Y?s8z0Dtgsyi63zbsB0(bo5SizAYpudLW{K&Mt z9TB7b&i75W7>~L&IfrvDC(XQ>t~h{YYnm`&011G{?vH^}P3fwe+1WjPoB92JFIcaC zr+s}{#VrI6Yg0DqJ@^+M4=>hs$)GEQC0d7^Jg9ox*Y!UMn9HW>55|$(3|#}7xp2DX zV7@l4O#z^XPYP)j1o(Zfqp9I*iFhPj;R%MXAcd%P(`ge+l`tfsDt0Pxt>Jio246R^GPPcs^b3L{C~1B3`xR^nUBcVc#(rcPv8;hFIR9N zonTmL@Q3&#S*D%XJ0(>+G;@5qlIPo{5kyL!#qGneim??6L z>FYOQC@9=0Kte6K_43bH9D-=B^!b@u6RG7&8)+G?Xd{r@_Vmx8t?BzPBpvB|d*>o1 zW~fMolnGc>5-BqqH#R8;L@@{05tKZW+0ZF0gaNF{UPg-e6CdHKMMB7JQ568q7sb4p+1rh@T39iuM-^UnWZK|Pq4zrgHk?~cG4_Kg& z8#Lh)I7QM1Wgb*EfINi@Oy2Sn{d6#|j&{wuN31zTdpTBla+C?Sv4a`;BD*^m#?uU` zx?qt#$0$lYUCf^HqT(#=eRKBHp7+@zCcUVl{~MA_oD9XOEa_gkQUK^S1l%~fKvrc#BoAkE8}WyvKiQZxE&)M>XHAq+SEl8C+~z;1ntd;dbORBBCq$D5mBrCZ4Fl z&N!s^o#=QEqdLNdEAS|=Ol{7vGfG2t4|nl$VS-A7EbPdCixh@0QraYil7`B6Nt_MF%~w!I4R}S71$vw;T{!`y zIf{_DOj^CF%yxbB6x9hNqI^ll#x!IHSd&R;#7??p6(O+~-7kIOyu;DOmXK#eu-sB1 z*B+XCa2jsUwZUq>ir_5Q90&>4qz zo$O@;fo}d#bY3Rn27l~L(0-<4by#Jxp^)xX5(3ij{(`p)+NAm%`zpVDhm@%X-JKdE z^I;ZIpwhYWIxUk297wmZ2iaU5ei(BNSuhj6g7=E1np~q`JOZ`-Z_yhTpici0BTNxv z<_CHa0nYLJwH$`ArnrrryW0O*RZ5+xxgiAM(RYw4`nU7B277Y}o0vbk66`CiD)ehB zBB^o2KX7UqmwyxtG3(Aq*E-jXr)4r&c|1d@+7`JHaUOBo7;|8H@j>kNl$=ZRH}-J* z%I+Le;+OW?!{`TgPHb$9iLSJUFdFtVHqM6b6vK?YTv^>RT3=KaeAJWc$}2u*){jw6 z@vy(>?aA`n66=wOg=s?_!A9gxsg&W)BFIT=jAe)M(`_y@A*7LLMmcgBbX~cN46-CB zofa+=`Umu-HAn#Ysl`P&JFJRU56$ByDE$dZ-}b;T8*H+A_rWOERbUYRp5QKmv=#mM zX^NB2XuLy2n!&`GAfVco^ywNPM)+MbWvZiW!D?q*j0c@dlXQ!Qq@hi)gj6*an6qGsM^gN1T!j-79L2tq{yBr*UhUQ9J2;I~^_`4)8iy;0 z-=&d&E3UW13}3K!n*@=D#E@5>cI=1eUcjNUdY>d<>=?YGF)bIjO+15faA1!px)lYQH4*3XE@4l)Wzx|El5dJ^NTAT9u zQj79W4-ssdHcoQ((kZ)ZTxsA6@hkQ4_!#-rfgJTny|bh^;pqN(@;FR$qHw|Wfd1NE zjhVx?vmEQ1bqw{^laJo*Jz0tcR{`clXjB>KMLfE7-#u1 zC9;q%+GgNT-;pbRu;r)fDI7_>djRDHE~5{XT#r8@T6L_#zow{T}#o&Y=Q9IqzwPOXDK9W zWtjcJ;tG2XD+-m#VOS6%NF=57D>OWr;`4!)R`Nwkt#*;kMR^C}9h|aC`ihEf`@9qh z-}whEhJc6W2Kd+9MC5?!-vL)^ZdIK5Wo%{u4B7A?;JvgV)U6}+-;Q=xQ^$PlCB+Zf z{f|sC4#{f2OzwUFf`$#y51*@YNT}A_lYNuYbR^8vEq@nu}dO+$L$6v`J_KbcMA@sYg1ZO;ztDHol#xD_mjL) zP$y;|BpuW8)UCmNynQ~FqZDELV@PQDM33JDR72@=4EY^1Q{D}ACoAG|ip>iUDd1>l zLDrs;5x%0GJ8G_}mQQdlTtU=w0^Q&u@4~=#Qo8d^3AGraBwL<`!BzZfa6gGDtp+O| zLYJ>jkT}sn=iVTc%xjWHnCidQLNh`39|(yLKi=+alG*X`8Tr3R_|<42fein?SM?vi zx9~D_M(>N_QhP1-6tE~jn8HQWlp~G}r-qLNW zZcD1AGq_%|u3b^<{W=uFqym*F$X8F~ng59R_!QetKzwKD&-l`Sw6eRyj2Han;esJc)Mgp`>$RpniK6!X%o%*Y$> zfJOdRk8g*z1Yd|4-ge`H=-BP8C6- z1ky7HEZ{Hk2nh`l)sfVO9y;5sFQvwFKET)5*RXZhP$&raaxJ}<9DPo@y!?mIgHVAc zxBw83V-2XqKH>86u*w{hI0RoqQw`Btb?)h6Z(z`2WFZ1=jTaS6g7odtKCPEABi|+8_(Ek&NciYjdC}G>p1sP^Fr&Kd0lk${&~d7 z<6b-Wzr^!AQpkJi%gf769Ey0pi}er>mtQLbu3lQh`1Y?9d*J3{)b3c$TX7%Ggo zi^@Y0m*1S31L`TqUt=Zq8n5&YrfKt=76C7m-;VqQjk*8x_L#SWF2s0~ebuW0~8l$tXMyWJBTtbqS z+&X7g^dk`WP^Udz(N+p5h*gd;)G=A;`0)&~ZHv?s0s1&r?C^J5TB#$(4{XUVt?xM+ z1d-Ycq|MEB$+&>LigWl9i*PTzrD#gG*AQp+i{CnmEF=+!7-|wOxAQCX+7OlIVzy-c z4PQGiq4yUTJTO|i_D{2P)#QD?#J1RCgWZ-$uk8l)cq2InsG;ZEHWe~NDZ2-js`12b zsI$kW`b&l18v@*3$%F-Y1x0=?C?O8f5X|JC-LF~{MBTDXjX*^wjO?FfpdJq-3;8ogEakRa z3{B!a>=AESP!4uU-lHaXd!Y_NtzWX6{>!i1j+x3E+a)9HK1Cg}v|j&~z+UfPP z!Z7Lk|4+zy3XquX{t+}+>#MGEU94MZb4?-~@q#$gvQuxpBd4-5-^`RIQM9$6pvg1u zWyd@t`W19M2~S4U5K?wYrkr;+-n`_H$3o>TRdk3dXB^)LreWwjdx`Ogy+af5-L0oZ{B>668Hg^|nWt>q1(h&Ma$ z!C{~irQHc4P1CqFOQCDu^%8WqWNZ4#cE~&H0eN*NHo+0cWd$VfjRu$_G~>Zw5`81q zhBT{WN#us4!Y4q5T>KpIflshGyH?@zNs{A8fMA(&V+l{L_}TN;BF=|N6s*ral_&>` z2`axm+z!#9mQ%9o8H{?%RfxAT5Bj`4d;WQ~S~2V4Q7&GVioEkp`IVxTYCW!R@@`vu z^3JLJYu=qCoqQfA%Ym=Ob*}$dJYCJoFIJM3a0uH^dlBQVYSs$Tznwag0%WcfeD--f zwGk7+Ro{Bd4HJs z7JbX{hs#dzrQf)Ti?-cWhl-g)w=sJ(7X`7hVUOa^4yC@Z?0XTscYP}NAQF_wwGa2K zFB1h$%x_#NGtD{CA=(@4|K-}xBF^GlkvLHI;3xKkmPhv6cXXxHs^?8!HWC{HT`a2= z{`5--&Z=6FucmK(JI1!u#baBXpWcHv)Fo!=hLtVOUEt=AVHedK=JTzk+u*RPyt}!z znvecfWkaohm90)6MW`#h-1DIeQ~Xm)KmD2xRn^^n<2%lUX5~TbIih9v_t53Vsp%04)6L}mc>hl+u3;xylu+U$-+eFyahM4m|bBxH<&nN&rEhEj(>h_rb E4+SGv5C8xG literal 0 HcmV?d00001 From f57ecbe59d6ad1b241e167f70d3c16c6013f67d3 Mon Sep 17 00:00:00 2001 From: "DESKTOP-M4GD565\\LME" Date: Thu, 5 Oct 2023 23:54:03 -0700 Subject: [PATCH 04/26] neighbors ree --- _maps/map_files/Oshan/oshan.dmm | 1 - 1 file changed, 1 deletion(-) diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index 5134a529a9d7..2264481f7eee 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -25519,7 +25519,6 @@ name = "Maximum Security Test Chamber"; req_access = list("xenobiology") }, -/obj/structure/cable, /turf/open/floor/engine, /area/station/science/xenobiology) "mYo" = ( From 488149481d269564df24dc6e581a8ca5b9063b5c Mon Sep 17 00:00:00 2001 From: "DESKTOP-M4GD565\\LME" Date: Thu, 5 Oct 2023 23:55:35 -0700 Subject: [PATCH 05/26] let's not do perma oshan shall we --- config/maps.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/maps.txt b/config/maps.txt index 2afc25e39f72..3cf1094af8ef 100644 --- a/config/maps.txt +++ b/config/maps.txt @@ -14,6 +14,7 @@ Format: endmap map metastation + #default minplayers 25 #voteweight 0.5 votable @@ -50,6 +51,5 @@ map multiz_debug endmap map oshan - default votable endmap From 645e14a584b5983aa8b02f6a9551a63b98001ab5 Mon Sep 17 00:00:00 2001 From: "DESKTOP-M4GD565\\LME" Date: Fri, 6 Oct 2023 00:56:52 -0700 Subject: [PATCH 06/26] moved medbay around --- _maps/map_files/Oshan/oshan.dmm | 864 ++++++++++++++------------------ 1 file changed, 383 insertions(+), 481 deletions(-) diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index 2264481f7eee..81c65e6019bd 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -47,17 +47,12 @@ /turf/open/floor/iron/dark, /area/station/medical/virology) "abb" = ( -/obj/structure/table, -/obj/machinery/camera/directional/north{ - c_tag = "Medbay Paramedic Dispatch"; - name = "medical camera"; - network = list("ss13","medical") - }, -/obj/machinery/fax{ - fax_name = "Medical"; - name = "Medical Fax Machine" +/obj/effect/turf_decal/tile/blue/full, +/obj/effect/turf_decal/siding/white{ + dir = 1 }, -/turf/open/floor/iron/dark, +/obj/machinery/vending/drugs, +/turf/open/floor/iron/white/textured, /area/station/medical/storage) "abe" = ( /obj/structure/table/reinforced, @@ -556,7 +551,7 @@ /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/unres, /turf/open/floor/iron/dark, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "amg" = ( /obj/effect/turf_decal/bot, /obj/effect/spawner/random/structure/crate_empty, @@ -2138,7 +2133,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "beA" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/window/preopen{ @@ -2584,16 +2579,11 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) "boX" = ( -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/effect/turf_decal/trimline/blue/filled/corner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/blue/filled/corner{ - dir = 1 +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 }, -/obj/effect/turf_decal/trimline/blue/filled/mid_joiner, -/turf/open/floor/iron/white/textured_large, -/area/station/medical/medbay/central) +/turf/open/floor/iron/white/textured, +/area/station/medical/office) "boZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/engine, @@ -2992,7 +2982,7 @@ }, /obj/structure/cable, /turf/open/floor/plating, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "byv" = ( /obj/machinery/conveyor/auto{ dir = 1 @@ -3069,23 +3059,23 @@ /turf/open/floor/carpet/purple, /area/station/command/heads_quarters/captain/private) "bAM" = ( -/obj/machinery/camera/autoname/directional/north, -/obj/machinery/light_switch/directional/north, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/structure/table/reinforced, -/obj/item/roller{ - pixel_y = 6 +/obj/item/storage/medkit/regular{ + pixel_x = 3; + pixel_y = -3 }, -/obj/item/roller{ - pixel_y = 6 +/obj/item/storage/medkit/brute{ + pixel_x = 3; + pixel_y = 3 }, -/obj/item/roller{ - pixel_y = 6 +/obj/item/storage/medkit/brute, +/obj/item/storage/medkit/brute{ + pixel_x = -3; + pixel_y = -3 }, -/obj/structure/window/spawner/directional/south, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/blue/full, /obj/structure/window/spawner/directional/east, +/obj/structure/window/spawner/directional/south, /turf/open/floor/iron/white/textured, /area/station/medical/storage) "bAN" = ( @@ -3277,7 +3267,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "bDW" = ( /obj/structure/table, /obj/machinery/power/apc/auto_name/directional/east, @@ -3946,7 +3936,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "bVu" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -5293,26 +5283,8 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/upper) "cKM" = ( -/obj/structure/window/spawner/directional/north, -/obj/item/storage/medkit/regular{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/storage/medkit/o2{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/medkit/o2, -/obj/item/storage/medkit/o2{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/structure/table/reinforced, -/obj/structure/window/spawner/directional/east, -/obj/structure/window/spawner/directional/south, -/obj/effect/turf_decal/tile/blue/full, -/turf/open/floor/iron/dark/textured_large, -/area/station/medical/medbay/central) +/turf/open/floor/iron/white/textured, +/area/station/medical/cryo) "cKY" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/dark_blue/opposingcorners{ @@ -5388,7 +5360,7 @@ dir = 1 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "cME" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 @@ -5445,7 +5417,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "cOP" = ( /mob/living/carbon/human/species/monkey, /obj/structure/flora/bush/lavendergrass/style_random, @@ -6307,7 +6279,7 @@ }, /obj/machinery/portable_atmospherics/canister/anesthetic_mix, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "djL" = ( /obj/structure/rack, /obj/effect/spawner/random/techstorage/command_all, @@ -6471,24 +6443,22 @@ /turf/open/floor/engine, /area/station/engineering/main) "dnv" = ( -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 9 - }, -/obj/structure/table/reinforced, -/obj/item/wheelchair{ - pixel_y = 3 - }, -/obj/item/wheelchair{ - pixel_y = 3 +/obj/item/storage/medkit/regular{ + pixel_x = 3; + pixel_y = -3 }, -/obj/item/wheelchair{ +/obj/item/storage/medkit/toxin{ + pixel_x = 3; pixel_y = 3 }, -/obj/item/wheelchair{ - pixel_y = 3 +/obj/item/storage/medkit/toxin, +/obj/item/storage/medkit/toxin{ + pixel_x = -3; + pixel_y = -3 }, +/obj/structure/table/reinforced, /obj/structure/window/spawner/directional/south, +/obj/effect/turf_decal/tile/blue/full, /turf/open/floor/iron/white/textured, /area/station/medical/storage) "dnA" = ( @@ -7211,14 +7181,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) -"dFu" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/blue/filled/corner{ - dir = 1 - }, -/turf/open/floor/iron/white/textured, -/area/station/medical/storage) "dFW" = ( /obj/effect/turf_decal/bot{ dir = 1 @@ -7749,9 +7711,8 @@ /obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ dir = 1 }, -/obj/machinery/vending/medical, /turf/open/floor/iron/white/textured_large, -/area/station/medical/medbay/central) +/area/station/medical/office) "dTU" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 6 @@ -7903,13 +7864,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/grass, /area/station/service/hydroponics) -"dYp" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white/textured, -/area/station/medical/storage) "dYT" = ( /turf/open/floor/wood, /area/station/command/heads_quarters/qm) @@ -8028,11 +7982,15 @@ }, /area/station/commons/dorms) "ebe" = ( -/obj/machinery/rnd/production/techfab/department/medical, -/obj/machinery/airalarm/directional/west, -/obj/effect/turf_decal/tile/blue/full, -/turf/open/floor/iron/dark/textured_large, -/area/station/medical/medbay/central) +/obj/machinery/computer/records/medical{ + dir = 4 + }, +/obj/machinery/light/directional/west, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/carpet, +/area/station/medical/office) "eco" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -8127,12 +8085,8 @@ /turf/open/floor/circuit, /area/station/tcommsat/server) "eeA" = ( -/obj/effect/landmark/start/medical_doctor, -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 5 - }, -/turf/open/floor/iron/dark/textured, -/area/station/medical/medbay/central) +/turf/closed/wall, +/area/station/medical/cryo) "eeS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/table/reinforced/rglass, @@ -8323,11 +8277,8 @@ /turf/open/floor/iron/dark, /area/station/science/ordnance/storage) "ejr" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 10 +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 4 }, /turf/open/floor/iron/white/textured, /area/station/medical/storage) @@ -9130,13 +9081,16 @@ /turf/open/floor/iron/dark, /area/station/maintenance/department/electrical) "eDD" = ( -/obj/structure/table, -/obj/effect/turf_decal/siding/white/corner, -/obj/machinery/firealarm/directional/north, -/obj/item/clipboard, -/obj/item/paper, -/obj/item/pen, -/turf/open/floor/iron/dark, +/obj/structure/table/reinforced, +/obj/item/clothing/gloves/latex/nitrile, +/obj/item/clothing/gloves/latex/nitrile, +/obj/item/clothing/gloves/latex/nitrile, +/obj/effect/turf_decal/tile/blue/full, +/obj/effect/turf_decal/siding/white{ + dir = 5 + }, +/obj/machinery/cell_charger, +/turf/open/floor/iron/white/textured, /area/station/medical/storage) "eDF" = ( /obj/structure/table, @@ -9946,7 +9900,7 @@ }, /obj/machinery/atmospherics/components/unary/cryo_cell, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "eXH" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -10258,7 +10212,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /obj/effect/turf_decal/trimline/blue/filled/line, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "feR" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -10563,7 +10517,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "foo" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/caution/stand_clear, @@ -10923,7 +10877,7 @@ /obj/machinery/light/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "fxX" = ( /obj/effect/turf_decal/stripes{ dir = 4 @@ -11130,7 +11084,7 @@ /area/station/hallway/primary/central) "fDX" = ( /turf/closed/wall/r_wall, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "fEm" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -11611,7 +11565,7 @@ dir = 9 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "fQp" = ( /obj/structure/tank_dispenser/oxygen, /obj/effect/turf_decal/trimline/red/filled/warning{ @@ -11646,9 +11600,6 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 6 }, -/obj/effect/turf_decal/trimline/blue/filled/corner{ - dir = 1 - }, /obj/effect/turf_decal/trimline/blue/filled/mid_joiner, /obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ dir = 4 @@ -11664,8 +11615,8 @@ pixel_x = 32; pixel_y = -13 }, -/turf/open/floor/iron/white/textured_large, -/area/station/medical/medbay/central) +/turf/open/floor/iron/white/textured, +/area/station/medical/office) "fRn" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /obj/structure/cable, @@ -12086,7 +12037,7 @@ dir = 4 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "gbv" = ( /obj/machinery/ocean_elevator{ elevator_id = "mineshaft" @@ -12182,11 +12133,17 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) "gcG" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 +/obj/structure/table/reinforced, +/obj/item/storage/box/syringes{ + pixel_y = 4 }, -/obj/structure/chair/sofa/corp/right{ - dir = 8 +/obj/item/storage/box/syringes, +/obj/item/gun/syringe, +/obj/effect/turf_decal/tile/blue/full, +/obj/machinery/door/window/right/directional/south{ + dir = 8; + name = "First Aid Supplies"; + req_access = list("medical") }, /turf/open/floor/iron/white/textured, /area/station/medical/storage) @@ -13395,7 +13352,8 @@ }, /obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - id_tag = "medlobby" + id_tag = "medlobby"; + cycle_id = "medbay" }, /turf/open/floor/iron/dark/textured, /area/station/medical/medbay/lobby) @@ -13485,7 +13443,7 @@ dir = 1 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "gPk" = ( /obj/machinery/duct/industrial/waste, /obj/effect/turf_decal/trimline/white/warning{ @@ -13782,19 +13740,22 @@ /turf/open/floor/iron/dark, /area/station/cargo/sorting) "gXq" = ( -/obj/machinery/airalarm/directional/north, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 +/obj/item/storage/medkit/regular{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/storage/medkit/fire{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/medkit/fire, +/obj/item/storage/medkit/fire{ + pixel_x = -3; + pixel_y = -3 }, /obj/structure/table/reinforced, -/obj/item/clothing/suit/jacket/straight_jacket, -/obj/item/clothing/glasses/eyepatch, -/obj/item/clothing/ears/earmuffs, -/obj/item/clothing/ears/earmuffs, -/obj/item/clothing/glasses/blindfold, -/obj/item/clothing/glasses/blindfold, +/obj/effect/turf_decal/tile/blue/full, /obj/machinery/door/window/right/directional/south{ - dir = 2; name = "First Aid Supplies"; req_access = list("medical") }, @@ -14616,7 +14577,7 @@ dir = 6 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "huL" = ( /obj/effect/turf_decal/stripes{ dir = 1 @@ -14892,7 +14853,7 @@ pixel_y = 6 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "hBR" = ( /obj/machinery/restaurant_portal/bar, /obj/effect/turf_decal/trimline/green/filled/line{ @@ -14982,7 +14943,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/duct/industrial/waste, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - id_tag = "medlobby" + id_tag = "medlobby"; + cycle_id = "medbay" }, /turf/open/floor/iron/dark/textured, /area/station/medical/medbay/lobby) @@ -15727,35 +15689,29 @@ /area/station/science/robotics/lab) "hWv" = ( /obj/effect/turf_decal/trimline/blue/filled/line, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, /obj/effect/turf_decal/trimline/blue/filled/mid_joiner, -/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ +/turf/open/floor/iron/white/textured, +/area/station/medical/office) +"hWy" = ( +/obj/machinery/camera/autoname/directional/north, +/obj/machinery/light_switch/directional/north, +/obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 }, -/turf/open/floor/iron/white/textured_large, -/area/station/medical/medbay/central) -"hWy" = ( -/obj/structure/window/spawner/directional/south, -/obj/item/storage/medkit/regular{ - pixel_x = 3; - pixel_y = -3 +/obj/structure/table/reinforced, +/obj/item/roller{ + pixel_y = 6 }, -/obj/item/storage/medkit/fire{ - pixel_x = 3; - pixel_y = 3 +/obj/item/roller{ + pixel_y = 6 }, -/obj/item/storage/medkit/fire, -/obj/item/storage/medkit/fire{ - pixel_x = -3; - pixel_y = -3 +/obj/item/roller{ + pixel_y = 6 }, -/obj/structure/table/reinforced, +/obj/structure/window/spawner/directional/south, /obj/structure/window/spawner/directional/east, -/obj/effect/turf_decal/tile/blue/full, -/turf/open/floor/iron/dark/textured_large, -/area/station/medical/medbay/central) +/turf/open/floor/iron/white/textured_large, +/area/station/medical/office) "hWK" = ( /obj/machinery/duct/industrial/waste, /obj/structure/disposalpipe/segment{ @@ -16186,12 +16142,22 @@ /turf/open/floor/eighties/red, /area/station/service/electronic_marketing_den) "ilC" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 6 +/obj/item/storage/medkit/regular{ + pixel_x = 3; + pixel_y = -3 }, -/obj/structure/chair/sofa/corp/left{ - dir = 8 +/obj/item/storage/medkit/o2{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/medkit/o2, +/obj/item/storage/medkit/o2{ + pixel_x = -3; + pixel_y = -3 }, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/blue/full, +/obj/structure/window/spawner/directional/west, /turf/open/floor/iron/white/textured, /area/station/medical/storage) "ilO" = ( @@ -16243,7 +16209,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "imz" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/iron/dark, @@ -18262,7 +18228,7 @@ "jpS" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "jpZ" = ( /obj/machinery/computer/security{ dir = 8 @@ -18311,17 +18277,11 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "jrX" = ( -/obj/effect/landmark/start/paramedic, -/obj/effect/turf_decal/loading_area/white{ - color = "#52B4E9"; - dir = 4 - }, -/obj/effect/turf_decal/tile/blue/full, -/obj/effect/turf_decal/siding/white{ - dir = 4 +/obj/structure/chair/office/light{ + dir = 8 }, -/turf/open/floor/iron/dark/textured_large, -/area/station/medical/medbay/central) +/turf/open/floor/carpet, +/area/station/medical/office) "jsj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -18799,7 +18759,7 @@ /obj/item/storage/backpack/duffelbag/med/surgery, /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "jFi" = ( /obj/effect/turf_decal/stripes{ dir = 9 @@ -19384,7 +19344,7 @@ dir = 1 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "jTb" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -19895,8 +19855,10 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/central) "kfA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, +/obj/effect/landmark/start/medical_doctor, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 5 + }, /turf/open/floor/iron/white/textured, /area/station/medical/storage) "kfJ" = ( @@ -19927,7 +19889,7 @@ /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "kgt" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 5 @@ -20419,7 +20381,7 @@ }, /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "kta" = ( /obj/machinery/ai_slipper{ uses = 10 @@ -21110,15 +21072,11 @@ /turf/open/floor/iron/dark, /area/station/service/cafeteria) "kJN" = ( -/obj/effect/turf_decal/trimline/blue/filled/corner, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 }, -/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ - dir = 8 - }, -/turf/open/floor/iron/white/textured_large, -/area/station/medical/medbay/central) +/turf/open/floor/iron/white/textured, +/area/station/medical/office) "kKh" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -21133,7 +21091,7 @@ dir = 6 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "kKx" = ( /obj/structure/table/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -21554,30 +21512,9 @@ /turf/open/floor/wood/large, /area/station/security/checkpoint/customs) "kTL" = ( -/obj/machinery/door/window/right/directional/south{ - dir = 1; - name = "First Aid Supplies"; - req_access = list("medical") - }, -/obj/structure/window/spawner/directional/west, -/obj/item/storage/medkit/regular{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/storage/medkit/toxin{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/medkit/toxin, -/obj/item/storage/medkit/toxin{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/structure/table/reinforced, -/obj/structure/window/spawner/directional/south, -/obj/effect/turf_decal/tile/blue/full, -/turf/open/floor/iron/dark/textured_large, -/area/station/medical/medbay/central) +/obj/machinery/photocopier, +/turf/open/floor/iron/white/textured, +/area/station/medical/office) "kUl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -21814,7 +21751,7 @@ dir = 1 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "lbq" = ( /obj/effect/turf_decal/tile/neutral/fourcorners{ color = "#009dc4" @@ -21823,11 +21760,20 @@ /turf/open/floor/iron/smooth, /area/station/commons/fitness/recreation) "lbA" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 6 +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -7; + pixel_y = 4 }, -/turf/open/floor/iron/dark/textured, -/area/station/medical/medbay/central) +/obj/item/newspaper{ + pixel_x = 11; + pixel_y = 4 + }, +/obj/item/newspaper{ + pixel_x = 8 + }, +/turf/open/floor/iron/white/textured, +/area/station/medical/office) "lca" = ( /obj/machinery/duct/industrial/waste, /obj/structure/cable, @@ -21927,7 +21873,7 @@ }, /obj/machinery/light/directional/east, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "lfy" = ( /obj/effect/mapping_helpers/airlock/unres, /obj/machinery/door/airlock/maintenance, @@ -21935,7 +21881,6 @@ /area/station/maintenance/port/central) "lfN" = ( /obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, /turf/open/floor/iron/dark/textured, /area/station/science/xenobiology) "lfO" = ( @@ -22250,7 +22195,7 @@ dir = 5 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "lms" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/green/filled/warning, @@ -22344,14 +22289,12 @@ /turf/open/floor/engine, /area/station/science/robotics/mechbay) "lpY" = ( -/obj/structure/chair/office/light{ - dir = 8 - }, -/obj/effect/turf_decal/siding/white{ +/obj/effect/turf_decal/loading_area/white{ + color = "#52B4E9"; dir = 4 }, -/obj/structure/cable, /turf/open/floor/iron/dark, +/turf/open/floor/iron/white/textured, /area/station/medical/storage) "lqa" = ( /obj/structure/cable, @@ -22480,12 +22423,8 @@ /turf/open/floor/iron/dark/textured_edge, /area/station/hallway/primary/central) "ltZ" = ( -/obj/effect/turf_decal/tile/blue/full, -/obj/effect/turf_decal/siding/white{ - dir = 6 - }, -/turf/open/floor/iron/dark/textured_large, -/area/station/medical/medbay/central) +/turf/open/floor/carpet, +/area/station/medical/office) "luc" = ( /obj/structure/cable, /obj/machinery/duct/industrial/waste, @@ -23425,14 +23364,10 @@ }, /area/station/engineering/atmos/hfr_room) "lQe" = ( -/obj/machinery/computer/records/medical{ - dir = 4 - }, -/obj/machinery/light/directional/west, -/obj/machinery/newscaster/directional/west, -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/iron/dark, +/obj/machinery/rnd/production/techfab/department/medical, +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/tile/blue/full, +/turf/open/floor/iron/white/textured, /area/station/medical/storage) "lQl" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/incinerator_input{ @@ -24185,8 +24120,9 @@ /obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ dir = 8 }, -/turf/open/floor/iron/white/textured_large, -/area/station/medical/medbay/central) +/obj/structure/cable, +/turf/open/floor/iron/white/textured, +/area/station/medical/office) "moq" = ( /obj/machinery/door/airlock/security{ name = "Brig Office" @@ -24841,11 +24777,9 @@ /turf/open/floor/iron/dark/textured_edge, /area/station/science/lobby) "mHV" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 4 - }, -/turf/open/floor/iron/dark/textured, -/area/station/medical/medbay/central) +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/medical/cryo) "mHY" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/rack, @@ -26186,7 +26120,6 @@ dir = 4; invisibility = 101 }, -/obj/effect/landmark/start/medical_doctor, /turf/open/floor/iron/white/textured, /area/station/medical/storage) "nnY" = ( @@ -26251,18 +26184,8 @@ /turf/open/floor/plastic, /area/station/hallway/primary/central) "nqf" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/right/directional/south{ - dir = 8; - name = "First Aid Supplies"; - req_access = list("medical") - }, -/obj/item/mod/module/plasma_stabilizer, -/obj/item/mod/module/thermal_regulator, -/obj/structure/window/spawner/directional/east, -/obj/effect/turf_decal/tile/blue/full, -/turf/open/floor/iron/dark/textured_large, -/area/station/medical/medbay/central) +/turf/open/floor/iron/white/textured, +/area/station/medical/office) "nqk" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 6 @@ -26306,7 +26229,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "nrI" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/effect/turf_decal/delivery, @@ -26445,7 +26368,7 @@ dir = 6 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "nvl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -26502,14 +26425,15 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 }, -/obj/effect/turf_decal/trimline/blue/filled/corner{ - dir = 8 - }, /obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ dir = 1 }, -/turf/open/floor/iron/white/textured_large, -/area/station/medical/medbay/central) +/obj/structure/cable, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 8 + }, +/turf/open/floor/iron/white/textured, +/area/station/medical/office) "nvS" = ( /obj/machinery/smartfridge/organ, /obj/machinery/light/directional/north, @@ -26982,13 +26906,18 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "nIg" = ( -/obj/effect/turf_decal/tile/blue/full, -/obj/effect/turf_decal/siding/white{ - dir = 1 +/obj/structure/table, +/obj/machinery/camera/directional/north{ + c_tag = "Medbay Paramedic Dispatch"; + name = "medical camera"; + network = list("ss13","medical") }, -/obj/machinery/vending/drugs, -/turf/open/floor/iron/dark/textured_large, -/area/station/medical/medbay/central) +/obj/machinery/fax{ + fax_name = "Medical"; + name = "Medical Fax Machine" + }, +/turf/open/floor/carpet, +/area/station/medical/office) "nIm" = ( /obj/effect/turf_decal/sand, /obj/effect/turf_decal/sand, @@ -27203,16 +27132,11 @@ /area/station/medical/storage) "nNP" = ( /obj/effect/turf_decal/trimline/blue/filled/warning, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, /obj/effect/turf_decal/trimline/blue/filled/mid_joiner, -/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ - dir = 1 - }, /obj/structure/chair/office/light, -/turf/open/floor/iron/white/textured_large, -/area/station/medical/medbay/central) +/obj/effect/landmark/start/medical_doctor, +/turf/open/floor/iron/white/textured, +/area/station/medical/office) "nNT" = ( /obj/structure/table, /obj/machinery/splicer, @@ -27301,8 +27225,8 @@ dir = 1 }, /obj/effect/turf_decal/siding/blue, -/turf/open/floor/iron/dark/textured, -/area/station/medical/medbay/central) +/turf/open/floor/iron/white/textured_large, +/area/station/medical/office) "nQI" = ( /turf/closed/wall/r_wall, /area/station/science/lab) @@ -27320,7 +27244,7 @@ "nRQ" = ( /obj/structure/disposalpipe/segment, /turf/closed/wall, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "nSA" = ( /obj/structure/sign/departments/lawyer, /turf/closed/wall, @@ -27969,7 +27893,7 @@ }, /obj/machinery/atmospherics/components/unary/cryo_cell, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "ojH" = ( /obj/effect/landmark/start/chaplain, /obj/structure/chair, @@ -27984,7 +27908,7 @@ dir = 1 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "ojN" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/yellow/filled/warning{ @@ -28333,7 +28257,7 @@ dir = 10 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "orf" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -28516,7 +28440,7 @@ dir = 1 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "ovu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -28837,21 +28761,15 @@ /turf/open/floor/carpet/orange, /area/station/command/heads_quarters/ce) "oEo" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ +/obj/structure/chair/sofa/left{ + color = "#52B4E9"; dir = 8 }, -/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ +/obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, -/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ - dir = 8 - }, -/obj/machinery/light/directional/east, -/turf/open/floor/iron/white/textured_large, -/area/station/medical/medbay/central) +/turf/open/floor/iron/white/textured, +/area/station/medical/office) "oEs" = ( /obj/machinery/vending/tool, /obj/machinery/camera/directional/north{ @@ -28892,13 +28810,10 @@ /turf/closed/wall/r_wall/rust, /area/station/ai_monitored/turret_protected/ai) "oGE" = ( -/obj/machinery/computer/crew{ - dir = 4 - }, -/obj/effect/turf_decal/siding/white, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/directional/west, +/obj/machinery/vending/wardrobe/medi_wardrobe, /turf/open/floor/iron/dark, +/turf/open/floor/iron/white/textured, /area/station/medical/storage) "oGQ" = ( /obj/effect/decal/cleanable/blood/tracks, @@ -29490,6 +29405,7 @@ "oYl" = ( /obj/machinery/light/directional/south, /obj/effect/turf_decal/trimline/blue/filled/line, +/obj/machinery/vending/medical, /turf/open/floor/iron/white/textured, /area/station/medical/storage) "oYu" = ( @@ -29501,7 +29417,7 @@ }, /obj/machinery/portable_atmospherics/canister/anesthetic_mix, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "oYN" = ( /obj/item/radio/intercom/directional/north, /obj/machinery/computer/security, @@ -29599,7 +29515,7 @@ dir = 1 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "pcx" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/plating/ocean, @@ -29876,7 +29792,7 @@ /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/blue/filled/warning, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "pkw" = ( /turf/closed/wall, /area/mine/storage/public) @@ -29950,7 +29866,7 @@ dir = 4 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "plD" = ( /obj/structure/chair/office{ dir = 4 @@ -31685,6 +31601,7 @@ dir = 1 }, /obj/structure/closet/l3closet/scientist, +/obj/structure/cable, /turf/open/floor/iron/dark/textured, /area/station/science/xenobiology) "qck" = ( @@ -31909,10 +31826,17 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/secondary/entry) "qhH" = ( -/obj/structure/extinguisher_cabinet/directional/east, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 +/obj/structure/table/reinforced, +/obj/item/defibrillator/loaded{ + pixel_y = 6 + }, +/obj/item/defibrillator/loaded{ + pixel_y = 3 }, +/obj/item/defibrillator/loaded, +/obj/effect/turf_decal/tile/blue/full, +/obj/structure/window/spawner/directional/north, +/obj/structure/window/spawner/directional/west, /turf/open/floor/iron/white/textured, /area/station/medical/storage) "qhM" = ( @@ -32294,7 +32218,7 @@ dir = 1 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "qrV" = ( /obj/structure/chair/wood{ dir = 4 @@ -32904,7 +32828,7 @@ dir = 1 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "qJD" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/access/all/medical/general, @@ -33394,12 +33318,9 @@ /turf/open/floor/plating, /area/station/maintenance/port/central) "qUa" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/trimline/blue/filled/warning, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 6 + }, /turf/open/floor/iron/white/textured, /area/station/medical/storage) "qUe" = ( @@ -33502,14 +33423,12 @@ /turf/open/floor/grass, /area/station/maintenance/starboard/upper) "qXP" = ( +/obj/item/kirbyplants/random, /obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ - dir = 8 + dir = 4 }, -/turf/open/floor/iron/white/textured_large, -/area/station/medical/medbay/central) +/turf/open/floor/iron/white/textured, +/area/station/medical/office) "qYv" = ( /obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/trimline/yellow/filled/end{ @@ -34463,7 +34382,7 @@ dir = 8 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "rwX" = ( /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, @@ -34489,7 +34408,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/duct/industrial/waste, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - id_tag = "medlobby" + id_tag = "medlobby"; + cycle_id = "medbay" }, /turf/open/floor/iron/white/textured, /area/station/medical/treatment_center) @@ -35821,17 +35741,14 @@ /turf/open/floor/wood, /area/station/service/cafeteria) "shm" = ( -/obj/structure/table/reinforced, -/obj/structure/window/spawner/directional/west, -/obj/item/storage/box/syringes{ - pixel_y = 4 +/obj/effect/turf_decal/trimline/blue/filled/mid_joiner, +/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ + dir = 1 }, -/obj/item/storage/box/syringes, -/obj/item/gun/syringe, -/obj/structure/window/spawner/directional/east, -/obj/effect/turf_decal/tile/blue/full, -/turf/open/floor/iron/dark/textured_large, -/area/station/medical/medbay/central) +/obj/structure/chair/office/light, +/obj/effect/landmark/start/paramedic, +/turf/open/floor/carpet, +/area/station/medical/office) "shF" = ( /obj/structure/fans/tiny/forcefield, /turf/open/floor/plating, @@ -36829,21 +36746,15 @@ pixel_x = -23; id = "ticket_machine_med" }, -/obj/effect/turf_decal/trimline/blue/filled/end{ - dir = 8 - }, /obj/effect/turf_decal/trimline/blue/filled/mid_joiner, -/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ - dir = 8 - }, /obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ dir = 1 }, /obj/machinery/computer/department_orders/medical{ dir = 4 }, -/turf/open/floor/iron/white/textured_large, -/area/station/medical/medbay/central) +/turf/open/floor/carpet, +/area/station/medical/office) "sJD" = ( /obj/structure/chair/sofa/middle{ dir = 4 @@ -37073,20 +36984,26 @@ /turf/open/floor/wood/large, /area/station/command/bridge) "sQl" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/effect/turf_decal/trimline/brown/warning, -/obj/machinery/camera/autoname/directional/north, -/obj/effect/turf_decal/trimline/brown/mid_joiner, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 +/obj/structure/table/reinforced, +/obj/item/wheelchair{ + pixel_y = 3 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/siding/blue, -/turf/open/floor/iron/dark/textured, -/area/station/medical/medbay/central) +/obj/item/wheelchair{ + pixel_y = 3 + }, +/obj/item/wheelchair{ + pixel_y = 3 + }, +/obj/item/wheelchair{ + pixel_y = 3 + }, +/obj/structure/window/spawner/directional/south, +/turf/open/floor/iron/white/textured_large, +/area/station/medical/office) "sQL" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -37750,8 +37667,8 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/aft) "tku" = ( -/obj/structure/bed/dogbed/runtime, /mob/living/simple_animal/pet/cat/runtime, +/obj/structure/bed/dogbed/runtime, /obj/item/toy/cattoy, /obj/machinery/airalarm/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -39004,7 +38921,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 6 }, -/turf/open/floor/iron, +/turf/open/floor/iron/white/textured, /area/station/medical/storage) "tSW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -39373,7 +39290,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/trimline/blue/filled/warning, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "ucp" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 6 @@ -39475,7 +39392,7 @@ dir = 4 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "udW" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, @@ -39643,6 +39560,7 @@ /obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/iron/white/textured_large, /area/station/medical/treatment_center) "uhr" = ( @@ -40181,8 +40099,8 @@ /obj/effect/turf_decal/siding/blue, /obj/structure/window/spawner/directional/west, /obj/machinery/light/directional/north, -/turf/open/floor/iron/dark/textured, -/area/station/medical/medbay/central) +/turf/open/floor/iron/white/textured_large, +/area/station/medical/office) "uxK" = ( /turf/closed/wall/r_wall, /area/station/commons/fitness/recreation/entertainment) @@ -40293,7 +40211,8 @@ }, /obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - id_tag = "medlobby" + id_tag = "medlobby"; + cycle_id = "medbay" }, /turf/open/floor/iron/white/textured, /area/station/medical/treatment_center) @@ -40775,7 +40694,7 @@ network = list("ss13","medbay") }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "uLC" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -41423,7 +41342,7 @@ dir = 1 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "vbD" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -41603,9 +41522,15 @@ /turf/open/floor/iron/dark/textured, /area/station/commons/storage/emergency/starboard) "veM" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 +/obj/structure/table/reinforced, +/obj/machinery/door/window/right/directional/south{ + dir = 8; + name = "First Aid Supplies"; + req_access = list("medical") }, +/obj/item/mod/module/plasma_stabilizer, +/obj/item/mod/module/thermal_regulator, +/obj/effect/turf_decal/tile/blue/full, /turf/open/floor/iron/white/textured, /area/station/medical/storage) "veZ" = ( @@ -42635,7 +42560,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "vHe" = ( /obj/machinery/light/no_nightlight/directional/east, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -43310,7 +43235,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "vZS" = ( /obj/effect/spawner/structure/window, /obj/structure/disposalpipe/segment, @@ -43593,19 +43518,12 @@ /turf/closed/wall, /area/station/security/brig) "whp" = ( -/obj/structure/table/reinforced, -/obj/structure/window/spawner/directional/west, -/obj/item/defibrillator/loaded{ - pixel_y = 6 - }, -/obj/item/defibrillator/loaded{ - pixel_y = 3 +/obj/structure/cable, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 }, -/obj/item/defibrillator/loaded, -/obj/structure/window/spawner/directional/east, -/obj/effect/turf_decal/tile/blue/full, -/turf/open/floor/iron/dark/textured_large, -/area/station/medical/medbay/central) +/turf/open/floor/iron/white/textured, +/area/station/medical/office) "whs" = ( /obj/machinery/computer/crew, /turf/open/floor/wood/parquet, @@ -43632,10 +43550,8 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/central) "whT" = ( -/obj/effect/turf_decal/siding/white{ - dir = 6 - }, /turf/open/floor/iron/dark, +/turf/open/floor/iron/white/textured, /area/station/medical/storage) "wie" = ( /obj/structure/table, @@ -44223,13 +44139,14 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 }, -/obj/effect/turf_decal/trimline/blue/filled/line, /obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/mid_joiner, -/turf/open/floor/iron/white/textured_large, -/area/station/medical/medbay/central) +/obj/structure/cable, +/obj/effect/turf_decal/trimline/blue/filled/line, +/turf/open/floor/iron/white/textured, +/area/station/medical/office) "wBl" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -44446,20 +44363,15 @@ /turf/open/floor/engine, /area/station/engineering/atmos/hfr_room) "wGM" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ +/obj/structure/chair/sofa/right{ + color = "#52B4E9"; dir = 8 }, -/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ +/obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, -/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ - dir = 8 - }, -/turf/open/floor/iron/white/textured_large, -/area/station/medical/medbay/central) +/turf/open/floor/iron/white/textured, +/area/station/medical/office) "wHy" = ( /obj/machinery/light/small/directional/east, /obj/effect/turf_decal/bot, @@ -44632,28 +44544,24 @@ /turf/open/floor/plastic, /area/station/hallway/primary/central) "wMO" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/machinery/airalarm/directional/north, +/obj/structure/table/reinforced, +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/item/clothing/glasses/eyepatch, +/obj/item/clothing/ears/earmuffs, +/obj/item/clothing/ears/earmuffs, +/obj/item/clothing/glasses/blindfold, +/obj/item/clothing/glasses/blindfold, /obj/machinery/door/window/right/directional/south{ + dir = 2; name = "First Aid Supplies"; req_access = list("medical") }, -/obj/structure/window/spawner/directional/west, -/obj/item/storage/medkit/regular{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/storage/medkit/brute{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/medkit/brute, -/obj/item/storage/medkit/brute{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/blue/full, -/turf/open/floor/iron/dark/textured_large, -/area/station/medical/medbay/central) +/turf/open/floor/iron/white/textured_large, +/area/station/medical/office) "wNL" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -44771,7 +44679,7 @@ dir = 10 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "wQa" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -44948,7 +44856,7 @@ dir = 1 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "wUz" = ( /obj/structure/fluff/broken_flooring, /turf/open/floor/plating, @@ -45102,6 +45010,7 @@ /obj/effect/turf_decal/trimline/blue/warning{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/iron/white/textured, /area/station/medical/treatment_center) "wYo" = ( @@ -45300,7 +45209,7 @@ dir = 4 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "xcq" = ( /obj/effect/turf_decal/trimline/red/filled/warning{ dir = 4 @@ -45431,7 +45340,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "xfO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -45532,11 +45441,10 @@ /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "xiD" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 8 - }, -/turf/open/floor/iron/white/textured, -/area/station/medical/storage) +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/medical/cryo) "xiE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/landmark/start/geneticist, @@ -45865,7 +45773,7 @@ dir = 10 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "xrV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, @@ -46013,7 +45921,7 @@ /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 5 }, -/turf/open/floor/iron, +/turf/open/floor/iron/white/textured, /area/station/medical/storage) "xva" = ( /obj/structure/disposalpipe/segment{ @@ -46486,12 +46394,13 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) "xIv" = ( -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/tile/blue/full, -/obj/machinery/vending/wardrobe/medi_wardrobe, -/obj/effect/turf_decal/siding/white, -/turf/open/floor/iron/dark/textured_large, -/area/station/medical/medbay/central) +/obj/machinery/computer/crew{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/carpet, +/area/station/medical/office) "xID" = ( /obj/effect/turf_decal/tile/green/half/contrasted, /obj/structure/chair/wood{ @@ -46644,17 +46553,12 @@ /turf/open/floor/iron/dark, /area/station/cargo/sorting) "xMv" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/gloves/latex/nitrile, -/obj/item/clothing/gloves/latex/nitrile, -/obj/item/clothing/gloves/latex/nitrile, -/obj/effect/turf_decal/tile/blue/full, -/obj/effect/turf_decal/siding/white{ - dir = 5 - }, -/obj/machinery/cell_charger, -/turf/open/floor/iron/dark/textured_large, -/area/station/medical/medbay/central) +/obj/structure/table, +/obj/item/clipboard, +/obj/item/paper, +/obj/item/pen, +/turf/open/floor/carpet, +/area/station/medical/office) "xMG" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 @@ -46750,17 +46654,15 @@ /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 4 }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, /obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ dir = 8 }, -/turf/open/floor/iron/white/textured_large, -/area/station/medical/medbay/central) +/obj/structure/cable, +/turf/open/floor/iron/white/textured, +/area/station/medical/office) "xPm" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -75273,7 +75175,7 @@ wAP xMv jrX ltZ -nNP +shm fNw hsi pdS @@ -75527,9 +75429,9 @@ pfW nhC sQl nvL -qXP kJN -wGM +kJN +kJN boX vGh xys @@ -75783,8 +75685,8 @@ pTU pfW nhC wMO -eeA -mHV +whp +nqf lbA kTL hWv @@ -76042,8 +75944,8 @@ nhC hWy whp nqf -shm -cKM +nqf +nqf nNP fNw pmR @@ -76281,11 +76183,11 @@ meJ qSI oRN kIP -tBQ +eeA bys -tBQ -tBQ -tBQ +eeA +eeA +eeA aIK cNq bbK @@ -76298,7 +76200,7 @@ vDY tBQ dTv xPa -wGM +qXP wGM oEo fRj @@ -76542,9 +76444,9 @@ fDX fQo xbZ pls -tBQ -tBQ -tBQ +eeA +eeA +eeA tgU yaj dvQ @@ -76795,7 +76697,7 @@ meJ qSI bMU fgS -nhC +mHV gPc wPX pbq @@ -77052,7 +76954,7 @@ meJ qSI iqh djZ -oft +xiD vbA pkl qrS @@ -77830,11 +77732,11 @@ bUR udR xrF ojJ -nhC +mHV nGo mFK pIN -mFK +cKM mTt yhc qRO @@ -78087,7 +77989,7 @@ bDK cMp vGC xfh -nhC +mHV hJi xGw onx @@ -78603,7 +78505,7 @@ feL oYu gTr dnv -xiD +ehz mrL gTr gTr @@ -79373,10 +79275,10 @@ abb lQe oGE rvQ -dFu +ehz kfA ejr -dYp +ejr qUa eCp jHE @@ -79630,7 +79532,7 @@ eDD lpY whT lqs -veM +ehz qhH veM gcG @@ -98381,7 +98283,7 @@ biq nsH fxe teK -rsS +sxa rsS nvs rsS From 0f3d93a4c806b3a6a6581d994b75ec284710ea1d Mon Sep 17 00:00:00 2001 From: "DESKTOP-M4GD565\\LME" Date: Fri, 6 Oct 2023 17:55:10 -0700 Subject: [PATCH 07/26] linter --- _maps/map_files/Oshan/oshan.dmm | 196 ++++++++++++-------------------- 1 file changed, 73 insertions(+), 123 deletions(-) diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index 81c65e6019bd..ea7a60f23523 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -5282,9 +5282,6 @@ /obj/effect/spawner/random/trash/graffiti, /turf/open/floor/plating, /area/station/maintenance/starboard/upper) -"cKM" = ( -/turf/open/floor/iron/white/textured, -/area/station/medical/cryo) "cKY" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/dark_blue/opposingcorners{ @@ -7864,6 +7861,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/grass, /area/station/service/hydroponics) +"dYp" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 4 + }, +/turf/open/floor/iron/white/textured, +/area/station/medical/storage) "dYT" = ( /turf/open/floor/wood, /area/station/command/heads_quarters/qm) @@ -8085,8 +8088,12 @@ /turf/open/floor/circuit, /area/station/tcommsat/server) "eeA" = ( -/turf/closed/wall, -/area/station/medical/cryo) +/obj/structure/cable, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/white/textured, +/area/station/medical/office) "eeS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/table/reinforced/rglass, @@ -8276,12 +8283,6 @@ /obj/effect/turf_decal/siding/purple, /turf/open/floor/iron/dark, /area/station/science/ordnance/storage) -"ejr" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 4 - }, -/turf/open/floor/iron/white/textured, -/area/station/medical/storage) "ejy" = ( /obj/effect/turf_decal/tile/green/half/contrasted, /obj/machinery/light/directional/north, @@ -11586,10 +11587,7 @@ /area/station/engineering/atmos/office) "fRb" = ( /obj/machinery/plumbing/floor_pump/input/on/waste/directional/west, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 5 - }, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/wood, /area/station/commons/lounge) "fRj" = ( /obj/machinery/button/ticket_machine{ @@ -13069,7 +13067,7 @@ dir = 4 }, /obj/effect/turf_decal/trimline/green/warning, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/wood, /area/station/commons/lounge) "gDC" = ( /obj/machinery/duct/industrial/waste, @@ -14859,7 +14857,7 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 5 }, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/wood, /area/station/commons/lounge) "hCk" = ( /obj/structure/cable, @@ -20611,7 +20609,7 @@ dir = 4 }, /obj/effect/turf_decal/trimline/green/warning, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/wood, /area/station/commons/lounge) "kAA" = ( /obj/effect/spawner/structure/window, @@ -22196,11 +22194,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/medical/cryo) -"lms" = ( -/obj/structure/cable, -/obj/effect/turf_decal/trimline/green/filled/warning, -/turf/open/floor/iron/dark/textured, -/area/station/commons/lounge) "lmt" = ( /obj/structure/table/wood/fancy/red, /obj/item/food/spaghetti/security, @@ -22233,10 +22226,8 @@ /turf/open/floor/plating, /area/station/maintenance/port/central) "lmO" = ( -/obj/machinery/duct/industrial/waste, -/obj/effect/turf_decal/trimline/green/filled/warning, -/turf/open/floor/iron/dark/textured, -/area/station/commons/lounge) +/turf/closed/wall, +/area/station/medical/cryo) "lmX" = ( /obj/effect/turf_decal/trimline/red/filled/warning{ dir = 4 @@ -22293,7 +22284,7 @@ color = "#52B4E9"; dir = 4 }, -/turf/open/floor/iron/dark, +/obj/structure/cable, /turf/open/floor/iron/white/textured, /area/station/medical/storage) "lqa" = ( @@ -23270,7 +23261,7 @@ /obj/effect/turf_decal/trimline/green/filled/warning{ dir = 1 }, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/wood, /area/station/commons/lounge) "lNZ" = ( /obj/structure/table/glass, @@ -23390,9 +23381,6 @@ /obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 8 }, -/obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics Monitoring" - }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "lQP" = ( @@ -24032,12 +24020,8 @@ /turf/open/floor/plating/ocean, /area/ocean/near_station_powered) "mnD" = ( -/obj/machinery/duct/industrial/waste, -/obj/effect/turf_decal/trimline/green/warning{ - dir = 1 - }, -/turf/open/floor/iron/dark/textured, -/area/station/commons/lounge) +/turf/open/floor/iron/white/textured, +/area/station/medical/cryo) "mnI" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner, /turf/open/floor/iron, @@ -24776,10 +24760,6 @@ }, /turf/open/floor/iron/dark/textured_edge, /area/station/science/lobby) -"mHV" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/medical/cryo) "mHY" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/rack, @@ -24848,12 +24828,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) -"mKe" = ( -/obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics Monitoring" - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "mKj" = ( /obj/machinery/duct/industrial/waste, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -26916,6 +26890,7 @@ fax_name = "Medical"; name = "Medical Fax Machine" }, +/obj/structure/cable, /turf/open/floor/carpet, /area/station/medical/office) "nIm" = ( @@ -27131,11 +27106,13 @@ /turf/open/floor/iron/white/textured, /area/station/medical/storage) "nNP" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning, /obj/effect/turf_decal/trimline/blue/filled/mid_joiner, +/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ + dir = 1 + }, /obj/structure/chair/office/light, -/obj/effect/landmark/start/medical_doctor, -/turf/open/floor/iron/white/textured, +/obj/effect/landmark/start/paramedic, +/turf/open/floor/carpet, /area/station/medical/office) "nNT" = ( /obj/structure/table, @@ -28812,7 +28789,6 @@ "oGE" = ( /obj/machinery/light/directional/west, /obj/machinery/vending/wardrobe/medi_wardrobe, -/turf/open/floor/iron/dark, /turf/open/floor/iron/white/textured, /area/station/medical/storage) "oGQ" = ( @@ -33422,13 +33398,6 @@ }, /turf/open/floor/grass, /area/station/maintenance/starboard/upper) -"qXP" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, -/turf/open/floor/iron/white/textured, -/area/station/medical/office) "qYv" = ( /obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/trimline/yellow/filled/end{ @@ -34344,7 +34313,6 @@ /area/station/engineering/main) "rvQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, /turf/open/floor/iron/stairs, /area/station/medical/storage) "rvY" = ( @@ -35528,13 +35496,6 @@ /obj/effect/turf_decal/trimline/dark_blue/line, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/aft) -"sbg" = ( -/obj/structure/cable, -/obj/effect/turf_decal/trimline/green/warning{ - dir = 1 - }, -/turf/open/floor/iron/dark/textured, -/area/station/commons/lounge) "sbh" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/effect/turf_decal/delivery, @@ -35741,13 +35702,11 @@ /turf/open/floor/wood, /area/station/service/cafeteria) "shm" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning, /obj/effect/turf_decal/trimline/blue/filled/mid_joiner, -/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ - dir = 1 - }, /obj/structure/chair/office/light, -/obj/effect/landmark/start/paramedic, -/turf/open/floor/carpet, +/obj/effect/landmark/start/medical_doctor, +/turf/open/floor/iron/white/textured, /area/station/medical/office) "shF" = ( /obj/structure/fans/tiny/forcefield, @@ -38139,10 +38098,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 10 - }, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/wood, /area/station/commons/lounge) "tzD" = ( /obj/structure/cable, @@ -38876,7 +38832,7 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 10 }, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/wood, /area/station/commons/lounge) "tRo" = ( /obj/structure/fluff/broken_flooring, @@ -42262,7 +42218,7 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 9 }, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/wood, /area/station/commons/lounge) "vyk" = ( /obj/structure/chair/wood{ @@ -42370,7 +42326,7 @@ codes_txt = "patrol;next_patrol=Hall-19"; location = "Hall-18" }, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/wood, /area/station/commons/lounge) "vBn" = ( /obj/structure/cable, @@ -43518,9 +43474,12 @@ /turf/closed/wall, /area/station/security/brig) "whp" = ( -/obj/structure/cable, +/obj/structure/chair/sofa/right{ + color = "#52B4E9"; + dir = 8 + }, /obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 + dir = 4 }, /turf/open/floor/iron/white/textured, /area/station/medical/office) @@ -43550,9 +43509,10 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/central) "whT" = ( -/turf/open/floor/iron/dark, -/turf/open/floor/iron/white/textured, -/area/station/medical/storage) +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/medical/cryo) "wie" = ( /obj/structure/table, /obj/machinery/cell_charger, @@ -44363,10 +44323,7 @@ /turf/open/floor/engine, /area/station/engineering/atmos/hfr_room) "wGM" = ( -/obj/structure/chair/sofa/right{ - color = "#52B4E9"; - dir = 8 - }, +/obj/item/kirbyplants/random, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, @@ -45083,12 +45040,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white/textured, /area/station/medical/treatment_center) -"wZY" = ( -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 6 - }, -/turf/open/floor/iron/dark/textured, -/area/station/commons/lounge) "xae" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/duct/industrial/waste, @@ -45442,7 +45393,6 @@ /area/station/service/kitchen) "xiD" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/medical/cryo) "xiE" = ( @@ -45951,7 +45901,7 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 6 }, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/wood, /area/station/commons/lounge) "xvF" = ( /obj/effect/turf_decal/stripes/full, @@ -65449,7 +65399,7 @@ hrr hrr hrr hrr -vyi +hrr tzl eco xUj @@ -65706,8 +65656,8 @@ bTn auj tzf bTn -sbg -lms +bTn +bTn qEO qmM sTn @@ -65963,8 +65913,8 @@ pXi hwW ivC pXi -mnD -lmO +pXi +pXi iul jEi eLS @@ -66221,7 +66171,7 @@ hrr xVm xVm fRb -wZY +xVm yhH qNW vkw @@ -75175,7 +75125,7 @@ wAP xMv jrX ltZ -shm +nNP fNw hsi pdS @@ -75685,7 +75635,7 @@ pTU pfW nhC wMO -whp +eeA nqf lbA kTL @@ -75942,11 +75892,11 @@ jvq sMv nhC hWy -whp +eeA nqf nqf nqf -nNP +shm fNw pmR pdS @@ -76183,11 +76133,11 @@ meJ qSI oRN kIP -eeA +lmO bys -eeA -eeA -eeA +lmO +lmO +lmO aIK cNq bbK @@ -76200,8 +76150,8 @@ vDY tBQ dTv xPa -qXP wGM +whp oEo fRj mCO @@ -76444,9 +76394,9 @@ fDX fQo xbZ pls -eeA -eeA -eeA +lmO +lmO +lmO tgU yaj dvQ @@ -76697,7 +76647,7 @@ meJ qSI bMU fgS -mHV +xiD gPc wPX pbq @@ -76954,7 +76904,7 @@ meJ qSI iqh djZ -xiD +whT vbA pkl qrS @@ -77732,11 +77682,11 @@ bUR udR xrF ojJ -mHV +xiD nGo mFK pIN -cKM +mnD mTt yhc qRO @@ -77989,7 +77939,7 @@ bDK cMp vGC xfh -mHV +xiD hJi xGw onx @@ -79277,8 +79227,8 @@ oGE rvQ ehz kfA -ejr -ejr +dYp +dYp qUa eCp jHE @@ -79530,7 +79480,7 @@ mog gTr eDD lpY -whT +ehz lqs ehz qhH @@ -94164,7 +94114,7 @@ cWz gyA iAR aRd -mKe +qax pfK lvw nLI From 4104afcc3519022f6e9c6d71d86fe4f9e8a972e5 Mon Sep 17 00:00:00 2001 From: "DESKTOP-M4GD565\\LME" Date: Fri, 6 Oct 2023 18:37:46 -0700 Subject: [PATCH 08/26] tweaks --- _maps/map_files/Oshan/oshan.dmm | 402 +++++++++++++++----------------- 1 file changed, 188 insertions(+), 214 deletions(-) diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index 957d1042ed71..e7b9d4b7ddbc 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -67,14 +67,17 @@ }, /area/station/science/robotics) "abg" = ( -/obj/machinery/computer/records/medical{ - dir = 4 - }, /obj/machinery/light/directional/west, /obj/machinery/newscaster/directional/west, /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/iron/dark, +/obj/structure/table/reinforced, +/obj/item/clothing/gloves/latex/nitrile, +/obj/item/clothing/gloves/latex/nitrile, +/obj/item/clothing/gloves/latex/nitrile, +/obj/item/clothing/gloves/latex/nitrile, +/obj/item/wrench/medical, +/turf/open/floor/iron/white/textured, /area/station/medical/storage) "abD" = ( /obj/structure/disposalpipe/segment, @@ -3368,10 +3371,13 @@ /turf/open/floor/iron/dark/textured, /area/mine/storage/public) "bKh" = ( -/obj/effect/turf_decal/siding/white{ - dir = 6 +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 4 }, -/turf/open/floor/iron/dark, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron/white/textured, /area/station/medical/storage) "bKz" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ @@ -7567,6 +7573,7 @@ /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/white/textured, /area/station/medical/storage) "dYT" = ( @@ -7711,10 +7718,10 @@ /turf/open/floor/iron, /area/station/cargo/storage) "ebe" = ( -/obj/machinery/rnd/production/techfab/department/medical, /obj/machinery/airalarm/directional/west, -/obj/effect/turf_decal/tile/blue/full, -/turf/open/floor/iron/dark/textured_large, +/obj/machinery/photocopier, +/obj/structure/cable, +/turf/open/floor/carpet, /area/station/medical/medbay/central) "ecd" = ( /obj/machinery/telecomms/processor/preset_two, @@ -7976,23 +7983,33 @@ /turf/open/floor/iron/dark, /area/station/science/ordnance/storage) "ejk" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 +/obj/item/storage/medkit/regular{ + pixel_x = 3; + pixel_y = -3 }, -/obj/structure/chair/sofa/corp/right{ - dir = 8 +/obj/item/storage/medkit/brute{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/medkit/brute, +/obj/item/storage/medkit/brute{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/structure/table/reinforced, +/obj/machinery/light/directional/north, +/obj/machinery/door/window/right/directional/south{ + dir = 8; + name = "First Aid Supplies"; + req_access = list("medical") }, /turf/open/floor/iron/white/textured, /area/station/medical/storage) "ejr" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, +/obj/structure/table/glass, +/obj/item/newspaper, /turf/open/floor/iron/white/textured, -/area/station/medical/storage) +/area/station/medical/office) "ejy" = ( /obj/effect/turf_decal/tile/green/half/contrasted, /obj/machinery/light/directional/north, @@ -9263,9 +9280,18 @@ /turf/open/floor/iron/smooth, /area/station/commons/fitness/recreation) "eQz" = ( -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/science/xenobiology) +/obj/structure/table/reinforced, +/obj/item/defibrillator/loaded{ + pixel_y = 6 + }, +/obj/item/defibrillator/loaded{ + pixel_y = 3 + }, +/obj/item/defibrillator/loaded, +/obj/effect/turf_decal/tile/blue/full, +/obj/structure/window/spawner/directional/north, +/turf/open/floor/iron/white/textured, +/area/station/medical/storage) "eQB" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, @@ -10740,7 +10766,6 @@ /turf/closed/wall/r_wall, /area/station/medical/cryo) "fEm" = ( -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 }, @@ -11281,6 +11306,7 @@ pixel_x = 32; pixel_y = -13 }, +/obj/item/kirbyplants/random, /turf/open/floor/iron/white/textured, /area/station/medical/office) "fRn" = ( @@ -15263,8 +15289,8 @@ /turf/open/floor/iron/white/textured_large, /area/station/science/robotics/lab) "hWv" = ( -/obj/effect/turf_decal/trimline/blue/filled/line, /obj/effect/turf_decal/trimline/blue/filled/mid_joiner, +/obj/effect/turf_decal/trimline/blue/filled/warning, /turf/open/floor/iron/white/textured, /area/station/medical/office) "hWy" = ( @@ -18981,12 +19007,14 @@ /turf/open/floor/iron/dark/textured, /area/station/medical/cryo) "jTb" = ( -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 10 +/obj/structure/table/reinforced, +/obj/item/mod/module/plasma_stabilizer, +/obj/item/mod/module/thermal_regulator, +/obj/effect/turf_decal/tile/blue/full, +/obj/machinery/door/window/right/directional/south{ + dir = 1; + name = "First Aid Supplies"; + req_access = list("medical") }, /turf/open/floor/iron/white/textured, /area/station/medical/storage) @@ -21128,29 +21156,7 @@ /turf/open/floor/wood/large, /area/station/security/checkpoint/customs) "kTL" = ( -/obj/machinery/door/window/right/directional/south{ - dir = 1; - name = "First Aid Supplies"; - req_access = list("medical") - }, -/obj/structure/window/spawner/directional/west, -/obj/item/storage/medkit/regular{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/storage/medkit/toxin{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/medkit/toxin, -/obj/item/storage/medkit/toxin{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/structure/table/reinforced, -/obj/structure/window/spawner/directional/south, -/obj/effect/turf_decal/tile/blue/full, -/turf/open/floor/iron/dark/textured_large, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/central) "kUi" = ( /turf/open/floor/iron, @@ -21428,20 +21434,7 @@ /turf/open/floor/iron/smooth, /area/station/commons/fitness/recreation) "lbA" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -7; - pixel_y = 4 - }, -/obj/item/newspaper{ - pixel_x = 11; - pixel_y = 4 - }, -/obj/item/newspaper{ - pixel_x = 8 - }, -/turf/open/floor/iron/white/textured, -/area/station/medical/office) +) "lca" = ( /obj/machinery/duct/industrial/waste, /obj/structure/cable, @@ -21835,10 +21828,18 @@ /turf/open/floor/carpet, /area/station/medical/medbay/central) "lms" = ( -/obj/structure/cable, -/obj/effect/turf_decal/trimline/green/filled/warning, +/obj/structure/table/reinforced, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/door/poddoor/shutters/preopen{ + name = "Medical Closure Shutters"; + desc = "Fuck off we're closed." + }, +/obj/item/paper_bin{ + pixel_x = -7; + pixel_y = 4 + }, /turf/open/floor/iron/dark/textured, -/area/station/commons/lounge) +/area/station/medical/medbay/central) "lmt" = ( /obj/structure/table/wood/fancy/red, /obj/item/food/spaghetti/security, @@ -23920,13 +23921,12 @@ "mrL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4; - invisibility = 101 - }, /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 10 }, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, /turf/open/floor/iron/white/textured, /area/station/medical/storage) "mrM" = ( @@ -24726,12 +24726,13 @@ "mMH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/junction/flip{ - dir = 8 - }, /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + invisibility = 101 + }, /turf/open/floor/iron/white/textured, /area/station/medical/storage) "mMM" = ( @@ -26172,6 +26173,10 @@ /obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ dir = 1 }, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 8 + }, /turf/open/floor/iron/white/textured_large, /area/station/medical/medbay/central) "nvY" = ( @@ -26937,22 +26942,10 @@ /turf/open/floor/carpet/executive, /area/station/command/heads_quarters/hop) "nOy" = ( -/obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/structure/table/reinforced, -/obj/item/clothing/suit/jacket/straight_jacket, -/obj/item/clothing/glasses/eyepatch, -/obj/item/clothing/ears/earmuffs, -/obj/item/clothing/ears/earmuffs, -/obj/item/clothing/glasses/blindfold, -/obj/item/clothing/glasses/blindfold, -/obj/machinery/door/window/right/directional/south{ - dir = 2; - name = "First Aid Supplies"; - req_access = list("medical") + dir = 10 }, +/obj/machinery/vending/medical, /turf/open/floor/iron/white/textured, /area/station/medical/storage) "nOV" = ( @@ -27050,13 +27043,9 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/aft) "nTg" = ( -/obj/machinery/computer/crew{ - dir = 4 - }, -/obj/effect/turf_decal/siding/white, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, +/obj/structure/table/reinforced, +/obj/machinery/cell_charger, +/turf/open/floor/iron/white/textured, /area/station/medical/storage) "nTi" = ( /turf/closed/wall, @@ -29176,9 +29165,14 @@ /turf/open/floor/iron/smooth, /area/station/ai_monitored/security/armory) "oYl" = ( -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/machinery/vending/medical, +/obj/structure/table/reinforced, +/obj/item/storage/box/syringes{ + pixel_y = 4 + }, +/obj/item/storage/box/syringes, +/obj/item/gun/syringe, +/obj/structure/window/spawner/directional/east, +/obj/structure/window/spawner/directional/north, /turf/open/floor/iron/white/textured, /area/station/medical/storage) "oYu" = ( @@ -31619,16 +31613,21 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/secondary/entry) "qhH" = ( -/obj/structure/table/reinforced, -/obj/item/defibrillator/loaded{ - pixel_y = 6 +/obj/structure/window/spawner/directional/north, +/obj/item/storage/medkit/regular{ + pixel_x = 3; + pixel_y = -3 }, -/obj/item/defibrillator/loaded{ +/obj/item/storage/medkit/o2{ + pixel_x = 3; pixel_y = 3 }, -/obj/item/defibrillator/loaded, -/obj/effect/turf_decal/tile/blue/full, -/obj/structure/window/spawner/directional/north, +/obj/item/storage/medkit/o2, +/obj/item/storage/medkit/o2{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/structure/table/reinforced, /obj/structure/window/spawner/directional/west, /turf/open/floor/iron/white/textured, /area/station/medical/storage) @@ -33071,6 +33070,7 @@ /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 6 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/white/textured, /area/station/medical/storage) "qUe" = ( @@ -33146,14 +33146,9 @@ /turf/open/floor/iron/dark/textured, /area/station/engineering/main) "qWx" = ( -/obj/structure/lattice, -/obj/structure/disposalpipe/segment{ - dir = 4; - invisibility = 101 - }, -/obj/machinery/conveyor/auto, -/turf/open/floor/plating/ocean, -/area/ocean/near_station_powered) +/obj/machinery/vending/wardrobe/medi_wardrobe, +/turf/open/floor/iron/white/textured, +/area/station/medical/storage) "qWC" = ( /obj/effect/turf_decal/trimline/green/line, /obj/effect/turf_decal/trimline/green/line, @@ -33185,14 +33180,9 @@ /turf/open/floor/grass, /area/station/maintenance/starboard/upper) "qXP" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ - dir = 8 - }, -/turf/open/floor/iron/white/textured_large, -/area/station/medical/medbay/central) +/obj/structure/table/glass, +/turf/open/floor/iron/white/textured, +/area/station/medical/office) "qYg" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/east, @@ -36779,6 +36769,10 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = -7; + pixel_y = 4 + }, /turf/open/floor/carpet/executive, /area/station/command/heads_quarters/hop) "sSN" = ( @@ -36956,13 +36950,9 @@ /turf/open/floor/wood, /area/station/security/detectives_office) "sXh" = ( -/obj/structure/table, -/obj/effect/turf_decal/siding/white/corner, /obj/machinery/firealarm/directional/north, -/obj/item/clipboard, -/obj/item/paper, -/obj/item/pen, -/turf/open/floor/iron/dark, +/obj/machinery/suit_storage_unit/medical, +/turf/open/floor/iron/white/textured, /area/station/medical/storage) "sYe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -38545,6 +38535,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 6 }, +/obj/machinery/recharge_station, /turf/open/floor/iron/white/textured, /area/station/medical/storage) "tSW" = ( @@ -40035,24 +40026,10 @@ /turf/open/floor/iron/smooth, /area/station/commons/fitness/recreation) "uCI" = ( -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 9 - }, -/obj/structure/table/reinforced, -/obj/item/wheelchair{ - pixel_y = 3 - }, -/obj/item/wheelchair{ - pixel_y = 3 - }, -/obj/item/wheelchair{ - pixel_y = 3 - }, -/obj/item/wheelchair{ - pixel_y = 3 +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 2 }, -/obj/structure/window/spawner/directional/south, /turf/open/floor/iron/white/textured, /area/station/medical/storage) "uDj" = ( @@ -40535,15 +40512,13 @@ /turf/open/misc/grass/jungle, /area/station/maintenance/port/central) "uNt" = ( -/obj/structure/table/glass, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, /obj/effect/turf_decal/trimline/blue/line{ dir = 8 }, -/obj/machinery/light/directional/east, -/turf/open/floor/iron/white/textured, +/turf/closed/wall, /area/station/medical/treatment_center) "uNu" = ( /obj/effect/turf_decal/stripes, @@ -41294,15 +41269,25 @@ /turf/open/floor/iron/dark/textured, /area/station/commons/storage/emergency/starboard) "veM" = ( +/obj/item/storage/medkit/regular{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/storage/medkit/fire{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/medkit/fire, +/obj/item/storage/medkit/fire{ + pixel_x = -3; + pixel_y = -3 + }, /obj/structure/table/reinforced, /obj/machinery/door/window/right/directional/south{ dir = 8; name = "First Aid Supplies"; req_access = list("medical") }, -/obj/item/mod/module/plasma_stabilizer, -/obj/item/mod/module/thermal_regulator, -/obj/effect/turf_decal/tile/blue/full, /turf/open/floor/iron/white/textured, /area/station/medical/storage) "veZ" = ( @@ -42288,14 +42273,8 @@ /turf/open/floor/plastic, /area/station/hallway/primary/central) "vFx" = ( -/obj/structure/chair/office/light{ - dir = 8 - }, -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, /obj/structure/cable, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/white/textured, /area/station/medical/storage) "vFQ" = ( /obj/structure/cable, @@ -42421,17 +42400,13 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) "vJu" = ( -/obj/structure/table, /obj/machinery/camera/directional/north{ c_tag = "Medbay Paramedic Dispatch"; name = "medical camera"; network = list("ss13","medical") }, -/obj/machinery/fax{ - fax_name = "Medical"; - name = "Medical Fax Machine" - }, -/turf/open/floor/iron/dark, +/obj/machinery/rnd/production/techfab/department/medical, +/turf/open/floor/iron/white/textured, /area/station/medical/storage) "vJx" = ( /obj/structure/reflector/box, @@ -43376,12 +43351,22 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/aft) "whB" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 6 +/obj/structure/window/spawner/directional/west, +/obj/item/storage/medkit/regular{ + pixel_x = 3; + pixel_y = -3 }, -/obj/structure/chair/sofa/corp/left{ - dir = 8 +/obj/item/storage/medkit/toxin{ + pixel_x = 3; + pixel_y = 3 }, +/obj/item/storage/medkit/toxin, +/obj/item/storage/medkit/toxin{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/blue/full, /turf/open/floor/iron/white/textured, /area/station/medical/storage) "whJ" = ( @@ -44138,11 +44123,6 @@ /turf/open/floor/iron/dark/textured, /area/mine/storage/public) "wCH" = ( -/obj/structure/bed/pod{ - desc = "An old medical bed, just waiting for replacement with something up to date."; - dir = 8; - name = "medical bed" - }, /obj/machinery/defibrillator_mount/directional/north, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 5 @@ -44150,8 +44130,8 @@ /obj/effect/turf_decal/trimline/blue/corner{ dir = 8 }, -/obj/item/bedsheet/medical, -/turf/open/floor/iron/white/textured, +/obj/machinery/light/directional/east, +/turf/closed/wall, /area/station/medical/treatment_center) "wCJ" = ( /obj/effect/spawner/structure/window/reinforced/plasma, @@ -44988,11 +44968,12 @@ /turf/open/floor/iron/dark/textured, /area/station/cargo/sorting) "wZY" = ( -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 6 +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 }, -/turf/open/floor/iron/dark/textured, -/area/station/commons/lounge) +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white/textured, +/area/station/medical/cryo) "xae" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/duct/industrial/waste, @@ -46408,6 +46389,7 @@ }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/newscaster/directional/west, /turf/open/floor/carpet, /area/station/medical/office) "xID" = ( @@ -46595,6 +46577,10 @@ /obj/item/clipboard, /obj/item/paper, /obj/item/pen, +/obj/item/paper_bin{ + pixel_x = -7; + pixel_y = 4 + }, /turf/open/floor/carpet, /area/station/medical/office) "xMG" = ( @@ -46706,6 +46692,9 @@ dir = 8 }, /obj/structure/cable, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 1 + }, /turf/open/floor/iron/white/textured, /area/station/medical/office) "xPm" = ( @@ -47443,23 +47432,8 @@ }, /area/station/engineering/main) "yit" = ( -/obj/machinery/camera/autoname/directional/north, -/obj/machinery/light_switch/directional/north, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/structure/table/reinforced, -/obj/item/roller{ - pixel_y = 6 - }, -/obj/item/roller{ - pixel_y = 6 - }, -/obj/item/roller{ - pixel_y = 6 - }, -/obj/structure/window/spawner/directional/south, -/obj/structure/window/spawner/directional/east, +/obj/machinery/firealarm/directional/north, +/obj/item/radio/intercom/directional/west, /turf/open/floor/iron/white/textured, /area/station/medical/storage) "yiT" = ( @@ -70087,7 +70061,7 @@ pkw fGs aFY aFY -uyW +lbA ske meJ meJ @@ -74958,7 +74932,7 @@ nIg ebe xIv sJt -vGh +lms pmR muw kAH @@ -75726,7 +75700,7 @@ nhC wMO eeA nqf -lbA +nqf kTL hWv vGh @@ -75983,8 +75957,8 @@ nhC hWy eeA nqf -nqf -nqf +ejr +qXP shm fNw pmR @@ -77575,7 +77549,7 @@ aah aah meJ fXF -moW +lbA dyB asA asA @@ -78544,10 +78518,10 @@ feL oYu gTr uCI -xiD +wZY mrL -gTr -gTr +qWx +eQz emO oes oes @@ -79316,7 +79290,7 @@ nTg rvQ ehz kfA -dYp +bKh dYp qUa eCp @@ -79569,7 +79543,7 @@ mog gTr sXh vFx -bKh +ehz lqs ehz qhH @@ -81411,7 +81385,7 @@ gmQ qgs ske kND -wHC +lbA xzf xzf xzf @@ -100366,7 +100340,7 @@ gro dNu tvt iri -eQz +muE iri tvt aZB @@ -100623,7 +100597,7 @@ ahl eRl wUP iri -eQz +muE iri atC gaz From d531b6f18c20ec91a8abbc18745b1dfacc72781d Mon Sep 17 00:00:00 2001 From: "DESKTOP-M4GD565\\LME" Date: Fri, 6 Oct 2023 18:53:31 -0700 Subject: [PATCH 09/26] a --- _maps/map_files/Oshan/oshan.dmm | 245 ++++++++++++++++---------------- 1 file changed, 119 insertions(+), 126 deletions(-) diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index e7b9d4b7ddbc..63827d275ca5 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -84,15 +84,9 @@ /turf/open/floor/plating, /area/station/maintenance/disposal) "abL" = ( -/obj/structure/cable, -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/blue/line{ - dir = 1 - }, +/obj/machinery/vending/wardrobe/medi_wardrobe, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/lobby) +/area/station/medical/storage) "acc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/grass, @@ -2492,7 +2486,7 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) "boX" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ +/obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 10 }, /turf/open/floor/iron/white/textured, @@ -2809,7 +2803,7 @@ }, /obj/structure/cable, /turf/open/floor/plating, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "byC" = ( /obj/structure/window/spawner/directional/south, /obj/machinery/atmospherics/components/trinary/filter/atmos/n2o{ @@ -3371,14 +3365,14 @@ /turf/open/floor/iron/dark/textured, /area/mine/storage/public) "bKh" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 10 +/obj/structure/table/reinforced, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/door/poddoor/shutters/preopen{ + name = "Medical Closure Shutters"; + desc = "Fuck off we're closed." }, -/turf/open/floor/iron/white/textured, -/area/station/medical/storage) +/turf/open/floor/iron/dark/textured, +/area/station/medical/office) "bKz" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 @@ -3825,7 +3819,7 @@ dir = 1 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "bWP" = ( /obj/effect/turf_decal/stripes{ dir = 8 @@ -7580,7 +7574,6 @@ /turf/open/floor/wood, /area/station/command/heads_quarters/qm) "dYV" = ( -/obj/structure/cable, /obj/effect/turf_decal/trimline/blue/filled/line, /obj/effect/turf_decal/trimline/blue/line{ dir = 1 @@ -7719,10 +7712,12 @@ /area/station/cargo/storage) "ebe" = ( /obj/machinery/airalarm/directional/west, -/obj/machinery/photocopier, /obj/structure/cable, +/obj/machinery/computer/records/medical{ + dir = 4 + }, /turf/open/floor/carpet, -/area/station/medical/medbay/central) +/area/station/medical/office) "ecd" = ( /obj/machinery/telecomms/processor/preset_two, /obj/machinery/camera/autoname/directional/south, @@ -8006,10 +8001,14 @@ /turf/open/floor/iron/white/textured, /area/station/medical/storage) "ejr" = ( -/obj/structure/table/glass, -/obj/item/newspaper, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/iron/white/textured, -/area/station/medical/office) +/area/station/medical/storage) "ejy" = ( /obj/effect/turf_decal/tile/green/half/contrasted, /obj/machinery/light/directional/north, @@ -8269,7 +8268,6 @@ /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/ai) "esa" = ( -/obj/structure/cable, /obj/machinery/defibrillator_mount/directional/south, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 6 @@ -8686,7 +8684,6 @@ /obj/effect/mapping_helpers/airlock/access/all/medical/cmo, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment, /obj/structure/cable, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/blue/filled/warning, @@ -9408,14 +9405,7 @@ /area/station/cargo/storage) "eTm" = ( /obj/structure/cable, -/obj/machinery/stasis, -/obj/machinery/door/window/right/directional/south{ - dir = 1; - name = "Medical Reception Desk"; - req_access = list("medical") - }, -/obj/machinery/door/window/right/directional/south, -/turf/open/floor/iron/dark/small, +/turf/closed/wall/r_wall, /area/station/medical/treatment_center) "eTz" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -10471,7 +10461,7 @@ dir = 6 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "fvS" = ( /obj/machinery/camera/autoname/directional/south, /obj/effect/turf_decal/tile/neutral/fourcorners{ @@ -10555,7 +10545,7 @@ /obj/machinery/light/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "fxS" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/access/all/supply/general, @@ -11134,7 +11124,7 @@ desc = "Fuck off we're closed." }, /turf/open/floor/iron/dark/textured, -/area/station/medical/medbay/central) +/area/station/medical/office) "fNz" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ @@ -14936,7 +14926,7 @@ "hNg" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "hNi" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible{ @@ -15767,13 +15757,10 @@ /turf/open/floor/plating, /area/station/hallway/primary/central/fore) "ikH" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/chair, -/obj/effect/turf_decal/trimline/blue/line, +/obj/structure/table/glass, +/obj/item/newspaper, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/lobby) +/area/station/medical/office) "ilb" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 @@ -15833,7 +15820,6 @@ /area/station/science/ordnance/office) "imo" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable, /obj/effect/turf_decal/trimline/blue/filled/line, /obj/effect/turf_decal/trimline/blue/line{ dir = 1 @@ -18370,7 +18356,7 @@ /obj/item/storage/backpack/duffelbag/med/surgery, /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "jEU" = ( /obj/machinery/camera/autoname/directional/south, /obj/effect/turf_decal/trimline/brown/filled/line, @@ -21156,8 +21142,12 @@ /turf/open/floor/wood/large, /area/station/security/checkpoint/customs) "kTL" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/storage) "kUi" = ( /turf/open/floor/iron, /area/station/cargo/warehouse/upper) @@ -21414,7 +21404,7 @@ dir = 1 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "lbi" = ( /obj/effect/turf_decal/trimline/brown/corner, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -21434,7 +21424,16 @@ /turf/open/floor/iron/smooth, /area/station/commons/fitness/recreation) "lbA" = ( -) +/obj/structure/lattice, +/obj/structure/disposalpipe/segment{ + dir = 4; + invisibility = 101 + }, +/obj/machinery/conveyor/auto/inside_corners{ + dir = 9 + }, +/turf/open/floor/plating/ocean, +/area/space) "lca" = ( /obj/machinery/duct/industrial/waste, /obj/structure/cable, @@ -21828,18 +21827,9 @@ /turf/open/floor/carpet, /area/station/medical/medbay/central) "lms" = ( -/obj/structure/table/reinforced, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/machinery/door/poddoor/shutters/preopen{ - name = "Medical Closure Shutters"; - desc = "Fuck off we're closed." - }, -/obj/item/paper_bin{ - pixel_x = -7; - pixel_y = 4 - }, -/turf/open/floor/iron/dark/textured, -/area/station/medical/medbay/central) +/obj/structure/table/glass, +/turf/open/floor/iron/white/textured, +/area/station/medical/office) "lmt" = ( /obj/structure/table/wood/fancy/red, /obj/item/food/spaghetti/security, @@ -22049,8 +22039,11 @@ /turf/open/floor/wood, /area/station/commons/fitness/recreation/entertainment) "ltZ" = ( -/turf/open/floor/carpet, -/area/station/medical/office) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/white/textured, +/area/station/medical/medbay/lobby) "luc" = ( /obj/structure/cable, /obj/machinery/duct/industrial/waste, @@ -22255,6 +22248,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/duct/industrial/waste, +/obj/structure/cable, /turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "lzJ" = ( @@ -23739,7 +23733,9 @@ /turf/open/floor/plating/ocean, /area/ocean/near_station_powered) "mnD" = ( -/turf/open/floor/iron/white/textured, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, /area/station/medical/cryo) "mnI" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner, @@ -23994,6 +23990,7 @@ id_tag = "medlobby"; cycle_id = "medbay_lobby" }, +/obj/structure/cable, /turf/open/floor/iron/dark/textured, /area/station/medical/medbay/lobby) "msT" = ( @@ -24382,7 +24379,7 @@ desc = "Fuck off we're closed." }, /turf/open/floor/iron/dark/textured, -/area/station/medical/medbay/central) +/area/station/medical/office) "mCV" = ( /obj/structure/cable, /obj/structure/sign/painting/library{ @@ -26178,7 +26175,7 @@ dir = 8 }, /turf/open/floor/iron/white/textured_large, -/area/station/medical/medbay/central) +/area/station/medical/office) "nvY" = ( /obj/effect/turf_decal/sand, /turf/open/floor/plating/ocean, @@ -26407,7 +26404,7 @@ dir = 4 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "nBu" = ( /obj/machinery/griddle, /turf/open/floor/iron/kitchen, @@ -28174,7 +28171,7 @@ dir = 1 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "ovm" = ( /obj/machinery/camera/autoname/directional/east, /obj/structure/extinguisher_cabinet/directional/east, @@ -29023,7 +29020,7 @@ dir = 9 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "oVc" = ( /obj/structure/window/spawner/directional/east, /obj/structure/bookcase{ @@ -32202,7 +32199,7 @@ dir = 1 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "qxd" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -33146,9 +33143,11 @@ /turf/open/floor/iron/dark/textured, /area/station/engineering/main) "qWx" = ( -/obj/machinery/vending/wardrobe/medi_wardrobe, -/turf/open/floor/iron/white/textured, -/area/station/medical/storage) +/obj/machinery/conveyor/auto/inside_corners{ + dir = 5 + }, +/turf/open/floor/plating, +/area/space) "qWC" = ( /obj/effect/turf_decal/trimline/green/line, /obj/effect/turf_decal/trimline/green/line, @@ -33179,10 +33178,6 @@ }, /turf/open/floor/grass, /area/station/maintenance/starboard/upper) -"qXP" = ( -/obj/structure/table/glass, -/turf/open/floor/iron/white/textured, -/area/station/medical/office) "qYg" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/east, @@ -34131,7 +34126,7 @@ dir = 8 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "rwN" = ( /obj/machinery/light/neon_lining{ icon_state = "pink2_1" @@ -36118,7 +36113,6 @@ /turf/open/floor/iron, /area/station/engineering/storage/tech) "sAU" = ( -/obj/structure/cable, /obj/effect/turf_decal/trimline/blue/filled/corner, /obj/effect/turf_decal/trimline/blue/line{ dir = 9 @@ -36444,7 +36438,7 @@ dir = 4 }, /turf/open/floor/iron/white/textured_large, -/area/station/medical/medbay/central) +/area/station/medical/office) "sJx" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -37924,7 +37918,7 @@ dir = 1 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "tCz" = ( /obj/effect/turf_decal/siding{ dir = 1 @@ -38898,7 +38892,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/trimline/blue/filled/warning, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "ucj" = ( /obj/structure/cable, /obj/machinery/navbeacon{ @@ -38941,7 +38935,7 @@ dir = 1 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "udu" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -40138,7 +40132,7 @@ dir = 5 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "uFh" = ( /obj/machinery/computer/warrant{ dir = 1 @@ -40285,13 +40279,8 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "uHW" = ( -/obj/structure/cable, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/blue/line, -/turf/open/floor/iron/dark/textured, -/area/station/medical/medbay/lobby) +/turf/closed/wall/r_wall, +/area/station/medical/office) "uIg" = ( /obj/machinery/light_switch/directional/north, /obj/effect/turf_decal/trimline/red/filled/warning{ @@ -41069,7 +41058,7 @@ dir = 10 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "vaZ" = ( /obj/machinery/light/directional/north, /obj/structure/table/wood, @@ -42011,7 +42000,7 @@ dir = 1 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "vwP" = ( /turf/closed/wall, /area/station/commons/dorms) @@ -42294,8 +42283,12 @@ name = "Medical Closure Shutters"; desc = "Fuck off we're closed." }, +/obj/item/paper_bin{ + pixel_x = -7; + pixel_y = 4 + }, /turf/open/floor/iron/dark/textured, -/area/station/medical/medbay/central) +/area/station/medical/office) "vGu" = ( /obj/effect/turf_decal/bot{ dir = 1 @@ -42307,7 +42300,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "vGH" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 9 @@ -43403,6 +43396,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/duct/industrial/waste, +/obj/structure/cable, /turf/open/floor/iron/white/textured, /area/station/medical/treatment_center) "wiK" = ( @@ -44747,7 +44741,7 @@ dir = 1 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "wUo" = ( /turf/closed/wall, /area/station/bitrunning/den) @@ -44968,12 +44962,11 @@ /turf/open/floor/iron/dark/textured, /area/station/cargo/sorting) "wZY" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 +/obj/machinery/conveyor/auto/inside_corners{ + dir = 10 }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white/textured, -/area/station/medical/cryo) +/turf/open/floor/plating, +/area/space) "xae" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/duct/industrial/waste, @@ -45224,7 +45217,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "xfK" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -70061,7 +70054,7 @@ pkw fGs aFY aFY -lbA +qWx ske meJ meJ @@ -74674,8 +74667,8 @@ gVL vsL xxZ xxZ -eJv -eJv +uHW +uHW xoE dno kAH @@ -74932,7 +74925,7 @@ nIg ebe xIv sJt -lms +vGh pmR muw kAH @@ -75187,7 +75180,7 @@ nQo wAP xMv jrX -ltZ +jrX nNP fNw hsi @@ -75446,7 +75439,7 @@ kJN kJN kJN boX -vGh +bKh xys muw rLb @@ -75701,9 +75694,9 @@ wMO eeA nqf nqf -kTL +nqf hWv -vGh +bKh hsi muw rLb @@ -75957,8 +75950,8 @@ nhC hWy eeA nqf -ejr -qXP +ikH +lms shm fNw pmR @@ -76473,8 +76466,8 @@ uhh eXH uOF uOF -eJv -eJv +uHW +uHW xoE dno kAH @@ -76710,7 +76703,7 @@ meJ qSI bMU fgS -nhC +xiD tCm vaj qwR @@ -76967,7 +76960,7 @@ meJ qSI iqh djZ -oft +mnD bWB pkl udg @@ -76989,7 +76982,7 @@ lJl wiH msQ lzG -adf +ltZ fUj rLb pmN @@ -77749,18 +77742,18 @@ xiD nGo mFK pIN -mnD +mFK mTt yhc qRO niS mFK -oMo +mFK dYV eTm -uHW -abL -ikH +sdC +qUv +qLe wvy rbq cIO @@ -78518,9 +78511,9 @@ feL oYu gTr uCI -wZY +kTL mrL -qWx +abL eQz emO oes @@ -79290,7 +79283,7 @@ nTg rvQ ehz kfA -bKh +ejr dYp qUa eCp @@ -81385,7 +81378,7 @@ gmQ qgs ske kND -lbA +wZY xzf xzf xzf From 9ec1f50049dfb548741867be709338572075e30b Mon Sep 17 00:00:00 2001 From: "DESKTOP-M4GD565\\LME" Date: Fri, 6 Oct 2023 20:01:53 -0700 Subject: [PATCH 10/26] aaaaa --- _maps/map_files/Oshan/oshan.dmm | 265 +++++++++++++++----------------- 1 file changed, 125 insertions(+), 140 deletions(-) diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index 63827d275ca5..c43a14d38d69 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -83,10 +83,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/disposal) -"abL" = ( -/obj/machinery/vending/wardrobe/medi_wardrobe, -/turf/open/floor/iron/white/textured, -/area/station/medical/storage) "acc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/grass, @@ -2668,6 +2664,7 @@ /obj/effect/turf_decal/tile/green{ dir = 4 }, +/obj/machinery/light/directional/south, /turf/open/floor/iron/white/textured, /area/station/science/genetics) "buF" = ( @@ -3365,14 +3362,12 @@ /turf/open/floor/iron/dark/textured, /area/mine/storage/public) "bKh" = ( -/obj/structure/table/reinforced, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/machinery/door/poddoor/shutters/preopen{ - name = "Medical Closure Shutters"; - desc = "Fuck off we're closed." +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 }, -/turf/open/floor/iron/dark/textured, -/area/station/medical/office) +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white/textured, +/area/station/medical/storage) "bKz" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 @@ -5481,6 +5476,7 @@ /obj/effect/turf_decal/trimline/blue/line{ dir = 5 }, +/obj/structure/cable, /turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "cUU" = ( @@ -7263,7 +7259,7 @@ /obj/effect/turf_decal/trimline/blue/warning{ dir = 1 }, -/turf/closed/wall/r_wall, +/turf/closed/wall, /area/station/medical/treatment_center) "dQd" = ( /turf/open/floor/engine/plasma, @@ -9277,16 +9273,7 @@ /turf/open/floor/iron/smooth, /area/station/commons/fitness/recreation) "eQz" = ( -/obj/structure/table/reinforced, -/obj/item/defibrillator/loaded{ - pixel_y = 6 - }, -/obj/item/defibrillator/loaded{ - pixel_y = 3 - }, -/obj/item/defibrillator/loaded, -/obj/effect/turf_decal/tile/blue/full, -/obj/structure/window/spawner/directional/north, +/obj/machinery/vending/wardrobe/medi_wardrobe, /turf/open/floor/iron/white/textured, /area/station/medical/storage) "eQB" = ( @@ -9404,8 +9391,8 @@ /turf/open/floor/iron/dark/textured, /area/station/cargo/storage) "eTm" = ( -/obj/structure/cable, -/turf/closed/wall/r_wall, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/space/basic, /area/station/medical/treatment_center) "eTz" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -21142,12 +21129,16 @@ /turf/open/floor/wood/large, /area/station/security/checkpoint/customs) "kTL" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 +/obj/structure/lattice, +/obj/structure/disposalpipe/segment{ + dir = 4; + invisibility = 101 }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white/textured, -/area/station/medical/storage) +/obj/machinery/conveyor/auto/inside_corners{ + dir = 9 + }, +/turf/open/floor/plating/ocean, +/area/space) "kUi" = ( /turf/open/floor/iron, /area/station/cargo/warehouse/upper) @@ -21424,16 +21415,9 @@ /turf/open/floor/iron/smooth, /area/station/commons/fitness/recreation) "lbA" = ( -/obj/structure/lattice, -/obj/structure/disposalpipe/segment{ - dir = 4; - invisibility = 101 - }, -/obj/machinery/conveyor/auto/inside_corners{ - dir = 9 - }, -/turf/open/floor/plating/ocean, -/area/space) +/obj/structure/table/glass, +/turf/open/floor/iron/white/textured, +/area/station/medical/office) "lca" = ( /obj/machinery/duct/industrial/waste, /obj/structure/cable, @@ -21827,9 +21811,18 @@ /turf/open/floor/carpet, /area/station/medical/medbay/central) "lms" = ( -/obj/structure/table/glass, +/obj/structure/table/reinforced, +/obj/item/defibrillator/loaded{ + pixel_y = 6 + }, +/obj/item/defibrillator/loaded{ + pixel_y = 3 + }, +/obj/item/defibrillator/loaded, +/obj/effect/turf_decal/tile/blue/full, +/obj/structure/window/spawner/directional/north, /turf/open/floor/iron/white/textured, -/area/station/medical/office) +/area/station/medical/storage) "lmt" = ( /obj/structure/table/wood/fancy/red, /obj/item/food/spaghetti/security, @@ -22039,11 +22032,9 @@ /turf/open/floor/wood, /area/station/commons/fitness/recreation/entertainment) "ltZ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron/white/textured, -/area/station/medical/medbay/lobby) +/obj/effect/spawner/structure/window, +/turf/open/floor/plating/ocean, +/area/ocean/generated_above) "luc" = ( /obj/structure/cable, /obj/machinery/duct/industrial/waste, @@ -23629,7 +23620,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/warning, -/turf/closed/wall/r_wall, +/turf/closed/wall, /area/station/medical/treatment_center) "mkv" = ( /obj/machinery/atmospherics/components/binary/pump{ @@ -23733,10 +23724,11 @@ /turf/open/floor/plating/ocean, /area/ocean/near_station_powered) "mnD" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/disposalpipe/segment, +/obj/machinery/conveyor/auto/inside_corners{ + dir = 5 + }, /turf/open/floor/plating, -/area/station/medical/cryo) +/area/space) "mnI" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner, /turf/open/floor/iron, @@ -24110,16 +24102,8 @@ /turf/open/floor/iron/dark/textured, /area/station/engineering/break_room) "muw" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4; - invisibility = 101 - }, -/obj/structure/railing{ - dir = 1 - }, -/turf/open/floor/iron/white/textured, -/area/station/medical/medbay/lobby) +/turf/closed/wall/r_wall, +/area/station/medical/office) "muE" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -26354,8 +26338,6 @@ /turf/open/floor/plating/ocean, /area/station/ai_monitored/turret_protected/ai) "nAd" = ( -/obj/machinery/light/directional/south, -/obj/structure/extinguisher_cabinet/directional/south, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 6 }, @@ -29318,18 +29300,9 @@ /turf/open/floor/wood, /area/station/service/abandoned_gambling_den/gaming) "pdS" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4; - invisibility = 101 - }, -/obj/structure/railing{ - dir = 1 - }, -/obj/machinery/light/floor/has_bulb, -/obj/effect/turf_decal/trimline/blue, -/turf/open/floor/iron/white/textured, -/area/station/medical/medbay/lobby) +/obj/effect/spawner/structure/window, +/turf/open/floor/iron/dark/textured, +/area/station/science/genetics) "pdU" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -33143,11 +33116,10 @@ /turf/open/floor/iron/dark/textured, /area/station/engineering/main) "qWx" = ( -/obj/machinery/conveyor/auto/inside_corners{ - dir = 5 - }, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, -/area/space) +/area/station/medical/cryo) "qWC" = ( /obj/effect/turf_decal/trimline/green/line, /obj/effect/turf_decal/trimline/green/line, @@ -34524,7 +34496,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/warning, -/turf/closed/wall/r_wall, +/turf/closed/wall, /area/station/medical/medbay/lobby) "rId" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -40279,8 +40251,11 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "uHW" = ( -/turf/closed/wall/r_wall, -/area/station/medical/office) +/obj/machinery/conveyor/auto/inside_corners{ + dir = 10 + }, +/turf/open/floor/plating, +/area/space) "uIg" = ( /obj/machinery/light_switch/directional/north, /obj/effect/turf_decal/trimline/red/filled/warning{ @@ -40539,8 +40514,8 @@ /turf/open/floor/plating, /area/station/security/brig) "uOF" = ( -/turf/closed/wall/r_wall, -/area/station/medical/treatment_center) +/turf/closed/wall, +/area/station/medical/office) "uOL" = ( /obj/machinery/light/directional/north, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -42283,10 +42258,6 @@ name = "Medical Closure Shutters"; desc = "Fuck off we're closed." }, -/obj/item/paper_bin{ - pixel_x = -7; - pixel_y = 4 - }, /turf/open/floor/iron/dark/textured, /area/station/medical/office) "vGu" = ( @@ -42529,7 +42500,6 @@ /area/station/medical/surgery/theatre) "vNG" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, /obj/structure/disposalpipe/segment, /obj/structure/sign/warning/no_smoking, /turf/open/floor/plating, @@ -44962,11 +44932,18 @@ /turf/open/floor/iron/dark/textured, /area/station/cargo/sorting) "wZY" = ( -/obj/machinery/conveyor/auto/inside_corners{ - dir = 10 +/obj/structure/table/reinforced, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/door/poddoor/shutters/preopen{ + name = "Medical Closure Shutters"; + desc = "Fuck off we're closed." }, -/turf/open/floor/plating, -/area/space) +/obj/item/paper_bin{ + pixel_x = -7; + pixel_y = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/medical/office) "xae" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/duct/industrial/waste, @@ -45182,15 +45159,9 @@ /turf/open/floor/iron/white/diagonal, /area/station/medical/medbay/lobby) "xeP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/obj/machinery/plumbing/floor_pump/input/on/waste/directional/south, -/obj/structure/disposalpipe/segment{ - dir = 4; - invisibility = 101 - }, -/obj/structure/railing{ - dir = 1 - }, /turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "xeR" = ( @@ -46019,7 +45990,21 @@ /turf/open/floor/iron/dark/textured, /area/mine/storage/public) "xxZ" = ( -/turf/closed/wall/r_wall, +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/item/folder, +/obj/item/pen, +/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "rdgene"; + name = "Genetics Lab Shutters" + }, +/obj/machinery/door/window/left/directional/west{ + dir = 1; + name = "Genetics Desk"; + req_access = list("genetics") + }, +/turf/open/space/basic, /area/station/science/genetics) "xyp" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ @@ -70054,7 +70039,7 @@ pkw fGs aFY aFY -qWx +mnD ske meJ meJ @@ -73118,13 +73103,13 @@ jKo jKo cMb uTw -xxZ -xxZ +jKo +jKo rJc -xxZ -xxZ -xxZ -xxZ +jKo +jKo +jKo +jKo vSw pqz adf @@ -73381,7 +73366,7 @@ cSo tqE bGI bPl -aDe +pdS sdC iLY pXC @@ -73638,7 +73623,7 @@ pmg vrS cuk bux -aDe +pdS sdC qUv qLe @@ -74665,10 +74650,10 @@ jKo jKo gVL vsL -xxZ -xxZ -uHW -uHW +jKo +jKo +uOF +uOF xoE dno kAH @@ -74925,9 +74910,9 @@ nIg ebe xIv sJt -vGh +wZY pmR -muw +dno kAH cIO dkr @@ -75184,7 +75169,7 @@ jrX nNP fNw hsi -pdS +fUj kAH gLU lfi @@ -75439,9 +75424,9 @@ kJN kJN kJN boX -bKh +vGh xys -muw +dno rLb wBP jln @@ -75696,9 +75681,9 @@ nqf nqf nqf hWv -bKh +vGh hsi -muw +dno rLb pmN jln @@ -75951,11 +75936,11 @@ hWy eeA nqf ikH -lms +lbA shm fNw pmR -pdS +fUj imU gLU wAl @@ -76212,7 +76197,7 @@ oEo fRj mCO hsi -xeP +mxp kAH cIO qdd @@ -76464,10 +76449,10 @@ tBQ xXa uhh eXH +xXa +xXa uOF -uOF -uHW -uHW +muw xoE dno kAH @@ -76960,7 +76945,7 @@ meJ qSI iqh djZ -mnD +qWx bWB pkl udg @@ -76982,7 +76967,7 @@ lJl wiH msQ lzG -ltZ +xeP fUj rLb pmN @@ -77542,7 +77527,7 @@ aah aah meJ fXF -lbA +kTL dyB asA asA @@ -78007,7 +77992,7 @@ mFK mFK sAU cly -uOF +eTm hbM cUS vUu @@ -78263,8 +78248,8 @@ gct rzA vUo esa -uOF -uOF +xXa +xXa vSw pqz adf @@ -78511,16 +78496,16 @@ feL oYu gTr uCI -kTL +bKh mrL -abL eQz +lms emO oes oes oes oes -lTb +emO uZg oeV eup @@ -78777,7 +78762,7 @@ whs kLW fla xFE -lTb +emO gym okd okd @@ -79800,7 +79785,7 @@ gTr gTr gTr gTr -emO +lTb mfk apo nFm @@ -81378,7 +81363,7 @@ gmQ qgs ske kND -wZY +uHW xzf xzf xzf @@ -83647,7 +83632,7 @@ aah aah aah aah -aah +ltZ meJ qSI nRM From bd9d016aab1997c756c0e99c8312471a70f86d81 Mon Sep 17 00:00:00 2001 From: "DESKTOP-M4GD565\\LME" Date: Fri, 6 Oct 2023 21:43:11 -0700 Subject: [PATCH 11/26] bar --- _maps/map_files/Oshan/oshan.dmm | 2628 ++++++++++++++++--------------- 1 file changed, 1368 insertions(+), 1260 deletions(-) diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index c43a14d38d69..0635fd20fb61 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -83,6 +83,10 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/disposal) +"abL" = ( +/obj/structure/window/spawner/directional/west, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/commons/lounge) "acc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/grass, @@ -477,14 +481,12 @@ /turf/open/floor/iron/dark, /area/station/medical/virology) "ajP" = ( -/obj/machinery/door/firedoor, -/obj/structure/table/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 8; - id = "roboticsprivacy"; - name = "Kitchen Shutters" +/obj/machinery/chem_master/condimaster{ + desc = "Looks like a knock-off chem-master. Perhaps useful for separating liquids when mixing drinks precisely. Also dispenses condiments."; + name = "HoochMaster Deluxe" }, -/turf/open/floor/iron/kitchen, +/obj/machinery/light/directional/west, +/turf/open/floor/carpet/lone, /area/station/service/kitchen) "ajQ" = ( /turf/closed/wall/r_wall, @@ -958,17 +960,12 @@ /turf/open/floor/wood, /area/station/command/heads_quarters/rd) "aAK" = ( -/obj/machinery/door/firedoor, -/obj/structure/table/reinforced, -/obj/structure/displaycase/forsale/kitchen{ - pixel_y = 8 - }, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 8; - id = "roboticsprivacy"; - name = "Kitchen Shutters" +/obj/structure/window/spawner/directional/north, +/obj/structure/window/spawner/directional/south, +/obj/machinery/conveyor/auto{ + dir = 4 }, -/turf/open/floor/iron/kitchen, +/turf/open/floor/carpet/lone, /area/station/service/kitchen) "aBb" = ( /obj/machinery/power/terminal{ @@ -1012,7 +1009,7 @@ /area/station/service/library) "aDe" = ( /obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, +/turf/open/floor/iron/white/textured, /area/station/science/genetics) "aDh" = ( /obj/structure/rack, @@ -1045,7 +1042,7 @@ "aDB" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/warning/no_smoking, -/turf/open/floor/plating, +/turf/open/floor/iron/white/textured, /area/station/science/genetics) "aEw" = ( /obj/structure/sign/poster/official/high_class_martini, @@ -1132,9 +1129,9 @@ /turf/open/floor/iron/dark/textured, /area/station/cargo/warehouse) "aGw" = ( -/obj/machinery/vending/boozeomat, -/turf/closed/wall, -/area/station/service/bar) +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/engine, +/area/station/maintenance/port/central) "aGz" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -1313,10 +1310,9 @@ /area/station/medical/medbay/central) "aKV" = ( /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/wood, -/area/station/commons/lounge) +/obj/effect/spawner/structure/window/reinforced/plasma, +/turf/open/floor/plating, +/area/station/maintenance/port/central) "aLs" = ( /obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -1342,9 +1338,10 @@ /turf/closed/wall/r_wall, /area/station/cargo/sorting) "aMo" = ( -/obj/structure/table/wood/fancy/red, -/obj/item/reagent_containers/cup/soda_cans/monkestation/lemonade{ - pixel_y = 9 +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/chair/wood{ + dir = 4 }, /turf/open/floor/wood, /area/station/commons/lounge) @@ -1419,6 +1416,16 @@ color = "#999999" }, /area/station/science/robotics) +"aOK" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Theater - Backstage" + }, +/obj/machinery/light/directional/south, +/obj/effect/spawner/random/trash, +/obj/structure/rack, +/obj/effect/spawner/random/clothing/costume, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "aPd" = ( /obj/machinery/computer/rdconsole{ dir = 1 @@ -1526,12 +1533,11 @@ /turf/open/floor/plating, /area/station/maintenance/disposal) "aSq" = ( -/obj/effect/landmark/start/bartender, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, /turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/area/station/commons/lounge) "aSt" = ( /obj/effect/turf_decal/stripes{ dir = 4 @@ -1713,9 +1719,8 @@ /turf/open/floor/iron/dark/textured, /area/station/medical/medbay/lobby) "aVb" = ( -/obj/machinery/light/directional/west, /turf/open/floor/wood, -/area/station/commons/lounge) +/area/station/service/bar) "aVe" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -1968,6 +1973,9 @@ dir = 9 }, /obj/effect/turf_decal/trimline/green/corner, +/obj/effect/turf_decal/siding/white{ + dir = 9 + }, /turf/open/floor/iron/dark/textured, /area/station/service/hydroponics) "bbE" = ( @@ -2354,13 +2362,10 @@ /turf/open/floor/plating, /area/station/science/robotics) "blS" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock{ - name = "Bar" - }, -/obj/effect/mapping_helpers/airlock/access/all/service/bar, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/obj/structure/table/wood/poker, +/obj/effect/spawner/random/entertainment/deck, +/turf/open/floor/wood, +/area/station/commons/lounge) "bmb" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 4 @@ -2976,8 +2981,12 @@ /area/station/hallway/primary/aft) "bCu" = ( /obj/machinery/light_switch/directional/west, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar/backroom) +/obj/effect/landmark/start/clown, +/turf/open/floor/eighties/red{ + icon = 'goon/icons/turf/floors.dmi'; + icon_state = "clown_carpet" + }, +/area/station/service/theater) "bCv" = ( /turf/open/floor/engine/n2, /area/station/engineering/atmos) @@ -3196,6 +3205,11 @@ /obj/machinery/ore_silo, /turf/open/floor/wood, /area/station/command/heads_quarters/qm) +"bHp" = ( +/obj/structure/chair/stool/bar/directional/east, +/obj/effect/landmark/start/assistant, +/turf/open/floor/carpet/lone, +/area/station/service/bar) "bHq" = ( /obj/effect/turf_decal/stripes{ dir = 1 @@ -3362,12 +3376,11 @@ /turf/open/floor/iron/dark/textured, /area/mine/storage/public) "bKh" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white/textured, -/area/station/medical/storage) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/bamboo, +/area/station/commons/fitness) "bKz" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 @@ -3596,9 +3609,13 @@ "bPZ" = ( /obj/item/radio/intercom/directional/north, /obj/machinery/light/small/directional/west, -/obj/machinery/vending/wardrobe/bar_wardrobe, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar/backroom) +/obj/structure/bed/dogbed, +/mob/living/basic/chicken/clown, +/turf/open/floor/eighties/red{ + icon = 'goon/icons/turf/floors.dmi'; + icon_state = "clown_carpet" + }, +/area/station/service/theater) "bQs" = ( /turf/open/floor/engine/o2, /area/station/engineering/atmos) @@ -4027,15 +4044,8 @@ /turf/open/floor/iron/dark, /area/station/service/cafeteria) "cdc" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4; - invisibility = 101 - }, -/obj/machinery/light/floor/has_bulb, -/obj/effect/turf_decal/trimline/blue, -/turf/open/floor/iron/dark/textured, -/area/station/medical/medbay/lobby) +/turf/closed/wall, +/area/station/medical/office) "cdv" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/white/filled/corner{ @@ -4104,9 +4114,8 @@ /turf/open/floor/carpet/cyan, /area/station/ai_monitored/turret_protected/ai_upload) "ceV" = ( -/obj/structure/cable, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/turf/open/floor/wood, +/area/station/service/kitchen) "cfz" = ( /obj/structure/lattice, /obj/structure/disposalpipe/segment{ @@ -4116,14 +4125,9 @@ /turf/open/floor/plating/ocean, /area/ocean) "cfI" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Fitness" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/turf/open/floor/bamboo, -/area/station/commons/fitness) +/turf/closed/wall, +/area/station/service/bar/backroom) "cfO" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -4460,12 +4464,9 @@ /area/station/service/theater/abandoned) "cqw" = ( /obj/machinery/newscaster/directional/north, -/obj/structure/dresser, -/turf/open/floor/eighties/red{ - icon = 'goon/icons/turf/floors.dmi'; - icon_state = "clown_carpet" - }, -/area/station/service/theater) +/obj/effect/spawner/random/trash, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "cqT" = ( /turf/open/floor/iron, /area/station/maintenance/port/central) @@ -4943,6 +4944,10 @@ }, /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) +"cGE" = ( +/obj/machinery/restaurant_portal/bar, +/turf/open/floor/wood, +/area/station/service/kitchen) "cGK" = ( /obj/effect/turf_decal/tile/purple/opposingcorners, /mob/living/basic/lizard/wags_his_tail{ @@ -5312,6 +5317,13 @@ /obj/structure/cable/multilayer/connected, /turf/open/floor/iron/dark/textured, /area/station/command/bridge) +"cRC" = ( +/obj/machinery/holopad, +/obj/machinery/light_switch/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/station/service/bar/backroom) "cRO" = ( /obj/machinery/camera/autoname/directional/west, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -5476,7 +5488,6 @@ /obj/effect/turf_decal/trimline/blue/line{ dir = 5 }, -/obj/structure/cable, /turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "cUU" = ( @@ -5510,6 +5521,8 @@ /obj/structure/cable, /obj/machinery/light/directional/east, /obj/machinery/camera/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/bamboo, /area/station/commons/fitness) "cWe" = ( @@ -5941,23 +5954,15 @@ /area/station/medical/coldroom) "dih" = ( /obj/machinery/light/small/directional/west, -/obj/item/clothing/mask/animal/horsehead, -/obj/structure/table/wood, -/obj/machinery/airalarm/directional/south, -/obj/item/clothing/mask/cigarette/pipe, -/obj/item/clothing/mask/fakemoustache, /obj/machinery/light_switch/directional/west, -/turf/open/floor/eighties/red{ - icon = 'goon/icons/turf/floors.dmi'; - icon_state = "clown_carpet" - }, -/area/station/service/theater) -"dik" = ( -/obj/effect/turf_decal/stripes, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/rack, +/obj/effect/spawner/random/clothing/gloves, /turf/open/floor/iron, -/area/station/commons/fitness) +/area/station/commons/vacant_room/commissary) +"dik" = ( +/obj/structure/curtain/cloth/fancy, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "dit" = ( /obj/structure/chair/sofa/corp/right{ desc = "Looks like someone threw it out. Covered in donut crumbs."; @@ -6253,16 +6258,15 @@ /area/station/science/xenobiology) "dpp" = ( /obj/machinery/duct/industrial/waste, -/obj/machinery/door/airlock{ - name = "Theater Backstage" - }, -/obj/effect/mapping_helpers/airlock/access/all/service/theatre, /obj/structure/cable, -/turf/open/floor/eighties/red{ - icon = 'goon/icons/turf/floors.dmi'; - icon_state = "clown_carpet" +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "hop"; + name = "Privacy Shutters" }, -/area/station/service/theater) +/turf/open/floor/plating, +/area/station/commons/vacant_room/commissary) "dpz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/duct/industrial/waste, @@ -6360,13 +6364,8 @@ /area/station/science/genetics) "dqA" = ( /obj/structure/table/wood, -/obj/machinery/chem_dispenser/drinks/beer{ - dir = 8; - pixel_y = 5; - pixel_x = 4 - }, /turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/area/station/commons/lounge) "dqB" = ( /obj/structure/chair/sofa/right/maroon, /obj/effect/landmark/start/botanist, @@ -6570,7 +6569,7 @@ dir = 4; invisibility = 101 }, -/turf/open/floor/plating, +/turf/open/floor/iron/white/textured, /area/station/medical/surgery/theatre) "dwb" = ( /obj/effect/turf_decal/tile/green/fourcorners, @@ -7291,7 +7290,7 @@ /obj/effect/turf_decal/trimline/blue/line{ dir = 8 }, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "dRt" = ( /obj/structure/chair/sofa/right/brown, @@ -7351,7 +7350,7 @@ "dSA" = ( /obj/structure/falsewall, /turf/open/floor/iron/dark, -/area/station/service/theater) +/area/station/commons/vacant_room/commissary) "dSN" = ( /obj/effect/turf_decal/trimline/yellow/line{ dir = 1 @@ -7997,14 +7996,8 @@ /turf/open/floor/iron/white/textured, /area/station/medical/storage) "ejr" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/iron/white/textured, -/area/station/medical/storage) +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/commons/lounge) "ejy" = ( /obj/effect/turf_decal/tile/green/half/contrasted, /obj/machinery/light/directional/north, @@ -8022,9 +8015,10 @@ /turf/open/floor/iron/dark/textured, /area/station/security/brig) "ekZ" = ( -/obj/effect/turf_decal/stripes, -/turf/open/floor/iron, -/area/station/commons/fitness) +/obj/structure/table/glass, +/obj/item/newspaper, +/turf/open/floor/iron/white/textured, +/area/station/medical/office) "elf" = ( /obj/structure/rack, /obj/effect/turf_decal/bot, @@ -8202,7 +8196,7 @@ /obj/effect/turf_decal/trimline/blue/line{ dir = 4 }, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "eqM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -8371,7 +8365,7 @@ "eup" = ( /obj/machinery/light/floor/has_bulb, /obj/effect/turf_decal/trimline/blue, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "euB" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, @@ -8396,14 +8390,7 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/door/firedoor, -/obj/structure/table/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 8; - id = "roboticsprivacy"; - name = "Kitchen Shutters" - }, -/turf/open/floor/iron/kitchen, +/turf/open/floor/carpet/lone, /area/station/service/kitchen) "evR" = ( /obj/structure/closet/secure_closet/security/sec, @@ -8515,12 +8502,14 @@ /turf/open/floor/wood, /area/station/command/heads_quarters/qm) "exP" = ( -/obj/effect/turf_decal/stripes{ - dir = 1 +/obj/machinery/camera/directional/north{ + c_tag = "Bar - Backroom" }, -/obj/structure/weightmachine/weightlifter, -/turf/open/floor/iron, -/area/station/commons/fitness) +/obj/structure/mirror/directional/north, +/obj/structure/sink/directional/south, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/station/service/bar/backroom) "exS" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/dark_blue/opposingcorners{ @@ -8789,9 +8778,10 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) "eFd" = ( -/obj/structure/table/wood/fancy/red, -/turf/open/floor/wood, -/area/station/commons/lounge) +/obj/effect/spawner/random/trash, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/engine, +/area/station/maintenance/port/central) "eFf" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, @@ -9166,12 +9156,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/airlock{ - name = "Kitchen" - }, -/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/kitchen, +/turf/open/floor/wood, /area/station/service/kitchen) "eOA" = ( /obj/effect/spawner/random/structure/grille, @@ -9273,9 +9258,11 @@ /turf/open/floor/iron/smooth, /area/station/commons/fitness/recreation) "eQz" = ( -/obj/machinery/vending/wardrobe/medi_wardrobe, -/turf/open/floor/iron/white/textured, -/area/station/medical/storage) +/obj/machinery/light/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/bamboo, +/area/station/commons/fitness) "eQB" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, @@ -9361,21 +9348,10 @@ /turf/open/floor/iron/smooth, /area/station/ai_monitored/security/armory) "eSy" = ( -/obj/structure/table/wood/fancy/black, -/obj/machinery/door/firedoor, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_x = 6; - pixel_y = -2 - }, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_y = 5; - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/soda_cans/cola{ - pixel_y = 7 - }, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/obj/structure/table/wood, +/obj/item/clothing/head/fedora, +/turf/open/floor/wood, +/area/station/commons/lounge) "eSB" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -9391,9 +9367,14 @@ /turf/open/floor/iron/dark/textured, /area/station/cargo/storage) "eTm" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/space/basic, -/area/station/medical/treatment_center) +/obj/machinery/button/door/directional/north{ + id = "roboticsprivacy"; + name = "Kitchen Shutter Control"; + req_access = list("kitchen"); + pixel_y = -8 + }, +/turf/closed/wall, +/area/station/service/kitchen) "eTz" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -9552,7 +9533,7 @@ desc = "Fuck off we're closed."; dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/iron/white/textured, /area/station/medical/treatment_center) "eXV" = ( /obj/effect/turf_decal/stripes{ @@ -9643,10 +9624,10 @@ }, /area/station/science/robotics) "eZH" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark/textured, -/area/station/medical/medbay/lobby) +/obj/structure/chair/stool/bar/directional/east, +/mob/living/carbon/human/species/monkey/punpun, +/turf/open/floor/carpet/lone, +/area/station/service/bar) "eZW" = ( /obj/structure/table, /obj/machinery/plantgenes, @@ -9921,6 +9902,7 @@ /obj/effect/turf_decal/trimline/red/corner{ dir = 1 }, +/obj/item/kirbyplants/random, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) "ffQ" = ( @@ -9948,6 +9930,14 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/restrooms) +"fgq" = ( +/obj/structure/window/spawner/directional/north, +/obj/structure/window/spawner/directional/south, +/obj/machinery/conveyor/auto{ + dir = 4 + }, +/turf/open/floor/carpet/lone, +/area/station/service/bar) "fgA" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 1 @@ -10188,13 +10178,9 @@ /turf/open/floor/engine, /area/station/engineering/atmos/office) "fos" = ( -/obj/effect/decal/cleanable/confetti, -/obj/machinery/vending/autodrobe, -/turf/open/floor/eighties/red{ - icon = 'goon/icons/turf/floors.dmi'; - icon_state = "clown_carpet" - }, -/area/station/service/theater) +/obj/effect/landmark/start/assistant, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "foG" = ( /obj/machinery/light/directional/north, /turf/open/floor/iron, @@ -10283,9 +10269,6 @@ dir = 4 }, /obj/machinery/duct/industrial/waste, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/spawner/random/trash, /turf/open/floor/plating, /area/station/maintenance/port/central) @@ -10302,13 +10285,12 @@ /turf/open/floor/iron, /area/station/cargo/warehouse/upper) "frv" = ( -/obj/effect/decal/cleanable/confetti, -/obj/structure/disposalpipe/segment, -/turf/open/floor/eighties/red{ - icon = 'goon/icons/turf/floors.dmi'; - icon_state = "clown_carpet" +/obj/structure/table/wood, +/obj/structure/desk_bell{ + pixel_x = -11 }, -/area/station/service/theater) +/turf/open/floor/carpet/lone, +/area/station/service/bar) "frP" = ( /turf/open/floor/carpet/executive, /area/station/command/bridge) @@ -10823,10 +10805,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/table/wood/fancy/red, -/obj/effect/spawner/random/food_or_drink, -/turf/open/floor/wood, -/area/station/commons/lounge) +/obj/structure/table/wood, +/obj/effect/spawner/random/entertainment/lighter, +/turf/open/floor/carpet/lone, +/area/station/service/bar) "fGK" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -10974,11 +10956,9 @@ /turf/open/floor/iron, /area/station/maintenance/port/central) "fJF" = ( -/obj/effect/turf_decal/stripes, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/weightmachine/stacklifter, -/turf/open/floor/iron, -/area/station/commons/fitness) +/obj/effect/landmark/start/bartender, +/turf/open/floor/carpet/lone, +/area/station/service/bar) "fKl" = ( /turf/open/floor/plating/ocean/pit/wall, /area/ocean) @@ -11215,8 +11195,10 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, -/turf/open/floor/wood, -/area/station/commons/lounge) +/obj/structure/chair/stool/bar/directional/east, +/obj/effect/landmark/start/psychologist, +/turf/open/floor/carpet/lone, +/area/station/service/bar) "fQb" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/dark_blue/opposingcorners{ @@ -11257,6 +11239,9 @@ /area/station/engineering/atmos/office) "fRb" = ( /obj/machinery/plumbing/floor_pump/input/on/waste/directional/west, +/obj/structure/chair/wood{ + dir = 4 + }, /turf/open/floor/wood, /area/station/commons/lounge) "fRj" = ( @@ -11365,9 +11350,15 @@ /area/station/engineering/atmos) "fUE" = ( /obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar/backroom) +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/eighties/red{ + icon = 'goon/icons/turf/floors.dmi'; + icon_state = "clown_carpet" + }, +/area/station/service/theater) "fUI" = ( /obj/structure/table/wood, /obj/item/paper_bin/carbon{ @@ -12222,14 +12213,11 @@ /area/station/commons/fitness/recreation/entertainment) "grX" = ( /obj/structure/cable, -/obj/effect/turf_decal/trimline/green/filled/warning{ - dir = 1 - }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=Hall-19"; location = "Hall-18" }, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/wood, /area/station/commons/lounge) "gsm" = ( /obj/structure/cable, @@ -12416,6 +12404,12 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) +"gxy" = ( +/obj/machinery/smartfridge/drinks{ + icon_state = "boozeomat" + }, +/turf/open/floor/carpet/lone, +/area/station/service/bar) "gyj" = ( /obj/structure/disposalpipe/trunk{ dir = 2 @@ -12435,7 +12429,7 @@ /obj/effect/turf_decal/trimline/blue/corner{ dir = 8 }, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "gyA" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ @@ -12680,7 +12674,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/trimline/green/warning, /turf/open/floor/wood, /area/station/commons/lounge) "gDC" = ( @@ -12693,6 +12686,14 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/secondary/exit/departure_lounge) +"gDG" = ( +/obj/machinery/door/airlock{ + name = "Bar" + }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/service/bar/backroom) "gDK" = ( /obj/item/storage/secure/safe/directional/north{ name = "armory safe B" @@ -12840,7 +12841,6 @@ /area/station/maintenance/starboard/aft) "gIB" = ( /obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, /turf/open/floor/bamboo, /area/station/commons/fitness) "gIV" = ( @@ -13503,7 +13503,7 @@ }, /obj/effect/turf_decal/trimline/blue/line, /obj/machinery/vending/wallmed/directional/north, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "hcx" = ( /obj/structure/disposalpipe/segment{ @@ -13512,6 +13512,13 @@ }, /turf/open/floor/engine, /area/station/cargo/miningoffice) +"hcy" = ( +/obj/effect/decal/cleanable/blood/tracks, +/obj/structure/rack, +/obj/item/stack/sheet/iron/twenty, +/obj/item/stack/sheet/glass/fifty, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "hcz" = ( /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 1 @@ -13542,10 +13549,10 @@ /turf/open/floor/engine, /area/station/engineering/atmos/hfr_room) "hdv" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/commons/fitness) +/obj/item/radio/intercom/directional/east, +/obj/machinery/light/small/directional/east, +/turf/open/floor/wood, +/area/station/service/bar/backroom) "hdD" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -13564,13 +13571,9 @@ /turf/open/floor/iron/dark, /area/station/cargo/sorting) "hdM" = ( -/obj/structure/table/wood/fancy/black, -/obj/machinery/door/firedoor, -/obj/structure/displaycase/forsale/kitchen{ - pixel_y = 8 - }, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/obj/structure/table/wood, +/turf/open/floor/wood, +/area/station/commons/lounge) "hee" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -13581,7 +13584,7 @@ /obj/effect/turf_decal/trimline/blue/line{ dir = 4 }, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "hef" = ( /obj/structure/fireplace, @@ -13631,6 +13634,15 @@ }, /turf/open/floor/iron/dark/textured, /area/station/engineering/break_room) +"hfC" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron/white/textured, +/area/station/medical/storage) "hfF" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -13742,6 +13754,11 @@ /obj/effect/turf_decal/trimline/red/filled/warning, /turf/open/floor/iron/smooth, /area/station/ai_monitored/security/armory) +"hhQ" = ( +/obj/structure/table/wood, +/obj/effect/spawner/random/entertainment/gambling, +/turf/open/floor/wood, +/area/station/commons/lounge) "hhT" = ( /obj/machinery/light/directional/north, /obj/effect/spawner/random/vending/snackvend, @@ -13811,6 +13828,9 @@ dir = 1 }, /obj/effect/turf_decal/trimline/green/line, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, /turf/open/floor/iron/dark/textured, /area/station/service/hydroponics) "hkH" = ( @@ -14013,7 +14033,7 @@ }, /obj/structure/railing, /obj/effect/turf_decal/trimline/blue/line, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "hsp" = ( /obj/structure/cable, @@ -14352,6 +14372,13 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) +"hAf" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/curtain/cloth/fancy, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "hAw" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -14362,8 +14389,9 @@ /area/station/maintenance/disposal) "hAN" = ( /obj/machinery/light/directional/south, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/obj/structure/window/spawner/directional/west, +/turf/open/floor/wood, +/area/station/commons/lounge) "hBQ" = ( /obj/structure/table/glass, /obj/effect/turf_decal/tile/blue/fourcorners, @@ -14390,12 +14418,14 @@ /turf/open/floor/iron/dark/textured, /area/station/medical/cryo) "hBR" = ( -/obj/machinery/restaurant_portal/bar, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 5 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/wood, -/area/station/commons/lounge) +/turf/open/floor/eighties/red{ + icon = 'goon/icons/turf/floors.dmi'; + icon_state = "clown_carpet" + }, +/area/station/service/theater) "hCk" = ( /obj/structure/cable, /obj/structure/disposalpipe/junction/flip{ @@ -15073,6 +15103,7 @@ /obj/effect/turf_decal/trimline/green/filled/warning{ dir = 1 }, +/obj/effect/turf_decal/siding/white, /turf/open/floor/iron/dark/textured, /area/station/commons/lounge) "hQm" = ( @@ -15248,12 +15279,8 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "hWe" = ( -/obj/machinery/chem_master/condimaster{ - desc = "Looks like a knock-off chem-master. Perhaps useful for separating liquids when mixing drinks precisely. Also dispenses condiments."; - name = "HoochMaster Deluxe" - }, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/turf/closed/wall, +/area/station/commons/vacant_room/commissary) "hWk" = ( /obj/structure/cable, /obj/machinery/light/directional/west, @@ -15333,17 +15360,21 @@ /turf/open/floor/iron/grimy, /area/station/service/lawoffice) "hXP" = ( -/obj/item/reagent_containers/cup/glass/drinkingglass{ - pixel_x = 7; - pixel_y = 4 +/obj/structure/disposalpipe/segment{ + dir = 4; + invisibility = 101 }, -/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{ - pixel_x = -5; - pixel_y = 6 +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 8 }, -/obj/structure/table/wood, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar/backroom) +/obj/effect/turf_decal/trimline/green/line{ + dir = 4 + }, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/service/hydroponics) "hXX" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -15744,10 +15775,10 @@ /turf/open/floor/plating, /area/station/hallway/primary/central/fore) "ikH" = ( -/obj/structure/table/glass, -/obj/item/newspaper, -/turf/open/floor/iron/white/textured, -/area/station/medical/office) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/station/service/bar/backroom) "ilb" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 @@ -15873,7 +15904,7 @@ dir = 1 }, /obj/machinery/camera/autoname/directional/south, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "inf" = ( /obj/machinery/disposal/delivery_chute, @@ -16432,6 +16463,10 @@ /obj/effect/turf_decal/trimline/green/line, /turf/open/floor/iron/dark, /area/station/service/cafeteria) +"iDt" = ( +/obj/structure/weightmachine/weightlifter, +/turf/open/floor/bamboo, +/area/station/commons/fitness) "iDO" = ( /obj/effect/landmark/start/cargo_technician, /obj/machinery/light/floor/has_bulb, @@ -16569,7 +16604,7 @@ "iHJ" = ( /obj/structure/sign/poster/official/cleanliness, /turf/closed/wall, -/area/station/commons/lounge) +/area/station/service/bar) "iHN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -16843,7 +16878,7 @@ /obj/effect/turf_decal/trimline/blue/corner{ dir = 8 }, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "iNA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -16909,7 +16944,7 @@ /obj/machinery/light_switch/directional/north, /obj/machinery/restaurant_portal/restaurant, /turf/open/floor/wood, -/area/station/commons/lounge) +/area/station/service/bar) "iQl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/engineering/glass{ @@ -17233,6 +17268,17 @@ /obj/effect/landmark/start/warden, /turf/open/floor/wood/large, /area/station/security/warden) +"jbE" = ( +/obj/machinery/door/airlock/external{ + name = "Atmospherics External Access" + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/turf/open/floor/plating, +/area/ocean/generated_above) "jbP" = ( /obj/effect/turf_decal/trimline/brown/line{ dir = 1 @@ -17315,8 +17361,12 @@ /turf/open/floor/carpet/purple, /area/station/science/server) "jdl" = ( -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar/backroom) +/obj/machinery/vending/autodrobe, +/turf/open/floor/eighties/red{ + icon = 'goon/icons/turf/floors.dmi'; + icon_state = "clown_carpet" + }, +/area/station/service/theater) "jdu" = ( /obj/structure/cable, /turf/open/floor/wood/large, @@ -17739,24 +17789,14 @@ /turf/open/floor/iron/white, /area/station/science/robotics/mechbay) "jod" = ( -/obj/structure/table/wood/fancy/black, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = -5 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = 5 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = 5; - pixel_y = 10 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = -5; - pixel_y = 10 +/obj/machinery/button/door/directional/north{ + id = "roboticsprivacy"; + name = "Kitchen Shutter Control"; + req_access = list("kitchen"); + pixel_y = -8 }, -/obj/machinery/door/firedoor, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/turf/closed/wall, +/area/station/commons/vacant_room/commissary) "jol" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/engine, @@ -17779,12 +17819,11 @@ /turf/open/floor/iron, /area/station/bitrunning/den) "jpm" = ( -/obj/machinery/duct/industrial/waste, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/conveyor/auto/inside_corners{ + dir = 10 }, -/turf/open/floor/engine, -/area/station/maintenance/port/central) +/turf/open/floor/plating, +/area/space) "jpE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/engine, @@ -17830,6 +17869,9 @@ /obj/structure/chair/office/light{ dir = 8 }, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, /turf/open/floor/carpet, /area/station/medical/office) "jsj" = ( @@ -18172,13 +18214,18 @@ /turf/open/floor/iron/dark, /area/station/security/office) "jAN" = ( -/obj/effect/turf_decal/stripes{ - dir = 10 +/obj/structure/table/reinforced, +/obj/item/defibrillator/loaded{ + pixel_y = 6 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/commons/fitness) +/obj/item/defibrillator/loaded{ + pixel_y = 3 + }, +/obj/item/defibrillator/loaded, +/obj/effect/turf_decal/tile/blue/full, +/obj/structure/window/spawner/directional/north, +/turf/open/floor/iron/white/textured, +/area/station/medical/storage) "jAQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -18220,9 +18267,6 @@ /area/station/service/lawoffice) "jBl" = ( /obj/machinery/duct/industrial/waste, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/plating, /area/station/maintenance/port/central) "jBm" = ( @@ -18255,6 +18299,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, /turf/open/floor/plating, /area/station/maintenance/disposal/incinerator) +"jBP" = ( +/obj/structure/table/wood, +/obj/structure/displaycase/forsale/kitchen{ + pixel_y = 8 + }, +/turf/open/floor/carpet/lone, +/area/station/service/bar) "jCa" = ( /obj/structure/chair/sofa/right, /obj/machinery/light/directional/north, @@ -18288,10 +18339,20 @@ /turf/open/floor/plastic, /area/station/hallway/primary/central) "jDu" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/commons/fitness) +/obj/item/wrench, +/obj/item/stack/sheet/glass{ + amount = 30 + }, +/obj/item/stack/sheet/iron{ + amount = 30 + }, +/obj/item/stack/cable_coil, +/obj/structure/closet, +/obj/item/vending_refill/cigarette, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood, +/area/station/service/bar/backroom) "jDB" = ( /obj/structure/rack, /obj/effect/turf_decal/tile/neutral, @@ -18352,12 +18413,11 @@ /turf/open/floor/iron/dark/textured, /area/station/cargo/storage) "jFi" = ( -/obj/effect/turf_decal/stripes{ - dir = 9 - }, -/obj/machinery/camera/autoname/directional/north, -/turf/open/floor/iron, -/area/station/commons/fitness) +/obj/structure/closet/secure_closet/bar, +/obj/machinery/light/small/directional/west, +/obj/machinery/light_switch/directional/north, +/turf/open/floor/wood, +/area/station/service/bar/backroom) "jFk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -18795,13 +18855,9 @@ }, /area/station/science/robotics) "jPs" = ( -/obj/effect/decal/cleanable/confetti, -/obj/effect/landmark/start/clown, -/turf/open/floor/eighties/red{ - icon = 'goon/icons/turf/floors.dmi'; - icon_state = "clown_carpet" - }, -/area/station/service/theater) +/obj/machinery/vending/wardrobe/medi_wardrobe, +/turf/open/floor/iron/white/textured, +/area/station/medical/storage) "jPx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -18949,6 +19005,17 @@ dir = 4 }, /area/station/service/chapel) +"jSC" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, +/obj/machinery/door/airlock{ + name = "Kitchen" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "jSJ" = ( /obj/structure/cable, /obj/structure/railing{ @@ -19177,6 +19244,12 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) +"jYH" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/maintenance/port/central) "jYT" = ( /obj/effect/turf_decal/stripes, /obj/structure/disposalpipe/segment{ @@ -19343,19 +19416,19 @@ /turf/open/floor/iron, /area/station/cargo/miningoffice) "kcH" = ( -/obj/machinery/button/door/directional/north{ - id = "roboticsprivacy"; - name = "Kitchen Shutter Control"; - req_access = list("kitchen"); - pixel_y = 0; - pixel_x = 25 - }, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) -"kcP" = ( -/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/bamboo, /area/station/commons/fitness) +"kcP" = ( +/obj/structure/table/reinforced, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/door/poddoor/shutters/preopen{ + name = "Medical Closure Shutters"; + desc = "Fuck off we're closed." + }, +/turf/open/floor/iron/dark/textured, +/area/station/medical/office) "kda" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 @@ -19885,8 +19958,20 @@ dir = 4; invisibility = 101 }, -/turf/open/floor/wood, -/area/station/commons/lounge) +/obj/structure/table, +/obj/item/book/manual/wiki/barman_recipes{ + pixel_y = 3; + pixel_x = -4 + }, +/obj/item/holosign_creator/robot_seat/bar{ + pixel_x = 6 + }, +/obj/machinery/light_switch/directional/west{ + pixel_y = 26 + }, +/obj/machinery/requests_console/directional/north, +/turf/open/floor/carpet/lone, +/area/station/service/bar) "kqx" = ( /obj/machinery/mecha_part_fabricator/maint, /obj/machinery/light/very_dim/directional/north, @@ -20243,7 +20328,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/trimline/green/warning, /turf/open/floor/wood, /area/station/commons/lounge) "kAA" = ( @@ -20254,19 +20338,17 @@ /area/station/cargo/storage) "kAE" = ( /obj/machinery/duct/industrial/waste, -/obj/structure/cable, -/turf/open/floor/eighties/red{ - icon = 'goon/icons/turf/floors.dmi'; - icon_state = "clown_carpet" - }, -/area/station/service/theater) +/obj/structure/rack, +/obj/item/stack/sheet/iron/twenty, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "kAH" = ( /obj/machinery/duct/industrial/waste, /obj/effect/turf_decal/trimline/blue/filled/line, /obj/effect/turf_decal/trimline/blue/line{ dir = 1 }, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "kAM" = ( /obj/structure/sign/warning/fire, @@ -20356,8 +20438,11 @@ /turf/open/floor/iron/dark, /area/station/security/office) "kCz" = ( -/turf/closed/wall/r_wall, -/area/station/service/theater) +/obj/effect/spawner/random/structure/musician/piano/random_piano, +/obj/structure/window/spawner/directional/west, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/commons/lounge) "kDg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -20500,14 +20585,8 @@ /area/station/maintenance/port/central) "kGi" = ( /obj/machinery/duct/industrial/waste, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/eighties/red{ - icon = 'goon/icons/turf/floors.dmi'; - icon_state = "clown_carpet" - }, -/area/station/service/theater) +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "kGj" = ( /obj/structure/extinguisher_cabinet/directional/east, /obj/machinery/button/door/directional/east{ @@ -20740,7 +20819,7 @@ codes_txt = "patrol;next_patrol=Hall-7"; location = "Hall-6" }, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "kKW" = ( /obj/effect/turf_decal/stripes{ @@ -21129,16 +21208,12 @@ /turf/open/floor/wood/large, /area/station/security/checkpoint/customs) "kTL" = ( -/obj/structure/lattice, -/obj/structure/disposalpipe/segment{ - dir = 4; - invisibility = 101 - }, -/obj/machinery/conveyor/auto/inside_corners{ - dir = 9 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 }, -/turf/open/floor/plating/ocean, -/area/space) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/station/service/bar/backroom) "kUi" = ( /turf/open/floor/iron, /area/station/cargo/warehouse/upper) @@ -21150,7 +21225,7 @@ dir = 9 }, /obj/effect/turf_decal/trimline/blue/corner, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "kUm" = ( /obj/machinery/door/airlock/grunge{ @@ -21164,14 +21239,17 @@ /turf/open/floor/iron/dark, /area/station/medical/morgue) "kUp" = ( -/obj/effect/turf_decal/stripes{ - dir = 8 +/obj/machinery/airalarm/directional/south, +/obj/item/stack/package_wrap{ + pixel_x = -4; + pixel_y = 6 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/commons/fitness) +/obj/item/stack/package_wrap, +/obj/structure/table/wood, +/obj/item/gun/ballistic/shotgun/doublebarrel, +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/wood, +/area/station/service/bar/backroom) "kUG" = ( /obj/machinery/light/directional/south, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -21415,9 +21493,20 @@ /turf/open/floor/iron/smooth, /area/station/commons/fitness/recreation) "lbA" = ( -/obj/structure/table/glass, -/turf/open/floor/iron/white/textured, -/area/station/medical/office) +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/green/line{ + dir = 4 + }, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/service/hydroponics) "lca" = ( /obj/machinery/duct/industrial/waste, /obj/structure/cable, @@ -21811,18 +21900,10 @@ /turf/open/floor/carpet, /area/station/medical/medbay/central) "lms" = ( -/obj/structure/table/reinforced, -/obj/item/defibrillator/loaded{ - pixel_y = 6 - }, -/obj/item/defibrillator/loaded{ - pixel_y = 3 - }, -/obj/item/defibrillator/loaded, -/obj/effect/turf_decal/tile/blue/full, -/obj/structure/window/spawner/directional/north, -/turf/open/floor/iron/white/textured, -/area/station/medical/storage) +/obj/machinery/duct/industrial/waste, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/wood, +/area/station/commons/lounge) "lmt" = ( /obj/structure/table/wood/fancy/red, /obj/item/food/spaghetti/security, @@ -21905,9 +21986,13 @@ /turf/open/floor/engine, /area/station/science/robotics/mechbay) "lqa" = ( +/obj/structure/table/wood, +/obj/machinery/firealarm/directional/south, +/obj/item/storage/photo_album/bar, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/turf/open/floor/iron, -/area/station/commons/fitness) +/turf/open/floor/wood, +/area/station/service/bar/backroom) "lqs" = ( /turf/open/floor/iron/stairs, /area/station/medical/storage) @@ -22032,9 +22117,12 @@ /turf/open/floor/wood, /area/station/commons/fitness/recreation/entertainment) "ltZ" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating/ocean, -/area/ocean/generated_above) +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/atmos) "luc" = ( /obj/structure/cable, /obj/machinery/duct/industrial/waste, @@ -22146,8 +22234,11 @@ /area/station/science/genetics) "lwx" = ( /obj/machinery/light/small/directional/east, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar/backroom) +/turf/open/floor/eighties/red{ + icon = 'goon/icons/turf/floors.dmi'; + icon_state = "clown_carpet" + }, +/area/station/service/theater) "lxi" = ( /obj/effect/turf_decal/tile/neutral/fourcorners{ color = "#009dc4" @@ -22193,14 +22284,7 @@ /area/station/service/kitchen/coldroom) "lyP" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor, -/obj/structure/table/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 8; - id = "roboticsprivacy"; - name = "Kitchen Shutters" - }, -/turf/open/floor/iron/kitchen, +/turf/open/floor/carpet/lone, /area/station/service/kitchen) "lyY" = ( /turf/open/floor/eighties/red{ @@ -22892,12 +22976,14 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) "lNO" = ( -/obj/machinery/duct/industrial/waste, -/obj/effect/turf_decal/trimline/green/filled/warning{ - dir = 1 +/obj/machinery/chem_dispenser/drinks/beer{ + dir = 8; + pixel_y = 5; + pixel_x = 4 }, -/turf/open/floor/wood, -/area/station/commons/lounge) +/obj/structure/table, +/turf/open/floor/carpet/lone, +/area/station/service/bar) "lNZ" = ( /obj/structure/table/glass, /obj/machinery/reagentgrinder{ @@ -23053,13 +23139,10 @@ /turf/open/floor/iron/smooth, /area/station/ai_monitored/security/armory) "lRV" = ( -/obj/structure/bed/dogbed, -/mob/living/basic/chicken/clown, -/turf/open/floor/eighties/red{ - icon = 'goon/icons/turf/floors.dmi'; - icon_state = "clown_carpet" - }, -/area/station/service/theater) +/obj/effect/decal/cleanable/blood/tracks, +/obj/effect/spawner/random/decoration, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "lSj" = ( /obj/machinery/conveyor/auto{ dir = 8 @@ -23093,11 +23176,8 @@ /area/station/engineering/main) "lSK" = ( /obj/machinery/light/directional/east, -/turf/open/floor/eighties/red{ - icon = 'goon/icons/turf/floors.dmi'; - icon_state = "clown_carpet" - }, -/area/station/service/theater) +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "lSW" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /obj/structure/cable/layer3, @@ -23218,7 +23298,7 @@ /obj/structure/cable, /obj/machinery/plumbing/floor_pump/input/on/waste/directional/south, /obj/machinery/light/floor/has_bulb, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "lXf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -23426,9 +23506,13 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/central) "mdi" = ( -/obj/machinery/camera/autoname/directional/west, -/turf/open/floor/wood, -/area/station/commons/lounge) +/obj/machinery/door/airlock/public/glass{ + name = "Central Access" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/bamboo, +/area/station/commons/fitness) "mdl" = ( /obj/machinery/duct/industrial/waste, /obj/machinery/light/floor/has_bulb, @@ -23481,11 +23565,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/chair/wood{ - dir = 4 - }, -/turf/open/floor/wood, -/area/station/commons/lounge) +/obj/structure/table/wood, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/carpet/lone, +/area/station/service/bar) "mfk" = ( /obj/structure/closet/secure_closet/chief_medical, /obj/item/screwdriver, @@ -23493,9 +23576,9 @@ /turf/open/floor/wood/parquet, /area/station/command/heads_quarters/cmo) "mfr" = ( -/obj/structure/cable, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar/backroom) +/obj/structure/chair/stool/directional/east, +/turf/open/floor/wood, +/area/station/commons/lounge) "mfz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -24102,8 +24185,9 @@ /turf/open/floor/iron/dark/textured, /area/station/engineering/break_room) "muw" = ( -/turf/closed/wall/r_wall, -/area/station/medical/office) +/obj/machinery/light/directional/west, +/turf/open/floor/wood, +/area/station/service/kitchen) "muE" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -24211,7 +24295,7 @@ /obj/machinery/holopad, /obj/structure/cable, /turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/area/station/commons/lounge) "myr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -24567,10 +24651,10 @@ /turf/open/floor/plating, /area/station/cargo/miningoffice) "mIS" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/table/wood/fancy/red, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/table/wood, +/obj/effect/spawner/random/entertainment/cigar, /turf/open/floor/wood, /area/station/commons/lounge) "mJm" = ( @@ -24811,10 +24895,9 @@ /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/auxiliary) "mPO" = ( -/obj/effect/landmark/start/bartender, /obj/structure/cable, /turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/area/station/commons/lounge) "mPQ" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 10 @@ -24914,8 +24997,9 @@ /area/station/maintenance/starboard/fore) "mSX" = ( /obj/machinery/camera/directional/east, +/obj/item/kirbyplants/random, /turf/open/floor/wood, -/area/station/commons/lounge) +/area/station/service/bar) "mTo" = ( /obj/effect/turf_decal/stripes{ dir = 4 @@ -25016,12 +25100,8 @@ /turf/open/floor/iron/dark/textured, /area/station/cargo/storage) "mVu" = ( -/obj/effect/landmark/start/clown, -/turf/open/floor/eighties/red{ - icon = 'goon/icons/turf/floors.dmi'; - icon_state = "clown_carpet" - }, -/area/station/service/theater) +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "mVB" = ( /obj/machinery/duct/industrial/waste, /obj/effect/turf_decal/trimline/brown/filled/warning, @@ -25111,12 +25191,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor, -/obj/machinery/smartfridge/drinks{ - icon_state = "boozeomat" - }, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/turf/open/floor/wood, +/area/station/commons/lounge) "mYo" = ( /obj/effect/landmark/start/assistant, /obj/effect/turf_decal/tile/blue/diagonal_centre, @@ -25219,9 +25295,12 @@ /area/station/science/lobby) "nbb" = ( /obj/structure/chair/wood, -/obj/effect/landmark/start/bartender, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar/backroom) +/obj/effect/landmark/start/clown, +/turf/open/floor/eighties/red{ + icon = 'goon/icons/turf/floors.dmi'; + icon_state = "clown_carpet" + }, +/area/station/service/theater) "nbf" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /obj/machinery/duct/industrial/waste, @@ -25299,13 +25378,10 @@ /turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "ncg" = ( -/obj/effect/turf_decal/stripes{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/structure/weightmachine/weightlifter, -/turf/open/floor/iron, -/area/station/commons/fitness) +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/random/directional/north, +/turf/open/floor/wood, +/area/station/service/bar/backroom) "nck" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8; @@ -25527,7 +25603,7 @@ /area/station/maintenance/disposal/incinerator) "nhC" = ( /obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, +/turf/open/floor/iron/white/textured, /area/station/medical/surgery/theatre) "nhE" = ( /obj/effect/turf_decal/trimline/red/filled/warning{ @@ -25681,12 +25757,9 @@ /turf/open/floor/iron/freezer, /area/station/commons/dorms) "njU" = ( -/obj/structure/chair/wood{ - dir = 4 - }, -/obj/effect/landmark/start/psychologist, -/turf/open/floor/wood, -/area/station/commons/lounge) +/obj/effect/spawner/structure/window, +/turf/open/floor/iron/white/textured, +/area/station/science/genetics) "nkb" = ( /obj/effect/turf_decal/stripes{ dir = 4 @@ -25951,12 +26024,8 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/chair/wood{ - dir = 8 - }, -/obj/effect/landmark/start/assistant, /turf/open/floor/wood, -/area/station/commons/lounge) +/area/station/service/bar) "nrd" = ( /obj/machinery/duct/industrial/waste, /obj/structure/disposalpipe/segment, @@ -26080,6 +26149,9 @@ /obj/effect/turf_decal/trimline/green/line{ dir = 4 }, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, /turf/open/floor/iron/dark/textured, /area/station/service/hydroponics) "nuB" = ( @@ -26125,7 +26197,7 @@ /obj/effect/turf_decal/trimline/blue/line{ dir = 10 }, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "nvs" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -26199,10 +26271,10 @@ /obj/effect/turf_decal/stripes{ dir = 5 }, -/obj/machinery/airalarm/directional/north, /obj/machinery/camera/autoname/directional/north, -/turf/open/floor/iron, -/area/station/commons/fitness) +/obj/structure/reagent_dispensers/beerkeg, +/turf/open/floor/wood, +/area/station/service/bar/backroom) "nxL" = ( /obj/structure/window/reinforced/tinted/frosted{ dir = 4 @@ -26667,6 +26739,9 @@ name = "Medical Fax Machine" }, /obj/structure/cable, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, /turf/open/floor/carpet, /area/station/medical/office) "nIm" = ( @@ -26701,7 +26776,7 @@ "nJU" = ( /obj/machinery/vending/cigarette, /turf/open/floor/wood, -/area/station/commons/lounge) +/area/station/service/bar) "nJV" = ( /obj/effect/landmark/start/mime, /turf/open/floor/iron/grimy, @@ -26887,6 +26962,9 @@ }, /obj/structure/chair/office/light, /obj/effect/landmark/start/paramedic, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, /turf/open/floor/carpet, /area/station/medical/office) "nNT" = ( @@ -26903,13 +26981,8 @@ /turf/open/floor/iron, /area/station/cargo/warehouse/upper) "nOf" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Fitness" - }, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/bamboo, +/turf/closed/wall, /area/station/commons/fitness) "nOo" = ( /obj/machinery/portable_atmospherics/canister/air, @@ -26955,6 +27028,11 @@ /obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) +"nPE" = ( +/obj/structure/table/wood, +/obj/effect/spawner/random/entertainment/lighter, +/turf/open/floor/carpet/lone, +/area/station/service/bar) "nPJ" = ( /obj/effect/turf_decal/trimline/red/filled/warning{ dir = 6 @@ -27120,22 +27198,12 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/door/firedoor, -/obj/structure/table/reinforced, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_x = 6; - pixel_y = -2 - }, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_y = 5; - pixel_x = 6 - }, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 8; - id = "roboticsprivacy"; - name = "Kitchen Shutters" +/obj/machinery/reagentgrinder{ + pixel_y = 12; + pixel_x = -1 }, -/turf/open/floor/iron/kitchen, +/obj/structure/table, +/turf/open/floor/carpet/lone, /area/station/service/kitchen) "nVh" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -27401,7 +27469,7 @@ id = "cmoprivacy"; name = "Privacy Shutter" }, -/turf/open/floor/plating, +/turf/open/floor/iron/white/textured, /area/station/command/heads_quarters/cmo) "oex" = ( /obj/effect/turf_decal/tile/brown/fourcorners, @@ -27426,7 +27494,7 @@ /obj/effect/turf_decal/trimline/blue/line{ dir = 6 }, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "ofk" = ( /turf/open/floor/iron/dark/textured, @@ -27443,7 +27511,7 @@ "oft" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/disposalpipe/segment, -/turf/open/floor/plating, +/turf/open/floor/iron/white/textured, /area/station/medical/surgery/theatre) "ofu" = ( /obj/machinery/atmospherics/components/binary/pump{ @@ -27600,11 +27668,10 @@ /turf/open/floor/wood/large, /area/station/security/checkpoint/customs) "oiG" = ( -/obj/structure/table/wood, /obj/structure/cable, -/obj/item/book/manual/wiki/barman_recipes, +/obj/structure/table/wood, /turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/area/station/commons/lounge) "oiN" = ( /obj/effect/spawner/random/vending/snackvend, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -27668,8 +27735,10 @@ /turf/open/floor/engine/vacuum, /area/station/engineering/atmos) "ojS" = ( +/obj/structure/window/spawner/directional/west, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/area/station/commons/lounge) "okd" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -27677,7 +27746,7 @@ /obj/effect/turf_decal/trimline/blue/line{ dir = 8 }, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "okC" = ( /obj/effect/turf_decal/trimline/yellow/line, @@ -27750,15 +27819,9 @@ /turf/open/floor/plating, /area/station/service/chapel) "omy" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/open/floor/eighties/red{ - icon = 'goon/icons/turf/floors.dmi'; - icon_state = "clown_carpet" - }, -/area/station/service/theater) +/obj/effect/spawner/random/decoration, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "omH" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -29300,9 +29363,9 @@ /turf/open/floor/wood, /area/station/service/abandoned_gambling_den/gaming) "pdS" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/iron/dark/textured, -/area/station/science/genetics) +/obj/structure/table/glass, +/turf/open/floor/iron/white/textured, +/area/station/medical/office) "pdU" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -29388,7 +29451,7 @@ /obj/effect/turf_decal/trimline/blue/line{ dir = 6 }, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "pgQ" = ( /obj/structure/rack, @@ -29684,7 +29747,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/blue/half/contrasted, /obj/structure/railing, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "pmW" = ( /obj/structure/disposalpipe/segment{ @@ -30456,8 +30519,11 @@ dir = 1 }, /obj/structure/cable, +/obj/structure/chair/wood/wings{ + dir = 8 + }, /turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/area/station/commons/lounge) "pIc" = ( /obj/machinery/door/airlock/research{ autoclose = 0; @@ -30511,12 +30577,8 @@ /turf/open/floor/plating, /area/station/cargo/warehouse) "pIL" = ( -/obj/structure/chair/wood{ - dir = 8 - }, -/obj/effect/landmark/start/assistant, -/turf/open/floor/wood, -/area/station/commons/lounge) +/turf/open/floor/carpet/lone, +/area/station/service/bar) "pIN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -30578,8 +30640,9 @@ /area/station/science/lab) "pJI" = ( /obj/machinery/light/small/directional/north, +/obj/machinery/newscaster/directional/north, /turf/open/floor/wood, -/area/station/commons/lounge) +/area/station/service/bar) "pJO" = ( /obj/machinery/duct/industrial/waste, /obj/effect/spawner/random/trash, @@ -30856,6 +30919,10 @@ /obj/machinery/light/no_nightlight/directional/east, /turf/open/floor/iron/dark/textured, /area/station/engineering/main) +"pPG" = ( +/obj/effect/landmark/event_spawn, +/turf/open/floor/wood, +/area/station/commons/lounge) "pPR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -31363,6 +31430,7 @@ /obj/effect/turf_decal/trimline/green/corner{ dir = 4 }, +/obj/item/kirbyplants/random, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) "qck" = ( @@ -31445,7 +31513,7 @@ dir = 1 }, /obj/structure/cable, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "qdS" = ( /obj/effect/turf_decal/trimline/red/filled/warning{ @@ -31684,7 +31752,7 @@ "qkz" = ( /obj/effect/spawner/random/vending/colavend, /turf/open/floor/wood, -/area/station/commons/lounge) +/area/station/service/bar) "qkH" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -31696,6 +31764,10 @@ /obj/machinery/door/airlock/maintenance, /turf/open/floor/mineral/titanium/yellow, /area/station/maintenance/starboard/aft) +"qll" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating/ocean, +/area/ocean/generated_above) "qlH" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green{ @@ -31770,11 +31842,15 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/chair/wood{ - dir = 8 +/obj/structure/table/wood, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -3 }, -/turf/open/floor/wood, -/area/station/commons/lounge) +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 3 + }, +/turf/open/floor/carpet/lone, +/area/station/service/bar) "qnG" = ( /obj/machinery/door/airlock/public/glass{ name = "Jim Norton's Quebecois Coffee" @@ -31940,12 +32016,17 @@ /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "qrV" = ( -/obj/structure/chair/wood{ - dir = 4 +/obj/structure/table, +/obj/machinery/chem_dispenser/drinks{ + dir = 8; + pixel_x = 4 }, -/obj/effect/landmark/start/assistant, -/turf/open/floor/wood, -/area/station/commons/lounge) +/obj/item/reagent_containers/cup/rag{ + pixel_y = 7; + pixel_x = -8 + }, +/turf/open/floor/carpet/lone, +/area/station/service/bar) "qrW" = ( /turf/open/floor/carpet/purple, /area/station/command/heads_quarters/captain/private) @@ -32451,12 +32532,13 @@ /turf/open/floor/iron/smooth, /area/station/commons/fitness/recreation) "qGs" = ( -/obj/effect/turf_decal/stripes{ - dir = 1 - }, -/obj/machinery/light/directional/north, -/turf/open/floor/iron, -/area/station/commons/fitness) +/obj/effect/landmark/start/bartender, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/station/service/bar/backroom) "qGy" = ( /obj/machinery/light_switch/directional/west, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -32718,7 +32800,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/line, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "qNr" = ( /obj/structure/disposalpipe/segment, @@ -32759,6 +32841,7 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 5 }, +/obj/item/kirbyplants/random, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/aft) "qOc" = ( @@ -32902,7 +32985,7 @@ /obj/effect/turf_decal/trimline/green/corner{ dir = 4 }, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/grass, /area/station/service/hydroponics) "qRJ" = ( /turf/closed/wall, @@ -33116,10 +33199,14 @@ /turf/open/floor/iron/dark/textured, /area/station/engineering/main) "qWx" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/sign/warning/vacuum/external/directional/south, +/obj/structure/cable, +/obj/machinery/light/small/directional/north, /turf/open/floor/plating, -/area/station/medical/cryo) +/area/ocean/generated_above) "qWC" = ( /obj/effect/turf_decal/trimline/green/line, /obj/effect/turf_decal/trimline/green/line, @@ -33150,6 +33237,12 @@ }, /turf/open/floor/grass, /area/station/maintenance/starboard/upper) +"qXP" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/carpet/lone, +/area/station/service/bar) "qYg" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/east, @@ -33272,7 +33365,7 @@ dir = 1 }, /obj/machinery/light/directional/south, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "rbt" = ( /obj/structure/table/wood, @@ -33287,9 +33380,12 @@ "rbD" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/service/bar, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/service/theatre, /turf/open/floor/iron/kitchen, -/area/station/service/bar/backroom) +/area/station/service/theater) "rbK" = ( /obj/machinery/duct/industrial/waste, /obj/effect/turf_decal/trimline/dark_blue/filled/warning{ @@ -33308,7 +33404,7 @@ /obj/effect/turf_decal/trimline/blue/warning{ dir = 8 }, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "rbR" = ( /obj/structure/cable, @@ -33484,13 +33580,9 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) "rgY" = ( -/obj/structure/table/wood, -/obj/machinery/chem_dispenser/drinks{ - dir = 8; - pixel_x = 4 - }, +/obj/effect/spawner/xmastree, /turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/area/station/commons/lounge) "rhi" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 8 @@ -33541,7 +33633,7 @@ /obj/effect/turf_decal/trimline/blue/line{ dir = 4 }, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "rhO" = ( /obj/machinery/door/airlock/external, @@ -34328,6 +34420,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 5 }, +/obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/atmos) "rDx" = ( @@ -34411,14 +34504,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/table/wood, -/obj/machinery/reagentgrinder{ - pixel_y = 6; - pixel_x = -2 - }, /obj/structure/cable, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/turf/open/floor/wood, +/area/station/commons/lounge) "rFV" = ( /obj/structure/sign/painting/library{ pixel_y = -32 @@ -34649,7 +34737,7 @@ /obj/effect/turf_decal/trimline/blue/warning{ dir = 1 }, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "rLj" = ( /turf/open/floor/wood, @@ -34708,11 +34796,11 @@ /area/station/service/library) "rNh" = ( /obj/effect/turf_decal/stripes{ - dir = 4 + dir = 6 }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/commons/fitness) +/obj/machinery/vending/wardrobe/bar_wardrobe, +/turf/open/floor/wood, +/area/station/service/bar/backroom) "rNm" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -35286,12 +35374,9 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) "sdC" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/blue/line, -/turf/open/floor/iron/dark/textured, -/area/station/medical/medbay/lobby) +/obj/structure/chair/stool/bar/directional/east, +/turf/open/floor/carpet/lone, +/area/station/service/bar) "sdH" = ( /obj/machinery/duct/industrial/waste, /obj/effect/turf_decal/trimline/yellow/line, @@ -35550,7 +35635,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/structure/sink/kitchen/directional/west, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, +/obj/machinery/door/airlock{ + name = "Kitchen" + }, +/obj/machinery/door/firedoor, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "smf" = ( @@ -35725,7 +35814,7 @@ /obj/effect/turf_decal/trimline/blue/line{ dir = 10 }, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "ssb" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -36177,7 +36266,7 @@ "sDD" = ( /obj/structure/sign/poster/official/safety_eye_protection, /turf/closed/wall, -/area/station/service/bar) +/area/station/service/theater) "sDJ" = ( /obj/machinery/duct/industrial/waste, /obj/effect/spawner/random/vending/snackvend, @@ -36207,7 +36296,7 @@ /obj/effect/turf_decal/trimline/blue/warning{ dir = 4 }, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "sEJ" = ( /obj/machinery/requests_console/directional/north, @@ -36220,8 +36309,12 @@ /obj/item/stack/sheet/iron{ amount = 30 }, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar/backroom) +/obj/structure/dresser, +/turf/open/floor/eighties/red{ + icon = 'goon/icons/turf/floors.dmi'; + icon_state = "clown_carpet" + }, +/area/station/service/theater) "sEU" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -36353,8 +36446,8 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/turf/open/floor/wood, -/area/station/commons/lounge) +/turf/open/floor/carpet/lone, +/area/station/service/bar) "sIf" = ( /obj/structure/cable, /turf/open/floor/wood, @@ -36409,7 +36502,7 @@ /obj/machinery/computer/department_orders/medical{ dir = 4 }, -/turf/open/floor/iron/white/textured_large, +/turf/open/floor/carpet, /area/station/medical/office) "sJx" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -36629,7 +36722,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/area/station/commons/lounge) "sPX" = ( /obj/structure/table/wood, /obj/machinery/button/door/directional/south{ @@ -36875,7 +36968,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/light/small/directional/south, /turf/open/floor/wood, -/area/station/commons/lounge) +/area/station/service/bar) "sVJ" = ( /obj/structure/cable, /obj/machinery/light/floor/has_bulb, @@ -37487,10 +37580,11 @@ /turf/open/floor/iron/white/textured, /area/station/science/genetics) "tqP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/obj/machinery/light/directional/east, -/turf/open/floor/bamboo, -/area/station/commons/fitness) +/turf/open/floor/iron/white/textured, +/area/station/medical/medbay/lobby) "trd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -37564,9 +37658,14 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/table/wood, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/obj/machinery/door/window{ + base_state = "right"; + dir = 8; + icon_state = "right"; + name = "Theater Stage" + }, +/turf/open/floor/wood, +/area/station/commons/lounge) "ttG" = ( /obj/effect/turf_decal/siding/blue, /obj/machinery/holopad/secure{ @@ -37711,8 +37810,9 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/turf/open/floor/wood, -/area/station/commons/lounge) +/obj/structure/table/wood, +/turf/open/floor/carpet/lone, +/area/station/service/bar) "tym" = ( /obj/machinery/camera/autoname/directional/west, /turf/open/floor/bamboo, @@ -37931,8 +38031,8 @@ }, /obj/machinery/camera/autoname/directional/north, /obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/turf/open/floor/wood, +/area/station/commons/lounge) "tDP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -37993,6 +38093,9 @@ /obj/item/multitool, /turf/open/floor/mineral/titanium/blue, /area/station/ai_monitored/command/storage/eva) +"tFN" = ( +/turf/closed/wall/r_wall, +/area/station/medical/office) "tFR" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 @@ -38130,14 +38233,10 @@ /turf/open/floor/plating, /area/station/engineering/storage/tech) "tIS" = ( -/obj/structure/table/wood, /obj/machinery/light_switch/directional/east, -/obj/item/reagent_containers/cup/rag{ - pixel_y = 7 - }, -/obj/item/holosign_creator/robot_seat/bar, +/obj/structure/table/wood, /turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/area/station/commons/lounge) "tIV" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -38247,6 +38346,18 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) +"tKQ" = ( +/obj/machinery/door/airlock/external{ + name = "Atmospherics External Access" + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/atmos) "tLb" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/yellow/filled/warning, @@ -38459,9 +38570,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 10 - }, /turf/open/floor/wood, /area/station/commons/lounge) "tRo" = ( @@ -38729,13 +38837,17 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) "tYT" = ( +/obj/machinery/light/small/directional/west, +/obj/item/clothing/mask/animal/horsehead, /obj/structure/table/wood, -/obj/item/gun/ballistic/shotgun/doublebarrel, -/obj/item/ammo_casing/shotgun/improvised, -/obj/item/storage/box/drinkingglasses, -/obj/item/storage/photo_album/bar, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar/backroom) +/obj/machinery/airalarm/directional/south, +/obj/item/clothing/mask/cigarette/pipe, +/obj/item/clothing/mask/fakemoustache, +/turf/open/floor/eighties/red{ + icon = 'goon/icons/turf/floors.dmi'; + icon_state = "clown_carpet" + }, +/area/station/service/theater) "tYW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment{ @@ -39025,12 +39137,11 @@ /turf/open/floor/iron/dark, /area/station/cargo/sorting) "ueF" = ( -/obj/effect/turf_decal/stripes{ - dir = 6 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/commons/fitness) +/obj/effect/landmark/start/cook, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "ueN" = ( /obj/structure/closet/emcloset, /turf/open/floor/plating, @@ -39039,7 +39150,7 @@ /obj/effect/spawner/random/entertainment/arcade, /obj/machinery/airalarm/directional/north, /turf/open/floor/wood, -/area/station/commons/lounge) +/area/station/service/bar) "ufr" = ( /obj/structure/disposalpipe/junction/flip{ dir = 4 @@ -39328,14 +39439,9 @@ /turf/open/floor/wood/parquet, /area/station/command/heads_quarters/cmo) "umT" = ( -/obj/structure/closet/crate/wooden/toy, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/south, -/turf/open/floor/eighties/red{ - icon = 'goon/icons/turf/floors.dmi'; - icon_state = "clown_carpet" - }, -/area/station/service/theater) +/obj/effect/spawner/random/trash, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "umX" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -39606,7 +39712,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/warning, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "ust" = ( /obj/machinery/light/directional/north, @@ -39717,8 +39823,9 @@ "uvM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/window/spawner/directional/west, /turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/area/station/commons/lounge) "uvT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -39917,15 +40024,16 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) "uBa" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/chair/wood{ - dir = 4 +/obj/structure/lattice, +/obj/structure/disposalpipe/segment{ + dir = 4; + invisibility = 101 }, -/obj/effect/landmark/start/assistant, -/turf/open/floor/wood, -/area/station/commons/lounge) +/obj/machinery/conveyor/auto/inside_corners{ + dir = 9 + }, +/turf/open/floor/plating/ocean, +/area/space) "uBf" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -40185,11 +40293,9 @@ /turf/open/floor/grass, /area/station/maintenance/starboard/upper) "uGO" = ( -/obj/structure/chair/wood{ - dir = 8 - }, -/turf/open/floor/wood, -/area/station/commons/lounge) +/obj/structure/table/wood, +/turf/open/floor/carpet/lone, +/area/station/service/bar) "uHd" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -40251,11 +40357,12 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "uHW" = ( -/obj/machinery/conveyor/auto/inside_corners{ - dir = 10 +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 }, -/turf/open/floor/plating, -/area/space) +/obj/effect/turf_decal/trimline/blue/line, +/turf/open/floor/iron/white/textured, +/area/station/medical/medbay/lobby) "uIg" = ( /obj/machinery/light_switch/directional/north, /obj/effect/turf_decal/trimline/red/filled/warning{ @@ -40290,8 +40397,8 @@ dir = 8 }, /obj/machinery/light/directional/east, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/turf/open/floor/wood, +/area/station/commons/lounge) "uJx" = ( /obj/item/lipstick/black, /obj/structure/table/wood, @@ -40514,8 +40621,9 @@ /turf/open/floor/plating, /area/station/security/brig) "uOF" = ( -/turf/closed/wall, -/area/station/medical/office) +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/iron/white/textured, +/area/station/medical/treatment_center) "uOL" = ( /obj/machinery/light/directional/north, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -40732,7 +40840,7 @@ "uSL" = ( /obj/structure/sign/poster/quirk/service_logo, /turf/closed/wall, -/area/station/commons/lounge) +/area/station/service/bar) "uSV" = ( /turf/open/floor/plating, /area/station/maintenance/starboard/central) @@ -41021,7 +41129,7 @@ /obj/item/storage/medkit, /obj/structure/table/glass, /obj/machinery/light/directional/north, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "uZx" = ( /obj/structure/closet/secure_closet/personal/cabinet, @@ -41080,7 +41188,7 @@ "vci" = ( /obj/machinery/vending/coffee, /turf/open/floor/wood, -/area/station/commons/lounge) +/area/station/service/bar) "vcm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -41148,8 +41256,8 @@ "vdg" = ( /obj/machinery/firealarm/directional/south, /obj/item/radio/intercom/directional/east, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/turf/open/floor/wood, +/area/station/commons/lounge) "vdj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -41175,8 +41283,11 @@ /area/station/science/genetics) "vdW" = ( /obj/machinery/holopad, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar/backroom) +/turf/open/floor/eighties/red{ + icon = 'goon/icons/turf/floors.dmi'; + icon_state = "clown_carpet" + }, +/area/station/service/theater) "vdX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -41480,11 +41591,12 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/aft) "vkC" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/glass/shaker, -/obj/item/holosign_creator/robot_seat/bar, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar/backroom) +/obj/structure/closet/crate/wooden/toy, +/turf/open/floor/eighties/red{ + icon = 'goon/icons/turf/floors.dmi'; + icon_state = "clown_carpet" + }, +/area/station/service/theater) "vkU" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 10 @@ -41802,7 +41914,7 @@ /obj/effect/turf_decal/trimline/blue/corner{ dir = 4 }, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "vrS" = ( /obj/effect/turf_decal/tile/green/opposingcorners{ @@ -41856,8 +41968,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "vtb" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/weightmachine/stacklifter, /turf/open/floor/bamboo, /area/station/commons/fitness) "vto" = ( @@ -41947,10 +42058,10 @@ /turf/open/floor/plating, /area/station/engineering/break_room) "vvq" = ( -/obj/structure/extinguisher_cabinet/directional/east, -/obj/machinery/light/directional/east, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/medical/cryo) "vvw" = ( /obj/effect/mapping_helpers/airlock/unres, /obj/machinery/door/airlock/maintenance, @@ -42032,13 +42143,12 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) "vyi" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 9 +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 }, -/turf/open/floor/wood, -/area/station/commons/lounge) +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white/textured, +/area/station/medical/storage) "vyk" = ( /obj/structure/chair/wood{ dir = 4 @@ -42096,6 +42206,14 @@ }, /turf/open/floor/iron/dark/textured, /area/station/science/lab) +"vAq" = ( +/obj/structure/window/spawner/directional/north, +/obj/structure/window/spawner/directional/south, +/obj/machinery/conveyor/auto{ + dir = 4 + }, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "vAr" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -42258,6 +42376,10 @@ name = "Medical Closure Shutters"; desc = "Fuck off we're closed." }, +/obj/item/paper_bin{ + pixel_x = -7; + pixel_y = 4 + }, /turf/open/floor/iron/dark/textured, /area/station/medical/office) "vGu" = ( @@ -42502,7 +42624,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/structure/disposalpipe/segment, /obj/structure/sign/warning/no_smoking, -/turf/open/floor/plating, +/turf/open/floor/iron/white/textured, /area/station/medical/treatment_center) "vOg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -42661,7 +42783,7 @@ }, /obj/effect/turf_decal/trimline/blue/line, /obj/machinery/camera/autoname/directional/north, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "vSD" = ( /obj/effect/spawner/structure/window/reinforced/plasma, @@ -43023,7 +43145,7 @@ dir = 4 }, /obj/machinery/light/directional/east, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "waC" = ( /obj/machinery/duct/industrial/waste, @@ -43487,6 +43609,7 @@ /obj/effect/turf_decal/trimline/green/filled/warning{ dir = 1 }, +/obj/effect/turf_decal/siding/white, /turf/open/floor/iron/dark/textured, /area/station/commons/lounge) "wnf" = ( @@ -43579,10 +43702,10 @@ /turf/open/floor/holofloor/beach/water, /area/station/maintenance/starboard/aft) "wqA" = ( -/obj/effect/turf_decal/stripes, -/obj/structure/weightmachine/stacklifter, +/obj/structure/mirror/directional/north, +/obj/effect/spawner/random/contraband/cannabis, /turf/open/floor/iron, -/area/station/commons/fitness) +/area/station/commons/vacant_room/commissary) "wqB" = ( /obj/machinery/vending/security, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -43844,7 +43967,7 @@ /obj/effect/turf_decal/trimline/blue/corner{ dir = 8 }, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "wxy" = ( /obj/machinery/suit_storage_unit/standard_unit, @@ -44208,20 +44331,12 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) "wGs" = ( -/obj/structure/table/wood/fancy/black, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/item/storage/fancy/cigarettes{ - pixel_y = 7; - pixel_x = -4 - }, -/obj/item/lighter{ - pixel_x = 7; - pixel_y = 3 - }, -/obj/machinery/door/firedoor, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/obj/structure/table/wood/poker, +/obj/effect/spawner/random/entertainment/gambling, +/turf/open/floor/wood, +/area/station/commons/lounge) "wGA" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -44532,9 +44647,6 @@ /area/station/ai_monitored/command/storage/eva) "wQd" = ( /obj/machinery/duct/industrial/waste, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, /obj/effect/spawner/random/trash, /turf/open/floor/engine, /area/station/maintenance/port/central) @@ -44631,8 +44743,9 @@ }, /area/station/science/robotics) "wRT" = ( -/turf/closed/wall, -/area/station/commons/lounge) +/obj/structure/sink/kitchen/directional/west, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "wRU" = ( /obj/machinery/light/small/directional/south, /turf/open/floor/engine/vacuum, @@ -44836,8 +44949,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/wood, -/area/station/commons/lounge) +/obj/structure/chair/stool/bar/directional/east, +/obj/effect/landmark/event_spawn, +/turf/open/floor/carpet/lone, +/area/station/service/bar) "wYe" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 8 @@ -44932,22 +45047,12 @@ /turf/open/floor/iron/dark/textured, /area/station/cargo/sorting) "wZY" = ( -/obj/structure/table/reinforced, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/machinery/door/poddoor/shutters/preopen{ - name = "Medical Closure Shutters"; - desc = "Fuck off we're closed." - }, -/obj/item/paper_bin{ - pixel_x = -7; - pixel_y = 4 - }, -/turf/open/floor/iron/dark/textured, -/area/station/medical/office) +/obj/item/kirbyplants/random, +/turf/open/floor/wood, +/area/station/service/bar) "xae" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/duct/industrial/waste, -/obj/effect/mapping_helpers/airlock/access/all/service/theatre, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -44955,7 +45060,7 @@ icon = 'goon/icons/turf/floors.dmi'; icon_state = "clown_carpet" }, -/area/station/service/theater) +/area/station/commons/vacant_room/commissary) "xan" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners, /obj/effect/landmark/start/depsec/medical, @@ -45159,10 +45264,9 @@ /turf/open/floor/iron/white/diagonal, /area/station/medical/medbay/lobby) "xeP" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron/white/textured, +/obj/effect/turf_decal/tile/blue/diagonal_centre, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/white/diagonal, /area/station/medical/medbay/lobby) "xeR" = ( /obj/machinery/computer/atmos_control/mix_tank{ @@ -45508,7 +45612,7 @@ }, /obj/effect/turf_decal/trimline/blue/line, /mob/living/simple_animal/bot/medbot/autopatrol, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "xoM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -45737,12 +45841,9 @@ /turf/open/floor/iron/dark/herringbone, /area/station/science/server) "xtr" = ( -/obj/structure/chair/wood{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/landmark/start/assistant, +/obj/structure/chair/stool/directional/east, /turf/open/floor/wood, /area/station/commons/lounge) "xtz" = ( @@ -45848,9 +45949,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 6 - }, /turf/open/floor/wood, /area/station/commons/lounge) "xvy" = ( @@ -46004,7 +46102,7 @@ name = "Genetics Desk"; req_access = list("genetics") }, -/turf/open/space/basic, +/turf/open/floor/iron/white/textured, /area/station/science/genetics) "xyp" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ @@ -46019,7 +46117,7 @@ /obj/effect/landmark/start/assistant, /obj/effect/turf_decal/tile/blue/half/contrasted, /obj/structure/railing, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "xyG" = ( /obj/machinery/navbeacon{ @@ -46041,12 +46139,9 @@ /turf/open/floor/plating, /area/station/maintenance/port/central) "xzg" = ( -/obj/effect/turf_decal/stripes, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/weightmachine/stacklifter, -/turf/open/floor/iron, -/area/station/commons/fitness) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/wood, +/area/station/service/bar/backroom) "xzj" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/structure/sign/poster/quirk/festive{ @@ -46095,12 +46190,12 @@ /turf/open/floor/engine, /area/station/cargo/miningoffice) "xAi" = ( -/obj/structure/table/wood/fancy/black, -/obj/machinery/door/firedoor, -/obj/effect/spawner/random/food_or_drink, -/obj/structure/window/plasma/spawner/directional/south, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/obj/structure/table/wood/poker, +/obj/effect/spawner/random/entertainment/deck, +/obj/effect/spawner/random/entertainment/deck, +/obj/item/storage/dice, +/turf/open/floor/wood, +/area/station/commons/lounge) "xAk" = ( /obj/structure/rack, /obj/item/wrench, @@ -46342,12 +46437,13 @@ /turf/open/floor/iron/dark/textured, /area/station/engineering/break_room) "xHk" = ( -/obj/structure/sink{ - pixel_y = 11 - }, /obj/structure/mirror/directional/north, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar/backroom) +/obj/machinery/newscaster/directional/north, +/turf/open/floor/eighties/red{ + icon = 'goon/icons/turf/floors.dmi'; + icon_state = "clown_carpet" + }, +/area/station/service/theater) "xHE" = ( /obj/machinery/telecomms/bus/preset_two, /turf/open/floor/iron/dark/telecomms, @@ -46387,9 +46483,14 @@ /turf/open/floor/iron/dark, /area/station/service/chapel/office) "xJb" = ( -/obj/effect/spawner/structure/window/reinforced, +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "hop"; + name = "Privacy Shutters" + }, /turf/open/floor/plating, -/area/station/service/theater) +/area/station/commons/vacant_room/commissary) "xJP" = ( /obj/machinery/duct/industrial/waste, /obj/effect/turf_decal/trimline/brown/filled/corner{ @@ -46413,10 +46514,11 @@ /turf/open/floor/plastic, /area/station/hallway/primary/central) "xKr" = ( -/obj/machinery/camera/autoname/directional/south, -/obj/structure/reagent_dispensers/beerkeg, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar/backroom) +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/engine, +/area/station/maintenance/port/central) "xKt" = ( /obj/machinery/drone_dispenser/preloaded, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -46461,14 +46563,14 @@ /turf/open/floor/iron/dark/textured, /area/station/engineering/main) "xKG" = ( -/obj/machinery/door/airlock{ - name = "Bar" - }, /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/service/bar, /obj/structure/cable, +/obj/machinery/door/airlock{ + name = "Theater Backstage" + }, +/obj/effect/mapping_helpers/airlock/access/all/service/theatre, /turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/area/station/service/theater) "xKW" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/structure/closet/l3closet/virology, @@ -46559,6 +46661,9 @@ pixel_x = -7; pixel_y = 4 }, +/obj/effect/turf_decal/siding/white{ + dir = 5 + }, /turf/open/floor/carpet, /area/station/medical/office) "xMG" = ( @@ -46850,10 +46955,12 @@ }, /area/station/science/lobby) "xTD" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/public/glass{ + name = "Fitness" + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/bamboo, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/space/basic, /area/station/commons/fitness) "xTO" = ( /obj/machinery/door/airlock/engineering/glass{ @@ -46918,6 +47025,7 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 9 }, +/obj/item/kirbyplants/random, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/aft) "xUv" = ( @@ -47159,7 +47267,7 @@ /obj/effect/turf_decal/trimline/blue/line{ dir = 4 }, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "ybO" = ( /obj/effect/turf_decal/trimline/green/filled/warning, @@ -61842,7 +61950,7 @@ oSb uVc hdD nLQ -nBu +wRB pqp fbw lll @@ -62864,21 +62972,21 @@ dYl utm oyT jwq -sKC +ueF pqp pqp pqp jsA -pqp +wRT pqp kam pqp jCA pug -wOJ -vtb rYQ -gop +bKh +kcH +eQz rYQ rYQ pug @@ -63116,26 +63224,26 @@ utm utm bbo nuk -aVe -upw +hXP +lbA qRE oyT -wRB -vvq -kcH -pqp -pqp -jsA -pqp -pqp -slV -kam oyT -pug +oyT +oyT +eTm +dik +hAf +oyT +vAq +slV +jSC +oWO +oWO cfI +oWO pug -pug -pug +xTD kmY kmY pug @@ -63377,22 +63485,22 @@ uIl awY pQl oyT -oyT -oyT +cGE +muw oyT nVa lyP evH ajP aAK -oyT +ceV eOu -pug +oWO jFi kUp -jAN -rYQ +oWO rYQ +kcH dwx dwx dwx @@ -63633,23 +63741,23 @@ ozW aVe upw ddU -wRT +lzc nJU aVb -mdi +lzc kpQ -xVm -xVm -xVm -xVm +pIL +pIL +gxy +fgq aVb -aKV -pug +nqU +gDG qGs lqa -xzg -rYQ -rYQ +oWO +iDt +kcH dwx dwx dwx @@ -63892,21 +64000,21 @@ osu uRy uSL qkz -xVm +aVb tyd sHS -xVm -xVm -xVm -xVm -xVm -aKV -kmY -exP +pIL +pIL +pIL +uGO +aVb +nqU +oWO +kTL jDu -dik -vtb -rYQ +oWO +iDt +kcH dwx dwx dwx @@ -64147,28 +64255,28 @@ asO wOi xvl eZW -wRT +lzc vci -xVm +aVb mfc -xVm +fJF qrV -xVm -rnD -xVm -uBa -aKV -kmY +lNO +pIL +jBP +nqU +nqU +oWO exP -lqa -wqA +cRC +oWO vtb -rYQ +kcH dwx dwx dwx dwx -kcP +rYQ dPH oTE afI @@ -64404,28 +64512,28 @@ eDF wOi xvl koV -wRT +lzc ufp -xVm +aVb fGC -xVm -eFd -xVm -aMo -xVm -mIS -xVm -kmY -exP -lqa -ekZ +pIL +pIL +pIL +pIL +uGO +nqU +aVb +oWO +xzg +ikH +oWO vtb -rYQ +kcH dwx dwx dwx dwx -kcP +rYQ dPH oHO afI @@ -64661,28 +64769,28 @@ kRY knL sJo ykL -wRT +lzc iQd -xVm +aVb qnD -xVm +uGO pIL -xVm +fJF uGO -xVm +nPE nqU -xVm -kmY +aVb +oWO ncg hdv -fJF -vtb +oWO +rYQ +kcH rYQ rYQ rYQ rYQ rYQ -kcP dPH tPb afI @@ -64919,27 +65027,27 @@ bow kxW foP iHJ -nTR -xVm +wZY +aVb wXQ -xVm -xVm -xVm -xVm -xVm -aKV +uGO +frv +uGO +uGO +sdC +nqU mSX -pug +oWO nxs rNh -ueF -xTD +oWO +rYQ cWa -kcP -kcP -kcP -kcP -tqP +rYQ +rYQ +rYQ +rYQ +gop dPH lpu afI @@ -65175,26 +65283,26 @@ vrw nyH xUv vrw -wRT -wRT +lzc +lzc pJI -wXQ +qXP fPY -xVm -xVm -xVm -xVm +eZH +sdC +bHp +pIL sVF -wRT -pug -pug -pug -pug +lzc +oWO +oWO +oWO +oWO nOf +mdi pug kmY kmY -kmY pug pug pug @@ -65434,7 +65542,7 @@ nyD cCg qbR pAj -vyi +hrr tRg hrr hrr @@ -65948,13 +66056,13 @@ kkW lca nDl wmV -lNO -gDA pXi +gDA +lms hwW lmI pXi -pXi +lms pXi iul jEi @@ -66205,12 +66313,12 @@ tGW bMv ffP xPG -hBR +nTR xvp -xVm -hrr -xVm -xVm +rnD +aMo +pPG +rnD fRb xVm yhH @@ -66464,25 +66572,25 @@ eqZ eqZ eqZ qoU +hdM +mIS xVm -hrr -xVm -xVm -xVm +hhQ +hdM xVm -oWO -oWO -oWO -oWO -oWO -mSq iWZ iWZ +iWZ +iWZ +iWZ +mSq +hWe +hWe xJb dpp xJb -iWZ -iWZ +hWe +hWe twN kUY wRx @@ -66727,19 +66835,19 @@ vMM vMM xVm jtJ -oWO +iWZ bPZ bCu -xKr -oWO -dNg +eYD iWZ +dNg +jod fos -lyY -kAE +mVu +kGi mVu dih -iWZ +hWe bul vWf slx @@ -66978,25 +67086,25 @@ qfN hUb eqZ tbJ -njU -qrV rnD -xtr rnD xVm -oWO +xtr +mfr +mfr +iWZ sEJ -jdl +lyY tYT -oWO -dNg iWZ +dNg +hWe cqw -jPs -kAE -lyY -lHw -iWZ +mVu +kGi +mVu +aOK +hWe wXn mDR tYW @@ -67237,23 +67345,23 @@ sKn mXG hdM eSy -jod +xVm wGs xAi blS sDD vdW nbb -hXP -oWO +lHw +iWZ dNg dSA lRV -lyY +hcy kAE -tBV +mVu umT -iWZ +hWe ewC cDw kOM @@ -67492,25 +67600,25 @@ hmD rNz hmD ttB +abL ojS -ojS -ojS +abL uvM -ojS +kCz hAN -lzc +iWZ xHk -jdl +lyY vkC -oWO -mSq iWZ -eYD +mSq +hWe +wqA lSK kGi -frv +mVu omy -kCz +aKn xbh cWe pPk @@ -67749,25 +67857,25 @@ eLw izt hmD rFL -ceV +mPO myg -ceV +mPO sPD pHZ -ceV +bTn xKG -mfr -mfr +tBV +lyY fUE -oWO -agR -iWZ -iWZ iWZ +agR +hWe +hWe +hWe xae -kCz -kCz -kCz +aKn +aKn +aKn arQ arQ smC @@ -68007,16 +68115,16 @@ xRl hmD tDO mPO -ojS -ojS +ejr +ejr aSq -ojS -ojS -aGw +ejr +xVm +iWZ jdl lwx -jdl -oWO +hBR +iWZ mSq mSq ttR @@ -68266,14 +68374,14 @@ uJs oiG dqA rgY -hWe +dqA tIS vdg -lzc -oWO -oWO +iWZ +iWZ +iWZ rbD -oWO +iWZ ouH gME oUx @@ -68519,23 +68627,23 @@ hmD hmD hmD hmD -mSq -wCJ +ske +aKV wCJ wCJ wCJ -mSq -mSq +ske +ske mSq oHd jkJ -wdT +jYH djt wdT jkJ wdT wdT -jpm +koQ wdT ont dGk @@ -68786,12 +68894,12 @@ jol jol xkV jol -jol -xkV -jol -jol -lgS -jol +xKr +eFd +wdT +wdT +aGw +wdT wQd wdT ont @@ -72855,8 +72963,8 @@ wwy wad nvn eup -eZH -cdc +adf +fUj kAH cIO bIK @@ -73366,8 +73474,8 @@ cSo tqE bGI bPl -pdS -sdC +njU +uHW iLY pXC dno @@ -73623,8 +73731,8 @@ pmg vrS cuk bux -pdS -sdC +njU +uHW qUv qLe mxp @@ -74138,14 +74246,14 @@ sfe vPE omi aDB -sdC +uHW gak vUu fUj rLb wBP jln -jln +xeP cIO xCU wXG @@ -74652,8 +74760,8 @@ gVL vsL jKo jKo -uOF -uOF +cdc +cdc xoE dno kAH @@ -74910,7 +75018,7 @@ nIg ebe xIv sJt -wZY +vGh pmR dno kAH @@ -75424,13 +75532,13 @@ kJN kJN kJN boX -vGh +kcP xys dno rLb wBP jln -jln +xeP cIO csW wXG @@ -75681,13 +75789,13 @@ nqf nqf nqf hWv -vGh +kcP hsi dno rLb pmN jln -jln +xeP cIO csW wXG @@ -75935,8 +76043,8 @@ nhC hWy eeA nqf -ikH -lbA +ekZ +pdS shm fNw pmR @@ -76451,8 +76559,8 @@ uhh eXH xXa xXa -uOF -muw +cdc +tFN xoE dno kAH @@ -76945,7 +77053,7 @@ meJ qSI iqh djZ -qWx +vvq bWB pkl udg @@ -76967,12 +77075,12 @@ lJl wiH msQ lzG -xeP +tqP fUj rLb pmN jln -jln +xeP cIO lGH wXG @@ -77527,7 +77635,7 @@ aah aah meJ fXF -kTL +uBa dyB asA asA @@ -77735,8 +77843,8 @@ niS mFK mFK dYV -eTm -sdC +uOF +uHW qUv qLe wvy @@ -77992,7 +78100,7 @@ mFK mFK sAU cly -eTm +uOF hbM cUS vUu @@ -78496,10 +78604,10 @@ feL oYu gTr uCI -bKh +vyi mrL -eQz -lms +jPs +jAN emO oes oes @@ -78509,7 +78617,7 @@ emO uZg oeV eup -eZH +adf lXc kAH cIO @@ -79268,7 +79376,7 @@ nTg rvQ ehz kfA -ejr +hfC dYp qUa eCp @@ -81363,7 +81471,7 @@ gmQ qgs ske kND -uHW +jpm xzf xzf xzf @@ -83632,7 +83740,7 @@ aah aah aah aah -ltZ +qll meJ qSI nRM @@ -91567,7 +91675,7 @@ aah aah meJ meJ -sks +nLI kdT wNL lvw @@ -91824,7 +91932,7 @@ aah aah meJ meJ -sks +nLI kdT wNL lvw @@ -92081,7 +92189,7 @@ aah aah meJ meJ -sks +nLI uoJ xZC pZg @@ -92338,7 +92446,7 @@ aah aah meJ meJ -sks +nLI uoJ azT uZd @@ -92595,7 +92703,7 @@ aah aah meJ meJ -sks +nLI uoJ jWP hDV @@ -92852,7 +92960,7 @@ aah aah meJ meJ -sks +nLI ksS cKa dQY @@ -93109,7 +93217,7 @@ aah aah aah aah -sks +nLI aSy xwe nsF @@ -93366,7 +93474,7 @@ aah aah aah aah -sks +nLI uoJ gYJ jlw @@ -94394,7 +94502,7 @@ aah aah aah aah -sks +nLI uoJ lvw lvw @@ -94651,7 +94759,7 @@ aah aah aah aah -sks +nLI uoJ lvw pcA @@ -94908,7 +95016,7 @@ aah aah aah aah -sks +nLI uoJ lvw lvw @@ -95165,7 +95273,7 @@ aah aah aah aah -sks +nLI aSy lvw dHZ @@ -95422,7 +95530,7 @@ aah aah aah aah -sks +nLI uoJ lvw dHZ @@ -95679,7 +95787,7 @@ aah aah aah aah -sks +nLI mvi wNL wNL @@ -95936,9 +96044,9 @@ aah aah aah aah -sks +nLI kdT -lvw +wNL dHZ dHZ dHZ @@ -96193,9 +96301,9 @@ aah aah aah aah -sks +nLI kdT -lvw +wNL dHZ dHZ dHZ @@ -96452,7 +96560,7 @@ aah aah sks lVD -eYO +ltZ lvw lvw lvw @@ -96708,7 +96816,7 @@ aah aah aah sks -avm +sks rDs tFR eYO @@ -96965,254 +97073,56 @@ aah aah aah aah -avm -avm -avm -kdT -tNO -bBL -qIB -jrg -sks -leR -fxe -fxe -fxe -fxe -fxe -fxe -fxe -fxe -fxe -eha -gAb -cmt -bMd -uxK -uxK -uxK -uxK -ygb -dKR -dKR -aKv -iLu -aKv -aKv -aKv -aKv -aKv -aKv -sUG -vlt -qqx -eCk -wWb -meJ -meJ -etN -meJ -meJ -meJ -meJ -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -meJ -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 -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 -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 -"} -(194,1,1) = {" -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 -aah -aah -aah -aah -aah +sks +tKQ +sks +kdT +tNO +bBL +qIB +jrg +sks +leR +fxe +fxe +fxe +fxe +fxe +fxe +fxe +fxe +fxe +eha +gAb +cmt +bMd +uxK +uxK +uxK +uxK +ygb +dKR +dKR +aKv +iLu +aKv +aKv +aKv +aKv +aKv +aKv +sUG +vlt +qqx +eCk +wWb +meJ +meJ +etN +meJ +meJ +meJ +meJ aah aah aah @@ -97224,7 +97134,205 @@ aah aah aah aah -avm +aah +aah +aah +aah +aah +aah +aah +aah +aah +aah +aah +aah +meJ +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 +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 +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 +"} +(194,1,1) = {" +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 +aah +aah +aah +aah +aah +aah +aah +aah +aah +aah +aah +aah +aah +aah +qYQ +qWx +ujh lyZ jvt vlo @@ -97479,10 +97587,10 @@ aah aah aah aah -aah -aah -avm -avm +qYQ +jbE +sks +sks jvt ibe eXz @@ -97739,7 +97847,7 @@ aah aah aah aah -sks +avm sks sks fxe From d3ab861af470a7580be2304ab4ac14363f877b43 Mon Sep 17 00:00:00 2001 From: "DESKTOP-M4GD565\\LME" Date: Fri, 6 Oct 2023 22:19:44 -0700 Subject: [PATCH 12/26] ppp --- _maps/map_files/Oshan/oshan.dmm | 1420 ++++++++++++++++--------------- 1 file changed, 732 insertions(+), 688 deletions(-) diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index 0635fd20fb61..1865a45e61e9 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -84,8 +84,9 @@ /turf/open/floor/plating, /area/station/maintenance/disposal) "abL" = ( -/obj/structure/window/spawner/directional/west, -/turf/open/floor/carpet/neon/simple/green/nodots, +/obj/machinery/duct/industrial/waste, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/wood, /area/station/commons/lounge) "acc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -204,10 +205,20 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "aec" = ( -/obj/structure/lattice, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating/ocean, -/area/ocean/near_station_powered) +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/green/line{ + dir = 4 + }, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/service/hydroponics) "aeh" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -486,7 +497,7 @@ name = "HoochMaster Deluxe" }, /obj/machinery/light/directional/west, -/turf/open/floor/carpet/lone, +/turf/open/floor/carpet/lone/star, /area/station/service/kitchen) "ajQ" = ( /turf/closed/wall/r_wall, @@ -962,10 +973,12 @@ "aAK" = ( /obj/structure/window/spawner/directional/north, /obj/structure/window/spawner/directional/south, +/obj/structure/table/wood, /obj/machinery/conveyor/auto{ - dir = 4 + dir = 4; + layer = 2.8 }, -/turf/open/floor/carpet/lone, +/turf/open/floor/carpet/lone/star, /area/station/service/kitchen) "aBb" = ( /obj/machinery/power/terminal{ @@ -1129,9 +1142,9 @@ /turf/open/floor/iron/dark/textured, /area/station/cargo/warehouse) "aGw" = ( -/obj/machinery/light/floor/has_bulb, -/turf/open/floor/engine, -/area/station/maintenance/port/central) +/obj/effect/landmark/event_spawn, +/turf/open/floor/wood, +/area/station/commons/lounge) "aGz" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -1309,10 +1322,10 @@ /turf/open/floor/iron/white/textured, /area/station/medical/medbay/central) "aKV" = ( -/obj/structure/cable, -/obj/effect/spawner/structure/window/reinforced/plasma, -/turf/open/floor/plating, -/area/station/maintenance/port/central) +/obj/structure/table/wood, +/obj/effect/spawner/random/entertainment/gambling, +/turf/open/floor/wood, +/area/station/commons/lounge) "aLs" = ( /obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -1338,13 +1351,16 @@ /turf/closed/wall/r_wall, /area/station/cargo/sorting) "aMo" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/chair/wood{ +/obj/machinery/door/airlock/external{ + name = "Atmospherics External Access" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/turf/open/floor/wood, -/area/station/commons/lounge) +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/atmos) "aMs" = ( /obj/machinery/duct/industrial/waste, /obj/structure/disposalpipe/segment{ @@ -1416,16 +1432,6 @@ color = "#999999" }, /area/station/science/robotics) -"aOK" = ( -/obj/machinery/camera/directional/south{ - c_tag = "Theater - Backstage" - }, -/obj/machinery/light/directional/south, -/obj/effect/spawner/random/trash, -/obj/structure/rack, -/obj/effect/spawner/random/clothing/costume, -/turf/open/floor/iron, -/area/station/commons/vacant_room/commissary) "aPd" = ( /obj/machinery/computer/rdconsole{ dir = 1 @@ -1496,7 +1502,7 @@ dir = 6 }, /turf/open/floor/plating/ocean, -/area/ocean/near_station_powered) +/area/ocean) "aRH" = ( /obj/machinery/light/directional/south, /obj/structure/extinguisher_cabinet/directional/west, @@ -1873,12 +1879,10 @@ }, /area/station/command/bridge) "aYq" = ( -/obj/structure/lattice, -/obj/machinery/conveyor/auto/inside_corners{ - dir = 10 - }, -/turf/open/floor/plating/ocean, -/area/ocean/near_station_powered) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/bamboo, +/area/station/commons/fitness) "aYJ" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -2270,6 +2274,14 @@ /obj/machinery/atmospherics/components/binary/pump/off/green/visible, /turf/open/floor/engine, /area/station/engineering/atmos/hfr_room) +"bkr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/chair/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/commons/lounge) "bku" = ( /obj/effect/turf_decal/stripes{ dir = 1 @@ -3205,11 +3217,6 @@ /obj/machinery/ore_silo, /turf/open/floor/wood, /area/station/command/heads_quarters/qm) -"bHp" = ( -/obj/structure/chair/stool/bar/directional/east, -/obj/effect/landmark/start/assistant, -/turf/open/floor/carpet/lone, -/area/station/service/bar) "bHq" = ( /obj/effect/turf_decal/stripes{ dir = 1 @@ -3376,11 +3383,8 @@ /turf/open/floor/iron/dark/textured, /area/mine/storage/public) "bKh" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/bamboo, -/area/station/commons/fitness) +/turf/closed/wall/r_wall, +/area/station/medical/office) "bKz" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 @@ -4044,8 +4048,11 @@ /turf/open/floor/iron/dark, /area/station/service/cafeteria) "cdc" = ( -/turf/closed/wall, -/area/station/medical/office) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/maintenance/port/central) "cdv" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/white/filled/corner{ @@ -4114,8 +4121,9 @@ /turf/open/floor/carpet/cyan, /area/station/ai_monitored/turret_protected/ai_upload) "ceV" = ( +/obj/structure/chair/stool/directional/east, /turf/open/floor/wood, -/area/station/service/kitchen) +/area/station/commons/lounge) "cfz" = ( /obj/structure/lattice, /obj/structure/disposalpipe/segment{ @@ -4184,6 +4192,11 @@ }, /turf/open/floor/iron/dark/textured, /area/station/engineering/main) +"ciu" = ( +/obj/structure/chair/stool/bar/directional/east, +/mob/living/carbon/human/species/monkey/punpun, +/turf/open/floor/carpet/lone/star, +/area/station/service/bar) "ciA" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -4944,10 +4957,6 @@ }, /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) -"cGE" = ( -/obj/machinery/restaurant_portal/bar, -/turf/open/floor/wood, -/area/station/service/kitchen) "cGK" = ( /obj/effect/turf_decal/tile/purple/opposingcorners, /mob/living/basic/lizard/wags_his_tail{ @@ -5028,6 +5037,10 @@ }, /turf/open/floor/iron/dark/textured, /area/station/medical/morgue) +"cIs" = ( +/obj/structure/window/spawner/directional/west, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/commons/lounge) "cIH" = ( /obj/structure/disposalpipe/segment, /obj/effect/spawner/random/trash, @@ -5317,13 +5330,6 @@ /obj/structure/cable/multilayer/connected, /turf/open/floor/iron/dark/textured, /area/station/command/bridge) -"cRC" = ( -/obj/machinery/holopad, -/obj/machinery/light_switch/directional/south, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood, -/area/station/service/bar/backroom) "cRO" = ( /obj/machinery/camera/autoname/directional/west, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -5960,8 +5966,13 @@ /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) "dik" = ( -/obj/structure/curtain/cloth/fancy, -/turf/open/floor/iron/kitchen, +/obj/machinery/button/door/directional/north{ + id = "roboticsprivacy"; + name = "Kitchen Shutter Control"; + req_access = list("kitchen"); + pixel_y = -8 + }, +/turf/closed/wall, /area/station/service/kitchen) "dit" = ( /obj/structure/chair/sofa/corp/right{ @@ -6363,9 +6374,10 @@ /turf/open/floor/iron/smooth, /area/station/science/genetics) "dqA" = ( -/obj/structure/table/wood, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/commons/lounge) +/obj/effect/spawner/random/trash, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/engine, +/area/station/maintenance/port/central) "dqB" = ( /obj/structure/chair/sofa/right/maroon, /obj/effect/landmark/start/botanist, @@ -6648,7 +6660,11 @@ dir = 9 }, /turf/open/floor/plating, -/area/station/maintenance/port/central) +/area/ocean) +"dzo" = ( +/obj/machinery/vending/wardrobe/medi_wardrobe, +/turf/open/floor/iron/white/textured, +/area/station/medical/storage) "dzq" = ( /obj/machinery/light/directional/south, /turf/open/floor/iron/dark/textured, @@ -6925,7 +6941,7 @@ invisibility = 101 }, /turf/open/floor/plating/ocean, -/area/ocean/near_station_powered) +/area/ocean) "dGy" = ( /turf/open/floor/iron/stairs, /area/station/commons/fitness/recreation/entertainment) @@ -7398,6 +7414,10 @@ /obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ dir = 1 }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 2 + }, /turf/open/floor/iron/white/textured_large, /area/station/medical/office) "dTU" = ( @@ -7562,7 +7582,9 @@ /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 4 }, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/iron/white/textured, /area/station/medical/storage) "dYT" = ( @@ -7996,8 +8018,9 @@ /turf/open/floor/iron/white/textured, /area/station/medical/storage) "ejr" = ( -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/commons/lounge) +/obj/effect/landmark/start/bartender, +/turf/open/floor/carpet/lone/star, +/area/station/service/bar) "ejy" = ( /obj/effect/turf_decal/tile/green/half/contrasted, /obj/machinery/light/directional/north, @@ -8015,10 +8038,15 @@ /turf/open/floor/iron/dark/textured, /area/station/security/brig) "ekZ" = ( -/obj/structure/table/glass, -/obj/item/newspaper, -/turf/open/floor/iron/white/textured, -/area/station/medical/office) +/obj/structure/lattice, +/obj/machinery/conveyor/auto{ + dir = 10 + }, +/obj/structure/disposalpipe/trunk{ + dir = 2 + }, +/turf/open/floor/plating/ocean, +/area/ocean) "elf" = ( /obj/structure/rack, /obj/effect/turf_decal/bot, @@ -8249,6 +8277,10 @@ /obj/structure/cable, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) +"erF" = ( +/obj/structure/sign/poster/official/cohiba_robusto_ad, +/turf/closed/wall/r_wall, +/area/station/security/detectives_office) "erT" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -8390,7 +8422,7 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/turf/open/floor/carpet/lone, +/turf/open/floor/carpet/lone/star, /area/station/service/kitchen) "evR" = ( /obj/structure/closet/secure_closet/security/sec, @@ -8737,6 +8769,11 @@ /obj/effect/turf_decal/trimline/purple/line, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) +"eDI" = ( +/obj/structure/table/glass, +/obj/item/newspaper, +/turf/open/floor/iron/white/textured, +/area/station/medical/office) "eDM" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -8778,10 +8815,8 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) "eFd" = ( -/obj/effect/spawner/random/trash, -/obj/machinery/light/floor/has_bulb, -/turf/open/floor/engine, -/area/station/maintenance/port/central) +/turf/open/floor/carpet/lone/star, +/area/station/service/kitchen) "eFf" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, @@ -9258,11 +9293,9 @@ /turf/open/floor/iron/smooth, /area/station/commons/fitness/recreation) "eQz" = ( -/obj/machinery/light/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/bamboo, -/area/station/commons/fitness) +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/science/xenobiology) "eQB" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, @@ -9367,14 +9400,11 @@ /turf/open/floor/iron/dark/textured, /area/station/cargo/storage) "eTm" = ( -/obj/machinery/button/door/directional/north{ - id = "roboticsprivacy"; - name = "Kitchen Shutter Control"; - req_access = list("kitchen"); - pixel_y = -8 - }, -/turf/closed/wall, -/area/station/service/kitchen) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/bamboo, +/area/station/commons/fitness) "eTz" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -9624,9 +9654,11 @@ }, /area/station/science/robotics) "eZH" = ( -/obj/structure/chair/stool/bar/directional/east, -/mob/living/carbon/human/species/monkey/punpun, -/turf/open/floor/carpet/lone, +/obj/structure/table/wood, +/obj/structure/displaycase/forsale/kitchen{ + pixel_y = 8 + }, +/turf/open/floor/carpet/lone/star, /area/station/service/bar) "eZW" = ( /obj/structure/table, @@ -9930,14 +9962,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/restrooms) -"fgq" = ( -/obj/structure/window/spawner/directional/north, -/obj/structure/window/spawner/directional/south, -/obj/machinery/conveyor/auto{ - dir = 4 - }, -/turf/open/floor/carpet/lone, -/area/station/service/bar) "fgA" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 1 @@ -10285,12 +10309,8 @@ /turf/open/floor/iron, /area/station/cargo/warehouse/upper) "frv" = ( -/obj/structure/table/wood, -/obj/structure/desk_bell{ - pixel_x = -11 - }, -/turf/open/floor/carpet/lone, -/area/station/service/bar) +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "frP" = ( /turf/open/floor/carpet/executive, /area/station/command/bridge) @@ -10679,7 +10699,7 @@ dir = 1 }, /turf/open/floor/plating/ocean, -/area/ocean/near_station_powered) +/area/ocean) "fCD" = ( /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) @@ -10807,7 +10827,7 @@ }, /obj/structure/table/wood, /obj/effect/spawner/random/entertainment/lighter, -/turf/open/floor/carpet/lone, +/turf/open/floor/carpet/lone/star, /area/station/service/bar) "fGK" = ( /obj/structure/cable, @@ -10956,9 +10976,12 @@ /turf/open/floor/iron, /area/station/maintenance/port/central) "fJF" = ( -/obj/effect/landmark/start/bartender, -/turf/open/floor/carpet/lone, -/area/station/service/bar) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/table/wood, +/obj/effect/spawner/random/entertainment/cigar, +/turf/open/floor/wood, +/area/station/commons/lounge) "fKl" = ( /turf/open/floor/plating/ocean/pit/wall, /area/ocean) @@ -11197,7 +11220,7 @@ }, /obj/structure/chair/stool/bar/directional/east, /obj/effect/landmark/start/psychologist, -/turf/open/floor/carpet/lone, +/turf/open/floor/carpet/lone/star, /area/station/service/bar) "fQb" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, @@ -11480,7 +11503,7 @@ dir = 4 }, /turf/open/floor/plating/ocean, -/area/ocean/near_station_powered) +/area/ocean) "fXH" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -11909,6 +11932,12 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) +"ggx" = ( +/obj/machinery/light/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/bamboo, +/area/station/commons/fitness) "ggI" = ( /obj/effect/mapping_helpers/airlock/access/all/command/general, /obj/machinery/door/firedoor, @@ -12305,7 +12334,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plating/ocean, -/area/ocean/near_station_powered) +/area/ocean) "gum" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -12374,6 +12403,11 @@ }, /turf/open/floor/engine, /area/station/commons/storage/emergency/port) +"gws" = ( +/obj/structure/mirror/directional/north, +/obj/effect/spawner/random/contraband/cannabis, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "gwz" = ( /obj/structure/disposalpipe/segment, /obj/effect/spawner/random/structure/closet_maintenance, @@ -12404,12 +12438,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) -"gxy" = ( -/obj/machinery/smartfridge/drinks{ - icon_state = "boozeomat" - }, -/turf/open/floor/carpet/lone, -/area/station/service/bar) "gyj" = ( /obj/structure/disposalpipe/trunk{ dir = 2 @@ -12686,14 +12714,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/secondary/exit/departure_lounge) -"gDG" = ( -/obj/machinery/door/airlock{ - name = "Bar" - }, -/obj/effect/mapping_helpers/airlock/access/all/service/bar, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/service/bar/backroom) "gDK" = ( /obj/item/storage/secure/safe/directional/north{ name = "armory safe B" @@ -13512,13 +13532,6 @@ }, /turf/open/floor/engine, /area/station/cargo/miningoffice) -"hcy" = ( -/obj/effect/decal/cleanable/blood/tracks, -/obj/structure/rack, -/obj/item/stack/sheet/iron/twenty, -/obj/item/stack/sheet/glass/fifty, -/turf/open/floor/iron, -/area/station/commons/vacant_room/commissary) "hcz" = ( /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 1 @@ -13634,15 +13647,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/engineering/break_room) -"hfC" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/iron/white/textured, -/area/station/medical/storage) "hfF" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -13754,11 +13758,6 @@ /obj/effect/turf_decal/trimline/red/filled/warning, /turf/open/floor/iron/smooth, /area/station/ai_monitored/security/armory) -"hhQ" = ( -/obj/structure/table/wood, -/obj/effect/spawner/random/entertainment/gambling, -/turf/open/floor/wood, -/area/station/commons/lounge) "hhT" = ( /obj/machinery/light/directional/north, /obj/effect/spawner/random/vending/snackvend, @@ -13793,7 +13792,7 @@ dir = 10 }, /turf/open/floor/plating/ocean, -/area/ocean/near_station_powered) +/area/ocean) "hiP" = ( /obj/structure/table/reinforced, /obj/item/multitool, @@ -14372,13 +14371,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) -"hAf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/curtain/cloth/fancy, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "hAw" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -14418,14 +14410,12 @@ /turf/open/floor/iron/dark/textured, /area/station/medical/cryo) "hBR" = ( -/obj/structure/disposalpipe/segment{ +/obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 4 }, -/turf/open/floor/eighties/red{ - icon = 'goon/icons/turf/floors.dmi'; - icon_state = "clown_carpet" - }, -/area/station/service/theater) +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/atmos) "hCk" = ( /obj/structure/cable, /obj/structure/disposalpipe/junction/flip{ @@ -15026,6 +15016,13 @@ }, /turf/open/floor/wood, /area/station/cargo/miningoffice) +"hOF" = ( +/obj/effect/decal/cleanable/blood/tracks, +/obj/structure/rack, +/obj/item/stack/sheet/iron/twenty, +/obj/item/stack/sheet/glass/fifty, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "hOO" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/structure/table/reinforced/rglass, @@ -15175,6 +15172,15 @@ /obj/machinery/light/directional/east, /turf/open/floor/carpet/orange, /area/station/command/heads_quarters/ce) +"hSx" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/eighties/red{ + icon = 'goon/icons/turf/floors.dmi'; + icon_state = "clown_carpet" + }, +/area/station/service/theater) "hSR" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/highsecurity{ @@ -15279,8 +15285,9 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "hWe" = ( -/turf/closed/wall, -/area/station/commons/vacant_room/commissary) +/obj/structure/table/wood, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/commons/lounge) "hWk" = ( /obj/structure/cable, /obj/machinery/light/directional/west, @@ -15360,21 +15367,15 @@ /turf/open/floor/iron/grimy, /area/station/service/lawoffice) "hXP" = ( -/obj/structure/disposalpipe/segment{ +/obj/structure/window/spawner/directional/north, +/obj/structure/table/wood, +/obj/structure/window/spawner/directional/south, +/obj/machinery/conveyor/auto{ dir = 4; - invisibility = 101 - }, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 8 + layer = 2.8 }, -/obj/effect/turf_decal/trimline/green/line{ - dir = 4 - }, -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/turf/open/floor/iron/dark/textured, -/area/station/service/hydroponics) +/turf/open/floor/carpet/lone/star, +/area/station/service/bar) "hXX" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -15775,10 +15776,11 @@ /turf/open/floor/plating, /area/station/hallway/primary/central/fore) "ikH" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood, -/area/station/service/bar/backroom) +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/engine, +/area/station/maintenance/port/central) "ilb" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 @@ -16054,6 +16056,10 @@ /obj/item/taperecorder/empty, /turf/open/floor/plating, /area/station/maintenance/port/central) +"iru" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/wood, +/area/station/service/bar/backroom) "irF" = ( /obj/machinery/light/directional/east, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -16107,6 +16113,17 @@ /obj/effect/spawner/random/trash, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"itv" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, +/obj/machinery/door/airlock{ + name = "Kitchen" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "itM" = ( /obj/machinery/duct/industrial/waste, /obj/effect/turf_decal/trimline/yellow/filled/warning{ @@ -16463,10 +16480,6 @@ /obj/effect/turf_decal/trimline/green/line, /turf/open/floor/iron/dark, /area/station/service/cafeteria) -"iDt" = ( -/obj/structure/weightmachine/weightlifter, -/turf/open/floor/bamboo, -/area/station/commons/fitness) "iDO" = ( /obj/effect/landmark/start/cargo_technician, /obj/machinery/light/floor/has_bulb, @@ -17268,17 +17281,6 @@ /obj/effect/landmark/start/warden, /turf/open/floor/wood/large, /area/station/security/warden) -"jbE" = ( -/obj/machinery/door/airlock/external{ - name = "Atmospherics External Access" - }, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/turf/open/floor/plating, -/area/ocean/generated_above) "jbP" = ( /obj/effect/turf_decal/trimline/brown/line{ dir = 1 @@ -17789,14 +17791,12 @@ /turf/open/floor/iron/white, /area/station/science/robotics/mechbay) "jod" = ( -/obj/machinery/button/door/directional/north{ - id = "roboticsprivacy"; - name = "Kitchen Shutter Control"; - req_access = list("kitchen"); - pixel_y = -8 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 }, -/turf/closed/wall, -/area/station/commons/vacant_room/commissary) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/station/service/bar/backroom) "jol" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/engine, @@ -17819,11 +17819,15 @@ /turf/open/floor/iron, /area/station/bitrunning/den) "jpm" = ( -/obj/machinery/conveyor/auto/inside_corners{ - dir = 10 +/obj/machinery/camera/directional/south{ + c_tag = "Theater - Backstage" }, -/turf/open/floor/plating, -/area/space) +/obj/machinery/light/directional/south, +/obj/effect/spawner/random/trash, +/obj/structure/rack, +/obj/effect/spawner/random/clothing/costume, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "jpE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/engine, @@ -17866,14 +17870,9 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "jrX" = ( -/obj/structure/chair/office/light{ - dir = 8 - }, -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/turf/open/floor/carpet, -/area/station/medical/office) +/obj/effect/spawner/structure/window, +/turf/open/floor/plating/ocean, +/area/ocean/generated_above) "jsj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -18144,7 +18143,7 @@ }, /obj/machinery/camera/autoname/directional/south, /turf/open/floor/plating/ocean, -/area/ocean/near_station_powered) +/area/ocean) "jzp" = ( /obj/machinery/duct/industrial/waste, /obj/structure/cable, @@ -18214,16 +18213,10 @@ /turf/open/floor/iron/dark, /area/station/security/office) "jAN" = ( -/obj/structure/table/reinforced, -/obj/item/defibrillator/loaded{ - pixel_y = 6 - }, -/obj/item/defibrillator/loaded{ - pixel_y = 3 +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 4 }, -/obj/item/defibrillator/loaded, -/obj/effect/turf_decal/tile/blue/full, -/obj/structure/window/spawner/directional/north, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/white/textured, /area/station/medical/storage) "jAQ" = ( @@ -18299,13 +18292,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, /turf/open/floor/plating, /area/station/maintenance/disposal/incinerator) -"jBP" = ( -/obj/structure/table/wood, -/obj/structure/displaycase/forsale/kitchen{ - pixel_y = 8 - }, -/turf/open/floor/carpet/lone, -/area/station/service/bar) "jCa" = ( /obj/structure/chair/sofa/right, /obj/machinery/light/directional/north, @@ -18855,9 +18841,11 @@ }, /area/station/science/robotics) "jPs" = ( -/obj/machinery/vending/wardrobe/medi_wardrobe, -/turf/open/floor/iron/white/textured, -/area/station/medical/storage) +/obj/machinery/conveyor/auto/inside_corners{ + dir = 10 + }, +/turf/open/floor/plating, +/area/space) "jPx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -19005,17 +18993,6 @@ dir = 4 }, /area/station/service/chapel) -"jSC" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, -/obj/machinery/door/airlock{ - name = "Kitchen" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "jSJ" = ( /obj/structure/cable, /obj/structure/railing{ @@ -19244,12 +19221,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) -"jYH" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/engine, -/area/station/maintenance/port/central) "jYT" = ( /obj/effect/turf_decal/stripes, /obj/structure/disposalpipe/segment{ @@ -19416,19 +19387,11 @@ /turf/open/floor/iron, /area/station/cargo/miningoffice) "kcH" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/bamboo, -/area/station/commons/fitness) +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/commons/lounge) "kcP" = ( -/obj/structure/table/reinforced, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/machinery/door/poddoor/shutters/preopen{ - name = "Medical Closure Shutters"; - desc = "Fuck off we're closed." - }, -/turf/open/floor/iron/dark/textured, -/area/station/medical/office) +/turf/closed/wall, +/area/station/commons/vacant_room/commissary) "kda" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 @@ -19970,7 +19933,7 @@ pixel_y = 26 }, /obj/machinery/requests_console/directional/north, -/turf/open/floor/carpet/lone, +/turf/open/floor/carpet/lone/star, /area/station/service/bar) "kqx" = ( /obj/machinery/mecha_part_fabricator/maint, @@ -20217,7 +20180,7 @@ dir = 9 }, /turf/open/floor/plating/ocean, -/area/ocean/near_station_powered) +/area/ocean) "kwP" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -20422,7 +20385,7 @@ dir = 10 }, /turf/open/floor/plating/ocean, -/area/ocean/near_station_powered) +/area/ocean) "kCc" = ( /obj/structure/cable, /obj/machinery/power/smes/engineering, @@ -20438,11 +20401,13 @@ /turf/open/floor/iron/dark, /area/station/security/office) "kCz" = ( -/obj/effect/spawner/random/structure/musician/piano/random_piano, -/obj/structure/window/spawner/directional/west, -/obj/machinery/light/floor/has_bulb, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/commons/lounge) +/obj/machinery/door/airlock{ + name = "Bar" + }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/service/bar/backroom) "kDg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -21208,12 +21173,16 @@ /turf/open/floor/wood/large, /area/station/security/checkpoint/customs) "kTL" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 +/obj/structure/lattice, +/obj/structure/disposalpipe/segment{ + dir = 4; + invisibility = 101 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood, -/area/station/service/bar/backroom) +/obj/machinery/conveyor/auto/inside_corners{ + dir = 9 + }, +/turf/open/floor/plating/ocean, +/area/ocean) "kUi" = ( /turf/open/floor/iron, /area/station/cargo/warehouse/upper) @@ -21493,20 +21462,9 @@ /turf/open/floor/iron/smooth, /area/station/commons/fitness/recreation) "lbA" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/green/line{ - dir = 4 - }, -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/turf/open/floor/iron/dark/textured, -/area/station/service/hydroponics) +/obj/structure/table/glass, +/turf/open/floor/iron/white/textured, +/area/station/medical/office) "lca" = ( /obj/machinery/duct/industrial/waste, /obj/structure/cable, @@ -21653,8 +21611,10 @@ /turf/open/floor/iron/dark/textured, /area/station/cargo/storage) "lgg" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/holopad, +/obj/structure/disposalpipe/junction{ + dir = 2 + }, /turf/open/floor/iron/white/textured, /area/station/medical/treatment_center) "lgp" = ( @@ -21900,10 +21860,13 @@ /turf/open/floor/carpet, /area/station/medical/medbay/central) "lms" = ( -/obj/machinery/duct/industrial/waste, -/obj/machinery/light/floor/has_bulb, -/turf/open/floor/wood, -/area/station/commons/lounge) +/obj/machinery/door/airlock/public/glass{ + name = "Central Access" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/bamboo, +/area/station/commons/fitness) "lmt" = ( /obj/structure/table/wood/fancy/red, /obj/item/food/spaghetti/security, @@ -21986,11 +21949,8 @@ /turf/open/floor/engine, /area/station/science/robotics/mechbay) "lqa" = ( -/obj/structure/table/wood, -/obj/machinery/firealarm/directional/south, -/obj/item/storage/photo_album/bar, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/station/service/bar/backroom) "lqs" = ( @@ -22117,12 +22077,14 @@ /turf/open/floor/wood, /area/station/commons/fitness/recreation/entertainment) "ltZ" = ( -/obj/effect/turf_decal/trimline/yellow/filled/corner{ +/obj/structure/chair/office/light{ + dir = 8 + }, +/obj/effect/turf_decal/siding/white{ dir = 4 }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/atmos) +/turf/open/floor/carpet, +/area/station/medical/office) "luc" = ( /obj/structure/cable, /obj/machinery/duct/industrial/waste, @@ -22284,7 +22246,7 @@ /area/station/service/kitchen/coldroom) "lyP" = ( /obj/structure/disposalpipe/segment, -/turf/open/floor/carpet/lone, +/turf/open/floor/carpet/lone/star, /area/station/service/kitchen) "lyY" = ( /turf/open/floor/eighties/red{ @@ -22311,6 +22273,10 @@ "lzc" = ( /turf/closed/wall, /area/station/service/bar) +"lzg" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/iron/dark/textured, +/area/station/medical/cryo) "lzo" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -22639,6 +22605,13 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/secondary/entry) +"lFo" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/curtain/cloth/fancy, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "lFv" = ( /obj/structure/table, /obj/item/seeds/ambrosia/gaia, @@ -22900,6 +22873,9 @@ }, /turf/open/floor/pod/dark, /area/station/security/warden) +"lLc" = ( +/turf/open/floor/wood, +/area/station/service/kitchen) "lLl" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod Three"; @@ -22976,13 +22952,9 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) "lNO" = ( -/obj/machinery/chem_dispenser/drinks/beer{ - dir = 8; - pixel_y = 5; - pixel_x = 4 - }, -/obj/structure/table, -/turf/open/floor/carpet/lone, +/obj/structure/table/wood, +/obj/effect/spawner/random/entertainment/lighter, +/turf/open/floor/carpet/lone/star, /area/station/service/bar) "lNZ" = ( /obj/structure/table/glass, @@ -23506,13 +23478,9 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/central) "mdi" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Central Access" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/bamboo, -/area/station/commons/fitness) +/obj/structure/curtain/cloth/fancy, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "mdl" = ( /obj/machinery/duct/industrial/waste, /obj/machinery/light/floor/has_bulb, @@ -23567,7 +23535,7 @@ }, /obj/structure/table/wood, /obj/machinery/camera/autoname/directional/west, -/turf/open/floor/carpet/lone, +/turf/open/floor/carpet/lone/star, /area/station/service/bar) "mfk" = ( /obj/structure/closet/secure_closet/chief_medical, @@ -23576,9 +23544,11 @@ /turf/open/floor/wood/parquet, /area/station/command/heads_quarters/cmo) "mfr" = ( -/obj/structure/chair/stool/directional/east, -/turf/open/floor/wood, -/area/station/commons/lounge) +/obj/effect/landmark/start/cook, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "mfz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -23805,13 +23775,15 @@ }, /obj/structure/cable/layer3, /turf/open/floor/plating/ocean, -/area/ocean/near_station_powered) +/area/ocean) "mnD" = ( -/obj/machinery/conveyor/auto/inside_corners{ - dir = 5 +/obj/machinery/door/airlock/public/glass{ + name = "Fitness" }, -/turf/open/floor/plating, -/area/space) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/bamboo, +/area/station/commons/fitness) "mnI" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner, /turf/open/floor/iron, @@ -24185,13 +24157,17 @@ /turf/open/floor/iron/dark/textured, /area/station/engineering/break_room) "muw" = ( -/obj/machinery/light/directional/west, -/turf/open/floor/wood, -/area/station/service/kitchen) +/obj/machinery/conveyor/auto/inside_corners{ + dir = 5 + }, +/turf/open/floor/plating, +/area/space) "muE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/turf/open/floor/iron, -/area/station/science/xenobiology) +/turf/open/floor/iron/white/textured, +/area/station/medical/medbay/lobby) "muW" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -24254,6 +24230,16 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) +"mxg" = ( +/obj/structure/window/spawner/directional/north, +/obj/structure/window/spawner/directional/south, +/obj/structure/table/wood, +/obj/machinery/conveyor/auto{ + dir = 4; + layer = 2.8 + }, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "mxp" = ( /obj/structure/cable, /obj/machinery/plumbing/floor_pump/input/on/waste/directional/south, @@ -24651,12 +24637,11 @@ /turf/open/floor/plating, /area/station/cargo/miningoffice) "mIS" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/table/wood, -/obj/effect/spawner/random/entertainment/cigar, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, -/area/station/commons/lounge) +/area/station/service/bar) "mJm" = ( /obj/structure/sign/departments/psychology/directional/west{ pixel_x = 0; @@ -24788,6 +24773,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/grass, /area/station/service/hydroponics) +"mMG" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white/textured, +/area/station/medical/storage) "mMH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -25100,8 +25092,13 @@ /turf/open/floor/iron/dark/textured, /area/station/cargo/storage) "mVu" = ( -/turf/open/floor/iron, -/area/station/commons/vacant_room/commissary) +/obj/structure/table/wood, +/obj/machinery/firealarm/directional/south, +/obj/item/storage/photo_album/bar, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/service/bar/backroom) "mVB" = ( /obj/machinery/duct/industrial/waste, /obj/effect/turf_decal/trimline/brown/filled/warning, @@ -25191,6 +25188,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/wood, /area/station/commons/lounge) "mYo" = ( @@ -25273,7 +25271,7 @@ /obj/structure/lattice, /obj/machinery/conveyor/auto, /turf/open/floor/plating/ocean, -/area/ocean/near_station_powered) +/area/ocean) "naS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -25757,9 +25755,14 @@ /turf/open/floor/iron/freezer, /area/station/commons/dorms) "njU" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/iron/white/textured, -/area/station/science/genetics) +/obj/machinery/button/door/directional/north{ + id = "roboticsprivacy"; + name = "Kitchen Shutter Control"; + req_access = list("kitchen"); + pixel_y = -8 + }, +/turf/closed/wall, +/area/station/commons/vacant_room/commissary) "nkb" = ( /obj/effect/turf_decal/stripes{ dir = 4 @@ -26021,11 +26024,8 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/secondary/exit/departure_lounge) "nqU" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/wood, -/area/station/service/bar) +/turf/closed/wall, +/area/station/medical/office) "nrd" = ( /obj/machinery/duct/industrial/waste, /obj/structure/disposalpipe/segment, @@ -27028,11 +27028,6 @@ /obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) -"nPE" = ( -/obj/structure/table/wood, -/obj/effect/spawner/random/entertainment/lighter, -/turf/open/floor/carpet/lone, -/area/station/service/bar) "nPJ" = ( /obj/effect/turf_decal/trimline/red/filled/warning{ dir = 6 @@ -27203,7 +27198,7 @@ pixel_x = -1 }, /obj/structure/table, -/turf/open/floor/carpet/lone, +/turf/open/floor/carpet/lone/star, /area/station/service/kitchen) "nVh" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -27511,8 +27506,8 @@ "oft" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white/textured, -/area/station/medical/surgery/theatre) +/turf/open/floor/plating, +/area/station/medical/cryo) "ofu" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 1; @@ -27735,6 +27730,7 @@ /turf/open/floor/engine/vacuum, /area/station/engineering/atmos) "ojS" = ( +/obj/effect/spawner/random/structure/musician/piano/random_piano, /obj/structure/window/spawner/directional/west, /obj/machinery/light/floor/has_bulb, /turf/open/floor/carpet/neon/simple/green/nodots, @@ -28101,6 +28097,10 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/secondary/exit/departure_lounge) +"oti" = ( +/obj/structure/weightmachine/weightlifter, +/turf/open/floor/bamboo, +/area/station/commons/fitness) "otk" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/mineral/titanium/yellow, @@ -28528,7 +28528,7 @@ dir = 6 }, /turf/open/floor/plating/ocean, -/area/ocean/near_station_powered) +/area/ocean) "oDx" = ( /obj/machinery/light/directional/south, /turf/open/floor/plating, @@ -28912,7 +28912,7 @@ invisibility = 101 }, /turf/open/floor/plating/ocean, -/area/ocean/near_station_powered) +/area/ocean) "oRr" = ( /obj/structure/table/glass, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -29363,8 +29363,17 @@ /turf/open/floor/wood, /area/station/service/abandoned_gambling_den/gaming) "pdS" = ( -/obj/structure/table/glass, -/turf/open/floor/iron/white/textured, +/obj/structure/table/reinforced, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/door/poddoor/shutters/preopen{ + name = "Medical Closure Shutters"; + desc = "Fuck off we're closed." + }, +/obj/item/paper_bin{ + pixel_x = -7; + pixel_y = 4 + }, +/turf/open/floor/iron/dark/textured, /area/station/medical/office) "pdU" = ( /obj/structure/disposalpipe/segment{ @@ -29976,7 +29985,7 @@ }, /obj/structure/cable/layer3, /turf/open/floor/plating/ocean, -/area/ocean/near_station_powered) +/area/ocean) "prW" = ( /obj/machinery/atmospherics/components/unary/passive_vent, /turf/open/floor/circuit/telecomms, @@ -30577,7 +30586,7 @@ /turf/open/floor/plating, /area/station/cargo/warehouse) "pIL" = ( -/turf/open/floor/carpet/lone, +/turf/open/floor/carpet/lone/star, /area/station/service/bar) "pIN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -30919,10 +30928,6 @@ /obj/machinery/light/no_nightlight/directional/east, /turf/open/floor/iron/dark/textured, /area/station/engineering/main) -"pPG" = ( -/obj/effect/landmark/event_spawn, -/turf/open/floor/wood, -/area/station/commons/lounge) "pPR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -31764,10 +31769,6 @@ /obj/machinery/door/airlock/maintenance, /turf/open/floor/mineral/titanium/yellow, /area/station/maintenance/starboard/aft) -"qll" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating/ocean, -/area/ocean/generated_above) "qlH" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green{ @@ -31800,6 +31801,11 @@ }, /turf/open/floor/engine, /area/station/science/robotics/mechbay) +"qmg" = ( +/obj/structure/chair/stool/bar/directional/east, +/obj/effect/landmark/start/assistant, +/turf/open/floor/carpet/lone/star, +/area/station/service/bar) "qmi" = ( /obj/effect/spawner/random/trash/graffiti, /turf/closed/wall, @@ -31849,7 +31855,7 @@ /obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3 }, -/turf/open/floor/carpet/lone, +/turf/open/floor/carpet/lone/star, /area/station/service/bar) "qnG" = ( /obj/machinery/door/airlock/public/glass{ @@ -32025,7 +32031,7 @@ pixel_y = 7; pixel_x = -8 }, -/turf/open/floor/carpet/lone, +/turf/open/floor/carpet/lone/star, /area/station/service/bar) "qrW" = ( /turf/open/floor/carpet/purple, @@ -33199,14 +33205,12 @@ /turf/open/floor/iron/dark/textured, /area/station/engineering/main) "qWx" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/structure/table/wood, +/obj/structure/desk_bell{ + pixel_x = -11 }, -/obj/structure/sign/warning/vacuum/external/directional/south, -/obj/structure/cable, -/obj/machinery/light/small/directional/north, -/turf/open/floor/plating, -/area/ocean/generated_above) +/turf/open/floor/carpet/lone/star, +/area/station/service/bar) "qWC" = ( /obj/effect/turf_decal/trimline/green/line, /obj/effect/turf_decal/trimline/green/line, @@ -33238,10 +33242,13 @@ /turf/open/floor/grass, /area/station/maintenance/starboard/upper) "qXP" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/chem_dispenser/drinks/beer{ + dir = 8; + pixel_y = 5; + pixel_x = 4 }, -/turf/open/floor/carpet/lone, +/obj/structure/table, +/turf/open/floor/carpet/lone/star, /area/station/service/bar) "qYg" = ( /obj/structure/cable, @@ -33569,6 +33576,11 @@ }, /turf/open/floor/engine/vacuum, /area/station/engineering/atmos) +"rgt" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced/plasma, +/turf/open/floor/plating, +/area/station/maintenance/port/central) "rgW" = ( /obj/machinery/duct/industrial/waste, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -35374,9 +35386,12 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) "sdC" = ( -/obj/structure/chair/stool/bar/directional/east, -/turf/open/floor/carpet/lone, -/area/station/service/bar) +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/line, +/turf/open/floor/iron/white/textured, +/area/station/medical/medbay/lobby) "sdH" = ( /obj/machinery/duct/industrial/waste, /obj/effect/turf_decal/trimline/yellow/line, @@ -36446,7 +36461,7 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/turf/open/floor/carpet/lone, +/turf/open/floor/carpet/lone/star, /area/station/service/bar) "sIf" = ( /obj/structure/cable, @@ -36543,9 +36558,11 @@ /turf/open/floor/carpet/executive, /area/station/commons/vacant_room/commissary) "sKn" = ( -/obj/structure/sign/poster/official/cohiba_robusto_ad, -/turf/closed/wall, -/area/station/security/detectives_office) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/carpet/lone/star, +/area/station/service/bar) "sKC" = ( /obj/effect/landmark/start/cook, /turf/open/floor/iron/kitchen, @@ -36876,6 +36893,13 @@ /obj/effect/turf_decal/tile/blue/diagonal_centre, /turf/open/floor/iron/white/diagonal, /area/station/medical/medbay/lobby) +"sUg" = ( +/obj/machinery/holopad, +/obj/machinery/light_switch/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/station/service/bar/backroom) "sUj" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -37580,11 +37604,9 @@ /turf/open/floor/iron/white/textured, /area/station/science/genetics) "tqP" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron/white/textured, -/area/station/medical/medbay/lobby) +/obj/structure/sink/kitchen/directional/west, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "trd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -37653,7 +37675,6 @@ /turf/open/floor/plating, /area/station/maintenance/port/central) "ttB" = ( -/obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, /obj/structure/disposalpipe/segment{ dir = 4 @@ -37811,7 +37832,7 @@ dir = 6 }, /obj/structure/table/wood, -/turf/open/floor/carpet/lone, +/turf/open/floor/carpet/lone/star, /area/station/service/bar) "tym" = ( /obj/machinery/camera/autoname/directional/west, @@ -37887,6 +37908,13 @@ }, /turf/open/floor/plastic, /area/station/hallway/primary/central) +"tzG" = ( +/obj/item/radio/intercom/directional/west{ + pixel_x = 4; + pixel_y = -9 + }, +/turf/closed/wall, +/area/station/medical/storage) "tzU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -38093,9 +38121,6 @@ /obj/item/multitool, /turf/open/floor/mineral/titanium/blue, /area/station/ai_monitored/command/storage/eva) -"tFN" = ( -/turf/closed/wall/r_wall, -/area/station/medical/office) "tFR" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 @@ -38346,18 +38371,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) -"tKQ" = ( -/obj/machinery/door/airlock/external{ - name = "Atmospherics External Access" - }, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/engineering/atmos) "tLb" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/yellow/filled/warning, @@ -38551,6 +38564,10 @@ }, /turf/open/floor/engine, /area/station/engineering/atmos/hfr_room) +"tQS" = ( +/obj/machinery/restaurant_portal/bar, +/turf/open/floor/wood, +/area/station/service/kitchen) "tQV" = ( /obj/effect/turf_decal/stripes, /obj/machinery/camera/autoname/directional/south, @@ -39137,11 +39154,13 @@ /turf/open/floor/iron/dark, /area/station/cargo/sorting) "ueF" = ( -/obj/effect/landmark/start/cook, -/obj/structure/extinguisher_cabinet/directional/east, -/obj/machinery/light/directional/east, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4; + invisibility = 101 + }, +/turf/open/floor/iron/white/textured, +/area/station/medical/treatment_center) "ueN" = ( /obj/structure/closet/emcloset, /turf/open/floor/plating, @@ -39288,6 +39307,10 @@ dir = 4 }, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4; + invisibility = 101 + }, /turf/open/floor/iron/white/textured_large, /area/station/medical/treatment_center) "uhr" = ( @@ -40024,16 +40047,16 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) "uBa" = ( -/obj/structure/lattice, -/obj/structure/disposalpipe/segment{ - dir = 4; - invisibility = 101 +/obj/machinery/door/airlock/external{ + name = "Atmospherics External Access" }, -/obj/machinery/conveyor/auto/inside_corners{ - dir = 9 +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 }, -/turf/open/floor/plating/ocean, -/area/space) +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/turf/open/floor/plating, +/area/ocean/generated_above) "uBf" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -40294,7 +40317,7 @@ /area/station/maintenance/starboard/upper) "uGO" = ( /obj/structure/table/wood, -/turf/open/floor/carpet/lone, +/turf/open/floor/carpet/lone/star, /area/station/service/bar) "uHd" = ( /obj/effect/turf_decal/stripes/line{ @@ -40357,12 +40380,11 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "uHW" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 +/obj/machinery/smartfridge/drinks{ + icon_state = "boozeomat" }, -/obj/effect/turf_decal/trimline/blue/line, -/turf/open/floor/iron/white/textured, -/area/station/medical/medbay/lobby) +/turf/open/floor/carpet/lone/star, +/area/station/service/bar) "uIg" = ( /obj/machinery/light_switch/directional/north, /obj/effect/turf_decal/trimline/red/filled/warning{ @@ -42058,10 +42080,10 @@ /turf/open/floor/plating, /area/station/engineering/break_room) "vvq" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/station/medical/cryo) +/obj/effect/turf_decal/tile/blue/diagonal_centre, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/white/diagonal, +/area/station/medical/medbay/lobby) "vvw" = ( /obj/effect/mapping_helpers/airlock/unres, /obj/machinery/door/airlock/maintenance, @@ -42143,12 +42165,10 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) "vyi" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white/textured, -/area/station/medical/storage) +/obj/structure/window/spawner/directional/west, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/commons/lounge) "vyk" = ( /obj/structure/chair/wood{ dir = 4 @@ -42206,14 +42226,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/science/lab) -"vAq" = ( -/obj/structure/window/spawner/directional/north, -/obj/structure/window/spawner/directional/south, -/obj/machinery/conveyor/auto{ - dir = 4 - }, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "vAr" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -42376,10 +42388,6 @@ name = "Medical Closure Shutters"; desc = "Fuck off we're closed." }, -/obj/item/paper_bin{ - pixel_x = -7; - pixel_y = 4 - }, /turf/open/floor/iron/dark/textured, /area/station/medical/office) "vGu" = ( @@ -42429,7 +42437,7 @@ dir = 8 }, /turf/open/floor/plating/ocean, -/area/ocean/near_station_powered) +/area/ocean) "vIv" = ( /obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -43012,7 +43020,7 @@ dir = 4 }, /turf/open/floor/plating/ocean, -/area/ocean/near_station_powered) +/area/ocean) "vXy" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/carpet, @@ -43325,6 +43333,10 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/qm) +"wfl" = ( +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/engine, +/area/station/maintenance/port/central) "wfC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -43702,10 +43714,9 @@ /turf/open/floor/holofloor/beach/water, /area/station/maintenance/starboard/aft) "wqA" = ( -/obj/structure/mirror/directional/north, -/obj/effect/spawner/random/contraband/cannabis, -/turf/open/floor/iron, -/area/station/commons/vacant_room/commissary) +/obj/machinery/light/directional/west, +/turf/open/floor/wood, +/area/station/service/kitchen) "wqB" = ( /obj/machinery/vending/security, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -44743,9 +44754,9 @@ }, /area/station/science/robotics) "wRT" = ( -/obj/structure/sink/kitchen/directional/west, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) +/obj/effect/spawner/structure/window, +/turf/open/floor/iron/white/textured, +/area/station/science/genetics) "wRU" = ( /obj/machinery/light/small/directional/south, /turf/open/floor/engine/vacuum, @@ -44951,7 +44962,7 @@ }, /obj/structure/chair/stool/bar/directional/east, /obj/effect/landmark/event_spawn, -/turf/open/floor/carpet/lone, +/turf/open/floor/carpet/lone/star, /area/station/service/bar) "wYe" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ @@ -44961,6 +44972,10 @@ dir = 4 }, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4; + invisibility = 101 + }, /turf/open/floor/iron/white/textured, /area/station/medical/treatment_center) "wYo" = ( @@ -45047,9 +45062,18 @@ /turf/open/floor/iron/dark/textured, /area/station/cargo/sorting) "wZY" = ( -/obj/item/kirbyplants/random, -/turf/open/floor/wood, -/area/station/service/bar) +/obj/structure/table/reinforced, +/obj/item/defibrillator/loaded{ + pixel_y = 6 + }, +/obj/item/defibrillator/loaded{ + pixel_y = 3 + }, +/obj/item/defibrillator/loaded, +/obj/effect/turf_decal/tile/blue/full, +/obj/structure/window/spawner/directional/north, +/turf/open/floor/iron/white/textured, +/area/station/medical/storage) "xae" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/duct/industrial/waste, @@ -45264,10 +45288,21 @@ /turf/open/floor/iron/white/diagonal, /area/station/medical/medbay/lobby) "xeP" = ( -/obj/effect/turf_decal/tile/blue/diagonal_centre, -/obj/item/kirbyplants/random, -/turf/open/floor/iron/white/diagonal, -/area/station/medical/medbay/lobby) +/obj/structure/disposalpipe/segment{ + dir = 4; + invisibility = 101 + }, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/green/line{ + dir = 4 + }, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/service/hydroponics) "xeR" = ( /obj/machinery/computer/atmos_control/mix_tank{ dir = 1 @@ -46139,9 +46174,10 @@ /turf/open/floor/plating, /area/station/maintenance/port/central) "xzg" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/wood, -/area/station/service/bar/backroom) +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white/textured, +/area/station/medical/surgery/theatre) "xzj" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/structure/sign/poster/quirk/festive{ @@ -46514,11 +46550,9 @@ /turf/open/floor/plastic, /area/station/hallway/primary/central) "xKr" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/engine, -/area/station/maintenance/port/central) +/obj/structure/chair/stool/bar/directional/east, +/turf/open/floor/carpet/lone/star, +/area/station/service/bar) "xKt" = ( /obj/machinery/drone_dispenser/preloaded, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -46778,6 +46812,9 @@ /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/iron/white/textured, /area/station/medical/office) "xPm" = ( @@ -46955,13 +46992,14 @@ }, /area/station/science/lobby) "xTD" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Fitness" +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/space/basic, -/area/station/commons/fitness) +/obj/structure/sign/warning/vacuum/external/directional/south, +/obj/structure/cable, +/obj/machinery/light/small/directional/north, +/turf/open/floor/plating, +/area/ocean/generated_above) "xTO" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Engineering Foyer" @@ -47349,6 +47387,10 @@ }, /turf/open/floor/iron/dark, /area/station/cargo/sorting) +"ydn" = ( +/obj/item/kirbyplants/random, +/turf/open/floor/wood, +/area/station/service/bar) "ydB" = ( /obj/effect/gibspawner/xeno/bodypartless, /obj/structure/spider/stickyweb, @@ -47518,8 +47560,10 @@ }, /area/station/engineering/main) "yit" = ( -/obj/machinery/firealarm/directional/north, -/obj/item/radio/intercom/directional/west, +/obj/machinery/firealarm/directional/north{ + pixel_y = 25; + pixel_x = -12 + }, /turf/open/floor/iron/white/textured, /area/station/medical/storage) "yiT" = ( @@ -62972,21 +63016,21 @@ dYl utm oyT jwq -ueF +mfr pqp pqp pqp jsA -wRT +tqP pqp kam pqp jCA pug rYQ -bKh -kcH -eQz +eTm +aYq +ggx rYQ rYQ pug @@ -63224,26 +63268,26 @@ utm utm bbo nuk -hXP -lbA +xeP +aec qRE oyT oyT oyT oyT -eTm dik -hAf +mdi +lFo oyT -vAq +mxg slV -jSC +itv oWO oWO cfI oWO pug -xTD +mnD kmY kmY pug @@ -63485,22 +63529,22 @@ uIl awY pQl oyT -cGE -muw -oyT +tQS +wqA +eFd nVa lyP evH ajP aAK -ceV +lLc eOu oWO jFi kUp oWO rYQ -kcH +aYq dwx dwx dwx @@ -63744,20 +63788,20 @@ ddU lzc nJU aVb -lzc +pIL kpQ pIL pIL -gxy -fgq +uHW +hXP aVb -nqU -gDG +mIS +kCz qGs -lqa +mVu oWO -iDt -kcH +oti +aYq dwx dwx dwx @@ -64008,13 +64052,13 @@ pIL pIL uGO aVb -nqU +mIS oWO -kTL +jod jDu oWO -iDt -kcH +oti +aYq dwx dwx dwx @@ -64259,19 +64303,19 @@ lzc vci aVb mfc -fJF +ejr qrV -lNO +qXP pIL -jBP -nqU -nqU +eZH +mIS +mIS oWO exP -cRC +sUg oWO vtb -kcH +aYq dwx dwx dwx @@ -64521,14 +64565,14 @@ pIL pIL pIL uGO -nqU +mIS aVb oWO -xzg -ikH +iru +lqa oWO vtb -kcH +aYq dwx dwx dwx @@ -64775,17 +64819,17 @@ aVb qnD uGO pIL -fJF +ejr uGO -nPE -nqU +lNO +mIS aVb oWO ncg hdv oWO rYQ -kcH +aYq rYQ rYQ rYQ @@ -65027,15 +65071,15 @@ bow kxW foP iHJ -wZY +ydn aVb wXQ uGO -frv +qWx uGO uGO -sdC -nqU +xKr +mIS mSX oWO nxs @@ -65286,11 +65330,11 @@ vrw lzc lzc pJI -qXP +sKn fPY -eZH -sdC -bHp +ciu +xKr +qmg pIL sVF lzc @@ -65299,7 +65343,7 @@ oWO oWO oWO nOf -mdi +lms pug kmY kmY @@ -66058,11 +66102,11 @@ nDl wmV pXi gDA -lms +abL hwW lmI pXi -lms +abL pXi iul jEi @@ -66313,11 +66357,11 @@ tGW bMv ffP xPG -nTR +xVm xvp rnD -aMo -pPG +bkr +aGw rnD fRb xVm @@ -66573,9 +66617,9 @@ eqZ eqZ qoU hdM -mIS +fJF xVm -hhQ +aKV hdM xVm iWZ @@ -66584,13 +66628,13 @@ iWZ iWZ iWZ mSq -hWe -hWe +kcP +kcP xJb dpp xJb -hWe -hWe +kcP +kcP twN kUY wRx @@ -66841,13 +66885,13 @@ bCu eYD iWZ dNg -jod +njU fos -mVu +frv kGi -mVu +frv dih -hWe +kcP bul vWf slx @@ -67090,21 +67134,21 @@ rnD rnD xVm xtr -mfr -mfr +ceV +ceV iWZ sEJ lyY tYT iWZ dNg -hWe +kcP cqw -mVu +frv kGi -mVu -aOK -hWe +frv +jpm +kcP wXn mDR tYW @@ -67341,11 +67385,11 @@ djv ycc knP gUb -sKn +eqZ mXG hdM eSy -xVm +nTR wGs xAi blS @@ -67357,11 +67401,11 @@ iWZ dNg dSA lRV -hcy +hOF kAE -mVu +frv umT -hWe +kcP ewC cDw kOM @@ -67598,13 +67642,13 @@ sxX oMw hmD rNz -hmD +erF ttB -abL -ojS -abL +vyi +cIs +cIs uvM -kCz +ojS hAN iWZ xHk @@ -67612,11 +67656,11 @@ lyY vkC iWZ mSq -hWe -wqA +kcP +gws lSK kGi -mVu +frv omy aKn xbh @@ -67869,9 +67913,9 @@ lyY fUE iWZ agR -hWe -hWe -hWe +kcP +kcP +kcP xae aKn aKn @@ -68115,15 +68159,15 @@ xRl hmD tDO mPO -ejr -ejr +kcH +kcH aSq -ejr +kcH xVm iWZ jdl lwx -hBR +hSx iWZ mSq mSq @@ -68372,9 +68416,9 @@ kgY hmD uJs oiG -dqA +hWe rgY -dqA +hWe tIS vdg iWZ @@ -68628,7 +68672,7 @@ hmD hmD hmD ske -aKV +rgt wCJ wCJ wCJ @@ -68637,7 +68681,7 @@ ske mSq oHd jkJ -jYH +cdc djt wdT jkJ @@ -68894,11 +68938,11 @@ jol jol xkV jol -xKr -eFd +ikH +dqA wdT wdT -aGw +wfl wdT wQd wdT @@ -70147,7 +70191,7 @@ pkw fGs aFY aFY -mnD +muw ske meJ meJ @@ -70701,7 +70745,7 @@ rvq rvq rvq rvq -rvq +mdW vHZ cfz etN @@ -70958,7 +71002,7 @@ meJ meJ meJ meJ -rvq +mdW vHZ cfz etN @@ -71215,7 +71259,7 @@ aah meJ meJ meJ -rvq +mdW vHZ cfz etN @@ -71472,7 +71516,7 @@ aah aah meJ meJ -rvq +mdW vHZ cfz etN @@ -71729,7 +71773,7 @@ aah aah meJ meJ -rvq +mdW vHZ cfz etN @@ -71986,7 +72030,7 @@ aah aah aah meJ -rvq +mdW vHZ cfz etN @@ -72243,7 +72287,7 @@ jDJ jDJ jDJ jDJ -aec +wFB gul hwI etN @@ -72500,7 +72544,7 @@ jDJ jDJ jDJ jDJ -aec +wFB gul wFB uCz @@ -72757,7 +72801,7 @@ meJ meJ meJ meJ -rvq +mdW vHZ sRh sRh @@ -73013,8 +73057,8 @@ etN meJ meJ meJ -rvq -rvq +mdW +mdW vHZ sRh qiU @@ -73268,10 +73312,10 @@ aah pHU etN meJ -rvq -rvq -rvq -aYq +mdW +mdW +mdW +dTu kBN sRh byf @@ -73474,8 +73518,8 @@ cSo tqE bGI bPl -njU -uHW +wRT +sdC iLY pXC dno @@ -73524,9 +73568,9 @@ aah meJ pHU etN -rvq -rvq -aYq +mdW +mdW +dTu naN kBN sRh @@ -73731,8 +73775,8 @@ pmg vrS cuk bux -njU -uHW +wRT +sdC qUv qLe mxp @@ -73780,9 +73824,9 @@ aah meJ meJ pHU -gBb -rvq -aYq +cfz +mdW +dTu kBN asA asA @@ -74037,9 +74081,9 @@ aah meJ meJ fXF -gBb -aYq -kBN +cfz +dTu +ekZ asA asA mqy @@ -74246,14 +74290,14 @@ sfe vPE omi aDB -uHW +sdC gak vUu fUj rLb wBP jln -xeP +vvq cIO xCU wXG @@ -74295,7 +74339,7 @@ meJ meJ fXF hiO -kBN +ekZ asA asA elt @@ -74760,8 +74804,8 @@ gVL vsL jKo jKo -cdc -cdc +nqU +nqU xoE dno kAH @@ -75018,7 +75062,7 @@ nIg ebe xIv sJt -vGh +pdS pmR dno kAH @@ -75268,12 +75312,12 @@ pxZ iYt jYz gSH -oft +xzg nQo wAP xMv -jrX -jrX +ltZ +ltZ nNP fNw hsi @@ -75532,13 +75576,13 @@ kJN kJN kJN boX -kcP +vGh xys dno rLb wBP jln -xeP +vvq cIO csW wXG @@ -75789,13 +75833,13 @@ nqf nqf nqf hWv -kcP +vGh hsi dno rLb pmN jln -xeP +vvq cIO csW wXG @@ -76043,8 +76087,8 @@ nhC hWy eeA nqf -ekZ -pdS +eDI +lbA shm fNw pmR @@ -76559,8 +76603,8 @@ uhh eXH xXa xXa -cdc -tFN +nqU +bKh xoE dno kAH @@ -77053,7 +77097,7 @@ meJ qSI iqh djZ -vvq +oft bWB pkl udg @@ -77069,18 +77113,18 @@ oMo oMo oMo oMo -oMo +ueF uAv lJl wiH msQ lzG -tqP +muE fUj rLb pmN jln -xeP +vvq cIO lGH wXG @@ -77326,7 +77370,7 @@ rEh sVq hXo cQI -wil +rtb wil dPW mko @@ -77635,7 +77679,7 @@ aah aah meJ fXF -uBa +kTL dyB asA asA @@ -77831,7 +77875,7 @@ bUR udR xrF ojJ -xiD +lzg nGo mFK pIN @@ -77844,7 +77888,7 @@ mFK mFK dYV uOF -uHW +sdC qUv qLe wvy @@ -77892,7 +77936,7 @@ aah aah meJ fXF -gBb +cfz kwO dyB asA @@ -78088,7 +78132,7 @@ bDK cMp vGC xfh -xiD +lzg hJi xGw onx @@ -78149,8 +78193,8 @@ aah aah meJ pHU -gBb -rvq +cfz +mdW kwO dyB asA @@ -78407,8 +78451,8 @@ aah meJ pHU etN -rvq -rvq +mdW +mdW kwO fCx dyB @@ -78604,10 +78648,10 @@ feL oYu gTr uCI -vyi +mMG mrL -jPs -jAN +dzo +wZY emO oes oes @@ -78665,9 +78709,9 @@ aah pHU etN meJ -rvq -rvq -rvq +mdW +mdW +mdW kwO dyB pla @@ -78924,8 +78968,8 @@ etN meJ meJ meJ -rvq -rvq +mdW +mdW vHZ pla pla @@ -79116,7 +79160,7 @@ gTr gTr gTr gTr -gTr +tzG yit ehz nnN @@ -79182,7 +79226,7 @@ meJ meJ meJ meJ -rvq +mdW kwO fCx dyB @@ -79376,8 +79420,8 @@ nTg rvQ ehz kfA -hfC dYp +jAN qUa eCp jHE @@ -79439,9 +79483,9 @@ meJ meJ meJ meJ -rvq -rvq -rvq +mdW +mdW +mdW kwO dyB pla @@ -79698,8 +79742,8 @@ meJ meJ meJ meJ -rvq -rvq +mdW +mdW kwO dyB pla @@ -79956,8 +80000,8 @@ meJ meJ meJ meJ -rvq -rvq +mdW +mdW kwO dyB rDE @@ -80215,7 +80259,7 @@ meJ meJ meJ rvq -rvq +mdW vHZ rDE iMT @@ -80719,7 +80763,7 @@ kND qlS heN oDq -gBb +cfz meJ meJ meJ @@ -80976,7 +81020,7 @@ kND lSj hkS vXo -gBb +cfz meJ meJ meJ @@ -81233,7 +81277,7 @@ mSq lSj hkS vXo -gBb +cfz meJ meJ meJ @@ -81471,7 +81515,7 @@ gmQ qgs ske kND -jpm +jPs xzf xzf xzf @@ -81490,11 +81534,11 @@ fgm bPH hkS vXo -gBb -rvq -rvq -rvq -rvq +cfz +mdW +mdW +mdW +mdW vHZ ogd ogd @@ -83740,7 +83784,7 @@ aah aah aah aah -qll +jrX meJ qSI nRM @@ -96560,7 +96604,7 @@ aah aah sks lVD -ltZ +hBR lvw lvw lvw @@ -97074,7 +97118,7 @@ aah aah aah sks -tKQ +aMo sks kdT tNO @@ -97331,7 +97375,7 @@ aah aah aah qYQ -qWx +xTD ujh lyZ jvt @@ -97588,7 +97632,7 @@ aah aah aah qYQ -jbE +uBa sks sks jvt @@ -100426,7 +100470,7 @@ gro dNu tvt iri -muE +eQz iri tvt aZB @@ -100683,7 +100727,7 @@ ahl eRl wUP iri -muE +eQz iri atC gaz From 79c8b11db2e67c752d99bbc7cb801f1a69d0650e Mon Sep 17 00:00:00 2001 From: "DESKTOP-M4GD565\\LME" Date: Fri, 6 Oct 2023 23:07:54 -0700 Subject: [PATCH 13/26] f --- _maps/map_files/Oshan/oshan.dmm | 292 +++++++++++++++++++++----------- 1 file changed, 191 insertions(+), 101 deletions(-) diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index 1865a45e61e9..4f09dbb7bdb2 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -497,8 +497,8 @@ name = "HoochMaster Deluxe" }, /obj/machinery/light/directional/west, -/turf/open/floor/carpet/lone/star, -/area/station/service/kitchen) +/turf/open/floor/carpet, +/area/station/service/bar) "ajQ" = ( /turf/closed/wall/r_wall, /area/station/security/office) @@ -978,8 +978,9 @@ dir = 4; layer = 2.8 }, -/turf/open/floor/carpet/lone/star, -/area/station/service/kitchen) +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/carpet, +/area/station/service/bar) "aBb" = ( /obj/machinery/power/terminal{ dir = 1 @@ -1502,7 +1503,7 @@ dir = 6 }, /turf/open/floor/plating/ocean, -/area/ocean) +/area/ocean/near_station_powered) "aRH" = ( /obj/machinery/light/directional/south, /obj/structure/extinguisher_cabinet/directional/west, @@ -4195,7 +4196,10 @@ "ciu" = ( /obj/structure/chair/stool/bar/directional/east, /mob/living/carbon/human/species/monkey/punpun, -/turf/open/floor/carpet/lone/star, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/carpet, /area/station/service/bar) "ciA" = ( /obj/structure/cable, @@ -6641,6 +6645,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/service/janitor, /turf/open/floor/iron/grimy, /area/station/service/hydroponics) "dys" = ( @@ -6660,7 +6665,7 @@ dir = 9 }, /turf/open/floor/plating, -/area/ocean) +/area/ocean/near_station_powered) "dzo" = ( /obj/machinery/vending/wardrobe/medi_wardrobe, /turf/open/floor/iron/white/textured, @@ -6941,7 +6946,7 @@ invisibility = 101 }, /turf/open/floor/plating/ocean, -/area/ocean) +/area/ocean/near_station_powered) "dGy" = ( /turf/open/floor/iron/stairs, /area/station/commons/fitness/recreation/entertainment) @@ -7398,7 +7403,7 @@ dir = 10 }, /turf/open/floor/plating/ocean, -/area/ocean) +/area/ocean/near_station_powered) "dTv" = ( /obj/machinery/firealarm/directional/north, /obj/machinery/light/directional/north, @@ -8019,7 +8024,7 @@ /area/station/medical/storage) "ejr" = ( /obj/effect/landmark/start/bartender, -/turf/open/floor/carpet/lone/star, +/turf/open/floor/carpet, /area/station/service/bar) "ejy" = ( /obj/effect/turf_decal/tile/green/half/contrasted, @@ -8046,7 +8051,7 @@ dir = 2 }, /turf/open/floor/plating/ocean, -/area/ocean) +/area/ocean/near_station_powered) "elf" = ( /obj/structure/rack, /obj/effect/turf_decal/bot, @@ -8419,11 +8424,9 @@ /turf/open/floor/wood/parquet, /area/station/command/heads_quarters/hop) "evH" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/carpet/lone/star, -/area/station/service/kitchen) +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/commons/lounge) "evR" = ( /obj/structure/closet/secure_closet/security/sec, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -8815,8 +8818,11 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) "eFd" = ( -/turf/open/floor/carpet/lone/star, -/area/station/service/kitchen) +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/carpet, +/area/station/service/bar) "eFf" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, @@ -9188,11 +9194,12 @@ /turf/open/floor/iron/dark/textured, /area/station/security/office) "eOu" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/wood, -/area/station/service/kitchen) +/obj/structure/lattice, +/obj/machinery/conveyor/auto{ + dir = 9 + }, +/turf/open/floor/plating/ocean, +/area/ocean/near_station_powered) "eOA" = ( /obj/effect/spawner/random/structure/grille, /turf/open/floor/iron/dark, @@ -9658,7 +9665,8 @@ /obj/structure/displaycase/forsale/kitchen{ pixel_y = 8 }, -/turf/open/floor/carpet/lone/star, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/carpet, /area/station/service/bar) "eZW" = ( /obj/structure/table, @@ -10699,7 +10707,7 @@ dir = 1 }, /turf/open/floor/plating/ocean, -/area/ocean) +/area/ocean/near_station_powered) "fCD" = ( /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) @@ -10827,7 +10835,10 @@ }, /obj/structure/table/wood, /obj/effect/spawner/random/entertainment/lighter, -/turf/open/floor/carpet/lone/star, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/carpet, /area/station/service/bar) "fGK" = ( /obj/structure/cable, @@ -11220,7 +11231,10 @@ }, /obj/structure/chair/stool/bar/directional/east, /obj/effect/landmark/start/psychologist, -/turf/open/floor/carpet/lone/star, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/turf/open/floor/carpet, /area/station/service/bar) "fQb" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, @@ -11467,6 +11481,13 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"fWU" = ( +/obj/structure/chair/stool/bar/directional/east, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/turf/open/floor/carpet, +/area/station/service/bar) "fXb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -12334,7 +12355,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plating/ocean, -/area/ocean) +/area/ocean/near_station_powered) "gum" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -12623,13 +12644,10 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) "gBb" = ( -/obj/structure/lattice, -/obj/structure/disposalpipe/segment{ - dir = 4; - invisibility = 101 - }, -/turf/open/floor/plating/ocean, -/area/ocean/near_station_powered) +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/carpet, +/area/station/service/bar) "gBj" = ( /obj/effect/turf_decal/box/corners{ dir = 8 @@ -12975,6 +12993,13 @@ }, /turf/open/floor/iron/smooth, /area/station/ai_monitored/security/armory) +"gMs" = ( +/mob/living/basic/chicken/brown, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/misc/sandy_dirt, +/area/station/service/hydroponics/upper) "gMt" = ( /obj/effect/mapping_helpers/burnt_floor, /obj/effect/decal/cleanable/dirt/dust, @@ -13200,6 +13225,13 @@ }, /turf/open/floor/plating, /area/ruin/space/ks13/engineering/secure_storage) +"gUS" = ( +/mob/living/basic/chicken, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/misc/sandy_dirt, +/area/station/service/hydroponics/upper) "gVf" = ( /obj/structure/cable/industrial, /obj/structure/disposalpipe/segment, @@ -13792,7 +13824,7 @@ dir = 10 }, /turf/open/floor/plating/ocean, -/area/ocean) +/area/ocean/near_station_powered) "hiP" = ( /obj/structure/table/reinforced, /obj/item/multitool, @@ -14047,6 +14079,7 @@ /area/station/maintenance/port/aft) "hsV" = ( /obj/structure/railing, +/obj/effect/turf_decal/siding/wood, /turf/open/misc/sandy_dirt, /area/station/service/hydroponics/upper) "hti" = ( @@ -15374,7 +15407,9 @@ dir = 4; layer = 2.8 }, -/turf/open/floor/carpet/lone/star, +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/carpet, /area/station/service/bar) "hXX" = ( /obj/structure/disposalpipe/segment{ @@ -18143,7 +18178,7 @@ }, /obj/machinery/camera/autoname/directional/south, /turf/open/floor/plating/ocean, -/area/ocean) +/area/ocean/near_station_powered) "jzp" = ( /obj/machinery/duct/industrial/waste, /obj/structure/cable, @@ -18841,11 +18876,12 @@ }, /area/station/science/robotics) "jPs" = ( +/obj/structure/lattice, /obj/machinery/conveyor/auto/inside_corners{ - dir = 10 + dir = 9 }, -/turf/open/floor/plating, -/area/space) +/turf/open/floor/plating/ocean, +/area/station/maintenance/port/central) "jPx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -19933,7 +19969,7 @@ pixel_y = 26 }, /obj/machinery/requests_console/directional/north, -/turf/open/floor/carpet/lone/star, +/turf/open/floor/carpet, /area/station/service/bar) "kqx" = ( /obj/machinery/mecha_part_fabricator/maint, @@ -20180,7 +20216,7 @@ dir = 9 }, /turf/open/floor/plating/ocean, -/area/ocean) +/area/ocean/near_station_powered) "kwP" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -20385,7 +20421,7 @@ dir = 10 }, /turf/open/floor/plating/ocean, -/area/ocean) +/area/ocean/near_station_powered) "kCc" = ( /obj/structure/cable, /obj/machinery/power/smes/engineering, @@ -20886,6 +20922,9 @@ "kMm" = ( /obj/structure/cable, /obj/structure/nestbox, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, /turf/open/misc/sandy_dirt, /area/station/service/hydroponics/upper) "kMx" = ( @@ -21182,7 +21221,7 @@ dir = 9 }, /turf/open/floor/plating/ocean, -/area/ocean) +/area/ocean/near_station_powered) "kUi" = ( /turf/open/floor/iron, /area/station/cargo/warehouse/upper) @@ -22246,8 +22285,8 @@ /area/station/service/kitchen/coldroom) "lyP" = ( /obj/structure/disposalpipe/segment, -/turf/open/floor/carpet/lone/star, -/area/station/service/kitchen) +/turf/open/floor/carpet, +/area/station/service/bar) "lyY" = ( /turf/open/floor/eighties/red{ icon = 'goon/icons/turf/floors.dmi'; @@ -22874,8 +22913,12 @@ /turf/open/floor/pod/dark, /area/station/security/warden) "lLc" = ( -/turf/open/floor/wood, -/area/station/service/kitchen) +/obj/structure/cable, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/commons/lounge) "lLl" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod Three"; @@ -22954,7 +22997,8 @@ "lNO" = ( /obj/structure/table/wood, /obj/effect/spawner/random/entertainment/lighter, -/turf/open/floor/carpet/lone/star, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/carpet, /area/station/service/bar) "lNZ" = ( /obj/structure/table/glass, @@ -23535,7 +23579,10 @@ }, /obj/structure/table/wood, /obj/machinery/camera/autoname/directional/west, -/turf/open/floor/carpet/lone/star, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/carpet, /area/station/service/bar) "mfk" = ( /obj/structure/closet/secure_closet/chief_medical, @@ -24016,6 +24063,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 6 }, +/obj/machinery/disposal/bin, /turf/open/floor/iron, /area/station/engineering/atmos) "msQ" = ( @@ -24161,7 +24209,7 @@ dir = 5 }, /turf/open/floor/plating, -/area/space) +/area/station/maintenance/port/central) "muE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -24924,6 +24972,9 @@ /obj/structure/railing{ dir = 4 }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/open/misc/sandy_dirt, /area/station/service/hydroponics/upper) "mRf" = ( @@ -25271,7 +25322,7 @@ /obj/structure/lattice, /obj/machinery/conveyor/auto, /turf/open/floor/plating/ocean, -/area/ocean) +/area/ocean/near_station_powered) "naS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -27198,8 +27249,8 @@ pixel_x = -1 }, /obj/structure/table, -/turf/open/floor/carpet/lone/star, -/area/station/service/kitchen) +/turf/open/floor/carpet, +/area/station/service/bar) "nVh" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 5 @@ -27581,6 +27632,9 @@ /obj/structure/railing{ dir = 4 }, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, /turf/open/misc/sandy_dirt, /area/station/service/hydroponics/upper) "ogJ" = ( @@ -27665,6 +27719,9 @@ "oiG" = ( /obj/structure/cable, /obj/structure/table/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/commons/lounge) "oiN" = ( @@ -27733,6 +27790,7 @@ /obj/effect/spawner/random/structure/musician/piano/random_piano, /obj/structure/window/spawner/directional/west, /obj/machinery/light/floor/has_bulb, +/obj/effect/turf_decal/siding/wood, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/commons/lounge) "okd" = ( @@ -27801,6 +27859,7 @@ /obj/effect/turf_decal/tile/green{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/janitor, /turf/open/floor/iron/white/textured, /area/station/science/genetics) "omn" = ( @@ -27959,6 +28018,9 @@ /turf/open/floor/iron/dark/textured, /area/station/security/office) "opQ" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, /turf/open/misc/sandy_dirt, /area/station/service/hydroponics/upper) "opR" = ( @@ -28528,7 +28590,7 @@ dir = 6 }, /turf/open/floor/plating/ocean, -/area/ocean) +/area/ocean/near_station_powered) "oDx" = ( /obj/machinery/light/directional/south, /turf/open/floor/plating, @@ -28912,7 +28974,7 @@ invisibility = 101 }, /turf/open/floor/plating/ocean, -/area/ocean) +/area/ocean/near_station_powered) "oRr" = ( /obj/structure/table/glass, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -29985,7 +30047,7 @@ }, /obj/structure/cable/layer3, /turf/open/floor/plating/ocean, -/area/ocean) +/area/ocean/near_station_powered) "prW" = ( /obj/machinery/atmospherics/components/unary/passive_vent, /turf/open/floor/circuit/telecomms, @@ -30148,6 +30210,9 @@ /obj/structure/railing{ dir = 4 }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/open/misc/sandy_dirt, /area/station/service/hydroponics/upper) "pwU" = ( @@ -30531,6 +30596,7 @@ /obj/structure/chair/wood/wings{ dir = 8 }, +/obj/effect/turf_decal/siding/wood, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/commons/lounge) "pIc" = ( @@ -30586,7 +30652,7 @@ /turf/open/floor/plating, /area/station/cargo/warehouse) "pIL" = ( -/turf/open/floor/carpet/lone/star, +/turf/open/floor/carpet, /area/station/service/bar) "pIN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -31804,7 +31870,10 @@ "qmg" = ( /obj/structure/chair/stool/bar/directional/east, /obj/effect/landmark/start/assistant, -/turf/open/floor/carpet/lone/star, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/turf/open/floor/carpet, /area/station/service/bar) "qmi" = ( /obj/effect/spawner/random/trash/graffiti, @@ -31855,7 +31924,10 @@ /obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3 }, -/turf/open/floor/carpet/lone/star, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/carpet, /area/station/service/bar) "qnG" = ( /obj/machinery/door/airlock/public/glass{ @@ -32031,7 +32103,7 @@ pixel_y = 7; pixel_x = -8 }, -/turf/open/floor/carpet/lone/star, +/turf/open/floor/carpet, /area/station/service/bar) "qrW" = ( /turf/open/floor/carpet/purple, @@ -33209,7 +33281,7 @@ /obj/structure/desk_bell{ pixel_x = -11 }, -/turf/open/floor/carpet/lone/star, +/turf/open/floor/carpet, /area/station/service/bar) "qWC" = ( /obj/effect/turf_decal/trimline/green/line, @@ -33248,7 +33320,7 @@ pixel_x = 4 }, /obj/structure/table, -/turf/open/floor/carpet/lone/star, +/turf/open/floor/carpet, /area/station/service/bar) "qYg" = ( /obj/structure/cable, @@ -36461,7 +36533,7 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/turf/open/floor/carpet/lone/star, +/turf/open/floor/carpet, /area/station/service/bar) "sIf" = ( /obj/structure/cable, @@ -36561,7 +36633,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/carpet/lone/star, +/turf/open/floor/wood, /area/station/service/bar) "sKC" = ( /obj/effect/landmark/start/cook, @@ -37832,7 +37904,10 @@ dir = 6 }, /obj/structure/table/wood, -/turf/open/floor/carpet/lone/star, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/carpet, /area/station/service/bar) "tym" = ( /obj/machinery/camera/autoname/directional/west, @@ -38260,6 +38335,7 @@ "tIS" = ( /obj/machinery/light_switch/directional/east, /obj/structure/table/wood, +/obj/effect/turf_decal/siding/wood, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/commons/lounge) "tIV" = ( @@ -38567,7 +38643,7 @@ "tQS" = ( /obj/machinery/restaurant_portal/bar, /turf/open/floor/wood, -/area/station/service/kitchen) +/area/station/service/bar) "tQV" = ( /obj/effect/turf_decal/stripes, /obj/machinery/camera/autoname/directional/south, @@ -40317,7 +40393,7 @@ /area/station/maintenance/starboard/upper) "uGO" = ( /obj/structure/table/wood, -/turf/open/floor/carpet/lone/star, +/turf/open/floor/carpet, /area/station/service/bar) "uHd" = ( /obj/effect/turf_decal/stripes/line{ @@ -40383,7 +40459,7 @@ /obj/machinery/smartfridge/drinks{ icon_state = "boozeomat" }, -/turf/open/floor/carpet/lone/star, +/turf/open/floor/carpet, /area/station/service/bar) "uIg" = ( /obj/machinery/light_switch/directional/north, @@ -41580,6 +41656,7 @@ "vjL" = ( /obj/structure/railing, /mob/living/basic/chicken, +/obj/effect/turf_decal/siding/wood, /turf/open/misc/sandy_dirt, /area/station/service/hydroponics/upper) "vkl" = ( @@ -42167,6 +42244,9 @@ "vyi" = ( /obj/structure/window/spawner/directional/west, /obj/machinery/light/floor/has_bulb, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/commons/lounge) "vyk" = ( @@ -42437,7 +42517,7 @@ dir = 8 }, /turf/open/floor/plating/ocean, -/area/ocean) +/area/ocean/near_station_powered) "vIv" = ( /obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -43020,7 +43100,7 @@ dir = 4 }, /turf/open/floor/plating/ocean, -/area/ocean) +/area/ocean/near_station_powered) "vXy" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/carpet, @@ -43716,7 +43796,7 @@ "wqA" = ( /obj/machinery/light/directional/west, /turf/open/floor/wood, -/area/station/service/kitchen) +/area/station/service/bar) "wqB" = ( /obj/machinery/vending/security, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -44962,7 +45042,10 @@ }, /obj/structure/chair/stool/bar/directional/east, /obj/effect/landmark/event_spawn, -/turf/open/floor/carpet/lone/star, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/turf/open/floor/carpet, /area/station/service/bar) "wYe" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ @@ -46551,7 +46634,10 @@ /area/station/hallway/primary/central) "xKr" = ( /obj/structure/chair/stool/bar/directional/east, -/turf/open/floor/carpet/lone/star, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/carpet, /area/station/service/bar) "xKt" = ( /obj/machinery/drone_dispenser/preloaded, @@ -46836,6 +46922,9 @@ /area/station/commons/lounge) "xPK" = ( /mob/living/basic/chicken/brown, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/open/misc/sandy_dirt, /area/station/service/hydroponics/upper) "xQl" = ( @@ -47084,6 +47173,7 @@ /obj/effect/turf_decal/trimline/green/filled/warning{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/janitor, /turf/open/floor/iron/dark/textured, /area/station/service/hydroponics) "xUD" = ( @@ -63528,17 +63618,17 @@ rcV uIl awY pQl -oyT +lzc tQS wqA eFd nVa lyP -evH +sHS ajP aAK -lLc -eOu +aVb +mIS oWO jFi kUp @@ -63788,7 +63878,7 @@ ddU lzc nJU aVb -pIL +eFd kpQ pIL pIL @@ -64050,7 +64140,7 @@ sHS pIL pIL pIL -uGO +gBb aVb mIS oWO @@ -64564,7 +64654,7 @@ pIL pIL pIL pIL -uGO +gBb mIS aVb oWO @@ -65078,7 +65168,7 @@ uGO qWx uGO uGO -xKr +fWU mIS mSX oWO @@ -65335,7 +65425,7 @@ fPY ciu xKr qmg -pIL +aVb sVF lzc oWO @@ -67635,7 +67725,7 @@ syi bXl skl kMm -dJB +gUS hmD hmD sxX @@ -67901,7 +67991,7 @@ eLw izt hmD rFL -mPO +lLc myg mPO sPD @@ -68158,11 +68248,11 @@ bHT xRl hmD tDO -mPO +lLc kcH kcH aSq -kcH +evH xVm iWZ jdl @@ -68405,7 +68495,7 @@ csW syi clC hNC -xPK +gMs mLJ hmD uRS @@ -70484,12 +70574,12 @@ aah meJ meJ rvq -kwO +jPs fCx fCx fCx fCx -dyB +eOu cfz etN meJ @@ -75569,7 +75659,7 @@ jvq jWG jvq iNI -nhC +jvq sQl nvL kJN @@ -75826,7 +75916,7 @@ jvq fZX pTU iNI -nhC +jvq wMO eeA nqf @@ -78455,7 +78545,7 @@ mdW mdW kwO fCx -dyB +eOu pla pla cZm @@ -78713,7 +78803,7 @@ mdW mdW mdW kwO -dyB +eOu pla euG uHj @@ -79229,7 +79319,7 @@ meJ mdW kwO fCx -dyB +eOu pla pla kDN @@ -79487,7 +79577,7 @@ mdW mdW mdW kwO -dyB +eOu pla pla wqQ @@ -79745,7 +79835,7 @@ meJ mdW mdW kwO -dyB +eOu pla pla pla @@ -80259,7 +80349,7 @@ meJ meJ meJ rvq -mdW +rvq vHZ rDE iMT @@ -80506,7 +80596,7 @@ kND kND hkS rvq -gBb +cfz meJ meJ meJ @@ -81515,7 +81605,7 @@ gmQ qgs ske kND -jPs +qlS xzf xzf xzf From f97ad4742754d86f16a477d752e62bb321cf9fb2 Mon Sep 17 00:00:00 2001 From: "DESKTOP-M4GD565\\LME" Date: Fri, 6 Oct 2023 23:28:37 -0700 Subject: [PATCH 14/26] ben is short --- _maps/map_files/Oshan/oshan.dmm | 147 ++++++++++++++++---------------- 1 file changed, 75 insertions(+), 72 deletions(-) diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index 4f09dbb7bdb2..acf2dd1246be 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -1882,6 +1882,7 @@ "aYq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/bamboo, /area/station/commons/fitness) "aYJ" = ( @@ -4134,9 +4135,12 @@ /turf/open/floor/plating/ocean, /area/ocean) "cfI" = ( -/obj/structure/cable, -/turf/closed/wall, -/area/station/service/bar/backroom) +/obj/structure/lattice, +/obj/machinery/conveyor/auto{ + dir = 9 + }, +/turf/open/floor/plating, +/area/ocean/near_station_powered) "cfO" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -6645,7 +6649,6 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/access/all/service/janitor, /turf/open/floor/iron/grimy, /area/station/service/hydroponics) "dys" = ( @@ -6664,7 +6667,7 @@ /obj/machinery/conveyor/auto{ dir = 9 }, -/turf/open/floor/plating, +/turf/open/floor/plating/ocean, /area/ocean/near_station_powered) "dzo" = ( /obj/machinery/vending/wardrobe/medi_wardrobe, @@ -8424,7 +8427,10 @@ /turf/open/floor/wood/parquet, /area/station/command/heads_quarters/hop) "evH" = ( -/obj/effect/turf_decal/siding/wood, +/obj/structure/cable, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/commons/lounge) "evR" = ( @@ -9194,12 +9200,12 @@ /turf/open/floor/iron/dark/textured, /area/station/security/office) "eOu" = ( -/obj/structure/lattice, -/obj/machinery/conveyor/auto{ - dir = 9 +/mob/living/basic/chicken, +/obj/effect/turf_decal/siding/wood{ + dir = 8 }, -/turf/open/floor/plating/ocean, -/area/ocean/near_station_powered) +/turf/open/misc/sandy_dirt, +/area/station/service/hydroponics/upper) "eOA" = ( /obj/effect/spawner/random/structure/grille, /turf/open/floor/iron/dark, @@ -9410,6 +9416,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/bamboo, /area/station/commons/fitness) "eTz" = ( @@ -11481,13 +11488,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"fWU" = ( -/obj/structure/chair/stool/bar/directional/east, -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/turf/open/floor/carpet, -/area/station/service/bar) "fXb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -11957,6 +11957,7 @@ /obj/machinery/light/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/bamboo, /area/station/commons/fitness) "ggI" = ( @@ -12644,8 +12645,10 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) "gBb" = ( -/obj/structure/table/wood, -/obj/effect/turf_decal/siding/wood, +/obj/structure/chair/stool/bar/directional/east, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/open/floor/carpet, /area/station/service/bar) "gBj" = ( @@ -12993,13 +12996,6 @@ }, /turf/open/floor/iron/smooth, /area/station/ai_monitored/security/armory) -"gMs" = ( -/mob/living/basic/chicken/brown, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/turf/open/misc/sandy_dirt, -/area/station/service/hydroponics/upper) "gMt" = ( /obj/effect/mapping_helpers/burnt_floor, /obj/effect/decal/cleanable/dirt/dust, @@ -13225,13 +13221,6 @@ }, /turf/open/floor/plating, /area/ruin/space/ks13/engineering/secure_storage) -"gUS" = ( -/mob/living/basic/chicken, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/turf/open/misc/sandy_dirt, -/area/station/service/hydroponics/upper) "gVf" = ( /obj/structure/cable/industrial, /obj/structure/disposalpipe/segment, @@ -18876,12 +18865,9 @@ }, /area/station/science/robotics) "jPs" = ( -/obj/structure/lattice, -/obj/machinery/conveyor/auto/inside_corners{ - dir = 9 - }, -/turf/open/floor/plating/ocean, -/area/station/maintenance/port/central) +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/commons/lounge) "jPx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -20442,6 +20428,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/service/bar, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/iron, /area/station/service/bar/backroom) "kDg" = ( @@ -21173,6 +21160,13 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) +"kSs" = ( +/obj/structure/lattice, +/obj/machinery/conveyor/auto/inside_corners{ + dir = 9 + }, +/turf/open/floor/plating/ocean, +/area/station/maintenance/port/central) "kSE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -21904,6 +21898,8 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/cable, /turf/open/floor/bamboo, /area/station/commons/fitness) "lmt" = ( @@ -22913,12 +22909,10 @@ /turf/open/floor/pod/dark, /area/station/security/warden) "lLc" = ( -/obj/structure/cable, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/commons/lounge) +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/carpet, +/area/station/service/bar) "lLl" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod Three"; @@ -23829,6 +23823,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/bamboo, /area/station/commons/fitness) "mnI" = ( @@ -30397,6 +30392,13 @@ /obj/item/book/manual/wiki/security_space_law, /turf/open/floor/iron/grimy, /area/station/service/lawoffice) +"pDv" = ( +/mob/living/basic/chicken/brown, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/misc/sandy_dirt, +/area/station/service/hydroponics/upper) "pDI" = ( /obj/structure/rack, /obj/item/storage/box/lights/mixed, @@ -33214,6 +33216,7 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/aft) "qUv" = ( @@ -44680,6 +44683,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/structure/cable, /turf/open/floor/bamboo, /area/station/commons/fitness) "wPi" = ( @@ -46635,7 +46639,7 @@ "xKr" = ( /obj/structure/chair/stool/bar/directional/east, /obj/effect/turf_decal/siding/wood{ - dir = 4 + dir = 6 }, /turf/open/floor/carpet, /area/station/service/bar) @@ -46923,7 +46927,7 @@ "xPK" = ( /mob/living/basic/chicken/brown, /obj/effect/turf_decal/siding/wood{ - dir = 8 + dir = 1 }, /turf/open/misc/sandy_dirt, /area/station/service/hydroponics/upper) @@ -47159,7 +47163,6 @@ /obj/machinery/door/airlock/hydroponics/glass{ name = "Hydroponics" }, -/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -47173,7 +47176,7 @@ /obj/effect/turf_decal/trimline/green/filled/warning{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/service/janitor, +/obj/effect/mapping_helpers/airlock/access/all/service/general, /turf/open/floor/iron/dark/textured, /area/station/service/hydroponics) "xUD" = ( @@ -63374,7 +63377,7 @@ slV itv oWO oWO -cfI +oWO oWO pug mnD @@ -64140,7 +64143,7 @@ sHS pIL pIL pIL -gBb +lLc aVb mIS oWO @@ -64654,7 +64657,7 @@ pIL pIL pIL pIL -gBb +lLc mIS aVb oWO @@ -65168,7 +65171,7 @@ uGO qWx uGO uGO -fWU +xKr mIS mSX oWO @@ -65423,7 +65426,7 @@ pJI sKn fPY ciu -xKr +gBb qmg aVb sVF @@ -67725,7 +67728,7 @@ syi bXl skl kMm -gUS +eOu hmD hmD sxX @@ -67991,7 +67994,7 @@ eLw izt hmD rFL -lLc +evH myg mPO sPD @@ -68239,7 +68242,7 @@ eig aST hNC opQ -xPK +pDv hmD fbv diP @@ -68248,11 +68251,11 @@ bHT xRl hmD tDO -lLc +evH kcH kcH aSq -evH +jPs xVm iWZ jdl @@ -68495,7 +68498,7 @@ csW syi clC hNC -gMs +xPK mLJ hmD uRS @@ -70574,12 +70577,12 @@ aah meJ meJ rvq -jPs +kSs fCx fCx fCx fCx -eOu +dyB cfz etN meJ @@ -77770,7 +77773,7 @@ aah meJ fXF kTL -dyB +cfI asA asA qPs @@ -78028,7 +78031,7 @@ meJ fXF cfz kwO -dyB +cfI asA asA fkr @@ -78286,7 +78289,7 @@ pHU cfz mdW kwO -dyB +cfI asA asA pla @@ -78545,7 +78548,7 @@ mdW mdW kwO fCx -eOu +dyB pla pla cZm @@ -78803,7 +78806,7 @@ mdW mdW mdW kwO -eOu +dyB pla euG uHj @@ -79319,7 +79322,7 @@ meJ mdW kwO fCx -eOu +dyB pla pla kDN @@ -79577,7 +79580,7 @@ mdW mdW mdW kwO -eOu +dyB pla pla wqQ @@ -79835,7 +79838,7 @@ meJ mdW mdW kwO -eOu +dyB pla pla pla @@ -80093,7 +80096,7 @@ meJ mdW mdW kwO -dyB +cfI rDE lCF cTE From d4540b7773ad9700173eda0f762c6173147ba0f5 Mon Sep 17 00:00:00 2001 From: "DESKTOP-M4GD565\\LME" Date: Sat, 7 Oct 2023 00:33:24 -0700 Subject: [PATCH 15/26] im drungk --- _maps/map_files/Oshan/oshan.dmm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index acf2dd1246be..b2eaf4a6b461 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -9412,13 +9412,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/cargo/storage) -"eTm" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/bamboo, -/area/station/commons/fitness) "eTz" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -27854,7 +27847,6 @@ /obj/effect/turf_decal/tile/green{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/service/janitor, /turf/open/floor/iron/white/textured, /area/station/science/genetics) "omn" = ( @@ -44683,7 +44675,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/structure/cable, /turf/open/floor/bamboo, /area/station/commons/fitness) "wPi" = ( @@ -63121,7 +63112,7 @@ pqp jCA pug rYQ -eTm +aYq aYq ggx rYQ From bcf6b3e793b7e0bcc4fceae4ffd0782868f11b9f Mon Sep 17 00:00:00 2001 From: "DESKTOP-M4GD565\\LME" Date: Sat, 7 Oct 2023 00:45:28 -0700 Subject: [PATCH 16/26] wrestling ring --- _maps/map_files/Oshan/oshan.dmm | 169 +++++++++++++++++++++++++++----- 1 file changed, 142 insertions(+), 27 deletions(-) diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index b2eaf4a6b461..7ab2b8c6f384 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -116,6 +116,18 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/medical/surgery/aft) +"acG" = ( +/obj/structure/railing{ + dir = 5 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/iron/smooth_large{ + icon = 'goon/icons/turf/floors.dmi'; + icon_state = "boxing" + }, +/area/station/commons/fitness) "acI" = ( /obj/machinery/firealarm/directional/south, /turf/open/floor/wood, @@ -6261,6 +6273,18 @@ /obj/item/flashlight/seclite, /turf/open/floor/iron/dark/textured, /area/station/command/heads_quarters/hos) +"doG" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/iron/smooth_large{ + icon = 'goon/icons/turf/floors.dmi'; + icon_state = "boxing" + }, +/area/station/commons/fitness) "doZ" = ( /obj/structure/displaycase/labcage, /turf/open/floor/wood, @@ -8804,6 +8828,26 @@ }, /turf/open/floor/engine, /area/station/science/ordnance/office) +"eEU" = ( +/obj/item/clothing/gloves/boxing{ + pixel_x = -8; + pixel_y = 1 + }, +/obj/item/clothing/gloves/boxing/blue{ + pixel_x = -5; + pixel_y = 7 + }, +/obj/item/clothing/gloves/boxing/green{ + pixel_y = 2; + pixel_x = 1 + }, +/obj/item/clothing/gloves/boxing/yellow{ + pixel_y = 7; + pixel_x = 6 + }, +/obj/structure/table/wood, +/turf/open/floor/bamboo, +/area/station/commons/fitness) "eEZ" = ( /obj/machinery/light/floor/has_bulb, /obj/structure/cable, @@ -9242,6 +9286,15 @@ /obj/effect/turf_decal/sand, /turf/open/floor/plating/ocean, /area/ocean/generated_above) +"ePO" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron/smooth_large{ + icon = 'goon/icons/turf/floors.dmi'; + icon_state = "boxing" + }, +/area/station/commons/fitness) "ePQ" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/trimline/purple/filled/line, @@ -9412,6 +9465,15 @@ }, /turf/open/floor/iron/dark/textured, /area/station/cargo/storage) +"eTm" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/iron/smooth_large{ + icon = 'goon/icons/turf/floors.dmi'; + icon_state = "boxing" + }, +/area/station/commons/fitness) "eTz" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -11843,6 +11905,15 @@ /obj/item/book, /turf/open/floor/carpet/executive, /area/station/command/heads_quarters/hop) +"gdB" = ( +/obj/structure/table/wood, +/obj/item/clothing/ears/earmuffs, +/obj/item/clothing/ears/earmuffs{ + pixel_x = 5; + pixel_y = 3 + }, +/turf/open/floor/bamboo, +/area/station/commons/fitness) "gdO" = ( /obj/machinery/duct/industrial/waste, /obj/structure/disposalpipe/segment{ @@ -11947,11 +12018,13 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) "ggx" = ( -/obj/machinery/light/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/bamboo, +/obj/structure/railing{ + dir = 5 + }, +/turf/open/floor/iron/smooth_large{ + icon = 'goon/icons/turf/floors.dmi'; + icon_state = "boxing" + }, /area/station/commons/fitness) "ggI" = ( /obj/effect/mapping_helpers/airlock/access/all/command/general, @@ -20332,6 +20405,18 @@ /obj/structure/sign/warning/fire, /turf/closed/wall/r_wall, /area/station/maintenance/disposal/incinerator) +"kAN" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/iron/smooth_large{ + icon = 'goon/icons/turf/floors.dmi'; + icon_state = "boxing" + }, +/area/station/commons/fitness) "kBk" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -23933,6 +24018,18 @@ }, /turf/open/floor/iron/dark/diagonal, /area/station/cargo/lobby) +"mpP" = ( +/obj/structure/railing{ + dir = 5 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/iron/smooth_large{ + icon = 'goon/icons/turf/floors.dmi'; + icon_state = "boxing" + }, +/area/station/commons/fitness) "mqy" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/warning{ dir = 9 @@ -24703,6 +24800,15 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) +"mKR" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/iron/smooth_large{ + icon = 'goon/icons/turf/floors.dmi'; + icon_state = "boxing" + }, +/area/station/commons/fitness) "mKU" = ( /obj/effect/decal/cleanable/dirt, /obj/item/bedsheet/mime/double, @@ -42270,6 +42376,15 @@ "vzd" = ( /turf/closed/wall/r_wall, /area/station/command/heads_quarters/hos) +"vzj" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/waterbottle, +/obj/item/reagent_containers/cup/glass/waterbottle{ + pixel_x = -9; + pixel_y = 10 + }, +/turf/open/floor/bamboo, +/area/station/commons/fitness) "vzp" = ( /obj/structure/cable, /turf/open/floor/circuit/green/telecomms/mainframe, @@ -63114,7 +63229,7 @@ pug rYQ aYq aYq -ggx +aYq rYQ rYQ pug @@ -63629,10 +63744,10 @@ kUp oWO rYQ aYq -dwx -dwx -dwx -dwx +rYQ +rYQ +rYQ +rYQ vUg dPH bSj @@ -63886,10 +64001,10 @@ mVu oWO oti aYq -dwx -dwx -dwx -dwx +doG +mKR +mKR +acG gHM dPH ieT @@ -64143,10 +64258,10 @@ jDu oWO oti aYq +ePO dwx dwx -dwx -dwx +ggx gIB dPH bSj @@ -64398,12 +64513,12 @@ oWO exP sUg oWO -vtb +vzj aYq +ePO dwx dwx -dwx -dwx +ggx rYQ dPH oTE @@ -64657,10 +64772,10 @@ lqa oWO vtb aYq -dwx -dwx -dwx -dwx +kAN +eTm +eTm +mpP rYQ dPH oHO @@ -64912,7 +65027,7 @@ oWO ncg hdv oWO -rYQ +vtb aYq rYQ rYQ @@ -65173,8 +65288,8 @@ rYQ cWa rYQ rYQ -rYQ -rYQ +eEU +gdB gop dPH lpu @@ -80342,7 +80457,7 @@ meJ meJ meJ meJ -rvq +mdW rvq vHZ rDE From b351fd86142627881c52f50f49167ce9f5bb3eff Mon Sep 17 00:00:00 2001 From: "DESKTOP-M4GD565\\LME" Date: Sat, 7 Oct 2023 00:48:51 -0700 Subject: [PATCH 17/26] im not afraid of commitment --- _maps/map_files/Oshan/oshan.dmm | 251 ++++++++++++++++---------------- 1 file changed, 125 insertions(+), 126 deletions(-) diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index 7ab2b8c6f384..b9a4dad63b22 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -116,18 +116,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/medical/surgery/aft) -"acG" = ( -/obj/structure/railing{ - dir = 5 - }, -/obj/structure/railing{ - dir = 8 - }, -/turf/open/floor/iron/smooth_large{ - icon = 'goon/icons/turf/floors.dmi'; - icon_state = "boxing" - }, -/area/station/commons/fitness) "acI" = ( /obj/machinery/firealarm/directional/south, /turf/open/floor/wood, @@ -631,6 +619,18 @@ /obj/machinery/rnd/production/techfab/department/service, /turf/open/floor/wood, /area/station/hallway/secondary/service) +"aon" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/iron/smooth_large{ + icon = 'goon/icons/turf/floors.dmi'; + icon_state = "boxing" + }, +/area/station/commons/fitness) "aoV" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, @@ -2566,6 +2566,15 @@ /obj/effect/turf_decal/trimline/purple/filled/warning, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) +"bqt" = ( +/obj/structure/railing{ + dir = 5 + }, +/turf/open/floor/iron/smooth_large{ + icon = 'goon/icons/turf/floors.dmi'; + icon_state = "boxing" + }, +/area/station/commons/fitness) "bqD" = ( /obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/neutral/fourcorners{ @@ -6273,18 +6282,6 @@ /obj/item/flashlight/seclite, /turf/open/floor/iron/dark/textured, /area/station/command/heads_quarters/hos) -"doG" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 8 - }, -/turf/open/floor/iron/smooth_large{ - icon = 'goon/icons/turf/floors.dmi'; - icon_state = "boxing" - }, -/area/station/commons/fitness) "doZ" = ( /obj/structure/displaycase/labcage, /turf/open/floor/wood, @@ -7933,6 +7930,18 @@ dir = 8 }, /area/station/engineering/main) +"egP" = ( +/obj/structure/railing{ + dir = 5 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/iron/smooth_large{ + icon = 'goon/icons/turf/floors.dmi'; + icon_state = "boxing" + }, +/area/station/commons/fitness) "egY" = ( /obj/structure/chair/office{ dir = 8 @@ -8828,26 +8837,6 @@ }, /turf/open/floor/engine, /area/station/science/ordnance/office) -"eEU" = ( -/obj/item/clothing/gloves/boxing{ - pixel_x = -8; - pixel_y = 1 - }, -/obj/item/clothing/gloves/boxing/blue{ - pixel_x = -5; - pixel_y = 7 - }, -/obj/item/clothing/gloves/boxing/green{ - pixel_y = 2; - pixel_x = 1 - }, -/obj/item/clothing/gloves/boxing/yellow{ - pixel_y = 7; - pixel_x = 6 - }, -/obj/structure/table/wood, -/turf/open/floor/bamboo, -/area/station/commons/fitness) "eEZ" = ( /obj/machinery/light/floor/has_bulb, /obj/structure/cable, @@ -9286,15 +9275,6 @@ /obj/effect/turf_decal/sand, /turf/open/floor/plating/ocean, /area/ocean/generated_above) -"ePO" = ( -/obj/structure/railing{ - dir = 1 - }, -/turf/open/floor/iron/smooth_large{ - icon = 'goon/icons/turf/floors.dmi'; - icon_state = "boxing" - }, -/area/station/commons/fitness) "ePQ" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/trimline/purple/filled/line, @@ -9466,13 +9446,13 @@ /turf/open/floor/iron/dark/textured, /area/station/cargo/storage) "eTm" = ( -/obj/structure/railing{ - dir = 4 - }, -/turf/open/floor/iron/smooth_large{ - icon = 'goon/icons/turf/floors.dmi'; - icon_state = "boxing" +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/waterbottle, +/obj/item/reagent_containers/cup/glass/waterbottle{ + pixel_x = -9; + pixel_y = 10 }, +/turf/open/floor/bamboo, /area/station/commons/fitness) "eTz" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -11905,15 +11885,6 @@ /obj/item/book, /turf/open/floor/carpet/executive, /area/station/command/heads_quarters/hop) -"gdB" = ( -/obj/structure/table/wood, -/obj/item/clothing/ears/earmuffs, -/obj/item/clothing/ears/earmuffs{ - pixel_x = 5; - pixel_y = 3 - }, -/turf/open/floor/bamboo, -/area/station/commons/fitness) "gdO" = ( /obj/machinery/duct/industrial/waste, /obj/structure/disposalpipe/segment{ @@ -12021,6 +11992,9 @@ /obj/structure/railing{ dir = 5 }, +/obj/structure/railing{ + dir = 8 + }, /turf/open/floor/iron/smooth_large{ icon = 'goon/icons/turf/floors.dmi'; icon_state = "boxing" @@ -14030,6 +14004,15 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/science/lobby) +"hor" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/iron/smooth_large{ + icon = 'goon/icons/turf/floors.dmi'; + icon_state = "boxing" + }, +/area/station/commons/fitness) "hoz" = ( /turf/closed/wall, /area/station/medical/surgery/aft) @@ -20405,18 +20388,6 @@ /obj/structure/sign/warning/fire, /turf/closed/wall/r_wall, /area/station/maintenance/disposal/incinerator) -"kAN" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 4 - }, -/turf/open/floor/iron/smooth_large{ - icon = 'goon/icons/turf/floors.dmi'; - icon_state = "boxing" - }, -/area/station/commons/fitness) "kBk" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -21977,7 +21948,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/obj/structure/cable, /turf/open/floor/bamboo, /area/station/commons/fitness) "lmt" = ( @@ -24018,18 +23988,6 @@ }, /turf/open/floor/iron/dark/diagonal, /area/station/cargo/lobby) -"mpP" = ( -/obj/structure/railing{ - dir = 5 - }, -/obj/structure/railing{ - dir = 4 - }, -/turf/open/floor/iron/smooth_large{ - icon = 'goon/icons/turf/floors.dmi'; - icon_state = "boxing" - }, -/area/station/commons/fitness) "mqy" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/warning{ dir = 9 @@ -24800,15 +24758,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) -"mKR" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/open/floor/iron/smooth_large{ - icon = 'goon/icons/turf/floors.dmi'; - icon_state = "boxing" - }, -/area/station/commons/fitness) "mKU" = ( /obj/effect/decal/cleanable/dirt, /obj/item/bedsheet/mime/double, @@ -25084,6 +25033,15 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) +"mRG" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/iron/smooth_large{ + icon = 'goon/icons/turf/floors.dmi'; + icon_state = "boxing" + }, +/area/station/commons/fitness) "mRO" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/brown/filled/warning, @@ -34798,6 +34756,15 @@ /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, /area/station/science/robotics/lab) +"rIZ" = ( +/obj/structure/table/wood, +/obj/item/clothing/ears/earmuffs, +/obj/item/clothing/ears/earmuffs{ + pixel_x = 5; + pixel_y = 3 + }, +/turf/open/floor/bamboo, +/area/station/commons/fitness) "rJc" = ( /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; @@ -35008,6 +34975,26 @@ }, /turf/open/floor/iron/grimy, /area/station/security/detectives_office) +"rNP" = ( +/obj/item/clothing/gloves/boxing{ + pixel_x = -8; + pixel_y = 1 + }, +/obj/item/clothing/gloves/boxing/blue{ + pixel_x = -5; + pixel_y = 7 + }, +/obj/item/clothing/gloves/boxing/green{ + pixel_y = 2; + pixel_x = 1 + }, +/obj/item/clothing/gloves/boxing/yellow{ + pixel_y = 7; + pixel_x = 6 + }, +/obj/structure/table/wood, +/turf/open/floor/bamboo, +/area/station/commons/fitness) "rNY" = ( /obj/effect/landmark/start/cargo_technician, /obj/structure/disposalpipe/segment{ @@ -35842,6 +35829,15 @@ "smo" = ( /turf/open/floor/holofloor/beach/coast_t, /area/station/service/library) +"smw" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron/smooth_large{ + icon = 'goon/icons/turf/floors.dmi'; + icon_state = "boxing" + }, +/area/station/commons/fitness) "smC" = ( /obj/machinery/door/airlock/mining/glass{ name = "Mining Dock" @@ -36555,6 +36551,18 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/warning, /turf/open/floor/iron/dark/textured, /area/station/command/bridge) +"sFP" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/iron/smooth_large{ + icon = 'goon/icons/turf/floors.dmi'; + icon_state = "boxing" + }, +/area/station/commons/fitness) "sFY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -42376,15 +42384,6 @@ "vzd" = ( /turf/closed/wall/r_wall, /area/station/command/heads_quarters/hos) -"vzj" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/glass/waterbottle, -/obj/item/reagent_containers/cup/glass/waterbottle{ - pixel_x = -9; - pixel_y = 10 - }, -/turf/open/floor/bamboo, -/area/station/commons/fitness) "vzp" = ( /obj/structure/cable, /turf/open/floor/circuit/green/telecomms/mainframe, @@ -64001,10 +64000,10 @@ mVu oWO oti aYq -doG -mKR -mKR -acG +aon +hor +hor +ggx gHM dPH ieT @@ -64258,10 +64257,10 @@ jDu oWO oti aYq -ePO +smw dwx dwx -ggx +bqt gIB dPH bSj @@ -64513,12 +64512,12 @@ oWO exP sUg oWO -vzj +eTm aYq -ePO +smw dwx dwx -ggx +bqt rYQ dPH oTE @@ -64772,10 +64771,10 @@ lqa oWO vtb aYq -kAN -eTm -eTm -mpP +sFP +mRG +mRG +egP rYQ dPH oHO @@ -65288,8 +65287,8 @@ rYQ cWa rYQ rYQ -eEU -gdB +rNP +rIZ gop dPH lpu From 278dd1c9c916814d37b427cfda68ff15510eb735 Mon Sep 17 00:00:00 2001 From: "DESKTOP-M4GD565\\LME" Date: Sat, 7 Oct 2023 01:14:05 -0700 Subject: [PATCH 18/26] does this help? --- .../screenshot_antag_icons_cyberpolice.png | Bin 677 -> 695 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_cyberpolice.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_cyberpolice.png index ac8a6347bbd71ffa772df99c026a1fb85e1973d8..333a512545efd128bdb56f580fb1659157f018d4 100644 GIT binary patch delta 557 zcmV+|0@D4Z1-Au|7&8O|0000GwrUFi0016POjJbx002!*O*1nyW@cs|A0K*jSz%j1 z&5%=?k76k)DPgLSw2_2>f7eMwK~z|U?Uzk%!Y~kp)5r&?DF+DCY`Uc800c&r*jC~O zRgO@uzyZ3+ZTsfg2~-8TsECY&H#YYBtc>T!rYP?1-u`Y6{_MiztpKI?lZc;4bt^zo z$O**zv+{9(5JVslVOI)gZVDhW_fz#g1aytJ4KB#93zX?orPh^ff43oQ-!V+`@&uJ3 z;Gj!`w|2MN?{}Z=hbDQgxdRqB&^6vn1XpX@ia@>+g;HklAyw6AfFgFFS_h5IbnNQ* zdmR>P*{jQZ0Yfm?cw2>m)+9pS<{Hd}pvS(rHo(OOHJ7@^KLyjFn|scz;0bP0GXFjNObyMGPv- vLRh+qmyUU`gZ&r(DUJagibY>O{snvke9jHKhq^=E00000NkvXXu0mjf#RmYR delta 558 zcmV+}0@3}q1*HX$7=H)@0002hMu!Rj0037|OjJbx002ceB}+XhEhQK_FCRWLA=;jj z>c6!4(Z(4W8Lh3YT~truuciP10RQ08ynAtUae^5e9ug83rKz?fBPlB@G0V--?(Xg( zAR;d=F&P*do2|FY+x&)*36=l=00DGTPE!Ct=GbNc003lqRFPh7e~d{)K~!jg?U(IR zgD?<9p;lBxk;s?g`#-05ySJ0=s6){(PRpJ@2_)R(WJ!uy<~WYyTp79Ig8vX8b*J2b zJwP|5>#_y8rtcMz+yZt}I9xExPSf*PXz3P3!7CSJT=_e2AHh|s8n|EGDUdy21l%C4f6m>GATDYkeAP`2xCc0H zO6Gzjg7~mp83Dqj$UKX_pW}ig0`4BpW)Z&@xz)FTf6{SJZbLAR;~PNp4$QG+&Z2k# z$(&Iik;Vln1$<(z$m8ksO$k^7BbcV?1E86r;Lk;N!H*6}m##Ty;>+Kho>!Ed8Sa9m wm@g9}h~G57Bul+2f%$6V!qd0>zm9bTpAQYv;4BgIg8%>k07*qoM6N<$f(u0U3;+NC From 11c424266725caf7878c9dfd41a8dc1c10872294 Mon Sep 17 00:00:00 2001 From: "DESKTOP-M4GD565\\LME" Date: Sat, 7 Oct 2023 10:31:33 -0700 Subject: [PATCH 19/26] Revert "does this help?" This reverts commit 278dd1c9c916814d37b427cfda68ff15510eb735. --- .../screenshot_antag_icons_cyberpolice.png | Bin 695 -> 677 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_cyberpolice.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_cyberpolice.png index 333a512545efd128bdb56f580fb1659157f018d4..ac8a6347bbd71ffa772df99c026a1fb85e1973d8 100644 GIT binary patch delta 558 zcmV+}0@3}q1*HX$7=H)@0002hMu!Rj0037|OjJbx002ceB}+XhEhQK_FCRWLA=;jj z>c6!4(Z(4W8Lh3YT~truuciP10RQ08ynAtUae^5e9ug83rKz?fBPlB@G0V--?(Xg( zAR;d=F&P*do2|FY+x&)*36=l=00DGTPE!Ct=GbNc003lqRFPh7e~d{)K~!jg?U(IR zgD?<9p;lBxk;s?g`#-05ySJ0=s6){(PRpJ@2_)R(WJ!uy<~WYyTp79Ig8vX8b*J2b zJwP|5>#_y8rtcMz+yZt}I9xExPSf*PXz3P3!7CSJT=_e2AHh|s8n|EGDUdy21l%C4f6m>GATDYkeAP`2xCc0H zO6Gzjg7~mp83Dqj$UKX_pW}ig0`4BpW)Z&@xz)FTf6{SJZbLAR;~PNp4$QG+&Z2k# z$(&Iik;Vln1$<(z$m8ksO$k^7BbcV?1E86r;Lk;N!H*6}m##Ty;>+Kho>!Ed8Sa9m wm@g9}h~G57Bul+2f%$6V!qd0>zm9bTpAQYv;4BgIg8%>k07*qoM6N<$f(u0U3;+NC delta 557 zcmV+|0@D4Z1-Au|7&8O|0000GwrUFi0016POjJbx002!*O*1nyW@cs|A0K*jSz%j1 z&5%=?k76k)DPgLSw2_2>f7eMwK~z|U?Uzk%!Y~kp)5r&?DF+DCY`Uc800c&r*jC~O zRgO@uzyZ3+ZTsfg2~-8TsECY&H#YYBtc>T!rYP?1-u`Y6{_MiztpKI?lZc;4bt^zo z$O**zv+{9(5JVslVOI)gZVDhW_fz#g1aytJ4KB#93zX?orPh^ff43oQ-!V+`@&uJ3 z;Gj!`w|2MN?{}Z=hbDQgxdRqB&^6vn1XpX@ia@>+g;HklAyw6AfFgFFS_h5IbnNQ* zdmR>P*{jQZ0Yfm?cw2>m)+9pS<{Hd}pvS(rHo(OOHJ7@^KLyjFn|scz;0bP0GXFjNObyMGPv- vLRh+qmyUU`gZ&r(DUJagibY>O{snvke9jHKhq^=E00000NkvXXu0mjf#RmYR From a11936e0af9b73b6e8068a5e09400fc54846d719 Mon Sep 17 00:00:00 2001 From: "DESKTOP-M4GD565\\LME" Date: Sat, 7 Oct 2023 16:57:31 -0700 Subject: [PATCH 20/26] rasslin --- _maps/map_files/Oshan/oshan.dmm | 161 +++++++++--------- .../aesthetics/icons/railing_wrestling.dmi | Bin 0 -> 1274 bytes .../modules/aesthetics/objects/railing.dm | 4 + 3 files changed, 89 insertions(+), 76 deletions(-) create mode 100644 monkestation/code/modules/aesthetics/icons/railing_wrestling.dmi diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index b9a4dad63b22..989d96cec4c1 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -620,16 +620,11 @@ /turf/open/floor/wood, /area/station/hallway/secondary/service) "aon" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 8 - }, -/turf/open/floor/iron/smooth_large{ - icon = 'goon/icons/turf/floors.dmi'; - icon_state = "boxing" - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/railing/wrestling, +/turf/open/floor/bamboo, /area/station/commons/fitness) "aoV" = ( /obj/effect/spawner/structure/window/reinforced/plasma, @@ -1405,6 +1400,10 @@ "aNi" = ( /turf/open/floor/engine, /area/station/engineering/main) +"aNU" = ( +/obj/machinery/barsign, +/turf/closed/wall, +/area/station/service/bar) "aOa" = ( /obj/structure/extinguisher_cabinet/directional/east, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -2567,9 +2566,7 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) "bqt" = ( -/obj/structure/railing{ - dir = 5 - }, +/obj/structure/railing/wrestling, /turf/open/floor/iron/smooth_large{ icon = 'goon/icons/turf/floors.dmi'; icon_state = "boxing" @@ -7931,12 +7928,10 @@ }, /area/station/engineering/main) "egP" = ( -/obj/structure/railing{ - dir = 5 - }, -/obj/structure/railing{ +/obj/structure/railing/wrestling{ dir = 4 }, +/obj/structure/railing/wrestling, /turf/open/floor/iron/smooth_large{ icon = 'goon/icons/turf/floors.dmi'; icon_state = "boxing" @@ -8860,7 +8855,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/turf/open/floor/carpet, +/turf/closed/wall, /area/station/service/bar) "eFf" = ( /obj/effect/decal/cleanable/dirt, @@ -9708,6 +9703,9 @@ pixel_y = 8 }, /obj/effect/turf_decal/siding/wood, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "interropriv" + }, /turf/open/floor/carpet, /area/station/service/bar) "eZW" = ( @@ -10730,7 +10728,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "engiewindow"; - dir = 8 + dir = 4 }, /obj/structure/cable, /turf/open/floor/plating, @@ -10880,6 +10878,10 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "interropriv"; + dir = 1 + }, /turf/open/floor/carpet, /area/station/service/bar) "fGK" = ( @@ -11989,12 +11991,10 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) "ggx" = ( -/obj/structure/railing{ - dir = 5 - }, -/obj/structure/railing{ +/obj/structure/railing/wrestling{ dir = 8 }, +/obj/structure/railing/wrestling, /turf/open/floor/iron/smooth_large{ icon = 'goon/icons/turf/floors.dmi'; icon_state = "boxing" @@ -14005,7 +14005,7 @@ /turf/open/floor/iron/showroomfloor, /area/station/science/lobby) "hor" = ( -/obj/structure/railing{ +/obj/structure/railing/wrestling{ dir = 8 }, /turf/open/floor/iron/smooth_large{ @@ -16688,8 +16688,9 @@ /turf/open/floor/iron/white/textured, /area/station/medical/surgery/aft) "iHJ" = ( -/obj/structure/sign/poster/official/cleanliness, -/turf/closed/wall, +/obj/effect/landmark/start/bartender, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/carpet, /area/station/service/bar) "iHN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -18644,9 +18645,6 @@ /obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 8 }, -/obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics Monitoring" - }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "jJy" = ( @@ -22959,6 +22957,9 @@ "lLc" = ( /obj/structure/table/wood, /obj/effect/turf_decal/siding/wood, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "interropriv" + }, /turf/open/floor/carpet, /area/station/service/bar) "lLl" = ( @@ -23040,6 +23041,9 @@ /obj/structure/table/wood, /obj/effect/spawner/random/entertainment/lighter, /obj/effect/turf_decal/siding/wood, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "interropriv" + }, /turf/open/floor/carpet, /area/station/service/bar) "lNZ" = ( @@ -23624,6 +23628,10 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "interropriv"; + dir = 1 + }, /turf/open/floor/carpet, /area/station/service/bar) "mfk" = ( @@ -25034,14 +25042,13 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) "mRG" = ( -/obj/structure/railing{ +/obj/structure/table/wood, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "engiewindow"; dir = 4 }, -/turf/open/floor/iron/smooth_large{ - icon = 'goon/icons/turf/floors.dmi'; - icon_state = "boxing" - }, -/area/station/commons/fitness) +/turf/open/floor/carpet, +/area/station/service/bar) "mRO" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/brown/filled/warning, @@ -31188,7 +31195,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "engiewindow"; - dir = 8 + dir = 4 }, /turf/open/floor/iron, /area/station/engineering/break_room) @@ -31940,7 +31947,8 @@ "qmt" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ - id = "interropriv" + id = "interropriv"; + dir = 1 }, /turf/open/floor/plating, /area/station/security/interrogation) @@ -31985,6 +31993,10 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "interropriv"; + dir = 1 + }, /turf/open/floor/carpet, /area/station/service/bar) "qnG" = ( @@ -33265,7 +33277,6 @@ "qUe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/directional/west, /obj/effect/turf_decal/trimline/green/line{ dir = 4 }, @@ -33340,6 +33351,10 @@ /obj/structure/desk_bell{ pixel_x = -11 }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "engiewindow"; + dir = 4 + }, /turf/open/floor/carpet, /area/station/service/bar) "qWC" = ( @@ -35830,14 +35845,9 @@ /turf/open/floor/holofloor/beach/coast_t, /area/station/service/library) "smw" = ( -/obj/structure/railing{ - dir = 1 - }, -/turf/open/floor/iron/smooth_large{ - icon = 'goon/icons/turf/floors.dmi'; - icon_state = "boxing" - }, -/area/station/commons/fitness) +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/carpet, +/area/station/service/bar) "smC" = ( /obj/machinery/door/airlock/mining/glass{ name = "Mining Dock" @@ -36552,10 +36562,7 @@ /turf/open/floor/iron/dark/textured, /area/station/command/bridge) "sFP" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ +/obj/structure/railing/wrestling{ dir = 4 }, /turf/open/floor/iron/smooth_large{ @@ -38016,6 +38023,10 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "interropriv"; + dir = 1 + }, /turf/open/floor/carpet, /area/station/service/bar) "tym" = ( @@ -40241,7 +40252,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, -/area/ocean/generated_above) +/area/station/engineering/atmos) "uBf" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -43276,11 +43287,9 @@ /turf/open/floor/carpet/neon/simple/orange/nodots, /area/station/cargo/miningoffice) "vYW" = ( -/obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics Monitoring" - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) +/obj/machinery/light/directional/east, +/turf/closed/wall, +/area/station/service/kitchen) "vZk" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -47197,7 +47206,7 @@ /obj/structure/cable, /obj/machinery/light/small/directional/north, /turf/open/floor/plating, -/area/ocean/generated_above) +/area/station/engineering/atmos) "xTO" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Engineering Foyer" @@ -61158,7 +61167,7 @@ bKO kiG kiG kiG -oyT +vYW oyT xkQ oyT @@ -63999,10 +64008,10 @@ qGs mVu oWO oti -aYq aon hor hor +hor ggx gHM dPH @@ -64256,8 +64265,8 @@ jod jDu oWO oti -aYq -smw +aon +dwx dwx dwx bqt @@ -64513,8 +64522,8 @@ exP sUg oWO eTm -aYq -smw +aon +dwx dwx dwx bqt @@ -64770,10 +64779,10 @@ iru lqa oWO vtb -aYq +aon +sFP +sFP sFP -mRG -mRG egP rYQ dPH @@ -65011,13 +65020,13 @@ kRY knL sJo ykL -lzc +aNU iQd aVb qnD uGO -pIL -ejr +smw +iHJ uGO lNO mIS @@ -65268,14 +65277,14 @@ wgZ bow kxW foP -iHJ +lzc ydn aVb wXQ -uGO +mRG qWx -uGO -uGO +mRG +mRG xKr mIS mSX @@ -94505,7 +94514,7 @@ cWz gyA iAR aRd -vYW +qax xeR lvw nLI @@ -97572,7 +97581,7 @@ aah aah aah aah -qYQ +sks xTD ujh lyZ @@ -97829,7 +97838,7 @@ aah aah aah aah -qYQ +sks uBa sks sks diff --git a/monkestation/code/modules/aesthetics/icons/railing_wrestling.dmi b/monkestation/code/modules/aesthetics/icons/railing_wrestling.dmi new file mode 100644 index 0000000000000000000000000000000000000000..8599826f7bd3360ab427d4818fb3d4854c6eb408 GIT binary patch literal 1274 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58CaNs)Vi3hp+HJ2z$e5NNMBJ>YGYt9_ut0A zQ2YP?|2uc?nCKfQ%gL#$sK&&^ELgChwY7D|j2XXHUa|t2Q4-`A%;50sMjDW_qbek# z#3i*jxhS)sBr`vcfuUl~(n%Zn4k-w=Ig(3 zky%i<+k4;t{k!e2Px@RSseUQm{m+C4TQ@&(>9g*-7~H)esrW|nk|l8=Kg{etC?wxx zxbAklwRFuvkBkqVofmm(rmjr0*I4Tw>Ha$Q^ozTVQy)C)Y}=o=Y>%5>!=?nb^uuk8 zlJT$g*RJ^Hm(%+GSG>v77oQW%J_S6xzN^e$&$y(M^K<;6O0&ME)+Ib&A9SXUIy9PL^4xZZ~QF8EUK@nF)0x=@gch)e#B zr=5O>2L7^FDR9l$ujTc>okeHife);cmP9wcJU*F~^_Z?fq~7C4i&>vlvoT$g6I4<- z>dbUV?qbQl?H!%RSy&VpI}@=|*&jZ~y2Mt=MIozS)BTpR z6U(hT$*=aYB`suN)dD&c-vJ*J0VUuCelZ zJ-e0Ih2ML3$4$7-U&?rE?d^3(zu9Uu-p!8KUw)nY-dE??Z}~}o@5Sm@T<8CKuj@;ZUKCF>{Ra7DW`g>;Cvnvhhe*@-kynf)K@|ye0&s81V z%lGVu=C$|1>3bifw)igU`&BaF69=U8os z7R?py@D=#`_qI;MUipAi3~h`|H-0lNO=%<3wbPBCem1}D zT9Nd--i2x2XLf7G^FNy(DzCU#ZnCaXkJaWme;G*lTEpCi=YJ0R9Vq^HKEu7Cz6k&eax{yA)B`BS|wm+6;rUU}OTCXofegyq2K i#G%+CfJ*dC-0u>w?^F2Q^h{t$#Ng@b=d#Wzp$P!@WkhBG literal 0 HcmV?d00001 diff --git a/monkestation/code/modules/aesthetics/objects/railing.dm b/monkestation/code/modules/aesthetics/objects/railing.dm index 2ad7f7a72840..68449d6b7d72 100644 --- a/monkestation/code/modules/aesthetics/objects/railing.dm +++ b/monkestation/code/modules/aesthetics/objects/railing.dm @@ -133,3 +133,7 @@ if(WEST) pix_offset_y = 32 overlays += image(icon, "mcorneroverlay_l[density]", pixel_x = pix_offset_x, pixel_y = pix_offset_y) + +/obj/structure/railing/wrestling + name = "boxing ring" + icon = 'monkestation/code/modules/aesthetics/icons/railing_wrestling.dmi' From 7f783871c09a302eef72037c7d169b0ba06c6191 Mon Sep 17 00:00:00 2001 From: "DESKTOP-M4GD565\\LME" Date: Sat, 7 Oct 2023 20:51:12 -0700 Subject: [PATCH 21/26] finish railing sprites, fix up lighting --- _maps/map_files/Oshan/oshan.dmm | 199 +++++++++++++----- .../aesthetics/icons/railing_wrestling.dmi | Bin 1274 -> 1332 bytes 2 files changed, 143 insertions(+), 56 deletions(-) diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index 989d96cec4c1..c1e2d5767e34 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -620,11 +620,13 @@ /turf/open/floor/wood, /area/station/hallway/secondary/service) "aon" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/railing/wrestling, -/turf/open/floor/bamboo, +/obj/structure/railing/wrestling{ + dir = 8 + }, +/turf/open/floor/iron/smooth_large{ + icon = 'goon/icons/turf/floors.dmi'; + icon_state = "boxing" + }, /area/station/commons/fitness) "aoV" = ( /obj/effect/spawner/structure/window/reinforced/plasma, @@ -1400,10 +1402,6 @@ "aNi" = ( /turf/open/floor/engine, /area/station/engineering/main) -"aNU" = ( -/obj/machinery/barsign, -/turf/closed/wall, -/area/station/service/bar) "aOa" = ( /obj/structure/extinguisher_cabinet/directional/east, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -4933,6 +4931,11 @@ }, /turf/open/floor/wood, /area/station/service/cafeteria) +"cFa" = ( +/obj/effect/landmark/start/bartender, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/carpet, +/area/station/service/bar) "cFn" = ( /obj/effect/turf_decal/siding/blue{ dir = 6 @@ -5551,7 +5554,6 @@ /area/station/security/checkpoint/customs) "cWa" = ( /obj/structure/cable, -/obj/machinery/light/directional/east, /obj/machinery/camera/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -5592,6 +5594,17 @@ /obj/effect/spawner/random/structure/table_or_rack, /turf/open/floor/plating, /area/station/maintenance/port/central) +"cXk" = ( +/obj/structure/table/wood, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "engiewindow"; + dir = 4 + }, +/obj/item/plate{ + pixel_y = 3 + }, +/turf/open/floor/carpet, +/area/station/service/bar) "cXs" = ( /obj/structure/cable, /obj/machinery/door/airlock/external{ @@ -14005,14 +14018,17 @@ /turf/open/floor/iron/showroomfloor, /area/station/science/lobby) "hor" = ( -/obj/structure/railing/wrestling{ - dir = 8 +/obj/structure/table/wood, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "engiewindow"; + dir = 4 }, -/turf/open/floor/iron/smooth_large{ - icon = 'goon/icons/turf/floors.dmi'; - icon_state = "boxing" +/obj/item/plate, +/obj/item/plate{ + pixel_y = 3 }, -/area/station/commons/fitness) +/turf/open/floor/carpet, +/area/station/service/bar) "hoz" = ( /turf/closed/wall, /area/station/medical/surgery/aft) @@ -15357,6 +15373,10 @@ /area/station/engineering/atmos) "hWe" = ( /obj/structure/table/wood, +/obj/item/clothing/head/costume/sombrero, +/obj/item/clothing/head/costume/sombrero/green{ + pixel_y = -5 + }, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/commons/lounge) "hWk" = ( @@ -16688,9 +16708,8 @@ /turf/open/floor/iron/white/textured, /area/station/medical/surgery/aft) "iHJ" = ( -/obj/effect/landmark/start/bartender, -/obj/machinery/light/floor/has_bulb, -/turf/open/floor/carpet, +/obj/machinery/barsign, +/turf/closed/wall, /area/station/service/bar) "iHN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -20304,6 +20323,10 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/wood, /area/station/service/library) +"kyg" = ( +/obj/machinery/light/directional/east, +/turf/closed/wall, +/area/station/commons/fitness) "kyq" = ( /obj/item/radio/intercom/directional/west, /obj/machinery/button/door/directional/west{ @@ -22816,6 +22839,10 @@ /obj/item/bikehorn, /obj/machinery/light/directional/south, /obj/structure/extinguisher_cabinet/directional/south, +/obj/item/food/pie/cream, +/obj/item/food/pie/cream{ + pixel_y = 8 + }, /turf/open/floor/eighties/red{ icon = 'goon/icons/turf/floors.dmi'; icon_state = "clown_carpet" @@ -22948,6 +22975,17 @@ /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/dark, /area/station/service/chapel) +"lKL" = ( +/obj/structure/table/wood, +/obj/item/clothing/under/costume/skyrat/kimono, +/obj/item/clothing/under/costume/skyrat/kimono/sigmar, +/obj/effect/spawner/random/entertainment/musical_instrument, +/obj/effect/spawner/random/entertainment/musical_instrument{ + pixel_x = 9; + pixel_y = 10 + }, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/commons/lounge) "lKN" = ( /obj/machinery/computer/arcade/orion_trail{ dir = 4 @@ -25042,13 +25080,14 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) "mRG" = ( -/obj/structure/table/wood, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engiewindow"; +/obj/structure/railing/wrestling{ dir = 4 }, -/turf/open/floor/carpet, -/area/station/service/bar) +/turf/open/floor/iron/smooth_large{ + icon = 'goon/icons/turf/floors.dmi'; + icon_state = "boxing" + }, +/area/station/commons/fitness) "mRO" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/brown/filled/warning, @@ -27781,6 +27820,12 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/item/clothing/mask/cigarette/pipe/crackpipe, +/obj/effect/spawner/random/entertainment/musical_instrument, +/obj/effect/spawner/random/entertainment/musical_instrument{ + pixel_x = 9; + pixel_y = 10 + }, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/commons/lounge) "oiN" = ( @@ -32705,6 +32750,14 @@ /obj/effect/turf_decal/tile/brown/fourcorners, /turf/open/floor/iron/dark, /area/station/cargo/sorting) +"qHl" = ( +/obj/structure/table/wood, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "engiewindow"; + dir = 4 + }, +/turf/open/floor/carpet, +/area/station/service/bar) "qHw" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt/dust, @@ -34778,6 +34831,21 @@ pixel_x = 5; pixel_y = 3 }, +/obj/item/clothing/mask/animal/horsehead{ + pixel_y = 7; + pixel_x = -7 + }, +/obj/item/clothing/mask/animal/pig{ + pixel_x = -8 + }, +/obj/item/clothing/mask/animal/cowmask{ + pixel_y = -5; + pixel_x = 9 + }, +/obj/item/clothing/mask/animal/small/bear{ + pixel_y = 8; + pixel_x = 9 + }, /turf/open/floor/bamboo, /area/station/commons/fitness) "rJc" = ( @@ -35845,9 +35913,9 @@ /turf/open/floor/holofloor/beach/coast_t, /area/station/service/library) "smw" = ( -/obj/machinery/light/floor/has_bulb, -/turf/open/floor/carpet, -/area/station/service/bar) +/obj/machinery/light/directional/east, +/turf/closed/wall, +/area/station/service/kitchen) "smC" = ( /obj/machinery/door/airlock/mining/glass{ name = "Mining Dock" @@ -36562,13 +36630,11 @@ /turf/open/floor/iron/dark/textured, /area/station/command/bridge) "sFP" = ( -/obj/structure/railing/wrestling{ - dir = 4 - }, -/turf/open/floor/iron/smooth_large{ - icon = 'goon/icons/turf/floors.dmi'; - icon_state = "boxing" - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/railing/wrestling, +/turf/open/floor/bamboo, /area/station/commons/fitness) "sFY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -38172,6 +38238,13 @@ "tBQ" = ( /turf/closed/wall, /area/station/medical/surgery/theatre) +"tBU" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/directional/south, +/turf/open/floor/wood, +/area/station/service/bar) "tBV" = ( /obj/structure/cable, /turf/open/floor/eighties/red{ @@ -38456,6 +38529,12 @@ /obj/machinery/light_switch/directional/east, /obj/structure/table/wood, /obj/effect/turf_decal/siding/wood, +/obj/item/clothing/under/costume/scarecrow, +/obj/effect/spawner/random/entertainment/musical_instrument, +/obj/effect/spawner/random/entertainment/musical_instrument{ + pixel_x = 9; + pixel_y = 10 + }, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/commons/lounge) "tIV" = ( @@ -39056,6 +39135,10 @@ /obj/machinery/airalarm/directional/south, /obj/item/clothing/mask/cigarette/pipe, /obj/item/clothing/mask/fakemoustache, +/obj/item/food/pie/cream, +/obj/item/food/pie/cream{ + pixel_y = 8 + }, /turf/open/floor/eighties/red{ icon = 'goon/icons/turf/floors.dmi'; icon_state = "clown_carpet" @@ -42581,6 +42664,10 @@ /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/plastic, /area/station/hallway/primary/central) +"vFT" = ( +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/carpet, +/area/station/service/bar) "vGh" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced/spawner/directional/north, @@ -43287,9 +43374,9 @@ /turf/open/floor/carpet/neon/simple/orange/nodots, /area/station/cargo/miningoffice) "vYW" = ( -/obj/machinery/light/directional/east, +/obj/machinery/light/directional/south, /turf/closed/wall, -/area/station/service/kitchen) +/area/station/service/bar) "vZk" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -61167,7 +61254,7 @@ bKO kiG kiG kiG -vYW +smw oyT xkQ oyT @@ -63497,7 +63584,7 @@ pug mnD kmY kmY -pug +kyg pug vSN dPH @@ -64008,10 +64095,10 @@ qGs mVu oWO oti +sFP +aon +aon aon -hor -hor -hor ggx gHM dPH @@ -64265,7 +64352,7 @@ jod jDu oWO oti -aon +sFP dwx dwx dwx @@ -64506,7 +64593,7 @@ asO wOi xvl eZW -lzc +vYW vci aVb mfc @@ -64516,13 +64603,13 @@ qXP pIL eZH mIS -mIS +tBU oWO exP sUg oWO eTm -aon +sFP dwx dwx dwx @@ -64779,10 +64866,10 @@ iru lqa oWO vtb -aon -sFP -sFP sFP +mRG +mRG +mRG egP rYQ dPH @@ -65020,13 +65107,13 @@ kRY knL sJo ykL -aNU +iHJ iQd aVb qnD uGO -smw -iHJ +vFT +cFa uGO lNO mIS @@ -65281,10 +65368,10 @@ lzc ydn aVb wXQ -mRG +cXk qWx -mRG -mRG +qHl +hor xKr mIS mSX @@ -65294,7 +65381,7 @@ rNh oWO rYQ cWa -rYQ +gop rYQ rNP rIZ @@ -68625,7 +68712,7 @@ uJs oiG hWe rgY -hWe +lKL tIS vdg iWZ diff --git a/monkestation/code/modules/aesthetics/icons/railing_wrestling.dmi b/monkestation/code/modules/aesthetics/icons/railing_wrestling.dmi index 8599826f7bd3360ab427d4818fb3d4854c6eb408..06e74c30b59a99d2020e1a620325d2a8714d36d3 100644 GIT binary patch delta 1049 zcmeyxxrJ+kHe>x4PZ!6KiaBp*+vZF^*;ViyBKl1?#-XrJ?a>}96cw>H`h#z>Dg=i{@uLm-+tCwoi;D-f3o*XO4;6x z509rjlHBm9g6jsS8LJ{w>W5y2#$3k^2gw?1hXV-=*$M6fN&#&3_qhdbh_-M{Impk< z!o#+K?Hdb7?PP|=T9Dd5Hej_4OnXIkESVB-+!**@vGKImPg7xuuku145^b*^5MBCb z7H7{de$JTCQ|miH@>5EJAIu7>^92ir!vq5s{AY^1w(h`-4+&n4iQGA7(h5I*80a#=_xpb_UlJ$%`4AOnW=~<6Al!-0WGdND6LXTa@O*`l^RRAfxEmlxOKTb~RWj zGqE5EUil~0(aI#Uz+r8}wSx*jj$G%;kmYIeuQ8W*e9aWa-uyr~UVA~Q0f*hkZ^{z- zTXuIVU(uTJ$K_|=$CK|FIqK)s{+*F}`BiV=w7t7Z|1B?Ue7re-{osuxZ&_YrcCWd{zqsiamHEUvqO`^VQ!mU${S6F}*3D*S%l(lNFy&y~AF< zwC8qV?~5<$pLm^6CZG7#PW*4vp1y<^*$MA8VdCH76Aa zNsK(qEE~QvYe^n3a8U4V)8kHf&mLmbkl4WRtq((x!^ym8X@7KSxpTXJlarbDwrVl?E6@j7d^dRIU|9trgOj-XQ zC>DI&y*1iQ(ct4v^DC@f{BvfnTyo${`fWeah->fb+xIcC&%gTbpmRcf;_z19hDGmH`GNIdmer?n1s8@t-{Lq#=12YsefQ~algfMX z45kCdOBh%+92mI*6!`xCJdnlt<9p3rmN)5l-be;<1vCItCIc&nVvB$iDq-aEk6AbE Wi(pFG1XVc(AnxRPZ!6KiaBp*+vZjVm&g6tz}y zd}R08_4xOM7Y}zevve8nZ}`A{fYqLJ<{_c%_h(+mR_DyWzkG9z@pq4Tr*q1VPwv#U zHt*SA(89EvPm#&>!&QdH+IE3PC5fK}z6yU<45(2S)Wz2F)^=3IS`gTn7WdY<)SPo*!bRMy#U7Wnb0ZtE(c zh_!ZijRZV4ecke_{=?HELt_DppBuj2-y&%7_4D&c-vJ*J0VUuCelZJ-e0Ih2ML3$4$7-U&?rE?d^3(zu9Uu-p!8KUw)nY z-dE??Z}~}o@5Sm@T(9TmMIrIr2Jz?_I)QyR&|Cr9P~Ye^pc=|N47o z*|RGR>3;*}Z@hlsqVk&i%gO=%<3wbPBCem1}DT9Nd--i2x2XLf7G^FNy(DzCU#ZnCaXkJaWm ze;HFfQ2biM+=l0W4*DG^{&zs?#cqe&pP8fnZR>x3_0L?c1D~1u4($KgD8Asp`S^dc zKm2LXo^YOjPmTkFy?M#{kHyZB377tDoU6fbo_`0^&p!uNv#~t*$r!FMU%ujQ14A~$ zJoy6FPd^*Yc{zY4t#h!m|FDgb@tT7^%ct`>|2WEjhSfDT9{7HL62k``O$SDZ4}Ic#S6Q@t;j>6dX{dD|2wkp;li<-q8~q1YmTO7u+J?-H=@Q~2HVOa>tEboFyt I=akR{0QKv~{{R30 From 2214f46e07d9d7d667e31f81aac2e07426cc289a Mon Sep 17 00:00:00 2001 From: "DESKTOP-M4GD565\\LME" Date: Sat, 7 Oct 2023 22:13:15 -0700 Subject: [PATCH 22/26] cleanup --- _maps/map_files/Oshan/oshan.dmm | 421 +++++++++++------- .../modules/aesthetics/objects/railing.dm | 1 + 2 files changed, 265 insertions(+), 157 deletions(-) diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index c1e2d5767e34..edf2ab9a479d 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -376,6 +376,8 @@ "ahc" = ( /obj/effect/mapping_helpers/burnt_floor, /obj/structure/cable, +/obj/item/stack/sheet/iron, +/obj/structure/frame/computer, /turf/open/floor/plating, /area/station/service/electronic_marketing_den) "ahh" = ( @@ -620,13 +622,11 @@ /turf/open/floor/wood, /area/station/hallway/secondary/service) "aon" = ( -/obj/structure/railing/wrestling{ - dir = 8 - }, -/turf/open/floor/iron/smooth_large{ - icon = 'goon/icons/turf/floors.dmi'; - icon_state = "boxing" - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/railing/wrestling, +/turf/open/floor/bamboo, /area/station/commons/fitness) "aoV" = ( /obj/effect/spawner/structure/window/reinforced/plasma, @@ -1167,6 +1167,11 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/engine, /area/station/commons/storage/emergency/port) +"aHz" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/random/entertainment/arcade, +/turf/open/floor/eighties/red, +/area/station/service/electronic_marketing_den) "aIc" = ( /obj/effect/landmark/start/clown, /turf/open/ballpit, @@ -2448,6 +2453,7 @@ "bnB" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/camera/autoname/directional/south, +/obj/effect/spawner/random/entertainment/arcade, /turf/open/floor/plating, /area/station/service/electronic_marketing_den) "bnI" = ( @@ -3367,6 +3373,10 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/aft) +"bIX" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/iron, +/area/station/commons/storage/emergency/port) "bJp" = ( /obj/structure/sink/kitchen/directional/west, /obj/structure/cable, @@ -4163,6 +4173,11 @@ }, /turf/closed/wall, /area/station/maintenance/starboard/aft) +"cgb" = ( +/obj/machinery/light/directional/south, +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/bamboo, +/area/station/commons/fitness) "cgM" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -4931,11 +4946,6 @@ }, /turf/open/floor/wood, /area/station/service/cafeteria) -"cFa" = ( -/obj/effect/landmark/start/bartender, -/obj/machinery/light/floor/has_bulb, -/turf/open/floor/carpet, -/area/station/service/bar) "cFn" = ( /obj/effect/turf_decal/siding/blue{ dir = 6 @@ -5594,17 +5604,6 @@ /obj/effect/spawner/random/structure/table_or_rack, /turf/open/floor/plating, /area/station/maintenance/port/central) -"cXk" = ( -/obj/structure/table/wood, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engiewindow"; - dir = 4 - }, -/obj/item/plate{ - pixel_y = 3 - }, -/turf/open/floor/carpet, -/area/station/service/bar) "cXs" = ( /obj/structure/cable, /obj/machinery/door/airlock/external{ @@ -6006,7 +6005,7 @@ /area/station/commons/vacant_room/commissary) "dik" = ( /obj/machinery/button/door/directional/north{ - id = "roboticsprivacy"; + id = "kitchen"; name = "Kitchen Shutter Control"; req_access = list("kitchen"); pixel_y = -8 @@ -6312,7 +6311,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ dir = 8; - id = "hop"; + id = "westcommissary"; name = "Privacy Shutters" }, /turf/open/floor/plating, @@ -9121,6 +9120,10 @@ /obj/structure/cable, /turf/open/floor/iron/dark/textured, /area/station/cargo/warehouse/upper) +"eKW" = ( +/obj/effect/spawner/random/engineering/tool, +/turf/open/floor/iron, +/area/station/commons/storage/emergency/port) "eLw" = ( /obj/structure/table/wood, /obj/machinery/computer/security/wooden_tv{ @@ -9717,7 +9720,8 @@ }, /obj/effect/turf_decal/siding/wood, /obj/machinery/door/poddoor/shutters/preopen{ - id = "interropriv" + id = "kitchen"; + name = "Kitchen" }, /turf/open/floor/carpet, /area/station/service/bar) @@ -10892,8 +10896,9 @@ dir = 1 }, /obj/machinery/door/poddoor/shutters/preopen{ - id = "interropriv"; - dir = 1 + id = "kitchen"; + dir = 1; + name = "Kitchen" }, /turf/open/floor/carpet, /area/station/service/bar) @@ -12868,6 +12873,10 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/upper) +"gGZ" = ( +/obj/item/pneumatic_cannon/pie, +/turf/open/ballpit, +/area/station/maintenance/port/central) "gHp" = ( /obj/structure/table/wood, /obj/item/storage/fancy/candle_box{ @@ -13636,7 +13645,6 @@ /turf/open/floor/engine, /area/station/engineering/atmos/hfr_room) "hdv" = ( -/obj/item/radio/intercom/directional/east, /obj/machinery/light/small/directional/east, /turf/open/floor/wood, /area/station/service/bar/backroom) @@ -13856,6 +13864,11 @@ }, /turf/open/floor/iron/dark/textured, /area/station/security/brig) +"hiJ" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/chair/stool/directional/south, +/turf/open/floor/eighties/red, +/area/station/service/electronic_marketing_den) "hiO" = ( /obj/structure/lattice, /obj/structure/disposalpipe/segment{ @@ -14018,17 +14031,14 @@ /turf/open/floor/iron/showroomfloor, /area/station/science/lobby) "hor" = ( -/obj/structure/table/wood, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engiewindow"; - dir = 4 +/obj/structure/railing/wrestling{ + dir = 8 }, -/obj/item/plate, -/obj/item/plate{ - pixel_y = 3 +/turf/open/floor/iron/smooth_large{ + icon = 'goon/icons/turf/floors.dmi'; + icon_state = "boxing" }, -/turf/open/floor/carpet, -/area/station/service/bar) +/area/station/commons/fitness) "hoz" = ( /turf/closed/wall, /area/station/medical/surgery/aft) @@ -15575,6 +15585,15 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/aft) +"iaT" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "westcommissary"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, +/area/station/commons/vacant_room/commissary) "iaV" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/structure/sign/warning/engine_safety/directional/south, @@ -15748,6 +15767,10 @@ /obj/structure/barricade/wooden/crude, /turf/open/floor/eighties/red, /area/station/service/electronic_marketing_den) +"igu" = ( +/obj/machinery/barsign, +/turf/closed/wall, +/area/station/service/bar) "igC" = ( /obj/machinery/light/directional/east, /turf/open/floor/wood, @@ -16708,8 +16731,8 @@ /turf/open/floor/iron/white/textured, /area/station/medical/surgery/aft) "iHJ" = ( -/obj/machinery/barsign, -/turf/closed/wall, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/carpet, /area/station/service/bar) "iHN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -17047,7 +17070,6 @@ /turf/open/floor/plating, /area/station/commons/fitness/recreation/entertainment) "iQd" = ( -/obj/machinery/light_switch/directional/north, /obj/machinery/restaurant_portal/restaurant, /turf/open/floor/wood, /area/station/service/bar) @@ -18399,6 +18421,10 @@ }, /turf/open/ballpit, /area/station/security/checkpoint/customs) +"jCp" = ( +/obj/item/chair/stool, +/turf/open/floor/eighties/red, +/area/station/service/electronic_marketing_den) "jCA" = ( /obj/machinery/camera/directional/east, /obj/structure/extinguisher_cabinet/directional/south, @@ -20323,10 +20349,6 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/wood, /area/station/service/library) -"kyg" = ( -/obj/machinery/light/directional/east, -/turf/closed/wall, -/area/station/commons/fitness) "kyq" = ( /obj/item/radio/intercom/directional/west, /obj/machinery/button/door/directional/west{ @@ -20573,6 +20595,10 @@ /obj/effect/spawner/random/structure/table_or_rack, /turf/open/floor/plating, /area/station/maintenance/starboard/central) +"kEi" = ( +/obj/item/radio/intercom/directional/east, +/turf/closed/wall, +/area/station/service/bar/backroom) "kEj" = ( /obj/structure/bed/dogbed, /mob/living/basic/pet/dog/bullterrier{ @@ -21311,7 +21337,6 @@ /turf/open/floor/iron/dark, /area/station/medical/morgue) "kUp" = ( -/obj/machinery/airalarm/directional/south, /obj/item/stack/package_wrap{ pixel_x = -4; pixel_y = 6 @@ -22576,6 +22601,10 @@ }, /turf/open/floor/iron/dark/textured, /area/mine/storage/public) +"lCs" = ( +/obj/machinery/light/directional/east, +/turf/closed/wall, +/area/station/commons/fitness) "lCz" = ( /obj/structure/sign/departments/chemistry/pharmacy, /obj/machinery/vending/drugs, @@ -22975,17 +23004,6 @@ /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/dark, /area/station/service/chapel) -"lKL" = ( -/obj/structure/table/wood, -/obj/item/clothing/under/costume/skyrat/kimono, -/obj/item/clothing/under/costume/skyrat/kimono/sigmar, -/obj/effect/spawner/random/entertainment/musical_instrument, -/obj/effect/spawner/random/entertainment/musical_instrument{ - pixel_x = 9; - pixel_y = 10 - }, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/commons/lounge) "lKN" = ( /obj/machinery/computer/arcade/orion_trail{ dir = 4 @@ -22996,10 +23014,15 @@ /obj/structure/table/wood, /obj/effect/turf_decal/siding/wood, /obj/machinery/door/poddoor/shutters/preopen{ - id = "interropriv" + id = "kitchen"; + name = "Kitchen" }, /turf/open/floor/carpet, /area/station/service/bar) +"lLg" = ( +/obj/machinery/light/directional/south, +/turf/closed/wall, +/area/station/service/bar) "lLl" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod Three"; @@ -23080,7 +23103,8 @@ /obj/effect/spawner/random/entertainment/lighter, /obj/effect/turf_decal/siding/wood, /obj/machinery/door/poddoor/shutters/preopen{ - id = "interropriv" + id = "kitchen"; + name = "Kitchen" }, /turf/open/floor/carpet, /area/station/service/bar) @@ -23667,8 +23691,9 @@ dir = 1 }, /obj/machinery/door/poddoor/shutters/preopen{ - id = "interropriv"; - dir = 1 + id = "kitchen"; + dir = 1; + name = "Kitchen" }, /turf/open/floor/carpet, /area/station/service/bar) @@ -23725,6 +23750,15 @@ }, /turf/open/floor/iron/dark/textured, /area/station/cargo/warehouse/upper) +"mgE" = ( +/obj/effect/spawner/random/techstorage/arcade_boards, +/obj/item/stack/sheet/iron, +/turf/open/floor/eighties/red, +/area/station/service/electronic_marketing_den) +"mgS" = ( +/obj/machinery/light/directional/east, +/turf/closed/wall, +/area/station/service/kitchen) "mhc" = ( /obj/effect/turf_decal/stripes{ dir = 4 @@ -24628,6 +24662,12 @@ "mFK" = ( /turf/open/floor/iron/white/textured, /area/station/medical/treatment_center) +"mFX" = ( +/obj/effect/mapping_helpers/burnt_floor, +/obj/effect/spawner/random/entertainment/arcade, +/obj/item/chair/stool, +/turf/open/floor/eighties/red, +/area/station/service/electronic_marketing_den) "mFY" = ( /obj/machinery/computer/atmos_control/plasma_tank{ dir = 1 @@ -25080,14 +25120,14 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) "mRG" = ( -/obj/structure/railing/wrestling{ +/obj/structure/table/wood, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "kitchen"; + name = "Kitchen"; dir = 4 }, -/turf/open/floor/iron/smooth_large{ - icon = 'goon/icons/turf/floors.dmi'; - icon_state = "boxing" - }, -/area/station/commons/fitness) +/turf/open/floor/carpet, +/area/station/service/bar) "mRO" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/brown/filled/warning, @@ -25905,8 +25945,8 @@ /area/station/commons/dorms) "njU" = ( /obj/machinery/button/door/directional/north{ - id = "roboticsprivacy"; - name = "Kitchen Shutter Control"; + id = "westcommissary"; + name = "West Commissary Shutters"; req_access = list("kitchen"); pixel_y = -8 }, @@ -26420,7 +26460,6 @@ /obj/effect/turf_decal/stripes{ dir = 5 }, -/obj/machinery/camera/autoname/directional/north, /obj/structure/reagent_dispensers/beerkeg, /turf/open/floor/wood, /area/station/service/bar/backroom) @@ -32039,8 +32078,9 @@ dir = 1 }, /obj/machinery/door/poddoor/shutters/preopen{ - id = "interropriv"; - dir = 1 + id = "kitchen"; + dir = 1; + name = "Kitchen" }, /turf/open/floor/carpet, /area/station/service/bar) @@ -32750,14 +32790,6 @@ /obj/effect/turf_decal/tile/brown/fourcorners, /turf/open/floor/iron/dark, /area/station/cargo/sorting) -"qHl" = ( -/obj/structure/table/wood, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engiewindow"; - dir = 4 - }, -/turf/open/floor/carpet, -/area/station/service/bar) "qHw" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt/dust, @@ -33405,7 +33437,8 @@ pixel_x = -11 }, /obj/machinery/door/poddoor/shutters/preopen{ - id = "engiewindow"; + id = "kitchen"; + name = "Kitchen"; dir = 4 }, /turf/open/floor/carpet, @@ -34175,6 +34208,13 @@ }, /turf/open/floor/carpet/orange, /area/station/command/heads_quarters/ce) +"rqz" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/directional/south, +/turf/open/floor/wood, +/area/station/service/bar) "rqG" = ( /obj/effect/turf_decal/tile/purple/opposingcorners, /obj/structure/table, @@ -34487,6 +34527,11 @@ /obj/machinery/stasis, /turf/open/floor/iron/white/textured, /area/station/medical/treatment_center) +"rzB" = ( +/obj/effect/landmark/start/bartender, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/carpet, +/area/station/service/bar) "rzM" = ( /obj/effect/spawner/random/vending/snackvend, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -34627,6 +34672,19 @@ /obj/effect/landmark/start/atmospheric_technician, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) +"rDp" = ( +/obj/structure/table/wood, +/obj/item/plate, +/obj/item/plate{ + pixel_y = 3 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "kitchen"; + name = "Kitchen"; + dir = 4 + }, +/turf/open/floor/carpet, +/area/station/service/bar) "rDs" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 5 @@ -35913,9 +35971,16 @@ /turf/open/floor/holofloor/beach/coast_t, /area/station/service/library) "smw" = ( -/obj/machinery/light/directional/east, -/turf/closed/wall, -/area/station/service/kitchen) +/obj/structure/table/wood, +/obj/item/clothing/under/costume/skyrat/kimono, +/obj/item/clothing/under/costume/skyrat/kimono/sigmar, +/obj/effect/spawner/random/entertainment/musical_instrument, +/obj/effect/spawner/random/entertainment/musical_instrument{ + pixel_x = 9; + pixel_y = 10 + }, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/commons/lounge) "smC" = ( /obj/machinery/door/airlock/mining/glass{ name = "Mining Dock" @@ -36562,15 +36627,6 @@ /area/station/medical/medbay/lobby) "sEJ" = ( /obj/machinery/requests_console/directional/north, -/obj/item/vending_refill/cigarette, -/obj/structure/closet, -/obj/item/wrench, -/obj/item/stack/sheet/glass{ - amount = 30 - }, -/obj/item/stack/sheet/iron{ - amount = 30 - }, /obj/structure/dresser, /turf/open/floor/eighties/red{ icon = 'goon/icons/turf/floors.dmi'; @@ -36630,11 +36686,13 @@ /turf/open/floor/iron/dark/textured, /area/station/command/bridge) "sFP" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/railing/wrestling, -/turf/open/floor/bamboo, +/obj/structure/railing/wrestling{ + dir = 4 + }, +/turf/open/floor/iron/smooth_large{ + icon = 'goon/icons/turf/floors.dmi'; + icon_state = "boxing" + }, /area/station/commons/fitness) "sFY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -36920,6 +36978,11 @@ }, /turf/open/floor/iron/dark, /area/station/science/robotics/mechbay) +"sMY" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/chair/stool, +/turf/open/floor/plating, +/area/station/service/electronic_marketing_den) "sNA" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -37095,6 +37158,11 @@ /obj/structure/curtain, /turf/open/floor/noslip, /area/station/medical/pharmacy) +"sSk" = ( +/obj/effect/mapping_helpers/burnt_floor, +/obj/effect/landmark/event_spawn, +/turf/open/floor/eighties/red, +/area/station/service/electronic_marketing_den) "sSo" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -37789,6 +37857,7 @@ /area/station/science/ordnance/office) "tnM" = ( /obj/machinery/light/directional/south, +/obj/effect/spawner/random/engineering/tool, /turf/open/floor/iron, /area/station/commons/storage/emergency/port) "toa" = ( @@ -38090,8 +38159,9 @@ dir = 1 }, /obj/machinery/door/poddoor/shutters/preopen{ - id = "interropriv"; - dir = 1 + id = "kitchen"; + dir = 1; + name = "Kitchen" }, /turf/open/floor/carpet, /area/station/service/bar) @@ -38238,13 +38308,6 @@ "tBQ" = ( /turf/closed/wall, /area/station/medical/surgery/theatre) -"tBU" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/light/directional/south, -/turf/open/floor/wood, -/area/station/service/bar) "tBV" = ( /obj/structure/cable, /turf/open/floor/eighties/red{ @@ -38337,6 +38400,11 @@ }, /turf/open/floor/iron/dark/textured, /area/station/engineering/main) +"tEd" = ( +/obj/effect/mapping_helpers/burnt_floor, +/obj/item/chair/stool, +/turf/open/floor/eighties/red, +/area/station/service/electronic_marketing_den) "tEr" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -39712,6 +39780,10 @@ }, /turf/open/floor/plastic, /area/station/hallway/primary/central) +"ulQ" = ( +/obj/machinery/airalarm/directional/north, +/turf/open/floor/bamboo, +/area/station/commons/fitness) "umh" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -40141,6 +40213,10 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron/smooth, /area/station/commons/fitness/recreation) +"uwo" = ( +/obj/structure/closet/crate/wooden/toy, +/turf/open/floor/bamboo, +/area/station/commons/fitness) "uwI" = ( /obj/machinery/portable_atmospherics/canister/anesthetic_mix, /obj/effect/turf_decal/trimline/blue/filled/end{ @@ -42664,10 +42740,6 @@ /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/plastic, /area/station/hallway/primary/central) -"vFT" = ( -/obj/machinery/light/floor/has_bulb, -/turf/open/floor/carpet, -/area/station/service/bar) "vGh" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced/spawner/directional/north, @@ -43183,6 +43255,18 @@ }, /turf/open/floor/plating, /area/station/hallway/secondary/exit/departure_lounge) +"vUR" = ( +/obj/structure/table/wood, +/obj/item/plate{ + pixel_y = 3 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "kitchen"; + name = "Kitchen"; + dir = 4 + }, +/turf/open/floor/carpet, +/area/station/service/bar) "vUV" = ( /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/trimline/brown/filled/warning, @@ -43376,7 +43460,7 @@ "vYW" = ( /obj/machinery/light/directional/south, /turf/closed/wall, -/area/station/service/bar) +/area/station/service/bar/backroom) "vZk" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -43479,6 +43563,14 @@ /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"wbP" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/spawner/random/techstorage/arcade_boards, +/obj/item/stack/sheet/iron, +/turf/open/floor/eighties/red, +/area/station/service/electronic_marketing_den) "wbU" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -44737,6 +44829,12 @@ "wJX" = ( /turf/closed/wall, /area/station/service/electronic_marketing_den) +"wKb" = ( +/obj/effect/mapping_helpers/burnt_floor, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/random/entertainment/arcade, +/turf/open/floor/eighties/red, +/area/station/service/electronic_marketing_den) "wKB" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -46035,6 +46133,10 @@ /obj/structure/flora/bush/flowers_br/style_random, /turf/open/floor/grass, /area/station/hallway/secondary/exit/departure_lounge) +"xqG" = ( +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "xqO" = ( /obj/machinery/door/airlock/research{ name = "Nanite Controller Room" @@ -46810,7 +46912,12 @@ /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ dir = 8; - id = "hop"; + id = "westcommissary"; + name = "Privacy Shutters" + }, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "westcommissary"; name = "Privacy Shutters" }, /turf/open/floor/plating, @@ -58674,7 +58781,7 @@ kpD kpD foG hLd -hLd +eKW hLd hLd kpD @@ -59704,7 +59811,7 @@ mca mca fXj hLd -hLd +bIX oRY ieT quy @@ -61254,7 +61361,7 @@ bKO kiG kiG kiG -smw +mgS oyT xkQ oyT @@ -63069,7 +63176,7 @@ wOJ rYQ rYQ tym -rYQ +cgb pug ieT fZs @@ -63326,7 +63433,7 @@ aYq aYq aYq rYQ -rYQ +uwo pug bSj ieT @@ -63584,7 +63691,7 @@ pug mnD kmY kmY -kyg +lCs pug vSN dPH @@ -63837,7 +63944,7 @@ oWO jFi kUp oWO -rYQ +ulQ aYq rYQ rYQ @@ -64095,12 +64202,12 @@ qGs mVu oWO oti -sFP -aon -aon aon +hor +hor +hor ggx -gHM +rYQ dPH ieT ope @@ -64352,7 +64459,7 @@ jod jDu oWO oti -sFP +aon dwx dwx dwx @@ -64593,7 +64700,7 @@ asO wOi xvl eZW -vYW +lLg vci aVb mfc @@ -64603,18 +64710,18 @@ qXP pIL eZH mIS -tBU +rqz oWO exP sUg -oWO +vYW eTm -sFP +aon dwx dwx dwx bqt -rYQ +gHM dPH oTE afI @@ -64866,10 +64973,10 @@ iru lqa oWO vtb +aon +sFP +sFP sFP -mRG -mRG -mRG egP rYQ dPH @@ -65107,18 +65214,18 @@ kRY knL sJo ykL -iHJ +igu iQd aVb qnD uGO -vFT -cFa +iHJ +rzB uGO lNO mIS aVb -oWO +kEi ncg hdv oWO @@ -65368,10 +65475,10 @@ lzc ydn aVb wXQ -cXk +vUR qWx -qHl -hor +mRG +rDp xKr mIS mSX @@ -66926,7 +67033,7 @@ kcP kcP xJb dpp -xJb +iaT kcP kcP twN @@ -67138,13 +67245,13 @@ rfc nxP ljv ewL -gMt -ewL -aTw +wKb +hiJ +jCp pyJ kOf grw -ewL +hiJ wJX bfN csW @@ -67397,8 +67504,8 @@ ilm kOf kOf ewL -aTw -kOf +mgE +sSk aTw nmp bnB @@ -67435,7 +67542,7 @@ sEJ lyY tYT iWZ -dNg +gGZ kcP cqw frv @@ -67912,10 +68019,10 @@ aTw uth rwX svH -kOf -aTw -nmp -qet +mFX +jCp +wbP +sMY wJX xmh ttR @@ -67954,7 +68061,7 @@ kcP gws lSK kGi -frv +xqG omy aKn xbh @@ -68166,10 +68273,10 @@ rfc nxP wJX qet -ewL -ewL +aHz +hiJ jIw -kOf +tEd aTw coa ewL @@ -68712,7 +68819,7 @@ uJs oiG hWe rgY -lKL +smw tIS vdg iWZ diff --git a/monkestation/code/modules/aesthetics/objects/railing.dm b/monkestation/code/modules/aesthetics/objects/railing.dm index 68449d6b7d72..3814ef943151 100644 --- a/monkestation/code/modules/aesthetics/objects/railing.dm +++ b/monkestation/code/modules/aesthetics/objects/railing.dm @@ -137,3 +137,4 @@ /obj/structure/railing/wrestling name = "boxing ring" icon = 'monkestation/code/modules/aesthetics/icons/railing_wrestling.dmi' + material_flags = null From e3754858dcaa6bfef0368e18b9ca17f9c5ad0f44 Mon Sep 17 00:00:00 2001 From: "DESKTOP-M4GD565\\LME" Date: Sun, 8 Oct 2023 01:22:23 -0700 Subject: [PATCH 23/26] poop --- _maps/map_files/Oshan/oshan.dmm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index edf2ab9a479d..881275e4f178 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -4161,12 +4161,10 @@ /turf/open/floor/plating/ocean, /area/ocean) "cfI" = ( -/obj/structure/lattice, -/obj/machinery/conveyor/auto{ - dir = 9 - }, -/turf/open/floor/plating, -/area/ocean/near_station_powered) +/obj/effect/turf_decal/tile/green/fourcorners, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/dark/textured, +/area/station/service/hydroponics) "cfO" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -4358,6 +4356,7 @@ /obj/effect/turf_decal/trimline/blue/corner{ dir = 1 }, +/obj/machinery/light/directional/east, /turf/open/floor/iron/white/textured, /area/station/medical/treatment_center) "clC" = ( @@ -6701,6 +6700,7 @@ /area/ocean/near_station_powered) "dzo" = ( /obj/machinery/vending/wardrobe/medi_wardrobe, +/obj/machinery/light/directional/west, /turf/open/floor/iron/white/textured, /area/station/medical/storage) "dzq" = ( @@ -41413,9 +41413,8 @@ /turf/closed/wall/r_wall, /area/station/service/library) "uWO" = ( -/obj/machinery/conveyor{ - dir = 4; - id = "garbage" +/obj/machinery/conveyor/auto/inside_corners{ + dir = 6 }, /turf/open/floor/plating, /area/station/maintenance/disposal) @@ -43808,6 +43807,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, +/obj/machinery/light/directional/east, /turf/open/floor/iron/white/textured, /area/station/medical/office) "whs" = ( @@ -61609,7 +61609,7 @@ jtn uSV vme qBz -dwb +cfI nzU vrw hbh @@ -75970,7 +75970,7 @@ jvq jWG jvq iNI -jvq +nhC sQl nvL kJN @@ -78081,7 +78081,7 @@ aah meJ fXF kTL -cfI +dyB asA asA qPs @@ -78339,7 +78339,7 @@ meJ fXF cfz kwO -cfI +dyB asA asA fkr @@ -78597,7 +78597,7 @@ pHU cfz mdW kwO -cfI +dyB asA asA pla @@ -80404,7 +80404,7 @@ meJ mdW mdW kwO -cfI +dyB rDE lCF cTE From 8337e00f333f883c4643670d975814dbafd8c25d Mon Sep 17 00:00:00 2001 From: "DESKTOP-M4GD565\\LME" Date: Sun, 8 Oct 2023 12:54:36 -0700 Subject: [PATCH 24/26] wuh --- _maps/map_files/Oshan/oshan.dmm | 69 ++++++++++++++++++++++----------- 1 file changed, 46 insertions(+), 23 deletions(-) diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index 881275e4f178..abba0b53a76c 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -7150,6 +7150,7 @@ /area/station/medical/treatment_center) "dMc" = ( /obj/machinery/airalarm/directional/east, +/obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/locker) "dMe" = ( @@ -8374,11 +8375,11 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) "esx" = ( -/obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 }, +/obj/structure/rack, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/locker) "esy" = ( @@ -16381,6 +16382,13 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) +"iwE" = ( +/obj/machinery/door/airlock/bathroom{ + name = "Toilet"; + id_tag = "peepeepoopoo1" + }, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/locker) "iwF" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -17268,6 +17276,15 @@ /area/station/cargo/miningoffice) "iWY" = ( /obj/structure/sink/directional/south, +/obj/structure/mirror/directional/north, +/obj/machinery/button/door/directional/north{ + pixel_x = -8; + id = "peepeepoopoo1"; + normaldoorcontrol = 1; + specialfunctions = 4; + pixel_y = 32; + name = "Restroom Lock" + }, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/locker) "iWZ" = ( @@ -23044,10 +23061,7 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) "lLE" = ( -/obj/structure/sink/directional/east{ - name = "Urinal"; - desc = "Oh god I washed my hands in it..." - }, +/obj/machinery/light/small/directional/west, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/locker) "lMa" = ( @@ -24089,7 +24103,7 @@ pixel_y = 32; name = "Restroom Lock" }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/mirror/directional/north, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/locker) "mqX" = ( @@ -26970,7 +26984,7 @@ /turf/open/floor/iron/grimy, /area/station/service/theater/abandoned) "nJY" = ( -/obj/structure/rack, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/locker) "nKc" = ( @@ -32419,6 +32433,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, +/obj/structure/rack, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/locker) "quU" = ( @@ -33727,11 +33742,9 @@ /turf/open/floor/iron/white/textured, /area/station/medical/pharmacy) "rdF" = ( -/obj/machinery/door/airlock/bathroom{ - name = "Toilet"; - id_tag = "peepeepoopoo" +/obj/structure/toilet{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/locker) "rdL" = ( @@ -34311,6 +34324,9 @@ /area/station/commons/fitness/recreation/entertainment) "rta" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/locker) "rtb" = ( @@ -35783,6 +35799,13 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/secondary/exit/departure_lounge) +"sgu" = ( +/obj/machinery/door/airlock/bathroom{ + name = "Toilet"; + id_tag = "peepeepoopoo" + }, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/locker) "sgC" = ( /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 @@ -40148,10 +40171,10 @@ /turf/open/floor/grass, /area/station/service/hydroponics) "utN" = ( -/obj/machinery/light/small/directional/south, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/showroomfloor, -/area/station/commons/toilet/locker) +/obj/effect/turf_decal/tile/green/fourcorners, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/dark/textured, +/area/station/service/hydroponics) "utU" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -61631,10 +61654,10 @@ oyT fYK cbc qNu -nJY -fYK qNu +sgu lLE +qNu fYK drg rxV @@ -61891,7 +61914,7 @@ pzs esx fYK iWY -nJY +rdF fYK aGz iAJ @@ -62146,8 +62169,8 @@ fYK rvH fig rta -rdF -utN +fYK +fYK fYK fYK drg @@ -62405,7 +62428,7 @@ yjV quS fYK mqN -quS +qNu fYK xlX iAJ @@ -62660,8 +62683,8 @@ fYK dMc yjV nJY -fYK -qNu +iwE +cfI fQi fYK ecC From 6b8d1c3b123903d26952127f90cc89f3149b4933 Mon Sep 17 00:00:00 2001 From: "DESKTOP-M4GD565\\LME" Date: Sun, 8 Oct 2023 12:55:05 -0700 Subject: [PATCH 25/26] bathrooms --- _maps/map_files/Oshan/oshan.dmm | 71 ++++++++++++++++----------------- 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index abba0b53a76c..287919fe0448 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -4161,10 +4161,9 @@ /turf/open/floor/plating/ocean, /area/ocean) "cfI" = ( -/obj/effect/turf_decal/tile/green/fourcorners, -/obj/machinery/light/directional/west, -/turf/open/floor/iron/dark/textured, -/area/station/service/hydroponics) +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/locker) "cfO" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -5456,6 +5455,10 @@ /obj/effect/spawner/random/structure/grille, /turf/open/floor/iron, /area/station/maintenance/port/central) +"cTu" = ( +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/locker) "cTx" = ( /obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 1 @@ -15824,6 +15827,13 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/secondary/entry) +"iim" = ( +/obj/machinery/door/airlock/bathroom{ + name = "Toilet"; + id_tag = "peepeepoopoo" + }, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/locker) "iip" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/machinery/chem_master, @@ -16382,13 +16392,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) -"iwE" = ( -/obj/machinery/door/airlock/bathroom{ - name = "Toilet"; - id_tag = "peepeepoopoo1" - }, -/turf/open/floor/iron/showroomfloor, -/area/station/commons/toilet/locker) "iwF" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -23061,7 +23064,7 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) "lLE" = ( -/obj/machinery/light/small/directional/west, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/locker) "lMa" = ( @@ -26984,7 +26987,9 @@ /turf/open/floor/iron/grimy, /area/station/service/theater/abandoned) "nJY" = ( -/obj/structure/cable, +/obj/structure/toilet{ + dir = 8 + }, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/locker) "nKc" = ( @@ -33742,11 +33747,10 @@ /turf/open/floor/iron/white/textured, /area/station/medical/pharmacy) "rdF" = ( -/obj/structure/toilet{ - dir = 8 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/commons/toilet/locker) +/obj/effect/turf_decal/tile/green/fourcorners, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/dark/textured, +/area/station/service/hydroponics) "rdL" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -35799,13 +35803,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/secondary/exit/departure_lounge) -"sgu" = ( -/obj/machinery/door/airlock/bathroom{ - name = "Toilet"; - id_tag = "peepeepoopoo" - }, -/turf/open/floor/iron/showroomfloor, -/area/station/commons/toilet/locker) "sgC" = ( /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 @@ -40171,10 +40168,12 @@ /turf/open/floor/grass, /area/station/service/hydroponics) "utN" = ( -/obj/effect/turf_decal/tile/green/fourcorners, -/obj/machinery/light/directional/west, -/turf/open/floor/iron/dark/textured, -/area/station/service/hydroponics) +/obj/machinery/door/airlock/bathroom{ + name = "Toilet"; + id_tag = "peepeepoopoo1" + }, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/locker) "utU" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -61632,7 +61631,7 @@ jtn uSV vme qBz -cfI +rdF nzU vrw hbh @@ -61655,8 +61654,8 @@ fYK cbc qNu qNu -sgu -lLE +iim +cTu qNu fYK drg @@ -61914,7 +61913,7 @@ pzs esx fYK iWY -rdF +nJY fYK aGz iAJ @@ -62682,8 +62681,8 @@ rss fYK dMc yjV -nJY -iwE +lLE +utN cfI fQi fYK @@ -98315,7 +98314,7 @@ aah aah aah aah -avm +sks sks sks fxe From 266c24e9cad0bcc11e4f90705b1435131f727bf0 Mon Sep 17 00:00:00 2001 From: "DESKTOP-M4GD565\\LME" Date: Sun, 8 Oct 2023 14:43:51 -0700 Subject: [PATCH 26/26] more tweaks --- _maps/map_files/Oshan/oshan.dmm | 108 ++++++++++++++++++-------------- 1 file changed, 62 insertions(+), 46 deletions(-) diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index 287919fe0448..b2813f5b8eab 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -1307,7 +1307,7 @@ /turf/open/floor/mineral/titanium, /area/station/ai_monitored/command/storage/eva) "aJB" = ( -/turf/open/floor/carpet/lone/star, +/turf/open/floor/carpet, /area/station/service/chapel/office) "aJE" = ( /obj/machinery/light/directional/south, @@ -2904,7 +2904,7 @@ "bAN" = ( /obj/structure/closet/crate/coffin, /obj/machinery/camera/autoname/directional/north, -/turf/open/floor/carpet/lone/star, +/turf/open/floor/carpet, /area/station/service/chapel/office) "bAP" = ( /turf/closed/wall/r_wall, @@ -4161,7 +4161,7 @@ /turf/open/floor/plating/ocean, /area/ocean) "cfI" = ( -/obj/machinery/light/small/directional/east, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/locker) "cfO" = ( @@ -5455,10 +5455,6 @@ /obj/effect/spawner/random/structure/grille, /turf/open/floor/iron, /area/station/maintenance/port/central) -"cTu" = ( -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron/showroomfloor, -/area/station/commons/toilet/locker) "cTx" = ( /obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 1 @@ -5677,7 +5673,7 @@ "cZD" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/carpet/lone/star, +/turf/open/floor/carpet, /area/station/service/chapel/office) "cZZ" = ( /obj/machinery/camera/autoname/directional/south, @@ -10851,7 +10847,6 @@ /turf/open/floor/plating, /area/station/maintenance/disposal) "fFg" = ( -/obj/effect/landmark/start/scientist, /obj/effect/turf_decal/siding/blue{ dir = 4 }, @@ -10859,6 +10854,7 @@ dir = 8; color = "#EFB341" }, +/obj/effect/landmark/start/research_director, /turf/open/floor/wood/large, /area/station/command/bridge) "fFI" = ( @@ -12488,7 +12484,6 @@ /turf/open/floor/engine, /area/station/commons/storage/emergency/port) "gws" = ( -/obj/structure/mirror/directional/north, /obj/effect/spawner/random/contraband/cannabis, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) @@ -15827,13 +15822,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/secondary/entry) -"iim" = ( -/obj/machinery/door/airlock/bathroom{ - name = "Toilet"; - id_tag = "peepeepoopoo" - }, -/turf/open/floor/iron/showroomfloor, -/area/station/commons/toilet/locker) "iip" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/machinery/chem_master, @@ -16533,7 +16521,7 @@ /area/station/hallway/primary/central) "iAv" = ( /obj/structure/closet/crate/coffin, -/turf/open/floor/carpet/lone/star, +/turf/open/floor/carpet, /area/station/service/chapel/office) "iAJ" = ( /obj/structure/disposalpipe/segment{ @@ -18004,6 +17992,10 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"jrV" = ( +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/locker) "jrX" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating/ocean, @@ -18427,6 +18419,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, /turf/open/floor/plating, /area/station/maintenance/disposal/incinerator) +"jBN" = ( +/obj/machinery/door/airlock/bathroom{ + name = "Toilet"; + id_tag = "peepeepoopoo1" + }, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/locker) "jCa" = ( /obj/structure/chair/sofa/right, /obj/machinery/light/directional/north, @@ -22061,6 +22060,13 @@ }, /turf/open/floor/iron/smooth, /area/station/ai_monitored/security/armory) +"loQ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/structure/rack, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/locker) "loV" = ( /obj/machinery/door/airlock/command/glass{ name = "Bridge" @@ -23064,9 +23070,14 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) "lLE" = ( -/obj/structure/cable, -/turf/open/floor/iron/showroomfloor, -/area/station/commons/toilet/locker) +/obj/machinery/button/door/directional/east{ + id = "service_reception_shutters"; + name = "shutters control"; + pixel_y = -4; + pixel_x = -8 + }, +/turf/closed/wall/r_wall, +/area/station/commons/vacant_room/commissary) "lMa" = ( /obj/structure/sign/warning/cold_temp/directional/north{ name = "\improper CRYOGENICS" @@ -30151,7 +30162,7 @@ dir = 1; id = "crematoriumChapel" }, -/turf/open/floor/carpet/lone/star, +/turf/open/floor/carpet, /area/station/service/chapel/office) "pqN" = ( /obj/effect/spawner/structure/window/reinforced, @@ -32438,7 +32449,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, -/obj/structure/rack, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/locker) "quU" = ( @@ -32626,7 +32636,7 @@ "qBh" = ( /obj/structure/closet/crate/coffin, /obj/machinery/light_switch/directional/south, -/turf/open/floor/carpet/lone/star, +/turf/open/floor/carpet, /area/station/service/chapel/office) "qBk" = ( /obj/effect/turf_decal/trimline/green/filled/line, @@ -34327,10 +34337,7 @@ /turf/open/floor/wood, /area/station/commons/fitness/recreation/entertainment) "rta" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, +/obj/machinery/light/small/directional/west, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/locker) "rtb" = ( @@ -36307,7 +36314,7 @@ /area/station/command/heads_quarters/hos) "svo" = ( /obj/structure/cable, -/turf/open/floor/carpet/lone/star, +/turf/open/floor/carpet, /area/station/service/chapel/office) "svv" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -37379,6 +37386,15 @@ /obj/machinery/suit_storage_unit/medical, /turf/open/floor/iron/white/textured, /area/station/medical/storage) +"sXu" = ( +/obj/machinery/button/door/directional/north{ + id = "west commissary doors"; + name = "West Commissary Shutters"; + req_access = list("kitchen"); + pixel_y = -8 + }, +/turf/closed/wall, +/area/station/commons/vacant_room/commissary) "sYe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -39493,12 +39509,6 @@ "uea" = ( /obj/machinery/light/no_nightlight/directional/north, /obj/structure/table/reinforced, -/obj/machinery/button/door/directional/east{ - id = "service_reception_shutters"; - name = "shutters control"; - pixel_y = -4; - pixel_x = -8 - }, /obj/item/paper_bin{ pixel_x = 6; pixel_y = 2 @@ -40170,7 +40180,7 @@ "utN" = ( /obj/machinery/door/airlock/bathroom{ name = "Toilet"; - id_tag = "peepeepoopoo1" + id_tag = "peepeepoopoo" }, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/locker) @@ -43443,7 +43453,7 @@ "vYt" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, -/turf/open/floor/carpet/lone/star, +/turf/open/floor/carpet, /area/station/service/chapel/office) "vYD" = ( /obj/structure/window/reinforced/tinted/frosted{ @@ -45483,7 +45493,9 @@ /turf/open/floor/iron/white/textured, /area/station/medical/storage) "xae" = ( -/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/airlock/maintenance{ + id_tag = "west commissary doors" + }, /obj/machinery/duct/industrial/waste, /obj/structure/disposalpipe/segment{ dir = 4 @@ -46942,6 +46954,10 @@ id = "westcommissary"; name = "Privacy Shutters" }, +/obj/item/paper_bin{ + pixel_x = 6; + pixel_y = 2 + }, /turf/open/floor/plating, /area/station/commons/vacant_room/commissary) "xJP" = ( @@ -61654,8 +61670,8 @@ fYK cbc qNu qNu -iim -cTu +utN +rta qNu fYK drg @@ -62167,7 +62183,7 @@ eYH fYK rvH fig -rta +quS fYK fYK fYK @@ -62424,7 +62440,7 @@ lll fYK rvH yjV -quS +loQ fYK mqN qNu @@ -62681,9 +62697,9 @@ rss fYK dMc yjV -lLE -utN cfI +jBN +jrV fQi fYK ecC @@ -68079,7 +68095,7 @@ lyY vkC iWZ mSq -kcP +sXu gws lSK kGi @@ -86596,7 +86612,7 @@ giY mMM sUj kVT -aKn +lLE uea fFI rYF