diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm index 42ca9e3a167..199bd564786 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm @@ -8,7 +8,7 @@ /area/icemoon/surface) "h" = ( /obj/effect/mob_spawn/corpse/human/skeleton, -/obj/item/clothing/suit/bronze, +/obj/item/clothing/suit/costume/bronze, /obj/item/clothing/shoes/bronze, /obj/item/clothing/head/bronze, /turf/open/floor/bronze{ diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm index 4b68b157bff..8f94726e2bf 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm @@ -580,7 +580,7 @@ }, /obj/item/clothing/neck/beads, /obj/item/clothing/glasses/sunglasses/reagent, -/obj/item/clothing/suit/hawaiian, +/obj/item/clothing/suit/costume/hawaiian, /turf/open/floor/wood, /area/ruin/powered/beach) "sV" = ( @@ -1257,7 +1257,7 @@ /obj/structure/closet/cabinet, /obj/item/storage/backpack/duffelbag, /obj/item/clothing/under/shorts/blue, -/obj/item/clothing/suit/ianshirt, +/obj/item/clothing/suit/costume/ianshirt, /obj/item/clothing/shoes/sandal{ desc = "A very fashionable pair of flip-flops."; name = "flip-flops" diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm index 94ebab0e4d2..1dbd60e75f4 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm @@ -117,7 +117,7 @@ /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/dirt/dust, /obj/item/clothing/head/fedora/curator, -/obj/item/clothing/suit/curator, +/obj/item/clothing/suit/jacket/curator, /turf/open/floor/mineral/titanium/white, /area/ruin/powered/graveyard_shuttle) "cm" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm index 92b43af8aed..ed086216aa5 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm @@ -202,7 +202,7 @@ /obj/item/honey_frame, /obj/item/queen_bee/bought, /obj/item/clothing/head/beekeeper_head, -/obj/item/clothing/suit/beekeeper_suit, +/obj/item/clothing/suit/utility/beekeeper_suit, /obj/machinery/light/directional/west, /turf/open/floor/vault, /area/ruin/powered/seedvault) @@ -342,7 +342,7 @@ /obj/item/honey_frame, /obj/item/queen_bee/bought, /obj/item/clothing/head/beekeeper_head, -/obj/item/clothing/suit/beekeeper_suit, +/obj/item/clothing/suit/utility/beekeeper_suit, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/vault, /area/ruin/powered/seedvault) diff --git a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm index ef2f00da598..74f318cdab9 100644 --- a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm +++ b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm @@ -196,7 +196,7 @@ "aQ" = ( /obj/structure/closet/crate/radiation, /obj/item/clothing/head/radiation, -/obj/item/clothing/suit/radiation, +/obj/item/clothing/suit/utility/radiation, /obj/item/geiger_counter, /turf/open/floor/mineral/titanium/yellow, /area/ruin/space/has_grav/derelictoutpost/dockedship) diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index e5a822a9c6d..a358bc683ee 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -8548,8 +8548,8 @@ /area/ruin/space/ancientstation/beta/hall) "Tx" = ( /obj/structure/closet/radiation, -/obj/item/clothing/suit/radiation, -/obj/item/clothing/suit/radiation, +/obj/item/clothing/suit/utility/radiation, +/obj/item/clothing/suit/utility/radiation, /obj/item/clothing/head/radiation, /obj/item/clothing/head/radiation, /obj/item/geiger_counter, diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm index 61d7f38be74..df2e7ad0df5 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm @@ -2710,7 +2710,7 @@ pixel_x = -6; pixel_y = -12 }, -/obj/item/clothing/suit/fire/atmos{ +/obj/item/clothing/suit/utility/fire/atmos{ pixel_x = 12; pixel_y = -12 }, diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm index 8807c319989..181e68bfdc3 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm @@ -4355,7 +4355,7 @@ /area/ruin/space/has_grav/skyrat/interdynefob/service/diner) "pr" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/clothing/suit/nerdshirt, +/obj/item/clothing/suit/costume/nerdshirt, /obj/effect/decal/cleanable/blood/footprints{ dir = 8 }, @@ -11662,7 +11662,7 @@ }, /obj/structure/closet/crate, /obj/item/inflatable/door, -/obj/item/clothing/suit/fire/atmos{ +/obj/item/clothing/suit/utility/fire/atmos{ armor = list("melee"=20,"bullet"=30,"laser"=20,"energy"=20,"bomb"=20,"bio"=10,"fire"=80,"acid"=50); desc = "An old, reinforced and obviously stolen firesuit. There's an expiry date for the thermal padding, safe to say it's well past the expiration date."; name = "padded firesuit"; diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm index 286bf8a2ec8..c70a9748d70 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm @@ -1574,7 +1574,7 @@ }, /obj/structure/closet/radiation, /obj/item/clothing/head/radiation, -/obj/item/clothing/suit/radiation, +/obj/item/clothing/suit/utility/radiation, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/port_tarkon/atmos) "iy" = ( diff --git a/_maps/RandomZLevels/SnowCabin.dmm b/_maps/RandomZLevels/SnowCabin.dmm index 01b852192b6..a3177e1e0dd 100644 --- a/_maps/RandomZLevels/SnowCabin.dmm +++ b/_maps/RandomZLevels/SnowCabin.dmm @@ -3838,7 +3838,7 @@ invoke_damage = 60; name = "ice rune" }, -/obj/item/clothing/suit/snowman{ +/obj/item/clothing/suit/costume/snowman{ desc = "The dead body of a snowman. There's holes to stick your own body in it."; name = "snowman corpse" }, diff --git a/_maps/RandomZLevels/TheBeach.dmm b/_maps/RandomZLevels/TheBeach.dmm index 2fb1d9c8785..0d7de3b1621 100644 --- a/_maps/RandomZLevels/TheBeach.dmm +++ b/_maps/RandomZLevels/TheBeach.dmm @@ -125,7 +125,7 @@ }, /obj/item/clothing/head/pirate, /obj/item/clothing/glasses/eyepatch, -/obj/item/clothing/suit/pirate, +/obj/item/clothing/suit/costume/pirate, /obj/item/claymore/cutlass{ desc = "A piratey, foam sword used by kids to train themselves in the business of \"negotiating\" the transfer of treasure."; force = 0; diff --git a/_maps/RandomZLevels/mothership_astrum.dmm b/_maps/RandomZLevels/mothership_astrum.dmm index 4a8b85b81c2..75b51b4664a 100644 --- a/_maps/RandomZLevels/mothership_astrum.dmm +++ b/_maps/RandomZLevels/mothership_astrum.dmm @@ -837,10 +837,6 @@ "nJ" = ( /obj/structure/table/wood, /obj/item/clothing/head/pirate/armored, -/obj/item/clothing/suit/pirate/captain/armored{ - armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 30, "bio" = 30, "fire" = 60, "acid" = 75); - name = "improved captain coat" - }, /turf/open/floor/wood, /area/awaymission/mothership_astrum/deck5) "nK" = ( @@ -1166,7 +1162,7 @@ /area/awaymission/mothership_astrum/halls) "sG" = ( /obj/structure/chair, -/obj/item/clothing/suit/pirate/armored, +/obj/item/clothing/suit/costume/pirate/armored, /turf/open/misc/beach/sand, /area/awaymission/mothership_astrum/deck5) "sI" = ( diff --git a/_maps/map_files/Blueshift/BlueShift_middle.dmm b/_maps/map_files/Blueshift/BlueShift_middle.dmm index f14e7e0d738..e8fa1032d30 100644 --- a/_maps/map_files/Blueshift/BlueShift_middle.dmm +++ b/_maps/map_files/Blueshift/BlueShift_middle.dmm @@ -3392,7 +3392,7 @@ pixel_x = -7; pixel_y = 5 }, -/obj/item/clothing/suit/hawaiian{ +/obj/item/clothing/suit/costume/hawaiian{ pixel_x = 8; pixel_y = 7 }, @@ -10624,7 +10624,7 @@ "cTA" = ( /obj/structure/closet/secure_closet/detective, /obj/item/clothing/under/rank/security/detective, -/obj/item/clothing/suit/det_suit{ +/obj/item/clothing/suit/jacket/det_suit{ icon_state = "curator" }, /obj/item/clothing/head/fedora/det_hat{ @@ -11607,7 +11607,7 @@ dir = 1 }, /obj/structure/table, -/obj/item/clothing/suit/radiation, +/obj/item/clothing/suit/utility/radiation, /obj/item/clothing/head/radiation, /obj/item/clothing/glasses/meson, /obj/item/geiger_counter, @@ -20012,16 +20012,16 @@ /obj/item/clothing/under/rank/security/officer/formal, /obj/item/clothing/under/rank/security/officer/formal, /obj/item/clothing/under/rank/security/officer/formal, -/obj/item/clothing/suit/security/officer, -/obj/item/clothing/suit/security/officer, -/obj/item/clothing/suit/security/officer, -/obj/item/clothing/suit/security/officer, -/obj/item/clothing/suit/security/officer, -/obj/item/clothing/suit/security/officer, +/obj/item/clothing/suit/jacket/officer/blue, +/obj/item/clothing/suit/jacket/officer/blue, +/obj/item/clothing/suit/jacket/officer/blue, +/obj/item/clothing/suit/jacket/officer/blue, +/obj/item/clothing/suit/jacket/officer/blue, +/obj/item/clothing/suit/jacket/officer/blue, /obj/item/clothing/under/rank/security/warden/formal, -/obj/item/clothing/suit/security/warden, +/obj/item/clothing/suit/jacket/warden/blue, /obj/item/clothing/under/rank/security/head_of_security/formal, -/obj/item/clothing/suit/security/hos, +/obj/item/clothing/suit/jacket/hos/blue, /obj/item/clothing/head/beret/sec/navyofficer, /obj/item/clothing/head/beret/sec/navyofficer, /obj/item/clothing/head/beret/sec/navyofficer, @@ -23299,7 +23299,7 @@ /obj/effect/turf_decal/bot, /obj/structure/table/glass, /obj/item/melee/flyswatter, -/obj/item/clothing/suit/beekeeper_suit, +/obj/item/clothing/suit/utility/beekeeper_suit, /obj/item/clothing/head/beekeeper_head, /obj/effect/turf_decal/tile/green{ dir = 4 @@ -23337,7 +23337,7 @@ pixel_x = 6; pixel_y = 8 }, -/obj/item/clothing/suit/yakuza{ +/obj/item/clothing/suit/costume/yakuza{ pixel_x = -6; pixel_y = -8 }, @@ -25496,8 +25496,8 @@ /area/station/security/prison) "iau" = ( /obj/structure/closet/bombcloset/security, -/obj/item/clothing/suit/bomb_suit/security, -/obj/item/clothing/suit/bomb_suit/security, +/obj/item/clothing/suit/utility/bomb_suit/security, +/obj/item/clothing/suit/utility/bomb_suit/security, /obj/item/clothing/head/bomb_hood/security, /obj/item/clothing/head/bomb_hood/security, /obj/machinery/light_switch/directional/west, @@ -30048,8 +30048,8 @@ /area/station/security/lockers) "jwp" = ( /obj/structure/table, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, /obj/item/clothing/mask/muzzle, /obj/item/clothing/mask/muzzle, /obj/item/clothing/glasses/blindfold, @@ -30342,7 +30342,7 @@ /area/station/security/checkpoint/escape) "jAh" = ( /obj/structure/bed, -/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, /obj/item/clothing/glasses/blindfold, /obj/item/clothing/mask/muzzle, /turf/open/floor/iron/dark, @@ -32143,7 +32143,7 @@ }, /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2, -/obj/item/clothing/suit/judgerobe, +/obj/item/clothing/suit/costume/judgerobe, /obj/item/clothing/head/powdered_wig{ pixel_y = 11 }, @@ -41397,7 +41397,7 @@ }, /obj/structure/flora/bush/sparsegrass, /obj/structure/beebox, -/obj/item/clothing/suit/beekeeper_suit, +/obj/item/clothing/suit/utility/beekeeper_suit, /obj/item/clothing/head/beekeeper_head, /turf/open/floor/grass, /area/station/service/chapel) @@ -54275,7 +54275,7 @@ /obj/structure/bed{ name = "Justice Bed" }, -/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, /obj/item/clothing/glasses/blindfold, /obj/item/clothing/mask/muzzle, /obj/item/electropack, @@ -70430,7 +70430,7 @@ }, /obj/structure/extinguisher_cabinet/directional/north, /obj/structure/table, -/obj/item/clothing/suit/radiation, +/obj/item/clothing/suit/utility/radiation, /obj/item/tank/internals/emergency_oxygen/engi, /obj/item/clothing/head/radiation, /obj/item/clothing/glasses/meson, diff --git a/_maps/map_files/Blueshift/BlueShift_upper.dmm b/_maps/map_files/Blueshift/BlueShift_upper.dmm index 90077f437d2..127f93b7efc 100644 --- a/_maps/map_files/Blueshift/BlueShift_upper.dmm +++ b/_maps/map_files/Blueshift/BlueShift_upper.dmm @@ -24159,7 +24159,7 @@ /obj/structure/chair/comfy{ dir = 1 }, -/obj/item/clothing/suit/nerdshirt, +/obj/item/clothing/suit/costume/nerdshirt, /obj/item/clothing/head/fedora, /obj/structure/cable, /turf/open/floor/wood, @@ -35166,7 +35166,7 @@ dir = 1 }, /obj/structure/closet/secure_closet/personal/cabinet, -/obj/item/clothing/suit/ianshirt, +/obj/item/clothing/suit/costume/ianshirt, /obj/item/toy/plush/skyrat/ian/small, /obj/item/tail_pin, /obj/item/clothing/under/rank/civilian/head_of_personnel/skyrat/parade, @@ -57651,10 +57651,10 @@ /area/station/maintenance/aft/upper) "txt" = ( /obj/structure/rack/shelf, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, /turf/open/floor/iron, /area/station/medical/aslyum) "txw" = ( diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index fa03661f95c..beaa3aa585f 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -7879,18 +7879,6 @@ }, /turf/open/space, /area/space/nearstation) -"cau" = ( -/obj/structure/bed{ - dir = 4 - }, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/mask/muzzle, -/obj/item/clothing/glasses/blindfold, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/station/security/execution/transfer) "caw" = ( /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron/white, @@ -8585,6 +8573,12 @@ /obj/structure/sign/poster/random/directional/east, /turf/open/floor/iron, /area/station/maintenance/port/fore) +"ckB" = ( +/obj/structure/closet/secure_closet/hop, +/obj/item/clothing/suit/costume/ianshirt, +/obj/item/bedsheet/ian, +/turf/open/floor/iron/grimy, +/area/station/command/heads_quarters/hop) "ckC" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -9085,13 +9079,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) -"cse" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/science/genetics) "csh" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -10288,16 +10275,6 @@ }, /turf/open/floor/iron, /area/station/security/courtroom) -"cHj" = ( -/obj/structure/bed, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/mask/muzzle, -/obj/item/clothing/glasses/blindfold, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/security/execution/transfer) "cHk" = ( /obj/structure/table/wood, /obj/item/folder/yellow, @@ -13312,11 +13289,6 @@ /obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/iron/dark, /area/station/medical/surgery/theatre) -"dBY" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/science/genetics) "dCd" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -14022,11 +13994,6 @@ /obj/structure/cable/layer3, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) -"dNl" = ( -/obj/machinery/portable_atmospherics/pump/lil_pump, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "dNn" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/airless, @@ -18093,14 +18060,6 @@ /obj/effect/spawner/random/trash/mess, /turf/open/floor/iron, /area/station/service/kitchen/abandoned) -"eXv" = ( -/obj/structure/table/wood, -/obj/item/clothing/suit/cardborg, -/obj/item/clothing/head/cardborg, -/obj/machinery/light/small/directional/east, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/service/theater/abandoned) "eXD" = ( /obj/machinery/camera/directional/north{ c_tag = "Solar - Aft Port"; @@ -18778,21 +18737,6 @@ dir = 1 }, /area/station/service/bar) -"ffb" = ( -/obj/structure/rack, -/obj/item/clothing/suit/fire/firefighter, -/obj/item/clothing/mask/gas, -/obj/item/clothing/head/hardhat/red, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/maintenance/port/greater) "ffd" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/portable_atmospherics/canister/oxygen, @@ -20258,6 +20202,14 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron, /area/station/science/research) +"fyD" = ( +/obj/structure/table/wood, +/obj/item/clothing/suit/costume/cardborg, +/obj/item/clothing/head/cardborg, +/obj/machinery/light/small/directional/east, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/service/theater/abandoned) "fyG" = ( /obj/structure/table_frame/wood, /obj/item/crowbar/red, @@ -30274,6 +30226,21 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/engineering/atmos/project) +"ilz" = ( +/obj/structure/rack, +/obj/item/clothing/suit/utility/fire/firefighter, +/obj/item/clothing/mask/gas, +/obj/item/clothing/head/hardhat/red, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/maintenance/port/greater) "ilG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -34671,17 +34638,6 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) -"jvf" = ( -/obj/machinery/light/directional/south, -/obj/effect/landmark/start/geneticist, -/obj/structure/chair/office/light{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/science/genetics) "jvm" = ( /obj/structure/window/reinforced{ dir = 4 @@ -35660,17 +35616,6 @@ /obj/effect/turf_decal/tile/brown/anticorner/contrasted, /turf/open/floor/iron, /area/station/cargo/qm) -"jHE" = ( -/obj/structure/table/wood, -/obj/item/clothing/suit/justice, -/obj/item/clothing/head/helmet/justice/escape{ - name = "justice helmet" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/dark, -/area/station/service/theater/abandoned) "jHP" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -39625,6 +39570,19 @@ /obj/effect/turf_decal/trimline/blue/filled/line, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +"kJb" = ( +/obj/structure/cable, +/obj/structure/closet/secure_closet/detective, +/obj/item/clothing/head/fedora/det_hat{ + icon_state = "curator" + }, +/obj/item/clothing/suit/jacket/det_suit{ + icon_state = "curator" + }, +/obj/item/clothing/under/rank/security/detective, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/detectives_office) "kJd" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, @@ -42363,20 +42321,12 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/medical/break_room) -"lwA" = ( -/obj/structure/table, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/mask/muzzle, -/obj/item/clothing/glasses/blindfold, -/obj/item/clothing/ears/earmuffs, -/obj/item/gun/syringe, -/obj/item/clothing/glasses/eyepatch, -/obj/machinery/light/directional/east, -/obj/effect/turf_decal/tile/blue{ - dir = 8 +"lws" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 }, -/turf/open/floor/iron/white, -/area/station/medical/surgery/theatre) +/turf/open/floor/iron/dark, +/area/station/science/genetics) "lwD" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -45507,6 +45457,23 @@ }, /turf/open/floor/plating/airless, /area/station/maintenance/port/greater) +"mnN" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Distro to Waste" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/box/corners{ + dir = 8 + }, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/atmos/pumproom) "mnR" = ( /obj/machinery/door/window/brigdoor{ name = "Creature Pen"; @@ -51253,19 +51220,6 @@ }, /turf/open/floor/iron, /area/station/medical/storage) -"nQe" = ( -/obj/structure/cable, -/obj/structure/closet/secure_closet/detective, -/obj/item/clothing/head/fedora/det_hat{ - icon_state = "curator" - }, -/obj/item/clothing/suit/det_suit{ - icon_state = "curator" - }, -/obj/item/clothing/under/rank/security/detective, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/security/detectives_office) "nQg" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 4 @@ -51934,12 +51888,6 @@ /obj/item/assembly/flash/handheld, /turf/open/floor/iron/dark, /area/station/command/bridge) -"nYG" = ( -/obj/structure/closet/secure_closet/hop, -/obj/item/clothing/suit/ianshirt, -/obj/item/bedsheet/ian, -/turf/open/floor/iron/grimy, -/area/station/command/heads_quarters/hop) "nYV" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -56750,6 +56698,10 @@ }, /turf/open/floor/iron/white, /area/station/command/heads_quarters/rd) +"pqP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/science/genetics) "pqX" = ( /obj/structure/chair{ dir = 1 @@ -58991,6 +58943,11 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"pTO" = ( +/obj/machinery/portable_atmospherics/pump/lil_pump, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "pTU" = ( /obj/machinery/camera/directional/north{ c_tag = "Science - Port"; @@ -59485,24 +59442,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/station/service/abandoned_gambling_den) -"qah" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Distro to Waste" - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/light/directional/east, -/obj/effect/turf_decal/box/corners{ - dir = 8 - }, -/obj/machinery/airalarm/directional/east, -/turf/open/floor/iron/dark/corner, -/area/station/engineering/atmos/pumproom) "qaq" = ( /obj/structure/table, /obj/item/clothing/gloves/color/latex, @@ -69216,6 +69155,17 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/station/maintenance/aft) +"sJM" = ( +/obj/structure/table/wood, +/obj/item/clothing/suit/costume/justice, +/obj/item/clothing/head/helmet/justice/escape{ + name = "justice helmet" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/service/theater/abandoned) "sJO" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, @@ -77576,6 +77526,15 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible, /turf/open/floor/iron, /area/station/maintenance/port/aft) +"uSO" = ( +/obj/machinery/light/directional/south, +/obj/effect/landmark/start/geneticist, +/obj/structure/chair/office/light{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/science/genetics) "uSR" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -83538,6 +83497,16 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/station/maintenance/port/lesser) +"wsH" = ( +/obj/structure/bed, +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/item/clothing/mask/muzzle, +/obj/item/clothing/glasses/blindfold, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/security/execution/transfer) "wte" = ( /obj/machinery/light/small/directional/south, /obj/effect/turf_decal/tile/brown/half/contrasted, @@ -86004,6 +85973,20 @@ }, /turf/open/floor/iron, /area/station/cargo/qm) +"xdJ" = ( +/obj/structure/table, +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/item/clothing/mask/muzzle, +/obj/item/clothing/glasses/blindfold, +/obj/item/clothing/ears/earmuffs, +/obj/item/gun/syringe, +/obj/item/clothing/glasses/eyepatch, +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) "xdL" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -89032,10 +89015,6 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) -"xTq" = ( -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/science/genetics) "xTr" = ( /turf/closed/wall, /area/station/science/robotics/lab) @@ -89460,6 +89439,18 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"xZz" = ( +/obj/structure/bed{ + dir = 4 + }, +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/item/clothing/mask/muzzle, +/obj/item/clothing/glasses/blindfold, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/security/execution/transfer) "xZF" = ( /obj/machinery/light/small/directional/west, /obj/machinery/status_display/evac/directional/west, @@ -109190,7 +109181,7 @@ rlr kYc geZ iTq -ffb +ilz eZG geZ vIC @@ -117357,7 +117348,7 @@ hbS wKo aPO pUp -qah +mnN grO sdi itI @@ -119226,11 +119217,11 @@ aMl dGi jIO fex -dBY -cse -xTq -xTq -jvf +pqP +lws +nek +nek +uSO swT khh rqx @@ -124127,7 +124118,7 @@ kRL tJP oxo cNs -dNl +pTO kzc kOv irR @@ -125617,7 +125608,7 @@ pRS pRS ftI kXb -nYG +ckB pRS oHJ qdA @@ -136907,7 +136898,7 @@ aac aad aad oIU -nQe +kJb nPS kdY jYC @@ -137734,7 +137725,7 @@ bxK gCa psV rdI -lwA +xdJ kgr aaM uwB @@ -140222,7 +140213,7 @@ mSe mSe mSe kBt -cau +xZz oCa nbi jrA @@ -140736,7 +140727,7 @@ pMa caH mSe hle -cHj +wsH aFO hgd gsT @@ -141596,11 +141587,11 @@ gKS aFD nXH rMA -jHE +sJM ggs jtD iBZ -eXv +fyD kWQ iLr aad diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 2c87ab07f7e..9f48bac564e 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -229,16 +229,6 @@ /obj/item/clothing/mask/gas, /turf/open/floor/iron/smooth, /area/mine/living_quarters) -"aeP" = ( -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/iron/dark/smooth_edge{ - dir = 4 - }, -/area/station/engineering/transit_tube) "aeV" = ( /obj/structure/sign/warning, /turf/closed/wall, @@ -318,18 +308,6 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/hallway/secondary/service) -"agG" = ( -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 9 - }, -/obj/structure/sink/directional/south, -/obj/machinery/camera{ - c_tag = "Virology Break Room"; - dir = 1; - network = list("ss13","medbay") - }, -/turf/open/floor/iron/dark, -/area/station/medical/virology) "agH" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/right/directional/east{ @@ -999,19 +977,6 @@ /obj/machinery/light/small/directional/east, /turf/open/openspace/icemoon/keep_below, /area/station/security/execution/education) -"ark" = ( -/obj/machinery/shower/directional/north, -/obj/structure/window/reinforced/tinted{ - dir = 8 - }, -/obj/structure/window/reinforced/tinted{ - dir = 4 - }, -/obj/machinery/door/window/left/directional/north{ - name = "Shower Cubicle" - }, -/turf/open/floor/iron/freezer, -/area/station/maintenance/starboard/fore) "aro" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -1237,6 +1202,15 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) +"aun" = ( +/obj/effect/turf_decal/trimline/red/warning{ + dir = 9 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/range) "auq" = ( /obj/structure/ladder, /obj/effect/decal/cleanable/dirt, @@ -1559,13 +1533,6 @@ }, /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) -"ayL" = ( -/obj/machinery/shower/directional/west, -/obj/effect/turf_decal/stripes/red/line{ - dir = 5 - }, -/turf/open/floor/iron/textured, -/area/station/engineering/atmos) "azf" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -1956,18 +1923,6 @@ /obj/structure/cable, /turf/open/floor/iron/cafeteria, /area/mine/laborcamp) -"aGk" = ( -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 8 - }, -/obj/structure/sink/directional/east, -/obj/effect/turf_decal/tile/dark{ - dir = 4 - }, -/obj/effect/turf_decal/tile/dark, -/obj/machinery/requests_console/auto_name/directional/west, -/turf/open/floor/iron/white, -/area/station/medical/virology) "aGr" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/camera/directional/east{ @@ -3013,17 +2968,6 @@ /obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/iron/white/smooth_large, /area/station/medical/virology) -"aVV" = ( -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 6 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/airalarm/directional/east, -/obj/machinery/shower/directional/west, -/turf/open/floor/iron/white, -/area/station/medical/virology) "aWb" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -3956,6 +3900,11 @@ /obj/machinery/requests_console/auto_name/directional/east, /turf/open/floor/iron, /area/station/commons/locker) +"bkQ" = ( +/obj/effect/turf_decal/trimline, +/obj/machinery/shower/directional/south, +/turf/open/floor/iron/smooth, +/area/mine/eva) "bkR" = ( /obj/machinery/light/directional/south, /obj/structure/sign/warning/test_chamber/directional/south, @@ -4469,6 +4418,16 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/miningdock) +"bsA" = ( +/obj/structure/sink/directional/south, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) "bsG" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research/glass{ @@ -4592,22 +4551,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"buF" = ( -/obj/machinery/door/airlock/external{ - glass = 1; - name = "Service External Airlock"; - opacity = 0 - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/structure/sign/warning/cold_temp/directional/north, -/obj/structure/sign/warning/gas_mask/directional/south{ - desc = "A sign that warns of dangerous gasses in the air, instructing you to wear internals." - }, -/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, -/turf/open/floor/plating, -/area/station/maintenance/starboard/lesser) "buS" = ( /obj/effect/turf_decal/tile/red/half{ dir = 4 @@ -4885,22 +4828,6 @@ /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/plating/icemoon, /area/station/science/ordnance/bomb) -"byG" = ( -/obj/structure/flora/bush/flowers_pp/style_random, -/obj/structure/closet/crate{ - name = "Le Caisee D'abeille" - }, -/obj/item/honey_frame, -/obj/item/honey_frame, -/obj/item/honey_frame, -/obj/item/clothing/suit/beekeeper_suit, -/obj/item/clothing/suit/hooded/bee_costume, -/obj/item/clothing/head/beekeeper_head, -/obj/item/clothing/head/hooded/bee_hood, -/obj/item/melee/flyswatter, -/obj/item/queen_bee/bought, -/turf/open/floor/grass, -/area/station/service/hydroponics) "byH" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/iron/dark, @@ -5797,12 +5724,6 @@ /obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"bKE" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/shower/directional/west, -/obj/effect/turf_decal/trimline/blue, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/hfr_room) "bKN" = ( /obj/machinery/door/airlock/security/glass{ name = "Brig Control" @@ -6211,6 +6132,18 @@ dir = 1 }, /area/station/hallway/primary/starboard) +"bQl" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 8 + }, +/obj/structure/sink/directional/east, +/obj/effect/turf_decal/tile/dark{ + dir = 4 + }, +/obj/effect/turf_decal/tile/dark, +/obj/machinery/requests_console/auto_name/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/virology) "bQr" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -6666,6 +6599,12 @@ /obj/effect/turf_decal/trimline/blue/filled/line, /turf/open/floor/iron/dark, /area/station/medical/storage) +"bYa" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/shower/directional/west, +/obj/effect/turf_decal/trimline/blue, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "bYd" = ( /obj/machinery/airalarm/directional/west, /obj/machinery/light/small/directional/west, @@ -6908,6 +6847,18 @@ /obj/effect/turf_decal/tile/blue/full, /turf/open/floor/iron/dark/smooth_large, /area/station/command/heads_quarters/cmo) +"caO" = ( +/obj/machinery/newscaster/directional/east, +/obj/structure/sink/directional/west, +/obj/structure/window/reinforced, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison/work) "caS" = ( /obj/machinery/light/directional/east, /obj/machinery/status_display/evac/directional/east, @@ -7246,6 +7197,17 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) +"cfp" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 10 + }, +/obj/machinery/firealarm/directional/west, +/obj/structure/sink/directional/east, +/turf/open/floor/iron, +/area/station/service/hydroponics) "cfC" = ( /obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, /obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ @@ -7429,13 +7391,6 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/iron, /area/station/hallway/primary/aft) -"ciQ" = ( -/obj/structure/sink/directional/west, -/obj/structure/sign/poster/official/cleanliness{ - pixel_x = 32 - }, -/turf/open/floor/iron, -/area/station/maintenance/port/fore) "ciS" = ( /obj/structure/table/wood, /obj/effect/spawner/random/trash/cigbutt, @@ -8735,6 +8690,15 @@ /obj/machinery/computer/security/telescreen/entertainment/directional/north, /turf/open/floor/iron/dark, /area/station/service/chapel) +"cBC" = ( +/obj/machinery/shower/directional/east, +/obj/effect/turf_decal/trimline, +/obj/structure/sign/warning/gas_mask{ + desc = "A sign that warns of dangerous gasses in the air, instructing you to wear internals."; + pixel_x = -29 + }, +/turf/open/floor/iron/smooth, +/area/mine/living_quarters) "cBD" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -8901,6 +8865,14 @@ /obj/structure/grille/broken, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) +"cEE" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/sink/kitchen/directional/east{ + desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; + name = "old sink" + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "cEL" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -10051,6 +10023,20 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, /area/station/maintenance/port/greater) +"cWt" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Research Division Access"; + network = list("ss13","rd") + }, +/obj/structure/sink/directional/west, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/research) "cWG" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -10191,6 +10177,10 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"cYy" = ( +/obj/machinery/shower/directional/south, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/toilet) "cYE" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -10341,6 +10331,12 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) +"dae" = ( +/obj/structure/sink/directional/east, +/obj/structure/mirror/directional/west, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet) "daf" = ( /obj/structure/table, /turf/open/floor/plating/snowed/icemoon, @@ -10693,12 +10689,6 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/underground/explored) -"dgf" = ( -/obj/structure/sink/directional/east, -/obj/structure/mirror/directional/west, -/obj/effect/landmark/start/assistant, -/turf/open/floor/iron/freezer, -/area/station/commons/toilet) "dgk" = ( /obj/effect/spawner/random/vending/snackvend, /obj/effect/turf_decal/stripes/line{ @@ -10899,15 +10889,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/port) -"djz" = ( -/obj/structure/sink/directional/west, -/obj/item/reagent_containers/glass/bucket, -/obj/item/mop, -/obj/item/reagent_containers/glass/bottle/ammonia, -/obj/machinery/airalarm/directional/south, -/obj/effect/spawner/random/contraband/prison, -/turf/open/floor/plating, -/area/station/security/prison/safe) "djC" = ( /obj/effect/decal/remains/human, /obj/item/reagent_containers/food/drinks/bottle/wine{ @@ -11252,11 +11233,6 @@ "dnq" = ( /turf/open/floor/iron, /area/station/hallway/primary/central) -"dnw" = ( -/obj/structure/sink/kitchen/directional/south, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/maintenance/department/medical/morgue) "dnD" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -11273,6 +11249,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/port/aft) +"dnR" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/structure/sink/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) "dnX" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -11308,14 +11292,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) -"doI" = ( -/obj/structure/closet/radiation, -/obj/structure/sign/warning/electric_shock/directional/north, -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/main) "doJ" = ( /turf/open/floor/wood/parquet, /area/station/commons/lounge) @@ -11408,17 +11384,6 @@ /obj/structure/sign/warning/cold_temp, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat_interior) -"dqh" = ( -/obj/machinery/shower/directional/north, -/obj/structure/window/reinforced/tinted{ - dir = 8 - }, -/obj/machinery/door/window/left/directional/north{ - name = "Shower Cubicle" - }, -/obj/item/soap/nanotrasen, -/turf/open/floor/iron/freezer, -/area/station/maintenance/starboard/fore) "dqs" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, @@ -12218,6 +12183,10 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron/dark, /area/station/commons/fitness) +"dDa" = ( +/obj/structure/sink/directional/south, +/turf/open/floor/iron, +/area/station/science/xenobiology) "dDm" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on{ dir = 1 @@ -12781,6 +12750,17 @@ /obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/fore) +"dLE" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/suit/utility/radiation, +/obj/item/clothing/head/radiation, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/item/geiger_counter, +/obj/item/clothing/glasses/meson, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "dLH" = ( /obj/structure/fence{ dir = 1 @@ -12916,6 +12896,17 @@ }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) +"dNX" = ( +/obj/machinery/shower/directional/north, +/obj/structure/window/reinforced/tinted{ + dir = 8 + }, +/obj/machinery/door/window/left/directional/north{ + name = "Shower Cubicle" + }, +/obj/item/soap/nanotrasen, +/turf/open/floor/iron/freezer, +/area/station/maintenance/starboard/fore) "dOc" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -13107,6 +13098,13 @@ /obj/structure/disposalpipe/trunk, /turf/open/floor/plating, /area/station/maintenance/disposal) +"dRr" = ( +/obj/structure/bed, +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/turf/open/floor/iron/white/textured, +/area/station/security/medical) "dRy" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -13833,6 +13831,15 @@ }, /turf/open/floor/iron, /area/station/cargo/miningdock) +"eeN" = ( +/obj/machinery/firealarm/directional/north, +/obj/structure/chair{ + dir = 8 + }, +/obj/machinery/airalarm/directional/east, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron, +/area/station/cargo/lobby) "eeO" = ( /obj/structure/window/reinforced{ dir = 8 @@ -13982,13 +13989,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/ai_monitored/command/storage/eva) -"egM" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/shower/directional/south, -/turf/open/floor/iron, -/area/station/science/xenobiology) "egR" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -15714,14 +15714,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/breakroom) -"eIF" = ( -/obj/structure/sink/kitchen/directional/south, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron, -/area/station/service/bar) "eII" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 9 @@ -15732,15 +15724,6 @@ /obj/item/reagent_containers/dropper, /turf/open/floor/iron/dark, /area/station/medical/virology) -"eIL" = ( -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/obj/structure/table, -/obj/item/clothing/head/fedora, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/iron/white/smooth_large, -/area/station/service/kitchen/diner) "eIU" = ( /obj/machinery/button/door/directional/south{ id = "Cargo_Store_In"; @@ -15749,12 +15732,6 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) -"eJd" = ( -/obj/structure/sink/directional/west, -/obj/structure/mirror/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/freezer, -/area/station/commons/toilet/locker) "eJe" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -15890,20 +15867,6 @@ /obj/structure/chair/stool/directional/west, /turf/open/floor/iron, /area/station/commons/dorms) -"eKP" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Research Division Access"; - network = list("ss13","rd") - }, -/obj/structure/sink/directional/west, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/station/science/research) "eKW" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 4 @@ -16380,6 +16343,26 @@ }, /turf/open/floor/iron/white, /area/station/science/genetics) +"eSL" = ( +/obj/structure/table, +/obj/machinery/computer/security/telescreen/interrogation{ + dir = 1; + name = "isolation room monitor"; + network = list("isolation"); + pixel_y = -32 + }, +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket{ + pixel_x = 6 + }, +/obj/machinery/camera/directional/east{ + c_tag = "Security - Permabrig Prep"; + network = list("ss13","prison"); + view_range = 5 + }, +/obj/structure/cable, +/turf/open/floor/iron/smooth, +/area/station/security/execution/transfer) "eST" = ( /obj/structure/toilet{ dir = 4 @@ -16489,16 +16472,6 @@ /obj/machinery/space_heater, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) -"eUJ" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 8; - name = "Air to Distro" - }, -/obj/structure/sink/directional/south, -/obj/item/mop, -/obj/item/reagent_containers/glass/bucket, -/turf/open/floor/iron/smooth, -/area/mine/laborcamp/security) "eUK" = ( /obj/machinery/computer/shuttle/mining{ dir = 8 @@ -16904,13 +16877,6 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) -"eZk" = ( -/obj/machinery/shower/directional/west, -/obj/effect/turf_decal/stripes/red/end{ - dir = 8 - }, -/turf/open/floor/iron/dark/textured, -/area/station/engineering/main) "eZp" = ( /obj/machinery/space_heater, /obj/effect/decal/cleanable/dirt, @@ -16940,16 +16906,6 @@ }, /turf/open/floor/iron, /area/station/cargo/sorting) -"eZI" = ( -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sink/directional/south, -/turf/open/floor/iron/white, -/area/station/medical/virology) "eZJ" = ( /obj/machinery/mineral/stacking_machine{ input_dir = 1; @@ -17011,6 +16967,11 @@ /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/iron, /area/station/commons/fitness) +"fbc" = ( +/obj/structure/sink/directional/west, +/obj/structure/mirror/directional/east, +/turf/open/floor/iron/freezer, +/area/station/maintenance/starboard/fore) "fbh" = ( /obj/machinery/power/tracker, /obj/structure/cable, @@ -17239,6 +17200,17 @@ dir = 8 }, /area/mine/eva) +"ffr" = ( +/obj/structure/sink/directional/west, +/obj/structure/cable, +/obj/machinery/button/door/directional/east{ + id = "xenobio10"; + layer = 4; + name = "Xenobio Pen 10 Blast DOors"; + req_access = list("xenobiology") + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "ffz" = ( /obj/machinery/processor/slime, /turf/open/floor/iron, @@ -17453,6 +17425,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/hallway/primary/central) +"fiI" = ( +/obj/machinery/shower/directional/north, +/obj/item/soap/deluxe, +/obj/item/bikehorn/rubberducky, +/obj/structure/curtain, +/turf/open/floor/iron/freezer, +/area/station/command/heads_quarters/captain) "fiO" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -17736,6 +17715,12 @@ "fmD" = ( /turf/open/floor/wood/parquet, /area/station/service/bar/atrium) +"fmK" = ( +/obj/structure/sink/directional/west, +/obj/structure/mirror/directional/east, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/freezer, +/area/station/command/heads_quarters/captain) "fmU" = ( /obj/structure/railing/corner{ dir = 4 @@ -17883,13 +17868,6 @@ /obj/machinery/suit_storage_unit/atmos, /turf/open/floor/iron/dark/textured, /area/station/engineering/atmos) -"fpO" = ( -/obj/machinery/shower/directional/east, -/obj/effect/turf_decal/stripes/red/end{ - dir = 4 - }, -/turf/open/floor/iron/dark/textured, -/area/station/engineering/main) "fpP" = ( /obj/machinery/camera/directional/north{ c_tag = "Central Hallway North-East" @@ -17901,16 +17879,6 @@ /obj/structure/sign/poster/official/random/directional/north, /turf/open/floor/wood, /area/station/hallway/secondary/service) -"fpY" = ( -/obj/machinery/shower/directional/north, -/obj/structure/window/reinforced/tinted{ - dir = 4 - }, -/obj/machinery/door/window/left/directional/north{ - name = "Shower Cubicle" - }, -/turf/open/floor/iron/freezer, -/area/station/maintenance/starboard/fore) "fqc" = ( /obj/effect/turf_decal/tile/red/full, /obj/structure/table, @@ -18427,6 +18395,15 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"fyW" = ( +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 4 + }, +/area/station/engineering/transit_tube) "fyZ" = ( /obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron, @@ -18440,10 +18417,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"fzk" = ( -/obj/structure/sink/directional/east, -/turf/open/floor/iron, -/area/station/hallway/secondary/service) "fzu" = ( /obj/structure/closet/crate, /obj/effect/spawner/random/maintenance/three, @@ -19017,6 +18990,10 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) +"fIE" = ( +/obj/machinery/shower/directional/west, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet) "fIH" = ( /obj/structure/closet/lasertag/red, /obj/effect/spawner/random/contraband/permabrig_gear, @@ -19122,6 +19099,13 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/atmos) +"fKM" = ( +/obj/machinery/shower/directional/west, +/obj/effect/turf_decal/stripes/red/line{ + dir = 6 + }, +/turf/open/floor/iron/textured, +/area/station/engineering/atmos) "fLa" = ( /obj/machinery/gibber, /turf/open/floor/plating/snowed/coldroom, @@ -19663,6 +19647,14 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark/smooth_large, /area/station/science/breakroom) +"fTU" = ( +/obj/structure/closet/radiation, +/obj/structure/sign/warning/electric_shock/directional/north, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/main) "fTW" = ( /turf/open/floor/plating, /area/station/maintenance/starboard/upper) @@ -20297,6 +20289,23 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/science/ordnance) +"gcA" = ( +/obj/structure/rack, +/obj/item/clothing/suit/utility/fire/firefighter, +/obj/item/tank/internals/oxygen, +/obj/item/clothing/mask/gas, +/obj/item/extinguisher, +/obj/item/clothing/head/hardhat/red, +/obj/item/clothing/glasses/meson, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/atmospherics/components/binary/pump/on/general/visible/layer4{ + dir = 4; + name = "Air In" + }, +/turf/open/floor/plating, +/area/station/maintenance/fore) "gcE" = ( /obj/structure/chair/wood{ dir = 4 @@ -20490,6 +20499,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/engineering/storage_shared) +"ggH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sink/directional/south, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "ggR" = ( /obj/machinery/computer/teleporter{ dir = 8 @@ -20962,6 +20980,16 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron/showroomfloor, /area/station/security/prison/toilet) +"gnW" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sink/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "gnZ" = ( /obj/structure/marker_beacon/burgundy, /turf/open/floor/plating/snowed/smoothed/icemoon, @@ -21123,6 +21151,14 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron/smooth_edge, /area/station/security/lockers) +"grl" = ( +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/obj/structure/table, +/obj/item/clothing/head/fedora, +/turf/open/floor/iron/white/smooth_large, +/area/station/service/kitchen/diner) "grr" = ( /obj/structure/table, /obj/item/storage/box/shipping, @@ -21499,6 +21535,10 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/greater) +"gye" = ( +/obj/machinery/shower/directional/east, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet) "gyf" = ( /obj/structure/table/wood, /obj/machinery/newscaster/directional/south, @@ -21742,6 +21782,18 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"gBA" = ( +/obj/machinery/shower/directional/west, +/obj/effect/turf_decal/stripes/red/line{ + dir = 5 + }, +/turf/open/floor/iron/textured, +/area/station/engineering/atmos) +"gBE" = ( +/obj/structure/sink/kitchen/directional/south, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) "gBI" = ( /obj/machinery/light/small/directional/south, /turf/open/floor/plating, @@ -21810,6 +21862,12 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/security/courtroom) +"gDk" = ( +/obj/structure/sink/directional/west, +/obj/structure/mirror/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/locker) "gDp" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -22488,11 +22546,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/aft/greater) -"gOa" = ( -/obj/machinery/shower/directional/south, -/obj/item/bikehorn/rubberducky/plasticducky, -/turf/open/floor/iron/showroomfloor, -/area/station/security/prison/toilet) "gOb" = ( /obj/structure/cable, /obj/machinery/door/poddoor/preopen{ @@ -22608,18 +22661,6 @@ /obj/machinery/light_switch/directional/south, /turf/open/floor/iron/showroomfloor, /area/station/security/warden) -"gPt" = ( -/obj/machinery/newscaster/directional/east, -/obj/structure/sink/directional/west, -/obj/structure/window/reinforced, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/turf/open/floor/iron/cafeteria, -/area/station/security/prison/work) "gPE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -22774,6 +22815,13 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) +"gRw" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/shower/directional/south, +/turf/open/floor/iron, +/area/station/science/xenobiology) "gRI" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, @@ -22907,10 +22955,6 @@ }, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) -"gUJ" = ( -/obj/structure/sink/directional/east, -/turf/open/floor/iron/freezer, -/area/station/commons/toilet) "gUQ" = ( /obj/structure/fence/door{ dir = 4 @@ -23649,17 +23693,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"hfW" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/suit/radiation, -/obj/item/clothing/head/radiation, -/obj/item/geiger_counter, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/item/clothing/glasses/meson, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) "hgc" = ( /obj/structure/table, /turf/open/floor/plating, @@ -23732,10 +23765,6 @@ dir = 1 }, /area/station/service/chapel/office) -"hhC" = ( -/obj/machinery/shower/directional/south, -/turf/open/floor/iron/showroomfloor, -/area/station/security/prison/toilet) "hhT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -23893,6 +23922,16 @@ /obj/machinery/light/directional/west, /turf/open/floor/wood, /area/station/commons/vacant_room/office) +"hlf" = ( +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/sink/directional/west, +/turf/open/floor/iron, +/area/station/service/hydroponics) "hll" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -24199,10 +24238,6 @@ }, /turf/open/floor/iron, /area/station/engineering/main) -"hqO" = ( -/obj/machinery/shower/directional/west, -/turf/open/floor/iron/freezer, -/area/station/commons/toilet) "hqS" = ( /obj/structure/railing, /obj/structure/rack, @@ -24433,6 +24468,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/service/library) +"huE" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sink/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/virology) "huI" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -24810,6 +24855,11 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/security/brig/upper) +"hAR" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/sink/directional/south, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) "hAT" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -25705,6 +25755,18 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/smooth_half, /area/station/security/brig/upper) +"hQS" = ( +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sink/kitchen/directional/north{ + desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; + name = "old sink" + }, +/turf/open/floor/iron/dark, +/area/mine/laborcamp) "hRp" = ( /obj/machinery/button/door/directional/north{ id = "visitation"; @@ -26768,6 +26830,19 @@ }, /turf/open/floor/iron/dark, /area/station/service/chapel) +"iij" = ( +/obj/structure/table/reinforced, +/obj/item/stack/sheet/glass/fifty{ + pixel_x = 2; + pixel_y = 0 + }, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/cable_coil{ + pixel_x = -3; + pixel_y = 3 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "iin" = ( /obj/machinery/space_heater, /turf/open/floor/plating, @@ -27394,10 +27469,6 @@ }, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) -"isp" = ( -/obj/machinery/shower/directional/east, -/turf/open/floor/iron/freezer, -/area/station/commons/toilet) "isE" = ( /obj/machinery/vending/wardrobe/sec_wardrobe, /obj/machinery/light/directional/north, @@ -27486,6 +27557,16 @@ dir = 1 }, /area/mine/eva/lower) +"iuo" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/sink/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/virology) "iuq" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 9 @@ -27880,14 +27961,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"iAV" = ( -/obj/item/soap/deluxe, -/obj/item/bikehorn/rubberducky, -/obj/structure/curtain, -/obj/machinery/shower/directional/south, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/freezer, -/area/station/medical/break_room) "iBd" = ( /obj/structure/fireplace{ pixel_x = -32 @@ -28074,12 +28147,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) -"iDU" = ( -/obj/structure/sink/directional/west, -/obj/structure/mirror/directional/east, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron/freezer, -/area/station/command/heads_quarters/captain) "iEd" = ( /obj/structure/sign/warning/radiation, /turf/closed/wall/r_wall, @@ -28196,17 +28263,6 @@ "iHp" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/turret_protected/ai) -"iHw" = ( -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 10 - }, -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 10 - }, -/obj/machinery/firealarm/directional/west, -/obj/structure/sink/directional/east, -/turf/open/floor/iron, -/area/station/service/hydroponics) "iHy" = ( /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -28264,11 +28320,6 @@ }, /turf/open/floor/iron/dark, /area/station/commons/storage/mining) -"iIk" = ( -/obj/structure/sink/kitchen/directional/south, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/cafeteria, -/area/station/security/prison/mess) "iIs" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, @@ -28558,11 +28609,6 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) -"iLE" = ( -/obj/machinery/shower/directional/south, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron/freezer, -/area/mine/laborcamp) "iLK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -29204,15 +29250,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/command/bridge) -"iUW" = ( -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/obj/structure/chair, -/obj/machinery/camera/autoname/directional/west, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/iron/white/smooth_large, -/area/station/service/kitchen/diner) "iVb" = ( /obj/structure/railing/corner{ dir = 8 @@ -29994,12 +30031,6 @@ }, /turf/closed/wall/r_wall, /area/station/engineering/atmos) -"jgz" = ( -/obj/structure/sink/directional/south, -/obj/effect/decal/cleanable/dirt, -/obj/structure/mirror/directional/south, -/turf/open/floor/iron/freezer, -/area/station/medical/break_room) "jgG" = ( /obj/structure/closet/secure_closet/security/sec, /turf/open/floor/iron/smooth_edge, @@ -30017,16 +30048,6 @@ /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/iron/white, /area/station/maintenance/port/fore) -"jhu" = ( -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/sink/directional/west, -/turf/open/floor/iron/white, -/area/station/medical/virology) "jhy" = ( /obj/effect/turf_decal/tile/brown, /turf/open/floor/iron, @@ -30087,11 +30108,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/port/greater) -"jiM" = ( -/obj/machinery/shower/directional/south, -/obj/effect/spawner/random/contraband/permabrig_weapon, -/turf/open/floor/iron/showroomfloor, -/area/station/security/prison/toilet) "jiZ" = ( /obj/machinery/light/small/directional/east, /obj/machinery/camera/directional/east{ @@ -30226,6 +30242,12 @@ /obj/structure/disposalpipe/trunk, /turf/open/floor/iron, /area/station/science/xenobiology) +"jkv" = ( +/obj/structure/sink/directional/east, +/obj/structure/mirror/directional/west, +/obj/effect/landmark/start/assistant, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet) "jkH" = ( /obj/structure/training_machine, /obj/effect/landmark/blobstart, @@ -30360,6 +30382,14 @@ dir = 1 }, /area/mine/eva/lower) +"jnH" = ( +/obj/structure/sink/directional/south, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron, +/area/station/security/prison/garden) "jnM" = ( /obj/structure/chair/sofa, /turf/open/floor/carpet/blue, @@ -30561,14 +30591,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) -"jrs" = ( -/obj/structure/sink/directional/south, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron, -/area/station/security/prison/garden) "jrI" = ( /obj/structure/transit_tube/curved/flipped, /obj/structure/cable, @@ -31231,13 +31253,17 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) -"jCZ" = ( -/obj/machinery/shower/directional/north, -/obj/item/soap/deluxe, -/obj/item/bikehorn/rubberducky, -/obj/structure/curtain, -/turf/open/floor/iron/freezer, -/area/station/command/heads_quarters/captain) +"jDh" = ( +/obj/machinery/button/door/directional/north{ + pixel_y = 24; + pixel_x = -25; + name = "Kitchen Lockdown"; + req_access = list("kitchen"); + id = "kitchencounter" + }, +/obj/effect/turf_decal/tile/neutral/diagonal_edge, +/turf/open/floor/iron/kitchen/diagonal, +/area/station/service/kitchen) "jDi" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/components/binary/pump{ @@ -31342,15 +31368,6 @@ dir = 8 }, /area/station/service/chapel) -"jFp" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/closet/secure_closet/personal{ - anchored = 1 - }, -/obj/item/clothing/under/pants/track, -/obj/item/clothing/suit/ianshirt, -/turf/open/floor/iron, -/area/station/maintenance/starboard/fore) "jFv" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -31712,16 +31729,6 @@ }, /turf/open/floor/plating/icemoon, /area/station/security/execution/education) -"jKu" = ( -/obj/effect/turf_decal/trimline/red/warning{ - dir = 9 - }, -/obj/effect/turf_decal/stripes/red/line{ - dir = 1 - }, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/iron/dark/textured, -/area/station/security/range) "jKy" = ( /obj/effect/turf_decal/tile/yellow/opposingcorners, /obj/machinery/holopad, @@ -32522,6 +32529,10 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/station/maintenance/fore) +"jVe" = ( +/obj/structure/sink/directional/east, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet) "jVq" = ( /obj/structure/railing/corner, /obj/effect/turf_decal/tile/blue, @@ -32808,6 +32819,16 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/iron, /area/station/cargo/office) +"kaD" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 8; + name = "Air to Distro" + }, +/obj/structure/sink/directional/south, +/obj/item/mop, +/obj/item/reagent_containers/glass/bucket, +/turf/open/floor/iron/smooth, +/area/mine/laborcamp/security) "kaO" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/loading_area{ @@ -32922,11 +32943,6 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron, /area/station/engineering/storage/tech) -"kcr" = ( -/obj/machinery/shower/directional/south, -/obj/item/soap/nanotrasen, -/turf/open/floor/iron/showroomfloor, -/area/station/security/prison/toilet) "kcA" = ( /obj/structure/railing/corner{ dir = 1 @@ -33159,13 +33175,6 @@ /obj/structure/sign/poster/random/directional/west, /turf/open/floor/iron, /area/station/engineering/atmos) -"kfR" = ( -/obj/machinery/airalarm/directional/south, -/obj/machinery/shower/directional/west, -/obj/effect/turf_decal/delivery, -/obj/item/bikehorn/rubberducky, -/turf/open/floor/iron/freezer, -/area/station/commons/toilet/locker) "kfY" = ( /obj/effect/turf_decal/siding/white{ dir = 1 @@ -33327,6 +33336,11 @@ }, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) +"khz" = ( +/obj/machinery/shower/directional/south, +/obj/effect/spawner/random/contraband/permabrig_weapon, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/toilet) "khA" = ( /obj/structure/plaque/static_plaque/golden/commission/icebox{ pixel_y = 29 @@ -33568,26 +33582,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) -"klT" = ( -/obj/structure/table, -/obj/machinery/computer/security/telescreen/interrogation{ - dir = 1; - name = "isolation room monitor"; - network = list("isolation"); - pixel_y = -32 - }, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/suit/straight_jacket{ - pixel_x = 6 - }, -/obj/machinery/camera/directional/east{ - c_tag = "Security - Permabrig Prep"; - network = list("ss13","prison"); - view_range = 5 - }, -/obj/structure/cable, -/turf/open/floor/iron/smooth, -/area/station/security/execution/transfer) "klX" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/public/glass{ @@ -33676,6 +33670,13 @@ /obj/machinery/computer/department_orders/engineering, /turf/open/floor/iron/dark, /area/station/engineering/lobby) +"knk" = ( +/obj/machinery/shower/directional/east, +/obj/effect/turf_decal/stripes/red/end{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/main) "knl" = ( /turf/open/floor/engine{ name = "Holodeck Projector Floor" @@ -34207,6 +34208,16 @@ /obj/structure/closet/firecloset, /turf/open/floor/iron/smooth, /area/station/maintenance/port/fore) +"kvH" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/sink/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/turf/open/floor/iron/white, +/area/station/medical/virology) "kvI" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -34289,22 +34300,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) -"kxx" = ( -/obj/structure/sink/kitchen/directional/west, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 8 - }, -/obj/item/radio/intercom/directional/east{ - pixel_x = 31 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/service/hydroponics) "kxy" = ( /obj/structure/railing{ dir = 1 @@ -34476,6 +34471,14 @@ }, /turf/open/floor/plating, /area/station/maintenance/disposal) +"kzL" = ( +/obj/machinery/shower/directional/north, +/obj/effect/turf_decal/trimline/blue/line{ + dir = 9 + }, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron/dark/textured, +/area/station/medical/treatment_center) "kzO" = ( /obj/structure/table, /obj/machinery/cell_charger{ @@ -34833,6 +34836,19 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/cafeteria, /area/station/security/prison/mess) +"kFE" = ( +/obj/machinery/shower/directional/north, +/obj/structure/window/reinforced/tinted{ + dir = 8 + }, +/obj/structure/window/reinforced/tinted{ + dir = 4 + }, +/obj/machinery/door/window/left/directional/north{ + name = "Shower Cubicle" + }, +/turf/open/floor/iron/freezer, +/area/station/maintenance/starboard/fore) "kFG" = ( /obj/structure/table/wood, /obj/machinery/microwave, @@ -35971,14 +35987,6 @@ /obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/iron/dark/textured_half, /area/station/service/bar/backroom) -"kWt" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, -/obj/structure/sink/directional/west, -/turf/open/floor/iron/white, -/area/station/medical/medbay/aft) "kWw" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -36279,17 +36287,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/aft/greater) -"lan" = ( -/obj/structure/sink/directional/west, -/obj/structure/cable, -/obj/machinery/button/door/directional/east{ - id = "xenobio10"; - layer = 4; - name = "Xenobio Pen 10 Blast DOors"; - req_access = list("xenobiology") - }, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "law" = ( /obj/machinery/door/airlock/security/glass{ name = "Security Vestibule" @@ -36384,12 +36381,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"lbR" = ( -/obj/machinery/shower/directional/south, -/obj/item/soap/nanotrasen, -/obj/item/bikehorn/rubberducky/plasticducky, -/turf/open/floor/iron/freezer, -/area/mine/laborcamp) "lca" = ( /obj/structure/railing/corner{ dir = 1 @@ -36921,6 +36912,14 @@ }, /turf/open/misc/asteroid/snow/standard_air, /area/station/science/research) +"lkQ" = ( +/obj/machinery/shower/directional/north, +/obj/effect/turf_decal/trimline/blue/line{ + dir = 5 + }, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/dark/textured, +/area/station/medical/treatment_center) "lkS" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/food/pie_smudge, @@ -37406,6 +37405,13 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/service) +"lsX" = ( +/obj/machinery/shower/directional/west, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/research) "ltj" = ( /obj/machinery/light/directional/east, /obj/effect/turf_decal/trimline/purple/filled/corner{ @@ -37623,6 +37629,18 @@ "lwR" = ( /turf/closed/wall/r_wall, /area/mine/living_quarters) +"lwY" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 9 + }, +/obj/structure/sink/directional/south, +/obj/machinery/camera{ + c_tag = "Virology Break Room"; + dir = 1; + network = list("ss13","medbay") + }, +/turf/open/floor/iron/dark, +/area/station/medical/virology) "lxc" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -38307,6 +38325,14 @@ /obj/item/storage/box/mousetraps, /turf/open/floor/iron, /area/station/service/janitor) +"lIS" = ( +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/obj/structure/chair, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/iron/white/smooth_large, +/area/station/service/kitchen/diner) "lIW" = ( /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat_interior) @@ -38314,16 +38340,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating/icemoon, /area/station/hallway/secondary/entry) -"lJs" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sink/directional/south, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "lJO" = ( /turf/closed/wall, /area/station/maintenance/port/fore) @@ -38807,16 +38823,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"lSe" = ( -/obj/structure/sink/directional/south, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/service/hydroponics/garden) "lSu" = ( /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors/nospawn) @@ -38908,6 +38914,14 @@ /obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/iron/large, /area/station/medical/medbay/lobby) +"lUl" = ( +/obj/structure/sink/kitchen/directional/south{ + desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; + name = "old sink" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/freezer, +/area/mine/laborcamp) "lUw" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -39206,6 +39220,11 @@ /obj/structure/statue/snow/snowman, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) +"mal" = ( +/obj/machinery/shower/directional/south, +/obj/item/bikehorn/rubberducky/plasticducky, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/toilet) "mar" = ( /obj/effect/turf_decal/tile/blue, /obj/machinery/light/directional/south, @@ -40246,14 +40265,6 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/underground/explored) -"mrS" = ( -/obj/machinery/shower/directional/north, -/obj/effect/turf_decal/trimline/blue/line{ - dir = 9 - }, -/obj/machinery/status_display/evac/directional/south, -/turf/open/floor/iron/dark/textured, -/area/station/medical/treatment_center) "mrX" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 8 @@ -41471,10 +41482,6 @@ /obj/machinery/meter/layer4, /turf/open/floor/plating, /area/station/maintenance/fore) -"mOj" = ( -/obj/structure/sink/directional/south, -/turf/open/floor/iron, -/area/station/science/xenobiology) "mOo" = ( /obj/structure/disposalpipe/segment, /obj/effect/mapping_helpers/broken_floor, @@ -41552,16 +41559,6 @@ }, /turf/open/floor/wood, /area/station/service/lawoffice) -"mPa" = ( -/obj/structure/sink/directional/east, -/obj/machinery/button/door/directional/west{ - id = "xenobio2"; - layer = 4; - name = "Xenobio Pen 2 Blast Door"; - req_access = list("xenobiology") - }, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "mPb" = ( /obj/structure/window/reinforced{ dir = 1; @@ -41633,14 +41630,6 @@ "mQk" = ( /turf/open/floor/plating/snowed/coldroom, /area/station/service/kitchen/coldroom) -"mQo" = ( -/obj/effect/turf_decal/trimline, -/obj/machinery/shower/directional/north, -/obj/structure/sign/warning/gas_mask/directional/south{ - desc = "A sign that warns of dangerous gasses in the air, instructing you to wear internals." - }, -/turf/open/floor/iron/smooth, -/area/mine/eva/lower) "mQq" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -42266,13 +42255,6 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"naB" = ( -/obj/structure/sink/directional/west, -/obj/structure/mirror/directional/east, -/obj/machinery/light/small/directional/south, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/freezer, -/area/mine/eva/lower) "naL" = ( /obj/effect/turf_decal/tile/brown{ dir = 8 @@ -43439,6 +43421,13 @@ dir = 4 }, /area/station/service/chapel) +"nqF" = ( +/obj/machinery/shower/directional/west, +/obj/effect/turf_decal/stripes/red/end{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/main) "nqP" = ( /obj/machinery/camera/directional/north{ c_tag = "Research Division West"; @@ -43912,15 +43901,6 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/chemistry) -"nyZ" = ( -/obj/machinery/shower/directional/east, -/obj/effect/turf_decal/trimline, -/obj/structure/sign/warning/gas_mask{ - desc = "A sign that warns of dangerous gasses in the air, instructing you to wear internals."; - pixel_x = -29 - }, -/turf/open/floor/iron/smooth, -/area/mine/living_quarters) "nzf" = ( /obj/effect/turf_decal/delivery, /obj/structure/cable, @@ -46572,6 +46552,10 @@ "olf" = ( /turf/open/floor/carpet, /area/station/commons/dorms) +"oln" = ( +/obj/structure/sink/directional/east, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) "olH" = ( /obj/machinery/door/airlock/command{ name = "Captain's Quarters" @@ -47022,15 +47006,6 @@ /obj/effect/landmark/start/hangover/closet, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"osc" = ( -/obj/machinery/shower/directional/east, -/obj/effect/turf_decal/trimline, -/obj/structure/sign/warning/gas_mask{ - desc = "A sign that warns of dangerous gasses in the air, instructing you to wear internals."; - pixel_x = -29 - }, -/turf/open/floor/iron/smooth, -/area/mine/eva) "ose" = ( /obj/machinery/vending/tool, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -47040,16 +47015,6 @@ }, /turf/open/floor/iron/dark, /area/station/commons/storage/primary) -"osf" = ( -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/sink/directional/west, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, -/turf/open/floor/iron/white, -/area/station/medical/virology) "osm" = ( /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/dark, @@ -47093,15 +47058,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/maintenance/port/aft) -"osL" = ( -/obj/effect/turf_decal/tile/neutral/diagonal_edge, -/obj/effect/turf_decal/tile/blue/diagonal_edge, -/obj/machinery/vending/wardrobe/chef_wardrobe{ - pixel_x = -2 - }, -/obj/item/radio/intercom/directional/west, -/turf/open/floor/iron/kitchen/diagonal, -/area/station/service/kitchen) "osO" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -47212,14 +47168,6 @@ }, /turf/open/floor/iron/white, /area/station/science/genetics) -"ovi" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/machinery/door/window/right/directional/east, -/obj/structure/sign/warning/cold_temp/directional/south, -/turf/open/floor/plating/snowed/coldroom, -/area/station/service/kitchen/coldroom) "ovt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -47419,23 +47367,6 @@ /obj/structure/sign/poster/contraband/random/directional/north, /turf/open/floor/plating, /area/station/security/prison/safe) -"oyO" = ( -/obj/structure/rack, -/obj/item/clothing/suit/fire/firefighter, -/obj/item/tank/internals/oxygen, -/obj/item/clothing/mask/gas, -/obj/item/extinguisher, -/obj/item/clothing/head/hardhat/red, -/obj/item/clothing/glasses/meson, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/atmospherics/components/binary/pump/on/general/visible/layer4{ - dir = 4; - name = "Air In" - }, -/turf/open/floor/plating, -/area/station/maintenance/fore) "oyV" = ( /obj/effect/turf_decal/tile/neutral/diagonal_edge, /obj/structure/cable, @@ -47758,16 +47689,6 @@ /obj/item/stack/cable_coil/five, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"oCD" = ( -/obj/machinery/firealarm/directional/north, -/obj/structure/chair{ - dir = 8 - }, -/obj/machinery/airalarm/directional/east, -/obj/machinery/airalarm/directional/east, -/obj/machinery/camera/directional/east, -/turf/open/floor/iron, -/area/station/cargo/lobby) "oCF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -47868,6 +47789,13 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/iron/dark/smooth_half, /area/station/engineering/atmos/project) +"oDA" = ( +/obj/structure/sink/kitchen/directional/west{ + desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; + name = "old sink" + }, +/turf/open/floor/iron/freezer, +/area/mine/laborcamp) "oDB" = ( /obj/machinery/light/small/directional/east, /turf/open/floor/plating, @@ -49559,16 +49487,6 @@ }, /turf/open/floor/plating, /area/station/hallway/secondary/entry) -"piz" = ( -/obj/machinery/button/door/directional/north{ - pixel_x = -25; - name = "Kitchen Lockdown"; - req_access = list("kitchen"); - id = "kitchencounter" - }, -/obj/effect/turf_decal/tile/neutral/diagonal_edge, -/turf/open/floor/iron/kitchen/diagonal, -/area/station/service/kitchen) "piB" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -49592,6 +49510,22 @@ }, /turf/open/floor/carpet, /area/station/commons/dorms) +"piD" = ( +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/closet/crate{ + name = "Le Caisee D'abeille" + }, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/clothing/suit/utility/beekeeper_suit, +/obj/item/clothing/suit/hooded/bee_costume, +/obj/item/clothing/head/beekeeper_head, +/obj/item/clothing/head/hooded/bee_hood, +/obj/item/melee/flyswatter, +/obj/item/queen_bee/bought, +/turf/open/floor/grass, +/area/station/service/hydroponics) "piI" = ( /obj/machinery/airalarm/directional/south, /obj/machinery/camera{ @@ -49731,13 +49665,6 @@ /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) -"pkv" = ( -/obj/machinery/shower/directional/west, -/obj/effect/turf_decal/stripes/red/line{ - dir = 6 - }, -/turf/open/floor/iron/textured, -/area/station/engineering/atmos) "pkN" = ( /obj/structure/railing, /obj/effect/mapping_helpers/burnt_floor, @@ -50466,6 +50393,11 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/station/maintenance/department/chapel) +"pww" = ( +/obj/machinery/shower/directional/south, +/obj/item/soap/nanotrasen, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/toilet) "pwx" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /obj/effect/mapping_helpers/broken_floor, @@ -50800,6 +50732,12 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/cafeteria, /area/station/security/prison/mess) +"pBe" = ( +/obj/structure/sink/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/mirror/directional/east, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/locker) "pBk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, @@ -52220,6 +52158,11 @@ }, /turf/open/floor/iron, /area/station/engineering/lobby) +"pZp" = ( +/obj/structure/sink/directional/east, +/obj/structure/mirror/directional/west, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/toilet) "pZD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -52234,6 +52177,14 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron, /area/station/engineering/storage) +"pZK" = ( +/obj/effect/turf_decal/trimline, +/obj/machinery/shower/directional/north, +/obj/structure/sign/warning/gas_mask/directional/south{ + desc = "A sign that warns of dangerous gasses in the air, instructing you to wear internals." + }, +/turf/open/floor/iron/smooth, +/area/mine/eva/lower) "pZY" = ( /mob/living/simple_animal/hostile/asteroid/polarbear{ move_force = 999; @@ -52862,15 +52813,6 @@ /obj/structure/disposalpipe/trunk/multiz/down, /turf/open/floor/iron/dark, /area/station/medical/medbay/aft) -"qks" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sink/directional/south, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "qku" = ( /obj/item/kirbyplants/random, /turf/open/floor/iron/grimy, @@ -53155,6 +53097,12 @@ /obj/effect/turf_decal/trimline/dark_blue/line, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) +"qpv" = ( +/obj/structure/sink/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/structure/mirror/directional/south, +/turf/open/floor/iron/freezer, +/area/station/medical/break_room) "qpy" = ( /obj/structure/chair{ dir = 8 @@ -53449,6 +53397,11 @@ }, /turf/open/floor/iron/grimy, /area/station/service/chapel/office) +"quJ" = ( +/obj/machinery/shower/directional/south, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/freezer, +/area/mine/laborcamp) "quK" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -53671,6 +53624,17 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/engineering/lobby) +"qxD" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/suit/utility/radiation, +/obj/item/clothing/head/radiation, +/obj/item/geiger_counter, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/item/clothing/glasses/meson, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "qxQ" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/iron, @@ -54500,6 +54464,15 @@ /obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/station/service/lawoffice) +"qLK" = ( +/obj/machinery/shower/directional/east, +/obj/effect/turf_decal/trimline, +/obj/structure/sign/warning/gas_mask{ + desc = "A sign that warns of dangerous gasses in the air, instructing you to wear internals."; + pixel_x = -29 + }, +/turf/open/floor/iron/smooth, +/area/mine/eva) "qLN" = ( /obj/machinery/door/poddoor/preopen{ id = "misclab"; @@ -54939,16 +54912,6 @@ /obj/effect/turf_decal/tile/red, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"qRc" = ( -/obj/structure/sink/directional/south, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/service/hydroponics/garden) "qRh" = ( /obj/machinery/airalarm/directional/west, /obj/effect/turf_decal/tile/blue{ @@ -54978,13 +54941,6 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"qRN" = ( -/obj/machinery/shower/directional/west, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/science/research) "qRO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -55142,6 +55098,15 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) +"qUo" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/closet/secure_closet/personal{ + anchored = 1 + }, +/obj/item/clothing/under/pants/track, +/obj/item/clothing/suit/costume/ianshirt, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) "qUu" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -55779,11 +55744,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/storage) -"rdH" = ( -/obj/item/reagent_containers/glass/bucket, -/obj/structure/sink/directional/east, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) "rdO" = ( /obj/machinery/light_switch/directional/north{ pixel_x = -7 @@ -55953,17 +55913,6 @@ "rgE" = ( /turf/closed/wall/r_wall, /area/station/engineering/atmos/hfr_room) -"rgT" = ( -/obj/structure/sink/directional/west, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/item/radio/intercom/directional/east, -/turf/open/floor/iron/white, -/area/station/science/research) "rhf" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -56420,11 +56369,6 @@ dir = 1 }, /area/station/science/explab) -"rqp" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/sink/directional/south, -/turf/open/floor/iron, -/area/station/hallway/secondary/service) "rqq" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -57840,12 +57784,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/mine/eva) -"rOG" = ( -/obj/structure/sign/warning/no_smoking/circle/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/obj/structure/sink/directional/west, -/turf/open/floor/iron/white, -/area/station/medical/cryo) "rOU" = ( /obj/effect/landmark/start/hangover, /turf/open/floor/iron/dark, @@ -58092,6 +58030,16 @@ /obj/machinery/light/directional/west, /turf/open/openspace, /area/station/science/xenobiology) +"rSA" = ( +/obj/effect/turf_decal/tile/neutral/diagonal_edge, +/obj/effect/turf_decal/tile/blue/diagonal_edge, +/obj/machinery/vending/wardrobe/chef_wardrobe{ + pixel_y = 0; + pixel_x = -2 + }, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron/kitchen/diagonal, +/area/station/service/kitchen) "rSC" = ( /turf/open/floor/glass/reinforced, /area/station/engineering/lobby) @@ -58312,14 +58260,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/mine/laborcamp) -"rVZ" = ( -/obj/effect/turf_decal/tile/neutral/diagonal_edge, -/obj/machinery/airalarm/directional/east, -/obj/structure/sink/kitchen/directional/west, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/kitchen/diagonal, -/area/station/service/kitchen) "rWn" = ( /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron, @@ -58578,6 +58518,22 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/project) +"rZI" = ( +/obj/structure/sink/kitchen/directional/west, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 8 + }, +/obj/item/radio/intercom/directional/east{ + pixel_x = 31 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) "rZN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -60199,6 +60155,14 @@ /obj/effect/turf_decal/tile/dark_green/diagonal_edge, /turf/open/floor/iron/dark/diagonal, /area/station/engineering/atmos/mix) +"syu" = ( +/obj/effect/turf_decal/tile/neutral/diagonal_edge, +/obj/machinery/airalarm/directional/east, +/obj/structure/sink/kitchen/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/kitchen/diagonal, +/area/station/service/kitchen) "syw" = ( /obj/structure/fence/corner{ dir = 4 @@ -60856,6 +60820,11 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/white, /area/station/medical/psychology) +"sHF" = ( +/obj/item/reagent_containers/glass/bucket, +/obj/structure/sink/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) "sHM" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -60870,6 +60839,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/smooth, /area/mine/mechbay) +"sId" = ( +/obj/structure/sink/directional/west, +/obj/structure/sign/poster/official/cleanliness{ + pixel_x = 32 + }, +/turf/open/floor/iron, +/area/station/maintenance/port/fore) "sIg" = ( /obj/effect/turf_decal/tile/brown{ dir = 8 @@ -61692,6 +61668,11 @@ }, /turf/open/floor/iron/white, /area/station/maintenance/port/fore) +"sYp" = ( +/obj/structure/sink/kitchen/directional/south, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison/mess) "sYu" = ( /obj/machinery/door/firedoor, /obj/effect/landmark/event_spawn, @@ -61984,10 +61965,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/port/greater) -"tds" = ( -/obj/structure/sink/directional/east, -/turf/open/floor/iron, -/area/station/maintenance/port/fore) "tdL" = ( /obj/structure/stairs/south, /obj/structure/railing{ @@ -62028,20 +62005,6 @@ /obj/structure/fence, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/underground/explored) -"tek" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/sink/kitchen/directional/east{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink" - }, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) -"tel" = ( -/obj/structure/sink/directional/west, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/mirror/directional/east, -/turf/open/floor/iron/freezer, -/area/station/commons/toilet/locker) "teB" = ( /obj/machinery/conveyor_switch/oneway{ id = "packageSort2" @@ -62191,6 +62154,15 @@ /mob/living/simple_animal/bot/secbot/beepsky/armsky, /turf/open/floor/iron/dark/textured, /area/station/ai_monitored/security/armory) +"thl" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "kitchencounter"; + name = "Kitchen Counter Shutters"; + dir = 2 + }, +/turf/open/floor/plating, +/area/station/service/kitchen) "thD" = ( /obj/machinery/airalarm/directional/north, /turf/open/floor/plating, @@ -62487,6 +62459,16 @@ /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/plating, /area/station/science/ordnance) +"tmf" = ( +/obj/machinery/shower/directional/north, +/obj/structure/window/reinforced/tinted{ + dir = 4 + }, +/obj/machinery/door/window/left/directional/north{ + name = "Shower Cubicle" + }, +/turf/open/floor/iron/freezer, +/area/station/maintenance/starboard/fore) "tml" = ( /obj/structure/grille, /turf/open/floor/plating, @@ -62704,6 +62686,14 @@ /obj/item/key/janitor, /turf/open/floor/iron, /area/station/service/janitor) +"tqD" = ( +/obj/item/soap/deluxe, +/obj/item/bikehorn/rubberducky, +/obj/structure/curtain, +/obj/machinery/shower/directional/south, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/freezer, +/area/station/medical/break_room) "tqQ" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -62811,18 +62801,6 @@ /obj/machinery/rnd/server/master, /turf/open/openspace/icemoon, /area/station/science/server) -"tsB" = ( -/obj/structure/table/reinforced, -/obj/item/stack/sheet/glass/fifty{ - pixel_x = 2 - }, -/obj/item/stack/sheet/iron/fifty, -/obj/item/stack/cable_coil{ - pixel_x = -3; - pixel_y = 3 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/hfr_room) "tsH" = ( /obj/machinery/door/airlock/security/glass{ name = "Interrogation" @@ -63821,13 +63799,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) -"tFn" = ( -/obj/structure/sink/directional/west, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/mirror/directional/east, -/turf/open/floor/iron/freezer, -/area/station/commons/toilet/locker) "tFs" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -64274,16 +64245,6 @@ }, /turf/open/floor/iron/white, /area/station/science/robotics/lab) -"tMg" = ( -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/structure/sink/directional/west, -/turf/open/floor/iron, -/area/station/service/hydroponics) "tMk" = ( /obj/machinery/duct, /obj/structure/cable, @@ -65570,6 +65531,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/cargo/drone_bay) +"uil" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/machinery/door/window/right/directional/east{ + dir = 4 + }, +/obj/structure/sign/warning/cold_temp/directional/south, +/turf/open/floor/plating/snowed/coldroom, +/area/station/service/kitchen/coldroom) "uin" = ( /obj/structure/sign/warning/fire/directional/south, /obj/effect/turf_decal/stripes/corner{ @@ -65829,6 +65800,22 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/security/prison/safe) +"ulH" = ( +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Service External Airlock"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/structure/sign/warning/cold_temp/directional/north, +/obj/structure/sign/warning/gas_mask/directional/south{ + desc = "A sign that warns of dangerous gasses in the air, instructing you to wear internals." + }, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) "ulK" = ( /obj/effect/turf_decal/caution{ dir = 8 @@ -66335,16 +66322,6 @@ /obj/effect/spawner/random/techstorage/tcomms_all, /turf/open/floor/plating, /area/station/engineering/storage/tech) -"uug" = ( -/obj/item/clothing/suit/snowman{ - name = "Man of Snow" - }, -/obj/item/clothing/head/snowman{ - name = "Head of Snow"; - pixel_y = 9 - }, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "uum" = ( /obj/machinery/door/airlock/public/glass{ name = "Chapel" @@ -66487,6 +66464,12 @@ dir = 4 }, /area/station/engineering/lobby) +"uxv" = ( +/obj/structure/sign/warning/no_smoking/circle/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/structure/sink/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/cryo) "uxx" = ( /obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/monitored/air_output{ dir = 1 @@ -67843,6 +67826,17 @@ }, /turf/open/floor/iron/dark, /area/station/science/ordnance/office) +"uWI" = ( +/obj/structure/sink/directional/west, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/white, +/area/station/science/research) "uWW" = ( /obj/structure/closet/cardboard, /obj/effect/spawner/random/maintenance, @@ -68221,11 +68215,6 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"vci" = ( -/obj/effect/turf_decal/trimline, -/obj/machinery/shower/directional/south, -/turf/open/floor/iron/smooth, -/area/mine/eva) "vcj" = ( /turf/closed/wall/r_wall, /area/mine/storage) @@ -68562,6 +68551,12 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/iron/dark, /area/station/service/chapel) +"vhn" = ( +/obj/machinery/shower/directional/south, +/obj/item/soap/nanotrasen, +/obj/item/bikehorn/rubberducky/plasticducky, +/turf/open/floor/iron/freezer, +/area/mine/laborcamp) "vhB" = ( /obj/structure/chair/plastic, /obj/effect/turf_decal/bot_red, @@ -68707,6 +68702,16 @@ /obj/machinery/light/floor, /turf/open/floor/iron, /area/station/cargo/storage) +"vjR" = ( +/obj/structure/sink/directional/south, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) "vjS" = ( /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron/white, @@ -68841,6 +68846,10 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/service/hydroponics/garden) +"vls" = ( +/obj/structure/sink/directional/east, +/turf/open/floor/iron, +/area/station/maintenance/port/fore) "vlt" = ( /obj/machinery/conveyor{ dir = 1; @@ -69723,11 +69732,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark/textured, /area/station/security/range) -"vyy" = ( -/obj/structure/sink/directional/west, -/obj/structure/mirror/directional/east, -/turf/open/floor/iron/freezer, -/area/station/maintenance/starboard/fore) "vyU" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /turf/open/misc/asteroid/snow/icemoon, @@ -71495,17 +71499,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) -"wbb" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/suit/radiation, -/obj/item/clothing/head/radiation, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/item/geiger_counter, -/obj/item/clothing/glasses/meson, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) "wbe" = ( /obj/structure/cable/multilayer/multiz, /obj/effect/turf_decal/trimline/green/filled/line{ @@ -71525,6 +71518,17 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark, /area/station/engineering/atmos/project) +"wbm" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 6 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/airalarm/directional/east, +/obj/machinery/shower/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/virology) "wbn" = ( /obj/structure/table, /obj/structure/bedsheetbin, @@ -71600,6 +71604,14 @@ }, /turf/open/floor/plating, /area/mine/eva) +"wcQ" = ( +/obj/structure/sink/kitchen/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/station/service/bar) "wcV" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, @@ -71748,6 +71760,13 @@ /obj/structure/sign/poster/official/wtf_is_co2, /turf/closed/wall/r_wall, /area/station/maintenance/aft/greater) +"wfF" = ( +/obj/structure/sink/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/mirror/directional/east, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/locker) "wfK" = ( /obj/item/folder/blue, /obj/structure/table/wood, @@ -72596,6 +72615,16 @@ }, /turf/open/floor/iron, /area/station/engineering/storage) +"wrj" = ( +/obj/structure/sink/directional/east, +/obj/machinery/button/door/directional/west{ + id = "xenobio2"; + layer = 4; + name = "Xenobio Pen 2 Blast Door"; + req_access = list("xenobiology") + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "wrA" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -73569,13 +73598,6 @@ }, /turf/open/floor/iron/white, /area/station/science/robotics/lab) -"wGb" = ( -/obj/structure/bed, -/obj/item/clothing/suit/straight_jacket, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "wGc" = ( /obj/machinery/door/poddoor/preopen{ id = "testlab"; @@ -74306,12 +74328,6 @@ "wRd" = ( /turf/open/floor/iron, /area/station/engineering/main) -"wRn" = ( -/obj/structure/sink/directional/east, -/obj/structure/mirror/directional/west, -/obj/machinery/light/directional/north, -/turf/open/floor/iron/freezer, -/area/station/commons/toilet) "wRr" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -74693,14 +74709,6 @@ "wXw" = ( /turf/open/genturf/alternative, /area/icemoon/surface/outdoors/noruins) -"wXI" = ( -/obj/machinery/shower/directional/north, -/obj/effect/turf_decal/trimline/blue/line{ - dir = 5 - }, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/iron/dark/textured, -/area/station/medical/treatment_center) "wXW" = ( /obj/structure/sign/warning/gas_mask/directional/south, /obj/effect/spawner/random/trash/grille_or_waste, @@ -74972,14 +74980,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/commons/fitness) -"xbm" = ( -/obj/structure/sink/kitchen/directional/south{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink" - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron/freezer, -/area/mine/laborcamp) "xbn" = ( /obj/effect/turf_decal/tile/neutral/diagonal_edge, /obj/structure/disposalpipe/segment{ @@ -75138,6 +75138,13 @@ /obj/structure/sign/warning/cold_temp, /turf/closed/wall, /area/station/hallway/secondary/exit/departure_lounge) +"xdS" = ( +/obj/structure/sink/directional/west, +/obj/structure/mirror/directional/east, +/obj/machinery/light/small/directional/south, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron/freezer, +/area/mine/eva/lower) "xdU" = ( /obj/effect/turf_decal/tile/purple{ dir = 4 @@ -75358,6 +75365,16 @@ }, /turf/open/floor/iron/smooth_large, /area/station/cargo/drone_bay) +"xgP" = ( +/obj/item/clothing/suit/costume/snowman{ + name = "Man of Snow" + }, +/obj/item/clothing/head/snowman{ + name = "Head of Snow"; + pixel_y = 9 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "xgX" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -75966,14 +75983,6 @@ /obj/effect/mapping_helpers/airlock/access/all/service/general, /turf/open/floor/iron/dark/textured, /area/station/hallway/secondary/service) -"xqH" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "kitchencounter"; - name = "Kitchen Counter Shutters" - }, -/turf/open/floor/plating, -/area/station/service/kitchen) "xqY" = ( /obj/machinery/firealarm/directional/east, /turf/open/floor/iron/dark, @@ -76510,6 +76519,15 @@ /obj/structure/closet/crate, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) +"xzR" = ( +/obj/structure/sink/directional/west, +/obj/item/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/reagent_containers/glass/bottle/ammonia, +/obj/machinery/airalarm/directional/south, +/obj/effect/spawner/random/contraband/prison, +/turf/open/floor/plating, +/area/station/security/prison/safe) "xzT" = ( /obj/machinery/porta_turret/ai{ dir = 4 @@ -76699,18 +76717,6 @@ /obj/effect/spawner/random/vending/snackvend, /turf/open/floor/iron, /area/station/hallway/secondary/service) -"xDu" = ( -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green, -/obj/effect/decal/cleanable/dirt, -/obj/structure/sink/kitchen/directional/north{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink" - }, -/turf/open/floor/iron/dark, -/area/mine/laborcamp) "xDG" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/smart/simple/green/visible{ @@ -77699,13 +77705,6 @@ }, /turf/open/floor/engine/cult, /area/station/service/library) -"xUJ" = ( -/obj/structure/sink/kitchen/directional/west{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink" - }, -/turf/open/floor/iron/freezer, -/area/mine/laborcamp) "xUP" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -78397,6 +78396,13 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/wood, /area/station/service/library) +"yeG" = ( +/obj/machinery/airalarm/directional/south, +/obj/machinery/shower/directional/west, +/obj/effect/turf_decal/delivery, +/obj/item/bikehorn/rubberducky, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/locker) "yfb" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/stripes/line{ @@ -78537,11 +78543,6 @@ /obj/structure/sign/warning/cold_temp/directional/east, /turf/open/floor/plating, /area/station/engineering/main) -"yhP" = ( -/obj/structure/sink/directional/east, -/obj/structure/mirror/directional/west, -/turf/open/floor/iron/showroomfloor, -/area/station/security/prison/toilet) "yhU" = ( /obj/structure/chair/stool/directional/north, /turf/open/floor/iron, @@ -96672,7 +96673,7 @@ qlU wDU roa nIN -naB +xdS wDU xlq ghx @@ -100270,7 +100271,7 @@ vfp niN eSY uyq -mQo +pZK uUT bzJ srZ @@ -102496,14 +102497,14 @@ udC udC udC uOb -jiM +khz amx fXO lBR -yhP +pZp gnR lBR -yhP +pZp qrq lBR kIo @@ -103010,7 +103011,7 @@ udC udC udC uOb -gOa +mal amx kHn lBR @@ -103524,7 +103525,7 @@ udC udC udC uOb -kcr +pww amx ddz lBR @@ -104038,7 +104039,7 @@ udC udC udC uOb -hhC +cYy amx yia dhS @@ -109192,7 +109193,7 @@ dRM qwa fXj ldH -iIk +sYp hux kDu vXn @@ -109964,7 +109965,7 @@ uAE jlX xad scw -uug +xgP ghx ghx ghx @@ -110473,7 +110474,7 @@ udC udC udC uPk -jKu +aun fnW lTa xad @@ -112748,7 +112749,7 @@ iDt iDt qzG vjh -iLE +quJ uYj dUG rQx @@ -113005,8 +113006,8 @@ iDt iDt uEA vjh -lbR -xUJ +vhn +oDA njJ qbl dqx @@ -113529,7 +113530,7 @@ dqx aoF hVB npH -xDu +hQS vjh pDW fLT @@ -114550,7 +114551,7 @@ sPA sPA sPA njJ -xbm +lUl sTO rVX rQx @@ -114826,7 +114827,7 @@ ghx ghx iDt nTO -eUJ +kaD eYC xjO nTO @@ -157078,7 +157079,7 @@ tFC jkn jkn iyE -nyZ +cBC vAj lwR iDt @@ -165558,7 +165559,7 @@ tOJ axo kWx tzE -osc +qLK cKl rsY urG @@ -166497,7 +166498,7 @@ bCp fYi tCL jNf -jrs +jnH hKI fWe ozX @@ -166751,7 +166752,7 @@ hPs xLV xLV mxA -gPt +caO tCL jNf kRm @@ -167085,7 +167086,7 @@ aEM gKd gKd rsY -vci +bkQ avh qGg uUT @@ -167786,7 +167787,7 @@ vVH vVH vVH nYZ -djz +xzR xhK iDt ijY @@ -172677,7 +172678,7 @@ ihB ddp hBg hBg -klT +eSL pOk par rsM @@ -177595,7 +177596,7 @@ gAN sCZ sCZ eGM -kxx +rZI bTI fKy kWR @@ -178365,7 +178366,7 @@ lvc exw ivr jlq -byG +piD hmb eoq vAu @@ -179172,7 +179173,7 @@ vHR pHD qMz hjM -dnw +gBE wEU rwD nxM @@ -179639,7 +179640,7 @@ xMq mdZ kgs tGZ -fzk +oln tGZ tGZ let @@ -180723,7 +180724,7 @@ nxM mco upa hjM -bKE +bYa bif nCD rgE @@ -180990,7 +180991,7 @@ kpG uAi qST iRP -tsB +iij lKt rgE udC @@ -182490,7 +182491,7 @@ fwB fwB btU btU -qks +ggH ofm nHc nHc @@ -182501,7 +182502,7 @@ xDb xDb xDb ygs -aGk +bQl rQw xEb eVZ @@ -182988,7 +182989,7 @@ rxY vKC rxY fzK -eIF +wcQ tAe mgR qYo @@ -183768,7 +183769,7 @@ nNe jre jre lOt -ovi +uil ksK fwB fwB @@ -184812,12 +184813,12 @@ aVU jUB xDb xDb -eZI +huE qWD oQY nvX jUB -agG +lwY lPC vpX xDb @@ -185053,7 +185054,7 @@ vFg xwx vTp jre -buF +ulH jre fuH fuH @@ -185329,7 +185330,7 @@ cxQ taL wgI ueE -osf +kvH jUB vjJ bPE @@ -185579,8 +185580,8 @@ udC udC xDb pPD -jhu -aVV +iuo +wbm jUB xmB anK @@ -188173,7 +188174,7 @@ xyn dmj pMF fwC -lan +ffr ega xCh kaW @@ -188184,7 +188185,7 @@ pMF rjT rXD pMF -mPa +wrj lNo pMF clW @@ -224609,7 +224610,7 @@ lJO anl lJO jvj -ciQ +sId lnY waM lJO @@ -225127,7 +225128,7 @@ anl iwD anl lJO -qRc +vjR aPM aPM kMu @@ -226155,7 +226156,7 @@ sQx lJO anl lJO -lSe +bsA sAR sAR cBD @@ -227202,12 +227203,12 @@ dVj siX wpc xBn -tFn -eJd -tel -eJd +wfF +gDk +pBe +gDk xZG -kfR +yeG tKI vGM tKI @@ -227682,7 +227683,7 @@ tCr lJO khW iSn -tds +vls lJO hjI qDI @@ -228788,7 +228789,7 @@ sEB bln pRj dMO -tek +cEE dcQ wAW ktS @@ -233894,7 +233895,7 @@ gxO dKK xmN rCC -oCD +eeN grN qmi kGx @@ -239335,11 +239336,11 @@ pcg uGz dsk qnC -doI +fTU eBI oEt gka -hfW +qxD fab kFZ wuo @@ -239596,7 +239597,7 @@ efU uif wRd gka -wbb +dLE fab iag loc @@ -239750,7 +239751,7 @@ bUx jOQ bxQ bUx -wGb +dRr mZD aKt tDk @@ -240874,7 +240875,7 @@ xSv aIg rjh xZl -fpO +knk pna aIg oUA @@ -241388,7 +241389,7 @@ pdV hqV pie uGT -eZk +nqF pna hqV nQw @@ -241603,9 +241604,9 @@ qjx heX viQ lpM -iDU +fmK axB -jCZ +fiI mhQ ixu hGh @@ -241833,11 +241834,11 @@ akD qIU rXO uja -wRn -gUJ +dae +jVe vVw -gUJ -dgf +jVe +jkv rKS uja fpP @@ -242404,9 +242405,9 @@ jlV hHN hHN axM -pkv +fKM rPd -ayL +gBA caS hHN wAB @@ -243117,8 +243118,8 @@ lvY mmA iXK uja -isp -isp +gye +gye kxN uja rCo @@ -243200,7 +243201,7 @@ oHp nyA ybq lhO -aeP +fyW duh bln bln @@ -243631,8 +243632,8 @@ mAz oSk ltV uja -hqO -hqO +fIE +fIE tUn uja jlP @@ -243642,7 +243643,7 @@ uja idw eZj iuE -iHw +cfp cKp kDP kmQ @@ -244661,7 +244662,7 @@ nXn qdd gmW uiw -tMg +hlf hGI tCs exw @@ -244906,7 +244907,7 @@ vXY skl gfE uBn -oyO +gcA skl ncO vfW @@ -246729,7 +246730,7 @@ hnf bdP rga fAc -iUW +lIS iAJ eCA ihf @@ -246744,7 +246745,7 @@ xxg nDl uau hgh -lJs +gnW xPT cxA lka @@ -247016,7 +247017,7 @@ gHq ygF wGE rpM -mrS +kzL cvS oaX cvS @@ -247273,7 +247274,7 @@ olI oyB mcp rpM -wXI +lkQ cvS gDp gDp @@ -248011,13 +248012,13 @@ wbB lxf eBa qZB -piz +jDh gtw gtw gtw gtw gtw -osL +rSA cpY cGZ lCi @@ -248517,7 +248518,7 @@ gmW gmW mdZ mdZ -rqp +hAR kQX tGZ mdZ @@ -248778,7 +248779,7 @@ byk rrx nIr mdZ -eIL +grl lxf son qZB @@ -248789,7 +248790,7 @@ ioo eke fkk bpG -xqH +thl uXm lso qEM @@ -249046,7 +249047,7 @@ qfe ecZ fkk lmG -xqH +thl kYE lso cbs @@ -249303,7 +249304,7 @@ fMP fMP oyV fFu -xqH +thl uXm lso qEM @@ -249553,7 +249554,7 @@ fbm gjh laQ bzn -rVZ +syu qjX wKm wqZ @@ -249846,7 +249847,7 @@ sHd jih rkM eHU -kWt +dnR eHU rkM eHU @@ -250073,7 +250074,7 @@ cSQ kKL kKl beT -rdH +sHF giD kKL bws @@ -250868,7 +250869,7 @@ klc slK hXU bba -rOG +uxv uKj dDw wCl @@ -250885,7 +250886,7 @@ vxE hyd xjD tMO -jgz +qpv sZF vwr wRr @@ -251142,7 +251143,7 @@ rbK tsY uaW tMO -iAV +tqD sZF mEK wRr @@ -253959,7 +253960,7 @@ rEd eum gSN jbU -mOj +dDa drr hvm pvB @@ -254216,7 +254217,7 @@ wfR oQx vpW jbU -egM +gRw fmU qhL wve @@ -255955,7 +255956,7 @@ bln bln bln iyY -jFp +qUo nTf gzY rEX @@ -256249,9 +256250,9 @@ cYE lso iBv wLl -eKP -qRN -rgT +cWt +lsX +uWI wLl dzg fXr @@ -256474,7 +256475,7 @@ pDe fYj meQ vve -fpY +tmf kKL mqO fUc @@ -256731,7 +256732,7 @@ fOz gsH kKL qNu -ark +kFE kKL lUC lUC @@ -256987,8 +256988,8 @@ tjV dxs pVi kKL -vyy -dqh +fbc +dNX kKL nwd epd diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 9f9977e1cf9..57e58f443b4 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -8292,16 +8292,6 @@ /obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) -"cxq" = ( -/obj/effect/turf_decal/bot, -/obj/structure/rack, -/obj/effect/decal/cleanable/cobweb, -/obj/item/clothing/suit/fire/firefighter{ - pixel_y = 5 - }, -/obj/item/clothing/mask/breath, -/turf/open/floor/plating, -/area/station/maintenance/port/lesser) "cxO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -19641,6 +19631,19 @@ /obj/effect/decal/cleanable/dirt, /turf/open/misc/asteroid/airless, /area/space/nearstation) +"fIu" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 4 + }, +/obj/machinery/meter, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/science/ordnance/storage) "fIw" = ( /obj/machinery/libraryscanner, /obj/effect/turf_decal/tile/neutral, @@ -22401,13 +22404,6 @@ /obj/structure/grille, /turf/closed/wall/r_wall/rust, /area/station/engineering/atmos) -"gvt" = ( -/obj/item/clothing/head/cardborg, -/obj/item/clothing/suit/cardborg, -/obj/structure/closet/cardboard/metal, -/obj/machinery/airalarm/directional/east, -/turf/open/floor/plating, -/area/station/maintenance/central) "gvu" = ( /obj/machinery/portable_atmospherics/canister, /obj/machinery/atmospherics/components/unary/portables_connector/visible, @@ -31044,14 +31040,6 @@ /obj/effect/landmark/start/chaplain, /turf/open/floor/cult, /area/station/service/chapel/office) -"iKa" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/bodycontainer/crematorium{ - dir = 4 - }, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/iron/checker, -/area/station/security/processing/cremation) "iKg" = ( /turf/closed/wall/rust, /area/station/engineering/main) @@ -37782,6 +37770,16 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) +"kNP" = ( +/obj/effect/turf_decal/bot, +/obj/structure/rack, +/obj/effect/decal/cleanable/cobweb, +/obj/item/clothing/suit/utility/fire/firefighter{ + pixel_y = 5 + }, +/obj/item/clothing/mask/breath, +/turf/open/floor/plating, +/area/station/maintenance/port/lesser) "kNS" = ( /obj/structure/cable, /turf/open/floor/iron/dark, @@ -41090,6 +41088,25 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) +"lJL" = ( +/obj/machinery/requests_console/directional/north{ + department = "Security"; + departmentType = 3; + name = "Security Requests Console" + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red, +/obj/structure/filingcabinet, +/turf/open/floor/iron/showroomfloor, +/area/station/security/checkpoint/medical) "lJR" = ( /obj/machinery/button/crematorium/indestructible{ pixel_x = -25 @@ -43468,6 +43485,13 @@ luminosity = 2 }, /area/station/ai_monitored/turret_protected/ai) +"mtI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/bodycontainer/crematorium{ + dir = 4 + }, +/turf/open/floor/iron/checker, +/area/station/security/processing/cremation) "mtN" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -43546,14 +43570,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/cargo/storage) -"mvu" = ( -/obj/structure/table/bronze, -/obj/item/clothing/suit/bronze, -/obj/item/clothing/shoes/bronze{ - pixel_x = -12 - }, -/turf/open/floor/bronze, -/area/station/maintenance/department/chapel) "mvz" = ( /obj/machinery/door/airlock/research{ name = "Ordnance Lab" @@ -44247,12 +44263,6 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/engineering/hallway) -"mGm" = ( -/obj/structure/table, -/obj/item/clothing/suit/justice, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/plating, -/area/station/maintenance/aft) "mGo" = ( /obj/structure/table, /obj/effect/turf_decal/tile/neutral, @@ -46656,11 +46666,6 @@ }, /turf/open/floor/iron, /area/station/security/office) -"nqj" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/iron/dark, -/area/station/service/chapel/storage) "nqm" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -65084,20 +65089,6 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron, /area/station/commons/storage/primary) -"sEl" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 4 - }, -/obj/machinery/meter, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/iron/showroomfloor, -/area/station/science/ordnance/storage) "sEs" = ( /obj/item/storage/box/bodybags, /obj/item/pen, @@ -71513,26 +71504,6 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/port/greater) -"upV" = ( -/obj/machinery/requests_console/directional/north{ - department = "Security"; - departmentType = 3; - name = "Security Requests Console" - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red, -/obj/structure/filingcabinet, -/obj/machinery/camera/directional/north, -/turf/open/floor/iron/showroomfloor, -/area/station/security/checkpoint/medical) "upW" = ( /obj/structure/cable, /turf/open/floor/engine, @@ -75136,6 +75107,14 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/fore) +"vtv" = ( +/obj/structure/table/bronze, +/obj/item/clothing/suit/costume/bronze, +/obj/item/clothing/shoes/bronze{ + pixel_x = -12 + }, +/turf/open/floor/bronze, +/area/station/maintenance/department/chapel) "vtF" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ @@ -76509,6 +76488,13 @@ "vKm" = ( /turf/open/floor/engine/vacuum, /area/station/maintenance/disposal/incinerator) +"vKp" = ( +/obj/item/clothing/head/cardborg, +/obj/item/clothing/suit/costume/cardborg, +/obj/structure/closet/cardboard/metal, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/central) "vKE" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -82560,6 +82546,12 @@ }, /turf/closed/wall, /area/station/maintenance/starboard) +"xun" = ( +/obj/structure/table, +/obj/item/clothing/suit/costume/justice, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/plating, +/area/station/maintenance/aft) "xuA" = ( /obj/machinery/vending/hydroseeds{ slogan_delay = 700 @@ -96870,7 +96862,7 @@ mgR pwT drG pqD -cxq +kNP tZP duU kzl @@ -97054,7 +97046,7 @@ rqG cop tiv rfg -mvu +vtv bJV aaa aaa @@ -100377,7 +100369,7 @@ aeU aeU qOd lDK -nqj +lqR pOV pOV tiv @@ -103578,7 +103570,7 @@ ilv bzc vWY frP -iKa +mtI lwp aUz aaa @@ -106864,7 +106856,7 @@ pBd cTI gAO rFt -upV +lJL ozt xJn rFt @@ -110515,7 +110507,7 @@ cmc nPT gmn nPT -mGm +xun tjE tOa xPc @@ -118971,7 +118963,7 @@ vrf pBy jlh aVx -gvt +vKp ewe hfp ixo @@ -126912,7 +126904,7 @@ bwA dya nDM dty -sEl +fIu jYp qew sVI diff --git a/_maps/map_files/Map_Reset/Skyrat_Map_Reset.dmm b/_maps/map_files/Map_Reset/Skyrat_Map_Reset.dmm index 68eeedf90e6..5f0006fd1c8 100644 --- a/_maps/map_files/Map_Reset/Skyrat_Map_Reset.dmm +++ b/_maps/map_files/Map_Reset/Skyrat_Map_Reset.dmm @@ -10374,7 +10374,7 @@ /area/station/hallway/secondary/entry) "Ao" = ( /obj/structure/bed, -/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, /obj/item/clothing/glasses/blindfold, /obj/item/clothing/mask/muzzle, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -12824,7 +12824,7 @@ /area/station/maintenance/port/fore) "GM" = ( /obj/structure/bed, -/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, /obj/item/clothing/glasses/blindfold, /obj/item/clothing/mask/muzzle, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -19158,8 +19158,8 @@ "Yp" = ( /obj/structure/closet/bombcloset/security, /obj/effect/turf_decal/bot_blue, -/obj/item/clothing/suit/bomb_suit/security, -/obj/item/clothing/suit/bomb_suit/security, +/obj/item/clothing/suit/utility/bomb_suit/security, +/obj/item/clothing/suit/utility/bomb_suit/security, /obj/item/clothing/head/bomb_hood/security, /obj/item/clothing/head/bomb_hood/security, /turf/open/floor/iron/dark, @@ -19298,9 +19298,9 @@ /area/station/service/salon) "YJ" = ( /obj/structure/table, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, /obj/item/restraints/handcuffs, /obj/item/restraints/handcuffs, /obj/item/restraints/handcuffs, @@ -19692,7 +19692,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/item/clothing/suit/fire/firefighter, +/obj/item/clothing/suit/utility/fire/firefighter, /obj/item/clothing/head/hardhat/red, /turf/open/floor/iron/dark, /area/station/security/prison/upper) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 3f69739aae7..63bece577ae 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -72,13 +72,6 @@ }, /turf/open/floor/carpet, /area/station/commons/dorms) -"abl" = ( -/obj/item/clothing/suit/straight_jacket, -/obj/item/electropack, -/obj/structure/table, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/security/execution/transfer) "abI" = ( /obj/structure/chair/stool/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -159,6 +152,25 @@ /obj/machinery/duct, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) +"adH" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/right/directional/south{ + dir = 8; + name = "First Aid Supplies"; + req_access = list("medical") + }, +/obj/item/clothing/glasses/blindfold{ + pixel_y = 3 + }, +/obj/item/clothing/glasses/blindfold, +/obj/item/clothing/ears/earmuffs{ + pixel_y = 3 + }, +/obj/item/clothing/ears/earmuffs, +/obj/item/clothing/glasses/eyepatch, +/obj/item/clothing/suit/jacket/straight_jacket, +/turf/open/floor/iron/dark, +/area/station/medical/office) "adS" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, @@ -329,6 +341,15 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) +"agW" = ( +/obj/structure/cable, +/obj/structure/sink/kitchen/directional/west, +/obj/machinery/power/apc/auto_name/directional/north, +/mob/living/simple_animal/hostile/retaliate/goat{ + name = "Pete" + }, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/station/service/kitchen/coldroom) "ahg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /obj/machinery/duct, @@ -1249,16 +1270,6 @@ "ayg" = ( /turf/open/floor/engine/o2, /area/station/engineering/atmos) -"ayi" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/sink/directional/east, -/obj/structure/sign/poster/official/cleanliness{ - pixel_y = -32 - }, -/obj/machinery/light/small/directional/south, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/service/hydroponics) "ayr" = ( /turf/open/floor/iron, /area/station/engineering/break_room) @@ -1389,6 +1400,14 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) +"aBk" = ( +/obj/structure/sink/directional/west, +/obj/structure/toilet{ + pixel_y = 8 + }, +/obj/structure/light_construct/small/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) "aBJ" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/delivery, @@ -1494,6 +1513,17 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"aCO" = ( +/obj/structure/sign/warning/radiation/rad_area/directional/north{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) "aCQ" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -1862,6 +1892,41 @@ }, /turf/open/floor/engine/n2o, /area/station/engineering/atmos) +"aJf" = ( +/obj/structure/closet/crate/secure/weapon{ + desc = "A secure clothing crate."; + name = "formal uniform crate"; + req_access = list("armory") + }, +/obj/item/clothing/under/rank/security/officer/formal, +/obj/item/clothing/under/rank/security/officer/formal, +/obj/item/clothing/under/rank/security/officer/formal, +/obj/item/clothing/under/rank/security/officer/formal, +/obj/item/clothing/under/rank/security/officer/formal, +/obj/item/clothing/under/rank/security/officer/formal, +/obj/item/clothing/suit/jacket/officer/blue, +/obj/item/clothing/suit/jacket/officer/blue, +/obj/item/clothing/suit/jacket/officer/blue, +/obj/item/clothing/suit/jacket/officer/blue, +/obj/item/clothing/suit/jacket/officer/blue, +/obj/item/clothing/suit/jacket/officer/blue, +/obj/item/clothing/under/rank/security/warden/formal, +/obj/item/clothing/suit/jacket/warden/blue, +/obj/item/clothing/under/rank/security/head_of_security/formal, +/obj/item/clothing/suit/jacket/hos/blue, +/obj/item/clothing/head/beret/sec/navyofficer, +/obj/item/clothing/head/beret/sec/navyofficer, +/obj/item/clothing/head/beret/sec/navyofficer, +/obj/item/clothing/head/beret/sec/navyofficer, +/obj/item/clothing/head/beret/sec/navyofficer, +/obj/item/clothing/head/beret/sec/navyofficer, +/obj/item/clothing/head/beret/sec/navywarden, +/obj/item/clothing/head/hos/beret/navyhos, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/security/lockers) "aJj" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -2976,10 +3041,6 @@ /obj/effect/turf_decal/trimline/brown/filled/corner, /turf/open/floor/iron, /area/station/construction/storage_wing) -"bba" = ( -/obj/machinery/shower/directional/west, -/turf/open/floor/iron/freezer, -/area/station/security/prison/shower) "bbd" = ( /obj/machinery/duct, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -3133,6 +3194,10 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/fore/lesser) +"bdS" = ( +/obj/structure/sink/directional/west, +/turf/open/floor/iron/white, +/area/station/science/research) "bec" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -3225,29 +3290,11 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark, /area/station/science/ordnance) -"bfJ" = ( -/obj/structure/sign/poster/official/cleanliness{ - pixel_x = -32 - }, -/obj/structure/sink/directional/south, -/obj/effect/turf_decal/tile/green/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/medical/virology) "bfO" = ( /obj/machinery/holopad, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) -"bfV" = ( -/obj/structure/sink/kitchen/directional/east{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink" - }, -/obj/structure/mirror/directional/west, -/turf/open/floor/wood, -/area/station/maintenance/port/aft) "bgm" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -3358,12 +3405,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/security/prison) -"bhO" = ( -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/shower/directional/west, -/obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/iron/white, -/area/station/medical/surgery/theatre) "bhS" = ( /turf/closed/wall/r_wall, /area/station/maintenance/aft/greater) @@ -4004,6 +4045,18 @@ }, /turf/open/floor/iron, /area/station/commons/locker) +"bsI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/closed/wall, +/area/station/engineering/atmos/pumproom) +"bsM" = ( +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/structure/cable, +/obj/structure/sink/directional/east, +/obj/machinery/airalarm/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/open/floor/iron/white, +/area/station/medical/cryo) "bsZ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -4769,14 +4822,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/central) -"bKg" = ( -/obj/structure/sink/directional/west, -/obj/structure/toilet{ - pixel_y = 8 - }, -/obj/structure/light_construct/small/directional/south, -/turf/open/floor/plating, -/area/station/maintenance/aft/greater) "bKj" = ( /obj/structure/window/reinforced{ dir = 8 @@ -5158,6 +5203,14 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"bSK" = ( +/obj/machinery/shower/directional/south, +/obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) "bSY" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, @@ -5448,12 +5501,6 @@ /obj/machinery/portable_atmospherics/canister/plasma, /turf/open/floor/plating, /area/station/engineering/main) -"bYw" = ( -/obj/structure/sink/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "bYz" = ( /turf/open/floor/circuit, /area/station/maintenance/port/aft) @@ -5602,18 +5649,6 @@ /obj/machinery/autolathe, /turf/open/floor/iron, /area/station/cargo/storage) -"cel" = ( -/obj/structure/sink/directional/east, -/obj/structure/mirror/directional/west, -/obj/machinery/light/small/directional/south, -/obj/machinery/button/door/directional/south{ - id = "FitnessShower"; - name = "Lock Control"; - normaldoorcontrol = 1; - specialfunctions = 4 - }, -/turf/open/floor/iron/freezer, -/area/station/commons/fitness/recreation) "cem" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -5900,6 +5935,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"clc" = ( +/obj/machinery/shower/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/freezer, +/area/station/security/prison/shower) "clj" = ( /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, @@ -6692,6 +6732,15 @@ }, /turf/open/floor/wood, /area/station/service/library) +"cyA" = ( +/obj/structure/mirror/directional/north, +/obj/structure/sink/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/trash/soap{ + spawn_scatter_radius = 1 + }, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/captain/private) "cyG" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -6998,19 +7047,6 @@ /obj/effect/spawner/random/engineering/flashlight, /turf/open/floor/plating, /area/station/maintenance/central) -"cDX" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/warning/radiation/rad_area/directional/north, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) "cEv" = ( /obj/item/food/grown/wheat, /obj/item/food/grown/watermelon, @@ -7023,6 +7059,15 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +"cEK" = ( +/obj/structure/bed, +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/item/clothing/glasses/blindfold, +/obj/item/clothing/mask/muzzle, +/obj/item/electropack, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) "cFa" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 @@ -7888,6 +7933,17 @@ }, /turf/open/floor/iron, /area/station/security/brig) +"cYf" = ( +/obj/structure/sink/kitchen/directional/south{ + desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; + name = "old sink" + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/commons/toilet/auxiliary) "cYg" = ( /obj/effect/turf_decal/bot_white, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -8211,6 +8267,11 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/science/lab) +"ddH" = ( +/obj/structure/sink/directional/east, +/obj/effect/spawner/random/trash/mess, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "ddK" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -8722,17 +8783,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/chemistry) +"dkz" = ( +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/item/electropack, +/obj/structure/table, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "dkC" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/closed/wall/r_wall, /area/station/engineering/atmos) -"dkH" = ( -/obj/structure/sink/directional/east, -/obj/structure/sign/poster/contraband/random/directional/west, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) "dkL" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/event_spawn, @@ -8926,6 +8989,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/dorms) +"dpG" = ( +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/shower/directional/north, +/turf/open/floor/iron, +/area/station/science/xenobiology) "dpL" = ( /obj/structure/window/reinforced{ dir = 4 @@ -10958,13 +11029,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/brig) -"ebi" = ( -/obj/machinery/light/small/broken/directional/west, -/obj/structure/table, -/obj/item/clothing/suit/cyborg_suit, -/obj/item/clothing/mask/gas/cyborg, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) "ebn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -11074,6 +11138,16 @@ "ecO" = ( /turf/open/floor/carpet, /area/station/service/library) +"ecV" = ( +/obj/structure/rack, +/obj/item/clothing/gloves/color/fyellow, +/obj/structure/sink/kitchen/directional/south{ + desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; + name = "old sink" + }, +/obj/effect/spawner/random/maintenance/two, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) "edo" = ( /obj/structure/table/glass, /obj/item/paper_bin, @@ -11382,6 +11456,28 @@ /obj/item/storage/backpack/duffelbag/sec, /turf/open/floor/iron/dark, /area/station/security/office) +"eiZ" = ( +/obj/structure/sink/kitchen/directional/south{ + desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; + name = "old sink" + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) +"ejc" = ( +/obj/structure/sink/directional/east, +/obj/structure/mirror/directional/west, +/obj/machinery/light/small/directional/south, +/obj/machinery/button/door/directional/south{ + id = "FitnessShower"; + name = "Lock Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/turf/open/floor/iron/freezer, +/area/station/commons/fitness/recreation) "eje" = ( /obj/structure/chair{ dir = 4 @@ -11584,16 +11680,6 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) -"elU" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/shower/directional/south{ - name = "emergency shower" - }, -/obj/effect/turf_decal/trimline/blue/end, -/turf/open/floor/iron, -/area/station/engineering/atmos) "elV" = ( /obj/machinery/airalarm/directional/north, /obj/item/clothing/under/misc/assistantformal, @@ -11665,6 +11751,16 @@ }, /turf/open/floor/iron, /area/station/science/lab) +"enE" = ( +/obj/structure/sign/poster/official/cleanliness{ + pixel_x = -32 + }, +/obj/structure/sink/directional/south, +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) "enK" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -11948,20 +12044,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"erL" = ( -/obj/machinery/shower/directional/east, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/button/door/directional/north{ - id = "AuxShower"; - name = "Lock Control"; - normaldoorcontrol = 1; - specialfunctions = 4 - }, -/obj/effect/spawner/random/trash/soap{ - spawn_scatter_radius = 1 - }, -/turf/open/floor/iron, -/area/station/commons/toilet/auxiliary) "erS" = ( /obj/structure/table/wood, /obj/item/camera_film{ @@ -11974,15 +12056,6 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/wood, /area/station/service/library) -"esc" = ( -/obj/structure/sign/warning/radiation/rad_area/directional/north, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) "esd" = ( /obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = 4; @@ -12207,6 +12280,13 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) +"evh" = ( +/obj/structure/sink/directional/east, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) "evD" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -12477,11 +12557,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/gravity_generator) -"eBh" = ( -/obj/machinery/shower/directional/west, -/obj/effect/landmark/event_spawn, -/turf/open/floor/iron/freezer, -/area/station/commons/toilet/restrooms) "eBn" = ( /obj/effect/spawner/random/structure/closet_maintenance, /obj/effect/spawner/random/maintenance/two, @@ -12984,14 +13059,6 @@ }, /turf/closed/wall/r_wall, /area/station/hallway/secondary/command) -"eMx" = ( -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/shower/directional/north, -/turf/open/floor/iron, -/area/station/science/xenobiology) "eMG" = ( /obj/structure/closet/lasertag/blue, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -13159,14 +13226,6 @@ "eQE" = ( /turf/closed/wall, /area/station/service/bar/backroom) -"eQG" = ( -/obj/structure/sink/directional/east, -/obj/machinery/light_switch/directional/west, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/service/hydroponics/garden) "eQO" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -13583,16 +13642,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/virology) -"eYI" = ( -/obj/machinery/shower/directional/west, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/engineering/main) "eYL" = ( /obj/machinery/photocopier, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -13625,19 +13674,6 @@ /obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/floor/iron/white, /area/station/science/genetics) -"eZA" = ( -/obj/machinery/shower/directional/south{ - name = "emergency shower" - }, -/obj/effect/turf_decal/trimline/blue/end, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/medical/chemistry) "eZI" = ( /obj/structure/table, /obj/item/clothing/glasses/sunglasses{ @@ -13861,6 +13897,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/dorms) +"fff" = ( +/obj/machinery/shower/directional/west, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/main) "ffj" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -14611,6 +14657,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/command/corporate_showroom) +"fso" = ( +/obj/machinery/shower/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron/freezer, +/area/station/security/prison/shower) "fsN" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -14861,13 +14913,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"fzO" = ( -/obj/machinery/shower/directional/east, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron/freezer, -/area/station/security/prison/shower) "fAd" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, @@ -15335,6 +15380,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/cargo/qm) +"fID" = ( +/obj/structure/sink/directional/east, +/obj/structure/sign/poster/contraband/random/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "fIE" = ( /obj/machinery/telecomms/server/presets/supply, /turf/open/floor/circuit/telecomms/mainframe, @@ -16002,6 +16052,11 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"fVH" = ( +/obj/structure/mirror/directional/east, +/obj/machinery/shower/directional/west, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) "fVJ" = ( /obj/effect/turf_decal/plaque{ icon_state = "L1" @@ -16413,15 +16468,6 @@ "gdb" = ( /turf/closed/wall/r_wall, /area/station/security/range) -"gdh" = ( -/obj/structure/sink/kitchen/directional/west, -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/cafeteria, -/area/station/service/kitchen) "gdF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/stripes/line, @@ -16697,6 +16743,15 @@ /obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating, /area/station/maintenance/port) +"giZ" = ( +/obj/effect/landmark/xeno_spawn, +/obj/machinery/shower/directional/south, +/obj/structure/curtain, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/captain/private) "gja" = ( /obj/machinery/airalarm/directional/north, /obj/structure/closet/secure_closet/personal, @@ -16712,6 +16767,16 @@ /obj/effect/spawner/random/bureaucracy/briefcase, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) +"gjd" = ( +/obj/machinery/shower/directional/east, +/obj/machinery/door/window/right/directional/east{ + base_state = "left"; + dir = 2; + icon_state = "left"; + name = "Shower" + }, +/turf/open/floor/iron/freezer, +/area/station/commons/fitness/recreation) "gji" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 8 @@ -16759,6 +16824,12 @@ dir = 5 }, /area/station/service/kitchen) +"gjT" = ( +/obj/machinery/shower/directional/east, +/obj/machinery/light/small/directional/south, +/obj/effect/spawner/random/trash/mess, +/turf/open/floor/iron, +/area/station/commons/toilet/auxiliary) "gjZ" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 @@ -17560,12 +17631,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"gzw" = ( -/obj/machinery/shower/directional/east, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, -/turf/open/floor/iron/freezer, -/area/station/security/prison/shower) "gzJ" = ( /obj/structure/chair/sofa/left, /turf/open/floor/carpet, @@ -17667,14 +17732,6 @@ "gBD" = ( /turf/closed/wall/r_wall, /area/station/command/teleporter) -"gBJ" = ( -/obj/machinery/shower/directional/south, -/obj/item/radio/intercom/directional/east, -/obj/effect/turf_decal/tile/green/anticorner/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/medical/virology) "gBN" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -18067,11 +18124,6 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"gJE" = ( -/obj/structure/mirror/directional/west, -/obj/machinery/shower/directional/east, -/turf/open/floor/iron/freezer, -/area/station/commons/toilet/restrooms) "gJN" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -18364,11 +18416,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/sorting) -"gOi" = ( -/obj/machinery/shower/directional/west, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/freezer, -/area/station/security/prison/shower) "gOp" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -18446,6 +18493,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet, /area/station/command/heads_quarters/captain/private) +"gPW" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/sink/directional/west, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "gPX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/window/reinforced{ @@ -18540,6 +18596,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) +"gSw" = ( +/obj/structure/sink/directional/west, +/obj/effect/turf_decal/tile/yellow, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "gSx" = ( /obj/machinery/suit_storage_unit/hos, /obj/item/radio/intercom/directional/east, @@ -19264,6 +19334,13 @@ }, /turf/open/floor/plating/airless, /area/station/engineering/atmos) +"hdX" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) "hdZ" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -19639,18 +19716,6 @@ }, /turf/open/floor/iron, /area/station/security/execution/transfer) -"hlB" = ( -/obj/machinery/shower/directional/south{ - name = "emergency shower" - }, -/obj/effect/turf_decal/trimline/blue/end, -/obj/effect/turf_decal/bot{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/engineering/atmos) "hlD" = ( /turf/open/floor/carpet, /area/station/command/heads_quarters/captain/private) @@ -19773,12 +19838,6 @@ /obj/structure/lattice/catwalk, /turf/open/space, /area/space/nearstation) -"hnt" = ( -/obj/machinery/light/small/directional/west, -/obj/structure/sink/directional/south, -/mob/living/simple_animal/mouse/brown/tom, -/turf/open/floor/plating, -/area/station/security/prison/safe) "hnv" = ( /obj/effect/turf_decal/bot, /obj/structure/mecha_wreckage/ripley, @@ -20148,17 +20207,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) -"hvl" = ( -/obj/machinery/light_switch/directional/east, -/obj/machinery/shower/directional/west{ - name = "emergency shower" - }, -/obj/structure/sign/warning/secure_area/directional/north, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/iron, -/area/station/engineering/main) "hvr" = ( /obj/machinery/camera/directional/south{ c_tag = "Central Primary Hallway - Fore - Courtroom" @@ -22006,6 +22054,25 @@ /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/central) +"ice" = ( +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/stack/pipe_cleaner_coil/random, +/obj/item/stack/pipe_cleaner_coil/random, +/obj/item/stack/pipe_cleaner_coil/random, +/obj/item/stack/pipe_cleaner_coil/random, +/obj/item/stack/pipe_cleaner_coil/random, +/obj/item/canvas, +/obj/item/canvas, +/obj/item/canvas, +/obj/item/canvas, +/obj/item/canvas, +/obj/item/canvas, +/obj/item/chisel{ + pixel_y = 7 + }, +/turf/open/floor/iron, +/area/station/commons/storage/art) "ich" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5, /obj/machinery/atmospherics/pipe/smart/simple/purple/visible, @@ -22205,14 +22272,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/command/gateway) -"igl" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/item/radio/intercom/directional/north, -/obj/machinery/shower/directional/south, -/turf/open/floor/iron/white, -/area/station/science/xenobiology/hallway) "ign" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -22357,6 +22416,14 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/plating, /area/station/maintenance/fore) +"iic" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/item/radio/intercom/directional/north, +/obj/machinery/shower/directional/south, +/turf/open/floor/iron/white, +/area/station/science/xenobiology/hallway) "iin" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -22436,6 +22503,12 @@ "ikb" = ( /turf/open/floor/iron, /area/station/commons/dorms) +"iki" = ( +/obj/machinery/light/small/directional/west, +/obj/structure/sink/directional/south, +/mob/living/simple_animal/mouse/brown/tom, +/turf/open/floor/plating, +/area/station/security/prison/safe) "ikw" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/bot, @@ -23239,6 +23312,17 @@ }, /turf/open/floor/iron, /area/station/command/gateway) +"ivd" = ( +/obj/structure/bed, +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/item/clothing/glasses/blindfold, +/obj/item/clothing/mask/muzzle, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/security/execution/transfer) "ivu" = ( /obj/structure/table/reinforced, /obj/machinery/camera/directional/west{ @@ -23570,13 +23654,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"izU" = ( -/obj/machinery/shower/directional/east, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/station/medical/pharmacy) "iAd" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -23808,15 +23885,6 @@ /obj/structure/sign/poster/random/directional/south, /turf/open/floor/wood, /area/station/service/theater) -"iDF" = ( -/obj/structure/bed, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/glasses/blindfold, -/obj/item/clothing/mask/muzzle, -/obj/item/electropack, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/security/execution/education) "iDG" = ( /obj/structure/table, /obj/item/stock_parts/scanning_module{ @@ -24077,6 +24145,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/security/medical) +"iIz" = ( +/obj/structure/sink/kitchen/directional/south{ + desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; + name = "old sink" + }, +/obj/effect/spawner/random/trash/mess, +/turf/open/floor/iron/showroomfloor, +/area/station/maintenance/starboard/lesser) "iIP" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -24333,15 +24409,6 @@ }, /turf/open/floor/iron, /area/station/security/brig) -"iLR" = ( -/obj/structure/sink/directional/west, -/obj/item/reagent_containers/glass/watering_can, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 4 - }, -/obj/machinery/airalarm/directional/east, -/turf/open/floor/iron, -/area/station/security/prison/garden) "iMc" = ( /obj/machinery/light/small/directional/west, /turf/open/floor/iron/freezer, @@ -24569,15 +24636,6 @@ /obj/structure/closet/emcloset, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) -"iOM" = ( -/obj/structure/mirror/directional/north, -/obj/structure/sink/directional/south, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/spawner/random/trash/soap{ - spawn_scatter_radius = 1 - }, -/turf/open/floor/iron/white, -/area/station/command/heads_quarters/captain/private) "iOS" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -24888,10 +24946,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/port) -"iSy" = ( -/obj/structure/sink/directional/west, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "iSI" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -25233,11 +25287,6 @@ }, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"iYL" = ( -/obj/machinery/shower/directional/east, -/obj/effect/landmark/start/hangover, -/turf/open/floor/iron/freezer, -/area/station/commons/toilet/restrooms) "iYO" = ( /obj/structure/table, /obj/item/circular_saw, @@ -25252,6 +25301,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/grimy, /area/station/tcommsat/computer) +"iYR" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/shower/directional/south{ + name = "emergency shower" + }, +/obj/effect/turf_decal/trimline/blue/end, +/turf/open/floor/iron, +/area/station/engineering/atmos) "iZi" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -25285,15 +25344,6 @@ /obj/machinery/portable_atmospherics/canister/anesthetic_mix, /turf/open/floor/iron/dark, /area/station/medical/cryo) -"iZV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) "jaq" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 10 @@ -25535,16 +25585,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port) -"jfz" = ( -/obj/structure/sink/kitchen/directional/south{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink" - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/security/execution/education) "jfB" = ( /obj/machinery/door/airlock/external{ name = "Mining Dock Airlock" @@ -25723,19 +25763,6 @@ /mob/living/simple_animal/sloth/citrus, /turf/open/floor/iron, /area/station/cargo/storage) -"jhJ" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/meter, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/station/engineering/atmos/pumproom) "jhS" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/cable, @@ -25778,6 +25805,15 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/station/cargo/qm) +"jja" = ( +/obj/structure/sink/directional/west, +/obj/item/reagent_containers/glass/watering_can, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 4 + }, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron, +/area/station/security/prison/garden) "jjj" = ( /obj/structure/chair/comfy/black{ dir = 4 @@ -25906,14 +25942,6 @@ /obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"jlG" = ( -/obj/structure/bed, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/glasses/blindfold, -/obj/item/clothing/mask/muzzle, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/dark, -/area/station/security/holding_cell) "jlJ" = ( /obj/effect/spawner/random/entertainment/arcade, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -26668,6 +26696,21 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"jxN" = ( +/obj/structure/sign/poster/official/cleanliness{ + pixel_x = 32 + }, +/obj/structure/sink/directional/south, +/obj/effect/turf_decal/bot, +/obj/item/clothing/suit/apron/chef{ + name = "Jim Norton's Quebecois Coffee apron" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/camera/directional/north{ + c_tag = "Jim Norton's Quebecois Coffee" + }, +/turf/open/floor/iron/dark, +/area/station/service/cafeteria) "jxS" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/white/line{ @@ -26777,22 +26820,15 @@ /obj/machinery/holopad/secure, /turf/open/floor/iron/dark, /area/station/security/office) +"jzM" = ( +/obj/machinery/shower/directional/east, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/turf/open/floor/iron/freezer, +/area/station/security/prison/shower) "jzN" = ( /turf/closed/wall/r_wall, /area/station/command/corporate_showroom) -"jzS" = ( -/obj/structure/sink/directional/south, -/obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/service/hydroponics) "jAl" = ( /obj/machinery/computer/secure_data, /obj/machinery/newscaster/directional/north, @@ -27085,6 +27121,18 @@ "jGr" = ( /turf/closed/wall/r_wall, /area/station/tcommsat/server) +"jGu" = ( +/obj/structure/bed{ + dir = 4 + }, +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/item/clothing/glasses/blindfold, +/obj/item/clothing/mask/muzzle, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/security/execution/transfer) "jGv" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -27121,6 +27169,14 @@ }, /turf/open/floor/iron/white/smooth_large, /area/station/medical/treatment_center) +"jHd" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/machinery/shower/directional/north, +/obj/effect/turf_decal/trimline/blue/end{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "jHg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -27684,17 +27740,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/station/cargo/qm) -"jQd" = ( -/obj/structure/sink/kitchen/directional/south{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink" - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/commons/toilet/auxiliary) "jQr" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/cable, @@ -28086,6 +28131,13 @@ }, /turf/open/floor/wood, /area/station/service/cafeteria) +"jWS" = ( +/obj/machinery/shower/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/commons/toilet/auxiliary) "jXe" = ( /obj/structure/lattice, /obj/item/wirecutters, @@ -28139,17 +28191,6 @@ }, /turf/open/floor/iron, /area/station/security/prison/garden) -"jXZ" = ( -/obj/structure/bed, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/glasses/blindfold, -/obj/item/clothing/mask/muzzle, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/security/execution/transfer) "jYi" = ( /obj/structure/extinguisher_cabinet/directional/south, /obj/effect/turf_decal/tile/yellow{ @@ -28206,16 +28247,6 @@ }, /turf/open/floor/wood/parquet, /area/station/medical/psychology) -"jZu" = ( -/obj/structure/sink/directional/east, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, -/turf/open/floor/iron/white, -/area/station/science/xenobiology/hallway) "jZz" = ( /obj/machinery/atmospherics/pipe/smart/manifold/purple/visible, /turf/open/floor/iron, @@ -28295,17 +28326,6 @@ /obj/structure/sign/warning/vacuum/external, /turf/closed/wall, /area/station/cargo/miningoffice) -"kaB" = ( -/obj/machinery/shower/directional/west, -/obj/machinery/firealarm/directional/east, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 9 - }, -/turf/open/floor/iron/checker, -/area/station/science/research) "kaC" = ( /obj/machinery/light_switch/directional/east, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -28375,15 +28395,6 @@ dir = 1 }, /area/station/engineering/main) -"kcf" = ( -/obj/structure/cable, -/obj/structure/sink/kitchen/directional/west, -/obj/machinery/power/apc/auto_name/directional/north, -/mob/living/simple_animal/hostile/retaliate/goat{ - name = "Pete" - }, -/turf/open/floor/iron/kitchen_coldroom/freezerfloor, -/area/station/service/kitchen/coldroom) "kcg" = ( /obj/structure/chair/wood{ dir = 8 @@ -28911,11 +28922,6 @@ }, /turf/open/floor/iron/white, /area/station/science/ordnance/office) -"kmq" = ( -/obj/machinery/shower/directional/west, -/obj/effect/landmark/start/assistant, -/turf/open/floor/iron/freezer, -/area/station/commons/toilet/restrooms) "kms" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -29439,6 +29445,17 @@ /obj/structure/chair, /turf/open/floor/iron/grimy, /area/station/security/interrogation) +"kvH" = ( +/obj/machinery/shower/directional/west, +/obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 10 + }, +/turf/open/floor/iron/checker, +/area/station/science/research) "kvK" = ( /obj/machinery/meter, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -29674,14 +29691,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/maintenance/port/greater) -"kzN" = ( -/obj/structure/sink/kitchen/directional/south{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink" - }, -/obj/effect/spawner/random/trash/mess, -/turf/open/floor/iron/showroomfloor, -/area/station/maintenance/starboard/lesser) "kzQ" = ( /obj/effect/turf_decal/siding/purple, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -29758,20 +29767,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/genetics) -"kBG" = ( -/obj/structure/sink/directional/west, -/obj/effect/turf_decal/tile/yellow, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "kBQ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/electrolyzer, @@ -29804,18 +29799,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/main) -"kCA" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Bar - Backroom" - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/mirror/directional/north, -/obj/structure/sink/directional/south, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/wood, -/area/station/service/bar/backroom) "kCC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment, @@ -30763,6 +30746,14 @@ /obj/item/kirbyplants/photosynthetic, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai_upload) +"kUI" = ( +/obj/structure/sink/directional/east, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/station/service/hydroponics) "kUJ" = ( /obj/effect/turf_decal/box/white{ color = "#52B4E9" @@ -31609,6 +31600,12 @@ /obj/machinery/bluespace_vendor/directional/west, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +"ljb" = ( +/obj/machinery/firealarm/directional/west, +/obj/structure/sink/directional/east, +/obj/effect/turf_decal/tile/green/fourcorners, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "ljf" = ( /obj/structure/table, /obj/item/wirecutters, @@ -32507,6 +32504,18 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/command) +"lyV" = ( +/obj/machinery/shower/directional/south{ + name = "emergency shower" + }, +/obj/effect/turf_decal/trimline/blue/end, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/engineering/atmos) "lzJ" = ( /obj/structure/cable, /turf/open/floor/iron/solarpanel/airless, @@ -32703,12 +32712,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos/storage/gas) -"lEN" = ( -/obj/machinery/plate_press, -/obj/effect/turf_decal/bot, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/iron, -/area/station/security/prison/work) "lEP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -32720,6 +32723,11 @@ }, /turf/open/floor/iron/dark, /area/station/medical/break_room) +"lFe" = ( +/obj/item/clothing/suit/costume/snowman, +/obj/item/clothing/head/snowman, +/turf/open/floor/fake_snow, +/area/station/maintenance/port/aft) "lFq" = ( /obj/structure/sign/warning/biohazard, /turf/closed/wall/r_wall, @@ -32792,10 +32800,6 @@ }, /turf/open/floor/wood, /area/station/service/lawoffice) -"lHH" = ( -/obj/structure/sink/directional/west, -/turf/open/floor/iron/white, -/area/station/science/research) "lHK" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/west, @@ -33063,6 +33067,16 @@ }, /turf/open/floor/iron, /area/station/engineering/main) +"lME" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/sink/directional/east, +/obj/structure/sign/poster/official/cleanliness{ + pixel_y = -32 + }, +/obj/machinery/light/small/directional/south, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/service/hydroponics) "lMI" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -33221,6 +33235,16 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"lPf" = ( +/obj/structure/closet/radiation, +/obj/structure/sign/warning/radiation/rad_area/directional/north{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/engineering/gravity_generator) "lPi" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/duct, @@ -33331,6 +33355,16 @@ /obj/effect/spawner/random/trash/caution_sign, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +"lQL" = ( +/obj/structure/sink/directional/east, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/turf/open/floor/iron/white, +/area/station/science/xenobiology/hallway) "lQW" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -33575,6 +33609,11 @@ }, /turf/open/floor/iron, /area/station/commons/locker) +"lVU" = ( +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/shower/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) "lWa" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -34335,6 +34374,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/port) +"mmC" = ( +/obj/machinery/shower/directional/east, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) "mmF" = ( /obj/machinery/light/small/directional/east, /obj/item/solar_assembly, @@ -35367,21 +35411,6 @@ /obj/effect/spawner/random/maintenance/three, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) -"mEG" = ( -/obj/structure/sign/poster/official/cleanliness{ - pixel_x = 32 - }, -/obj/structure/sink/directional/south, -/obj/effect/turf_decal/bot, -/obj/item/clothing/suit/apron/chef{ - name = "Jim Norton's Quebecois Coffee apron" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/camera/directional/north{ - c_tag = "Jim Norton's Quebecois Coffee" - }, -/turf/open/floor/iron/dark, -/area/station/service/cafeteria) "mEL" = ( /obj/effect/spawner/random/structure/closet_maintenance, /turf/open/floor/plating, @@ -35556,25 +35585,6 @@ }, /turf/open/floor/iron, /area/station/engineering/break_room) -"mGZ" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/right/directional/south{ - dir = 8; - name = "First Aid Supplies"; - req_access = list("medical") - }, -/obj/item/clothing/glasses/blindfold{ - pixel_y = 3 - }, -/obj/item/clothing/glasses/blindfold, -/obj/item/clothing/ears/earmuffs{ - pixel_y = 3 - }, -/obj/item/clothing/ears/earmuffs, -/obj/item/clothing/glasses/eyepatch, -/obj/item/clothing/suit/straight_jacket, -/turf/open/floor/iron/dark, -/area/station/medical/office) "mHe" = ( /obj/item/stack/sheet/plasteel{ amount = 10; @@ -35875,12 +35885,6 @@ }, /turf/open/floor/iron, /area/station/command/teleporter) -"mMc" = ( -/obj/machinery/shower/directional/west, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/iron/freezer, -/area/station/security/prison/shower) "mMl" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -36297,12 +36301,6 @@ }, /turf/open/floor/engine, /area/station/engineering/atmospherics_engine) -"mUj" = ( -/obj/machinery/shower/directional/east, -/obj/machinery/light/small/directional/south, -/obj/effect/spawner/random/trash/mess, -/turf/open/floor/iron, -/area/station/commons/toilet/auxiliary) "mUr" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8; @@ -36376,6 +36374,18 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/fore) +"mVz" = ( +/obj/structure/sink/kitchen/directional/south{ + desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; + name = "old sink" + }, +/obj/effect/landmark/xeno_spawn, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/commons/toilet/auxiliary) "mVE" = ( /obj/structure/chair/office/light{ dir = 4 @@ -37474,6 +37484,17 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"noe" = ( +/obj/machinery/light_switch/directional/east, +/obj/machinery/shower/directional/west{ + name = "emergency shower" + }, +/obj/structure/sign/warning/secure_area/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/engineering/main) "noi" = ( /obj/machinery/pdapainter{ pixel_y = 2 @@ -38172,6 +38193,12 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"nzv" = ( +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/shower/directional/west, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) "nzP" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 10 @@ -38243,6 +38270,19 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/wood, /area/station/service/bar/backroom) +"nBi" = ( +/obj/structure/sink/directional/south, +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) "nBs" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, @@ -38303,6 +38343,14 @@ }, /turf/open/floor/wood, /area/station/commons/lounge) +"nCs" = ( +/obj/structure/bed, +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/item/clothing/glasses/blindfold, +/obj/item/clothing/mask/muzzle, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/security/holding_cell) "nCu" = ( /obj/structure/chair/office{ dir = 1 @@ -38428,16 +38476,6 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) -"nFS" = ( -/obj/machinery/shower/directional/east, -/obj/machinery/door/window/right/directional/east{ - base_state = "left"; - dir = 2; - icon_state = "left"; - name = "Shower" - }, -/turf/open/floor/iron/freezer, -/area/station/commons/fitness/recreation) "nGe" = ( /obj/structure/railing, /obj/machinery/light/small/red/directional/west, @@ -38590,10 +38628,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) -"nJP" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/closed/wall, -/area/station/engineering/atmos/pumproom) "nJW" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -38774,14 +38808,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/command) -"nNE" = ( -/obj/structure/closet/radiation, -/obj/structure/sign/warning/radiation/rad_area/directional/north, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/iron, -/area/station/engineering/gravity_generator) "nNH" = ( /obj/structure/chair/comfy/black{ dir = 4 @@ -39402,10 +39428,6 @@ }, /turf/open/floor/engine, /area/station/science/ordnance/burnchamber) -"nZU" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) "oae" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, @@ -39825,6 +39847,12 @@ }, /turf/open/floor/iron, /area/station/security/range) +"ohe" = ( +/obj/structure/sink/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "ohf" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/east, @@ -41041,6 +41069,19 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/security/brig) +"oCV" = ( +/obj/machinery/shower/directional/south{ + name = "emergency shower" + }, +/obj/effect/turf_decal/trimline/blue/end, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) "oCX" = ( /obj/structure/sign/warning/biohazard, /turf/closed/wall/r_wall, @@ -41571,17 +41612,6 @@ "oNs" = ( /turf/open/floor/engine, /area/station/engineering/supermatter) -"oNv" = ( -/obj/machinery/shower/directional/south{ - name = "emergency shower" - }, -/obj/effect/turf_decal/trimline/blue/end, -/obj/effect/turf_decal/bot{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/atmos) "oND" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -42253,14 +42283,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) -"pbp" = ( -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/structure/cable, -/obj/structure/sink/directional/east, -/obj/machinery/airalarm/directional/west, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/turf/open/floor/iron/white, -/area/station/medical/cryo) "pbt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -42783,14 +42805,6 @@ }, /turf/open/floor/grass, /area/station/service/hydroponics/garden) -"pkG" = ( -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/machinery/shower/directional/north, -/obj/effect/turf_decal/trimline/blue/end{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) "pkH" = ( /obj/structure/rack, /obj/item/restraints/handcuffs, @@ -43155,6 +43169,11 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +"prN" = ( +/obj/machinery/shower/directional/west, +/obj/effect/landmark/start/assistant, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) "prT" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -43954,13 +43973,6 @@ }, /turf/open/floor/iron/freezer, /area/station/commons/toilet/restrooms) -"pGJ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/sink/directional/west, -/obj/item/reagent_containers/glass/bucket, -/obj/item/mop, -/turf/open/floor/iron, -/area/station/service/janitor) "pHb" = ( /turf/open/floor/iron, /area/station/security/brig) @@ -44318,18 +44330,6 @@ /obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) -"pNC" = ( -/obj/structure/bed{ - dir = 4 - }, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/glasses/blindfold, -/obj/item/clothing/mask/muzzle, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/station/security/execution/transfer) "pNR" = ( /obj/machinery/airalarm/directional/east, /turf/open/floor/iron/dark, @@ -45184,6 +45184,12 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/central) +"qeP" = ( +/obj/structure/sink/directional/west, +/obj/structure/mirror/directional/east, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) "qeQ" = ( /obj/machinery/turretid{ icon_state = "control_stun"; @@ -45392,6 +45398,13 @@ /obj/effect/mapping_helpers/airlock/access/any/medical/pharmacy, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +"qhH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sink/directional/west, +/obj/item/reagent_containers/glass/bucket, +/obj/item/mop, +/turf/open/floor/iron, +/area/station/service/janitor) "qhI" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -46169,14 +46182,6 @@ /obj/effect/spawner/random/structure/closet_private, /turf/open/floor/carpet, /area/station/commons/dorms) -"qws" = ( -/obj/structure/sink/directional/west, -/obj/machinery/light_switch/directional/east, -/obj/effect/turf_decal/tile/green/anticorner/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/medical/virology) "qwG" = ( /obj/structure/closet/firecloset, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -46601,6 +46606,20 @@ /obj/structure/chair/pew/right, /turf/open/floor/iron/chapel, /area/station/service/chapel) +"qEe" = ( +/obj/machinery/shower/directional/east, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/button/door/directional/north{ + id = "AuxShower"; + name = "Lock Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/effect/spawner/random/trash/soap{ + spawn_scatter_radius = 1 + }, +/turf/open/floor/iron, +/area/station/commons/toilet/auxiliary) "qEf" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -46634,15 +46653,6 @@ /obj/effect/spawner/random/entertainment/deck, /turf/open/floor/iron, /area/station/security/prison) -"qEJ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate/freezer, -/obj/structure/sink/kitchen/directional/south{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink" - }, -/turf/open/floor/iron, -/area/station/cargo/warehouse) "qEK" = ( /obj/machinery/door/airlock/maintenance{ name = "Medbay Maintenance" @@ -47173,16 +47183,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet, /area/station/command/bridge) -"qNX" = ( -/obj/structure/rack, -/obj/item/clothing/gloves/color/fyellow, +"qOp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/freezer, /obj/structure/sink/kitchen/directional/south{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; name = "old sink" }, -/obj/effect/spawner/random/maintenance/two, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) +/turf/open/floor/iron, +/area/station/cargo/warehouse) "qOs" = ( /obj/machinery/door/airlock/maintenance{ name = "Genetics Maintenance" @@ -47795,14 +47804,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, /turf/open/floor/iron/dark, /area/station/tcommsat/server) -"qYp" = ( -/obj/structure/sink/directional/east, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/station/service/hydroponics) "qYt" = ( /obj/structure/table/reinforced, /obj/item/paper_bin{ @@ -48174,11 +48175,6 @@ /obj/effect/spawner/random/decoration/showcase, /turf/open/floor/carpet, /area/station/command/corporate_showroom) -"rgE" = ( -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/shower/directional/west, -/turf/open/floor/iron/white, -/area/station/medical/surgery/theatre) "rgN" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -48237,13 +48233,6 @@ /obj/machinery/door/firedoor/heavy, /turf/open/floor/iron/dark, /area/station/engineering/atmos) -"rhI" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) "rhK" = ( /obj/machinery/teleport/hub, /turf/open/floor/plating, @@ -48284,6 +48273,13 @@ /obj/machinery/computer/security/telescreen/entertainment/directional/north, /turf/open/floor/wood, /area/station/commons/lounge) +"riM" = ( +/obj/machinery/shower/directional/east, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) "riW" = ( /obj/structure/plasticflaps/opaque, /obj/machinery/door/window/left/directional/north{ @@ -49243,17 +49239,6 @@ /obj/item/stock_parts/cell/high, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) -"ryq" = ( -/obj/machinery/shower/directional/west, -/obj/item/radio/intercom/directional/east, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 10 - }, -/turf/open/floor/iron/checker, -/area/station/science/research) "ryv" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/random/medical/patient_stretcher, @@ -51066,26 +51051,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"sbj" = ( -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/stack/pipe_cleaner_coil/random, -/obj/item/stack/pipe_cleaner_coil/random, -/obj/item/stack/pipe_cleaner_coil/random, -/obj/item/stack/pipe_cleaner_coil/random, -/obj/item/stack/pipe_cleaner_coil/random, -/obj/item/canvas, -/obj/item/canvas, -/obj/item/canvas, -/obj/item/canvas, -/obj/item/canvas, -/obj/item/canvas, -/obj/item/chisel{ - pixel_y = 7 - }, -/obj/machinery/camera/directional/south, -/turf/open/floor/iron, -/area/station/commons/storage/art) "sbl" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/iron/dark, @@ -51635,12 +51600,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/security/prison/safe) -"slL" = ( -/obj/structure/sink/directional/west, -/obj/structure/mirror/directional/east, -/obj/effect/landmark/start/hangover, -/turf/open/floor/iron/freezer, -/area/station/commons/toilet/restrooms) "smg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, /obj/effect/mapping_helpers/airlock/locked, @@ -51729,6 +51688,17 @@ }, /turf/open/floor/iron/white, /area/station/science/ordnance/testlab) +"snH" = ( +/obj/machinery/shower/directional/south{ + name = "emergency shower" + }, +/obj/effect/turf_decal/trimline/blue/end, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/atmos) "snS" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -52261,12 +52231,6 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron/white, /area/station/science/lab) -"sxJ" = ( -/obj/machinery/firealarm/directional/west, -/obj/structure/sink/directional/east, -/obj/effect/turf_decal/tile/green/fourcorners, -/turf/open/floor/iron, -/area/station/hallway/primary/central) "sxR" = ( /obj/structure/table/wood, /obj/machinery/computer/security/wooden_tv, @@ -52940,12 +52904,47 @@ /obj/machinery/smartfridge/chemistry/preloaded, /turf/closed/wall, /area/station/medical/pharmacy) +"sKw" = ( +/obj/structure/table, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/item/pen/red{ + pixel_x = 8; + pixel_y = 8 + }, +/obj/item/pen/fountain{ + pixel_x = 6; + pixel_y = 0 + }, +/obj/item/pen/blue{ + pixel_x = -5; + pixel_y = -3 + }, +/obj/item/storage/medkit/regular{ + pixel_x = -9; + pixel_y = 10 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) "sKy" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/storage/tools) +"sKF" = ( +/obj/structure/sink/kitchen/directional/west, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) "sKJ" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -53287,17 +53286,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/science/lab) -"sQX" = ( -/obj/machinery/shower/directional/east, -/obj/structure/extinguisher_cabinet/directional/west, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/main) "sQY" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -53321,31 +53309,6 @@ "sRm" = ( /turf/open/floor/iron/white, /area/station/medical/storage) -"sRD" = ( -/obj/structure/table, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 - }, -/obj/item/pen/red{ - pixel_x = 8; - pixel_y = 8 - }, -/obj/item/pen/fountain{ - pixel_x = 6 - }, -/obj/item/pen/blue{ - pixel_x = -5; - pixel_y = -3 - }, -/obj/item/storage/medkit/regular{ - pixel_x = -9; - pixel_y = 10 - }, -/turf/open/floor/iron, -/area/station/cargo/storage) "sRJ" = ( /obj/structure/extinguisher_cabinet/directional/east, /obj/item/kirbyplants{ @@ -53596,11 +53559,6 @@ /obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"sUN" = ( -/obj/structure/sink/directional/east, -/obj/effect/spawner/random/trash/mess, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) "sUO" = ( /obj/machinery/firealarm/directional/west, /obj/machinery/camera/directional/west{ @@ -53842,6 +53800,19 @@ /obj/effect/landmark/start/chief_medical_officer, /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) +"sYb" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/meter, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/atmos/pumproom) "sYf" = ( /obj/structure/chair/office{ dir = 4 @@ -54214,11 +54185,6 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai) -"tfA" = ( -/obj/structure/sink/directional/west, -/obj/structure/mirror/directional/east, -/turf/open/floor/iron/freezer, -/area/station/commons/toilet/restrooms) "tfD" = ( /obj/structure/table/wood/poker, /obj/effect/decal/cleanable/dirt, @@ -54517,6 +54483,14 @@ /obj/item/radio/intercom/prison/directional/north, /turf/open/floor/iron, /area/station/security/prison) +"tkX" = ( +/obj/structure/sink/directional/east, +/obj/machinery/light_switch/directional/west, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) "tlh" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -55814,6 +55788,17 @@ /obj/effect/turf_decal/trimline/red/filled/corner, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) +"tJH" = ( +/obj/machinery/shower/directional/west, +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 9 + }, +/turf/open/floor/iron/checker, +/area/station/science/research) "tJL" = ( /obj/structure/table, /obj/item/folder/red{ @@ -56060,6 +56045,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/warden) +"tNt" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/structure/sink/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) "tNw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -56116,6 +56108,14 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/maintenance/solars/port/fore) +"tOx" = ( +/obj/structure/sink/directional/west, +/obj/machinery/light_switch/directional/east, +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) "tOK" = ( /obj/structure/rack, /obj/item/cane, @@ -56206,27 +56206,6 @@ /obj/item/clothing/mask/surgical, /turf/open/floor/iron/showroomfloor, /area/station/maintenance/starboard/lesser) -"tPV" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable, -/obj/structure/sink/directional/west, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) -"tPW" = ( -/obj/structure/sink/kitchen/directional/south{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink" - }, -/obj/effect/landmark/xeno_spawn, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating, -/area/station/commons/toilet/auxiliary) "tQG" = ( /obj/structure/cable, /obj/machinery/door/airlock/virology/glass{ @@ -56243,6 +56222,20 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port) +"tRk" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Gravity Generator Foyer" + }, +/obj/structure/closet/radiation, +/obj/structure/sign/warning/radiation/rad_area/directional/north{ + dir = 1 + }, +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/engineering/gravity_generator) "tRm" = ( /obj/structure/window/reinforced{ dir = 4 @@ -56319,6 +56312,11 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +"tTd" = ( +/obj/structure/mirror/directional/west, +/obj/machinery/shower/directional/east, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) "tTg" = ( /obj/machinery/portable_atmospherics/pump, /obj/structure/window/reinforced{ @@ -56759,6 +56757,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) +"tZQ" = ( +/obj/structure/sink/kitchen/directional/east{ + desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; + name = "old sink" + }, +/obj/structure/mirror/directional/west, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) "tZS" = ( /obj/structure/flora/bush/jungle/b/style_random, /obj/structure/flora/bush/flowers_pp/style_random, @@ -57163,15 +57169,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"uhb" = ( -/obj/effect/landmark/xeno_spawn, -/obj/machinery/shower/directional/south, -/obj/structure/curtain, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/command/heads_quarters/captain/private) "uhq" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -57535,13 +57532,6 @@ }, /turf/open/floor/wood, /area/station/commons/vacant_room/office) -"unW" = ( -/obj/machinery/shower/directional/west, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/commons/toilet/auxiliary) "uod" = ( /obj/effect/turf_decal/siding/white{ dir = 8 @@ -58147,18 +58137,6 @@ /obj/machinery/meter, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) -"uxx" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Gravity Generator Foyer" - }, -/obj/structure/closet/radiation, -/obj/structure/sign/warning/radiation/rad_area/directional/north, -/obj/machinery/airalarm/directional/east, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/iron, -/area/station/engineering/gravity_generator) "uxI" = ( /obj/machinery/vending/medical, /obj/machinery/light/directional/south, @@ -59185,6 +59163,11 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"uQB" = ( +/obj/machinery/shower/directional/west, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) "uQF" = ( /obj/structure/lattice, /obj/item/stack/rods, @@ -59537,6 +59520,14 @@ /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/grass, /area/station/medical/virology) +"uYh" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) "uYi" = ( /turf/open/floor/plating/airless, /area/station/solars/starboard/aft) @@ -59587,6 +59578,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"uYZ" = ( +/obj/structure/chair/comfy{ + dir = 1 + }, +/obj/item/clothing/suit/costume/nerdshirt, +/obj/item/clothing/head/fedora, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "uZa" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -59716,6 +59715,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) +"vch" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) "vcu" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -59736,6 +59744,10 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/checkpoint/science) +"vcL" = ( +/obj/machinery/shower/directional/west, +/turf/open/floor/iron/freezer, +/area/station/security/prison/shower) "vcS" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -62038,6 +62050,13 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"vRE" = ( +/obj/machinery/light/small/broken/directional/west, +/obj/structure/table, +/obj/item/clothing/suit/costume/cyborg_suit, +/obj/item/clothing/mask/gas/cyborg, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "vRN" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -62841,13 +62860,6 @@ }, /turf/open/floor/carpet, /area/station/commons/vacant_room/office) -"wfz" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/obj/structure/sink/directional/east, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) "wfC" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -63180,11 +63192,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white/smooth_large, /area/station/medical/medbay/central) -"wlY" = ( -/obj/structure/mirror/directional/east, -/obj/machinery/shower/directional/west, -/turf/open/floor/iron/freezer, -/area/station/commons/toilet/restrooms) "wmc" = ( /obj/structure/closet/secure_closet/evidence, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -63272,14 +63279,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"wos" = ( -/obj/structure/chair/comfy{ - dir = 1 - }, -/obj/item/clothing/suit/nerdshirt, -/obj/item/clothing/head/fedora, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) "woG" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -63590,6 +63589,10 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/brig) +"wta" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) "wto" = ( /obj/effect/turf_decal/tile/purple/fourcorners, /obj/machinery/door/firedoor, @@ -63632,6 +63635,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/security/prison) +"wtC" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Bar - Backroom" + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/mirror/directional/north, +/obj/structure/sink/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/service/bar/backroom) "wtP" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -63688,11 +63703,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/satellite) -"wuW" = ( -/obj/item/clothing/suit/snowman, -/obj/item/clothing/head/snowman, -/turf/open/floor/fake_snow, -/area/station/maintenance/port/aft) "wvd" = ( /obj/machinery/door/airlock{ id_tag = "Cabin5"; @@ -64282,14 +64292,6 @@ /obj/machinery/newscaster/directional/east, /turf/open/floor/iron/white/corner, /area/station/hallway/secondary/entry) -"wHM" = ( -/obj/structure/sink/kitchen/directional/south, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/security/prison/mess) "wHW" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -64965,13 +64967,6 @@ /obj/effect/spawner/random/engineering/atmospherics_portable, /turf/open/floor/plating, /area/station/maintenance/port/greater) -"wUB" = ( -/obj/structure/sink/directional/east, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/service/hydroponics/garden) "wUC" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -65243,6 +65238,11 @@ /obj/structure/table, /turf/open/floor/plating/airless, /area/station/engineering/atmos) +"wYH" = ( +/obj/structure/sink/directional/west, +/obj/structure/mirror/directional/east, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) "wZe" = ( /obj/machinery/door/airlock/public/glass{ name = "Chapel Office" @@ -65449,6 +65449,13 @@ "xdJ" = ( /turf/closed/wall, /area/station/medical/surgery/aft) +"xdL" = ( +/obj/machinery/shower/directional/east, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/freezer, +/area/station/security/prison/shower) "xdQ" = ( /obj/structure/sign/warning/hot_temp/directional/south, /turf/open/floor/plating, @@ -65494,13 +65501,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) -"xer" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, -/obj/structure/sink/directional/west, -/turf/open/floor/iron/white, -/area/station/medical/surgery/theatre) "xew" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -66408,6 +66408,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/grimy, /area/station/service/chapel/office) +"xvn" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/structure/sink/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "xvt" = ( /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -66506,6 +66513,10 @@ /obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) +"xxK" = ( +/obj/structure/sink/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "xxO" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -67109,6 +67120,21 @@ /obj/machinery/atmospherics/components/trinary/filter/flipped/critical, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"xHH" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/warning/radiation/rad_area/directional/north{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) "xIx" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -67243,14 +67269,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/miningoffice) -"xJZ" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) "xKk" = ( /obj/machinery/photocopier, /turf/open/floor/iron/white, @@ -68506,6 +68524,17 @@ /obj/effect/turf_decal/tile/bar, /turf/open/floor/iron, /area/station/construction/storage_wing) +"ygT" = ( +/obj/machinery/shower/directional/east, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/main) "yhm" = ( /obj/machinery/airalarm/directional/west, /obj/structure/disposaloutlet{ @@ -68633,6 +68662,14 @@ }, /turf/open/floor/plating, /area/station/hallway/secondary/entry) +"ykq" = ( +/obj/structure/sink/kitchen/directional/south, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) "ykI" = ( /obj/effect/landmark/start/hangover, /turf/open/floor/engine{ @@ -68698,41 +68735,6 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/wood, /area/station/service/lawoffice) -"ylW" = ( -/obj/structure/closet/crate/secure/weapon{ - desc = "A secure clothing crate."; - name = "formal uniform crate"; - req_access = list("armory") - }, -/obj/item/clothing/under/rank/security/officer/formal, -/obj/item/clothing/under/rank/security/officer/formal, -/obj/item/clothing/under/rank/security/officer/formal, -/obj/item/clothing/under/rank/security/officer/formal, -/obj/item/clothing/under/rank/security/officer/formal, -/obj/item/clothing/under/rank/security/officer/formal, -/obj/item/clothing/suit/security/officer, -/obj/item/clothing/suit/security/officer, -/obj/item/clothing/suit/security/officer, -/obj/item/clothing/suit/security/officer, -/obj/item/clothing/suit/security/officer, -/obj/item/clothing/suit/security/officer, -/obj/item/clothing/under/rank/security/warden/formal, -/obj/item/clothing/suit/security/warden, -/obj/item/clothing/under/rank/security/head_of_security/formal, -/obj/item/clothing/suit/security/hos, -/obj/item/clothing/head/beret/sec/navyofficer, -/obj/item/clothing/head/beret/sec/navyofficer, -/obj/item/clothing/head/beret/sec/navyofficer, -/obj/item/clothing/head/beret/sec/navyofficer, -/obj/item/clothing/head/beret/sec/navyofficer, -/obj/item/clothing/head/beret/sec/navyofficer, -/obj/item/clothing/head/beret/sec/navywarden, -/obj/item/clothing/head/hos/beret/navyhos, -/obj/structure/extinguisher_cabinet/directional/east, -/obj/structure/cable, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/turf/open/floor/iron/dark, -/area/station/security/lockers) "ylZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -82012,7 +82014,7 @@ mPO sZK heE kzZ -bfV +tZQ fBX nBy oiQ @@ -83822,7 +83824,7 @@ jUb jUb jUb eCK -wos +uYZ jUb nCw jUb @@ -84092,7 +84094,7 @@ uGq wIW kHk gqI -qws +tOx hGi cSm tRI @@ -85090,7 +85092,7 @@ uOH jUb xIK dsE -sUN +ddH ciq pqz iuB @@ -85335,8 +85337,8 @@ dPQ rtG vJB fjD -erL -mUj +qEe +gjT pOa mrN gXe @@ -85593,7 +85595,7 @@ fjD cHj cHj vsr -unW +jWS pOa vZE ivx @@ -85628,7 +85630,7 @@ shK jUb tzt xjH -bfJ +enE sOM lyf xjH @@ -85844,7 +85846,7 @@ pTf iOc qwG fjD -jQd +cYf vCu cwc kXa @@ -85883,7 +85885,7 @@ syh gsn shK jUb -wuW +lFe xjH rUU eSR @@ -86101,7 +86103,7 @@ xOw iOc rcW fjD -tPW +mVz haE vsr fRG @@ -86142,7 +86144,7 @@ shK jUb fRg xjH -gBJ +bSK wqJ prx xjH @@ -87115,7 +87117,7 @@ pvP dka bgx mmR -sRD +sKw bJR iGD kga @@ -87178,7 +87180,7 @@ fqR ajM fje tSw -bKg +aBk tSw wxF tSw @@ -88096,7 +88098,7 @@ aaa aaa iOr sQq -iLR +jja viQ dTQ rOP @@ -88183,10 +88185,10 @@ jUb kpB dIK jUb -bhO -rgE +nzv +lVU ixv -xer +tNt wRZ kOp air @@ -88700,7 +88702,7 @@ vXc gZD tuC rDJ -wfz +xvn fTE hBY vVI @@ -88860,7 +88862,7 @@ hkV tKa tGX aXa -wHM +ykq oZL hmy oZL @@ -88904,7 +88906,7 @@ jXu twr gkS jXu -qEJ +qOp nvg vzR dKY @@ -89205,7 +89207,7 @@ hdx cIW pOa jwp -pbp +bsM uIM ahg sSN @@ -89732,7 +89734,7 @@ buN lTR wUQ jGG -pkG +jHd kFu tnN eih @@ -90660,15 +90662,15 @@ uMb qig ocG ihb -gzw +jzM pJu -fzO +xdL ihb nyf uZa -lEN +sWF wZz -hnt +iki qOT swR tGX @@ -91174,9 +91176,9 @@ tlx rGb jFK ihb -mMc -gOi -bba +fso +clc +vcL ihb otM koc @@ -91268,7 +91270,7 @@ irL xFp sgS ccV -bYw +ohe eMU ttE aPm @@ -91734,7 +91736,7 @@ bVk bNP orC guX -mEG +jxN fHk tUJ jWR @@ -91801,7 +91803,7 @@ vRz xwD dVt iHn -iSy +xxK wUc nmQ nmQ @@ -91947,7 +91949,7 @@ aaa aaa ehB oSf -iDF +cEK ncq bMM mRq @@ -92034,7 +92036,7 @@ xFp aww rlw oUS -mGZ +adH quH bMY dAx @@ -92464,7 +92466,7 @@ tdW tdW tdW tdW -jfz +eiZ bhu uyi tdW @@ -92726,7 +92728,7 @@ eLd qNj tdW cTl -pNC +jGu mWZ gkn rUG @@ -93240,7 +93242,7 @@ xnS gYi jTZ jRh -jXZ +ivd ouj gkn yey @@ -93589,7 +93591,7 @@ xga pKP pKP bqX -eZA +oCV iqz tqd iIW @@ -93835,7 +93837,7 @@ mui xEf lWG gsW -kBG +gSw mHx gVj oBq @@ -94351,7 +94353,7 @@ lrR qwI xJI tIx -izU +riM hCt jVt rYN @@ -94521,7 +94523,7 @@ sIe sIe sIe sIe -abl +dkz gya jTZ uMY @@ -97100,7 +97102,7 @@ aaa rrt aaa ahj -ylW +aJf sCi kiW rfb @@ -98430,7 +98432,7 @@ syo syo syo syo -uhb +giZ syo syo syo @@ -98665,7 +98667,7 @@ mrL gHo rFU ieV -jlG +nCs wJL kdO ruc @@ -98687,7 +98689,7 @@ onp vNG tIR tyY -iOM +cyA tyY aPs cUX @@ -98976,9 +98978,9 @@ ibw dSD gFQ aDm -ryq -lHH -kaB +kvH +bdS +tJH yaj xKK gVO @@ -101026,7 +101028,7 @@ cfe ddO sLE cEv -sxJ +ljb ofZ tUn hKV @@ -102053,7 +102055,7 @@ ebC iQI tNL elM -qYp +kUI ijv hRQ tUn @@ -102265,8 +102267,8 @@ ilh dKO cBw uWg -tfA -slL +wYH +qeP pGH bvb rNJ @@ -102557,7 +102559,7 @@ nxA hyX wYn eQE -kCA +wtC rOM eQE qrQ @@ -102772,9 +102774,9 @@ cur rXX dNw ilh -iYL -gJE -iYL +mmC +tTd +mmC dIO jlY tem @@ -103269,8 +103271,8 @@ aaa aaa aaa nvn -nFS -cel +gjd +ejc ilh gfe aDR @@ -103286,9 +103288,9 @@ mVp cur lhD ilh -kmq -wlY -eBh +prN +fVH +uQB dIO eYz kdX @@ -104396,7 +104398,7 @@ bLd bLd bLd bLd -ebi +vRE oWk pIF qBF @@ -104601,7 +104603,7 @@ fRS tUv rAg bEU -sbj +ice khA gXj btI @@ -104838,11 +104840,11 @@ pFd nwa lqQ nYO -eQG +tkX hvO ued hvO -wUB +evh rkA qXB psZ @@ -104870,7 +104872,7 @@ xLR sej hED hAc -gdh +sKF iIT uIs mAV @@ -104878,7 +104880,7 @@ vqp wen bMa kCZ -jzS +nBi bNl pEB kCD @@ -105169,7 +105171,7 @@ eWy bLd lpD wYl -dkH +fID fPD eQY hpv @@ -105899,7 +105901,7 @@ inI iHh aNN huG -kcf +agW oXd apt huG @@ -105907,7 +105909,7 @@ jWj wYB oXM siz -ayi +lME unL laf aJn @@ -106687,7 +106689,7 @@ gXd szJ ghN tUn -kzN +iIz kmN hep kmN @@ -107198,7 +107200,7 @@ gub unL gjF euc -pGJ +qhH vMc tUn tUn @@ -109447,7 +109449,7 @@ hMQ qXB qXB kpI -qNX +ecV qcP wrn qXB @@ -109474,7 +109476,7 @@ pTw rrh cnK kZs -sQX +ygT inP dOQ cnK @@ -109788,7 +109790,7 @@ lKu aaa aaa wmL -jZu +lQL qkq ooz wmL @@ -109965,7 +109967,7 @@ wrn tjR lOZ qXB -cDX +xHH tCS qeV tCS @@ -109988,7 +109990,7 @@ haR gZG cnK doD -eYI +fff siA dOQ cnK @@ -110045,7 +110047,7 @@ aaa aaa aaa wmL -igl +iic uNO hUd uWk @@ -110478,7 +110480,7 @@ tCS tCS tCS tCS -nNE +lPf pql nqL gXP @@ -110787,7 +110789,7 @@ dKE ilc dKE mHT -elU +iYR nau vuU jvj @@ -110992,10 +110994,10 @@ gTh myY dRx nqL -uxx +tRk xtp nqL -hvl +noe iSI qaA fqV @@ -111507,7 +111509,7 @@ vCr eOJ oVd tCS -esc +aCO tCS eVi bwE @@ -112829,12 +112831,12 @@ unq bDq rRR laE -jhJ -iZV -nZU -xJZ -rhI -nJP +sYb +vch +wta +uYh +hdX +bsI kxH qhc qhc @@ -113136,7 +113138,7 @@ pwZ dxc fdZ fdZ -eMx +dpG xiL gTS hbK @@ -113392,7 +113394,7 @@ jzw thT jzw sie -tPV +gPW qiD nYL ddK @@ -117210,7 +117212,7 @@ mUQ mUQ tIk vhv -hlB +lyV fhG jvj nzP @@ -117467,7 +117469,7 @@ eKv vmI qGn vhv -oNv +snH ruP ioc mei diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index e26ae6968f0..50d86bdb2a0 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -547,12 +547,10 @@ /turf/open/floor/iron/dark, /area/centcom/central_command_areas/armory) "bI" = ( -/obj/machinery/shower/directional/south, -/obj/item/soap/syndie, -/obj/structure/curtain, -/obj/machinery/door/window/survival_pod, -/turf/open/floor/iron/showroomfloor, -/area/centcom/central_command_areas/holding) +/obj/machinery/shower/directional/east, +/obj/effect/turf_decal/stripes/box, +/turf/open/floor/mineral/titanium/tiled, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) "bJ" = ( /obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -692,11 +690,6 @@ /obj/item/soap/syndie, /turf/open/floor/carpet/black, /area/centcom/central_command_areas/holding) -"cd" = ( -/obj/structure/sink/directional/east, -/obj/structure/mirror/directional/west, -/turf/open/floor/iron/white, -/area/centcom/tdome/observation) "cf" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -786,10 +779,6 @@ }, /turf/open/floor/iron, /area/centcom/tdome/observation) -"cr" = ( -/obj/structure/sink/kitchen/directional/west, -/turf/open/floor/iron/cafeteria, -/area/centcom/central_command_areas/holding) "ct" = ( /obj/machinery/door/airlock/centcom{ name = "CentCom Security" @@ -913,6 +902,12 @@ dir = 1 }, /area/centcom/central_command_areas/holding) +"cF" = ( +/obj/structure/sink/directional/west, +/obj/structure/mirror/directional/east, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/showroomfloor, +/area/centcom/central_command_areas/holding) "cG" = ( /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/dark/textured_large, @@ -1173,10 +1168,6 @@ /obj/structure/flora/bush/flowers_yw/style_random, /turf/open/floor/grass, /area/centcom/central_command_areas/holding) -"dw" = ( -/obj/machinery/shower/directional/west, -/turf/open/floor/iron/white, -/area/centcom/tdome/observation) "dx" = ( /obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -1477,15 +1468,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/control) -"eo" = ( -/obj/structure/toilet/greyscale{ - dir = 4 - }, -/obj/structure/sink/directional/west, -/obj/structure/mirror/directional/east, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron/showroomfloor, -/area/centcom/central_command_areas/holding) "ep" = ( /obj/effect/turf_decal/tile/yellow/half{ dir = 4 @@ -1857,16 +1839,17 @@ /obj/effect/turf_decal/siding/wood/corner, /turf/open/floor/wood/tile, /area/centcom/central_command_areas/holding) -"fp" = ( -/obj/structure/sink/directional/west, -/obj/structure/mirror/directional/east, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/showroomfloor, -/area/centcom/central_command_areas/holding) "fq" = ( /obj/machinery/duct, /turf/open/floor/carpet/black, /area/centcom/central_command_areas/holding) +"fr" = ( +/obj/structure/mirror/magic{ + pixel_y = 28 + }, +/obj/structure/sink/directional/south, +/turf/open/floor/iron/white, +/area/centcom/wizard_station) "fs" = ( /obj/effect/turf_decal/tile/yellow/half, /obj/effect/turf_decal/tile/yellow/half{ @@ -2012,14 +1995,6 @@ "fO" = ( /turf/closed/wall/mineral/wood, /area/centcom/central_command_areas/holding) -"fP" = ( -/obj/structure/sink/directional/west, -/obj/structure/mirror/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 9 - }, -/turf/open/floor/iron/white, -/area/centcom/central_command_areas/admin) "fQ" = ( /obj/effect/turf_decal/siding/thinplating_new/dark, /turf/open/floor/mineral/plastitanium, @@ -2229,10 +2204,9 @@ /turf/open/floor/iron, /area/centcom/central_command_areas/armory) "gy" = ( -/obj/machinery/shower/directional/east, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, +/obj/structure/sink/directional/west, +/obj/structure/mirror/directional/east, +/obj/effect/turf_decal/tile/green, /turf/open/floor/iron/white, /area/centcom/tdome/observation) "gz" = ( @@ -3792,6 +3766,19 @@ icon_state = "alien17" }, /area/centcom/abductor_ship) +"kO" = ( +/obj/machinery/shower/directional/east, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) "kP" = ( /turf/closed/indestructible/abductor{ icon_state = "alien18" @@ -4266,6 +4253,22 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"mf" = ( +/obj/effect/turf_decal/tile/dark/fourcorners, +/obj/effect/turf_decal/siding/wood, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/clothing/suit/costume/hawaiian{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/clothing/suit/costume/hawaiian, +/obj/item/clothing/suit/costume/hawaiian{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/clothing/suit/costume/hawaiian, +/turf/open/floor/iron/sepia, +/area/centcom/central_command_areas/holding) "mg" = ( /obj/structure/sign/poster/contraband/gorlex_recruitment{ pixel_x = -32 @@ -4591,11 +4594,6 @@ dir = 4 }, /area/centcom/syndicate_mothership/expansion_bioterrorism) -"mV" = ( -/obj/machinery/shower/directional/south, -/obj/machinery/light/floor, -/turf/open/floor/iron/freezer, -/area/centcom/syndicate_mothership/control) "mW" = ( /obj/structure/reagent_dispensers/wall/peppertank/directional/west, /obj/effect/turf_decal/tile/red{ @@ -4832,11 +4830,6 @@ /obj/structure/chair/office, /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/control) -"nP" = ( -/obj/structure/sink/kitchen/directional/west, -/obj/item/reagent_containers/glass/bucket, -/turf/open/floor/catwalk_floor/iron_smooth, -/area/centcom/syndicate_mothership/control) "nQ" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -5039,11 +5032,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin) -"op" = ( -/obj/structure/sink/directional/west, -/obj/structure/mirror/directional/east, -/turf/open/floor/iron/white, -/area/centcom/tdome/observation) "oq" = ( /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 1 @@ -5124,6 +5112,17 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/fore) +"oz" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 + }, +/obj/structure/sink/directional/south, +/obj/item/shovel/spade{ + pixel_x = -4 + }, +/obj/item/reagent_containers/glass/bucket, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bioterrorism) "oA" = ( /obj/structure/closet/crate/bin, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -5136,6 +5135,17 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin) +"oC" = ( +/obj/machinery/shower/directional/west, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) "oD" = ( /obj/item/kirbyplants{ icon_state = "plant-21" @@ -5175,10 +5185,6 @@ "oG" = ( /turf/closed/indestructible/iron, /area/centcom/syndicate_mothership/control) -"oH" = ( -/obj/machinery/shower/directional/east, -/turf/open/floor/iron/white, -/area/centcom/tdome/observation) "oI" = ( /obj/machinery/door/airlock/centcom{ name = "Thunderdome Administration" @@ -5423,11 +5429,13 @@ /obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron, /area/centcom/central_command_areas/prison) -"pp" = ( -/obj/effect/turf_decal/stripes/box, -/obj/machinery/shower/directional/south, -/turf/open/floor/mineral/plastitanium, -/area/centcom/syndicate_mothership/control) +"po" = ( +/obj/machinery/shower/directional/east, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) "pq" = ( /obj/structure/fence/door, /turf/open/misc/asteroid/snow/airless, @@ -5572,6 +5580,27 @@ /obj/structure/flora/bush/pale/style_random, /turf/open/misc/asteroid, /area/centcom/tdome/observation) +"pP" = ( +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/item/clothing/under/rank/civilian/curator/treasure_hunter, +/obj/item/clothing/under/dress/skirt, +/obj/item/clothing/under/shorts/black, +/obj/item/clothing/under/pants/track, +/obj/item/clothing/accessory/armband/deputy, +/obj/item/clothing/accessory/waistcoat, +/obj/item/clothing/shoes/jackboots, +/obj/item/clothing/shoes/laceup, +/obj/item/clothing/neck/stripedredscarf, +/obj/item/clothing/neck/tie/red, +/obj/item/clothing/head/helmet/space/beret, +/obj/item/clothing/suit/jacket/curator, +/obj/item/clothing/suit/space/officer, +/obj/item/clothing/gloves/fingerless, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/glasses/eyepatch, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/admin) "pQ" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -6248,17 +6277,6 @@ /obj/structure/sign/warning/secure_area, /turf/closed/indestructible/riveted, /area/centcom/central_command_areas/armory) -"rZ" = ( -/obj/machinery/shower/directional/west, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/centcom/tdome/observation) "sa" = ( /obj/structure/table/wood, /obj/item/lighter, @@ -6299,6 +6317,13 @@ }, /turf/open/floor/plating/abductor, /area/centcom/abductor_ship) +"sj" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/airlock/centcom{ + name = "Thunderdome Administration" + }, +/turf/open/floor/plating, +/area/centcom/tdome/administration) "sk" = ( /turf/open/floor/plating/icemoon, /area/centcom/syndicate_mothership/control) @@ -6401,6 +6426,12 @@ /obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/control) +"sB" = ( +/obj/structure/sink/kitchen/directional/west, +/obj/item/reagent_containers/glass/bucket, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/catwalk_floor, +/area/centcom/central_command_areas/holding) "sC" = ( /obj/effect/turf_decal/tile/green{ dir = 1 @@ -6616,6 +6647,13 @@ /obj/machinery/newscaster/directional/south, /turf/open/floor/iron, /area/centcom/central_command_areas/control) +"tj" = ( +/obj/machinery/shower/directional/west, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) "tk" = ( /obj/structure/window/reinforced/survival_pod{ name = "Tinted Window"; @@ -6916,6 +6954,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/control) +"ud" = ( +/obj/item/mop, +/obj/structure/sink/kitchen/directional/west, +/obj/item/reagent_containers/glass/bucket, +/turf/open/floor/catwalk_floor, +/area/centcom/central_command_areas/holding) "uf" = ( /turf/closed/indestructible/riveted, /area/centcom/tdome/administration) @@ -6971,22 +7015,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/courtroom) -"uq" = ( -/obj/effect/turf_decal/tile/dark/fourcorners, -/obj/effect/turf_decal/siding/wood, -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/clothing/suit/hawaiian{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/item/clothing/suit/hawaiian, -/obj/item/clothing/suit/hawaiian{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/clothing/suit/hawaiian, -/turf/open/floor/iron/sepia, -/area/centcom/central_command_areas/holding) "ur" = ( /obj/machinery/pdapainter, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -7146,13 +7174,6 @@ }, /turf/open/lava/plasma/ice_moon, /area/centcom/syndicate_mothership/control) -"uX" = ( -/obj/machinery/shower/directional/east, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/centcom/tdome/observation) "uY" = ( /obj/structure/flora/bush/lavendergrass/style_random, /obj/structure/flora/bush/sparsegrass/style_random, @@ -7268,19 +7289,6 @@ }, /turf/open/floor/carpet, /area/centcom/wizard_station) -"vo" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/shower/directional/south, -/obj/structure/curtain, -/obj/machinery/door/window/brigdoor/left/directional/south{ - name = "Shower" - }, -/obj/item/soap/deluxe, -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/iron/white, -/area/centcom/central_command_areas/admin) "vp" = ( /obj/machinery/light/directional/south, /turf/open/floor/carpet/black, @@ -7316,6 +7324,11 @@ /obj/effect/mapping_helpers/airlock/access/all/admin/captain, /turf/open/floor/iron, /area/centcom/central_command_areas/courtroom) +"vw" = ( +/obj/structure/sink/directional/west, +/obj/structure/mirror/directional/east, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) "vz" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -7403,6 +7416,13 @@ }, /turf/open/floor/mineral/titanium, /area/centcom/syndicate_mothership/control) +"vK" = ( +/obj/machinery/shower/directional/east, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) "vL" = ( /obj/machinery/light/floor, /turf/open/floor/iron/dark/textured_half{ @@ -7601,6 +7621,10 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/holding) +"wn" = ( +/obj/machinery/shower/directional/east, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) "wo" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 4 @@ -7821,19 +7845,6 @@ }, /turf/open/floor/carpet, /area/centcom/wizard_station) -"wR" = ( -/obj/machinery/shower/directional/east, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/centcom/tdome/observation) "wT" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -7868,12 +7879,6 @@ /obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) -"wX" = ( -/obj/structure/sink/directional/east, -/obj/structure/mirror/directional/west, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/showroomfloor, -/area/centcom/central_command_areas/holding) "wZ" = ( /obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/red, @@ -8110,6 +8115,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, /turf/closed/indestructible/syndicate, /area/centcom/syndicate_mothership/control) +"xM" = ( +/obj/machinery/shower/directional/west, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) "xN" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron, @@ -8277,6 +8293,13 @@ /obj/effect/mapping_helpers/airlock/access/all/admin/general, /turf/open/floor/iron, /area/centcom/central_command_areas/control) +"yl" = ( +/obj/machinery/shower/directional/south, +/obj/item/soap/syndie, +/obj/structure/curtain, +/obj/machinery/door/window/survival_pod, +/turf/open/floor/iron/showroomfloor, +/area/centcom/central_command_areas/holding) "yn" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/warning/vacuum, @@ -8416,6 +8439,11 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +"yM" = ( +/obj/structure/sink/kitchen/directional/west, +/obj/item/reagent_containers/glass/bucket, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/centcom/syndicate_mothership/control) "yN" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/heat_exchanging/junction, @@ -8586,6 +8614,14 @@ planetary_atmos = 0 }, /area/awaymission/errorroom) +"zj" = ( +/obj/structure/sink/directional/east, +/obj/structure/mirror/directional/west, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) "zk" = ( /obj/machinery/door/airlock/medical/glass{ name = "Infirmary" @@ -8653,12 +8689,6 @@ /obj/effect/turf_decal/tile/brown, /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/two) -"zt" = ( -/obj/structure/sink/directional/west, -/obj/structure/mirror/directional/east, -/obj/effect/turf_decal/tile/green, -/turf/open/floor/iron/white, -/area/centcom/tdome/observation) "zu" = ( /obj/structure/fence/cut/large, /obj/effect/light_emitter{ @@ -8677,6 +8707,14 @@ /obj/structure/sign/nanotrasen, /turf/closed/indestructible/riveted, /area/centcom/tdome/observation) +"zy" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/sink/kitchen/directional/south, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) "zz" = ( /obj/structure/table/reinforced, /obj/item/restraints/handcuffs/cable/zipties, @@ -8883,11 +8921,6 @@ dir = 4 }, /area/centcom/central_command_areas/holding) -"zX" = ( -/obj/machinery/shower/directional/east, -/obj/effect/turf_decal/stripes/box, -/turf/open/floor/mineral/titanium/tiled, -/area/centcom/syndicate_mothership/expansion_chemicalwarfare) "zY" = ( /obj/structure/lattice/catwalk, /obj/effect/turf_decal/stripes/line{ @@ -9132,14 +9165,6 @@ dir = 4 }, /area/centcom/central_command_areas/holding) -"AE" = ( -/obj/structure/sink/directional/east, -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/turf/open/floor/iron, -/area/centcom/tdome/observation) "AF" = ( /obj/structure/table/wood, /obj/item/storage/photo_album, @@ -9738,13 +9763,6 @@ /obj/machinery/light/directional/north, /turf/open/floor/engine/cult, /area/centcom/wizard_station) -"Cj" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/airlock/centcom{ - name = "Thunderdome Administration" - }, -/turf/open/floor/plating, -/area/centcom/tdome/administration) "Ck" = ( /obj/machinery/door/airlock/maintenance/external{ name = "Bunk Room 1" @@ -9886,6 +9904,14 @@ }, /turf/open/floor/mineral/plastitanium, /area/centcom/syndicate_mothership/expansion_chemicalwarfare) +"CC" = ( +/obj/structure/sink/directional/west, +/obj/structure/mirror/directional/east, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) "CD" = ( /obj/item/kirbyplants{ icon_state = "plant-21" @@ -10046,6 +10072,10 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/control) +"Dc" = ( +/obj/structure/sink/kitchen/directional/west, +/turf/open/floor/iron/cafeteria, +/area/centcom/central_command_areas/holding) "Dd" = ( /obj/machinery/door/window/survival_pod{ dir = 8; @@ -10344,13 +10374,6 @@ "DR" = ( /turf/open/floor/iron/white, /area/centcom/wizard_station) -"DS" = ( -/obj/structure/mirror/magic{ - pixel_y = 28 - }, -/obj/structure/sink/directional/south, -/turf/open/floor/iron/white, -/area/centcom/wizard_station) "DT" = ( /obj/structure/sign/poster/contraband/cc64k_ad, /turf/closed/indestructible/syndicate, @@ -10752,15 +10775,6 @@ /obj/structure/sign/poster/contraband/free_key, /turf/closed/indestructible/syndicate, /area/centcom/syndicate_mothership/control) -"Fe" = ( -/obj/structure/sink/directional/west, -/obj/structure/mirror/directional/east, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/centcom/tdome/observation) "Ff" = ( /turf/open/misc/asteroid/snow/airless, /area/centcom/syndicate_mothership) @@ -11370,6 +11384,11 @@ /obj/structure/closet/crate/cardboard/mothic, /turf/open/floor/plating, /area/centcom/syndicate_mothership/control) +"GP" = ( +/obj/structure/sink/directional/west, +/obj/effect/turf_decal/tile/red/fourcorners, +/turf/open/floor/iron, +/area/centcom/tdome/observation) "GQ" = ( /obj/structure/railing, /turf/open/floor/iron/stairs/old{ @@ -11810,17 +11829,6 @@ }, /turf/open/floor/mineral/plastitanium, /area/centcom/syndicate_mothership/expansion_bombthreat) -"Il" = ( -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 1 - }, -/obj/structure/sink/directional/south, -/obj/item/shovel/spade{ - pixel_x = -4 - }, -/obj/item/reagent_containers/glass/bucket, -/turf/open/floor/mineral/plastitanium/red, -/area/centcom/syndicate_mothership/expansion_bioterrorism) "In" = ( /obj/structure/flora/grass/both/style_random, /obj/structure/railing{ @@ -12237,6 +12245,19 @@ }, /turf/open/floor/iron, /area/centcom/tdome/arena) +"JA" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/shower/directional/south, +/obj/structure/curtain, +/obj/machinery/door/window/brigdoor/left/directional/south{ + name = "Shower" + }, +/obj/item/soap/deluxe, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/turf/open/floor/iron/white, +/area/centcom/central_command_areas/admin) "JC" = ( /obj/machinery/abductor/pad{ team_number = 2 @@ -12260,6 +12281,14 @@ }, /turf/open/floor/mineral/titanium/blue, /area/centcom/central_command_areas/evacuation/ship) +"JG" = ( +/obj/structure/sink/directional/west, +/obj/structure/mirror/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 9 + }, +/turf/open/floor/iron/white, +/area/centcom/central_command_areas/admin) "JH" = ( /obj/structure/rack, /obj/item/clothing/under/color/red, @@ -12306,6 +12335,17 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/centcom/syndicate_mothership/expansion_bioterrorism) +"JQ" = ( +/obj/structure/sink/directional/east, +/obj/structure/mirror/directional/west, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) "JR" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, @@ -12560,6 +12600,11 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/one) +"KG" = ( +/obj/structure/sink/directional/west, +/obj/structure/mirror/directional/east, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) "KH" = ( /turf/closed/wall/mineral/titanium, /area/centcom/central_command_areas/evacuation/ship) @@ -12988,6 +13033,12 @@ "Mm" = ( /turf/open/floor/grass, /area/centcom/central_command_areas/holding) +"Mn" = ( +/obj/structure/sink/directional/east, +/obj/structure/mirror/directional/west, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/showroomfloor, +/area/centcom/central_command_areas/holding) "Mo" = ( /obj/structure/bed, /obj/item/bedsheet/black, @@ -13198,13 +13249,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) -"MS" = ( -/obj/machinery/shower/directional/west, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/centcom/tdome/observation) "MT" = ( /obj/structure/flora/rock/pile/style_random, /obj/effect/light_emitter{ @@ -13623,18 +13667,6 @@ /obj/structure/cable, /turf/open/floor/wood, /area/centcom/central_command_areas/admin) -"Oe" = ( -/obj/structure/closet/crate/bin, -/obj/item/clothing/suit/xenos, -/obj/item/clothing/head/xenos, -/obj/item/xenos_claw, -/obj/item/grown/log/bamboo, -/obj/item/grown/log/bamboo, -/obj/structure/sign/painting/library{ - pixel_y = 32 - }, -/turf/open/floor/wood/tile, -/area/centcom/central_command_areas/holding) "Of" = ( /obj/item/clipboard, /obj/item/stamp/denied{ @@ -13983,13 +14015,10 @@ /turf/open/floor/iron/dark, /area/centcom/central_command_areas/control) "OV" = ( -/obj/structure/sink/directional/west, -/obj/structure/mirror/directional/east, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/centcom/tdome/observation) +/obj/machinery/shower/directional/south, +/obj/machinery/light/floor, +/turf/open/floor/iron/freezer, +/area/centcom/syndicate_mothership/control) "OW" = ( /obj/structure/chair/sofa/bench{ dir = 4 @@ -14260,10 +14289,8 @@ /turf/open/floor/iron/dark, /area/centcom/central_command_areas/ferry) "PI" = ( -/obj/structure/sink/kitchen/directional/west, -/obj/item/reagent_containers/glass/bucket, -/obj/effect/turf_decal/siding/wood, -/turf/open/floor/catwalk_floor, +/obj/structure/sink/kitchen/directional/south, +/turf/open/floor/carpet/black, /area/centcom/central_command_areas/holding) "PK" = ( /obj/effect/turf_decal/tile/brown, @@ -14508,6 +14535,11 @@ /obj/structure/flora/grass/both/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/centcom/syndicate_mothership/control) +"Qt" = ( +/obj/effect/turf_decal/stripes/box, +/obj/machinery/shower/directional/south, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/control) "Qu" = ( /obj/structure/window/paperframe{ can_atmos_pass = 0 @@ -14544,17 +14576,6 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) -"Qy" = ( -/obj/machinery/shower/directional/west, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/centcom/tdome/observation) "Qz" = ( /obj/effect/turf_decal/tile/green, /turf/open/floor/iron, @@ -14581,6 +14602,19 @@ /obj/item/clothing/under/costume/roman, /turf/open/floor/wood/parquet, /area/centcom/central_command_areas/holding) +"QF" = ( +/obj/machinery/shower/directional/east, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) "QH" = ( /obj/item/toy/figure/syndie, /turf/open/misc/asteroid/snow/icemoon, @@ -14726,13 +14760,6 @@ /obj/effect/mapping_helpers/airlock/access/all/admin/general, /turf/open/floor/iron, /area/centcom/central_command_areas/prison) -"Rb" = ( -/obj/machinery/shower/directional/west, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/centcom/tdome/observation) "Rc" = ( /obj/machinery/light/small/directional/east, /turf/open/floor/catwalk_floor, @@ -14941,6 +14968,18 @@ }, /turf/open/floor/iron/white, /area/centcom/central_command_areas/control) +"RA" = ( +/obj/structure/closet/crate/bin, +/obj/item/clothing/suit/costume/xenos, +/obj/item/clothing/head/xenos, +/obj/item/xenos_claw, +/obj/item/grown/log/bamboo, +/obj/item/grown/log/bamboo, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/turf/open/floor/wood/tile, +/area/centcom/central_command_areas/holding) "RB" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -15265,6 +15304,11 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/courtroom) +"SC" = ( +/obj/structure/sink/directional/east, +/obj/structure/mirror/directional/west, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) "SD" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -15720,12 +15764,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/centcom/central_command_areas/ferry) -"TL" = ( -/obj/item/mop, -/obj/structure/sink/kitchen/directional/west, -/obj/item/reagent_containers/glass/bucket, -/turf/open/floor/catwalk_floor, -/area/centcom/central_command_areas/holding) "TM" = ( /obj/effect/turf_decal/tile/yellow/half{ dir = 4 @@ -15977,27 +16015,6 @@ /obj/structure/flora/tree/dead/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/centcom/syndicate_mothership/control) -"Ur" = ( -/obj/structure/closet/secure_closet/personal/cabinet, -/obj/item/clothing/under/rank/civilian/curator/treasure_hunter, -/obj/item/clothing/under/dress/skirt, -/obj/item/clothing/under/shorts/black, -/obj/item/clothing/under/pants/track, -/obj/item/clothing/accessory/armband/deputy, -/obj/item/clothing/accessory/waistcoat, -/obj/item/clothing/shoes/jackboots, -/obj/item/clothing/shoes/laceup, -/obj/item/clothing/neck/stripedredscarf, -/obj/item/clothing/neck/tie/red, -/obj/item/clothing/head/helmet/space/beret, -/obj/item/clothing/suit/curator, -/obj/item/clothing/suit/space/officer, -/obj/item/clothing/gloves/fingerless, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/glasses/eyepatch, -/obj/machinery/firealarm/directional/west, -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/admin) "Us" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/effect/turf_decal/siding/thinplating_new/dark{ @@ -16073,6 +16090,15 @@ }, /turf/open/floor/wood/tile, /area/centcom/central_command_areas/holding) +"UD" = ( +/obj/structure/sink/directional/west, +/obj/structure/mirror/directional/east, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) "UE" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/item/paper_bin, @@ -16211,19 +16237,6 @@ }, /turf/open/floor/iron, /area/centcom/tdome/administration) -"UX" = ( -/obj/machinery/shower/directional/east, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/centcom/tdome/observation) "UY" = ( /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 1 @@ -16259,6 +16272,14 @@ dir = 4 }, /area/centcom/central_command_areas/holding) +"Vb" = ( +/obj/structure/sink/directional/east, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/turf/open/floor/iron, +/area/centcom/tdome/observation) "Vc" = ( /obj/effect/decal/cleanable/vomit/old, /turf/open/floor/iron/dark, @@ -16642,10 +16663,6 @@ /obj/item/assembly/flash/handheld, /turf/open/floor/iron, /area/centcom/syndicate_mothership/control) -"Wb" = ( -/obj/structure/sink/kitchen/directional/south, -/turf/open/floor/carpet/black, -/area/centcom/central_command_areas/holding) "Wc" = ( /obj/machinery/door/airlock/centcom{ name = "CentCom Security" @@ -16674,11 +16691,6 @@ }, /turf/open/floor/wood/tile, /area/centcom/central_command_areas/holding) -"Wf" = ( -/obj/structure/sink/directional/west, -/obj/effect/turf_decal/tile/red/fourcorners, -/turf/open/floor/iron, -/area/centcom/tdome/observation) "Wh" = ( /obj/structure/sign/poster/contraband/lizard{ pixel_x = -32 @@ -17101,13 +17113,13 @@ }, /area/centcom/syndicate_mothership/control) "Xj" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ +/obj/structure/sink/directional/east, +/obj/structure/mirror/directional/west, +/obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/structure/sink/kitchen/directional/south, -/turf/open/floor/iron, -/area/centcom/syndicate_mothership/control) +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) "Xk" = ( /obj/structure/table/reinforced, /obj/item/storage/box/handcuffs, @@ -17115,16 +17127,14 @@ /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation) "Xl" = ( -/obj/structure/sink/directional/east, -/obj/structure/mirror/directional/west, -/obj/effect/turf_decal/tile/red{ - dir = 1 +/obj/structure/toilet/greyscale{ + dir = 4 }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/centcom/tdome/observation) +/obj/structure/sink/directional/west, +/obj/structure/mirror/directional/east, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/showroomfloor, +/area/centcom/central_command_areas/holding) "Xm" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -17186,14 +17196,6 @@ /obj/effect/mapping_helpers/airlock/access/all/admin/general, /turf/open/floor/iron, /area/centcom/central_command_areas/control) -"Xu" = ( -/obj/structure/sink/directional/east, -/obj/structure/mirror/directional/west, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/centcom/tdome/observation) "Xv" = ( /obj/structure/chair/sofa/bench/right{ dir = 4 @@ -17231,6 +17233,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/supply) +"XB" = ( +/obj/machinery/shower/directional/west, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) "XC" = ( /obj/machinery/vending/snack, /obj/effect/turf_decal/delivery, @@ -17365,6 +17374,10 @@ /obj/item/toy/toy_xeno, /turf/open/floor/wood/parquet, /area/centcom/central_command_areas/holding) +"XP" = ( +/obj/machinery/shower/directional/west, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) "XQ" = ( /obj/machinery/computer/crew{ dir = 1 @@ -17548,11 +17561,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) -"Yz" = ( -/obj/structure/sink/directional/west, -/obj/structure/mirror/directional/east, -/turf/open/floor/mineral/titanium, -/area/centcom/syndicate_mothership/control) "YA" = ( /obj/machinery/door/airlock/centcom{ locked = 1; @@ -17835,14 +17843,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) -"Zm" = ( -/obj/structure/sink/directional/east, -/obj/structure/mirror/directional/west, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/centcom/tdome/observation) "Zn" = ( /obj/structure/table/wood/fancy/royalblack, /obj/item/storage/box/holy/follower, @@ -23145,7 +23145,7 @@ rp Zq Gx HY -zX +bI nH kb kb @@ -24436,7 +24436,7 @@ gL FD Ih RK -Il +oz Na Sf FM @@ -26795,7 +26795,7 @@ qZ qZ qZ qE -DS +fr Ef Eo qE @@ -27002,7 +27002,7 @@ pZ IS JI bK -pp +Qt Go KW kv @@ -27509,7 +27509,7 @@ nz TH HN ng -Xj +zy lA pZ CH @@ -27520,7 +27520,7 @@ Kq Go OO ng -mV +OV IR mg NR @@ -27777,11 +27777,11 @@ ng za ng ng -mV +OV DK Ey -Yz -Yz +KG +KG Dd Dd ng @@ -29832,7 +29832,7 @@ WW WW Hr ng -nP +yM ng gd ES @@ -36538,7 +36538,7 @@ QA ci Fh fO -Wb +PI XH Sd Sd @@ -36792,7 +36792,7 @@ pJ pJ fg US -cr +Dc Fh fO cl @@ -40640,13 +40640,13 @@ pJ pJ fg Zi -wX +Mn fO bN YC YC Rm -uq +mf Rv bv Sd @@ -41153,8 +41153,8 @@ pJ Zc hs fg -bI -fp +yl +cF fO bN YC @@ -43216,7 +43216,7 @@ sm WA WA fO -eo +Xl QQ YC YC @@ -44777,7 +44777,7 @@ YC YC cN CQ -TL +ud Nd OL aa @@ -45284,7 +45284,7 @@ Pf Sa XI fO -Oe +RA yg yg yg @@ -47344,7 +47344,7 @@ pJ hs pJ Nd -PI +sB uI Ov MX @@ -56289,8 +56289,8 @@ aa aa aa On -vo -fP +JA +JG On Qg XV @@ -56836,15 +56836,15 @@ aa aa aa QC -wR -gy -oH +kO +po +wn QC ZV -Xu -cd -Zm -Xl +Xj +SC +zj +JQ QC gT Vr @@ -57323,7 +57323,7 @@ On ZT To WX -Ur +pP UR YU GB @@ -57350,9 +57350,9 @@ aa aa aa QC -rZ -MS -dw +oC +tj +XP QC TB TB @@ -59156,7 +59156,7 @@ QC uK eI bi -Wf +GP bi eI bi @@ -63782,7 +63782,7 @@ QC YD cS cS -AE +Vb cS cS cS @@ -65574,9 +65574,9 @@ SH UH SH QC -UX -uX -oH +QF +vK +wn QC TB TB @@ -66088,15 +66088,15 @@ NO NO NO QC -Qy -Rb -dw +xM +XB +XP QC ND -OV -op -zt -Fe +CC +vw +gy +UD QC ei Ah @@ -66616,7 +66616,7 @@ pO HE Sl SU -Cj +sj Vl bM Wn diff --git a/_maps/map_files/generic/CentCom_skyrat.dmm b/_maps/map_files/generic/CentCom_skyrat.dmm index dbace7903bb..000f9cc0f6f 100644 --- a/_maps/map_files/generic/CentCom_skyrat.dmm +++ b/_maps/map_files/generic/CentCom_skyrat.dmm @@ -5671,7 +5671,7 @@ /obj/item/clothing/neck/stripedredscarf, /obj/item/clothing/neck/tie/red, /obj/item/clothing/head/helmet/space/beret, -/obj/item/clothing/suit/curator, +/obj/item/clothing/suit/jacket/curator, /obj/item/clothing/suit/space/officer, /obj/item/clothing/gloves/fingerless, /obj/item/clothing/gloves/color/black, @@ -14543,16 +14543,16 @@ /obj/effect/turf_decal/tile/dark/fourcorners, /obj/effect/turf_decal/siding/wood, /obj/structure/table/reinforced/plastitaniumglass, -/obj/item/clothing/suit/hawaiian{ +/obj/item/clothing/suit/costume/hawaiian{ pixel_x = -3; pixel_y = -3 }, -/obj/item/clothing/suit/hawaiian, -/obj/item/clothing/suit/hawaiian{ +/obj/item/clothing/suit/costume/hawaiian, +/obj/item/clothing/suit/costume/hawaiian{ pixel_x = 3; pixel_y = 3 }, -/obj/item/clothing/suit/hawaiian, +/obj/item/clothing/suit/costume/hawaiian, /turf/open/floor/sepia, /area/centcom/central_command_areas/holding) "NE" = ( @@ -16776,7 +16776,7 @@ /area/centcom/syndicate_mothership/control) "Ud" = ( /obj/structure/closet/crate/bin, -/obj/item/clothing/suit/xenos, +/obj/item/clothing/suit/costume/xenos, /obj/item/clothing/head/xenos, /obj/item/xenos_claw, /obj/item/grown/log/bamboo, diff --git a/_maps/map_files/generic/CentCom_skyrat_z2.dmm b/_maps/map_files/generic/CentCom_skyrat_z2.dmm index 54a28280055..ee647e5bf4d 100644 --- a/_maps/map_files/generic/CentCom_skyrat_z2.dmm +++ b/_maps/map_files/generic/CentCom_skyrat_z2.dmm @@ -5921,7 +5921,7 @@ /turf/open/floor/iron/white, /area/centcom/holding/cafe) "bGx" = ( -/obj/item/clothing/suit/xenos, +/obj/item/clothing/suit/costume/xenos, /obj/item/clothing/head/xenos, /obj/structure/alien/weeds, /turf/open/misc/dirt/planet, @@ -10219,11 +10219,11 @@ /obj/item/clothing/under/shorts/green, /obj/item/clothing/under/shorts/grey, /obj/item/clothing/under/shorts/purple, -/obj/item/clothing/suit/hawaiian, +/obj/item/clothing/suit/costume/hawaiian, /obj/item/clothing/glasses/sunglasses, /obj/item/clothing/glasses/sunglasses/big, /obj/item/clothing/glasses/sunglasses, -/obj/item/clothing/suit/ianshirt, +/obj/item/clothing/suit/costume/ianshirt, /obj/item/clothing/suit/hawaiian_green, /obj/item/clothing/suit/hawaiian_orange, /obj/item/clothing/suit/hawaiian_purple, @@ -10443,7 +10443,7 @@ /obj/item/clothing/head/shrine_wig{ pixel_y = 7 }, -/obj/item/clothing/suit/shrine_maiden, +/obj/item/clothing/suit/costume/shrine_maiden, /obj/item/storage/basket{ pixel_y = 11 }, diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index be7d52bb09f..939d0cbcb24 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -54,6 +54,18 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron, /area/station/cargo/qm) +"aca" = ( +/obj/structure/cable/multilayer/multiz, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/small/directional/south, +/obj/structure/sign/warning/electric_shock/directional/south, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) "acd" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 4 @@ -162,6 +174,11 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +"adz" = ( +/obj/structure/sign/warning/vacuum/external/directional/north, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/hallway/secondary/entry) "adM" = ( /turf/closed/wall, /area/station/medical/break_room) @@ -237,6 +254,12 @@ /obj/item/stack/ore/glass, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"afB" = ( +/obj/structure/sign/warning/vacuum/external/directional/west, +/obj/effect/turf_decal/sand/plating, +/obj/machinery/light/small/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) "afI" = ( /obj/machinery/light/directional/east, /obj/effect/turf_decal/trimline/white/line{ @@ -920,12 +943,6 @@ /obj/item/seeds/tower, /turf/open/floor/iron/dark, /area/station/security/prison/garden) -"asO" = ( -/obj/structure/window/reinforced/spawner/east, -/obj/machinery/shower/directional/west, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/freezer, -/area/station/security/prison/shower) "asP" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 8 @@ -1065,6 +1082,15 @@ "awE" = ( /turf/open/floor/engine/n2, /area/station/engineering/atmos) +"awJ" = ( +/obj/structure/cable/multilayer/multiz, +/obj/effect/turf_decal/stripes/end{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/warning/electric_shock/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/aft) "awX" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -1082,13 +1108,6 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/iron/smooth, /area/station/hallway/primary/tram/right) -"axe" = ( -/obj/structure/sign/warning/pods/directional/east, -/obj/effect/decal/cleanable/dirt, -/obj/item/stack/cable_coil/cut, -/obj/item/wirecutters, -/turf/open/floor/iron/smooth, -/area/station/maintenance/starboard/central) "axk" = ( /obj/effect/turf_decal/trimline/green/filled/line, /obj/effect/turf_decal/trimline/green/filled/line{ @@ -1478,13 +1497,6 @@ /obj/structure/cable, /turf/open/floor/wood/large, /area/station/service/library) -"aGB" = ( -/obj/structure/sign/warning/vacuum/directional/north, -/obj/machinery/light/small/directional/east, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron/smooth, -/area/station/hallway/primary/tram/left) "aGK" = ( /obj/structure/filingcabinet, /obj/item/book/manual/wiki/security_space_law, @@ -1526,12 +1538,6 @@ /obj/item/modular_computer/laptop/preset/civilian, /turf/open/floor/wood/large, /area/station/service/library) -"aHJ" = ( -/obj/item/kirbyplants/random, -/obj/structure/sign/warning/fire/directional/north, -/obj/machinery/light/directional/north, -/turf/open/floor/iron, -/area/station/science/ordnance/storage) "aHT" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -1719,6 +1725,14 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/dark, /area/station/science/xenobiology) +"aMs" = ( +/obj/effect/turf_decal/trimline/purple/filled/line, +/obj/effect/turf_decal/trimline/neutral/filled/warning, +/obj/structure/sign/departments/science/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/hallway/primary/tram/right) "aMu" = ( /obj/structure/chair/stool/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -1940,12 +1954,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"aRG" = ( -/obj/vehicle/ridden/secway, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "aRM" = ( /obj/machinery/flasher/directional/north{ id = "reeducation" @@ -2023,11 +2031,6 @@ }, /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) -"aSQ" = ( -/obj/machinery/shower/directional/south, -/obj/structure/curtain, -/turf/open/floor/iron/freezer, -/area/station/commons/toilet) "aST" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -2330,6 +2333,12 @@ }, /turf/open/floor/plating, /area/station/command/heads_quarters/cmo) +"aYZ" = ( +/obj/structure/window/reinforced/spawner/west, +/obj/machinery/shower/directional/east, +/obj/structure/cable, +/turf/open/floor/iron/freezer, +/area/station/security/prison/shower) "aZg" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 1; @@ -2921,13 +2930,6 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) -"bkB" = ( -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 4 - }, -/obj/structure/sink/directional/west, -/turf/open/floor/iron/white, -/area/station/medical/virology) "bkD" = ( /obj/structure/window/reinforced{ dir = 8 @@ -3043,6 +3045,17 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/service/hydroponics) +"blT" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line, +/obj/structure/cable, +/obj/structure/sign/departments/holy/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "bmb" = ( /obj/structure/window/reinforced, /obj/structure/table/wood, @@ -3092,6 +3105,14 @@ /obj/machinery/photocopier, /turf/open/floor/wood, /area/station/service/lawoffice) +"bns" = ( +/obj/effect/turf_decal/trimline/neutral/filled/corner, +/obj/structure/disposalpipe/segment, +/obj/structure/sign/departments/evac/directional/east{ + pixel_y = -32 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/tram/right) "bnt" = ( /obj/structure/chair/office{ dir = 1 @@ -3165,6 +3186,13 @@ /obj/effect/mapping_helpers/airlock/access/all/command/gateway, /turf/open/floor/iron, /area/station/command/gateway) +"boc" = ( +/obj/structure/window/reinforced/spawner/west, +/obj/machinery/shower/directional/east, +/obj/item/soap/nanotrasen, +/obj/structure/cable, +/turf/open/floor/iron/freezer, +/area/station/security/prison/shower) "bog" = ( /obj/effect/turf_decal/trimline/brown/filled/corner{ dir = 4 @@ -3271,17 +3299,6 @@ /obj/machinery/duct, /turf/open/floor/iron/freezer, /area/station/commons/toilet) -"bpN" = ( -/obj/structure/window/reinforced/spawner/east, -/obj/structure/sign/departments/medbay/alt/directional/south, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 6 - }, -/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, -/area/station/security/medical) "bpU" = ( /obj/structure/bed{ dir = 8 @@ -3328,16 +3345,6 @@ "brm" = ( /turf/open/openspace, /area/station/hallway/primary/tram/right) -"bro" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/structure/sign/warning/chem_diamond/directional/east, -/obj/structure/chair/office/light, -/obj/effect/landmark/start/chemist, -/turf/open/floor/iron/white, -/area/station/medical/chemistry) "brr" = ( /obj/effect/turf_decal/siding/thinplating{ dir = 8 @@ -3470,10 +3477,6 @@ /obj/machinery/rnd/server, /turf/open/floor/circuit/telecomms/server, /area/station/science/server) -"btQ" = ( -/obj/machinery/airalarm/directional/south, -/turf/open/floor/glass/reinforced, -/area/station/ai_monitored/turret_protected/aisat/hallway) "bug" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 5 @@ -5204,10 +5207,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/checker, /area/station/commons/lounge) -"bUS" = ( -/obj/machinery/shower/directional/east, -/turf/open/floor/iron/freezer, -/area/station/security/prison/shower) "bUT" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -5663,14 +5662,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/freezer, /area/station/commons/toilet) -"ccb" = ( -/obj/structure/sink/directional/east, -/obj/effect/turf_decal/trimline/neutral/line, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/service/hydroponics/garden) "ccj" = ( /obj/effect/turf_decal/trimline/brown/filled/line, /turf/open/floor/iron, @@ -6370,6 +6361,14 @@ "cmr" = ( /turf/open/floor/iron/stairs/medium, /area/station/engineering/transit_tube) +"cng" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/sign/warning/biohazard/directional/west, +/obj/structure/window/reinforced/spawner, +/turf/open/floor/catwalk_floor, +/area/station/command/gateway) "cnA" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /turf/open/floor/engine/n2o, @@ -6650,13 +6649,6 @@ /obj/structure/table/reinforced, /turf/open/floor/iron/dark, /area/station/service/bar) -"crY" = ( -/obj/structure/sink/directional/west, -/obj/structure/mirror/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/freezer, -/area/station/commons/toilet) "csz" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 1 @@ -6890,6 +6882,14 @@ /obj/effect/turf_decal/trimline/red/filled/corner, /turf/open/floor/iron/dark, /area/station/security/interrogation) +"cwa" = ( +/obj/structure/mirror/directional/north, +/obj/structure/sink/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron/freezer, +/area/station/science/lower) "cwf" = ( /turf/closed/wall/rock/porous, /area/station/maintenance/department/security) @@ -6898,6 +6898,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating/airless, /area/mine/explored) +"cws" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/airlock/external{ + name = "Escape Airlock" + }, +/obj/structure/sign/warning/vacuum/external/directional/north, +/turf/open/floor/plating, +/area/station/hallway/secondary/exit/departure_lounge) "cwG" = ( /turf/open/floor/iron, /area/station/cargo/office) @@ -7181,12 +7191,6 @@ }, /turf/open/floor/iron/white, /area/station/science/lower) -"cAv" = ( -/obj/structure/sign/warning/radiation/rad_area/directional/north, -/obj/effect/turf_decal/bot_white, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/gravity_generator) "cAy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -7636,14 +7640,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"cGr" = ( -/obj/effect/turf_decal/trimline/purple/filled/line, -/obj/effect/turf_decal/trimline/neutral/filled/warning, -/obj/structure/sign/departments/science/directional/south, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/right) "cGy" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -7764,6 +7760,17 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/engine, /area/station/science/xenobiology) +"cIG" = ( +/obj/structure/window/reinforced/spawner/east, +/obj/structure/sign/departments/medbay/alt/directional/south, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 6 + }, +/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, +/area/station/security/medical) "cIM" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -7828,17 +7835,14 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/engineering/break_room) -"cJK" = ( -/obj/effect/turf_decal/stripes, -/obj/effect/turf_decal/stripes{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ +"cJE" = ( +/obj/machinery/shower/directional/east, +/obj/effect/turf_decal/box, +/obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 }, -/obj/structure/sign/warning/test_chamber/directional/south, /turf/open/floor/iron, -/area/station/science/ordnance/testlab) +/area/station/engineering/main) "cJL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -8012,15 +8016,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit) -"cNE" = ( -/obj/structure/closet/emcloset{ - anchored = 1 - }, -/obj/effect/turf_decal/bot, -/obj/machinery/light/small/directional/west, -/obj/structure/sign/warning/vacuum/external/directional/north, -/turf/open/floor/plating, -/area/station/ai_monitored/turret_protected/aisat/foyer) "cNI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -8071,12 +8066,6 @@ }, /turf/open/floor/iron, /area/station/security/prison) -"cOs" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/warning/electric_shock/directional/north, -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/hallway/primary/tram/left) "cOw" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -8181,14 +8170,6 @@ /obj/structure/table, /turf/open/floor/iron, /area/station/security/prison) -"cQs" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/structure/sink/directional/south, -/turf/open/floor/iron, -/area/station/cargo/miningdock/cafeteria) "cQD" = ( /obj/structure/table/reinforced, /obj/structure/reagent_dispensers/servingdish, @@ -8273,21 +8254,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/lesser) -"cSB" = ( -/obj/structure/table, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 1 - }, -/obj/structure/sign/warning/no_smoking/directional/north, -/obj/item/experi_scanner{ - pixel_x = 5 - }, -/obj/item/experi_scanner, -/obj/item/experi_scanner{ - pixel_x = -5 - }, -/turf/open/floor/iron/white, -/area/station/science/research) "cSH" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -8301,15 +8267,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/miningdock/cafeteria) -"cST" = ( -/obj/structure/cable/multilayer/multiz, -/obj/effect/turf_decal/stripes/end{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/warning/electric_shock/directional/south, -/turf/open/floor/plating, -/area/station/maintenance/solars/port/aft) "cTc" = ( /obj/structure/table, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -8429,6 +8386,18 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/exit) +"cVw" = ( +/obj/machinery/shower/directional/east, +/obj/effect/turf_decal/box, +/obj/structure/fluff{ + desc = "What, you think the water just magically soaks into the metallic flooring?"; + icon = 'icons/obj/lavaland/survival_pod.dmi'; + icon_state = "fan_tiny"; + name = "shower drain" + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "cVz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -8868,6 +8837,16 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/service) +"ddC" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/structure/sign/warning/secure_area/directional/north{ + name = "HIGH SECURITY STORAGE" + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) "ddJ" = ( /obj/effect/turf_decal/siding/thinplating{ dir = 4 @@ -8923,18 +8902,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/checkpoint) -"dex" = ( -/obj/structure/cable/multilayer/multiz, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/light/small/directional/south, -/obj/structure/sign/warning/electric_shock/directional/south, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/maintenance/starboard/greater) "dez" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -9161,6 +9128,18 @@ }, /turf/open/floor/iron/dark, /area/station/commons/lounge) +"diU" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/sign/warning/secure_area/directional/north{ + name = "HIGH SECURITY STORAGE" + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) "dja" = ( /obj/effect/turf_decal/stripes{ dir = 1 @@ -9309,6 +9288,19 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/drone_bay) +"dlr" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/structure/sink/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "dlv" = ( /obj/machinery/computer/camera_advanced/xenobio, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -9538,11 +9530,6 @@ /obj/machinery/holopad, /turf/open/floor/iron/grimy, /area/station/hallway/secondary/entry) -"dpK" = ( -/obj/machinery/shower/directional/north, -/obj/structure/curtain, -/turf/open/floor/iron/freezer, -/area/station/commons/toilet) "dpM" = ( /obj/structure/table, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -9957,13 +9944,6 @@ "duB" = ( /turf/closed/wall/r_wall, /area/station/security/prison/garden) -"duF" = ( -/obj/structure/window/reinforced/spawner/west, -/obj/machinery/shower/directional/east, -/obj/item/soap/nanotrasen, -/obj/structure/cable, -/turf/open/floor/iron/freezer, -/area/station/security/prison/shower) "duT" = ( /turf/open/space/basic, /area/mine/explored) @@ -9982,6 +9962,13 @@ }, /turf/open/floor/iron, /area/station/commons/storage/art) +"dvu" = ( +/obj/machinery/power/smes/engineering, +/obj/structure/cable, +/obj/structure/sign/warning/electric_shock/directional/north, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/catwalk_floor, +/area/station/maintenance/central/greater) "dvB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -10224,16 +10211,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet, /area/station/commons/dorms) -"dyc" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/machinery/door/airlock/external{ - name = "Escape Airlock" - }, -/obj/structure/sign/warning/vacuum/external/directional/north, -/turf/open/floor/plating, -/area/station/hallway/secondary/exit/departure_lounge) "dye" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ dir = 8 @@ -10254,13 +10231,6 @@ /obj/structure/flora/bush/leavy/style_random, /turf/open/floor/grass, /area/station/medical/virology) -"dym" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/machinery/shower/directional/north, -/obj/effect/turf_decal/box, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/main) "dyq" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/railing{ @@ -10439,6 +10409,18 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/foyer) +"dBt" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/obj/structure/sign/warning/electric_shock/directional/west, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology) "dBu" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -10525,6 +10507,17 @@ }, /turf/open/floor/carpet, /area/station/service/library) +"dCN" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/sign/departments/chemistry/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "dCU" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 8 @@ -10645,6 +10638,17 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/cargo/storage) +"dFl" = ( +/obj/structure/sign/warning/vacuum/external/directional/west, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 9 + }, +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/processing) "dFo" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 4 @@ -10668,14 +10672,6 @@ /obj/machinery/door/window/right/tram, /turf/open/openspace, /area/station/hallway/primary/tram/center) -"dFE" = ( -/obj/machinery/shower/directional/east, -/obj/effect/turf_decal/box, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/engineering/main) "dFG" = ( /obj/effect/turf_decal/trimline/white/filled/line{ dir = 4 @@ -10774,10 +10770,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/station/cargo/storage) -"dGG" = ( -/obj/structure/sink/kitchen/directional/west, -/turf/open/floor/iron/cafeteria, -/area/station/service/kitchen) "dGJ" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 @@ -10858,6 +10850,11 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/tram/left) +"dII" = ( +/obj/structure/sink/directional/east, +/obj/structure/mirror/directional/west, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet) "dIY" = ( /obj/structure/window/reinforced{ dir = 4 @@ -10878,17 +10875,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, /turf/open/floor/iron/dark, /area/station/science/xenobiology) -"dJt" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/structure/sign/warning/secure_area/directional/east, -/turf/open/floor/iron/white, -/area/station/science/lower) "dJF" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ dir = 8 @@ -10901,11 +10887,6 @@ "dJM" = ( /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"dJO" = ( -/obj/effect/turf_decal/trimline/purple/filled/line, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/iron/white, -/area/station/science/research) "dJS" = ( /obj/structure/bed, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -11218,6 +11199,23 @@ }, /turf/open/floor/iron, /area/station/maintenance/tram/right) +"dPM" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/warning, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/sign/warning/docking/directional/north{ + desc = "A warning sign which reads 'KEEP CLEAR OF TRAM DOCKING AREA'."; + name = "KEEP CLEAR: TRAM DOCKING AREA sign" + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/maintenance/tram/left) "dPS" = ( /obj/machinery/modular_computer/console/preset/id{ dir = 8 @@ -11935,21 +11933,6 @@ /obj/structure/musician/piano, /turf/open/floor/carpet, /area/station/service/theater) -"ece" = ( -/obj/structure/sign/warning/radiation/rad_area/directional/north{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/hallway/secondary/construction/engineering) "ech" = ( /obj/structure/window/reinforced/spawner/west, /turf/open/floor/grass, @@ -12871,6 +12854,13 @@ }, /turf/open/floor/iron/freezer, /area/station/commons/toilet) +"etP" = ( +/obj/machinery/power/smes, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/warning/electric_shock/directional/north, +/obj/structure/cable, +/turf/open/floor/catwalk_floor, +/area/station/maintenance/solars/port/aft) "eug" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 8 @@ -13100,6 +13090,15 @@ }, /turf/open/floor/iron, /area/station/cargo/miningdock) +"eyS" = ( +/obj/structure/sign/warning/vacuum/directional/south, +/obj/machinery/light/small/directional/east, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/smooth, +/area/station/hallway/primary/tram/left) "eyX" = ( /obj/structure/flora/bush/lavendergrass/style_random, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -13271,6 +13270,10 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/cargo/lobby) +"eBM" = ( +/obj/machinery/shower/directional/east, +/turf/open/floor/iron/freezer, +/area/station/security/prison/shower) "eCp" = ( /obj/machinery/computer/secure_data, /turf/open/floor/iron/grimy, @@ -13393,16 +13396,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor, /area/station/maintenance/department/medical) -"eEi" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/structure/sink/directional/south, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "eEm" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -13445,18 +13438,6 @@ }, /turf/open/floor/engine/air, /area/station/engineering/atmos) -"eFi" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/suit/radiation, -/obj/item/clothing/head/radiation, -/obj/item/clothing/glasses/meson, -/obj/item/geiger_counter, -/obj/item/geiger_counter, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) "eFk" = ( /obj/structure/table, /obj/item/stack/sheet/rglass{ @@ -13509,19 +13490,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/tram/right) -"eFA" = ( -/obj/effect/turf_decal/trimline/neutral/filled/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/departments/evac/directional/east{ - pixel_y = 32 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/right) "eFJ" = ( /obj/structure/cable, /obj/machinery/door/airlock/maintenance_hatch{ @@ -13626,23 +13594,6 @@ }, /turf/open/floor/iron, /area/station/security/prison/work) -"eIe" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/purple/filled/corner, -/obj/structure/sink/directional/east, -/obj/machinery/camera{ - c_tag = "Science - Left Entry Airlock"; - dir = 10; - network = list("ss13","rd") - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/science/research) "eIk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/closed/wall/r_wall, @@ -14393,13 +14344,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron/freezer, /area/station/science/lower) -"eWx" = ( -/obj/machinery/power/smes, -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/warning/electric_shock/directional/north, -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/solars/port/aft) "eWG" = ( /obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4{ dir = 4 @@ -14531,15 +14475,6 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"eYz" = ( -/obj/structure/cable/multilayer/multiz, -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/warning/electric_shock/directional/west, -/obj/effect/turf_decal/stripes/end{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/maintenance/starboard/lesser) "eYC" = ( /obj/effect/landmark/blobstart, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -14634,6 +14569,15 @@ }, /turf/open/floor/glass/reinforced, /area/station/hallway/primary/tram/center) +"fbm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/obj/structure/sign/departments/restroom/directional/north, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/science/lower) "fbo" = ( /obj/effect/turf_decal/trimline/yellow/warning, /obj/structure/railing/corner, @@ -14693,6 +14637,18 @@ /obj/machinery/modular_computer/console/preset/cargochat/science, /turf/open/floor/iron/white, /area/station/science/explab) +"fcK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/obj/structure/disposalpipe/junction/flip{ + dir = 1 + }, +/obj/structure/cable, +/obj/structure/sign/warning/secure_area/directional/east, +/turf/open/floor/iron/white, +/area/station/science/lower) "fcL" = ( /obj/structure/closet/l3closet/janitor, /obj/machinery/firealarm/directional/south, @@ -14705,6 +14661,13 @@ }, /turf/open/floor/iron, /area/station/service/janitor) +"fcY" = ( +/obj/structure/sign/warning/vacuum/directional/north, +/obj/machinery/light/small/directional/east, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/smooth, +/area/station/hallway/primary/tram/left) "fdt" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/power/apc/auto_name/directional/west, @@ -14815,6 +14778,22 @@ }, /turf/open/floor/iron, /area/station/engineering/transit_tube) +"feF" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/filled/warning{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/red/filled/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/corner{ + dir = 4 + }, +/obj/structure/sign/departments/security/directional/west, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) "feW" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ dir = 8 @@ -14879,14 +14858,6 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor, /area/station/maintenance/port/fore) -"ffX" = ( -/obj/structure/mirror/directional/north, -/obj/structure/sink/directional/south, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/iron/freezer, -/area/station/science/lower) "fgi" = ( /turf/closed/wall, /area/station/cargo/lobby) @@ -15097,6 +15068,14 @@ /obj/effect/turf_decal/stripes/white/full, /turf/open/floor/iron, /area/station/hallway/secondary/service) +"fjs" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/mirror/directional/west, +/obj/structure/sink/directional/east, +/turf/open/floor/iron/dark, +/area/station/science/genetics) "fju" = ( /obj/structure/disposalpipe/segment, /obj/machinery/duct, @@ -15177,13 +15156,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/hallway/secondary/exit/departure_lounge) -"fki" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 8 - }, -/obj/structure/sign/warning/engine_safety/directional/west, -/turf/open/floor/iron, -/area/station/engineering/break_room) "fks" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor, @@ -15393,6 +15365,21 @@ }, /turf/open/floor/vault, /area/station/hallway/primary/tram/right) +"foe" = ( +/obj/structure/table, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/obj/structure/sign/warning/no_smoking/directional/north, +/obj/item/experi_scanner{ + pixel_x = 5 + }, +/obj/item/experi_scanner, +/obj/item/experi_scanner{ + pixel_x = -5 + }, +/turf/open/floor/iron/white, +/area/station/science/research) "fog" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -15476,6 +15463,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, /turf/closed/wall/r_wall, /area/station/engineering/break_room) +"foW" = ( +/obj/structure/cable/multilayer/multiz, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/end{ + dir = 8 + }, +/obj/structure/sign/warning/electric_shock/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/department/medical) "fpf" = ( /obj/structure/flora/bush/leavy/style_random, /obj/structure/flora/tree/palm/style_random, @@ -16170,6 +16166,19 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/wood, /area/station/commons/vacant_room/office) +"fDe" = ( +/obj/effect/turf_decal/trimline/neutral/filled/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/departments/evac/directional/east{ + pixel_y = 32 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/tram/right) "fDw" = ( /obj/machinery/door/airlock/hatch, /obj/effect/decal/cleanable/dirt, @@ -16248,6 +16257,20 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"fFz" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Medical - Surgery Room A"; + network = list("ss13","medbay") + }, +/obj/structure/sink/directional/east, +/obj/machinery/status_display/evac/directional/west, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/surgery/fore) "fFF" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -16782,6 +16805,16 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) +"fPl" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/structure/sink/directional/south, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "fPu" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/disposalpipe/segment{ @@ -17351,6 +17384,23 @@ /obj/structure/bookcase/random/fiction, /turf/open/floor/wood/large, /area/station/service/library) +"gaC" = ( +/obj/structure/rack, +/obj/item/reagent_containers/glass/bottle/epinephrine{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/reagent_containers/glass/bottle/fluorine{ + pixel_x = 7; + pixel_y = 3 + }, +/obj/item/reagent_containers/glass/bottle/iodine{ + pixel_x = 1 + }, +/obj/structure/sign/warning/chem_diamond/directional/south, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark/textured_edge, +/area/station/medical/medbay/central) "gbB" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 @@ -17427,6 +17477,13 @@ "gdt" = ( /turf/closed/wall/r_wall, /area/station/cargo/storage) +"gdD" = ( +/obj/structure/sign/warning/vacuum/external/directional/south, +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/turf/open/floor/iron, +/area/station/engineering/atmos) "gdF" = ( /obj/machinery/vending/wardrobe/det_wardrobe, /obj/structure/sign/poster/official/dick_gum{ @@ -17457,6 +17514,18 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"geg" = ( +/obj/effect/turf_decal/trimline/yellow/warning, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/structure/sign/warning/docking/directional/north{ + desc = "A warning sign which reads 'KEEP CLEAR OF TRAM DOCKING AREA'."; + name = "KEEP CLEAR: TRAM DOCKING AREA sign" + }, +/turf/open/floor/iron, +/area/station/maintenance/tram/left) "gen" = ( /obj/effect/turf_decal/tile{ dir = 1 @@ -17618,13 +17687,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) -"ggF" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/glass/reinforced, -/area/station/ai_monitored/turret_protected/aisat/hallway) "ggL" = ( /obj/structure/closet/crate/trashcart/laundry, /obj/item/clothing/under/rank/prisoner/skirt, @@ -17677,6 +17739,14 @@ }, /turf/open/floor/plating, /area/station/science/cytology) +"ghV" = ( +/obj/machinery/shower/directional/west, +/obj/effect/turf_decal/box, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/main) "gia" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 10 @@ -17924,6 +17994,17 @@ /obj/structure/chair/plastic, /turf/open/floor/eighties/red, /area/station/commons/fitness/recreation/entertainment) +"glR" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 10 + }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) "glY" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, @@ -19367,13 +19448,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/primary/tram/center) -"gNd" = ( -/obj/machinery/power/smes/engineering, -/obj/structure/cable, -/obj/structure/sign/warning/electric_shock/directional/north, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/central/greater) "gNe" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/stripes/corner{ @@ -19406,13 +19480,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"gNl" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, -/obj/structure/sign/departments/psychology/directional/east, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "gNm" = ( /turf/open/floor/circuit, /area/station/ai_monitored/command/nuke_storage) @@ -19496,11 +19563,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/command/bridge) -"gOk" = ( -/obj/effect/turf_decal/trimline/purple/filled/line, -/obj/structure/sign/departments/xenobio/directional/south, -/turf/open/floor/iron/white, -/area/station/science/research) "gOp" = ( /obj/structure/rack, /obj/item/reagent_containers/glass/bottle/ethanol{ @@ -19527,17 +19589,6 @@ }, /turf/open/floor/glass/reinforced, /area/station/hallway/primary/tram/right) -"gOI" = ( -/obj/structure/window/reinforced/spawner/west, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 8 - }, -/obj/machinery/shower/directional/south, -/turf/open/floor/iron/white, -/area/station/medical/pharmacy) "gPo" = ( /obj/structure/window/reinforced{ dir = 4 @@ -19607,14 +19658,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/interrogation) -"gQo" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/sign/warning/secure_area/directional/south{ - desc = "A warning sign which reads 'SERVER ROOM'."; - name = "SERVER ROOM" - }, -/turf/open/floor/plating, -/area/station/science/server) "gQz" = ( /obj/structure/table/glass, /obj/structure/mirror/directional/north, @@ -19716,18 +19759,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/courtroom) -"gRP" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/suit/radiation, -/obj/item/clothing/head/radiation, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/meson, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) "gRU" = ( /obj/machinery/door/airlock{ id_tag = "private_m"; @@ -19967,6 +19998,13 @@ }, /turf/open/floor/glass/reinforced, /area/station/ai_monitored/turret_protected/aisat/hallway) +"gVn" = ( +/obj/structure/sink/kitchen/directional/west{ + desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; + name = "old sink" + }, +/turf/open/floor/wood, +/area/station/service/bar/backroom) "gVu" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ dir = 4 @@ -20021,18 +20059,6 @@ }, /turf/open/floor/iron, /area/station/science/robotics/mechbay) -"gVU" = ( -/obj/machinery/shower/directional/east, -/obj/effect/turf_decal/box, -/obj/structure/fluff{ - desc = "What, you think the water just magically soaks into the metallic flooring?"; - icon = 'icons/obj/lavaland/survival_pod.dmi'; - icon_state = "fan_tiny"; - name = "shower drain" - }, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) "gVW" = ( /obj/structure/table, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -20201,15 +20227,16 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/gravity_generator) +"gYY" = ( +/obj/structure/sign/warning/pods/directional/east, +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/cable_coil/cut, +/obj/item/wirecutters, +/turf/open/floor/iron/smooth, +/area/station/maintenance/starboard/central) "gZk" = ( /turf/closed/wall, /area/station/science/auxlab) -"gZv" = ( -/obj/effect/turf_decal/stripes/line, -/mob/living/simple_animal/bot/secbot/beepsky/armsky, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/ai_monitored/security/armory) "gZE" = ( /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/canister/nitrogen, @@ -20303,6 +20330,14 @@ }, /turf/open/floor/iron, /area/station/commons/storage/art) +"hbj" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/sign/warning/secure_area/directional/south{ + desc = "A warning sign which reads 'SERVER ROOM'."; + name = "SERVER ROOM" + }, +/turf/open/floor/plating, +/area/station/science/server) "hbD" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -20362,6 +20397,21 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/cargo/storage) +"hcl" = ( +/obj/structure/sign/warning/radiation/rad_area/directional/north{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/secondary/construction/engineering) "hcu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -20541,6 +20591,26 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +"hfA" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/trimline/purple/filled/corner{ + dir = 8 + }, +/obj/structure/sink/directional/west, +/obj/machinery/camera{ + c_tag = "Science - Right Entry Airlock"; + dir = 6; + network = list("ss13","rd") + }, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/science/research) "hfN" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 10 @@ -20885,15 +20955,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/tram/center) -"hnh" = ( -/obj/structure/sign/warning/vacuum/directional/south, -/obj/machinery/light/small/directional/east, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron/smooth, -/area/station/hallway/primary/tram/left) "hnw" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/camera/directional/south{ @@ -20981,6 +21042,14 @@ }, /turf/open/space/openspace, /area/space) +"hpB" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/sign/warning/secure_area/directional/north{ + desc = "A warning sign which reads 'SERVER ROOM'."; + name = "SERVER ROOM" + }, +/turf/open/floor/plating, +/area/station/science/server) "hpF" = ( /obj/machinery/light/directional/south, /obj/effect/turf_decal/trimline/purple/filled/line, @@ -21001,6 +21070,15 @@ }, /turf/open/floor/iron/white, /area/station/service/kitchen) +"hpM" = ( +/obj/structure/cable/multilayer/multiz, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/warning/electric_shock/directional/west, +/obj/effect/turf_decal/stripes/end{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) "hqc" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -21353,6 +21431,13 @@ "hyg" = ( /turf/open/floor/glass/reinforced, /area/station/hallway/primary/tram/center) +"hyi" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/structure/sink/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "hyE" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -21948,6 +22033,17 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/tram/left) +"hGW" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/shower/directional/west, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "hHf" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -21989,6 +22085,14 @@ "hHP" = ( /turf/open/floor/iron/dark, /area/station/maintenance/radshelter/civil) +"hHX" = ( +/obj/effect/turf_decal/trimline/purple/filled/line, +/obj/effect/turf_decal/trimline/neutral/filled/warning, +/obj/structure/sign/departments/science/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/tram/right) "hIg" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -22312,6 +22416,11 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/medical/morgue) +"hOY" = ( +/obj/structure/cable, +/obj/structure/sink/directional/south, +/turf/open/floor/iron/freezer, +/area/station/security/prison) "hPb" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/yellow/warning, @@ -22346,18 +22455,6 @@ /obj/effect/landmark/start/lawyer, /turf/open/floor/wood, /area/station/service/lawoffice) -"hQa" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 10 - }, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/firealarm/directional/south, -/obj/machinery/camera/directional/south, -/turf/open/floor/iron/white, -/area/station/medical/pharmacy) "hQf" = ( /obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -22371,14 +22468,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) -"hQn" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/sign/warning/vacuum/external/directional/west, -/obj/structure/cable, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) "hQU" = ( /obj/effect/turf_decal/trimline/green/filled/corner{ dir = 4 @@ -23061,6 +23150,14 @@ /obj/effect/turf_decal/trimline/purple/filled/corner, /turf/open/floor/iron, /area/station/science/robotics/mechbay) +"ibL" = ( +/obj/structure/sink/directional/east, +/obj/effect/turf_decal/trimline/neutral/line, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) "ica" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 @@ -23088,6 +23185,12 @@ }, /turf/open/floor/iron, /area/station/security/prison/safe) +"icl" = ( +/obj/item/kirbyplants/random, +/obj/structure/sign/warning/fire/directional/north, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/science/ordnance/storage) "icx" = ( /turf/open/floor/circuit/green, /area/station/science/robotics/mechbay) @@ -23635,23 +23738,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"imc" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/yellow/warning, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/sign/warning/docking/directional/north{ - desc = "A warning sign which reads 'KEEP CLEAR OF TRAM DOCKING AREA'."; - name = "KEEP CLEAR: TRAM DOCKING AREA sign" - }, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/iron, -/area/station/maintenance/tram/left) "iml" = ( /obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 8 @@ -23746,6 +23832,17 @@ dir = 5 }, /area/station/service/chapel) +"inT" = ( +/obj/effect/turf_decal/stripes, +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/structure/sign/warning/test_chamber/directional/south, +/turf/open/floor/iron, +/area/station/science/ordnance/testlab) "ioi" = ( /turf/open/floor/plating/airless, /area/station/science/ordnance/bomb) @@ -23816,6 +23913,22 @@ }, /turf/open/floor/iron, /area/station/maintenance/tram/right) +"ipp" = ( +/obj/structure/closet/emcloset{ + anchored = 1 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/light/small/directional/west, +/obj/structure/sign/warning/vacuum/external/directional/north, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat/foyer) +"ipQ" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/structure/sign/departments/psychology/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "iqh" = ( /obj/machinery/door/window{ name = "Captain's Desk"; @@ -23954,6 +24067,18 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/security/courtroom) +"irM" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/smartfridge/organ, +/obj/structure/sign/warning/cold_temp/directional/west, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/freezer, +/area/station/medical/coldroom) "irN" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -24280,11 +24405,6 @@ /obj/effect/spawner/random/trash/cigbutt, /turf/open/floor/iron/smooth, /area/station/maintenance/department/security) -"ixp" = ( -/obj/structure/sign/warning/vacuum/external/directional/north, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/hallway/secondary/entry) "ixu" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -24319,15 +24439,6 @@ /obj/machinery/newscaster/directional/east, /turf/open/floor/carpet, /area/station/security/detectives_office) -"ixT" = ( -/obj/structure/cable/multilayer/multiz, -/obj/structure/sign/warning/electric_shock/directional/east, -/obj/effect/turf_decal/stripes/end{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/maintenance/tram/left) "ixW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -24759,6 +24870,16 @@ /obj/machinery/portable_atmospherics/pump/lil_pump, /turf/open/floor/iron/dark, /area/station/science/ordnance/storage) +"iFG" = ( +/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/purple/filled/line{ + dir = 9 + }, +/obj/structure/sign/departments/cargo/directional/west, +/turf/open/floor/iron/white, +/area/station/science/research) "iFO" = ( /obj/structure/railing/corner{ dir = 1 @@ -24887,6 +25008,14 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/science/xenobiology) +"iHP" = ( +/obj/structure/cable/multilayer/multiz, +/obj/structure/sign/warning/electric_shock/directional/west, +/obj/effect/turf_decal/stripes/end{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/security) "iHT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -25641,6 +25770,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/commons/dorms) +"iWt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/obj/structure/sign/warning/secure_area/directional/east, +/turf/open/floor/iron, +/area/station/engineering/atmos) "iWz" = ( /obj/machinery/door/airlock/external/glass{ name = "Supply Door Airlock" @@ -25768,13 +25905,6 @@ /obj/effect/turf_decal/caution, /turf/open/floor/iron, /area/station/hallway/primary/tram/right) -"iXZ" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 8 - }, -/obj/structure/sign/departments/restroom/directional/west, -/turf/open/floor/iron, -/area/station/commons/dorms) "iYb" = ( /obj/structure/table, /obj/item/folder/yellow, @@ -25904,6 +26034,12 @@ /obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/security/lockers) +"jaM" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 9 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/hallway) "jaP" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/camera/directional/south{ @@ -25992,12 +26128,6 @@ }, /turf/open/floor/iron, /area/station/cargo/drone_bay) -"jcS" = ( -/obj/machinery/power/smes, -/obj/structure/sign/warning/electric_shock/directional/west, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/solars/starboard) "jcW" = ( /obj/machinery/requests_console/directional/south{ department = "Law Office"; @@ -26366,6 +26496,11 @@ /obj/structure/cable, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai) +"jkj" = ( +/obj/machinery/ntnet_relay, +/obj/structure/sign/warning/no_smoking/directional/south, +/turf/open/floor/circuit/telecomms/mainframe, +/area/station/tcommsat/server) "jkm" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -27041,6 +27176,13 @@ }, /turf/open/floor/iron, /area/station/maintenance/tram/mid) +"jwa" = ( +/obj/structure/sign/warning/vacuum/directional/north, +/obj/machinery/light/small/directional/west, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/smooth, +/area/station/hallway/primary/tram/center) "jwr" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/spawner/random/structure/girder, @@ -27455,6 +27597,13 @@ /obj/effect/turf_decal/trimline/white/filled/line, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) +"jDe" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 8 + }, +/obj/structure/sink/directional/east, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology) "jDi" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -27760,6 +27909,12 @@ }, /turf/open/floor/iron, /area/station/maintenance/port/central) +"jJj" = ( +/obj/structure/sign/warning/vacuum/external/directional/west, +/obj/effect/turf_decal/sand/plating, +/obj/machinery/light/small/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) "jJt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -28028,11 +28183,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/prison) -"jOt" = ( -/obj/structure/sign/warning/vacuum/external/directional/west, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) +"jOg" = ( +/obj/structure/cable, +/obj/structure/sink/kitchen/directional/east{ + desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; + name = "old sink" + }, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison/mess) "jOB" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, @@ -28142,6 +28300,20 @@ /obj/structure/cable/multilayer/connected, /turf/open/floor/iron, /area/station/engineering/engine_smes) +"jQk" = ( +/obj/structure/sink/directional/west, +/obj/structure/mirror/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet) +"jQr" = ( +/obj/structure/window/reinforced/spawner/east, +/obj/machinery/shower/directional/west, +/obj/item/bikehorn/rubberducky, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/freezer, +/area/station/security/prison/shower) "jQD" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -28266,12 +28438,6 @@ /obj/item/pipe_dispenser, /turf/open/floor/iron, /area/station/construction/mining/aux_base) -"jTa" = ( -/obj/structure/window/reinforced/spawner/west, -/obj/machinery/shower/directional/east, -/obj/structure/cable, -/turf/open/floor/iron/freezer, -/area/station/security/prison/shower) "jTk" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /obj/structure/lattice, @@ -28406,15 +28572,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/engineering/atmos/pumproom) -"jUY" = ( -/obj/structure/cable/multilayer/multiz, -/obj/structure/sign/warning/electric_shock/directional/east, -/obj/effect/turf_decal/stripes/end{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/hallway/primary/tram/left) "jVg" = ( /obj/machinery/status_display/evac/directional/east, /turf/open/floor/circuit/red, @@ -28422,13 +28579,6 @@ "jVw" = ( /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"jVD" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 4 - }, -/obj/structure/sink/directional/west, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "jVT" = ( /obj/structure/table, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -28472,6 +28622,13 @@ }, /turf/open/floor/vault, /area/station/hallway/primary/tram/center) +"jWF" = ( +/obj/structure/sign/warning/vacuum/directional/north, +/obj/machinery/light/small/directional/west, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/smooth, +/area/station/hallway/primary/tram/right) "jWG" = ( /obj/machinery/light/small/directional/north, /obj/structure/closet/firecloset, @@ -28557,6 +28714,23 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/medical) +"jXN" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/purple/filled/corner, +/obj/structure/sink/directional/east, +/obj/machinery/camera{ + c_tag = "Science - Left Entry Airlock"; + dir = 10; + network = list("ss13","rd") + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/science/research) "jXY" = ( /obj/machinery/door/airlock/command{ name = "Captain's Quarters" @@ -28920,17 +29094,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/station/hallway/secondary/service) -"keN" = ( -/obj/structure/sign/warning/vacuum/external/directional/west, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 9 - }, -/obj/structure/closet/emcloset, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/security/processing) "keX" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 @@ -29114,6 +29277,15 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor, /area/station/hallway/primary/tram/left) +"khI" = ( +/obj/effect/turf_decal/trimline/purple/filled/line, +/obj/machinery/shower/directional/north{ + name = "emergency shower" + }, +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/science/research) "khN" = ( /obj/machinery/door/airlock{ id_tag = "private_c"; @@ -29247,14 +29419,6 @@ /obj/effect/turf_decal/trimline/red/filled/corner, /turf/open/floor/iron, /area/station/security/office) -"kjc" = ( -/obj/structure/cable/multilayer/multiz, -/obj/structure/sign/warning/electric_shock/directional/west, -/obj/effect/turf_decal/stripes/end{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/science/research) "kjl" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -29548,6 +29712,17 @@ /obj/item/stock_parts/cell/high, /turf/open/floor/iron/dark, /area/station/command/bridge) +"kmU" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/sink/directional/east, +/obj/item/reagent_containers/glass/bucket, +/turf/open/floor/iron, +/area/station/security/prison/garden) "kna" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 @@ -30974,16 +31149,6 @@ "kMz" = ( /turf/open/floor/engine/cult, /area/station/service/library) -"kMD" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/brown/corner{ - dir = 1 - }, -/obj/structure/sign/departments/cargo/directional/north, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/right) "kMF" = ( /obj/machinery/modular_computer/console/preset/command, /obj/machinery/power/apc/auto_name/directional/north, @@ -31226,6 +31391,10 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/security/warden) +"kQE" = ( +/obj/structure/sink/kitchen/directional/west, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) "kQF" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 1 @@ -32031,22 +32200,6 @@ /obj/structure/fluff/tram_rail/anchor, /turf/open/openspace, /area/station/hallway/primary/tram/center) -"leQ" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/neutral/filled/warning{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/filled/corner{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/neutral/corner{ - dir = 1 - }, -/obj/structure/sign/departments/security/directional/east, -/turf/open/floor/iron, -/area/station/hallway/secondary/command) "lfc" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 8 @@ -32251,6 +32404,12 @@ }, /turf/open/floor/iron, /area/station/cargo/warehouse) +"liz" = ( +/obj/structure/window/reinforced/spawner/east, +/obj/machinery/shower/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/freezer, +/area/station/security/prison/shower) "liC" = ( /obj/machinery/porta_turret/ai{ dir = 4 @@ -32754,6 +32913,11 @@ }, /turf/open/floor/iron, /area/station/engineering/break_room) +"lrE" = ( +/obj/structure/sign/warning/vacuum/external/directional/west, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "lrG" = ( /obj/effect/turf_decal/sand/plating, /obj/item/flashlight/flare, @@ -33102,17 +33266,6 @@ }, /turf/open/floor/iron/white, /area/station/science/explab) -"lwU" = ( -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/sign/departments/chemistry/directional/south, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "lwV" = ( /obj/machinery/camera/emp_proof{ c_tag = "Engineering - Atmospherics Plasma Chamber"; @@ -33290,18 +33443,6 @@ /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/iron/dark, /area/station/service/chapel) -"lzi" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 10 - }, -/obj/structure/sink/directional/east, -/obj/machinery/status_display/evac/directional/west, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/iron/white, -/area/station/medical/surgery/aft) "lzo" = ( /obj/machinery/door/window/left/directional/south, /turf/open/floor/grass, @@ -33427,6 +33568,12 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron/white, /area/station/command/heads_quarters/captain/private) +"lBw" = ( +/obj/structure/sign/warning/radiation/rad_area/directional/north, +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/gravity_generator) "lBB" = ( /obj/machinery/computer/secure_data, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -33466,6 +33613,13 @@ "lCy" = ( /turf/closed/wall/r_wall, /area/station/hallway/secondary/exit) +"lCA" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/obj/structure/sink/directional/west, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology) "lCE" = ( /obj/machinery/light/small/directional/south, /obj/structure/closet/emcloset, @@ -33919,6 +34073,14 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/white, /area/station/service/kitchen) +"lMu" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/sink/directional/south, +/turf/open/floor/iron, +/area/station/cargo/miningdock/cafeteria) "lMw" = ( /obj/machinery/door/airlock{ id_tag = "Toilet3"; @@ -34054,6 +34216,15 @@ /obj/item/clothing/head/festive, /turf/open/floor/eighties/red, /area/station/commons/fitness/recreation/entertainment) +"lPb" = ( +/obj/structure/cable/multilayer/multiz, +/obj/structure/sign/warning/electric_shock/directional/east, +/obj/effect/turf_decal/stripes/end{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/hallway/primary/tram/left) "lPe" = ( /obj/structure/closet/radiation, /obj/effect/turf_decal/stripes/line{ @@ -34310,11 +34481,6 @@ }, /turf/open/floor/catwalk_floor, /area/station/maintenance/starboard/central) -"lTH" = ( -/obj/machinery/light/small/directional/west, -/obj/machinery/shower/directional/south, -/turf/open/floor/iron/freezer, -/area/station/security/prison) "lTP" = ( /obj/structure/stairs/south, /turf/open/floor/iron/stairs/medium{ @@ -34746,6 +34912,12 @@ "mbJ" = ( /turf/closed/wall, /area/station/maintenance/tram/right) +"mbQ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/warning/electric_shock/directional/north, +/obj/structure/cable, +/turf/open/floor/catwalk_floor, +/area/station/hallway/primary/tram/left) "mbX" = ( /obj/effect/spawner/structure/window, /obj/machinery/door/poddoor/shutters/preopen{ @@ -34927,15 +35099,6 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/genetics) -"mfz" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 8 - }, -/obj/machinery/light/directional/west, -/obj/structure/sign/warning/secure_area/directional/west, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/station/security/office) "mfC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -34954,6 +35117,19 @@ }, /turf/open/floor/engine/cult, /area/station/service/library) +"mfT" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 5 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/sink/directional/south, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "mfU" = ( /obj/structure/frame/machine, /obj/effect/decal/cleanable/dirt, @@ -35376,14 +35552,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/service/chapel/monastery) -"mlP" = ( -/obj/structure/sign/warning/vacuum/external/directional/west, -/obj/effect/turf_decal/sand/plating, -/obj/machinery/light/small/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/starboard/greater) "mlS" = ( /obj/structure/rack, /obj/structure/window/reinforced, @@ -35535,6 +35703,13 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron/dark, /area/station/medical/storage) +"mof" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/warning/vacuum/directional/north, +/obj/machinery/light/small/directional/east, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/smooth, +/area/station/hallway/primary/tram/center) "moi" = ( /obj/machinery/door/airlock/research{ id_tag = "ResearchExt"; @@ -35885,10 +36060,6 @@ }, /turf/open/floor/catwalk_floor, /area/station/maintenance/port/central) -"mtW" = ( -/obj/machinery/shower/directional/west, -/turf/open/floor/iron/freezer, -/area/station/security/prison/shower) "mub" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 1 @@ -36442,6 +36613,11 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/exit) +"mBU" = ( +/obj/effect/turf_decal/stripes/line, +/mob/living/simple_animal/bot/secbot/beepsky/armsky, +/turf/open/floor/iron, +/area/station/ai_monitored/security/armory) "mBV" = ( /obj/structure/rack, /obj/item/reagent_containers/glass/bottle/mercury{ @@ -36495,14 +36671,11 @@ }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) -"mCS" = ( -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 5 - }, -/obj/structure/sink/directional/south, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron/white, -/area/station/medical/virology) +"mCT" = ( +/obj/machinery/light/small/directional/west, +/obj/machinery/shower/directional/north, +/turf/open/floor/iron/freezer, +/area/station/security/prison) "mDg" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, /obj/structure/sign/gym/mirrored/right{ @@ -36654,13 +36827,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/tram/mid) -"mFl" = ( -/obj/structure/sign/warning/vacuum/directional/north, -/obj/machinery/light/small/directional/west, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron/smooth, -/area/station/hallway/primary/tram/right) "mFm" = ( /obj/machinery/mecha_part_fabricator, /obj/effect/turf_decal/bot, @@ -36754,20 +36920,6 @@ /obj/effect/turf_decal/trimline/neutral/filled/corner, /turf/open/floor/iron, /area/station/hallway/secondary/service) -"mGA" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 9 - }, -/obj/machinery/camera/directional/west{ - c_tag = "Medical - Surgery Room A"; - network = list("ss13","medbay") - }, -/obj/structure/sink/directional/east, -/obj/machinery/status_display/evac/directional/west, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/iron/white, -/area/station/medical/surgery/fore) "mGG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, @@ -36857,18 +37009,6 @@ }, /turf/open/floor/iron, /area/station/security/prison) -"mHG" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 1 - }, -/obj/structure/sign/warning/electric_shock/directional/west, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "mHM" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -36881,13 +37021,6 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/iron/grimy, /area/station/service/library/lounge) -"mIa" = ( -/obj/structure/sign/warning/radiation/rad_area/directional/north, -/obj/effect/turf_decal/siding/wideplating{ - dir = 10 - }, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/command/nuke_storage) "mIi" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -36996,6 +37129,13 @@ /obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"mJO" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/obj/structure/sign/departments/chemistry/pharmacy/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/tram/center) "mKv" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 1 @@ -37363,11 +37503,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/service/hydroponics) -"mQc" = ( -/obj/effect/turf_decal/trimline/purple/filled/line, -/obj/structure/sign/warning/biohazard/directional/south, -/turf/open/floor/iron/white, -/area/station/science/research) "mQi" = ( /obj/structure/lattice/catwalk, /obj/structure/railing, @@ -37612,6 +37747,18 @@ }, /turf/open/floor/iron/white, /area/station/medical/chemistry) +"mUE" = ( +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 1 + }, +/obj/structure/sign/departments/cargo/directional/north, +/obj/effect/turf_decal/trimline/neutral/filled/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/hallway/primary/tram/right) "mUM" = ( /obj/machinery/door/airlock/security{ name = "Prison Workshop" @@ -38538,15 +38685,6 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/iron, /area/station/cargo/qm) -"nku" = ( -/obj/structure/cable/multilayer/multiz, -/obj/structure/sign/warning/electric_shock/directional/west, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/cargo/storage) "nkx" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -39238,18 +39376,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/commons/dorms) -"nwU" = ( -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 10 - }, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/structure/sign/warning/deathsposal/directional/south, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark, -/area/station/medical/virology) "nwX" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, @@ -39425,6 +39551,18 @@ /obj/structure/railing, /turf/open/floor/plating, /area/station/maintenance/tram/mid) +"nAm" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/suit/utility/radiation, +/obj/item/clothing/head/radiation, +/obj/item/clothing/glasses/meson, +/obj/item/geiger_counter, +/obj/item/geiger_counter, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "nAN" = ( /obj/effect/decal/cleanable/dirt, /obj/item/chair, @@ -39668,14 +39806,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/engine/n2, /area/station/engineering/atmos) -"nGz" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/mirror/directional/west, -/obj/structure/sink/directional/east, -/turf/open/floor/iron/dark, -/area/station/science/genetics) "nGZ" = ( /obj/effect/turf_decal/siding/thinplating/dark, /obj/structure/chair{ @@ -39714,6 +39844,11 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/research) +"nHj" = ( +/obj/machinery/shower/directional/north, +/obj/structure/curtain, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet) "nHx" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -39993,6 +40128,11 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/command) +"nNK" = ( +/obj/machinery/shower/directional/south, +/obj/structure/curtain, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/captain/private) "nNL" = ( /obj/structure/chair{ dir = 4 @@ -40039,6 +40179,15 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"nOm" = ( +/obj/structure/sign/warning/vacuum/directional/south, +/obj/machinery/light/small/directional/west, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/smooth, +/area/station/hallway/primary/tram/right) "nOq" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/iron, @@ -40387,6 +40536,25 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/foyer) +"nWi" = ( +/obj/structure/table/reinforced, +/obj/structure/window/reinforced, +/obj/item/defibrillator/loaded{ + pixel_y = 6 + }, +/obj/effect/turf_decal/siding/white, +/obj/machinery/door/window/left/directional/west{ + name = "Secure Medical Storage"; + req_access = list("medical") + }, +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/item/clothing/glasses/blindfold, +/obj/item/clothing/glasses/blindfold, +/obj/item/clothing/ears/earmuffs, +/obj/item/clothing/ears/earmuffs, +/turf/open/floor/iron/dark, +/area/station/medical/storage) "nWj" = ( /obj/effect/spawner/random/structure/crate_empty, /obj/effect/spawner/random/engineering/flashlight, @@ -40459,6 +40627,13 @@ "nWZ" = ( /turf/open/floor/plating, /area/space) +"nXf" = ( +/obj/structure/sign/warning/radiation/rad_area/directional/north, +/obj/effect/turf_decal/siding/wideplating{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) "nXp" = ( /obj/structure/floodlight_frame, /turf/open/misc/asteroid, @@ -40567,14 +40742,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/tram/left) -"nZI" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/airalarm/directional/east, -/turf/open/floor/iron/white, -/area/station/science/research) "nZS" = ( /obj/structure/closet/l3closet/security, /turf/open/floor/iron/showroomfloor, @@ -41297,14 +41464,6 @@ "omc" = ( /turf/open/floor/iron/white, /area/station/service/kitchen) -"oml" = ( -/obj/effect/turf_decal/trimline/purple/filled/line, -/obj/effect/turf_decal/trimline/neutral/filled/warning, -/obj/structure/sign/departments/science/directional/south, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/right) "omm" = ( /turf/closed/wall, /area/station/maintenance/department/security) @@ -41416,11 +41575,6 @@ /obj/effect/spawner/random/trash/food_packaging, /turf/open/floor/catwalk_floor, /area/station/maintenance/tram/right) -"opG" = ( -/obj/machinery/shower/directional/south, -/obj/structure/curtain, -/turf/open/floor/iron/white, -/area/station/command/heads_quarters/captain/private) "opH" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -41670,14 +41824,6 @@ }, /turf/open/floor/iron/dark, /area/station/medical/morgue) -"otT" = ( -/obj/effect/turf_decal/trimline/neutral/filled/corner, -/obj/structure/disposalpipe/segment, -/obj/structure/sign/departments/evac/directional/east{ - pixel_y = -32 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/right) "ouJ" = ( /obj/effect/turf_decal/siding/thinplating{ dir = 9 @@ -41693,14 +41839,6 @@ }, /turf/open/floor/iron, /area/station/ai_monitored/security/armory) -"ouO" = ( -/obj/structure/mirror/directional/north, -/obj/structure/sink/directional/south, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/freezer, -/area/station/science/lower) "ouV" = ( /obj/effect/turf_decal/sand/plating, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, @@ -41712,22 +41850,6 @@ }, /turf/open/floor/engine, /area/station/science/xenobiology) -"ovs" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/filled/warning{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/red/filled/corner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/neutral/corner{ - dir = 4 - }, -/obj/structure/sign/departments/security/directional/west, -/turf/open/floor/iron, -/area/station/hallway/secondary/command) "ovz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -41749,25 +41871,6 @@ /obj/machinery/air_sensor/plasma_tank, /turf/open/floor/engine/plasma, /area/station/engineering/atmos) -"owb" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 1 - }, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/iron/white, -/area/station/science/research) -"owh" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/machinery/smartfridge/organ, -/obj/structure/sign/warning/cold_temp/directional/west, -/obj/machinery/light/directional/west, -/turf/open/floor/iron/freezer, -/area/station/medical/coldroom) "owl" = ( /obj/effect/turf_decal/weather/snow, /obj/effect/turf_decal/weather/snow/corner{ @@ -42272,14 +42375,6 @@ }, /turf/open/space/basic, /area/space/nearstation) -"oGm" = ( -/obj/machinery/shower/directional/west, -/obj/effect/turf_decal/box, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/main) "oGu" = ( /obj/machinery/door/airlock/public/glass{ name = "Barbershop" @@ -42514,6 +42609,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/command/bridge) +"oKf" = ( +/obj/effect/turf_decal/trimline/purple/filled/line, +/obj/structure/sign/departments/xenobio/directional/south, +/turf/open/floor/iron/white, +/area/station/science/research) "oKy" = ( /obj/structure/closet/crate, /obj/effect/turf_decal/stripes/corner{ @@ -42538,17 +42638,6 @@ /mob/living/simple_animal/bot/floorbot, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/maint) -"oLf" = ( -/obj/structure/closet{ - name = "Beekeeper Uniform" - }, -/obj/item/clothing/suit/beekeeper_suit, -/obj/item/clothing/head/beekeeper_head, -/obj/item/melee/flyswatter, -/obj/effect/turf_decal/trimline/green/filled/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/service/hydroponics) "oLl" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 1 @@ -42661,17 +42750,6 @@ }, /turf/open/floor/iron/white, /area/station/science/lobby) -"oMB" = ( -/obj/structure/cable, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/sink/directional/east, -/obj/item/reagent_containers/glass/bucket, -/turf/open/floor/iron, -/area/station/security/prison/garden) "oMI" = ( /turf/open/openspace, /area/station/ai_monitored/turret_protected/aisat/hallway) @@ -42969,6 +43047,22 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/iron, /area/station/maintenance/tram/left) +"oRD" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/filled/warning{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/red/filled/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/corner{ + dir = 1 + }, +/obj/structure/sign/departments/security/directional/east, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) "oRE" = ( /obj/item/bedsheet/dorms_double{ dir = 4 @@ -43269,17 +43363,6 @@ /obj/effect/turf_decal/caution, /turf/open/floor/iron, /area/station/hallway/primary/tram/left) -"oVP" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line, -/obj/structure/cable, -/obj/structure/sign/departments/holy/directional/south, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/iron, -/area/station/commons/fitness/recreation) "oVU" = ( /obj/effect/turf_decal/tile{ dir = 1 @@ -43771,20 +43854,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/hallway/primary/tram/right) -"peD" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/warning/vacuum/directional/south, -/obj/machinery/light/small/directional/east, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron/smooth, -/area/station/hallway/primary/tram/center) -"peI" = ( -/obj/structure/cable, -/obj/structure/sink/directional/south, -/turf/open/floor/iron/freezer, -/area/station/security/prison) "peP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/cafeteria, @@ -43959,6 +44028,15 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +"pit" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 6 + }, +/obj/structure/sign/warning/no_smoking/directional/south, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/main) "piG" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/grille, @@ -43989,6 +44067,13 @@ "piX" = ( /turf/open/floor/engine/n2o, /area/station/engineering/atmos) +"piZ" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 5 + }, +/obj/structure/sign/warning/rad_shelter/directional/north, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit) "pjc" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, /obj/machinery/camera/directional/south{ @@ -44164,13 +44249,6 @@ }, /turf/open/floor/iron, /area/station/security/prison) -"plV" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, -/obj/structure/sink/directional/west, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "plY" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/duct, @@ -44457,6 +44535,11 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/checkpoint/science) +"ppw" = ( +/obj/machinery/shower/directional/south, +/obj/structure/curtain, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet) "ppC" = ( /obj/effect/turf_decal/siding/thinplating{ dir = 8 @@ -44981,6 +45064,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/cargo/warehouse) +"pxF" = ( +/obj/structure/sink/directional/south, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 5 + }, +/obj/machinery/newscaster/directional/east, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) "pxS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/trimline/purple/filled/corner{ @@ -45741,11 +45832,6 @@ /obj/structure/ladder, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) -"pMS" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/structure/sign/warning/secure_area/directional/south, -/turf/open/floor/iron, -/area/station/tcommsat/computer) "pMX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -45890,18 +45976,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/atmospherics_engine) -"pPo" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 4 - }, -/obj/structure/disposalpipe/junction/flip{ - dir = 1 - }, -/obj/structure/cable, -/obj/structure/sign/warning/secure_area/directional/east, -/turf/open/floor/iron/white, -/area/station/science/lower) "pPp" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 1 @@ -46133,10 +46207,6 @@ /obj/structure/rack, /turf/open/floor/iron/dark, /area/station/cargo/miningdock/oresilo) -"pUm" = ( -/obj/structure/sign/departments/engineering/directional/east, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "pUn" = ( /obj/effect/turf_decal/siding/wideplating/corner{ dir = 8 @@ -46226,14 +46296,6 @@ /obj/structure/fluff/tram_rail/floor, /turf/open/floor/iron, /area/station/hallway/primary/tram/right) -"pVH" = ( -/obj/structure/sink/directional/south, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 5 - }, -/obj/machinery/newscaster/directional/east, -/turf/open/floor/iron/dark, -/area/station/service/hydroponics) "pVJ" = ( /obj/machinery/seed_extractor, /obj/effect/turf_decal/tile/green/fourcorners, @@ -46560,12 +46622,6 @@ }, /turf/open/floor/wood, /area/station/service/bar/backroom) -"qaJ" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "qaL" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -46595,6 +46651,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor, /area/station/maintenance/department/security) +"qbb" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/obj/machinery/shower/directional/south, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/virology) "qbu" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 @@ -46973,13 +47038,6 @@ /obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/iron/dark, /area/station/command/bridge) -"qhs" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 4 - }, -/obj/structure/sign/departments/chemistry/pharmacy/directional/east, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/center) "qhC" = ( /obj/machinery/duct, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -47085,13 +47143,6 @@ /obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/iron/showroomfloor, /area/station/security/warden) -"qiK" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 8 - }, -/obj/structure/sink/directional/east, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "qiL" = ( /obj/structure/ladder, /obj/effect/decal/cleanable/dirt, @@ -47123,13 +47174,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/primary/tram/center) -"qjj" = ( -/obj/structure/sign/warning/vacuum/external/directional/south, -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos) "qjw" = ( /obj/machinery/computer/secure_data, /obj/machinery/requests_console/directional/north{ @@ -47226,15 +47270,6 @@ }, /turf/open/openspace, /area/station/security/brig) -"qkt" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 9 - }, -/obj/machinery/shower/directional/south, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/machinery/firealarm/directional/west, -/turf/open/floor/iron/white, -/area/station/medical/virology) "qkx" = ( /obj/machinery/door/airlock/research{ name = "Ordnance Lab" @@ -47255,6 +47290,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/starboard/central) +"qkP" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/obj/structure/sign/warning/secure_area/directional/west, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/security/office) "qkS" = ( /obj/machinery/atmospherics/components/unary/thermomachine/heater{ dir = 8 @@ -47279,6 +47323,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/cafeteria, /area/station/commons/dorms/laundry) +"qlQ" = ( +/obj/structure/cable/multilayer/multiz, +/obj/structure/sign/warning/electric_shock/directional/west, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/cargo/storage) "qlU" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ dir = 4 @@ -47936,6 +47989,13 @@ /obj/effect/decal/cleanable/dirt, /turf/closed/wall/r_wall, /area/station/maintenance/starboard/lesser) +"qyb" = ( +/obj/structure/sign/warning/radiation/rad_area/directional/north, +/obj/effect/turf_decal/siding/wideplating{ + dir = 10 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) "qyf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -48020,22 +48080,19 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) -"qzl" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/structure/sign/warning/secure_area/directional/north{ - name = "HIGH SECURITY STORAGE" - }, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/command/nuke_storage) "qzn" = ( /obj/machinery/vending/wardrobe/curator_wardrobe, /turf/open/floor/engine/cult, /area/station/service/library) +"qzM" = ( +/obj/structure/sign/warning/vacuum/directional/south, +/obj/machinery/light/small/directional/west, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/smooth, +/area/station/hallway/primary/tram/center) "qzP" = ( /obj/item/radio/intercom/directional/south, /obj/structure/bed/dogbed/renault, @@ -48238,6 +48295,14 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/security/warden) +"qEI" = ( +/obj/structure/sink/directional/east, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) "qEL" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -48595,18 +48660,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"qJe" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/machinery/light/directional/east, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 1 - }, -/obj/structure/sign/warning/electric_shock/directional/east, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "qJh" = ( /obj/structure/railing/corner{ dir = 1 @@ -48717,6 +48770,17 @@ /obj/machinery/newscaster/directional/east, /turf/open/floor/iron/grimy, /area/station/hallway/secondary/entry) +"qLj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/structure/sign/warning/secure_area/directional/east, +/turf/open/floor/iron/white, +/area/station/science/lower) "qLp" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot{ @@ -48902,13 +48966,6 @@ "qPa" = ( /turf/closed/wall/rust, /area/station/maintenance/port/fore) -"qPe" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/obj/structure/sink/directional/east, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "qPw" = ( /obj/machinery/power/emitter/welded{ dir = 8 @@ -48951,6 +49008,14 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"qQV" = ( +/obj/structure/sign/warning/vacuum/external/directional/west, +/obj/effect/turf_decal/sand/plating, +/obj/machinery/light/small/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) "qQX" = ( /obj/structure/fluff/tram_rail/end{ dir = 1 @@ -49125,14 +49190,6 @@ /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/open/floor/iron/dark, /area/station/science/ordnance/storage) -"qUs" = ( -/obj/structure/window/reinforced/spawner/east, -/obj/structure/sign/departments/medbay/alt/directional/north, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 5 - }, -/turf/open/floor/iron/white, -/area/station/security/medical) "qUy" = ( /obj/machinery/camera/directional/south{ c_tag = "Civilian - Holodeck South"; @@ -49918,13 +49975,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/engine_smes) -"rjM" = ( -/obj/structure/sink/kitchen/directional/west{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink" - }, -/turf/open/floor/wood, -/area/station/service/bar/backroom) "rkd" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 8 @@ -49964,13 +50014,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/service/hydroponics/garden) -"rkB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/ai_monitored/security/armory) "rkE" = ( /obj/machinery/light/small/directional/north, /turf/open/floor/engine, @@ -50103,17 +50146,6 @@ /obj/item/candle, /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/central) -"rmW" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line, -/obj/structure/cable, -/obj/structure/sign/departments/holy/directional/south, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/iron, -/area/station/commons/fitness/recreation) "rnc" = ( /obj/structure/table/wood, /obj/item/folder/blue, @@ -50278,18 +50310,6 @@ /obj/effect/turf_decal/bot_white, /turf/open/floor/iron/white, /area/station/service/kitchen) -"rqd" = ( -/obj/structure/sign/warning/radiation/rad_area/directional/north{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/hallway/secondary/construction/engineering) "rqi" = ( /obj/structure/table/wood, /obj/structure/window/reinforced{ @@ -50378,12 +50398,6 @@ }, /turf/open/floor/iron/dark, /area/station/service/bar) -"rrq" = ( -/obj/structure/sign/warning/vacuum/external/directional/west, -/obj/effect/turf_decal/sand/plating, -/obj/machinery/light/small/directional/east, -/turf/open/floor/plating, -/area/station/maintenance/starboard/greater) "rrr" = ( /obj/effect/turf_decal/trimline/brown/filled/corner{ dir = 1 @@ -50454,6 +50468,10 @@ /obj/structure/cable, /turf/open/floor/circuit, /area/station/ai_monitored/command/nuke_storage) +"rsP" = ( +/obj/machinery/shower/directional/west, +/turf/open/floor/iron/freezer, +/area/station/security/prison/shower) "rsX" = ( /obj/structure/rack, /obj/item/storage/toolbox/mechanical{ @@ -50622,14 +50640,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) -"rvU" = ( -/obj/structure/sink/directional/east, -/obj/structure/extinguisher_cabinet/directional/west, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/service/hydroponics/garden) "rww" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 9 @@ -51035,6 +51045,11 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) +"rCt" = ( +/obj/structure/mirror/directional/north, +/obj/structure/sink/directional/south, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/captain/private) "rCv" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 1 @@ -51139,6 +51154,18 @@ /obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/iron, /area/station/science/research) +"rDo" = ( +/obj/structure/sign/warning/radiation/rad_area/directional/north{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/secondary/construction/engineering) "rDI" = ( /obj/effect/turf_decal/trimline/white/line{ dir = 1 @@ -51550,6 +51577,16 @@ }, /turf/open/misc/asteroid/snow/coldroom, /area/station/service/kitchen/coldroom) +"rKz" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/brown/corner{ + dir = 1 + }, +/obj/structure/sign/departments/cargo/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/tram/right) "rKC" = ( /obj/effect/turf_decal/siding/thinplating{ dir = 8 @@ -51677,14 +51714,6 @@ }, /turf/open/floor/iron, /area/station/cargo/miningdock/cafeteria) -"rMw" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 4 - }, -/obj/structure/sign/warning/secure_area/directional/east, -/turf/open/floor/iron, -/area/station/engineering/atmos) "rMA" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner, /obj/effect/turf_decal/trimline/neutral/filled/corner{ @@ -52022,13 +52051,6 @@ /obj/structure/fluff/tram_rail, /turf/open/openspace, /area/station/hallway/primary/tram/center) -"rQb" = ( -/obj/structure/sink/kitchen/directional/east{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink" - }, -/turf/open/floor/iron/cafeteria, -/area/station/service/kitchen) "rQl" = ( /obj/structure/chair/stool/directional/south, /obj/effect/landmark/start/assistant, @@ -52294,13 +52316,6 @@ /obj/machinery/computer/security/telescreen/entertainment/directional/south, /turf/open/floor/iron/grimy, /area/station/service/library/lounge) -"rUx" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/warning/vacuum/directional/north, -/obj/machinery/light/small/directional/east, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron/smooth, -/area/station/hallway/primary/tram/center) "rUD" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -52973,25 +52988,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/office) -"shl" = ( -/obj/structure/table/reinforced, -/obj/structure/window/reinforced, -/obj/item/defibrillator/loaded{ - pixel_y = 6 - }, -/obj/effect/turf_decal/siding/white, -/obj/machinery/door/window/left/directional/west{ - name = "Secure Medical Storage"; - req_access = list("medical") - }, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/glasses/blindfold, -/obj/item/clothing/glasses/blindfold, -/obj/item/clothing/ears/earmuffs, -/obj/item/clothing/ears/earmuffs, -/turf/open/floor/iron/dark, -/area/station/medical/storage) "shR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment, @@ -53080,6 +53076,18 @@ /obj/machinery/light/directional/north, /turf/open/floor/carpet, /area/station/command/heads_quarters/hos) +"slr" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 + }, +/obj/structure/sink/directional/east, +/obj/machinery/status_display/evac/directional/west, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/surgery/aft) "slA" = ( /obj/structure/table, /obj/machinery/recharger{ @@ -53798,14 +53806,6 @@ }, /turf/open/floor/iron/white, /area/station/science/robotics/lab) -"syq" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/sign/warning/secure_area/directional/north{ - desc = "A warning sign which reads 'SERVER ROOM'."; - name = "SERVER ROOM" - }, -/turf/open/floor/plating, -/area/station/science/server) "syv" = ( /turf/closed/wall/r_wall, /area/station/security/checkpoint/science) @@ -54307,15 +54307,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/security/checkpoint/science) -"sIP" = ( -/obj/structure/cable/multilayer/multiz, -/obj/structure/sign/warning/electric_shock/directional/west, -/obj/effect/turf_decal/stripes/end{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/maintenance/tram/right) "sJg" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -54366,6 +54357,13 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) +"sKn" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/structure/sink/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "sKt" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, @@ -54893,6 +54891,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/engineering/atmospherics_engine) +"sTB" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/obj/structure/sign/warning/engine_safety/directional/west, +/turf/open/floor/iron, +/area/station/engineering/break_room) "sTH" = ( /obj/machinery/computer/secure_data{ dir = 1 @@ -54904,6 +54909,18 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/command/gateway) +"sTK" = ( +/obj/machinery/power/smes/engineering, +/obj/machinery/light/directional/west, +/obj/structure/sign/warning/electric_shock/directional/west, +/obj/machinery/camera/emp_proof{ + c_tag = "Engineering - SMES"; + dir = 10; + network = list("ss13","engineering") + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/engine_smes) "sTN" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 8 @@ -55177,6 +55194,17 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"sYi" = ( +/obj/structure/closet{ + name = "Beekeeper Uniform" + }, +/obj/item/clothing/suit/utility/beekeeper_suit, +/obj/item/clothing/head/beekeeper_head, +/obj/item/melee/flyswatter, +/obj/effect/turf_decal/trimline/green/filled/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) "sYs" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -55414,18 +55442,6 @@ "tby" = ( /turf/open/floor/iron/white, /area/station/science/research) -"tbH" = ( -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 1 - }, -/obj/structure/sign/departments/cargo/directional/north, -/obj/effect/turf_decal/trimline/neutral/filled/warning{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/right) "tce" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash/cigbutt, @@ -55542,17 +55558,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/port/central) -"teS" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/shower/directional/west, -/obj/item/radio/intercom/directional/east, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "tfk" = ( /obj/machinery/firealarm/directional/north, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -55620,6 +55625,14 @@ /obj/machinery/newscaster/directional/west, /turf/open/floor/iron, /area/station/commons/dorms) +"tgI" = ( +/obj/structure/cable/multilayer/multiz, +/obj/structure/sign/warning/electric_shock/directional/west, +/obj/effect/turf_decal/stripes/end{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/science/research) "tgO" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ dir = 1 @@ -55735,6 +55748,15 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/science/research) +"tjm" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/warning/vacuum/directional/south, +/obj/machinery/light/small/directional/east, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/smooth, +/area/station/hallway/primary/tram/center) "tjs" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -55871,6 +55893,13 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/station/hallway/primary/tram/right) +"tlQ" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/machinery/shower/directional/north, +/obj/effect/turf_decal/box, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/main) "tlZ" = ( /turf/open/floor/iron/cafeteria, /area/station/security/prison) @@ -55934,6 +55963,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/freezer, /area/station/security/prison/shower) +"tmP" = ( +/obj/effect/turf_decal/trimline/purple/filled/line, +/obj/structure/sign/warning/biohazard/directional/south, +/turf/open/floor/iron/white, +/area/station/science/research) "tmS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -55995,11 +56029,6 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"tnH" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "tnY" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 5 @@ -56643,14 +56672,6 @@ /obj/effect/turf_decal/trimline/purple/filled/line, /turf/open/floor/iron/white, /area/station/science/cytology) -"twe" = ( -/obj/structure/sign/warning/vacuum/external/directional/east, -/obj/machinery/computer/security/labor, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 5 - }, -/turf/open/floor/iron, -/area/station/security/processing) "twf" = ( /obj/machinery/computer/rdservercontrol, /obj/machinery/light/directional/north, @@ -56732,6 +56753,11 @@ }, /turf/open/floor/iron, /area/station/security/brig) +"txM" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/structure/sign/warning/secure_area/directional/south, +/turf/open/floor/iron, +/area/station/tcommsat/computer) "txR" = ( /obj/structure/table, /obj/effect/spawner/random/entertainment/dice, @@ -57224,11 +57250,6 @@ /obj/effect/turf_decal/siding/thinplating, /turf/open/floor/iron, /area/station/hallway/secondary/service) -"tGG" = ( -/obj/machinery/ntnet_relay, -/obj/structure/sign/warning/no_smoking/directional/south, -/turf/open/floor/circuit/telecomms/mainframe, -/area/station/tcommsat/server) "tGI" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/computer/turbine_computer{ @@ -57341,6 +57362,13 @@ /obj/machinery/oven, /turf/open/floor/iron/white, /area/station/service/kitchen) +"tJk" = ( +/obj/structure/sink/kitchen/directional/east{ + desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; + name = "old sink" + }, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) "tJl" = ( /obj/structure/window/reinforced, /obj/structure/table/wood, @@ -57439,17 +57467,6 @@ }, /turf/open/floor/iron/dark, /area/station/commons/fitness) -"tKB" = ( -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 6 - }, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/structure/sign/warning/deathsposal/directional/south, -/turf/open/floor/iron/white, -/area/station/medical/virology) "tKH" = ( /obj/machinery/suit_storage_unit/captain, /turf/open/floor/wood, @@ -57499,18 +57516,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/engine/co2, /area/station/engineering/atmos) -"tLR" = ( -/obj/effect/turf_decal/trimline/yellow/warning, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 1 - }, -/obj/structure/sign/warning/docking/directional/north{ - desc = "A warning sign which reads 'KEEP CLEAR OF TRAM DOCKING AREA'."; - name = "KEEP CLEAR: TRAM DOCKING AREA sign" - }, -/turf/open/floor/iron, -/area/station/maintenance/tram/left) "tLS" = ( /obj/structure/chair/office{ dir = 1 @@ -57638,15 +57643,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/atmos) -"tPr" = ( -/obj/effect/turf_decal/trimline/purple/filled/line, -/obj/machinery/shower/directional/north{ - name = "emergency shower" - }, -/obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/science/research) "tPw" = ( /obj/effect/turf_decal/siding/thinplating/dark/corner{ dir = 1 @@ -57659,6 +57655,13 @@ "tPE" = ( /turf/closed/wall, /area/station/hallway/secondary/entry) +"tPH" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 4 + }, +/obj/structure/sink/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/virology) "tPR" = ( /turf/open/floor/wood, /area/command/heads_quarters/captain/private/nt_rep) @@ -58006,18 +58009,6 @@ }, /turf/open/floor/carpet, /area/station/service/library) -"tVV" = ( -/obj/machinery/power/smes/engineering, -/obj/machinery/light/directional/west, -/obj/structure/sign/warning/electric_shock/directional/west, -/obj/machinery/camera/emp_proof{ - c_tag = "Engineering - SMES"; - dir = 10; - network = list("ss13","engineering") - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/engine_smes) "tWb" = ( /obj/machinery/camera/directional/east{ c_tag = "Civilian - Theatre Stage" @@ -58377,15 +58368,6 @@ }, /turf/open/floor/iron, /area/station/science/robotics/lab) -"ucD" = ( -/obj/structure/cable/multilayer/multiz, -/obj/structure/sign/warning/electric_shock/directional/west, -/obj/effect/turf_decal/stripes/end{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/maintenance/central/greater) "ucE" = ( /obj/effect/landmark/start/bartender, /turf/open/floor/iron/dark, @@ -58487,15 +58469,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/courtroom) -"uek" = ( -/obj/structure/cable/multilayer/multiz, -/obj/effect/turf_decal/stripes/end{ - dir = 4 - }, -/obj/structure/sign/warning/electric_shock/directional/west, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/hallway/primary/tram/right) "uem" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -58742,6 +58715,18 @@ "uid" = ( /turf/open/floor/eighties, /area/station/commons/fitness/recreation/entertainment) +"uij" = ( +/obj/machinery/shower/directional/west, +/obj/effect/turf_decal/box, +/obj/structure/fluff{ + desc = "What, you think the water just magically soaks into the metallic flooring?"; + icon = 'icons/obj/lavaland/survival_pod.dmi'; + icon_state = "fan_tiny"; + name = "shower drain" + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "uim" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 8 @@ -58815,6 +58800,11 @@ }, /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) +"ujz" = ( +/obj/vehicle/ridden/secway, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "ujC" = ( /obj/structure/chair{ dir = 1 @@ -58896,14 +58886,6 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/dark, /area/station/security/interrogation) -"ulq" = ( -/obj/structure/cable/multilayer/multiz, -/obj/structure/sign/warning/electric_shock/directional/west, -/obj/effect/turf_decal/stripes/end{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/maintenance/department/security) "ulK" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrous_output{ dir = 8 @@ -58932,11 +58914,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/maintenance/tram/left) -"umd" = ( -/obj/machinery/light/small/directional/west, -/obj/machinery/shower/directional/north, -/turf/open/floor/iron/freezer, -/area/station/security/prison) "ume" = ( /obj/structure/sign/warning/docking, /turf/closed/wall, @@ -59337,11 +59314,6 @@ "usY" = ( /turf/closed/wall/r_wall, /area/station/maintenance/department/cargo) -"utb" = ( -/obj/structure/mirror/directional/north, -/obj/structure/sink/directional/south, -/turf/open/floor/iron/white, -/area/station/command/heads_quarters/captain/private) "uti" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash/food_packaging, @@ -59462,15 +59434,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) -"uuZ" = ( -/obj/structure/sign/warning/vacuum/directional/south, -/obj/machinery/light/small/directional/west, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron/smooth, -/area/station/hallway/primary/tram/right) "uva" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -59532,13 +59495,6 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor, /area/station/maintenance/starboard/greater) -"uvO" = ( -/obj/structure/window/reinforced/spawner/east, -/obj/machinery/shower/directional/west, -/obj/item/bikehorn/rubberducky, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/freezer, -/area/station/security/prison/shower) "uvY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood/parquet, @@ -59905,6 +59861,14 @@ /obj/machinery/light/directional/north, /turf/open/openspace, /area/station/hallway/primary/tram/center) +"uCq" = ( +/obj/structure/mirror/directional/north, +/obj/structure/sink/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/freezer, +/area/station/science/lower) "uCv" = ( /obj/effect/turf_decal/siding/wood, /turf/open/floor/iron/grimy, @@ -60007,15 +59971,6 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/dark, /area/station/command/bridge) -"uEm" = ( -/obj/structure/cable/multilayer/multiz, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/end{ - dir = 8 - }, -/obj/structure/sign/warning/electric_shock/directional/east, -/turf/open/floor/plating, -/area/station/maintenance/department/medical) "uEp" = ( /obj/effect/turf_decal/trimline/red/filled/line, /obj/structure/cable, @@ -60325,15 +60280,6 @@ }, /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) -"uLs" = ( -/obj/structure/cable/multilayer/multiz, -/obj/effect/turf_decal/stripes/end{ - dir = 1 - }, -/obj/structure/sign/warning/electric_shock/directional/south, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/maintenance/department/crew_quarters/dorms) "uLC" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -60406,15 +60352,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/brig) -"uMI" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 1 - }, -/obj/structure/sign/departments/restroom/directional/north, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/science/lower) "uMR" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 8 @@ -60600,6 +60537,13 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) +"uPn" = ( +/obj/structure/cable/multilayer/multiz, +/obj/structure/sign/warning/electric_shock/directional/north, +/obj/effect/turf_decal/stripes/end, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) "uPr" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 5 @@ -61002,12 +60946,6 @@ /obj/structure/railing, /turf/open/floor/plating, /area/station/maintenance/tram/left) -"uWI" = ( -/obj/structure/sign/warning/vacuum/external/directional/west, -/obj/effect/turf_decal/sand/plating, -/obj/machinery/light/small/directional/east, -/turf/open/floor/plating, -/area/station/maintenance/starboard/lesser) "uWO" = ( /mob/living/carbon/human/species/monkey, /turf/open/floor/grass, @@ -61133,11 +61071,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/nuke_storage) -"uZr" = ( -/obj/structure/sink/directional/east, -/obj/structure/mirror/directional/west, -/turf/open/floor/iron/freezer, -/area/station/commons/toilet) "uZs" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 @@ -61591,6 +61524,17 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/service) +"vgH" = ( +/obj/structure/window/reinforced/spawner/west, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/obj/machinery/shower/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) "vgZ" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -62357,16 +62301,6 @@ }, /turf/open/floor/catwalk_floor, /area/station/hallway/primary/tram/center) -"vuY" = ( -/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/purple/filled/line{ - dir = 9 - }, -/obj/structure/sign/departments/cargo/directional/west, -/turf/open/floor/iron/white, -/area/station/science/research) "vvk" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 5 @@ -62514,6 +62448,15 @@ }, /turf/open/floor/plating, /area/station/maintenance/tram/left) +"vxq" = ( +/obj/structure/cable/multilayer/multiz, +/obj/effect/turf_decal/stripes/end{ + dir = 4 + }, +/obj/structure/sign/warning/electric_shock/directional/west, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/hallway/primary/tram/right) "vxv" = ( /obj/effect/turf_decal/siding/thinplating{ dir = 8 @@ -62664,14 +62607,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit) -"vAP" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/sign/warning/biohazard/directional/east, -/obj/structure/window/reinforced/spawner, -/turf/open/floor/catwalk_floor, -/area/station/command/gateway) "vBa" = ( /obj/structure/chair{ dir = 1; @@ -62853,13 +62788,15 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"vDL" = ( -/obj/structure/sign/warning/vacuum/directional/north, -/obj/machinery/light/small/directional/west, +"vDP" = ( +/obj/structure/cable/multilayer/multiz, +/obj/structure/sign/warning/electric_shock/directional/east, +/obj/effect/turf_decal/stripes/end{ + dir = 8 + }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron/smooth, -/area/station/hallway/primary/tram/center) +/turf/open/floor/plating, +/area/station/maintenance/tram/left) "vEe" = ( /obj/structure/window/reinforced/spawner, /obj/machinery/chem_heater/withbuffer, @@ -63081,14 +63018,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/storage) -"vIz" = ( -/obj/structure/cable, -/obj/structure/sink/kitchen/directional/east{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink" - }, -/turf/open/floor/iron/cafeteria, -/area/station/security/prison/mess) "vIF" = ( /obj/effect/turf_decal/trimline/red/filled/line, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -63100,19 +63029,6 @@ }, /turf/open/floor/iron, /area/station/security/prison) -"vJp" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/structure/sink/directional/south, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "vJt" = ( /obj/structure/chair/stool/bar/directional/north, /obj/effect/turf_decal/siding/thinplating{ @@ -63434,6 +63350,12 @@ /obj/machinery/light_switch/directional/west, /turf/open/floor/iron/grimy, /area/station/security/detectives_office) +"vPK" = ( +/obj/machinery/power/smes, +/obj/structure/sign/warning/electric_shock/directional/west, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard) "vPY" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 @@ -63853,6 +63775,13 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/command) +"vXd" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/obj/structure/sign/departments/restroom/directional/west, +/turf/open/floor/iron, +/area/station/commons/dorms) "vXf" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -64008,16 +63937,6 @@ }, /turf/open/floor/iron, /area/station/security/processing) -"vZP" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/structure/sign/warning/secure_area/directional/north{ - name = "HIGH SECURITY STORAGE" - }, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/command/nuke_storage) "wag" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 @@ -64040,6 +63959,18 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"was" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 10 + }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/sign/warning/deathsposal/directional/south, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark, +/area/station/medical/virology) "waB" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/decal/cleanable/dirt, @@ -64059,6 +63990,18 @@ /obj/effect/turf_decal/caution, /turf/open/floor/iron, /area/station/hallway/primary/tram/right) +"waU" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/obj/structure/sign/warning/electric_shock/directional/east, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology) "wbb" = ( /turf/open/floor/iron, /area/station/commons/dorms) @@ -64099,6 +64042,10 @@ /obj/effect/turf_decal/trimline/green/filled/line, /turf/open/floor/iron/dark, /area/station/service/hydroponics) +"wbO" = ( +/obj/structure/sign/departments/engineering/directional/east, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "wbT" = ( /obj/machinery/computer/med_data{ dir = 8 @@ -64294,19 +64241,6 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron, /area/station/cargo/lobby) -"wfQ" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 5 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/structure/sink/directional/south, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "wgf" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/yellow/warning{ @@ -65633,13 +65567,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/construction/engineering) -"wFt" = ( -/obj/structure/sign/warning/radiation/rad_area/directional/north, -/obj/effect/turf_decal/siding/wideplating{ - dir = 6 - }, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/command/nuke_storage) "wFx" = ( /turf/closed/wall, /area/station/science/robotics/lab) @@ -65855,6 +65782,11 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/exit) +"wIq" = ( +/obj/machinery/light/small/directional/west, +/obj/machinery/shower/directional/south, +/turf/open/floor/iron/freezer, +/area/station/security/prison) "wIx" = ( /obj/machinery/camera/directional/west{ c_tag = "Secure - Gateway North" @@ -66032,6 +65964,15 @@ /obj/structure/table/wood/fancy/royalblue, /turf/open/floor/wood/large, /area/station/service/library) +"wLK" = ( +/obj/structure/cable/multilayer/multiz, +/obj/structure/sign/warning/electric_shock/directional/west, +/obj/effect/turf_decal/stripes/end{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/central/greater) "wLR" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 5 @@ -66260,6 +66201,15 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/iron/smooth, /area/station/hallway/primary/tram/left) +"wPZ" = ( +/obj/structure/cable/multilayer/multiz, +/obj/effect/turf_decal/stripes/end{ + dir = 1 + }, +/obj/structure/sign/warning/electric_shock/directional/south, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/department/crew_quarters/dorms) "wQm" = ( /turf/open/floor/iron, /area/station/engineering/atmos) @@ -66615,6 +66565,17 @@ /obj/effect/mapping_helpers/airlock/access/any/science/maintenance, /turf/open/floor/catwalk_floor, /area/station/maintenance/starboard/lesser) +"wWV" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line, +/obj/structure/cable, +/obj/structure/sign/departments/holy/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "wXe" = ( /obj/machinery/atmospherics/components/binary/valve{ dir = 4; @@ -66748,15 +66709,6 @@ /obj/effect/turf_decal/trimline/neutral/filled/line, /turf/open/floor/iron, /area/station/maintenance/tram/mid) -"wYv" = ( -/obj/structure/sign/warning/vacuum/directional/south, -/obj/machinery/light/small/directional/west, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron/smooth, -/area/station/hallway/primary/tram/center) "wYB" = ( /obj/machinery/door/firedoor, /obj/structure/cable, @@ -66944,18 +66896,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"xbj" = ( -/obj/machinery/shower/directional/west, -/obj/effect/turf_decal/box, -/obj/structure/fluff{ - desc = "What, you think the water just magically soaks into the metallic flooring?"; - icon = 'icons/obj/lavaland/survival_pod.dmi'; - icon_state = "fan_tiny"; - name = "shower drain" - }, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) "xbo" = ( /obj/machinery/door/airlock/research{ name = "Ordnance Lab" @@ -67199,13 +67139,6 @@ }, /turf/open/floor/iron, /area/station/security/execution/transfer) -"xeA" = ( -/obj/structure/cable/multilayer/multiz, -/obj/structure/sign/warning/electric_shock/directional/north, -/obj/effect/turf_decal/stripes/end, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/maintenance/starboard/lesser) "xeE" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 @@ -67386,15 +67319,6 @@ /obj/effect/spawner/random/bureaucracy/briefcase, /turf/open/floor/wood, /area/station/service/lawoffice) -"xhf" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 6 - }, -/obj/structure/sign/warning/no_smoking/directional/south, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/main) "xhs" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -67521,6 +67445,14 @@ /obj/effect/turf_decal/trimline/neutral/filled/warning, /turf/open/floor/iron, /area/station/hallway/secondary/exit) +"xkq" = ( +/obj/structure/window/reinforced/spawner/east, +/obj/structure/sign/departments/medbay/alt/directional/north, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 5 + }, +/turf/open/floor/iron/white, +/area/station/security/medical) "xks" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -67710,6 +67642,16 @@ "xnj" = ( /turf/open/floor/iron, /area/station/security/execution/transfer) +"xnw" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/structure/sign/warning/chem_diamond/directional/east, +/obj/structure/chair/office/light, +/obj/effect/landmark/start/chemist, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) "xnB" = ( /obj/modular_map_root/tramstation{ key = "maintenance_enginelong" @@ -67757,23 +67699,6 @@ }, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"xoT" = ( -/obj/structure/rack, -/obj/item/reagent_containers/glass/bottle/epinephrine{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/reagent_containers/glass/bottle/fluorine{ - pixel_x = 7; - pixel_y = 3 - }, -/obj/item/reagent_containers/glass/bottle/iodine{ - pixel_x = 1 - }, -/obj/structure/sign/warning/chem_diamond/directional/south, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/dark/textured_edge, -/area/station/medical/medbay/central) "xpb" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -67782,6 +67707,14 @@ /obj/effect/turf_decal/stripes/white/full, /turf/open/floor/iron, /area/station/hallway/secondary/service) +"xpc" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/ai_monitored/security/armory) "xpj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -68261,6 +68194,14 @@ /obj/machinery/recharge_station, /turf/closed/mineral/random/stationside/asteroid/porus, /area/mine/explored) +"xxl" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/sign/warning/vacuum/external/directional/west, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "xxz" = ( /obj/machinery/rnd/bepis, /obj/effect/turf_decal/tile/brown/fourcorners, @@ -68374,6 +68315,14 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/hallway/secondary/service) +"xyB" = ( +/obj/structure/sign/warning/vacuum/external/directional/east, +/obj/machinery/computer/security/labor, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/security/processing) "xyS" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 @@ -68410,6 +68359,14 @@ /obj/machinery/vending/games, /turf/open/floor/iron/grimy, /area/station/service/library/lounge) +"xzQ" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/sign/warning/biohazard/directional/east, +/obj/structure/window/reinforced/spawner, +/turf/open/floor/catwalk_floor, +/area/station/command/gateway) "xzU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/trimline/brown/filled/corner{ @@ -68630,6 +68587,15 @@ "xFx" = ( /turf/open/floor/iron, /area/station/commons/fitness) +"xFR" = ( +/obj/structure/cable/multilayer/multiz, +/obj/structure/sign/warning/electric_shock/directional/west, +/obj/effect/turf_decal/stripes/end{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/tram/right) "xFY" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 @@ -68958,13 +68924,6 @@ }, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"xMV" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 5 - }, -/obj/structure/sign/warning/rad_shelter/directional/north, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit) "xNb" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -69214,6 +69173,14 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron, /area/station/security/brig) +"xQQ" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 5 + }, +/obj/structure/sink/directional/south, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/white, +/area/station/medical/virology) "xQS" = ( /turf/open/floor/iron/grimy, /area/station/hallway/secondary/entry) @@ -69396,6 +69363,18 @@ /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/iron, /area/station/engineering/atmos) +"xUH" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/suit/utility/radiation, +/obj/item/clothing/head/radiation, +/obj/item/clothing/glasses/meson, +/obj/item/clothing/glasses/meson, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "xUL" = ( /obj/effect/mapping_helpers/ianbirthday, /obj/structure/disposalpipe/segment{ @@ -69547,6 +69526,17 @@ /obj/machinery/status_display/shuttle, /turf/closed/wall, /area/station/hallway/secondary/exit/departure_lounge) +"xWw" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 6 + }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/structure/sign/warning/deathsposal/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/virology) "xWC" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -69599,26 +69589,6 @@ /obj/item/cautery, /turf/open/floor/iron/white, /area/station/science/robotics/lab) -"xWT" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/trimline/purple/filled/corner{ - dir = 8 - }, -/obj/structure/sink/directional/west, -/obj/machinery/camera{ - c_tag = "Science - Right Entry Airlock"; - dir = 6; - network = list("ss13","rd") - }, -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/science/research) "xWX" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -70056,14 +70026,6 @@ /obj/machinery/light/dim/directional/south, /turf/open/floor/iron/freezer, /area/station/commons/toilet) -"yfh" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/sign/warning/biohazard/directional/west, -/obj/structure/window/reinforced/spawner, -/turf/open/floor/catwalk_floor, -/area/station/command/gateway) "yfH" = ( /obj/structure/cable, /obj/effect/landmark/start/medical_doctor, @@ -70199,13 +70161,6 @@ /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/iron, /area/station/hallway/secondary/exit) -"yhV" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 9 - }, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/turret_protected/aisat/hallway) "yhY" = ( /obj/effect/turf_decal/stripes/corner, /obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, @@ -84290,9 +84245,9 @@ dhe apC hEz apC -aSQ +ppw daq -dpK +nHj veV hAD hAD @@ -84301,9 +84256,9 @@ nZa mqU hAD veV -aSQ +ppw daq -dpK +nHj apC vCf apC @@ -84547,20 +84502,20 @@ dhe apC hEz apC -aSQ +ppw orC -dpK +nHj veV vSm mgc -crY -crY +jQk +jQk biC hAD veV -aSQ +ppw iRX -dpK +nHj apC vCf apC @@ -84804,7 +84759,7 @@ dhe apC hEz apC -aSQ +ppw iCA vBg tTw @@ -84817,7 +84772,7 @@ vBg tTw vBg ydw -dpK +nHj apC vCf apC @@ -85061,9 +85016,9 @@ dhe apC hEz apC -aSQ +ppw wty -dpK +nHj veV hAD hAD @@ -85072,9 +85027,9 @@ mCQ kEp hAD veV -aSQ +ppw cbV -dpK +nHj apC vCf apC @@ -85297,7 +85252,7 @@ dhe dhe dhe gGi -jOt +lrE mUk cIO xjF @@ -85318,9 +85273,9 @@ dhe apC hEz apC -aSQ +ppw etO -dpK +nHj veV cDZ hAD @@ -85329,9 +85284,9 @@ veV kEp hAD veV -aSQ +ppw etO -dpK +nHj apC vCf apC @@ -86609,8 +86564,8 @@ veV veV hAD hAD -uZr -uZr +dII +dII oQS hAD veV @@ -87872,7 +87827,7 @@ gcp xgi mhZ nUZ -ixT +vDP gNy iRQ xgi @@ -88153,7 +88108,7 @@ lRR ili hTL sMZ -iXZ +vXd mub ili sbD @@ -88360,7 +88315,7 @@ xcj oEN oVM naX -vIz +jOg vfY pWp oVM @@ -88641,7 +88596,7 @@ doo jAk pZW ncF -imc +dPM kKS kKS kKS @@ -89117,11 +89072,11 @@ iqH vdQ cXb ryo -lTH +wIq fZX wkk fZX -umd +mCT gvI rAZ kHT @@ -89376,7 +89331,7 @@ orT ryo nlp gvI -peI +hOY gvI nlp gvI @@ -89907,12 +89862,12 @@ fCK dSe rUR rUR -wFt +nXf oqi uZn rUR rUR -qzl +diU uaC lQM lQM @@ -90935,12 +90890,12 @@ mUM dhL rUR rUR -mIa +qyb hEZ mdq rUR rUR -vZP +ddC tVe lQM lQM @@ -92496,7 +92451,7 @@ pZW pZW pZW ncF -tLR +geg aKC qQq qQq @@ -93241,10 +93196,10 @@ vMx vIF nhm eHG -bUS -bUS -bUS -bUS +eBM +eBM +eBM +eBM fEK vRO dhe @@ -93498,10 +93453,10 @@ vMx ebn xeW tmv -uvO -asO -asO -asO +jQr +liz +liz +liz xXD vRO dhe @@ -93755,10 +93710,10 @@ eLY mlv wYB pje -jTa -jTa -duF -jTa +aYZ +aYZ +boc +aYZ kIt vRO dhe @@ -93989,7 +93944,7 @@ dDG hFr hFr xwf -gNd +dvu jjX pAl vzY @@ -94012,10 +93967,10 @@ eLY uBu nhm uAm -mtW -mtW -mtW -mtW +rsP +rsP +rsP +rsP dER vRO dhe @@ -95036,14 +94991,14 @@ dhe duB eRw bEB -oMB +kmU eay qjG duB xwf eWG sKG -ucD +wLK xwf dhe dhe @@ -95873,7 +95828,7 @@ iMU tvd bso jkU -uLs +wPZ bso dhe dhe @@ -97422,7 +97377,7 @@ ney osd qrr uou -tGG +jkj vNH dhe aRN @@ -97670,7 +97625,7 @@ jIG tVt hAE eqi -pMS +txM ngp dwR dwR @@ -98947,7 +98902,7 @@ pkp nJQ bgg uQW -tVV +sTK uQW qgs nPN @@ -99479,7 +99434,7 @@ qHs cgA uUT oby -hQn +xxl uUT uUT csM @@ -100743,8 +100698,8 @@ cjy dAR pkG pqb -dFE -dFE +cJE +cJE vpP aYF djg @@ -101257,8 +101212,8 @@ cjy cIm kuX lfg -oGm -oGm +ghV +ghV vpP roB ptT @@ -101273,7 +101228,7 @@ hJd hJd gxh hJd -dym +tlQ lfB ltq fuj @@ -101530,9 +101485,9 @@ tNf mVg dSN dSN -xhf +pit qHs -eFi +nAm fuj bLP hDI @@ -101771,7 +101726,7 @@ bbj rww lBb lJH -fki +sTB equ bbj roB @@ -101789,7 +101744,7 @@ ccX bvI cjy qHs -gRP +xUH fuj qmi miU @@ -102278,7 +102233,7 @@ cjq cSp tFV fal -ece +hcl jbs stZ cgR @@ -102485,7 +102440,7 @@ pIf ugC lzo bKb -oLf +sYi nUP wDw ale @@ -102527,7 +102482,7 @@ qyr mgX rCM pcu -cAv +lBw bVW gys wio @@ -102768,7 +102723,7 @@ oHY qXe nrW edQ -rjM +gVn qjU ugX qjU @@ -102792,7 +102747,7 @@ cjq aKm uLW fal -rqd +rDo jbs stZ cgR @@ -103515,7 +103470,7 @@ nUP nUP nUP nUP -pVH +pxF vCt jQS tRF @@ -104342,7 +104297,7 @@ rHk rBe nHX xsc -rMw +iWt eYa rHk rDj @@ -108218,7 +108173,7 @@ tLM fjb hZr bQQ -qjj +gdD hZr hZr hZr @@ -109229,7 +109184,7 @@ pLP lJo mwK umP -eYz +hpM fYD lxM mwK @@ -109670,7 +109625,7 @@ dDG dhe dhe naa -jcS +vPK kgc vSJ oHw @@ -109737,7 +109692,7 @@ dDG dDG dDG ekG -uWI +afB jRB umP skn @@ -110210,13 +110165,13 @@ dCA dCA dCA vtk -mlP +qQV cLl gDp foL pUP kvj -rrq +jJj aIL dDG dDG @@ -111756,7 +111711,7 @@ uGW uGW arE qiL -dex +aca arE ovz arE @@ -112054,7 +112009,7 @@ tIK lPe mwK mwK -xeA +uPn lvi jaP mwK @@ -112582,7 +112537,7 @@ rkE qdl qdl sYT -mHG +dBt wzL npf qdl @@ -114383,7 +114338,7 @@ cif bYn ehJ dJF -qiK +jDe vwe lsd vwe @@ -114830,7 +114785,7 @@ dhe dhe dhe unl -cQs +lMu rMq uPc rMq @@ -114897,7 +114852,7 @@ qrL ekP lyn ofJ -jVD +lCA ttq fIy fIy @@ -115387,7 +115342,7 @@ qdj qdj qdj qdj -uMI +fbm cAt ggR ggR @@ -115641,17 +115596,17 @@ qxm dhe dhe kxB -ffX +cwa jjw gnp bwJ -pPo +fcK iaC iaC cAy knk knk -dJt +qLj mfC mwK hvT @@ -115898,7 +115853,7 @@ qxm oys kxB kxB -ouO +uCq bTq kxB kxB @@ -116694,7 +116649,7 @@ rkE qdl qdl pCa -qJe +waU jAZ mGa qdl @@ -117170,7 +117125,7 @@ wnn hKj myD sVs -sIP +xFR stO jwx hKj @@ -117242,7 +117197,7 @@ vXM vXM mbe xvl -cNE +ipp xly xvl odF @@ -117445,7 +117400,7 @@ oyF bzE uay jqE -aHJ +icl xwG mZn hzO @@ -118457,7 +118412,7 @@ qxm qNo bPK rLP -axe +gYY cxi qxm qxm @@ -119762,7 +119717,7 @@ pjE vqm rFx osM -cJK +inT xmc xmc dhe @@ -145430,7 +145385,7 @@ tPE loo lRu nmY -ixp +adz nmY jhd jhd @@ -147743,7 +147698,7 @@ iyc hvt vcI nmY -ixp +adz nmY jhd jhd @@ -149305,8 +149260,8 @@ wdU jNb ckM nEF -rvU -ccb +qEI +ibL mpw tdx dMU @@ -152100,7 +152055,7 @@ dxC kHZ kHZ kHZ -yfh +cng hSH mxJ hfN @@ -152336,7 +152291,7 @@ dDG xSX xSX xSX -keN +dFl tuZ qwy jxG @@ -152861,9 +152816,9 @@ nEc gki mjM mjM -qUs +xkq sfJ -bpN +cIG run run dhe @@ -153128,7 +153083,7 @@ dxC ndP ndP ndP -vAP +xzQ hAv cPg lnj @@ -153150,7 +153105,7 @@ fMN ojT tkv ook -cOs +mbQ khH khH dzU @@ -153408,7 +153363,7 @@ ojT ofA ook dpA -jUY +lPb tkv bhk ojT @@ -154392,7 +154347,7 @@ dDG dDG dDG uov -twe +xyB cxV iiN jWO @@ -154412,7 +154367,7 @@ kVA sNl sTN ktX -leQ +oRD kdV acr pxi @@ -155164,7 +155119,7 @@ qEM nFM epT hgn -aRG +ujz aFA dEv ubf @@ -155231,7 +155186,7 @@ mAt brQ mAt bAf -rmW +blT pUw pUw tfW @@ -155931,12 +155886,12 @@ dEv hgn hgn hgn -cvx +xhQ mUl tXi mkz -gZv -tnH +mBU +hgn ycK etH bLT @@ -156188,11 +156143,11 @@ dEv sab uPZ eSj -cvx -tGX +xhQ +xpc mlS hLx -rkB +avY hgn jMX wZs @@ -156449,7 +156404,7 @@ bKl qOD iHb avY -tnH +hgn mzH dEv rUc @@ -156706,7 +156661,7 @@ jlQ tuU aEy hgn -qaJ +hgn kkV dEv lAW @@ -156773,7 +156728,7 @@ lmb fTC pqY sUo -oVP +wWV pUw pUw fvS @@ -157477,7 +157432,7 @@ gTU qxT hbK syV -mfz +qkP tLg iuO iuO @@ -157496,7 +157451,7 @@ sHw kil sLC rUd -ovs +feF joB lTV pxi @@ -158783,7 +158738,7 @@ omm fpt oRU tFJ -opG +nNK lBt ltw tix @@ -159297,7 +159252,7 @@ piG fpt txX tFJ -utb +rCt aLB ltw dwZ @@ -159573,7 +159528,7 @@ urP kOE yiM kQx -hnh +eyS yiM cFs lNP @@ -159581,7 +159536,7 @@ gnj vVY cFs yiM -aGB +fcY bSG yiM dhe @@ -159865,7 +159820,7 @@ whz mFF xqS dCh -eWx +etP lxv jxS aMU @@ -160579,7 +160534,7 @@ wSR tFJ atI ryO -ulq +iHP tFJ dhe dhe @@ -161409,7 +161364,7 @@ xqS xqS dCh xJj -cST +awJ dCh dhe dhe @@ -163456,7 +163411,7 @@ dhe kRL fsy hEj -owh +irM spv ykW whz @@ -164456,7 +164411,7 @@ dhe dhe izU rOZ -wYv +qzM izU eSz tCl @@ -164464,7 +164419,7 @@ tFZ wvE eSz izU -vDL +jwa qVu izU dhe @@ -164481,13 +164436,13 @@ mvL bdR uHf xBk -mGA +fFz jnk dyB xRx xuA usW -lzi +slr uBr uBr wdj @@ -164733,7 +164688,7 @@ xBk xBk ewF gTr -shl +nWi sXb fkb kkw @@ -165756,7 +165711,7 @@ nRR oGw evg opP -hQa +glR jyH bfE jVw @@ -166010,7 +165965,7 @@ lNj dVP jyH jyH -gOI +vgH adi cur kfb @@ -166540,7 +166495,7 @@ qdK xKP qdK cWx -plV +hyi qGc utK srE @@ -166746,7 +166701,7 @@ dhe dhe eSx eSx -rQb +tJk vVC fqU uzM @@ -166779,7 +166734,7 @@ oVt gCX eOi agt -qhs +mJO cVg pvc vEe @@ -167063,7 +167018,7 @@ keD jHN ncS sHm -xoT +gaC jYS fOv ygi @@ -167574,7 +167529,7 @@ lXy dkW xSZ dyI -lwU +dCN jYS jYS jYS @@ -167821,7 +167776,7 @@ xSZ rkH oIU jRr -xbj +uij wbT dvQ uZQ @@ -168335,7 +168290,7 @@ xSZ hqV oIU jRr -gVU +cVw krE bvK eGn @@ -169122,7 +169077,7 @@ jqP jLK jYS qrR -bro +xnw fkR jYS qgt @@ -169316,7 +169271,7 @@ dhe dhe eSx eSx -dGG +kQE whs fEG cON @@ -169624,7 +169579,7 @@ gNk qOX gNk eqq -qPe +sKn exo wUH iys @@ -169865,7 +169820,7 @@ xXq vMl gXj csZ -pUm +wbO eSz eSz qNI @@ -170134,7 +170089,7 @@ qdK iug scA pWZ -gNl +ipQ bhA ojj xav @@ -170652,7 +170607,7 @@ euC xvO dUm ugt -qkt +qbb oEt uNN ugt @@ -170909,7 +170864,7 @@ uvY xNH upx ugt -mCS +xQQ gtv afZ ugt @@ -171652,7 +171607,7 @@ dhe dhe abE khY -peD +tjm izU eSz tCl @@ -171660,7 +171615,7 @@ tFZ wvE eSz izU -rUx +mof vuS whz pio @@ -171684,7 +171639,7 @@ pbn xug dGn pfo -bkB +tPH kxb uQK qQZ @@ -171947,7 +171902,7 @@ ihB eNH buW lxT -tKB +xWw ugt fPu dDG @@ -172197,7 +172152,7 @@ mBq kOL bcZ jfw -nwU +was ugt ugt ugt @@ -174765,7 +174720,7 @@ dhe dhe dhe mBq -uEm +foW puo mMl mBq @@ -176535,7 +176490,7 @@ wUY lZW lZW cLq -uuZ +nOm bMb brm iOd @@ -176543,7 +176498,7 @@ jgH vPi brm bMb -mFl +jWF vlf pTh wJO @@ -177292,7 +177247,7 @@ fcg oDp aFR pKs -nku +qlQ usY mPw lZW @@ -177590,7 +177545,7 @@ doK doK szB ebW -kjc +tgI weI tml soq @@ -178350,7 +178305,7 @@ nDm iCY pqn jGB -eIe +jXN cjN qMS dqV @@ -178366,7 +178321,7 @@ vEX hzq vEX cVz -vuY +iFG huu eyc hTG @@ -178607,7 +178562,7 @@ xPQ stt juf uhP -tPr +khI ccO tqp quv @@ -178883,7 +178838,7 @@ vMO sXX toa xjr -dJO +hTG hlc fyd fyd @@ -179114,7 +179069,7 @@ vPi brm dfz iey -oml +aMs wpK lfQ lfQ @@ -179128,7 +179083,7 @@ mxl edg tPZ tPZ -owb +joR tby gyB oPT @@ -179361,7 +179316,7 @@ jzn oNJ cbc fgi -tbH +mUE hhL bMb brm @@ -179385,7 +179340,7 @@ nyF svv icL tPZ -cSB +foe tby hTG oPT @@ -179660,7 +179615,7 @@ hlc hlc hlc hlc -vJp +dlr jee dxa dRW @@ -179911,7 +179866,7 @@ hJW bSE hFt aob -mQc +tmP iYW qKC cZf @@ -180425,10 +180380,10 @@ wwn bSE joR jfs -gOk +oKf iYW -wfQ -teS +mfT +hGW mlg iYW vLH @@ -180688,7 +180643,7 @@ hlc hlc hlc hlc -eEi +fPl ntE oIG uTt @@ -181160,7 +181115,7 @@ fgi fgi fgi fgi -kMD +rKz hBQ xYV brm @@ -181170,7 +181125,7 @@ vPi brm bOr qtF -cGr +hHX wpK lfQ lfQ @@ -181691,7 +181646,7 @@ sxk xjV juf jjL -tPr +khI ccO uVj rdg @@ -181931,7 +181886,7 @@ yiV xoN pwp wZE -eFA +fDe hFH hZc seW @@ -181941,14 +181896,14 @@ seW seW iXW sBC -otT +bns vte hBW cmb poo moi rRD -xWT +hfA pyU cEy jPy @@ -181958,7 +181913,7 @@ wVj wVj kEA hwM -nZI +hwM hwM hwM faF @@ -182477,7 +182432,7 @@ fdt gUO meP jyZ -nGz +fjs hhT xNT wBi @@ -182706,7 +182661,7 @@ rxO lCE vUE rxO -uek +vxq cEC eAG kKn @@ -183053,7 +183008,7 @@ dVM rOT rSB dVM -ggF +fho cEb gFf wbW @@ -183061,7 +183016,7 @@ pnT uqS uqS gFf -yhV +jaM bdb gSr gFf @@ -183239,9 +183194,9 @@ hen rfq pPD hvJ -syq +hpB bKU -gQo +hbj hvJ oii nzE @@ -183829,7 +183784,7 @@ oMI gFf uqS cSe -btQ +uqS gFf gFf gFf @@ -184240,7 +184195,7 @@ azX vHa hHP lCy -xMV +piZ doD qbu riS @@ -187587,7 +187542,7 @@ uCy uCy vhu uCy -dyc +cws uCy uCy uCy diff --git a/_maps/shuttles/emergency_delta.dmm b/_maps/shuttles/emergency_delta.dmm index 91c534a406a..3799d36f2d6 100644 --- a/_maps/shuttles/emergency_delta.dmm +++ b/_maps/shuttles/emergency_delta.dmm @@ -565,7 +565,7 @@ /area/shuttle/escape) "bl" = ( /obj/structure/rack, -/obj/item/clothing/suit/fire/firefighter, +/obj/item/clothing/suit/utility/fire/firefighter, /obj/item/tank/internals/oxygen/red, /obj/item/clothing/mask/gas, /obj/item/clothing/head/hardhat/red, diff --git a/_maps/shuttles/emergency_medisim.dmm b/_maps/shuttles/emergency_medisim.dmm index f39b9242ed9..99e9c649493 100644 --- a/_maps/shuttles/emergency_medisim.dmm +++ b/_maps/shuttles/emergency_medisim.dmm @@ -1084,7 +1084,7 @@ "RV" = ( /obj/structure/rack, /obj/item/tank/internals/oxygen/red, -/obj/item/clothing/suit/fire/firefighter, +/obj/item/clothing/suit/utility/fire/firefighter, /obj/item/clothing/mask/gas, /obj/item/clothing/head/hardhat/red, /obj/machinery/light/directional/west, diff --git a/_maps/shuttles/emergency_meta.dmm b/_maps/shuttles/emergency_meta.dmm index eec8df2770b..a4ffbc38238 100644 --- a/_maps/shuttles/emergency_meta.dmm +++ b/_maps/shuttles/emergency_meta.dmm @@ -566,7 +566,7 @@ "bM" = ( /obj/structure/rack, /obj/item/tank/internals/oxygen/red, -/obj/item/clothing/suit/fire/firefighter, +/obj/item/clothing/suit/utility/fire/firefighter, /obj/item/clothing/mask/gas, /obj/item/clothing/head/hardhat/red, /obj/effect/turf_decal/stripes/line{ diff --git a/_maps/shuttles/emergency_monastery.dmm b/_maps/shuttles/emergency_monastery.dmm index 4041d358d16..a3a4ec1804a 100644 --- a/_maps/shuttles/emergency_monastery.dmm +++ b/_maps/shuttles/emergency_monastery.dmm @@ -1724,9 +1724,9 @@ /obj/structure/closet{ name = "beekeeping wardrobe" }, -/obj/item/clothing/suit/beekeeper_suit, -/obj/item/clothing/suit/beekeeper_suit, -/obj/item/clothing/suit/beekeeper_suit, +/obj/item/clothing/suit/utility/beekeeper_suit, +/obj/item/clothing/suit/utility/beekeeper_suit, +/obj/item/clothing/suit/utility/beekeeper_suit, /obj/item/clothing/head/beekeeper_head, /obj/item/clothing/head/beekeeper_head, /obj/item/clothing/head/beekeeper_head, diff --git a/_maps/shuttles/emergency_nature.dmm b/_maps/shuttles/emergency_nature.dmm index cbf6708e146..3b4d869aa69 100644 --- a/_maps/shuttles/emergency_nature.dmm +++ b/_maps/shuttles/emergency_nature.dmm @@ -1107,7 +1107,7 @@ dir = 6 }, /obj/structure/table/glass, -/obj/item/clothing/suit/monkeysuit{ +/obj/item/clothing/suit/costume/monkeysuit{ pixel_x = -2; pixel_y = 4 }, diff --git a/_maps/shuttles/emergency_raven.dmm b/_maps/shuttles/emergency_raven.dmm index 1257373351f..0750aca3589 100644 --- a/_maps/shuttles/emergency_raven.dmm +++ b/_maps/shuttles/emergency_raven.dmm @@ -278,7 +278,7 @@ }, /obj/structure/rack, /obj/item/tank/internals/oxygen/red, -/obj/item/clothing/suit/fire/firefighter, +/obj/item/clothing/suit/utility/fire/firefighter, /obj/item/clothing/mask/gas, /obj/item/clothing/head/hardhat/red, /obj/effect/decal/cleanable/dirt, @@ -1473,7 +1473,7 @@ }, /obj/structure/rack, /obj/item/tank/internals/oxygen/red, -/obj/item/clothing/suit/fire/firefighter, +/obj/item/clothing/suit/utility/fire/firefighter, /obj/item/clothing/mask/gas, /obj/item/clothing/head/hardhat/red, /turf/open/floor/iron/dark, diff --git a/_maps/shuttles/ruin_pirate_cutter.dmm b/_maps/shuttles/ruin_pirate_cutter.dmm index 8a4499c60f1..cd3e1f467cd 100644 --- a/_maps/shuttles/ruin_pirate_cutter.dmm +++ b/_maps/shuttles/ruin_pirate_cutter.dmm @@ -7,7 +7,7 @@ name = "pirate outfits" }, /obj/item/clothing/head/collectable/pirate, -/obj/item/clothing/suit/pirate, +/obj/item/clothing/suit/costume/pirate, /obj/item/clothing/under/costume/pirate, /obj/item/clothing/shoes/jackboots, /obj/item/clothing/head/bandana, @@ -240,7 +240,7 @@ name = "pirate outfits" }, /obj/item/clothing/head/collectable/pirate, -/obj/item/clothing/suit/pirate, +/obj/item/clothing/suit/costume/pirate, /obj/item/clothing/under/costume/pirate, /obj/item/clothing/shoes/jackboots, /obj/item/clothing/head/bandana, diff --git a/_maps/skyrat/automapper/templates/Skyrat_Map_Reset.dmm b/_maps/skyrat/automapper/templates/Skyrat_Map_Reset.dmm index 651e80dceef..3a22e7ef4f0 100644 --- a/_maps/skyrat/automapper/templates/Skyrat_Map_Reset.dmm +++ b/_maps/skyrat/automapper/templates/Skyrat_Map_Reset.dmm @@ -9801,7 +9801,7 @@ /area/station/hallway/secondary/entry) "Ao" = ( /obj/structure/bed, -/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, /obj/item/clothing/glasses/blindfold, /obj/item/clothing/mask/muzzle, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -12072,7 +12072,7 @@ /area/station/maintenance/port/fore) "GM" = ( /obj/structure/bed, -/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, /obj/item/clothing/glasses/blindfold, /obj/item/clothing/mask/muzzle, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -18071,8 +18071,8 @@ "Yp" = ( /obj/structure/closet/bombcloset/security, /obj/effect/turf_decal/bot_blue, -/obj/item/clothing/suit/bomb_suit/security, -/obj/item/clothing/suit/bomb_suit/security, +/obj/item/clothing/suit/utility/bomb_suit/security, +/obj/item/clothing/suit/utility/bomb_suit/security, /obj/item/clothing/head/bomb_hood/security, /obj/item/clothing/head/bomb_hood/security, /turf/open/floor/iron/dark, @@ -18209,9 +18209,9 @@ /area/station/service/salon) "YJ" = ( /obj/structure/table, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, /obj/item/restraints/handcuffs, /obj/item/restraints/handcuffs, /obj/item/restraints/handcuffs, @@ -18587,7 +18587,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/item/clothing/suit/fire/firefighter, +/obj/item/clothing/suit/utility/fire/firefighter, /obj/item/clothing/head/hardhat/red, /turf/open/floor/iron/dark, /area/station/security/prison/upper) diff --git a/_maps/skyrat/automapper/templates/deltastation/deltastation_prison.dmm b/_maps/skyrat/automapper/templates/deltastation/deltastation_prison.dmm index 63f83aa2b69..9f50e99c921 100644 --- a/_maps/skyrat/automapper/templates/deltastation/deltastation_prison.dmm +++ b/_maps/skyrat/automapper/templates/deltastation/deltastation_prison.dmm @@ -2781,9 +2781,9 @@ /area/brigofficer) "zc" = ( /obj/structure/table, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, /obj/item/restraints/handcuffs, /obj/item/restraints/handcuffs, /obj/item/restraints/handcuffs, @@ -2843,7 +2843,7 @@ /area/station/security/prison) "zE" = ( /obj/structure/bed, -/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, /obj/item/clothing/glasses/blindfold, /obj/item/clothing/mask/muzzle, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -3486,8 +3486,8 @@ "Ez" = ( /obj/structure/closet/bombcloset/security, /obj/effect/turf_decal/bot_blue, -/obj/item/clothing/suit/bomb_suit/security, -/obj/item/clothing/suit/bomb_suit/security, +/obj/item/clothing/suit/utility/bomb_suit/security, +/obj/item/clothing/suit/utility/bomb_suit/security, /obj/item/clothing/head/bomb_hood/security, /obj/item/clothing/head/bomb_hood/security, /turf/open/floor/iron/dark, @@ -4038,7 +4038,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/item/clothing/suit/fire/firefighter, +/obj/item/clothing/suit/utility/fire/firefighter, /obj/item/clothing/head/hardhat/red, /turf/open/floor/iron/dark, /area/station/security/prison/upper) @@ -5501,7 +5501,7 @@ /area/station/security/prison/safe) "Yi" = ( /obj/structure/bed, -/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, /obj/item/clothing/glasses/blindfold, /obj/item/clothing/mask/muzzle, /obj/effect/turf_decal/trimline/blue/filled/line{ diff --git a/_maps/skyrat/automapper/templates/tramstation/tramstation_barber.dmm b/_maps/skyrat/automapper/templates/tramstation/tramstation_barber.dmm index 866cc03b94f..eeef6e4b7c4 100644 --- a/_maps/skyrat/automapper/templates/tramstation/tramstation_barber.dmm +++ b/_maps/skyrat/automapper/templates/tramstation/tramstation_barber.dmm @@ -130,7 +130,7 @@ /obj/structure/closet{ name = "Beekeeper Uniform" }, -/obj/item/clothing/suit/beekeeper_suit, +/obj/item/clothing/suit/utility/beekeeper_suit, /obj/item/clothing/head/beekeeper_head, /obj/item/melee/flyswatter, /obj/effect/turf_decal/trimline/green/filled/line, diff --git a/_maps/templates/holodeck_anthophillia.dmm b/_maps/templates/holodeck_anthophillia.dmm index c50ff32ebce..1ab367c976e 100644 --- a/_maps/templates/holodeck_anthophillia.dmm +++ b/_maps/templates/holodeck_anthophillia.dmm @@ -6,7 +6,7 @@ "v" = ( /obj/effect/holodeck_effect/mobspawner/bee, /obj/effect/decal/remains/human, -/obj/item/clothing/suit/beekeeper_suit, +/obj/item/clothing/suit/utility/beekeeper_suit, /turf/open/floor/holofloor/asteroid, /area/template_noop) "U" = ( diff --git a/_maps/templates/holodeck_chapelcourt.dmm b/_maps/templates/holodeck_chapelcourt.dmm index fcd98cb0b8a..925fe3da976 100644 --- a/_maps/templates/holodeck_chapelcourt.dmm +++ b/_maps/templates/holodeck_chapelcourt.dmm @@ -220,7 +220,7 @@ /turf/open/floor/holofloor/chapel/bottom_right, /area/template_noop) "F" = ( -/obj/item/clothing/suit/judgerobe, +/obj/item/clothing/suit/costume/judgerobe, /obj/item/clothing/head/powdered_wig, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ diff --git a/code/__DEFINES/species_clothing_paths.dm b/code/__DEFINES/species_clothing_paths.dm index a215b37aaab..be95aa3a3b0 100644 --- a/code/__DEFINES/species_clothing_paths.dm +++ b/code/__DEFINES/species_clothing_paths.dm @@ -4,7 +4,7 @@ ///The dmi for humanoid shoes #define DEFAULT_SHOES_FILE 'icons/mob/clothing/feet.dmi' ///The dmi for humanoid oversuits -#define DEFAULT_SUIT_FILE 'icons/mob/clothing/suit.dmi' +#define DEFAULT_SUIT_FILE 'icons/mob/clothing/suits/default.dmi' //DIGITIGRADE PATHS ///The dmi containing digitigrade uniforms diff --git a/code/_globalvars/phobias.dm b/code/_globalvars/phobias.dm index 73cd02df93c..6fa5d0f5143 100644 --- a/code/_globalvars/phobias.dm +++ b/code/_globalvars/phobias.dm @@ -396,7 +396,7 @@ GLOBAL_LIST_INIT(phobia_objs, list( /obj/item/clothing/mask/gas/owl_mask, /obj/item/clothing/mask/gas/plaguedoctor, /obj/item/clothing/shoes/griffin, - /obj/item/clothing/suit/chickensuit, + /obj/item/clothing/suit/costume/chickensuit, /obj/item/clothing/suit/space/freedom, /obj/item/clothing/suit/toggle/owlwings, /obj/item/clothing/under/costume/griffin, diff --git a/code/datums/components/crafting/tailoring.dm b/code/datums/components/crafting/tailoring.dm index 693a27ab24c..c96dc2425b7 100644 --- a/code/datums/components/crafting/tailoring.dm +++ b/code/datums/components/crafting/tailoring.dm @@ -124,8 +124,8 @@ /datum/crafting_recipe/ghostsheet name = "Ghost Sheet" - result = /obj/item/clothing/suit/ghost_sheet - time = 5 + result = /obj/item/clothing/suit/costume/ghost_sheet + time = 0.5 SECONDS tool_behaviors = list(TOOL_WIRECUTTER) reqs = list(/obj/item/bedsheet = 1) category = CAT_CLOTHING diff --git a/code/datums/greyscale/config_types/greyscale_configs.dm b/code/datums/greyscale/config_types/greyscale_configs.dm index 57fb783ebbb..66662587d04 100644 --- a/code/datums/greyscale/config_types/greyscale_configs.dm +++ b/code/datums/greyscale/config_types/greyscale_configs.dm @@ -329,7 +329,7 @@ /datum/greyscale_config/suspenders/worn name = "Worn Suspenders" - icon_file = 'icons/mob/clothing/suit.dmi' + icon_file = 'icons/mob/clothing/suits/utility.dmi' json_config = 'code/datums/greyscale/json_configs/suspenders_worn.json' /datum/greyscale_config/giftdeliverybox @@ -560,7 +560,7 @@ /datum/greyscale_config/heck_suit/worn name = "H.E.C.K. Suit Worn" - icon_file = 'icons/mob/clothing/suit.dmi' + icon_file = 'icons/mob/clothing/suits/armor.dmi' json_config = 'code/datums/greyscale/json_configs/heck_suit_worn.json' /datum/greyscale_config/heck_helmet diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index b5d3c7a8495..39c9b94283c 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -121,7 +121,7 @@ /obj/machinery/suit_storage_unit/radsuit name = "radiation suit storage unit" - suit_type = /obj/item/clothing/suit/radiation + suit_type = /obj/item/clothing/suit/utility/radiation helmet_type = /obj/item/clothing/head/radiation storage_type = /obj/item/geiger_counter diff --git a/code/game/objects/effects/spawners/costume.dm b/code/game/objects/effects/spawners/costume.dm index 4462aa5b2f5..1e8fb03f601 100644 --- a/code/game/objects/effects/spawners/costume.dm +++ b/code/game/objects/effects/spawners/costume.dm @@ -16,7 +16,7 @@ /obj/effect/spawner/costume/chicken name = "chicken costume spawner" items = list( - /obj/item/clothing/suit/chickensuit, + /obj/item/clothing/suit/costume/chickensuit, /obj/item/clothing/head/chicken, /obj/item/food/egg, ) @@ -137,7 +137,7 @@ name = "pirate costume spawner" items = list( /obj/item/clothing/under/costume/pirate, - /obj/item/clothing/suit/pirate, + /obj/item/clothing/suit/costume/pirate, /obj/effect/spawner/random/clothing/pirate_or_bandana, /obj/item/clothing/glasses/eyepatch, ) @@ -152,7 +152,7 @@ /obj/effect/spawner/costume/imperium_monk name = "imperium monk costume spawner" items = list( - /obj/item/clothing/suit/imperium_monk, + /obj/item/clothing/suit/costume/imperium_monk, /obj/effect/spawner/random/clothing/twentyfive_percent_cyborg_mask, ) diff --git a/code/game/objects/items/gift.dm b/code/game/objects/items/gift.dm index efb527225bd..86dec2e5436 100644 --- a/code/game/objects/items/gift.dm +++ b/code/game/objects/items/gift.dm @@ -84,10 +84,10 @@ GLOBAL_LIST_EMPTY(possible_gifts) /obj/item/clothing/neck/tie/horrible, /obj/item/clothing/suit/jacket/leather, /obj/item/clothing/suit/jacket/leather/overcoat, - /obj/item/clothing/suit/poncho, - /obj/item/clothing/suit/poncho/green, - /obj/item/clothing/suit/poncho/red, - /obj/item/clothing/suit/snowman, + /obj/item/clothing/suit/costume/poncho, + /obj/item/clothing/suit/costume/poncho/green, + /obj/item/clothing/suit/costume/poncho/red, + /obj/item/clothing/suit/costume/snowman, /obj/item/clothing/head/snowman, /obj/item/stack/sheet/mineral/coal) diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index 59c2f0341c3..e8088d46a39 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -1,130 +1,3 @@ -// CHAPLAIN CUSTOM ARMORS // - -/obj/item/clothing/head/helmet/chaplain/clock - name = "forgotten helmet" - desc = "It has the unyielding gaze of a god eternally forgotten." - icon_state = "clockwork_helmet" - inhand_icon_state = "clockwork_helmet_inhand" - armor = list(MELEE = 50, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 0, BIO = 0, FIRE = 80, ACID = 80) - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT - flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH - strip_delay = 8 SECONDS - dog_fashion = null - -/obj/item/clothing/suit/armor/riot/chaplain/clock - name = "forgotten armour" - desc = "It sounds like hissing steam, ticking cogs, gone silent, It looks like a dead machine, trying to tick with life." - icon_state = "clockwork_cuirass" - inhand_icon_state = "clockwork_cuirass_inhand" - allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) - slowdown = 0 - clothing_flags = NONE - -/obj/item/clothing/head/helmet/chaplain - name = "crusader helmet" - desc = "Deus Vult." - icon_state = "knight_templar" - inhand_icon_state = "knight_templar" - armor = list(MELEE = 50, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 0, BIO = 0, FIRE = 80, ACID = 80) - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT - flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH - strip_delay = 80 - dog_fashion = null - -/obj/item/clothing/suit/armor/riot/chaplain - name = "crusader armour" - desc = "God wills it!" - icon_state = "knight_templar" - inhand_icon_state = "knight_templar" - allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) - slowdown = 0 - clothing_flags = NONE - -/obj/item/clothing/suit/armor/riot/chaplain/studentuni - name = "student robe" - desc = "The uniform of a bygone institute of learning." - icon_state = "studentuni" - inhand_icon_state = "studentuni" - body_parts_covered = ARMS|CHEST - -/obj/item/clothing/head/helmet/chaplain/cage - name = "cage" - desc = "A cage that restrains the will of the self, allowing one to see the profane world for what it is." - flags_inv = NONE - icon_state = "cage" - inhand_icon_state = "cage" - worn_y_offset = 7 - -/obj/item/clothing/head/helmet/chaplain/ancient - name = "ancient helmet" - desc = "None may pass!" - icon_state = "knight_ancient" - inhand_icon_state = "knight_ancient" - -/obj/item/clothing/suit/armor/riot/chaplain/ancient - name = "ancient armour" - desc = "Defend the treasure..." - icon_state = "knight_ancient" - inhand_icon_state = "knight_ancient" - -/obj/item/clothing/suit/armor/riot/chaplain/witchhunter - name = "witchunter garb" - desc = "This worn outfit saw much use back in the day." - icon_state = "witchhunter" - inhand_icon_state = "witchhunter" - body_parts_covered = CHEST|GROIN|LEGS|ARMS - -/obj/item/clothing/head/helmet/chaplain/witchunter_hat - name = "witchunter hat" - desc = "This hat saw much use back in the day." - icon_state = "witchhunterhat" - inhand_icon_state = "witchhunterhat" - flags_cover = HEADCOVERSEYES - flags_inv = HIDEEYES - -/obj/item/clothing/head/helmet/chaplain/adept - name = "adept hood" - desc = "Its only heretical when others do it." - icon_state = "crusader" - inhand_icon_state = "crusader" - flags_cover = HEADCOVERSEYES - flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS - -/obj/item/clothing/suit/armor/riot/chaplain/adept - name = "adept robes" - desc = "The ideal outfit for burning the unfaithful." - icon_state = "crusader" - inhand_icon_state = "crusader" - -/obj/item/clothing/suit/hooded/chaplain_hoodie - name = "follower hoodie" - desc = "Hoodie made for acolytes of the chaplain." - icon_state = "chaplain_hoodie" - inhand_icon_state = "chaplain_hoodie" - body_parts_covered = CHEST|GROIN|LEGS|ARMS - allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) - hoodtype = /obj/item/clothing/head/hooded/chaplain_hood - -/obj/item/clothing/head/hooded/chaplain_hood - name = "follower hood" - desc = "Hood made for acolytes of the chaplain." - icon_state = "chaplain_hood" - body_parts_covered = HEAD - flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS - -/obj/item/clothing/suit/hooded/chaplain_hoodie/leader - name = "leader hoodie" - desc = "Now you're ready for some 50 dollar bling water." - icon_state = "chaplain_hoodie_leader" - inhand_icon_state = "chaplain_hoodie_leader" - hoodtype = /obj/item/clothing/head/hooded/chaplain_hood/leader - -/obj/item/clothing/head/hooded/chaplain_hood/leader - name = "leader hood" - desc = "I mean, you don't /have/ to seek bling water. I just think you should." - icon_state = "chaplain_hood_leader" - - // CHAPLAIN NULLROD AND CUSTOM WEAPONS // /obj/item/nullrod diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm index 5dd76cf21dd..29515f5b8b9 100644 --- a/code/game/objects/items/religion.dm +++ b/code/game/objects/items/religion.dm @@ -267,20 +267,6 @@ icon_state = "bannerpack-blue" //this is all part of one item set -/obj/item/clothing/suit/armor/plate/crusader - name = "Crusader's Armour" - desc = "Armour that's comprised of metal and cloth." - icon_state = "crusader" - w_class = WEIGHT_CLASS_BULKY - slowdown = 2.0 //gotta pretend we're balanced. - body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS - armor = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 60, BIO = 0, FIRE = 60, ACID = 60) - -/obj/item/clothing/suit/armor/plate/crusader/red - icon_state = "crusader-red" - -/obj/item/clothing/suit/armor/plate/crusader/blue - icon_state = "crusader-blue" /obj/item/clothing/head/helmet/plate/crusader name = "Crusader's Hood" @@ -368,33 +354,24 @@ heat_protection = FEET max_heat_protection_temperature = SHOES_MAX_TEMP_PROTECT - /obj/item/clothing/shoes/plate/red icon_state = "crusader-red" /obj/item/clothing/shoes/plate/blue icon_state = "crusader-blue" - -/obj/item/storage/box/itemset/crusader - name = "Crusader's Armour Set" //i can't into ck2 references - desc = "This armour is said to be based on the armor of kings on another world thousands of years ago, who tended to assassinate, conspire, and plot against everyone who tried to do the same to them. Some things never change." - - /obj/item/storage/box/itemset/crusader/blue/PopulateContents() - new /obj/item/clothing/suit/armor/plate/crusader/blue(src) + new /obj/item/clothing/suit/chaplainsuit/armor/crusader/blue(src) new /obj/item/clothing/head/helmet/plate/crusader/blue(src) new /obj/item/clothing/gloves/plate/blue(src) new /obj/item/clothing/shoes/plate/blue(src) - /obj/item/storage/box/itemset/crusader/red/PopulateContents() - new /obj/item/clothing/suit/armor/plate/crusader/red(src) + new /obj/item/clothing/suit/chaplainsuit/armor/crusader/red(src) new /obj/item/clothing/head/helmet/plate/crusader/red(src) new /obj/item/clothing/gloves/plate/red(src) new /obj/item/clothing/shoes/plate/red(src) - /obj/item/claymore/weak desc = "This one is rusted." force = 30 diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index c68b98a7a21..194c7318ab5 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -80,7 +80,7 @@ GLOBAL_LIST_INIT(corgi_recipes, list ( \ GLOBAL_LIST_INIT(monkey_recipes, list ( \ new/datum/stack_recipe("monkey mask", /obj/item/clothing/mask/gas/monkeymask, 1), \ - new/datum/stack_recipe("monkey suit", /obj/item/clothing/suit/monkeysuit, 2), \ + new/datum/stack_recipe("monkey suit", /obj/item/clothing/suit/costume/monkeysuit, 2), \ )) /obj/item/stack/sheet/animalhide/monkey/get_main_recipes() @@ -105,7 +105,7 @@ GLOBAL_LIST_INIT(monkey_recipes, list ( \ GLOBAL_LIST_INIT(xeno_recipes, list ( \ new/datum/stack_recipe("alien helmet", /obj/item/clothing/head/xenos, 1), \ - new/datum/stack_recipe("alien suit", /obj/item/clothing/suit/xenos, 2), \ + new/datum/stack_recipe("alien suit", /obj/item/clothing/suit/costume/xenos, 2), \ )) /obj/item/stack/sheet/animalhide/xeno/get_main_recipes() diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 8bdc72aa44f..800f12ea97a 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -497,7 +497,7 @@ GLOBAL_LIST_INIT(durathread_recipes, list ( \ */ GLOBAL_LIST_INIT(cardboard_recipes, list ( \ new/datum/stack_recipe("box", /obj/item/storage/box), \ - new/datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/cardborg, 3), \ + new/datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/costume/cardborg, 3), \ new/datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/cardborg), \ new/datum/stack_recipe("large box", /obj/structure/closet/cardboard, 4, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("cardboard cutout", /obj/item/cardboard_cutout, 5), \ @@ -607,7 +607,7 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \ new/datum/stack_recipe("bronze pinion airlock assembly", /obj/structure/door_assembly/door_assembly_bronze/seethru, 4, time = 50, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("bronze floor tile", /obj/item/stack/tile/bronze, 1, 4, 20), \ new/datum/stack_recipe("bronze hat", /obj/item/clothing/head/bronze), \ - new/datum/stack_recipe("bronze suit", /obj/item/clothing/suit/bronze), \ + new/datum/stack_recipe("bronze suit", /obj/item/clothing/suit/costume/bronze), \ new/datum/stack_recipe("bronze boots", /obj/item/clothing/shoes/bronze), \ null, new/datum/stack_recipe("bronze chair", /obj/structure/chair/bronze, 1, time = 0, one_per_turf = TRUE, on_floor = TRUE), \ diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index cfe19aebacd..baa696b4fc8 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -56,7 +56,6 @@ /obj/item/storage/backpack/holding/Initialize() . = ..() - create_storage(max_specific_storage = WEIGHT_CLASS_GIGANTIC, max_total_storage = 35, max_slots = 30, type = /datum/storage/bag_of_holding) atom_storage.allow_big_nesting = TRUE @@ -562,7 +561,7 @@ new /obj/item/surgicaldrill(src) new /obj/item/cautery(src) new /obj/item/surgical_drapes(src) - new /obj/item/clothing/suit/straight_jacket(src) + new /obj/item/clothing/suit/jacket/straight_jacket(src) new /obj/item/clothing/mask/muzzle(src) new /obj/item/mmi/syndie(src) new /obj/item/blood_filter(src) diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 0915ffe5fc7..c09b1b9c327 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -1599,7 +1599,7 @@ /obj/item/storage/box/hero/PopulateContents() new /obj/item/clothing/head/fedora/curator(src) - new /obj/item/clothing/suit/curator(src) + new /obj/item/clothing/suit/jacket/curator(src) new /obj/item/clothing/under/rank/civilian/curator/treasure_hunter(src) new /obj/item/clothing/shoes/workboots/mining(src) new /obj/item/melee/curator_whip(src) @@ -1653,41 +1653,41 @@ /obj/item/storage/box/holy/clock/PopulateContents() new /obj/item/clothing/head/helmet/chaplain/clock(src) - new /obj/item/clothing/suit/armor/riot/chaplain/clock(src) + new /obj/item/clothing/suit/chaplainsuit/armor/clock(src) /obj/item/storage/box/holy name = "Templar Kit" /obj/item/storage/box/holy/PopulateContents() new /obj/item/clothing/head/helmet/chaplain(src) - new /obj/item/clothing/suit/armor/riot/chaplain(src) + new /obj/item/clothing/suit/chaplainsuit/armor/templar(src) /obj/item/storage/box/holy/student name = "Profane Scholar Kit" /obj/item/storage/box/holy/student/PopulateContents() - new /obj/item/clothing/suit/armor/riot/chaplain/studentuni(src) + new /obj/item/clothing/suit/chaplainsuit/armor/studentuni(src) new /obj/item/clothing/head/helmet/chaplain/cage(src) /obj/item/storage/box/holy/sentinel name = "Stone Sentinel Kit" /obj/item/storage/box/holy/sentinel/PopulateContents() - new /obj/item/clothing/suit/armor/riot/chaplain/ancient(src) + new /obj/item/clothing/suit/chaplainsuit/armor/ancient(src) new /obj/item/clothing/head/helmet/chaplain/ancient(src) /obj/item/storage/box/holy/witchhunter name = "Witchhunter Kit" /obj/item/storage/box/holy/witchhunter/PopulateContents() - new /obj/item/clothing/suit/armor/riot/chaplain/witchhunter(src) + new /obj/item/clothing/suit/chaplainsuit/armor/witchhunter(src) new /obj/item/clothing/head/helmet/chaplain/witchunter_hat(src) /obj/item/storage/box/holy/adept name = "Divine Adept Kit" /obj/item/storage/box/holy/adept/PopulateContents() - new /obj/item/clothing/suit/armor/riot/chaplain/adept(src) + new /obj/item/clothing/suit/chaplainsuit/armor/adept(src) new /obj/item/clothing/head/helmet/chaplain/adept(src) /obj/item/storage/box/holy/follower diff --git a/code/game/objects/items/storage/garment.dm b/code/game/objects/items/storage/garment.dm index 63a89c35a49..2d4e17caf3b 100644 --- a/code/game/objects/items/storage/garment.dm +++ b/code/game/objects/items/storage/garment.dm @@ -47,7 +47,7 @@ new /obj/item/clothing/under/rank/captain/parade(src) new /obj/item/clothing/suit/armor/vest/capcarapace(src) new /obj/item/clothing/suit/armor/vest/capcarapace/captains_formal(src) - new /obj/item/clothing/suit/capjacket(src) + new /obj/item/clothing/suit/jacket/capjacket(src) new /obj/item/clothing/glasses/sunglasses/gar/giga(src) new /obj/item/clothing/gloves/color/captain(src) new /obj/item/clothing/head/caphat(src) diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index e64a9ce052c..8104d06cd13 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -314,7 +314,7 @@ /obj/structure/closet/wardrobe/curator/PopulateContents() new /obj/item/clothing/head/fedora/curator(src) - new /obj/item/clothing/suit/curator(src) + new /obj/item/clothing/suit/jacket/curator(src) new /obj/item/clothing/under/rank/civilian/curator/treasure_hunter(src) new /obj/item/clothing/shoes/workboots/mining(src) new /obj/item/storage/backpack/satchel/explorer(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm index f94c529b564..38e67d543a2 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -17,7 +17,8 @@ new /obj/item/clothing/head/soft(src) // Why does the QM spawn with a generic soft cap */ new /obj/item/radio/headset/heads/qm(src) - new /obj/item/clothing/suit/fire/firefighter(src) + new /obj/item/clothing/suit/utility/fire/firefighter(src) + new /obj/item/clothing/gloves/fingerless(src) new /obj/item/megaphone/cargo(src) new /obj/item/tank/internals/emergency_oxygen(src) new /obj/item/export_scanner(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 1fdd070e03f..b2b95f5adff 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -83,7 +83,7 @@ new /obj/item/tank/internals/emergency_oxygen/engi(src) new /obj/item/holosign_creator/atmos(src) new /obj/item/watertank/atmos(src) - new /obj/item/clothing/suit/fire/atmos(src) + new /obj/item/clothing/suit/utility/fire/atmos(src) new /obj/item/clothing/mask/gas/atmos(src) new /obj/item/clothing/head/hardhat/atmos(src) new /obj/item/clothing/glasses/meson/engine/tray(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 25e90c82a40..ffa53edf584 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -62,7 +62,7 @@ new /obj/item/storage/backpack/medic(src) new /obj/item/radio/headset/headset_srvmed(src) new /obj/item/clipboard(src) - new /obj/item/clothing/suit/straight_jacket(src) + new /obj/item/clothing/suit/jacket/straight_jacket(src) new /obj/item/clothing/ears/earmuffs(src) new /obj/item/clothing/mask/muzzle(src) new /obj/item/clothing/glasses/blindfold(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 89f30c9c73e..0a3cad77890 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -82,7 +82,7 @@ new /obj/item/clothing/head/beret/sec/navywarden(src) //new /obj/item/clothing/suit/armor/vest/warden/alt(src) //SKYRAT EDIT REMOVAL new /obj/item/clothing/under/rank/security/warden/formal(src) - new /obj/item/clothing/suit/security/warden(src) //SKYRAT ADDITION - FORMAL COAT + new /obj/item/clothing/suit/jacket/warden/blue(src) //SKYRAT ADDITION - FORMAL COAT //new /obj/item/clothing/under/rank/security/warden/skirt(src) SKYRAT EDIT REMOVAL new /obj/item/clothing/glasses/hud/security/sunglasses(src) new /obj/item/holosign_creator/security(src) @@ -300,7 +300,7 @@ for(var/i in 1 to 3) new /obj/item/paper/fluff/jobs/security/court_judgement (src) new /obj/item/pen (src) - new /obj/item/clothing/suit/judgerobe (src) + new /obj/item/clothing/suit/costume/judgerobe (src) new /obj/item/clothing/head/powdered_wig (src) new /obj/item/storage/briefcase(src) diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index 150b66b42db..3f6e65c528e 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -63,8 +63,7 @@ /obj/structure/closet/firecloset/PopulateContents() ..() - - new /obj/item/clothing/suit/fire/firefighter(src) + new /obj/item/clothing/suit/utility/fire/firefighter(src) new /obj/item/clothing/mask/gas/alt(src) //SKYRAT EDIT CHANGE - ORIGINAL: /obj/item/clothing/mask/gas(src) new /obj/item/tank/internals/oxygen/red(src) new /obj/item/extinguisher(src) @@ -73,7 +72,7 @@ new /obj/item/storage/inflatable(src) //SKYRAT EDIT ADDITION - INFLATABLES /obj/structure/closet/firecloset/full/PopulateContents() - new /obj/item/clothing/suit/fire/firefighter(src) + new /obj/item/clothing/suit/utility/fire/firefighter(src) new /obj/item/clothing/mask/gas/alt(src) //SKYRAT EDIT CHANGE - ORIGINAL: /obj/item/clothing/mask/gas(src) new /obj/item/flashlight(src) new /obj/item/tank/internals/oxygen/red(src) @@ -137,7 +136,7 @@ /obj/structure/closet/radiation/PopulateContents() ..() new /obj/item/geiger_counter(src) - new /obj/item/clothing/suit/radiation(src) + new /obj/item/clothing/suit/utility/radiation(src) new /obj/item/clothing/head/radiation(src) /* @@ -150,19 +149,19 @@ /obj/structure/closet/bombcloset/PopulateContents() ..() - new /obj/item/clothing/suit/bomb_suit(src) + new /obj/item/clothing/suit/utility/bomb_suit(src) new /obj/item/clothing/under/color/black(src) new /obj/item/clothing/shoes/sneakers/black(src) new /obj/item/clothing/head/bomb_hood(src) /obj/structure/closet/bombcloset/security/PopulateContents() - new /obj/item/clothing/suit/bomb_suit/security(src) + new /obj/item/clothing/suit/utility/bomb_suit/security(src) new /obj/item/clothing/under/rank/security/officer(src) new /obj/item/clothing/shoes/jackboots(src) new /obj/item/clothing/head/bomb_hood/security(src) /obj/structure/closet/bombcloset/white/PopulateContents() - new /obj/item/clothing/suit/bomb_suit/white(src) + new /obj/item/clothing/suit/utility/bomb_suit/white(src) new /obj/item/clothing/under/color/black(src) new /obj/item/clothing/shoes/sneakers/black(src) new /obj/item/clothing/head/bomb_hood/white(src) diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index 2e5c8839a0f..256ccc46783 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -341,6 +341,7 @@ Striking a noncultist, however, will tear their flesh."} name = "ancient cultist robes" desc = "A ragged, dusty set of robes. Strange letters line the inside." icon_state = "cultrobes" + worn_icon = 'icons/mob/clothing/suits/armor.dmi' inhand_icon_state = "cultrobes" body_parts_covered = CHEST|GROIN|LEGS|ARMS allowed = list(/obj/item/tome, /obj/item/melee/cultblade) @@ -387,6 +388,7 @@ Striking a noncultist, however, will tear their flesh."} name = "magus robes" desc = "A set of armored robes worn by the followers of Nar'Sie." icon_state = "magusred" + worn_icon = 'icons/mob/clothing/suits/wizard.dmi' inhand_icon_state = "magusred" body_parts_covered = CHEST|GROIN|LEGS|ARMS allowed = list(/obj/item/tome, /obj/item/melee/cultblade) diff --git a/code/modules/antagonists/fugitive/fugitive_outfits.dm b/code/modules/antagonists/fugitive/fugitive_outfits.dm index 3d176a9d39b..e49aa041507 100644 --- a/code/modules/antagonists/fugitive/fugitive_outfits.dm +++ b/code/modules/antagonists/fugitive/fugitive_outfits.dm @@ -24,7 +24,7 @@ /datum/outfit/waldo name = "Waldo" uniform = /obj/item/clothing/under/pants/jeans - suit = /obj/item/clothing/suit/striped_sweater + suit = /obj/item/clothing/suit/costume/striped_sweater head = /obj/item/clothing/head/beanie/waldo shoes = /obj/item/clothing/shoes/sneakers/brown ears = /obj/item/radio/headset diff --git a/code/modules/antagonists/gang/gang.dm b/code/modules/antagonists/gang/gang.dm index 4a094184cd4..a270c857bd5 100644 --- a/code/modules/antagonists/gang/gang.dm +++ b/code/modules/antagonists/gang/gang.dm @@ -374,10 +374,10 @@ /obj/item/clothing/head/beanie/yellow, /obj/item/clothing/mask/bandana/gold, /obj/item/clothing/head/hardhat, - /obj/item/clothing/suit/yakuza) + /obj/item/clothing/suit/costume/yakuza) free_clothes = list(/obj/item/clothing/under/costume/yakuza, /obj/item/clothing/shoes/yakuza, - /obj/item/clothing/suit/yakuza, + /obj/item/clothing/suit/costume/yakuza, /obj/item/clothing/head/hardhat, /obj/item/toy/crayon/spraycan) antag_hud_name = "Tojo" @@ -426,12 +426,12 @@ gang_id = "VDL" acceptable_clothes = list(/obj/item/clothing/head/soft/black, /obj/item/clothing/under/costume/dutch, - /obj/item/clothing/suit/dutch, + /obj/item/clothing/suit/costume/dutch, /obj/item/clothing/head/bowler, /obj/item/clothing/mask/bandana/black) free_clothes = list(/obj/item/clothing/under/costume/dutch, /obj/item/clothing/head/bowler, - /obj/item/clothing/suit/dutch, + /obj/item/clothing/suit/costume/dutch, /obj/item/toy/crayon/spraycan) antag_hud_name = "Dutch" gang_team_type = /datum/team/gang/dutch @@ -451,10 +451,10 @@ roundend_category = "IRS Agents" gang_name = "Internal Revenue Service" gang_id = "IRS" - acceptable_clothes = list(/obj/item/clothing/suit/irs, + acceptable_clothes = list(/obj/item/clothing/suit/costume/irs, /obj/item/clothing/under/costume/irs, /obj/item/clothing/head/irs) - free_clothes = list(/obj/item/clothing/suit/irs, + free_clothes = list(/obj/item/clothing/suit/costume/irs, /obj/item/clothing/under/costume/irs, /obj/item/clothing/head/irs, /obj/item/toy/crayon/spraycan) @@ -475,10 +475,10 @@ roundend_category = "O.S.I. Agents" gang_name = "Office of Secret Intelligence" gang_id = "OSI" - acceptable_clothes = list(/obj/item/clothing/suit/osi, + acceptable_clothes = list(/obj/item/clothing/suit/costume/osi, /obj/item/clothing/under/costume/osi, /obj/item/clothing/glasses/osi) - free_clothes = list(/obj/item/clothing/suit/osi, + free_clothes = list(/obj/item/clothing/suit/costume/osi, /obj/item/clothing/under/costume/osi, /obj/item/clothing/glasses/osi, /obj/item/toy/crayon/spraycan) @@ -499,10 +499,10 @@ roundend_category = "Lost M.C. Bikers" gang_name = "The Lost M.C." gang_id = "TMC" - acceptable_clothes = list(/obj/item/clothing/suit/tmc, + acceptable_clothes = list(/obj/item/clothing/suit/costume/tmc, /obj/item/clothing/under/costume/tmc, /obj/item/clothing/head/tmc) - free_clothes = list(/obj/item/clothing/suit/tmc, + free_clothes = list(/obj/item/clothing/suit/costume/tmc, /obj/item/clothing/under/costume/tmc, /obj/item/clothing/head/tmc, /obj/item/toy/crayon/spraycan) @@ -523,10 +523,10 @@ roundend_category = "Powder Gangers" gang_name = "Powder Gangers" gang_id = "PG" - acceptable_clothes = list(/obj/item/clothing/suit/pg, + acceptable_clothes = list(/obj/item/clothing/suit/costume/pg, /obj/item/clothing/under/costume/pg, /obj/item/clothing/head/pg) - free_clothes = list(/obj/item/clothing/suit/pg, + free_clothes = list(/obj/item/clothing/suit/costume/pg, /obj/item/clothing/under/costume/pg, /obj/item/clothing/head/pg, /obj/item/toy/crayon/spraycan) @@ -548,11 +548,11 @@ roundend_category = "O'Driscoll's Gangsters" gang_name = "O'Driscoll's Gang" gang_id = "DB" - acceptable_clothes = list(/obj/item/clothing/suit/driscoll, + acceptable_clothes = list(/obj/item/clothing/suit/costume/driscoll, /obj/item/clothing/under/costume/driscoll, /obj/item/clothing/mask/gas/driscoll, /obj/item/clothing/shoes/cowboy) - free_clothes = list(/obj/item/clothing/suit/driscoll, + free_clothes = list(/obj/item/clothing/suit/costume/driscoll, /obj/item/clothing/under/costume/driscoll, /obj/item/clothing/mask/gas/driscoll, /obj/item/clothing/shoes/cowboy, @@ -574,11 +574,11 @@ roundend_category = "Deckers" gang_name = "Deckers" gang_id = "DK" - acceptable_clothes = list(/obj/item/clothing/suit/deckers, + acceptable_clothes = list(/obj/item/clothing/suit/costume/deckers, /obj/item/clothing/under/costume/deckers, /obj/item/clothing/head/deckers, /obj/item/clothing/shoes/deckers) - free_clothes = list(/obj/item/clothing/suit/deckers, + free_clothes = list(/obj/item/clothing/suit/costume/deckers, /obj/item/clothing/under/costume/deckers, /obj/item/clothing/head/deckers, /obj/item/clothing/shoes/deckers, @@ -601,11 +601,11 @@ roundend_category = "Morningstar Member" gang_name = "Morningstar" gang_id = "MS" - acceptable_clothes = list(/obj/item/clothing/suit/morningstar, + acceptable_clothes = list(/obj/item/clothing/suit/costume/morningstar, /obj/item/clothing/under/costume/morningstar, /obj/item/clothing/head/morningstar, /obj/item/clothing/shoes/morningstar) - free_clothes = list(/obj/item/clothing/suit/morningstar, + free_clothes = list(/obj/item/clothing/suit/costume/morningstar, /obj/item/clothing/under/costume/morningstar, /obj/item/clothing/head/morningstar, /obj/item/clothing/shoes/morningstar, @@ -627,11 +627,11 @@ roundend_category = "Third Street Saints Gangsters" gang_name = "Third Street Saints" gang_id = "TSS" - acceptable_clothes = list(/obj/item/clothing/suit/saints, + acceptable_clothes = list(/obj/item/clothing/suit/costume/saints, /obj/item/clothing/under/costume/saints, /obj/item/clothing/head/saints, /obj/item/clothing/shoes/saints) - free_clothes = list(/obj/item/clothing/suit/saints, + free_clothes = list(/obj/item/clothing/suit/costume/saints, /obj/item/clothing/under/costume/saints, /obj/item/clothing/head/saints, /obj/item/clothing/shoes/saints, @@ -654,11 +654,11 @@ roundend_category = "Phantom Thieves" gang_name = "Phantom Thieves of Hearts" gang_id = "PT" - acceptable_clothes = list(/obj/item/clothing/suit/phantom, + acceptable_clothes = list(/obj/item/clothing/suit/costume/phantom, /obj/item/clothing/under/costume/phantom, /obj/item/clothing/glasses/phantom, /obj/item/clothing/shoes/phantom) - free_clothes = list(/obj/item/clothing/suit/phantom, + free_clothes = list(/obj/item/clothing/suit/costume/phantom, /obj/item/clothing/under/costume/phantom, /obj/item/clothing/glasses/phantom, /obj/item/clothing/shoes/phantom, @@ -680,7 +680,7 @@ roundend_category = "Allies" gang_name = "Allies" gang_id = "ALLIES" - free_clothes = list(/obj/item/clothing/suit/allies, + free_clothes = list(/obj/item/clothing/suit/costume/allies, /obj/item/clothing/under/costume/allies, /obj/item/clothing/head/allies, /obj/item/clothing/gloves/color/black, @@ -703,7 +703,7 @@ roundend_category = "Soviets" gang_name = "Soviets" gang_id = "SOV" - free_clothes = list(/obj/item/clothing/suit/soviet, + free_clothes = list(/obj/item/clothing/suit/costume/soviet, /obj/item/clothing/under/costume/soviet_families, /obj/item/clothing/head/ushanka/soviet, /obj/item/clothing/gloves/color/black, @@ -726,7 +726,7 @@ roundend_category = "Yuri's Army" gang_name = "Yuri's Army" gang_id = "YR" - free_clothes = list(/obj/item/clothing/suit/yuri, + free_clothes = list(/obj/item/clothing/suit/costume/yuri, /obj/item/clothing/under/costume/yuri, /obj/item/clothing/head/yuri, /obj/item/clothing/gloves/color/black, @@ -749,7 +749,7 @@ roundend_category = "Sybil Slickers" gang_name = "Sybil Slickers" gang_id = "SS" - free_clothes = list(/obj/item/clothing/suit/sybil_slickers, + free_clothes = list(/obj/item/clothing/suit/costume/sybil_slickers, /obj/item/clothing/under/costume/sybil_slickers, /obj/item/clothing/head/sybil_slickers, /obj/item/clothing/gloves/tackler/football, @@ -772,7 +772,7 @@ roundend_category = "Basil Boys" gang_name = "Basil Boys" gang_id = "BB" - free_clothes = list(/obj/item/clothing/suit/basil_boys, + free_clothes = list(/obj/item/clothing/suit/costume/basil_boys, /obj/item/clothing/under/costume/basil_boys, /obj/item/clothing/head/basil_boys, /obj/item/clothing/gloves/tackler/football, diff --git a/code/modules/cargo/exports/gear.dm b/code/modules/cargo/exports/gear.dm index 8a9d5aeed0a..e0e495c7507 100644 --- a/code/modules/cargo/exports/gear.dm +++ b/code/modules/cargo/exports/gear.dm @@ -60,7 +60,7 @@ /datum/export/gear/radsuit cost = CARGO_CRATE_VALUE * 0.2 unit_name = "radsuit" - export_types = list(/obj/item/clothing/suit/radiation) + export_types = list(/obj/item/clothing/suit/utility/radiation) /datum/export/gear/biohood cost = CARGO_CRATE_VALUE * 0.1 @@ -80,7 +80,7 @@ /datum/export/gear/bombsuit cost = CARGO_CRATE_VALUE * 0.2 unit_name = "bomb suit" - export_types = list(/obj/item/clothing/suit/bomb_suit) + export_types = list(/obj/item/clothing/suit/utility/bomb_suit) /datum/export/gear/lizardboots cost = CARGO_CRATE_VALUE * 0.7 diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index f5934fa1f67..2d5efa55992 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -140,7 +140,7 @@ desc = "Science gone bonkers? Beeping behind the airlock? Buy now and be the hero the station des... I mean needs! (time not included)" cost = CARGO_CRATE_VALUE * 2 contains = list(/obj/item/clothing/head/bomb_hood, - /obj/item/clothing/suit/bomb_suit, + /obj/item/clothing/suit/utility/bomb_suit, /obj/item/clothing/mask/gas, /obj/item/screwdriver, /obj/item/wirecutters, @@ -151,8 +151,8 @@ name = "Firefighting Crate" desc = "Only you can prevent station fires. Partner up with two firefighter suits, gas masks, flashlights, large oxygen tanks, extinguishers, and hardhats!" cost = CARGO_CRATE_VALUE * 2 - contains = list(/obj/item/clothing/suit/fire/firefighter, - /obj/item/clothing/suit/fire/firefighter, + contains = list(/obj/item/clothing/suit/utility/fire/firefighter, + /obj/item/clothing/suit/utility/fire/firefighter, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, /obj/item/flashlight, @@ -232,8 +232,8 @@ cost = CARGO_CRATE_VALUE * 2 contains = list(/obj/item/clothing/head/radiation, /obj/item/clothing/head/radiation, - /obj/item/clothing/suit/radiation, - /obj/item/clothing/suit/radiation, + /obj/item/clothing/suit/utility/radiation, + /obj/item/clothing/suit/utility/radiation, /obj/item/geiger_counter, /obj/item/geiger_counter, /obj/item/reagent_containers/food/drinks/bottle/vodka, @@ -391,15 +391,15 @@ access_view = ACCESS_SECURITY contains = list(/obj/item/clothing/under/rank/security/officer/formal, /obj/item/clothing/under/rank/security/officer/formal, - /obj/item/clothing/suit/security/officer, - /obj/item/clothing/suit/security/officer, + /obj/item/clothing/suit/jacket/officer/blue, + /obj/item/clothing/suit/jacket/officer/blue, /obj/item/clothing/head/beret/sec/navyofficer, /obj/item/clothing/head/beret/sec/navyofficer, /obj/item/clothing/under/rank/security/warden/formal, - /obj/item/clothing/suit/security/warden, + /obj/item/clothing/suit/jacket/warden/blue, /obj/item/clothing/head/beret/sec/navywarden, /obj/item/clothing/under/rank/security/head_of_security/formal, - /obj/item/clothing/suit/security/hos, + /obj/item/clothing/suit/jacket/hos/blue, /obj/item/clothing/head/hos/beret/navyhos) crate_name = "security clothing crate" */ @@ -1795,9 +1795,9 @@ desc = "Bee business booming? Better be benevolent and boost botany by bestowing bi-Beekeeper-suits! Contains two beekeeper suits and matching headwear." cost = CARGO_CRATE_VALUE * 2 contains = list(/obj/item/clothing/head/beekeeper_head, - /obj/item/clothing/suit/beekeeper_suit, + /obj/item/clothing/suit/utility/beekeeper_suit, /obj/item/clothing/head/beekeeper_head, - /obj/item/clothing/suit/beekeeper_suit) + /obj/item/clothing/suit/utility/beekeeper_suit) crate_name = "beekeeper suits" crate_type = /obj/structure/closet/crate/hydroponics @@ -1811,7 +1811,7 @@ /obj/item/honey_frame, /obj/item/queen_bee/bought, /obj/item/clothing/head/beekeeper_head, - /obj/item/clothing/suit/beekeeper_suit, + /obj/item/clothing/suit/utility/beekeeper_suit, /obj/item/melee/flyswatter) crate_name = "beekeeping starter crate" crate_type = /obj/structure/closet/crate/hydroponics @@ -2433,15 +2433,15 @@ desc = "Reenact Shakespearean plays with this assortment of outfits. Contains eight different costumes!" cost = CARGO_CRATE_VALUE * 2 contains = list(/obj/item/clothing/head/snowman, - /obj/item/clothing/suit/snowman, + /obj/item/clothing/suit/costume/snowman, /obj/item/clothing/head/chicken, - /obj/item/clothing/suit/chickensuit, + /obj/item/clothing/suit/costume/chickensuit, /obj/item/clothing/mask/gas/monkeymask, - /obj/item/clothing/suit/monkeysuit, + /obj/item/clothing/suit/costume/monkeysuit, /obj/item/clothing/head/cardborg, - /obj/item/clothing/suit/cardborg, + /obj/item/clothing/suit/costume/cardborg, /obj/item/clothing/head/xenos, - /obj/item/clothing/suit/xenos, + /obj/item/clothing/suit/costume/xenos, /obj/item/clothing/suit/hooded/ian_costume, /obj/item/clothing/suit/hooded/carp_costume, /obj/item/clothing/suit/hooded/bee_costume) diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index ae39f0f068f..28f7ecc8dce 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -410,6 +410,7 @@ name = "armor" desc = "A slim armored vest that protects against most types of damage." icon_state = "armor" + worn_icon = 'icons/mob/clothing/suits/armor.dmi' inhand_icon_state = "armor" blood_overlay_type = "armor" resistance_flags = NONE @@ -623,9 +624,7 @@ /obj/item/clothing/shoes/chameleon/Initialize(mapload) . = ..() - create_storage(type = /datum/storage/pockets/shoes) - chameleon_action = new(src) chameleon_action.chameleon_type = /obj/item/clothing/shoes chameleon_action.chameleon_name = "Shoes" diff --git a/code/modules/clothing/head/costume.dm b/code/modules/clothing/head/costume.dm index d3c8f6fc742..1240ad58f32 100644 --- a/code/modules/clothing/head/costume.dm +++ b/code/modules/clothing/head/costume.dm @@ -111,8 +111,8 @@ ..() if(ishuman(user) && slot == ITEM_SLOT_HEAD) var/mob/living/carbon/human/H = user - if(istype(H.wear_suit, /obj/item/clothing/suit/cardborg)) - var/obj/item/clothing/suit/cardborg/CB = H.wear_suit + if(istype(H.wear_suit, /obj/item/clothing/suit/costume/cardborg)) + var/obj/item/clothing/suit/costume/cardborg/CB = H.wear_suit CB.disguise(user, src) /obj/item/clothing/head/cardborg/dropped(mob/living/user) diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm index 1da4c134fbe..605e448a40f 100644 --- a/code/modules/clothing/outfits/standard.dm +++ b/code/modules/clothing/outfits/standard.dm @@ -59,7 +59,7 @@ name = "tournament gangster" uniform = /obj/item/clothing/under/rank/security/detective - suit = /obj/item/clothing/suit/det_suit + suit = /obj/item/clothing/suit/jacket/det_suit glasses = /obj/item/clothing/glasses/thermal/monocle head = /obj/item/clothing/head/fedora/det_hat l_hand = /obj/item/gun/ballistic @@ -120,7 +120,7 @@ id = /obj/item/card/id/advanced id_trim = /datum/id_trim/pirate uniform = /obj/item/clothing/under/costume/pirate - suit = /obj/item/clothing/suit/pirate/armored + suit = /obj/item/clothing/suit/costume/pirate/armored ears = /obj/item/radio/headset/syndicate glasses = /obj/item/clothing/glasses/eyepatch head = /obj/item/clothing/head/bandana/armored @@ -382,7 +382,7 @@ id = /obj/item/card/id/advanced/centcom id_trim = /datum/id_trim/centcom/admiral uniform = /obj/item/clothing/under/costume/soviet - suit = /obj/item/clothing/suit/pirate/captain + suit = /obj/item/clothing/suit/costume/pirate/captain back = /obj/item/storage/backpack/satchel/leather belt = /obj/item/gun/ballistic/revolver/mateba ears = /obj/item/radio/headset/headset_cent diff --git a/code/modules/clothing/spacesuits/_spacesuits.dm b/code/modules/clothing/spacesuits/_spacesuits.dm index c6a0f477530..1ad6ca2077c 100644 --- a/code/modules/clothing/spacesuits/_spacesuits.dm +++ b/code/modules/clothing/spacesuits/_spacesuits.dm @@ -26,6 +26,7 @@ name = "space suit" desc = "A suit that protects against low pressure environments. Has a big 13 on the back." icon_state = "spaceold" + worn_icon = 'icons/mob/clothing/suits/spacesuit.dmi' inhand_icon_state = "s_suit" w_class = WEIGHT_CLASS_BULKY clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL diff --git a/code/modules/clothing/spacesuits/santa.dm b/code/modules/clothing/spacesuits/santa.dm index cc59cfdac4d..f824fc530d8 100644 --- a/code/modules/clothing/spacesuits/santa.dm +++ b/code/modules/clothing/spacesuits/santa.dm @@ -10,6 +10,7 @@ name = "Santa's suit" desc = "Festive!" icon_state = "santa" + worn_icon = 'icons/mob/clothing/suits/wizard.dmi' inhand_icon_state = "santa" slowdown = 0 allowed = list(/obj/item) //for stuffing exta special presents diff --git a/code/modules/clothing/suits/ablativecoat.dm b/code/modules/clothing/suits/ablativecoat.dm index 614878d47dd..4889291c206 100644 --- a/code/modules/clothing/suits/ablativecoat.dm +++ b/code/modules/clothing/suits/ablativecoat.dm @@ -16,6 +16,7 @@ name = "ablative trenchcoat" desc = "Experimental trenchcoat specially crafted to reflect and absorb laser and disabler shots. Don't expect it to do all that much against an axe or a shotgun, however." icon_state = "ablativecoat" + worn_icon = 'icons/mob/clothing/suits/armor.dmi' inhand_icon_state = "ablativecoat" body_parts_covered = CHEST|GROIN|LEGS|ARMS armor = list(MELEE = 10, BULLET = 10, LASER = 60, ENERGY = 60, BOMB = 0, BIO = 0, FIRE = 100, ACID = 100) diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 6129e632fe4..f3edc48442b 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -1,4 +1,5 @@ /obj/item/clothing/suit/armor + worn_icon = 'icons/mob/clothing/suits/armor.dmi' allowed = null body_parts_covered = CHEST cold_protection = CHEST|GROIN @@ -91,13 +92,13 @@ "Greatcoat" = list( RESKIN_ICON = 'icons/obj/clothing/suits.dmi', RESKIN_ICON_STATE = "hos", - RESKIN_WORN_ICON = 'icons/mob/clothing/suit.dmi', + RESKIN_WORN_ICON = 'icons/mob/clothing/suits/armor.dmi', RESKIN_WORN_ICON_STATE = "hos" ), "Trenchcoat" = list( RESKIN_ICON = 'icons/obj/clothing/suits.dmi', RESKIN_ICON_STATE = "hostrench", - RESKIN_WORN_ICON = 'icons/mob/clothing/suit.dmi', + RESKIN_WORN_ICON = 'icons/mob/clothing/suits/armor.dmi', RESKIN_WORN_ICON_STATE = "hostrench" ), "Navy Blue Jacket" = list( @@ -159,7 +160,7 @@ "Basic Warden Armor" = list( RESKIN_ICON = 'icons/obj/clothing/suits.dmi', RESKIN_ICON_STATE = "warden_alt", - RESKIN_WORN_ICON = 'icons/mob/clothing/suit.dmi', + RESKIN_WORN_ICON = 'icons/mob/clothing/suits/armor.dmi', RESKIN_WORN_ICON_STATE = "warden_alt" ), "Standard" = list( diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index b32a8ee2b68..25e49205925 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -13,6 +13,7 @@ name = "bio suit" desc = "A suit that protects against biological contamination." icon_state = "bio" + worn_icon = 'icons/mob/clothing/suits/bio.dmi' inhand_icon_state = "bio_suit" w_class = WEIGHT_CLASS_BULKY clothing_flags = THICKMATERIAL diff --git a/code/modules/clothing/suits/chaplainsuits.dm b/code/modules/clothing/suits/chaplainsuits.dm index 07a61c2d458..b332dc00672 100644 --- a/code/modules/clothing/suits/chaplainsuits.dm +++ b/code/modules/clothing/suits/chaplainsuits.dm @@ -2,6 +2,16 @@ //If any new staple chaplain items get added, put them in these lists /obj/item/clothing/suit/chaplainsuit allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) + worn_icon = 'icons/mob/clothing/suits/chaplain.dmi' + +/obj/item/clothing/suit/chaplainsuit/armor + body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + armor = list(MELEE = 50, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 0, BIO = 0, FIRE = 80, ACID = 80, WOUND = 20) + clothing_flags = BLOCKS_SHOVE_KNOCKDOWN + strip_delay = 80 + equip_delay_other = 60 /obj/item/clothing/suit/hooded/chaplainsuit allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) @@ -31,14 +41,14 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS flags_inv = HIDEJUMPSUIT -/obj/item/clothing/suit/chaplainsuit/studentuni +/obj/item/clothing/suit/chaplainsuit/armor/studentuni name = "student robe" desc = "The uniform of a bygone institute of learning." icon_state = "studentuni" inhand_icon_state = "studentuni" body_parts_covered = ARMS|CHEST -/obj/item/clothing/suit/chaplainsuit/witchhunter +/obj/item/clothing/suit/chaplainsuit/armor/witchhunter name = "witchunter garb" desc = "This worn outfit saw much use back in the day." icon_state = "witchhunter" @@ -49,6 +59,7 @@ name = "monk's habit" desc = "A few steps above rended sackcloth." icon_state = "monkfrock" + worn_icon = 'icons/mob/clothing/suits/chaplain.dmi' inhand_icon_state = "monkfrock" body_parts_covered = CHEST|GROIN|LEGS|ARMS hoodtype = /obj/item/clothing/head/hooded/monkhabit @@ -85,3 +96,129 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS flags_inv = HIDEJUMPSUIT allowed = list(/obj/item/megaphone/clown, /obj/item/soap, /obj/item/food/pie/cream, /obj/item/bikehorn, /obj/item/bikehorn/golden, /obj/item/bikehorn/airhorn, /obj/item/instrument/bikehorn, /obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter, /obj/item/toy/crayon, /obj/item/toy/crayon/spraycan, /obj/item/toy/crayon/spraycan/lubecan, /obj/item/grown/bananapeel, /obj/item/food/grown/banana) + +/obj/item/clothing/head/helmet/chaplain/clock + name = "forgotten helmet" + desc = "It has the unyielding gaze of a god eternally forgotten." + icon_state = "clockwork_helmet" + inhand_icon_state = "clockwork_helmet_inhand" + armor = list(MELEE = 50, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 0, BIO = 0, FIRE = 80, ACID = 80) + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT + flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH + strip_delay = 8 SECONDS + dog_fashion = null + +/obj/item/clothing/suit/chaplainsuit/armor/clock + name = "forgotten armour" + desc = "It sounds like hissing steam, ticking cogs, gone silent, It looks like a dead machine, trying to tick with life." + icon_state = "clockwork_cuirass" + inhand_icon_state = "clockwork_cuirass_inhand" + allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) + slowdown = 0 + clothing_flags = NONE + +/obj/item/clothing/head/helmet/chaplain + name = "crusader helmet" + desc = "Deus Vult." + icon_state = "knight_templar" + inhand_icon_state = "knight_templar" + armor = list(MELEE = 50, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 0, BIO = 0, FIRE = 80, ACID = 80) + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT + flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH + strip_delay = 80 + dog_fashion = null + +/obj/item/clothing/suit/chaplainsuit/armor/templar + name = "crusader armour" + desc = "God wills it!" + icon_state = "knight_templar" + inhand_icon_state = "knight_templar" + allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) + slowdown = 0 + clothing_flags = NONE + +/obj/item/clothing/head/helmet/chaplain/cage + name = "cage" + desc = "A cage that restrains the will of the self, allowing one to see the profane world for what it is." + flags_inv = NONE + icon_state = "cage" + inhand_icon_state = "cage" + worn_y_offset = 7 + +/obj/item/clothing/head/helmet/chaplain/ancient + name = "ancient helmet" + desc = "None may pass!" + icon_state = "knight_ancient" + inhand_icon_state = "knight_ancient" + +/obj/item/clothing/suit/chaplainsuit/armor/ancient + name = "ancient armour" + desc = "Defend the treasure..." + icon_state = "knight_ancient" + inhand_icon_state = "knight_ancient" + +/obj/item/clothing/head/helmet/chaplain/witchunter_hat + name = "witchunter hat" + desc = "This hat saw much use back in the day." + icon_state = "witchhunterhat" + inhand_icon_state = "witchhunterhat" + flags_cover = HEADCOVERSEYES + flags_inv = HIDEEYES + +/obj/item/clothing/head/helmet/chaplain/adept + name = "adept hood" + desc = "Its only heretical when others do it." + icon_state = "crusader" + inhand_icon_state = "crusader" + flags_cover = HEADCOVERSEYES + flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS + +/obj/item/clothing/suit/chaplainsuit/armor/adept + name = "adept robes" + desc = "The ideal outfit for burning the unfaithful." + icon_state = "crusader" + inhand_icon_state = "crusader" + +/obj/item/clothing/suit/chaplainsuit/armor/crusader + name = "Crusader's Armour" + desc = "Armour that's comprised of metal and cloth." + icon_state = "crusader" + w_class = WEIGHT_CLASS_BULKY + slowdown = 2.0 //gotta pretend we're balanced. + body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + armor = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 60, BIO = 0, FIRE = 60, ACID = 60) + +/obj/item/clothing/suit/chaplainsuit/armor/crusader/red + icon_state = "crusader-red" + +/obj/item/clothing/suit/chaplainsuit/armor/crusader/blue + icon_state = "crusader-blue" + +/obj/item/clothing/suit/hooded/chaplain_hoodie + name = "follower hoodie" + desc = "Hoodie made for acolytes of the chaplain." + icon_state = "chaplain_hoodie" + worn_icon = 'icons/mob/clothing/suits/chaplain.dmi' + inhand_icon_state = "chaplain_hoodie" + body_parts_covered = CHEST|GROIN|LEGS|ARMS + allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) + hoodtype = /obj/item/clothing/head/hooded/chaplain_hood + +/obj/item/clothing/head/hooded/chaplain_hood + name = "follower hood" + desc = "Hood made for acolytes of the chaplain." + icon_state = "chaplain_hood" + body_parts_covered = HEAD + flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS + +/obj/item/clothing/suit/hooded/chaplain_hoodie/leader + name = "leader hoodie" + desc = "Now you're ready for some 50 dollar bling water." + icon_state = "chaplain_hoodie_leader" + inhand_icon_state = "chaplain_hoodie_leader" + hoodtype = /obj/item/clothing/head/hooded/chaplain_hood/leader + +/obj/item/clothing/head/hooded/chaplain_hood/leader + name = "leader hood" + desc = "I mean, you don't /have/ to seek bling water. I just think you should." + icon_state = "chaplain_hood_leader" diff --git a/code/modules/clothing/suits/costume.dm b/code/modules/clothing/suits/costume.dm index 390ceb031e3..b77017ffb67 100644 --- a/code/modules/clothing/suits/costume.dm +++ b/code/modules/clothing/suits/costume.dm @@ -1,7 +1,11 @@ +/obj/item/clothing/suit/costume + worn_icon = 'icons/mob/clothing/suits/costume.dmi' + /obj/item/clothing/suit/hooded/flashsuit name = "flashy costume" desc = "What did you expect?" icon_state = "flashsuit" + worn_icon = 'icons/mob/clothing/suits/costume.dmi' inhand_icon_state = "armor" body_parts_covered = CHEST|GROIN hoodtype = /obj/item/clothing/head/hooded/flashsuit @@ -13,7 +17,7 @@ body_parts_covered = HEAD flags_inv = HIDEHAIR|HIDEEARS|HIDEFACIALHAIR|HIDEFACE|HIDEMASK|HIDESNOUT -/obj/item/clothing/suit/pirate +/obj/item/clothing/suit/costume/pirate name = "pirate coat" desc = "Yarr." icon_state = "pirate" @@ -21,23 +25,23 @@ allowed = list(/obj/item/melee/energy/sword/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/reagent_containers/food/drinks/bottle/rum) species_exception = list(/datum/species/golem) -/obj/item/clothing/suit/pirate/armored +/obj/item/clothing/suit/costume/pirate/armored armor = list(MELEE = 30, BULLET = 50, LASER = 30,ENERGY = 40, BOMB = 30, BIO = 30, FIRE = 60, ACID = 75) strip_delay = 40 equip_delay_other = 20 -/obj/item/clothing/suit/pirate/captain +/obj/item/clothing/suit/costume/pirate/captain name = "pirate captain coat" desc = "Yarr." icon_state = "hgpirate" inhand_icon_state = "hgpirate" -/obj/item/clothing/suit/pirate/captain/armored +/obj/item/clothing/suit/costume/pirate/armored armor = list(MELEE = 30, BULLET = 50, LASER = 30,ENERGY = 40, BOMB = 30, BIO = 30, FIRE = 60, ACID = 75) strip_delay = 40 equip_delay_other = 20 -/obj/item/clothing/suit/cyborg_suit +/obj/item/clothing/suit/costume/cyborg_suit name = "cyborg suit" desc = "Suit for a cyborg costume." icon_state = "death" @@ -47,7 +51,7 @@ fire_resist = T0C+5200 flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT -/obj/item/clothing/suit/justice +/obj/item/clothing/suit/costume/justice name = "justice suit" desc = "this pretty much looks ridiculous" //Needs no fixing icon_state = "justice" @@ -55,7 +59,7 @@ flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT armor = list(MELEE = 35, BULLET = 30, LASER = 30, ENERGY = 40, BOMB = 25, BIO = 0, FIRE = 50, ACID = 50) -/obj/item/clothing/suit/judgerobe +/obj/item/clothing/suit/costume/judgerobe name = "judge's robe" desc = "This robe commands authority." icon_state = "judge" @@ -82,6 +86,7 @@ /obj/item/clothing/suit/syndicatefake name = "black and red space suit replica" icon_state = "syndicate-black-red" + worn_icon = 'icons/mob/clothing/suits/spacesuit.dmi' inhand_icon_state = "syndicate-black-red" body_parts_covered = CHEST|GROIN|ARMS|LEGS|FEET desc = "A plastic replica of the Syndicate space suit. You'll look just like a real murderous Syndicate agent in this! This is a toy, it is not made for use in space!" @@ -90,7 +95,7 @@ flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL // SYKRAT EDIT ADDITION - HIDETAIL resistance_flags = NONE -/obj/item/clothing/suit/hastur +/obj/item/clothing/suit/costume/hastur name = "\improper Hastur's robe" desc = "Robes not meant to be worn by man." icon_state = "hastur" @@ -98,7 +103,7 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT -/obj/item/clothing/suit/imperium_monk +/obj/item/clothing/suit/costume/imperium_monk name = "\improper Imperium monk suit" desc = "Have YOU killed a xeno today?" icon_state = "imperium_monk" @@ -107,7 +112,7 @@ flags_inv = HIDESHOES|HIDEJUMPSUIT allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen) -/obj/item/clothing/suit/chickensuit +/obj/item/clothing/suit/costume/chickensuit name = "chicken suit" desc = "A suit made long ago by the ancient empire KFC." icon_state = "chickensuit" @@ -115,7 +120,7 @@ body_parts_covered = CHEST|ARMS|GROIN|LEGS|FEET flags_inv = HIDESHOES|HIDEJUMPSUIT -/obj/item/clothing/suit/monkeysuit +/obj/item/clothing/suit/costume/monkeysuit name = "monkey suit" desc = "A suit that looks like a primate." icon_state = "monkeysuit" @@ -127,6 +132,7 @@ name = "owl cloak" desc = "A soft brown cloak made of synthetic feathers. Soft to the touch, stylish, and a 2 meter wing span that will drive the ladies mad." icon_state = "owl_wings" + worn_icon = 'icons/mob/clothing/suits/costume.dmi' inhand_icon_state = "owl_wings" toggle_noun = "wings" body_parts_covered = ARMS|CHEST @@ -141,7 +147,7 @@ icon_state = "griffin_wings" inhand_icon_state = "griffin_wings" -/obj/item/clothing/suit/cardborg +/obj/item/clothing/suit/costume/cardborg name = "cardborg suit" desc = "An ordinary cardboard box with holes cut in the sides." icon_state = "cardborg" @@ -150,16 +156,16 @@ flags_inv = HIDEJUMPSUIT dog_fashion = /datum/dog_fashion/back -/obj/item/clothing/suit/cardborg/equipped(mob/living/user, slot) +/obj/item/clothing/suit/costume/cardborg/equipped(mob/living/user, slot) ..() if(slot == ITEM_SLOT_OCLOTHING) disguise(user) -/obj/item/clothing/suit/cardborg/dropped(mob/living/user) +/obj/item/clothing/suit/costume/cardborg/dropped(mob/living/user) ..() user.remove_alt_appearance("standard_borg_disguise") -/obj/item/clothing/suit/cardborg/proc/disguise(mob/living/carbon/human/H, obj/item/clothing/head/cardborg/borghead) +/obj/item/clothing/suit/costume/cardborg/proc/disguise(mob/living/carbon/human/H, obj/item/clothing/head/cardborg/borghead) if(istype(H)) if(!borghead) borghead = H.head @@ -169,7 +175,7 @@ I.add_overlay(mutable_appearance('icons/mob/robots.dmi', "robot_e")) //gotta look realistic add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/silicons, "standard_borg_disguise", I) //you look like a robot to robots! (including yourself because you're totally a robot) -/obj/item/clothing/suit/snowman +/obj/item/clothing/suit/costume/snowman name = "snowman outfit" desc = "Two white spheres covered in white glitter. 'Tis the season." icon_state = "snowman" @@ -177,36 +183,36 @@ body_parts_covered = CHEST|GROIN flags_inv = HIDEJUMPSUIT -/obj/item/clothing/suit/poncho +/obj/item/clothing/suit/costume/poncho name = "poncho" desc = "Your classic, non-racist poncho." icon_state = "classicponcho" inhand_icon_state = "classicponcho" species_exception = list(/datum/species/golem) -/obj/item/clothing/suit/poncho/green +/obj/item/clothing/suit/costume/poncho/green name = "green poncho" desc = "Your classic, non-racist poncho. This one is green." icon_state = "greenponcho" inhand_icon_state = "greenponcho" -/obj/item/clothing/suit/poncho/red +/obj/item/clothing/suit/costume/poncho/red name = "red poncho" desc = "Your classic, non-racist poncho. This one is red." icon_state = "redponcho" inhand_icon_state = "redponcho" -/obj/item/clothing/suit/poncho/ponchoshame +/obj/item/clothing/suit/costume/poncho/ponchoshame name = "poncho of shame" desc = "Forced to live on your shameful acting as a fake Mexican, you and your poncho have grown inseparable. Literally." icon_state = "ponchoshame" inhand_icon_state = "ponchoshame" -/obj/item/clothing/suit/poncho/ponchoshame/Initialize(mapload) +/obj/item/clothing/suit/costume/poncho/ponchoshame/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, SHAMEBRERO_TRAIT) -/obj/item/clothing/suit/whitedress +/obj/item/clothing/suit/costume/whitedress name = "white dress" desc = "A fancy white dress." icon_state = "white_dress" @@ -218,6 +224,7 @@ name = "carp costume" desc = "A costume made from 'synthetic' carp scales, it smells." icon_state = "carp_casual" + worn_icon = 'icons/mob/clothing/suits/costume.dmi' inhand_icon_state = "labcoat" body_parts_covered = CHEST|GROIN|ARMS|LEGS|FEET cold_protection = CHEST|GROIN|ARMS @@ -289,6 +296,7 @@ name = "corgi costume" desc = "A costume that looks like someone made a human-like corgi, it won't guarantee belly rubs." icon_state = "ian" + worn_icon = 'icons/mob/clothing/suits/costume.dmi' inhand_icon_state = "labcoat" body_parts_covered = CHEST|GROIN|ARMS|LEGS|FEET //cold_protection = CHEST|GROIN|ARMS @@ -310,6 +318,7 @@ name = "bee costume" desc = "Bee the true Queen!" icon_state = "bee" + worn_icon = 'icons/mob/clothing/suits/costume.dmi' inhand_icon_state = "labcoat" body_parts_covered = CHEST|GROIN|ARMS clothing_flags = THICKMATERIAL @@ -328,6 +337,7 @@ name = "bloated human suit" desc = "A horribly bloated suit made from human skins." icon_state = "lingspacesuit" + worn_icon = 'icons/mob/clothing/suits/costume.dmi' inhand_icon_state = "labcoat" body_parts_covered = CHEST|GROIN|ARMS|LEGS|FEET allowed = list() @@ -344,14 +354,7 @@ flags_cover = HEADCOVERSEYES flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT -/obj/item/clothing/suit/security/officer/russian - name = "\improper Russian officer's jacket" - desc = "This jacket is for those special occasions when a russian officer isn't required to wear their armor." - icon_state = "officertanjacket" - inhand_icon_state = "officertanjacket" - body_parts_covered = CHEST|ARMS - -/obj/item/clothing/suit/shrine_maiden +/obj/item/clothing/suit/costume/shrine_maiden name = "shrine maiden's outfit" desc = "Makes you want to exterminate some troublesome youkai." icon_state = "shrine_maiden" @@ -359,31 +362,31 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS flags_inv = HIDEJUMPSUIT -/obj/item/clothing/suit/striped_sweater +/obj/item/clothing/suit/costume/striped_sweater name = "striped sweater" desc = "Reminds you of someone, but you just can't put your finger on it..." icon_state = "waldo_shirt" inhand_icon_state = "waldo_shirt" -/obj/item/clothing/suit/dracula +/obj/item/clothing/suit/costume/dracula name = "dracula coat" desc = "Looks like this belongs in a very old movie set." icon_state = "draculacoat" inhand_icon_state = "draculacoat" -/obj/item/clothing/suit/drfreeze_coat +/obj/item/clothing/suit/costume/drfreeze_coat name = "doctor freeze's labcoat" desc = "A labcoat imbued with the power of features and freezes." icon_state = "drfreeze_coat" inhand_icon_state = "drfreeze_coat" -/obj/item/clothing/suit/gothcoat +/obj/item/clothing/suit/costume/gothcoat name = "gothic coat" desc = "Perfect for those who want to stalk around a corner of a bar." icon_state = "gothcoat" inhand_icon_state = "gothcoat" -/obj/item/clothing/suit/xenos +/obj/item/clothing/suit/costume/xenos name = "xenos suit" desc = "A suit made out of chitinous alien hide." icon_state = "xenos" @@ -392,42 +395,42 @@ flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT allowed = list(/obj/item/clothing/mask/facehugger/toy) -/obj/item/clothing/suit/nemes +/obj/item/clothing/suit/costume/nemes name = "pharoah tunic" desc = "Lavish space tomb not included." icon_state = "pharoah" inhand_icon_state = "pharoah" body_parts_covered = CHEST|GROIN -/obj/item/clothing/suit/changshan_red +/obj/item/clothing/suit/costume/changshan_red name = "red changshan" desc = "A gorgeously embroidered silk shirt." icon_state = "changshan_red" inhand_icon_state = "changshan_red" body_parts_covered = CHEST|GROIN|ARMS|LEGS -/obj/item/clothing/suit/changshan_blue +/obj/item/clothing/suit/costume/changshan_blue name = "blue changshan" desc = "A gorgeously embroidered silk shirt." icon_state = "changshan_blue" inhand_icon_state = "changshan_blue" body_parts_covered = CHEST|GROIN|ARMS|LEGS -/obj/item/clothing/suit/cheongsam_red +/obj/item/clothing/suit/costume/cheongsam_red name = "red cheongsam" desc = "A gorgeously embroidered silk dress." icon_state = "cheongsam_red" inhand_icon_state = "cheongsam_red" body_parts_covered = CHEST|GROIN|ARMS|LEGS -/obj/item/clothing/suit/cheongsam_blue +/obj/item/clothing/suit/costume/cheongsam_blue name = "blue cheongsam" desc = "A gorgeously embroidered silk dress." icon_state = "cheongsam_blue" inhand_icon_state = "cheongsam_blue" body_parts_covered = CHEST|GROIN|ARMS|LEGS -/obj/item/clothing/suit/bronze +/obj/item/clothing/suit/costume/bronze name = "bronze suit" desc = "A big and clanky suit made of bronze that offers no protection and looks very unfashionable. Nice." icon = 'icons/obj/clothing/suits.dmi' @@ -438,6 +441,7 @@ name = "mystic's robe" desc = "Wearing this makes you feel more attuned with the nature of the universe... as well as a bit more irresponsible. " icon_state = "mysticrobe" + worn_icon = 'icons/mob/clothing/suits/costume.dmi' inhand_icon_state = "mysticrobe" body_parts_covered = CHEST|GROIN|LEGS|ARMS allowed = list(/obj/item/spellbook, /obj/item/storage/book/bible) @@ -456,17 +460,18 @@ name = "coordinator jacket" desc = "A jacket for a party ooordinator, stylish!." icon_state = "capformal" + worn_icon = 'icons/mob/clothing/suits/armor.dmi' inhand_icon_state = "capspacesuit" armor = list(MELEE = 25, BULLET = 15, LASER = 25, ENERGY = 35, BOMB = 25, BIO = 0, FIRE = 50, ACID = 50) -/obj/item/clothing/suit/hawaiian +/obj/item/clothing/suit/costume/hawaiian name = "hawaiian overshirt" desc = "A cool shirt for chilling on the beach." icon_state = "hawaiian_blue" inhand_icon_state = "hawaiian_blue" species_exception = list(/datum/species/golem) -/obj/item/clothing/suit/yakuza +/obj/item/clothing/suit/costume/yakuza name = "tojo clan jacket" desc = "The jacket of a mad dog." icon_state = "MajimaJacket" @@ -474,7 +479,7 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/suit/dutch +/obj/item/clothing/suit/costume/dutch name = "dutch's jacket" desc = "For those long nights on the beach in Tahiti." icon_state = "DutchJacket" @@ -483,7 +488,7 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/suit/driscoll +/obj/item/clothing/suit/costume/driscoll name = "driscoll poncho" desc = "Keeping you warm in the harsh cold of space." icon_state = "driscoll_suit" @@ -491,7 +496,7 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/suit/irs +/obj/item/clothing/suit/costume/irs name = "internal revenue service jacket" desc = "I'm crazy enough to take on The Owl, but the IRS? Nooo thank you!" icon_state = "irs_suit" @@ -499,7 +504,7 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/suit/osi +/obj/item/clothing/suit/costume/osi name = "\improper O.S.I. body armor" desc = "You're beyond good and evil, super man. You work for the government. And you're a tool, boy, a tool! Built for a single purpose by the United States of shut your third fucking damn eye for a fucking reason! You can't teach a hammer to love nails, son. That dog don't hunt!" icon_state = "osi_suit" @@ -507,7 +512,7 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/suit/tmc +/obj/item/clothing/suit/costume/tmc name = "\improper Lost M.C. cut" desc = "Making sure everyone knows you're in the best biker gang this side of Alderney." icon_state = "tmc_suit" @@ -515,7 +520,7 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/suit/pg +/obj/item/clothing/suit/costume/pg name = "powder ganger jacket" desc = "Remind Security of their mistakes in giving prisoners blasting charges." icon_state = "pg_suit" @@ -523,7 +528,7 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/suit/deckers +/obj/item/clothing/suit/costume/deckers name = "decker hoodie" desc = "Based? Based on what?" icon_state = "decker_suit" @@ -531,7 +536,7 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/suit/morningstar +/obj/item/clothing/suit/costume/morningstar name = "morningstar coat" desc = "This coat costs more than you've ever made in your entire life." icon_state = "morningstar_suit" @@ -539,7 +544,7 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/suit/saints +/obj/item/clothing/suit/costume/saints name = "Third Street Saints fur coat" desc = "Rated 10 out of 10 in Cosmo for best coat brand." icon_state = "saints_suit" @@ -549,7 +554,7 @@ min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/suit/phantom +/obj/item/clothing/suit/costume/phantom name = "phantom thief coat" desc = "Your foes will never see you coming in this stealthy yet stylish getup." icon_state = "phantom_suit" @@ -557,7 +562,7 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/suit/allies +/obj/item/clothing/suit/costume/allies name = "allies body armor" desc = "How 'bout some action!? Sponsored by DonkSoft Co. for historical reenactment of the Third World War!" icon_state = "allies_armor" @@ -565,35 +570,35 @@ body_parts_covered = CHEST|GROIN supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/suit/soviet +/obj/item/clothing/suit/costume/soviet name = "soviet armored coat" desc = "Conscript reporting! Sponsored by DonkSoft Co. for historical reenactment of the Third World War!" icon_state = "soviet_suit" inhand_icon_state = "soviet_suit" body_parts_covered = CHEST|GROIN|LEGS|ARMS -/obj/item/clothing/suit/yuri +/obj/item/clothing/suit/costume/yuri name = "yuri initiate coat" desc = "Yuri is master! Sponsored by DonkSoft Co. for historical reenactment of the Third World War!" icon_state = "yuri_coat" inhand_icon_state = "yuri_coat" body_parts_covered = CHEST|GROIN|ARMS -/obj/item/clothing/suit/sybil_slickers +/obj/item/clothing/suit/costume/sybil_slickers name = "sybil slickers protective gear" desc = "Given to members of the Sybil Slickers football team!" icon_state = "football_armor_blue" inhand_icon_state = "football_armor_blue" body_parts_covered = CHEST|GROIN|LEGS|ARMS -/obj/item/clothing/suit/basil_boys +/obj/item/clothing/suit/costume/basil_boys name = "basil boys protective gear" desc = "Given to members of the Basil Boys football team!" icon_state = "football_armor_red" inhand_icon_state = "football_armor_red" body_parts_covered = CHEST|GROIN|LEGS|ARMS -/obj/item/clothing/suit/joker +/obj/item/clothing/suit/costume/joker name = "comedian coat" desc = "I mean, don’t you have to be funny to be a comedian?" icon_state = "joker_coat" diff --git a/code/modules/clothing/suits/ghostsheet.dm b/code/modules/clothing/suits/ghostsheet.dm index 901e823624c..a75734fe92d 100644 --- a/code/modules/clothing/suits/ghostsheet.dm +++ b/code/modules/clothing/suits/ghostsheet.dm @@ -1,4 +1,4 @@ -/obj/item/clothing/suit/ghost_sheet +/obj/item/clothing/suit/costume/ghost_sheet name = "ghost sheet" desc = "The hands float by themselves, so it's extra spooky." icon_state = "ghost_sheet" @@ -11,7 +11,7 @@ alternate_worn_layer = UNDER_HEAD_LAYER species_exception = list(/datum/species/golem) -/obj/item/clothing/suit/ghost_sheet/spooky +/obj/item/clothing/suit/costume/ghost_sheet/spooky name = "spooky ghost" desc = "This is obviously just a bedsheet, but maybe try it on?" user_vars_to_edit = list("name" = "Spooky Ghost", "real_name" = "Spooky Ghost" , "incorporeal_move" = INCORPOREAL_MOVE_BASIC, "appearance_flags" = KEEP_TOGETHER|TILE_BOUND, "alpha" = 150) diff --git a/code/modules/clothing/suits/jacket.dm b/code/modules/clothing/suits/jacket.dm index 80fe54c5918..6137b63440a 100644 --- a/code/modules/clothing/suits/jacket.dm +++ b/code/modules/clothing/suits/jacket.dm @@ -2,6 +2,7 @@ name = "bomber jacket" desc = "Aviators not included." icon_state = "bomberjacket" + worn_icon = 'icons/mob/clothing/suits/jacket.dmi' inhand_icon_state = "brownjsuit" 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) body_parts_covered = CHEST|GROIN|ARMS diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 139074b934f..4b5e159629c 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -7,6 +7,7 @@ name = "apron" desc = "A basic blue apron." icon_state = "apron" + worn_icon = 'icons/mob/clothing/suits/utility.dmi' inhand_icon_state = "apron" blood_overlay_type = "armor" body_parts_covered = CHEST|GROIN @@ -22,7 +23,7 @@ body_parts_covered = CHEST|GROIN|LEGS //Captain -/obj/item/clothing/suit/capjacket +/obj/item/clothing/suit/jacket/capjacket name = "captain's parade jacket" desc = "Worn by a Captain to show their class." icon_state = "capjacket" @@ -35,6 +36,7 @@ name = "chef's apron" desc = "An apron-jacket used by a high class chef." icon_state = "chef" + worn_icon = 'icons/mob/clothing/suits/jacket.dmi' inhand_icon_state = "chef" armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 50, FIRE = 0, ACID = 0) body_parts_covered = CHEST|GROIN|ARMS @@ -53,7 +55,7 @@ allowed = list(/obj/item/kitchen, /obj/item/knife/kitchen, /obj/item/storage/bag/tray) //Detective -/obj/item/clothing/suit/det_suit +/obj/item/clothing/suit/jacket/det_suit name = "trenchcoat" desc = "A 18th-century multi-purpose trenchcoat. Someone who wears this means serious business." icon_state = "detective" @@ -64,27 +66,40 @@ cold_protection = CHEST|GROIN|ARMS heat_protection = CHEST|GROIN|ARMS -/obj/item/clothing/suit/det_suit/Initialize(mapload) +/obj/item/clothing/suit/jacket/det_suit/Initialize(mapload) . = ..() allowed = GLOB.detective_vest_allowed -/obj/item/clothing/suit/det_suit/dark +/obj/item/clothing/suit/jacket/det_suit/dark name = "noir trenchcoat" desc = "A hard-boiled private investigator's dark trenchcoat." icon_state = "noirdet" inhand_icon_state = "greydet" -/obj/item/clothing/suit/det_suit/noir +/obj/item/clothing/suit/jacket/det_suit/noir name = "noir suit coat" desc = "A dapper private investigator's dark suit coat." icon_state = "detsuit" inhand_icon_state = "detsuit" +/obj/item/clothing/suit/jacket/det_suit/kim + name = "aerostatic bomber jacket" + desc = "A jacket once worn by the revolutionary air brigades during the Antecentennial Revolution. There are quite a few pockets on the inside, mostly for storing notebooks and compasses." + icon_state = "aerostatic_bomber_jacket" + inhand_icon_state = "aerostatic_bomber_jacket" + +/obj/item/clothing/suit/jacket/det_suit/disco + name = "disco ass blazer" + desc = "Looks like someone skinned this blazer off some long extinct disco-animal. It has an enigmatic white rectangle on the back and the right sleeve." + icon_state = "jamrock_blazer" + inhand_icon_state = "jamrock_blazer" + //Engineering /obj/item/clothing/suit/hazardvest name = "hazard vest" desc = "A high-visibility vest used in work zones." icon_state = "hazard" + worn_icon = 'icons/mob/clothing/suits/utility.dmi' inhand_icon_state = "hazard" blood_overlay_type = "armor" allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/t_scanner, /obj/item/radio, /obj/item/storage/bag/construction) @@ -101,6 +116,7 @@ name = "blue suit jacket" desc = "A snappy dress jacket." icon_state = "suitjacket_blue" + worn_icon = 'icons/mob/clothing/suits/jacket.dmi' inhand_icon_state = "suitjacket_blue" blood_overlay_type = "coat" body_parts_covered = CHEST|ARMS @@ -118,13 +134,13 @@ icon_state = "suitjacket_black" inhand_icon_state = "ro_suit" - //Mime /obj/item/clothing/suit/toggle/suspenders name = "suspenders" desc = "They suspend the illusion of the mime's play." icon = 'icons/obj/clothing/belts.dmi' icon_state = "suspenders" + worn_icon = 'icons/mob/clothing/suits/utility.dmi' worn_icon_state = "suspenders" blood_overlay_type = "armor" //it's the less thing that I can put here toggle_noun = "straps" @@ -147,27 +163,48 @@ greyscale_colors = "#888888" //Security -/obj/item/clothing/suit/security/officer +/obj/item/clothing/suit/jacket/officer/blue name = "security officer's jacket" desc = "This jacket is for those special occasions when a security officer isn't required to wear their armor." icon_state = "officerbluejacket" inhand_icon_state = "officerbluejacket" body_parts_covered = CHEST|ARMS -/obj/item/clothing/suit/security/warden +/obj/item/clothing/suit/jacket/officer/tan + name = "security officer's jacket" + desc = "This jacket is for those special occasions when a security officer isn't required to wear their armor." + icon_state = "officertanjacket" + inhand_icon_state = "officertanjacket" + body_parts_covered = CHEST|ARMS + +/obj/item/clothing/suit/jacket/warden/blue name = "warden's jacket" desc = "Perfectly suited for the warden that wants to leave an impression of style on those who visit the brig." icon_state = "wardenbluejacket" inhand_icon_state = "wardenbluejacket" body_parts_covered = CHEST|ARMS -/obj/item/clothing/suit/security/hos +/obj/item/clothing/suit/jacket/warden/tan + name = "warden's jacket" + desc = "Perfectly suited for the warden that wants to leave an impression of style on those who visit the brig." + icon_state = "wardentanjacket" + inhand_icon_state = "wardentanjacket" + body_parts_covered = CHEST|ARMS + +/obj/item/clothing/suit/jacket/hos/blue name = "head of security's jacket" desc = "This piece of clothing was specifically designed for asserting superior authority." icon_state = "hosbluejacket" inhand_icon_state = "hosbluejacket" body_parts_covered = CHEST|ARMS +/obj/item/clothing/suit/jacket/hos/tan + name = "head of security's jacket" + desc = "This piece of clothing was specifically designed for asserting superior authority." + icon_state = "hostanjacket" + inhand_icon_state = "hostanjacket" + body_parts_covered = CHEST|ARMS + //Surgeon /obj/item/clothing/suit/apron/surgical name = "surgical apron" @@ -192,7 +229,7 @@ ) //Curator -/obj/item/clothing/suit/curator +/obj/item/clothing/suit/jacket/curator name = "treasure hunter's coat" desc = "Both fashionable and lightly armoured, this jacket is favoured by treasure hunters the galaxy over." icon_state = "curator" @@ -204,13 +241,12 @@ cold_protection = CHEST|ARMS heat_protection = CHEST|ARMS - //Robotocist - /obj/item/clothing/suit/hooded/techpriest name = "techpriest robes" desc = "For those who REALLY love their toasters." icon_state = "techpriest" + worn_icon = 'icons/mob/clothing/suits/costume.dmi' inhand_icon_state = "techpriest" body_parts_covered = CHEST|GROIN|LEGS|ARMS hoodtype = /obj/item/clothing/head/hooded/techpriest @@ -222,16 +258,3 @@ inhand_icon_state = "techpriesthood" body_parts_covered = HEAD flags_inv = HIDEHAIR|HIDEEARS - -/obj/item/clothing/suit/det_suit/kim - name = "aerostatic bomber jacket" - desc = "A jacket once worn by the revolutionary air brigades during the Antecentennial Revolution. There are quite a few pockets on the inside, mostly for storing notebooks and compasses." - icon_state = "aerostatic_bomber_jacket" - inhand_icon_state = "aerostatic_bomber_jacket" - -/obj/item/clothing/suit/det_suit/disco - name = "disco ass blazer" - desc = "Looks like someone skinned this blazer off some long extinct disco-animal. It has an enigmatic white rectangle on the back and the right sleeve." - icon_state = "jamrock_blazer" - inhand_icon_state = "jamrock_blazer" - diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index 1a6004c9fcb..736a004d9e6 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -2,6 +2,7 @@ name = "labcoat" desc = "A suit that protects against minor chemical spills." icon_state = "labcoat" + worn_icon = 'icons/mob/clothing/suits/labcoat.dmi' inhand_icon_state = "labcoat" blood_overlay_type = "coat" body_parts_covered = CHEST|ARMS diff --git a/code/modules/clothing/suits/lasertag.dm b/code/modules/clothing/suits/lasertag.dm index e1b75b08c2e..95b281a776b 100644 --- a/code/modules/clothing/suits/lasertag.dm +++ b/code/modules/clothing/suits/lasertag.dm @@ -2,6 +2,7 @@ name = "blue laser tag armor" desc = "A piece of plastic armor. It has sensors that react to red light." //Lasers are concentrated light icon_state = "bluetag" + worn_icon = 'icons/mob/clothing/suits/costume.dmi' inhand_icon_state = "bluetag" blood_overlay_type = "armor" body_parts_covered = CHEST @@ -12,6 +13,7 @@ name = "red laser tag armor" desc = "A piece of plastic armor. It has sensors that react to blue light." icon_state = "redtag" + worn_icon = 'icons/mob/clothing/suits/costume.dmi' inhand_icon_state = "redtag" blood_overlay_type = "armor" body_parts_covered = CHEST diff --git a/code/modules/clothing/suits/shirt.dm b/code/modules/clothing/suits/shirt.dm index eeea8e17a71..e034958bc95 100644 --- a/code/modules/clothing/suits/shirt.dm +++ b/code/modules/clothing/suits/shirt.dm @@ -1,4 +1,4 @@ -/obj/item/clothing/suit/ianshirt +/obj/item/clothing/suit/costume/ianshirt name = "worn shirt" desc = "A worn out, curiously comfortable t-shirt with a picture of Ian. You wouldn't go so far as to say it feels like being hugged when you wear it, but it's pretty close. Good for sleeping in." icon_state = "ianshirt" @@ -7,7 +7,7 @@ ///How many times has this shirt been washed? (In an ideal world this is just the determinant of the transform matrix.) var/wash_count = 0 -/obj/item/clothing/suit/ianshirt/machine_wash(obj/machinery/washing_machine/washer) +/obj/item/clothing/suit/costume/ianshirt/machine_wash(obj/machinery/washing_machine/washer) . = ..() if(wash_count <= 5) transform *= TRANSFORM_USING_VARIABLE(0.8, 1) @@ -17,7 +17,7 @@ washer.visible_message("[src] implodes due to repeated washing.") qdel(src) -/obj/item/clothing/suit/nerdshirt +/obj/item/clothing/suit/costume/nerdshirt name = "gamer shirt" desc = "A baggy shirt with vintage game character Phanic the Weasel. Why would anyone wear this?" icon_state = "nerdshirt" diff --git a/code/modules/clothing/suits/straightjacket.dm b/code/modules/clothing/suits/straightjacket.dm index eaafe60ade9..15abb01ebb4 100644 --- a/code/modules/clothing/suits/straightjacket.dm +++ b/code/modules/clothing/suits/straightjacket.dm @@ -1,4 +1,4 @@ -/obj/item/clothing/suit/straight_jacket +/obj/item/clothing/suit/jacket/straight_jacket name = "straight jacket" desc = "A suit that completely restrains the wearer. Manufactured by Antyphun Corp." //Straight jacket is antifun icon_state = "straight_jacket" diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index 7dc16510e99..ae5764cd192 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -9,7 +9,10 @@ * Fire protection */ -/obj/item/clothing/suit/fire +/obj/item/clothing/suit/utility + worn_icon = 'icons/mob/clothing/suits/utility.dmi' + +/obj/item/clothing/suit/utility/fire name = "emergency firesuit" desc = "A suit that helps protect against fire and heat." icon_state = "fire" @@ -29,23 +32,23 @@ equip_delay_other = 60 resistance_flags = FIRE_PROOF -/obj/item/clothing/suit/fire/worn_overlays(mutable_appearance/standing, isinhands, icon_file) +/obj/item/clothing/suit/utility/fire/worn_overlays(mutable_appearance/standing, isinhands, icon_file) . = ..() if(!isinhands) . += emissive_appearance(icon_file, "[icon_state]-emissive", alpha = src.alpha) -/obj/item/clothing/suit/fire/firefighter +/obj/item/clothing/suit/utility/fire/firefighter icon_state = "firesuit" inhand_icon_state = "firefighter" -/obj/item/clothing/suit/fire/heavy +/obj/item/clothing/suit/utility/fire/heavy name = "heavy firesuit" desc = "An old, bulky thermal protection suit." icon_state = "thermal" inhand_icon_state = "ro_suit" slowdown = 1.5 -/obj/item/clothing/suit/fire/atmos +/obj/item/clothing/suit/utility/fire/atmos name = "firesuit" desc = "An expensive firesuit that protects against even the most deadly of station fires. Designed to protect even if the wearer is set aflame." icon_state = "atmos_firesuit" @@ -73,7 +76,7 @@ resistance_flags = NONE -/obj/item/clothing/suit/bomb_suit +/obj/item/clothing/suit/utility/bomb_suit name = "bomb suit" desc = "A suit designed for safety when handling explosives." icon_state = "bombsuit" @@ -97,7 +100,7 @@ icon_state = "bombsuit_sec" inhand_icon_state = "bombsuit_sec" -/obj/item/clothing/suit/bomb_suit/security +/obj/item/clothing/suit/utility/bomb_suit/security icon_state = "bombsuit_sec" inhand_icon_state = "bombsuit_sec" allowed = list(/obj/item/gun/energy, /obj/item/melee/baton, /obj/item/restraints/handcuffs) @@ -107,7 +110,7 @@ icon_state = "bombsuit_white" inhand_icon_state = "bombsuit_white" -/obj/item/clothing/suit/bomb_suit/white +/obj/item/clothing/suit/utility/bomb_suit/white icon_state = "bombsuit_white" inhand_icon_state = "bombsuit_white" @@ -131,7 +134,7 @@ . = ..() AddElement(/datum/element/radiation_protected_clothing) -/obj/item/clothing/suit/radiation +/obj/item/clothing/suit/utility/radiation name = "radiation suit" desc = "A suit that protects against radiation. The label reads, 'Made with lead. Please do not consume insulation.'" icon_state = "rad" @@ -147,11 +150,11 @@ flags_inv = HIDEJUMPSUIT|HIDETAIL // SKYRAT EDIT ADDITION - HIDETAIL resistance_flags = NONE -/obj/item/clothing/suit/radiation/Initialize(mapload) +/obj/item/clothing/suit/utility/radiation/Initialize(mapload) . = ..() AddElement(/datum/element/radiation_protected_clothing) -/obj/item/clothing/suit/radiation/worn_overlays(mutable_appearance/standing, isinhands, icon_file) +/obj/item/clothing/suit/utility/radiation/worn_overlays(mutable_appearance/standing, isinhands, icon_file) . = ..() if(!isinhands) . += emissive_appearance(icon_file, "[icon_state]-emissive", alpha = src.alpha) diff --git a/code/modules/clothing/suits/wetfloor.dm b/code/modules/clothing/suits/wetfloor.dm index 9bccc903a32..3a04e90cec0 100644 --- a/code/modules/clothing/suits/wetfloor.dm +++ b/code/modules/clothing/suits/wetfloor.dm @@ -2,6 +2,7 @@ name = "wet floor sign" desc = "Caution! Wet Floor!" icon_state = "caution" + worn_icon = 'icons/mob/clothing/suits/utility.dmi' lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi' force = 1 diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm index 0930f14eca4..5c4095d5ab3 100644 --- a/code/modules/clothing/suits/wiz_robe.dm +++ b/code/modules/clothing/suits/wiz_robe.dm @@ -59,6 +59,7 @@ name = "wizard robe" desc = "A magnificent, gem-lined robe that seems to radiate power." icon_state = "wizard" + worn_icon = 'icons/mob/clothing/suits/wizard.dmi' inhand_icon_state = "wizrobe" body_parts_covered = CHEST|GROIN|ARMS|LEGS armor = list(MELEE = 30, BULLET = 20, LASER = 20, ENERGY = 30, BOMB = 20, BIO = 100, FIRE = 100, ACID = 100, WOUND = 20) diff --git a/code/modules/holiday/easter.dm b/code/modules/holiday/easter.dm index 7c8b9c9cac7..3e1ab4d59a3 100644 --- a/code/modules/holiday/easter.dm +++ b/code/modules/holiday/easter.dm @@ -61,10 +61,11 @@ clothing_flags = THICKMATERIAL | SNUG_FIT flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT -/obj/item/clothing/suit/bunnysuit +/obj/item/clothing/suit/costume/bunnysuit name = "Easter Bunny Suit" desc = "Hop Hop Hop!" icon_state = "bunnysuit" + worn_icon = 'icons/mob/clothing/suits/costume.dmi' inhand_icon_state = "bunnysuit" slowdown = -0.3 clothing_flags = THICKMATERIAL @@ -97,7 +98,7 @@ /obj/item/surprise_egg/proc/dispensePrize(turf/where) var/static/list/prize_list = list(/obj/item/clothing/head/bunnyhead, - /obj/item/clothing/suit/bunnysuit, + /obj/item/clothing/suit/costume/bunnysuit, /obj/item/storage/backpack/satchel/bunnysatchel, /obj/item/food/grown/carrot, /obj/item/toy/balloon, diff --git a/code/modules/hydroponics/beekeeping/beekeeper_suit.dm b/code/modules/hydroponics/beekeeping/beekeeper_suit.dm index e45cb8e7abf..ffd4886e35c 100644 --- a/code/modules/hydroponics/beekeeping/beekeeper_suit.dm +++ b/code/modules/hydroponics/beekeeping/beekeeper_suit.dm @@ -7,7 +7,7 @@ clothing_flags = THICKMATERIAL | SNUG_FIT -/obj/item/clothing/suit/beekeeper_suit +/obj/item/clothing/suit/utility/beekeeper_suit name = "beekeeper suit" desc = "Keeps the lil buzzing buggers away from your squishy bits." icon_state = "beekeeper" diff --git a/code/modules/jobs/job_types/detective.dm b/code/modules/jobs/job_types/detective.dm index 8f9113f09c3..56bc6b81052 100644 --- a/code/modules/jobs/job_types/detective.dm +++ b/code/modules/jobs/job_types/detective.dm @@ -50,7 +50,7 @@ id_trim = /datum/id_trim/job/detective uniform = /obj/item/clothing/under/rank/security/detective - suit = /obj/item/clothing/suit/det_suit + suit = /obj/item/clothing/suit/jacket/det_suit backpack_contents = list( /obj/item/detective_scanner = 1, /obj/item/melee/baton = 1, diff --git a/code/modules/mafia/outfits.dm b/code/modules/mafia/outfits.dm index 94f4c178cde..5d239aca6c5 100644 --- a/code/modules/mafia/outfits.dm +++ b/code/modules/mafia/outfits.dm @@ -19,7 +19,7 @@ uniform = /obj/item/clothing/under/rank/security/detective neck = /obj/item/clothing/neck/tie/detective shoes = /obj/item/clothing/shoes/sneakers/brown - suit = /obj/item/clothing/suit/det_suit + suit = /obj/item/clothing/suit/jacket/det_suit gloves = /obj/item/clothing/gloves/color/black head = /obj/item/clothing/head/fedora/det_hat mask = /obj/item/clothing/mask/cigarette diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm index ec06b4a3330..bdaa7ca693e 100644 --- a/code/modules/mining/abandoned_crates.dm +++ b/code/modules/mining/abandoned_crates.dm @@ -180,7 +180,7 @@ if(63 to 64) new /obj/item/clothing/shoes/kindle_kicks(src) if(65 to 66) - new /obj/item/clothing/suit/ianshirt(src) + new /obj/item/clothing/suit/costume/ianshirt(src) new /obj/item/clothing/suit/hooded/ian_costume(src) if(67 to 68) new /obj/item/toy/plush/awakenedplushie(src) diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm index 780175ac4cd..4b90c21438b 100644 --- a/code/modules/mining/equipment/explorer_gear.dm +++ b/code/modules/mining/equipment/explorer_gear.dm @@ -3,6 +3,7 @@ name = "explorer suit" desc = "An armoured suit for exploring harsh environments." icon_state = "explorer" + worn_icon = 'icons/mob/clothing/suits/utility.dmi' inhand_icon_state = "explorer" body_parts_covered = CHEST|GROIN|LEGS|ARMS cold_protection = CHEST|GROIN|LEGS|ARMS @@ -68,6 +69,9 @@ . = ..() adjustmask() +/obj/item/clothing/suit/hooded/cloak + worn_icon = 'icons/mob/clothing/suits/armor.dmi' + /obj/item/clothing/suit/hooded/cloak/goliath name = "goliath cloak" icon_state = "goliath_cloak" diff --git a/code/modules/mining/lavaland/tendril_loot.dm b/code/modules/mining/lavaland/tendril_loot.dm index 1ea723d91a8..6080f88c091 100644 --- a/code/modules/mining/lavaland/tendril_loot.dm +++ b/code/modules/mining/lavaland/tendril_loot.dm @@ -449,9 +449,9 @@ /obj/item/shared_storage/red/Initialize(mapload) . = ..() - + create_storage(max_total_storage = 15, max_slots = 21) - + new /obj/item/shared_storage/blue(drop_location(), src) /obj/item/shared_storage/blue/Initialize(mapload, atom/master) @@ -594,6 +594,7 @@ name = "berserker armor" desc = "Voices echo from the armor, driving the user insane. Is not space-proof." icon_state = "berserker" + worn_icon = 'icons/mob/clothing/suits/armor.dmi' hoodtype = /obj/item/clothing/head/hooded/berserker armor = list(MELEE = 30, BULLET = 30, LASER = 10, ENERGY = 20, BOMB = 50, BIO = 0, FIRE = 100, ACID = 100) cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS diff --git a/code/modules/mob/living/simple_animal/hostile/skeleton.dm b/code/modules/mob/living/simple_animal/hostile/skeleton.dm index e0241f672c7..01f944e7048 100644 --- a/code/modules/mob/living/simple_animal/hostile/skeleton.dm +++ b/code/modules/mob/living/simple_animal/hostile/skeleton.dm @@ -73,7 +73,7 @@ melee_damage_upper = 30 deathmessage = "collapses into a pile of bones, its gear clanging as it hits the ground!" loot = list(/obj/effect/decal/remains/human, - /obj/item/clothing/suit/armor/riot/chaplain, + /obj/item/clothing/suit/chaplainsuit/armor/templar, /obj/item/clothing/head/helmet/chaplain, /obj/item/claymore/weak{name = "holy sword"}) diff --git a/code/modules/mob_spawn/corpses/mob_corpses.dm b/code/modules/mob_spawn/corpses/mob_corpses.dm index ce7809e87a4..7e0fd1efd6d 100644 --- a/code/modules/mob_spawn/corpses/mob_corpses.dm +++ b/code/modules/mob_spawn/corpses/mob_corpses.dm @@ -86,7 +86,7 @@ /datum/outfit/piratecorpse/ranged name = "Pirate Gunner Corpse" - suit = /obj/item/clothing/suit/pirate + suit = /obj/item/clothing/suit/costume/pirate head = /obj/item/clothing/head/pirate @@ -135,7 +135,7 @@ /datum/outfit/russiancorpse/officer name = "Russian Officer Corpse" uniform = /obj/item/clothing/under/costume/russian_officer - suit = /obj/item/clothing/suit/security/officer/russian + suit = /obj/item/clothing/suit/jacket/officer/tan shoes = /obj/item/clothing/shoes/combat ears = /obj/item/radio/headset head = /obj/item/clothing/head/ushanka diff --git a/code/modules/research/xenobiology/crossbreeding/_clothing.dm b/code/modules/research/xenobiology/crossbreeding/_clothing.dm index 0c3d45eee82..30b305a7bab 100644 --- a/code/modules/research/xenobiology/crossbreeding/_clothing.dm +++ b/code/modules/research/xenobiology/crossbreeding/_clothing.dm @@ -129,6 +129,7 @@ Slimecrossing Armor name = "adamantine armor" desc = "A full suit of adamantine plate armor. Impressively resistant to damage, but weighs about as much as you do." icon_state = "adamsuit" + worn_icon = 'icons/mob/clothing/suits/armor.dmi' inhand_icon_state = "adamsuit" flags_inv = NONE obj_flags = IMMUTABLE_SLOW diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index d24d696d37e..76babfac9a9 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -8,7 +8,7 @@ product_slogans = "Dress for success!;Suited and booted!;It's show time!;Why leave style up to fate? Use AutoDrobe!" vend_reply = "Thank you for using AutoDrobe!" products = list( - /obj/item/clothing/suit/chickensuit = 1, + /obj/item/clothing/suit/costume/chickensuit = 1, /obj/item/clothing/head/chicken = 1, /obj/item/clothing/under/rank/civilian/clown/blue = 1, /obj/item/clothing/under/rank/civilian/clown/green = 1, @@ -55,13 +55,13 @@ /obj/item/clothing/under/suit/waiter = 1, /obj/item/clothing/suit/jacket/miljacket = 1, /obj/item/clothing/under/costume/pirate = 1, - /obj/item/clothing/suit/pirate = 1, + /obj/item/clothing/suit/costume/pirate = 1, /obj/item/clothing/head/pirate = 1, /obj/item/clothing/head/bandana = 1, /obj/item/clothing/head/bandana = 1, /obj/item/clothing/under/costume/soviet = 1, /obj/item/clothing/head/ushanka = 1, - /obj/item/clothing/suit/imperium_monk = 1, + /obj/item/clothing/suit/costume/imperium_monk = 1, /obj/item/clothing/mask/gas/cyborg = 1, /obj/item/clothing/suit/chaplainsuit/holidaypriest = 1, /obj/item/clothing/suit/chaplainsuit/whiterobe = 1, @@ -98,9 +98,9 @@ /obj/item/clothing/head/cowboy_hat_black =1, /obj/item/clothing/head/sombrero = 1, /obj/item/clothing/head/sombrero/green = 1, - /obj/item/clothing/suit/poncho = 1, - /obj/item/clothing/suit/poncho/green = 1, - /obj/item/clothing/suit/poncho/red = 1, + /obj/item/clothing/suit/costume/poncho = 1, + /obj/item/clothing/suit/costume/poncho/green = 1, + /obj/item/clothing/suit/costume/poncho/red = 1, /obj/item/clothing/head/maidheadband = 1, /obj/item/clothing/under/costume/maid = 1, /obj/item/clothing/gloves/maid = 1, @@ -108,7 +108,7 @@ /obj/item/clothing/under/rank/civilian/janitor/maid = 1, /obj/item/clothing/glasses/cold=1, /obj/item/clothing/glasses/heat=1, - /obj/item/clothing/suit/whitedress = 1, + /obj/item/clothing/suit/costume/whitedress = 1, /obj/item/clothing/under/rank/civilian/clown/jester = 1, /obj/item/clothing/head/jester = 1, /obj/item/clothing/under/costume/villain = 1, @@ -119,9 +119,9 @@ /obj/item/clothing/suit/hooded/carp_costume = 1, /obj/item/clothing/suit/hooded/ian_costume = 1, /obj/item/clothing/suit/hooded/bee_costume = 1, - /obj/item/clothing/suit/snowman = 1, + /obj/item/clothing/suit/costume/snowman = 1, /obj/item/clothing/head/snowman = 1, - /obj/item/clothing/suit/joker = 1, + /obj/item/clothing/suit/costume/joker = 1, /obj/item/clothing/under/costume/joker = 1, /obj/item/clothing/mask/joy = 1, /obj/item/clothing/head/cueball = 1, @@ -132,18 +132,18 @@ /obj/item/clothing/head/delinquent = 1, /obj/item/clothing/head/wig/random = 3, /obj/item/clothing/head/shrine_wig = 1, - /obj/item/clothing/suit/shrine_maiden = 1, - /obj/item/clothing/suit/changshan_red = 1, - /obj/item/clothing/suit/changshan_blue = 1, - /obj/item/clothing/suit/cheongsam_red = 1, - /obj/item/clothing/suit/cheongsam_blue = 1, + /obj/item/clothing/suit/costume/shrine_maiden = 1, + /obj/item/clothing/suit/costume/changshan_red = 1, + /obj/item/clothing/suit/costume/changshan_blue = 1, + /obj/item/clothing/suit/costume/cheongsam_red = 1, + /obj/item/clothing/suit/costume/cheongsam_blue = 1, /obj/item/gohei = 1, /obj/item/clothing/under/rank/medical/doctor/nurse = 1, /obj/item/clothing/mask/gas/prop = 4, /obj/item/clothing/mask/gas/atmosprop = 3, ) contraband = list( - /obj/item/clothing/suit/judgerobe = 1, + /obj/item/clothing/suit/costume/judgerobe = 1, /obj/item/clothing/head/powdered_wig = 1, /obj/item/gun/magic/wand/nothing = 2, /obj/item/clothing/glasses/sunglasses/gar = 2, @@ -152,7 +152,7 @@ /obj/item/clothing/head/tv_head = 1, ) premium = list( - /obj/item/clothing/suit/pirate/captain = 2, + /obj/item/clothing/suit/costume/pirate/captain = 2, /obj/item/clothing/head/pirate/captain = 2, /obj/item/clothing/under/rank/civilian/clown/rainbow = 1, /obj/item/clothing/head/helmet/roman/fake = 1, diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index 9fd1039e4a0..f5a9630b3bf 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -97,14 +97,14 @@ /obj/item/clothing/head/cowboy_hat_grey = 1, /obj/item/clothing/glasses/monocle = 1, /obj/item/clothing/head/sombrero = 1, - /obj/item/clothing/suit/poncho = 1, + /obj/item/clothing/suit/costume/poncho = 1, /obj/item/clothing/under/costume/kilt = 1, /obj/item/clothing/under/dress/sundress = 1, /obj/item/clothing/under/dress/striped = 1, /obj/item/clothing/under/dress/sailor = 1, /obj/item/clothing/under/dress/redeveninggown = 1, /obj/item/clothing/under/dress/blacktango = 1, - /obj/item/clothing/suit/ianshirt = 1, + /obj/item/clothing/suit/costume/ianshirt = 1, /obj/item/clothing/shoes/laceup = 2, /obj/item/clothing/shoes/sandal = 2, /obj/item/clothing/shoes/winterboots = 2, @@ -120,59 +120,59 @@ /obj/item/clothing/under/suit/henchmen = 20, /obj/item/clothing/under/costume/yakuza = 20, /obj/item/clothing/shoes/yakuza = 20, - /obj/item/clothing/suit/yakuza = 20, + /obj/item/clothing/suit/costume/yakuza = 20, /obj/item/clothing/under/costume/jackbros = 20, /obj/item/clothing/shoes/jackbros = 20, /obj/item/clothing/head/jackbros = 20, /obj/item/clothing/under/costume/dutch = 20, /obj/item/clothing/head/bowler = 20, - /obj/item/clothing/suit/dutch = 20, + /obj/item/clothing/suit/costume/dutch = 20, /obj/item/clothing/shoes/cowboy = 20, - /obj/item/clothing/suit/irs = 20, + /obj/item/clothing/suit/costume/irs = 20, /obj/item/clothing/under/costume/irs = 20, /obj/item/clothing/head/irs = 20, - /obj/item/clothing/suit/osi = 20, + /obj/item/clothing/suit/costume/osi = 20, /obj/item/clothing/under/costume/osi = 20, /obj/item/clothing/glasses/osi = 20, - /obj/item/clothing/suit/tmc = 20, + /obj/item/clothing/suit/costume/tmc = 20, /obj/item/clothing/under/costume/tmc = 20, /obj/item/clothing/head/tmc = 20, - /obj/item/clothing/suit/pg = 20, + /obj/item/clothing/suit/costume/pg = 20, /obj/item/clothing/under/costume/pg = 20, /obj/item/clothing/head/pg = 20, - /obj/item/clothing/suit/driscoll = 20, + /obj/item/clothing/suit/costume/driscoll = 20, /obj/item/clothing/under/costume/driscoll = 20, /obj/item/clothing/mask/gas/driscoll = 20, - /obj/item/clothing/suit/deckers = 20, + /obj/item/clothing/suit/costume/deckers = 20, /obj/item/clothing/under/costume/deckers = 20, /obj/item/clothing/head/deckers = 20, /obj/item/clothing/shoes/deckers = 20, - /obj/item/clothing/suit/morningstar = 20, + /obj/item/clothing/suit/costume/morningstar = 20, /obj/item/clothing/under/costume/morningstar = 20, /obj/item/clothing/head/morningstar = 20, /obj/item/clothing/shoes/morningstar = 20, - /obj/item/clothing/suit/saints = 20, + /obj/item/clothing/suit/costume/saints = 20, /obj/item/clothing/under/costume/saints = 20, /obj/item/clothing/head/saints = 20, /obj/item/clothing/shoes/saints = 20, - /obj/item/clothing/suit/phantom = 20, + /obj/item/clothing/suit/costume/phantom = 20, /obj/item/clothing/under/costume/phantom = 20, /obj/item/clothing/glasses/phantom = 20, /obj/item/clothing/shoes/phantom = 20, - /obj/item/clothing/suit/allies = 20, + /obj/item/clothing/suit/costume/allies = 20, /obj/item/clothing/under/costume/allies = 20, /obj/item/clothing/head/allies = 20, - /obj/item/clothing/suit/soviet = 20, + /obj/item/clothing/suit/costume/soviet = 20, /obj/item/clothing/under/costume/soviet_families = 20, /obj/item/clothing/head/ushanka/soviet = 20, - /obj/item/clothing/suit/yuri = 20, + /obj/item/clothing/suit/costume/yuri = 20, /obj/item/clothing/under/costume/yuri = 20, /obj/item/clothing/head/yuri = 20, - /obj/item/clothing/suit/sybil_slickers = 20, + /obj/item/clothing/suit/costume/sybil_slickers = 20, /obj/item/clothing/under/costume/sybil_slickers = 20, /obj/item/clothing/head/sybil_slickers = 20, /obj/item/clothing/shoes/sybil_slickers = 20, - /obj/item/clothing/suit/basil_boys = 20, + /obj/item/clothing/suit/costume/basil_boys = 20, /obj/item/clothing/under/costume/basil_boys = 20, /obj/item/clothing/head/basil_boys = 20, /obj/item/clothing/shoes/basil_boys = 20, diff --git a/code/modules/vending/engineering.dm b/code/modules/vending/engineering.dm index baedc8203fb..54d203a4f61 100644 --- a/code/modules/vending/engineering.dm +++ b/code/modules/vending/engineering.dm @@ -24,7 +24,7 @@ /obj/item/weldingtool = 8, /obj/item/clothing/head/welding = 8, /obj/item/light/tube = 10, - /obj/item/clothing/suit/fire = 4, + /obj/item/clothing/suit/utility/fire = 4, /obj/item/stock_parts/scanning_module = 5, /obj/item/stock_parts/micro_laser = 5, /obj/item/stock_parts/matter_bin = 5, diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 317487270b9..cae1a68d500 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -34,7 +34,7 @@ ) premium = list( /obj/item/clothing/under/rank/security/officer/formal = 3, - /obj/item/clothing/suit/security/officer = 3, + /obj/item/clothing/suit/jacket/officer/blue = 3, /obj/item/clothing/head/beret/sec/navyofficer = 3, ) */ @@ -532,23 +532,23 @@ /obj/item/clothing/under/rank/security/detective = 2, /obj/item/clothing/under/rank/security/detective/skirt = 2, /obj/item/clothing/shoes/sneakers/brown = 2, - /obj/item/clothing/suit/det_suit = 2, + /obj/item/clothing/suit/jacket/det_suit = 2, /obj/item/clothing/head/fedora/det_hat = 2, /obj/item/clothing/under/rank/security/detective/noir = 2, /obj/item/clothing/under/rank/security/detective/noir/skirt = 2, /obj/item/clothing/accessory/waistcoat = 2, /obj/item/clothing/shoes/laceup = 2, - /obj/item/clothing/suit/det_suit/dark = 1, - /obj/item/clothing/suit/det_suit/noir = 1, + /obj/item/clothing/suit/jacket/det_suit/dark = 1, + /obj/item/clothing/suit/jacket/det_suit/noir = 1, /obj/item/clothing/head/fedora = 2, /obj/item/clothing/gloves/color/black = 2, /obj/item/clothing/gloves/color/latex = 2, /obj/item/clothing/under/rank/security/detective/disco = 1, - /obj/item/clothing/suit/det_suit/disco = 1, + /obj/item/clothing/suit/jacket/det_suit/disco = 1, /obj/item/clothing/shoes/discoshoes = 1, /obj/item/clothing/neck/tie/disco = 1, /obj/item/clothing/under/rank/security/detective/kim = 1, - /obj/item/clothing/suit/det_suit/kim = 1, + /obj/item/clothing/suit/jacket/det_suit/kim = 1, /obj/item/clothing/shoes/kim = 1, /obj/item/clothing/gloves/kim = 1, /obj/item/clothing/glasses/regular/kim = 1, diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi deleted file mode 100644 index ed5f5a55277..00000000000 Binary files a/icons/mob/clothing/suit.dmi and /dev/null differ diff --git a/icons/mob/clothing/suits/armor.dmi b/icons/mob/clothing/suits/armor.dmi new file mode 100644 index 00000000000..648b56f2bbc Binary files /dev/null and b/icons/mob/clothing/suits/armor.dmi differ diff --git a/icons/mob/clothing/suits/bio.dmi b/icons/mob/clothing/suits/bio.dmi new file mode 100644 index 00000000000..94740791e66 Binary files /dev/null and b/icons/mob/clothing/suits/bio.dmi differ diff --git a/icons/mob/clothing/suits/chaplain.dmi b/icons/mob/clothing/suits/chaplain.dmi new file mode 100644 index 00000000000..3585b6cd66c Binary files /dev/null and b/icons/mob/clothing/suits/chaplain.dmi differ diff --git a/icons/mob/clothing/suits/costume.dmi b/icons/mob/clothing/suits/costume.dmi new file mode 100644 index 00000000000..da598ab1e15 Binary files /dev/null and b/icons/mob/clothing/suits/costume.dmi differ diff --git a/icons/mob/clothing/suits/default.dmi b/icons/mob/clothing/suits/default.dmi new file mode 100644 index 00000000000..94e1b3d1352 Binary files /dev/null and b/icons/mob/clothing/suits/default.dmi differ diff --git a/icons/mob/clothing/suits/jacket.dmi b/icons/mob/clothing/suits/jacket.dmi new file mode 100644 index 00000000000..30a97025df7 Binary files /dev/null and b/icons/mob/clothing/suits/jacket.dmi differ diff --git a/icons/mob/clothing/suits/labcoat.dmi b/icons/mob/clothing/suits/labcoat.dmi new file mode 100644 index 00000000000..8510d62d63f Binary files /dev/null and b/icons/mob/clothing/suits/labcoat.dmi differ diff --git a/icons/mob/clothing/suits/spacesuit.dmi b/icons/mob/clothing/suits/spacesuit.dmi new file mode 100644 index 00000000000..b969ab91556 Binary files /dev/null and b/icons/mob/clothing/suits/spacesuit.dmi differ diff --git a/icons/mob/clothing/suits/utility.dmi b/icons/mob/clothing/suits/utility.dmi new file mode 100644 index 00000000000..7e5bce03658 Binary files /dev/null and b/icons/mob/clothing/suits/utility.dmi differ diff --git a/icons/mob/clothing/suits/wizard.dmi b/icons/mob/clothing/suits/wizard.dmi new file mode 100644 index 00000000000..e8ac43bb6ca Binary files /dev/null and b/icons/mob/clothing/suits/wizard.dmi differ diff --git a/modular_skyrat/master_files/code/_globalvars/maint_loot_oddity.dm b/modular_skyrat/master_files/code/_globalvars/maint_loot_oddity.dm index 72c806d02d4..a165b88cb7e 100644 --- a/modular_skyrat/master_files/code/_globalvars/maint_loot_oddity.dm +++ b/modular_skyrat/master_files/code/_globalvars/maint_loot_oddity.dm @@ -19,7 +19,7 @@ GLOBAL_LIST_INIT(oddity_loot, list(// oddity: strange or crazy items /obj/item/clothing/mask/animal/pig/cursed = 50, /obj/item/clothing/shoes/bhop = 5, /obj/item/clothing/suit/hooded/bloated_human = 100, - /obj/item/clothing/suit/poncho/ponchoshame = 50, + /obj/item/clothing/suit/costume/poncho/ponchoshame = 50, /obj/item/desynchronizer = 5, /obj/item/dice/d20/fate/stealth/one_use = 100, /obj/item/dice/d20/fate/stealth/cursed/one_use = 100, diff --git a/modular_skyrat/modules/banning/code/skyrat_bans.dm b/modular_skyrat/modules/banning/code/skyrat_bans.dm index b818074aa66..ea838a8ad26 100644 --- a/modular_skyrat/modules/banning/code/skyrat_bans.dm +++ b/modular_skyrat/modules/banning/code/skyrat_bans.dm @@ -26,7 +26,7 @@ GLOBAL_LIST_EMPTY(hell) //eorg banned players go here /datum/outfit/chicken name = "Chicken" - suit = /obj/item/clothing/suit/chickensuit + suit = /obj/item/clothing/suit/costume/chickensuit head = /obj/item/clothing/head/chicken /obj/effect/landmark/hell diff --git a/modular_skyrat/modules/command_vendor/code/vending.dm b/modular_skyrat/modules/command_vendor/code/vending.dm index e4786a3263d..643c1680c1d 100644 --- a/modular_skyrat/modules/command_vendor/code/vending.dm +++ b/modular_skyrat/modules/command_vendor/code/vending.dm @@ -26,7 +26,7 @@ /obj/item/clothing/under/rank/captain/parade = 1, /obj/item/clothing/suit/armor/vest/capcarapace/captains_formal = 1, /obj/item/clothing/suit/armor/vest/capcarapace/jacket = 1, - /obj/item/clothing/suit/capjacket = 1, + /obj/item/clothing/suit/jacket/capjacket = 1, /obj/item/clothing/neck/mantle/capmantle = 1, /obj/item/storage/backpack/captain = 1, /obj/item/storage/backpack/satchel/cap = 1, diff --git a/modular_skyrat/modules/energy_axe/code/energy_fireaxe_case.dm b/modular_skyrat/modules/energy_axe/code/energy_fireaxe_case.dm index f82c7d383e0..1fea535427f 100644 --- a/modular_skyrat/modules/energy_axe/code/energy_fireaxe_case.dm +++ b/modular_skyrat/modules/energy_axe/code/energy_fireaxe_case.dm @@ -10,5 +10,5 @@ new /obj/item/fireaxe/energy(src) new /obj/item/extinguisher/advanced(src) new /obj/item/extinguisher/advanced(src) - new /obj/item/clothing/suit/fire/atmos(src) + new /obj/item/clothing/suit/utility/fire/atmos(src) new /obj/item/tank/internals/oxygen/red(src) diff --git a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm index 80b288e2e06..5d5593beace 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm @@ -98,7 +98,7 @@ GLOBAL_LIST_INIT(loadout_exosuits, generate_loadout_items(/datum/loadout_item/su /datum/loadout_item/suit/white_dress name = "White Dress" - item_path = /obj/item/clothing/suit/whitedress + item_path = /obj/item/clothing/suit/costume/whitedress /* * LABCOATS @@ -122,11 +122,11 @@ GLOBAL_LIST_INIT(loadout_exosuits, generate_loadout_items(/datum/loadout_item/su /datum/loadout_item/suit/poncho_green name = "Green Poncho" - item_path = /obj/item/clothing/suit/poncho/green + item_path = /obj/item/clothing/suit/costume/poncho/green /datum/loadout_item/suit/poncho_red name = "Red Poncho" - item_path = /obj/item/clothing/suit/poncho/red + item_path = /obj/item/clothing/suit/costume/poncho/red /* @@ -199,23 +199,23 @@ GLOBAL_LIST_INIT(loadout_exosuits, generate_loadout_items(/datum/loadout_item/su /datum/loadout_item/suit/snowman name = "Snowman Outfit" - item_path = /obj/item/clothing/suit/snowman + item_path = /obj/item/clothing/suit/costume/snowman /datum/loadout_item/suit/chicken name = "Chicken Suit" - item_path = /obj/item/clothing/suit/chickensuit + item_path = /obj/item/clothing/suit/costume/chickensuit /datum/loadout_item/suit/monkey name = "Monkey Suit" - item_path = /obj/item/clothing/suit/monkeysuit + item_path = /obj/item/clothing/suit/costume/monkeysuit /datum/loadout_item/suit/cardborg name = "Cardborg Suit" - item_path = /obj/item/clothing/suit/cardborg + item_path = /obj/item/clothing/suit/costume/cardborg /datum/loadout_item/suit/xenos name = "Xenos Suit" - item_path = /obj/item/clothing/suit/xenos + item_path = /obj/item/clothing/suit/costume/xenos /datum/loadout_item/suit/ian_costume name = "Corgi Costume" @@ -325,7 +325,7 @@ GLOBAL_LIST_INIT(loadout_exosuits, generate_loadout_items(/datum/loadout_item/su /datum/loadout_item/suit/hawaiian_shirt name = "Hawaiian Shirt" - item_path = /obj/item/clothing/suit/hawaiian + item_path = /obj/item/clothing/suit/costume/hawaiian /datum/loadout_item/suit/hawaiian_blue name = "Blue Hawaiian Shirt" @@ -653,11 +653,11 @@ GLOBAL_LIST_INIT(loadout_exosuits, generate_loadout_items(/datum/loadout_item/su /datum/loadout_item/suit/sybil name = "Sybil Coat" - item_path = /obj/item/clothing/suit/sybil_slickers + item_path = /obj/item/clothing/suit/costume/sybil_slickers /datum/loadout_item/suit/basil name = "Basil Coat" - item_path = /obj/item/clothing/suit/basil_boys + item_path = /obj/item/clothing/suit/costume/basil_boys /datum/loadout_item/suit/soviet name = "Soviet Coat" diff --git a/modular_skyrat/modules/modular_vending/code/wardrobes.dm b/modular_skyrat/modules/modular_vending/code/wardrobes.dm index 8dc24447458..ad76c9ed718 100644 --- a/modular_skyrat/modules/modular_vending/code/wardrobes.dm +++ b/modular_skyrat/modules/modular_vending/code/wardrobes.dm @@ -84,7 +84,7 @@ /obj/machinery/vending/wardrobe/chap_wardrobe skyrat_products = list( - /obj/item/clothing/suit/nemes = 1, + /obj/item/clothing/suit/costume/nemes = 1, /obj/item/clothing/head/nemes = 1, /obj/item/clothing/head/pharaoh = 1, //dont google camel by camel worst mistake of my life /obj/item/clothing/under/rank/pmarsrobe = 1 diff --git a/modular_skyrat/modules/novaya_ert/code/outfit.dm b/modular_skyrat/modules/novaya_ert/code/outfit.dm index 44d6d2b30fd..5ea5fc08665 100644 --- a/modular_skyrat/modules/novaya_ert/code/outfit.dm +++ b/modular_skyrat/modules/novaya_ert/code/outfit.dm @@ -83,7 +83,7 @@ ears = /obj/item/radio/headset/headset_cent/alt/with_key mask = null uniform = /obj/item/clothing/under/costume/russian_officer - suit = /obj/item/clothing/suit/security/officer/russian + suit = /obj/item/clothing/suit/jacket/officer/tan suit_store = null gloves = /obj/item/clothing/gloves/combat belt = /obj/item/gun/ballistic/revolver/nagant diff --git a/modular_skyrat/modules/sec_haul/code/misc/vending.dm b/modular_skyrat/modules/sec_haul/code/misc/vending.dm index 0c97313a410..c4bbb2a34b4 100644 --- a/modular_skyrat/modules/sec_haul/code/misc/vending.dm +++ b/modular_skyrat/modules/sec_haul/code/misc/vending.dm @@ -78,7 +78,7 @@ /obj/item/clothing/gloves/color/black/security = 10, ) premium = list( /obj/item/clothing/under/rank/security/officer/formal = 3, - /obj/item/clothing/suit/security/officer = 3, + /obj/item/clothing/suit/jacket/officer = 3, /obj/item/clothing/head/beret/sec/navyofficer = 3) refill_canister = /obj/item/vending_refill/wardrobe/peacekeeper_wardrobe payment_department = ACCOUNT_SEC @@ -110,5 +110,5 @@ /obj/item/clothing/suit/toggle/jacket/sec/old = 3, ) premium = list( /obj/item/clothing/under/rank/security/officer/formal = 5, - /obj/item/clothing/suit/security/officer = 5, + /obj/item/clothing/suit/jacket/officer = 5, /obj/item/clothing/head/beret/sec/navyofficer = 5) diff --git a/tools/UpdatePaths/Scripts/68417_mob_suit_repath.txt b/tools/UpdatePaths/Scripts/68417_mob_suit_repath.txt new file mode 100644 index 00000000000..c09dee8d0e1 --- /dev/null +++ b/tools/UpdatePaths/Scripts/68417_mob_suit_repath.txt @@ -0,0 +1,76 @@ +#comment This replaces all mob icon suit paths https://github.com/tgstation/tgstation/pull/68417 + +/obj/item/clothing/suit/bronze : /obj/item/clothing/suit/costume/bronze {@OLD} +/obj/item/clothing/suit/hawaiian : /obj/item/clothing/suit/costume/hawaiian {@OLD} +/obj/item/clothing/suit/ianshirt : /obj/item/clothing/suit/costume/ianshirt {@OLD} +/obj/item/clothing/suit/curator : /obj/item/clothing/suit/jacket/curator {@OLD} +/obj/item/clothing/suit/beekeeper_suit : /obj/item/clothing/suit/utility/beekeeper_suit {@OLD} +/obj/item/clothing/suit/radiation : /obj/item/clothing/suit/utility/radiation {@OLD} +/obj/item/clothing/suit/snowman : /obj/item/clothing/suit/costume/snowman {@OLD} +/obj/item/clothing/suit/pirate : /obj/item/clothing/suit/costume/pirate {@OLD} +/obj/item/clothing/suit/cardborg : /obj/item/clothing/suit/costume/cardborg {@OLD} +/obj/item/clothing/suit/fire/firefighter : /obj/item/clothing/suit/utility/fire/firefighter {@OLD} +/obj/item/clothing/suit/det_suit : /obj/item/clothing/suit/jacket/det_suit {@OLD} +/obj/item/clothing/suit/justice : /obj/item/clothing/suit/costume/justice {@OLD} +/obj/item/clothing/suit/straight_jacket : /obj/item/clothing/suit/jacket/straight_jacket {@OLD} +/obj/item/clothing/suit/cyborg_suit : /obj/item/clothing/suit/costume/cyborg_suit {@OLD} +/obj/item/clothing/suit/security/officer : /obj/item/clothing/suit/jacket/officer/blue {@OLD} +/obj/item/clothing/suit/security/warden : /obj/item/clothing/suit/jacket/warden/blue {@OLD} +/obj/item/clothing/suit/security/hos : /obj/item/clothing/suit/jacket/hos/blue {@OLD} +/obj/item/clothing/suit/nerdshirt : /obj/item/clothing/suit/costume/nerdshirt {@OLD} +/obj/item/clothing/suit/xenos : /obj/item/clothing/suit/costume/xenos {@OLD} +/obj/item/clothing/suit/monkeysuit : /obj/item/clothing/suit/costume/monkeysuit {@OLD} +/obj/item/clothing/suit/judgerobe : /obj/item/clothing/suit/costume/judgerobe {@OLD} +/obj/item/clothing/suit/chickensuit : /obj/item/clothing/suit/costume/chickensuit {@OLD} +/obj/item/clothing/suit/ghost_sheet : /obj/item/clothing/suit/costume/ghost_sheet {@OLD} +/obj/item/clothing/suit/imperium_monk : /obj/item/clothing/suit/costume/imperium_monk {@OLD} +/obj/item/clothing/suit/poncho : /obj/item/clothing/suit/costume/poncho {@OLD} +/obj/item/clothing/suit/poncho/green : /obj/item/clothing/suit/costume/poncho/green {@OLD} +/obj/item/clothing/suit/poncho/red : /obj/item/clothing/suit/costume/poncho/red {@OLD} +/obj/item/clothing/suit/armor/plate/crusader : /obj/item/clothing/suit/chaplainsuit/armor/crusader {@OLD} +/obj/item/clothing/suit/armor/plate/crusader/red : /obj/item/clothing/suit/chaplainsuit/armor/crusader/red {@OLD} +/obj/item/clothing/suit/armor/plate/crusader/blue : /obj/item/clothing/suit/chaplainsuit/armor/crusader/blue {@OLD} +/obj/item/clothing/suit/armor/riot/chaplain/clock : /obj/item/clothing/suit/chaplainsuit/armor/clock {@OLD} +/obj/item/clothing/suit/armor/riot/chaplain : /obj/item/clothing/suit/chaplainsuit/armor/templar {@OLD} +/obj/item/clothing/suit/armor/riot/chaplain/studentuni : /obj/item/clothing/suit/chaplainsuit/armor/studentuni {@OLD} +/obj/item/clothing/suit/armor/riot/chaplain/ancient : /obj/item/clothing/suit/chaplainsuit/armor/ancient {@OLD} +/obj/item/clothing/suit/armor/riot/chaplain/witchhunter : /obj/item/clothing/suit/chaplainsuit/armor/witchhunter {@OLD} +/obj/item/clothing/suit/armor/riot/chaplain/adept : /obj/item/clothing/suit/chaplainsuit/armor/adept {@OLD} +/obj/item/clothing/suit/capjacket : /obj/item/clothing/suit/jacket/capjacket {@OLD} +/obj/item/clothing/suit/fire/atmos : /obj/item/clothing/suit/utility/fire/atmos {@OLD} +/obj/item/clothing/suit/bomb_suit : /obj/item/clothing/suit/utility/bomb_suit {@OLD} +/obj/item/clothing/suit/bomb_suit/security : /obj/item/clothing/suit/utility/bomb_suit/security {@OLD} +/obj/item/clothing/suit/bomb_suit/white : /obj/item/clothing/suit/utility/bomb_suit/white {@OLD} +/obj/item/clothing/suit/striped_sweater : /obj/item/clothing/suit/costume/striped_sweater {@OLD} +/obj/item/clothing/suit/yakuza : /obj/item/clothing/suit/costume/yakuza {@OLD} +/obj/item/clothing/suit/dutch : /obj/item/clothing/suit/costume/dutch {@OLD} +/obj/item/clothing/suit/irs : /obj/item/clothing/suit/costume/irs {@OLD} +/obj/item/clothing/suit/osi : /obj/item/clothing/suit/costume/osi {@OLD} +/obj/item/clothing/suit/tmc : /obj/item/clothing/suit/costume/tmc {@OLD} +/obj/item/clothing/suit/pg : /obj/item/clothing/suit/costume/pg {@OLD} +/obj/item/clothing/suit/driscoll : /obj/item/clothing/suit/costume/driscoll {@OLD} +/obj/item/clothing/suit/deckers : /obj/item/clothing/suit/costume/deckers {@OLD} +/obj/item/clothing/suit/morningstar : /obj/item/clothing/suit/costume/morningstar {@OLD} +/obj/item/clothing/suit/saints : /obj/item/clothing/suit/costume/saints {@OLD} +/obj/item/clothing/suit/phantom : /obj/item/clothing/suit/costume/phantom {@OLD} +/obj/item/clothing/suit/allies : /obj/item/clothing/suit/costume/allies {@OLD} +/obj/item/clothing/suit/soviet : /obj/item/clothing/suit/costume/soviet {@OLD} +/obj/item/clothing/suit/yuri : /obj/item/clothing/suit/costume/yuri {@OLD} +/obj/item/clothing/suit/sybil_slickers : /obj/item/clothing/suit/costume/sybil_slickers {@OLD} +/obj/item/clothing/suit/basil_boys : /obj/item/clothing/suit/costume/basil_boys {@OLD} +/obj/item/clothing/suit/pirate/armored : /obj/item/clothing/suit/costume/pirate/armored {@OLD} +/obj/item/clothing/suit/pirate/captain : /obj/item/clothing/suit/costume/pirate/captain {@OLD} +/obj/item/clothing/suit/ghost_sheet/spooky : /obj/item/clothing/suit/costume/ghost_sheet/spooky {@OLD} +/obj/item/clothing/suit/det_suit/dark : /obj/item/clothing/suit/jacket/det_suit/dark {@OLD} +/obj/item/clothing/suit/det_suit/noir : /obj/item/clothing/suit/jacket/det_suit/noir {@OLD} +/obj/item/clothing/suit/det_suit/kim : /obj/item/clothing/suit/jacket/det_suit/kim {@OLD} +/obj/item/clothing/suit/det_suit/disco : /obj/item/clothing/suit/jacket/det_suit/disco {@OLD} +/obj/item/clothing/suit/bunnysuit : /obj/item/clothing/suit/costume/bunnysuit {@OLD} +/obj/item/clothing/suit/security/officer/russian : /obj/item/clothing/suit/jacket/officer/tan {@OLD} +/obj/item/clothing/suit/whitedress : /obj/item/clothing/suit/costume/whitedress {@OLD} +/obj/item/clothing/suit/shrine_maiden : /obj/item/clothing/suit/costume/shrine_maiden {@OLD} +/obj/item/clothing/suit/changshan_red : /obj/item/clothing/suit/costume/changshan_red {@OLD} +/obj/item/clothing/suit/changshan_blue : /obj/item/clothing/suit/costume/changshan_blue {@OLD} +/obj/item/clothing/suit/cheongsam_red : /obj/item/clothing/suit/costume/cheongsam_red {@OLD} +/obj/item/clothing/suit/cheongsam_blue : /obj/item/clothing/suit/costume/cheongsam_blue {@OLD} +/obj/item/clothing/suit/joker : /obj/item/clothing/suit/costume/joker {@OLD}