diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index db44dfb92a..e5232746f2 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -1240,13 +1240,26 @@ /turf/open/floor/plasteel/white, /area/crew_quarters/heads/hop) "abL" = ( -/obj/structure/sign/warning/securearea, -/turf/closed/wall, -/area/maintenance/starboard/fore) +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/box, +/obj/machinery/power/solar{ + id = "forestarboard"; + name = "Fore-Starboard Solar Array" + }, +/turf/open/floor/plasteel/airless/solarpanel, +/area/solar/starboard/fore) "abM" = ( -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, -/area/maintenance/starboard/fore) +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/space/basic, +/area/solar/starboard/fore) "abN" = ( /obj/structure/sign/warning/vacuum, /turf/closed/wall, @@ -1602,15 +1615,16 @@ /turf/open/floor/plasteel/white, /area/crew_quarters/heads/hop) "acu" = ( -/obj/structure/sign/warning/vacuum{ - pixel_x = 32; - pixel_y = 32 +/obj/structure/cable{ + icon_state = "0-8" }, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/plasteel, -/area/maintenance/starboard/fore) +/obj/effect/turf_decal/box, +/obj/machinery/power/solar{ + id = "forestarboard"; + name = "Fore-Starboard Solar Array" + }, +/turf/open/floor/plasteel/airless/solarpanel, +/area/solar/starboard/fore) "acv" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -2131,20 +2145,12 @@ /turf/open/floor/plasteel/white, /area/crew_quarters/heads/hop) "adm" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable/white{ - icon_state = "0-2" +/obj/structure/sign/warning/securearea{ + pixel_x = 32; + pixel_y = -32 }, -/obj/machinery/power/apc{ - areastring = "/area/maintenance/starboard/fore"; - dir = 4; - name = "Starboard Bow Maintenance APC"; - pixel_x = 26 - }, -/turf/open/floor/plating{ - icon_state = "platingdmg2" - }, -/area/maintenance/starboard/fore) +/turf/open/space/basic, +/area/space) "adn" = ( /turf/closed/wall, /area/quartermaster/storage) @@ -2157,15 +2163,9 @@ /turf/closed/wall, /area/quartermaster/storage) "adq" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/closet/emcloset/anchored, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/maintenance/starboard/fore) +/obj/structure/lattice/catwalk, +/turf/open/space/basic, +/area/solar/starboard/fore) "adr" = ( /obj/structure/cable{ icon_state = "4-8" @@ -2194,20 +2194,12 @@ /turf/open/floor/plating, /area/engine/supermatter) "adt" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "0-4" }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/door/airlock/external{ - name = "External Airlock"; - req_access_txt = "13" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel, -/area/maintenance/starboard/fore) +/turf/open/space/basic, +/area/solar/starboard/fore) "adu" = ( /turf/closed/wall, /area/quartermaster/qm) @@ -2393,13 +2385,18 @@ /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "adM" = ( -/obj/structure/sign/warning/vacuum{ - pixel_x = 32; - pixel_y = 32 +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/space/basic, +/area/solar/starboard/fore) "adN" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/item/radio/intercom{ @@ -2597,11 +2594,12 @@ /turf/open/floor/plasteel, /area/quartermaster/storage) "aef" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "0-8" }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +/turf/open/space/basic, +/area/solar/starboard/fore) "aeg" = ( /obj/machinery/conveyor{ dir = 8; @@ -3099,6 +3097,7 @@ "aeS" = ( /obj/structure/closet/crate, /obj/effect/turf_decal/delivery, +/obj/item/toy/figure/cargotech, /turf/open/floor/plasteel, /area/quartermaster/storage) "aeT" = ( @@ -5559,7 +5558,8 @@ icon_state = "plant-21" }, /obj/machinery/camera{ - c_tag = "Chemistry" + c_tag = "Chemistry"; + network = list("ss13","medbay") }, /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -6262,12 +6262,8 @@ /turf/open/floor/plasteel, /area/medical/medbay/zone3) "ajP" = ( -/obj/structure/cable/white{ - icon_state = "4-8" - }, -/obj/effect/landmark/start/research_director, -/turf/open/floor/plasteel, -/area/science/mixing) +/turf/closed/wall/r_wall, +/area/crew_quarters/heads/hor) "ajQ" = ( /obj/effect/turf_decal/loading_area{ dir = 8 @@ -7432,7 +7428,8 @@ dir = 4 }, /obj/machinery/camera{ - c_tag = "Chief Engineer's Office" + c_tag = "Chief Engineer's Office"; + network = list("ss13","engine") }, /mob/living/simple_animal/parrot/Poly, /turf/open/floor/plasteel/dark, @@ -12020,18 +12017,28 @@ }, /area/engine/atmos) "asH" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 8 - }, -/obj/machinery/camera{ - c_tag = "Atmospherics North East"; - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ +/obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 4 }, -/turf/open/floor/plasteel/checker, +/obj/machinery/atmospherics/components/binary/pump{ + name = "Plasma to Pure" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/camera{ + c_tag = "Atmospherics North"; + network = list("ss13","engine") + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, /area/engine/atmos) "asI" = ( /obj/structure/sign/warning/vacuum{ @@ -15126,7 +15133,8 @@ "axu" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/machinery/camera{ - c_tag = "Atmospherics Monitoring" + c_tag = "Atmospherics Monitoring"; + network = list("ss13","engine") }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -15702,6 +15710,10 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/item/toy/figure/atmos{ + pixel_x = -2; + pixel_y = 2 + }, /turf/open/floor/plasteel/dark/corner{ dir = 1 }, @@ -18253,23 +18265,25 @@ /turf/open/floor/plasteel/dark, /area/engine/atmos) "aCF" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 4; - name = "Air to External Air Ports" +/obj/effect/decal/cleanable/dirt, +/obj/item/radio/intercom{ + name = "Station Intercom"; + pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/camera{ - c_tag = "Atmospherics South East"; - dir = 1 + c_tag = "Atmospherics North West"; + dir = 4; + network = list("ss13","engine") }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/plasteel/dark/corner{ + dir = 1 + }, /area/engine/atmos) "aCG" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -19324,7 +19338,8 @@ }, /obj/machinery/camera{ c_tag = "Engineering Secure Storage"; - dir = 4 + dir = 4; + network = list("ss13","engine") }, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral, @@ -20192,7 +20207,8 @@ }, /obj/machinery/camera{ c_tag = "SMES Access"; - dir = 8 + dir = 8; + network = list("ss13","engine") }, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -20226,23 +20242,22 @@ /turf/open/floor/plasteel, /area/engine/engineering) "aFB" = ( -/obj/machinery/shower{ - dir = 8; - name = "emergency shower" +/obj/structure/cable{ + icon_state = "0-8" }, -/obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/power/terminal{ dir = 4 }, +/obj/effect/turf_decal/delivery, +/obj/machinery/airalarm{ + pixel_y = 24 + }, /obj/machinery/camera{ - c_tag = "Engineering Access"; - dir = 8 + c_tag = "Starboard Bow Solar"; + network = list("ss13","engine") }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/plasteel, -/area/engine/engineering) +/turf/open/floor/plating, +/area/maintenance/solars/starboard/fore) "aFC" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 @@ -20787,7 +20802,8 @@ /obj/machinery/light, /obj/machinery/camera{ c_tag = "Engineering Foyer"; - dir = 1 + dir = 1; + network = list("ss13","engine") }, /obj/machinery/power/apc{ areastring = "/area/engine/break_room"; @@ -21227,22 +21243,20 @@ /turf/open/floor/plasteel, /area/hallway/primary/starboard) "aGY" = ( -/obj/structure/bed/dogbed/runtime, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/delivery, -/obj/structure/sign/poster/official/medical_green_cross{ - pixel_x = -32 - }, /obj/machinery/camera{ - c_tag = "CMO's Office"; - dir = 4 + c_tag = "Genetics Cloning"; + dir = 4; + network = list("ss13","medbay") }, -/mob/living/simple_animal/pet/cat/Runtime, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/heads/cmo) +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -22 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/genetics) "aGZ" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -21343,7 +21357,8 @@ "aHg" = ( /obj/machinery/camera{ c_tag = "Gravity Generator Room"; - dir = 8 + dir = 8; + network = list("ss13","engine") }, /obj/effect/turf_decal/bot_white/left, /obj/effect/turf_decal/tile/neutral{ @@ -22188,7 +22203,8 @@ pixel_x = -32 }, /obj/machinery/camera{ - c_tag = "Engineering Monitoring" + c_tag = "Engineering Monitoring"; + network = list("ss13","engine") }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -22593,28 +22609,24 @@ /turf/open/floor/plasteel/white, /area/medical/genetics) "aJe" = ( -/obj/structure/table, -/obj/machinery/airalarm/unlocked{ - dir = 4; - pixel_x = -23 +/obj/machinery/firealarm{ + pixel_y = 24 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 +/obj/structure/extinguisher_cabinet{ + pixel_x = -24; + pixel_y = 32 }, -/obj/effect/turf_decal/tile/neutral, -/obj/item/clipboard, -/obj/item/folder/white, -/obj/item/storage/pill_bottle/mutadone{ - pixel_x = -8; - pixel_y = 8 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/machinery/camera{ + c_tag = "Gravity Generator Entry"; + network = list("ss13","engine"); + pixel_x = 23 }, -/obj/item/storage/pill_bottle/mannitol{ - pixel_x = -8; - pixel_y = 2 +/obj/effect/turf_decal/stripes/line{ + dir = 9 }, -/obj/item/radio/headset/headset_medsci, -/turf/open/floor/plasteel/dark, -/area/medical/genetics) +/turf/open/floor/plasteel, +/area/engine/gravity_generator) "aJf" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -22684,23 +22696,30 @@ /turf/open/floor/plating, /area/engine/gravity_generator) "aJk" = ( -/obj/machinery/firealarm{ - pixel_y = 24 +/obj/structure/table/reinforced, +/obj/item/lightreplacer, +/obj/structure/cable/white{ + icon_state = "1-8" }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -24; - pixel_y = 32 +/obj/structure/cable/white{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/obj/machinery/camera{ - c_tag = "Gravity Generator Entry"; - pixel_x = 23 - }, -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/item/toy/figure/engineer, /turf/open/floor/plasteel, -/area/engine/gravity_generator) +/area/engine/engineering) "aJl" = ( /obj/machinery/power/apc/highcap/five_k{ areastring = "/area/engine/gravity_generator"; @@ -23106,19 +23125,13 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "aJO" = ( -/obj/machinery/camera{ - c_tag = "Genetics Cloning"; - dir = 4 +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "rdprivacy"; + name = "Director's Privacy Blast Door" }, -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -22 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/turf/open/floor/plating, +/area/crew_quarters/heads/hor) "aJP" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -23394,21 +23407,9 @@ /turf/closed/wall, /area/maintenance/port/aft) "aKo" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/door/airlock/external{ - name = "External Airlock"; - req_access_txt = "13" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/maintenance/port/aft) +/obj/structure/lattice, +/turf/open/floor/plating/asteroid/airless, +/area/asteroid/nearstation) "aKp" = ( /obj/machinery/airalarm{ dir = 4; @@ -23446,17 +23447,16 @@ /turf/open/floor/plasteel/dark, /area/engine/gravity_generator) "aKr" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 +/obj/machinery/power/solar{ + id = "aftport"; + name = "Aft-Port Solar Array" }, -/obj/effect/landmark/xeno_spawn, -/obj/structure/sign/warning/vacuum{ - pixel_x = -32; - pixel_y = 32 +/obj/structure/cable{ + icon_state = "0-4" }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, -/area/maintenance/port/aft) +/obj/effect/turf_decal/box, +/turf/open/floor/plasteel/airless/solarpanel, +/area/solar/port/aft) "aKs" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command/glass{ @@ -23600,11 +23600,15 @@ /turf/open/floor/engine, /area/engine/supermatter) "aKB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "2-4" }, -/turf/open/floor/plasteel, -/area/maintenance/port/aft) +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/space/basic, +/area/solar/port/aft) "aKC" = ( /obj/machinery/atmospherics/components/binary/pump{ name = "Gas to Chamber" @@ -23624,24 +23628,16 @@ /turf/open/floor/plasteel/dark, /area/engine/engineering) "aKF" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/machinery/power/solar{ + id = "aftport"; + name = "Aft-Port Solar Array" }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/structure/cable{ + icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/door/airlock/external{ - name = "External Airlock"; - req_access_txt = "13" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/maintenance/port/aft) +/obj/effect/turf_decal/box, +/turf/open/floor/plasteel/airless/solarpanel, +/area/solar/port/aft) "aKG" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -23750,29 +23746,15 @@ /turf/open/floor/plasteel, /area/engine/engineering) "aKM" = ( -/obj/structure/table/reinforced, -/obj/item/lightreplacer, -/obj/structure/cable/white{ - icon_state = "1-8" - }, -/obj/structure/cable/white{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 +/obj/machinery/light_switch{ + pixel_y = -24 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/bot, +/obj/structure/closet/l3closet/janitor, +/obj/item/toy/figure/janitor, /turf/open/floor/plasteel, -/area/engine/engineering) +/area/janitor) "aKN" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -24268,13 +24250,18 @@ }, /area/maintenance/port/aft) "aLz" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "2-4" }, -/obj/machinery/light/small, -/obj/structure/closet/emcloset/anchored, -/turf/open/floor/plasteel, -/area/maintenance/port/aft) +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/space/basic, +/area/solar/port/aft) "aLA" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 @@ -24292,12 +24279,8 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "aLC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/item/cigbutt, -/turf/open/floor/plating, -/area/maintenance/port/aft) +/turf/closed/wall, +/area/maintenance/solars/port/aft) "aLD" = ( /obj/machinery/power/port_gen/pacman, /obj/effect/turf_decal/stripes/line{ @@ -24396,11 +24379,13 @@ /turf/open/floor/plasteel, /area/engine/gravity_generator) "aLL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/effect/turf_decal/box, +/obj/structure/cable{ + icon_state = "0-4" }, -/turf/open/floor/plating/airless, -/area/maintenance/port/aft) +/obj/machinery/power/tracker, +/turf/open/floor/plasteel/airless/solarpanel, +/area/solar/port/aft) "aLM" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -24938,27 +24923,19 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "aMH" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "0-8" }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch"; - req_access_txt = "12" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/maintenance/port/aft) +/turf/open/space/basic, +/area/solar/port/aft) "aMI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "0-4" }, -/turf/open/floor/plasteel/dark, -/area/maintenance/port/aft) +/turf/open/space/basic, +/area/solar/port/aft) "aMJ" = ( /turf/closed/wall/r_wall, /area/tcommsat/server) @@ -25024,21 +25001,18 @@ /turf/open/floor/engine, /area/engine/engineering) "aMQ" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "1-4" }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 +/obj/structure/cable{ + icon_state = "2-4" }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/maintenance/port/aft) +/turf/open/space/basic, +/area/solar/port/aft) "aMR" = ( /obj/machinery/camera{ c_tag = "Supermatter Chamber"; @@ -25257,14 +25231,32 @@ /turf/open/floor/plasteel, /area/janitor) "aNl" = ( -/obj/machinery/light_switch{ - pixel_y = -24 +/obj/structure/table, +/obj/machinery/airalarm/unlocked{ + dir = 4; + pixel_x = -23 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/bot, -/obj/structure/closet/l3closet/janitor, -/turf/open/floor/plasteel, -/area/janitor) +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/item/clipboard, +/obj/item/folder/white, +/obj/item/storage/pill_bottle/mutadone{ + pixel_x = -8; + pixel_y = 8 + }, +/obj/item/storage/pill_bottle/mannitol{ + pixel_x = -8; + pixel_y = 2 + }, +/obj/item/radio/headset/headset_medsci, +/obj/item/toy/figure/geneticist{ + pixel_x = 5; + pixel_y = 13 + }, +/turf/open/floor/plasteel/dark, +/area/medical/genetics) "aNm" = ( /obj/effect/turf_decal/bot, /obj/machinery/vending/wardrobe/jani_wardrobe, @@ -25575,23 +25567,17 @@ /turf/open/floor/plasteel/white, /area/medical/genetics) "aNO" = ( -/obj/machinery/camera{ - c_tag = "Genetics Lab"; - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 +/obj/effect/turf_decal/tile/purple{ + dir = 4 }, -/obj/machinery/computer/scan_consolenew{ - icon_state = "computer"; - dir = 1 +/obj/structure/sign/poster/official/anniversary_vintage_reprint{ + pixel_x = 32 }, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel/dark, -/area/medical/genetics) +/turf/open/floor/plasteel/white, +/area/science/research) "aNP" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -25744,22 +25730,10 @@ /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/cmo) "aOc" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch"; - req_access_txt = "12" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/maintenance/port/aft) +/obj/structure/lattice/catwalk, +/obj/effect/landmark/xeno_spawn, +/turf/open/space/basic, +/area/solar/port/aft) "aOd" = ( /obj/machinery/power/apc{ areastring = "/area/engine/engineering"; @@ -26119,17 +26093,18 @@ /turf/open/floor/engine, /area/engine/engineering) "aOH" = ( -/obj/structure/cable/white{ - icon_state = "1-2" +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-4" }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/open/floor/plating, -/area/maintenance/port/aft) +/turf/open/space/basic, +/area/solar/port/aft) "aOI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 @@ -26329,21 +26304,15 @@ /turf/closed/wall, /area/medical/genetics) "aOX" = ( -/obj/machinery/requests_console{ - department = "Medbay"; - departmentType = 1; - name = "Medbay RC"; - pixel_x = -30 - }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/camera{ - c_tag = "Medbay Storage" + c_tag = "R&D"; + dir = 1; + network = list("ss13","rd") }, -/obj/machinery/rnd/production/techfab/department/medical, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/box, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, -/area/medical/medbay/zone3) +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/plasteel/white, +/area/science/lab) "aOY" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -27125,18 +27094,24 @@ }, /area/hallway/primary/port/aft) "aQe" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/blue{ - dir = 8 +/obj/machinery/camera{ + c_tag = "Genetics Lab"; + dir = 8; + network = list("ss13","medbay") }, -/obj/effect/turf_decal/tile/blue{ +/obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/item/paper_bin, -/obj/item/pen, -/obj/item/stamp/cmo, -/turf/open/floor/plasteel/cafeteria, -/area/crew_quarters/heads/cmo) +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/computer/scan_consolenew{ + icon_state = "computer"; + dir = 1 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel/dark, +/area/medical/genetics) "aQf" = ( /obj/machinery/firealarm{ dir = 1; @@ -27424,40 +27399,12 @@ /turf/open/floor/plasteel/dark, /area/medical/morgue) "aQE" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/cable/white{ - icon_state = "0-8" - }, -/obj/structure/table/wood, -/obj/item/storage/box/bodybags{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/bodybags, -/obj/machinery/power/apc{ - areastring = "/area/medical/morgue"; +/obj/machinery/airalarm/unlocked{ dir = 4; - name = "Morgue APC"; - pixel_x = 26 + pixel_x = -23 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/camera{ - c_tag = "Morgue"; - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/medical/morgue) +/turf/open/floor/plating/asteroid, +/area/crew_quarters/heads/hor) "aQF" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -28844,24 +28791,20 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "aTn" = ( -/obj/effect/landmark/start/virologist, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4 +/obj/structure/table/plasmaglass, +/obj/machinery/recharger, +/obj/item/paicard{ + pixel_x = 15 }, -/obj/machinery/power/apc/highcap/five_k{ - areastring = "/area/medical/virology"; - dir = 1; - name = "Virology APC"; - pixel_y = 24 +/obj/structure/sign/poster/official/ue_no{ + pixel_y = 32 }, -/obj/structure/cable/white{ - icon_state = "0-4" +/obj/item/toy/figure/rd{ + pixel_x = -8; + pixel_y = 14 }, -/obj/machinery/camera{ - c_tag = "Virology" - }, -/turf/open/floor/plasteel, -/area/medical/virology) +/turf/open/floor/plating/asteroid, +/area/crew_quarters/heads/hor) "aTo" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall/r_wall, @@ -30095,14 +30038,24 @@ /turf/open/floor/plasteel/white, /area/science/research) "aVz" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/machinery/shower{ + dir = 8; + name = "emergency shower" + }, +/obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 +/obj/machinery/camera{ + c_tag = "Engineering Access"; + dir = 8; + network = list("ss13","engine") }, -/turf/open/floor/plasteel/white, -/area/science/research) +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/plasteel, +/area/engine/engineering) "aVA" = ( /turf/closed/wall, /area/science/research) @@ -30425,6 +30378,10 @@ /obj/item/reagent_containers/glass/bottle/epinephrine, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/dropper, +/obj/item/toy/figure/chemist{ + pixel_x = -6; + pixel_y = 11 + }, /turf/open/floor/plasteel/white, /area/medical/chemistry) "aWg" = ( @@ -30517,14 +30474,24 @@ /turf/open/floor/plasteel/white, /area/science/lab) "aWm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/camera{ - c_tag = "R&D"; - dir = 1 +/obj/structure/table, +/obj/item/storage/box/gloves{ + pixel_x = 3; + pixel_y = 3 }, -/obj/effect/turf_decal/tile/purple, -/turf/open/floor/plasteel/white, -/area/science/lab) +/obj/item/storage/box/beakers, +/obj/structure/extinguisher_cabinet{ + pixel_x = -26 + }, +/obj/machinery/camera{ + c_tag = "Medbay West"; + network = list("ss13","medbay") + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/medical/medbay/zone3) "aWn" = ( /obj/machinery/firealarm{ dir = 1; @@ -31057,23 +31024,22 @@ /turf/open/floor/plasteel/dark, /area/library) "aXm" = ( -/obj/structure/table, -/obj/item/storage/box/gloves{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/beakers, -/obj/structure/extinguisher_cabinet{ - pixel_x = -26 - }, -/obj/machinery/camera{ - c_tag = "Medbay West" - }, -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel, -/area/medical/medbay/zone3) +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/camera{ + c_tag = "Research Division North"; + network = list("ss13","rd") + }, +/obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/science/research) "aXn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/blue{ @@ -31712,18 +31678,26 @@ /turf/open/floor/plasteel/white, /area/science/research) "aYp" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 24 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/machinery/camera{ - c_tag = "Research Division South"; + c_tag = "Communications Relay"; + dir = 8; + network = list("ss13","tcomms") + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/machinery/vending/wardrobe/science_wardrobe, -/obj/effect/turf_decal/tile/purple, -/turf/open/floor/plasteel/white, -/area/science/research) +/turf/open/floor/plasteel/dark/telecomms, +/area/tcommsat/server) "aYq" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ dir = 1 @@ -31881,21 +31855,25 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "aYB" = ( -/obj/machinery/shower{ - desc = "From what you understand it was put in rather recently, but the design looks right out of the 2510's. Weird."; - dir = 1; - icon_state = "shower"; - name = "Emergency Shower" +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/airlock/command{ + name = "Research Director's Office"; + req_access_txt = "30" + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, /obj/effect/turf_decal/stripes/line{ - dir = 6 + dir = 4 }, -/obj/machinery/camera{ - c_tag = "Virology Access"; - dir = 1 +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/turf/open/floor/plasteel/white, -/area/medical/virology) +/turf/open/floor/plasteel, +/area/crew_quarters/heads/hor) "aYC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/landmark/event_spawn, @@ -32695,6 +32673,17 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft) +"aZS" = ( +/obj/structure/lattice/catwalk, +/turf/open/space/basic, +/area/solar/port/aft) +"aZT" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating/airless, +/area/solar/port/aft) "aZU" = ( /obj/machinery/recharge_station, /obj/effect/landmark/start/cyborg, @@ -32822,6 +32811,25 @@ }, /turf/open/floor/plasteel/dark, /area/science/robotics/lab) +"bae" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/airlock/external{ + name = "External Airlock"; + req_access_txt = "13" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/maintenance/solars/port/aft) "baf" = ( /obj/item/stack/sheet/metal/fifty, /obj/item/stack/sheet/metal/fifty, @@ -32895,6 +32903,148 @@ icon_state = "platingdmg1" }, /area/maintenance/starboard) +"baj" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/obj/effect/landmark/xeno_spawn, +/obj/structure/sign/warning/vacuum{ + pixel_x = -32; + pixel_y = 32 + }, +/obj/effect/turf_decal/delivery, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/maintenance/solars/port/aft) +"bak" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/maintenance/solars/port/aft) +"bal" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/door/airlock/external{ + name = "External Airlock"; + req_access_txt = "13" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/maintenance/solars/port/aft) +"bam" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/sign/warning/vacuum{ + pixel_y = 32 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plating, +/area/maintenance/solars/port/aft) +"ban" = ( +/obj/structure/cable/white{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/solars/port/aft) +"bao" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/structure/sign/warning/electricshock{ + pixel_y = -32 + }, +/turf/open/floor/plating, +/area/maintenance/solars/port/aft) +"bap" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_access_txt = "12" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/maintenance/solars/port/aft) +"baq" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/obj/structure/cable/white{ + icon_state = "2-8" + }, +/turf/open/floor/plating, +/area/maintenance/port/aft) +"bar" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/space/basic, +/area/solar/port/aft) +"bas" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light/small, +/obj/structure/closet/emcloset/anchored, +/turf/open/floor/plasteel, +/area/maintenance/solars/port/aft) +"bat" = ( +/turf/closed/wall/r_wall/rust, +/area/maintenance/solars/port/aft) +"bau" = ( +/turf/closed/wall/r_wall, +/area/maintenance/solars/port/aft) +"bav" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/closed/wall, +/area/maintenance/solars/port/aft) "baw" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/departments/medbay/alt, @@ -33015,6 +33165,17 @@ }, /turf/open/floor/plasteel, /area/medical/medbay/zone3) +"baE" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/engineering{ + name = "Port Quarter Solar Access"; + req_access_txt = "10" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/maintenance/solars/port/aft) "baF" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/blue, @@ -33125,28 +33286,22 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "baN" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 +/obj/machinery/computer/card/minor/rd, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/structure/cable/white{ - icon_state = "1-2" +/obj/item/aicard, +/turf/open/floor/plasteel{ + icon_state = "sepia" }, -/obj/structure/cable/white{ - icon_state = "1-4" - }, -/obj/machinery/camera{ - c_tag = "Mech Bay"; - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/plasteel, -/area/science/robotics/mechbay) +/area/crew_quarters/heads/hor) "baO" = ( /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, /obj/structure/cable/white{ @@ -33292,6 +33447,165 @@ }, /turf/open/floor/plasteel/dark, /area/science/robotics/lab) +"bbb" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/obj/structure/cable/white{ + icon_state = "1-4" + }, +/turf/open/floor/plating, +/area/maintenance/port/aft) +"bbc" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/item/cigbutt, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/maintenance/port/aft) +"bbd" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/maintenance/port/aft) +"bbe" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plating/airless, +/area/maintenance/port/aft) +"bbf" = ( +/obj/machinery/power/smes, +/obj/structure/cable/white{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/maintenance/solars/port/aft) +"bbg" = ( +/obj/structure/lattice/catwalk, +/obj/effect/landmark/xeno_spawn, +/turf/open/space/basic, +/area/solar/starboard/fore) +"bbh" = ( +/obj/structure/cable/white{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/maintenance/solars/port/aft) +"bbi" = ( +/obj/structure/cable/white{ + icon_state = "0-8" + }, +/obj/structure/cable/white{ + icon_state = "0-2" + }, +/obj/machinery/power/apc{ + areastring = "/area/maintenance/solars/port/aft"; + dir = 4; + name = "Port Quarter Solar APC"; + pixel_x = 26 + }, +/turf/open/floor/plating, +/area/maintenance/solars/port/aft) +"bbj" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_access_txt = "12" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/maintenance/port/aft) +"bbk" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/maintenance/port/aft) +"bbl" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/maintenance/port/aft) +"bbm" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_access_txt = "12" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/maintenance/port/aft) +"bbn" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable/white{ + icon_state = "1-8" + }, +/turf/open/floor/plating, +/area/maintenance/port/aft) +"bbo" = ( +/obj/structure/cable/white{ + icon_state = "1-4" + }, +/turf/open/floor/plating, +/area/maintenance/solars/port/aft) "bbp" = ( /obj/machinery/light{ dir = 8 @@ -33605,6 +33919,153 @@ }, /turf/open/floor/plasteel/dark, /area/science/robotics/lab) +"bbP" = ( +/obj/machinery/modular_computer/console/preset/research, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/plasteel{ + icon_state = "sepia" + }, +/area/crew_quarters/heads/hor) +"bbQ" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/space/basic, +/area/solar/starboard/fore) +"bbR" = ( +/obj/structure/cable/white{ + icon_state = "0-8" + }, +/obj/structure/cable/white, +/obj/machinery/power/solar_control{ + dir = 8; + id = "aftport"; + name = "Port Quarter Solar Control" + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/plating, +/area/maintenance/solars/port/aft) +"bbS" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/space/basic, +/area/solar/port/aft) +"bbT" = ( +/turf/closed/wall, +/area/maintenance/solars/starboard/fore) +"bbU" = ( +/turf/closed/wall/r_wall, +/area/maintenance/solars/starboard/fore) +"bbV" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/space/basic, +/area/solar/starboard/fore) +"bbW" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/space/basic, +/area/solar/starboard/fore) +"bbX" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/closet/emcloset/anchored, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel, +/area/maintenance/solars/starboard/fore) +"bbY" = ( +/obj/structure/lattice/catwalk, +/turf/open/floor/plating/airless, +/area/solar/starboard/fore) +"bbZ" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/plasteel, +/area/maintenance/solars/starboard/fore) +"bca" = ( +/obj/structure/sign/warning/vacuum{ + pixel_x = 32; + pixel_y = 32 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/obj/effect/landmark/xeno_spawn, +/obj/effect/turf_decal/delivery, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/maintenance/solars/starboard/fore) +"bcb" = ( +/obj/machinery/door/airlock/external{ + name = "External Airlock"; + req_access_txt = "13" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/maintenance/solars/starboard/fore) +"bcc" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/airlock/external{ + name = "External Airlock"; + req_access_txt = "13" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/maintenance/solars/starboard/fore) "bcd" = ( /obj/item/retractor, /obj/item/hemostat, @@ -33923,12 +34384,166 @@ }, /turf/open/floor/plasteel/dark, /area/science/robotics/lab) +"bcD" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/space/basic, +/area/solar/starboard/fore) "bcE" = ( /obj/structure/closet/l3closet/scientist{ pixel_x = -2 }, /turf/open/floor/plasteel, /area/science/mixing) +"bcF" = ( +/obj/structure/sign/warning/securearea, +/turf/closed/wall/r_wall, +/area/maintenance/solars/starboard/fore) +"bcG" = ( +/obj/structure/sign/warning/vacuum{ + pixel_x = 32; + pixel_y = 32 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plating, +/area/maintenance/solars/starboard/fore) +"bcH" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/maintenance/solars/starboard/fore) +"bcI" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/maintenance/solars/starboard/fore) +"bcJ" = ( +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/effect/turf_decal/box, +/obj/machinery/power/tracker, +/turf/open/floor/plasteel/airless/solarpanel, +/area/solar/starboard/fore) +"bcK" = ( +/obj/machinery/power/smes, +/obj/structure/cable/white{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/maintenance/solars/starboard/fore) +"bcL" = ( +/obj/structure/cable/white{ + icon_state = "0-2" + }, +/obj/structure/cable/white{ + icon_state = "0-8" + }, +/obj/machinery/power/solar_control{ + dir = 2; + id = "forestarboard"; + name = "Starboard Bow Solar Control" + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/plating, +/area/maintenance/solars/starboard/fore) +"bcM" = ( +/obj/structure/cable/white{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/solars/starboard/fore) +"bcN" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/structure/sign/warning/electricshock{ + pixel_x = 32; + pixel_y = -32 + }, +/turf/open/floor/plating, +/area/maintenance/solars/starboard/fore) +"bcO" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/engineering{ + name = "Starboard Bow Solar Access"; + req_access_txt = "10" + }, +/turf/open/floor/plating, +/area/maintenance/solars/starboard/fore) +"bcP" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/solars/starboard/fore) +"bcQ" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable, +/turf/open/space/basic, +/area/solar/starboard/fore) +"bcR" = ( +/obj/structure/cable/white{ + icon_state = "1-8" + }, +/turf/open/floor/plating, +/area/maintenance/solars/starboard/fore) +"bcS" = ( +/obj/structure/lattice, +/obj/structure/sign/warning/securearea{ + pixel_x = -32 + }, +/turf/open/floor/plating/asteroid/airless, +/area/asteroid/nearstation) +"bcT" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/airlock/external{ + name = "External Airlock"; + req_access_txt = "13" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/maintenance/solars/starboard/fore) "bcU" = ( /obj/item/circular_saw, /obj/item/surgicaldrill{ @@ -34174,6 +34789,15 @@ }, /turf/open/floor/plating, /area/security/checkpoint) +"bdi" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "bdj" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -34319,20 +34943,20 @@ /turf/open/floor/plasteel/dark, /area/science/robotics/lab) "bdv" = ( -/obj/structure/table/reinforced, -/obj/structure/window/reinforced{ +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 8 }, -/obj/item/clothing/gloves/color/latex, -/obj/item/surgical_drapes, -/obj/item/cautery, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/machinery/camera{ + c_tag = "Atmospherics North East"; + dir = 8; + network = list("ss13","engine") + }, +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/floor/plasteel/dark, -/area/science/robotics/lab) +/turf/open/floor/plasteel/checker, +/area/engine/atmos) "bdw" = ( /obj/machinery/holopad, /obj/effect/turf_decal/tile/purple{ @@ -34380,6 +35004,243 @@ /obj/structure/sign/warning/fire, /turf/closed/wall, /area/science/mixing) +"bdB" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating/airless, +/area/solar/starboard/fore) +"bdC" = ( +/obj/structure/cable, +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plating, +/area/maintenance/solars/port/aft) +"bdD" = ( +/obj/structure/displaycase/labcage, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/power/apc{ + areastring = "/area/crew_quarters/heads/hor"; + dir = 1; + name = "RD Office APC"; + pixel_y = 26 + }, +/obj/structure/cable/white{ + icon_state = "0-2" + }, +/turf/open/floor/plasteel{ + icon_state = "sepia" + }, +/area/crew_quarters/heads/hor) +"bdE" = ( +/obj/structure/cable/white{ + icon_state = "0-4" + }, +/obj/structure/cable/white{ + icon_state = "0-8" + }, +/obj/machinery/power/apc{ + areastring = "/area/maintenance/solars/starboard/fore"; + dir = 2; + name = "Starboard Bow Solar APC"; + pixel_y = -26 + }, +/turf/open/floor/plating, +/area/maintenance/solars/starboard/fore) +"bdF" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/power/apc{ + areastring = "/area/maintenance/starboard/fore"; + dir = 4; + name = "Starboard Bow Maintenance APC"; + pixel_x = 26 + }, +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/structure/cable/white{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) +"bdG" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 + }, +/turf/open/floor/plating, +/area/maintenance/solars/port/aft) +"bdH" = ( +/obj/machinery/requests_console{ + department = "Medbay"; + departmentType = 1; + name = "Medbay RC"; + pixel_x = -30 + }, +/obj/machinery/camera{ + c_tag = "Medbay Storage"; + network = list("ss13","medbay") + }, +/obj/machinery/rnd/production/techfab/department/medical, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/box, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel, +/area/medical/medbay/zone3) +"bdI" = ( +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/holopad, +/turf/open/floor/plasteel{ + icon_state = "sepia" + }, +/area/crew_quarters/heads/hor) +"bdJ" = ( +/obj/structure/chair/office/dark{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/landmark/start/research_director, +/turf/open/floor/plasteel{ + icon_state = "sepia" + }, +/area/crew_quarters/heads/hor) +"bdK" = ( +/obj/machinery/computer/mecha{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/plasteel{ + icon_state = "sepia" + }, +/area/crew_quarters/heads/hor) +"bdL" = ( +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/landmark/start/research_director, +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel{ + icon_state = "sepia" + }, +/area/crew_quarters/heads/hor) +"bdM" = ( +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/turf/open/floor/plasteel{ + icon_state = "sepia" + }, +/area/crew_quarters/heads/hor) +"bdN" = ( +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/keycard_auth{ + pixel_x = 24; + pixel_y = -24 + }, +/obj/machinery/button/door{ + id = "rdprivacy"; + name = "Director's Privacy Toggle"; + pixel_x = 24; + pixel_y = -38 + }, +/obj/machinery/light_switch{ + pixel_x = 40; + pixel_y = -24 + }, +/obj/machinery/button/door{ + id = "rdxeno"; + name = "Xenobiology Containment Lockdown"; + pixel_x = 38; + pixel_y = -38; + req_access_txt = "47" + }, +/turf/open/floor/plasteel{ + icon_state = "sepia" + }, +/area/crew_quarters/heads/hor) +"bdO" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall/r_wall, +/area/crew_quarters/heads/hor) +"bdP" = ( +/obj/machinery/light{ + dir = 1; + light_color = "#c1caff" + }, +/obj/structure/flora/tree/palm, +/turf/open/floor/plating/asteroid, +/area/crew_quarters/heads/hor) "bdQ" = ( /obj/structure/closet/secure_closet/medical2, /obj/machinery/airalarm{ @@ -34487,25 +35348,23 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/zone3) "bdW" = ( -/obj/structure/closet/crate/freezer/blood, -/obj/structure/extinguisher_cabinet{ - pixel_y = -26 +/obj/structure/bed/dogbed/runtime, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 +/obj/effect/turf_decal/delivery, +/obj/structure/sign/poster/official/medical_green_cross{ + pixel_x = -32 }, /obj/machinery/camera{ - c_tag = "Medbay Recovery Room"; - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 + c_tag = "CMO's Office"; + dir = 4; + network = list("ss13","medbay") }, +/mob/living/simple_animal/pet/cat/Runtime, /turf/open/floor/plasteel/dark, -/area/medical/medbay/zone3) +/area/crew_quarters/heads/cmo) "bdX" = ( /obj/machinery/computer/crew{ dir = 4 @@ -34790,10 +35649,174 @@ /obj/machinery/door/poddoor/incinerator_toxmix, /turf/open/floor/engine/vacuum, /area/science/mixing) +"beu" = ( +/obj/machinery/portable_atmospherics/pump, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel, +/area/science/mixing) +"bev" = ( +/obj/structure/table/plasmaglass, +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/stamp/rd, +/obj/machinery/newscaster{ + pixel_y = 32 + }, +/turf/open/floor/plating/asteroid, +/area/crew_quarters/heads/hor) +"bew" = ( +/obj/machinery/computer/aifixer{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/plasteel{ + icon_state = "sepia" + }, +/area/crew_quarters/heads/hor) +"bex" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel{ + icon_state = "sepia" + }, +/area/crew_quarters/heads/hor) +"bey" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/stamp/cmo, +/obj/machinery/light_switch{ + pixel_x = 24; + pixel_y = -24 + }, +/turf/open/floor/plasteel/cafeteria, +/area/crew_quarters/heads/cmo) +"bez" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -26 + }, +/turf/open/floor/plasteel{ + icon_state = "sepia" + }, +/area/crew_quarters/heads/hor) +"beA" = ( +/obj/structure/closet/bombcloset, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/science/mixing) +"beB" = ( +/obj/structure/cable/white{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/plasteel, +/area/science/mixing) +"beC" = ( +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -24 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/structure/cable/white{ + icon_state = "1-4" + }, +/obj/machinery/camera{ + c_tag = "Mech Bay"; + dir = 4; + network = list("ss13","rd") + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/science/robotics/mechbay) +"beD" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/structure/sign/poster/official/soft_cap_pop_art{ + pixel_y = -32 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/turf/open/floor/plasteel{ + icon_state = "sepia" + }, +/area/crew_quarters/heads/hor) "beE" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, /area/medical/medbay/zone3) +"beF" = ( +/obj/machinery/camera{ + c_tag = "Toxins Lab West"; + network = list("ss13","rd") + }, +/turf/open/floor/plasteel, +/area/science/mixing) "beG" = ( /obj/structure/sign/departments/medbay/alt, /turf/closed/wall, @@ -34930,6 +35953,146 @@ }, /turf/closed/wall/r_wall, /area/science/robotics/lab) +"beR" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/camera{ + c_tag = "Research Director's Office"; + dir = 1; + network = list("ss13","rd") + }, +/obj/item/radio/intercom{ + name = "Station Intercom"; + pixel_y = -26 + }, +/turf/open/floor/plasteel{ + icon_state = "sepia" + }, +/area/crew_quarters/heads/hor) +"beS" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "1-8" + }, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Research Director's Desk"; + departmentType = 5; + name = "Research Director RC"; + pixel_x = 0; + pixel_y = -32; + receive_ore_updates = 1 + }, +/turf/open/floor/plasteel{ + icon_state = "sepia" + }, +/area/crew_quarters/heads/hor) +"beT" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 + }, +/turf/open/floor/plasteel, +/area/science/mixing) +"beU" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/science/mixing) +"beV" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/closet/bombcloset, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/science/mixing) +"beW" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/science/mixing) +"beX" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/plasteel, +/area/science/mixing) +"beY" = ( +/obj/structure/sign/warning/nosmoking/circle, +/turf/closed/wall/r_wall, +/area/crew_quarters/heads/hor) +"beZ" = ( +/obj/machinery/light_switch{ + pixel_x = -24 + }, +/turf/open/floor/plasteel, +/area/science/mixing) +"bfa" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/science/mixing) +"bfb" = ( +/obj/machinery/portable_atmospherics/scrubber, +/obj/item/storage/firstaid/toxin, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel, +/area/science/mixing) +"bfc" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/turf/open/floor/plasteel, +/area/science/mixing) +"bfd" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/science/mixing) "bfe" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/airalarm/unlocked{ @@ -34969,6 +36132,37 @@ /obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel, /area/hallway/primary/aft) +"bfh" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/turf/open/floor/plasteel, +/area/science/mixing) +"bfi" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/structure/cable/white{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel, +/area/science/mixing) +"bfj" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/science/mixing) +"bfk" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/science/mixing) "bfl" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -35033,6 +36227,15 @@ }, /turf/open/floor/plating, /area/maintenance/starboard) +"bfq" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/science/mixing) "bfr" = ( /obj/structure/cable/white{ icon_state = "1-8" @@ -35045,6 +36248,32 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"bfs" = ( +/obj/machinery/vending/wardrobe/science_wardrobe, +/obj/machinery/light, +/turf/open/floor/plasteel, +/area/science/mixing) +"bft" = ( +/obj/structure/closet/secure_closet/RD, +/obj/machinery/light, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/obj/item/circuitboard/aicore, +/turf/open/floor/plasteel{ + icon_state = "sepia" + }, +/area/crew_quarters/heads/hor) "bfu" = ( /turf/closed/wall, /area/chapel/main) @@ -35063,6 +36292,27 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel/white, /area/chapel/main) +"bfw" = ( +/obj/machinery/suit_storage_unit/rd, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/rd{ + dir = 1; + icon_state = "telescreen"; + pixel_y = -28 + }, +/turf/open/floor/plasteel{ + icon_state = "sepia" + }, +/area/crew_quarters/heads/hor) "bfx" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 @@ -35075,16 +36325,148 @@ }, /turf/closed/wall, /area/chapel/main) +"bfz" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 + }, +/turf/open/floor/plasteel, +/area/science/mixing) "bfA" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/closed/wall, /area/chapel/main) +"bfB" = ( +/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, +/turf/open/floor/plasteel, +/area/science/mixing) "bfC" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/closed/wall/rust, /area/chapel/main) +"bfD" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "0-8" + }, +/obj/structure/table/wood, +/obj/item/storage/box/bodybags{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/bodybags, +/obj/machinery/power/apc{ + areastring = "/area/medical/morgue"; + dir = 4; + name = "Morgue APC"; + pixel_x = 26 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/camera{ + c_tag = "Morgue"; + dir = 8; + network = list("ss13","medbay") + }, +/turf/open/floor/plasteel/dark, +/area/medical/morgue) +"bfE" = ( +/obj/structure/table/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/item/clothing/gloves/color/latex, +/obj/item/surgical_drapes, +/obj/item/cautery, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/item/toy/figure/roboticist{ + pixel_x = -4; + pixel_y = 14 + }, +/turf/open/floor/plasteel/dark, +/area/science/robotics/lab) +"bfF" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/camera{ + c_tag = "Surgery Operating"; + dir = 1; + network = list("ss13","medbay"); + pixel_x = 22 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/medical/medbay/zone3) +"bfG" = ( +/obj/structure/closet/crate/freezer/blood, +/obj/structure/extinguisher_cabinet{ + pixel_y = -26 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/obj/machinery/camera{ + c_tag = "Medbay Recovery Room"; + dir = 8; + network = list("ss13","medbay") + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/medical/medbay/zone3) +"bfH" = ( +/obj/effect/landmark/start/virologist, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/power/apc/highcap/five_k{ + areastring = "/area/medical/virology"; + dir = 1; + name = "Virology APC"; + pixel_y = 24 + }, +/obj/structure/cable/white{ + icon_state = "0-4" + }, +/obj/machinery/camera{ + c_tag = "Virology"; + network = list("ss13","medbay") + }, +/turf/open/floor/plasteel, +/area/medical/virology) "bfI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable/white{ @@ -35162,6 +36544,36 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft) +"bfM" = ( +/obj/machinery/shower{ + desc = "From what you understand it was put in rather recently, but the design looks right out of the 2510's. Weird."; + dir = 1; + icon_state = "shower"; + name = "Emergency Shower" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/camera{ + c_tag = "Virology Access"; + dir = 1; + network = list("ss13","medbay") + }, +/turf/open/floor/plasteel/white, +/area/medical/virology) +"bfN" = ( +/obj/effect/turf_decal/stripes/end{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/camera{ + c_tag = "Xenobiology North"; + dir = 4; + network = list("ss13","rd"); + pixel_y = -5 + }, +/turf/open/floor/plasteel, +/area/science/xenobiology) "bfO" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 @@ -35367,6 +36779,48 @@ }, /turf/open/floor/plasteel/dark, /area/chapel/main) +"bgc" = ( +/obj/machinery/shower{ + dir = 4; + name = "emergency shower" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/stripes/end{ + dir = 8 + }, +/obj/machinery/camera{ + c_tag = "Xenobiology Central"; + dir = 4; + network = list("ss13","rd"); + pixel_y = -5 + }, +/turf/open/floor/plasteel, +/area/science/xenobiology) +"bgd" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/beakers{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/syringes, +/obj/item/extinguisher/mini, +/obj/machinery/airalarm/unlocked{ + dir = 4; + pixel_x = -23 + }, +/obj/machinery/newscaster{ + pixel_y = -32 + }, +/obj/machinery/camera{ + c_tag = "Xenobiology Lab"; + dir = 4; + network = list("ss13","rd") + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/science/xenobiology) "bge" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 @@ -35401,6 +36855,88 @@ heat_capacity = 1e+006 }, /area/hallway/primary/aft) +"bgg" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/machinery/status_display{ + pixel_y = -32 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/camera{ + c_tag = "Xenobiology South"; + dir = 1; + network = list("ss13","rd") + }, +/turf/open/floor/plasteel, +/area/science/xenobiology) +"bgh" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -26 + }, +/obj/machinery/camera{ + c_tag = "Atmospherics South West"; + dir = 1; + network = list("ss13","engine") + }, +/turf/open/floor/plasteel, +/area/engine/atmos) +"bgi" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 4; + name = "Air to External Air Ports" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/camera{ + c_tag = "Atmospherics South East"; + dir = 1; + network = list("ss13","engine") + }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/engine/atmos) +"bgj" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/airlock_sensor{ + id_tag = "incinerator_airlock_sensor"; + master_tag = "incinerator_airlock_control"; + pixel_y = 24 + }, +/obj/machinery/camera/autoname{ + network = list("ss13","engine") + }, +/turf/open/floor/engine, +/area/maintenance/disposal/incinerator) +"bgk" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/light/small, +/obj/machinery/camera{ + c_tag = "Port Quarter Solar"; + dir = 1; + network = list("ss13","engine") + }, +/turf/open/floor/plating, +/area/maintenance/solars/port/aft) "bgl" = ( /obj/machinery/vending/cola/random, /obj/machinery/newscaster{ @@ -35428,6 +36964,20 @@ }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) +"bgn" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = 24 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/obj/machinery/camera{ + c_tag = "Research Division South"; + dir = 8; + network = list("ss13","rd") + }, +/obj/machinery/vending/wardrobe/science_wardrobe, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/plasteel/white, +/area/science/research) "bgo" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/white{ @@ -36710,22 +38260,6 @@ }, /turf/open/floor/plasteel/dark, /area/hallway/secondary/entry) -"biC" = ( -/obj/machinery/shower{ - dir = 4; - name = "emergency shower" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/stripes/end{ - dir = 8 - }, -/obj/machinery/camera{ - c_tag = "Xenobiology Central"; - dir = 4; - pixel_y = -5 - }, -/turf/open/floor/plasteel, -/area/science/xenobiology) "biD" = ( /obj/machinery/shower{ dir = 8; @@ -37396,46 +38930,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) -"bjP" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/beakers{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/syringes, -/obj/item/extinguisher/mini, -/obj/machinery/airalarm/unlocked{ - dir = 4; - pixel_x = -23 - }, -/obj/machinery/newscaster{ - pixel_y = -32 - }, -/obj/machinery/camera{ - c_tag = "Xenobiology Lab"; - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/plasteel, -/area/science/xenobiology) -"bjQ" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/monkeycubes, -/obj/item/storage/box/monkeycubes, -/obj/machinery/status_display{ - pixel_y = -32 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/camera{ - c_tag = "Xenobiology South"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/science/xenobiology) "bjR" = ( /obj/machinery/computer/camera_advanced/xenobio{ dir = 1 @@ -37844,22 +39338,6 @@ /obj/machinery/telecomms/broadcaster/preset_left/birdstation, /turf/open/floor/circuit/telecomms/mainframe, /area/tcommsat/server) -"blr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/cable/white{ - icon_state = "4-8" - }, -/obj/machinery/camera{ - c_tag = "Research Division North" - }, -/obj/effect/landmark/event_spawn, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/science/research) "bls" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -37881,27 +39359,6 @@ heat_capacity = 1e+006 }, /area/hallway/primary/aft) -"blt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/camera{ - c_tag = "Surgery Operating"; - dir = 1; - pixel_x = 22 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/medical/medbay/zone3) "blv" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -38715,26 +40172,6 @@ }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) -"buU" = ( -/obj/machinery/camera{ - c_tag = "Communications Relay"; - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel/dark/telecomms, -/area/tcommsat/server) "buW" = ( /turf/closed/wall/r_wall, /area/engine/supermatter) @@ -39149,9 +40586,6 @@ heat_capacity = 1e+006 }, /area/hallway/secondary/entry) -"bxZ" = ( -/turf/closed/wall, -/area/maintenance/starboard/fore) "bye" = ( /turf/closed/wall/rust, /area/maintenance/fore) @@ -39206,14 +40640,6 @@ dir = 1 }, /area/engine/atmos) -"bNB" = ( -/obj/machinery/portable_atmospherics/pump, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, -/area/science/mixing) "bOJ" = ( /obj/machinery/camera{ c_tag = "Toxins Launch Room Access"; @@ -39227,15 +40653,6 @@ }, /turf/open/floor/plasteel, /area/science/mixing) -"bWO" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/obj/structure/cable/white{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/science/mixing) "bYE" = ( /obj/structure/sign/warning/fire, /obj/machinery/atmospherics/pipe/simple/general/visible{ @@ -39374,19 +40791,6 @@ }, /turf/open/floor/engine/vacuum, /area/maintenance/disposal/incinerator) -"cGz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -26 - }, -/obj/machinery/camera{ - c_tag = "Atmospherics South West"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/engine/atmos) "cRz" = ( /obj/machinery/button/door{ id = "supplybridge"; @@ -39595,18 +40999,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/engine/atmos) -"edA" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/door/airlock/external{ - name = "External Airlock"; - req_access_txt = "13" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/maintenance/starboard/fore) "eew" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable{ @@ -39738,18 +41130,6 @@ }, /turf/open/floor/plasteel/dark, /area/engine/atmos) -"eFp" = ( -/obj/effect/turf_decal/stripes/end{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/camera{ - c_tag = "Xenobiology North"; - dir = 4; - pixel_y = -5 - }, -/turf/open/floor/plasteel, -/area/science/xenobiology) "eGm" = ( /turf/closed/wall/r_wall, /area/science/storage) @@ -40201,12 +41581,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"hns" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/closed/wall/rust, -/area/science/mixing) "hpr" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=3.2-AtriumSW"; @@ -40512,14 +41886,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/visible, /turf/open/floor/plasteel, /area/engine/atmos) -"iXB" = ( -/obj/structure/closet/bombcloset, -/obj/machinery/light_switch{ - pixel_y = 28 - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, -/area/science/mixing) "iZQ" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/carbon_input, /turf/open/floor/engine/co2, @@ -40725,13 +42091,6 @@ }, /turf/open/floor/plasteel, /area/science/mixing) -"jLT" = ( -/obj/machinery/portable_atmospherics/scrubber, -/obj/item/storage/firstaid/toxin, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel, -/area/science/mixing) "jRe" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -40890,10 +42249,6 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/plating, /area/science/storage) -"lmr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel, -/area/science/mixing) "low" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 @@ -40965,26 +42320,6 @@ }, /turf/open/floor/plasteel, /area/science/mixing) -"lAs" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/radio/intercom{ - name = "Station Intercom"; - pixel_y = 24 - }, -/obj/machinery/camera{ - c_tag = "Atmospherics North West"; - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/plasteel/dark/corner{ - dir = 1 - }, -/area/engine/atmos) "lCg" = ( /obj/machinery/door/airlock/external{ name = "Supply Dock Airlock"; @@ -41084,13 +42419,6 @@ "meo" = ( /turf/closed/wall/r_wall/rust, /area/science/mixing) -"mfj" = ( -/obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/science/mixing) "mgs" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/air_input{ dir = 1 @@ -41494,15 +42822,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/hallway/primary/starboard) -"oRo" = ( -/obj/structure/cable/white{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/science/mixing) "pbT" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 @@ -41701,10 +43020,6 @@ }, /turf/closed/wall/r_wall, /area/engine/atmos) -"pXH" = ( -/obj/machinery/vending/wardrobe/science_wardrobe, -/turf/open/floor/plasteel, -/area/science/mixing) "pZU" = ( /obj/structure/lattice, /obj/structure/grille, @@ -41879,23 +43194,6 @@ /obj/machinery/atmospherics/pipe/simple/cyan/visible, /turf/open/floor/plasteel, /area/engine/atmos) -"rjV" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/airlock_sensor{ - id_tag = "incinerator_airlock_sensor"; - master_tag = "incinerator_airlock_control"; - pixel_y = 24 - }, -/obj/machinery/camera/autoname, -/turf/open/floor/engine, -/area/maintenance/disposal/incinerator) "rlq" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -41908,13 +43206,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft) -"rpy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, -/obj/structure/sign/warning/nosmoking/circle, -/turf/closed/wall, -/area/science/mixing) "rzn" = ( /obj/machinery/status_display, /turf/closed/wall, @@ -41994,18 +43285,6 @@ /mob/living/simple_animal/opossum, /turf/open/floor/plating, /area/maintenance/starboard) -"scn" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/science/mixing) "sdL" = ( /obj/effect/turf_decal/delivery, /obj/machinery/hydroponics/soil, @@ -44840,12 +46119,6 @@ "tin" = ( /turf/open/floor/engine/vacuum, /area/science/mixing) -"tms" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/closed/wall, -/area/maintenance/starboard/aft) "ttp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/white{ @@ -45025,29 +46298,6 @@ }, /turf/closed/wall/r_wall, /area/engine/atmos) -"uoy" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/pump{ - name = "Plasma to Pure" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/camera{ - c_tag = "Atmospherics North" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/engine/atmos) "upN" = ( /obj/machinery/door/airlock/research{ name = "Toxins Launch Room"; @@ -45778,14 +47028,6 @@ /obj/structure/grille, /turf/closed/wall/r_wall, /area/engine/atmos) -"xLe" = ( -/obj/structure/closet/bombcloset, -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, -/area/science/mixing) "xPz" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 9 @@ -70446,22 +71688,22 @@ jFP jFP jFP jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa jFP jFP jFP @@ -70703,22 +71945,22 @@ jFP jFP jFP jFP -jFP -jFP -jFP -uXD -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP +aaa +aaa +aaa +aab +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa jFP jFP jFP @@ -70961,19 +72203,19 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +pZU +sdX +pZU +pZU +pZU +sdX +aLL +sdX +pZU +pZU +pZU +sdX +pZU aaa aaa jFP @@ -71218,19 +72460,19 @@ aaa aaa aaa aaa +pZU aaa aaa aaa aaa aaa +aMH aaa aaa aaa aaa aaa -aaa -aaa -aaa +pZU aaa aaa jFP @@ -71475,19 +72717,19 @@ aaa aaa aaa aaa +pZU aaa +aKr +aKr +aKr +aKr +aMI +aKr +aKr +aKr +aKr aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +pZU aaa aaa jFP @@ -71732,19 +72974,19 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +sdX +sdX +aKB +aLz +aLz +aLz +aMQ +bar +bar +bar +bbS +sdX +sdX aaa aaa jFP @@ -71989,19 +73231,19 @@ aaa aaa aaa aaa +pZU aaa +aKF +aKF +aKF +aKF +aMH +aKF +aKF +aKF +aKF aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +pZU aaa aaa jFP @@ -72227,7 +73469,7 @@ aad aad aad gdA -rjV +bgj fsJ eyu uvg @@ -72246,19 +73488,19 @@ aaa aaa aaa aaa +pZU aaa aaa aaa aaa aaa +aOc aaa aaa aaa aaa aaa -aaa -aaa -aaa +pZU aaa aaa jFP @@ -72503,19 +73745,19 @@ aaa aaa aaa aaa +pZU aaa +aKr +aKr +aKr +aKr +aMI +aKr +aKr +aKr +aKr aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +pZU aaa aaa jFP @@ -72760,19 +74002,19 @@ aac aac aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +pZU +sdX +aKB +aLz +aLz +aLz +aOH +bar +bar +bar +bbS +sdX +sdX aaa aaa jFP @@ -72990,7 +74232,7 @@ aad aad aad aqz -lAs +aCF qTa oJp hUG @@ -73017,19 +74259,19 @@ aad aac aac aac +sdX aaa +aKF +aKF +aKF +aKF +aMH +aKF +aKF +aKF +aKF aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +pZU aaa aaa jFP @@ -73257,7 +74499,7 @@ bGL vuN jkl eew -cGz +bgh qUW aqz aqz @@ -73274,19 +74516,19 @@ aad aad aad aad -aac -aac -aaa +aKo aaa aaa aaa aaa aaa +aZS aaa aaa aaa aaa aaa +pZU aaa aaa jFP @@ -73531,19 +74773,19 @@ aad aad aad aad -aad +adx aad aac aad aad aad -bvg +aZT aac aaa aaa aaa aaa -aaa +pZU aaa aaa jFP @@ -73793,14 +75035,14 @@ aad aad aad aad -aKm -aKo -aKm -aKm -aaa -aaa -aaa -aaa +aLC +bae +aLC +aLC +sdX +sdX +sdX +sdX aaa aaa aaa @@ -74051,13 +75293,13 @@ aMJ aMJ sJV aMJ -aKr -aLz -aKm -aaa +baj +bas +aLC aaa aaa aaa +pZU aaa aaa aaa @@ -74308,13 +75550,13 @@ buJ buO sKn aMJ -aKB -aLs -aKm -aac -aaa -aaa +bak +bat +aLC +aLC +aLC aaa +pZU aaa aaa aaa @@ -74549,7 +75791,7 @@ anv anK aoo aGe -aJk +aJe aKt aLH aMK @@ -74565,13 +75807,13 @@ buK sKj buR aMJ -aKF -aqo -aad -aac -aaa -aaa +bal +bau +bbf +bbo +aLC aaa +pZU aaa aaa aaa @@ -74822,13 +76064,13 @@ buL buP buS aMJ -aKJ -aKm -aad -aad -aaa -aaa -aaa +bam +bav +bdC +bgk +aLC +sdX +sdX aaa aaa aaa @@ -75079,13 +76321,13 @@ buK sKj buR aMJ -aKJ -aKm -aad -aad -aaa -aaa +ban +baE +bbh +bdG +aLC aaa +pZU aaa aaa aaa @@ -75302,7 +76544,7 @@ pNE oOk xej oaV -uoy +asH lqz fFw auq @@ -75334,15 +76576,15 @@ aTZ blq buN buQ -buU +aYp sJV -aKJ -aqo -aad -aaa -aaa -aaa +bao +bau +bbi +bbR +aLC aaa +pZU aaa aaa aaa @@ -75593,13 +76835,13 @@ sJV aMJ aMJ sJV -aKJ -aqo -aLs -aac -aaa -aaa +bap +bau +bat +aLC +aLC aaa +pZU aaa aaa aaa @@ -75850,13 +77092,13 @@ aad bvo aad aKm -aLp -aLB +baq +bbb aKm aac aac aac -aac +aKo aaa aaa aaa @@ -76108,12 +77350,12 @@ aUQ aXc aKm aqo -aLC +bbc aLv aac aac aac -aad +adx aad aaa aaa @@ -76365,7 +77607,7 @@ aUR aUQ bvo aLs -aKJ +bbd aKm aac aad @@ -76622,7 +77864,7 @@ aWz aVL bvo aqo -aLL +bbe aKm aad aad @@ -76879,7 +78121,7 @@ aWz aUQ bvg aKm -aKJ +bbd aKm aKm aad @@ -77136,7 +78378,7 @@ aWz aVL bvg aLv -aKJ +bbd aME aKm aad @@ -77393,7 +78635,7 @@ aUU aUQ bvg aKm -aKJ +bbd aMF aKm aac @@ -77650,7 +78892,7 @@ aWz aVL bvg aKm -aKJ +bbd aMG aKm aKm @@ -77907,8 +79149,8 @@ aWz aUQ bvo aKm -aLp -aLB +baq +bbb aOI aPQ aPQ @@ -78130,7 +79372,7 @@ asA asD sAx arA -asH +bdv atI auB avG @@ -78165,7 +79407,7 @@ aVL bvo aqo aKm -aMH +bbj axU aKm aMG @@ -78422,7 +79664,7 @@ aUQ aad aLs aLX -aMI +bbk aOL aPR aQV @@ -78679,7 +79921,7 @@ aVL aad aqo aMv -aMQ +bbl aOM aPS aRc @@ -78911,10 +80153,10 @@ ayl azr aAt aBB -aCF +bgi aDu aEz -aFB +aVz aGo aHu aIr @@ -78936,7 +80178,7 @@ bvo bvo aqo aMw -aMI +bbk aON aPT aRd @@ -78945,7 +80187,7 @@ aUm aKm aVH aRe -aTn +bfH aWL aZB aTv @@ -79193,7 +80435,7 @@ axX aEg aEg aMD -aOc +bbm aOS aPU aRj @@ -79450,7 +80692,7 @@ aFM aFM aKl aFM -aOH +bbn aOT aPV uXV @@ -79717,7 +80959,7 @@ aKm aSQ aKV aWJ -aYB +bfM aKV aYA aZJ @@ -80461,7 +81703,7 @@ aGt aHz aIw aJF -aKM +aJk aMa aNe aEt @@ -81504,7 +82746,7 @@ aVT aVQ aXg ajG -aGY +bdW aOl aOQ aCy @@ -82019,7 +83261,7 @@ aVQ aXk ajG aOZ -aQe +bey aOK aCy aPE @@ -82776,7 +84018,7 @@ aIC aJK aKR aMg -aNl +aKM aID aOU aQc @@ -82794,7 +84036,7 @@ aNS aPz aPB aPH -aQE +bfD aQL aRb aVc @@ -83039,13 +84281,13 @@ aEh aFh aGf aHG -aJe +aNl aJo aLo aLu aMl aOW -aOX +bdH aGZ aOE aPv @@ -83557,7 +84799,7 @@ aJg aJA aLr aLA -aNO +aQe ail aXQ aYI @@ -83823,7 +85065,7 @@ baw aSh bcf bcW -blt +bfF ooX avB bfA @@ -84068,11 +85310,11 @@ bxQ sJJ ail aGF -aJO +aGY aNL aNo aNP -aXm +aWm aXS aYK aZG @@ -85108,7 +86350,7 @@ baB bbr bci bcZ -bdW +bfG aSh atE bfA @@ -89216,7 +90458,7 @@ aXy aYi aZb aZU -baN +beC bbC bct bdl @@ -89724,7 +90966,7 @@ aSw aTI aUC aVv -aWm +aOX aWV aXA aYk @@ -90263,7 +91505,7 @@ nTi jdD bhb bhO -bjP +bgd bfP aad aad @@ -90497,7 +91739,7 @@ aSz aTL aWp aWW -blr +aXm aYn aZf aZY @@ -90512,15 +91754,15 @@ bfQ bgq bhc bhP -eFp +bfN bhP pLb bhP -biC +bgc bhP bjq bjD -bjQ +bgg bfP aad aad @@ -90954,9 +92196,9 @@ sOk aae aae aaf -aaa -aaa -aaa +sdX +sdX +sdX aae aad abs @@ -91008,11 +92250,11 @@ aRv aSB aTN aUG -aVz +aNO aWr aWX aXE -aYp +bgn aZh baa baU @@ -91210,12 +92452,12 @@ aad aad aaa aaa -aae -aaa -aaa -bxZ -abL -bxZ +bbT +bbT +bbT +bbT +bcF +bbT swz abs abs @@ -91466,17 +92708,17 @@ sMq aad aad aaa -aaa -aae -aad -aac -edA -abM -acu -adt -adM -aef adm +bbT +bbX +bbZ +bcc +bcG +bcM +bcT +bym +bdi +bdF bxw bym afB @@ -91724,13 +92966,13 @@ aad aad aaa aad -aah -aad -aad -bxZ -bxZ -adq -bxZ +bbU +bbT +bca +bbT +bcH +bcN +bbT adY aei adn @@ -91789,7 +93031,7 @@ bad baX bbL bcA -bdv +bfE beo aZl sPK @@ -91982,11 +93224,11 @@ aac aaa aad aad -aad -aad -aad -bxZ -bxZ +bbT +bcb +bbT +bcI +bcO adu adu aej @@ -92239,11 +93481,11 @@ aac aaa aaa aad -aac -aac -aad -aad -aad +bbY +bdB +bbT +aFB +bcP ady adZ aek @@ -92491,16 +93733,16 @@ sMq sMr sMr aad +adx +sdX +sdX +bbW +bcQ +adq aad -aaa -aaa -aaa -aaa -aaa -aad -aad -aad -aad +bbT +bcK +bdE adu aea aen @@ -92748,16 +93990,16 @@ aad aad aad aad -aac +aKo +aaa +aaa +aef aaa aaa aaa -aaa -aaa -aaa -aad -aad -aad +bbT +bcL +bcR adu aeb aeP @@ -93002,19 +94244,19 @@ aad aad aac aac -aad +adx aaa aaa +sdX aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aac -aac +adq +sdX +sdX +sdX +bbT +bbT +bbU adu adu adu @@ -93259,19 +94501,19 @@ aad aac aac aaa +sdX +aaa +aaa +sdX +aaa +aaa +adq aaa aaa aaa +sdX aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aac +bcS aad aad aad @@ -93324,8 +94566,8 @@ auu avz avF abv -sON -tms +hXc +orV hXc abP jLF @@ -93516,19 +94758,19 @@ aad aaa aaa aaa +pZU aaa +abL +abL +abL +abL +adt +abL +abL +abL +abL aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aac +aKo aac aad aad @@ -93581,8 +94823,8 @@ aux avA avH abv -aad -orV +beA +beV iio tPn wOe @@ -93773,19 +95015,19 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +pZU +sdX +abM +bbQ +bbQ +bbQ +adM +bbV +bbV +bbV +bcD +sdX +pZU aaa aaa aac @@ -93838,9 +95080,9 @@ atF atF atF swG -aad -hns -iXB +beF +beW +beZ hVE sPq hVE @@ -94030,19 +95272,19 @@ aaa aaa aaa aaa +pZU aaa +acu +acu +acu +acu +aef +acu +acu +acu +acu aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +pZU aaa aaa aaa @@ -94094,14 +95336,14 @@ aaa aaa aaa aad -aad -aad -hns -xLe +iio +beB +beX +bfa +bfc +bfi hVE -ajP -hVE -pXH +bfs sVt vCu tin @@ -94287,19 +95529,19 @@ aaa aaa aaa aaa +pZU aaa aaa aaa aaa aaa +bbg aaa aaa aaa aaa aaa -aaa -aaa -aaa +pZU aaa aaa aaa @@ -94349,13 +95591,13 @@ aaa aaa aaa aaa -aac aad -aad -aad -orV +ajP +ajP +aYB +ajP nMh -hVE +beW sPq wPr jIk @@ -94544,19 +95786,19 @@ aaa aaa aaa aaa +sdX aaa +abL +abL +abL +abL +adt +abL +abL +abL +abL aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +sdX aaa aaa aaa @@ -94606,14 +95848,14 @@ aaa aaa aaa aaa -aac -aac aad -aad -orV +ajP +aQE +bex +ajP pdX -hVE -bWO +bfd +bfj oKp dXv sVt @@ -94798,23 +96040,23 @@ jFP jFP jFP jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP aaa aaa aaa +pZU +sdX +abM +bbQ +bbQ +bbQ +adM +bbV +bbV +bbV +bcD +sdX +pZU +aaa aaa aaa aaa @@ -94862,15 +96104,15 @@ aaf aaa aaa aaa -aaa aac aad -aad -aad -rpy -jLT -lmr -oRo +ajP +bdP +bez +beY +bfb +bfh +bfk pAN nTg gcw @@ -95055,23 +96297,23 @@ jFP jFP jFP jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP aaa aaa aaa +pZU +aaa +acu +acu +acu +acu +aef +acu +acu +acu +acu +aaa +pZU +aaa aaa aaa aaa @@ -95119,15 +96361,15 @@ aaf aaa aaa aaa -aaa -aac aad aad -aad -sVt -bNB -hVE -sPq +ajP +aTn +beD +bdO +beu +mvB +beT hVE lzC sVt @@ -95312,23 +96554,23 @@ jFP jFP jFP jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP aaa aaa aaa +pZU +aaa +aaa +aaa +aaa +aaa +adt +aaa +aaa +aaa +aaa +aaa +pZU +aaa aaa aaa aaa @@ -95376,15 +96618,15 @@ aaf aaa aaa aaa -aaa -aac aad -aad -aad -sVt +ajP +ajP +bev +beR +ajP jXX wwT -sPq +beU tFk hVE lzG @@ -95569,23 +96811,23 @@ jFP jFP jFP jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP aaa aaa aaa +sdX +sdX +pZU +pZU +pZU +sdX +bcJ +sdX +pZU +pZU +pZU +sdX +sdX +aaa aaa aaa aaa @@ -95633,16 +96875,16 @@ aaa aaa aaa aaa -aaa -aac -aad -aad -aad -meo +ajP +ajP +bdD +bdL +beS +ajP xiZ wvy -sPq -mfj +bfz +bfB mvB mvB kqH @@ -95826,20 +97068,20 @@ jFP jFP jFP jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -95890,12 +97132,12 @@ aaa aaa aaa aaa -aaa -aac -aac -aad -aad -sVt +aJO +baN +bdI +bdM +bft +ajP mhf kCG ybw @@ -96083,20 +97325,20 @@ jFP jFP jFP jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -96147,12 +97389,12 @@ aaf aaa aaa aaa -aaa -aac -aac -aad -aad -sVt +aJO +bbP +bdJ +bdN +bfw +ajP sVt sVt sVt @@ -96340,20 +97582,20 @@ jFP jFP jFP jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -96404,16 +97646,16 @@ aaf aaa aaa aaa -aaa -aaa -aad -aad -eGm -eGm +aJO +aJO +bdK +bew +ajP +ajP eGm meo uiT -scn +bfq bpj iio aad @@ -96597,20 +97839,20 @@ jFP jFP jFP jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -96662,10 +97904,10 @@ aaa aaa aaa aaa -aaa -aad -aad -leU +aJO +aJO +aJO +ajP dfK dfK sVt @@ -96854,20 +98096,20 @@ jFP jFP jFP jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm index 94059c0880..767894050d 100644 --- a/code/__DEFINES/loadout.dm +++ b/code/__DEFINES/loadout.dm @@ -54,3 +54,16 @@ //donator items #define LOADOUT_CATEGORY_DONATOR "Donator" + +//how many prosthetics can we have +#define MAXIMUM_LOADOUT_PROSTHETICS 2 + +//what limbs can be amputated or be prosthetic +#define LOADOUT_ALLOWED_LIMB_TARGETS list(BODY_ZONE_L_ARM,BODY_ZONE_R_ARM,BODY_ZONE_L_LEG,BODY_ZONE_R_LEG) + +//options for modifiying limbs +#define LOADOUT_LIMB_NORMAL "Normal" +#define LOADOUT_LIMB_PROSTHETIC "Prosthetic" +#define LOADOUT_LIMB_AMPUTATED "Amputated" + +#define LOADOUT_LIMBS list(LOADOUT_LIMB_NORMAL,LOADOUT_LIMB_PROSTHETIC,LOADOUT_LIMB_AMPUTATED) //you can amputate your legs/arms though \ No newline at end of file diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index 71c2b2e13b..09d4aadf50 100644 --- a/code/_globalvars/lists/flavor_misc.dm +++ b/code/_globalvars/lists/flavor_misc.dm @@ -279,7 +279,8 @@ GLOBAL_LIST_INIT(unlocked_mutant_parts, list("horns", "insect_fluff")) //parts in either of the above two lists that require a second option that allows them to be coloured GLOBAL_LIST_INIT(colored_mutant_parts, list("insect_wings" = "wings_color", "deco_wings" = "wings_color", "horns" = "horns_color")) -//species ids that have greyscale sprites +//body ids that have greyscale sprites GLOBAL_LIST_INIT(greyscale_limb_types, list("human","moth","lizard","pod","plant","jelly","slime","golem","lum","stargazer","mush","ethereal","snail","c_golem","b_golem","mammal","xeno","ipc","insect","synthliz","avian","aquatic")) -//species ids that need snowflake coloring applied +//body ids that have prosthetic sprites +GLOBAL_LIST_INIT(prosthetic_limb_types, list("xion","bishop","cybersolutions","grayson","hephaestus","nanotrasen","talon")) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 0bc4e6665a..9af86653f4 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -396,6 +396,7 @@ SUBSYSTEM_DEF(ticker) SSjob.EquipRank(N, player.mind.assigned_role, 0) if(CONFIG_GET(flag/roundstart_traits) && ishuman(N.new_character)) SSquirks.AssignQuirks(N.new_character, N.client, TRUE, TRUE, SSjob.GetJob(player.mind.assigned_role), FALSE, N) + N.client.prefs.post_copy_to(player) CHECK_TICK if(captainless) for(var/mob/dead/new_player/N in GLOB.player_list) diff --git a/code/datums/mood_events/generic_negative_events.dm b/code/datums/mood_events/generic_negative_events.dm index 38b004a657..1abe077980 100644 --- a/code/datums/mood_events/generic_negative_events.dm +++ b/code/datums/mood_events/generic_negative_events.dm @@ -204,6 +204,11 @@ mood_change = -1 timeout = 2 MINUTES +/datum/mood_event/plush_bite + description = "IT BIT ME!! OW!\n" + mood_change = -3 + timeout = 2 MINUTES + //Cursed stuff below /datum/mood_event/emptypred diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 68b5d6f987..322fba0a33 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -211,24 +211,27 @@ GLOBAL_LIST_EMPTY(family_heirlooms) H.gain_trauma(T, TRAUMA_RESILIENCE_ABSOLUTE) /datum/quirk/paraplegic/on_spawn() - if(quirk_holder.buckled) // Handle late joins being buckled to arrival shuttle chairs. - quirk_holder.buckled.unbuckle_mob(quirk_holder) + if(quirk_holder.client) + var/modified_limbs = quirk_holder.client.prefs.modified_limbs + if(!(modified_limbs[BODY_ZONE_L_LEG] == LOADOUT_LIMB_AMPUTATED && modified_limbs[BODY_ZONE_R_LEG] == LOADOUT_LIMB_AMPUTATED && !isjellyperson(quirk_holder))) + if(quirk_holder.buckled) // Handle late joins being buckled to arrival shuttle chairs. + quirk_holder.buckled.unbuckle_mob(quirk_holder) - var/turf/T = get_turf(quirk_holder) - var/obj/structure/chair/spawn_chair = locate() in T + var/turf/T = get_turf(quirk_holder) + var/obj/structure/chair/spawn_chair = locate() in T - var/obj/vehicle/ridden/wheelchair/wheels = new(T) - if(spawn_chair) // Makes spawning on the arrivals shuttle more consistent looking - wheels.setDir(spawn_chair.dir) + var/obj/vehicle/ridden/wheelchair/wheels = new(T) + if(spawn_chair) // Makes spawning on the arrivals shuttle more consistent looking + wheels.setDir(spawn_chair.dir) - wheels.buckle_mob(quirk_holder) + wheels.buckle_mob(quirk_holder) - // During the spawning process, they may have dropped what they were holding, due to the paralysis - // So put the things back in their hands. + // During the spawning process, they may have dropped what they were holding, due to the paralysis + // So put the things back in their hands. - for(var/obj/item/I in T) - if(I.fingerprintslast == quirk_holder.ckey) - quirk_holder.put_in_hands(I) + for(var/obj/item/I in T) + if(I.fingerprintslast == quirk_holder.ckey) + quirk_holder.put_in_hands(I) /datum/quirk/poor_aim name = "Poor Aim" @@ -244,42 +247,6 @@ GLOBAL_LIST_EMPTY(family_heirlooms) mob_trait = TRAIT_PROSOPAGNOSIA medical_record_text = "Patient suffers from prosopagnosia and cannot recognize faces." -/datum/quirk/prosthetic_limb - name = "Prosthetic Limb" - desc = "An accident caused you to lose one of your limbs. Because of this, you now have a random prosthetic!" - value = -1 - var/slot_string = "limb" - -/datum/quirk/prosthetic_limb/on_spawn() - var/mob/living/carbon/human/H = quirk_holder - var/limb_slot - if(HAS_TRAIT(H, TRAIT_PARA))//Prevent paraplegic legs being replaced - limb_slot = pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM) - else - limb_slot = pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) - var/obj/item/bodypart/old_part = H.get_bodypart(limb_slot) - var/obj/item/bodypart/prosthetic - switch(limb_slot) - if(BODY_ZONE_L_ARM) - prosthetic = new/obj/item/bodypart/l_arm/robot/surplus(quirk_holder) - slot_string = "left arm" - if(BODY_ZONE_R_ARM) - prosthetic = new/obj/item/bodypart/r_arm/robot/surplus(quirk_holder) - slot_string = "right arm" - if(BODY_ZONE_L_LEG) - prosthetic = new/obj/item/bodypart/l_leg/robot/surplus(quirk_holder) - slot_string = "left leg" - if(BODY_ZONE_R_LEG) - prosthetic = new/obj/item/bodypart/r_leg/robot/surplus(quirk_holder) - slot_string = "right leg" - prosthetic.replace_limb(H) - qdel(old_part) - H.regenerate_icons() - -/datum/quirk/prosthetic_limb/post_add() - to_chat(quirk_holder, "Your [slot_string] has been replaced with a surplus prosthetic. It is fragile and will easily come apart under duress. Additionally, \ - you need to use a welding tool and cables to repair it, instead of bruise packs and ointment.") - /datum/quirk/insanity name = "Reality Dissociation Syndrome" desc = "You suffer from a severe disorder that causes very vivid hallucinations. Mindbreaker toxin can suppress its effects, and you are immune to mindbreaker's hallucinogenic properties. This is not a license to grief." diff --git a/code/game/objects/items/miscellaneous.dm b/code/game/objects/items/miscellaneous.dm index 6f1aec287b..7e14fb9d35 100644 --- a/code/game/objects/items/miscellaneous.dm +++ b/code/game/objects/items/miscellaneous.dm @@ -255,7 +255,7 @@ /obj/item/choice_beacon/box/plushie/generate_display_names() var/list/plushie_list = list() //plushie set 1: just subtypes of /obj/item/toy/plush - var/list/plushies_set_one = subtypesof(/obj/item/toy/plush) - list(/obj/item/toy/plush/narplush, /obj/item/toy/plush/awakenedplushie, /obj/item/toy/plush/random_snowflake, /obj/item/toy/plush/random) //don't allow these special ones (you can still get narplush/hugbox) + var/list/plushies_set_one = subtypesof(/obj/item/toy/plush) - list(/obj/item/toy/plush/narplush, /obj/item/toy/plush/awakenedplushie, /obj/item/toy/plush/random_snowflake, /obj/item/toy/plush/plushling, /obj/item/toy/plush/random) //don't allow these special ones (you can still get narplush/hugbox) for(var/V in plushies_set_one) var/atom/A = V plushie_list[initial(A.name)] = A @@ -272,4 +272,3 @@ icon_state = "skub" w_class = WEIGHT_CLASS_BULKY attack_verb = list("skubbed") - diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index 44205f4884..9a8f1214f0 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -167,7 +167,7 @@ return log_game("[key_name(user)] activated a hidden grenade in [src].") grenade.preprime(user, msg = FALSE, volume = 10) - SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT,"plushpet", /datum/mood_event/plushpet) + SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT,"plushpet", /datum/mood_event/plushpet) else to_chat(user, "You try to pet [src], but it has no stuffing. Aww...") SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT,"plush_nostuffing", /datum/mood_event/plush_nostuffing) @@ -754,8 +754,8 @@ GLOBAL_LIST_INIT(valid_plushie_paths, valid_plushie_paths()) attack_verb = list("headbutt", "scritched", "bit") squeak_override = list('modular_citadel/sound/voice/nya.ogg' = 1) can_random_spawn = FALSE - - + + /obj/item/toy/plush/hairball name = "Hairball" desc = "A bundle of undigested fibers and scales. Yuck." @@ -765,3 +765,78 @@ GLOBAL_LIST_INIT(valid_plushie_paths, valid_plushie_paths()) squeak_override = list('sound/misc/splort.ogg'=1) attack_verb = list("sploshed", "splorted", "slushed") can_random_spawn = FALSE + +/obj/item/toy/plush/plushling + name = "peculiar plushie" + desc = "An adorable stuffed toy- wait, did it just move?" + can_random_spawn = FALSE + var/absorb_cooldown = 100 //ticks cooldown between absorbs + var/next_absorb = 0 //When can it absorb another plushie + var/check_interval = 20 + var/next_check = 0 + +//Overrides parent proc +/obj/item/toy/plush/plushling/attack_self(mob/user) + if(!user) //hmmmmm + return + to_chat(user, "You try to pet the plushie, but recoil as it bites your hand instead! OW!") + SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT,"plush_bite", /datum/mood_event/plush_bite) + var/mob/living/carbon/human/H = user + if(!H) + return //Type safety. + H.apply_damage(5, BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM)) + addtimer(CALLBACK(H, /mob/living/carbon/human.proc/dropItemToGround, src, TRUE), 1) + +/obj/item/toy/plush/plushling/New() + var/initial_state = pick("plushie_lizard", "plushie_snake", "plushie_slime", "fox") + icon_state = initial_state + item_state = initial_state + START_PROCESSING(SSobj, src) + . = ..() + +/obj/item/toy/plush/plushling/Destroy() + STOP_PROCESSING(SSobj, src) + . = ..() + +/obj/item/toy/plush/plushling/process() + if(world.time < next_absorb || world.time < next_check) + return + next_check = world.time + check_interval + var/obj/item/toy/plush/target + for(var/obj/item/toy/plush/possible_target in loc) //First, it tries to get anything in its same location, be it a tile or a backpack + if(possible_target == src || istype(possible_target, /obj/item/toy/plush/plushling)) + continue + target = possible_target + break + if(!target) + if(!isturf(loc)) + return + for(var/obj/item/toy/plush/P in oview(1, src)) //If that doesn't work, it hunts for plushies adjacent to its own tile + if(istype(P, /obj/item/toy/plush/plushling)) //These do not hunt their own kind + continue + src.throw_at(P, 1, 2) + visible_message("[src] leaps at [P]!") + break + return + if(istype(target, /obj/item/toy/plush/plushling)) //These do not consume their own. + return + next_absorb = world.time + absorb_cooldown + plushie_absorb(target) + +/obj/item/toy/plush/plushling/proc/plushie_absorb(obj/item/toy/plush/victim) + if(!victim) + return + visible_message("[src] gruesomely mutilliates [victim], leaving nothing more than dust!") + name = victim.name + desc = victim.desc + " Wait, did it just move..?" + icon_state = victim.icon_state + item_state = victim.item_state + squeak_override = victim.squeak_override + attack_verb = victim.attack_verb + new /obj/effect/decal/cleanable/ash(get_turf(victim)) + qdel(victim) + +/obj/item/toy/plush/plushling/love(obj/item/toy/plush/Kisser, mob/living/user) //You shouldn't have come here, poor plush. + if(!Kisser) + return + plushie_absorb(Kisser) diff --git a/code/modules/arousal/arousal.dm b/code/modules/arousal/arousal.dm index c9b2690784..97de452398 100644 --- a/code/modules/arousal/arousal.dm +++ b/code/modules/arousal/arousal.dm @@ -68,7 +68,7 @@ R.reaction(turfing ? target : target.loc, TOUCH, 1, 0) if(!turfing) R.trans_to(target, R.total_volume * (spill ? G.fluid_transfer_factor : 1)) - G.time_since_last_orgasm = 0 + G.last_orgasmed = world.time R.clear_reagents() /mob/living/carbon/human/proc/mob_climax_outside(obj/item/organ/genital/G, mb_time = 30) //This is used for forced orgasms and other hands-free climaxes diff --git a/code/modules/arousal/genitals.dm b/code/modules/arousal/genitals.dm index 8f88076af9..65eeca75fe 100644 --- a/code/modules/arousal/genitals.dm +++ b/code/modules/arousal/genitals.dm @@ -16,7 +16,7 @@ var/fluid_efficiency = 1 var/fluid_rate = CUM_RATE var/fluid_mult = 1 - var/time_since_last_orgasm = 500 + var/last_orgasmed = 0 var/aroused_state = FALSE //Boolean used in icon_state strings var/obj/item/organ/genital/linked_organ var/linked_organ_slot //used for linking an apparatus' organ to its other half on update_link(). @@ -24,10 +24,6 @@ /obj/item/organ/genital/Initialize(mapload, do_update = TRUE) . = ..() - if(fluid_id) - create_reagents(fluid_max_volume, NONE, NO_REAGENTS_VALUE) - if(CHECK_BITFIELD(genital_flags, GENITAL_FUID_PRODUCTION)) - reagents.add_reagent(fluid_id, fluid_max_volume) if(do_update) update() @@ -140,8 +136,6 @@ /obj/item/organ/genital/proc/modify_size(modifier, min = -INFINITY, max = INFINITY) fluid_max_volume += modifier*2.5 fluid_rate += modifier/10 - if(reagents) - reagents.maximum_volume = fluid_max_volume return /obj/item/organ/genital/proc/update_size() @@ -151,18 +145,14 @@ if(!owner || owner.stat == DEAD) aroused_state = FALSE -/obj/item/organ/genital/on_life() - . = ..() - if(!reagents || !.) - return - reagents.maximum_volume = fluid_max_volume - if(fluid_id && CHECK_BITFIELD(genital_flags, GENITAL_FUID_PRODUCTION)) - time_since_last_orgasm++ - /obj/item/organ/genital/proc/generate_fluid(datum/reagents/R) - var/amount = clamp(fluid_rate * time_since_last_orgasm * fluid_mult,0,fluid_max_volume) + var/amount = clamp((fluid_rate * ((world.time - last_orgasmed) / SSmobs.wait) * fluid_mult),0,fluid_max_volume) R.clear_reagents() - R.add_reagent(fluid_id,amount) + R.maximum_volume = fluid_max_volume + if(fluid_id) + R.add_reagent(fluid_id,amount) + else if(linked_organ?.fluid_id) + R.add_reagent(linked_organ.fluid_id,amount) return TRUE /obj/item/organ/genital/proc/update_link() diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 51e027522c..cff3040926 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -163,6 +163,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) ) var/custom_speech_verb = "default" //if your say_mod is to be something other than your races var/custom_tongue = "default" //if your tongue is to be something other than your races + var/modified_limbs = list() //prosthetic/amputated limbs var/chosen_limb_id //body sprite selected to load for the users limbs, null means default, is sanitized when loaded /// Security record note section @@ -429,12 +430,19 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "Gender:[gender == MALE ? "Male" : (gender == FEMALE ? "Female" : (gender == PLURAL ? "Non-binary" : "Object"))]
" if(gender != NEUTER && pref_species.sexes) dat += "Body Model:[features["body_model"] == MALE ? "Masculine" : "Feminine"]
" + dat += "Limb Modification:
" + dat += "Modify Limbs
" + for(var/modification in modified_limbs) + if(modified_limbs[modification][1] == LOADOUT_LIMB_PROSTHETIC) + dat += "[modification]: [modified_limbs[modification][2]]
" + else + dat += "[modification]: [modified_limbs[modification][1]]
" + dat += "
" dat += "Species:[pref_species.name]
" dat += "Custom Species Name:[custom_species ? custom_species : "None"]
" dat += "Random Body:Randomize!
" dat += "Always Random Body:[be_random_body ? "Yes" : "No"]
" dat += "
Cycle background:[bgstate]
" - var/use_skintones = pref_species.use_skintones if(use_skintones) dat += APPEARANCE_CATEGORY_COLUMN @@ -1235,6 +1243,9 @@ GLOBAL_LIST_EMPTY(preferences_datums) for(var/V in all_quirks) var/datum/quirk/T = SSquirks.quirks[V] bal -= initial(T.value) + for(var/modification in modified_limbs) + if(modified_limbs[modification][1] == LOADOUT_LIMB_PROSTHETIC) + return bal + 1 //max 1 point regardless of how many prosthetics return bal /datum/preferences/proc/GetPositiveQuirkCount() @@ -1492,6 +1503,29 @@ GLOBAL_LIST_EMPTY(preferences_datums) if("cycle_bg") bgstate = next_list_item(bgstate, bgstate_options) + if("modify_limbs") + var/limb_type = input(user, "Choose the limb to modify:", "Character Preference") as null|anything in LOADOUT_ALLOWED_LIMB_TARGETS + if(limb_type) + var/modification_type = input(user, "Choose the modification to the limb:", "Character Preference") as null|anything in LOADOUT_LIMBS + if(modification_type) + if(modification_type == LOADOUT_LIMB_PROSTHETIC) + var/prosthetic_type = input(user, "Choose the type of prosthetic", "Character Preference") as null|anything in (list("prosthetic") + GLOB.prosthetic_limb_types) + if(prosthetic_type) + var/number_of_prosthetics = 0 + for(var/modification in modified_limbs) + if(modified_limbs[modification][1] == LOADOUT_LIMB_PROSTHETIC) + number_of_prosthetics += 1 + if(number_of_prosthetics >= MAXIMUM_LOADOUT_PROSTHETICS && !(limb_type in modified_limbs && modified_limbs[limb_type][1] == LOADOUT_LIMB_PROSTHETIC)) + to_chat(user, "You can only have up to two prosthetic limbs!") + else + //save the actual prosthetic data + modified_limbs[limb_type] = list(modification_type, prosthetic_type) + else + if(modification_type == LOADOUT_LIMB_NORMAL) + modified_limbs -= limb_type + else + modified_limbs[limb_type] = list(modification_type) + if("underwear") var/new_underwear = input(user, "Choose your character's underwear:", "Character Preference") as null|anything in GLOB.underwear_list if(new_underwear) @@ -2478,7 +2512,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) ShowChoices(user) return 1 -/datum/preferences/proc/copy_to(mob/living/carbon/human/character, icon_updates = 1, roundstart_checks = TRUE) +/datum/preferences/proc/copy_to(mob/living/carbon/human/character, icon_updates = 1, roundstart_checks = TRUE, initial_spawn = FALSE) if(be_random_name) real_name = pref_species.random_name(gender) @@ -2573,6 +2607,35 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(custom_speech_verb != "default") character.dna.species.say_mod = custom_speech_verb + //limb stuff, only done when initially spawning in + if(initial_spawn) + //delete any existing prosthetic limbs to make sure no remnant prosthetics are left over + for(var/obj/item/bodypart/part in character.bodyparts) + if(part.status == BODYPART_ROBOTIC) + qdel(part) + character.regenerate_limbs() //regenerate limbs so now you only have normal limbs + for(var/modified_limb in modified_limbs) + var/modification = modified_limbs[modified_limb][1] + var/obj/item/bodypart/old_part = character.get_bodypart(modified_limb) + if(modification == LOADOUT_LIMB_PROSTHETIC) + var/obj/item/bodypart/new_limb + switch(modified_limb) + if(BODY_ZONE_L_ARM) + new_limb = new/obj/item/bodypart/l_arm/robot/surplus(character) + if(BODY_ZONE_R_ARM) + new_limb = new/obj/item/bodypart/r_arm/robot/surplus(character) + if(BODY_ZONE_L_LEG) + new_limb = new/obj/item/bodypart/l_leg/robot/surplus(character) + if(BODY_ZONE_R_LEG) + new_limb = new/obj/item/bodypart/r_leg/robot/surplus(character) + var/prosthetic_type = modified_limbs[modified_limb][2] + if(prosthetic_type != "prosthetic") //lets just leave the old sprites as they are + new_limb.icon = file("icons/mob/augmentation/cosmetic_prosthetic/[prosthetic_type].dmi") + new_limb.replace_limb(character) + qdel(old_part) + + if(length(modified_limbs)) + character.regenerate_icons() SEND_SIGNAL(character, COMSIG_HUMAN_PREFS_COPIED_TO, src, icon_updates, roundstart_checks) @@ -2581,6 +2644,18 @@ GLOBAL_LIST_EMPTY(preferences_datums) character.update_body() character.update_hair() +/datum/preferences/proc/post_copy_to(mob/living/carbon/human/character) + //if no legs, and not a paraplegic or a slime, give them a free wheelchair + if(modified_limbs[BODY_ZONE_L_LEG] == LOADOUT_LIMB_AMPUTATED && modified_limbs[BODY_ZONE_R_LEG] == LOADOUT_LIMB_AMPUTATED && !character.has_quirk(/datum/quirk/paraplegic) && !isjellyperson(character)) + if(character.buckled) + character.buckled.unbuckle_mob(character) + var/turf/T = get_turf(character) + var/obj/structure/chair/spawn_chair = locate() in T + var/obj/vehicle/ridden/wheelchair/wheels = new(T) + if(spawn_chair) // Makes spawning on the arrivals shuttle more consistent looking + wheels.setDir(spawn_chair.dir) + wheels.buckle_mob(character) + /datum/preferences/proc/get_default_name(name_id) switch(name_id) if("human") diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 8591d77e50..5856a7b6e1 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -514,6 +514,12 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car S["scars3"] >> scars_list["3"] S["scars4"] >> scars_list["4"] S["scars5"] >> scars_list["5"] + var/limbmodstr + S["modified_limbs"] >> limbmodstr + if(length(limbmodstr)) + modified_limbs = safe_json_decode(limbmodstr) + else + modified_limbs = list() S["chosen_limb_id"] >> chosen_limb_id S["hide_ckey"] >> hide_ckey //saved per-character @@ -845,8 +851,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car WRITE_FILE(S["feature_ooc_notes"], features["ooc_notes"]) - WRITE_FILE(S["chosen_limb_id"], chosen_limb_id) - //Custom names for(var/custom_name_id in GLOB.preferences_custom_names) var/savefile_slot_name = custom_name_id + "_name" //TODO remove this @@ -874,6 +878,9 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car WRITE_FILE(S["scars3"] , scars_list["3"]) WRITE_FILE(S["scars4"] , scars_list["4"]) WRITE_FILE(S["scars5"] , scars_list["5"]) + if(islist(modified_limbs)) + WRITE_FILE(S["modified_limbs"] , safe_json_encode(modified_limbs)) + WRITE_FILE(S["chosen_limb_id"], chosen_limb_id) //gear loadout diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index 1238b37919..0feceaf1a8 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -80,6 +80,9 @@ if(mind_traits) for(var/t in mind_traits) ADD_TRAIT(H.mind, t, JOB_TRAIT) + if(/datum/quirk/paraplegic in blacklisted_quirks) + H.regenerate_limbs() //if you can't be a paraplegic, attempt to regenerate limbs to stop amputated limb selection + H.set_resting(FALSE, TRUE) //they probably shouldn't be on the floor because they had no legs then suddenly had legs /datum/job/proc/announce(mob/living/carbon/human/H) if(head_announce) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 72e52176bb..82492052a9 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -93,7 +93,7 @@ new /obj/item/gun/magic/wand/book/spark(src) /obj/structure/closet/crate/necropolis/tendril/misc/PopulateContents() - var/loot = rand(1,11) + var/loot = rand(1,14) switch(loot) if(1) new /obj/item/shared_storage/red(src) @@ -120,10 +120,7 @@ new /obj/item/bedsheet/cosmos(src) new /obj/item/melee/skateboard/hoverboard(src) if(11) - if(prob(50)) - new /obj/item/malf_upgrade - else - new /obj/item/disk/tech_disk/illegal + new /obj/item/disk/tech_disk/illegal(src) if(12) new /obj/item/clothing/suit/space/hardsuit/cult(src) if(13) @@ -135,7 +132,7 @@ new /obj/item/disk/design_disk/modkit_disc/rapid_repeater(src) /obj/structure/closet/crate/necropolis/tendril/all/PopulateContents() - var/loot = rand(1,31) + var/loot = rand(1,29) switch(loot) if(1) new /obj/item/shared_storage/red(src) @@ -162,44 +159,44 @@ new /obj/item/bedsheet/cosmos(src) new /obj/item/melee/skateboard/hoverboard(src) if(11) - new /obj/item/disk/tech_disk/illegal - if(15) + new /obj/item/disk/tech_disk/illegal(src) + if(12) new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/beserker/old(src) - if(16) + if(13) new /obj/item/nullrod/scythe/talking(src) - if(17) + if(14) new /obj/item/nullrod/armblade(src) - if(18) + if(15) new /obj/item/reagent_containers/food/drinks/bottle/holywater/hell(src) new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor/old(src) - if(19) + if(16) new /obj/item/grenade/clusterbuster/inferno(src) - if(20) + if(17) new /obj/item/gun/magic/wand/book/shock(src) - if(21) + if(18) new /obj/item/gun/magic/wand/book/page(src) - if(22) + if(19) new /obj/item/gun/magic/wand/book/spark(src) - if(23) + if(20) new /obj/item/soulstone/anybody(src) - if(24) + if(21) new /obj/item/rod_of_asclepius(src) - if(25) + if(22) new /obj/item/organ/heart/cursed/wizard(src) - if(26) + if(23) new /obj/item/book/granter/spell/summonitem(src) - if(27) + if(24) new /obj/item/borg/upgrade/modkit/lifesteal(src) new /obj/item/bedsheet/cult(src) - if(28) + if(25) new /obj/item/clothing/neck/necklace/memento_mori(src) - if(28) + if(26) new /obj/item/warp_cube/red(src) - if(29) + if(27) new /obj/item/immortality_talisman(src) - if(30) + if(28) new /obj/item/gun/magic/wand/book/healing(src) - if(31) + if(29) new /obj/item/reagent_containers/glass/bottle/ichor/red(src) new /obj/item/reagent_containers/glass/bottle/ichor/blue(src) new /obj/item/reagent_containers/glass/bottle/ichor/green(src) diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 768c4c943e..312449064f 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -414,6 +414,8 @@ give_magic(humanc) if(GLOB.curse_of_madness_triggered) give_madness(humanc, GLOB.curse_of_madness_triggered) + if(humanc.client) + humanc.client.prefs.post_copy_to(humanc) GLOB.joined_player_list += character.ckey GLOB.latejoiners += character @@ -567,7 +569,7 @@ client.prefs.scars_list["[cur_scar_index]"] = valid_scars client.prefs.save_character() - client.prefs.copy_to(H) + client.prefs.copy_to(H, initial_spawn = TRUE) H.dna.update_dna_identity() if(mind) if(transfer_after) diff --git a/code/modules/mob/dead/new_player/preferences_setup.dm b/code/modules/mob/dead/new_player/preferences_setup.dm index 9a0d9f9242..b77fae68c8 100644 --- a/code/modules/mob/dead/new_player/preferences_setup.dm +++ b/code/modules/mob/dead/new_player/preferences_setup.dm @@ -41,7 +41,7 @@ var/mob/living/carbon/human/dummy/mannequin = generate_or_wait_for_human_dummy(DUMMY_HUMAN_SLOT_PREFERENCES) // Apply the Dummy's preview background first so we properly layer everything else on top of it. mannequin.add_overlay(mutable_appearance('modular_citadel/icons/ui/backgrounds.dmi', bgstate, layer = SPACE_LAYER)) - copy_to(mannequin) + copy_to(mannequin, initial_spawn = TRUE) if(previewJob && equip_job) mannequin.job = previewJob.title diff --git a/code/modules/mob/living/carbon/human/dummy.dm b/code/modules/mob/living/carbon/human/dummy.dm index 2f5c94b784..ed1ba3852f 100644 --- a/code/modules/mob/living/carbon/human/dummy.dm +++ b/code/modules/mob/living/carbon/human/dummy.dm @@ -18,6 +18,9 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy) /mob/living/carbon/human/dummy/Life() return +/mob/living/carbon/human/dummy/update_mobility() + return + /mob/living/carbon/human/dummy/proc/wipe_state() delete_equipment() icon_render_key = null diff --git a/html/changelog.html b/html/changelog.html index b79889b25c..04f018f7ba 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,12 @@ -->
+

16 September 2020

+

timothyteakettle updated:

+ +

12 September 2020

BlueWildrose updated:

- -

15 July 2020

-

Sonic121x updated:

-
GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index ff0cc4817d..8c2e0680a6 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -27318,3 +27318,6 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - bugfix: glaives now work again zeroisthebiggay: - balance: Revolver is now poplocked down to fifteen people. +2020-09-16: + timothyteakettle: + - tweak: fixed an icon path diff --git a/html/changelogs/AutoChangeLog-pr-13255.yml b/html/changelogs/AutoChangeLog-pr-13255.yml new file mode 100644 index 0000000000..6f4c7a4b51 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13255.yml @@ -0,0 +1,4 @@ +author: "timothyteakettle" +delete-after: True +changes: + - rscadd: "due to changes in policy, and several lawsuits, Nanotrasen has been forced to allow disabled people to sign up" diff --git a/html/changelogs/AutoChangeLog-pr-13356.yml b/html/changelogs/AutoChangeLog-pr-13356.yml new file mode 100644 index 0000000000..cb8769d0e3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13356.yml @@ -0,0 +1,11 @@ +author: "EmeraldSundisk" +delete-after: True +changes: + - rscadd: "Adds the Research Director's office to Omega Station" + - rscadd: "Adds 2 new solar arrays (and control rooms)" + - rscadd: "Adds some action figures that weren't there previously" + - rscadd: "The CMO's office now has a light switch" + - tweak: "Slight readjustments to impacted areas" + - tweak: "Readjusts the toxins air supply line to (ideally) be easier to service" + - bugfix: "Department camera consoles should now be able to actually check appropriate cameras" + - bugfix: "Xenobiology can now be locked down (by the Research Director)" diff --git a/html/changelogs/AutoChangeLog-pr-13362.yml b/html/changelogs/AutoChangeLog-pr-13362.yml new file mode 100644 index 0000000000..b8fbfc3de2 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13362.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - bugfix: "Your balls finally feel full, again." diff --git a/html/changelogs/AutoChangeLog-pr-13365.yml b/html/changelogs/AutoChangeLog-pr-13365.yml new file mode 100644 index 0000000000..af5974aa87 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13365.yml @@ -0,0 +1,4 @@ +author: "DeltaFire15" +delete-after: True +changes: + - bugfix: "Fixed wacky necropolis loot chest behavior" diff --git a/html/changelogs/AutoChangeLog-pr-13387.yml b/html/changelogs/AutoChangeLog-pr-13387.yml new file mode 100644 index 0000000000..26a059e935 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13387.yml @@ -0,0 +1,4 @@ +author: "MrJWhit" +delete-after: True +changes: + - rscadd: "Adds a brain damage line" diff --git a/html/changelogs/AutoChangeLog-pr-13388.yml b/html/changelogs/AutoChangeLog-pr-13388.yml new file mode 100644 index 0000000000..f032d958c1 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13388.yml @@ -0,0 +1,5 @@ +author: "DeltaFire15" +delete-after: True +changes: + - rscadd: "Failing the plushmium reaction can now create peculiar plushies, depending on reaction volume." + - bugfix: "The mood-buff from petting a plushie now works properly again." diff --git a/icons/mob/augmentation/cosmetic_prosthetic/bishop.dmi b/icons/mob/augmentation/cosmetic_prosthetic/bishop.dmi new file mode 100644 index 0000000000..8641ef2d3c Binary files /dev/null and b/icons/mob/augmentation/cosmetic_prosthetic/bishop.dmi differ diff --git a/icons/mob/augmentation/cosmetic_prosthetic/cybersolutions.dmi b/icons/mob/augmentation/cosmetic_prosthetic/cybersolutions.dmi new file mode 100644 index 0000000000..eeed0d0c01 Binary files /dev/null and b/icons/mob/augmentation/cosmetic_prosthetic/cybersolutions.dmi differ diff --git a/icons/mob/augmentation/cosmetic_prosthetic/grayson.dmi b/icons/mob/augmentation/cosmetic_prosthetic/grayson.dmi new file mode 100644 index 0000000000..9ed6c5f06f Binary files /dev/null and b/icons/mob/augmentation/cosmetic_prosthetic/grayson.dmi differ diff --git a/icons/mob/augmentation/cosmetic_prosthetic/hephaestus.dmi b/icons/mob/augmentation/cosmetic_prosthetic/hephaestus.dmi new file mode 100644 index 0000000000..4bb6b72fd0 Binary files /dev/null and b/icons/mob/augmentation/cosmetic_prosthetic/hephaestus.dmi differ diff --git a/icons/mob/augmentation/cosmetic_prosthetic/nanotrasen.dmi b/icons/mob/augmentation/cosmetic_prosthetic/nanotrasen.dmi new file mode 100644 index 0000000000..18c7738ba3 Binary files /dev/null and b/icons/mob/augmentation/cosmetic_prosthetic/nanotrasen.dmi differ diff --git a/icons/mob/augmentation/cosmetic_prosthetic/talon.dmi b/icons/mob/augmentation/cosmetic_prosthetic/talon.dmi new file mode 100644 index 0000000000..9e4b93fb54 Binary files /dev/null and b/icons/mob/augmentation/cosmetic_prosthetic/talon.dmi differ diff --git a/icons/mob/augmentation/cosmetic_prosthetic/ward.dmi b/icons/mob/augmentation/cosmetic_prosthetic/ward.dmi new file mode 100644 index 0000000000..b2622ef6a1 Binary files /dev/null and b/icons/mob/augmentation/cosmetic_prosthetic/ward.dmi differ diff --git a/icons/mob/augmentation/cosmetic_prosthetic/xion.dmi b/icons/mob/augmentation/cosmetic_prosthetic/xion.dmi new file mode 100644 index 0000000000..823205742a Binary files /dev/null and b/icons/mob/augmentation/cosmetic_prosthetic/xion.dmi differ diff --git a/icons/mob/clothing/custom_w.dmi b/icons/mob/clothing/custom_w.dmi index b30170ffec..d1e1d71f7e 100644 Binary files a/icons/mob/clothing/custom_w.dmi and b/icons/mob/clothing/custom_w.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm index ff40b37ad8..ddae98c1c4 100644 --- a/modular_citadel/code/modules/client/loadout/__donator.dm +++ b/modular_citadel/code/modules/client/loadout/__donator.dm @@ -515,4 +515,10 @@ name = "custom atmos skirt" slot = SLOT_IN_BACKPACK path = /obj/item/clothing/suit/customskirt - ckeywhitelist = list("thakyz") \ No newline at end of file + ckeywhitelist = list("thakyz") + +/datum/gear/donator/hisakaki + name = "halo" + slot = SLOT_HEAD + path = /obj/item/clothing/head/halo + ckeywhitelist = list("hisakaki") diff --git a/modular_citadel/code/modules/custom_loadout/custom_items.dm b/modular_citadel/code/modules/custom_loadout/custom_items.dm index ad18d23088..ea124c044b 100644 --- a/modular_citadel/code/modules/custom_loadout/custom_items.dm +++ b/modular_citadel/code/modules/custom_loadout/custom_items.dm @@ -559,3 +559,12 @@ icon = 'icons/obj/custom.dmi' mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi' mutantrace_variation = NONE + +/obj/item/clothing/head/halo + name = "transdimensional halo" + desc = "An oddly shaped halo that magically hovers above the head." + icon_state = "halo" + item_state = "halo" + icon = 'icons/mob/clothing/custom_w.dmi' + mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi' + mutantrace_variation = NONE diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm index aea156a8f5..0cee2fc5cd 100644 --- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm +++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm @@ -501,7 +501,10 @@ PurityMin = 0.6 /datum/chemical_reaction/fermi/plushmium/FermiExplode(datum/reagents, var/atom/my_atom, volume, temp, pH) - new /obj/item/toy/plush/random(get_turf(my_atom)) + if(volume < 20) //It creates a normal plush at low volume.. at higher amounts, things get slightly more interesting. + new /obj/item/toy/plush/random(get_turf(my_atom)) + else + new /obj/item/toy/plush/plushling(get_turf(my_atom)) my_atom.visible_message("The reaction suddenly zaps, creating a plushie!") my_atom.reagents.clear_reagents() diff --git a/strings/traumas.json b/strings/traumas.json index f8fed95c98..e5048d41b2 100644 --- a/strings/traumas.json +++ b/strings/traumas.json @@ -132,7 +132,8 @@ "@pick(semicolon)My balls finally feel full, again.", "@pick(semicolon)Assaltign a sec osficer aren't crime if ur @pick(roles)", ";SEC I SPILED MU JICE HELELPH HELPJ JLEP HELP", - "@pick(semicolon) atmos is chemistyr is radation fast air is FASTER cheemsitry and FASTER RADIATION AND FASTER DEATH!!!" + "@pick(semicolon) atmos is chemistyr is radation fast air is FASTER cheemsitry and FASTER RADIATION AND FASTER DEATH!!!", + "@pick(semicolon) FUC'KING MuNKEY WAch TALKN SHIT" ], "mutations": [