diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 05e321c81c21..4af93d6ff876 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -52951,14 +52951,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/hallway/primary/fore) -"mQm" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ - dir = 8 - }, -/obj/structure/window/reinforced/plasma/spawner/directional/west, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) "mQt" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -118632,7 +118624,7 @@ vVc gAw gAw cCY -mQm +qmJ cCY gAw gAw diff --git a/_maps/map_files/Mining/Oshan.dmm b/_maps/map_files/Mining/Oshan.dmm index 3bc29a42195d..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, @@ -24900,7 +24920,7 @@ mt nW nW nW -bE +hs Jq Ev Hv diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index 1b18be14c7d6..b2813f5b8eab 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -67,29 +67,27 @@ }, /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, /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 - }, -/turf/open/floor/iron/white/textured, -/area/station/medical/medbay/lobby) +/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, /turf/open/floor/grass, @@ -207,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{ @@ -253,6 +261,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, @@ -362,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" = ( @@ -478,15 +494,13 @@ /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, -/area/station/service/kitchen) +/obj/machinery/light/directional/west, +/turf/open/floor/carpet, +/area/station/service/bar) "ajQ" = ( /turf/closed/wall/r_wall, /area/station/security/office) @@ -552,7 +566,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, @@ -607,6 +621,13 @@ /obj/machinery/rnd/production/techfab/department/service, /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, +/area/station/commons/fitness) "aoV" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, @@ -959,18 +980,16 @@ /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/structure/table/wood, +/obj/machinery/conveyor/auto{ + dir = 4; + layer = 2.8 }, -/turf/open/floor/iron/kitchen, -/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 @@ -1013,7 +1032,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, @@ -1046,7 +1065,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, @@ -1133,9 +1152,9 @@ /turf/open/floor/iron/dark/textured, /area/station/cargo/warehouse) "aGw" = ( -/obj/machinery/vending/boozeomat, -/turf/closed/wall, -/area/station/service/bar) +/obj/effect/landmark/event_spawn, +/turf/open/floor/wood, +/area/station/commons/lounge) "aGz" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -1148,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, @@ -1283,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, @@ -1313,9 +1337,8 @@ /turf/open/floor/iron/white/textured, /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, +/obj/structure/table/wood, +/obj/effect/spawner/random/entertainment/gambling, /turf/open/floor/wood, /area/station/commons/lounge) "aLs" = ( @@ -1343,12 +1366,16 @@ /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/door/airlock/external{ + name = "Atmospherics External Access" }, -/turf/open/floor/wood, -/area/station/commons/lounge) +/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) "aMs" = ( /obj/machinery/duct/industrial/waste, /obj/structure/disposalpipe/segment{ @@ -1527,12 +1554,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 @@ -1714,9 +1740,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; @@ -1869,12 +1894,11 @@ }, /area/station/command/bridge) "aYq" = ( -/obj/structure/lattice, -/obj/machinery/conveyor/auto{ - dir = 3 - }, -/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, +/obj/structure/cable, +/turf/open/floor/bamboo, +/area/station/commons/fitness) "aYJ" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -1969,6 +1993,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" = ( @@ -2096,7 +2123,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{ @@ -2263,6 +2290,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 @@ -2355,13 +2390,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 @@ -2421,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" = ( @@ -2483,16 +2516,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/warning{ + 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, @@ -2541,6 +2569,13 @@ /obj/effect/turf_decal/trimline/purple/filled/warning, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) +"bqt" = ( +/obj/structure/railing/wrestling, +/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{ @@ -2670,6 +2705,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" = ( @@ -2805,7 +2841,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{ @@ -2868,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, @@ -2981,8 +3017,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) @@ -3076,7 +3116,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, @@ -3154,17 +3194,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{ @@ -3344,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, @@ -3378,11 +3411,8 @@ /turf/open/floor/iron/dark/textured, /area/mine/storage/public) "bKh" = ( -/obj/effect/turf_decal/siding/white{ - dir = 6 - }, -/turf/open/floor/iron/dark, -/area/station/medical/storage) +/turf/closed/wall/r_wall, +/area/station/medical/office) "bKz" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 @@ -3611,9 +3641,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) @@ -3790,7 +3824,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{ @@ -3829,7 +3863,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 @@ -4042,15 +4076,11 @@ /turf/open/floor/iron/dark, /area/station/service/cafeteria) "cdc" = ( -/obj/structure/cable, /obj/structure/disposalpipe/segment{ - dir = 4; - invisibility = 101 + dir = 4 }, -/obj/machinery/light/floor/has_bulb, -/obj/effect/turf_decal/trimline/blue, -/turf/open/floor/iron/dark/textured, -/area/station/medical/medbay/lobby) +/turf/open/floor/engine, +/area/station/maintenance/port/central) "cdv" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/white/filled/corner{ @@ -4119,9 +4149,9 @@ /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) +/obj/structure/chair/stool/directional/east, +/turf/open/floor/wood, +/area/station/commons/lounge) "cfz" = ( /obj/structure/lattice, /obj/structure/disposalpipe/segment{ @@ -4131,20 +4161,20 @@ /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/open/floor/iron/showroomfloor, +/area/station/commons/toilet/locker) "cfO" = ( /obj/structure/disposalpipe/segment{ dir = 9 }, /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; @@ -4195,6 +4225,14 @@ }, /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, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/station/service/bar) "ciA" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -4317,6 +4355,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" = ( @@ -4475,12 +4514,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) @@ -5038,6 +5074,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, @@ -5084,27 +5124,6 @@ /obj/effect/spawner/random/trash/graffiti, /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) "cKY" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/dark_blue/opposingcorners{ @@ -5163,7 +5182,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 @@ -5224,7 +5243,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, @@ -5543,8 +5562,9 @@ /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, /turf/open/floor/bamboo, /area/station/commons/fitness) "cWe" = ( @@ -5653,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, @@ -5976,23 +5996,20 @@ /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/machinery/button/door/directional/north{ + id = "kitchen"; + 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{ desc = "Looks like someone threw it out. Covered in donut crumbs."; @@ -6063,7 +6080,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, @@ -6288,16 +6305,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 = "westcommissary"; + 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, @@ -6394,14 +6410,10 @@ /turf/open/floor/iron/smooth, /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) +/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, @@ -6605,7 +6617,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, @@ -6679,11 +6691,17 @@ /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) +"dzo" = ( +/obj/machinery/vending/wardrobe/medi_wardrobe, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/white/textured, +/area/station/medical/storage) "dzq" = ( /obj/machinery/light/directional/south, /turf/open/floor/iron/dark/textured, @@ -6918,14 +6936,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 @@ -7139,6 +7149,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" = ( @@ -7301,7 +7312,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, @@ -7333,7 +7344,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, @@ -7393,7 +7404,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 @@ -7419,6 +7430,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/near_station_powered) "dTv" = ( /obj/machinery/firealarm/directional/north, /obj/machinery/light/directional/north, @@ -7434,9 +7452,12 @@ /obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ dir = 1 }, -/obj/machinery/vending/medical, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 2 + }, /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 @@ -7596,17 +7617,18 @@ /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, +/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) "dYT" = ( /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 @@ -7744,11 +7766,13 @@ /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, -/area/station/medical/medbay/central) +/obj/structure/cable, +/obj/machinery/computer/records/medical{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/station/medical/office) "ecd" = ( /obj/machinery/telecomms/processor/preset_two, /obj/machinery/camera/autoname/directional/south, @@ -7840,12 +7864,12 @@ /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 +/obj/structure/cable, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 }, -/turf/open/floor/iron/dark/textured, -/area/station/medical/medbay/central) +/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, @@ -7915,6 +7939,16 @@ dir = 8 }, /area/station/engineering/main) +"egP" = ( +/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" + }, +/area/station/commons/fitness) "egY" = ( /obj/structure/chair/office{ dir = 8 @@ -8009,23 +8043,32 @@ /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 }, -/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/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/effect/landmark/start/bartender, +/turf/open/floor/carpet, +/area/station/service/bar) "ejy" = ( /obj/effect/turf_decal/tile/green/half/contrasted, /obj/machinery/light/directional/north, @@ -8043,9 +8086,15 @@ /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/lattice, +/obj/machinery/conveyor/auto{ + dir = 10 + }, +/obj/structure/disposalpipe/trunk{ + dir = 2 + }, +/turf/open/floor/plating/ocean, +/area/ocean/near_station_powered) "elf" = ( /obj/structure/rack, /obj/effect/turf_decal/bot, @@ -8223,7 +8272,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, @@ -8276,6 +8325,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 @@ -8285,7 +8338,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 @@ -8322,11 +8374,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" = ( @@ -8393,7 +8445,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, @@ -8415,18 +8467,12 @@ /turf/open/floor/wood/parquet, /area/station/command/heads_quarters/hop) "evH" = ( -/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" +/obj/structure/cable, +/obj/effect/turf_decal/siding/wood{ + dir = 1 }, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) +/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{ @@ -8537,12 +8583,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{ @@ -8702,7 +8750,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, @@ -8771,6 +8818,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 @@ -8812,9 +8864,11 @@ /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/turf_decal/siding/wood{ + dir = 1 + }, +/turf/closed/wall, +/area/station/service/bar) "eFf" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, @@ -9066,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{ @@ -9186,16 +9244,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, -/obj/machinery/door/airlock{ - name = "Kitchen" +/mob/living/basic/chicken, +/obj/effect/turf_decal/siding/wood{ + dir = 8 }, -/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) +/turf/open/misc/sandy_dirt, +/area/station/service/hydroponics/upper) "eOA" = ( /obj/effect/spawner/random/structure/grille, /turf/open/floor/iron/dark, @@ -9384,21 +9438,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{ @@ -9414,16 +9457,14 @@ /turf/open/floor/iron/dark/textured, /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/structure/table/wood, +/obj/item/reagent_containers/cup/glass/waterbottle, +/obj/item/reagent_containers/cup/glass/waterbottle{ + pixel_x = -9; + pixel_y = 10 }, -/obj/machinery/door/window/right/directional/south, -/turf/open/floor/iron/dark/small, -/area/station/medical/treatment_center) +/turf/open/floor/bamboo, +/area/station/commons/fitness) "eTz" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -9574,7 +9615,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{ @@ -9582,7 +9623,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{ @@ -9673,10 +9714,17 @@ }, /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/table/wood, +/obj/structure/displaycase/forsale/kitchen{ + pixel_y = 8 + }, +/obj/effect/turf_decal/siding/wood, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "kitchen"; + name = "Kitchen" + }, +/turf/open/floor/carpet, +/area/station/service/bar) "eZW" = ( /obj/structure/table, /obj/machinery/plantgenes, @@ -9904,7 +9952,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 @@ -9951,6 +9999,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" = ( @@ -10204,7 +10253,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, @@ -10218,13 +10267,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, @@ -10313,9 +10358,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) @@ -10332,13 +10374,8 @@ /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" - }, -/area/station/service/theater) +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "frP" = ( /turf/open/floor/carpet/executive, /area/station/command/bridge) @@ -10478,7 +10515,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{ @@ -10562,7 +10599,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, @@ -10708,7 +10745,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, @@ -10771,9 +10808,8 @@ /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{ dir = 8 }, @@ -10811,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 }, @@ -10819,6 +10854,7 @@ dir = 8; color = "#EFB341" }, +/obj/effect/landmark/start/research_director, /turf/open/floor/wood/large, /area/station/command/bridge) "fFI" = ( @@ -10854,10 +10890,18 @@ /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, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "kitchen"; + dir = 1; + name = "Kitchen" + }, +/turf/open/floor/carpet, +/area/station/service/bar) "fGK" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -11005,11 +11049,12 @@ /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/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) @@ -11142,7 +11187,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{ @@ -11246,8 +11291,13 @@ /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, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/turf/open/floor/carpet, +/area/station/service/bar) "fQb" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/dark_blue/opposingcorners{ @@ -11288,10 +11338,10 @@ /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 +/obj/structure/chair/wood{ + dir = 4 }, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/wood, /area/station/commons/lounge) "fRj" = ( /obj/machinery/button/ticket_machine{ @@ -11302,9 +11352,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 @@ -11320,8 +11367,9 @@ pixel_x = 32; pixel_y = -13 }, -/turf/open/floor/iron/white/textured_large, -/area/station/medical/medbay/central) +/obj/item/kirbyplants/random, +/turf/open/floor/iron/white/textured, +/area/station/medical/office) "fRn" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /obj/structure/cable, @@ -11401,9 +11449,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{ @@ -11525,7 +11579,7 @@ dir = 4 }, /turf/open/floor/plating/ocean, -/area/ocean/near_station_powered) +/area/ocean) "fXH" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -11752,7 +11806,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" @@ -11954,6 +12008,16 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) +"ggx" = ( +/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" + }, +/area/station/commons/fitness) "ggI" = ( /obj/effect/mapping_helpers/airlock/access/all/command/general, /obj/machinery/door/firedoor, @@ -12258,14 +12322,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, @@ -12422,6 +12483,10 @@ }, /turf/open/floor/engine, /area/station/commons/storage/emergency/port) +"gws" = ( +/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, @@ -12471,7 +12536,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{ @@ -12637,13 +12702,12 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) "gBb" = ( -/obj/structure/lattice, -/obj/structure/disposalpipe/segment{ - dir = 4; - invisibility = 101 +/obj/structure/chair/stool/bar/directional/east, +/obj/effect/turf_decal/siding/wood{ + dir = 4 }, -/turf/open/floor/plating/ocean, -/area/ocean/near_station_powered) +/turf/open/floor/carpet, +/area/station/service/bar) "gBj" = ( /obj/effect/turf_decal/box/corners{ dir = 8 @@ -12716,8 +12780,7 @@ /obj/structure/disposalpipe/segment{ 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, @@ -12809,6 +12872,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{ @@ -12876,7 +12943,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" = ( @@ -13539,7 +13605,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{ @@ -13578,10 +13644,9 @@ /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/machinery/light/small/directional/east, +/turf/open/floor/wood, +/area/station/service/bar/backroom) "hdD" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -13600,13 +13665,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, @@ -13617,7 +13678,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, @@ -13802,6 +13863,22 @@ }, /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{ + 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, @@ -13836,6 +13913,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" = ( @@ -13949,6 +14029,15 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/science/lobby) +"hor" = ( +/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) "hoz" = ( /turf/closed/wall, /area/station/medical/surgery/aft) @@ -14038,7 +14127,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, @@ -14053,6 +14142,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" = ( @@ -14387,8 +14477,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, @@ -14413,14 +14504,14 @@ 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{ - dir = 5 +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 4 }, -/turf/open/floor/iron/dark/textured, -/area/station/commons/lounge) +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/atmos) "hCk" = ( /obj/structure/cable, /obj/structure/disposalpipe/junction/flip{ @@ -14938,7 +15029,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{ @@ -15021,6 +15112,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, @@ -15098,6 +15196,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" = ( @@ -15169,6 +15268,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{ @@ -15273,12 +15381,13 @@ /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" +/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/service/bar) +/area/station/commons/lounge) "hWk" = ( /obj/structure/cable, /obj/machinery/light/directional/west, @@ -15291,36 +15400,30 @@ /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/line{ - dir = 1 - }, /obj/effect/turf_decal/trimline/blue/filled/mid_joiner, -/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" = ( +/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{ @@ -15364,17 +15467,17 @@ /turf/open/floor/iron/grimy, /area/station/service/lawoffice) "hXP" = ( -/obj/item/reagent_containers/cup/glass/drinkingglass{ - pixel_x = 7; - pixel_y = 4 - }, -/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{ - pixel_x = -5; - pixel_y = 6 - }, +/obj/structure/window/spawner/directional/north, /obj/structure/table/wood, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar/backroom) +/obj/structure/window/spawner/directional/south, +/obj/machinery/conveyor/auto{ + dir = 4; + layer = 2.8 + }, +/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{ dir = 5 @@ -15481,6 +15584,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, @@ -15654,6 +15766,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, @@ -15775,13 +15891,11 @@ /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, -/turf/open/floor/iron/white/textured, -/area/station/medical/medbay/lobby) +/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 @@ -15841,7 +15955,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 @@ -15861,7 +15974,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, @@ -15908,7 +16021,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, @@ -16058,6 +16171,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{ @@ -16111,6 +16228,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{ @@ -16393,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{ @@ -16602,9 +16730,9 @@ /turf/open/floor/iron/white/textured, /area/station/medical/surgery/aft) "iHJ" = ( -/obj/structure/sign/poster/official/cleanliness, -/turf/closed/wall, -/area/station/commons/lounge) +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/carpet, +/area/station/service/bar) "iHN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -16699,15 +16827,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{ @@ -16887,7 +17006,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, @@ -16950,10 +17069,9 @@ /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/commons/lounge) +/area/station/service/bar) "iQl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/engineering/glass{ @@ -17003,13 +17121,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, @@ -17156,6 +17267,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" = ( @@ -17366,8 +17486,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, @@ -17790,24 +17914,12 @@ /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/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 }, -/obj/machinery/door/firedoor, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/station/service/bar/backroom) "jol" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/engine, @@ -17830,12 +17942,15 @@ /turf/open/floor/iron, /area/station/bitrunning/den) "jpm" = ( -/obj/machinery/duct/industrial/waste, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/camera/directional/south{ + c_tag = "Theater - Backstage" }, -/turf/open/floor/engine, -/area/station/maintenance/port/central) +/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, @@ -17877,18 +17992,14 @@ }, /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/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 - }, -/turf/open/floor/iron/dark/textured_large, -/area/station/medical/medbay/central) +/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, @@ -18229,13 +18340,12 @@ /turf/open/floor/iron/dark, /area/station/security/office) "jAN" = ( -/obj/effect/turf_decal/stripes{ - dir = 10 +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 4 }, -/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/structure/disposalpipe/segment, +/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, @@ -18277,9 +18387,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" = ( @@ -18312,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, @@ -18326,6 +18440,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, @@ -18345,10 +18463,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, @@ -18400,7 +18528,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, @@ -18409,12 +18537,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, @@ -18582,9 +18709,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" = ( @@ -18852,13 +18976,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/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, @@ -19035,14 +19155,16 @@ dir = 1 }, /turf/open/floor/iron/dark/textured, -/area/station/medical/surgery/theatre) +/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) @@ -19398,19 +19520,11 @@ /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) +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/commons/lounge) "kcP" = ( -/obj/structure/cable, -/turf/open/floor/bamboo, -/area/station/commons/fitness) +/turf/closed/wall, +/area/station/commons/vacant_room/commissary) "kda" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 @@ -19536,8 +19650,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" = ( @@ -19568,7 +19684,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 @@ -19938,8 +20054,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, +/area/station/service/bar) "kqx" = ( /obj/machinery/mecha_part_fabricator/maint, /obj/machinery/light/very_dim/directional/north, @@ -20057,7 +20185,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 @@ -20179,6 +20307,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 @@ -20289,8 +20424,7 @@ /obj/structure/disposalpipe/segment{ 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, @@ -20300,19 +20434,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, @@ -20402,8 +20534,14 @@ /turf/open/floor/iron/dark, /area/station/security/office) "kCz" = ( -/turf/closed/wall/r_wall, -/area/station/service/theater) +/obj/machinery/door/airlock{ + name = "Bar" + }, +/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" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -20476,6 +20614,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{ @@ -20535,16 +20677,19 @@ }, /turf/open/floor/iron/dark/textured, /area/station/engineering/main) -"kGi" = ( -/obj/machinery/duct/industrial/waste, +"kGh" = ( /obj/structure/disposalpipe/segment{ - dir = 6 + dir = 9 }, -/turf/open/floor/eighties/red{ - icon = 'goon/icons/turf/floors.dmi'; - icon_state = "clown_carpet" +/obj/machinery/conveyor/auto/inside_corners{ + dir = 5 }, -/area/station/service/theater) +/turf/open/floor/plating, +/area/station/maintenance/port/central) +"kGi" = ( +/obj/machinery/duct/industrial/waste, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "kGj" = ( /obj/structure/extinguisher_cabinet/directional/east, /obj/machinery/button/door/directional/east{ @@ -20712,15 +20857,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, @@ -20735,7 +20876,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{ @@ -20781,7 +20922,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{ @@ -20883,6 +21024,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" = ( @@ -21131,6 +21275,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, @@ -21170,30 +21321,16 @@ /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/structure/lattice, +/obj/structure/disposalpipe/segment{ + dir = 4; + invisibility = 101 }, -/obj/item/storage/medkit/toxin, -/obj/item/storage/medkit/toxin{ - pixel_x = -3; - pixel_y = -3 +/obj/machinery/conveyor/auto/inside_corners{ + dir = 9 }, -/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) +/turf/open/floor/plating/ocean, +/area/ocean/near_station_powered) "kUi" = ( /turf/open/floor/iron, /area/station/cargo/warehouse/upper) @@ -21205,7 +21342,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{ @@ -21219,14 +21356,16 @@ /turf/open/floor/iron/dark, /area/station/medical/morgue) "kUp" = ( -/obj/effect/turf_decal/stripes{ - dir = 8 +/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{ @@ -21450,7 +21589,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{ @@ -21470,11 +21609,9 @@ /turf/open/floor/iron/smooth, /area/station/commons/fitness/recreation) "lbA" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 6 - }, -/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) "lca" = ( /obj/machinery/duct/industrial/waste, /obj/structure/cable, @@ -21574,7 +21711,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, @@ -21621,8 +21758,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" = ( @@ -21868,10 +22007,14 @@ /turf/open/floor/carpet, /area/station/medical/medbay/central) "lms" = ( +/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, /obj/structure/cable, -/obj/effect/turf_decal/trimline/green/filled/warning, -/turf/open/floor/iron/dark/textured, -/area/station/commons/lounge) +/turf/open/floor/bamboo, +/area/station/commons/fitness) "lmt" = ( /obj/structure/table/wood/fancy/red, /obj/item/food/spaghetti/security, @@ -21909,16 +22052,21 @@ /turf/open/floor/wood, /area/station/commons/lounge) "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 }, /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" @@ -21956,9 +22104,10 @@ /turf/open/floor/engine, /area/station/science/robotics/mechbay) "lqa" = ( -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/commons/fitness) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/station/service/bar/backroom) "lqs" = ( /turf/open/floor/iron/stairs, /area/station/medical/storage) @@ -22083,12 +22232,14 @@ /turf/open/floor/wood, /area/station/commons/fitness/recreation/entertainment) "ltZ" = ( -/obj/effect/turf_decal/tile/blue/full, +/obj/structure/chair/office/light{ + dir = 8 + }, /obj/effect/turf_decal/siding/white{ - dir = 6 + dir = 4 }, -/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, @@ -22200,8 +22351,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" @@ -22247,15 +22401,8 @@ /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, -/area/station/service/kitchen) +/turf/open/floor/carpet, +/area/station/service/bar) "lyY" = ( /turf/open/floor/eighties/red{ icon = 'goon/icons/turf/floors.dmi'; @@ -22281,6 +22428,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, @@ -22293,6 +22444,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" = ( @@ -22475,6 +22627,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, @@ -22608,6 +22764,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, @@ -22731,6 +22894,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" @@ -22869,6 +23036,19 @@ }, /turf/open/floor/pod/dark, /area/station/security/warden) +"lLc" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/wood, +/obj/machinery/door/poddoor/shutters/preopen{ + 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"; @@ -22890,12 +23070,14 @@ /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/button/door/directional/east{ + id = "service_reception_shutters"; + name = "shutters control"; + pixel_y = -4; + pixel_x = -8 }, -/turf/open/floor/iron/showroomfloor, -/area/station/commons/toilet/locker) +/turf/closed/wall/r_wall, +/area/station/commons/vacant_room/commissary) "lMa" = ( /obj/structure/sign/warning/cold_temp/directional/north{ name = "\improper CRYOGENICS" @@ -22945,12 +23127,15 @@ /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/structure/table/wood, +/obj/effect/spawner/random/entertainment/lighter, +/obj/effect/turf_decal/siding/wood, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "kitchen"; + name = "Kitchen" }, -/turf/open/floor/iron/dark/textured, -/area/station/commons/lounge) +/turf/open/floor/carpet, +/area/station/service/bar) "lNZ" = ( /obj/structure/table/glass, /obj/machinery/reagentgrinder{ @@ -23106,13 +23291,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 @@ -23146,11 +23328,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, @@ -23271,7 +23450,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, @@ -23479,9 +23658,9 @@ /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/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, @@ -23534,11 +23713,18 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/chair/wood{ - dir = 4 +/obj/structure/table/wood, +/obj/machinery/camera/autoname/directional/west, +/obj/effect/turf_decal/siding/wood{ + dir = 1 }, -/turf/open/floor/wood, -/area/station/commons/lounge) +/obj/machinery/door/poddoor/shutters/preopen{ + id = "kitchen"; + dir = 1; + name = "Kitchen" + }, +/turf/open/floor/carpet, +/area/station/service/bar) "mfk" = ( /obj/structure/closet/secure_closet/chief_medical, /obj/item/screwdriver, @@ -23546,9 +23732,11 @@ /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/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, @@ -23590,6 +23778,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 @@ -23673,7 +23870,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{ @@ -23775,14 +23972,16 @@ }, /obj/structure/cable/layer3, /turf/open/floor/plating/ocean, -/area/ocean/near_station_powered) +/area/ocean) "mnD" = ( -/obj/machinery/duct/industrial/waste, -/obj/effect/turf_decal/trimline/green/warning{ - dir = 1 +/obj/machinery/door/airlock/public/glass{ + name = "Fitness" }, -/turf/open/floor/iron/dark/textured, -/area/station/commons/lounge) +/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" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner, /turf/open/floor/iron, @@ -23859,8 +24058,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" @@ -23917,7 +24117,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" = ( @@ -23962,13 +24162,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" = ( @@ -24015,6 +24214,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 6 }, +/obj/machinery/disposal/bin, /turf/open/floor/iron, /area/station/engineering/atmos) "msQ" = ( @@ -24036,6 +24236,7 @@ id_tag = "medlobby"; cycle_id = "medbay_lobby" }, +/obj/structure/cable, /turf/open/floor/iron/dark/textured, /area/station/medical/medbay/lobby) "msT" = ( @@ -24155,14 +24356,15 @@ /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 +/obj/machinery/conveyor/auto/inside_corners{ + dir = 5 }, +/turf/open/floor/plating, +/area/station/maintenance/port/central) +"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/white/textured, /area/station/medical/medbay/lobby) "muW" = ( @@ -24227,6 +24429,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, @@ -24268,7 +24480,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, @@ -24420,7 +24632,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{ @@ -24478,6 +24690,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 @@ -24567,12 +24785,6 @@ }, /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) "mHY" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/rack, @@ -24633,9 +24845,8 @@ /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, /turf/open/floor/wood, -/area/station/commons/lounge) +/area/station/service/bar) "mJm" = ( /obj/structure/sign/departments/psychology/directional/west{ pixel_x = 0; @@ -24767,15 +24978,23 @@ /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, -/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" = ( @@ -24873,10 +25092,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 @@ -24911,6 +25129,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" = ( @@ -24926,6 +25147,15 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) +"mRG" = ( +/obj/structure/table/wood, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "kitchen"; + name = "Kitchen"; + dir = 4 + }, +/turf/open/floor/carpet, +/area/station/service/bar) "mRO" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/brown/filled/warning, @@ -24976,8 +25206,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 @@ -25078,12 +25309,13 @@ /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) +/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, @@ -25173,12 +25405,9 @@ /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) +/obj/machinery/power/apc/auto_name/directional/north, +/turf/open/floor/wood, +/area/station/commons/lounge) "mYo" = ( /obj/effect/landmark/start/assistant, /obj/effect/turf_decal/tile/blue/diagonal_centre, @@ -25281,9 +25510,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, @@ -25361,13 +25593,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; @@ -25402,13 +25631,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, @@ -25596,7 +25818,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{ @@ -25750,12 +25972,14 @@ /turf/open/floor/iron/freezer, /area/station/commons/dorms) "njU" = ( -/obj/structure/chair/wood{ - dir = 4 +/obj/machinery/button/door/directional/north{ + id = "westcommissary"; + name = "West Commissary Shutters"; + req_access = list("kitchen"); + pixel_y = -8 }, -/obj/effect/landmark/start/psychologist, -/turf/open/floor/wood, -/area/station/commons/lounge) +/turf/closed/wall, +/area/station/commons/vacant_room/commissary) "nkb" = ( /obj/effect/turf_decal/stripes{ dir = 4 @@ -25913,7 +26137,6 @@ dir = 4; invisibility = 101 }, -/obj/effect/landmark/start/medical_doctor, /turf/open/floor/iron/white/textured, /area/station/medical/storage) "nnY" = ( @@ -25984,18 +26207,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 @@ -26028,15 +26241,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, -/obj/structure/chair/wood{ - dir = 8 - }, -/obj/effect/landmark/start/assistant, -/turf/open/floor/wood, -/area/station/commons/lounge) +/turf/closed/wall, +/area/station/medical/office) "nrd" = ( /obj/machinery/duct/industrial/waste, /obj/structure/disposalpipe/segment, @@ -26044,7 +26250,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, @@ -26160,6 +26366,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" = ( @@ -26184,7 +26393,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, @@ -26205,7 +26414,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, @@ -26231,14 +26440,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 }, +/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) +/area/station/medical/office) "nvY" = ( /obj/effect/turf_decal/sand, /turf/open/floor/plating/ocean, @@ -26278,10 +26488,9 @@ /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 @@ -26417,8 +26626,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 }, @@ -26467,7 +26674,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, @@ -26737,13 +26944,22 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "nIg" = ( -/obj/effect/turf_decal/tile/blue/full, +/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/structure/cable, /obj/effect/turf_decal/siding/white{ dir = 1 }, -/obj/machinery/vending/drugs, -/turf/open/floor/iron/dark/textured_large, -/area/station/medical/medbay/central) +/turf/open/floor/carpet, +/area/station/medical/office) "nIm" = ( /obj/effect/turf_decal/sand, /obj/effect/turf_decal/sand, @@ -26776,13 +26992,15 @@ "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, /area/station/service/theater/abandoned) "nJY" = ( -/obj/structure/rack, +/obj/structure/toilet{ + dir = 8 + }, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/locker) "nKc" = ( @@ -26956,17 +27174,17 @@ /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/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/paramedic, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/station/medical/office) "nNT" = ( /obj/structure/table, /obj/machinery/splicer, @@ -26981,13 +27199,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, @@ -26999,22 +27212,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" = ( @@ -27073,8 +27274,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) @@ -27101,7 +27302,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, @@ -27112,13 +27313,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, @@ -27214,23 +27411,13 @@ /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, -/area/station/service/kitchen) +/obj/structure/table, +/turf/open/floor/carpet, +/area/station/service/bar) "nVh" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 5 @@ -27495,7 +27682,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, @@ -27520,7 +27707,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, @@ -27538,7 +27725,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, -/area/station/medical/surgery/theatre) +/area/station/medical/cryo) "ofu" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 1; @@ -27612,6 +27799,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" = ( @@ -27694,11 +27884,19 @@ /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, +/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/service/bar) +/area/station/commons/lounge) "oiN" = ( /obj/effect/spawner/random/vending/snackvend, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -27735,7 +27933,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, @@ -27750,7 +27948,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{ @@ -27762,8 +27960,12 @@ /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, +/obj/effect/turf_decal/siding/wood, /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 @@ -27771,7 +27973,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, @@ -27844,15 +28046,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, @@ -27994,6 +28190,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" = ( @@ -28060,7 +28259,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; @@ -28132,6 +28331,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, @@ -28247,7 +28450,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, @@ -28429,7 +28632,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" = ( @@ -28551,6 +28756,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, @@ -28587,21 +28799,15 @@ /turf/open/floor/iron/dark, /area/station/service/chapel/office) "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{ @@ -29093,7 +29299,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{ @@ -29235,8 +29441,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/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" = ( @@ -29248,7 +29460,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, @@ -29385,18 +29597,18 @@ /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/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/structure/railing{ - dir = 1 +/obj/item/paper_bin{ + pixel_x = -7; + pixel_y = 4 }, -/obj/machinery/light/floor/has_bulb, -/obj/effect/turf_decal/trimline/blue, -/turf/open/floor/iron/white/textured, -/area/station/medical/medbay/lobby) +/turf/open/floor/iron/dark/textured, +/area/station/medical/office) "pdU" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -29482,7 +29694,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, @@ -29611,7 +29823,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) @@ -29685,7 +29897,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 @@ -29778,7 +29990,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{ @@ -29945,9 +30157,12 @@ /turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "pqM" = ( -/obj/structure/closet/crate/coffin, /obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/carpet/lone/star, +/obj/structure/bodycontainer/crematorium{ + dir = 1; + id = "crematoriumChapel" + }, +/turf/open/floor/carpet, /area/station/service/chapel/office) "pqN" = ( /obj/effect/spawner/structure/window/reinforced, @@ -30167,6 +30382,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" = ( @@ -30351,6 +30569,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, @@ -30547,8 +30772,12 @@ dir = 1 }, /obj/structure/cable, +/obj/structure/chair/wood/wings{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood, /turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/area/station/commons/lounge) "pIc" = ( /obj/machinery/door/airlock/research{ autoclose = 0; @@ -30602,12 +30831,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, +/area/station/service/bar) "pIN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -30669,8 +30894,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, @@ -30800,9 +31026,7 @@ /turf/open/floor/engine, /area/station/engineering/atmos/office) "pMX" = ( -/obj/machinery/conveyor/auto{ - dir = 7 - }, +/obj/machinery/conveyor/auto, /obj/structure/disposalpipe/segment{ dir = 4; invisibility = 101 @@ -31085,7 +31309,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "engiewindow"; - dir = 8 + dir = 4 }, /turf/open/floor/iron, /area/station/engineering/break_room) @@ -31456,6 +31680,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" = ( @@ -31538,7 +31763,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{ @@ -31676,10 +31901,22 @@ /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/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/west, /turf/open/floor/iron/white/textured, /area/station/medical/storage) "qhM" = ( @@ -31765,7 +32002,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{ @@ -31793,6 +32030,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 @@ -31803,6 +32046,14 @@ }, /turf/open/floor/engine, /area/station/science/robotics/mechbay) +"qmg" = ( +/obj/structure/chair/stool/bar/directional/east, +/obj/effect/landmark/start/assistant, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/turf/open/floor/carpet, +/area/station/service/bar) "qmi" = ( /obj/effect/spawner/random/trash/graffiti, /turf/closed/wall, @@ -31810,7 +32061,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) @@ -31845,11 +32097,23 @@ /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 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "kitchen"; + dir = 1; + name = "Kitchen" + }, +/turf/open/floor/carpet, +/area/station/service/bar) "qnG" = ( /obj/machinery/door/airlock/public/glass{ name = "Jim Norton's Quebecois Coffee" @@ -32015,12 +32279,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, +/area/station/service/bar) "qrW" = ( /turf/open/floor/carpet/purple, /area/station/command/heads_quarters/captain/private) @@ -32247,7 +32516,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 @@ -32367,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, @@ -32526,12 +32795,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{ @@ -32793,7 +33063,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, @@ -32834,6 +33104,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" = ( @@ -32977,7 +33248,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, @@ -33112,24 +33383,22 @@ /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/effect/turf_decal/trimline/blue/filled/warning{ + dir = 6 + }, /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/trimline/blue/filled/warning, /turf/open/floor/iron/white/textured, /area/station/medical/storage) "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 }, /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" = ( @@ -33193,14 +33462,17 @@ /turf/open/floor/iron/dark/textured, /area/station/engineering/main) "qWx" = ( -/obj/structure/lattice, -/obj/structure/disposalpipe/segment{ - dir = 4; - invisibility = 101 +/obj/structure/table/wood, +/obj/structure/desk_bell{ + pixel_x = -11 }, -/obj/machinery/conveyor/auto, -/turf/open/floor/plating/ocean, -/area/ocean/near_station_powered) +/obj/machinery/door/poddoor/shutters/preopen{ + id = "kitchen"; + name = "Kitchen"; + dir = 4 + }, +/turf/open/floor/carpet, +/area/station/service/bar) "qWC" = ( /obj/effect/turf_decal/trimline/green/line, /obj/effect/turf_decal/trimline/green/line, @@ -33232,14 +33504,14 @@ /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 +/obj/machinery/chem_dispenser/drinks/beer{ + dir = 8; + pixel_y = 5; + pixel_x = 4 }, -/turf/open/floor/iron/white/textured_large, -/area/station/medical/medbay/central) +/obj/structure/table, +/turf/open/floor/carpet, +/area/station/service/bar) "qYg" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/east, @@ -33362,7 +33634,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, @@ -33377,9 +33649,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{ @@ -33398,7 +33673,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, @@ -33482,13 +33757,10 @@ /turf/open/floor/iron/white/textured, /area/station/medical/pharmacy) "rdF" = ( -/obj/machinery/door/airlock/bathroom{ - name = "Toilet"; - id_tag = "peepeepoopoo" - }, -/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) "rdL" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -33563,6 +33835,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{ @@ -33574,13 +33851,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 @@ -33631,7 +33904,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, @@ -33862,12 +34135,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, @@ -33968,6 +34235,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, @@ -34063,7 +34337,7 @@ /turf/open/floor/wood, /area/station/commons/fitness/recreation/entertainment) "rta" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/small/directional/west, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/locker) "rtb" = ( @@ -34157,7 +34431,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" = ( @@ -34195,7 +34468,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" @@ -34281,6 +34554,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{ @@ -34421,10 +34699,24 @@ /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 }, +/obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/atmos) "rDx" = ( @@ -34508,14 +34800,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 @@ -34593,7 +34880,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, @@ -34622,6 +34909,30 @@ /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 + }, +/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" = ( /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; @@ -34746,7 +35057,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, @@ -34805,11 +35116,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{ @@ -34832,6 +35143,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{ @@ -35320,13 +35651,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, @@ -35394,7 +35718,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) "sdH" = ( /obj/machinery/duct/industrial/waste, @@ -35526,17 +35850,12 @@ /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/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/effect/turf_decal/trimline/blue/filled/warning, +/obj/effect/turf_decal/trimline/blue/filled/mid_joiner, +/obj/structure/chair/office/light, +/obj/effect/landmark/start/medical_doctor, +/turf/open/floor/iron/white/textured, +/area/station/medical/office) "shF" = ( /obj/structure/fans/tiny/forcefield, /turf/open/floor/plating, @@ -35659,7 +35978,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" = ( @@ -35674,6 +35997,17 @@ "smo" = ( /turf/open/floor/holofloor/beach/coast_t, /area/station/service/library) +"smw" = ( +/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" @@ -35834,7 +36168,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{ @@ -35980,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{ @@ -36194,7 +36528,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 @@ -36287,7 +36620,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, @@ -36317,21 +36650,16 @@ /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, -/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'; + icon_state = "clown_carpet" }, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar/backroom) +/area/station/service/theater) "sEU" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -36384,6 +36712,15 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/warning, /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" + }, +/area/station/commons/fitness) "sFY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -36463,8 +36800,8 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/turf/open/floor/wood, -/area/station/commons/lounge) +/turf/open/floor/carpet, +/area/station/service/bar) "sIf" = ( /obj/structure/cable, /turf/open/floor/wood, @@ -36512,21 +36849,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) "sJx" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -36566,9 +36897,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/wood, +/area/station/service/bar) "sKC" = ( /obj/effect/landmark/start/cook, /turf/open/floor/iron/kitchen, @@ -36672,6 +37005,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, @@ -36745,7 +37083,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{ @@ -36770,20 +37108,26 @@ /turf/open/floor/iron/dark/textured, /area/station/cargo/warehouse/upper) "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 @@ -36841,10 +37185,19 @@ /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, /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" = ( @@ -36889,6 +37242,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{ @@ -36981,7 +37341,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, @@ -37022,14 +37382,19 @@ /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) +"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, @@ -37412,8 +37777,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, @@ -37528,6 +37893,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" = ( @@ -37597,10 +37963,9 @@ /turf/open/floor/iron/white/textured, /area/station/science/genetics) "tqP" = ( -/obj/structure/cable, -/obj/machinery/light/directional/east, -/turf/open/floor/bamboo, -/area/station/commons/fitness) +/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, @@ -37669,14 +38034,18 @@ /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 }, -/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{ @@ -37821,8 +38190,17 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/turf/open/floor/wood, -/area/station/commons/lounge) +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "kitchen"; + dir = 1; + name = "Kitchen" + }, +/turf/open/floor/carpet, +/area/station/service/bar) "tym" = ( /obj/machinery/camera/autoname/directional/west, /turf/open/floor/bamboo, @@ -37868,10 +38246,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) "tzt" = ( /obj/machinery/door/airlock/public/glass{ @@ -37900,6 +38275,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, @@ -38003,7 +38385,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 @@ -38044,8 +38426,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, @@ -38054,6 +38436,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{ @@ -38243,14 +38630,17 @@ /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/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 }, -/obj/item/holosign_creator/robot_seat/bar, /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, @@ -38553,6 +38943,10 @@ }, /turf/open/floor/engine, /area/station/engineering/atmos/hfr_room) +"tQS" = ( +/obj/machinery/restaurant_portal/bar, +/turf/open/floor/wood, +/area/station/service/bar) "tQV" = ( /obj/effect/turf_decal/stripes, /obj/machinery/camera/autoname/directional/south, @@ -38572,10 +38966,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/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, @@ -38614,7 +39005,8 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 6 }, -/turf/open/floor/iron, +/obj/machinery/recharge_station, +/turf/open/floor/iron/white/textured, /area/station/medical/storage) "tSW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -38841,13 +39233,21 @@ /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, +/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" + }, +/area/station/service/theater) "tYW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment{ @@ -38976,7 +39376,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{ @@ -39019,7 +39419,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; @@ -39097,7 +39497,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, @@ -39109,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 @@ -39137,12 +39531,13 @@ /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/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, @@ -39151,7 +39546,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 @@ -39288,6 +39683,11 @@ /obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ 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" = ( @@ -39410,6 +39810,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, @@ -39439,14 +39843,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 @@ -39717,7 +40116,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, @@ -39779,8 +40178,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, +/obj/machinery/door/airlock/bathroom{ + name = "Toilet"; + id_tag = "peepeepoopoo" + }, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/locker) "utU" = ( @@ -39828,8 +40229,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, @@ -39843,6 +40245,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{ @@ -39878,8 +40284,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) @@ -40028,15 +40434,16 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) "uBa" = ( +/obj/machinery/door/airlock/external{ + name = "Atmospherics External Access" + }, /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/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 }, -/obj/effect/landmark/start/assistant, -/turf/open/floor/wood, -/area/station/commons/lounge) +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/turf/open/floor/plating, +/area/station/engineering/atmos) "uBf" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -40103,24 +40510,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" = ( @@ -40229,7 +40622,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 @@ -40310,11 +40703,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, +/area/station/service/bar) "uHd" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -40376,13 +40767,11 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "uHW" = ( -/obj/structure/cable, -/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/dark/textured, -/area/station/medical/medbay/lobby) +/turf/open/floor/carpet, +/area/station/service/bar) "uIg" = ( /obj/machinery/light_switch/directional/north, /obj/effect/turf_decal/trimline/red/filled/warning{ @@ -40417,8 +40806,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, @@ -40526,7 +40915,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 @@ -40603,15 +40992,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, @@ -40643,7 +41030,8 @@ /turf/open/floor/plating, /area/station/security/brig) "uOF" = ( -/turf/closed/wall/r_wall, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/iron/white/textured, /area/station/medical/treatment_center) "uOL" = ( /obj/machinery/light/directional/north, @@ -40861,7 +41249,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) @@ -41057,9 +41445,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) @@ -41150,7 +41537,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, @@ -41162,7 +41549,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, @@ -41209,7 +41596,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, @@ -41277,8 +41664,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, @@ -41304,8 +41691,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 @@ -41362,8 +41752,24 @@ /turf/open/floor/iron/dark/textured, /area/station/commons/storage/emergency/starboard) "veM" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 +/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") }, /turf/open/floor/iron/white/textured, /area/station/medical/storage) @@ -41560,6 +41966,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" = ( @@ -41593,11 +42000,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 @@ -41915,7 +42323,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{ @@ -41969,8 +42377,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" = ( @@ -42060,10 +42467,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/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, @@ -42088,7 +42495,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) @@ -42145,12 +42552,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/structure/window/spawner/directional/west, +/obj/machinery/light/floor/has_bulb, +/obj/effect/turf_decal/siding/wood{ + dir = 1 }, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/carpet/neon/simple/green/nodots, /area/station/commons/lounge) "vyk" = ( /obj/structure/chair/wood{ @@ -42350,14 +42757,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, @@ -42378,7 +42779,7 @@ desc = "Fuck off we're closed." }, /turf/open/floor/iron/dark/textured, -/area/station/medical/medbay/central) +/area/station/medical/office) "vGu" = ( /obj/effect/turf_decal/bot{ dir = 1 @@ -42390,7 +42791,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 @@ -42483,17 +42884,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, @@ -42623,10 +43020,9 @@ /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, +/turf/open/floor/iron/white/textured, /area/station/medical/treatment_center) "vOg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -42785,7 +43181,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, @@ -42890,6 +43286,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, @@ -43045,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{ @@ -43081,11 +43489,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/south, +/turf/closed/wall, +/area/station/service/bar/backroom) "vZk" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -43133,7 +43539,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, @@ -43147,7 +43553,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, @@ -43188,6 +43594,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{ @@ -43327,6 +43741,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, @@ -43414,19 +43832,16 @@ /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/structure/chair/sofa/right{ + color = "#52B4E9"; + dir = 8 }, -/obj/item/defibrillator/loaded{ - pixel_y = 3 +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 }, -/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) +/obj/machinery/light/directional/east, +/turf/open/floor/iron/white/textured, +/area/station/medical/office) "whs" = ( /obj/machinery/computer/crew, /turf/open/floor/wood/parquet, @@ -43442,12 +43857,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" = ( @@ -43484,6 +43909,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" = ( @@ -43557,12 +43983,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, @@ -43610,6 +44030,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" = ( @@ -43702,10 +44123,9 @@ /turf/open/floor/holofloor/beach/water, /area/station/maintenance/starboard/aft) "wqA" = ( -/obj/effect/turf_decal/stripes, -/obj/structure/weightmachine/stacklifter, -/turf/open/floor/iron, -/area/station/commons/fitness) +/obj/machinery/light/directional/west, +/turf/open/floor/wood, +/area/station/service/bar) "wqB" = ( /obj/machinery/vending/security, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -43967,7 +44387,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, @@ -44103,13 +44523,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, @@ -44209,11 +44630,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 @@ -44221,8 +44637,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, @@ -44335,20 +44751,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 @@ -44356,20 +44764,12 @@ /turf/open/floor/engine, /area/station/engineering/atmos/hfr_room) "wGM" = ( +/obj/item/kirbyplants/random, /obj/effect/turf_decal/trimline/blue/filled/line{ 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) +/turf/open/floor/iron/white/textured, +/area/station/medical/office) "wHy" = ( /obj/machinery/light/small/directional/east, /obj/effect/turf_decal/bot, @@ -44461,6 +44861,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; @@ -44530,28 +44936,24 @@ /turf/open/floor/iron/dark/textured, /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, @@ -44671,9 +45073,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) @@ -44770,8 +45169,9 @@ }, /area/station/science/robotics) "wRT" = ( -/turf/closed/wall, -/area/station/commons/lounge) +/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, @@ -44850,7 +45250,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) @@ -44975,8 +45375,13 @@ /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, +/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{ dir = 8 @@ -44984,6 +45389,11 @@ /obj/effect/turf_decal/trimline/blue/warning{ 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" = ( @@ -45070,15 +45480,23 @@ /turf/open/floor/iron/dark/textured, /area/station/cargo/sorting) "wZY" = ( -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 6 +/obj/structure/table/reinforced, +/obj/item/defibrillator/loaded{ + pixel_y = 6 }, -/turf/open/floor/iron/dark/textured, -/area/station/commons/lounge) +/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/door/airlock/maintenance{ + id_tag = "west commissary doors" + }, /obj/machinery/duct/industrial/waste, -/obj/effect/mapping_helpers/airlock/access/all/service/theatre, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -45086,7 +45504,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, @@ -45290,17 +45708,21 @@ /turf/open/floor/iron/white/diagonal, /area/station/medical/medbay/lobby) "xeP" = ( -/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 +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 8 }, -/turf/open/floor/iron/white/textured, -/area/station/medical/medbay/lobby) +/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 @@ -45325,7 +45747,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, @@ -45420,11 +45842,9 @@ /turf/open/floor/iron/dark/textured, /area/mine/storage/public) "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, +/turf/open/floor/plating, +/area/station/medical/cryo) "xiE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/landmark/start/geneticist, @@ -45647,7 +46067,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, @@ -45747,6 +46167,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" @@ -45797,7 +46221,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, @@ -45876,12 +46300,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" = ( @@ -45954,7 +46375,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{ @@ -45987,10 +46408,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 6 - }, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/wood, /area/station/commons/lounge) "xvy" = ( /obj/structure/table, @@ -46129,7 +46547,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/floor/iron/white/textured, /area/station/science/genetics) "xyp" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ @@ -46144,7 +46576,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{ @@ -46166,12 +46598,10 @@ /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/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{ @@ -46220,12 +46650,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, @@ -46467,12 +46897,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, @@ -46487,12 +46918,14 @@ /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, +/obj/machinery/newscaster/directional/west, +/turf/open/floor/carpet, +/area/station/medical/office) "xID" = ( /obj/effect/turf_decal/tile/green/half/contrasted, /obj/structure/chair/wood{ @@ -46510,9 +46943,23 @@ /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 = "westcommissary"; + name = "Privacy Shutters" + }, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "westcommissary"; + name = "Privacy Shutters" + }, +/obj/item/paper_bin{ + pixel_x = 6; + pixel_y = 2 + }, /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{ @@ -46536,10 +46983,12 @@ /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/chair/stool/bar/directional/east, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/turf/open/floor/carpet, +/area/station/service/bar) "xKt" = ( /obj/machinery/drone_dispenser/preloaded, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -46584,14 +47033,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, @@ -46674,17 +47123,19 @@ /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/structure/table, +/obj/item/clipboard, +/obj/item/paper, +/obj/item/pen, +/obj/item/paper_bin{ + pixel_x = -7; + pixel_y = 4 + }, /obj/effect/turf_decal/siding/white{ dir = 5 }, -/obj/machinery/cell_charger, -/turf/open/floor/iron/dark/textured_large, -/area/station/medical/medbay/central) +/turf/open/floor/carpet, +/area/station/medical/office) "xMG" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 @@ -46787,17 +47238,21 @@ /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, +/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" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -46817,6 +47272,9 @@ /area/station/commons/lounge) "xPK" = ( /mob/living/basic/chicken/brown, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/open/misc/sandy_dirt, /area/station/service/hydroponics/upper) "xQl" = ( @@ -46973,11 +47431,14 @@ }, /area/station/science/lobby) "xTD" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/sign/warning/vacuum/external/directional/south, /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, -/area/station/commons/fitness) +/obj/machinery/light/small/directional/north, +/turf/open/floor/plating, +/area/station/engineering/atmos) "xTO" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Engineering Foyer" @@ -47041,13 +47502,13 @@ /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" = ( /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, @@ -47061,6 +47522,7 @@ /obj/effect/turf_decal/trimline/green/filled/warning{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/service/general, /turf/open/floor/iron/dark/textured, /area/station/service/hydroponics) "xUD" = ( @@ -47282,7 +47744,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, @@ -47364,6 +47826,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, @@ -47533,23 +47999,10 @@ }, /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/machinery/firealarm/directional/north{ + pixel_y = 25; + pixel_x = -12 }, -/obj/structure/window/spawner/directional/south, -/obj/structure/window/spawner/directional/east, /turf/open/floor/iron/white/textured, /area/station/medical/storage) "yiT" = ( @@ -58366,7 +58819,7 @@ kpD kpD foG hLd -hLd +eKW hLd hLd kpD @@ -59396,7 +59849,7 @@ mca mca fXj hLd -hLd +bIX oRY ieT quy @@ -60946,7 +61399,7 @@ bKO kiG kiG kiG -oyT +mgS oyT xkQ oyT @@ -61194,7 +61647,7 @@ jtn uSV vme qBz -dwb +rdF nzU vrw hbh @@ -61216,10 +61669,10 @@ oyT fYK cbc qNu -nJY -fYK qNu -lLE +utN +rta +qNu fYK drg rxV @@ -61730,9 +62183,9 @@ eYH fYK rvH fig -rta -rdF -utN +quS +fYK +fYK fYK fYK drg @@ -61980,17 +62433,17 @@ oSb uVc hdD nLQ -nBu +wRB pqp fbw lll fYK rvH yjV -quS +loQ fYK mqN -quS +qNu fYK xlX iAJ @@ -62244,9 +62697,9 @@ rss fYK dMc yjV -nJY -fYK -qNu +cfI +jBN +jrV fQi fYK ecC @@ -62761,7 +63214,7 @@ wOJ rYQ rYQ tym -rYQ +cgb pug ieT fZs @@ -63002,23 +63455,23 @@ dYl utm oyT jwq -sKC +mfr pqp pqp pqp jsA -pqp +tqP pqp kam pqp jCA pug -wOJ -vtb -rYQ -gop rYQ +aYq +aYq +aYq rYQ +uwo pug bSj ieT @@ -63254,29 +63707,29 @@ utm utm bbo nuk -aVe -upw +xeP +aec qRE oyT -wRB -vvq -kcH -pqp -pqp -jsA -pqp -pqp -slV -kam oyT +oyT +oyT +dik +mdi +lFo +oyT +mxg +slV +itv +oWO +oWO +oWO +oWO pug -cfI -pug -pug -pug +mnD kmY kmY -pug +lCs pug vSN dPH @@ -63514,27 +63967,27 @@ rcV uIl awY pQl -oyT -oyT -oyT -oyT +lzc +tQS +wqA +eFd nVa lyP -evH +sHS ajP aAK -oyT -eOu -pug +aVb +mIS +oWO jFi kUp -jAN +oWO +ulQ +aYq +rYQ +rYQ rYQ rYQ -dwx -dwx -dwx -dwx vUg dPH bSj @@ -63771,28 +64224,28 @@ ozW aVe upw ddU -wRT +lzc nJU aVb -mdi +eFd kpQ -xVm -xVm -xVm -xVm +pIL +pIL +uHW +hXP aVb -aKV -pug +mIS +kCz qGs -lqa -xzg -rYQ +mVu +oWO +oti +aon +hor +hor +hor +ggx rYQ -dwx -dwx -dwx -dwx -gHM dPH ieT ope @@ -64030,25 +64483,25 @@ osu uRy uSL qkz -xVm +aVb tyd sHS -xVm -xVm -xVm -xVm -xVm -aKV -kmY -exP +pIL +pIL +pIL +lLc +aVb +mIS +oWO +jod jDu -dik -vtb -rYQ -dwx +oWO +oti +aon dwx dwx dwx +bqt gIB dPH bSj @@ -64285,28 +64738,28 @@ asO wOi xvl eZW -wRT +lLg vci -xVm +aVb mfc -xVm +ejr qrV -xVm -rnD -xVm -uBa -aKV -kmY +qXP +pIL +eZH +mIS +rqz +oWO exP -lqa -wqA -vtb -rYQ -dwx +sUg +vYW +eTm +aon dwx dwx dwx -kcP +bqt +gHM dPH oTE afI @@ -64542,28 +64995,28 @@ eDF wOi xvl koV -wRT +lzc ufp -xVm +aVb fGC -xVm -eFd -xVm -aMo -xVm +pIL +pIL +pIL +pIL +lLc mIS -xVm -kmY -exP +aVb +oWO +iru lqa -ekZ +oWO vtb +aon +sFP +sFP +sFP +egP rYQ -dwx -dwx -dwx -dwx -kcP dPH oHO afI @@ -64799,28 +65252,28 @@ kRY knL sJo ykL -wRT +igu iQd -xVm +aVb qnD -xVm -pIL -xVm uGO -xVm -nqU -xVm -kmY +iHJ +rzB +uGO +lNO +mIS +aVb +kEi ncg hdv -fJF +oWO vtb +aYq rYQ rYQ rYQ rYQ rYQ -kcP dPH tPb afI @@ -65056,28 +65509,28 @@ wgZ bow kxW foP -iHJ -nTR -xVm +lzc +ydn +aVb wXQ -xVm -xVm -xVm -xVm -xVm -aKV +vUR +qWx +mRG +rDp +xKr +mIS mSX -pug +oWO nxs rNh -ueF -xTD +oWO +rYQ cWa -kcP -kcP -kcP -kcP -tqP +gop +rYQ +rNP +rIZ +gop dPH lpu afI @@ -65313,26 +65766,26 @@ vrw nyH xUv vrw -wRT -wRT +lzc +lzc pJI -wXQ +sKn fPY -xVm -xVm -xVm -xVm +ciu +gBb +qmg +aVb sVF -wRT -pug -pug -pug -pug +lzc +oWO +oWO +oWO +oWO nOf +lms pug kmY kmY -kmY pug pug pug @@ -65572,13 +66025,13 @@ nyD cCg qbR pAj -vyi +hrr tRg hrr hrr hrr hrr -vyi +hrr tzl eco xUj @@ -65835,8 +66288,8 @@ bTn auj tzf bTn -sbg -lms +bTn +bTn qEO qmM sTn @@ -66086,14 +66539,14 @@ kkW lca nDl wmV -lNO -gDA pXi +gDA +abL hwW lmI pXi -mnD -lmO +abL +pXi iul jEi eLS @@ -66343,14 +66796,14 @@ tGW bMv ffP xPG -hBR -xvp -xVm -hrr -xVm xVm +xvp +rnD +bkr +aGw +rnD fRb -wZY +xVm yhH qNW vkw @@ -66602,25 +67055,25 @@ eqZ eqZ eqZ qoU +hdM +fJF xVm -hrr -xVm -xVm -xVm +aKV +hdM xVm -oWO -oWO -oWO -oWO -oWO -mSq iWZ iWZ -xJb -dpp -xJb iWZ iWZ +iWZ +mSq +kcP +kcP +xJb +dpp +iaT +kcP +kcP twN kUY wRx @@ -66830,13 +67283,13 @@ rfc nxP ljv ewL -gMt -ewL -aTw +wKb +hiJ +jCp pyJ kOf grw -ewL +hiJ wJX bfN csW @@ -66865,19 +67318,19 @@ vMM vMM xVm jtJ -oWO +iWZ bPZ bCu -xKr -oWO -dNg +eYD iWZ +dNg +njU fos -lyY -kAE -mVu +frv +kGi +frv dih -iWZ +kcP bul vWf slx @@ -67089,8 +67542,8 @@ ilm kOf kOf ewL -aTw -kOf +mgE +sSk aTw nmp bnB @@ -67116,25 +67569,25 @@ qfN hUb eqZ tbJ -njU -qrV rnD -xtr rnD xVm -oWO +xtr +ceV +ceV +iWZ sEJ -jdl +lyY tYT -oWO -dNg iWZ +gGZ +kcP cqw -jPs -kAE -lyY -lHw -iWZ +frv +kGi +frv +jpm +kcP wXn mDR tYW @@ -67371,27 +67824,27 @@ djv ycc knP gUb -sKn +eqZ mXG hdM eSy -jod +nTR wGs xAi blS sDD vdW nbb -hXP -oWO +lHw +iWZ dNg dSA lRV -lyY +hOF kAE -tBV +frv umT -iWZ +kcP ewC cDw kOM @@ -67604,10 +68057,10 @@ aTw uth rwX svH -kOf -aTw -nmp -qet +mFX +jCp +wbP +sMY wJX xmh ttR @@ -67621,34 +68074,34 @@ syi bXl skl kMm -dJB +eOu hmD hmD sxX oMw hmD rNz -hmD +erF ttB -ojS -ojS -ojS +vyi +cIs +cIs uvM ojS hAN -lzc +iWZ xHk -jdl +lyY vkC -oWO -mSq iWZ -eYD +mSq +sXu +gws lSK kGi -frv +xqG omy -kCz +aKn xbh cWe pPk @@ -67858,10 +68311,10 @@ rfc nxP wJX qet -ewL -ewL +aHz +hiJ jIw -kOf +tEd aTw coa ewL @@ -67887,25 +68340,25 @@ eLw izt hmD rFL -ceV +evH myg -ceV +mPO sPD pHZ -ceV +bTn xKG -mfr -mfr +tBV +lyY fUE -oWO -agR -iWZ -iWZ iWZ +agR +kcP +kcP +kcP xae -kCz -kCz -kCz +aKn +aKn +aKn arQ arQ smC @@ -68135,7 +68588,7 @@ eig aST hNC opQ -xPK +pDv hmD fbv diP @@ -68144,17 +68597,17 @@ bHT xRl hmD tDO -mPO -ojS -ojS +evH +kcH +kcH aSq -ojS -ojS -aGw +jPs +xVm +iWZ jdl lwx -jdl -oWO +hSx +iWZ mSq mSq ttR @@ -68402,16 +68855,16 @@ kgY hmD uJs oiG -dqA -rgY hWe +rgY +smw tIS vdg -lzc -oWO -oWO +iWZ +iWZ +iWZ rbD -oWO +iWZ ouH gME oUx @@ -68657,23 +69110,23 @@ hmD hmD hmD hmD -mSq -wCJ +ske +rgt wCJ wCJ wCJ -mSq -mSq +ske +ske mSq oHd jkJ -wdT +cdc djt wdT jkJ wdT wdT -jpm +koQ wdT ont dGk @@ -68924,12 +69377,12 @@ jol jol xkV jol -jol -xkV -jol -jol -lgS -jol +ikH +dqA +wdT +wdT +wfl +wdT wQd wdT ont @@ -70177,7 +70630,7 @@ pkw fGs aFY aFY -aFY +muw ske meJ meJ @@ -70470,12 +70923,12 @@ aah meJ meJ rvq -vHZ +kSs fCx fCx fCx fCx -iRT +dyB cfz etN meJ @@ -70731,7 +71184,7 @@ rvq rvq rvq rvq -rvq +mdW vHZ cfz etN @@ -70988,7 +71441,7 @@ meJ meJ meJ meJ -rvq +mdW vHZ cfz etN @@ -71245,7 +71698,7 @@ aah meJ meJ meJ -rvq +mdW vHZ cfz etN @@ -71502,7 +71955,7 @@ aah aah meJ meJ -rvq +mdW vHZ cfz etN @@ -71759,7 +72212,7 @@ aah aah meJ meJ -rvq +mdW vHZ cfz etN @@ -72016,7 +72469,7 @@ aah aah aah meJ -rvq +mdW vHZ cfz etN @@ -72273,7 +72726,7 @@ jDJ jDJ jDJ jDJ -aec +wFB gul hwI etN @@ -72530,7 +72983,7 @@ jDJ jDJ jDJ jDJ -aec +wFB gul wFB uCz @@ -72787,7 +73240,7 @@ meJ meJ meJ meJ -rvq +mdW vHZ sRh sRh @@ -72993,8 +73446,8 @@ wwy wad nvn eup -eZH -cdc +adf +fUj kAH cIO bIK @@ -73043,8 +73496,8 @@ etN meJ meJ meJ -rvq -rvq +mdW +mdW vHZ sRh qiU @@ -73241,13 +73694,13 @@ jKo jKo cMb uTw -xxZ -xxZ +jKo +jKo rJc -xxZ -xxZ -xxZ -xxZ +jKo +jKo +jKo +jKo vSw pqz adf @@ -73298,11 +73751,11 @@ aah pHU etN meJ -rvq -rvq -rvq -naN -vHZ +mdW +mdW +mdW +dTu +kBN sRh byf tKt @@ -73504,7 +73957,7 @@ cSo tqE bGI bPl -aDe +wRT sdC iLY pXC @@ -73554,11 +74007,11 @@ aah meJ pHU etN -rvq -rvq -naN +mdW +mdW +dTu naN -vHZ +kBN sRh sRh ewQ @@ -73761,7 +74214,7 @@ pmg vrS cuk bux -aDe +wRT sdC qUv qLe @@ -73810,10 +74263,10 @@ aah meJ meJ pHU -gBb -rvq -naN -vHZ +cfz +mdW +dTu +kBN asA asA sRh @@ -74067,9 +74520,9 @@ aah meJ meJ fXF -gBb -naN -vHZ +cfz +dTu +ekZ asA asA mqy @@ -74283,7 +74736,7 @@ fUj rLb wBP jln -jln +vvq cIO xCU wXG @@ -74324,8 +74777,8 @@ meJ meJ meJ fXF -qWx -vHZ +hiO +ekZ asA asA elt @@ -74788,10 +75241,10 @@ jKo jKo gVL vsL -xxZ -xxZ -eJv -eJv +jKo +jKo +nqU +nqU xoE dno kAH @@ -75048,9 +75501,9 @@ nIg ebe xIv sJt -vGh +pdS pmR -muw +dno kAH cIO dkr @@ -75298,16 +75751,16 @@ pxZ iYt jYz gSH -oft +xzg nQo wAP xMv -jrX +ltZ ltZ nNP fNw hsi -pdS +fUj kAH gLU lfi @@ -75558,17 +76011,17 @@ iNI nhC sQl nvL -qXP kJN -wGM +kJN +kJN boX vGh xys -muw +dno rLb wBP jln -jln +vvq cIO csW wXG @@ -75812,20 +76265,20 @@ jvq fZX pTU iNI -nhC +jvq wMO eeA -mHV -lbA -kTL +nqf +nqf +nqf hWv vGh hsi -muw +dno rLb pmN jln -jln +vvq cIO csW wXG @@ -76071,14 +76524,14 @@ jvq sMv nhC hWy -whp +eeA nqf +eDI +lbA shm -cKM -nNP fNw pmR -pdS +fUj imU gLU wAl @@ -76312,11 +76765,11 @@ meJ qSI oRN kIP -tBQ +lmO bys -tBQ -tBQ -tBQ +lmO +lmO +lmO aIK cNq bbK @@ -76330,12 +76783,12 @@ tBQ dTv xPa wGM -wGM +whp oEo fRj mCO hsi -xeP +mxp kAH cIO qdd @@ -76573,9 +77026,9 @@ fDX oUK nAS pls -tBQ -tBQ -tBQ +lmO +lmO +lmO tgU yaj dvQ @@ -76587,10 +77040,10 @@ tBQ xXa uhh eXH -uOF -uOF -eJv -eJv +xXa +xXa +nqU +bKh xoE dno kAH @@ -76826,7 +77279,7 @@ meJ qSI bMU fgS -nhC +xiD tCm vaj qwR @@ -77099,18 +77552,18 @@ oMo oMo oMo oMo -oMo +ueF uAv lJl wiH msQ lzG -adf +muE fUj rLb pmN jln -jln +vvq cIO lGH wXG @@ -77356,7 +77809,7 @@ rEh sVq hXo cQI -wil +rtb wil dPW mko @@ -77665,8 +78118,8 @@ aah aah meJ fXF -bFY -iRT +kTL +dyB asA asA qPs @@ -77861,7 +78314,7 @@ bUR udR xrF ojJ -nhC +lzg nGo mFK pIN @@ -77871,12 +78324,12 @@ yhc qRO niS mFK -oMo +mFK dYV -eTm -uHW -abL -ikH +uOF +sdC +qUv +qLe wvy rbq cIO @@ -77922,9 +78375,9 @@ aah aah meJ fXF -gBb -vHZ -iRT +cfz +kwO +dyB asA asA fkr @@ -78118,7 +78571,7 @@ bDK cMp vGC xfh -nhC +lzg hJi xGw onx @@ -78179,10 +78632,10 @@ aah aah meJ pHU -gBb -rvq -vHZ -iRT +cfz +mdW +kwO +dyB asA asA pla @@ -78386,8 +78839,8 @@ gct rzA vUo esa -uOF -uOF +xXa +xXa vSw pqz adf @@ -78398,7 +78851,7 @@ xCU uVK bva twr -iKF +kGh kND meJ meJ @@ -78437,11 +78890,11 @@ aah meJ pHU etN -rvq -rvq -vHZ +mdW +mdW +kwO fCx -iRT +dyB pla pla cZm @@ -78634,20 +79087,20 @@ feL oYu gTr uCI -xiD +mMG mrL -gTr -gTr +dzo +wZY emO oes oes oes oes -lTb +emO uZg oeV eup -eZH +adf lXc kAH cIO @@ -78695,11 +79148,11 @@ aah pHU etN meJ -rvq -rvq -rvq -vHZ -iRT +mdW +mdW +mdW +kwO +dyB pla euG uHj @@ -78900,7 +79353,7 @@ whs kLW fla xFE -lTb +emO gym okd okd @@ -78954,8 +79407,8 @@ etN meJ meJ meJ -rvq -rvq +mdW +mdW vHZ pla pla @@ -79146,7 +79599,7 @@ gTr gTr gTr gTr -gTr +tzG yit ehz nnN @@ -79212,10 +79665,10 @@ meJ meJ meJ meJ -rvq -vHZ +mdW +kwO fCx -iRT +dyB pla pla kDN @@ -79404,10 +79857,10 @@ vJu abg nTg rvQ -dFu +ehz kfA -ejr dYp +jAN qUa eCp jHE @@ -79469,11 +79922,11 @@ meJ meJ meJ meJ -rvq -rvq -rvq -vHZ -iRT +mdW +mdW +mdW +kwO +dyB pla pla wqQ @@ -79659,9 +80112,9 @@ mog gTr sXh vFx -bKh +ehz lqs -veM +ehz qhH veM ejk @@ -79728,10 +80181,10 @@ meJ meJ meJ meJ -rvq -rvq -vHZ -iRT +mdW +mdW +kwO +dyB pla pla pla @@ -79923,7 +80376,7 @@ gTr gTr gTr gTr -emO +lTb mfk apo nFm @@ -79986,10 +80439,10 @@ meJ meJ meJ meJ -rvq -rvq -vHZ -iRT +mdW +mdW +kwO +dyB rDE lCF cTE @@ -80244,7 +80697,7 @@ meJ meJ meJ meJ -rvq +mdW rvq vHZ rDE @@ -80492,7 +80945,7 @@ kND kND hkS rvq -gBb +cfz meJ meJ meJ @@ -80746,10 +81199,10 @@ jDJ jDJ uCz kND -wlA +qlS heN -vXo -gBb +oDq +cfz meJ meJ meJ @@ -80968,10 +81421,10 @@ tYA xmh xCU tMK -dyB -dyB -dyB -jOH +xzf +xzf +xzf +aeW kND ske ske @@ -81006,7 +81459,7 @@ kND lSj hkS vXo -gBb +cfz meJ meJ meJ @@ -81229,13 +81682,13 @@ bva bva rUd tMK -dyB -dyB -dyB -dyB -dyB -dyB -jOH +xzf +xzf +xzf +xzf +xzf +xzf +aeW ske ske meJ @@ -81263,17 +81716,17 @@ mSq lSj hkS vXo -gBb +cfz meJ meJ meJ mdW -rnF -aYq -aYq -aYq -aYq -aYq +dTu +naN +naN +naN +naN +naN kBN rDE ccv @@ -81493,7 +81946,7 @@ qTR bva rUd tMK -jOH +aeW kND kND kND @@ -81501,7 +81954,7 @@ gmQ qgs ske kND -ndA +qlS xzf xzf xzf @@ -81520,11 +81973,11 @@ fgm bPH hkS vXo -gBb -rvq -rvq -rvq -rvq +cfz +mdW +mdW +mdW +mdW vHZ ogd ogd @@ -81751,13 +82204,13 @@ mSq vnz rUd tMK -dyB -dyB -dyB +xzf +xzf +xzf pMX -dyB -dyB -dyB +xzf +xzf +xzf bPH csW xCU @@ -83770,7 +84223,7 @@ aah aah aah aah -aah +jrX meJ qSI nRM @@ -86159,7 +86612,7 @@ giY mMM sUj kVT -aKn +lLE uea fFI rYF @@ -91705,7 +92158,7 @@ aah aah meJ meJ -sks +nLI kdT wNL lvw @@ -91962,7 +92415,7 @@ aah aah meJ meJ -sks +nLI kdT wNL lvw @@ -92219,7 +92672,7 @@ aah aah meJ meJ -sks +nLI uoJ xZC pZg @@ -92476,7 +92929,7 @@ aah aah meJ meJ -sks +nLI uoJ azT uZd @@ -92733,7 +93186,7 @@ aah aah meJ meJ -sks +nLI uoJ jWP hDV @@ -92990,7 +93443,7 @@ aah aah meJ meJ -sks +nLI ksS cKa dQY @@ -93247,7 +93700,7 @@ aah aah aah aah -sks +nLI aSy xwe nsF @@ -93504,7 +93957,7 @@ aah aah aah aah -sks +nLI uoJ gYJ jlw @@ -94293,7 +94746,7 @@ cWz gyA iAR aRd -vYW +qax xeR lvw nLI @@ -94532,7 +94985,7 @@ aah aah aah aah -sks +nLI uoJ lvw lvw @@ -94789,7 +95242,7 @@ aah aah aah aah -sks +nLI uoJ lvw pcA @@ -95046,7 +95499,7 @@ aah aah aah aah -sks +nLI uoJ lvw lvw @@ -95303,7 +95756,7 @@ aah aah aah aah -sks +nLI aSy lvw dHZ @@ -95560,7 +96013,7 @@ aah aah aah aah -sks +nLI uoJ lvw dHZ @@ -95817,7 +96270,7 @@ aah aah aah aah -sks +nLI mvi wNL wNL @@ -96074,9 +96527,9 @@ aah aah aah aah -sks +nLI kdT -lvw +wNL dHZ dHZ dHZ @@ -96331,9 +96784,9 @@ aah aah aah aah -sks +nLI kdT -lvw +wNL dHZ dHZ dHZ @@ -96590,7 +97043,7 @@ aah aah sks lVD -eYO +hBR lvw lvw lvw @@ -96846,7 +97299,7 @@ aah aah aah sks -avm +sks rDs tFR eYO @@ -97103,9 +97556,9 @@ aah aah aah aah -avm -avm -avm +sks +aMo +sks kdT tNO bBL @@ -97360,9 +97813,9 @@ aah aah aah aah -aah -aah -avm +sks +xTD +ujh lyZ jvt vlo @@ -97617,10 +98070,10 @@ aah aah aah aah -aah -aah -avm -avm +sks +uBa +sks +sks jvt ibe eXz @@ -98412,7 +98865,7 @@ gAb lQT fxe teK -rsS +sxa rsS nvs rsS diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index ffca395da9c2..acd6f5664038 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -11620,6 +11620,12 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/engineering/engine_smes) +"csL" = ( +/obj/structure/closet{ + name = "Evidence Closet 2" + }, +/turf/open/floor/iron/dark, +/area/station/security/evidence) "csN" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ @@ -20677,8 +20683,8 @@ /turf/open/floor/iron, /area/station/security/prison) "fsQ" = ( -/obj/structure/closet{ - name = "Evidence Closet 1" +/obj/structure/closet/secure_closet/evidence{ + name = "secure evidence closet 1" }, /turf/open/floor/iron/dark, /area/station/security/evidence) @@ -31912,7 +31918,7 @@ /area/station/engineering/break_room) "jil" = ( /obj/structure/closet{ - name = "Evidence Closet 1" + name = "Evidence Closet 4" }, /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, @@ -46731,7 +46737,7 @@ /area/station/command/teleporter) "nVx" = ( /obj/structure/closet{ - name = "Evidence Closet 1" + name = "Evidence Closet 3" }, /obj/machinery/firealarm/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -53805,10 +53811,10 @@ /turf/open/floor/iron, /area/station/security/brig) "qnr" = ( -/obj/structure/closet{ - name = "Evidence Closet 1" - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/closet/secure_closet/evidence{ + name = "secure evidence closet 2" + }, /turf/open/floor/iron/dark, /area/station/security/evidence) "qnv" = ( @@ -55525,6 +55531,7 @@ dir = 4 }, /obj/structure/table/reinforced, +/obj/structure/cable/multilayer/multiz, /turf/open/floor/iron/dark, /area/station/command/bridge) "qNA" = ( @@ -64037,7 +64044,7 @@ /area/station/command/teleporter) "tyx" = ( /obj/structure/closet{ - name = "Evidence Closet 1" + name = "Evidence Closet 5" }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/spawner/random/contraband/narcotics, @@ -71201,6 +71208,8 @@ "vGH" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/smooth, /area/station/maintenance/port/central) "vGI" = ( @@ -167479,7 +167488,7 @@ omm wPe tFJ tYg -fsQ +csL jil fsQ jKq diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index cf9cd2a5b467..dbf3a02c5286 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -651,20 +651,22 @@ GLOBAL_LIST_INIT(human_heights_to_offsets, list( /// Total number of layers for mob overlays /// KEEP THIS UP-TO-DATE OR SHIT WILL BREAK /// Also consider updating layers_to_offset -#define TOTAL_LAYERS 34 +#define TOTAL_LAYERS 35 /// Mutant race multiparts - Lbelly -#define ACCESSORIES_LAYER 34 +#define ACCESSORIES_LAYER 35 /// Mutations layer - Tk headglows, cold resistance glow, etc -#define MUTATIONS_LAYER 33 +#define MUTATIONS_LAYER 34 /// Mutantrace features (tail when looking south) that must appear behind the body parts -#define BODY_BEHIND_LAYER 32 +#define BODY_BEHIND_LAYER 33 /// Layer for bodyparts that should appear behind every other bodypart - Mostly, legs when facing WEST or EAST -#define BODYPARTS_LOW_LAYER 31 +#define BODYPARTS_LOW_LAYER 32 /// Layer for most bodyparts, appears above BODYPARTS_LOW_LAYER and below BODYPARTS_HIGH_LAYER -#define BODYPARTS_LAYER 30 +#define BODYPARTS_LAYER 31 /// Mutantrace features (snout, body markings) that must appear above the body parts -#define BODY_ADJ_LAYER 29 -/// Underwear, undershirts, socks, eyes, lips(makeup) +#define BODY_ADJ_LAYER 30 +// Eyes, lips(makeup) +#define FACE_LAYER 29 +/// Underwear, undershirts, socks #define BODY_LAYER 28 /// Mutations that should appear above body, body_adj and bodyparts layer (e.g. laser eyes) #define FRONT_MUTATIONS_LAYER 27 @@ -748,6 +750,7 @@ GLOBAL_LIST_INIT(layers_to_offset, list( "[ID_CARD_LAYER]" = UPPER_BODY, // unused "[ID_LAYER]" = UPPER_BODY, "[FACEMASK_LAYER]" = UPPER_BODY, + "[FACE_LAYER]" = UPPER_BODY, // These two are cached, and have their appearance shared(?), so it's safer to just not touch it "[MUTATIONS_LAYER]" = NO_MODIFY, "[FRONT_MUTATIONS_LAYER]" = NO_MODIFY, diff --git a/code/datums/mutations/body.dm b/code/datums/mutations/body.dm index 3e1926dead01..8da93b79eb30 100644 --- a/code/datums/mutations/body.dm +++ b/code/datums/mutations/body.dm @@ -125,8 +125,9 @@ /datum/mutation/human/dwarfism/on_losing(mob/living/carbon/human/owner) if(..()) return - // REMOVE_TRAIT(owner, TRAIT_DWARF, GENETIC_MUTATION) - // owner.visible_message(span_danger("[owner] suddenly grows!"), span_notice("Everything around you seems to shrink..")) + //We're leaving the size traits permanent until someone wants to separate the mutation from customization aspects + //REMOVE_TRAIT(owner, TRAIT_DWARF, GENETIC_MUTATION) + //owner.visible_message(span_danger("[owner] suddenly grows!"), span_notice("Everything around you seems to shrink..")) //Clumsiness has a very large amount of small drawbacks depending on item. /datum/mutation/human/clumsy @@ -370,27 +371,25 @@ playsound(owner,'sound/weapons/sear.ogg', 50, TRUE) /datum/mutation/human/gigantism - name = "Gigantism"//negative version of dwarfism + name = "Gigantism" desc = "The cells within the subject spread out to cover more area, making the subject appear larger." quality = MINOR_NEGATIVE difficulty = 12 conflicts = list(/datum/mutation/human/dwarfism) + locked = TRUE /datum/mutation/human/gigantism/on_acquiring(mob/living/carbon/human/owner) if(..()) return ADD_TRAIT(owner, TRAIT_GIANT, GENETIC_MUTATION) - owner.resize = 1.25 - owner.update_transform() - owner.visible_message(span_danger("[owner] suddenly grows!"), span_notice("Everything around you seems to shrink..")) + //handled in init_signals.dm /datum/mutation/human/gigantism/on_losing(mob/living/carbon/human/owner) if(..()) return - // REMOVE_TRAIT(owner, TRAIT_GIANT, GENETIC_MUTATION) - // owner.resize = 0.8 - // owner.update_transform() - // owner.visible_message(span_danger("[owner] suddenly shrinks!"), span_notice("Everything around you seems to grow..")) + //We're leaving the size traits permanent until someone wants to separate the mutation from customization aspects + //REMOVE_TRAIT(owner, TRAIT_GIANT, GENETIC_MUTATION) + //handled in init_signals.dm /datum/mutation/human/spastic name = "Spastic" diff --git a/code/game/objects/items/storage/holsters.dm b/code/game/objects/items/storage/holsters.dm index 2bbbcf02a5bc..616524e28c6a 100644 --- a/code/game/objects/items/storage/holsters.dm +++ b/code/game/objects/items/storage/holsters.dm @@ -30,7 +30,9 @@ /obj/item/food/grown/banana, /obj/item/gun/energy/laser/thermal, /obj/item/gun/ballistic/rifle/boltaction, //fits if you make it an obrez - )) + /obj/item/gun/energy/laser/captain, + /obj/item/gun/energy/e_gun/hos, + )) /obj/item/storage/belt/holster/energy name = "energy shoulder holsters" @@ -47,7 +49,9 @@ /obj/item/food/grown/banana, /obj/item/gun/energy/laser/thermal, /obj/item/gun/energy/recharge/ebow, - )) + /obj/item/gun/energy/laser/captain, + /obj/item/gun/energy/e_gun/hos, + )) /obj/item/storage/belt/holster/energy/thermal name = "thermal shoulder holsters" @@ -100,6 +104,8 @@ /obj/item/gun/energy/disabler, /obj/item/gun/energy/dueling, /obj/item/gun/energy/laser/thermal, + /obj/item/gun/energy/laser/captain, + /obj/item/gun/energy/e_gun/hos, /obj/item/gun/ballistic/rifle/boltaction, //fits if you make it an obrez )) @@ -173,8 +179,12 @@ /obj/item/gun/energy/recharge/ebow, /obj/item/gun/energy/e_gun/mini, /obj/item/gun/energy/disabler, - /obj/item/gun/energy/dueling - )) + /obj/item/gun/energy/dueling, + /obj/item/gun/energy/laser/captain, + /obj/item/gun/energy/e_gun/hos, + )) + + atom_storage.silent = TRUE /obj/item/storage/belt/holster/nukie name = "operative holster" diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 11e778c295c5..49d434e5cb7e 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -381,7 +381,9 @@ GLOBAL_LIST_EMPTY(preferences_datums) if (isnull(body)) create_body() else - body.wipe_state() + //body.wipe_state() + QDEL_NULL(body) + create_body() appearance = preferences.render_new_preview_appearance(body) /atom/movable/screen/map_view/char_preview/proc/create_body() diff --git a/code/modules/clothing/head/_head.dm b/code/modules/clothing/head/_head.dm index 5dbfbade1fa2..a67d65b5139d 100644 --- a/code/modules/clothing/head/_head.dm +++ b/code/modules/clothing/head/_head.dm @@ -88,6 +88,10 @@ head_icon = selected_hat.icon var/mutable_appearance/hat_adding = selected_hat.build_worn_icon(HEAD_LAYER, head_icon, FALSE, FALSE) hat_adding.pixel_y = ((current_hat * 4) - 1) + if(ismob(loc)) + if(ishuman(loc)) + var/mob/living/carbon/human/user = loc + hat_adding.pixel_y -= GLOB.human_heights_to_offsets[num2text(user.get_mob_height())][1] hat_adding.pixel_x = (rand(-1, 1)) current_hat++ . += hat_adding diff --git a/code/modules/clothing/suits/_suits.dm b/code/modules/clothing/suits/_suits.dm index 6e7f5865f704..c7c206e66872 100644 --- a/code/modules/clothing/suits/_suits.dm +++ b/code/modules/clothing/suits/_suits.dm @@ -8,6 +8,7 @@ /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/tank/jetpack/oxygen/captain, + /obj/item/storage/belt/holster, ) armor_type = /datum/armor/none drop_sound = 'sound/items/handling/cloth_drop.ogg' diff --git a/code/modules/clothing/suits/jacket.dm b/code/modules/clothing/suits/jacket.dm index d441db0efad1..ae2cb14caa2c 100644 --- a/code/modules/clothing/suits/jacket.dm +++ b/code/modules/clothing/suits/jacket.dm @@ -1,7 +1,16 @@ /obj/item/clothing/suit/jacket icon = 'icons/obj/clothing/suits/jacket.dmi' worn_icon = 'icons/mob/clothing/suits/jacket.dmi' - allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/radio) + allowed = list( + /obj/item/flashlight, + /obj/item/tank/internals/emergency_oxygen, + /obj/item/tank/internals/plasmaman, + /obj/item/toy, + /obj/item/storage/fancy/cigarettes, + /obj/item/lighter, + /obj/item/radio, + /obj/item/storage/belt/holster, + ) body_parts_covered = CHEST|GROIN|ARMS cold_protection = CHEST|GROIN|ARMS min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT diff --git a/code/modules/mob/living/carbon/carbon_update_icons.dm b/code/modules/mob/living/carbon/carbon_update_icons.dm index 32490dbd6f5f..b6aad62e1072 100644 --- a/code/modules/mob/living/carbon/carbon_update_icons.dm +++ b/code/modules/mob/living/carbon/carbon_update_icons.dm @@ -333,6 +333,15 @@ if(iter_part.burnstate) damage_overlay.add_overlay("[iter_part.dmg_overlay_type]_[iter_part.body_zone]_0[iter_part.burnstate]") + var/mob/living/carbon/human/human = src + if(human) + var/height = human.get_mob_height() + if(height == HUMAN_HEIGHT_DWARF) + height += 2 + height = num2text(height) + var/offsets = GLOB.human_heights_to_offsets[height] + damage_overlay.pixel_y += offsets[1] + apply_overlay(DAMAGE_LAYER) /mob/living/carbon/update_wound_overlays() @@ -345,6 +354,15 @@ if(iter_part.bleed_overlay_icon) wound_overlay.add_overlay(iter_part.bleed_overlay_icon) + var/mob/living/carbon/human/human = src + if(human) + var/height = human.get_mob_height() + if(height == HUMAN_HEIGHT_DWARF) + height += 2 + height = num2text(height) + var/offsets = GLOB.human_heights_to_offsets[height] + wound_overlay.pixel_y += offsets[1] + apply_overlay(WOUND_LAYER) /mob/living/carbon/update_worn_mask() diff --git a/code/modules/mob/living/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm index 6343d324d147..2c371e78b7ff 100644 --- a/code/modules/mob/living/carbon/human/human_update_icons.dm +++ b/code/modules/mob/living/carbon/human/human_update_icons.dm @@ -847,7 +847,7 @@ generate/load female uniform sprites matching all previously decided variables if(HD && !(HAS_TRAIT(src, TRAIT_HUSK))) // lipstick if(lip_style && (LIPS in dna.species.species_traits)) - var/mutable_appearance/lip_overlay = mutable_appearance('icons/mob/species/human/human_face.dmi', "lips_[lip_style]", -BODY_LAYER) + var/mutable_appearance/lip_overlay = mutable_appearance('icons/mob/species/human/human_face.dmi', "lips_[lip_style]", -FACE_LAYER) lip_overlay.color = lip_color if(OFFSET_FACE in dna.species.offset_features) lip_overlay.pixel_x += dna.species.offset_features[OFFSET_FACE][1] @@ -860,7 +860,7 @@ generate/load female uniform sprites matching all previously decided variables if(parent_eyes) add_overlay(parent_eyes.generate_body_overlay(src)) else - var/mutable_appearance/missing_eyes = mutable_appearance('icons/mob/species/human/human_face.dmi', "eyes_missing", -BODY_LAYER) + var/mutable_appearance/missing_eyes = mutable_appearance('icons/mob/species/human/human_face.dmi', "eyes_missing", -FACE_LAYER) if(OFFSET_FACE in dna.species.offset_features) missing_eyes.pixel_x += dna.species.offset_features[OFFSET_FACE][1] missing_eyes.pixel_y += dna.species.offset_features[OFFSET_FACE][2] diff --git a/code/modules/mob/living/carbon/human/init_signals.dm b/code/modules/mob/living/carbon/human/init_signals.dm index 1a864b6bad96..308ade654cfe 100644 --- a/code/modules/mob/living/carbon/human/init_signals.dm +++ b/code/modules/mob/living/carbon/human/init_signals.dm @@ -3,6 +3,8 @@ RegisterSignals(src, list(SIGNAL_ADDTRAIT(TRAIT_UNKNOWN), SIGNAL_REMOVETRAIT(TRAIT_UNKNOWN)), PROC_REF(on_unknown_trait)) RegisterSignals(src, list(SIGNAL_ADDTRAIT(TRAIT_DWARF), SIGNAL_REMOVETRAIT(TRAIT_DWARF)), PROC_REF(on_dwarf_trait)) + RegisterSignals(src, list(SIGNAL_ADDTRAIT(TRAIT_GIANT)), PROC_REF(on_gain_giant_trait)) + RegisterSignals(src, list(SIGNAL_REMOVETRAIT(TRAIT_GIANT)), PROC_REF(on_lose_giant_trait)) /// Gaining or losing [TRAIT_UNKNOWN] updates our name and our sechud /mob/living/carbon/human/proc/on_unknown_trait(datum/source) @@ -19,3 +21,16 @@ regenerate_icons() // No more passtable for you, bub +/mob/living/carbon/human/proc/on_gain_giant_trait(datum/source) + SIGNAL_HANDLER + + src.resize = 1.25 + src.update_transform() + src.visible_message(span_danger("[src] suddenly grows!"), span_notice("Everything around you seems to shrink..")) + +/mob/living/carbon/human/proc/on_lose_giant_trait(datum/source) + SIGNAL_HANDLER + //We're leaving the size traits permanent until someone wants to separate the mutation from customization aspects + //src.resize = 0.8 + //src.update_transform() + //src.visible_message(span_danger("[src] suddenly shrinks!"), span_notice("Everything around you seems to grow..")) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 00ea009c117a..0551edf90cb6 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -653,23 +653,25 @@ GLOBAL_LIST_EMPTY(features_by_species) */ /datum/species/proc/handle_body(mob/living/carbon/human/species_human) species_human.remove_overlay(BODY_LAYER) + species_human.remove_overlay(FACE_LAYER) var/height_offset = species_human.get_top_offset() // From high changed by varying limb height if(HAS_TRAIT(species_human, TRAIT_INVISIBLE_MAN)) return handle_mutant_bodyparts(species_human) var/list/standing = list() + var/list/standing_face = list() var/obj/item/bodypart/head/noggin = species_human.get_bodypart(BODY_ZONE_HEAD) if(noggin && !(HAS_TRAIT(species_human, TRAIT_HUSK))) // lipstick if(species_human.lip_style && (LIPS in species_traits)) - var/mutable_appearance/lip_overlay = mutable_appearance('icons/mob/species/human/human_face.dmi', "lips_[species_human.lip_style]", -BODY_LAYER) + var/mutable_appearance/lip_overlay = mutable_appearance('icons/mob/species/human/human_face.dmi', "lips_[species_human.lip_style]", -FACE_LAYER) lip_overlay.color = species_human.lip_color if(OFFSET_FACE in species_human.dna.species.offset_features) lip_overlay.pixel_x += species_human.dna.species.offset_features[OFFSET_FACE][1] lip_overlay.pixel_y += species_human.dna.species.offset_features[OFFSET_FACE][2] lip_overlay.pixel_y += height_offset - standing += lip_overlay + standing_face += lip_overlay // eyes if(!(NOEYESPRITES in species_traits)) @@ -687,7 +689,7 @@ GLOBAL_LIST_EMPTY(features_by_species) add_pixel_y += height_offset if(!eye_organ) - no_eyeslay = mutable_appearance('icons/mob/species/human/human_face.dmi', "eyes_missing", -BODY_LAYER) + no_eyeslay = mutable_appearance('icons/mob/species/human/human_face.dmi', "eyes_missing", -FACE_LAYER) no_eyeslay.pixel_x += add_pixel_x no_eyeslay.pixel_y += add_pixel_y standing += no_eyeslay @@ -697,7 +699,7 @@ GLOBAL_LIST_EMPTY(features_by_species) if(!no_eyeslay) for(var/mutable_appearance/eye_overlay in eye_organ.generate_body_overlay(species_human)) eye_overlay.pixel_y += height_offset - standing += eye_overlay + standing_face += eye_overlay // organic body markings if(HAS_MARKINGS in species_traits) @@ -770,8 +772,11 @@ GLOBAL_LIST_EMPTY(features_by_species) if(standing.len) species_human.overlays_standing[BODY_LAYER] = standing + if(standing_face.len) + species_human.overlays_standing[FACE_LAYER] = standing_face species_human.apply_overlay(BODY_LAYER) + species_human.apply_overlay(FACE_LAYER) handle_mutant_bodyparts(species_human) /** diff --git a/code/modules/surgery/bodyparts/hair.dm b/code/modules/surgery/bodyparts/hair.dm index 4cbfa5dd585a..673af47de27b 100644 --- a/code/modules/surgery/bodyparts/hair.dm +++ b/code/modules/surgery/bodyparts/hair.dm @@ -68,6 +68,11 @@ facial_hairstyle = human_head_owner.facial_hairstyle var/atom/location = loc || owner || src + var/height = human_head_owner.get_mob_height() + if(height == HUMAN_HEIGHT_DWARF) + height += 2 + height = num2text(height) + var/offsets = GLOB.human_heights_to_offsets[height] if(facial_hairstyle && !facial_hair_hidden && (FACEHAIR in species_flags_list)) sprite_accessory = GLOB.facial_hairstyles_list[facial_hairstyle] @@ -75,11 +80,13 @@ //Create the overlay facial_overlay = mutable_appearance(sprite_accessory.icon, sprite_accessory.icon_state, -HAIR_LAYER) facial_overlay.overlays += emissive_blocker(facial_overlay.icon, facial_overlay.icon_state, location, alpha = hair_alpha) + facial_overlay.pixel_y += offsets[1] //Gradients facial_hair_gradient_style = LAZYACCESS(human_head_owner.grad_style, GRADIENT_FACIAL_HAIR_KEY) if(facial_hair_gradient_style) facial_hair_gradient_color = LAZYACCESS(human_head_owner.grad_color, GRADIENT_FACIAL_HAIR_KEY) facial_gradient_overlay = make_gradient_overlay(sprite_accessory.icon, sprite_accessory.icon_state, HAIR_LAYER, GLOB.facial_hair_gradients_list[facial_hair_gradient_style], facial_hair_gradient_color) + facial_gradient_overlay.pixel_y += offsets[1] facial_overlay.overlays += emissive_blocker(sprite_accessory.icon, sprite_accessory.icon_state, location, alpha = hair_alpha) diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm index c82f0c71d5be..57001668ec8b 100644 --- a/code/modules/surgery/bodyparts/head.dm +++ b/code/modules/surgery/bodyparts/head.dm @@ -203,7 +203,7 @@ . += facial_overlay if(!eyes) - . += image('icons/mob/species/human/human_face.dmi', "eyes_missing", -BODY_LAYER, SOUTH) + . += image('icons/mob/species/human/human_face.dmi', "eyes_missing", -FACE_LAYER, SOUTH) //Applies the debrained overlay if there is no brain if(!brain) @@ -229,14 +229,14 @@ // lipstick if(lip_style) - var/image/lips_overlay = image('icons/mob/species/human/human_face.dmi', "lips_[lip_style]", -BODY_LAYER, SOUTH) + var/image/lips_overlay = image('icons/mob/species/human/human_face.dmi', "lips_[lip_style]", -FACE_LAYER, SOUTH) lips_overlay.color = lip_color . += lips_overlay // eyes if(eyes) // This is a bit of copy/paste code from eyes.dm:generate_body_overlay - var/image/eye_left = image('icons/mob/species/human/human_face.dmi', "[eyes.eye_icon_state]_l", -BODY_LAYER, SOUTH) - var/image/eye_right = image('icons/mob/species/human/human_face.dmi', "[eyes.eye_icon_state]_r", -BODY_LAYER, SOUTH) + var/image/eye_left = image('icons/mob/species/human/human_face.dmi', "[eyes.eye_icon_state]_l", -FACE_LAYER, SOUTH) + var/image/eye_right = image('icons/mob/species/human/human_face.dmi', "[eyes.eye_icon_state]_r", -FACE_LAYER, SOUTH) if(eyes.eye_color_left) eye_left.color = eyes.eye_color_left if(eyes.eye_color_right) diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm index 9cad386b1a91..8aa349be967c 100644 --- a/code/modules/surgery/organs/eyes.dm +++ b/code/modules/surgery/organs/eyes.dm @@ -121,8 +121,8 @@ var/eye_icon = parent.dna?.species.eyes_icon || 'icons/mob/species/human/human_face.dmi' - var/mutable_appearance/eye_left = mutable_appearance(eye_icon, "[eye_icon_state]_l", -BODY_LAYER) - var/mutable_appearance/eye_right = mutable_appearance(eye_icon, "[eye_icon_state]_r", -BODY_LAYER) + var/mutable_appearance/eye_left = mutable_appearance(eye_icon, "[eye_icon_state]_l", -FACE_LAYER) + var/mutable_appearance/eye_right = mutable_appearance(eye_icon, "[eye_icon_state]_r", -FACE_LAYER) var/list/overlays = list(eye_left, eye_right) if(EYECOLOR in parent.dna?.species.species_traits) diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_goblin.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_goblin.png index 22204deaabb0..cfd36b779863 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_goblin.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_goblin.png differ diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm index 6289b82508ad..01fff9bdf6db 100644 --- a/code/modules/vending/security.dm +++ b/code/modules/vending/security.dm @@ -30,6 +30,7 @@ /obj/item/clothing/gloves/tackler = 5, /obj/item/grenade/stingbang = 1, /obj/item/watertank/pepperspray = 2, + /obj/item/storage/belt/holster/energy = 4, /obj/item/ammo_box/magazine/m35 = 5, //monkestation edit: Paco sec ) refill_canister = /obj/item/vending_refill/security diff --git a/html/changelogs/AutoChangeLog-pr-363.yml b/html/changelogs/AutoChangeLog-pr-363.yml new file mode 100644 index 000000000000..e6f11031bd71 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-363.yml @@ -0,0 +1,5 @@ +author: "KoboldCommando" +delete-after: True +changes: + - bugfix: "dwarf beards and eyes should work properly now" + - bugfix: "giants use the new height system and look a bit less distorted" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-418.yml b/html/changelogs/AutoChangeLog-pr-418.yml new file mode 100644 index 000000000000..7e13dee9932c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-418.yml @@ -0,0 +1,4 @@ +author: "DrDiasyl aka DrTuxedo" +delete-after: True +changes: + - balance: "Holsters can now be clipped to any suit, and house Captain antique gun and HoS gun. You now can buy holsters from the SecTech premium section." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-426.yml b/html/changelogs/AutoChangeLog-pr-426.yml new file mode 100644 index 000000000000..9a0e1f0e0119 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-426.yml @@ -0,0 +1,6 @@ +author: "lmenvs" +delete-after: True +changes: + - bugfix: "various oshan fixes" + - rscadd: "new conveyor/auto/inside_corners for the missing directional sprites." + - rscadd: "new wrestling railing." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-428.yml b/html/changelogs/AutoChangeLog-pr-428.yml new file mode 100644 index 000000000000..38c75a4d5b6c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-428.yml @@ -0,0 +1,10 @@ +author: "wraith-54321" +delete-after: True +changes: + - bugfix: "eminence linked abscond and purge reagents can now actually be used again" + - bugfix: "vitality matrix servant revival" + - balance: "default max servants is now 10 again" + - balance: "replica fabricators now build slower on reebe until the cult has stabilized their first anchoring crystal" + - balance: "clockwork bows deal double damage to non clockwork machines and structures" + - balance: "kindle will now only have less effect on reebe if the ark is active" + - balance: "the crew now has 30 extra seconds to prepare before the portals open" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-430.yml b/html/changelogs/AutoChangeLog-pr-430.yml new file mode 100644 index 000000000000..9aac974ecbb4 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-430.yml @@ -0,0 +1,4 @@ +author: "KoboldCommando" +delete-after: True +changes: + - sound: "tweaked the new surgery sound" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-432.yml b/html/changelogs/AutoChangeLog-pr-432.yml new file mode 100644 index 000000000000..992e18ae3ff6 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-432.yml @@ -0,0 +1,4 @@ +author: "Glyphee" +delete-after: True +changes: + - rscadd: "placeholder screams" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-435.yml b/html/changelogs/AutoChangeLog-pr-435.yml new file mode 100644 index 000000000000..5818f06b0046 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-435.yml @@ -0,0 +1,4 @@ +author: "Salted-Zen" +delete-after: True +changes: + - rscadd: "Added medical eyepatch and mask to monkey store" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-437.yml b/html/changelogs/AutoChangeLog-pr-437.yml new file mode 100644 index 000000000000..9f1eb2f46904 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-437.yml @@ -0,0 +1,8 @@ +author: "Dexee" +delete-after: True +changes: + - qol: "Evidence lockers on Tramstation now numbered correctly" + - qol: "Two evidence lockers swapped on Tramstation for their secure counterparts to match other stations." + - qol: "Scrubber and Vent pipes by arrivals on lower Z now properly connect on Tramstation" + - qol: "Added a missing multi-Z cable hub to the bridge on Tramstation. The vault has power again!" + - rscdel: "Removed an errant directional plasmaglass window by the SM cooling loop on Deltastation." \ No newline at end of file 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 000000000000..06e74c30b59a Binary files /dev/null and b/monkestation/code/modules/aesthetics/icons/railing_wrestling.dmi differ diff --git a/monkestation/code/modules/aesthetics/objects/railing.dm b/monkestation/code/modules/aesthetics/objects/railing.dm index 2ad7f7a72840..3814ef943151 100644 --- a/monkestation/code/modules/aesthetics/objects/railing.dm +++ b/monkestation/code/modules/aesthetics/objects/railing.dm @@ -133,3 +133,8 @@ 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' + material_flags = null diff --git a/monkestation/code/modules/antagonists/clock_cult/actions/_action.dm b/monkestation/code/modules/antagonists/clock_cult/actions/_action.dm index 1c64b06e3867..9ab4c66b9277 100644 --- a/monkestation/code/modules/antagonists/clock_cult/actions/_action.dm +++ b/monkestation/code/modules/antagonists/clock_cult/actions/_action.dm @@ -69,3 +69,4 @@ if(!iseminence(usr)) to_chat(usr, span_boldwarning("You are not an eminence and should not have this! Please report this as a bug.")) return FALSE + return TRUE diff --git a/monkestation/code/modules/antagonists/clock_cult/actions/purge_reagents.dm b/monkestation/code/modules/antagonists/clock_cult/actions/purge_reagents.dm index 85405c17086d..b13167b0b5f2 100644 --- a/monkestation/code/modules/antagonists/clock_cult/actions/purge_reagents.dm +++ b/monkestation/code/modules/antagonists/clock_cult/actions/purge_reagents.dm @@ -14,8 +14,8 @@ to_chat(em_user, span_notice("You dont currently have a marked servant!")) return FALSE var/mob/living/purged = em_user.marked_servant?.resolve() - for(var/datum/reagent/chem in purged.reagents.reagent_list) - purged.reagents.remove_reagent(chem.type, chem.volume) + for(var/datum/reagent/chem in purged.reagents?.reagent_list) + purged.reagents?.remove_reagent(chem.type, chem.volume) to_chat(em_user, "You purge the reagents of [purged].") em_user.marked_servant = null return TRUE diff --git a/monkestation/code/modules/antagonists/clock_cult/antag_datums/clock_cult_team.dm b/monkestation/code/modules/antagonists/clock_cult/antag_datums/clock_cult_team.dm index 56e5ca5f0e8b..961c2ac12034 100644 --- a/monkestation/code/modules/antagonists/clock_cult/antag_datums/clock_cult_team.dm +++ b/monkestation/code/modules/antagonists/clock_cult/antag_datums/clock_cult_team.dm @@ -1,7 +1,7 @@ GLOBAL_DATUM(main_clock_cult, /datum/team/clock_cult) -//this is effectively 4 higher due to the first anchoring crystal always allowing 4 more servants -#define DEFAULT_MAX_HUMAN_SERVANTS 8 +//this is effectively 2 higher due to the first anchoring crystal always allowing 2 more servants +#define DEFAULT_MAX_HUMAN_SERVANTS 10 #define CONVERSION_WARNING_NONE 0 #define CONVERSION_WARNING_HALFWAY 1 #define CONVERSION_WARNING_THREEQUARTERS 2 diff --git a/monkestation/code/modules/antagonists/clock_cult/antag_datums/clock_cultist.dm b/monkestation/code/modules/antagonists/clock_cult/antag_datums/clock_cultist.dm index 2c5ce5a9ee1a..1cfcc2548c8f 100644 --- a/monkestation/code/modules/antagonists/clock_cult/antag_datums/clock_cultist.dm +++ b/monkestation/code/modules/antagonists/clock_cult/antag_datums/clock_cultist.dm @@ -44,8 +44,10 @@ /datum/antagonist/clock_cultist/greet() . = ..() - to_chat(owner.current, span_notice("Dont forget, your structures are by default off and must be clicked on to be turned on. Structures that are turned on have passive power use.")) - to_chat(owner.current, span_brass("The bottom right corner of your clockwork slab UI has a more in depth guide.")) + to_chat(owner.current, span_boldwarning("Dont forget, your structures are by default off and must be clicked on to be turned on. Structures that are turned on have passive power use.")) + to_chat(owner.current, span_userdanger("HEY")) + to_chat(owner.current, span_boldwarning("YOUR CLOCKWORK SLAB UI HAS A MORE IN DEPTH GUIDE IN ITS BOTTOM RIGHT HAND SIDE. \ + YOU CAN HOVER YOUR MOUSE POINTER OVER SCRIPTURE BUTTONS FOR EXTRA INFO.")) //given_clock_team is provided by conversion methods, although we never use it due to wanting to just set their team to the main clock cult /datum/antagonist/clock_cultist/create_team(datum/team/clock_cult/given_clock_team) diff --git a/monkestation/code/modules/antagonists/clock_cult/items/replica_fabricator.dm b/monkestation/code/modules/antagonists/clock_cult/items/replica_fabricator.dm index 084814d048ad..b587b80a7d19 100644 --- a/monkestation/code/modules/antagonists/clock_cult/items/replica_fabricator.dm +++ b/monkestation/code/modules/antagonists/clock_cult/items/replica_fabricator.dm @@ -1,5 +1,7 @@ #define BRASS_POWER_COST 10 #define REGULAR_POWER_COST (BRASS_POWER_COST / 2) +//how much to add to the creation_delay while the cult lacks a charged anchoring crystal +#define SLOWDOWN_FROM_NO_ANCHOR_CRYSTAL 0.2 /obj/item/clockwork/replica_fabricator name = "replica fabricator" @@ -80,7 +82,13 @@ else if(!isopenturf(target)) return - var/calculated_creation_delay = selected_output.creation_delay * (on_reebe(user) ? selected_output.reebe_mult : 1) + var/calculated_creation_delay = 1 + if(on_reebe(user)) + calculated_creation_delay = selected_output.reebe_mult + if(!get_charged_anchor_crystals()) + calculated_creation_delay += SLOWDOWN_FROM_NO_ANCHOR_CRYSTAL + calculated_creation_delay = selected_output.creation_delay * calculated_creation_delay + var/obj/effect/temp_visual/ratvar/constructing_effect/effect = new(creation_turf, calculated_creation_delay) if(!do_after(user, calculated_creation_delay, target)) @@ -311,3 +319,4 @@ #undef BRASS_POWER_COST #undef REGULAR_POWER_COST +#undef SLOWDOWN_FROM_NO_ANCHOR_CRYSTAL diff --git a/monkestation/code/modules/antagonists/clock_cult/items/weaponry.dm b/monkestation/code/modules/antagonists/clock_cult/items/weaponry.dm index e11c1ef62ca7..2aead8e80ec0 100644 --- a/monkestation/code/modules/antagonists/clock_cult/items/weaponry.dm +++ b/monkestation/code/modules/antagonists/clock_cult/items/weaponry.dm @@ -229,7 +229,8 @@ /obj/item/gun/ballistic/bow/clockwork name = "brass bow" - desc = "A bow made from brass and other components that you can't quite understand. It glows with a deep energy and frabricates arrows by itself." + desc = "A bow made from brass and other components that you can't quite understand. It glows with a deep energy and frabricates arrows by itself. \ + It's bolts destabilize hit structures, making them lose additional integrity." icon = 'monkestation/icons/obj/clock_cult/clockwork_weapons.dmi' lefthand_file = 'monkestation/icons/mob/clock_cult/clockwork_lefthand.dmi' righthand_file = 'monkestation/icons/mob/clock_cult/clockwork_righthand.dmi' @@ -319,5 +320,19 @@ damage = 25 damage_type = BURN +//double damage to non clockwork structures and machines +/obj/projectile/energy/clockbolt/on_hit(atom/target, blocked, pierce_hit) + if(ismob(target)) + var/mob/mob_target = target + if(IS_CLOCK(mob_target)) //friendly fire is bad + return + + . = ..() + if(!.) + return + + if(!QDELETED(target) && (istype(target, /obj/structure) || istype(target, /obj/machinery)) && !istype(target, /obj/structure/destructible/clockwork)) + target.update_integrity(target.get_integrity() - 25) + #undef HAMMER_FLING_DISTANCE #undef HAMMER_THROW_FLING_DISTANCE diff --git a/monkestation/code/modules/antagonists/clock_cult/scriptures/preservation/clockwork_armaments.dm b/monkestation/code/modules/antagonists/clock_cult/scriptures/preservation/clockwork_armaments.dm index 74b3888b62ed..7ffded8b7c17 100644 --- a/monkestation/code/modules/antagonists/clock_cult/scriptures/preservation/clockwork_armaments.dm +++ b/monkestation/code/modules/antagonists/clock_cult/scriptures/preservation/clockwork_armaments.dm @@ -37,4 +37,4 @@ base_outfit.equip(invoker) - invoker.put_in_hands(new weapon_path, FALSE) + invoker.put_in_hands(new weapon_path, FALSE, forced = FALSE) diff --git a/monkestation/code/modules/antagonists/clock_cult/scriptures/servitude/kindle.dm b/monkestation/code/modules/antagonists/clock_cult/scriptures/servitude/kindle.dm index afa4a9e9c082..778fd32722e2 100644 --- a/monkestation/code/modules/antagonists/clock_cult/scriptures/servitude/kindle.dm +++ b/monkestation/code/modules/antagonists/clock_cult/scriptures/servitude/kindle.dm @@ -90,7 +90,7 @@ carbon_hit.adjust_silence(EFFECT_TIME * 2) //enough time to cuff and remove their radio, or just go back to reebe where their comms wont work carbon_hit.AdjustKnockdown(EFFECT_TIME * 1.5) - carbon_hit.Stun(EFFECT_TIME * (on_reebe(carbon_hit) ? 0.1 : 1)) //pretty much 0 stun if your on reebe, still good for knockdown though + carbon_hit.Stun(EFFECT_TIME * ((on_reebe(carbon_hit) && GLOB.clock_ark?.current_state) ? 0.1 : 1)) //pretty much 0 stun if your on reebe, still good for knockdown though if(hit_mob.client) var/client_color = hit_mob.client.color diff --git a/monkestation/code/modules/antagonists/clock_cult/structures/anchor_crystal.dm b/monkestation/code/modules/antagonists/clock_cult/structures/anchor_crystal.dm index 2b17b8527e86..7272c29bbd9f 100644 --- a/monkestation/code/modules/antagonists/clock_cult/structures/anchor_crystal.dm +++ b/monkestation/code/modules/antagonists/clock_cult/structures/anchor_crystal.dm @@ -9,6 +9,7 @@ GLOBAL_LIST_EMPTY(anchoring_crystals) //list of all anchoring crystals #define SHIELD_DEFLECT "deflect" //the shield is currently in its deflecting animation #define SHIELD_BREAK "break" //the shield is currently in its breaking animation #define SHIELD_BROKEN "broken" //the shield is currently broken +#define SERVANT_CAPACITY_TO_GIVE 2 //how many extra server slots do we give on first charged crystal /obj/structure/destructible/clockwork/anchoring_crystal name = "Anchoring Crystal" desc = "A strange crystal that you cant quite seem to focus on." @@ -152,6 +153,7 @@ GLOBAL_LIST_EMPTY(anchoring_crystals) //list of all anchoring crystals //do all the stuff for finishing charging /obj/structure/destructible/clockwork/anchoring_crystal/proc/finish_charging() + send_clock_message(null, span_bigbrass(span_bold("The Anchoring Crystal at [crystal_area] has fully charged! [anchoring_crystal_charge_message(TRUE)]"))) charge_state = FULLY_CHARGED resistance_flags += INDESTRUCTIBLE atom_integrity = INFINITY @@ -161,7 +163,6 @@ GLOBAL_LIST_EMPTY(anchoring_crystals) //list of all anchoring crystals "Central Command Higher Dimensional Affairs", ANNOUNCER_SPANOMALIES, has_important_message = TRUE) GLOB.max_clock_power += 1000 - send_clock_message(null, span_bigbrass(span_bold("The Anchoring Crystal at [crystal_area] has fully charged! [anchoring_crystal_charge_message(TRUE)]"))) SSshuttle.clearHostileEnvironment(src) var/datum/scripture/create_structure/anchoring_crystal/creation_scripture = /datum/scripture/create_structure/anchoring_crystal if(locate(creation_scripture) in GLOB.clock_scriptures_by_type) @@ -169,8 +170,8 @@ GLOBAL_LIST_EMPTY(anchoring_crystals) //list of all anchoring crystals creation_scripture.update_info() switch(get_charged_anchor_crystals()) - if(1) //add 4 more max servants - GLOB.main_clock_cult.max_human_servants += 4 + if(1) //add 2 more max servants and increase replica fabricator build speed + GLOB.main_clock_cult.max_human_servants += SERVANT_CAPACITY_TO_GIVE if(2) //create a steam helios on reebe if(GLOB.abscond_markers.len) var/turf/created_at = get_turf(pick(GLOB.abscond_markers)) @@ -205,13 +206,13 @@ GLOBAL_LIST_EMPTY(anchoring_crystals) //list of all anchoring crystals ///return a message based off of what this anchoring crystal did/will do for the cult /proc/anchoring_crystal_charge_message(completed = FALSE) - var/message + var/message = "" switch(get_charged_anchor_crystals()) + if(0) + message = "[completed ? "We can now" : "We will be able to"] support 2 more servants, gain faster buildspeed with replica fabricators on reebe, and the ark can be opened." if(1) - message = "[completed ? "We can now" : "We will be able to"] support 4 more servants and the ark can be opened." - if(2) message = "The Steam Helios, a strong 2 pilot mech, [completed ? "has been" : "will be"] summoned to reebe." - if(3) + if(2) message = "Humaniod servants [completed ? "may now" : "will be able to"] ascend their form to that of a clockwork golem, giving them innate armor, environmental immunity, \ and faster invoking for most scriptures." return message @@ -233,3 +234,4 @@ GLOBAL_LIST_EMPTY(anchoring_crystals) //list of all anchoring crystals #undef SHIELD_DEFLECT #undef SHIELD_BREAK #undef SHIELD_BROKEN +#undef SERVANT_CAPACITY_TO_GIVE diff --git a/monkestation/code/modules/antagonists/clock_cult/structures/prosperity_prism.dm b/monkestation/code/modules/antagonists/clock_cult/structures/prosperity_prism.dm index 663dd2bd2244..147217499744 100644 --- a/monkestation/code/modules/antagonists/clock_cult/structures/prosperity_prism.dm +++ b/monkestation/code/modules/antagonists/clock_cult/structures/prosperity_prism.dm @@ -12,7 +12,12 @@ minimum_power = POWER_PER_USE passive_consumption = POWER_PER_USE / 2 ///typecache of chem types to purge - var/static/list/chems_to_purge = typecacheof(list(/datum/reagent/toxin, /datum/reagent/water/holywater)) + var/static/list/chems_to_purge + +/obj/structure/destructible/clockwork/gear_base/powered/prosperity_prism/Initialize(mapload) + . = ..() + if(!chems_to_purge) + chems_to_purge = typecacheof(list(/datum/reagent/toxin, /datum/reagent/water/holywater)) /obj/structure/destructible/clockwork/gear_base/powered/prosperity_prism/process(seconds_per_tick) @@ -27,18 +32,17 @@ if(possible_cultist.health >= possible_cultist.maxHealth) continue - if(use_power(POWER_PER_USE)) - possible_cultist.adjustToxLoss(-2.5 * seconds_per_tick) - possible_cultist.stamina.adjust(7.5 * seconds_per_tick) - possible_cultist.adjustBruteLoss(-2.5 * seconds_per_tick) - possible_cultist.adjustFireLoss(-2.5 * seconds_per_tick) - possible_cultist.adjustOxyLoss(-2.5 * seconds_per_tick) - possible_cultist.adjustCloneLoss(-1 * seconds_per_tick) + possible_cultist.adjustToxLoss(-2.5 * seconds_per_tick) + possible_cultist.stamina.adjust(7.5 * seconds_per_tick) + possible_cultist.adjustBruteLoss(-2.5 * seconds_per_tick) + possible_cultist.adjustFireLoss(-2.5 * seconds_per_tick) + possible_cultist.adjustOxyLoss(-2.5 * seconds_per_tick) + possible_cultist.adjustCloneLoss(-1 * seconds_per_tick) - new /obj/effect/temp_visual/heal(get_turf(possible_cultist), "#1E8CE1") + new /obj/effect/temp_visual/heal(get_turf(possible_cultist), "#1E8CE1") - for(var/datum/reagent/negative_chem in possible_cultist.reagents?.reagent_list) - if(is_type_in_typecache(negative_chem, chems_to_purge)) - possible_cultist.reagents?.remove_reagent(negative_chem.type, 2.5 * seconds_per_tick) + for(var/datum/reagent/negative_chem in possible_cultist.reagents?.reagent_list) + if(is_type_in_typecache(negative_chem, chems_to_purge)) + possible_cultist.reagents?.remove_reagent(negative_chem.type, 2.5 * seconds_per_tick) #undef POWER_PER_USE diff --git a/monkestation/code/modules/antagonists/clock_cult/structures/sigil/sigil_vitality.dm b/monkestation/code/modules/antagonists/clock_cult/structures/sigil/sigil_vitality.dm index 6fca97dca63d..4bc3b0668e9d 100644 --- a/monkestation/code/modules/antagonists/clock_cult/structures/sigil/sigil_vitality.dm +++ b/monkestation/code/modules/antagonists/clock_cult/structures/sigil/sigil_vitality.dm @@ -12,7 +12,7 @@ /obj/structure/destructible/clockwork/sigil/vitality/can_affect(mob/living/affected_mob) - if(affected_mob.stat == DEAD) + if(affected_mob.stat == DEAD && !IS_CLOCK(affected_mob)) return FALSE if(HAS_TRAIT(affected_mob, TRAIT_NODEATH) || HAS_TRAIT(affected_mob, TRAIT_NO_SOUL)) @@ -30,6 +30,8 @@ return FALSE if(IS_CLOCK(affected_mob)) + deltimer(active_timer) + active_timer = null var/revived = FALSE if(affected_mob.stat == DEAD) var/damage_healed = 20 + ((affected_mob.maxHealth - affected_mob.health) * 0.6) @@ -52,7 +54,6 @@ else visible_message(span_warning("\The [src] fails to revive [affected_mob]!")) fail_invocation() - return if(revived) SEND_SOUND(affected_mob, 'sound/magic/clockwork/scripture_tier_up.ogg') to_chat(affected_mob, span_bigbrass("\"[text2ratvar("MY LIGHT SHINES THROUGH YOU, YOUR SERVITUDE IS NOT FINISHED.")]\"")) diff --git a/monkestation/code/modules/antagonists/clock_cult/structures/stargazer.dm b/monkestation/code/modules/antagonists/clock_cult/structures/stargazer.dm index 32d6f7c6c393..9506d226ad1a 100644 --- a/monkestation/code/modules/antagonists/clock_cult/structures/stargazer.dm +++ b/monkestation/code/modules/antagonists/clock_cult/structures/stargazer.dm @@ -8,7 +8,7 @@ icon_state = "stargazer" base_icon_state = "stargazer" anchored = TRUE - break_message = "The stargazer collapses." + break_message = span_warning("The stargazer collapses.") ///ref to our visual effect, migtht be able to make this just be an overlay var/obj/effect/stargazer_light/light_effect ///cooldown for enchanting items diff --git a/monkestation/code/modules/antagonists/clock_cult/structures/the_ark.dm b/monkestation/code/modules/antagonists/clock_cult/structures/the_ark.dm index 93ddab7e1447..48fb92ad8923 100644 --- a/monkestation/code/modules/antagonists/clock_cult/structures/the_ark.dm +++ b/monkestation/code/modules/antagonists/clock_cult/structures/the_ark.dm @@ -7,7 +7,7 @@ GLOBAL_VAR_INIT(ratvar_risen, FALSE) #define ARK_STATE_SUMMONING 3 //state for the halfway point of ark activation #define ARK_STATE_FINAL 4 //the ark has either finished opening or been destroyed in this state #define ARK_READY_PERIOD 300 SECONDS //how long until the cult is annouced after they reach max members, 5 minutes -#define ARK_GRACE_PERIOD 180 SECONDS //how long until the portals open after the cult is annouced, 3 minutes +#define ARK_GRACE_PERIOD 210 SECONDS //how long until the portals open after the cult is annouced, 3 minutes 30 seconds #define ARK_ASSAULT_PERIOD 600 //how long the crew has to destroy the ark after the assault begins, 10 minutes /obj/structure/destructible/clockwork/the_ark name = "\improper Ark of the Clockwork Justiciar" diff --git a/monkestation/code/modules/conveyor/code/conveyor.dm b/monkestation/code/modules/conveyor/code/conveyor.dm new file mode 100644 index 000000000000..c77e49a4edd0 --- /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/icons/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/monkestation/code/modules/conveyor/icons/conveyor.dmi b/monkestation/code/modules/conveyor/icons/conveyor.dmi new file mode 100644 index 000000000000..81cbbe90b634 Binary files /dev/null and b/monkestation/code/modules/conveyor/icons/conveyor.dmi differ diff --git a/monkestation/code/modules/donator/code/datum/loadout.dm b/monkestation/code/modules/donator/code/datum/loadout.dm index d9a8c2ffc49c..0622a8c615fa 100644 --- a/monkestation/code/modules/donator/code/datum/loadout.dm +++ b/monkestation/code/modules/donator/code/datum/loadout.dm @@ -3,10 +3,14 @@ /datum/loadout_item/suit/cirno_outfit name = "Cirno Outfit" item_path = /obj/item/clothing/suit/costume/cirno + donator_only = TRUE + requires_purchase = FALSE /datum/loadout_item/head/cirno name = "Cirno Wig" item_path = /obj/item/clothing/head/costume/cirno + donator_only = TRUE + requires_purchase = FALSE /datum/loadout_item/pocket_items/donator/cirno name = "Pet Delivery Beacon - Cirno" @@ -40,6 +44,8 @@ /datum/loadout_item/suit/shark_costume name = "Blahaj Costume" item_path = /obj/item/clothing/suit/hooded/shark_costume + donator_only = TRUE + requires_purchase = FALSE //ruby_flamewing @@ -54,48 +60,56 @@ name = "Syndicate Pajamas" item_path = /obj/item/clothing/under/costume/syndie_pajamas donator_only = TRUE + requires_purchase = FALSE //happiestplane /datum/loadout_item/mask/zoro name = "Zoro Mask" item_path = /obj/item/clothing/mask/zoro donator_only = TRUE + requires_purchase = FALSE /datum/loadout_item/under/navy_uniform name = "Naval Officer Uniform" item_path = /obj/item/clothing/under/costume/navy_uniform_gold donator_only = TRUE + requires_purchase = FALSE //riddler /datum/loadout_item/suit/dark_hos name = "Dark HoS Trenchcoat" item_path = /obj/item/clothing/suit/costume/dark_hos donator_only = TRUE + requires_purchase = FALSE /datum/loadout_item/head/cirno name = "Dark HoS Hat" item_path = /obj/item/clothing/head/costume/dark_hos donator_only = TRUE + requires_purchase = FALSE /datum/loadout_item/toys/seam_plush name = "Puck Plush" item_path = /obj/item/toy/plush/seam donator_only = TRUE + requires_purchase = FALSE //sammi /datum/loadout_item/toys/puck_plush name = "Puck Plush" item_path = /obj/item/toy/plush/puck donator_only = TRUE + requires_purchase = FALSE //ADHDBirb -/datum/loadout_item/suit/cirno_outfit +/datum/loadout_item/suit/lemon_bomber name = "Lemon Assault Vest" item_path = /obj/item/clothing/suit/jacket/bomber/lemon donator_only = TRUE + requires_purchase = FALSE //Random @@ -103,3 +117,4 @@ name = "Spider Plush" item_path = /obj/item/toy/plush/spider donator_only = TRUE + requires_purchase = FALSE diff --git a/monkestation/code/modules/loadouts/items/glasses.dm b/monkestation/code/modules/loadouts/items/glasses.dm index a9a0b7fd2a3d..e95e76014cde 100644 --- a/monkestation/code/modules/loadouts/items/glasses.dm +++ b/monkestation/code/modules/loadouts/items/glasses.dm @@ -89,7 +89,11 @@ GLOBAL_LIST_INIT(loadout_glasses, generate_loadout_items(/datum/loadout_item/gla /datum/loadout_item/glasses/eyepatch name = "Eyepatch" - item_path = /obj/item/clothing/glasses/eyepatch + item_path = /obj/item/clothing/glasses/ + +/datum/loadout_item/glasses/eyepatch_medical + name = "Medical Eyepatch" + item_path = /obj/item/clothing/glasses/eyepatch/medical /datum/loadout_item/glasses/blindfold name = "Blindfold" diff --git a/monkestation/code/modules/loadouts/items/masks.dm b/monkestation/code/modules/loadouts/items/masks.dm index b9b51b647065..8835e0987793 100644 --- a/monkestation/code/modules/loadouts/items/masks.dm +++ b/monkestation/code/modules/loadouts/items/masks.dm @@ -49,6 +49,9 @@ GLOBAL_LIST_INIT(loadout_masks, generate_loadout_items(/datum/loadout_item/mask) name = "Skull Bandana" item_path = /obj/item/clothing/mask/bandana/skull +/datum/loadout_item/mask/surgical_mask + name = "Sterile Mask" + item_path = /obj/item/clothing/mask/surgical /* * GAS MASKS diff --git a/monkestation/code/modules/mob/living/carbon/human/species_type/goblin.dm b/monkestation/code/modules/mob/living/carbon/human/species_type/goblin.dm index 2835d6721aca..a941a712daf5 100644 --- a/monkestation/code/modules/mob/living/carbon/human/species_type/goblin.dm +++ b/monkestation/code/modules/mob/living/carbon/human/species_type/goblin.dm @@ -42,6 +42,33 @@ /mob/living/carbon/human/species/goblin race = /datum/species/goblin +/datum/species/goblin/get_scream_sound(mob/living/carbon/human/human) + if(human.gender == MALE) + if(prob(1)) + return 'sound/voice/human/wilhelm_scream.ogg' + return pick( + 'sound/voice/human/malescream_1.ogg', + 'sound/voice/human/malescream_2.ogg', + 'sound/voice/human/malescream_3.ogg', + 'sound/voice/human/malescream_4.ogg', + 'sound/voice/human/malescream_5.ogg', + 'sound/voice/human/malescream_6.ogg', + ) + + return pick( + 'sound/voice/human/femalescream_1.ogg', + 'sound/voice/human/femalescream_2.ogg', + 'sound/voice/human/femalescream_3.ogg', + 'sound/voice/human/femalescream_4.ogg', + 'sound/voice/human/femalescream_5.ogg', + ) + +/datum/species/goblin/get_laugh_sound(mob/living/carbon/human/human) + if(human.gender == MALE) + return pick('sound/voice/human/manlaugh1.ogg', 'sound/voice/human/manlaugh2.ogg') + else + return 'sound/voice/human/womanlaugh.ogg' + /datum/language_holder/goblin understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM), /datum/language/goblin = list(LANGUAGE_ATOM)) diff --git a/monkestation/code/modules/store/store_items/glasses.dm b/monkestation/code/modules/store/store_items/glasses.dm index a4917d8fce23..597a9c3a7a45 100644 --- a/monkestation/code/modules/store/store_items/glasses.dm +++ b/monkestation/code/modules/store/store_items/glasses.dm @@ -60,6 +60,10 @@ GLOBAL_LIST_INIT(store_glasses, generate_store_items(/datum/store_item/glasses)) name = "Eyepatch" item_path = /obj/item/clothing/glasses/eyepatch +/datum/store_item/glasses/eyepatch_medical + name = "Medical Eyepatch" + item_path = /obj/item/clothing/glasses/eyepatch/medical + /datum/store_item/glasses/blindfold name = "Blindfold" item_path = /obj/item/clothing/glasses/blindfold diff --git a/monkestation/code/modules/store/store_items/masks.dm b/monkestation/code/modules/store/store_items/masks.dm index ee61b7ab519d..7c4c019ce5d8 100644 --- a/monkestation/code/modules/store/store_items/masks.dm +++ b/monkestation/code/modules/store/store_items/masks.dm @@ -27,6 +27,10 @@ GLOBAL_LIST_INIT(store_masks, generate_store_items(/datum/store_item/mask)) name = "Skull Bandana" item_path = /obj/item/clothing/mask/bandana/skull +/datum/store_item/mask/surgical_mask + name = "Sterile Mask" + item_path = /obj/item/clothing/mask/surgical + /* * GAS MASKS diff --git a/sound/surgery/retractor2.ogg b/sound/surgery/retractor2.ogg index 9a8c64efc17e..572808b09a3e 100644 Binary files a/sound/surgery/retractor2.ogg and b/sound/surgery/retractor2.ogg differ diff --git a/tgstation.dme b/tgstation.dme index ff9d8f7cc8d2..238b739b1010 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5820,6 +5820,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"