diff --git a/_maps/RandomRuins/IceRuins/bubberstation/icemoon_persistence.dmm b/_maps/RandomRuins/IceRuins/bubberstation/icemoon_persistence.dmm index 3cd29691d5ed4..2981a2db82c43 100644 --- a/_maps/RandomRuins/IceRuins/bubberstation/icemoon_persistence.dmm +++ b/_maps/RandomRuins/IceRuins/bubberstation/icemoon_persistence.dmm @@ -170,7 +170,6 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/effect/mapping_helpers/airalarm/syndicate_access, /obj/machinery/disposal/delivery_chute{ dir = 1; name = "disposals chute"; diff --git a/_maps/RandomRuins/LavaRuins/bubberstation/lavaland_persistence.dmm b/_maps/RandomRuins/LavaRuins/bubberstation/lavaland_persistence.dmm index 49425f59126a0..6ae94c2275ada 100644 --- a/_maps/RandomRuins/LavaRuins/bubberstation/lavaland_persistence.dmm +++ b/_maps/RandomRuins/LavaRuins/bubberstation/lavaland_persistence.dmm @@ -7,9 +7,11 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service) "ab" = ( -/obj/machinery/firealarm/directional/west, -/turf/open/floor/wood/parquet, -/area/ruin/space/has_grav/bubbers/persistance/command/liason) +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/turf/open/floor/iron/white, +/area/ruin/space/has_grav/bubbers/persistance/med/treatment) "ac" = ( /obj/machinery/light/cold/directional/north, /obj/effect/turf_decal/stripes/red/line{ @@ -21,33 +23,27 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "af" = ( -/obj/machinery/door/poddoor{ - id = "turbine_vent" - }, -/turf/open/floor/engine, -/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) +/obj/machinery/biogenerator/medstation/directional/north, +/obj/machinery/light_switch/directional/west, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/healthanalyzer/advanced, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/white, +/area/ruin/space/has_grav/bubbers/persistance/med/treatment) "ag" = ( /obj/effect/turf_decal/trimline/purple/filled/corner, /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/rnd) "ah" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/lipstick/quantum{ - pixel_x = 9; - pixel_y = 4 - }, -/obj/item/lipstick/syndie, /obj/structure/cable, -/obj/item/straight_razor, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 +/obj/structure/table/reinforced/plastitaniumglass, +/obj/structure/disposalpipe/segment{ + dir = 9 }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/effect/mapping_helpers/apc/syndicate_access, -/obj/effect/mapping_helpers/apc/full_charge, -/obj/effect/mapping_helpers/apc/cut_AI_wire, -/turf/open/floor/iron/kitchen/herringbone, -/area/ruin/space/has_grav/bubbers/persistance/service/salon) +/obj/item/reagent_containers/cup/mortar, +/obj/item/pestle, +/turf/open/floor/iron/white, +/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "ai" = ( /obj/machinery/light/directional/east, /obj/machinery/firealarm/directional/east, @@ -61,32 +57,28 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/med/chem) "aj" = ( -/obj/effect/turf_decal/skyrat_decals/syndicate/middle/middle, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/sec/armory) -"al" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/dark_red/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/siding/wood/corner{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/carpet/royalblack, -/area/ruin/space/has_grav/bubbers/persistance/service/lounge) +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/sec/holding) +"al" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/obj/machinery/light/directional/south, +/turf/open/floor/engine, +/area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) "am" = ( -/obj/machinery/vending/autodrobe{ - pixel_x = -28; - all_products_free = 1; - density = 0 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8 +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/obj/structure/cable, +/obj/machinery/door/poddoor{ + id = "prison_shutters" }, -/turf/open/floor/wood, -/area/ruin/space/has_grav/bubbers/persistance/service/lockers) +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/sec/prison) "an" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/engineering) @@ -139,37 +131,30 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/engineering/mining) "au" = ( -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" +/obj/machinery/light/directional/west, +/obj/machinery/doppler_array{ + dir = 4 }, -/obj/structure/sign/warning/biohazard/directional/west, -/obj/structure/lattice/catwalk/mining, -/turf/open/floor/engine/hull{ - initial_gas_mix = "LAVALAND_ATMOS" +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/sci/ordnance) +"av" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/junction{ + dir = 1 }, -/area/lavaland/surface/outdoors) +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "ay" = ( /obj/structure/cable, /obj/machinery/light/directional/east, /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "az" = ( -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/machinery/camera/autoname/directional/north{ - name = "Persistence Exterior North"; - network = list("persistence_ext") - }, -/obj/structure/lattice/catwalk/mining, -/turf/open/lava/smooth/lava_land_surface, -/area/ruin/space/has_grav/bubbers/dauntless/command/vault) +/turf/closed/wall/r_wall/syndicate/nodiagonal, +/area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) "aA" = ( /obj/structure/disposalpipe/trunk, /obj/machinery/disposal/bin, @@ -193,18 +178,27 @@ /turf/open/floor/wood/tile, /area/ruin/space/has_grav/bubbers/persistance/sec/prison/rec) "aE" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/structure/chair/office/light{ +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/obj/structure/chair/sofa/corp/left{ + color = "#DE3A3A"; dir = 4 }, +/obj/effect/spawner/random/entertainment/plushie, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/apc/cut_AI_wire, +/obj/effect/mapping_helpers/apc/full_charge, +/obj/effect/mapping_helpers/apc/syndicate_access, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/med/viro) +/area/ruin/space/has_grav/bubbers/persistance/med) "aF" = ( -/obj/machinery/hydroponics/constructable, -/turf/open/floor/grass, -/area/ruin/space/has_grav/bubbers/persistance/sec/prison) +/obj/machinery/atmospherics/components/binary/volume_pump/on/layer4{ + dir = 8 + }, +/turf/closed/wall/r_wall/syndicate/nodiagonal, +/area/ruin/space/has_grav/bubbers/persistance/engineering) "aG" = ( /obj/structure/extinguisher_cabinet/directional/south, /obj/structure/reagent_dispensers/water_cooler, @@ -253,17 +247,13 @@ /turf/open/floor/wood/parquet, /area/ruin/space/has_grav/bubbers/persistance/command/liason) "aO" = ( -/obj/machinery/door/window/survival_pod/left/directional/north{ - name = "Virology Airlock"; - req_access = list("syndicate") - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/effect/turf_decal/siding/blue{ - dir = 1 +/obj/machinery/porta_turret/syndicate{ + dir = 8; + pixel_x = -32; + pixel_y = -32 }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/med) +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/space/has_grav/bubbers/dauntless/command/vault) "aQ" = ( /obj/structure/emergency_shield/cult/weak{ name = "Energy Shield" @@ -337,6 +327,11 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) +"be" = ( +/obj/machinery/light/directional/south, +/obj/structure/reagent_dispensers/foamtank, +/turf/open/floor/pod/dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) "bf" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -360,21 +355,17 @@ /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/service) "bl" = ( -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 6 - }, -/obj/structure/showcase/cyborg{ - desc = "A stand with the empty body of a Cybersun cyborg bolted to it."; - dir = 8; - icon = 'icons/mob/silicon/robots.dmi'; - icon_state = "synd_sec"; - name = "syndicate cyborg showcase"; - pixel_x = 6 +/obj/structure/dresser, +/obj/item/flashlight/lamp/green{ + pixel_x = 5; + pixel_y = 15 }, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/machinery/light/directional/north, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/bubbers/persistance/command/liason) "bn" = ( /obj/structure/disposalpipe/segment, /obj/structure/window/reinforced/survival_pod/spawner/directional/north, @@ -382,11 +373,14 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/med) "bo" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/turf/open/floor/iron/white, -/area/ruin/space/has_grav/bubbers/persistance/med/treatment) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/ruin/space/has_grav/bubbers/persistance/service/lockers) "bq" = ( /obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, @@ -403,28 +397,42 @@ /area/ruin/space/has_grav/bubbers/persistance/med) "bu" = ( /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/duct, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "bv" = ( -/obj/structure/table/wood, -/obj/machinery/vending/wardrobe/sec_wardrobe/red{ - density = 0; - all_products_free = 1; - pixel_x = -28 +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/item/storage/fancy/coffee_cart_rack{ + pixel_x = -9; + pixel_y = -1 }, -/obj/machinery/vending/wardrobe/syndie_wardrobe{ - density = 0; - pixel_y = -28; - all_products_free = 1 +/obj/item/storage/fancy/coffee_condi_display{ + pixel_x = 4; + pixel_y = 2 }, -/obj/effect/turf_decal/siding/wood{ - dir = 10 +/obj/item/reagent_containers/cup/bottle/syrup_bottle/caramel{ + pixel_x = 11; + pixel_y = 16 }, -/turf/open/floor/wood, -/area/ruin/space/has_grav/bubbers/persistance/service/lockers) +/obj/item/reagent_containers/cup/bottle/syrup_bottle/korta_nectar{ + pixel_y = 16; + pixel_x = 2 + }, +/obj/item/reagent_containers/cup/bottle/syrup_bottle/liqueur{ + pixel_x = -7; + pixel_y = 16 + }, +/obj/structure/cable, +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/turf/open/floor/wood/large, +/area/ruin/space/has_grav/bubbers/persistance/service/diner) "bx" = ( /obj/structure/emergency_shield/cult/weak{ name = "Energy Shield" @@ -454,28 +462,37 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/evac) "bA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) -"bB" = ( -/obj/structure/dresser, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/paper_bin/carbon, +/obj/item/pen/survival, +/obj/item/pen/red/security, +/obj/item/pen/screwdriver, +/obj/item/pen/fountain/captain, +/obj/item/pen/fourcolor, +/turf/open/floor/mineral/plastitanium/red{ + icon_state = "plastitanium" }, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/sec/prison) +/area/ruin/space/has_grav/bubbers/persistance/command/bridge) +"bB" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/effect/turf_decal/siding/thinplating/dark/corner, +/turf/open/floor/iron/terracotta/herringbone, +/area/ruin/space/has_grav/bubbers/persistance/service/hydro) "bC" = ( -/obj/structure/table/wood/fancy/red, -/obj/machinery/coffeemaker/impressa, -/obj/item/storage/box/coffeepack/robusta, -/obj/effect/turf_decal/siding/wood{ - dir = 9 +/obj/structure/cable, +/obj/machinery/duct, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/carpet/red, -/area/ruin/space/has_grav/bubbers/persistance/command/liason) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service/janitorial) "bE" = ( /obj/machinery/duct, /obj/structure/cable, @@ -509,16 +526,6 @@ /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "bJ" = ( -/obj/structure/chair/sofa/right/maroon{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/turf/open/floor/carpet/purple, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/science) -"bK" = ( -/obj/machinery/duct, /obj/structure/cable, /obj/structure/disposalpipe/segment{ dir = 4 @@ -526,23 +533,38 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/door/firedoor/heavy, +/obj/machinery/door/airlock/science{ + id_tag = "syndishipscienced" + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/effect/mapping_helpers/airlock/cutaiwire, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/med) +/area/ruin/space/has_grav/bubbers/persistance/sci/rnd) +"bK" = ( +/obj/machinery/computer/security/telescreen/entertainment/directional/west, +/obj/structure/chair/comfy/barber_chair{ + dir = 1 + }, +/obj/structure/mirror/directional/north, +/obj/effect/turf_decal/siding/thinplating/dark/end{ + dir = 1 + }, +/turf/open/floor/iron/kitchen/herringbone, +/area/ruin/space/has_grav/bubbers/persistance/service/salon) "bL" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/heavy, -/obj/machinery/door/airlock/highsecurity{ - name = "Armory" +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" }, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/leader, -/obj/effect/mapping_helpers/airlock/cutaiwire, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/machinery/camera/autoname/directional/north{ + name = "Persistence Exterior North"; + network = list("persistence_ext") + }, +/obj/structure/lattice/catwalk/mining, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/space/has_grav/bubbers/dauntless/command/vault) "bM" = ( /obj/effect/turf_decal/siding/wood, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -595,24 +617,14 @@ /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "bS" = ( -/obj/machinery/button/door/directional/west{ - pixel_y = 8; - id = "syndieng_windows"; - name = "Window Shutters"; - req_access = list("syndicate") - }, -/obj/structure/disposalpipe/trunk{ - dir = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 9 }, -/obj/machinery/disposal/bin, -/obj/machinery/button/polarizer{ - pixel_x = -40; - pixel_y = 8; - id = "syndiengi_w"; - name = "engineering window polarization" +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 }, -/turf/open/floor/pod/dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering) +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service/diner) "bU" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -677,10 +689,14 @@ /turf/open/floor/noslip/tram, /area/ruin/space/has_grav/bubbers/persistance/med/chem) "cb" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/turf/open/floor/mineral/titanium/tiled/white, -/area/ruin/space/has_grav/bubbers/persistance/med/treatment) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/cargo) "cc" = ( /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/cargo) @@ -734,19 +750,6 @@ }, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) -"cq" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/airalarm/directional/south, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/obj/machinery/disposal/bin, -/obj/structure/extinguisher_cabinet/directional/west, -/turf/open/floor/iron/dark/textured_corner{ - dir = 4 - }, -/area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) "cr" = ( /obj/machinery/door/firedoor/heavy, /turf/open/floor/catwalk_floor/iron_dark, @@ -771,11 +774,11 @@ }, /area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) "cv" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/structure/cable, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/dish_drive/bullet, +/obj/structure/sign/poster/contraband/syndicate_pistol/directional/west, /turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/command/vault) +/area/ruin/space/has_grav/bubbers/persistance/sec/armory) "cw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/structure/safe/abovetilefloor, @@ -790,10 +793,6 @@ /obj/item/book/granter/crafting_recipe/donk_secret_recipe, /turf/open/floor/carpet/green, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/chef) -"cx" = ( -/obj/effect/turf_decal/skyrat_decals/syndicate/middle/left, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/command/bridge) "cy" = ( /obj/machinery/duct, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -831,29 +830,19 @@ /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "cG" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 1 - }, -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/surgery_tray/full/advanced, -/obj/machinery/smartfridge/organ{ - pixel_y = 32; - density = 0 - }, -/turf/open/floor/mineral/titanium/tiled/white, -/area/ruin/space/has_grav/bubbers/persistance/med/treatment) +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/sci/ordnance) "cH" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/dark_red/filled/line{ - dir = 8 +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium{ + polarizer_id = "dauntless_interrogation" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 +/obj/structure/cable, +/obj/machinery/door/poddoor{ + id = "synditrash"; + name = "Persistance Recycling Blast Doors" }, -/turf/open/floor/carpet/royalblack, -/area/ruin/space/has_grav/bubbers/persistance/service/lounge) +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/cargo) "cI" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 8 @@ -866,21 +855,18 @@ /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "cJ" = ( -/obj/machinery/computer{ - desc = "A console meant to allow modifications to IDs. There's a chameleon ID stuck inside and no one has been able to pull it out..."; - icon_keyboard = "syndie_key"; - icon_screen = "explosive"; - name = "syndicate access change console"; - dir = 1 +/obj/effect/turf_decal/siding/dark{ + dir = 4; + icon_state = "siding_plain_end" }, -/obj/item/paper{ - default_raw_text = "

DS2 Corporate Report

The SSV Dauntless has successfully landed itself near active Nanotrasen installations. Engine shutdown in progress...

The Syndicate welcomes you onboard, Corporate Liaison. It is deeply suggested you help our crew via informing them of their corporate investors' goal and to help maintain cohesion. The ship is jointy ran, afterall. Don't hurt yourself now, and stay winning.

"; - name = "paper- 'SSV Dauntless Corporate Report'" +/obj/effect/mob_spawn/ghost_role/human/persistence/syndicate/janitor{ + name = "Persistence Janitor" }, -/obj/machinery/light/directional/south, -/obj/structure/sign/calendar/directional/south, -/turf/open/floor/wood/parquet, -/area/ruin/space/has_grav/bubbers/persistance/command/liason) +/obj/structure/sign/painting/library{ + pixel_y = 30 + }, +/turf/open/floor/iron/terracotta/diagonal, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/janitor) "cL" = ( /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium{ polarizer_id = "persistencelounge_w" @@ -918,12 +904,20 @@ /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/rnd) "cR" = ( -/turf/closed/wall/r_wall/syndicate/nodiagonal, -/area/ruin/space/has_grav/bubbers/persistance/service/janitorial) +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/machinery/hydroponics/constructable, +/turf/open/floor/grass, +/area/ruin/space/has_grav/bubbers/persistance/sec/prison) "cS" = ( -/obj/structure/toilet{ - dir = 4 +/obj/machinery/plate_press, +/obj/item/stack/license_plates/empty/fifty, +/obj/effect/turf_decal/siding/dark{ + dir = 9 }, +/obj/item/stack/license_plates/empty/fifty, +/obj/machinery/light/directional/north, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/firealarm/directional/north, /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "cV" = ( @@ -934,12 +928,10 @@ /turf/open/floor/mineral/titanium/white, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "cW" = ( -/obj/structure/sauna_oven, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/turf/open/floor/wood/large, -/area/ruin/space/has_grav/bubbers/persistance/service/sauna) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/turf/open/floor/mineral/titanium/tiled/white, +/area/ruin/space/has_grav/bubbers/persistance/med/treatment) "cY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -969,25 +961,44 @@ /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) "dc" = ( -/obj/structure/window/reinforced/plasma/spawner/directional/north, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" + }, +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" + }, +/obj/machinery/camera/autoname/directional/west{ + name = "Persistence Exterior West"; + network = list("persistence_ext") + }, +/obj/machinery/porta_turret/syndicate{ + dir = 8; + pixel_x = -32 + }, +/obj/structure/lattice/catwalk/mining, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/space/has_grav/bubbers/dauntless/command/vault) "de" = ( /obj/structure/cable, -/obj/machinery/airalarm/directional/west, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) -"df" = ( -/obj/machinery/duct, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/cable, -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, +/obj/machinery/door/firedoor/heavy, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/hatch{ + name = "Exterior Hatch" + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service) +"df" = ( +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, /obj/effect/turf_decal/siding/dark{ dir = 6 }, @@ -1003,16 +1014,9 @@ /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "dh" = ( -/obj/machinery/duct, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/door/window/brigdoor/security/cell/left/directional/south{ - id = "syndicate_cell"; - name = "Syndicate Holding Cell"; - req_access = list("syndicate") - }, -/turf/open/floor/iron/white/small, -/area/ruin/space/has_grav/bubbers/persistance/sec/holding) +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/service/gym) "di" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/turf_decal/trimline/dark_red/filled/line, @@ -1054,22 +1058,20 @@ /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/rnd) "dq" = ( -/obj/machinery/duct, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/obj/machinery/cell_charger_multi/wall_mounted/directional/north, +/obj/machinery/bci_implanter, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/bubbers/persistance/sci/rnd) "dr" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/turf_decal/siding/dark{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/cargo) +/obj/machinery/recharge_station, +/turf/open/floor/iron/dark/small, +/area/ruin/space/has_grav/bubbers/persistance/sec/prison) "ds" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/structure/closet/secure_closet/medical1{ @@ -1093,16 +1095,15 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) "du" = ( -/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium{ - polarizer_id = "dauntless_interrogation" +/obj/effect/turf_decal/stripes/line{ + dir = 9 }, -/obj/structure/cable, -/obj/machinery/door/poddoor{ - id = "synditrash"; - name = "Persistance Recycling Blast Doors" +/obj/structure/sign/departments/custodian/directional/east, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/cargo) +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service) "dw" = ( /obj/structure/chair/sofa/middle/maroon, /obj/effect/turf_decal/tile/bar/opposingcorners{ @@ -1114,19 +1115,18 @@ /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "dx" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/door/firedoor/heavy, +/obj/machinery/duct, /obj/structure/cable, -/obj/machinery/door/airlock/medical{ - id_tag = "syndishipmed"; - name = "Medical Officer Quarters" +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/turf_decal/siding/dark{ + dir = 9 }, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, -/obj/effect/mapping_helpers/airlock/cutaiwire, -/turf/open/floor/wood/large, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/medical) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white/diagonal, +/area/ruin/space/has_grav/bubbers/persistance/med) "dy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -1142,14 +1142,15 @@ /turf/open/floor/grass, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "dA" = ( -/obj/machinery/light/directional/south, -/obj/structure/tank_dispenser, -/obj/effect/turf_decal/stripes/red/line{ - dir = 1 +/obj/machinery/duct, +/obj/structure/cable, +/obj/structure/disposalpipe/junction/flip{ + dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/pod/dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering) +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service/gym) "dB" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -1163,48 +1164,31 @@ /obj/effect/mapping_helpers/apc/full_charge, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/maa) -"dC" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/obj/machinery/light/directional/north, -/obj/machinery/light_switch/directional/north, -/obj/machinery/button/polarizer{ - pixel_x = -24; - id = "persistence_pysch_w"; - name = "medical window polarization"; - pixel_y = 8 - }, -/obj/machinery/button/door{ - id = "syndicatepysch"; - pixel_x = -24; - pixel_y = -8; - name = "Window Shutters" - }, -/obj/item/kirbyplants/organic/applebush, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/med) "dD" = ( -/obj/structure/sign/xenobio_guide/directional/west, -/obj/machinery/camera/autoname/directional/north{ - network = list("persistence_xeno"); - name = "persistence_xeno_north" - }, -/turf/open/floor/circuit/telecomms, -/area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/firealarm/directional/east, +/obj/structure/fake_stairs/directional/north, +/obj/machinery/duct, +/obj/structure/disposalpipe/segment, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service) "dE" = ( +/obj/machinery/door/airlock/highsecurity{ + name = "Bridge" + }, +/obj/machinery/door/firedoor/heavy, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/leader, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/structure/cable, -/obj/effect/mapping_helpers/apc/syndicate_access, -/obj/effect/mapping_helpers/apc/full_charge, -/obj/effect/mapping_helpers/apc/cut_AI_wire, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/siding/dark{ - dir = 9 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/iron/white/small, -/area/ruin/space/has_grav/bubbers/persistance/service/lockers) +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/command/bridge) "dF" = ( /obj/structure/railing/wooden_fencing{ dir = 8 @@ -1219,21 +1203,18 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service) "dH" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 5 +/obj/machinery/light_switch/directional/west, +/obj/machinery/computer/mecha{ + dir = 4 }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) -"dI" = ( -/obj/machinery/conveyor_switch/oneway{ - id = "syndirecycle" +/turf/open/floor/mineral/plastitanium/red{ + icon_state = "plastitanium" }, +/area/ruin/space/has_grav/bubbers/persistance/command/bridge) +"dI" = ( +/obj/structure/chair/office/tactical, /turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/cargo) +/area/ruin/space/has_grav/bubbers/persistance/sec/armory) "dJ" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/incinerator_input{ dir = 1; @@ -1242,16 +1223,26 @@ /turf/open/floor/engine, /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "dL" = ( -/obj/structure/cable, -/obj/machinery/duct, -/obj/structure/disposalpipe/junction{ - dir = 1 +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/sign/poster/contraband/revolver/directional/west, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/structure/cable, +/obj/machinery/button/door/directional/west{ + id = "syndimining"; + name = "Blast Doors"; + req_access = list("syndicate"); + pixel_x = 0; + pixel_y = 24 + }, +/turf/open/floor/engine/hull{ + initial_gas_mix = "LAVALAND_ATMOS" + }, +/area/ruin/space/has_grav/bubbers/persistance/evac) "dM" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -1276,21 +1267,26 @@ /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/service/lounge) "dP" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/obj/machinery/sleeper/syndie/fullupgrade{ - dir = 4 +/obj/machinery/light/directional/west, +/obj/structure/sign/departments/science/directional/west, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service) +"dQ" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/obj/effect/turf_decal/siding/dark_green{ + dir = 10 }, -/turf/open/floor/iron/white, -/area/ruin/space/has_grav/bubbers/persistance/med/treatment) -"dR" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/reagentgrinder, +/obj/item/stack/sheet/mineral/uranium/five, +/obj/item/stack/sheet/mineral/gold{ + amount = 10 }, -/obj/structure/chair/sofa/corp, -/turf/open/floor/carpet/royalblack, -/area/ruin/space/has_grav/bubbers/persistance/sec/prison/rec) +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/bubbers/persistance/med/viro) "dT" = ( /obj/machinery/dna_infuser, /obj/structure/window/reinforced/survival_pod/spawner/directional/east, @@ -1313,12 +1309,10 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/command/liason) "dV" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/machinery/duct, -/turf/open/floor/iron/freezer, -/area/ruin/space/has_grav/bubbers/persistance/command/admiral) +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/lighter/skull, +/turf/open/floor/carpet/royalblack, +/area/ruin/space/has_grav/bubbers/persistance/sec/prison/rec) "dW" = ( /obj/machinery/duct, /obj/effect/turf_decal/siding{ @@ -1330,49 +1324,17 @@ /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) "dZ" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, +/obj/effect/turf_decal/stripes/line, +/turf/closed/wall/r_wall/syndicate/nodiagonal, +/area/ruin/space/has_grav/bubbers/persistance/service/gym) +"eb" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/firealarm/directional/west, /obj/machinery/light/directional/west, -/obj/item/choice_beacon/music, -/obj/effect/spawner/random/exotic/syndie, -/obj/item/mod/module/shooting_assistant, -/obj/machinery/digital_clock/directional/west, -/obj/effect/spawner/random/entertainment/plushie, -/obj/effect/spawner/random/entertainment/plushie_delux, -/obj/item/clothing/suit/jacket/runner/syndicate, -/obj/structure/closet/secure_closet/persistence/maa_locker, -/turf/open/floor/carpet/red, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/maa) -"ea" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/door/firedoor/heavy, -/obj/machinery/door/window/survival_pod/left/directional/south{ - req_access = list("syndicate") - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) -"eb" = ( -/obj/machinery/button/door/directional/north{ - id = "syndicatesauna"; - name = "Sauna Window Shutters"; - pixel_y = -24; - pixel_x = -8 - }, -/obj/machinery/button/polarizer{ - pixel_x = 8; - pixel_y = -24; - id = "persistence_sauna_w"; - name = "sauna window polarization" - }, -/obj/machinery/light_switch/directional/south, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/disposal/bin, -/turf/open/floor/wood/large, -/area/ruin/space/has_grav/bubbers/persistance/service/sauna) +/obj/machinery/portable_atmospherics/scrubber, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "ec" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -1400,44 +1362,58 @@ /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "ej" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/pipe_dispenser{ - pixel_x = -3 +/obj/machinery/conveyor_switch/oneway{ + id = "syndirecycle" }, -/obj/item/rpd_upgrade/unwrench, -/turf/open/floor/pod/dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering) +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/cargo) "ek" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "el" = ( -/obj/structure/cable, -/obj/machinery/power/terminal{ - dir = 1 +/obj/effect/turf_decal/siding/dark{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) -"en" = ( -/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, -/obj/machinery/atmospherics/pipe/layer_manifold/yellow{ +/obj/effect/turf_decal/siding/dark{ dir = 4 }, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) +/obj/structure/closet/secure_closet/interdynefob/engie_locker, +/obj/item/construction/plumbing/engineering, +/obj/item/wrench, +/turf/open/floor/noslip, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +"en" = ( +/obj/structure/closet/generic/wall{ + pixel_x = 32 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/effect/mob_spawn/ghost_role/human/persistence/prisoner, +/obj/effect/spawner/random/entertainment/plushie, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/sec/prison) "ep" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) +"eq" = ( +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/mob_spawn/ghost_role/human/persistence/syndicate/service{ + dir = 4; + name = "Persistence General Staff" + }, +/turf/open/floor/carpet/green, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/chef) "er" = ( -/obj/structure/filingcabinet, -/obj/item/folder/syndicate/red, -/obj/machinery/light/directional/north, -/obj/machinery/firealarm/directional/north, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/command/vault) +/area/ruin/space/has_grav/bubbers/persistance/sec/armory) "es" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/machinery/griddle/frontier_tabletop, @@ -1466,6 +1442,15 @@ }, /turf/open/floor/iron/white/diagonal, /area/ruin/space/has_grav/bubbers/persistance/med) +"ex" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/obj/machinery/door/firedoor/heavy, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/item/holosign_creator/atmos, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "eA" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -1552,17 +1537,11 @@ /turf/open/floor/carpet/stellar, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/cargo) "eO" = ( -/obj/structure/lattice/catwalk/mining, -/obj/machinery/door/poddoor{ - id = "synditrashgun" - }, -/obj/structure/fans/tiny/forcefield{ - dir = 4 - }, -/turf/open/floor/engine/hull{ - initial_gas_mix = "LAVALAND_ATMOS" - }, -/area/ruin/space/has_grav/bubbers/persistance/cargo) +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/turf/open/floor/iron/white, +/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "eP" = ( /obj/structure/window/reinforced/survival_pod/spawner/directional/west, /obj/structure/window/reinforced/survival_pod/spawner/directional/south, @@ -1570,23 +1549,18 @@ /turf/open/floor/engine, /area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) "eR" = ( -/obj/structure/disposalpipe/trunk, -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/siding/dark_green{ - dir = 5 +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 }, -/obj/machinery/light_switch/directional/east, -/obj/structure/sign/warning/biohazard/directional/north, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/med/viro) +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/duct, +/turf/open/floor/iron/white, +/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "eS" = ( -/obj/machinery/washing_machine, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/effect/turf_decal/siding/dark{ - dir = 9 - }, -/turf/open/floor/iron/white/small, -/area/ruin/space/has_grav/bubbers/persistance/service/lockers) +/obj/machinery/biogenerator, +/turf/open/floor/iron/kitchen/diagonal, +/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "eT" = ( /obj/structure/closet/secure_closet/interdynefob/welding_supplies, /obj/machinery/airalarm/directional/south, @@ -1602,15 +1576,6 @@ }, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) -"eU" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ - dir = 8 - }, -/obj/structure/window/reinforced/plasma/spawner/directional/south, -/obj/structure/window/reinforced/plasma/spawner/directional/north, -/obj/machinery/portable_atmospherics/canister/plasma, -/turf/open/floor/engine/plasma, -/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) "eW" = ( /obj/item/tank/internals/plasmaman/belt/full, /obj/item/tank/internals/plasmaman/belt/full, @@ -1661,14 +1626,23 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service/janitorial) "fa" = ( -/obj/machinery/door/airlock/highsecurity{ - id_tag = "syndishipbrigoff" +/obj/structure/table, +/obj/item/pipe_dispenser{ + pixel_x = -3 }, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/leader, -/obj/effect/mapping_helpers/airlock/cutaiwire, -/obj/structure/disposalpipe/segment, +/obj/item/storage/box/stockparts/basic{ + pixel_y = -3; + pixel_x = 5 + }, +/obj/item/stack/sheet/plasmaglass/fifty, +/obj/item/storage/toolbox/syndicate{ + pixel_y = 5 + }, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/item/survivalcapsule/fan, /turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/brig) +/area/ruin/space/has_grav/bubbers/persistance/engineering/mining) "fb" = ( /obj/machinery/door/poddoor{ id = "syndicatepool" @@ -1679,6 +1653,20 @@ /obj/structure/cable, /turf/open/floor/plating, /area/ruin/space/has_grav/bubbers/persistance/service/sauna) +"fc" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/item/bedsheet/cosmos/double{ + dir = 1 + }, +/obj/structure/bed/double/pod{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron/terracotta/small, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/engineering) "fd" = ( /obj/effect/turf_decal/siding/dark/corner{ dir = 8 @@ -1697,17 +1685,19 @@ /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "fh" = ( -/obj/effect/turf_decal/stripes/red/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/red/line, +/obj/machinery/duct, /obj/structure/cable, +/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/engine/hull{ - initial_gas_mix = "LAVALAND_ATMOS" +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/airlock/service{ + name = "Kitchen" }, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "fi" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/item/forging/hammer, @@ -1729,47 +1719,48 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/carpet/green, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/chef) -"fm" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 10 - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/command/bridge) "fo" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/persistance/cargo/drone) -"fq" = ( -/obj/effect/spawner/random/exotic/syndie, -/obj/item/storage/wallet/random, -/obj/item/clothing/under/syndicate/skyrat/baseball, -/obj/effect/spawner/random/exotic/syndie, -/obj/effect/spawner/random/exotic/syndie, -/obj/effect/spawner/random/entertainment/plushie, -/obj/effect/spawner/random/entertainment/plushie_delux, -/obj/structure/closet/generic/wall{ - pixel_y = -32 +"fp" = ( +/obj/structure/sign/poster/contraband/interdyne_gene_clinics/directional/south, +/obj/item/infuser_book, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/radio/intercom/directional/east{ + name = "two-way prisoner intercom"; + freerange = 1; + freqlock = 1; + frequency = 1245; + pixel_x = 0; + pixel_y = -30 }, -/obj/item/storage/box/syndimaid, -/obj/effect/turf_decal/siding/wood{ +/obj/item/storage/box/monkeycubes, +/obj/effect/turf_decal/siding/blue{ dir = 10 }, -/turf/open/floor/carpet/purple, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/janitor) +/obj/item/infuser_book, +/obj/item/sequence_scanner, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/bubbers/persistance/med) +"fq" = ( +/turf/closed/wall/r_wall/syndicate/nodiagonal, +/area/ruin/space/has_grav/bubbers/persistance/service/salon) "fr" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/mineral/plastitanium/red{ - icon_state = "plastitanium" - }, -/area/ruin/space/has_grav/bubbers/persistance/command/bridge) -"ft" = ( +/obj/machinery/door/firedoor/heavy, +/obj/structure/cable, +/obj/machinery/door/airlock/security/old{ + name = "Interrogation" + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "persistence_int" + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) +"ft" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{ dir = 1 }, @@ -1801,34 +1792,21 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/sec/armory) "fw" = ( -/obj/structure/window/reinforced/survival_pod/spawner/directional/west, -/obj/structure/window/reinforced/survival_pod/spawner/directional/north, -/obj/machinery/camera/autoname/directional/west{ - network = list("persistence_xeno") - }, -/turf/open/floor/engine, -/area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) -"fz" = ( -/obj/effect/turf_decal/stripes/red/line{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/stripes/red/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/structure/cable, -/obj/machinery/button/door/directional/west{ - id = "syndimining"; - name = "Blast Doors"; - req_access = list("syndicate"); - pixel_x = 0; - pixel_y = 24 - }, -/turf/open/floor/engine/hull{ - initial_gas_mix = "LAVALAND_ATMOS" +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/command/bridge) +"fz" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, -/area/ruin/space/has_grav/bubbers/persistance/evac) +/obj/structure/closet/firecloset/full, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service) "fA" = ( /obj/effect/turf_decal/siding/dark/corner, /turf/open/floor/iron/dark/small, @@ -1839,9 +1817,12 @@ /turf/open/floor/mineral/titanium/white, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "fD" = ( -/obj/item/storage/backpack/satchel/flat, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/sec/armory) +/obj/machinery/door/poddoor{ + id = "armory_s2"; + name = "Emergancy Armory Access" + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "fE" = ( /obj/structure/cable, /obj/structure/table/reinforced/plastitaniumglass, @@ -1863,33 +1844,29 @@ /turf/open/misc/grass/jungle/station, /area/ruin/space/has_grav/bubbers/persistance/service) "fG" = ( -/obj/structure/chair/office/tactical{ +/obj/structure/chair/sofa/right/maroon{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/med) -"fH" = ( -/obj/machinery/duct, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/bar/opposingcorners{ +/obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/turf/open/floor/carpet/purple, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/science) +"fH" = ( +/obj/structure/chair/sofa/bench/right, +/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/effect/turf_decal/siding{ - dir = 8 - }, -/obj/structure/sign/poster/contraband/energy_swords/directional/west, -/turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/bubbers/persistance/service/diner) +/turf/open/floor/wood/large, +/area/ruin/space/has_grav/bubbers/persistance/service/sauna) "fI" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 10 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/sec/armory) +/area/ruin/space/has_grav/bubbers/persistance/command/bridge) "fO" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/item/clothing/head/utility/chefhat, @@ -1899,20 +1876,12 @@ /turf/open/floor/iron/kitchen/diagonal, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "fP" = ( -/obj/effect/turf_decal/stripes/red/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/red/line, -/obj/machinery/button/door{ - id = "syndihanger"; - pixel_x = 24; - name = "Hanger doors"; - req_access = list("syndicate") - }, -/turf/open/floor/engine/hull{ - initial_gas_mix = "LAVALAND_ATMOS" +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/turf_decal/siding/dark/corner{ + dir = 8 }, -/area/ruin/space/has_grav/bubbers/persistance/service) +/turf/open/floor/mineral/titanium/tiled/white, +/area/ruin/space/has_grav/bubbers/persistance/med/treatment) "fQ" = ( /obj/effect/turf_decal/siding/white{ dir = 4 @@ -1947,52 +1916,13 @@ }, /area/ruin/space/has_grav/bubbers/persistance/cargo) "fU" = ( -/obj/item/reagent_containers/condiment/vinegar{ - pixel_x = -3; - pixel_y = 11 - }, -/obj/item/reagent_containers/condiment/yoghurt{ - pixel_x = 6; - pixel_y = 5 - }, -/obj/item/reagent_containers/condiment/cornmeal{ - pixel_x = -6; - pixel_y = 2 - }, -/obj/item/food/canned/jellyfish{ - pixel_x = 5 - }, -/obj/item/food/canned/desert_snails{ - pixel_x = -3; - pixel_y = 1 - }, -/obj/item/food/canned/tomatoes, -/obj/item/food/canned/tuna{ - pixel_x = -6; - pixel_y = -5 - }, -/obj/item/food/canned/pine_nuts{ - pixel_x = 10; - pixel_y = -9 - }, -/obj/item/food/fishmeat/moonfish{ - pixel_y = -11 - }, -/obj/item/food/fishmeat/moonfish{ - pixel_y = -8 - }, -/obj/item/food/fishmeat/moonfish{ - pixel_y = -5 +/obj/structure/table/wood, +/obj/structure/towel_bin{ + pixel_y = -10; + pixel_x = -1 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/effect/mapping_helpers/apc/syndicate_access, -/obj/effect/mapping_helpers/apc/cut_AI_wire, -/obj/effect/mapping_helpers/apc/full_charge, -/obj/structure/closet/crate/freezer/donk, -/turf/open/floor/iron/kitchen_coldroom/freezerfloor, -/area/ruin/space/has_grav/bubbers/persistance/service/freezer) +/turf/open/floor/wood/large, +/area/ruin/space/has_grav/bubbers/persistance/service/sauna) "fV" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -2022,18 +1952,17 @@ /area/ruin/space/has_grav/bubbers/persistance/service/lounge) "fY" = ( /obj/structure/cable, +/obj/machinery/duct, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/button/door/directional/west{ - pixel_y = -8; - specialfunctions = 4; - name = "Dorm Bolt Switch"; - id = "syndishipservicedorm"; - req_access = list("syndicate"); - normaldoorcontrol = 1 +/obj/machinery/door/firedoor/heavy, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/machinery/door/airlock/service/glass{ + name = "Salon" }, -/turf/open/floor/iron/terracotta/herringbone, -/area/ruin/space/has_grav/bubbers/persistance/service/hydro) +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service/salon) "ga" = ( /obj/machinery/dna_scannernew, /obj/structure/window/reinforced/survival_pod/spawner/directional/east, @@ -2075,46 +2004,39 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/cargo) "ge" = ( -/obj/structure/table/optable, -/obj/effect/turf_decal/siding/dark{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/machinery/airalarm/directional/north, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/obj/item/defibrillator/loaded, -/turf/open/floor/mineral/titanium/tiled/white, -/area/ruin/space/has_grav/bubbers/persistance/med/treatment) +/obj/machinery/light/directional/west, +/obj/machinery/bluespace_miner, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering/mining) "gf" = ( -/turf/closed/wall/r_wall/syndicate/nodiagonal, -/area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) -"gg" = ( -/obj/machinery/porta_turret/syndicate{ - dir = 8; - pixel_x = 32; - pixel_y = 32 - }, -/obj/structure/lattice/catwalk/mining, -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" +/obj/effect/turf_decal/stripes/line{ + dir = 10 }, -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/sec/holding) +"gg" = ( +/obj/structure/disposalpipe/trunk{ + dir = 4 }, -/turf/open/lava/smooth/lava_land_surface, -/area/ruin/space/has_grav/bubbers/dauntless/command/vault) +/obj/machinery/disposal/bin, +/obj/machinery/firealarm/directional/south, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/apc/syndicate_access, +/obj/effect/mapping_helpers/apc/full_charge, +/obj/effect/mapping_helpers/apc/cut_AI_wire, +/turf/open/floor/carpet/donk, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/morale) "gk" = ( /obj/structure/cable, /obj/structure/sauna_oven, /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/sauna) "gl" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 10 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/turf/open/floor/carpet/red, -/area/ruin/space/has_grav/bubbers/persistance/command/liason) +/obj/structure/cable, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/ruin/space/has_grav/bubbers/persistance/service/freezer) "gm" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -2132,27 +2054,10 @@ /turf/open/lava/smooth/lava_land_surface, /area/lavaland/surface/outdoors) "gr" = ( -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/machinery/porta_turret/syndicate{ - dir = 8; - pixel_x = -32 - }, -/obj/machinery/camera/autoname/directional/west{ - name = "Persistence Exterior West"; - network = list("persistence_ext") - }, -/obj/machinery/conveyor{ - dir = 8; - id = "QMLoad" - }, -/obj/structure/lattice/catwalk/mining, -/turf/open/floor/pod/dark, -/area/lavaland/surface/outdoors) +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/cell_charger_multi/wall_mounted/directional/west, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/bubbers/persistance/sci/robotics) "gs" = ( /obj/machinery/duct, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -2173,14 +2078,14 @@ /area/ruin/space/has_grav/bubbers/persistance/service/freezer) "gw" = ( /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium{ - polarizer_id = "persist_science" + polarizer_id = "persistenceengidorm_w" }, +/obj/structure/cable, /obj/machinery/door/poddoor{ - id = "syndisci_windows" + id = "persistengidorm_s" }, -/obj/structure/cable, /turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/science) +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/engineering) "gx" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -2195,18 +2100,13 @@ /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "gy" = ( -/obj/machinery/duct, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/effect/turf_decal/siding/dark{ dir = 9 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/white/diagonal, -/area/ruin/space/has_grav/bubbers/persistance/med) +/obj/machinery/light/directional/west, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/wood, +/area/ruin/space/has_grav/bubbers/persistance/service/gym) "gz" = ( /obj/machinery/duct, /obj/structure/cable, @@ -2242,50 +2142,44 @@ }, /turf/open/floor/wood/tile, /area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) -"gD" = ( -/obj/machinery/light/directional/north, -/obj/structure/frame/machine/secured, -/obj/item/circuitboard/machine/stacking_unit_console, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering/mining) "gI" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/airalarm/directional/south, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/obj/machinery/ecto_sniffer, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/sci/robotics) -"gJ" = ( -/obj/structure/fireplace, -/obj/effect/mob_spawn/ghost_role/human/persistence/syndicate/researcher{ - dir = 4; - name = "Persistence Researcher" +/mob/living/basic/lizard/tegu{ + name = "Entertains-The-Hostages"; + faction = list("neutral","Syndicate") }, -/turf/open/floor/iron/terracotta/diagonal, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/science) +/obj/structure/bed/dogbed, +/obj/structure/sign/poster/contraband/syndiemoth/directional/north, +/turf/open/floor/grass, +/area/ruin/space/has_grav/bubbers/persistance/sec/prison) "gK" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/structure/cable, -/obj/machinery/door/firedoor/heavy, -/obj/machinery/duct, -/obj/structure/disposalpipe/segment, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/obj/structure/toilet{ + pixel_y = 13; + dir = 8 + }, +/obj/machinery/dryer{ + pixel_y = 25 + }, +/turf/open/floor/iron/freezer, +/area/ruin/space/has_grav/bubbers/persistance/command/admiral) +"gM" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/bucket/wooden{ + pixel_x = -9; + pixel_y = 7 + }, +/obj/item/stack/sheet/mineral/wood/fifty, +/obj/machinery/light/directional/west, +/obj/item/stack/sheet/mineral/wood/fifty, +/turf/open/floor/wood/large, +/area/ruin/space/has_grav/bubbers/persistance/service/sauna) "gN" = ( /obj/item/modular_computer/laptop/preset/syndicate, /obj/structure/table/reinforced/plastitaniumglass, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/sec/armory) -"gO" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 9 - }, -/turf/open/floor/iron/terracotta/herringbone, -/area/ruin/space/has_grav/bubbers/persistance/service/hydro) "gP" = ( /obj/structure/chair{ dir = 8 @@ -2295,27 +2189,76 @@ }, /turf/open/floor/wood/tile, /area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) +"gQ" = ( +/obj/structure/closet/crate, +/obj/item/skillchip/job/engineer, +/obj/item/skillchip/job/janitor, +/obj/item/skillchip/job/psychology, +/obj/item/skillchip/job/roboticist, +/obj/item/skillchip/brainwashing, +/obj/item/skillchip/job/psychology, +/obj/item/skillchip/job/roboticist, +/obj/item/skillchip/job/janitor, +/obj/item/skillchip/job/miner, +/obj/item/skillchip/entrails_reader, +/obj/machinery/vending/clothing{ + density = 0; + pixel_y = -28; + all_products_free = 1 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/turf/open/floor/wood, +/area/ruin/space/has_grav/bubbers/persistance/service/lockers) "gS" = ( -/obj/structure/chair/sofa/left/maroon{ +/obj/structure/toilet{ dir = 4 }, -/obj/effect/turf_decal/siding/wood{ - dir = 9 +/obj/machinery/light/directional/south, +/obj/machinery/camera/autoname/directional/west{ + name = "Persistence Exterior West"; + network = list("persistence_ext") }, -/turf/open/floor/carpet/purple, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/science) +/turf/open/floor/iron/dark/small, +/area/ruin/space/has_grav/bubbers/persistance/sec/prison) +"gT" = ( +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" + }, +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" + }, +/obj/machinery/porta_turret/syndicate{ + dir = 8; + pixel_x = -32 + }, +/obj/machinery/camera/autoname/directional/west{ + name = "Persistence Exterior West"; + network = list("persistence_ext") + }, +/obj/machinery/conveyor{ + dir = 8; + id = "QMLoad" + }, +/obj/structure/lattice/catwalk/mining, +/turf/open/floor/pod/dark, +/area/ruin/space/has_grav/bubbers/dauntless/command/vault) "gV" = ( /obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "gW" = ( -/obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/carpet/red, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/brig) +/obj/structure/cable, +/obj/structure/sign/poster/official/corporate_perks_vacation/directional/south, +/obj/machinery/duct, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "gZ" = ( /obj/machinery/recharge_station, /turf/open/floor/iron/dark, @@ -2340,30 +2283,33 @@ /turf/open/floor/iron/terracotta/diagonal, /area/ruin/space/has_grav/bubbers/persistance/service) "he" = ( -/obj/machinery/conveyor{ - id = "syndirecycle"; - dir = 1 - }, -/obj/effect/spawner/random/maintenance/five, -/obj/item/stock_parts/power_store/cell/lead, -/obj/item/stock_parts/power_store/cell/lead, -/obj/effect/spawner/random/maintenance/two, -/obj/effect/spawner/random/trash/garbage{ - pixel_x = 4; - pixel_y = 5 +/obj/effect/turf_decal/vg_decals/atmos/nitrogen, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer2{ + dir = 8 }, /turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/cargo) +/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) "hf" = ( -/obj/effect/turf_decal/skyrat_decals/syndicate/top/middle, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/sec/armory) +/obj/machinery/door/poddoor{ + id = "armory_s"; + name = "Emergancy Armory Access" + }, +/obj/effect/turf_decal/stripes/red/full, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) +"hh" = ( +/obj/structure/drain, +/obj/machinery/duct, +/turf/open/floor/iron/white/small, +/area/ruin/space/has_grav/bubbers/persistance/service/lockers) "hk" = ( -/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, -/obj/machinery/atmospherics/pipe/layer_manifold/brown{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ dir = 8 }, -/turf/open/floor/plating/reinforced, +/obj/structure/window/reinforced/plasma/spawner/directional/south, +/obj/structure/window/reinforced/plasma/spawner/directional/north, +/obj/machinery/portable_atmospherics/canister/plasma, +/turf/open/floor/engine/plasma, /area/ruin/space/has_grav/bubbers/persistance/engineering/gas) "hl" = ( /obj/machinery/vending/donksnack{ @@ -2396,14 +2342,11 @@ /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "hn" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/cable, -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/turf/open/floor/carpet/purple, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/janitor) +/obj/machinery/light/directional/south, +/obj/structure/table, +/obj/machinery/xenoarch/recoverer, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/engineering/mining) "ho" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/structure/disposalpipe/segment{ @@ -2461,44 +2404,42 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/sci/robotics) "hr" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/closet/emcloset/wall{ - pixel_x = -32 +/obj/effect/turf_decal/siding/dark{ + dir = 10 }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/machinery/light/directional/west, +/obj/machinery/defibrillator_mount/charging{ + pixel_y = -30 + }, +/obj/item/defibrillator/loaded, +/obj/machinery/breath_machine/anesthetic, +/turf/open/floor/mineral/titanium/tiled/white, +/area/ruin/space/has_grav/bubbers/persistance/med/treatment) "hs" = ( -/obj/machinery/airalarm/directional/south, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/obj/machinery/button/door/directional/west{ - id = "syndimining"; - name = "Blast Doors"; - req_access = list("syndicate") +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/machinery/porta_turret/syndicate{ + dir = 8; + pixel_x = -32 }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/evac) -"ht" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/structure/cable, -/mob/living/simple_animal/hostile/syndimouse{ - name = "Syndicate Chefpretive"; - desc = "A strange mouse in a Syndicate combat MODsuit, built for mice!"; - faction = list("neutral","Syndicate") +/obj/machinery/camera/autoname/directional/west{ + name = "Persistence Exterior West"; + network = list("persistence_ext") }, -/turf/open/floor/iron/kitchen_coldroom/freezerfloor, -/area/ruin/space/has_grav/bubbers/persistance/service/freezer) -"hw" = ( -/obj/effect/turf_decal/siding/white{ - dir = 6 +/obj/machinery/conveyor{ + dir = 8; + id = "QMLoad" + }, +/obj/structure/lattice/catwalk/mining, +/turf/open/floor/pod/dark, +/area/lavaland/surface/outdoors) +"hw" = ( +/obj/effect/turf_decal/siding/white{ + dir = 6 }, /obj/machinery/light/directional/east, /obj/structure/table/reinforced/plastitaniumglass, @@ -2517,16 +2458,27 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) -"hC" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 +"hB" = ( +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 6 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/structure/showcase/cyborg{ + desc = "A stand with the empty body of a Cybersun cyborg bolted to it."; + dir = 8; + icon = 'icons/mob/silicon/robots.dmi'; + icon_state = "synd_sec"; + name = "syndicate cyborg showcase"; + pixel_x = 6 }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/carpet/red, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/brig) +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/service) +"hC" = ( +/obj/structure/table, +/obj/machinery/xenoarch/scanner, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/engineering/mining) "hD" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -2541,14 +2493,17 @@ /turf/open/floor/iron/white/diagonal, /area/ruin/space/has_grav/bubbers/persistance/med) "hE" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment, -/obj/machinery/duct, -/obj/machinery/cell_charger_multi/wall_mounted/directional/east, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/window/survival_pod/left/directional/west{ + req_access = list("syndicate") + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/cargo) "hF" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/red/line{ @@ -2561,27 +2516,42 @@ /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "hH" = ( -/obj/machinery/airalarm/directional/west, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/kirbyplants/organic/plant3, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/machinery/duct, +/obj/structure/cable, +/obj/structure/disposalpipe/junction/yjunction{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/turf_decal/siding/dark/corner{ + dir = 8 + }, +/turf/open/floor/iron/white/small, +/area/ruin/space/has_grav/bubbers/persistance/service/lockers) "hI" = ( -/obj/machinery/door/window/survival_pod/left/directional/north{ - name = "Chemistry"; - req_access = list("syndicate") +/obj/effect/turf_decal/siding/wood{ + dir = 1 }, -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/reagent_containers/cup/beaker/cryoxadone, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/med/chem) -"hJ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 + dir = 8 }, -/turf/open/floor/carpet/purple, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/janitor) +/obj/structure/disposalpipe/segment, +/turf/open/floor/carpet/red, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/brig) +"hJ" = ( +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" + }, +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" + }, +/obj/structure/lattice/catwalk/mining, +/obj/machinery/camera/autoname/directional/west{ + name = "Persistence Exterior West"; + network = list("persistence_ext") + }, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/space/has_grav/bubbers/dauntless/command/vault) "hL" = ( /obj/machinery/griddle, /obj/effect/turf_decal/siding/thinplating/dark{ @@ -2600,32 +2570,28 @@ /turf/open/floor/carpet/royalblack, /area/ruin/space/has_grav/bubbers/persistance/sec/prison/rec) "hN" = ( -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/machinery/conveyor{ - dir = 8; - id = "QMLoad" +/obj/effect/turf_decal/siding/wood{ + dir = 10 }, -/obj/structure/lattice/catwalk/mining, -/turf/open/floor/pod/dark, -/area/ruin/space/has_grav/bubbers/dauntless/command/vault) -"hO" = ( -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/heavy, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, -/obj/effect/mapping_helpers/airlock/cutaiwire, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/hatch{ - name = "Exterior Hatch" +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/effect/mob_spawn/ghost_role/human/persistence/syndicate/brigoff{ + dir = 4; + name = "Persistence Brig Officer" }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) +/turf/open/floor/carpet/red, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/brig) +"hO" = ( +/obj/machinery/light/directional/west, +/obj/machinery/computer/rdconsole{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red{ + icon_state = "plastitanium" + }, +/area/ruin/space/has_grav/bubbers/persistance/command/bridge) "hP" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 @@ -2636,10 +2602,10 @@ /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/rnd) "hQ" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/lighter/skull, -/turf/open/floor/carpet/royalblack, -/area/ruin/space/has_grav/bubbers/persistance/sec/prison/rec) +/obj/effect/spawner/liquids_spawner/shoulders, +/obj/effect/mist, +/turf/open/floor/iron/pool/cobble, +/area/ruin/space/has_grav/bubbers/persistance/service/sauna) "hR" = ( /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/cargo) @@ -2654,30 +2620,23 @@ /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "hU" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/door/firedoor/heavy, -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 4 +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/tattoo_kit{ + pixel_y = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, -/obj/effect/mapping_helpers/airlock/cutaiwire, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/cargo) +/obj/item/fur_dyer, +/obj/effect/turf_decal/siding/thinplating/dark, +/turf/open/floor/iron/kitchen/herringbone, +/area/ruin/space/has_grav/bubbers/persistance/service/salon) "hV" = ( -/obj/structure/window/reinforced/survival_pod/spawner/directional/south, -/obj/effect/turf_decal/siding/dark_green{ - dir = 10 - }, -/obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/reagentgrinder, -/obj/item/stack/sheet/mineral/uranium/five, -/obj/item/stack/sheet/mineral/gold{ - amount = 10 +/obj/effect/turf_decal/stripes/line, +/obj/structure/disposalpipe/segment, +/obj/machinery/light/directional/east, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/med/viro) +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/sec/holding) "hW" = ( /obj/structure/closet/generic/wall{ pixel_x = 32 @@ -2709,6 +2668,14 @@ /obj/machinery/exoscanner, /turf/open/lava/smooth/lava_land_surface, /area/ruin/space/has_grav/bubbers/persistance/cargo/drone) +"ic" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/effect/turf_decal/siding/dark{ + dir = 9 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/sci/robotics) "if" = ( /obj/structure/window/reinforced/survival_pod/spawner/directional/west, /obj/structure/window/reinforced/survival_pod/spawner/directional/south, @@ -2729,24 +2696,18 @@ /turf/open/floor/iron/white/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "ii" = ( -/obj/structure/table/wood/fancy/red, -/obj/machinery/fax{ - fax_name = "Unknown Syndicate Fax Liason"; - name = "Syndicate Company Representative Fax Machine"; - syndicate_network = 1 +/obj/effect/turf_decal/skyrat_decals/syndicate/top/left, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 1 }, -/obj/structure/sign/flag/syndicate/directional/east, -/turf/open/floor/wood/parquet, -/area/ruin/space/has_grav/bubbers/persistance/command/liason) +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/command/bridge) "ij" = ( -/obj/structure/closet/secure_closet/brig{ - id = "Syndicate Cell"; - name = "Syndicate Cell locker"; - req_one_access = null; - req_access = list("syndicate") +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 }, /turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/sec/holding) +/area/ruin/space/has_grav/bubbers/persistance/sec/brigentrance) "ik" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -2758,15 +2719,17 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "il" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/structure/cable, -/obj/structure/chair/sofa/corp/right{ - dir = 4 +/obj/machinery/button/door/directional/south{ + specialfunctions = 4; + id = "syndiship_vault"; + normaldoorcontrol = 1; + name = "Vault Bolt Control"; + req_access = list("syndicate") }, -/turf/open/floor/carpet/royalblack, -/area/ruin/space/has_grav/bubbers/persistance/sec/prison/rec) +/obj/structure/closet/crate/goldcrate, +/obj/item/stack/spacecash/c10000, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/command/vault) "im" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -2784,18 +2747,12 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/sec/armory) "ip" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 5 - }, -/obj/structure/toilet{ - pixel_y = 13; - dir = 8 - }, -/obj/machinery/dryer{ - pixel_y = 25 +/obj/structure/disposalpipe/segment{ + dir = 9 }, -/turf/open/floor/iron/freezer, -/area/ruin/space/has_grav/bubbers/persistance/command/admiral) +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/sci/ordnance) "iq" = ( /obj/machinery/airalarm/directional/south, /obj/effect/mapping_helpers/airalarm/syndicate_access, @@ -2844,15 +2801,23 @@ /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "ix" = ( -/obj/machinery/photocopier/gratis, -/obj/machinery/light/directional/north, -/obj/machinery/airalarm/directional/north, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/turf/open/floor/wood/parquet, -/area/ruin/space/has_grav/bubbers/persistance/command/liason) -"iy" = ( -/obj/structure/cable, -/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/light/directional/south, +/obj/structure/showcase/cyborg{ + desc = "A stand with the empty body of a Cybersun cyborg bolted to it."; + dir = 4; + icon = 'icons/mob/silicon/robots.dmi'; + icon_state = "synd_sec"; + name = "syndicate cyborg showcase"; + pixel_x = -6 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 10 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/service) +"iy" = ( +/obj/structure/cable, +/obj/structure/table/reinforced/plastitaniumglass, /obj/item/taperecorder, /obj/structure/noticeboard/directional/north, /obj/item/paper/monitorkey{ @@ -2867,44 +2832,17 @@ }, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) "iB" = ( -/obj/item/card/emag, -/obj/item/reagent_containers/heroinbrick{ - desc = "A brick of stimulants meant for use by Tiger Cooperative agents. It seems this one's just a brittle block of heroin."; - name = "Tiger Coop stimulant brick" - }, -/obj/item/storage/box/syndie_kit/chameleon/ghostcafe{ - desc = "A sleek, sturdy box."; - name = "Chameleon Kit" - }, -/obj/machinery/turretid{ - ailock = 1; - control_area = "/area/ruin/space/has_grav/bubbers/dauntless/command/vault"; - dir = 1; - icon_state = "control_kill"; - lethal = 1; - name = "Base turret controls"; - pixel_y = 30; - req_access = list("syndicate"); - shoot_cyborgs = 1 - }, -/obj/item/skub, -/obj/structure/safe/abovetilefloor{ - name = "High risk syndicate gear storage" - }, +/obj/item/disk/ammo_workbench/advanced, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/ammo_workbench, /turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/command/vault) +/area/ruin/space/has_grav/bubbers/persistance/sec/armory) "iC" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service) -"iF" = ( -/obj/effect/turf_decal/siding/dark, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/turf/open/floor/mineral/titanium/tiled/white, -/area/ruin/space/has_grav/bubbers/persistance/med/treatment) "iH" = ( /obj/effect/turf_decal/siding/dark/corner{ dir = 4 @@ -2919,32 +2857,41 @@ }, /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) +"iI" = ( +/obj/structure/chair/office/tactical{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/bubbers/persistance/med/chem) "iJ" = ( -/obj/structure/reagent_dispensers/water_cooler, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) -"iK" = ( -/obj/structure/cargo_shelf, -/obj/machinery/airalarm/directional/north, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/obj/effect/mapping_helpers/airalarm/tlv_cold_room, -/turf/open/floor/iron/kitchen_coldroom/freezerfloor, -/area/ruin/space/has_grav/bubbers/persistance/service/freezer) +/obj/effect/turf_decal/skyrat_decals/syndicate/top/middle, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/sec/armory) "iL" = ( -/obj/structure/cable, -/turf/closed/wall/r_wall/syndicate/cruiser, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/janitor) +/obj/structure/lattice/catwalk/mining, +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" + }, +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" + }, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/space/has_grav/bubbers/dauntless/command/vault) "iO" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/junction/flip{ - dir = 1 +/obj/effect/turf_decal/siding/wood{ + dir = 8 }, -/obj/machinery/duct, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/effect/turf_decal/trimline/dark_red/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/turf/open/floor/carpet/royalblack, +/area/ruin/space/has_grav/bubbers/persistance/service/lounge) "iP" = ( /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, /obj/structure/cable, @@ -3001,28 +2948,29 @@ /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) "iZ" = ( -/obj/machinery/computer/crew/syndie{ - dir = 4 +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" }, -/obj/structure/window/reinforced/survival_pod/spawner/directional/west, -/obj/item/radio/intercom/directional/east{ - name = "two-way prisoner intercom"; - freerange = 1; - freqlock = 1; - frequency = 1245; - pixel_x = 0; - pixel_y = -30 +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/sec/brigentrance) +/obj/structure/lattice/catwalk/mining, +/obj/machinery/conveyor{ + dir = 8; + id = "QMLoad" + }, +/turf/open/floor/pod/dark, +/area/lavaland/surface/outdoors) "ja" = ( -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/effect/turf_decal/siding/wood, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, -/obj/machinery/door/firedoor/heavy, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/structure/chair/comfy/carp{ + dir = 8 + }, +/turf/open/floor/carpet/red, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/maa) "jb" = ( /obj/machinery/digital_clock/directional/north, /obj/structure/table/reinforced/plastitaniumglass, @@ -3036,17 +2984,13 @@ /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "jd" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/door/window/survival_pod/left/directional/west{ - req_access = list("syndicate") +/obj/machinery/washing_machine, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/effect/turf_decal/siding/dark{ + dir = 9 }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/cargo) +/turf/open/floor/iron/white/small, +/area/ruin/space/has_grav/bubbers/persistance/service/lockers) "je" = ( /obj/machinery/photocopier/gratis, /turf/open/floor/mineral/plastitanium/red, @@ -3079,30 +3023,20 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/cargo/drone) "jk" = ( -/obj/machinery/duct, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/effect/turf_decal/siding/dark{ - dir = 10 - }, -/obj/structure/disposalpipe/junction{ - dir = 8 +/obj/effect/turf_decal/siding/wood{ + dir = 1 }, -/turf/open/floor/iron/white/small, -/area/ruin/space/has_grav/bubbers/persistance/service/lockers) +/turf/open/floor/carpet/green, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/chef) "jl" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, /turf/open/floor/plating/elevatorshaft, /area/ruin/space/has_grav/bubbers/persistance/cargo) -"jo" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/sec/holding) "jq" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/dauntless/command/vault) @@ -3110,15 +3044,12 @@ /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/engineering) "js" = ( -/obj/structure/bed/double/pod{ - dir = 1 - }, -/obj/item/bedsheet/medical/double{ - dir = 4 +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 5 }, -/obj/machinery/light_switch/directional/west, -/turf/open/floor/wood/large, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/medical) +/obj/effect/turf_decal/siding/dark, +/turf/open/floor/iron/white/diagonal, +/area/ruin/space/has_grav/bubbers/persistance/med) "jt" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/siding/dark/corner{ @@ -3128,32 +3059,40 @@ /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "ju" = ( -/obj/machinery/button/door{ - id = "syndishipmed"; +/obj/machinery/button/door/directional/north{ + id = "syndicatesauna"; + name = "Sauna Window Shutters"; + pixel_y = -24; + pixel_x = -8 + }, +/obj/machinery/button/polarizer{ pixel_x = 8; pixel_y = -24; - name = "Airlock Bolts"; - normaldoorcontrol = 1; - req_access = list("syndicate"); - specialfunctions = 4 + id = "persistence_sauna_w"; + name = "sauna window polarization" }, -/obj/machinery/newscaster/directional/west, -/obj/structure/dresser, -/obj/item/flashlight/lamp/green{ - pixel_x = 5; - pixel_y = 15 +/obj/machinery/light_switch/directional/south, +/obj/structure/disposalpipe/trunk{ + dir = 8 }, -/obj/machinery/light/directional/south, +/obj/machinery/disposal/bin, /turf/open/floor/wood/large, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/medical) +/area/ruin/space/has_grav/bubbers/persistance/service/sauna) "jy" = ( -/obj/machinery/computer/station_alert{ - dir = 1 - }, -/turf/open/floor/mineral/plastitanium/red{ - icon_state = "plastitanium" +/obj/effect/spawner/random/exotic/syndie, +/obj/item/storage/wallet/random, +/obj/item/clothing/under/syndicate/skyrat/baseball, +/obj/effect/spawner/random/exotic/syndie, +/obj/effect/spawner/random/exotic/syndie, +/obj/item/storage/box/syndibunny, +/obj/effect/spawner/random/entertainment/plushie, +/obj/effect/spawner/random/entertainment/plushie_delux, +/obj/effect/turf_decal/siding/wood, +/obj/structure/closet/generic/wall{ + pixel_y = -32 }, -/area/ruin/space/has_grav/bubbers/persistance/command/bridge) +/turf/open/floor/carpet/green, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/chef) "jA" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -3208,6 +3147,13 @@ "jH" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) +"jI" = ( +/obj/structure/plasticflaps, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/service/hydro) "jJ" = ( /obj/structure/window/reinforced/survival_pod/spawner/directional/east, /obj/structure/table/reinforced/plastitaniumglass, @@ -3243,83 +3189,57 @@ /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "jO" = ( -/obj/structure/cable, -/obj/machinery/duct, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/firealarm/directional/east, -/obj/machinery/light/directional/east, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) -"jQ" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/duct, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/item/storage/fancy/coffee_cart_rack{ - pixel_x = -9; - pixel_y = -1 - }, -/obj/item/storage/fancy/coffee_condi_display{ - pixel_x = 4; - pixel_y = 2 - }, -/obj/item/reagent_containers/cup/bottle/syrup_bottle/caramel{ - pixel_x = 11; - pixel_y = 16 +/obj/item/card/emag, +/obj/item/reagent_containers/heroinbrick{ + desc = "A brick of stimulants meant for use by Tiger Cooperative agents. It seems this one's just a brittle block of heroin."; + name = "Tiger Coop stimulant brick" }, -/obj/item/reagent_containers/cup/bottle/syrup_bottle/korta_nectar{ - pixel_y = 16; - pixel_x = 2 +/obj/item/storage/box/syndie_kit/chameleon/ghostcafe{ + desc = "A sleek, sturdy box."; + name = "Chameleon Kit" }, -/obj/item/reagent_containers/cup/bottle/syrup_bottle/liqueur{ - pixel_x = -7; - pixel_y = 16 +/obj/machinery/turretid{ + ailock = 1; + control_area = "/area/ruin/space/has_grav/bubbers/dauntless/command/vault"; + dir = 1; + icon_state = "control_kill"; + lethal = 1; + name = "Base turret controls"; + pixel_y = 30; + req_access = list("syndicate"); + shoot_cyborgs = 1 }, -/obj/structure/cable, -/obj/effect/turf_decal/siding/dark{ - dir = 8 +/obj/item/skub, +/obj/structure/safe/abovetilefloor{ + name = "High risk syndicate gear storage" }, -/turf/open/floor/wood/large, -/area/ruin/space/has_grav/bubbers/persistance/service/diner) +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/command/vault) "jS" = ( -/obj/machinery/conveyor{ - dir = 8; - id = "QMLoad" +/obj/machinery/button/door/directional/west{ + pixel_y = 8; + id = "syndieng_windows"; + name = "Window Shutters"; + req_access = list("syndicate") + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/bin, +/obj/machinery/button/polarizer{ + pixel_x = -40; + pixel_y = 8; + id = "syndiengi_w"; + name = "engineering window polarization" }, -/obj/structure/lattice/catwalk/mining, /turf/open/floor/pod/dark, -/area/lavaland/surface/outdoors) +/area/ruin/space/has_grav/bubbers/persistance/engineering) "jT" = ( -/obj/item/clothing/glasses/night, -/obj/item/storage/belt/military, -/obj/item/storage/belt/military, -/obj/item/clothing/mask/gas/syndicate, -/obj/item/clothing/mask/gas/syndicate, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/under/syndicate/combat, -/obj/item/clothing/under/syndicate/combat, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/gloves/combat, -/obj/item/card/id/advanced/chameleon, -/obj/item/card/id/advanced/chameleon, -/obj/item/card/id/advanced/chameleon, -/obj/item/radio/headset/interdyne, -/obj/item/radio/headset/interdyne, -/obj/item/radio/headset/interdyne, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/light_switch/directional/north, -/obj/structure/closet/crate/secure/syndicate/cybersun/night{ - name = "Cybersun Operative Equipment" - }, -/obj/item/suppressor, -/obj/item/suppressor, -/obj/item/suppressor, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/sec/armory) +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "jU" = ( /obj/structure/flora/bush/flowers_yw/style_random, /obj/machinery/door/window/survival_pod/left/directional/east, @@ -3349,15 +3269,17 @@ /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "jY" = ( -/obj/structure/cable, -/obj/machinery/duct, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/fake_stairs/directional/north, -/obj/machinery/firealarm/directional/west, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/structure/sign/painting/library{ + pixel_x = -30 + }, +/obj/structure/rack, +/obj/item/paint_palette, +/obj/item/canvas/twentyfour_twentyfour, +/obj/item/canvas/twentyfour_twentyfour, +/obj/item/canvas/drawingtablet, +/obj/item/paint/anycolor, +/turf/open/floor/wood, +/area/ruin/space/has_grav/bubbers/persistance/service/lounge) "jZ" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -3404,16 +3326,15 @@ /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "kg" = ( -/obj/structure/window/reinforced/survival_pod/spawner/directional/east, -/mob/living/carbon/human/species/monkey, -/obj/structure/flora/bush/flowers_br/style_random, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/effect/spawner/liquids_spawner/shoulders, +/obj/structure/chair/sofa/bench/left{ + dir = 4 + }, +/obj/effect/mist, +/turf/open/floor/iron/pool/cobble/corner{ dir = 1 }, -/obj/machinery/airalarm/directional/west, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/turf/open/misc/grass/jungle/station, -/area/ruin/space/has_grav/bubbers/persistance/med) +/area/ruin/space/has_grav/bubbers/persistance/service/sauna) "kh" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -3433,16 +3354,15 @@ initial_gas_mix = "LAVALAND_ATMOS" }, /area/lavaland/surface/outdoors) -"kj" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/closet/emcloset/wall{ - pixel_x = -32 - }, -/obj/machinery/light/directional/south, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/sec/holding) +"kk" = ( +/obj/structure/cable, +/obj/machinery/duct, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/digital_clock/directional/east, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "kl" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -3487,14 +3407,18 @@ /turf/open/floor/engine, /area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) "kp" = ( -/obj/structure/window/reinforced/survival_pod/spawner/directional/south, -/obj/machinery/door/firedoor/heavy, -/obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/airalarm/directional/west, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/obj/item/holosign_creator/atmos, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/structure/cable, +/obj/machinery/duct, +/obj/structure/disposalpipe/segment, +/obj/structure/sign/warning/engine_safety/directional/east, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/apc/syndicate_access, +/obj/effect/mapping_helpers/apc/full_charge, +/obj/effect/mapping_helpers/apc/cut_AI_wire, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "kq" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/machinery/pollution_scrubber, @@ -3520,12 +3444,11 @@ /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "ku" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/obj/machinery/duct, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service) "kv" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) @@ -3554,13 +3477,13 @@ /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "ky" = ( -/obj/machinery/power/turbine/core_rotor{ - dir = 8; - mapping_id = "dauntless_turbine" - }, /obj/structure/cable, -/turf/open/floor/engine, -/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "kz" = ( /obj/effect/turf_decal/siding/wood, /obj/structure/table/wood/fancy/black, @@ -3578,6 +3501,12 @@ }, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) +"kA" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/wood, +/area/ruin/space/has_grav/bubbers/persistance/service/gym) "kB" = ( /obj/structure/safe/abovetilefloor{ name = "High risk syndicate gear storage" @@ -3593,6 +3522,13 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/cargo) +"kD" = ( +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/obj/machinery/atmospherics/pipe/layer_manifold/pink{ + dir = 8 + }, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) "kE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/firealarm/directional/north, @@ -3601,17 +3537,43 @@ }, /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) +"kF" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/colony/bolts, +/area/ruin/space/has_grav/bubbers/persistance/service) "kI" = ( -/obj/structure/window/reinforced/survival_pod/spawner/directional/south, -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/toy/plush/abductor/agent, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable, -/obj/effect/mapping_helpers/apc/syndicate_access, -/obj/effect/mapping_helpers/apc/cut_AI_wire, -/obj/effect/mapping_helpers/apc/full_charge, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/cargo/drone) +/obj/structure/table/wood, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/item/folder/syndicate{ + pixel_x = 5 + }, +/obj/item/clothing/glasses/sunglasses{ + pixel_y = 7; + pixel_x = 8 + }, +/obj/item/flashlight/lamp{ + pixel_x = -6; + pixel_y = 2 + }, +/obj/item/radio/intercom/directional/east{ + name = "Interview room intercom"; + broadcasting = 1; + freerange = 1; + freqlock = 1; + frequency = 1241; + canhear_range = 1; + desc = "Surely no one is listening in!"; + pixel_x = 0; + pixel_y = 32 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/obj/item/taperecorder, +/turf/open/floor/wood/tile, +/area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) "kJ" = ( /obj/effect/turf_decal/skyrat_decals/syndicate/middle/middle, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -3619,33 +3581,32 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) "kM" = ( -/obj/structure/disposalpipe/junction/flip{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/cable, -/obj/machinery/light/directional/east, -/obj/machinery/duct, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) -"kO" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/machinery/suit_storage_unit/industrial/syndicatemining, +/obj/effect/turf_decal/siding/wood{ + dir = 10 }, -/obj/machinery/light/directional/west, -/obj/structure/sign/departments/science/directional/west, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) -"kP" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 +/turf/open/floor/carpet/stellar, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/cargo) +"kP" = ( +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/structure/lattice/catwalk/mining, +/obj/machinery/porta_turret/syndicate{ + dir = 8; + pixel_x = 32; + faction = list("Syndicate","neutral") + }, +/obj/machinery/camera/autoname/directional/east{ + network = list("persistence_ext"); + name = "persistence exterior east" + }, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/space/has_grav/bubbers/dauntless/command/vault) "kQ" = ( /obj/machinery/atmospherics/components/unary/portables_connector{ dir = 8 @@ -3670,19 +3631,33 @@ /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/persistance/service/freezer) "kU" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/machinery/light/directional/south, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/chem_mass_spec, +/obj/machinery/cell_charger_multi/wall_mounted/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/bubbers/persistance/med/chem) +"kV" = ( +/obj/machinery/light/directional/west, +/obj/structure/closet/emcloset/wall{ + pixel_x = -32 }, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/iron/colony/bolts, /area/ruin/space/has_grav/bubbers/persistance/service) "kW" = ( -/obj/effect/spawner/liquids_spawner/shoulders, -/obj/effect/mist, -/turf/open/floor/iron/pool/cobble, -/area/ruin/space/has_grav/bubbers/persistance/service/sauna) +/obj/structure/lattice/catwalk/mining, +/obj/machinery/door/poddoor{ + id = "synditrashgun" + }, +/obj/structure/fans/tiny/forcefield{ + dir = 4 + }, +/turf/open/floor/engine/hull{ + initial_gas_mix = "LAVALAND_ATMOS" + }, +/area/ruin/space/has_grav/bubbers/persistance/cargo) "kX" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/morale) @@ -3698,67 +3673,46 @@ /turf/open/floor/engine, /area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) "kZ" = ( -/obj/effect/mob_spawn/ghost_role/human/persistence/syndicate/moraleofficer{ - name = "Persistence Morale Officer" - }, -/obj/structure/closet/generic/wall{ - pixel_x = -32 - }, -/obj/item/storage/box/syndimaid, -/obj/item/storage/box/syndimaid, -/obj/effect/spawner/random/entertainment/plushie_delux, -/obj/effect/spawner/random/entertainment/plushie, -/obj/effect/spawner/random/exotic/syndie, -/obj/effect/spawner/random/exotic/syndie, -/obj/item/clothing/under/syndicate/skyrat/baseball, -/obj/item/storage/wallet/random, -/obj/effect/spawner/random/exotic/syndie, -/obj/effect/turf_decal/siding/dark{ - dir = 10 - }, -/obj/effect/turf_decal/siding/dark/corner{ - dir = 4 - }, -/turf/open/floor/iron/terracotta/diagonal, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/morale) -"la" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/storage/toolbox/syndicate{ - pixel_y = 5 +/obj/machinery/vending/hydronutrients{ + pixel_x = -28; + can_astar_pass = 1; + density = 0; + all_products_free = 1 }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/sci/robotics) +/obj/structure/flora/bush/flowers_pp/style_random, +/turf/open/floor/grass, +/area/ruin/space/has_grav/bubbers/persistance/service/hydro) "lb" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/junction/flip{ +/obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) -"ld" = ( -/obj/structure/window/reinforced/survival_pod/spawner/directional/south, -/obj/structure/bed/maint, -/obj/machinery/camera/autoname/directional/east{ - network = list("persistence_ext"); - name = "persistence exterior east" +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/cargo) +"ld" = ( +/obj/machinery/door/airlock/security/old/glass{ + name = "General Population Access" }, -/turf/open/floor/iron/white/small, -/area/ruin/space/has_grav/bubbers/persistance/sec/holding) -"le" = ( -/obj/structure/flora/bush/sparsegrass/style_random, -/obj/machinery/biogenerator, -/obj/machinery/light/directional/west, -/obj/machinery/camera/autoname/directional/west{ - name = "Persistence Exterior West"; - network = list("persistence_ext") +/obj/effect/turf_decal/stripes/red/full, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "dauntless-sec" }, -/turf/open/floor/grass, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/door/firedoor/heavy, +/turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) +"le" = ( +/obj/structure/sign/poster/contraband/free_drone/directional/north, +/obj/structure/frame/machine/secured, +/obj/item/circuitboard/machine/mechfab/interdyne, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/bubbers/persistance/sci/robotics) "lf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -3782,17 +3736,6 @@ /obj/machinery/biogenerator/foodricator, /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) -"lm" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/machinery/airalarm/directional/east, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) "ln" = ( /obj/structure/chair/stool{ dir = 4 @@ -3802,14 +3745,14 @@ /turf/open/floor/wood/tile, /area/ruin/space/has_grav/bubbers/persistance/sec/prison/rec) "lp" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/machinery/light/directional/east, -/obj/machinery/airalarm/directional/east, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/effect/turf_decal/trimline/dark_red/filled/line{ + dir = 8 + }, +/turf/open/floor/carpet/royalblack, +/area/ruin/space/has_grav/bubbers/persistance/service/lounge) "lq" = ( /obj/structure/table/wood/fancy/black, /obj/item/modular_computer/laptop/preset/syndicate, @@ -3838,15 +3781,11 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "lt" = ( -/obj/machinery/button/door{ - pixel_y = 8; - id = "syndiliasonshutter"; - pixel_x = -24; - name = "shutter button"; - req_access = list("syndicate") - }, -/turf/open/floor/wood/parquet, -/area/ruin/space/has_grav/bubbers/persistance/command/liason) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "lu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -3889,15 +3828,6 @@ }, /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) -"lA" = ( -/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium{ - polarizer_id = "syndiengi_w" - }, -/obj/machinery/door/poddoor{ - id = "syndieng_windows" - }, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/engineering) "lB" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -3908,11 +3838,24 @@ /turf/open/floor/carpet/purple, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/janitor) "lD" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/effect/turf_decal/siding/wood, -/turf/open/floor/carpet/stellar, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/cargo) +/obj/machinery/button/door{ + id = "syndishipmed"; + pixel_x = 8; + pixel_y = -24; + name = "Airlock Bolts"; + normaldoorcontrol = 1; + req_access = list("syndicate"); + specialfunctions = 4 + }, +/obj/machinery/newscaster/directional/west, +/obj/structure/dresser, +/obj/item/flashlight/lamp/green{ + pixel_x = 5; + pixel_y = 15 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/wood/large, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/medical) "lG" = ( /obj/machinery/computer/camera_advanced/syndie{ dir = 8 @@ -3928,23 +3871,11 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/med) "lJ" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/chem_master, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/heavy, -/obj/machinery/door/airlock/highsecurity{ - name = "Interrogation" - }, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, -/obj/effect/mapping_helpers/airlock/cutaiwire, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "persistence_int" - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/bubbers/persistance/med/chem) "lK" = ( /obj/effect/turf_decal/siding/dark{ dir = 6 @@ -4000,11 +3931,15 @@ /turf/open/floor/iron/white/diagonal, /area/ruin/space/has_grav/bubbers/persistance/med) "lR" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/machinery/duct, +/obj/machinery/button/door/directional/north{ + id = "syndicatejanitor"; + name = "Janitor Closet" }, +/obj/vehicle/ridden/janicart, +/obj/item/key/janitor, /turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/engineering/mining) +/area/ruin/space/has_grav/bubbers/persistance/service/janitorial) "lS" = ( /obj/structure/emergency_shield/cult/weak{ name = "Energy Shield" @@ -4042,26 +3977,16 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/cargo) -"lV" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/modular_computer/laptop/preset/syndicate, -/obj/structure/sign/poster/contraband/lamarr/directional/south, -/obj/structure/cable, -/obj/effect/turf_decal/siding/wood{ - dir = 10 - }, -/turf/open/floor/carpet/purple, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/science) "lW" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/service/gym) "lX" = ( -/obj/structure/window/reinforced/survival_pod/spawner/directional/north, -/obj/effect/turf_decal/siding/blue{ - dir = 9 +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/obj/machinery/atmospherics/pipe/layer_manifold/yellow{ + dir = 4 }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/med) +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) "lY" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -4079,29 +4004,15 @@ /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "me" = ( -/obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/structure/chair/comfy/carp{ - dir = 8 - }, -/turf/open/floor/carpet/red, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/maa) +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) "mf" = ( /obj/machinery/computer/quantum_console{ dir = 1 }, /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) -"mg" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, -/obj/machinery/duct, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) "mh" = ( /obj/effect/turf_decal/siding/dark{ dir = 5 @@ -4132,20 +4043,39 @@ /turf/open/floor/mineral/titanium/white, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "mj" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/structure/sink/kitchen/directional/east, +/obj/machinery/digital_clock/directional/west, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 10 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/kitchen/herringbone, +/area/ruin/space/has_grav/bubbers/persistance/service/salon) "mk" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/structure/table/reinforced/plastitaniumglass, +/obj/effect/turf_decal/siding/dark{ + dir = 10 }, -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service/janitorial) +/obj/item/autopsy_scanner, +/obj/item/healthanalyzer{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/machinery/light/directional/south, +/obj/machinery/button/polarizer{ + pixel_x = -8; + pixel_y = -24; + id = "persistence_operating"; + name = "medical window polarization" + }, +/obj/machinery/button/door{ + id = "persistence_operating_s"; + pixel_x = 8; + pixel_y = -24; + name = "Shutters" + }, +/turf/open/floor/mineral/titanium/tiled/white, +/area/ruin/space/has_grav/bubbers/persistance/med/treatment) "mm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -4177,15 +4107,14 @@ }, /area/ruin/space/has_grav/bubbers/persistance/cargo) "mt" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/structure/cable, +/obj/machinery/power/terminal{ + dir = 1 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/effect/turf_decal/siding/thinplating/dark/corner, -/turf/open/floor/iron/terracotta/herringbone, -/area/ruin/space/has_grav/bubbers/persistance/service/hydro) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "mu" = ( /obj/structure/plasticflaps, /turf/open/floor/plating/reinforced, @@ -4208,28 +4137,10 @@ /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/rnd) "mx" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/sec/armory) -"my" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment, -/obj/machinery/button/door/directional/north{ - name = "Armory Shutters"; - id = "armory_s"; - pixel_y = 0; - req_access = list("syndicate_leader"); - pixel_x = -24 - }, +/obj/effect/turf_decal/siding/dark, +/obj/machinery/duct, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) "mA" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 4 @@ -4237,33 +4148,20 @@ /obj/machinery/duct, /turf/open/floor/iron/terracotta/herringbone, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) -"mF" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/item/clothing/shoes/sneakers/crimson, -/obj/item/clothing/under/rank/prisoner/syndicate, -/obj/item/clothing/under/rank/prisoner/syndicate{ - pixel_y = 4 - }, -/obj/item/clothing/under/rank/prisoner/syndicate{ - pixel_y = 8 - }, -/obj/item/clothing/shoes/sneakers/crimson{ - pixel_x = -4 - }, -/obj/item/clothing/shoes/sneakers/crimson{ - pixel_x = 4 - }, +"mB" = ( +/obj/machinery/light_switch/directional/south, /obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/airalarm/directional/west, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/obj/machinery/door/window/survival_pod/left/directional/east{ - req_access = list("syndicate") - }, -/obj/item/nifsoft_remover/syndie, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/sec/prison) +/obj/item/storage/box/beakers/bluespace, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/bubbers/persistance/med/chem) +"mF" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/syndicate_access, +/obj/effect/mapping_helpers/apc/full_charge, +/obj/effect/mapping_helpers/apc/cut_AI_wire, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/sci/ordnance) "mG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -4285,17 +4183,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/service/lounge) +"mL" = ( +/obj/machinery/seed_extractor, +/obj/machinery/light/directional/west, +/turf/open/floor/grass, +/area/ruin/space/has_grav/bubbers/persistance/sec/prison) "mM" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/chair/comfy/carp{ + dir = 8 }, -/obj/structure/cable, -/obj/structure/sign/poster/official/corporate_perks_vacation/directional/south, -/obj/machinery/duct, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/bubbers/persistance/command/liason) "mN" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 9 @@ -4337,9 +4236,19 @@ /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/engineering/gas) "mT" = ( -/obj/structure/sign/poster/official/pda_ad/directional/west, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" + }, +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" + }, +/obj/machinery/porta_turret/syndicate{ + dir = 8; + pixel_y = 32 + }, +/obj/structure/lattice/catwalk/mining, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/space/has_grav/bubbers/dauntless/command/vault) "mU" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -4362,19 +4271,13 @@ /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "mX" = ( -/obj/effect/turf_decal/trimline/dark_blue/filled/line{ - dir = 5 - }, -/obj/effect/turf_decal/siding/dark, -/turf/open/floor/iron/white/diagonal, -/area/ruin/space/has_grav/bubbers/persistance/med) -"mY" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 8 +/obj/structure/extinguisher_cabinet/directional/south, +/obj/effect/mob_spawn/ghost_role/human/persistence/syndicate/stationmed{ + dir = 4; + name = "Persistence Medical Officer" }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/command/bridge) +/turf/open/floor/wood/large, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/medical) "mZ" = ( /obj/structure/closet/generic/wall{ pixel_y = 32 @@ -4390,28 +4293,17 @@ /obj/item/clothing/suit/jacket/runner/syndicate, /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/medical) -"na" = ( -/obj/machinery/duct, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/light/directional/north, -/turf/open/floor/iron/kitchen/diagonal, -/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "nb" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/machinery/duct, -/obj/structure/curtain, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 4 + dir = 1 }, -/turf/open/floor/iron/freezer, -/area/ruin/space/has_grav/bubbers/persistance/command/admiral) +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/structure/cable, +/turf/open/floor/carpet/stellar, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/cargo) "nc" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -4434,56 +4326,48 @@ /turf/open/floor/mineral/titanium/tiled/white, /area/ruin/space/has_grav/bubbers/persistance/med/treatment) "nf" = ( -/obj/effect/turf_decal/siding/dark/corner{ - dir = 8 - }, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, -/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/machinery/duct, /obj/structure/cable, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 6 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/heavy, -/obj/machinery/door/airlock/science{ - name = "Ordnance" - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/sci/robotics) +/obj/effect/turf_decal/siding/dark, +/turf/open/floor/wood/large, +/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "nh" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/med/chem) -"ni" = ( -/obj/effect/turf_decal/vg_decals/atmos/nitrous_oxide, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) +/obj/effect/turf_decal/skyrat_decals/syndicate/middle/middle, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/sec/armory) +"nk" = ( +/obj/item/storage/backpack/satchel/flat, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/sec/armory) "nm" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/structure/cable, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, /obj/machinery/duct, -/obj/structure/disposalpipe/segment, -/obj/structure/sign/warning/engine_safety/directional/east, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/effect/mapping_helpers/apc/syndicate_access, -/obj/effect/mapping_helpers/apc/full_charge, -/obj/effect/mapping_helpers/apc/cut_AI_wire, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/door/window/survival_pod/left/directional/east, +/turf/open/floor/iron/freezer, +/area/ruin/space/has_grav/bubbers/persistance/command/admiral) "nn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/green/hidden/layer2, /turf/open/floor/engine, /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "np" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/carpet/green, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/chef) +/obj/structure/table/wood/fancy/red, +/obj/machinery/fax{ + fax_name = "Unknown Syndicate Fax Liason"; + name = "Syndicate Company Representative Fax Machine"; + syndicate_network = 1 + }, +/obj/structure/sign/flag/syndicate/directional/east, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/bubbers/persistance/command/liason) "ns" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -4525,19 +4409,17 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/sci/robotics) "nw" = ( -/obj/machinery/button/door/directional/west{ - id = "syndimining"; - name = "Blast Doors"; - req_access = list("syndicate") +/obj/effect/turf_decal/siding/dark{ + dir = 1 }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/surgery_tray/full/advanced, +/obj/machinery/smartfridge/organ{ + pixel_y = 32; + density = 0 }, -/obj/machinery/light/directional/north, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/evac) +/turf/open/floor/mineral/titanium/tiled/white, +/area/ruin/space/has_grav/bubbers/persistance/med/treatment) "nx" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -4567,26 +4449,23 @@ /obj/structure/flora/bush/flowers_yw/style_random, /turf/open/floor/grass, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) -"nA" = ( +"nz" = ( /obj/structure/cable, +/obj/machinery/duct, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/duct, -/turf/open/floor/iron/kitchen/diagonal, -/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) -"nB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, -/obj/effect/mapping_helpers/airlock/cutaiwire, -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 4; - name = "Isolation Cell" - }, -/turf/open/floor/mineral/plastitanium, +/obj/structure/sign/poster/contraband/syndiemoth/directional/east, +/obj/machinery/door/firedoor/heavy, +/turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) +"nA" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/structure/sink/kitchen/directional/east, +/turf/open/floor/wood/large, +/area/ruin/space/has_grav/bubbers/persistance/service/sauna) "nC" = ( /obj/structure/table/wood/fancy/red, /obj/effect/turf_decal/siding/wood{ @@ -4615,6 +4494,19 @@ /obj/structure/cargo_shelf, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/cargo) +"nG" = ( +/obj/effect/turf_decal/trimline/dark_red/filled/line{ + dir = 9 + }, +/obj/effect/turf_decal/siding/wood/end{ + dir = 1 + }, +/obj/machinery/light/directional/west, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/structure/aquarium/donkfish, +/turf/open/floor/carpet/royalblack, +/area/ruin/space/has_grav/bubbers/persistance/service/lounge) "nH" = ( /obj/structure/closet/secure_closet/interdynefob/cl_locker, /obj/effect/spawner/random/exotic/syndie, @@ -4633,9 +4525,30 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) "nK" = ( -/obj/machinery/smartfridge/drinks, -/turf/open/floor/wood/large, -/area/ruin/space/has_grav/bubbers/persistance/service/diner) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/effect/turf_decal/siding/dark_green{ + dir = 1 + }, +/obj/item/storage/belt/medical/paramedic, +/obj/item/circular_saw/field_medic, +/obj/item/healthanalyzer/advanced, +/obj/item/clothing/mask/gas/glass, +/obj/item/tank/internals/oxygen, +/obj/item/clothing/shoes/galoshes, +/obj/item/mop, +/obj/item/reagent_containers/cup/bucket/wooden, +/obj/item/clothing/suit/bio_suit/security, +/obj/item/clothing/head/bio_hood/security, +/obj/item/clothing/suit/bio_suit/virology, +/obj/item/clothing/head/bio_hood, +/obj/item/storage/bag/bio, +/obj/structure/closet/generic/wall{ + pixel_y = 32; + name = "Biohazard Equipment" + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/bubbers/persistance/med/viro) "nL" = ( /obj/structure/table/wood/fancy/red, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -4643,12 +4556,12 @@ /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/service/lounge) "nM" = ( -/obj/machinery/duct, /obj/structure/cable, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/firealarm/directional/west, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/door/firedoor/heavy, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) "nN" = ( @@ -4661,13 +4574,8 @@ /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "nO" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/effect/turf_decal/siding/blue{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/med) +/turf/closed/wall/r_wall/syndicate/nodiagonal, +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "nP" = ( /obj/effect/turf_decal/vg_decals/radiation, /obj/structure/cable, @@ -4682,39 +4590,48 @@ /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/science) "nR" = ( -/obj/structure/frame/machine/secured, -/obj/item/circuitboard/machine/circuit_imprinter/offstation, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/door/window/survival_pod/left/directional/south{ + name = "Virology"; + req_access = list("syndicate") + }, +/obj/effect/turf_decal/stripes/red/line, +/obj/structure/cable, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/sci/robotics) +/area/ruin/space/has_grav/bubbers/persistance/med/viro) "nS" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 8 +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 }, -/obj/effect/turf_decal/siding/dark{ - dir = 4 +/obj/effect/turf_decal/stripes/red/line, +/obj/machinery/button/door{ + id = "syndihanger"; + pixel_x = 24; + name = "Hanger doors"; + req_access = list("syndicate") }, -/obj/machinery/door/airlock/vault{ - name = "Vault"; - id_tag = "syndiship_vault" +/turf/open/floor/engine/hull{ + initial_gas_mix = "LAVALAND_ATMOS" }, -/obj/effect/mapping_helpers/airlock/cutaiwire, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/door/firedoor/heavy, -/obj/structure/cable, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/command/vault) +/area/ruin/space/has_grav/bubbers/persistance/service) "nT" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/structure/fans/tiny/forcefield, -/obj/machinery/door/poddoor{ - id = "syndihanger" +/obj/machinery/button/door{ + id = "syndibridge_w"; + name = "Bridge Window Shutters"; + req_access = list("syndicate_leader"); + pixel_y = 8; + pixel_x = -24 }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/machinery/computer/monitor{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium/red{ + icon_state = "plastitanium" + }, +/area/ruin/space/has_grav/bubbers/persistance/command/bridge) "nU" = ( /obj/structure/chair/sofa/bench/right{ dir = 8 @@ -4722,16 +4639,18 @@ /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/sauna) "nV" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/turf/open/floor/iron/kitchen/herringbone, -/area/ruin/space/has_grav/bubbers/persistance/service/salon) +/obj/structure/cable, +/turf/closed/wall/r_wall/syndicate/cruiser, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/janitor) "nW" = ( -/obj/machinery/atmospherics/components/binary/tank_compressor, -/obj/structure/sign/poster/contraband/singletank_bomb/directional/west, +/obj/structure/cable, +/obj/machinery/duct, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/digital_clock/directional/west, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/sci/ordnance) +/area/ruin/space/has_grav/bubbers/persistance/service) "nX" = ( /obj/machinery/power/floodlight, /obj/effect/turf_decal/stripes/red/line{ @@ -4807,12 +4726,14 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/sec/armory) "oi" = ( -/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, -/obj/machinery/atmospherics/pipe/layer_manifold/cyan{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood/corner{ dir = 8 }, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) +/turf/open/floor/carpet/stellar, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/cargo) "ok" = ( /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/engineering/mining) @@ -4824,42 +4745,40 @@ /turf/open/floor/grass, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "op" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/tattoo_kit{ - pixel_y = 4 +/obj/structure/lattice/catwalk/mining, +/turf/open/floor/engine/hull{ + initial_gas_mix = "LAVALAND_ATMOS" }, -/obj/item/fur_dyer, -/obj/effect/turf_decal/siding/thinplating/dark, -/turf/open/floor/iron/kitchen/herringbone, -/area/ruin/space/has_grav/bubbers/persistance/service/salon) +/area/lavaland/surface/outdoors) "oq" = ( -/obj/machinery/light/directional/west, -/obj/machinery/bluespace_miner, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering/mining) -"or" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /obj/structure/cable, -/obj/structure/disposalpipe/segment{ +/obj/structure/chair/sofa/corp/right{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/effect/turf_decal/siding/dark{ - dir = 10 +/turf/open/floor/carpet/royalblack, +/area/ruin/space/has_grav/bubbers/persistance/sec/prison/rec) +"or" = ( +/obj/effect/turf_decal/vg_decals/atmos/oxygen, +/obj/machinery/atmospherics/components/binary/valve/digital{ + dir = 8 }, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/sci/robotics) +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2{ + dir = 4 + }, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) "os" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/bucket/wooden{ - pixel_x = -9; - pixel_y = 7 +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/junction/flip{ + dir = 1 }, -/obj/item/stack/sheet/mineral/wood/fifty, -/obj/machinery/light/directional/west, -/obj/item/stack/sheet/mineral/wood/fifty, -/turf/open/floor/wood/large, -/area/ruin/space/has_grav/bubbers/persistance/service/sauna) +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "ot" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -4869,6 +4788,21 @@ "ou" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +"ov" = ( +/obj/machinery/conveyor{ + id = "syndirecycle"; + dir = 1 + }, +/obj/effect/spawner/random/maintenance/five, +/obj/item/stock_parts/power_store/cell/lead, +/obj/item/stock_parts/power_store/cell/lead, +/obj/effect/spawner/random/maintenance/two, +/obj/effect/spawner/random/trash/garbage{ + pixel_x = 4; + pixel_y = 5 + }, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/cargo) "ow" = ( /obj/machinery/air_sensor{ chamber_id = "syndiship_turbine" @@ -4888,24 +4822,15 @@ /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/service/sauna) "oB" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/disposalpipe/trunk{ - dir = 8 +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 9 }, -/obj/machinery/disposal/bin, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) -"oC" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/door/firedoor/heavy, -/obj/machinery/door/airlock/medical/glass{ - name = "Operating Room" +/obj/structure/disposalpipe/segment, +/obj/structure/chair/comfy/shuttle/tactical{ + dir = 8 }, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, -/obj/effect/mapping_helpers/airlock/cutaiwire, -/turf/open/floor/iron/white/small, -/area/ruin/space/has_grav/bubbers/persistance/med/treatment) +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/command/bridge) "oD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/camera/autoname/directional/east{ @@ -4938,11 +4863,17 @@ /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "oH" = ( -/obj/structure/closet/firecloset/wall{ - pixel_y = 32 +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 }, -/turf/open/floor/pod/dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 4 + }, +/turf/open/floor/iron/kitchen/herringbone, +/area/ruin/space/has_grav/bubbers/persistance/service/salon) "oI" = ( /obj/structure/emergency_shield/cult/weak{ name = "Energy Shield" @@ -4959,17 +4890,10 @@ /turf/open/floor/iron/terracotta/herringbone, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "oK" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/chem_dispenser/frontier_appliance, -/obj/structure/cable, -/obj/machinery/duct, -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, -/turf/open/floor/wood/large, -/area/ruin/space/has_grav/bubbers/persistance/service/diner) +/obj/effect/turf_decal/siding/dark, +/obj/item/kirbyplants/fern, +/turf/open/floor/iron/white/small, +/area/ruin/space/has_grav/bubbers/persistance/service/lockers) "oM" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -4978,21 +4902,39 @@ /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "oO" = ( -/obj/structure/chair/office/tactical, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/sec/brigentrance) -"oP" = ( -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/sci/robotics) -"oQ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 +/obj/machinery/computer{ + desc = "A console meant to allow modifications to IDs. There's a chameleon ID stuck inside and no one has been able to pull it out..."; + icon_keyboard = "syndie_key"; + icon_screen = "explosive"; + name = "syndicate access change console"; + dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/item/paper{ + default_raw_text = "

DS2 Corporate Report

The SSV Dauntless has successfully landed itself near active Nanotrasen installations. Engine shutdown in progress...

The Syndicate welcomes you onboard, Corporate Liaison. It is deeply suggested you help our crew via informing them of their corporate investors' goal and to help maintain cohesion. The ship is jointy ran, afterall. Don't hurt yourself now, and stay winning.

"; + name = "paper- 'SSV Dauntless Corporate Report'" + }, +/obj/machinery/light/directional/south, +/obj/structure/sign/calendar/directional/south, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/bubbers/persistance/command/liason) +"oP" = ( +/obj/structure/closet/secure_closet/brig{ + id = "Syndicate Cell"; + name = "Syndicate Cell locker"; + req_one_access = null; + req_access = list("syndicate") }, /turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) +/area/ruin/space/has_grav/bubbers/persistance/sec/holding) +"oQ" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/obj/structure/sign/warning/no_smoking/directional/west, +/obj/machinery/light/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/chem_heater/withbuffer, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/bubbers/persistance/med/chem) "oR" = ( /obj/structure/closet/secure_closet/interdynefob/brig_officer_locker, /obj/effect/turf_decal/siding/wood{ @@ -5029,15 +4971,20 @@ /turf/open/floor/iron/terracotta/herringbone, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "oV" = ( -/obj/machinery/duct, -/obj/structure/cable, -/obj/structure/disposalpipe/junction/flip{ - dir = 8 +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/gym) +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" + }, +/obj/structure/sign/warning/chem_diamond/directional/west, +/obj/structure/lattice/catwalk/mining, +/obj/machinery/conveyor{ + dir = 8; + id = "QMLoad" + }, +/turf/open/floor/pod/dark, +/area/lavaland/surface/outdoors) "oY" = ( /obj/machinery/conveyor_switch, /obj/effect/turf_decal/stripes/line{ @@ -5065,30 +5012,27 @@ /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "pc" = ( -/obj/effect/turf_decal/skyrat_decals/syndicate/bottom/middle, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/sec/armory) -"pd" = ( -/obj/machinery/vending/hydronutrients{ - pixel_x = -28; - can_astar_pass = 1; - density = 0; - all_products_free = 1 +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/flora/bush/flowers_pp/style_random, -/turf/open/floor/grass, -/area/ruin/space/has_grav/bubbers/persistance/service/hydro) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/airlock/highsecurity{ + name = "Armory" + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/leader, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "pf" = ( /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/sec/armory) "pg" = ( -/obj/structure/extinguisher_cabinet/directional/south, -/obj/effect/mob_spawn/ghost_role/human/persistence/syndicate/stationmed{ - dir = 4; - name = "Persistence Medical Officer" - }, -/turf/open/floor/wood/large, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/medical) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/bubbers/persistance/sci/robotics) "ph" = ( /obj/machinery/vending/cigarette/syndicate{ onstation = 0; @@ -5116,45 +5060,46 @@ /obj/machinery/duct, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +"pk" = ( +/obj/machinery/light/directional/west, +/obj/machinery/digital_clock/directional/west, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/sec/prison) "pl" = ( -/obj/structure/cable, -/obj/structure/table/reinforced/plastitaniumglass, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/item/reagent_containers/cup/mortar, -/obj/item/pestle, -/turf/open/floor/iron/white, -/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) -"pm" = ( -/obj/machinery/porta_turret/syndicate{ - dir = 8; - pixel_y = 32 - }, /obj/structure/emergency_shield/cult/weak{ name = "Energy Shield" }, /obj/structure/emergency_shield/cult/weak{ name = "Energy Shield" }, -/obj/machinery/camera/autoname/directional/north{ - name = "Persistence Exterior North"; - network = list("persistence_ext") - }, /obj/structure/lattice/catwalk/mining, +/obj/machinery/porta_turret/syndicate{ + dir = 8; + pixel_x = 32 + }, +/obj/machinery/camera/autoname/directional/east{ + network = list("persistence_ext"); + name = "persistence exterior east" + }, /turf/open/lava/smooth/lava_land_surface, /area/ruin/space/has_grav/bubbers/dauntless/command/vault) +"po" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/turf/open/floor/wood/tile, +/area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) "pp" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/door/window/survival_pod/left/directional/south{ - name = "Virology"; - req_access = list("syndicate") +/obj/effect/turf_decal/siding/white{ + dir = 10 + }, +/obj/structure/chair/sofa/corp/right{ + color = "#DE3A3A"; + dir = 4 }, -/obj/effect/turf_decal/stripes/red/line, -/obj/structure/cable, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/med/viro) +/area/ruin/space/has_grav/bubbers/persistance/med) "pq" = ( /obj/machinery/duct, /obj/structure/cable, @@ -5177,15 +5122,6 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) -"ps" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service/diner) "pt" = ( /obj/structure/dresser, /obj/item/flashlight/lamp/green{ @@ -5250,13 +5186,21 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/rnd) +"px" = ( +/obj/machinery/power/turbine/core_rotor{ + dir = 8; + mapping_id = "dauntless_turbine" + }, +/obj/structure/cable, +/turf/open/floor/engine, +/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "pz" = ( -/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, -/obj/machinery/atmospherics/pipe/layer_manifold/dark/visible{ - dir = 8 +/obj/machinery/conveyor{ + id = "syndirecycle"; + dir = 1 }, /turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) +/area/ruin/space/has_grav/bubbers/persistance/cargo) "pA" = ( /obj/machinery/duct, /obj/structure/chair/comfy/beige{ @@ -5274,26 +5218,35 @@ /turf/open/floor/engine/o2, /area/ruin/space/has_grav/bubbers/persistance/engineering/gas) "pD" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/sign/poster/contraband/free_drone/directional/west, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) -"pE" = ( -/obj/machinery/computer/crew/syndie{ - dir = 1 - }, -/turf/open/floor/mineral/plastitanium/red{ - icon_state = "plastitanium" - }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/machinery/status_display/department_balance{ + credits_account = "INT"; + name = "dauntless budget display"; + pixel_y = 30; + default_logo = "synd" + }, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/coffeemaker/impressa, +/obj/item/storage/box/coffeepack{ + pixel_x = 15; + pixel_y = 10 + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/command/bridge) +"pE" = ( +/obj/machinery/computer/crew/syndie{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium/red{ + icon_state = "plastitanium" + }, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) "pI" = ( -/obj/structure/table, -/obj/machinery/xenoarch/scanner, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/engineering/mining) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/ruin/space/has_grav/bubbers/persistance/med/treatment) "pK" = ( /obj/structure/closet/secure_closet/interdynefob/armory_gear_locker, /obj/item/ammo_box/magazine/m9mm, @@ -5313,6 +5266,18 @@ }, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/sec/armory) +"pM" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/obj/structure/sign/barber{ + pixel_x = 14 + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service) "pN" = ( /obj/machinery/duct, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -5333,6 +5298,14 @@ /obj/machinery/duct, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) +"pQ" = ( +/obj/structure/cable, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) "pS" = ( /obj/structure/drain/big, /turf/open/floor/iron/white/small, @@ -5344,11 +5317,14 @@ /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/rnd) "pU" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 10 }, -/turf/open/floor/iron/colony/bolts, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/command/bridge) "pV" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 4 @@ -5435,23 +5411,10 @@ /turf/open/lava/smooth/lava_land_surface, /area/lavaland/surface/outdoors) "qh" = ( -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/machinery/porta_turret/syndicate{ - dir = 8; - pixel_x = 32 - }, -/obj/machinery/camera/autoname/directional/east{ - network = list("persistence_ext"); - name = "persistence exterior east" - }, -/obj/structure/lattice/catwalk/mining, -/turf/open/lava/smooth/lava_land_surface, -/area/ruin/space/has_grav/bubbers/dauntless/command/vault) +/obj/structure/sign/warning/gas_mask/directional/south, +/obj/machinery/light/directional/south, +/turf/open/floor/pod/dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) "qi" = ( /obj/structure/sign/poster/contraband/free_key/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -5464,10 +5427,6 @@ /obj/effect/turf_decal/siding/thinplating/dark/corner, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) -"qn" = ( -/obj/machinery/bluespace_miner, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering/mining) "qp" = ( /obj/structure/cable, /obj/machinery/door/firedoor/heavy, @@ -5479,15 +5438,20 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/cargo) "qs" = ( -/obj/machinery/duct, -/obj/structure/cable, -/obj/structure/disposalpipe/junction/flip{ - dir = 1 +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/iron/kitchen/diagonal, -/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" + }, +/obj/machinery/porta_turret/syndicate{ + dir = 8; + pixel_x = 32; + pixel_y = 32 + }, +/obj/structure/lattice/catwalk/mining, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/space/has_grav/bubbers/dauntless/command/vault) "qt" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/red/line{ @@ -5510,24 +5474,26 @@ /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/robotics) "qx" = ( -/obj/effect/turf_decal/skyrat_decals/syndicate/bottom/left, -/obj/effect/turf_decal/siding/thinplating/dark/corner{ +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/siding/dark{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/command/bridge) +/obj/machinery/duct, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) "qz" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/structure/sign/poster/official/there_is_no_gas_giant/directional/west, -/obj/machinery/light/directional/west, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/siding/dark_green{ dir = 4 }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/cargo/drone) +/obj/machinery/computer/pandemic, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/apc/syndicate_access, +/obj/effect/mapping_helpers/apc/full_charge, +/obj/effect/mapping_helpers/apc/cut_AI_wire, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/bubbers/persistance/med/viro) "qA" = ( /obj/machinery/airalarm/directional/east, /obj/effect/mapping_helpers/airalarm/syndicate_access, @@ -5543,14 +5509,6 @@ "qB" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/medical) -"qC" = ( -/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, -/obj/structure/cable, -/obj/machinery/door/poddoor{ - id = "prison_shutters" - }, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/sec/prison) "qD" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -5592,20 +5550,15 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/service/lounge) "qJ" = ( -/obj/machinery/door/airlock/highsecurity{ - name = "Bridge" - }, -/obj/machinery/door/firedoor/heavy, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/leader, -/obj/effect/mapping_helpers/airlock/cutaiwire, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/safe/abovetilefloor, +/obj/item/sign/flag/syndicate{ + pixel_x = -3; + pixel_y = 6 }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/command/bridge) +/turf/open/floor/carpet/stellar, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/cargo) "qL" = ( /obj/structure/cable, /obj/machinery/duct, @@ -5626,47 +5579,81 @@ }, /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) -"qO" = ( -/obj/structure/cable, +"qN" = ( +/obj/structure/disposalpipe/junction/flip{ + dir = 1 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/light/directional/south, -/obj/structure/plant_tank, -/turf/open/floor/iron/terracotta/herringbone, -/area/ruin/space/has_grav/bubbers/persistance/service/hydro) +/obj/structure/cable, +/obj/machinery/light/directional/east, +/obj/machinery/duct, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) +"qO" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/structure/bed/double{ + dir = 1 + }, +/obj/item/bedsheet/hos/double{ + dir = 4 + }, +/obj/machinery/button/door{ + id = "syndishipmaad"; + pixel_x = -24; + pixel_y = 8; + name = "Airlock Bolts"; + specialfunctions = 4; + normaldoorcontrol = 1 + }, +/turf/open/floor/carpet/red, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/maa) "qP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/ruin/space/has_grav/bubbers/persistance/service/gym) "qQ" = ( -/obj/effect/mapping_helpers/apc/full_charge, -/obj/effect/mapping_helpers/apc/cut_AI_wire, -/obj/effect/mapping_helpers/apc/syndicate_access, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 +/obj/machinery/plumbing/synthesizer/water_synth, +/obj/effect/turf_decal/siding/dark{ + dir = 10 }, -/obj/effect/turf_decal/stripes/end, -/obj/structure/window/reinforced/plasma/spawner/directional/west, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/cargo) +/turf/open/floor/noslip, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) "qR" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/structure/cable, -/obj/machinery/duct, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/door/window/survival_pod/left/directional/east{ + name = "Liason Desk"; + req_access = list("syndicate_leader") + }, +/obj/machinery/door/window/survival_pod/left/directional/west{ + req_access = list("syndicate") + }, +/obj/machinery/door/poddoor/shutters/window{ + id = "syndiliasonshutter" + }, +/obj/machinery/door/firedoor/heavy, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/area/ruin/space/has_grav/bubbers/persistance/command/liason) "qT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/netpod, /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) +"qU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/junction/yjunction{ + dir = 1 + }, +/obj/machinery/duct, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "qV" = ( /obj/structure/weightmachine/weightlifter, /obj/effect/turf_decal/siding{ @@ -5676,43 +5663,45 @@ /turf/open/floor/iron/white/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "qW" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 9 +/obj/effect/spawner/liquids_spawner/shoulders, +/obj/structure/chair/sofa/bench/right{ + dir = 4 }, -/obj/machinery/digital_clock/directional/north, -/obj/machinery/computer/operating, -/turf/open/floor/mineral/titanium/tiled/white, -/area/ruin/space/has_grav/bubbers/persistance/med/treatment) +/obj/effect/mist, +/turf/open/floor/iron/pool/cobble/corner{ + dir = 8 + }, +/area/ruin/space/has_grav/bubbers/persistance/service/sauna) "qX" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 10 +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/turf/open/floor/iron/white/diagonal, -/area/ruin/space/has_grav/bubbers/persistance/med) +/obj/structure/disposalpipe/segment, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/command/bridge) "qY" = ( -/obj/machinery/duct, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/effect/mapping_helpers/apc/syndicate_access, -/obj/effect/mapping_helpers/apc/cut_AI_wire, -/obj/effect/mapping_helpers/apc/full_charge, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/sec/holding) -"qZ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/effect/turf_decal/siding/wood{ - dir = 1 +/obj/machinery/button/door/directional/south{ + name = "Prisoner Lockdown"; + id = "Syndi_cell"; + req_access = list("syndicate_leader"); + pixel_y = 40; + pixel_x = 8; + specialfunctions = 4; + normaldoorcontrol = 1 }, -/obj/machinery/airalarm/directional/north, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/obj/structure/cable, -/turf/open/floor/carpet/stellar, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/cargo) +/obj/machinery/button/door/directional/north{ + id = "prison_shutters"; + name = "Prisoner Viewing Privlages"; + req_access = list("syndicate_leader"); + pixel_x = 8 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/sec/brigentrance) +"qZ" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/storage/hypospraykit/cmo/combat, +/turf/open/floor/wood/large, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/medical) "ra" = ( /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium{ polarizer_id = "persistence_operating" @@ -5751,15 +5740,15 @@ /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/cargo) "rg" = ( -/obj/effect/spawner/liquids_spawner/shoulders, -/obj/structure/chair/sofa/bench/left{ - dir = 4 - }, -/obj/effect/mist, -/turf/open/floor/iron/pool/cobble/corner{ +/obj/effect/turf_decal/stripes/line{ dir = 1 }, -/area/ruin/space/has_grav/bubbers/persistance/service/sauna) +/obj/structure/closet/emcloset/wall{ + pixel_x = -32 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/sec/holding) "rh" = ( /obj/item/vending_refill/hotdog, /obj/machinery/light/directional/north, @@ -5823,12 +5812,42 @@ /obj/effect/turf_decal/siding, /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/bubbers/persistance/service/diner) -"rr" = ( -/obj/machinery/light_switch/directional/south, +"rq" = ( /obj/structure/table/reinforced/plastitaniumglass, -/obj/item/storage/box/beakers/bluespace, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/med/chem) +/obj/item/modular_computer/laptop/preset/syndicate, +/obj/structure/sign/poster/contraband/lamarr/directional/south, +/obj/structure/cable, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/turf/open/floor/carpet/purple, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/science) +"rr" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/sign/poster/contraband/free_drone/directional/west, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) +"rt" = ( +/obj/machinery/porta_turret/syndicate{ + dir = 8; + pixel_y = 32 + }, +/obj/machinery/camera/autoname/directional/north{ + name = "Persistence Exterior North"; + network = list("persistence_ext") + }, +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" + }, +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" + }, +/obj/structure/lattice/catwalk/mining, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/space/has_grav/bubbers/dauntless/command/vault) "ru" = ( /obj/machinery/door/firedoor/heavy, /obj/structure/curtain/cloth/fancy, @@ -5865,11 +5884,18 @@ }, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) "rx" = ( -/obj/machinery/light/directional/south, -/obj/structure/table, -/obj/machinery/xenoarch/recoverer, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/engineering/mining) +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/button/door/directional/west{ + id = "synditrash"; + name = "Persistance Recycling Blast Doors"; + req_access = list("syndicate"); + pixel_y = -8 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "ry" = ( /obj/structure/fans/tiny, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -5884,21 +5910,39 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service/freezer) "rC" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 8 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 4 +/obj/machinery/mass_driver/trash{ + dir = 1; + id = "synditrashgun" }, -/turf/open/floor/iron/terracotta/herringbone, -/area/ruin/space/has_grav/bubbers/persistance/service/hydro) +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/cargo) "rD" = ( -/obj/machinery/firealarm/directional/east, -/turf/closed/wall/r_wall/syndicate/cruiser, -/area/ruin/space/has_grav/bubbers/persistance/command/admiral) +/obj/item/storage/briefcase/secure/white{ + pixel_y = 13 + }, +/obj/effect/spawner/random/bureaucracy/folder{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/effect/spawner/random/bureaucracy/folder{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/effect/spawner/random/bureaucracy/folder{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/structure/table/wood/fancy/black, +/obj/item/paper_bin/carbon{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/pen/fountain/captain{ + name = "Liason's fountain pen"; + pixel_y = 5 + }, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/bubbers/persistance/command/liason) "rE" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -5938,57 +5982,29 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/iron/white/diagonal, /area/ruin/space/has_grav/bubbers/persistance/med) -"rN" = ( -/obj/machinery/light/directional/north, -/obj/machinery/seed_extractor{ - pixel_x = -3 +"rM" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 }, -/turf/open/floor/grass, -/area/ruin/space/has_grav/bubbers/persistance/service/hydro) +/obj/machinery/light/directional/west, +/obj/item/choice_beacon/music, +/obj/effect/spawner/random/exotic/syndie, +/obj/item/mod/module/shooting_assistant, +/obj/machinery/digital_clock/directional/west, +/obj/effect/spawner/random/entertainment/plushie, +/obj/effect/spawner/random/entertainment/plushie_delux, +/obj/item/clothing/suit/jacket/runner/syndicate, +/obj/structure/closet/secure_closet/persistence/maa_locker, +/turf/open/floor/carpet/red, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/maa) "rO" = ( -/obj/structure/closet/secure_closet/freezer/meat{ - req_access = list("syndicate") - }, -/obj/item/storage/fancy/egg_box, -/obj/item/storage/fancy/egg_box, -/obj/item/reagent_containers/condiment/flour, -/obj/item/reagent_containers/condiment/flour, -/obj/item/reagent_containers/condiment/enzyme{ - pixel_x = 12 +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/obj/item/reagent_containers/condiment/rice, -/obj/item/reagent_containers/condiment/sugar, -/obj/item/reagent_containers/condiment/milk, -/obj/item/reagent_containers/condiment/milk, -/obj/item/reagent_containers/condiment/soymilk, -/obj/item/reagent_containers/condiment/soymilk, -/obj/item/choice_beacon/ingredient, -/obj/item/toy/figure/chef, -/obj/item/circuitboard/machine/dish_drive, -/obj/item/food/meat/slab, -/obj/item/food/meat/slab, -/obj/item/food/meat/slab, -/obj/item/food/meat/slab, -/obj/item/food/meat/slab, -/obj/item/food/meat/slab, -/obj/item/food/meat/slab, -/obj/item/food/meat/slab, -/obj/item/food/meat/slab, -/obj/item/food/meat/slab, -/obj/item/food/meat/slab, -/obj/item/food/meat/slab, -/obj/item/food/meat/slab, -/obj/item/food/meat/slab, -/obj/item/food/meat/slab, -/obj/item/food/meat/slab, -/obj/item/food/meat/slab, -/obj/item/food/meat/slab, -/obj/item/food/meat/slab, -/obj/item/food/meat/slab, -/obj/item/food/meat/slab, -/obj/item/food/meat/slab, -/turf/open/floor/iron/kitchen_coldroom/freezerfloor, -/area/ruin/space/has_grav/bubbers/persistance/service/freezer) +/obj/structure/sign/poster/contraband/babel_device/directional/east, +/obj/machinery/door/firedoor/heavy, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service) "rP" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -5998,24 +6014,33 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/carpet/royalblack, /area/ruin/space/has_grav/bubbers/persistance/sec/prison/rec) -"rQ" = ( -/obj/effect/turf_decal/skyrat_decals/ds2/left, -/obj/effect/turf_decal/siding/thinplating/dark/corner{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating/dark/corner{ +"rR" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/service) -"rR" = ( -/obj/machinery/duct, +/obj/item/clothing/shoes/sneakers/crimson, +/obj/item/clothing/under/rank/prisoner/syndicate, +/obj/item/clothing/under/rank/prisoner/syndicate{ + pixel_y = 4 + }, +/obj/item/clothing/under/rank/prisoner/syndicate{ + pixel_y = 8 + }, +/obj/item/clothing/shoes/sneakers/crimson{ + pixel_x = -4 + }, +/obj/item/clothing/shoes/sneakers/crimson{ + pixel_x = 4 + }, +/obj/structure/table/reinforced/plastitaniumglass, /obj/machinery/airalarm/directional/west, /obj/effect/mapping_helpers/airalarm/syndicate_access, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/light/cold/directional/north, -/turf/open/floor/iron/white/small, -/area/ruin/space/has_grav/bubbers/persistance/sec/holding) +/obj/machinery/door/window/survival_pod/left/directional/east{ + req_access = list("syndicate") + }, +/obj/item/nifsoft_remover/syndie, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/sec/prison) "rS" = ( /obj/effect/spawner/liquids_spawner/shoulders, /obj/machinery/button/door/directional/north{ @@ -6053,22 +6078,24 @@ /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "rV" = ( -/obj/machinery/button/door{ - id = "syndibridge_w"; - name = "Bridge Window Shutters"; - req_access = list("syndicate_leader"); - pixel_x = -24 +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/obj/structure/noticeboard/directional/north, -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/paper/dark_matteor_summoning, -/obj/item/paper/crumpled/muddy/fluff/cannon_instructions, -/obj/item/paper/crumpled/retired_designs, -/obj/item/paper/crumpled/plap, -/obj/item/paper/crumpled/rbmk2, -/obj/item/paper/default_lawset_list, +/obj/machinery/light/directional/east, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/command/bridge) +/area/ruin/space/has_grav/bubbers/persistance/service) +"rX" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/closet/emcloset/wall{ + pixel_x = -32 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "rY" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -6080,13 +6107,8 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/engineering/mining) "rZ" = ( -/obj/structure/disposalpipe/trunk, -/obj/machinery/disposal/bin, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/sec/holding) +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/sec/brigentrance) "sa" = ( /obj/machinery/posialert/directional/south{ radio_key = /obj/item/encryptionkey/headset_syndicate/interdyne @@ -6121,16 +6143,18 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) "sf" = ( -/obj/effect/turf_decal/vg_decals/atmos/plasma, -/obj/machinery/atmospherics/components/binary/valve/digital{ +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service) "sh" = ( -/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/service/gym) +/obj/structure/sign/warning/yes_smoking/circle/directional/west, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/sci/ordnance) "si" = ( /obj/machinery/airalarm/directional/west, /obj/effect/turf_decal/stripes/red/line{ @@ -6139,36 +6163,27 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "sj" = ( -/obj/machinery/conveyor_switch/oneway{ - id = "syndirecycle" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/door/window/survival_pod/left/directional/west{ +/obj/machinery/door/window/survival_pod/left/directional/north{ + name = "Virology Airlock"; req_access = list("syndicate") }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/cargo) -"sm" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/effect/turf_decal/siding/blue{ + dir = 1 }, -/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/bubbers/persistance/med) +"sm" = ( /obj/structure/cable, -/obj/effect/mapping_helpers/apc/syndicate_access, -/obj/effect/mapping_helpers/apc/cut_AI_wire, -/obj/effect/mapping_helpers/apc/full_charge, -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/multitool/circuit, -/turf/open/floor/iron/smooth, -/area/ruin/space/has_grav/bubbers/persistance/sci/rnd) +/obj/machinery/duct, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "so" = ( /obj/structure/frame/machine/secured, /obj/item/circuitboard/machine/component_printer, @@ -6189,43 +6204,41 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/sci/robotics) "sq" = ( -/obj/machinery/cryopod{ - dir = 4 +/obj/effect/turf_decal/siding/dark_green{ + dir = 8 }, -/obj/machinery/computer/cryopod/interdyne/directional/west, -/obj/effect/turf_decal/siding/wood{ - dir = 9 +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/storage/box/beakers{ + pixel_x = 2; + pixel_y = 2 }, -/turf/open/floor/wood, -/area/ruin/space/has_grav/bubbers/persistance/service/lockers) +/obj/item/storage/box/syringes, +/obj/item/restraints/handcuffs/cable/zipties, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/bubbers/persistance/med/viro) +"sr" = ( +/obj/structure/window/reinforced/plasma/spawner/directional/north, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) "st" = ( /obj/structure/sign/warning/no_smoking/directional/east, /obj/structure/fans/tiny, /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/engineering/gas) "su" = ( -/obj/structure/rack/gunrack, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/structure/cable, -/obj/item/gun/ballistic/rifle/sniper_rifle/syndicate, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/sec/armory) +/turf/closed/wall/r_wall/syndicate/nodiagonal, +/area/ruin/space/has_grav/bubbers/persistance/sec/holding) "sw" = ( -/obj/structure/cable, -/obj/machinery/duct, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/junction/flip{ - dir = 1 +/obj/structure/sign/painting/library{ + pixel_x = -30 }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/machinery/light/directional/west{ + dir = 2 + }, +/obj/machinery/libraryscanner, +/turf/open/floor/wood, +/area/ruin/space/has_grav/bubbers/persistance/service/lounge) "sy" = ( /obj/effect/turf_decal/siding/thinplating/dark/corner{ dir = 1 @@ -6233,18 +6246,12 @@ /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "sz" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 8 - }, -/obj/structure/cable, -/obj/structure/sign/poster/contraband/kudzu/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 4 - }, -/turf/open/floor/iron/terracotta/herringbone, -/area/ruin/space/has_grav/bubbers/persistance/service/hydro) +/obj/machinery/light/directional/south, +/obj/machinery/light_switch/directional/south, +/obj/effect/turf_decal/siding/blue, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/bubbers/persistance/med) "sA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -6296,8 +6303,18 @@ /turf/open/floor/iron/terracotta/small, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/engineering) "sE" = ( -/obj/machinery/firealarm/directional/west, -/turf/open/floor/plating/reinforced, +/obj/effect/turf_decal/stripes, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "rad_shutters" + }, +/obj/structure/cable, +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/airlock/atmos/glass{ + name = "Turbine Room Airlock" + }, +/turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "sF" = ( /turf/open/floor/mineral/titanium/white, @@ -6319,18 +6336,13 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) "sJ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/siding{ - dir = 9 - }, -/obj/machinery/cryopod{ - dir = 2 +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/effect/turf_decal/siding/blue{ + dir = 8 }, -/obj/machinery/computer/cryopod/interdyne/directional/north, -/turf/open/floor/iron/white/small, -/area/ruin/space/has_grav/bubbers/persistance/sec/prison) +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/bubbers/persistance/med) "sL" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -6354,26 +6366,19 @@ /obj/structure/sign/poster/official/safety_internals/directional/east, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service) -"sO" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/structure/window/reinforced/survival_pod/spawner/directional/south, -/obj/item/storage/box/medipens{ - pixel_x = 4; - pixel_y = 13 - }, -/obj/machinery/light/directional/west, -/turf/open/floor/iron/white, -/area/ruin/space/has_grav/bubbers/persistance/med/treatment) "sP" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 +/obj/structure/cable, +/obj/structure/disposalpipe/trunk{ + dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/machinery/airalarm/directional/south, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/machinery/disposal/bin, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/iron/dark/textured_corner{ dir = 4 }, -/obj/machinery/door/firedoor/heavy, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) +/area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) "sQ" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -6401,51 +6406,71 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "sT" = ( -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) +/obj/structure/railing{ + dir = 10 + }, +/obj/structure/lattice/catwalk/mining, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "sU" = ( -/obj/machinery/conveyor{ - id = "syndirecycle"; - dir = 1 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/cargo) +/obj/machinery/sleeper/syndie/fullupgrade{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/ruin/space/has_grav/bubbers/persistance/med/treatment) "sV" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/structure/cable, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/med) +/mob/living/simple_animal/hostile/syndimouse{ + name = "Syndicate Chefpretive"; + desc = "A strange mouse in a Syndicate combat MODsuit, built for mice!"; + faction = list("neutral","Syndicate") + }, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/ruin/space/has_grav/bubbers/persistance/service/freezer) "sW" = ( -/obj/machinery/digital_clock/directional/west, -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/modular_computer/laptop/preset/syndicate, -/obj/item/reagent_containers/cup/maunamug, -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/siding/wood{ - dir = 9 +/obj/structure/rack/shelf, +/obj/item/melee/baton/telescopic{ + pixel_y = 10; + pixel_x = 3 }, -/obj/machinery/newscaster/directional/north, +/obj/item/melee/baton/telescopic{ + pixel_x = 9; + pixel_y = 10 + }, +/obj/item/melee/baton/telescopic{ + pixel_x = -3; + pixel_y = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/item/melee/energy/sword/saber{ + pixel_x = 3 + }, +/obj/item/melee/energy/sword/saber{ + pixel_x = 8 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/sec/armory) +"sY" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/carpet/green, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/chef) -"sY" = ( -/obj/machinery/button/door{ - id = "syndibridge_w"; - name = "Bridge Window Shutters"; - req_access = list("syndicate_leader"); - pixel_y = 8; - pixel_x = -24 - }, -/obj/machinery/airalarm/directional/west, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/obj/machinery/computer/monitor{ +"sZ" = ( +/obj/machinery/duct, +/obj/structure/cable, +/obj/structure/disposalpipe/junction{ dir = 1 }, -/turf/open/floor/mineral/plastitanium/red{ - icon_state = "plastitanium" - }, -/area/ruin/space/has_grav/bubbers/persistance/command/bridge) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "tb" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/cargo/drone) @@ -6457,12 +6482,14 @@ /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/sauna) "td" = ( -/obj/effect/turf_decal/vg_decals/atmos/nitrogen, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer2{ - dir = 8 +/obj/machinery/door/window/survival_pod/left/directional/east{ + req_access = list("syndicate") }, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) +/obj/structure/flora/bush/flowers_br/style_random, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/turf/open/misc/grass/jungle/station, +/area/ruin/space/has_grav/bubbers/persistance/med) "te" = ( /obj/structure/sign/poster/official/foam_force_ad/directional/south, /obj/structure/sign/poster/official/carwo_magazine/directional/east, @@ -6470,62 +6497,51 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/cargo) "tf" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/status_display/department_balance{ - credits_account = "INT"; - name = "dauntless budget display"; - pixel_y = 30; - default_logo = "synd" +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 5 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/sec/armory) +"th" = ( +/obj/machinery/smartfridge/food, +/turf/open/floor/iron/kitchen/diagonal, +/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) +"ti" = ( /obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/coffeemaker/impressa, -/obj/item/storage/box/coffeepack{ - pixel_x = 15; +/obj/item/storage/box/stockparts/deluxe{ + pixel_x = -6; pixel_y = 10 }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/command/bridge) -"th" = ( -/obj/machinery/airalarm/directional/west, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/effect/mob_spawn/ghost_role/human/persistence/syndicate/service{ - dir = 4; - name = "Persistence General Staff" +/obj/item/storage/box/stockparts/deluxe{ + pixel_x = 3; + pixel_y = -4 }, -/turf/open/floor/carpet/green, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/chef) -"ti" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 +/turf/open/floor/pod/dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) +"tj" = ( +/obj/structure/railing/wooden_fencing{ + dir = 8 }, -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/stripes/line{ +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/railing/wooden_fencing{ dir = 1 }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/cargo) -"tj" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 10 - }, -/obj/machinery/light/directional/west, -/turf/open/floor/wood, -/area/ruin/space/has_grav/bubbers/persistance/service/gym) +/turf/open/floor/grass, +/area/ruin/space/has_grav/bubbers/persistance/service/hydro) "tk" = ( -/obj/structure/sign/painting/library{ - pixel_x = -30 +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/light/directional/south, +/obj/machinery/barsign/all_access/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 9 }, -/obj/structure/rack, -/obj/item/paint_palette, -/obj/item/canvas/twentyfour_twentyfour, -/obj/item/canvas/twentyfour_twentyfour, -/obj/item/canvas/drawingtablet, -/obj/item/paint/anycolor, -/turf/open/floor/wood, -/area/ruin/space/has_grav/bubbers/persistance/service/lounge) +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service/diner) "tl" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -6553,41 +6569,68 @@ /turf/open/floor/iron/terracotta/herringbone, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "tn" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 10 +/obj/machinery/porta_turret/syndicate{ + dir = 8; + pixel_y = -32; + pixel_x = 32; + faction = list("Syndicate","neutral") }, -/obj/machinery/digital_clock/directional/west, -/obj/machinery/light/directional/south, -/turf/open/floor/carpet/stellar, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/cargo) +/obj/structure/lattice/catwalk/mining, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/space/has_grav/bubbers/dauntless/command/vault) "tr" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 5 }, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) -"tt" = ( -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" +"ts" = ( +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 }, -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" +/obj/effect/turf_decal/stripes/red/line, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/engine/hull{ + initial_gas_mix = "LAVALAND_ATMOS" }, -/obj/machinery/camera/autoname/directional/west{ - name = "Persistence Exterior West"; - network = list("persistence_ext") +/area/ruin/space/has_grav/bubbers/persistance/service) +"tt" = ( +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/item/ammo_box/magazine/m223, +/obj/item/ammo_box/magazine/m223, +/obj/item/storage/belt/holster/nukie, +/obj/item/storage/belt/holster/nukie, +/obj/item/storage/belt/holster/nukie, +/obj/item/storage/belt/holster/nukie, +/obj/item/storage/belt/holster/nukie, +/obj/item/ammo_box/a357, +/obj/item/ammo_box/a357, +/obj/item/ammo_box/magazine/m12g, +/obj/item/ammo_box/magazine/m12g, +/obj/item/ammo_box/magazine/smgm45, +/obj/item/ammo_box/magazine/smgm45, +/obj/item/ammo_box/magazine/smgm45, +/obj/item/ammo_box/magazine/smgm45, +/obj/item/ammo_box/magazine/smgm45, +/obj/structure/closet/crate/secure/syndicate/gorlex/weapons{ + name = "Gorlex ammo crate" }, -/obj/structure/lattice/catwalk/mining, -/turf/open/lava/smooth/lava_land_surface, -/area/ruin/space/has_grav/bubbers/dauntless/command/vault) +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/sec/armory) "tv" = ( -/obj/machinery/door/window/survival_pod/left/directional/south{ - req_access = list("syndicate") +/obj/machinery/vending/autodrobe{ + pixel_x = -28; + all_products_free = 1; + density = 0 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/cargo/drone) +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood, +/area/ruin/space/has_grav/bubbers/persistance/service/lockers) "tw" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -6610,6 +6653,16 @@ }, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/service/lounge) +"tB" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/brig) "tE" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -6626,18 +6679,6 @@ /obj/effect/mapping_helpers/airalarm/syndicate_access, /turf/open/floor/iron/white/small, /area/ruin/space/has_grav/bubbers/persistance/service/lockers) -"tH" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 10 - }, -/obj/machinery/light/directional/west, -/obj/machinery/defibrillator_mount/charging{ - pixel_y = -30 - }, -/obj/item/defibrillator/loaded, -/obj/machinery/breath_machine/anesthetic, -/turf/open/floor/mineral/titanium/tiled/white, -/area/ruin/space/has_grav/bubbers/persistance/med/treatment) "tJ" = ( /obj/machinery/oven/range_frontier, /obj/item/reagent_containers/cup/soup_pot, @@ -6662,6 +6703,22 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/iron/white/small, /area/ruin/space/has_grav/bubbers/persistance/service/lockers) +"tM" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 6 + }, +/obj/machinery/duct, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/turf/open/floor/iron/white/diagonal, +/area/ruin/space/has_grav/bubbers/persistance/med) "tN" = ( /turf/open/floor/iron/terracotta/small, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/engineering) @@ -6675,14 +6732,16 @@ /turf/open/floor/engine/co2, /area/ruin/space/has_grav/bubbers/persistance/engineering/gas) "tP" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/turf/open/floor/carpet/red, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/maa) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/structure/cable, +/obj/structure/rack/gunrack, +/obj/structure/sign/poster/contraband/energy_swords/directional/west, +/obj/structure/disposalpipe/segment, +/obj/item/gun/microfusion/mcr01/syndie, +/obj/item/gun/microfusion/mcr01/syndie, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/sec/armory) "tQ" = ( /obj/effect/turf_decal/siding/dark{ dir = 5 @@ -6726,20 +6785,18 @@ }, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) -"tW" = ( -/obj/effect/turf_decal/siding/dark_green{ - dir = 8 - }, +"tX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/structure/table/reinforced/plastitaniumglass, -/obj/item/storage/box/beakers{ - pixel_x = 2; - pixel_y = 2 +/obj/machinery/chem_dispenser/frontier_appliance, +/obj/structure/cable, +/obj/machinery/duct, +/obj/effect/turf_decal/siding/dark{ + dir = 8 }, -/obj/item/storage/box/syringes, -/obj/item/restraints/handcuffs/cable/zipties, -/obj/machinery/light/directional/west, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/med/viro) +/turf/open/floor/wood/large, +/area/ruin/space/has_grav/bubbers/persistance/service/diner) "tY" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/machinery/reagentgrinder{ @@ -6749,28 +6806,27 @@ /turf/open/floor/iron/kitchen/diagonal, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "tZ" = ( -/obj/structure/sign/poster/official/periodic_table/directional/west, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/siding/dark{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/chem_dispenser/fullupgrade, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/med/chem) +/obj/structure/table/wood, +/obj/structure/towel_bin{ + pixel_y = -10; + pixel_x = -1 + }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/turf/open/floor/iron/white/small, +/area/ruin/space/has_grav/bubbers/persistance/service/lockers) "ua" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/structure/cable, -/obj/machinery/firealarm/directional/east, -/obj/machinery/light/directional/west, -/obj/structure/closet/firecloset/wall{ - pixel_x = -32 +/obj/effect/turf_decal/siding/wood{ + dir = 4 }, -/obj/machinery/duct, -/obj/structure/disposalpipe/segment, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/structure/sink/directional/west, +/obj/structure/mirror/directional/east, +/turf/open/floor/iron/freezer, +/area/ruin/space/has_grav/bubbers/persistance/command/admiral) "ub" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -6784,15 +6840,14 @@ /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "uc" = ( -/obj/effect/turf_decal/siding/white{ - dir = 10 - }, -/obj/structure/chair/sofa/corp/right{ - color = "#DE3A3A"; - dir = 4 +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/effect/turf_decal/siding/wood{ + dir = 9 }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/med) +/obj/machinery/suit_storage_unit/industrial/bloodredsuit, +/turf/open/floor/carpet/purple, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/science) "ue" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -6801,18 +6856,12 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/sci/ordnance) "ug" = ( -/obj/machinery/light/directional/north, -/obj/machinery/button/camkillswitch/persistence_ext{ - pixel_y = 24; - pixel_x = 8 - }, -/obj/machinery/button/camkillswitch/persistence_xeno{ - pixel_y = 24; - pixel_x = -8 +/obj/effect/turf_decal/siding/wood{ + dir = 10 }, -/obj/structure/extinguisher_cabinet/directional/west, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/command/vault) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/turf/open/floor/carpet/red, +/area/ruin/space/has_grav/bubbers/persistance/command/liason) "uh" = ( /obj/machinery/airalarm/directional/east, /obj/effect/mapping_helpers/airalarm/syndicate_access, @@ -6833,17 +6882,6 @@ }, /turf/open/floor/iron/terracotta/herringbone, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) -"uj" = ( -/obj/effect/turf_decal/trimline/purple/filled/line, -/obj/machinery/firealarm/directional/south, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/iron/smooth, -/area/ruin/space/has_grav/bubbers/persistance/sci/rnd) "uk" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 5 @@ -6853,15 +6891,8 @@ /turf/open/floor/iron/white/diagonal, /area/ruin/space/has_grav/bubbers/persistance/med) "um" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ - dir = 8 - }, -/obj/effect/turf_decal/vg_decals/atmos/oxygen, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/structure/window/reinforced/plasma/spawner/directional/south, -/obj/structure/window/reinforced/plasma/spawner/directional/north, -/turf/open/floor/engine/o2, -/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) +/turf/closed/wall/r_wall/syndicate/nodiagonal, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/cargo) "un" = ( /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, /obj/structure/cable, @@ -6870,29 +6901,18 @@ }, /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/evac) +"uo" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service/janitorial) "up" = ( /obj/structure/dresser, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) -"uq" = ( -/obj/machinery/porta_turret/syndicate{ - dir = 8; - pixel_y = -32 - }, -/obj/machinery/camera/autoname/directional/south{ - name = "Persistence Exterior South"; - network = list("persistence_ext") - }, -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/structure/lattice/catwalk/mining, -/turf/open/lava/smooth/lava_land_surface, -/area/ruin/space/has_grav/bubbers/dauntless/command/vault) "us" = ( /obj/structure/closet/crate/medical, /obj/item/storage/backpack/duffelbag/syndie/surgery, @@ -6914,9 +6934,11 @@ /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/med/treatment) "ut" = ( -/obj/effect/turf_decal/skyrat_decals/syndicate/middle/left, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/sec/armory) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/carpet/purple, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/janitor) "uu" = ( /obj/effect/turf_decal/stripes/red/corner{ dir = 8 @@ -6936,6 +6958,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) +"uw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service) +"uy" = ( +/obj/structure/fireplace, +/obj/item/stack/sheet/mineral/wood/fifty, +/obj/effect/turf_decal/siding/dark/end{ + dir = 4 + }, +/turf/open/floor/iron/terracotta/diagonal, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/morale) "uz" = ( /obj/machinery/atmospherics/miner/n2o, /obj/structure/window/reinforced/plasma/spawner/directional/south, @@ -6968,18 +7004,25 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) "uD" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/machinery/duct, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/bar/opposingcorners{ dir = 8 }, -/obj/structure/closet/firecloset/full, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/turf_decal/siding{ + dir = 10 + }, +/turf/open/floor/iron/cafeteria, +/area/ruin/space/has_grav/bubbers/persistance/service/diner) "uE" = ( -/obj/machinery/light/directional/west, -/obj/structure/table, -/obj/machinery/xenoarch/researcher, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/engineering/mining) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/bubbers/persistance/med/chem) "uF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -7017,60 +7060,85 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) +"uL" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/wood/large, +/area/ruin/space/has_grav/bubbers/persistance/service/sauna) "uM" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/storage/box/teargas{ - pixel_x = 3; - pixel_y = 6 - }, -/obj/item/storage/box/handcuffs{ - pixel_y = 3 +/obj/machinery/porta_turret/syndicate{ + dir = 8; + pixel_x = 32; + pixel_y = 32 }, -/obj/item/storage/box/flashbangs{ - pixel_x = -3 +/obj/structure/lattice/catwalk/mining, +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/sec/armory) -"uP" = ( -/obj/machinery/light/directional/west, -/obj/machinery/doppler_array{ - dir = 4 +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/space/has_grav/bubbers/dauntless/command/vault) +"uO" = ( +/obj/machinery/airalarm/directional/south, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/machinery/button/door/directional/west{ + id = "syndimining"; + name = "Blast Doors"; + req_access = list("syndicate") }, -/obj/machinery/digital_clock/directional/north, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/sci/ordnance) -"uQ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/camera/autoname/directional/east{ - network = list("persistence_ext"); - name = "persistence exterior east" +/obj/effect/turf_decal/stripes/corner{ + dir = 1 }, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/sec/prison) -"uR" = ( -/obj/machinery/atmospherics/components/trinary/mixer/on/layer2{ +/obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) -"uS" = ( -/turf/closed/wall/r_wall/syndicate/nodiagonal, -/area/ruin/space/has_grav/bubbers/dauntless/command/vault) -"uT" = ( +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/evac) +"uP" = ( +/obj/structure/kitchenspike, +/obj/item/knife/butcher, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/ruin/space/has_grav/bubbers/persistance/service/freezer) +"uQ" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/structure/sink/kitchen/directional/east, +/obj/structure/sign/warning/cold_temp/directional/west, +/turf/open/floor/iron/white, +/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) +"uR" = ( +/obj/machinery/atmospherics/components/trinary/mixer/on/layer2{ + dir = 1 + }, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) +"uS" = ( +/turf/closed/wall/r_wall/syndicate/nodiagonal, +/area/ruin/space/has_grav/bubbers/dauntless/command/vault) +"uT" = ( /obj/machinery/duct, -/obj/machinery/button/door/directional/north{ - id = "syndicatejanitor"; - name = "Janitor Closet" +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/bar/opposingcorners{ + dir = 8 }, -/obj/vehicle/ridden/janicart, -/obj/item/key/janitor, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/service/janitorial) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/apc/syndicate_access, +/obj/effect/mapping_helpers/apc/cut_AI_wire, +/obj/effect/mapping_helpers/apc/full_charge, +/obj/effect/turf_decal/siding{ + dir = 8 + }, +/obj/structure/chair/sofa/right/maroon{ + dir = 4 + }, +/turf/open/floor/iron/cafeteria, +/area/ruin/space/has_grav/bubbers/persistance/service/diner) "uW" = ( /obj/structure/bookcase/random{ pixel_y = -32; @@ -7082,13 +7150,11 @@ /area/ruin/space/has_grav/bubbers/persistance/service) "uX" = ( /obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 + dir = 1 }, +/obj/machinery/firealarm/directional/south, /turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) +/area/ruin/space/has_grav/bubbers/persistance/cargo) "uY" = ( /obj/structure/flora/bush/flowers_yw/style_random, /obj/structure/flora/bush/fullgrass, @@ -7124,11 +7190,10 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "vd" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/sec/armory) +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/obj/structure/cable, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/service) "ve" = ( /obj/machinery/flatpacker, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -7213,29 +7278,23 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/sci/robotics) "vq" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, -/turf/closed/wall/r_wall/syndicate/cruiser, -/area/ruin/space/has_grav/bubbers/persistance/cargo) -"vr" = ( -/obj/structure/sign/poster/contraband/interdyne_gene_clinics/directional/south, -/obj/item/infuser_book, -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/radio/intercom/directional/east{ - name = "two-way prisoner intercom"; - freerange = 1; - freqlock = 1; - frequency = 1245; - pixel_x = 0; - pixel_y = -30 - }, -/obj/item/storage/box/monkeycubes, -/obj/effect/turf_decal/siding/blue{ - dir = 10 +/obj/machinery/button/door/directional/north{ + name = "Armory Shutters"; + id = "armory_s"; + pixel_y = 0; + req_access = list("syndicate_leader"); + pixel_x = -24 }, -/obj/item/infuser_book, -/obj/item/sequence_scanner, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/med) +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) +"vr" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall/r_wall/syndicate/cruiser, +/area/ruin/space/has_grav/bubbers/persistance/service/diner) "vs" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -7250,15 +7309,6 @@ /obj/machinery/disposal/bin, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/med/chem) -"vv" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) "vw" = ( /obj/machinery/exodrone_launcher, /obj/machinery/button/door/directional/north{ @@ -7282,23 +7332,15 @@ /turf/open/floor/iron/white/small, /area/ruin/space/has_grav/bubbers/persistance/service/lockers) "vA" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/obj/structure/safe/abovetilefloor, -/obj/item/sign/flag/syndicate{ - pixel_x = -3; - pixel_y = 6 - }, -/obj/item/implanter/interdyne, -/obj/item/implanter/interdyne, -/obj/item/implanter/interdyne, -/obj/item/storage/box/pinpointer_pairs{ - pixel_x = -4; - pixel_y = 6 +/obj/structure/cable, +/obj/structure/disposalpipe/junction/yjunction{ + dir = 4 }, -/turf/open/floor/carpet/royalblue, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/medical) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "vB" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -7330,26 +7372,45 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "vF" = ( -/obj/structure/lattice/catwalk/mining, -/turf/open/floor/engine/hull{ - initial_gas_mix = "LAVALAND_ATMOS" - }, -/area/lavaland/surface/outdoors) +/obj/machinery/light/directional/east, +/turf/open/floor/iron/colony/bolts, +/area/ruin/space/has_grav/bubbers/persistance/service) "vG" = ( +/obj/machinery/duct, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/turf_decal/tile/bar/opposingcorners{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/turf/open/floor/iron/white, -/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/light/dim/directional/west, +/obj/effect/turf_decal/siding{ + dir = 9 + }, +/obj/structure/chair/sofa/corner/maroon{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/entertainment/directional/west, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron/cafeteria, +/area/ruin/space/has_grav/bubbers/persistance/service/diner) "vH" = ( -/obj/structure/closet/generic/wall{ - pixel_x = 32 +/obj/machinery/computer/crew/syndie{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/effect/mob_spawn/ghost_role/human/persistence/prisoner, -/obj/effect/spawner/random/entertainment/plushie, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/sec/prison) +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/obj/item/radio/intercom/directional/east{ + name = "two-way prisoner intercom"; + freerange = 1; + freqlock = 1; + frequency = 1245; + pixel_x = 0; + pixel_y = -30 + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/sec/brigentrance) "vI" = ( /obj/structure/sink/kitchen/directional/south, /obj/effect/turf_decal/siding/dark{ @@ -7359,23 +7420,27 @@ /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) "vJ" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 9 +/obj/effect/turf_decal/siding/wood, +/obj/structure/safe/abovetilefloor, +/obj/item/sign/flag/syndicate{ + pixel_x = 3; + pixel_y = 6 }, -/obj/machinery/light/directional/west, -/obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/wood, -/area/ruin/space/has_grav/bubbers/persistance/service/gym) +/obj/machinery/light/directional/south, +/turf/open/floor/carpet/purple, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/janitor) "vK" = ( -/obj/machinery/duct, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 8 +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" }, -/turf/open/floor/iron/kitchen/herringbone, -/area/ruin/space/has_grav/bubbers/persistance/service/salon) +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" + }, +/obj/structure/sign/warning/docking/directional/west, +/turf/open/floor/engine/hull{ + initial_gas_mix = "LAVALAND_ATMOS" + }, +/area/lavaland/surface/outdoors) "vL" = ( /obj/structure/bed/dogbed, /mob/living/basic/pet/fox{ @@ -7394,32 +7459,16 @@ /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/command/liason) "vM" = ( -/obj/item/storage/briefcase/secure/white{ - pixel_y = 13 - }, -/obj/effect/spawner/random/bureaucracy/folder{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/effect/spawner/random/bureaucracy/folder{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/effect/spawner/random/bureaucracy/folder{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/structure/table/wood/fancy/black, -/obj/item/paper_bin/carbon{ - pixel_x = -5; - pixel_y = 3 +/obj/machinery/telecomms/relay/preset, +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/obj/item/pen/fountain/captain{ - name = "Liason's fountain pen"; - pixel_y = 5 +/obj/structure/sign/poster/contraband/hacking_guide/directional/south, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 }, -/turf/open/floor/wood/parquet, -/area/ruin/space/has_grav/bubbers/persistance/command/liason) +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "vN" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/evac) @@ -7446,13 +7495,13 @@ /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "vQ" = ( -/obj/structure/table/wood, -/obj/structure/towel_bin{ - pixel_y = -10; - pixel_x = -1 +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/obj/machinery/camera/autoname/directional/west{ + network = list("persistence_xeno") }, -/turf/open/floor/wood/large, -/area/ruin/space/has_grav/bubbers/persistance/service/sauna) +/turf/open/floor/engine, +/area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) "vR" = ( /obj/structure/emergency_shield/cult/weak{ name = "Energy Shield" @@ -7466,6 +7515,20 @@ "vS" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) +"vT" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/bookcase/random{ + pixel_y = -32; + density = 0 + }, +/turf/open/floor/carpet/royalblack, +/area/ruin/space/has_grav/bubbers/persistance/sec/prison/rec) "vU" = ( /obj/structure/window/reinforced/survival_pod/spawner/directional/east, /obj/machinery/smartfridge/chemistry, @@ -7474,9 +7537,14 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/med/chem) "vV" = ( -/obj/structure/flora/bush/lavendergrass/style_random, -/turf/open/floor/grass, -/area/ruin/space/has_grav/bubbers/persistance/sec/prison) +/obj/structure/cable, +/obj/machinery/duct, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/door/firedoor/heavy, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "vW" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -7491,12 +7559,17 @@ /turf/open/floor/iron/terracotta/herringbone, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "wa" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/airlock/wood{ + id_tag = "syndishipservicedorm" }, -/obj/structure/punching_bag, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service/gym) +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service/hydro) "wb" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -7506,20 +7579,12 @@ /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) "wc" = ( -/obj/effect/turf_decal/trimline/purple/filled/corner{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/purple/filled/corner{ +/obj/effect/turf_decal/vg_decals/atmos/plasma, +/obj/machinery/atmospherics/components/binary/valve/digital{ dir = 8 }, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/iron/smooth, -/area/ruin/space/has_grav/bubbers/persistance/sci/rnd) +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) "wd" = ( /obj/structure/chair/sofa/corp/corner, /obj/effect/turf_decal/siding/wood{ @@ -7603,12 +7668,18 @@ /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "wr" = ( +/obj/machinery/duct, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/effect/turf_decal/siding/dark{ dir = 1 }, -/obj/machinery/recharge_station, -/turf/open/floor/iron/dark/small, -/area/ruin/space/has_grav/bubbers/persistance/sec/prison) +/obj/machinery/dryer{ + pixel_y = 25 + }, +/turf/open/floor/iron/white/small, +/area/ruin/space/has_grav/bubbers/persistance/service/lockers) "ws" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -7636,69 +7707,38 @@ /turf/open/floor/plating/elevatorshaft, /area/ruin/space/has_grav/bubbers/persistance/cargo) "ww" = ( -/obj/structure/fans/tiny, -/obj/machinery/duct, +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/door/firedoor/heavy, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service) +"wx" = ( /obj/structure/cable, -/obj/structure/disposalpipe/segment, +/obj/machinery/duct, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/heavy, -/obj/machinery/door/airlock/wood{ - name = "Sauna" - }, -/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/structure/sign/poster/official/no_erp/directional/west, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/sauna) -"wx" = ( -/obj/structure/lattice/catwalk/mining, -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" +/area/ruin/space/has_grav/bubbers/persistance/service) +"wz" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 10 }, -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, -/turf/open/lava/smooth/lava_land_surface, -/area/ruin/space/has_grav/bubbers/dauntless/command/vault) -"wz" = ( +/turf/open/floor/carpet/royalblue, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/medical) +"wA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/heavy, -/obj/machinery/door/airlock/grunge{ - name = "Cell 1"; - id_tag = "Syndi_cell" - }, -/obj/effect/mapping_helpers/airlock/cutaiwire, /turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/sec/prison) -"wA" = ( -/obj/machinery/conveyor{ - id = "syndirecycle"; - dir = 1 - }, -/obj/effect/spawner/random/trash/garbage{ - pixel_x = 4; - pixel_y = 5 - }, -/obj/effect/spawner/random/maintenance/three, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/effect/spawner/random/trash/garbage{ - pixel_x = 4; - pixel_y = 5 - }, -/obj/effect/spawner/random/maintenance/three, -/obj/effect/spawner/random/trash/garbage{ - pixel_x = 4; - pixel_y = 5 - }, -/obj/effect/spawner/random/maintenance/two, -/obj/effect/spawner/random/trash/garbage{ - pixel_x = 4; - pixel_y = 5 - }, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/cargo) +/area/ruin/space/has_grav/bubbers/persistance/sec/armory) "wB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -7708,24 +7748,46 @@ }, /area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) "wD" = ( -/obj/effect/turf_decal/tile/bar/opposingcorners{ - dir = 8 +/obj/structure/closet/generic/wall{ + pixel_x = -32 }, -/obj/structure/table/wood/fancy/red, -/turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/bubbers/persistance/service/diner) +/obj/effect/spawner/random/exotic/syndie, +/obj/effect/spawner/random/exotic/syndie, +/obj/effect/spawner/random/exotic/syndie, +/obj/item/choice_beacon/music, +/obj/item/clothing/under/syndicate/skyrat/baseball, +/obj/item/storage/wallet/random, +/obj/effect/spawner/random/exotic/syndie, +/obj/item/clothing/shoes/workboots/mining, +/obj/item/modular_computer/laptop/preset/syndicate, +/obj/item/clothing/glasses/meson/night, +/obj/item/storage/belt/mining/vendor, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/effect/mob_spawn/ghost_role/human/persistence/syndicate/quartermaster{ + dir = 4; + name = "Persistence Cargo Tech" + }, +/turf/open/floor/carpet/stellar, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/cargo) "wF" = ( /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "wG" = ( -/obj/structure/railing/wooden_fencing{ - dir = 8 +/obj/machinery/button/door/directional/west{ + id = "syndimining"; + name = "Blast Doors"; + req_access = list("syndicate") }, -/mob/living/basic/chicken/teshari{ - faction = list("neutral","Syndicate") +/obj/effect/turf_decal/stripes/corner{ + dir = 8 }, -/turf/open/floor/grass, -/area/ruin/space/has_grav/bubbers/persistance/service/hydro) +/obj/machinery/light/directional/north, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/evac) "wI" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -7769,21 +7831,27 @@ /obj/structure/cable, /turf/open/floor/wood/parquet, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) -"wP" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron/colony/bolts, -/area/ruin/space/has_grav/bubbers/persistance/evac) -"wQ" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 +"wO" = ( +/obj/machinery/vending/autodrobe{ + pixel_x = -28; + all_products_free = 1; + density = 0 }, -/obj/effect/turf_decal/trimline/dark_red/filled/line{ - dir = 8 +/turf/open/floor/carpet/donk, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/morale) +"wP" = ( +/obj/structure/cable, +/obj/effect/mapping_helpers/apc/full_charge, +/obj/effect/mapping_helpers/apc/cut_AI_wire, +/obj/effect/mapping_helpers/apc/syndicate_access, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 }, -/turf/open/floor/carpet/royalblack, -/area/ruin/space/has_grav/bubbers/persistance/service/lounge) +/obj/machinery/light/directional/south, +/turf/open/floor/iron/white, +/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "wS" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/service/freezer) @@ -7797,34 +7865,30 @@ /turf/open/floor/wood, /area/ruin/space/has_grav/bubbers/persistance/service/gym) "wU" = ( -/obj/machinery/light/directional/west, -/obj/machinery/digital_clock/directional/west, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/sec/prison) +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/obj/effect/turf_decal/vg_decals/numbers/one, +/turf/open/floor/engine, +/area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) "wV" = ( -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/light/directional/south, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/cable, +/obj/machinery/door/airlock/service{ + id_tag = "syndishipjanidorm"; + name = "Janitorial Dorm" }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/effect/mapping_helpers/airlock/cutaiwire, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/janitorial) +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/janitor) "wY" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/paper_bin/carbon, -/obj/item/pen/survival, -/obj/item/pen/red/security, -/obj/item/pen/screwdriver, -/obj/item/pen/fountain/captain, -/obj/item/pen/fourcolor, -/turf/open/floor/mineral/plastitanium/red{ - icon_state = "plastitanium" - }, -/area/ruin/space/has_grav/bubbers/persistance/command/bridge) -"wZ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/research/anomaly_refinery, +/obj/structure/sign/poster/contraband/little_fruits/directional/west, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/sci/ordnance) +"wZ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/structure/cable, /obj/effect/turf_decal/siding/dark{ @@ -7844,18 +7908,23 @@ /turf/open/floor/iron/terracotta/diagonal, /area/ruin/space/has_grav/bubbers/persistance/service) "xd" = ( -/obj/structure/cable, -/obj/effect/mapping_helpers/apc/full_charge, -/obj/effect/mapping_helpers/apc/cut_AI_wire, -/obj/effect/mapping_helpers/apc/syndicate_access, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 +/obj/effect/turf_decal/siding/wood{ + dir = 9 }, -/obj/machinery/light/directional/south, -/turf/open/floor/iron/white, -/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) +/obj/structure/safe/abovetilefloor, +/obj/item/sign/flag/syndicate{ + pixel_x = -3; + pixel_y = 6 + }, +/obj/item/implanter/interdyne, +/obj/item/implanter/interdyne, +/obj/item/implanter/interdyne, +/obj/item/storage/box/pinpointer_pairs{ + pixel_x = -4; + pixel_y = 6 + }, +/turf/open/floor/carpet/royalblue, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/medical) "xe" = ( /obj/structure/sign/warning/radiation/directional/east, /obj/structure/emergency_shield/cult/weak{ @@ -7880,27 +7949,20 @@ /turf/open/floor/iron/white/small, /area/ruin/space/has_grav/bubbers/persistance/service/lockers) "xi" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/duct, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/structure/cable, -/obj/machinery/door/airlock/hatch{ - name = "Morale Officer" - }, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, -/obj/effect/mapping_helpers/airlock/cutaiwire, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/morale) +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/sec/holding) "xj" = ( -/obj/structure/sign/painting/library{ - pixel_x = -30 - }, -/obj/machinery/light/directional/west{ - dir = 2 - }, -/obj/machinery/libraryscanner, -/turf/open/floor/wood, -/area/ruin/space/has_grav/bubbers/persistance/service/lounge) +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "xk" = ( /obj/effect/spawner/liquids_spawner/shoulders, /obj/structure/chair/sofa/bench{ @@ -7934,29 +7996,13 @@ /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) "xq" = ( -/obj/machinery/airalarm/directional/north, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/obj/item/ammo_box/magazine/m223, -/obj/item/ammo_box/magazine/m223, -/obj/item/storage/belt/holster/nukie, -/obj/item/storage/belt/holster/nukie, -/obj/item/storage/belt/holster/nukie, -/obj/item/storage/belt/holster/nukie, -/obj/item/storage/belt/holster/nukie, -/obj/item/ammo_box/a357, -/obj/item/ammo_box/a357, -/obj/item/ammo_box/magazine/m12g, -/obj/item/ammo_box/magazine/m12g, -/obj/item/ammo_box/magazine/smgm45, -/obj/item/ammo_box/magazine/smgm45, -/obj/item/ammo_box/magazine/smgm45, -/obj/item/ammo_box/magazine/smgm45, -/obj/item/ammo_box/magazine/smgm45, -/obj/structure/closet/crate/secure/syndicate/gorlex/weapons{ - name = "Gorlex ammo crate" +/obj/effect/turf_decal/siding/wood{ + dir = 9 }, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/sec/armory) +/obj/machinery/incident_display/delam/directional/north, +/obj/machinery/newscaster/directional/west, +/turf/open/floor/iron/terracotta/small, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/engineering) "xs" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 9 @@ -8006,6 +8052,12 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) +"xx" = ( +/obj/machinery/light/directional/west, +/obj/machinery/smartfridge/disks, +/obj/structure/table/reinforced/plastitaniumglass, +/turf/open/floor/grass, +/area/ruin/space/has_grav/bubbers/persistance/service/hydro) "xy" = ( /obj/structure/toilet{ dir = 4 @@ -8017,10 +8069,17 @@ /turf/open/floor/iron/white/small, /area/ruin/space/has_grav/bubbers/persistance/service/lockers) "xz" = ( -/obj/structure/drain, -/obj/machinery/duct, -/turf/open/floor/iron/white/small, -/area/ruin/space/has_grav/bubbers/persistance/service/lockers) +/obj/structure/bed/double/pod{ + dir = 1 + }, +/obj/effect/spawner/random/bedsheet/any/double{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/sec/prison) "xC" = ( /obj/machinery/door/window/survival_pod/left/directional/south{ req_access = list("syndicate"); @@ -8056,6 +8115,16 @@ icon_state = "plastitanium" }, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) +"xH" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/structure/fans/tiny/forcefield, +/obj/machinery/door/poddoor{ + id = "syndihanger" + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service) "xI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/effect/mob_spawn/ghost_role/human/persistence/prisoner, @@ -8070,13 +8139,14 @@ /turf/open/floor/noslip, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "xK" = ( -/obj/machinery/door/poddoor{ - id = "armory_s"; - name = "Emergancy Armory Access" +/obj/effect/turf_decal/vg_decals/atmos/nitrogen, +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ + dir = 8 }, -/obj/effect/turf_decal/stripes/red/full, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/structure/window/reinforced/plasma/spawner/directional/south, +/turf/open/floor/engine/n2, +/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) "xN" = ( /obj/effect/turf_decal/skyrat_decals/ds2/right, /obj/effect/turf_decal/siding/thinplating/dark/corner{ @@ -8085,13 +8155,6 @@ /obj/effect/turf_decal/siding/thinplating/dark/corner, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/service) -"xO" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/door/firedoor/heavy, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) "xP" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -8127,12 +8190,12 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service) "xT" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/light/directional/south, -/obj/machinery/light_switch/directional/south, -/obj/effect/turf_decal/siding/blue, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/med) +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/structure/chair/sofa/corp, +/turf/open/floor/carpet/royalblack, +/area/ruin/space/has_grav/bubbers/persistance/sec/prison/rec) "xU" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -8140,22 +8203,41 @@ /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/ruin/space/has_grav/bubbers/persistance/service/freezer) "xV" = ( -/obj/structure/cable, -/obj/machinery/duct, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/digital_clock/directional/west, -/turf/open/floor/catwalk_floor/iron_dark, +/obj/machinery/door/poddoor{ + id = "syndihanger" + }, +/obj/structure/fans/tiny/forcefield, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service) "xY" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/firealarm/directional/west, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/machinery/conveyor{ + id = "syndirecycle"; + dir = 1 + }, +/obj/effect/spawner/random/trash/garbage{ + pixel_x = 4; + pixel_y = 5 + }, +/obj/effect/spawner/random/maintenance/three, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/effect/spawner/random/trash/garbage{ + pixel_x = 4; + pixel_y = 5 + }, +/obj/effect/spawner/random/maintenance/three, +/obj/effect/spawner/random/trash/garbage{ + pixel_x = 4; + pixel_y = 5 + }, +/obj/effect/spawner/random/maintenance/two, +/obj/effect/spawner/random/trash/garbage{ + pixel_x = 4; + pixel_y = 5 + }, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/cargo) "xZ" = ( /obj/structure/chair/sofa/right/maroon{ dir = 4 @@ -8185,14 +8267,6 @@ /obj/structure/sign/xenobio_guide/directional/east, /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) -"yb" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/turf/open/floor/carpet/purple, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/janitor) "yc" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -8209,24 +8283,16 @@ /turf/open/floor/wood/parquet, /area/ruin/space/has_grav/bubbers/persistance/command/liason) "yf" = ( -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/machinery/porta_turret/syndicate{ - dir = 8; - pixel_x = 32; - faction = list("Syndicate","neutral") - }, -/obj/machinery/camera/autoname/directional/east{ - network = list("persistence_ext"); - name = "persistence exterior east" +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/airlock/grunge{ + name = "Cell 1"; + id_tag = "Syndi_cell" }, -/obj/structure/lattice/catwalk/mining, -/turf/open/lava/smooth/lava_land_surface, -/area/ruin/space/has_grav/bubbers/dauntless/command/vault) +/obj/effect/mapping_helpers/airlock/cutaiwire, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/sec/prison) "yg" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 @@ -8249,15 +8315,9 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "yi" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/light_switch/directional/east, +/obj/machinery/duct, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) "yk" = ( /obj/machinery/door/window/survival_pod/left/directional/east{ name = "Slime Euthanization Chamber"; @@ -8288,12 +8348,21 @@ }, /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/service) -"yp" = ( +"yo" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/machinery/recharger, /obj/structure/reagent_dispensers/wall/peppertank/directional/north, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/sec/armory) +"yp" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service) "ys" = ( /obj/effect/turf_decal/tile/dark_red/half{ dir = 8 @@ -8305,16 +8374,10 @@ /turf/open/floor/engine, /area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) "yt" = ( -/obj/structure/cable, -/obj/machinery/duct, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/janitorial) -"yu" = ( +/obj/structure/fake_stairs/directional/north, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service) +"yu" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -8344,6 +8407,22 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white/diagonal, /area/ruin/space/has_grav/bubbers/persistance/med) +"yB" = ( +/obj/structure/sign/painting/library{ + pixel_x = -30 + }, +/obj/machinery/light/directional/west{ + dir = 1 + }, +/obj/structure/easel, +/turf/open/floor/wood, +/area/ruin/space/has_grav/bubbers/persistance/service/lounge) +"yD" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service) "yE" = ( /obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, @@ -8364,16 +8443,6 @@ }, /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) -"yH" = ( -/obj/effect/turf_decal/vg_decals/atmos/oxygen, -/obj/machinery/atmospherics/components/binary/valve/digital{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2{ - dir = 4 - }, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) "yI" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 10 @@ -8403,12 +8472,6 @@ /obj/structure/fireaxecabinet/mechremoval/directional/north, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/sci/robotics) -"yM" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/turf/open/floor/mineral/plastitanium/red{ - icon_state = "plastitanium" - }, -/area/ruin/space/has_grav/bubbers/persistance/command/bridge) "yN" = ( /obj/effect/turf_decal/tile/bar/opposingcorners{ dir = 8 @@ -8424,18 +8487,14 @@ /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/persistance/service) "yR" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 4; - icon_state = "siding_plain_end" - }, -/obj/effect/mob_spawn/ghost_role/human/persistence/syndicate/janitor{ - name = "Persistence Janitor" - }, -/obj/structure/sign/painting/library{ - pixel_y = 30 - }, -/turf/open/floor/iron/terracotta/diagonal, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/janitor) +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "yT" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -8459,12 +8518,12 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "yV" = ( -/obj/effect/turf_decal/skyrat_decals/syndicate/top/left, -/obj/effect/turf_decal/siding/thinplating/dark/corner{ - dir = 1 +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/obj/effect/turf_decal/siding/blue{ + dir = 9 }, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/command/bridge) +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/bubbers/persistance/med) "yW" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/item/slime_extract/grey{ @@ -8507,32 +8566,57 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/cargo) "zd" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood/corner{ +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/siding/dark{ dir = 8 }, -/turf/open/floor/carpet/stellar, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/cargo) +/obj/machinery/jukebox{ + req_access = list("syndicate"); + anchored = 0 + }, +/turf/open/floor/wood/large, +/area/ruin/space/has_grav/bubbers/persistance/service/diner) "ze" = ( -/obj/effect/spawner/liquids_spawner/shoulders, -/obj/structure/chair/sofa/bench/right{ - dir = 4 +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" }, -/obj/effect/mist, -/turf/open/floor/iron/pool/cobble/corner{ - dir = 8 +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" }, -/area/ruin/space/has_grav/bubbers/persistance/service/sauna) +/obj/machinery/camera/autoname/directional/east{ + network = list("persistence_ext"); + name = "persistence exterior east" + }, +/obj/structure/lattice/catwalk/mining, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/space/has_grav/bubbers/dauntless/command/vault) "zg" = ( -/obj/structure/window/reinforced/survival_pod/spawner/directional/east, -/obj/structure/window/reinforced/survival_pod/spawner/directional/north, -/mob/living/carbon/human/species/monkey, -/obj/structure/flora/bush/flowers_yw/style_random, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/misc/grass/jungle/station, -/area/ruin/space/has_grav/bubbers/persistance/med) +/obj/effect/mob_spawn/ghost_role/human/persistence/syndicate/moraleofficer{ + name = "Persistence Morale Officer" + }, +/obj/structure/closet/generic/wall{ + pixel_x = -32 + }, +/obj/item/storage/box/syndimaid, +/obj/item/storage/box/syndimaid, +/obj/effect/spawner/random/entertainment/plushie_delux, +/obj/effect/spawner/random/entertainment/plushie, +/obj/effect/spawner/random/exotic/syndie, +/obj/effect/spawner/random/exotic/syndie, +/obj/item/clothing/under/syndicate/skyrat/baseball, +/obj/item/storage/wallet/random, +/obj/effect/spawner/random/exotic/syndie, +/obj/effect/turf_decal/siding/dark{ + dir = 10 + }, +/obj/effect/turf_decal/siding/dark/corner{ + dir = 4 + }, +/turf/open/floor/iron/terracotta/diagonal, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/morale) "zh" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -8550,27 +8634,51 @@ /turf/open/floor/iron/kitchen/diagonal, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "zo" = ( -/obj/machinery/airalarm/directional/south, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/obj/effect/spawner/liquids_spawner/shoulders, -/obj/effect/mist, -/turf/open/floor/iron/pool/cobble/side, -/area/ruin/space/has_grav/bubbers/persistance/service/sauna) +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" + }, +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" + }, +/obj/machinery/conveyor{ + dir = 8; + id = "QMLoad" + }, +/obj/structure/lattice/catwalk/mining, +/turf/open/floor/pod/dark, +/area/ruin/space/has_grav/bubbers/dauntless/command/vault) "zp" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/machinery/light/directional/north, +/obj/machinery/button/camkillswitch/persistence_ext{ + pixel_y = 24; + pixel_x = 8 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 +/obj/machinery/button/camkillswitch/persistence_xeno{ + pixel_y = 24; + pixel_x = -8 }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/command/vault) "zq" = ( /obj/structure/disposalpipe/trunk, /obj/structure/window/reinforced/survival_pod/spawner/directional/south, /obj/machinery/disposal/bin, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/cargo/drone) +"zt" = ( +/obj/structure/toilet{ + pixel_y = 13; + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/obj/machinery/flasher/directional/north{ + id = "syndicate_cell" + }, +/turf/open/floor/iron/white/small, +/area/ruin/space/has_grav/bubbers/persistance/sec/holding) "zu" = ( /obj/item/storage/photo_album/syndicate{ pixel_x = 8; @@ -8606,12 +8714,13 @@ /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "zx" = ( -/obj/machinery/door/poddoor{ - id = "syndihanger" +/obj/machinery/computer/station_alert{ + dir = 1 }, -/obj/structure/fans/tiny/forcefield, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) +/turf/open/floor/mineral/plastitanium/red{ + icon_state = "plastitanium" + }, +/area/ruin/space/has_grav/bubbers/persistance/command/bridge) "zy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/structure/bed/double/pod, @@ -8622,38 +8731,48 @@ /turf/open/floor/carpet/purple, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/science) "zz" = ( -/obj/structure/window/reinforced/survival_pod/spawner/directional/north, -/obj/structure/sign/warning/no_smoking/directional/west, -/obj/machinery/light/directional/west, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, +/obj/machinery/duct, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/chem_heater/withbuffer, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/med/chem) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/firealarm/directional/east, +/obj/structure/disposalpipe/junction, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "zB" = ( -/obj/machinery/duct, -/obj/structure/cable, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/storage/fancy/cigarettes/cigpack_syndicate{ + pixel_x = 3; + pixel_y = 6 + }, +/obj/item/lighter/skull, +/obj/machinery/pollution_scrubber, /obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/item/reagent_containers/cup/glass/shaker{ + pixel_x = -6; + pixel_y = -7 + }, +/obj/item/reagent_containers/cup/rag, +/obj/structure/sink/kitchen/directional/west{ + pixel_x = 18 + }, +/obj/item/reagent_containers/cup/maunamug, +/obj/effect/turf_decal/siding/dark{ dir = 6 }, +/obj/machinery/light_switch/directional/east, +/turf/open/floor/wood/large, +/area/ruin/space/has_grav/bubbers/persistance/service/diner) +"zC" = ( +/obj/machinery/duct, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/effect/turf_decal/siding/dark, -/turf/open/floor/wood/large, +/turf/open/floor/iron/kitchen/diagonal, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) -"zC" = ( -/obj/structure/window/reinforced/survival_pod/spawner/directional/west, -/obj/structure/window/reinforced/survival_pod/spawner/directional/south, -/obj/effect/turf_decal/vg_decals/numbers/one, -/turf/open/floor/engine, -/area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) -"zD" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/weightmachine/weightlifter, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service/gym) "zF" = ( /obj/machinery/airalarm/directional/north, /obj/effect/mapping_helpers/airalarm/syndicate_access, @@ -8668,6 +8787,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/iron/kitchen/diagonal, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) +"zH" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/turf/open/floor/wood, +/area/ruin/space/has_grav/bubbers/persistance/service/lockers) "zI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -8680,17 +8805,10 @@ /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/sauna) "zK" = ( -/obj/structure/bed/double/pod{ - dir = 1 - }, -/obj/effect/spawner/random/bedsheet/any/double{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/sec/prison) +/obj/structure/closet/radiation, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service) "zL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -8700,9 +8818,15 @@ /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/sauna) "zM" = ( -/obj/structure/sign/warning/yes_smoking/circle/directional/west, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/sci/ordnance) +/obj/structure/closet/generic/wall{ + pixel_y = -32 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/structure/plant_tank, +/turf/open/floor/iron/terracotta/herringbone, +/area/ruin/space/has_grav/bubbers/persistance/service/hydro) "zN" = ( /obj/effect/turf_decal/siding/dark{ dir = 10 @@ -8712,10 +8836,15 @@ /turf/open/floor/noslip/tram, /area/ruin/space/has_grav/bubbers/persistance/med/chem) "zO" = ( -/obj/machinery/research/anomaly_refinery, -/obj/structure/sign/poster/contraband/little_fruits/directional/west, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/sci/ordnance) +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/window/reinforced/plasma/spawner/directional/west, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/cargo) "zP" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/shipping_container/donk_co{ @@ -8726,13 +8855,15 @@ /turf/open/floor/plating/elevatorshaft, /area/ruin/space/has_grav/bubbers/persistance/cargo) "zQ" = ( -/obj/machinery/vending/autodrobe{ - pixel_x = -28; - all_products_free = 1; - density = 0 +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/power/terminal{ + dir = 1 }, -/turf/open/floor/carpet/donk, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/morale) +/obj/structure/cable, +/obj/machinery/light_switch/directional/east, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "zR" = ( /obj/machinery/light/directional/east, /obj/item/pickaxe, @@ -8791,30 +8922,45 @@ /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/brig) "zX" = ( -/obj/structure/cable, /obj/machinery/duct, -/obj/structure/disposalpipe/junction{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/sign/poster/official/no_erp/directional/west, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/machinery/door/firedoor/heavy, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/structure/cable, +/obj/machinery/door/airlock/silver/glass{ + name = "Gym" + }, +/turf/open/floor/iron/stairs{ + dir = 8 + }, +/area/ruin/space/has_grav/bubbers/persistance/service/gym) "zY" = ( /obj/structure/window/reinforced/plasma/spawner/directional/south, /turf/open/floor/grass, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "Aa" = ( -/obj/structure/safe/abovetilefloor, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/maa) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/sec/armory) "Ab" = ( /obj/effect/turf_decal/siding/dark, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/iron/white/diagonal, /area/ruin/space/has_grav/bubbers/persistance/med) +"Ad" = ( +/turf/open/floor/carpet/purple, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/science) "Ae" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -8822,15 +8968,14 @@ /turf/open/floor/wood/parquet, /area/ruin/space/has_grav/bubbers/persistance/command/liason) "Af" = ( -/obj/effect/turf_decal/siding/dark/end{ - dir = 1 +/obj/effect/turf_decal/stripes/line{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, -/obj/machinery/monkey_recycler, -/obj/structure/sign/flag/syndicate/directional/north, -/obj/structure/window/reinforced/survival_pod/spawner/directional/west, -/turf/open/floor/iron/smooth, -/area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service) "Ag" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -8839,30 +8984,26 @@ /turf/open/floor/carpet/royalblack, /area/ruin/space/has_grav/bubbers/persistance/sec/prison/rec) "Ai" = ( -/obj/structure/closet/generic/wall{ - pixel_y = -32 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/structure/plant_tank, -/turf/open/floor/iron/terracotta/herringbone, -/area/ruin/space/has_grav/bubbers/persistance/service/hydro) +/obj/machinery/food_cart, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/ruin/space/has_grav/bubbers/persistance/service/freezer) "Ak" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/dark, /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) "Al" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 10 - }, -/obj/structure/chair{ - dir = 4 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/structure/cable, +/obj/machinery/door/airlock/hatch{ + name = "Morale Officer" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/wood/tile, -/area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/morale) "Am" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -8934,15 +9075,14 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/med/chem) "Au" = ( -/obj/machinery/light/directional/west, -/obj/machinery/button/door{ - id = "syndihanger"; - pixel_x = -24; - name = "Hanger doors"; - req_access = list("syndicate") +/obj/effect/turf_decal/siding/wood{ + dir = 10 }, -/turf/open/floor/iron/colony/bolts, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/machinery/light_switch/directional/west, +/obj/machinery/light/directional/west, +/obj/machinery/duct, +/turf/open/floor/iron/freezer, +/area/ruin/space/has_grav/bubbers/persistance/command/admiral) "Ay" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -8982,9 +9122,15 @@ /turf/open/floor/iron/terracotta/herringbone, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "AA" = ( -/obj/structure/flora/biolumi/flower/weaklight, -/turf/open/misc/grass/jungle/station, -/area/ruin/space/has_grav/bubbers/persistance/command/admiral) +/obj/structure/fans/tiny/forcefield, +/obj/machinery/door/poddoor{ + id = "syndimining" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/evac) "AB" = ( /obj/effect/turf_decal/siding/dark/corner{ dir = 8 @@ -9024,24 +9170,41 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service/gym) "AG" = ( -/obj/structure/cable, -/obj/machinery/duct, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/airalarm/directional/south, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/effect/spawner/liquids_spawner/shoulders, +/obj/effect/mist, +/turf/open/floor/iron/pool/cobble/side, +/area/ruin/space/has_grav/bubbers/persistance/service/sauna) +"AH" = ( +/obj/item/clothing/glasses/night, +/obj/item/storage/belt/military, +/obj/item/storage/belt/military, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/under/syndicate/combat, +/obj/item/clothing/under/syndicate/combat, +/obj/item/clothing/gloves/combat, +/obj/item/clothing/gloves/combat, +/obj/item/card/id/advanced/chameleon, +/obj/item/card/id/advanced/chameleon, +/obj/item/card/id/advanced/chameleon, +/obj/item/radio/headset/interdyne, +/obj/item/radio/headset/interdyne, +/obj/item/radio/headset/interdyne, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/heavy, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, -/obj/effect/mapping_helpers/airlock/cutaiwire, -/obj/machinery/door/airlock/service/glass{ - name = "Salon" +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/light_switch/directional/north, +/obj/structure/closet/crate/secure/syndicate/cybersun/night{ + name = "Cybersun Operative Equipment" }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/salon) -"AH" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable, -/obj/structure/extinguisher_cabinet/directional/west, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/item/suppressor, +/obj/item/suppressor, +/obj/item/suppressor, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/sec/armory) "AL" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -9073,19 +9236,15 @@ /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "AO" = ( -/obj/structure/cable, /obj/machinery/duct, -/obj/structure/disposalpipe/junction{ - dir = 1 - }, +/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) -"AP" = ( -/obj/structure/extinguisher_cabinet/directional/west, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/turf/open/floor/iron/kitchen/herringbone, +/area/ruin/space/has_grav/bubbers/persistance/service/salon) "AQ" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) @@ -9178,23 +9337,18 @@ /turf/open/floor/plating/elevatorshaft, /area/ruin/space/has_grav/bubbers/persistance/cargo) "Bd" = ( -/obj/effect/turf_decal/vg_decals/atmos/carbon_dioxide, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) -"Be" = ( -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/structure/lattice/catwalk/mining, -/obj/machinery/camera/autoname/directional/west{ - name = "Persistence Exterior West"; - network = list("persistence_ext") +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/structure/cable, +/obj/machinery/firealarm/directional/east, +/obj/machinery/light/directional/west, +/obj/structure/closet/firecloset/wall{ + pixel_x = -32 }, -/turf/open/lava/smooth/lava_land_surface, -/area/ruin/space/has_grav/bubbers/dauntless/command/vault) +/obj/machinery/duct, +/obj/structure/disposalpipe/segment, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "Bf" = ( /obj/structure/flora/bush/flowers_yw/style_random, /turf/open/floor/grass, @@ -9218,17 +9372,9 @@ }, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service) -"Bl" = ( -/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium{ - polarizer_id = "dauntbar_w" - }, -/obj/structure/cable, -/obj/machinery/door/poddoor/shutters/preopen{ - name = "Bar Shutters"; - id = "dauntbar_s" - }, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/service/diner) +"Bk" = ( +/turf/open/floor/carpet/donk, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/morale) "Bn" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 @@ -9277,10 +9423,19 @@ /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/cargo) "Br" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/cell_charger_multi/wall_mounted/directional/west, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/sci/robotics) +/obj/structure/cable, +/obj/machinery/duct, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/siding/dark{ + dir = 9 + }, +/turf/open/floor/wood/large, +/area/ruin/space/has_grav/bubbers/persistance/service/diner) "Bt" = ( /obj/effect/turf_decal/tile/dark_red/half, /obj/structure/window/reinforced/survival_pod/spawner/directional/north, @@ -9322,14 +9477,22 @@ /turf/open/floor/carpet/purple, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/science) "Bv" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 +/obj/structure/table/wood, +/obj/machinery/vending/wardrobe/sec_wardrobe/red{ + density = 0; + all_products_free = 1; + pixel_x = -28 }, -/obj/structure/chair/sofa/left/maroon{ - dir = 4 +/obj/machinery/vending/wardrobe/syndie_wardrobe{ + density = 0; + pixel_y = -28; + all_products_free = 1 }, -/turf/open/floor/carpet/green, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/chef) +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/turf/open/floor/wood, +/area/ruin/space/has_grav/bubbers/persistance/service/lockers) "Bw" = ( /obj/structure/cable, /obj/structure/disposalpipe/trunk{ @@ -9349,37 +9512,18 @@ /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/med/treatment) "Bz" = ( -/obj/machinery/button/door/directional/south{ - name = "Prisoner Lockdown"; - id = "Syndi_cell"; - req_access = list("syndicate_leader"); - pixel_y = 40; - pixel_x = 8; - specialfunctions = 4; - normaldoorcontrol = 1 - }, -/obj/machinery/button/door/directional/north{ - id = "prison_shutters"; - name = "Prisoner Viewing Privlages"; - req_access = list("syndicate_leader"); - pixel_x = 8 +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 }, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/sec/brigentrance) -"BD" = ( -/obj/machinery/duct, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/heavy, -/obj/machinery/door/airlock/service{ - name = "Kitchen" +/obj/structure/safe/abovetilefloor, +/obj/item/mod/module/stealth/wraith, +/obj/item/sign/flag/syndicate{ + pixel_x = -3; + pixel_y = 6 }, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, -/obj/effect/mapping_helpers/airlock/cutaiwire, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) +/obj/item/aicard/syndie, +/turf/open/floor/carpet/purple, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/science) "BE" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -9390,9 +9534,17 @@ /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/rnd) "BF" = ( -/obj/structure/chair/office/tactical, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4; + name = "Isolation Cell" + }, /turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/sec/armory) +/area/ruin/space/has_grav/bubbers/persistance/service) "BG" = ( /obj/structure/sign/poster/contraband/busty_backdoor_xeno_babes_6/directional/north, /obj/machinery/airalarm/directional/east, @@ -9409,40 +9561,30 @@ /turf/open/floor/wood/parquet, /area/ruin/space/has_grav/bubbers/persistance/command/liason) "BI" = ( -/obj/effect/spawner/random/exotic/syndie, -/obj/item/storage/wallet/random, -/obj/item/clothing/under/syndicate/skyrat/baseball, -/obj/effect/spawner/random/exotic/syndie, -/obj/effect/spawner/random/exotic/syndie, -/obj/item/storage/box/syndibunny, -/obj/effect/spawner/random/entertainment/plushie, -/obj/effect/spawner/random/entertainment/plushie_delux, -/obj/effect/turf_decal/siding/wood, -/obj/structure/closet/generic/wall{ - pixel_y = -32 +/obj/machinery/cryopod{ + dir = 4 }, -/turf/open/floor/carpet/green, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/chef) +/obj/machinery/computer/cryopod/interdyne/directional/west, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/turf/open/floor/wood, +/area/ruin/space/has_grav/bubbers/persistance/service/lockers) "BJ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" }, -/obj/machinery/door/airlock/highsecurity{ - id_tag = "syndishipbrigoff"; - name = "Brig Officer Quarters" +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" }, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/leader, -/obj/effect/mapping_helpers/airlock/cutaiwire, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/brig) +/obj/structure/lattice/catwalk/mining, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/engineering) "BM" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/storage/hypospraykit/cmo/combat, -/turf/open/floor/wood/large, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/medical) +/obj/structure/frame/machine/secured, +/obj/item/circuitboard/machine/circuit_imprinter/offstation, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/bubbers/persistance/sci/robotics) "BN" = ( /obj/machinery/duct, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -9453,14 +9595,22 @@ /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "BO" = ( +/obj/effect/turf_decal/siding/dark_green{ + dir = 9 + }, /obj/structure/table/reinforced/plastitaniumglass, -/obj/item/storage/box/metalfoam, -/obj/item/storage/toolbox/syndicate{ - pixel_y = 5 +/obj/item/reagent_containers/dropper{ + pixel_y = -6 }, -/obj/item/stock_parts/power_store/cell/lead, -/turf/open/floor/pod/dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering) +/obj/item/storage/test_tube_rack, +/obj/machinery/smartfridge/chemistry/virology/preloaded{ + pixel_y = 32 + }, +/obj/item/book/manual/wiki/infections{ + pixel_y = 7 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/bubbers/persistance/med/viro) "BQ" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/chef) @@ -9468,31 +9618,21 @@ /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/persistance/engineering/gas) "BS" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/cable, -/obj/structure/bed/double/pod{ - dir = 1 - }, -/obj/effect/spawner/random/bedsheet/any/double{ - dir = 4 - }, -/obj/machinery/button/door{ - id = "syndishipbrigoff"; - pixel_x = -24; - pixel_y = 8; - name = "Airlock Bolts"; - specialfunctions = 4; - normaldoorcontrol = 1 - }, -/turf/open/floor/carpet/red, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/brig) +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/obj/machinery/light/directional/north, +/turf/open/floor/engine, +/area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) "BT" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/sci/robotics) +"BV" = ( +/obj/structure/sauna_oven, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/wood/large, +/area/ruin/space/has_grav/bubbers/persistance/service/sauna) "BW" = ( /obj/machinery/duct, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -9514,59 +9654,20 @@ /turf/open/floor/carpet/royalblack, /area/ruin/space/has_grav/bubbers/persistance/service/lounge) "BY" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/structure/dresser, -/obj/item/flashlight/lamp/green{ - pixel_x = 5; - pixel_y = 15 - }, -/obj/machinery/button/door/directional/west{ - pixel_y = -8; - name = "Engineering Dorm Bolt Switch"; - id = "syndishipengibed"; - req_access = list("syndicate"); - normaldoorcontrol = 1; - specialfunctions = 4 - }, -/obj/machinery/button/door/directional/west{ - pixel_y = 8; - name = "turbines shutters"; - id = "turbine_shutters_bed"; - req_access = list("syndicate") - }, -/obj/machinery/button/door/directional/west{ - pixel_x = -40; - pixel_y = -8; - name = "Radiation Shutters"; - id = "rad_shutters" - }, -/obj/machinery/button/polarizer{ - pixel_x = -40; - pixel_y = 8; - name = "Turbine Window Polarization"; - id = "burnchamberbed_w" +/obj/effect/turf_decal/stripes/line{ + dir = 5 }, -/obj/machinery/light_switch/directional/west, -/turf/open/floor/iron/terracotta/small, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/engineering) -"BZ" = ( -/obj/machinery/duct, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/door/firedoor/heavy, -/obj/machinery/door/airlock/hydroponics/glass{ - name = "hydroponics" - }, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, -/obj/effect/mapping_helpers/airlock/cutaiwire, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service) +"BZ" = ( +/obj/machinery/atmospherics/components/binary/tank_compressor, +/obj/structure/sign/poster/contraband/singletank_bomb/directional/west, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) +/area/ruin/space/has_grav/bubbers/persistance/sci/ordnance) "Cc" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -9578,18 +9679,21 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/sci/robotics) "Ce" = ( -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/structure/sign/warning/docking/directional/west, -/turf/open/floor/engine/hull{ - initial_gas_mix = "LAVALAND_ATMOS" - }, -/area/lavaland/surface/outdoors) -"Cj" = ( +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/machinery/door/firedoor/heavy, +/obj/machinery/light/directional/east, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) +"Ci" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/light/directional/south, +/obj/structure/plant_tank, +/turf/open/floor/iron/terracotta/herringbone, +/area/ruin/space/has_grav/bubbers/persistance/service/hydro) +"Cj" = ( /obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 6 }, @@ -9608,21 +9712,23 @@ /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "Co" = ( -/obj/effect/turf_decal/siding/white{ - dir = 8 +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/lipstick/quantum{ + pixel_x = 9; + pixel_y = 4 }, -/obj/structure/chair/sofa/corp/left{ - color = "#DE3A3A"; - dir = 4 +/obj/item/lipstick/syndie, +/obj/structure/cable, +/obj/item/straight_razor, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 }, -/obj/effect/spawner/random/entertainment/plushie, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/effect/mapping_helpers/apc/cut_AI_wire, -/obj/effect/mapping_helpers/apc/full_charge, +/obj/machinery/power/apc/auto_name/directional/north, /obj/effect/mapping_helpers/apc/syndicate_access, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/med) +/obj/effect/mapping_helpers/apc/full_charge, +/obj/effect/mapping_helpers/apc/cut_AI_wire, +/turf/open/floor/iron/kitchen/herringbone, +/area/ruin/space/has_grav/bubbers/persistance/service/salon) "Cr" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/service/janitorial) @@ -9693,10 +9799,11 @@ }, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) "CD" = ( -/obj/structure/table, -/obj/machinery/xenoarch/digger, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/engineering/mining) +/obj/effect/turf_decal/siding/dark, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/turf/open/floor/mineral/titanium/tiled/white, +/area/ruin/space/has_grav/bubbers/persistance/med/treatment) "CE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/light/directional/south, @@ -9706,6 +9813,15 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/med) +"CF" = ( +/obj/machinery/porta_turret/syndicate{ + dir = 8; + pixel_x = 32; + pixel_y = -32 + }, +/obj/structure/lattice/catwalk/mining, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/space/has_grav/bubbers/dauntless/command/vault) "CG" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -9714,29 +9830,34 @@ /turf/open/floor/iron/white/small, /area/ruin/space/has_grav/bubbers/persistance/service/lockers) "CH" = ( -/obj/machinery/airalarm/directional/west, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/obj/effect/turf_decal/siding/thinplating/dark{ +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal/bin, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/effect/turf_decal/siding/thinplating/dark/corner{ - dir = 4 - }, -/turf/open/floor/iron/kitchen/herringbone, -/area/ruin/space/has_grav/bubbers/persistance/service/salon) -"CI" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/bluespace_vendor/directional/west, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) +/area/ruin/space/has_grav/bubbers/persistance/sec/holding) +"CI" = ( +/obj/effect/turf_decal/trimline/purple/filled/line, +/obj/machinery/firealarm/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/bubbers/persistance/sci/rnd) "CJ" = ( -/obj/machinery/light/directional/west, -/obj/structure/frame/machine/secured, -/obj/item/circuitboard/machine/protolathe/interdyne, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/sci/robotics) +/obj/machinery/button/door{ + pixel_y = 8; + id = "syndiliasonshutter"; + pixel_x = -24; + name = "shutter button"; + req_access = list("syndicate") + }, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/bubbers/persistance/command/liason) "CK" = ( /obj/machinery/light_switch/directional/east, /turf/closed/wall/r_wall/syndicate/cruiser, @@ -9745,24 +9866,28 @@ /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "CM" = ( -/obj/machinery/porta_turret/syndicate{ - dir = 8; - pixel_y = 32; - pixel_x = -32 - }, -/obj/machinery/camera/autoname/directional/north{ - name = "Persistence Exterior North"; - network = list("persistence_ext") +/obj/effect/turf_decal/siding/wood{ + dir = 10 }, -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/modular_computer/laptop/preset/syndicate, +/obj/machinery/button/polarizer{ + pixel_x = -24; + pixel_y = 8; + name = "Engineering Window Polarization"; + id = "persistenceengidorm_w" }, -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" +/obj/machinery/button/door/directional/west{ + pixel_y = -8; + name = "Engineering Dorm Windows Shutters"; + id = "persistengidorm_s"; + req_access = list("syndicate") }, -/obj/structure/lattice/catwalk/mining, -/turf/open/lava/smooth/lava_land_surface, -/area/ruin/space/has_grav/bubbers/dauntless/command/vault) +/obj/machinery/light/directional/south, +/turf/open/floor/iron/terracotta/small, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/engineering) "CN" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 4 @@ -9770,30 +9895,14 @@ /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "CO" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/structure/sign/barber{ - pixel_x = 14 +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) +/turf/open/floor/iron/kitchen/herringbone, +/area/ruin/space/has_grav/bubbers/persistance/service/salon) "CP" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/service/lounge) -"CR" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/newscaster/directional/south, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/brig) "CS" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 6 @@ -9826,23 +9935,57 @@ /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "CW" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/coffeemaker, +/obj/structure/cable, +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/light/directional/west, +/obj/machinery/vending/boozeomat{ + pixel_y = -32; + all_products_free = 1 + }, +/obj/machinery/button/door/directional/north{ + id = "dauntbar_s"; + name = "Bar Shutters"; + pixel_x = -24; + pixel_y = 8 + }, +/obj/machinery/button/polarizer{ + id = "dauntbar_w"; + name = "Bar Windows"; + pixel_y = -8; + pixel_x = -24 + }, +/obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/siding/dark{ + dir = 10 + }, +/turf/open/floor/wood/large, +/area/ruin/space/has_grav/bubbers/persistance/service/diner) +"CX" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/light/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/command/bridge) +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service/janitorial) "CZ" = ( -/turf/open/floor/grass, -/area/ruin/space/has_grav/bubbers/persistance/sec/prison) -"Dc" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/area/ruin/space/has_grav/bubbers/persistance/sci/ordnance) +"Dc" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/turf/open/floor/mineral/plastitanium/red{ + icon_state = "plastitanium" + }, +/area/ruin/space/has_grav/bubbers/persistance/command/bridge) "De" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/persistance/service/sauna) @@ -9872,49 +10015,44 @@ /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/rnd) "Dg" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/storage/box/stockparts/deluxe{ - pixel_x = -6; - pixel_y = 10 - }, -/obj/item/storage/box/stockparts/deluxe{ - pixel_x = 3; - pixel_y = -4 - }, -/turf/open/floor/pod/dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering) +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/iron/kitchen/diagonal, +/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "Dh" = ( /obj/machinery/light/dim/directional/west, /turf/open/floor/iron/stairs, /area/ruin/space/has_grav/bubbers/persistance/service/diner) -"Dk" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/light/directional/north, -/obj/machinery/firealarm/directional/north, -/obj/structure/cable, -/obj/effect/turf_decal/siding/dark/end{ - dir = 8 - }, -/obj/structure/reagent_dispensers/watertank/high, -/turf/open/floor/noslip, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) -"Dn" = ( -/obj/machinery/syndicatebomb/empty, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +"Dm" = ( /obj/structure/cable, -/turf/open/floor/circuit/red/anim, -/area/ruin/space/has_grav/bubbers/persistance/command/vault) -"Do" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/heavy, -/obj/machinery/door/airlock/public/glass{ - name = "Recreation" - }, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/structure/fireplace, +/obj/effect/turf_decal/siding/dark{ + dir = 8; + icon_state = "siding_plain_end" + }, +/turf/open/floor/iron/terracotta/small, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/chef) +"Dn" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/book/granter/crafting_recipe/dusting/rebarxbowsyndie_ammo, +/obj/item/storage/fancy/donut_box, +/obj/machinery/light/directional/west, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/sec/armory) +"Do" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/airlock/public/glass{ + name = "Recreation" + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/cutaiwire, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/sec/prison/rec) "Dq" = ( @@ -9942,12 +10080,9 @@ /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/med/chem) "Du" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/cargo) +/obj/effect/turf_decal/skyrat_decals/syndicate/top/left, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/sec/armory) "Dv" = ( /obj/effect/turf_decal/siding/dark{ dir = 6 @@ -9955,18 +10090,11 @@ /turf/open/floor/iron/white/diagonal, /area/ruin/space/has_grav/bubbers/persistance/med) "Dx" = ( -/obj/machinery/status_display/door_timer{ - id = "syndicate_cell"; - name = "Syndicate Holding Cell"; - pixel_y = 32; - req_access = list("syndicate") - }, -/obj/structure/window/reinforced/survival_pod/spawner/directional/west, -/obj/machinery/computer/security/persistence{ - dir = 4 +/obj/machinery/door/poddoor{ + id = "turbine_vent" }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/sec/brigentrance) +/turf/open/floor/engine, +/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "Dz" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/med) @@ -9987,41 +10115,35 @@ /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/rnd) "DD" = ( -/obj/structure/closet/crate, -/obj/item/skillchip/job/engineer, -/obj/item/skillchip/job/janitor, -/obj/item/skillchip/job/psychology, -/obj/item/skillchip/job/roboticist, -/obj/item/skillchip/brainwashing, -/obj/item/skillchip/job/psychology, -/obj/item/skillchip/job/roboticist, -/obj/item/skillchip/job/janitor, -/obj/item/skillchip/job/miner, -/obj/item/skillchip/entrails_reader, -/obj/machinery/vending/clothing{ - density = 0; - pixel_y = -28; - all_products_free = 1 +/obj/machinery/duct, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/bar/opposingcorners{ + dir = 8 }, -/obj/effect/turf_decal/siding/wood{ - dir = 6 +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/turf_decal/siding{ + dir = 8 }, -/turf/open/floor/wood, -/area/ruin/space/has_grav/bubbers/persistance/service/lockers) +/obj/structure/sign/poster/contraband/energy_swords/directional/west, +/turf/open/floor/iron/cafeteria, +/area/ruin/space/has_grav/bubbers/persistance/service/diner) "DE" = ( /obj/machinery/light/directional/south, /obj/machinery/suit_storage_unit/industrial/commsoperative, /turf/open/floor/wood/parquet, /area/ruin/space/has_grav/bubbers/persistance/command/liason) "DF" = ( -/obj/structure/sink/kitchen/directional/east, -/obj/machinery/digital_clock/directional/west, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 10 +/obj/effect/spawner/liquids_spawner/shoulders, +/obj/structure/chair/sofa/bench{ + dir = 4 }, -/obj/machinery/light/directional/south, -/turf/open/floor/iron/kitchen/herringbone, -/area/ruin/space/has_grav/bubbers/persistance/service/salon) +/obj/effect/mist, +/turf/open/floor/iron/pool/cobble/side{ + dir = 8 + }, +/area/ruin/space/has_grav/bubbers/persistance/service/sauna) "DG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, @@ -10029,51 +10151,80 @@ /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) "DH" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/recharger, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/door/firedoor/heavy, -/obj/machinery/light/directional/west, -/obj/machinery/door/window/survival_pod/left/directional/south{ - req_access = list("syndicate") +/obj/structure/cable, +/obj/machinery/duct, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/security/old/glass{ + name = "Brig" }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/door/firedoor/heavy, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/sec/brigentrance) +"DI" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/bluespace_vendor/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service) -"DI" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 9 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/chair/comfy/shuttle/tactical{ - dir = 8 - }, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/command/bridge) "DJ" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/service/sauna) "DK" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/junction{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/sec/armory) +/obj/machinery/smartfridge/drinks, +/turf/open/floor/wood/large, +/area/ruin/space/has_grav/bubbers/persistance/service/diner) "DL" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/button/door/directional/west{ - id = "synditrash"; - name = "Persistance Recycling Blast Doors"; - req_access = list("syndicate"); - pixel_y = -8 +/obj/machinery/conveyor{ + id = "syndirecycle"; + dir = 1 }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/effect/spawner/random/trash/garbage{ + pixel_x = 4; + pixel_y = 5 + }, +/obj/effect/spawner/random/trash/garbage{ + pixel_x = 4; + pixel_y = 5 + }, +/obj/effect/spawner/random/maintenance/three, +/obj/effect/spawner/random/trash/garbage{ + pixel_x = 4; + pixel_y = 5 + }, +/obj/effect/spawner/random/trash/garbage{ + pixel_x = 4; + pixel_y = 5 + }, +/obj/machinery/light/directional/west, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/effect/spawner/random/maintenance/three, +/obj/effect/spawner/random/trash/garbage{ + pixel_x = 4; + pixel_y = 5 + }, +/obj/effect/spawner/random/trash/garbage{ + pixel_x = 4; + pixel_y = 5 + }, +/obj/effect/spawner/random/trash/garbage{ + pixel_x = 4; + pixel_y = 5 + }, +/obj/effect/spawner/random/maintenance/five, +/obj/item/stock_parts/power_store/cell/lead, +/obj/effect/spawner/random/maintenance/two, +/obj/effect/spawner/random/trash/garbage{ + pixel_x = 4; + pixel_y = 5 + }, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/cargo) "DM" = ( /obj/structure/cable, /obj/structure/sign/poster/official/moth_epi/directional/south, @@ -10091,9 +10242,15 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/med/chem) "DN" = ( -/obj/machinery/biogenerator, -/turf/open/floor/iron/kitchen/diagonal, -/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/structure/cable, +/obj/machinery/duct, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "DO" = ( /obj/effect/turf_decal/vg_decals/radiation, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -10144,28 +10301,17 @@ }, /turf/open/floor/mineral/titanium/white, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) -"DV" = ( +"DX" = ( +/obj/machinery/duct, /obj/structure/cable, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/heavy, -/obj/machinery/door/airlock/science{ - id_tag = "syndishipscienced" - }, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, -/obj/effect/mapping_helpers/airlock/cutaiwire, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/sci/rnd) -"DW" = ( -/obj/effect/turf_decal/skyrat_decals/ds2/middle, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/service) -"DX" = ( -/turf/closed/wall/r_wall/syndicate/nodiagonal, -/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) +/obj/effect/turf_decal/siding/dark, +/turf/open/floor/iron/white/small, +/area/ruin/space/has_grav/bubbers/persistance/service/lockers) "DY" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) @@ -10175,11 +10321,16 @@ /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "Ea" = ( -/obj/structure/sign/poster/contraband/free_drone/directional/north, -/obj/structure/frame/machine/secured, -/obj/item/circuitboard/machine/mechfab/interdyne, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/sci/robotics) +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium{ + polarizer_id = "dauntbar_w" + }, +/obj/structure/cable, +/obj/machinery/door/poddoor/shutters/preopen{ + name = "Bar Shutters"; + id = "dauntbar_s" + }, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/service/diner) "Ed" = ( /obj/structure/window/reinforced/survival_pod/spawner/directional/south, /obj/machinery/button/door/directional/west{ @@ -10226,28 +10377,14 @@ /turf/open/floor/iron/white/small, /area/ruin/space/has_grav/bubbers/persistance/service/lockers) "Eh" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/structure/cable, -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/modular_computer/laptop/preset/syndicate, -/obj/machinery/button/polarizer{ - pixel_x = -24; - pixel_y = 8; - name = "Engineering Window Polarization"; - id = "persistenceengidorm_w" +/obj/structure/disposalpipe/junction{ + dir = 4 }, -/obj/machinery/button/door/directional/west{ - pixel_y = -8; - name = "Engineering Dorm Windows Shutters"; - id = "persistengidorm_s"; - req_access = list("syndicate") - }, -/obj/machinery/light/directional/south, -/turf/open/floor/iron/terracotta/small, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/engineering) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/sec/armory) "Ei" = ( /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) @@ -10262,19 +10399,17 @@ /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) "Eq" = ( -/obj/effect/turf_decal/siding/wood, -/obj/structure/safe/abovetilefloor, -/obj/item/sign/flag/syndicate{ - pixel_x = 3; - pixel_y = 6 +/obj/effect/turf_decal/stripes/line, +/obj/structure/disposalpipe/trunk{ + dir = 8 }, -/obj/machinery/light/directional/south, -/turf/open/floor/carpet/purple, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/janitor) +/obj/machinery/disposal/bin, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service) "Es" = ( -/obj/structure/sign/poster/contraband/hacking_guide/directional/east, -/turf/closed/wall/r_wall/syndicate/nodiagonal, -/area/ruin/space/has_grav/bubbers/persistance/sci/robotics) +/obj/structure/flora/bush/lavendergrass/style_random, +/turf/open/floor/grass, +/area/ruin/space/has_grav/bubbers/persistance/sec/prison) "Et" = ( /obj/effect/turf_decal/siding/wood, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -10300,10 +10435,14 @@ /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "Ew" = ( -/obj/effect/turf_decal/siding/dark, -/obj/item/kirbyplants/fern, -/turf/open/floor/iron/white/small, -/area/ruin/space/has_grav/bubbers/persistance/service/lockers) +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 9 + }, +/turf/open/floor/iron/terracotta/herringbone, +/area/ruin/space/has_grav/bubbers/persistance/service/hydro) "Ex" = ( /obj/machinery/light/directional/east, /obj/machinery/vending/medical/syndicate/cybersun{ @@ -10321,29 +10460,65 @@ /obj/machinery/iv_drip, /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/med/treatment) -"EA" = ( -/obj/machinery/computer/atmos_control/nocontrol/incinerator{ - dir = 4; - id_tag = "syndiship_turbine"; - atmos_chambers = list("syndiship_turbine") +"EC" = ( +/obj/item/reagent_containers/condiment/vinegar{ + pixel_x = -3; + pixel_y = 11 }, -/obj/machinery/button/door/directional/west{ - id = "turbine_vent"; - name = "Turbine Vent"; - req_access = list("syndicate") +/obj/item/reagent_containers/condiment/yoghurt{ + pixel_x = 6; + pixel_y = 5 }, -/turf/open/floor/catwalk_floor/titanium, -/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) -"ED" = ( -/obj/machinery/button/door{ - pixel_y = -32; - id = "syndiarmoryshutter" +/obj/item/reagent_containers/condiment/cornmeal{ + pixel_x = -6; + pixel_y = 2 }, -/obj/machinery/computer/camera_advanced/syndie{ - dir = 4 +/obj/item/food/canned/jellyfish{ + pixel_x = 5 }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/sec/armory) +/obj/item/food/canned/desert_snails{ + pixel_x = -3; + pixel_y = 1 + }, +/obj/item/food/canned/tomatoes, +/obj/item/food/canned/tuna{ + pixel_x = -6; + pixel_y = -5 + }, +/obj/item/food/canned/pine_nuts{ + pixel_x = 10; + pixel_y = -9 + }, +/obj/item/food/fishmeat/moonfish{ + pixel_y = -11 + }, +/obj/item/food/fishmeat/moonfish{ + pixel_y = -8 + }, +/obj/item/food/fishmeat/moonfish{ + pixel_y = -5 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/syndicate_access, +/obj/effect/mapping_helpers/apc/cut_AI_wire, +/obj/effect/mapping_helpers/apc/full_charge, +/obj/structure/closet/crate/freezer/donk, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/ruin/space/has_grav/bubbers/persistance/service/freezer) +"ED" = ( +/obj/structure/cable, +/obj/effect/mapping_helpers/apc/syndicate_access, +/obj/effect/mapping_helpers/apc/full_charge, +/obj/effect/mapping_helpers/apc/cut_AI_wire, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/siding/dark{ + dir = 9 + }, +/turf/open/floor/iron/white/small, +/area/ruin/space/has_grav/bubbers/persistance/service/lockers) "EE" = ( /obj/structure/chair/comfy/shuttle/tactical{ dir = 4 @@ -10411,50 +10586,53 @@ /turf/open/floor/grass, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "EO" = ( -/obj/machinery/duct, -/obj/structure/cable, -/obj/structure/disposalpipe/junction/yjunction{ - dir = 8 +/obj/machinery/bluespace_miner, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering/mining) +"EP" = ( +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/effect/turf_decal/siding/dark/corner{ - dir = 8 +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" }, -/turf/open/floor/iron/white/small, -/area/ruin/space/has_grav/bubbers/persistance/service/lockers) -"EP" = ( -/obj/machinery/light/small/directional/west, -/obj/machinery/computer/turbine_computer{ - mapping_id = "dauntless_turbine"; - dir = 4 +/obj/machinery/porta_turret/syndicate{ + dir = 8; + pixel_x = -32 }, -/turf/open/floor/catwalk_floor/titanium, -/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) +/obj/machinery/camera/autoname/directional/west{ + name = "Persistence Exterior West"; + network = list("persistence_ext") + }, +/obj/structure/lattice/catwalk/mining, +/turf/open/lava/smooth/lava_land_surface, +/area/lavaland/surface/outdoors) "ER" = ( -/obj/structure/plasticflaps, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/effect/turf_decal/siding/dark{ + dir = 10 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/wood, +/area/ruin/space/has_grav/bubbers/persistance/service/gym) "ES" = ( -/obj/machinery/chem_master, +/obj/machinery/hydroponics/constructable, +/turf/open/floor/grass, +/area/ruin/space/has_grav/bubbers/persistance/sec/prison) +"ET" = ( +/obj/structure/guncase{ + req_access = list("syndicate") + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/med/chem) -"ET" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/effect/mapping_helpers/apc/syndicate_access, -/obj/effect/mapping_helpers/apc/cut_AI_wire, -/obj/effect/mapping_helpers/apc/full_charge, -/obj/structure/disposalpipe/junction{ - dir = 8 +/obj/machinery/light/directional/west, +/obj/item/gun/ballistic/shotgun/riot/sol/evil{ + pixel_y = 10 + }, +/obj/item/gun/ballistic/shotgun/riot/sol/evil{ + pixel_y = 10 }, /turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/brig) +/area/ruin/space/has_grav/bubbers/persistance/sec/armory) "EU" = ( /obj/machinery/firealarm/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -10463,26 +10641,28 @@ /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "EV" = ( -/obj/structure/plasticflaps, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/structure/cable, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/service/hydro) -"EW" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/bubbers/persistance/sci/rnd) +"EW" = ( +/obj/machinery/duct, +/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/light_switch/directional/west, -/obj/structure/dresser, -/obj/item/flashlight/lamp/green{ - pixel_x = 5; - pixel_y = 15 +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 5 }, -/turf/open/floor/carpet/red, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/brig) +/obj/machinery/skill_station, +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/turf/open/floor/iron/white/small, +/area/ruin/space/has_grav/bubbers/persistance/service/lockers) "EX" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -10503,16 +10683,22 @@ /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "Fa" = ( /obj/effect/turf_decal/stripes/line{ - dir = 10 + dir = 1 }, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) +/area/ruin/space/has_grav/bubbers/persistance/service/janitorial) "Fb" = ( -/obj/item/disk/ammo_workbench/advanced, -/obj/structure/extinguisher_cabinet/directional/west, -/obj/machinery/ammo_workbench, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/sec/armory) +/obj/structure/cable, +/obj/machinery/duct, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/firealarm/directional/east, +/obj/machinery/light/directional/east, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "Fc" = ( /obj/machinery/door/airlock/highsecurity{ id_tag = "syndishipmanager" @@ -10531,15 +10717,14 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "Fd" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 4; - name = "Medbay" +/obj/structure/chair/sofa/left/maroon{ + dir = 4 }, -/obj/machinery/door/firedoor/heavy, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, -/obj/effect/mapping_helpers/airlock/cutaiwire, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/med) +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/turf/open/floor/carpet/purple, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/science) "Fe" = ( /obj/machinery/door/airlock/security/old/glass{ name = "General Population Access" @@ -10580,6 +10765,17 @@ /obj/machinery/light/directional/south, /turf/open/floor/mineral/titanium/white, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) +"Fg" = ( +/obj/structure/table/optable, +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/item/defibrillator/loaded, +/turf/open/floor/mineral/titanium/tiled/white, +/area/ruin/space/has_grav/bubbers/persistance/med/treatment) "Fi" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/machinery/vending/dinnerware{ @@ -10593,15 +10789,24 @@ /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "Fj" = ( /obj/effect/turf_decal/siding/wood{ - dir = 10 + dir = 8 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/airalarm/directional/west, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/obj/effect/mob_spawn/ghost_role/human/persistence/syndicate/brigoff{ - dir = 4; - name = "Persistence Brig Officer" +/obj/structure/cable, +/obj/structure/bed/double/pod{ + dir = 1 + }, +/obj/effect/spawner/random/bedsheet/any/double{ + dir = 4 + }, +/obj/machinery/button/door{ + id = "syndishipbrigoff"; + pixel_x = -24; + pixel_y = 8; + name = "Airlock Bolts"; + specialfunctions = 4; + normaldoorcontrol = 1 }, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/brig) @@ -10701,17 +10906,17 @@ }, /turf/open/floor/wood/parquet, /area/ruin/space/has_grav/bubbers/persistance/command/liason) -"Fx" = ( -/obj/machinery/telecomms/relay/preset, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/sign/poster/contraband/hacking_guide/directional/south, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +"Fw" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/syndicate_access, +/obj/effect/mapping_helpers/apc/cut_AI_wire, +/obj/effect/mapping_helpers/apc/full_charge, +/obj/structure/disposalpipe/junction{ + dir = 8 }, /turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/brig) "Fy" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 @@ -10733,30 +10938,14 @@ }, /turf/open/floor/engine, /area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) -"FA" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/obj/structure/cable, -/obj/machinery/camera/autoname/directional/west{ - name = "Persistence Exterior West"; - network = list("persistence_ext") - }, -/obj/structure/chair/sofa/corp/corner{ - dir = 4 - }, -/turf/open/floor/carpet/royalblack, -/area/ruin/space/has_grav/bubbers/persistance/sec/prison/rec) "FF" = ( -/obj/structure/sign/painting/library{ - pixel_x = -30 - }, -/obj/machinery/light/directional/west{ - dir = 1 +/obj/structure/sign/xenobio_guide/directional/west, +/obj/machinery/camera/autoname/directional/north{ + network = list("persistence_xeno"); + name = "persistence_xeno_north" }, -/obj/structure/easel, -/turf/open/floor/wood, -/area/ruin/space/has_grav/bubbers/persistance/service/lounge) +/turf/open/floor/circuit/telecomms, +/area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) "FG" = ( /obj/structure/window/green_glass_pane, /obj/structure/curtain/cloth/fancy, @@ -10767,15 +10956,14 @@ /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/rnd) "FI" = ( -/obj/structure/table/wood/fancy/black, -/obj/item/reagent_containers/cup/glass/trophy/gold_cup{ - pixel_y = 6; - desc = "To the loss of a beloved sister ship. May you rest peacefully beneath the ice."; - name = "DS-2 Memorial Trophy" +/obj/effect/turf_decal/stripes/line{ + dir = 10 }, -/obj/effect/turf_decal/siding/thinplating/dark/end{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service) "FJ" = ( @@ -10790,31 +10978,50 @@ /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/cargo) "FQ" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 10 +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" + }, +/obj/machinery/porta_turret/syndicate{ + dir = 8; + pixel_x = 32 + }, +/obj/machinery/camera/autoname/directional/east{ + network = list("persistence_ext"); + name = "persistence exterior east" + }, +/obj/structure/lattice/catwalk/mining, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/space/has_grav/bubbers/dauntless/command/vault) +"FR" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ dir = 4 }, -/turf/open/floor/carpet/royalblue, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/medical) +/turf/open/floor/iron/terracotta/herringbone, +/area/ruin/space/has_grav/bubbers/persistance/service/hydro) "FS" = ( -/obj/structure/cable, -/obj/machinery/duct, -/obj/structure/disposalpipe/junction/flip{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/sec/holding) +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/cargo) "FT" = ( -/obj/structure/sign/flag/syndicate/directional/south, -/obj/effect/turf_decal/siding/thinplating/dark, -/obj/effect/mapping_helpers/broken_floor, -/obj/item/bouquet, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/structure/frame/machine/secured, +/obj/item/circuitboard/machine/stacking_machine, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering/mining) "FU" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -10838,22 +11045,17 @@ /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/rnd) "FY" = ( -/obj/machinery/light/directional/west, -/obj/machinery/computer/rdconsole{ - dir = 4 +/obj/structure/table/wood/fancy/black, +/obj/item/reagent_containers/cup/glass/trophy/gold_cup{ + pixel_y = 6; + desc = "To the loss of a beloved sister ship. May you rest peacefully beneath the ice."; + name = "DS-2 Memorial Trophy" }, -/turf/open/floor/mineral/plastitanium/red{ - icon_state = "plastitanium" +/obj/effect/turf_decal/siding/thinplating/dark/end{ + dir = 8 }, -/area/ruin/space/has_grav/bubbers/persistance/command/bridge) -"FZ" = ( -/obj/effect/turf_decal/stripes/blue/line, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/med) +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service) "Gb" = ( /obj/structure/window/reinforced/plasma/spawner/directional/north, /obj/machinery/netpod, @@ -10879,13 +11081,22 @@ /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "Gi" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/storage/box/metalfoam, +/obj/item/storage/toolbox/syndicate{ + pixel_y = 5 + }, +/obj/item/stock_parts/power_store/cell/lead, +/turf/open/floor/pod/dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) +"Gj" = ( +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/structure/sign/poster/contraband/babel_device/directional/east, -/obj/machinery/door/firedoor/heavy, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) +/turf/open/floor/iron/terracotta/herringbone, +/area/ruin/space/has_grav/bubbers/persistance/service/hydro) "Gk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -10913,22 +11124,19 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/cargo) "Gm" = ( -/obj/machinery/button/door/directional/west{ - pixel_y = -8; - specialfunctions = 4; - name = "Dorm Bolt Switch"; - id = "syndishipmoraledorm"; - req_access = list("syndicate"); - normaldoorcontrol = 1 - }, /obj/effect/turf_decal/siding/wood{ - dir = 10 + dir = 9 }, -/obj/structure/chair/sofa/right/maroon{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/light_switch/directional/west, +/obj/structure/dresser, +/obj/item/flashlight/lamp/green{ + pixel_x = 5; + pixel_y = 15 }, -/turf/open/floor/carpet/green, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/chef) +/turf/open/floor/carpet/red, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/brig) "Go" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/item/cutting_board, @@ -11007,39 +11215,23 @@ /turf/open/floor/iron/white/small, /area/ruin/space/has_grav/bubbers/persistance/service/lockers) "GB" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/firealarm/directional/east, -/obj/structure/fake_stairs/directional/north, -/obj/machinery/duct, -/obj/structure/disposalpipe/segment, +/obj/structure/chair/office/tactical{ + dir = 4 + }, /turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) +/area/ruin/space/has_grav/bubbers/persistance/cargo/drone) "GC" = ( -/obj/structure/guncase{ - req_access = list("syndicate") - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/light/directional/west, -/obj/item/gun/ballistic/shotgun/riot/sol/evil{ - pixel_y = 10 - }, -/obj/item/gun/ballistic/shotgun/riot/sol/evil{ - pixel_y = 10 - }, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/sec/armory) +/obj/machinery/firealarm/directional/west, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "GD" = ( -/obj/machinery/airalarm/directional/north, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/obj/effect/turf_decal/siding/dark{ - dir = 1; - icon_state = "siding_plain_end" +/obj/machinery/light/small/directional/west, +/obj/machinery/computer/turbine_computer{ + mapping_id = "dauntless_turbine"; + dir = 4 }, -/turf/open/floor/iron/terracotta/diagonal, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/morale) +/turf/open/floor/catwalk_floor/titanium, +/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "GE" = ( /obj/structure/disposalpipe/junction/flip{ dir = 4 @@ -11052,8 +11244,11 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/evac) "GF" = ( -/obj/structure/closet/radiation, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/stripes/end{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service) "GG" = ( @@ -11071,13 +11266,24 @@ "GH" = ( /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) -"GK" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/effect/turf_decal/siding/dark/corner{ - dir = 8 - }, -/turf/open/floor/mineral/titanium/tiled/white, -/area/ruin/space/has_grav/bubbers/persistance/med/treatment) +"GI" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/obj/effect/turf_decal/vg_decals/numbers/four, +/obj/machinery/camera/autoname/directional/west{ + network = list("persistence_xeno"); + pixel_y = -23 + }, +/turf/open/floor/engine, +/area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) +"GK" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light/directional/east, +/obj/item/kirbyplants/organic/plant9, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service) "GL" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 6 @@ -11092,16 +11298,13 @@ /turf/open/floor/iron/kitchen/herringbone, /area/ruin/space/has_grav/bubbers/persistance/service/salon) "GN" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/duct, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/light/directional/south, -/obj/machinery/barsign/all_access/directional/south, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/diner) +/area/ruin/space/has_grav/bubbers/persistance/service) "GP" = ( /obj/structure/bed/double/pod, /obj/effect/spawner/random/bedsheet/any/double, @@ -11131,32 +11334,27 @@ /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/cargo) "GT" = ( -/obj/effect/turf_decal/stripes/red/line{ - dir = 1 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/sec/brigentrance) -"GU" = ( -/obj/machinery/light/directional/west, -/obj/structure/closet/emcloset/wall{ - pixel_x = -32 - }, -/turf/open/floor/iron/colony/bolts, -/area/ruin/space/has_grav/bubbers/persistance/service) -"GV" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/structure/cable, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/sci/ordnance) -"GW" = ( -/obj/effect/turf_decal/siding/wood{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/sink/directional/west, -/obj/structure/mirror/directional/east, -/turf/open/floor/iron/freezer, +/obj/machinery/door/airlock/highsecurity{ + id_tag = "syndishipbrigoff"; + name = "Brig Officer Quarters" + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/leader, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/brig) +"GU" = ( +/obj/effect/turf_decal/skyrat_decals/syndicate/middle/left, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/command/bridge) +"GV" = ( +/obj/machinery/firealarm/directional/east, +/turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "GX" = ( /obj/machinery/light/directional/south, @@ -11183,9 +11381,12 @@ /turf/open/floor/glass/reinforced/plasma, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "Ha" = ( -/obj/machinery/icecream_vat, -/turf/open/floor/iron/kitchen_coldroom/freezerfloor, -/area/ruin/space/has_grav/bubbers/persistance/service/freezer) +/obj/structure/plasticflaps, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "Hc" = ( /obj/structure/fans/tiny, /obj/machinery/conveyor{ @@ -11234,31 +11435,47 @@ /obj/structure/cable, /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/rnd) -"Hl" = ( -/obj/structure/disposalpipe/segment, +"Hk" = ( /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/turf/open/floor/iron/white, -/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) -"Hn" = ( -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/airlock/highsecurity{ + name = "Armory Desk" }, -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" +/obj/effect/mapping_helpers/airlock/access/all/syndicate/leader, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/sec/armory) +"Hl" = ( +/obj/machinery/button/door{ + id = "syndibridge_w"; + name = "Bridge Window Shutters"; + req_access = list("syndicate_leader"); + pixel_x = -24 }, -/obj/machinery/porta_turret/syndicate{ - dir = 8; - pixel_x = -32 +/obj/structure/noticeboard/directional/north, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/paper/dark_matteor_summoning, +/obj/item/paper/crumpled/muddy/fluff/cannon_instructions, +/obj/item/paper/crumpled/retired_designs, +/obj/item/paper/crumpled/plap, +/obj/item/paper/crumpled/rbmk2, +/obj/item/paper/default_lawset_list, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/command/bridge) +"Hn" = ( +/obj/machinery/ntnet_relay, +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/obj/machinery/camera/autoname/directional/west{ - name = "Persistence Exterior West"; - network = list("persistence_ext") +/obj/machinery/light/directional/south, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 }, -/obj/structure/lattice/catwalk/mining, -/turf/open/lava/smooth/lava_land_surface, -/area/lavaland/surface/outdoors) +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "Hr" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/machinery/light/directional/north, @@ -11273,15 +11490,28 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/engineering/mining) "Ht" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/cargo/drone) +/obj/effect/turf_decal/vg_decals/atmos/nitrous_oxide, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) "Hw" = ( -/obj/structure/frame/machine/secured, -/obj/item/circuitboard/machine/stacking_machine, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering/mining) +/obj/machinery/porta_turret/syndicate{ + dir = 8; + pixel_y = 32; + pixel_x = -32 + }, +/obj/machinery/camera/autoname/directional/north{ + name = "Persistence Exterior North"; + network = list("persistence_ext") + }, +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" + }, +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" + }, +/obj/structure/lattice/catwalk/mining, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/space/has_grav/bubbers/dauntless/command/vault) "Hx" = ( /obj/structure/fans/tiny/forcefield{ dir = 4 @@ -11309,36 +11539,37 @@ /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "HA" = ( -/obj/structure/disposalpipe/trunk{ - dir = 4 +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 10 }, -/obj/machinery/disposal/bin, -/obj/structure/cable, -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/siding/wood, -/obj/machinery/digital_clock/directional/south, -/turf/open/floor/carpet/purple, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/science) +/obj/structure/microscope, +/obj/structure/table/reinforced/plastitaniumglass, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/bubbers/persistance/sci/rnd) "HB" = ( +/obj/machinery/duct, /obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/wood/large, -/area/ruin/space/has_grav/bubbers/persistance/service/sauna) +/obj/machinery/button/door/directional/north{ + name = "Armory Shutters"; + id = "armory_s2"; + pixel_y = 0; + req_access = list("syndicate_leader"); + pixel_x = -24 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "HC" = ( -/obj/effect/turf_decal/stripes/red/line{ +/obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/effect/turf_decal/stripes/red/line, -/obj/machinery/button/door{ - id = "syndihanger"; - pixel_x = -24; - name = "Hanger doors"; - req_access = list("syndicate") - }, -/turf/open/floor/engine/hull{ - initial_gas_mix = "LAVALAND_ATMOS" - }, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/carpet/stellar, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/cargo) "HD" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/persistance/sci/robotics) @@ -11389,46 +11620,50 @@ /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "HL" = ( -/obj/machinery/light/directional/south, -/obj/structure/reagent_dispensers/foamtank, -/turf/open/floor/pod/dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering) +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/mob/living/carbon/human/species/monkey, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/misc/grass/jungle/station, +/area/ruin/space/has_grav/bubbers/persistance/med) "HM" = ( -/obj/machinery/power/apc/auto_name/directional/north, -/obj/effect/mapping_helpers/apc/syndicate_access, -/obj/effect/mapping_helpers/apc/full_charge, -/obj/effect/mapping_helpers/apc/cut_AI_wire, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/storage/toolbox/syndicate{ + pixel_y = 5 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/bubbers/persistance/sci/robotics) +"HN" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/obj/machinery/door/airlock/vault{ + name = "Vault"; + id_tag = "syndiship_vault" + }, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/door/firedoor/heavy, /obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/sci/ordnance) -"HN" = ( +/area/ruin/space/has_grav/bubbers/persistance/command/vault) +"HO" = ( /obj/structure/cable, /obj/machinery/duct, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/sign/poster/contraband/syndiemoth/directional/east, -/obj/machinery/door/firedoor/heavy, +/obj/structure/sign/poster/contraband/revolver/directional/west, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) -"HO" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/machinery/button/door/directional/west{ - pixel_y = -8; - specialfunctions = 4; - name = "Dorm Bolt Switch"; - id = "syndishipjanidorm"; - req_access = list("syndicate"); - normaldoorcontrol = 1 - }, -/obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/turf/open/floor/carpet/purple, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/janitor) "HQ" = ( /obj/structure/cable, /obj/structure/disposalpipe/junction{ @@ -11465,23 +11700,9 @@ /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/med/treatment) "Ia" = ( -/obj/machinery/porta_turret/syndicate{ - dir = 8; - pixel_y = 32 - }, -/obj/machinery/camera/autoname/directional/north{ - name = "Persistence Exterior North"; - network = list("persistence_ext") - }, -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/structure/lattice/catwalk/mining, -/turf/open/lava/smooth/lava_land_surface, -/area/ruin/space/has_grav/bubbers/dauntless/command/vault) +/obj/machinery/icecream_vat, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/ruin/space/has_grav/bubbers/persistance/service/freezer) "Ic" = ( /obj/structure/disposalpipe/segment, /obj/structure/sign/departments/telecomms/alt/directional/east, @@ -11490,13 +11711,16 @@ /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "If" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/junction/flip{ dir = 1 }, /obj/machinery/duct, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service/janitorial) +/obj/machinery/firealarm/directional/east, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "Ig" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -11506,13 +11730,6 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/cargo) -"Ih" = ( -/obj/structure/chair/comfy/carp{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/turf/open/floor/wood/parquet, -/area/ruin/space/has_grav/bubbers/persistance/command/liason) "Ij" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -11526,69 +11743,43 @@ /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/medical) "Il" = ( -/obj/effect/spawner/liquids_spawner/shoulders, -/obj/structure/chair/sofa/bench{ - dir = 4 +/obj/effect/turf_decal/skyrat_decals/ds2/left, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 1 }, -/obj/effect/mist, -/turf/open/floor/iron/pool/cobble/side{ +/obj/effect/turf_decal/siding/thinplating/dark/corner{ dir = 8 }, -/area/ruin/space/has_grav/bubbers/persistance/service/sauna) +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/service) "Im" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 10 - }, -/obj/effect/turf_decal/trimline/dark_red/filled/line{ - dir = 10 - }, -/obj/structure/cable, -/obj/machinery/light/directional/west, -/obj/structure/bookcase/random{ - pixel_y = -32; - density = 0 - }, -/obj/machinery/light_switch/directional/west, -/turf/open/floor/carpet/royalblack, -/area/ruin/space/has_grav/bubbers/persistance/service/lounge) +/obj/machinery/firealarm/directional/west, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/bubbers/persistance/command/liason) "In" = ( -/obj/structure/chair/office/tactical{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 +/obj/structure/disposalpipe/trunk{ + dir = 4 }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/med/chem) +/obj/machinery/disposal/bin, +/obj/machinery/light/directional/west, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/sci/ordnance) "Io" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/cargo) "Ip" = ( -/obj/structure/cable, -/obj/machinery/duct, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/security/old/glass{ - name = "Brig" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/heavy, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, -/obj/effect/mapping_helpers/airlock/cutaiwire, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/sec/brigentrance) +/obj/structure/safe/abovetilefloor, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/maa) "Iq" = ( -/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium{ - polarizer_id = "persistence_operating" - }, -/obj/structure/cable, -/obj/machinery/door/poddoor{ - id = "persistence_operating_s"; - name = "Persistance Medical Blast Doors" - }, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/med/treatment) +/obj/machinery/light/directional/west, +/obj/structure/frame/machine/secured, +/obj/item/circuitboard/machine/protolathe/interdyne, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/bubbers/persistance/sci/robotics) "Ir" = ( /obj/structure/chair/office/light{ dir = 4 @@ -11596,14 +11787,15 @@ /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/cargo) "Is" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/structure/table/reinforced/plastitaniumglass, +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/obj/item/storage/box/medipens{ + pixel_x = 4; + pixel_y = 13 }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/machinery/light/directional/west, +/turf/open/floor/iron/white, +/area/ruin/space/has_grav/bubbers/persistance/med/treatment) "It" = ( /obj/structure/cable, /obj/machinery/light/directional/south, @@ -11631,27 +11823,14 @@ }, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/command/liason) -"Iy" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/turf/open/floor/wood, -/area/ruin/space/has_grav/bubbers/persistance/service/gym) "Iz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/heavy, -/obj/structure/cable, -/obj/machinery/door/airlock/security/old{ - name = "Interrogation" - }, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, -/obj/effect/mapping_helpers/airlock/cutaiwire, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "persistence_int" +/obj/machinery/camera/autoname/directional/east{ + network = list("persistence_ext"); + name = "persistence exterior east" }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/sec/prison) "IA" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -11681,26 +11860,20 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "IF" = ( -/obj/structure/table/wood, -/obj/structure/bedsheetbin/basket, -/obj/structure/sign/poster/contraband/blasto_detergent/directional/west, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/effect/turf_decal/stripes/red/line{ dir = 1 }, -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/siding/dark{ - dir = 8 +/obj/effect/turf_decal/stripes/red/line, +/obj/machinery/button/door{ + id = "syndihanger"; + pixel_x = -24; + name = "Hanger doors"; + req_access = list("syndicate") }, -/turf/open/floor/iron/white/small, -/area/ruin/space/has_grav/bubbers/persistance/service/lockers) -"IH" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/hairbrush/tactical, -/obj/item/scissors, -/obj/machinery/duct, -/obj/effect/turf_decal/siding/thinplating/dark, -/turf/open/floor/iron/kitchen/herringbone, -/area/ruin/space/has_grav/bubbers/persistance/service/salon) +/turf/open/floor/engine/hull{ + initial_gas_mix = "LAVALAND_ATMOS" + }, +/area/ruin/space/has_grav/bubbers/persistance/service) "II" = ( /obj/structure/window/reinforced/plasma/spawner/directional/north, /obj/machinery/conveyor_switch/oneway{ @@ -11733,68 +11906,69 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/med) "IN" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/ruin/space/has_grav/bubbers/persistance/med/treatment) +/obj/machinery/conveyor_switch/oneway{ + id = "syndirecycle" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/window/survival_pod/left/directional/west{ + req_access = list("syndicate") + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/cargo) "IO" = ( -/obj/structure/cable, +/obj/structure/sign/painting/library{ + pixel_x = -30 + }, +/obj/structure/rack, +/obj/item/lighter/skull, +/obj/item/stack/sheet/mineral/wood/fifty, +/obj/item/stack/sheet/mineral/wood/fifty, +/obj/item/stack/sheet/mineral/wood/fifty, +/turf/open/floor/wood, +/area/ruin/space/has_grav/bubbers/persistance/service/lounge) +"IP" = ( +/obj/structure/plasticflaps, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/engineering) +"IQ" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/duct, +/turf/open/floor/iron/freezer, +/area/ruin/space/has_grav/bubbers/persistance/command/admiral) +"IR" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service) +"IS" = ( +/obj/structure/fans/tiny, /obj/machinery/duct, +/obj/structure/cable, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/door/firedoor/heavy, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) -"IP" = ( -/obj/effect/turf_decal/stripes, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, -/obj/effect/mapping_helpers/airlock/cutaiwire, -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "rad_shutters" - }, -/obj/structure/cable, -/obj/machinery/door/firedoor/heavy, -/obj/machinery/door/airlock/atmos/glass{ - name = "Turbine Room Airlock" +/obj/machinery/door/airlock/wood{ + name = "Sauna" }, +/obj/effect/mapping_helpers/airlock/cutaiwire, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) -"IQ" = ( -/obj/structure/closet/generic/wall{ - pixel_x = -32 - }, -/obj/effect/spawner/random/exotic/syndie, -/obj/effect/spawner/random/exotic/syndie, -/obj/effect/spawner/random/exotic/syndie, -/obj/item/choice_beacon/music, -/obj/item/clothing/under/syndicate/skyrat/baseball, -/obj/item/storage/wallet/random, -/obj/effect/spawner/random/exotic/syndie, -/obj/item/clothing/shoes/workboots/mining, -/obj/item/modular_computer/laptop/preset/syndicate, -/obj/item/clothing/glasses/meson/night, -/obj/item/storage/belt/mining/vendor, -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/obj/effect/mob_spawn/ghost_role/human/persistence/syndicate/quartermaster{ - dir = 4; - name = "Persistence Cargo Tech" - }, -/turf/open/floor/carpet/stellar, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/cargo) -"IR" = ( -/obj/structure/flora/bush/lavendergrass/style_random, -/obj/structure/flora/bush/lavendergrass/style_random, -/obj/machinery/hydroponics/constructable, -/turf/open/floor/grass, -/area/ruin/space/has_grav/bubbers/persistance/sec/prison) -"IS" = ( -/obj/structure/disposalpipe/segment, -/turf/closed/wall/r_wall/syndicate/cruiser, -/area/ruin/space/has_grav/bubbers/persistance/service/diner) +/area/ruin/space/has_grav/bubbers/persistance/service/sauna) "IT" = ( /obj/structure/cable, /obj/structure/extinguisher_cabinet/directional/north, @@ -11802,25 +11976,53 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "IU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/firealarm/directional/west, -/obj/machinery/light/directional/west, -/obj/machinery/portable_atmospherics/scrubber, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) -"IW" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 8 +/obj/structure/closet/secure_closet/freezer/meat{ + req_access = list("syndicate") }, -/obj/effect/turf_decal/siding/dark{ - dir = 4 +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/enzyme{ + pixel_x = 12 }, -/obj/structure/closet/secure_closet/interdynefob/engie_locker, -/obj/item/construction/plumbing/engineering, -/obj/item/wrench, -/turf/open/floor/noslip, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/obj/item/reagent_containers/condiment/rice, +/obj/item/reagent_containers/condiment/sugar, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/soymilk, +/obj/item/reagent_containers/condiment/soymilk, +/obj/item/choice_beacon/ingredient, +/obj/item/toy/figure/chef, +/obj/item/circuitboard/machine/dish_drive, +/obj/item/food/meat/slab, +/obj/item/food/meat/slab, +/obj/item/food/meat/slab, +/obj/item/food/meat/slab, +/obj/item/food/meat/slab, +/obj/item/food/meat/slab, +/obj/item/food/meat/slab, +/obj/item/food/meat/slab, +/obj/item/food/meat/slab, +/obj/item/food/meat/slab, +/obj/item/food/meat/slab, +/obj/item/food/meat/slab, +/obj/item/food/meat/slab, +/obj/item/food/meat/slab, +/obj/item/food/meat/slab, +/obj/item/food/meat/slab, +/obj/item/food/meat/slab, +/obj/item/food/meat/slab, +/obj/item/food/meat/slab, +/obj/item/food/meat/slab, +/obj/item/food/meat/slab, +/obj/item/food/meat/slab, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/ruin/space/has_grav/bubbers/persistance/service/freezer) +"IW" = ( +/obj/structure/flora/bush/sparsegrass/style_random, +/turf/open/floor/grass, +/area/ruin/space/has_grav/bubbers/persistance/sec/prison) "IX" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -11832,18 +12034,8 @@ /turf/open/floor/noslip, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) "IZ" = ( -/obj/structure/toilet{ - pixel_y = 13; - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/machinery/flasher/directional/north{ - id = "syndicate_cell" - }, -/turf/open/floor/iron/white/small, -/area/ruin/space/has_grav/bubbers/persistance/sec/holding) +/turf/closed/wall/r_wall/syndicate/nodiagonal, +/area/ruin/space/has_grav/bubbers/persistance/service/janitorial) "Ja" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/machinery/chem_dispenser/frontier_appliance, @@ -11853,64 +12045,18 @@ }, /turf/open/floor/mineral/titanium/white, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) -"Jb" = ( -/obj/structure/table/wood, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/item/folder/syndicate{ - pixel_x = 5 - }, -/obj/item/clothing/glasses/sunglasses{ - pixel_y = 7; - pixel_x = 8 - }, -/obj/item/flashlight/lamp{ - pixel_x = -6; - pixel_y = 2 - }, -/obj/item/radio/intercom/directional/east{ - name = "Interview room intercom"; - broadcasting = 1; - freerange = 1; - freqlock = 1; - frequency = 1241; - canhear_range = 1; - desc = "Surely no one is listening in!"; - pixel_x = 0; - pixel_y = 32 - }, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 1 - }, -/obj/item/taperecorder, -/turf/open/floor/wood/tile, -/area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) "Jc" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/engineering/gas) -"Jd" = ( -/obj/machinery/porta_turret/syndicate{ - dir = 8; - pixel_y = -32 - }, -/obj/machinery/camera/autoname/directional/south{ - name = "Persistence Exterior South"; - network = list("persistence_ext") - }, -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/structure/lattice/catwalk/mining, -/turf/open/lava/smooth/lava_land_surface, -/area/ruin/space/has_grav/bubbers/dauntless/command/vault) "Je" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/door/window/survival_pod/left/directional/north{ + name = "Chemistry"; + req_access = list("syndicate") }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/sec/holding) +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/reagent_containers/cup/beaker/cryoxadone, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/bubbers/persistance/med/chem) "Jg" = ( /obj/effect/turf_decal/skyrat_decals/syndicate/top/right, /obj/effect/turf_decal/siding/thinplating/dark/corner{ @@ -11957,60 +12103,35 @@ /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "Jm" = ( -/obj/effect/turf_decal/siding/dark_green{ - dir = 9 - }, -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/reagent_containers/dropper{ - pixel_y = -6 - }, -/obj/item/storage/test_tube_rack, -/obj/machinery/smartfridge/chemistry/virology/preloaded{ - pixel_y = 32 - }, -/obj/item/book/manual/wiki/infections{ - pixel_y = 7 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/med/viro) -"Jo" = ( -/obj/effect/turf_decal/tile/bar/opposingcorners{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ dir = 8 }, -/obj/effect/turf_decal/siding{ - dir = 1 - }, +/obj/machinery/portable_atmospherics/canister/nitrous_oxide, +/obj/structure/window/reinforced/plasma/spawner/directional/south, +/obj/structure/window/reinforced/plasma/spawner/directional/north, +/turf/open/floor/engine/n2o, +/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) +"Jn" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment, /obj/machinery/duct, -/obj/machinery/firealarm/directional/north, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/cell_charger_multi/wall_mounted/directional/east, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) +"Jo" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/bubbers/persistance/service/diner) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service) "Jp" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/medical) -"Jq" = ( -/obj/machinery/button/door/directional/west{ - pixel_y = -8; - specialfunctions = 4; - name = "Dorm Bolt Switch"; - id = "syndishipcomms"; - req_access = list("syndicate"); - normaldoorcontrol = 1 - }, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/siding/dark/end{ - dir = 1 - }, -/turf/open/floor/noslip, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) "Jr" = ( /obj/structure/fans/tiny/forcefield{ dir = 4 @@ -12039,31 +12160,22 @@ /turf/open/floor/iron/terracotta/herringbone, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "Jt" = ( -/obj/structure/window/reinforced/survival_pod/spawner/directional/east, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4; - external_pressure_bound = 140; - name = "server vent"; - pressure_checks = 0 - }, -/obj/structure/sign/poster/contraband/arc_slimes/directional/north, -/turf/open/floor/circuit/telecomms, -/area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) -"Ju" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/light/cold/directional/north, +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/pod/dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) +"Jv" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/iron/dark/textured_corner{ - dir = 1 +/obj/effect/turf_decal/trimline/dark_red/filled/line{ + dir = 8 }, -/area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) -"Jv" = ( -/obj/structure/fake_stairs/directional/north, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/carpet/royalblack, +/area/ruin/space/has_grav/bubbers/persistance/service/lounge) "Jx" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -12176,22 +12288,28 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) "JK" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/duct, -/turf/open/floor/iron/kitchen/herringbone, -/area/ruin/space/has_grav/bubbers/persistance/service/salon) +/obj/structure/dresser, +/obj/item/flashlight/lamp/green{ + pixel_x = 5; + pixel_y = 15 + }, +/obj/item/sign/flag/syndicate{ + pixel_x = -7; + pixel_y = 13 + }, +/obj/machinery/light_switch/directional/west, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/maa) "JL" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/safe/abovetilefloor, +/obj/item/stack/sheet/mineral/bananium, +/obj/item/sign/flag/syndicate{ + pixel_x = -7; + pixel_y = 13 }, -/obj/structure/sign/departments/exodrone/directional/north, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/item/book/bible/syndicate, +/turf/open/floor/carpet/donk, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/morale) "JM" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/item/statuebust/hippocratic/evil, @@ -12211,18 +12329,12 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/med) "JT" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/effect/mapping_helpers/apc/syndicate_access, -/obj/effect/mapping_helpers/apc/full_charge, -/obj/effect/mapping_helpers/apc/cut_AI_wire, -/obj/structure/fireplace, +/obj/machinery/washing_machine, /obj/effect/turf_decal/siding/dark{ - dir = 8; - icon_state = "siding_plain_end" + dir = 10 }, -/turf/open/floor/iron/terracotta/diagonal, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/janitor) +/turf/open/floor/iron/white/small, +/area/ruin/space/has_grav/bubbers/persistance/service/lockers) "JU" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/janitor) @@ -12240,23 +12352,23 @@ /turf/open/floor/wood/parquet, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "JW" = ( -/obj/structure/cable, -/obj/effect/turf_decal/siding{ - dir = 10 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 +/obj/effect/turf_decal/tile/bar/opposingcorners{ + dir = 8 }, -/turf/open/floor/iron/white/small, -/area/ruin/space/has_grav/bubbers/persistance/sec/prison) +/obj/structure/table/wood/fancy/red, +/turf/open/floor/iron/cafeteria, +/area/ruin/space/has_grav/bubbers/persistance/service/diner) "JX" = ( -/obj/machinery/vending/wardrobe/chap_wardrobe/unholy{ - all_products_free = 1; - pixel_x = -28; - density = 0 +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium{ + polarizer_id = "persistence_operating" }, -/turf/open/floor/carpet/donk, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/morale) +/obj/structure/cable, +/obj/machinery/door/poddoor{ + id = "persistence_operating_s"; + name = "Persistance Medical Blast Doors" + }, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/med/treatment) "JY" = ( /obj/structure/closet/secure_closet/interdynefob/mod_locker, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -12272,40 +12384,46 @@ /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/engineering) "Ka" = ( +/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/junction/yjunction{ - dir = 1 +/obj/machinery/door/firedoor/heavy, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/structure/disposalpipe/segment{ + dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /obj/machinery/duct, +/obj/machinery/door/airlock/engineering/glass{ + name = "Engineering Bay" + }, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) "Kb" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/persistance/engineering) "Kc" = ( -/obj/machinery/food_cart, -/turf/open/floor/iron/kitchen_coldroom/freezerfloor, -/area/ruin/space/has_grav/bubbers/persistance/service/freezer) -"Kd" = ( +/obj/structure/filingcabinet, +/obj/item/folder/syndicate/red, +/obj/machinery/light/directional/north, +/obj/machinery/firealarm/directional/north, /turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/sec/brigentrance) +/area/ruin/space/has_grav/bubbers/persistance/command/vault) "Kf" = ( /obj/machinery/light/directional/south, -/obj/structure/showcase/cyborg{ - desc = "A stand with the empty body of a Cybersun cyborg bolted to it."; - dir = 4; - icon = 'icons/mob/silicon/robots.dmi'; - icon_state = "synd_sec"; - name = "syndicate cyborg showcase"; - pixel_x = -6 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 10 +/obj/structure/tank_dispenser, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 }, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/pod/dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) +"Kh" = ( +/obj/structure/cable, +/obj/machinery/power/smes/connector, +/obj/machinery/power/smesbank/super/full, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "Ki" = ( /obj/structure/closet/crate/secure/syndicate/gorlex{ name = "Gorlex Marauders MREs" @@ -12417,20 +12535,6 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) -"Ku" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/storage/barricade, -/obj/item/storage/barricade, -/obj/item/storage/box/handcuffs, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/porta_turret/syndicate{ - dir = 8; - pixel_y = 32; - faction = list("Syndicate","neutral") - }, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/sec/armory) "Kv" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Engineering Bay" @@ -12445,62 +12549,12 @@ /obj/machinery/door/firedoor/heavy, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) -"Ky" = ( -/obj/machinery/airalarm/directional/west, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/obj/machinery/plantgenes, -/obj/structure/table/reinforced/plastitaniumglass, -/obj/structure/window/reinforced/plasma/spawner/directional/south, -/turf/open/floor/grass, -/area/ruin/space/has_grav/bubbers/persistance/service/hydro) "Kz" = ( -/obj/machinery/conveyor{ - id = "syndirecycle"; - dir = 1 - }, -/obj/effect/spawner/random/trash/garbage{ - pixel_x = 4; - pixel_y = 5 - }, -/obj/effect/spawner/random/trash/garbage{ - pixel_x = 4; - pixel_y = 5 - }, -/obj/effect/spawner/random/maintenance/three, -/obj/effect/spawner/random/trash/garbage{ - pixel_x = 4; - pixel_y = 5 - }, -/obj/effect/spawner/random/trash/garbage{ - pixel_x = 4; - pixel_y = 5 - }, -/obj/machinery/light/directional/west, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/effect/spawner/random/maintenance/three, -/obj/effect/spawner/random/trash/garbage{ - pixel_x = 4; - pixel_y = 5 - }, -/obj/effect/spawner/random/trash/garbage{ - pixel_x = 4; - pixel_y = 5 - }, -/obj/effect/spawner/random/trash/garbage{ - pixel_x = 4; - pixel_y = 5 - }, -/obj/effect/spawner/random/maintenance/five, -/obj/item/stock_parts/power_store/cell/lead, -/obj/effect/spawner/random/maintenance/two, -/obj/effect/spawner/random/trash/garbage{ - pixel_x = 4; - pixel_y = 5 +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/cargo) +/turf/open/floor/iron/colony/bolts, +/area/ruin/space/has_grav/bubbers/persistance/evac) "KB" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/machinery/biogenerator/foodricator, @@ -12552,34 +12606,46 @@ }, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/evac) -"KO" = ( +"KN" = ( /obj/structure/cable, +/obj/machinery/duct, +/obj/structure/disposalpipe/junction/flip{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/wood/large, -/area/ruin/space/has_grav/bubbers/persistance/service/sauna) -"KQ" = ( -/obj/structure/railing/wooden_fencing{ - dir = 8 - }, -/obj/structure/flora/bush/flowers_yw/style_random, -/obj/structure/railing/wooden_fencing{ - dir = 1 +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/sec/holding) +"KO" = ( +/obj/structure/toilet{ + dir = 4 }, -/turf/open/floor/grass, -/area/ruin/space/has_grav/bubbers/persistance/service/hydro) +/turf/open/floor/iron/dark/small, +/area/ruin/space/has_grav/bubbers/persistance/sec/prison) +"KP" = ( +/obj/machinery/light/directional/north, +/obj/structure/frame/machine/secured, +/obj/item/circuitboard/machine/stacking_unit_console, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering/mining) +"KQ" = ( +/turf/open/floor/carpet/red, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/maa) "KR" = ( /obj/machinery/firealarm/directional/south, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/cargo) "KS" = ( +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/bin, /obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/sign/warning/explosives/alt/directional/west, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/siding/wood, +/obj/machinery/digital_clock/directional/south, +/turf/open/floor/carpet/purple, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/science) "KT" = ( /obj/structure/closet/radiation, /obj/item/mod/module/rad_protection, @@ -12598,33 +12664,57 @@ /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "KU" = ( -/obj/machinery/plumbing/synthesizer/water_synth, -/obj/effect/turf_decal/siding/dark{ - dir = 10 +/obj/machinery/porta_turret/syndicate{ + dir = 8; + pixel_y = -32 }, -/turf/open/floor/noslip, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/obj/machinery/camera/autoname/directional/south{ + name = "Persistence Exterior South"; + network = list("persistence_ext") + }, +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" + }, +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" + }, +/obj/structure/lattice/catwalk/mining, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/space/has_grav/bubbers/dauntless/command/vault) "KX" = ( -/obj/machinery/duct, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/iron/kitchen/diagonal, -/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/airlock/medical/glass{ + name = "Operating Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/turf/open/floor/iron/white/small, +/area/ruin/space/has_grav/bubbers/persistance/med/treatment) "KY" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/effect/turf_decal/siding/wood{ + dir = 10 }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/storage/fancy/donut_box, +/obj/machinery/newscaster/directional/west, +/turf/open/floor/carpet/red, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/maa) "KZ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" }, -/obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" + }, +/obj/machinery/camera/autoname/directional/west{ + name = "Persistence Exterior West"; + network = list("persistence_ext") + }, +/obj/structure/lattice/catwalk/mining, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/space/has_grav/bubbers/dauntless/command/vault) "La" = ( /obj/structure/closet/generic/wall{ pixel_x = 32 @@ -12633,12 +12723,6 @@ /obj/structure/plant_tank, /turf/open/floor/iron/terracotta/herringbone, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) -"Lb" = ( -/obj/machinery/airalarm/directional/west, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/obj/machinery/computer/exoscanner_control, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/cargo/drone) "Lc" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -12647,71 +12731,43 @@ /turf/open/floor/carpet/royalblue, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/medical) "Lf" = ( -/obj/machinery/duct, /obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/bar/opposingcorners{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/effect/mapping_helpers/apc/syndicate_access, -/obj/effect/mapping_helpers/apc/cut_AI_wire, -/obj/effect/mapping_helpers/apc/full_charge, /obj/effect/turf_decal/siding{ - dir = 8 + dir = 10 }, -/obj/structure/chair/sofa/right/maroon{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/bubbers/persistance/service/diner) -"Lg" = ( -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/siding/dark{ - dir = 1 - }, -/obj/structure/table/wood, -/obj/structure/towel_bin{ - pixel_y = -10; - pixel_x = -1 - }, -/obj/machinery/airalarm/directional/north, -/obj/effect/mapping_helpers/airalarm/syndicate_access, /turf/open/floor/iron/white/small, -/area/ruin/space/has_grav/bubbers/persistance/service/lockers) +/area/ruin/space/has_grav/bubbers/persistance/sec/prison) +"Lg" = ( +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "Li" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/machinery/light/directional/north, +/obj/machinery/seed_extractor{ + pixel_x = -3 }, -/obj/structure/window/reinforced/plasma/spawner/directional/west, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/cargo) +/turf/open/floor/grass, +/area/ruin/space/has_grav/bubbers/persistance/service/hydro) "Lj" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) "Ll" = ( -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/machinery/camera/autoname/directional/east{ - network = list("persistence_ext"); - name = "persistence exterior east" - }, -/obj/machinery/conveyor{ - dir = 8; - id = "QMLoad" +/obj/effect/mapping_helpers/apc/full_charge, +/obj/effect/mapping_helpers/apc/cut_AI_wire, +/obj/effect/mapping_helpers/apc/syndicate_access, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 }, -/obj/structure/lattice/catwalk/mining, -/turf/open/floor/pod/dark, -/area/ruin/space/has_grav/bubbers/dauntless/command/vault) +/obj/effect/turf_decal/stripes/end, +/obj/structure/window/reinforced/plasma/spawner/directional/west, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/cargo) "Lq" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/persistance/sci/rnd) @@ -12723,30 +12779,47 @@ /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "Ls" = ( -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/structure/lattice/catwalk/mining, -/turf/open/lava/smooth/lava_land_surface, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/engineering) +/obj/structure/cargo_shelf, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/effect/mapping_helpers/airalarm/tlv_cold_room, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/ruin/space/has_grav/bubbers/persistance/service/freezer) "Lt" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/table/wood/fancy/red, +/obj/machinery/coffeemaker/impressa, +/obj/item/storage/box/coffeepack/robusta, +/obj/effect/turf_decal/siding/wood{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/carpet/red, +/area/ruin/space/has_grav/bubbers/persistance/command/liason) +"Lu" = ( +/obj/structure/table, +/obj/machinery/xenoarch/digger, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/engineering/mining) +"Lw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/sci/robotics) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/cargo/drone) "LB" = ( /obj/machinery/computer/order_console/cook/interdyne{ dir = 1 }, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/ruin/space/has_grav/bubbers/persistance/service/freezer) +"LE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/structure/cable, +/obj/machinery/door/firedoor/heavy, +/obj/machinery/duct, +/obj/structure/disposalpipe/segment, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "LF" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -12784,23 +12857,25 @@ /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) "LL" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/canister/nitrous_oxide, -/obj/structure/window/reinforced/plasma/spawner/directional/south, -/obj/structure/window/reinforced/plasma/spawner/directional/north, -/turf/open/floor/engine/n2o, -/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/sign/poster/official/moth_epi/directional/west, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "LM" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/structure/cable, -/turf/open/floor/iron/colony/bolts, -/area/ruin/space/has_grav/bubbers/persistance/evac) +/obj/structure/sign/warning/electric_shock/directional/south, +/obj/machinery/duct, +/obj/machinery/light/cold/directional/south, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "LP" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -12829,24 +12904,16 @@ }, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) -"LW" = ( -/obj/structure/table, -/obj/item/pipe_dispenser{ - pixel_x = -3 - }, -/obj/item/storage/box/stockparts/basic{ - pixel_y = -3; - pixel_x = 5 +"LV" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 10 }, -/obj/item/stack/sheet/plasmaglass/fifty, -/obj/item/storage/toolbox/syndicate{ - pixel_y = 5 +/obj/structure/chair{ + dir = 4 }, -/obj/machinery/airalarm/directional/west, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/obj/item/survivalcapsule/fan, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/engineering/mining) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/wood/tile, +/area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) "LY" = ( /obj/effect/turf_decal/siding/dark, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -12872,24 +12939,33 @@ /turf/open/floor/mineral/titanium/white, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "Mb" = ( -/obj/effect/turf_decal/trimline/dark_red/filled/line{ - dir = 9 +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium{ + polarizer_id = "persist_science" }, -/obj/effect/turf_decal/siding/wood/end{ - dir = 1 +/obj/machinery/door/poddoor{ + id = "syndisci_windows" }, -/obj/machinery/light/directional/west, -/obj/machinery/airalarm/directional/west, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/obj/structure/aquarium/donkfish, -/turf/open/floor/carpet/royalblack, -/area/ruin/space/has_grav/bubbers/persistance/service/lounge) +/obj/structure/cable, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/science) "Mc" = ( -/obj/structure/chair/office/light{ +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron/smooth, -/area/ruin/space/has_grav/bubbers/persistance/sci/rnd) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/airlock/highsecurity{ + name = "Interrogation" + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "persistence_int" + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "Md" = ( /obj/machinery/suit_storage_unit/industrial/moraleofficer, /obj/machinery/light/directional/south, @@ -12924,15 +13000,24 @@ /obj/machinery/power/energy_accumulator/tesla_coil/anchored, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) -"Ml" = ( +"Mk" = ( +/obj/structure/dresser, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/effect/turf_decal/siding/wood{ +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/sec/prison) +"Ml" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/wood, -/area/ruin/space/has_grav/bubbers/persistance/service/lockers) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/iron/dark/textured_corner{ + dir = 1 + }, +/area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) "Mn" = ( /obj/structure/reagent_forge, /turf/open/floor/catwalk_floor/iron_dark, @@ -12954,10 +13039,24 @@ icon_state = "plastitanium" }, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) +"Mp" = ( +/obj/structure/cable, +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/junction/flip{ + dir = 1 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "Mr" = ( -/obj/machinery/nuclearbomb/beer, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/command/vault) +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/machinery/digital_clock/directional/west, +/obj/machinery/light/directional/south, +/turf/open/floor/carpet/stellar, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/cargo) "Mt" = ( /obj/structure/closet/generic/wall{ pixel_x = 32 @@ -12970,36 +13069,9 @@ }, /turf/open/floor/iron/white/small, /area/ruin/space/has_grav/bubbers/persistance/service/lockers) -"Mu" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/book/granter/crafting_recipe/dusting/rebarxbowsyndie_ammo, -/obj/item/storage/fancy/donut_box, -/obj/machinery/light/directional/west, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/sec/armory) -"Mv" = ( -/obj/structure/table/wood, -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/turf/open/floor/wood/tile, -/area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) "My" = ( /turf/open/floor/grass, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) -"Mz" = ( -/obj/machinery/duct, -/obj/structure/cable, -/obj/structure/disposalpipe/junction/yjunction{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/effect/turf_decal/siding/dark{ - dir = 1 - }, -/turf/open/floor/wood/large, -/area/ruin/space/has_grav/bubbers/persistance/service/diner) "MA" = ( /obj/structure/emergency_shield/cult/weak{ name = "Energy Shield" @@ -13031,79 +13103,60 @@ /turf/open/floor/wood, /area/ruin/space/has_grav/bubbers/persistance/service/gym) "ME" = ( -/obj/effect/turf_decal/skyrat_decals/syndicate/top/left, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/sec/armory) -"MF" = ( -/obj/structure/toilet{ - dir = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/obj/machinery/light/directional/south, -/obj/machinery/camera/autoname/directional/west{ - name = "Persistence Exterior West"; - network = list("persistence_ext") +/obj/structure/disposalpipe/trunk{ + dir = 1 }, -/turf/open/floor/iron/dark/small, -/area/ruin/space/has_grav/bubbers/persistance/sec/prison) -"MG" = ( -/turf/open/floor/carpet/red, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/maa) -"MH" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/storage/box/gas_miner_beacons/syndicate{ - pixel_x = 7; - pixel_y = -4 +/obj/machinery/disposal/bin, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service/gym) +"MF" = ( +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/obj/machinery/atmospherics/pipe/layer_manifold/brown{ + dir = 8 }, -/obj/item/storage/box/gas_miner_beacons/syndicate{ - pixel_x = -7; - pixel_y = -4 +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) +"MG" = ( +/obj/structure/rack/gunrack, +/obj/structure/disposalpipe/segment{ + dir = 5 }, -/obj/item/rwd/loaded, -/turf/open/floor/pod/dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering) -"MI" = ( -/obj/machinery/duct, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/effect/turf_decal/siding/dark{ - dir = 8 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 }, -/turf/open/floor/iron/white/small, -/area/ruin/space/has_grav/bubbers/persistance/service/lockers) +/obj/structure/cable, +/obj/item/gun/ballistic/rifle/sniper_rifle/syndicate, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/sec/armory) +"MI" = ( +/obj/structure/flora/biolumi/flower/weaklight, +/turf/open/misc/grass/jungle/station, +/area/ruin/space/has_grav/bubbers/persistance/command/admiral) "ML" = ( -/obj/structure/chair/office/tactical{ - dir = 4 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/cargo/drone) -"MM" = ( -/obj/machinery/porta_turret/syndicate{ - dir = 8; - pixel_x = -32; - pixel_y = -32 +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/turf/open/lava/smooth/lava_land_surface, -/area/ruin/space/has_grav/bubbers/dauntless/command/vault) -"MN" = ( /obj/machinery/duct, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/cable, -/obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/sec/holding) +/area/ruin/space/has_grav/bubbers/persistance/service/janitorial) +"MN" = ( +/obj/structure/chair/office/tactical, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/sec/brigentrance) "MO" = ( -/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium{ - polarizer_id = "persistenceengidorm_w" - }, -/obj/structure/cable, -/obj/machinery/door/poddoor{ - id = "persistengidorm_s" +/obj/structure/table/reinforced/plastitaniumglass, +/obj/structure/sign/poster/official/there_is_no_gas_giant/directional/west, +/obj/machinery/light/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/engineering) +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/cargo/drone) "MP" = ( /obj/machinery/smartfridge/food, /obj/machinery/door/firedoor/heavy, @@ -13143,23 +13196,23 @@ /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "MU" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 +/obj/machinery/power/turbine/turbine_outlet{ + dir = 8 }, -/obj/structure/sink/kitchen/directional/east, -/turf/open/floor/wood/large, -/area/ruin/space/has_grav/bubbers/persistance/service/sauna) +/turf/open/floor/engine, +/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "MW" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/extinguisher_cabinet/directional/south, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/light/directional/north, +/obj/machinery/firealarm/directional/north, +/obj/structure/cable, +/obj/effect/turf_decal/siding/dark/end{ + dir = 8 }, -/obj/machinery/duct, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/structure/reagent_dispensers/watertank/high, +/turf/open/floor/noslip, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) "MY" = ( /obj/machinery/duct, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -13219,23 +13272,15 @@ /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "Nd" = ( -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/structure/lattice/catwalk/mining, -/obj/machinery/porta_turret/syndicate{ - dir = 8; - pixel_x = -32 - }, -/obj/machinery/camera/autoname/directional/west{ - name = "Persistence Exterior West"; - network = list("persistence_ext") +/obj/machinery/duct, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 6 }, -/turf/open/lava/smooth/lava_land_surface, -/area/ruin/space/has_grav/bubbers/dauntless/command/vault) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/wood/large, +/area/ruin/space/has_grav/bubbers/persistance/service/sauna) "Ne" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -13249,14 +13294,18 @@ /turf/open/floor/iron/terracotta/herringbone, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "Nf" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 10 +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/storage/box/gas_miner_beacons/syndicate{ + pixel_x = 7; + pixel_y = -4 }, -/turf/open/floor/iron/smooth, -/area/ruin/space/has_grav/bubbers/persistance/sci/rnd) +/obj/item/storage/box/gas_miner_beacons/syndicate{ + pixel_x = -7; + pixel_y = -4 + }, +/obj/item/rwd/loaded, +/turf/open/floor/pod/dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) "Nh" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 @@ -13273,17 +13322,15 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "Nl" = ( -/obj/machinery/plate_press, -/obj/item/stack/license_plates/empty/fifty, -/obj/effect/turf_decal/siding/dark{ - dir = 9 - }, -/obj/item/stack/license_plates/empty/fifty, -/obj/machinery/light/directional/north, -/obj/structure/extinguisher_cabinet/directional/west, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/iron/dark/small, -/area/ruin/space/has_grav/bubbers/persistance/sec/prison) +/obj/effect/turf_decal/siding/dark/end{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/monkey_recycler, +/obj/structure/sign/flag/syndicate/directional/north, +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) "Nm" = ( /obj/structure/window/reinforced/survival_pod/spawner/directional/north, /obj/machinery/cryo_cell, @@ -13333,20 +13380,17 @@ }, /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) -"Nr" = ( -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/machinery/porta_turret/syndicate{ - dir = 8; - pixel_y = 32 +"Ns" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4; + external_pressure_bound = 140; + name = "server vent"; + pressure_checks = 0 }, -/obj/structure/lattice/catwalk/mining, -/turf/open/lava/smooth/lava_land_surface, -/area/ruin/space/has_grav/bubbers/dauntless/command/vault) +/obj/structure/sign/poster/contraband/arc_slimes/directional/north, +/turf/open/floor/circuit/telecomms, +/area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) "Nt" = ( /turf/open/floor/iron/kitchen/diagonal, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) @@ -13376,14 +13420,9 @@ /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "NE" = ( -/obj/structure/cable, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/extinguisher_cabinet/directional/west, -/obj/machinery/door/firedoor/heavy, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/turf/closed/wall/r_wall/syndicate/cruiser, +/area/ruin/space/has_grav/bubbers/persistance/cargo) "NG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/iron/white, @@ -13406,16 +13445,17 @@ /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) "NL" = ( -/obj/structure/sign/painting/library{ - pixel_x = -30 +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/obj/structure/bed/maint, +/obj/machinery/camera/autoname/directional/east{ + network = list("persistence_ext"); + name = "persistence exterior east" }, -/obj/structure/rack, -/obj/item/lighter/skull, -/obj/item/stack/sheet/mineral/wood/fifty, -/obj/item/stack/sheet/mineral/wood/fifty, -/obj/item/stack/sheet/mineral/wood/fifty, -/turf/open/floor/wood, -/area/ruin/space/has_grav/bubbers/persistance/service/lounge) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/white/small, +/area/ruin/space/has_grav/bubbers/persistance/sec/holding) "NM" = ( /obj/structure/flora/bush/flowers_br/style_random, /turf/open/floor/grass, @@ -13456,31 +13496,37 @@ /turf/open/floor/iron/white/diagonal, /area/ruin/space/has_grav/bubbers/persistance/med) "NT" = ( -/obj/effect/turf_decal/skyrat_decals/syndicate/bottom/left, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/sec/armory) +/obj/machinery/computer/apc_control/away{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium/red{ + icon_state = "plastitanium" + }, +/area/ruin/space/has_grav/bubbers/persistance/command/bridge) "NU" = ( /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/junction{ - dir = 1 +/turf/open/floor/mineral/plastitanium/red{ + icon_state = "plastitanium" }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/area/ruin/space/has_grav/bubbers/persistance/command/bridge) "NV" = ( -/obj/effect/turf_decal/siding/wood/corner{ - dir = 1 - }, -/obj/structure/safe/abovetilefloor, -/obj/item/mod/module/stealth/wraith, -/obj/item/sign/flag/syndicate{ - pixel_x = -3; - pixel_y = 6 +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 8 }, -/obj/item/aicard/syndie, -/turf/open/floor/carpet/purple, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/science) +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/obj/effect/mapping_helpers/apc/syndicate_access, +/obj/effect/mapping_helpers/apc/cut_AI_wire, +/obj/effect/mapping_helpers/apc/full_charge, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/multitool/circuit, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/bubbers/persistance/sci/rnd) "NW" = ( /obj/structure/mecha_wreckage/mauler{ anchored = 1; @@ -13511,11 +13557,9 @@ /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/service/lounge) "Of" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 10 +/obj/structure/chair/office/light{ + dir = 4 }, -/obj/structure/microscope, -/obj/structure/table/reinforced/plastitaniumglass, /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/rnd) "Og" = ( @@ -13549,12 +13593,12 @@ /turf/open/floor/iron/white/small, /area/ruin/space/has_grav/bubbers/persistance/service/lockers) "Ol" = ( -/obj/machinery/washing_machine, -/obj/effect/turf_decal/siding/dark{ - dir = 10 +/obj/effect/spawner/liquids_spawner/shoulders, +/obj/effect/mist, +/turf/open/floor/iron/pool/cobble/side{ + dir = 1 }, -/turf/open/floor/iron/white/small, -/area/ruin/space/has_grav/bubbers/persistance/service/lockers) +/area/ruin/space/has_grav/bubbers/persistance/service/sauna) "Oo" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/structure/reagent_dispensers/servingdish, @@ -13571,11 +13615,25 @@ /obj/machinery/duct, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) +"Or" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/carpet/green, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/chef) "Os" = ( /obj/machinery/shower/directional/west, /obj/structure/drain, /turf/open/floor/noslip, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) +"Ot" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/pipe_dispenser{ + pixel_x = -3 + }, +/obj/item/rpd_upgrade/unwrench, +/turf/open/floor/pod/dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) "Ou" = ( /obj/machinery/duct, /obj/structure/cable, @@ -13594,6 +13652,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) +"Ow" = ( +/obj/machinery/duct, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/kitchen/diagonal, +/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "Oy" = ( /obj/machinery/smartfridge/food, /obj/effect/turf_decal/siding{ @@ -13631,21 +13700,33 @@ }, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) "OB" = ( -/obj/structure/plasticflaps, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium{ + polarizer_id = "syndiengi_w" + }, +/obj/machinery/door/poddoor{ + id = "syndieng_windows" + }, /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/engineering) "OE" = ( -/turf/open/floor/carpet/purple, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/science) -"OF" = ( -/obj/machinery/duct, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/effect/turf_decal/trimline/purple/filled/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/purple/filled/corner{ + dir = 8 + }, /obj/structure/cable, -/obj/structure/disposalpipe/segment, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/bubbers/persistance/sci/rnd) +"OF" = ( +/obj/effect/turf_decal/skyrat_decals/syndicate/middle/left, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/sec/armory) "OG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -13653,48 +13734,23 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/cargo) "OH" = ( -/obj/structure/closet/secure_closet/freezer/meat{ - req_access = list("syndicate") - }, -/obj/effect/spawner/random/food_or_drink/donkpockets{ - pixel_x = -8; - pixel_y = -4 - }, -/obj/item/reagent_containers/condiment/flour, -/obj/item/reagent_containers/condiment/flour, -/obj/item/storage/fancy/egg_box, -/obj/item/storage/fancy/egg_box, -/obj/item/reagent_containers/condiment/enzyme{ - pixel_x = 12 - }, -/obj/item/reagent_containers/condiment/rice, -/obj/item/reagent_containers/condiment/sugar, -/obj/item/reagent_containers/condiment/milk, -/obj/item/reagent_containers/condiment/milk, -/obj/item/reagent_containers/condiment/soymilk, -/obj/item/reagent_containers/condiment/soymilk, -/obj/item/choice_beacon/ingredient, -/obj/item/choice_beacon/ingredient, -/obj/item/storage/box/beakers{ - pixel_x = -4; - pixel_y = -2 +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/obj/machinery/atmospherics/pipe/layer_manifold/cyan{ + dir = 8 }, -/turf/open/floor/iron/kitchen_coldroom/freezerfloor, -/area/ruin/space/has_grav/bubbers/persistance/service/freezer) +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) "OI" = ( /obj/structure/chair/sofa/bench/right, /obj/structure/cable, /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/sauna) "OJ" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 10 - }, -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/storage/fancy/donut_box, -/obj/machinery/newscaster/directional/west, -/turf/open/floor/carpet/red, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/maa) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/carpet/stellar, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/cargo) "OL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/wood, @@ -13730,38 +13786,34 @@ /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "OP" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/storage/fancy/cigarettes/cigpack_syndicate{ - pixel_x = 3; - pixel_y = 6 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, -/obj/item/lighter/skull, -/obj/machinery/pollution_scrubber, -/obj/structure/disposalpipe/segment{ +/obj/effect/turf_decal/siding{ dir = 9 }, -/obj/item/reagent_containers/cup/glass/shaker{ - pixel_x = -6; - pixel_y = -7 - }, -/obj/item/reagent_containers/cup/rag, -/obj/structure/sink/kitchen/directional/west{ - pixel_x = 18 - }, -/obj/item/reagent_containers/cup/maunamug, -/obj/effect/turf_decal/siding/dark{ - dir = 6 +/obj/machinery/cryopod{ + dir = 2 }, -/obj/machinery/light_switch/directional/east, -/turf/open/floor/wood/large, -/area/ruin/space/has_grav/bubbers/persistance/service/diner) +/obj/machinery/computer/cryopod/interdyne/directional/north, +/turf/open/floor/iron/white/small, +/area/ruin/space/has_grav/bubbers/persistance/sec/prison) "OQ" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/med/viro) -"OS" = ( -/obj/structure/window/reinforced/survival_pod/spawner/directional/east, -/obj/machinery/door/window/survival_pod/left/directional/north{ - name = "Robotics Airlock"; +"OR" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/carpet/red, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/maa) +"OS" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/obj/machinery/door/window/survival_pod/left/directional/north{ + name = "Robotics Airlock"; req_access = list("syndicate") }, /obj/item/ai_module/reset/purge{ @@ -13780,49 +13832,37 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/sci/robotics) "OT" = ( -/obj/structure/fireplace, -/obj/item/stack/sheet/mineral/wood/fifty, -/obj/effect/turf_decal/siding/dark/end{ - dir = 4 - }, -/turf/open/floor/iron/terracotta/diagonal, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/morale) +/obj/machinery/duct, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/light/cold/directional/north, +/turf/open/floor/iron/white/small, +/area/ruin/space/has_grav/bubbers/persistance/sec/holding) "OU" = ( -/obj/machinery/computer/security/telescreen/entertainment/directional/west, -/obj/structure/chair/comfy/barber_chair{ - dir = 1 - }, -/obj/structure/mirror/directional/north, -/obj/effect/turf_decal/siding/thinplating/dark/end{ +/obj/structure/sign/poster/contraband/hacking_guide/directional/east, +/turf/closed/wall/r_wall/syndicate/nodiagonal, +/area/ruin/space/has_grav/bubbers/persistance/sci/robotics) +"OV" = ( +/obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/iron/kitchen/herringbone, -/area/ruin/space/has_grav/bubbers/persistance/service/salon) -"OV" = ( -/turf/closed/wall/r_wall/syndicate/nodiagonal, -/area/ruin/space/has_grav/bubbers/persistance/sec/holding) +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service) "OW" = ( -/obj/effect/turf_decal/siding/dark{ +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/obj/machinery/atmospherics/pipe/layer_manifold/dark/visible{ dir = 8 }, -/obj/structure/hoop{ - dir = 4 - }, -/turf/open/floor/wood, -/area/ruin/space/has_grav/bubbers/persistance/service/gym) +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) "OX" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/effect/turf_decal/siding/dark{ - dir = 9 +/mob/living/basic/mining_drone/interdyne{ + name = "Molly" }, -/obj/machinery/duct, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/engineering/mining) "OY" = ( /obj/structure/chair/comfy/beige{ dir = 4 @@ -13837,24 +13877,11 @@ /turf/open/floor/iron/kitchen/diagonal, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "Pb" = ( -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/structure/lattice/catwalk/mining, -/obj/machinery/porta_turret/syndicate{ - dir = 8; - pixel_x = 32; - faction = list("Syndicate","neutral") - }, -/obj/machinery/camera/autoname/directional/east{ - network = list("persistence_ext"); - name = "persistence exterior east" - }, -/turf/open/lava/smooth/lava_land_surface, -/area/ruin/space/has_grav/bubbers/dauntless/command/vault) +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/machinery/hydroponics/constructable, +/turf/open/floor/grass, +/area/ruin/space/has_grav/bubbers/persistance/sec/prison) "Pc" = ( /obj/structure/table, /obj/item/storage/bag/xenoarch, @@ -13878,35 +13905,55 @@ /turf/open/floor/grass, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "Pf" = ( -/obj/structure/sign/warning/gas_mask/directional/south, -/obj/machinery/light/directional/south, -/turf/open/floor/pod/dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering) +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/door/firedoor/heavy, +/obj/structure/cable, +/obj/machinery/door/airlock/medical{ + id_tag = "syndishipmed"; + name = "Medical Officer Quarters" + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/turf/open/floor/wood/large, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/medical) "Pg" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ - dir = 8 +/obj/machinery/conveyor{ + dir = 8; + id = "QMLoad" }, -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/obj/structure/window/reinforced/plasma/spawner/directional/north, -/obj/structure/window/reinforced/plasma/spawner/directional/south, -/turf/open/floor/engine/co2, -/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) +/obj/structure/lattice/catwalk/mining, +/turf/open/floor/pod/dark, +/area/lavaland/surface/outdoors) "Ph" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/structure/sign/poster/official/periodic_table/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/chem_dispenser/fullupgrade, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/bubbers/persistance/med/chem) +"Pi" = ( +/obj/effect/turf_decal/siding/wood{ dir = 8 }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) -"Pi" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ +/obj/machinery/button/door/directional/west{ + pixel_y = -8; + specialfunctions = 4; + name = "Dorm Bolt Switch"; + id = "syndishipjanidorm"; + req_access = list("syndicate"); + normaldoorcontrol = 1 + }, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service/janitorial) +/turf/open/floor/carpet/purple, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/janitor) "Pj" = ( /obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 8 @@ -13914,41 +13961,39 @@ /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "Pk" = ( -/obj/machinery/duct, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/cable, -/obj/effect/turf_decal/siding/dark{ - dir = 8 +/obj/structure/lattice/catwalk/mining, +/obj/structure/railing{ + dir = 9 }, -/obj/machinery/jukebox{ - req_access = list("syndicate"); - anchored = 0 +/obj/machinery/atmospherics/components/unary/passive_vent/layer4{ + dir = 4 }, -/turf/open/floor/wood/large, -/area/ruin/space/has_grav/bubbers/persistance/service/diner) +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "Pl" = ( -/obj/machinery/button/door/directional/south{ - specialfunctions = 4; - id = "syndiship_vault"; - normaldoorcontrol = 1; - name = "Vault Bolt Control"; - req_access = list("syndicate") +/obj/machinery/button/door{ + pixel_y = -32; + id = "syndiarmoryshutter" }, -/obj/structure/closet/crate/goldcrate, -/obj/item/stack/spacecash/c10000, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/command/vault) -"Pn" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) -"Pr" = ( -/obj/machinery/holopad, -/turf/open/floor/mineral/plastitanium/red, +/obj/machinery/computer/camera_advanced/syndie{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/sec/armory) +"Pn" = ( +/obj/machinery/computer/rdservercontrol{ + dir = 4 + }, +/obj/machinery/button/door{ + id = "syndibridge_w"; + name = "Bridge Window Shutters"; + req_access = list("syndicate_leader"); + pixel_x = -24 + }, +/turf/open/floor/mineral/plastitanium/red{ + icon_state = "plastitanium" + }, +/area/ruin/space/has_grav/bubbers/persistance/command/bridge) "Ps" = ( /obj/structure/safe/abovetilefloor, /obj/item/sign/flag/syndicate{ @@ -13957,83 +14002,45 @@ }, /turf/open/floor/wood/parquet, /area/ruin/space/has_grav/bubbers/persistance/command/liason) -"Pu" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/heavy, -/obj/effect/mapping_helpers/airlock/cutaiwire, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, -/obj/machinery/duct, -/obj/machinery/door/airlock/engineering/glass{ - name = "Engineering Bay" - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) -"Pv" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/structure/sign/departments/custodian/directional/east, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) "Pz" = ( /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "PB" = ( /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/siding/dark_green{ - dir = 4 - }, -/obj/machinery/computer/pandemic, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/effect/mapping_helpers/apc/syndicate_access, -/obj/effect/mapping_helpers/apc/full_charge, -/obj/effect/mapping_helpers/apc/cut_AI_wire, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/med/viro) +/area/ruin/space/has_grav/bubbers/persistance/med) "PC" = ( -/obj/machinery/porta_turret/syndicate{ - dir = 8; - pixel_x = 32; - pixel_y = -32 - }, -/obj/structure/lattice/catwalk/mining, -/turf/open/lava/smooth/lava_land_surface, -/area/ruin/space/has_grav/bubbers/dauntless/command/vault) +/obj/machinery/duct, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "PD" = ( -/obj/machinery/airalarm/directional/north, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/turf/open/floor/iron/terracotta/herringbone, -/area/ruin/space/has_grav/bubbers/persistance/service/hydro) +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/engineering/mining) "PF" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/item/kirbyplants/synthetic/plant26, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service) -"PH" = ( -/obj/machinery/light/directional/east, -/turf/open/floor/iron/colony/bolts, -/area/ruin/space/has_grav/bubbers/persistance/service) "PJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 10 +/obj/effect/turf_decal/siding/wood{ + dir = 9 }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/janitorial) +/turf/open/floor/carpet/purple, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/janitor) "PL" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -14045,30 +14052,27 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service) "PM" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/effect/turf_decal/siding/dark_green{ - dir = 1 +/obj/structure/table/reinforced/plastitaniumglass, +/obj/effect/turf_decal/siding/white{ + dir = 8 }, -/obj/item/storage/belt/medical/paramedic, -/obj/item/circular_saw/field_medic, -/obj/item/healthanalyzer/advanced, -/obj/item/clothing/mask/gas/glass, -/obj/item/tank/internals/oxygen, -/obj/item/clothing/shoes/galoshes, -/obj/item/mop, -/obj/item/reagent_containers/cup/bucket/wooden, -/obj/item/clothing/suit/bio_suit/security, -/obj/item/clothing/head/bio_hood/security, -/obj/item/clothing/suit/bio_suit/virology, -/obj/item/clothing/head/bio_hood, -/obj/item/storage/bag/bio, -/obj/structure/closet/generic/wall{ - pixel_y = 32; - name = "Biohazard Equipment" +/obj/machinery/light/directional/north, +/obj/machinery/light_switch/directional/north, +/obj/machinery/button/polarizer{ + pixel_x = -24; + id = "persistence_pysch_w"; + name = "medical window polarization"; + pixel_y = 8 + }, +/obj/machinery/button/door{ + id = "syndicatepysch"; + pixel_x = -24; + pixel_y = -8; + name = "Window Shutters" }, +/obj/item/kirbyplants/organic/applebush, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/med/viro) +/area/ruin/space/has_grav/bubbers/persistance/med) "PN" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -14098,23 +14102,22 @@ /turf/open/floor/mineral/titanium/tiled/white, /area/ruin/space/has_grav/bubbers/persistance/med/treatment) "PQ" = ( -/obj/machinery/power/turbine/turbine_outlet{ - dir = 8 +/obj/structure/chair/office/tactical{ + dir = 4 }, -/turf/open/floor/engine, -/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/bubbers/persistance/med) "PR" = ( /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/cargo/drone) "PS" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 10 - }, -/obj/machinery/light_switch/directional/west, +/obj/effect/turf_decal/stripes/line, /obj/machinery/light/directional/west, -/obj/machinery/duct, -/turf/open/floor/iron/freezer, -/area/ruin/space/has_grav/bubbers/persistance/command/admiral) +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service) "PT" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -14128,19 +14131,14 @@ /turf/open/floor/carpet/donk, /area/ruin/space/has_grav/bubbers/persistance/service) "PU" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 10 +/obj/effect/turf_decal/siding/dark{ + dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/structure/hoop{ dir = 4 }, -/obj/structure/cable, -/obj/structure/bookcase/random{ - pixel_y = -32; - density = 0 - }, -/turf/open/floor/carpet/royalblack, -/area/ruin/space/has_grav/bubbers/persistance/sec/prison/rec) +/turf/open/floor/wood, +/area/ruin/space/has_grav/bubbers/persistance/service/gym) "PV" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -14157,14 +14155,43 @@ /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "PX" = ( -/obj/structure/cable, -/obj/machinery/duct, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/digital_clock/directional/east, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/structure/dresser, +/obj/item/flashlight/lamp/green{ + pixel_x = 5; + pixel_y = 15 + }, +/obj/machinery/button/door/directional/west{ + pixel_y = -8; + name = "Engineering Dorm Bolt Switch"; + id = "syndishipengibed"; + req_access = list("syndicate"); + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/machinery/button/door/directional/west{ + pixel_y = 8; + name = "turbines shutters"; + id = "turbine_shutters_bed"; + req_access = list("syndicate") + }, +/obj/machinery/button/door/directional/west{ + pixel_x = -40; + pixel_y = -8; + name = "Radiation Shutters"; + id = "rad_shutters" + }, +/obj/machinery/button/polarizer{ + pixel_x = -40; + pixel_y = 8; + name = "Turbine Window Polarization"; + id = "burnchamberbed_w" + }, +/obj/machinery/light_switch/directional/west, +/turf/open/floor/iron/terracotta/small, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/engineering) "PY" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/turf_decal/trimline/dark_red/filled/line, @@ -14180,6 +14207,19 @@ /obj/machinery/computer/libraryconsole/bookmanagement, /turf/open/floor/carpet/royalblack, /area/ruin/space/has_grav/bubbers/persistance/sec/prison/rec) +"Qa" = ( +/obj/machinery/computer/atmos_control/nocontrol/incinerator{ + dir = 4; + id_tag = "syndiship_turbine"; + atmos_chambers = list("syndiship_turbine") + }, +/obj/machinery/button/door/directional/west{ + id = "turbine_vent"; + name = "Turbine Vent"; + req_access = list("syndicate") + }, +/turf/open/floor/catwalk_floor/titanium, +/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "Qb" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark{ dir = 4 @@ -14207,46 +14247,31 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service/janitorial) "Qm" = ( -/obj/machinery/duct, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/skill_station, -/obj/effect/turf_decal/siding/dark{ - dir = 8 +/obj/structure/closet/firecloset/wall{ + pixel_y = 32 }, -/turf/open/floor/iron/white/small, -/area/ruin/space/has_grav/bubbers/persistance/service/lockers) +/turf/open/floor/pod/dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) "Qn" = ( -/obj/machinery/door/poddoor{ - id = "armory_s2"; - name = "Emergancy Armory Access" - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) -"Qp" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/obj/structure/bed/double{ +/obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/item/bedsheet/hos/double{ - dir = 4 - }, -/obj/machinery/button/door{ - id = "syndishipmaad"; - pixel_x = -24; - pixel_y = 8; - name = "Airlock Bolts"; - specialfunctions = 4; - normaldoorcontrol = 1 +/obj/structure/moisture_trap, +/obj/machinery/vending/wardrobe/jani_wardrobe{ + onstation = 0; + onstation_override = 1; + pixel_y = 28; + density = 0; + all_products_free = 1 }, -/turf/open/floor/carpet/red, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/maa) +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service/janitorial) +"Qp" = ( +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/machinery/computer/exoscanner_control, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/cargo/drone) "Qq" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/structure/cable, @@ -14273,6 +14298,10 @@ }, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/sci/robotics) +"Qt" = ( +/obj/effect/turf_decal/vg_decals/atmos/carbon_dioxide, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) "Qu" = ( /obj/effect/turf_decal/trimline/dark_red/filled/line{ dir = 5 @@ -14286,12 +14315,11 @@ /turf/open/floor/carpet/royalblack, /area/ruin/space/has_grav/bubbers/persistance/service/lounge) "Qx" = ( -/obj/machinery/airalarm/directional/east, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/obj/machinery/door/firedoor/heavy, -/obj/machinery/light/directional/east, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) +/obj/structure/chair/sofa/bench/left, +/obj/structure/cable, +/obj/machinery/light/directional/north, +/turf/open/floor/wood/large, +/area/ruin/space/has_grav/bubbers/persistance/service/sauna) "Qy" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -14299,40 +14327,30 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/sci/robotics) "Qz" = ( -/obj/effect/turf_decal/siding/dark, -/obj/machinery/duct, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) -"QA" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 9 - }, -/obj/machinery/light/directional/west, -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/storage/toolbox/syndicate{ - pixel_y = 5 +/obj/structure/disposalpipe/segment, +/turf/open/floor/mineral/plastitanium/red{ + icon_state = "plastitanium" }, -/obj/machinery/vending/cytopro{ - pixel_y = 28; - density = 0; - all_products_free = 1 +/area/ruin/space/has_grav/bubbers/persistance/command/bridge) +"QA" = ( +/obj/machinery/door/window/survival_pod/left/directional/south{ + req_access = list("syndicate") }, -/turf/open/floor/iron/smooth, -/area/ruin/space/has_grav/bubbers/persistance/sci/rnd) -"QB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/cargo/drone) +"QB" = ( /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/sauna) "QC" = ( -/obj/machinery/mineral/stacking_machine, -/obj/structure/window/reinforced/plasma/spawner/directional/west, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/firealarm/directional/east, +/obj/machinery/light/directional/east, /turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/cargo) +/area/ruin/space/has_grav/bubbers/persistance/service) "QD" = ( /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) @@ -14370,19 +14388,53 @@ /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "QH" = ( -/obj/machinery/light/cold/directional/north, -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/pod/dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering) +/obj/structure/closet/crate/hydroponics, +/obj/item/paper/guides/jobs/hydroponics, +/obj/item/seeds/onion, +/obj/item/seeds/garlic, +/obj/item/seeds/potato, +/obj/item/seeds/tomato, +/obj/item/seeds/carrot, +/obj/item/seeds/grass, +/obj/item/seeds/ambrosia, +/obj/item/seeds/wheat, +/obj/item/seeds/pumpkin, +/obj/effect/spawner/random/contraband/prison, +/obj/item/seeds/tower, +/obj/item/seeds/tobacco, +/obj/item/reagent_containers/cup/watering_can, +/obj/item/cultivator, +/obj/item/plant_analyzer, +/obj/item/secateurs, +/obj/item/shovel/spade, +/obj/item/seeds/chili, +/obj/item/seeds/pumpkin, +/obj/item/seeds/coffee, +/obj/effect/spawner/random/food_or_drink/seed, +/obj/effect/spawner/random/food_or_drink/seed, +/obj/effect/spawner/random/food_or_drink/seed, +/obj/item/storage/bag/plants/portaseeder, +/obj/item/reagent_containers/cup/watering_can, +/obj/item/storage/box/beakers, +/obj/effect/turf_decal/siding/dark{ + dir = 10 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/biogenerator/medstation/directional/west, +/turf/open/floor/iron/dark/small, +/area/ruin/space/has_grav/bubbers/persistance/sec/prison) "QK" = ( /obj/machinery/light/directional/west, -/obj/effect/turf_decal/siding/wood/end{ - dir = 1 +/obj/machinery/button/door{ + id = "syndihanger"; + pixel_x = -24; + name = "Hanger doors"; + req_access = list("syndicate") }, -/obj/machinery/shower/directional/south, -/obj/structure/drain/big, -/turf/open/floor/iron/freezer, -/area/ruin/space/has_grav/bubbers/persistance/command/admiral) +/turf/open/floor/iron/colony/bolts, +/area/ruin/space/has_grav/bubbers/persistance/service) "QL" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -14390,30 +14442,16 @@ /turf/open/floor/plating/elevatorshaft, /area/ruin/space/has_grav/bubbers/persistance/cargo) "QN" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/effect/turf_decal/siding/dark{ - dir = 10 - }, -/obj/item/autopsy_scanner, -/obj/item/healthanalyzer{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/machinery/light/directional/south, -/obj/machinery/button/polarizer{ - pixel_x = -8; - pixel_y = -24; - id = "persistence_operating"; - name = "medical window polarization" +/obj/effect/turf_decal/siding/wood{ + dir = 8 }, -/obj/machinery/button/door{ - id = "persistence_operating_s"; - pixel_x = 8; - pixel_y = -24; - name = "Shutters" +/obj/machinery/duct, +/obj/structure/curtain, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 }, -/turf/open/floor/mineral/titanium/tiled/white, -/area/ruin/space/has_grav/bubbers/persistance/med/treatment) +/turf/open/floor/iron/freezer, +/area/ruin/space/has_grav/bubbers/persistance/command/admiral) "QP" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/persistance/sci/ordnance) @@ -14423,27 +14461,25 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/med) "QT" = ( +/obj/effect/turf_decal/stripes/blue/line, /obj/structure/disposalpipe/segment, -/obj/structure/window/reinforced/survival_pod/spawner/directional/south, -/obj/effect/turf_decal/siding/dark_green{ - dir = 6 - }, -/obj/structure/reagent_dispensers/wall/virusfood/directional/east, -/obj/machinery/portable_atmospherics/canister/miasma, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/structure/cable, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/med/viro) +/area/ruin/space/has_grav/bubbers/persistance/med) "QU" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/effect/mapping_helpers/apc/syndicate_access, -/obj/effect/mapping_helpers/apc/cut_AI_wire, -/obj/effect/mapping_helpers/apc/full_charge, -/obj/structure/frame/machine/secured, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/command/vault) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/turf_decal/siding/dark{ + dir = 10 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/sci/robotics) "QW" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -14486,22 +14522,8 @@ /turf/open/floor/iron/kitchen/herringbone, /area/ruin/space/has_grav/bubbers/persistance/service/salon) "Rc" = ( -/obj/effect/turf_decal/tile/bar/opposingcorners{ - dir = 8 - }, -/obj/effect/turf_decal/siding{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/duct, -/obj/structure/chair/sofa/left/maroon, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/bubbers/persistance/service/diner) +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/bubbers/persistance/sci/robotics) "Re" = ( /obj/structure/disposalpipe/segment, /obj/machinery/power/apc/auto_name/directional/east, @@ -14523,23 +14545,15 @@ /turf/open/floor/wood, /area/ruin/space/has_grav/bubbers/persistance/service/gym) "Rh" = ( -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/machinery/camera/autoname/directional/west{ - name = "Persistence Exterior West"; - network = list("persistence_ext") - }, -/obj/machinery/porta_turret/syndicate{ - dir = 8; - pixel_x = -32 +/obj/machinery/duct, +/obj/structure/cable, +/obj/structure/disposalpipe/junction/flip{ + dir = 1 }, -/obj/structure/lattice/catwalk/mining, -/turf/open/lava/smooth/lava_land_surface, -/area/ruin/space/has_grav/bubbers/dauntless/command/vault) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/iron/kitchen/diagonal, +/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "Ri" = ( /obj/structure/fans/tiny, /obj/machinery/firealarm/directional/east, @@ -14547,35 +14561,41 @@ /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/engineering/gas) "Rj" = ( -/obj/structure/kitchenspike, -/obj/item/knife/butcher, -/turf/open/floor/iron/kitchen_coldroom/freezerfloor, -/area/ruin/space/has_grav/bubbers/persistance/service/freezer) -"Rk" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /obj/machinery/duct, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/effect/turf_decal/siding/dark{ - dir = 1 +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +"Rk" = ( +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white/small, -/area/ruin/space/has_grav/bubbers/persistance/service/lockers) -"Rl" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" }, -/obj/item/bedsheet/cosmos/double{ - dir = 1 +/obj/structure/lattice/catwalk/mining, +/obj/machinery/porta_turret/syndicate{ + dir = 8; + pixel_x = -32 }, -/obj/structure/bed/double/pod{ - dir = 1 +/obj/machinery/camera/autoname/directional/west{ + name = "Persistence Exterior West"; + network = list("persistence_ext") }, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/space/has_grav/bubbers/dauntless/command/vault) +"Rl" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/toy/plush/abductor/agent, +/obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/iron/terracotta/small, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/engineering) +/obj/effect/mapping_helpers/apc/syndicate_access, +/obj/effect/mapping_helpers/apc/cut_AI_wire, +/obj/effect/mapping_helpers/apc/full_charge, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/cargo/drone) "Rm" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/turf_decal/trimline/dark_red/filled/line, @@ -14610,21 +14630,13 @@ /turf/open/floor/wood/parquet, /area/ruin/space/has_grav/bubbers/persistance/command/liason) "Rt" = ( -/obj/effect/turf_decal/trimline/dark_blue/filled/line{ - dir = 6 - }, -/obj/machinery/duct, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/effect/turf_decal/siding/dark{ - dir = 1 +/obj/structure/fireplace, +/obj/effect/mob_spawn/ghost_role/human/persistence/syndicate/researcher{ + dir = 4; + name = "Persistence Researcher" }, -/turf/open/floor/iron/white/diagonal, -/area/ruin/space/has_grav/bubbers/persistance/med) +/turf/open/floor/iron/terracotta/diagonal, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/science) "Ru" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -14632,32 +14644,15 @@ /turf/open/floor/wood, /area/ruin/space/has_grav/bubbers/persistance/service/gym) "Rw" = ( -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/disposal/bin, -/obj/machinery/firealarm/directional/south, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/effect/mapping_helpers/apc/syndicate_access, -/obj/effect/mapping_helpers/apc/full_charge, -/obj/effect/mapping_helpers/apc/cut_AI_wire, -/turf/open/floor/carpet/donk, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/morale) -"Rx" = ( -/obj/structure/cable, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/door/firedoor/heavy, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, -/obj/effect/mapping_helpers/airlock/cutaiwire, -/obj/machinery/door/airlock/mining{ - id_tag = "syndishipcargo"; - name = "Cargo Tech Quarters" +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/obj/effect/turf_decal/siding/dark_green{ + dir = 6 }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/cargo) +/obj/structure/reagent_dispensers/wall/virusfood/directional/east, +/obj/machinery/portable_atmospherics/canister/miasma, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/bubbers/persistance/med/viro) "Ry" = ( /obj/machinery/light/directional/north, /obj/structure/sign/poster/contraband/killingjoke/directional/north, @@ -14669,19 +14664,18 @@ /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "RA" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/structure/moisture_trap, -/obj/machinery/vending/wardrobe/jani_wardrobe{ - onstation = 0; - onstation_override = 1; - pixel_y = 28; - density = 0; - all_products_free = 1 +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/apc/syndicate_access, +/obj/effect/mapping_helpers/apc/full_charge, +/obj/effect/mapping_helpers/apc/cut_AI_wire, +/obj/structure/fireplace, +/obj/effect/turf_decal/siding/dark{ + dir = 8; + icon_state = "siding_plain_end" }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service/janitorial) +/turf/open/floor/iron/terracotta/diagonal, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/janitor) "RB" = ( /obj/structure/chair/stool{ dir = 4 @@ -14707,10 +14701,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/light/directional/east, -/obj/item/kirbyplants/organic/plant9, +/obj/structure/weightmachine/weightlifter, /turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) +/area/ruin/space/has_grav/bubbers/persistance/service/gym) "RE" = ( /obj/structure/window/reinforced/plasma/spawner/directional/north, /obj/machinery/byteforge, @@ -14755,19 +14748,19 @@ "RJ" = ( /obj/machinery/duct, /obj/structure/cable, -/obj/structure/disposalpipe/junction{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/door/firedoor/heavy, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/area/ruin/space/has_grav/bubbers/persistance/med) "RK" = ( -/obj/machinery/light/directional/west, -/obj/machinery/smartfridge/disks, -/obj/structure/table/reinforced/plastitaniumglass, -/turf/open/floor/grass, -/area/ruin/space/has_grav/bubbers/persistance/service/hydro) +/obj/effect/turf_decal/stripes/line, +/obj/item/kirbyplants/organic/plant15, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service) "RL" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -14821,14 +14814,11 @@ /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/med/treatment) "RW" = ( -/obj/structure/cable, -/obj/machinery/duct, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/firealarm/directional/east, -/obj/structure/disposalpipe/junction, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/command/vault) "RX" = ( /obj/machinery/duct, /obj/effect/turf_decal/stripes/red/line, @@ -14838,15 +14828,16 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "RY" = ( -/obj/structure/safe/abovetilefloor, -/obj/item/stack/sheet/mineral/bananium, -/obj/item/sign/flag/syndicate{ - pixel_x = -7; - pixel_y = 13 - }, -/obj/item/book/bible/syndicate, -/turf/open/floor/carpet/donk, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/morale) +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/apc/syndicate_access, +/obj/effect/mapping_helpers/apc/cut_AI_wire, +/obj/effect/mapping_helpers/apc/full_charge, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/sec/holding) "Sa" = ( /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/engineering/mining) @@ -14908,18 +14899,17 @@ /turf/open/floor/iron/white/diagonal, /area/ruin/space/has_grav/bubbers/persistance/med) "Sn" = ( -/obj/machinery/duct, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/effect/turf_decal/siding/dark{ - dir = 1 - }, -/obj/machinery/dryer{ - pixel_y = 25 +/obj/machinery/digital_clock/directional/west, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/modular_computer/laptop/preset/syndicate, +/obj/item/reagent_containers/cup/maunamug, +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/siding/wood{ + dir = 9 }, -/turf/open/floor/iron/white/small, -/area/ruin/space/has_grav/bubbers/persistance/service/lockers) +/obj/machinery/newscaster/directional/north, +/turf/open/floor/carpet/green, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/chef) "So" = ( /obj/machinery/gibber, /obj/machinery/light/directional/south, @@ -14935,18 +14925,26 @@ /turf/open/floor/mineral/titanium/white, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "Ss" = ( -/obj/machinery/door/airlock/security/old/glass{ - name = "General Population Access" +/obj/machinery/conveyor{ + id = "syndirecycle"; + dir = 1 }, -/obj/effect/turf_decal/stripes/red/full, -/obj/effect/mapping_helpers/airlock/cutaiwire, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "dauntless-sec" +/obj/effect/spawner/random/trash/garbage{ + pixel_x = 4; + pixel_y = 5 }, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, -/obj/machinery/door/firedoor/heavy, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/sec/prison) +/obj/effect/spawner/random/trash/garbage{ + pixel_x = 4; + pixel_y = 5 + }, +/obj/effect/spawner/random/maintenance/two, +/obj/effect/spawner/random/maintenance/two, +/obj/effect/spawner/random/maintenance/two, +/obj/effect/spawner/random/maintenance/two, +/obj/effect/spawner/random/maintenance/two, +/obj/effect/spawner/random/maintenance/two, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/cargo) "Sv" = ( /obj/structure/window/reinforced/tinted/frosted/spawner/directional/south{ opacity = 1 @@ -14958,75 +14956,69 @@ /turf/open/floor/iron/white/small, /area/ruin/space/has_grav/bubbers/persistance/service/lockers) "Sw" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/structure/cable, -/obj/structure/sign/warning/electric_shock/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 9 + }, /obj/machinery/duct, -/obj/machinery/light/cold/directional/south, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) "Sx" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/structure/sink/kitchen/directional/east, -/obj/structure/sign/warning/cold_temp/directional/west, -/turf/open/floor/iron/white, -/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) +/obj/structure/reagent_dispensers/water_cooler, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service) "Sy" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, /obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/duct, -/turf/open/floor/iron/white, -/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "Sz" = ( -/obj/effect/turf_decal/stripes/line, -/turf/closed/wall/r_wall/syndicate/nodiagonal, -/area/ruin/space/has_grav/bubbers/persistance/service/gym) +/obj/effect/turf_decal/skyrat_decals/ds2/middle, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/service) "SA" = ( -/mob/living/basic/lizard/tegu{ - name = "Entertains-The-Hostages"; - faction = list("neutral","Syndicate") - }, -/obj/structure/bed/dogbed, -/obj/structure/sign/poster/contraband/syndiemoth/directional/north, -/turf/open/floor/grass, -/area/ruin/space/has_grav/bubbers/persistance/sec/prison) -"SC" = ( /obj/effect/turf_decal/stripes/line{ - dir = 5 + dir = 6 }, -/obj/machinery/light/directional/south, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service) -"SD" = ( -/obj/machinery/conveyor{ - id = "syndirecycle"; - dir = 1 +"SC" = ( +/obj/machinery/button/door/directional/west{ + pixel_y = -8; + specialfunctions = 4; + name = "Dorm Bolt Switch"; + id = "syndishipmoraledorm"; + req_access = list("syndicate"); + normaldoorcontrol = 1 }, -/obj/effect/spawner/random/trash/garbage{ - pixel_x = 4; - pixel_y = 5 +/obj/effect/turf_decal/siding/wood{ + dir = 10 }, -/obj/effect/spawner/random/trash/garbage{ - pixel_x = 4; - pixel_y = 5 +/obj/structure/chair/sofa/right/maroon{ + dir = 4 }, -/obj/effect/spawner/random/maintenance/two, -/obj/effect/spawner/random/maintenance/two, -/obj/effect/spawner/random/maintenance/two, -/obj/effect/spawner/random/maintenance/two, -/obj/effect/spawner/random/maintenance/two, -/obj/effect/spawner/random/maintenance/two, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/cargo) +/turf/open/floor/carpet/green, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/chef) +"SD" = ( +/obj/machinery/status_display/door_timer{ + id = "syndicate_cell"; + name = "Syndicate Holding Cell"; + pixel_y = 32; + req_access = list("syndicate") + }, +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/obj/machinery/computer/security/persistence{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/sec/brigentrance) "SE" = ( /obj/machinery/duct, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, @@ -15036,22 +15028,31 @@ /turf/open/floor/iron/white/small, /area/ruin/space/has_grav/bubbers/persistance/service/lockers) "SF" = ( -/obj/structure/fans/tiny/forcefield, -/obj/machinery/door/poddoor{ - id = "syndimining" +/obj/machinery/plumbing/synthesizer/water_synth, +/obj/effect/turf_decal/siding/dark{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/evac) +/turf/open/floor/noslip, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) "SG" = ( -/obj/structure/cable, -/obj/machinery/power/smes/connector, -/obj/machinery/power/smesbank/super/full, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) -"SH" = ( +/obj/machinery/button/door/directional/west{ + pixel_y = -8; + specialfunctions = 4; + name = "Dorm Bolt Switch"; + id = "syndishipcomms"; + req_access = list("syndicate"); + normaldoorcontrol = 1 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/siding/dark/end{ + dir = 1 + }, +/turf/open/floor/noslip, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +"SH" = ( /obj/structure/closet/generic/wall{ pixel_x = 32 }, @@ -15076,10 +15077,12 @@ /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/rnd) "SJ" = ( -/obj/structure/flora/bush/lavendergrass/style_random, -/obj/machinery/hydroponics/constructable, -/turf/open/floor/grass, -/area/ruin/space/has_grav/bubbers/persistance/sec/prison) +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/structure/cable, +/turf/open/floor/carpet/donk, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/morale) "SK" = ( /obj/structure/chair/comfy/carp{ dir = 4 @@ -15102,14 +15105,21 @@ "SN" = ( /turf/open/floor/glass/reinforced/plasma, /area/ruin/space/has_grav/bubbers/persistance/service/diner) -"SQ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 +"SO" = ( +/obj/machinery/porta_turret/syndicate{ + dir = 8; + pixel_y = -32 }, -/obj/machinery/firealarm/directional/east, -/obj/machinery/light/directional/east, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/machinery/camera/autoname/directional/south{ + name = "Persistence Exterior South"; + network = list("persistence_ext") + }, +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" + }, +/obj/structure/lattice/catwalk/mining, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/space/has_grav/bubbers/dauntless/command/vault) "SS" = ( /obj/structure/chair/comfy/carp{ dir = 1 @@ -15133,43 +15143,15 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service) "SU" = ( -/obj/structure/closet/crate/hydroponics, -/obj/item/paper/guides/jobs/hydroponics, -/obj/item/seeds/onion, -/obj/item/seeds/garlic, -/obj/item/seeds/potato, -/obj/item/seeds/tomato, -/obj/item/seeds/carrot, -/obj/item/seeds/grass, -/obj/item/seeds/ambrosia, -/obj/item/seeds/wheat, -/obj/item/seeds/pumpkin, -/obj/effect/spawner/random/contraband/prison, -/obj/item/seeds/tower, -/obj/item/seeds/tobacco, -/obj/item/reagent_containers/cup/watering_can, -/obj/item/cultivator, -/obj/item/plant_analyzer, -/obj/item/secateurs, -/obj/item/shovel/spade, -/obj/item/seeds/chili, -/obj/item/seeds/pumpkin, -/obj/item/seeds/coffee, -/obj/effect/spawner/random/food_or_drink/seed, -/obj/effect/spawner/random/food_or_drink/seed, -/obj/effect/spawner/random/food_or_drink/seed, -/obj/item/storage/bag/plants/portaseeder, -/obj/item/reagent_containers/cup/watering_can, -/obj/item/storage/box/beakers, -/obj/effect/turf_decal/siding/dark{ - dir = 10 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1 +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/structure/frame/machine/secured, +/obj/item/circuitboard/machine/ore_silo, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, -/obj/machinery/biogenerator/medstation/directional/west, -/turf/open/floor/iron/dark/small, -/area/ruin/space/has_grav/bubbers/persistance/sec/prison) +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/command/vault) "SZ" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/sci/ordnance) @@ -15216,14 +15198,13 @@ /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "Tg" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 10 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/command/bridge) +/obj/machinery/duct, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "Tj" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -15234,27 +15215,37 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "Tl" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/carpet/green, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/chef) -"Tn" = ( -/turf/closed/wall/r_wall/syndicate/nodiagonal, -/area/ruin/space/has_grav/bubbers/persistance/sec/prison/rec) -"To" = ( -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/siding/wood{ - dir = 9 +/obj/machinery/porta_turret/syndicate{ + dir = 8; + pixel_y = 32 + }, +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" + }, +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" }, /obj/machinery/camera/autoname/directional/north{ name = "Persistence Exterior North"; network = list("persistence_ext") }, -/obj/machinery/digital_clock/directional/west, -/obj/item/kirbyplants/organic/plant6, -/turf/open/floor/wood/tile, -/area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) +/obj/structure/lattice/catwalk/mining, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/space/has_grav/bubbers/dauntless/command/vault) +"Tn" = ( +/turf/closed/wall/r_wall/syndicate/nodiagonal, +/area/ruin/space/has_grav/bubbers/persistance/sec/prison/rec) +"To" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/mob/living/carbon/human/species/monkey, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/turf/open/misc/grass/jungle/station, +/area/ruin/space/has_grav/bubbers/persistance/med) "Tr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -15263,6 +15254,15 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/cargo) +"Ts" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service/janitorial) "Tu" = ( /obj/machinery/newscaster/directional/south, /obj/machinery/button/door/directional/west{ @@ -15282,20 +15282,26 @@ /turf/open/floor/wood/parquet, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "Tv" = ( -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/airalarm/directional/south, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/machinery/ecto_sniffer, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/bubbers/persistance/sci/robotics) +"Tw" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 9 }, -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" +/obj/structure/cable, +/obj/machinery/camera/autoname/directional/west{ + name = "Persistence Exterior West"; + network = list("persistence_ext") }, -/obj/machinery/porta_turret/syndicate{ - dir = 8; - pixel_x = 32; - pixel_y = 32 +/obj/structure/chair/sofa/corp/corner{ + dir = 4 }, -/obj/structure/lattice/catwalk/mining, -/turf/open/lava/smooth/lava_land_surface, -/area/ruin/space/has_grav/bubbers/dauntless/command/vault) +/turf/open/floor/carpet/royalblack, +/area/ruin/space/has_grav/bubbers/persistance/sec/prison/rec) "Tz" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -15360,23 +15366,23 @@ /turf/open/floor/grass, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "TH" = ( -/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, -/obj/machinery/atmospherics/pipe/layer_manifold/pink{ - dir = 8 +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) +/obj/machinery/duct, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "TI" = ( -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/structure/sign/warning/docking/directional/west, -/obj/structure/lattice/catwalk/mining, -/turf/open/lava/smooth/lava_land_surface, -/area/lavaland/surface/outdoors) +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/machinery/plantgenes, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/structure/window/reinforced/plasma/spawner/directional/south, +/turf/open/floor/grass, +/area/ruin/space/has_grav/bubbers/persistance/service/hydro) "TJ" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -15405,6 +15411,15 @@ /obj/structure/flora/bush/flowers_pp/style_random, /turf/open/floor/grass, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) +"TM" = ( +/obj/structure/railing/wooden_fencing{ + dir = 8 + }, +/mob/living/basic/chicken/teshari{ + faction = list("neutral","Syndicate") + }, +/turf/open/floor/grass, +/area/ruin/space/has_grav/bubbers/persistance/service/hydro) "TN" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -15433,6 +15448,15 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) +"TS" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service) "TT" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/persistance/service/gym) @@ -15495,12 +15519,13 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/sec/armory) "Ua" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/structure/cable, -/turf/open/floor/carpet/donk, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/morale) +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/sec/holding) "Ub" = ( /obj/effect/turf_decal/siding/dark, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -15520,22 +15545,31 @@ /turf/open/floor/iron/kitchen/herringbone, /area/ruin/space/has_grav/bubbers/persistance/service/salon) "Uf" = ( -/obj/machinery/digital_clock/directional/west, -/obj/effect/turf_decal/siding/dark/end, -/obj/structure/closet/firecloset/full, -/turf/open/floor/noslip, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) -"Uj" = ( -/turf/open/floor/carpet/donk, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/morale) -"Uk" = ( -/obj/machinery/modular_computer/preset/engineering{ - dir = 8 - }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/light/directional/south, -/obj/structure/cable, +/turf/open/floor/iron/white, +/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) +"Uj" = ( +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/door/window/brigdoor/security/cell/left/directional/south{ + id = "syndicate_cell"; + name = "Syndicate Holding Cell"; + req_access = list("syndicate") + }, +/turf/open/floor/iron/white/small, +/area/ruin/space/has_grav/bubbers/persistance/sec/holding) +"Uk" = ( +/obj/machinery/modular_computer/preset/engineering{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/light/directional/south, +/obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south, /obj/machinery/digital_clock/directional/east, /turf/open/floor/wood/large, @@ -15553,20 +15587,20 @@ /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/rnd) "Um" = ( -/obj/machinery/airalarm/directional/east, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/obj/structure/frame/machine/secured, -/obj/item/circuitboard/machine/ore_silo, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/command/vault) +/obj/machinery/holopad, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/sec/armory) "Un" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron/kitchen_coldroom/freezerfloor, -/area/ruin/space/has_grav/bubbers/persistance/service/freezer) +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" + }, +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" + }, +/obj/structure/sign/warning/docking/directional/west, +/obj/structure/lattice/catwalk/mining, +/turf/open/lava/smooth/lava_land_surface, +/area/lavaland/surface/outdoors) "Up" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/item/clipboard, @@ -15593,14 +15627,16 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "Us" = ( -/obj/machinery/light/directional/south, -/obj/structure/extinguisher_cabinet/directional/west, -/obj/machinery/chem_mass_spec, -/obj/machinery/cell_charger_multi/wall_mounted/directional/south, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/duct, +/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/med/chem) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white/small, +/area/ruin/space/has_grav/bubbers/persistance/service/lockers) "Ut" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -15629,13 +15665,14 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/sec/armory) "Uv" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/effect/turf_decal/siding/dark{ - dir = 9 +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ + dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/sci/robotics) +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/obj/structure/window/reinforced/plasma/spawner/directional/north, +/obj/structure/window/reinforced/plasma/spawner/directional/south, +/turf/open/floor/engine/co2, +/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) "Uw" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -15646,14 +15683,6 @@ /obj/machinery/holopad, /turf/open/floor/carpet/donk, /area/ruin/space/has_grav/bubbers/persistance/service) -"Uz" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 1 - }, -/obj/machinery/cell_charger_multi/wall_mounted/directional/north, -/obj/machinery/bci_implanter, -/turf/open/floor/iron/smooth, -/area/ruin/space/has_grav/bubbers/persistance/sci/rnd) "UA" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/maa) @@ -15666,9 +15695,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) -"UD" = ( -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/sci/ordnance) "UE" = ( /obj/effect/turf_decal/siding/dark{ dir = 6 @@ -15677,23 +15703,12 @@ /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "UF" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/cable, -/obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/door/window/survival_pod/left/directional/east{ - name = "Liason Desk"; - req_access = list("syndicate_leader") - }, -/obj/machinery/door/window/survival_pod/left/directional/west{ - req_access = list("syndicate") - }, -/obj/machinery/door/poddoor/shutters/window{ - id = "syndiliasonshutter" +/obj/structure/fans/tiny/forcefield, +/obj/machinery/door/poddoor{ + id = "syndimining" }, -/obj/machinery/door/firedoor/heavy, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/command/liason) +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/evac) "UG" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -15701,11 +15716,31 @@ /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "UH" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/light/directional/west, -/obj/structure/extinguisher_cabinet/directional/west, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/machinery/vending/hydroseeds{ + pixel_x = -28; + can_astar_pass = 1; + density = 0; + all_products_free = 1 + }, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/effect/spawner/random/food_or_drink/seed_rare, +/obj/effect/spawner/random/food_or_drink/seed_rare, +/obj/effect/spawner/random/food_or_drink/seed_rare, +/obj/item/seeds/kudzu, +/obj/item/bee_smoker, +/obj/item/secateurs, +/obj/item/geneshears, +/obj/item/hatchet, +/obj/item/gun/energy/floragun, +/obj/item/plant_analyzer, +/obj/item/shovel/spade, +/obj/item/cultivator, +/obj/item/reagent_containers/cup/watering_can/advanced, +/obj/structure/closet/crate/secure/syndicate/arc{ + name = "botany supplies" + }, +/turf/open/floor/grass, +/area/ruin/space/has_grav/bubbers/persistance/service/hydro) "UI" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/dark, @@ -15724,36 +15759,35 @@ /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "UJ" = ( -/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/duct, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "UK" = ( /obj/structure/dresser, /turf/open/floor/carpet/donk, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/morale) -"UL" = ( -/obj/structure/dresser, -/obj/item/flashlight/lamp/green{ - pixel_x = 5; - pixel_y = 15 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/light/directional/north, -/obj/machinery/airalarm/directional/north, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/turf/open/floor/wood/parquet, -/area/ruin/space/has_grav/bubbers/persistance/command/liason) "UM" = ( /obj/effect/turf_decal/skyrat_decals/syndicate/bottom/right, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/sec/armory) +"UO" = ( +/obj/item/reagent_containers/cup/beaker/large, +/turf/open/floor/grass, +/area/ruin/space/has_grav/bubbers/persistance/sec/prison) "UP" = ( /obj/structure/cable, -/obj/machinery/duct, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/machinery/duct, +/turf/open/floor/iron/kitchen/herringbone, +/area/ruin/space/has_grav/bubbers/persistance/service/salon) "UQ" = ( /obj/machinery/light/directional/east, /obj/machinery/computer/camera_advanced/syndie{ @@ -15785,40 +15819,25 @@ /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/cargo) "UU" = ( -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/machinery/porta_turret/syndicate{ - dir = 8; - pixel_x = -32 +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/siding/wood{ + dir = 9 }, -/obj/machinery/camera/autoname/directional/west{ - name = "Persistence Exterior West"; +/obj/machinery/camera/autoname/directional/north{ + name = "Persistence Exterior North"; network = list("persistence_ext") }, -/obj/machinery/conveyor{ - dir = 8; - id = "QMLoad" - }, -/obj/structure/lattice/catwalk/mining, -/turf/open/floor/pod/dark, -/area/ruin/space/has_grav/bubbers/dauntless/command/vault) +/obj/machinery/digital_clock/directional/west, +/obj/item/kirbyplants/organic/plant6, +/turf/open/floor/wood/tile, +/area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) "UV" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/persistance/cargo) "UX" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/duct, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/machinery/nuclearbomb/beer, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/command/vault) "UY" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -15841,11 +15860,19 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service) "Vc" = ( +/obj/structure/cable, /obj/structure/disposalpipe/segment, -/turf/open/floor/mineral/plastitanium/red{ - icon_state = "plastitanium" +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/door/firedoor/heavy, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/machinery/door/airlock/mining{ + id_tag = "syndishipcargo"; + name = "Cargo Tech Quarters" }, -/area/ruin/space/has_grav/bubbers/persistance/command/bridge) +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/cargo) "Vd" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -15880,13 +15907,34 @@ /turf/open/floor/engine, /area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) "Vk" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/suit_storage_unit/industrial/syndicatemining, -/obj/effect/turf_decal/siding/wood{ - dir = 10 +/obj/structure/closet/secure_closet/freezer/meat{ + req_access = list("syndicate") }, -/turf/open/floor/carpet/stellar, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/cargo) +/obj/effect/spawner/random/food_or_drink/donkpockets{ + pixel_x = -8; + pixel_y = -4 + }, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/flour, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/reagent_containers/condiment/enzyme{ + pixel_x = 12 + }, +/obj/item/reagent_containers/condiment/rice, +/obj/item/reagent_containers/condiment/sugar, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/soymilk, +/obj/item/reagent_containers/condiment/soymilk, +/obj/item/choice_beacon/ingredient, +/obj/item/choice_beacon/ingredient, +/obj/item/storage/box/beakers{ + pixel_x = -4; + pixel_y = -2 + }, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/ruin/space/has_grav/bubbers/persistance/service/freezer) "Vm" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/engineering) @@ -15926,13 +15974,16 @@ /obj/machinery/light/directional/south, /turf/open/floor/engine, /area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) -"Vu" = ( -/obj/effect/spawner/liquids_spawner/shoulders, -/obj/effect/mist, -/turf/open/floor/iron/pool/cobble/side{ - dir = 1 +"Vt" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 5 }, -/area/ruin/space/has_grav/bubbers/persistance/service/sauna) +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service) "Vx" = ( /obj/structure/frame/machine/secured, /obj/item/circuitboard/machine/circuit_imprinter/offstation, @@ -15959,46 +16010,46 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/sci/robotics) "VA" = ( -/obj/structure/cable, +/obj/structure/safe/abovetilefloor, +/obj/item/sign/flag/syndicate{ + pixel_x = -3; + pixel_y = 6 + }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/sign/poster/official/moth_epi/directional/west, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/item/clothing/gloves/boxing/evil, +/turf/open/floor/carpet/red, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/brig) "VC" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 +/obj/machinery/mineral/stacking_machine, +/obj/structure/window/reinforced/plasma/spawner/directional/west, +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/carpet/stellar, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/cargo) -"VD" = ( -/turf/closed/wall/r_wall/syndicate/nodiagonal, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/cargo) -"VE" = ( -/obj/machinery/duct, -/obj/structure/cable, -/obj/effect/turf_decal/tile/bar/opposingcorners{ +/obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/light/dim/directional/west, -/obj/effect/turf_decal/siding{ - dir = 9 +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/cargo) +"VD" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 10 }, -/obj/structure/chair/sofa/corner/maroon{ - dir = 4 +/obj/effect/turf_decal/trimline/dark_red/filled/line{ + dir = 10 }, -/obj/machinery/computer/security/telescreen/entertainment/directional/west, -/obj/structure/disposalpipe/segment{ - dir = 6 +/obj/structure/cable, +/obj/machinery/light/directional/west, +/obj/structure/bookcase/random{ + pixel_y = -32; + density = 0 }, -/turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/bubbers/persistance/service/diner) +/obj/machinery/light_switch/directional/west, +/turf/open/floor/carpet/royalblack, +/area/ruin/space/has_grav/bubbers/persistance/service/lounge) +"VE" = ( +/obj/effect/turf_decal/skyrat_decals/syndicate/bottom/left, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/sec/armory) "VG" = ( /obj/structure/emergency_shield/cult/weak{ name = "Energy Shield" @@ -16010,31 +16061,24 @@ /turf/open/lava/smooth/lava_land_surface, /area/lavaland/surface/outdoors) "VK" = ( -/obj/machinery/vending/hydroseeds{ - pixel_x = -28; - can_astar_pass = 1; - density = 0; - all_products_free = 1 +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/storage/box/teargas{ + pixel_x = 3; + pixel_y = 6 }, -/obj/structure/flora/bush/flowers_pp/style_random, -/obj/effect/spawner/random/food_or_drink/seed_rare, -/obj/effect/spawner/random/food_or_drink/seed_rare, -/obj/effect/spawner/random/food_or_drink/seed_rare, -/obj/item/seeds/kudzu, -/obj/item/bee_smoker, -/obj/item/secateurs, -/obj/item/geneshears, -/obj/item/hatchet, -/obj/item/gun/energy/floragun, -/obj/item/plant_analyzer, -/obj/item/shovel/spade, -/obj/item/cultivator, -/obj/item/reagent_containers/cup/watering_can/advanced, -/obj/structure/closet/crate/secure/syndicate/arc{ - name = "botany supplies" +/obj/item/storage/box/handcuffs{ + pixel_y = 3 }, -/turf/open/floor/grass, -/area/ruin/space/has_grav/bubbers/persistance/service/hydro) +/obj/item/storage/box/flashbangs{ + pixel_x = -3 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/sec/armory) "VL" = ( /obj/effect/turf_decal/siding/dark, /turf/open/floor/iron/dark/small, @@ -16049,23 +16093,30 @@ /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "VQ" = ( -/obj/structure/railing{ - dir = 10 +/obj/effect/turf_decal/tile/bar/opposingcorners{ + dir = 8 + }, +/obj/effect/turf_decal/siding{ + dir = 1 }, -/obj/structure/lattice/catwalk/mining, -/turf/open/lava/smooth/lava_land_surface, -/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) -"VR" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/structure/cable, -/obj/structure/rack/gunrack, -/obj/structure/sign/poster/contraband/energy_swords/directional/west, -/obj/structure/disposalpipe/segment, -/obj/item/gun/microfusion/mcr01/syndie, -/obj/item/gun/microfusion/mcr01/syndie, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/sec/armory) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/duct, +/obj/structure/chair/sofa/left/maroon, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/cafeteria, +/area/ruin/space/has_grav/bubbers/persistance/service/diner) +"VR" = ( +/obj/machinery/vending/wardrobe/chap_wardrobe/unholy{ + all_products_free = 1; + pixel_x = -28; + density = 0 + }, +/turf/open/floor/carpet/donk, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/morale) "VS" = ( /obj/structure/fans/tiny, /turf/open/floor/plating/reinforced, @@ -16084,14 +16135,6 @@ /obj/structure/cable, /turf/open/floor/carpet/royalblue, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/medical) -"VV" = ( -/obj/machinery/airalarm/directional/west, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/turf/open/floor/iron/colony/bolts, -/area/ruin/space/has_grav/bubbers/persistance/service) "VW" = ( /obj/machinery/duct, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -16119,56 +16162,92 @@ /turf/open/floor/wood/parquet, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "Wa" = ( -/turf/closed/wall/r_wall/syndicate/nodiagonal, -/area/ruin/space/has_grav/bubbers/persistance/service/salon) +/obj/effect/spawner/random/exotic/syndie, +/obj/item/storage/wallet/random, +/obj/item/clothing/under/syndicate/skyrat/baseball, +/obj/effect/spawner/random/exotic/syndie, +/obj/effect/spawner/random/exotic/syndie, +/obj/effect/spawner/random/entertainment/plushie, +/obj/effect/spawner/random/entertainment/plushie_delux, +/obj/structure/closet/generic/wall{ + pixel_y = -32 + }, +/obj/item/storage/box/syndimaid, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/turf/open/floor/carpet/purple, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/janitor) "Wb" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/wood/large, +/area/ruin/space/has_grav/bubbers/persistance/service/sauna) +"We" = ( +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, +/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/siding/dark{ + dir = 5 + }, +/turf/open/floor/iron/dark/small, +/area/ruin/space/has_grav/bubbers/persistance/sec/prison) +"Wf" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service) +"Wg" = ( /obj/structure/emergency_shield/cult/weak{ name = "Energy Shield" }, /obj/structure/emergency_shield/cult/weak{ name = "Energy Shield" }, -/obj/structure/lattice/catwalk/mining, /obj/machinery/porta_turret/syndicate{ dir = 8; - pixel_x = 32 + pixel_x = 32; + faction = list("Syndicate","neutral") }, /obj/machinery/camera/autoname/directional/east{ network = list("persistence_ext"); name = "persistence exterior east" }, +/obj/structure/lattice/catwalk/mining, /turf/open/lava/smooth/lava_land_surface, /area/ruin/space/has_grav/bubbers/dauntless/command/vault) -"We" = ( -/obj/machinery/duct, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +"Wh" = ( +/obj/effect/turf_decal/stripes/red/corner{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/cable, -/obj/machinery/firealarm/directional/north, -/obj/effect/turf_decal/siding/dark{ - dir = 5 +/turf/open/floor/pod/dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) +"Wi" = ( +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, -/turf/open/floor/iron/dark/small, -/area/ruin/space/has_grav/bubbers/persistance/sec/prison) -"Wf" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 5 +/turf/open/floor/iron/colony/bolts, +/area/ruin/space/has_grav/bubbers/persistance/service) +"Wj" = ( +/obj/structure/sign/poster/official/pda_ad/directional/west, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service) +"Wk" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 10 }, -/turf/open/floor/wood, -/area/ruin/space/has_grav/bubbers/persistance/service/lockers) -"Wi" = ( -/obj/structure/chair/sofa/bench/right, -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/wood/large, -/area/ruin/space/has_grav/bubbers/persistance/service/sauna) -"Wj" = ( -/obj/machinery/airalarm/directional/north, -/obj/structure/cable, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/obj/machinery/power/smes/full, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/turf/open/floor/iron/white/diagonal, +/area/ruin/space/has_grav/bubbers/persistance/med) "Wm" = ( /obj/structure/closet/secure_closet/ds2atmos{ anchorable = 0; @@ -16193,16 +16272,18 @@ /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/engineering/mining) "Wq" = ( +/obj/machinery/duct, /obj/structure/cable, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/structure/disposaloutlet{ - dir = 4 +/obj/structure/disposalpipe/junction/yjunction{ + dir = 1 }, -/obj/structure/plasticflaps/opaque, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/cargo) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/turf/open/floor/wood/large, +/area/ruin/space/has_grav/bubbers/persistance/service/diner) "Wr" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -16217,17 +16298,15 @@ /turf/open/floor/iron/white/diagonal, /area/ruin/space/has_grav/bubbers/persistance/med) "Ws" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/heavy, -/obj/machinery/door/airlock/wood{ - id_tag = "syndishipservicedorm" +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ + dir = 8 }, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, -/obj/effect/mapping_helpers/airlock/cutaiwire, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/hydro) +/obj/effect/turf_decal/vg_decals/atmos/oxygen, +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/structure/window/reinforced/plasma/spawner/directional/south, +/obj/structure/window/reinforced/plasma/spawner/directional/north, +/turf/open/floor/engine/o2, +/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) "Wt" = ( /obj/structure/table/wood, /obj/effect/turf_decal/stripes/line, @@ -16243,14 +16322,14 @@ /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) "Ww" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/effect/turf_decal/siding/wood{ - dir = 1 +/obj/machinery/door/airlock/highsecurity{ + id_tag = "syndishipbrigoff" }, -/turf/open/floor/carpet/green, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/chef) +/obj/effect/mapping_helpers/airlock/access/all/syndicate/leader, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/structure/disposalpipe/segment, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/brig) "Wx" = ( /obj/item/reagent_containers/cup/maunamug, /obj/structure/table/wood/fancy/black, @@ -16258,43 +16337,37 @@ /turf/open/floor/wood/parquet, /area/ruin/space/has_grav/bubbers/persistance/command/liason) "Wy" = ( -/obj/machinery/button/door/directional/west{ - id = "syndimining"; - name = "Blast Doors"; - req_access = list("syndicate"); - pixel_x = 0; - pixel_y = -24 - }, -/obj/effect/turf_decal/stripes/red/line{ - dir = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 10 }, -/obj/effect/turf_decal/stripes/red/line{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/turf/open/floor/engine/hull{ - initial_gas_mix = "LAVALAND_ATMOS" - }, -/area/ruin/space/has_grav/bubbers/persistance/evac) +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service) "Wz" = ( /obj/machinery/duct, /obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/bar/opposingcorners{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/effect/turf_decal/siding{ - dir = 10 +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/airlock/hydroponics/glass{ + name = "hydroponics" }, -/turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/bubbers/persistance/service/diner) +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "WA" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/dish_drive/bullet, -/obj/structure/sign/poster/contraband/syndicate_pistol/directional/west, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/sec/armory) +/obj/machinery/airalarm/directional/north, +/obj/structure/cable, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/machinery/power/smes/full, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "WB" = ( /obj/machinery/button/ignition/incinerator{ id = "syndiship_igniter"; @@ -16322,49 +16395,47 @@ /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "WE" = ( -/obj/machinery/plumbing/synthesizer/water_synth, -/obj/effect/turf_decal/siding/dark{ - dir = 9 - }, -/turf/open/floor/noslip, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) -"WF" = ( -/obj/machinery/computer/apc_control/away{ - dir = 1 - }, -/turf/open/floor/mineral/plastitanium/red{ - icon_state = "plastitanium" - }, -/area/ruin/space/has_grav/bubbers/persistance/command/bridge) -"WG" = ( /obj/machinery/duct, /obj/structure/cable, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/button/door/directional/north{ - name = "Armory Shutters"; - id = "armory_s2"; - pixel_y = 0; - req_access = list("syndicate_leader"); - pixel_x = -24 - }, +/obj/structure/sign/poster/contraband/waffle_corp_rifles/directional/west, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) +"WF" = ( +/obj/effect/turf_decal/siding/wood, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/carpet/red, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/brig) +"WG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/door/firedoor/heavy, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service) "WH" = ( /obj/effect/turf_decal/siding/dark, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "WI" = ( -/obj/machinery/light_switch/directional/west, -/obj/machinery/computer/mecha{ - dir = 4 +/obj/machinery/duct, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/turf_decal/siding/dark{ + dir = 10 }, -/turf/open/floor/mineral/plastitanium/red{ - icon_state = "plastitanium" +/obj/structure/disposalpipe/junction{ + dir = 8 }, -/area/ruin/space/has_grav/bubbers/persistance/command/bridge) +/turf/open/floor/iron/white/small, +/area/ruin/space/has_grav/bubbers/persistance/service/lockers) "WJ" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 4 @@ -16372,19 +16443,22 @@ /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/persistance/service) "WK" = ( -/obj/machinery/duct, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/sign/poster/contraband/waffle_corp_rifles/directional/west, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4; + name = "Medbay" + }, +/obj/machinery/door/firedoor/heavy, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/effect/mapping_helpers/airlock/cutaiwire, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/area/ruin/space/has_grav/bubbers/persistance/med) "WL" = ( -/obj/structure/plasticflaps, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/engineering) +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/punching_bag, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service/gym) "WN" = ( /obj/effect/turf_decal/tile/bar/opposingcorners{ dir = 8 @@ -16402,40 +16476,23 @@ /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "WO" = ( -/obj/machinery/duct, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/wood/large, -/area/ruin/space/has_grav/bubbers/persistance/service/sauna) +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/kirbyplants/organic/plant3, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service) "WP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/structure/cable, /turf/open/floor/carpet/green, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/chef) "WR" = ( -/obj/structure/safe/abovetilefloor, -/obj/item/sign/flag/syndicate{ - pixel_x = -3; - pixel_y = 6 - }, -/obj/structure/disposalpipe/segment, -/obj/item/clothing/gloves/boxing/evil, -/turf/open/floor/carpet/red, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/brig) -"WS" = ( -/obj/structure/window/reinforced/survival_pod/spawner/directional/south, -/obj/structure/window/reinforced/survival_pod/spawner/directional/west, -/obj/effect/turf_decal/vg_decals/numbers/four, -/obj/machinery/camera/autoname/directional/west{ - network = list("persistence_xeno"); - pixel_y = -23 - }, -/turf/open/floor/engine, -/area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) +/obj/machinery/light/directional/west, +/obj/structure/table, +/obj/machinery/xenoarch/researcher, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/engineering/mining) "WU" = ( /obj/effect/turf_decal/siding/thinplating/dark, /obj/item/construction/plumbing, @@ -16444,41 +16501,52 @@ /turf/open/floor/iron/terracotta/herringbone, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "WV" = ( -/obj/machinery/light/directional/east, -/obj/effect/turf_decal/stripes/end{ +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/hairbrush/tactical, +/obj/item/scissors, +/obj/machinery/duct, +/obj/effect/turf_decal/siding/thinplating/dark, +/turf/open/floor/iron/kitchen/herringbone, +/area/ruin/space/has_grav/bubbers/persistance/service/salon) +"WW" = ( +/obj/machinery/button/door/directional/west{ + id = "syndimining"; + name = "Blast Doors"; + req_access = list("syndicate"); + pixel_x = 0; + pixel_y = -24 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/red/line{ dir = 8 }, -/obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) -"WW" = ( -/obj/structure/sink/kitchen/directional/west{ - pixel_x = 18 +/turf/open/floor/engine/hull{ + initial_gas_mix = "LAVALAND_ATMOS" }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, -/obj/effect/mapping_helpers/apc/syndicate_access, -/obj/effect/mapping_helpers/apc/cut_AI_wire, -/obj/effect/mapping_helpers/apc/full_charge, -/obj/structure/mop_bucket/janitorialcart, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/service/janitorial) +/area/ruin/space/has_grav/bubbers/persistance/evac) "WX" = ( -/obj/effect/turf_decal/vg_decals/atmos/nitrogen, -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ - dir = 8 +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/siding/dark_green{ + dir = 5 }, -/obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/structure/window/reinforced/plasma/spawner/directional/south, -/turf/open/floor/engine/n2, -/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) +/obj/machinery/light_switch/directional/east, +/obj/structure/sign/warning/biohazard/directional/north, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/bubbers/persistance/med/viro) "WY" = ( /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/structure/disposaloutlet{ + dir = 4 + }, +/obj/structure/plasticflaps/opaque, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/cargo) "WZ" = ( /obj/machinery/duct, /obj/machinery/airalarm/directional/north, @@ -16489,13 +16557,6 @@ /obj/machinery/washing_machine, /turf/open/floor/iron/white/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) -"Xa" = ( -/obj/structure/fans/tiny/forcefield, -/obj/machinery/door/poddoor{ - id = "syndimining" - }, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/evac) "Xb" = ( /obj/effect/turf_decal/siding/dark{ dir = 4 @@ -16522,21 +16583,19 @@ /turf/open/floor/mineral/titanium/white, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "Xh" = ( -/obj/structure/window/reinforced/survival_pod/spawner/directional/east, -/obj/structure/window/reinforced/survival_pod/spawner/directional/north, -/obj/machinery/light/directional/north, -/turf/open/floor/engine, -/area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) +/obj/effect/turf_decal/skyrat_decals/syndicate/bottom/middle, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/sec/armory) "Xi" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/structure/safe/abovetilefloor, -/obj/item/sign/flag/syndicate{ - pixel_x = -3; - pixel_y = 6 +/obj/structure/bed/double/pod{ + dir = 1 }, -/turf/open/floor/carpet/stellar, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/cargo) +/obj/item/bedsheet/medical/double{ + dir = 4 + }, +/obj/machinery/light_switch/directional/west, +/turf/open/floor/wood/large, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/medical) "Xj" = ( /obj/structure/cable, /obj/machinery/airalarm/directional/south, @@ -16581,14 +16640,14 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/engineering/mining) "Xq" = ( +/obj/structure/table/reinforced/plastitaniumglass, /obj/effect/turf_decal/stripes/line, -/obj/structure/disposalpipe/segment, -/obj/machinery/light/directional/east, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/window/survival_pod/left/directional/south{ + req_access = list("syndicate") }, /turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/sec/holding) +/area/ruin/space/has_grav/bubbers/persistance/service) "Xt" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -16596,9 +16655,15 @@ /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "Xu" = ( -/obj/machinery/smartfridge/food, -/turf/open/floor/iron/kitchen/diagonal, -/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) +/obj/effect/turf_decal/skyrat_decals/syndicate/bottom/left, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/command/bridge) "Xv" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -16613,42 +16678,33 @@ /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/rnd) "Xx" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/machinery/disposal/bin, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service/gym) -"Xy" = ( +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/structure/cable, +/obj/machinery/duct, +/obj/structure/disposalpipe/segment, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) +"Xz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/fireplace, -/obj/effect/turf_decal/siding/dark{ - dir = 8; - icon_state = "siding_plain_end" - }, -/turf/open/floor/iron/terracotta/small, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/chef) -"Xz" = ( -/mob/living/basic/mining_drone/interdyne{ - name = "Molly" +/obj/effect/turf_decal/siding/wood{ + dir = 1 }, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/engineering/mining) +/turf/open/floor/carpet/purple, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/janitor) "XA" = ( /obj/structure/cable, -/obj/structure/disposalpipe/junction/yjunction{ +/obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/firealarm/directional/west, +/obj/machinery/door/firedoor/heavy, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/area/ruin/space/has_grav/bubbers/persistance/cargo) "XB" = ( /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, /obj/structure/cable, @@ -16658,32 +16714,28 @@ /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/cargo) "XC" = ( +/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/cable, -/obj/machinery/door/airlock/service{ - id_tag = "syndishipjanidorm"; - name = "Janitorial Dorm" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, -/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/structure/sign/departments/exodrone/directional/north, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/janitor) +/area/ruin/space/has_grav/bubbers/persistance/service) "XF" = ( /obj/effect/turf_decal/siding/dark, /turf/open/floor/mineral/titanium/tiled/white, /area/ruin/space/has_grav/bubbers/persistance/med/treatment) "XG" = ( -/obj/machinery/mass_driver/trash{ - dir = 1; - id = "synditrashgun" - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/cargo) +/turf/open/floor/grass, +/area/ruin/space/has_grav/bubbers/persistance/sec/prison) "XI" = ( -/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/service) "XJ" = ( /obj/structure/cable, /obj/machinery/door/firedoor/heavy, @@ -16691,51 +16743,40 @@ /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "XK" = ( -/obj/structure/lattice/catwalk/mining, -/obj/structure/railing{ - dir = 9 - }, -/obj/machinery/atmospherics/components/unary/passive_vent/layer4{ - dir = 4 - }, -/turf/open/lava/smooth/lava_land_surface, -/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) -"XL" = ( /obj/structure/cable, /obj/machinery/duct, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, +/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/siding/dark{ - dir = 9 - }, -/turf/open/floor/wood/large, -/area/ruin/space/has_grav/bubbers/persistance/service/diner) -"XM" = ( -/obj/effect/turf_decal/stripes/line, -/obj/item/kirbyplants/organic/plant15, +/obj/structure/fake_stairs/directional/north, +/obj/machinery/firealarm/directional/west, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service) +"XL" = ( +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/machinery/biogenerator, +/obj/machinery/light/directional/west, +/obj/machinery/camera/autoname/directional/west{ + name = "Persistence Exterior West"; + network = list("persistence_ext") + }, +/turf/open/floor/grass, +/area/ruin/space/has_grav/bubbers/persistance/sec/prison) "XO" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "XP" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 6 +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) +"XQ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/obj/machinery/duct, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/door/window/survival_pod/left/directional/east, -/turf/open/floor/iron/freezer, -/area/ruin/space/has_grav/bubbers/persistance/command/admiral) -"XQ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/bubbers/persistance/sci/robotics) +/obj/structure/cable, +/turf/open/floor/iron/colony/bolts, +/area/ruin/space/has_grav/bubbers/persistance/evac) "XR" = ( /obj/structure/window/reinforced/survival_pod/spawner/directional/west, /obj/effect/turf_decal/tile/dark_red/half{ @@ -16743,57 +16784,32 @@ }, /turf/open/floor/engine, /area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) -"XS" = ( -/obj/structure/rack/shelf, -/obj/item/melee/baton/telescopic{ - pixel_y = 10; - pixel_x = 3 - }, -/obj/item/melee/baton/telescopic{ - pixel_x = 9; - pixel_y = 10 - }, -/obj/item/melee/baton/telescopic{ - pixel_x = -3; - pixel_y = 10 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/item/melee/energy/sword/saber{ - pixel_x = 3 - }, -/obj/item/melee/energy/sword/saber{ - pixel_x = 8 - }, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/sec/armory) "XU" = ( -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/structure/lattice/catwalk/mining, -/obj/machinery/conveyor{ - dir = 8; - id = "QMLoad" +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/pod/dark, -/area/lavaland/surface/outdoors) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/bubbers/persistance/sci/robotics) "XV" = ( -/obj/structure/dresser, -/obj/item/flashlight/lamp/green{ - pixel_x = 5; - pixel_y = 15 +/obj/effect/turf_decal/tile/bar/opposingcorners{ + dir = 8 }, -/obj/item/sign/flag/syndicate{ - pixel_x = -7; - pixel_y = 13 +/obj/effect/turf_decal/siding{ + dir = 1 }, -/obj/machinery/light_switch/directional/west, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/maa) +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/duct, +/obj/machinery/firealarm/directional/north, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/cafeteria, +/area/ruin/space/has_grav/bubbers/persistance/service/diner) "XW" = ( /obj/effect/turf_decal/siding/dark{ dir = 4 @@ -16801,12 +16817,6 @@ /obj/structure/hedge, /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/diner) -"XX" = ( -/obj/structure/chair/sofa/bench/left, -/obj/structure/cable, -/obj/machinery/light/directional/north, -/turf/open/floor/wood/large, -/area/ruin/space/has_grav/bubbers/persistance/service/sauna) "XY" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on{ dir = 4; @@ -16815,40 +16825,21 @@ /turf/open/floor/engine, /area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) "XZ" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/coffeemaker, -/obj/structure/cable, -/obj/machinery/duct, +/obj/machinery/syndicatebomb/empty, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/circuit/red/anim, +/area/ruin/space/has_grav/bubbers/persistance/command/vault) +"Ya" = ( /obj/machinery/light/directional/west, -/obj/machinery/vending/boozeomat{ - pixel_y = -32; - all_products_free = 1 - }, -/obj/machinery/button/door/directional/north{ - id = "dauntbar_s"; - name = "Bar Shutters"; - pixel_x = -24; - pixel_y = 8 - }, -/obj/machinery/button/polarizer{ - id = "dauntbar_w"; - name = "Bar Windows"; - pixel_y = -8; - pixel_x = -24 - }, -/obj/machinery/firealarm/directional/west, -/obj/effect/turf_decal/siding/dark{ - dir = 10 +/obj/effect/turf_decal/siding/wood/end{ + dir = 1 }, -/turf/open/floor/wood/large, -/area/ruin/space/has_grav/bubbers/persistance/service/diner) -"Ya" = ( -/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, -/obj/structure/cable, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/machinery/shower/directional/south, +/obj/structure/drain/big, +/turf/open/floor/iron/freezer, +/area/ruin/space/has_grav/bubbers/persistance/command/admiral) "Yc" = ( /obj/effect/turf_decal/stripes/red/corner{ dir = 4 @@ -16897,6 +16888,18 @@ }, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service) +"Yk" = ( +/obj/structure/sink/kitchen/directional/west{ + pixel_x = 18 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/effect/mapping_helpers/apc/syndicate_access, +/obj/effect/mapping_helpers/apc/cut_AI_wire, +/obj/effect/mapping_helpers/apc/full_charge, +/obj/structure/mop_bucket/janitorialcart, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/service/janitorial) "Yl" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/effect/mapping_helpers/apc/syndicate_access, @@ -16936,39 +16939,39 @@ /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "Yq" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 10 +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/sec/armory) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service) "Yr" = ( /obj/effect/landmark/navigate_destination, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/med) "Yu" = ( -/obj/structure/disposalpipe/trunk{ - dir = 4 +/obj/structure/sign/flag/syndicate/directional/south, +/obj/effect/turf_decal/siding/thinplating/dark, +/obj/effect/mapping_helpers/broken_floor, +/obj/item/bouquet, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/service) +"Yv" = ( +/obj/structure/table/wood, +/obj/structure/bedsheetbin/basket, +/obj/structure/sign/poster/contraband/blasto_detergent/directional/west, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 }, -/obj/machinery/disposal/bin, /obj/machinery/light/directional/west, -/obj/structure/extinguisher_cabinet/directional/west, -/obj/structure/cable, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/sci/ordnance) -"Yv" = ( -/obj/machinery/airalarm/directional/west, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/structure/cable, -/obj/machinery/duct, -/obj/structure/disposalpipe/segment, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/turf/open/floor/iron/white/small, +/area/ruin/space/has_grav/bubbers/persistance/service/lockers) "Yw" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -16978,16 +16981,21 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/sci/robotics) "Yx" = ( -/obj/machinery/seed_extractor, -/obj/machinery/light/directional/west, -/turf/open/floor/grass, -/area/ruin/space/has_grav/bubbers/persistance/sec/prison) +/obj/machinery/photocopier/gratis, +/obj/machinery/light/directional/north, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/bubbers/persistance/command/liason) "Yy" = ( -/obj/structure/window/reinforced/survival_pod/spawner/directional/south, -/obj/structure/window/reinforced/survival_pod/spawner/directional/east, -/obj/machinery/light/directional/south, -/turf/open/floor/engine, -/area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/effect/turf_decal/siding/dark{ + dir = 1; + icon_state = "siding_plain_end" + }, +/turf/open/floor/iron/terracotta/diagonal, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/morale) "Yz" = ( /obj/machinery/igniter{ id = "syndiship_igniter" @@ -17002,31 +17010,19 @@ /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/cargo) "YD" = ( -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/structure/sign/warning/chem_diamond/directional/west, -/obj/structure/lattice/catwalk/mining, -/obj/machinery/conveyor{ - dir = 8; - id = "QMLoad" - }, -/turf/open/floor/pod/dark, -/area/lavaland/surface/outdoors) +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/sign/warning/explosives/alt/directional/west, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "YE" = ( -/obj/machinery/ntnet_relay, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/light/directional/south, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) +/obj/machinery/digital_clock/directional/west, +/obj/effect/turf_decal/siding/dark/end, +/obj/structure/closet/firecloset/full, +/turf/open/floor/noslip, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) "YF" = ( /obj/structure/chair/plastic{ dir = 8 @@ -17034,39 +17030,50 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service) "YG" = ( -/obj/machinery/atmospherics/components/binary/volume_pump/on/layer4{ - dir = 8 +/obj/effect/turf_decal/stripes, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "rad_shutters" }, -/turf/closed/wall/r_wall/syndicate/nodiagonal, -/area/ruin/space/has_grav/bubbers/persistance/engineering) +/obj/machinery/door/firedoor/heavy, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/door/airlock/atmos/glass{ + name = "Turbine Room Airlock" + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "YK" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/elevatorshaft, /area/ruin/space/has_grav/bubbers/persistance/cargo) "YL" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/apc/syndicate_access, +/obj/effect/mapping_helpers/apc/cut_AI_wire, +/obj/effect/mapping_helpers/apc/full_charge, +/obj/structure/frame/machine/secured, /turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) +/area/ruin/space/has_grav/bubbers/persistance/command/vault) "YM" = ( -/obj/machinery/duct, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/storage/barricade, +/obj/item/storage/barricade, +/obj/item/storage/box/handcuffs, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/heavy, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, -/obj/effect/mapping_helpers/airlock/cutaiwire, -/obj/structure/cable, -/obj/machinery/door/airlock/silver/glass{ - name = "Gym" - }, -/turf/open/floor/iron/stairs{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/porta_turret/syndicate{ + dir = 8; + pixel_y = 32; + faction = list("Syndicate","neutral") }, -/area/ruin/space/has_grav/bubbers/persistance/service/gym) +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/sec/armory) "YN" = ( /obj/item/mail/junkmail, /obj/item/mail/junkmail, @@ -17115,20 +17122,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/wood, /area/ruin/space/has_grav/bubbers/persistance/service/gym) -"YQ" = ( -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/structure/emergency_shield/cult/weak{ - name = "Energy Shield" - }, -/obj/machinery/camera/autoname/directional/east{ - network = list("persistence_ext"); - name = "persistence exterior east" - }, -/obj/structure/lattice/catwalk/mining, -/turf/open/lava/smooth/lava_land_surface, -/area/ruin/space/has_grav/bubbers/dauntless/command/vault) "YR" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) @@ -17146,11 +17139,23 @@ /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "YT" = ( +/obj/effect/turf_decal/siding/dark/corner{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/structure/cable, /obj/structure/disposalpipe/segment{ - dir = 6 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/airlock/science{ + name = "Ordnance" }, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/sci/ordnance) +/area/ruin/space/has_grav/bubbers/persistance/sci/robotics) "YV" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 6 @@ -17203,29 +17208,25 @@ /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "Zc" = ( -/obj/machinery/porta_turret/syndicate{ - dir = 8; - pixel_y = -32; - pixel_x = 32; - faction = list("Syndicate","neutral") +/obj/effect/turf_decal/siding/wood{ + dir = 8 }, -/obj/structure/lattice/catwalk/mining, -/turf/open/lava/smooth/lava_land_surface, -/area/ruin/space/has_grav/bubbers/dauntless/command/vault) -"Zd" = ( -/obj/machinery/computer/rdservercontrol{ +/obj/structure/chair/sofa/left/maroon{ dir = 4 }, -/obj/machinery/button/door{ - id = "syndibridge_w"; - name = "Bridge Window Shutters"; - req_access = list("syndicate_leader"); - pixel_x = -24 - }, -/turf/open/floor/mineral/plastitanium/red{ - icon_state = "plastitanium" +/turf/open/floor/carpet/green, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/chef) +"Zd" = ( +/obj/machinery/duct, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/turf_decal/siding/dark{ + dir = 8 }, -/area/ruin/space/has_grav/bubbers/persistance/command/bridge) +/turf/open/floor/iron/white/small, +/area/ruin/space/has_grav/bubbers/persistance/service/lockers) "Ze" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -17262,23 +17263,19 @@ /obj/structure/window/reinforced/survival_pod/spawner/directional/north, /turf/open/floor/engine, /area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) -"Zm" = ( +"Zn" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, /obj/structure/cable, -/obj/structure/disposalpipe/segment, +/obj/structure/sign/poster/contraband/kudzu/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/heavy, -/obj/machinery/door/airlock/highsecurity{ - name = "Armory Desk" +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/leader, -/obj/effect/mapping_helpers/airlock/cutaiwire, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/sec/armory) -"Zn" = ( -/obj/item/reagent_containers/cup/beaker/large, -/turf/open/floor/grass, -/area/ruin/space/has_grav/bubbers/persistance/sec/prison) +/turf/open/floor/iron/terracotta/herringbone, +/area/ruin/space/has_grav/bubbers/persistance/service/hydro) "Zo" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) @@ -17294,30 +17291,32 @@ /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "Zr" = ( -/obj/machinery/duct, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/cable, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/recharger, /obj/effect/turf_decal/stripes/line, +/obj/machinery/door/firedoor/heavy, +/obj/machinery/light/directional/west, +/obj/machinery/door/window/survival_pod/left/directional/south{ + req_access = list("syndicate") + }, /turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/sec/holding) +/area/ruin/space/has_grav/bubbers/persistance/service) "Zs" = ( -/obj/machinery/airalarm/directional/north, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/obj/effect/turf_decal/siding/wood{ +/obj/effect/turf_decal/trimline/purple/filled/line{ dir = 9 }, -/obj/machinery/suit_storage_unit/industrial/bloodredsuit, -/turf/open/floor/carpet/purple, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/science) -"Zt" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 9 +/obj/machinery/light/directional/west, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/storage/toolbox/syndicate{ + pixel_y = 5 }, -/obj/machinery/incident_display/delam/directional/north, -/obj/machinery/newscaster/directional/west, -/turf/open/floor/iron/terracotta/small, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/engineering) +/obj/machinery/vending/cytopro{ + pixel_y = 28; + density = 0; + all_products_free = 1 + }, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/bubbers/persistance/sci/rnd) "Zu" = ( /obj/structure/table/reinforced/plastitaniumglass, /turf/open/floor/iron/kitchen/diagonal, @@ -17337,13 +17336,6 @@ }, /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) -"Zz" = ( -/obj/effect/turf_decal/stripes/red/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/pod/dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering) "ZA" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/persistance/service/lockers) @@ -17354,381 +17346,170 @@ /turf/open/floor/iron/terracotta/small, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/engineering) "ZC" = ( -/obj/structure/flora/bush/sparsegrass/style_random, -/turf/open/floor/grass, -/area/ruin/space/has_grav/bubbers/persistance/sec/prison) -"ZD" = ( -/obj/machinery/duct, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/effect/turf_decal/siding/dark, -/turf/open/floor/iron/white/small, -/area/ruin/space/has_grav/bubbers/persistance/service/lockers) -"ZE" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/storage/toolbox/syndicate{ - pixel_y = 5 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/evac) -"ZF" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/airalarm/directional/west, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) -"ZI" = ( -/obj/machinery/biogenerator/medstation/directional/north, -/obj/machinery/light_switch/directional/west, -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/healthanalyzer/advanced, -/obj/machinery/light/directional/west, -/turf/open/floor/iron/white, -/area/ruin/space/has_grav/bubbers/persistance/med/treatment) -"ZK" = ( -/turf/closed/wall/r_wall/syndicate/nodiagonal, -/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) -"ZL" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/effect/turf_decal/siding/wood/corner, -/obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/carpet/royalblue, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/medical) -"ZN" = ( -/obj/structure/chair/sofa/corp, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/turf/open/floor/carpet/royalblack, -/area/ruin/space/has_grav/bubbers/persistance/sec/prison/rec) -"ZP" = ( -/obj/machinery/door/window/survival_pod/left/directional/east{ - req_access = list("syndicate") - }, -/obj/structure/flora/bush/flowers_br/style_random, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/turf/open/misc/grass/jungle/station, -/area/ruin/space/has_grav/bubbers/persistance/med) -"ZQ" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/dark_red/filled/line{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/carpet/royalblack, -/area/ruin/space/has_grav/bubbers/persistance/service/lounge) -"ZR" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/effect/turf_decal/stripes/red/line{ - dir = 1 - }, +/obj/structure/plasticflaps, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/turf/open/floor/pod/dark, +/turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/engineering) -"ZS" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/heavy, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/cargo) -"ZT" = ( -/obj/machinery/duct, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/heavy, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) -"ZU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/sec/prison) -"ZV" = ( -/obj/effect/turf_decal/siding/wood, -/obj/structure/safe, -/obj/item/bombcore/syndicate/large, -/turf/open/floor/carpet/red, -/area/ruin/space/has_grav/bubbers/persistance/command/admiral) -"ZW" = ( -/obj/effect/turf_decal/tile/bar/opposingcorners{ - dir = 8 - }, -/turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/bubbers/persistance/service/diner) -"ZX" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 5 - }, -/obj/machinery/limbgrower/fullupgrade, -/obj/machinery/vending/wallmed/directional/east, -/turf/open/floor/mineral/titanium/tiled/white, -/area/ruin/space/has_grav/bubbers/persistance/med/treatment) -"ZY" = ( -/obj/effect/turf_decal/stripes, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, -/obj/effect/mapping_helpers/airlock/cutaiwire, -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "rad_shutters" - }, -/obj/machinery/door/firedoor/heavy, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/door/airlock/atmos/glass{ - name = "Turbine Room Airlock" +"ZD" = ( +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) -"ZZ" = ( -/turf/closed/wall/r_wall/syndicate/cruiser, -/area/lavaland/surface/outdoors) - -(1,1,1) = {" -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -FW -"} -(2,1,1) = {" -FW -FW -FW -FW -FW -FW -FW -FW -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -FW -FW -FW -FW -FW -FW -FW -FW -FW -"} -(3,1,1) = {" -FW -FW -FW -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -gq -FW -gq -gq -FW -FW -FW -FW -"} -(4,1,1) = {" -FW -FW -gq +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" + }, +/obj/machinery/camera/autoname/directional/east{ + network = list("persistence_ext"); + name = "persistence exterior east" + }, +/obj/machinery/conveyor{ + dir = 8; + id = "QMLoad" + }, +/obj/structure/lattice/catwalk/mining, +/turf/open/floor/pod/dark, +/area/ruin/space/has_grav/bubbers/dauntless/command/vault) +"ZE" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/storage/toolbox/syndicate{ + pixel_y = 5 + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/evac) +"ZF" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 9 + }, +/obj/machinery/digital_clock/directional/north, +/obj/machinery/computer/operating, +/turf/open/floor/mineral/titanium/tiled/white, +/area/ruin/space/has_grav/bubbers/persistance/med/treatment) +"ZG" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) +"ZH" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/button/door/directional/west{ + pixel_y = -8; + specialfunctions = 4; + name = "Dorm Bolt Switch"; + id = "syndishipservicedorm"; + req_access = list("syndicate"); + normaldoorcontrol = 1 + }, +/turf/open/floor/iron/terracotta/herringbone, +/area/ruin/space/has_grav/bubbers/persistance/service/hydro) +"ZI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/bubbers/persistance/med/viro) +"ZK" = ( +/turf/closed/wall/r_wall/syndicate/nodiagonal, +/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) +"ZL" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/effect/turf_decal/siding/wood/corner, +/obj/effect/turf_decal/siding/wood, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/carpet/royalblue, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/medical) +"ZN" = ( +/obj/structure/chair/sofa/corp, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/carpet/royalblack, +/area/ruin/space/has_grav/bubbers/persistance/sec/prison/rec) +"ZP" = ( +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" + }, +/obj/structure/emergency_shield/cult/weak{ + name = "Energy Shield" + }, +/obj/structure/sign/warning/biohazard/directional/west, +/obj/structure/lattice/catwalk/mining, +/turf/open/floor/engine/hull{ + initial_gas_mix = "LAVALAND_ATMOS" + }, +/area/lavaland/surface/outdoors) +"ZQ" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/dark_red/filled/line{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/carpet/royalblack, +/area/ruin/space/has_grav/bubbers/persistance/service/lounge) +"ZR" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/turf/open/floor/pod/dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) +"ZT" = ( +/obj/machinery/duct, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/door/firedoor/heavy, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) +"ZU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/sec/prison) +"ZV" = ( +/obj/effect/turf_decal/siding/wood, +/obj/structure/safe, +/obj/item/bombcore/syndicate/large, +/turf/open/floor/carpet/red, +/area/ruin/space/has_grav/bubbers/persistance/command/admiral) +"ZW" = ( +/obj/effect/turf_decal/tile/bar/opposingcorners{ + dir = 8 + }, +/turf/open/floor/iron/cafeteria, +/area/ruin/space/has_grav/bubbers/persistance/service/diner) +"ZX" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 5 + }, +/obj/machinery/limbgrower/fullupgrade, +/obj/machinery/vending/wallmed/directional/east, +/turf/open/floor/mineral/titanium/tiled/white, +/area/ruin/space/has_grav/bubbers/persistance/med/treatment) +"ZZ" = ( +/turf/closed/wall/r_wall/syndicate/cruiser, +/area/lavaland/surface/outdoors) + +(1,1,1) = {" gq gq gq @@ -17756,26 +17537,26 @@ gq gq gq gq -qh +FQ VG VG VG VG VG -Pb +kP gq gq gq gq VG -Wb +pl VG VG VG VG VG VG -qh +FQ qg gq gq @@ -17793,14 +17574,11 @@ gq gq gq gq -FW -FW +gq +gq FW "} -(5,1,1) = {" -FW -FW -gq +(2,1,1) = {" gq gq gq @@ -17810,30 +17588,30 @@ gq qg CL CL -qC -qC -qC +am +am +am CL CL -yf +Wg VG VG -YQ -gg +ze +uM gq gq gq -PC -Ll +CF +ZD hY ki hY ZZ dl -gw -gw -gw -gw +Mb +Mb +Mb +Mb dl hY hY @@ -17842,10 +17620,10 @@ hY hY Vm Vm -lA -lA -lA -lA +OB +OB +OB +OB Vm Vm AQ @@ -17855,7 +17633,7 @@ hY xe hY hY -qh +FQ gq oI gq @@ -17865,27 +17643,24 @@ gq gq gq gq -FW +gq FW FW "} -(6,1,1) = {" -FW -gq -gq +(3,1,1) = {" gq gq -Zc -YQ +tn +ze VG VG VG Zo -Yx -SJ -IR -aF -le +mL +cR +Pb +ES +XL Zo CL CL @@ -17902,10 +17677,10 @@ DY DY DY dl -gJ -gS -bJ -lV +Rt +Fd +fG +rq dl SZ SZ @@ -17913,16 +17688,16 @@ SZ SZ SZ SZ -QH -BO -ej -Dg -MH -bS -HL +Jt +Gi +Ot +ti +Nf +jS +be yZ -XK -VQ +Pk +sT yZ AQ AQ @@ -17930,21 +17705,18 @@ AQ AQ gq an -Ls -Ls -Ls -Ls -YQ -Tv +BJ +BJ +BJ +BJ +ze +qs gq gq FW FW "} -(7,1,1) = {" -FW -gq -gq +(4,1,1) = {" gq gq VG @@ -17953,77 +17725,74 @@ it xF xF Tn -SA -ZC -CZ -Zn -vV -SU +gI +IW +XG +UO +Es +QH FG -zK -wU -bB +xz +pk +Mk aB aB -fz -Wy +dL +WW aB DY -fw -zC +vQ +wU Zl -WS +GI dl -Zs -NV -OE -HA +uc +Bz +Ad +KS dl -uP -zO -nW -zM -Yu +au +wY +BZ +sh +In SZ -oH +Qm GH GH GH GH cZ -Pf +qh Kb -YG +aF yZ AQ yZ -EP -EA +GD +Qa yZ -af +Dx an an an -MO +gw an an -az +bL gq gq FW FW "} -(8,1,1) = {" -FW -gq -gq +(5,1,1) = {" gq gq VG it -FA -il -PU +Tw +oq +vT it Bp vP @@ -18031,31 +17800,31 @@ nN nN Hy DR -wz +yf uh -uQ -vH +Iz +en aB aB -SF -Xa +AA +UF aB DY -Xh +BS kn bg -Yy +al dl Bu zy jD xP nQ -HM +mF yE -UD -YT -GV +cG +CZ +ip AE CN CN @@ -18064,37 +17833,34 @@ Yc CN wI CN -Zz -OB +Wh +ZC sb -sE -AP +GC +Lg sb sb -kp -PQ +ex +MU an -Zt -BY -Rl -Eh -MO +xq +PX +fc +CM +gw VG gq gq -FW +gq FW "} -(9,1,1) = {" -FW -gq -gq +(6,1,1) = {" gq gq VG xF -dR -hQ +xT +dV hM it cy @@ -18108,10 +17874,10 @@ CL CL Zo aB -nw -LM -wP -hs +wG +XQ +Kz +uO DY Zl if @@ -18120,7 +17886,7 @@ Vh eF eF eF -DV +bJ eF Lq jW @@ -18136,7 +17902,7 @@ Gg QD hz QD -dA +Kf Kb sb Yn @@ -18144,23 +17910,20 @@ bH ay bH xC -ky +px an sD tN tN MQ -MO +gw VG gq gq -FW +gq FW "} -(10,1,1) = {" -FW -gq -gq +(7,1,1) = {" gq gq VG @@ -18190,10 +17953,10 @@ kn bg kn eF -QA -sm -wc -Of +Zs +NV +OE +HA Lq QP QP @@ -18209,7 +17972,7 @@ QD hz QD cp -ZY +YG DO Iu WB @@ -18229,10 +17992,7 @@ gq gq FW "} -(11,1,1) = {" -FW -gq -gq +(8,1,1) = {" gq gq VG @@ -18262,15 +18022,15 @@ eP Zl Ge eF -Uz -Mc -Nf -uj -Es -la -Br +dq +Of +EV +CI +OU +HM +gr HD -nf +YT HD Kb re @@ -18295,16 +18055,13 @@ qA AY Uk an -Nr +mT gq gq gq FW "} -(12,1,1) = {" -FW -gq -gq +(9,1,1) = {" gq gq VG @@ -18339,11 +18096,11 @@ cQ bP Fl BT -Ea -oP -oP -Lt -CJ +le +Rc +Rc +XU +Iq Vm cI PW @@ -18373,10 +18130,7 @@ gq gq FW "} -(13,1,1) = {" -FW -gq -gq +(10,1,1) = {" gq gq VG @@ -18391,11 +18145,11 @@ uu qM Zw Zo -GD -kZ -JX -zQ -Rw +Yy +zg +VR +wO +gg kX QW aB @@ -18411,11 +18165,11 @@ SI qE Hj HD -nR -XQ -Uv -or -gI +BM +pg +ic +QU +Tv Vm Mj Vg @@ -18445,10 +18199,7 @@ gq gq FW "} -(14,1,1) = {" -FW -gq -gq +(11,1,1) = {" gq qg VG @@ -18464,14 +18215,14 @@ ig AB Zo Rp -OT -Uj -RY -Ua -xi +uy +Bk +JL +SJ +Al GE dY -dD +FF yF Bt XY @@ -18497,7 +18248,7 @@ gV hz gV nP -IP +sE DZ GL kd @@ -18505,11 +18256,11 @@ AR by Yf oa -IU +eb Iu sb sb -bu +Sy AQ VG gq @@ -18517,12 +18268,9 @@ gq gq FW "} -(15,1,1) = {" -FW -gq -gq +(12,1,1) = {" gq -uq +KU CL CL CL @@ -18543,7 +18291,7 @@ Rp Rp QW DY -Jt +Ns yk cg ys @@ -18589,17 +18337,14 @@ gq gq FW "} -(16,1,1) = {" -FW -gq -gq +(13,1,1) = {" gq VG CL -cS -MF +KO +gS CL -Nl +cS eK Kk VL @@ -18612,10 +18357,10 @@ kX kX Rp Rp -jo -Je +gf +aj DY -Af +Nl iH Ek wK @@ -18661,17 +18406,14 @@ gq gq FW "} -(17,1,1) = {" -FW -FW -gq +(14,1,1) = {" gq VG CL -sJ -JW +OP +Lf CL -wr +dr Pz MR WH @@ -18680,13 +18422,13 @@ EZ fB es Zo -rR -dh -qY -MN -Zr +OT +Uj +RY +Ua +xi vj -OV +su dY vI AM @@ -18713,7 +18455,7 @@ GH cZ Rz Ze -WL +IP uR xD Pj @@ -18730,13 +18472,10 @@ AQ VG gq gq -gq -FW -"} -(18,1,1) = {" FW FW -gq +"} +(15,1,1) = {" gq VG CL @@ -18752,13 +18491,13 @@ sF fB KB Zo -IZ -ld -ij -rZ -Xq -FS -kj +zt +NL +oP +CH +hV +KN +rg DY yW NK @@ -18786,29 +18525,26 @@ lL mm YS Vm -td -yH -sf -ni -Bd -sT -Qx +he +or +wc +Ht +Qt +XP +Ce sb sb sb sb sA AQ -Nr -gq +mT gq gq FW -"} -(19,1,1) = {" -FW FW -gq +"} +(16,1,1) = {" gq VG CL @@ -18826,11 +18562,11 @@ Zo Zo CL Zo -Dx -iZ +SD +vH LH eH -nB +BF DY ya Gs @@ -18853,17 +18589,17 @@ gV gV Qk hm -DX +nO kv kS kv Jc -en -oi -TH -hk -pz -UJ +lX +OH +kD +MF +OW +me BR sb sb @@ -18874,13 +18610,10 @@ AQ bx gq gq -gq FW -"} -(20,1,1) = {" FW -FW -gq +"} +(17,1,1) = {" gq VG CL @@ -18896,13 +18629,13 @@ Ma Ff Zo vc -mF +rR CL -Bz -oO -DH +qY +MN +Zr eH -KZ +OV dY dY LK @@ -18916,26 +18649,26 @@ aq LH LH LH -Ya +vd sC -Ya +vd LH LH LH LH Vm Kv -DX -Wj -el -Fx +nO +WA +mt +vM Jc -WX -um -eU -LL -Pg -dc +xK +Ws +hk +Jm +Uv +sr Jc Cm sb @@ -18946,15 +18679,12 @@ AQ bx gq gq -gq -FW -"} -(21,1,1) = {" FW FW +"} +(18,1,1) = {" gq -gq -uq +KU CL CL CL @@ -18969,38 +18699,38 @@ Nw Jh si Nw -Ss -GT -Kd -ea +ld +ij +rZ +Xq eH TJ sG dY dY dY -UX -ja -mT -UH +TH +ww +Wj +PS eA sR -kO -hH -CI -qR -kM -GB -gK -ua -nm -Yv +dP +WO +DI +DN +qN +dD +LE +Bd +kp +Xx yU -Ka -ER -SG -el -YE +qU +Ha +Kh +mt +Hn Jc bb pC @@ -19018,13 +18748,10 @@ AQ bx gq gq -gq -FW -"} -(22,1,1) = {" FW FW -gq +"} +(19,1,1) = {" gq qg VG @@ -19047,31 +18774,31 @@ tl jZ se da -KY -KY -zp -YL -UX -sP -KY -kP +ku +ku +TS +SA +TH +BY +ku +IR eA sR da -KY -YL -mM +ku +SA +gW ep ep XO XO XO ep -uD -Sw +fz +LM kv Nb -yi +zQ Rf Jc jK @@ -19090,13 +18817,10 @@ AQ bx gq gq -gq -FW -"} -(23,1,1) = {" FW FW -gq +"} +(20,1,1) = {" gq gq VG @@ -19116,31 +18840,31 @@ UR Fe AS eX -Ip +DH eL qa qa -PX -jO +kk +Fb qa -RW -HN +zz +nz uv pP -iO -hE +If +Jn Op PN PN nc -rD -QK -nb -dV -PS +GV +Ya +QN +IQ +Au XO -GF -MW +zK +UJ LH kv kv @@ -19153,7 +18877,7 @@ uZ uZ uZ jH -EV +jI jH uZ uZ @@ -19162,16 +18886,13 @@ uZ VG gq gq -gq FW -"} -(24,1,1) = {" FW -FW -gq +"} +(21,1,1) = {" gq TO -Jd +SO vS vS vS @@ -19186,7 +18907,7 @@ vm vm vm vm -BJ +GT UA UA UA @@ -19204,31 +18925,31 @@ od NY NY NY -UF +qR NY ep -ip -GW -XP +gK +ua +nm ep YR -Pu +Ka ou -Jq -IW -Uf +SG +el +YE uZ -VK -pd -RK -Ky -gO -mt -sz -rC -Ws -fY -qO +UH +kZ +xx +TI +Ew +bB +Zn +FR +wa +ZH +Ci uZ VG VG @@ -19237,130 +18958,124 @@ gq gq FW "} -(25,1,1) = {" -FW -FW -gq +(22,1,1) = {" gq VG vS -gf -To -Al -de -Iz +az +UU +LV +pQ +fr ei UG oG Gb ZU vm -EW -BS +Gm Fj -CR +hN +tB UA -XV -Qp -dZ -OJ +JK +qO +rM +KY yw -ug -QU -Mr +zp +YL +UX LH xw mU AU NY -ix -ab -lt -Ih -cJ +Yx +Im +CJ +mM +oO XO XO XO BN Cl YR -OX -mg -ku -XI -Qz +Sw +qx +Rj +yi +mx uZ -rN +Li My My My yc oJ -KQ -wG +tj +TM uZ -PD -Ai +Gj +zM uZ -Ia +rt gq gq gq gq FW "} -(26,1,1) = {" -FW -FW -gq +(23,1,1) = {" gq VG gb -Mv -Jb +po +kI Sg -WY +ZG CL kE Pz mf II Tj -fa -hC -WR -gW -ET +Ww +hI +VA +WF +Fw UA -Aa -tP -MG -me +Ip +OR +KQ +ja yw -iB -Dn -cv -nS +jO +XZ +RW +HN RL TJ uY NY NY -ii -bC -gl -vM +np +Lt +ug +rD XO iv mV rG kz YR -Dk -XI -WE -KU -Qz +MW +yi +SF +qQ +mx uZ wp My @@ -19381,10 +19096,7 @@ gq gq FW "} -(27,1,1) = {" -FW -FW -gq +(24,1,1) = {" gq VG gb @@ -19409,14 +19121,14 @@ vB TY kl yw -er -Um -Pl +Kc +SU +il LH Oz TJ AC -FI +FY NY NY Iv @@ -19453,10 +19165,7 @@ gq gq FW "} -(28,1,1) = {" -FW -FW -gq +(25,1,1) = {" gq VG gb @@ -19488,8 +19197,8 @@ LH qb TJ MZ -rQ -Kf +Il +ix NY vL oS @@ -19516,19 +19225,16 @@ ny dF Me kT -Kc -Rj -Ha +Ai +uP +Ia wS qg gq gq FW "} -(29,1,1) = {" -FW -FW -gq +(26,1,1) = {" gq TO vS @@ -19538,30 +19244,30 @@ xp Am vS Wn -oq +ge Sa -qn -lR -LW -pI -uE +EO +PD +fa +hC +WR aH -GC -XS -Yq -VR -su +ET +sW +Aa +tP +MG aH -yp -Fb -Mu -WA +yo +iB +Dn +cv LH HQ ct sQ -DW -FT +Sz +Yu NY NY dU @@ -19571,7 +19277,7 @@ Ur KJ ik Ed -AA +MI NZ NZ NZ @@ -19588,19 +19294,16 @@ ir Pe TG kT -fU -Un -OH +EC +gl +Vk wS qg gq gq FW "} -(30,1,1) = {" -FW -FW -gq +(27,1,1) = {" gq gq VG @@ -19608,32 +19311,32 @@ et rl KD kh -cq +sP Wn -Hw +FT Sa Sa -lR -Xz +PD +OX ok -CD +Lu aH -jT -ME -ut -NT -uM +AH +Du +OF +VE +VK aH -xq -vd -Pr -ED +tt +er +Um +Pl LH RL TJ qF xN -bl +hB NY nZ Fv @@ -19645,10 +19348,10 @@ Fc XO ep BQ -sW -th -Bv -Gm +Sn +eq +Zc +SC uZ ar My @@ -19660,19 +19363,16 @@ aU Nh AT wS -iK -ht -rO +Ls +sV +IU wS qg gq gq FW "} -(31,1,1) = {" -FW -FW -gq +(28,1,1) = {" gq gq VG @@ -19680,26 +19380,26 @@ et BG cu wB -Ju +Ml Wn -gD +KP Sa Sa -lR +PD ok ok -rx +hn aH -Ku -hf -aj -pc -DK -Zm -mx -fI -fD -BF +YM +iJ +nh +Xh +Eh +Hk +tf +wA +nk +dI ST RL TJ @@ -19716,11 +19416,11 @@ JV Vy Tu XO -Xy -Ww -np -Tl -BI +Dm +jk +sY +Or +jy uZ yJ Bf @@ -19741,10 +19441,7 @@ gq gq FW "} -(32,1,1) = {" -FW -FW -gq +(29,1,1) = {" gq lS tb @@ -19752,7 +19449,7 @@ tb tb tb tb -lJ +Mc Wn IJ Sa @@ -19810,20 +19507,17 @@ LB wS qg gq -FW +gq FW "} -(33,1,1) = {" -FW -FW -gq +(30,1,1) = {" gq VG hZ lO -Lb -qz -kI +Qp +MO +Rl eA Wn LZ @@ -19849,7 +19543,7 @@ xw Bj AU NY -UL +bl ye aN Ae @@ -19866,15 +19560,15 @@ pt oF Na jH -Bl -Bl -Bl -Bl +Ea +Ea +Ea +Ea ND jH -BZ -Xu -DN +Wz +th +eS ZK ry mH @@ -19885,17 +19579,14 @@ gq gq FW "} -(34,1,1) = {" -FW -FW -gq +(31,1,1) = {" gq VG hZ lO -ML -Ht -tv +GB +Lw +QA eA ed Wn @@ -19907,14 +19598,14 @@ Wn Wn LH LH -xK +hf aH -bL +pc LH LH LH LH -Qn +fD LH yQ CT @@ -19937,19 +19628,19 @@ NZ NZ NZ BQ -nK -XL -Pk -jQ -oK -XZ +DK +Br +zd +bv +tX +CW mH -na +Ow Nt Nt -Sx -vG -xd +uQ +eO +wP Tf VG gq @@ -19957,10 +19648,7 @@ gq gq FW "} -(35,1,1) = {" -FW -FW -gq +(32,1,1) = {" gq VG hZ @@ -19969,59 +19657,59 @@ Cs PV zq Fk -DL -xY -NE -XA -lb -mj -ZF -hr -VA -KS -mj -my -lb -RJ -WK -nM -WG -dq +rx +ky nM +vA +os +xj +yR +rX +LL +YD +xj +vq +os +sZ +WE +PC +HB +Tg +PC ZT JI qa pr qa -zX +wx qa qa qa qa -jY -IO -sw +XK +vV +Mp pr -xV -dL -GN -IS -VE -Lf -fH -Wz -Mz +nW +HO +tk +vr +vG +uT +DD +uD +Wq SN SN SN -zB -BD -qs -KX -nA -Sy -Hl -pl +nf +fh +Rh +zC +Dg +eR +Uf +ah Tf VG gq @@ -20029,10 +19717,7 @@ gq gq FW "} -(36,1,1) = {" -FW -FW -gq +(33,1,1) = {" gq lS tb @@ -20043,43 +19728,43 @@ ji xQ iC iC -xO +WG eA -uX -SQ +Af +QC iC iC iC iC iC iC -Is +Wy Ou sR -oQ -Ph +sf +Yq iC -kU +Jo dG FJ sN FJ -lm +FI eH -oQ +sf iC FJ -Ph -Jv -Gi -lp +Yq +yt +rO +rV iC -vv +yp eH -ps +bS ND -Rc -wD +VQ +JW is RI jX @@ -20101,22 +19786,19 @@ gq gq FW "} -(37,1,1) = {" -FW -FW -gq +(34,1,1) = {" gq VG UV -dI +ej UV UV UV -du -du -Wq +cH +cH +WY UV -JL +XC TJ yQ ra @@ -20133,24 +19815,24 @@ YF jB Qe TT -sh +dh lW -sh -Sz +dh +dZ eH -RD -iJ +GK +Sx xE CP CP CP CP xE -XM +RK eH -SC +Wf ND -Jo +XV ZW is RI @@ -20173,54 +19855,51 @@ gq gq FW "} -(38,1,1) = {" -FW -FW -gq +(35,1,1) = {" gq gq -eO -XG -sU +kW +rC +pz Hc -SD -he -Kz -wA -vq -ZS -hU +Ss +ov +DL +xY +NE +XA +lb Hi -qW -tH +ZF +hr Hi HY HY -Iq +JX HY -bK -Fd +RJ +WK Ds Ds Ds Ds Ds -vJ -OW -tj +gy +PU +ER TT -YM +zX LH LH xE -FF -tk -NL -xj +yB +jY +IO +sw xE xE Gt -OF +GN bE Nc ZW @@ -20230,7 +19909,7 @@ og jt vC rI -OP +zB mH Cy Pa @@ -20245,51 +19924,48 @@ gq gq FW "} -(39,1,1) = {" -FW -FW -gq +(36,1,1) = {" gq lS Yd UV UV -QC -jd -Li -sj -qQ +VC +hE +zO +IN +Ll Yd -dr -Du +cb +uX HY -ge -GK -QN +Fg +fP +mk HY -ZI -dP -sO -gy -qX -zz -tZ -ES -Us +af +sU +Is +dx +Wk +oQ +Ph +lJ +kU Ds mn -Iy +kA Rg zb -oV -Xx +dA +ME lW -Mb -al -cH -wQ -wQ -Im +nG +iO +Jv +lp +lp +VD CP qL sR @@ -20317,10 +19993,7 @@ gq gq FW "} -(40,1,1) = {" -FW -FW -gq +(37,1,1) = {" gq VG XB @@ -20332,29 +20005,29 @@ cc sL OM qp -dr -ti -HY -cG cb -iF -oC -bo -IN -IN -Rt -mX -hI -In -nh -rr +FS +HY +nw +cW +CD +KX +ab +pI +pI +tM +js +Je +iI +uE +mB Ds mn OL LY AF VX -zD +RD lW Se Gf @@ -20389,10 +20062,7 @@ gq gq FW "} -(41,1,1) = {" -FW -FW -gq +(38,1,1) = {" gq VG XB @@ -20426,7 +20096,7 @@ Si Rg zb VX -wa +WL lW dm yY @@ -20455,16 +20125,13 @@ IB KH Fi mH -pm +Tl gq gq gq FW "} -(42,1,1) = {" -FW -FW -gq +(39,1,1) = {" gq VG XB @@ -20533,10 +20200,7 @@ gq gq FW "} -(43,1,1) = {" -FW -FW -gq +(40,1,1) = {" gq VG XB @@ -20593,22 +20257,19 @@ LH LH LH yQ -AH -GU -VV -Au -zx -HC +yD +kV +Wi +QK +xV +IF gq gq gq FW FW "} -(44,1,1) = {" -FW -FW -gq +(41,1,1) = {" gq VG XB @@ -20623,9 +20284,9 @@ Ut FN EJ HS -IQ -tn -VD +wD +Mr +um HY bV Ex @@ -20655,32 +20316,29 @@ TQ qa qa qa -AO +sm qa qa qa -AO -mj -mj -pD -NU -hO -dH -Pn -bA -Dc -nT -fh +sm +xj +xj +rr +av +de +Vt +lt +XI +jT +xH +ts gq gq gq FW FW "} -(45,1,1) = {" -FW -FW -gq +(42,1,1) = {" gq VG Yd @@ -20694,10 +20352,10 @@ OG Nz Nz Nz -Rx -VC -zd -Vk +Vc +HC +oi +kM HY HY HY @@ -20713,11 +20371,11 @@ lW lW lW lW -dE -jk -sq -am -bv +ED +WI +BI +tv +Bv ZA ZA RN @@ -20726,33 +20384,30 @@ LH eA aa iC -Fa +uw eH -Pv +du FJ -CO -UP -WV +pM +bu +GF Ji Ji -qJ +dE yQ -oB -PH -pU -PH -zx -fP +Eq +vF +kF +vF +xV +nS gq gq gq FW FW "} -(46,1,1) = {" -FW -FW -gq +(43,1,1) = {" gq VG Yd @@ -20767,33 +20422,33 @@ jL Ir KR HS -qZ -Xi -lD +nb +qJ +OJ OQ -Jm -tW -hV +BO +sq +dQ Sl Og -zg -ZP -kg +HL +td +To DJ -cW -vQ -os -MU +BV +fU +gM +nA DJ -Lg -ZD -Wf -Ml -DD +tZ +DX +zH +bo +gQ RN -eS -IF -Ol +jd +Yv +JT LH HE bk @@ -20803,11 +20458,11 @@ tT LH LH LH -AG +fY LH Lj -rV -CW +Hl +fw Ji vN vN @@ -20821,10 +20476,7 @@ gq FW FW "} -(47,1,1) = {" -FW -FW -gq +(44,1,1) = {" gq VG Yd @@ -20843,60 +20495,57 @@ Yl eN EM OQ -PM -aE -pp +nK +ZI +nR ns Mf -lX -nO -vr +yV +sJ +fp DJ -Wi -HB -KO -WO -ww -Rk -EO -MI -MI -Qm +fH +uL +Wb +Nd +IS +Us +hH +Zd +Zd +EW RN -Sn -xz -Ew +wr +hh +oK LH jf LH -uT -If -yt -Cr -OU -CH -vK -DF +lR +ML +bC +Cr +bK +oH +AO +mj Lj -tf -fr -FY -WI -Zd -wY -yM -sY +pD +NU +hO +dH +Pn +bA +Dc +nT Lj -Ia +rt gq gq FW FW "} -(48,1,1) = {" -FW -FW -gq +(45,1,1) = {" gq lS Yd @@ -20915,19 +20564,19 @@ qB qB qB OQ -eR -PB -QT +WX +qz +Rw AL Ab -aO -fG -xT +sj +PQ +sz DJ -XX +Qx QB hx -eb +ju DJ EX Gz @@ -20941,23 +20590,23 @@ kw LH dt LH -WW -mk -wV -cR -Wa -nV -JK -IH +Yk +Fa +CX +IZ +fq +CO +UP +WV Lj jb Kp -Vc -DI -mY -fm +Qz +oB +qX +pU xG -jy +zx Wv VG gq @@ -20965,10 +20614,7 @@ gq gq FW "} -(49,1,1) = {" -FW -FW -gq +(46,1,1) = {" gq VG XB @@ -20983,9 +20629,9 @@ nF pa te qB -BM -js -ju +qZ +Xi +lD qB Dz Dz @@ -21013,23 +20659,23 @@ RN LH Gw LH -cR -RA -PJ -Pi -Wa -ah +IZ +Qn +Ts +uo +fq +Co GM -op +hU Lj vO Yg mN -yV -cx -qx -Tg -WF +ii +GU +Xu +fI +NT Wv VG gq @@ -21037,10 +20683,7 @@ gq gq FW "} -(50,1,1) = {" -FW -FW -gq +(47,1,1) = {" gq VG XB @@ -21055,13 +20698,13 @@ gd TV UV qB -vA -FQ -pg +xd +wz +mX Jp -dC -Co -uc +PM +aE +pp cB yA bn @@ -21109,10 +20752,7 @@ gq gq FW "} -(51,1,1) = {" -FW -FW -gq +(48,1,1) = {" gq VG XB @@ -21130,10 +20770,10 @@ mZ lY ZL Ct -dx -sV -sV -FZ +Pf +PB +PB +QT yI xs lI @@ -21145,10 +20785,10 @@ QB zL De De -rg -Il -Il -ze +kg +DF +DF +qW DJ SE tG @@ -21159,14 +20799,14 @@ Uw uW JU JU -XC +wV JU JU -iL +nV iP iP uA -Wa +fq iy tr Jg @@ -21181,10 +20821,7 @@ gq FW FW "} -(52,1,1) = {" -FW -FW -gq +(49,1,1) = {" gq VG Yd @@ -21217,10 +20854,10 @@ QB hx hx Tz -Vu -kW -kW -zo +Ol +hQ +hQ +AG DJ vz ZA @@ -21230,14 +20867,14 @@ xa eY QY JU -JT -hn -HO -fq +RA +PJ +Pi +Wa JU -jS -vF -jS +Pg +op +Pg uA OA EE @@ -21253,10 +20890,7 @@ gq FW FW "} -(53,1,1) = {" -FW -FW -gq +(50,1,1) = {" gq gq vR @@ -21302,14 +20936,14 @@ cL cL LH JU -yR -yb -hJ -Eq +cJ +Xz +ut +vJ JU -jS -vF -jS +Pg +op +Pg uA Mo lG @@ -21325,23 +20959,20 @@ gq FW FW "} -(54,1,1) = {" -FW -FW -gq +(51,1,1) = {" gq gq -MM -tt -TI +aO +KZ +Un UV mp fT pV UV -Ce -UU -XU +vK +gT +iZ qB Bh Bh @@ -21379,9 +21010,9 @@ bO lB TN JU -jS -vF -jS +Pg +op +Pg jq Lj Lj @@ -21390,17 +21021,14 @@ Lj Wv Wv Lj -CM +Hw gq gq gq FW FW "} -(55,1,1) = {" -FW -FW -gq +(52,1,1) = {" gq gq gq @@ -21417,7 +21045,7 @@ gq VG VG VG -Rh +dc VG VG VG @@ -21425,21 +21053,21 @@ VG VG VG hY -YD -au -UU +oV +ZP +gT hY VG VG VG -Hn +EP VG VG hY -hN +zo aQ hY -gr +hs VG vR gq @@ -21454,7 +21082,7 @@ jq MA aQ hY -UU +gT VG VG VG @@ -21469,10 +21097,7 @@ gq FW FW "} -(56,1,1) = {" -FW -FW -FW +(53,1,1) = {" gq gq gq @@ -21517,12 +21142,12 @@ gq gq gq gq -Nd +Rk VG VG -Be +hJ VG -wx +iL gq gq gq @@ -21541,10 +21166,7 @@ gq FW FW "} -(57,1,1) = {" -FW -FW -FW +(54,1,1) = {" gq gq gq @@ -21613,13 +21235,10 @@ FW FW FW "} -(58,1,1) = {" -FW -FW -FW -FW -FW -FW +(55,1,1) = {" +gq +gq +gq FW FW FW @@ -21685,12 +21304,9 @@ FW FW FW "} -(59,1,1) = {" -FW -FW -FW -FW -FW +(56,1,1) = {" +gq +gq FW FW FW diff --git a/_maps/bubber/automapper/automapper_config.toml b/_maps/bubber/automapper/automapper_config.toml index 5ec4f9d6ddca8..7409bb38c594c 100644 --- a/_maps/bubber/automapper/automapper_config.toml +++ b/_maps/bubber/automapper/automapper_config.toml @@ -705,3 +705,27 @@ directory = "_maps/bubber/automapper/templates/NebulaStation/" required_map = "NebulaStation.dmm" coordinates = [42, 117, 2] trait_name = "Station" + +# Lavaland NW Persistence +[templates.lavaland_persistence] +map_files = ["lavaland_persistence.dmm"] +directory = "_maps/RandomRuins/LavaRuins/bubberstation/" +required_map = "Lavaland.dmm" +coordinates = [8, 161, 1] +trait_name = "Mining" + +# Moonstation NW Persistence +[templates.moonstation_persistence] +map_files = ["lavaland_persistence.dmm"] +directory = "_maps/RandomRuins/LavaRuins/bubberstation/" +required_map = "moonstation.dmm" +coordinates = [8, 179, 1] +trait_name = "Station" + +# Icebox SW Persistence +[templates.icebox_persistence] +map_files = ["icemoon_persistence.dmm"] +directory = "_maps/RandomRuins/IceRuins/bubberstation/" +required_map = "IceBoxStation.dmm" +coordinates = [19, 5, 1] +trait_name = "Station" diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 9a29a1f58c098..530b3adaf565c 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -897,7 +897,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "amX" = ( /turf/closed/wall/r_wall/rust, /area/station/ai_monitored/security/armory) @@ -1168,7 +1168,7 @@ /obj/structure/barricade/wooden/crude, /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/iron/dark, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "ari" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, @@ -2263,7 +2263,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "aKr" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -3436,7 +3436,7 @@ /obj/structure/barricade/wooden/crude, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "bib" = ( /obj/effect/turf_decal/bot, /obj/machinery/conveyor{ @@ -4084,7 +4084,7 @@ /obj/item/stack/rods, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "bty" = ( /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/canister/plasma, @@ -5811,7 +5811,7 @@ }, /obj/machinery/nuclearbomb/beer, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "cbJ" = ( /obj/structure/railing/corner{ dir = 8 @@ -5991,7 +5991,7 @@ /obj/structure/rack, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "cdV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/circuit/green{ @@ -6501,7 +6501,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "cjN" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -6798,7 +6798,7 @@ "cnq" = ( /obj/effect/turf_decal/bot, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "cnM" = ( /obj/structure/flora/bush/lavendergrass/style_random, /obj/effect/turf_decal/sand/plating, @@ -8558,7 +8558,7 @@ name = "on ramp" }, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "cWl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -9197,7 +9197,7 @@ "dgw" = ( /obj/structure/sign/warning/docking, /turf/closed/wall/rust, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "dgD" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, @@ -9209,7 +9209,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "dgE" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -9528,7 +9528,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "dlc" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/cup/glass/mug/coco, @@ -10057,7 +10057,7 @@ "dsD" = ( /obj/structure/sign/departments/cargo, /turf/closed/wall, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "dsI" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/hatch{ @@ -11153,7 +11153,7 @@ /area/station/cargo/storage) "dME" = ( /turf/closed/wall, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "dMF" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -12772,7 +12772,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "eqA" = ( /obj/machinery/light_switch/directional/south{ pixel_x = 26 @@ -13463,7 +13463,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "eCU" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -14055,7 +14055,7 @@ /area/station/maintenance/starboard/fore) "eNb" = ( /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "eNy" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -14591,7 +14591,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/contraband/random/directional/north, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "eYd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -14892,7 +14892,7 @@ environment_smash = 0 }, /turf/open/floor/carpet/green, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "fdC" = ( /obj/machinery/door/airlock/external{ name = "Labor Camp Shuttle Airlock"; @@ -15364,8 +15364,9 @@ /obj/item/screwdriver{ pixel_y = 6 }, +/obj/item/wallframe/apc, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "fkL" = ( /obj/structure/sign/warning/pods, /turf/closed/wall, @@ -17116,7 +17117,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "fIP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/chair/office{ @@ -17745,7 +17746,7 @@ /obj/structure/closet/crate, /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "fSE" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/vending/cigarette, @@ -18170,7 +18171,7 @@ /obj/effect/turf_decal/stripes/line, /obj/structure/cable, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "gaE" = ( /obj/effect/turf_decal/stripes/end{ dir = 4 @@ -19714,7 +19715,7 @@ }, /obj/structure/cable, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "gzA" = ( /obj/structure/girder, /obj/effect/turf_decal/stripes/corner, @@ -19950,7 +19951,7 @@ /obj/item/shard, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "gDT" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -20010,7 +20011,7 @@ }, /obj/structure/sign/poster/contraband/random/directional/east, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "gFD" = ( /obj/item/radio/intercom/directional/south, /obj/effect/turf_decal/tile/neutral{ @@ -20261,7 +20262,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "gIz" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -20373,9 +20374,9 @@ "gJF" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/stack/cable_coil/five, +/obj/item/stack/cable_coil/thirty, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "gJK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /turf/closed/wall/rust, @@ -20414,7 +20415,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "gKC" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, @@ -20998,7 +20999,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "gUZ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -21277,7 +21278,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "hbC" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/event_spawn, @@ -21433,7 +21434,7 @@ name = "Freight Mining Airlock" }, /turf/open/floor/iron/dark, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "heU" = ( /obj/structure/sign/warning/electric_shock/directional/south, /obj/effect/decal/cleanable/dirt, @@ -22698,7 +22699,7 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/structure/closet, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "hAc" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -22827,7 +22828,7 @@ pixel_y = 2 }, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "hBJ" = ( /turf/closed/wall/r_wall/rust, /area/station/maintenance/port/greater) @@ -23453,7 +23454,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "hKB" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -23704,7 +23705,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "hOt" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -24545,7 +24546,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "iaH" = ( /obj/structure/chair/wood/wings{ dir = 8 @@ -24613,7 +24614,7 @@ /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "ibJ" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -25020,7 +25021,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "ihU" = ( /turf/closed/wall/rust, /area/station/cargo/sorting) @@ -25537,7 +25538,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "ipI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/item/radio/intercom/directional/east, @@ -25819,7 +25820,7 @@ "itR" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "itZ" = ( /obj/structure/flora/bush/sparsegrass/style_random, /obj/structure/flora/bush/grassy/style_random, @@ -26116,7 +26117,7 @@ /obj/effect/turf_decal/stripes/line, /obj/structure/cable, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "iyF" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -26470,7 +26471,7 @@ "iEB" = ( /obj/structure/sign/warning/docking, /turf/closed/wall, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "iEG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -27235,7 +27236,7 @@ /obj/item/shard, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "iQN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -27501,7 +27502,7 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "iVj" = ( /turf/closed/wall/r_wall, /area/station/maintenance/department/security) @@ -29056,7 +29057,7 @@ }, /obj/structure/cable, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "jwi" = ( /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ @@ -29347,7 +29348,7 @@ }, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "jBS" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/window/reinforced/spawner/directional/west, @@ -29605,7 +29606,7 @@ }, /obj/structure/cable, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "jGW" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/disposalpipe/segment{ @@ -30370,7 +30371,7 @@ /area/station/security/lockers) "jSF" = ( /turf/open/floor/carpet/green, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "jSJ" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/bot, @@ -32949,7 +32950,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/effect/mapping_helpers/damaged_window, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "kNJ" = ( /obj/structure/table/wood, /obj/item/folder{ @@ -34080,7 +34081,7 @@ /obj/effect/decal/cleanable/blood/old, /obj/item/stack/rods, /turf/open/floor/carpet/green, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "lea" = ( /obj/machinery/rnd/production/techfab/department/cargo, /obj/effect/turf_decal/bot, @@ -34238,7 +34239,7 @@ /obj/structure/sign/warning/fire/directional/north, /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "lgl" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/spider/stickyweb, @@ -34295,7 +34296,7 @@ /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/remains/human, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "lhm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/closed/wall/r_wall, @@ -34784,7 +34785,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "lqy" = ( /obj/structure/flora/bush/fullgrass/style_random, /obj/structure/flora/bush/stalky/style_random, @@ -35752,7 +35753,7 @@ dir = 9 }, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "lFt" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/start/botanist, @@ -36111,7 +36112,7 @@ "lLH" = ( /obj/structure/sign/departments/engineering, /turf/closed/wall, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "lLN" = ( /obj/structure/fans/tiny, /obj/machinery/door/poddoor/massdriver_chapel, @@ -36349,7 +36350,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /obj/structure/cable, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "lQj" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/siding/yellow{ @@ -36490,7 +36491,7 @@ name = "Freight Bay Blast Door" }, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "lTc" = ( /obj/structure/rack, /obj/effect/turf_decal/bot, @@ -36784,7 +36785,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "lYa" = ( /obj/structure/chair/comfy/brown, /obj/effect/landmark/start/detective, @@ -37130,7 +37131,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "mdE" = ( /obj/machinery/light/small/directional/north, /obj/machinery/firealarm/directional/north, @@ -37448,7 +37449,7 @@ /obj/effect/decal/cleanable/oil, /obj/item/stack/cable_coil/cut, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "mit" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -37861,7 +37862,7 @@ }, /obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "moc" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 @@ -38290,7 +38291,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /obj/structure/cable, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "mwn" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -38709,7 +38710,7 @@ /area/station/science/genetics) "mDD" = ( /turf/closed/wall/rust, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "mDJ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ @@ -39641,7 +39642,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "mSu" = ( /obj/structure/table, /obj/machinery/light/directional/west, @@ -39896,7 +39897,7 @@ /obj/structure/sign/poster/contraband/random/directional/north, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "mXI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -40435,7 +40436,7 @@ icon_state = "crateopen" }, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "ngF" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/burnt_floor, @@ -41117,7 +41118,7 @@ "nuf" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "nuh" = ( /obj/effect/spawner/random/vending/colavend, /obj/effect/turf_decal/bot, @@ -42293,7 +42294,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /obj/structure/cable, /turf/open/floor/iron, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "nOR" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -42887,7 +42888,7 @@ /obj/item/stack/tile/wood, /obj/structure/cable, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "ocn" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -44107,7 +44108,7 @@ }, /obj/structure/cable, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "ozz" = ( /obj/machinery/firealarm/directional/west, /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ @@ -44778,7 +44779,7 @@ /obj/item/t_scanner, /obj/structure/cable, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "oLH" = ( /turf/closed/wall/r_wall/rust, /area/station/maintenance/starboard) @@ -44906,7 +44907,7 @@ /obj/structure/closet/crate, /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "oNO" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -45194,7 +45195,7 @@ name = "Freight Bay Blast Door" }, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "oTt" = ( /obj/structure/sign/painting/library{ pixel_x = 32 @@ -47367,7 +47368,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "pCP" = ( /obj/machinery/light/small/directional/north, /obj/effect/spawner/random/trash/cigbutt, @@ -48300,13 +48301,13 @@ name = "off ramp" }, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "pQT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/blood/old, /obj/structure/cable, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "pRu" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/door/window/left/directional/south{ @@ -49166,7 +49167,7 @@ }, /obj/structure/cable, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "qhf" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -49613,7 +49614,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "qpj" = ( /obj/structure/sign/warning/electric_shock, /turf/closed/wall/r_wall, @@ -49883,7 +49884,7 @@ /obj/effect/decal/cleanable/blood/old, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "quv" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, @@ -51345,7 +51346,7 @@ }, /obj/item/stack/cable_coil/cut, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "qVc" = ( /obj/machinery/chem_master, /obj/effect/turf_decal/bot, @@ -51473,7 +51474,7 @@ /obj/structure/table, /obj/item/binoculars, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "qWz" = ( /obj/structure/lattice, /obj/structure/sign/warning/secure_area/directional/east, @@ -52730,7 +52731,7 @@ /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "rrK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -52831,7 +52832,7 @@ name = "External Freight Airlock" }, /turf/open/floor/iron/dark, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "rsZ" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/abandoned, @@ -53045,7 +53046,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "rvD" = ( /obj/structure/transit_tube, /obj/effect/turf_decal/sand/plating, @@ -54045,7 +54046,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/table_frame, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "rMi" = ( /obj/effect/turf_decal/delivery, /obj/machinery/portable_atmospherics/scrubber/huge, @@ -54317,7 +54318,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "rQs" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/remains/human{ @@ -54457,7 +54458,7 @@ }, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "rRJ" = ( /obj/machinery/camera/directional/south{ c_tag = "Satellite External Fore"; @@ -54682,7 +54683,7 @@ }, /obj/item/stack/cable_coil/cut, /turf/open/floor/wood, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "rVw" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -54840,7 +54841,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "rZE" = ( /obj/effect/turf_decal/siding/blue/corner{ dir = 8 @@ -55042,7 +55043,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "scE" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -55266,7 +55267,7 @@ dir = 6 }, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "sfI" = ( /obj/structure/girder, /obj/effect/mapping_helpers/burnt_floor, @@ -56155,7 +56156,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "suo" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/caution/stand_clear, @@ -57780,7 +57781,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "sTB" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -60594,7 +60595,7 @@ }, /obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "tOa" = ( /obj/structure/table, /obj/item/tank/internals/oxygen/red, @@ -61305,7 +61306,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "tZk" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/corner{ @@ -62106,7 +62107,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "ulS" = ( /turf/closed/wall, /area/station/security/courtroom) @@ -63096,7 +63097,7 @@ }, /obj/item/stack/rods, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "uCR" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/blood/old, @@ -63794,7 +63795,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "uQE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -64318,7 +64319,7 @@ /obj/structure/grille/broken, /obj/effect/decal/cleanable/glass, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "uZT" = ( /obj/effect/landmark/start/medical_doctor, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, @@ -64667,7 +64668,7 @@ /obj/structure/barricade/wooden/crude, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "vfO" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ @@ -65970,7 +65971,7 @@ /obj/item/stack/rods, /obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "vAw" = ( /obj/machinery/vending/wardrobe/chef_wardrobe, /obj/effect/turf_decal/bot, @@ -67732,9 +67733,8 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner, /obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "war" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -68451,7 +68451,7 @@ /obj/effect/turf_decal/bot, /obj/structure/sign/warning/no_smoking/directional/north, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "wlP" = ( /obj/machinery/portable_atmospherics/scrubber, /obj/effect/turf_decal/bot, @@ -68778,7 +68778,7 @@ }, /mob/living/basic/mining/hivelord, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "wpw" = ( /turf/closed/wall, /area/station/science/xenobiology) @@ -69231,7 +69231,7 @@ /obj/structure/table/wood, /obj/effect/spawner/random/maintenance, /turf/open/floor/carpet/green, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "wxI" = ( /obj/item/kirbyplants{ icon_state = "plant-05" @@ -69433,7 +69433,7 @@ }, /mob/living/basic/mining/hivelord, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "wAz" = ( /obj/structure/railing{ dir = 4 @@ -69752,7 +69752,7 @@ }, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "wGA" = ( /obj/structure/table, /obj/structure/railing, @@ -70487,7 +70487,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/atmospheric_sanity/ignore_area, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "wSL" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -70571,7 +70571,7 @@ /obj/effect/turf_decal/stripes/line, /obj/structure/cable, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "wTS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, @@ -70592,7 +70592,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "wVb" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -70705,7 +70705,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "wWD" = ( /obj/structure/table, /obj/item/wrench, @@ -70824,7 +70824,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "wYR" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -71809,7 +71809,7 @@ "xqm" = ( /obj/structure/sign/warning/vacuum, /turf/closed/wall/rust, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "xqw" = ( /turf/open/floor/bronze, /area/station/maintenance/department/chapel) @@ -72131,7 +72131,7 @@ dir = 6 }, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "xvW" = ( /turf/closed/wall, /area/station/medical/paramedic) @@ -72241,7 +72241,7 @@ dir = 1 }, /turf/open/floor/plating, -/area/station/cargo/warehouse) +/area/mine/eva/abandoned) "xxN" = ( /obj/machinery/portable_atmospherics/canister/plasma, /turf/open/floor/iron/dark, diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index bbe7a504a13c4..7ce61d9b0833c 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -169,7 +169,10 @@ ///The species is forced to have digitigrade legs in generation. #define DIGITIGRADE_FORCED 2 -///Digitigrade's prefs, used in features for legs if you're meant to be a Digitigrade. +// Preferences for leg types +/// Legs that are normal +#define NORMAL_LEGS "Normal Legs" +/// Digitgrade legs that are like bended and uhhh no shoes #define DIGITIGRADE_LEGS "Digitigrade Legs" // Health/damage defines diff --git a/code/__DEFINES/~skyrat_defines/DNA.dm b/code/__DEFINES/~skyrat_defines/DNA.dm index 75f654733021b..fe4093b63ae2a 100644 --- a/code/__DEFINES/~skyrat_defines/DNA.dm +++ b/code/__DEFINES/~skyrat_defines/DNA.dm @@ -46,7 +46,6 @@ /// Organ slot external #define ORGAN_SLOT_EXTERNAL_CAP "cap" -#define ORGAN_SLOT_EXTERNAL_EARS "ears_external" // I hate having to do this, hopefully I'll be able to remove this soon with an external ears refactor. #define ORGAN_SLOT_EXTERNAL_FLUFF "fluff" #define ORGAN_SLOT_EXTERNAL_HEAD_ACCESSORY "head_accessory" #define ORGAN_SLOT_EXTERNAL_MOTH_MARKINGS "moth_markings" diff --git a/code/__HELPERS/duplicating.dm b/code/__HELPERS/duplicating.dm index 225dca91fb5b1..f0f3f9a9fce97 100644 --- a/code/__HELPERS/duplicating.dm +++ b/code/__HELPERS/duplicating.dm @@ -15,8 +15,6 @@ GLOBAL_LIST_INIT(duplicate_forbidden_vars, list( "contents", "cooldowns", "_datum_components", - "external_organs", - "external_organs_slot", "group", "hand_bodyparts", "held_items", diff --git a/code/controllers/subsystem/sprite_accessories.dm b/code/controllers/subsystem/sprite_accessories.dm index 8d7017648e92c..058a7cc40e198 100644 --- a/code/controllers/subsystem/sprite_accessories.dm +++ b/code/controllers/subsystem/sprite_accessories.dm @@ -47,7 +47,6 @@ SUBSYSTEM_DEF(accessories) // just 'accessories' for brevity var/list/horns_list var/list/frills_list var/list/spines_list - var/list/legs_list var/list/tail_spines_list //Mutant Human bits @@ -135,7 +134,6 @@ SUBSYSTEM_DEF(accessories) // just 'accessories' for brevity frills_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/frills, add_blank = TRUE)[DEFAULT_SPRITE_LIST] spines_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/spines, add_blank = TRUE)[DEFAULT_SPRITE_LIST] tail_spines_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/tail_spines, add_blank = TRUE)[DEFAULT_SPRITE_LIST] - legs_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/legs)[DEFAULT_SPRITE_LIST] caps_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/caps)[DEFAULT_SPRITE_LIST] moth_wings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_wings)[DEFAULT_SPRITE_LIST] moth_antennae_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_antennae)[DEFAULT_SPRITE_LIST] diff --git a/code/datums/bodypart_overlays/bodypart_overlay.dm b/code/datums/bodypart_overlays/bodypart_overlay.dm index 15e9bd62f44e9..767214024c609 100644 --- a/code/datums/bodypart_overlays/bodypart_overlay.dm +++ b/code/datums/bodypart_overlays/bodypart_overlay.dm @@ -89,7 +89,7 @@ return TRUE ///Colorizes the limb it's inserted to, if required. -/datum/bodypart_overlay/proc/override_color(rgb_value) +/datum/bodypart_overlay/proc/override_color(obj/item/bodypart/bodypart_owner) CRASH("External organ color set to override with no override proc.") ///Generate a unique identifier to cache with. If you change something about the image, but the icon cache stays the same, it'll simply pull the unchanged image out of the cache diff --git a/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm b/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm index 158bba5eece7c..a6e0097912575 100644 --- a/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm +++ b/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm @@ -13,6 +13,31 @@ ///Take on the dna/preference from whoever we're gonna be inserted in var/imprint_on_next_insertion = TRUE +/datum/bodypart_overlay/mutant/New(obj/item/organ/attached_organ) + . = ..() + + RegisterSignal(attached_organ, COMSIG_ORGAN_IMPLANTED, PROC_REF(on_mob_insert)) + +/datum/bodypart_overlay/mutant/proc/on_mob_insert(obj/item/organ/parent, mob/living/carbon/receiver) + SIGNAL_HANDLER + + if(!should_visual_organ_apply_to(parent.type, receiver)) + stack_trace("adding a [parent.type] to a [receiver.type] when it shouldn't be!") + + if(imprint_on_next_insertion) //We only want this set *once* + var/feature_name = receiver.dna.features[feature_key] + if (isnull(feature_name)) + /* SKYRAT EDIT - Customization - ORIGINAL: + feature_name = receiver.dna.species.mutant_organs[parent.type] + set_appearance_from_name(feature_name) + */ // SKYRAT EDIT START + if(!set_appearance_from_dna(receiver.dna)) + set_appearance_from_name(receiver.dna.species.mutant_organs[parent.type] || pick(get_global_feature_list())) + else + set_appearance_from_name(feature_name) + // SKYRAT EDIT END + imprint_on_next_insertion = FALSE + /datum/bodypart_overlay/mutant/get_overlay(layer, obj/item/bodypart/limb) inherit_color(limb) // If draw_color is not set yet, go ahead and do that return ..() @@ -67,7 +92,6 @@ return appearance /datum/bodypart_overlay/mutant/color_image(image/overlay, layer, obj/item/bodypart/limb) - overlay.color = sprite_datum.color_src ? draw_color : null /datum/bodypart_overlay/mutant/added_to_limb(obj/item/bodypart/limb) @@ -108,7 +132,7 @@ alpha = bodypart_owner.alpha // SKYRAT ADDITION - Mutant bodyparts transparency are based on limb transparency switch(color_source) if(ORGAN_COLOR_OVERRIDE) - draw_color = override_color(bodypart_owner.draw_color) + draw_color = override_color(bodypart_owner) if(ORGAN_COLOR_INHERIT) draw_color = bodypart_owner.draw_color if(ORGAN_COLOR_HAIR) @@ -141,3 +165,4 @@ CRASH("External organ [type] couldn't find sprite accessory [accessory_name]!") else CRASH("External organ [type] had fetch_sprite_datum called with a null accessory name!") + diff --git a/code/datums/dna.dm b/code/datums/dna.dm index c9fb318b8c254..8eca86cf93f62 100644 --- a/code/datums/dna.dm +++ b/code/datums/dna.dm @@ -765,9 +765,11 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) dna.features["caps"] = SSaccessories.caps_list[deconstruct_block(get_uni_feature_block(features, DNA_MUSHROOM_CAPS_BLOCK), length(SSaccessories.caps_list))] if(dna.features["pod_hair"]) dna.features["pod_hair"] = SSaccessories.pod_hair_list[deconstruct_block(get_uni_feature_block(features, DNA_POD_HAIR_BLOCK), length(SSaccessories.pod_hair_list))] + if(dna.features["fish_tail"]) + dna.features["fish_tail"] = SSaccessories.tails_list_fish[deconstruct_block(get_uni_feature_block(features, DNA_FISH_TAIL_BLOCK), length(SSaccessories.tails_list_fish))] - for(var/obj/item/organ/external/external_organ in organs) - external_organ.mutate_feature(features, src) + for(var/obj/item/organ/organ in organs) + organ.mutate_feature(features, src) if(icon_update) update_body(is_creating = mutcolor_update) diff --git a/code/datums/quirks/neutral_quirks/transhumanist.dm b/code/datums/quirks/neutral_quirks/transhumanist.dm index ea6494a6b327b..aa8ae075df395 100644 --- a/code/datums/quirks/neutral_quirks/transhumanist.dm +++ b/code/datums/quirks/neutral_quirks/transhumanist.dm @@ -127,10 +127,10 @@ else if(isorgan(new_part)) var/obj/item/organ/new_organ = new_part old_part = human_holder.get_organ_slot(new_organ.slot) - if(new_organ.Insert(human_holder, special = TRUE)) - old_part.moveToNullspace() - STOP_PROCESSING(SSobj, old_part) - slot_string = new_organ.name + new_organ.Insert(human_holder, special = TRUE) + old_part.moveToNullspace() + STOP_PROCESSING(SSobj, old_part) + slot_string = new_organ.name /datum/quirk/transhumanist/post_add() if(!slot_string) diff --git a/code/datums/sprite_accessories.dm b/code/datums/sprite_accessories.dm index 5f9869b7dda99..6a9edf8656593 100644 --- a/code/datums/sprite_accessories.dm +++ b/code/datums/sprite_accessories.dm @@ -34,8 +34,6 @@ * This is the source that this accessory will get its color from. Default is MUTCOLOR, but can also be HAIR, FACEHAIR, EYECOLOR and 0 if none. */ var/color_src = MUTANT_COLOR - /// Decides if this sprite has an "inner" part, such as the fleshy parts on ears. - var/hasinner = FALSE /// Is this part locked from roundstart selection? Used for parts that apply effects. var/locked = FALSE /// Should we center the sprite? @@ -1893,7 +1891,6 @@ /datum/sprite_accessory/ears/cat name = "Cat" icon_state = "cat" - hasinner = TRUE color_src = HAIR_COLOR /datum/sprite_accessory/ears/cat/big @@ -1920,7 +1917,6 @@ icon = 'icons/mob/human/fox_features.dmi' name = "Fox" icon_state = "fox" - hasinner = TRUE color_src = HAIR_COLOR locked = TRUE @@ -2131,16 +2127,6 @@ name = "Aquatic" icon_state = "aqua" -/datum/sprite_accessory/legs //legs are a special case, they aren't actually sprite_accessories but are updated with them. - icon = null //These datums exist for selecting legs on preference, and little else - em_block = TRUE - -/datum/sprite_accessory/legs/none - name = "Normal Legs" - -/datum/sprite_accessory/legs/digitigrade_lizard - name = DIGITIGRADE_LEGS - /datum/sprite_accessory/caps icon = 'icons/mob/human/species/mush_cap.dmi' color_src = HAIR_COLOR diff --git a/code/datums/status_effects/debuffs/dna_transformation.dm b/code/datums/status_effects/debuffs/dna_transformation.dm index 33b6eb1d91344..d75713064debf 100644 --- a/code/datums/status_effects/debuffs/dna_transformation.dm +++ b/code/datums/status_effects/debuffs/dna_transformation.dm @@ -33,7 +33,9 @@ // Save the old DNA transforming.dna.copy_dna(old_dna) // Makes them into the new DNA + transforming.visual_only_organs = TRUE // SKYRAT EDIT ADDITION - Customization new_dna.transfer_identity(transforming) + transforming.visual_only_organs = initial(transforming.visual_only_organs) // SKYRAT EDIT ADDITION - Customization transforming.real_name = new_dna.real_name transforming.name = transforming.get_visible_name() transforming.updateappearance(mutcolor_update = TRUE) @@ -44,7 +46,9 @@ var/mob/living/carbon/transforming = owner if(!QDELING(owner)) // Don't really need to do appearance stuff if we're being deleted + transforming.visual_only_organs = TRUE // SKYRAT EDIT ADDITION - Customization old_dna.transfer_identity(transforming) + transforming.visual_only_organs = initial(transforming.visual_only_organs) // SKYRAT EDIT ADDITION - Customization transforming.updateappearance(mutcolor_update = TRUE) transforming.domutcheck() diff --git a/code/game/machinery/dna_infuser/organ_sets/fly_organs.dm b/code/game/machinery/dna_infuser/organ_sets/fly_organs.dm index f86a161b1ceb4..3ffad6dcba385 100644 --- a/code/game/machinery/dna_infuser/organ_sets/fly_organs.dm +++ b/code/game/machinery/dna_infuser/organ_sets/fly_organs.dm @@ -137,7 +137,6 @@ //useless organs we throw in just to fuck with surgeons a bit more. they aren't part of a bonus, just the (absolute) state of flies /obj/item/organ/internal/fly desc = FLY_INFUSED_ORGAN_DESC - visual = FALSE /obj/item/organ/internal/fly/Initialize(mapload) . = ..() diff --git a/code/game/machinery/dna_infuser/organ_sets/fox_organs.dm b/code/game/machinery/dna_infuser/organ_sets/fox_organs.dm index 60d4465ce72ff..3fecac3bb6dbf 100644 --- a/code/game/machinery/dna_infuser/organ_sets/fox_organs.dm +++ b/code/game/machinery/dna_infuser/organ_sets/fox_organs.dm @@ -6,22 +6,4 @@ visual = TRUE damage_multiplier = 2 -//SKYRAT EDIT REMOVAL BEGIN - CUSTOMIZATION -/* -/obj/item/organ/internal/ears/fox/on_mob_insert(mob/living/carbon/human/ear_owner) - . = ..() - if(istype(ear_owner) && ear_owner.dna) - color = ear_owner.hair_color - ear_owner.dna.features["ears"] = ear_owner.dna.species.mutant_bodyparts["ears"] = "Fox" - ear_owner.dna.update_uf_block(DNA_EARS_BLOCK) - ear_owner.update_body() - -/obj/item/organ/internal/ears/fox/on_mob_remove(mob/living/carbon/human/ear_owner) - . = ..() - if(istype(ear_owner) && ear_owner.dna) - color = ear_owner.hair_color - ear_owner.dna.species.mutant_bodyparts -= "ears" - ear_owner.update_body() sprite_accessory_override = /datum/sprite_accessory/ears/fox -*/ -//SKYRAT EDIT REMOVAL END diff --git a/code/game/machinery/dna_infuser/organ_sets/gondola_organs.dm b/code/game/machinery/dna_infuser/organ_sets/gondola_organs.dm index 797c7839b2c29..9fcf7e483bba9 100644 --- a/code/game/machinery/dna_infuser/organ_sets/gondola_organs.dm +++ b/code/game/machinery/dna_infuser/organ_sets/gondola_organs.dm @@ -34,7 +34,7 @@ Fluoride Stare: After someone says 5 words, blah blah blah... AddElement(/datum/element/noticable_organ, "%PRONOUN_They radiate%PRONOUN_s an aura of serenity.") AddElement(/datum/element/update_icon_blocker) -/obj/item/organ/internal/heart/gondola/Insert(mob/living/carbon/receiver, special, movement_flags) +/obj/item/organ/internal/heart/gondola/mob_insert(mob/living/carbon/receiver, special, movement_flags) . = ..() if(!(FACTION_HOSTILE in receiver.faction)) factions_to_remove += FACTION_HOSTILE @@ -42,7 +42,7 @@ Fluoride Stare: After someone says 5 words, blah blah blah... factions_to_remove += FACTION_MINING receiver.faction |= list(FACTION_HOSTILE, FACTION_MINING) -/obj/item/organ/internal/heart/gondola/Remove(mob/living/carbon/heartless, special, movement_flags) +/obj/item/organ/internal/heart/gondola/mob_remove(mob/living/carbon/heartless, special, movement_flags) . = ..() for(var/faction in factions_to_remove) heartless.faction -= faction @@ -64,11 +64,11 @@ Fluoride Stare: After someone says 5 words, blah blah blah... AddElement(/datum/element/noticable_organ, "%PRONOUN_Their mouth is permanently affixed into a relaxed smile.", BODY_ZONE_PRECISE_MOUTH) AddElement(/datum/element/organ_set_bonus, /datum/status_effect/organ_set_bonus/gondola) -/obj/item/organ/internal/tongue/gondola/Insert(mob/living/carbon/tongue_owner, special, movement_flags) +/obj/item/organ/internal/tongue/gondola/mob_insert(mob/living/carbon/tongue_owner, special, movement_flags) . = ..() tongue_owner.add_mood_event("gondola_zen", /datum/mood_event/gondola_serenity) -/obj/item/organ/internal/tongue/gondola/Remove(mob/living/carbon/tongue_owner, special, movement_flags) +/obj/item/organ/internal/tongue/gondola/mob_remove(mob/living/carbon/tongue_owner, special, movement_flags) tongue_owner.clear_mood_event("gondola_zen") return ..() @@ -87,7 +87,7 @@ Fluoride Stare: After someone says 5 words, blah blah blah... AddElement(/datum/element/noticable_organ, "%PRONOUN_Their left arm has small needles breaching the skin all over it.", BODY_ZONE_L_ARM) AddElement(/datum/element/noticable_organ, "%PRONOUN_Their right arm has small needles breaching the skin all over it.", BODY_ZONE_R_ARM) -/obj/item/organ/internal/liver/gondola/Insert(mob/living/carbon/liver_owner, special, movement_flags) +/obj/item/organ/internal/liver/gondola/mob_insert(mob/living/carbon/liver_owner, special, movement_flags) . = ..() var/has_left = liver_owner.has_left_hand(check_disabled = FALSE) var/has_right = liver_owner.has_right_hand(check_disabled = FALSE) @@ -102,7 +102,7 @@ Fluoride Stare: After someone says 5 words, blah blah blah... RegisterSignal(liver_owner, COMSIG_LIVING_TRY_PULL, PROC_REF(on_owner_try_pull)) RegisterSignal(liver_owner, COMSIG_CARBON_HELPED, PROC_REF(on_hug)) -/obj/item/organ/internal/liver/gondola/Remove(mob/living/carbon/liver_owner, special, movement_flags) +/obj/item/organ/internal/liver/gondola/mob_remove(mob/living/carbon/liver_owner, special, movement_flags) . = ..() UnregisterSignal(liver_owner, list(COMSIG_HUMAN_EQUIPPING_ITEM, COMSIG_LIVING_TRY_PULL, COMSIG_CARBON_HELPED)) diff --git a/code/game/objects/items/body_egg.dm b/code/game/objects/items/body_egg.dm index d244d8c55cc16..d8b48e0789b21 100644 --- a/code/game/objects/items/body_egg.dm +++ b/code/game/objects/items/body_egg.dm @@ -15,15 +15,14 @@ if(iscarbon(loc)) Insert(loc) -/obj/item/organ/internal/body_egg/Insert(mob/living/carbon/egg_owner, special = FALSE, movement_flags = DELETE_IF_REPLACED) +/obj/item/organ/internal/body_egg/mob_insert(mob/living/carbon/egg_owner, special = FALSE, movement_flags = DELETE_IF_REPLACED) . = ..() - if(!.) - return + egg_owner.add_traits(list(TRAIT_XENO_HOST, TRAIT_XENO_IMMUNE), ORGAN_TRAIT) egg_owner.med_hud_set_status() INVOKE_ASYNC(src, PROC_REF(AddInfectionImages), egg_owner) -/obj/item/organ/internal/body_egg/Remove(mob/living/carbon/egg_owner, special, movement_flags) +/obj/item/organ/internal/body_egg/mob_remove(mob/living/carbon/egg_owner, special, movement_flags) . = ..() egg_owner.remove_traits(list(TRAIT_XENO_HOST, TRAIT_XENO_IMMUNE), ORGAN_TRAIT) egg_owner.med_hud_set_status() diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index 90444805c93e7..6ecf0b1f9f0da 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -354,7 +354,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror/broken, 28) user.set_facial_haircolor(sanitize_hexcolor(new_face_color), update = FALSE) user.dna.update_ui_block(DNA_FACIAL_HAIR_COLOR_BLOCK) user.update_body_parts() - user.update_mutant_bodyparts() /// SKYRAT EDIT ADDITION - Mirrors are no longer scared of colored ears /obj/structure/mirror/magic/attack_hand(mob/living/carbon/human/user) . = ..() diff --git a/code/modules/admin/verbs/manipulate_organs.dm b/code/modules/admin/verbs/manipulate_organs.dm index bfb5050dafa21..6c0a86126b607 100644 --- a/code/modules/admin/verbs/manipulate_organs.dm +++ b/code/modules/admin/verbs/manipulate_organs.dm @@ -18,10 +18,7 @@ ADMIN_VERB(manipulate_organs, R_DEBUG, "Manipulate Organs", "Manipulate the orga return organ_to_grant = organs[organ_to_grant] organ_to_grant = new organ_to_grant - if(!organ_to_grant.Insert(carbon_victim)) - to_chat(user, span_notice("[carbon_victim] is unable to carry this organ!")) - qdel(organ_to_grant) - return + organ_to_grant.Insert(carbon_victim) log_admin("[key_name(user)] has added organ [organ_to_grant.type] to [key_name(carbon_victim)]") message_admins("[key_name_admin(user)] has added organ [organ_to_grant.type] to [ADMIN_LOOKUPFLW(carbon_victim)]") diff --git a/code/modules/admin/verbs/secrets.dm b/code/modules/admin/verbs/secrets.dm index f3acd741faacd..368f6f4d6f45e 100644 --- a/code/modules/admin/verbs/secrets.dm +++ b/code/modules/admin/verbs/secrets.dm @@ -526,7 +526,7 @@ ADMIN_VERB(secrets, R_NONE, "Secrets", "Abuse harder than you ever have before w var/forename = names.len > 1 ? names[2] : names[1] var/newname = "[forename]-[pick(honorifics["[H.gender]"])]" H.fully_replace_character_name(H.real_name,newname) - H.update_mutant_bodyparts() + H.update_body_parts() if(animetype == "Yes") var/seifuku = pick(typesof(/obj/item/clothing/under/costume/schoolgirl)) var/obj/item/clothing/under/costume/schoolgirl/I = new seifuku diff --git a/code/modules/antagonists/abductor/equipment/gland.dm b/code/modules/antagonists/abductor/equipment/gland.dm index 89052e022180e..d1f240b7f6821 100644 --- a/code/modules/antagonists/abductor/equipment/gland.dm +++ b/code/modules/antagonists/abductor/equipment/gland.dm @@ -84,7 +84,7 @@ active_mind_control = FALSE return TRUE -/obj/item/organ/internal/heart/gland/Remove(mob/living/carbon/gland_owner, special, movement_flags) +/obj/item/organ/internal/heart/gland/mob_remove(mob/living/carbon/gland_owner, special, movement_flags) . = ..() active = FALSE if(initial(uses) == 1) @@ -93,10 +93,8 @@ hud.remove_atom_from_hud(gland_owner) clear_mind_control() -/obj/item/organ/internal/heart/gland/Insert(mob/living/carbon/gland_owner, special = FALSE, movement_flags = DELETE_IF_REPLACED) +/obj/item/organ/internal/heart/gland/mob_insert(mob/living/carbon/gland_owner, special = FALSE, movement_flags = DELETE_IF_REPLACED) . = ..() - if(!.) - return if(special != 2 && uses) // Special 2 means abductor surgery Start() diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm index d10074db3eed6..364e663f552b3 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -970,7 +970,9 @@ user.name = user.get_visible_name() current_profile = chosen_profile // SKYRAT EDIT START + user.visual_only_organs = TRUE chosen_dna.transfer_identity(user, TRUE) + user.visual_only_organs = initial(user.visual_only_organs) user.updateappearance(mutcolor_update = TRUE, eyeorgancolor_update = TRUE) user.regenerate_icons() user.name = user.get_visible_name() diff --git a/code/modules/antagonists/changeling/headslug_eggs.dm b/code/modules/antagonists/changeling/headslug_eggs.dm index 8f861aec2ec80..75c0881c55167 100644 --- a/code/modules/antagonists/changeling/headslug_eggs.dm +++ b/code/modules/antagonists/changeling/headslug_eggs.dm @@ -11,11 +11,11 @@ /// When this egg last got removed from a body. If -1, the egg hasn't been removed from a body. var/removal_time = -1 -/obj/item/organ/internal/body_egg/changeling_egg/Insert(mob/living/carbon/egg_owner, special = FALSE, movement_flags = DELETE_IF_REPLACED) +/obj/item/organ/internal/body_egg/changeling_egg/mob_insert(mob/living/carbon/egg_owner, special = FALSE, movement_flags = DELETE_IF_REPLACED) . = ..() hatch_time = world.time + (removal_time == -1 ? EGG_INCUBATION_TIME : (hatch_time - removal_time)) -/obj/item/organ/internal/body_egg/changeling_egg/Remove(mob/living/carbon/egg_owner, special, movement_flags) +/obj/item/organ/internal/body_egg/changeling_egg/mob_remove(mob/living/carbon/egg_owner, special, movement_flags) . = ..() removal_time = world.time diff --git a/code/modules/antagonists/heretic/knowledge/flesh_lore.dm b/code/modules/antagonists/heretic/knowledge/flesh_lore.dm index 1b162164b68e2..18b49889a7ab8 100644 --- a/code/modules/antagonists/heretic/knowledge/flesh_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/flesh_lore.dm @@ -1,7 +1,7 @@ /// The max amount of health a ghoul has. -#define GHOUL_MAX_HEALTH 25 +#define GHOUL_MAX_HEALTH HUMAN_MAXHEALTH - 35 // BUBBER EDIT /// The max amount of health a voiceless dead has. -#define MUTE_MAX_HEALTH 50 +#define MUTE_MAX_HEALTH HUMAN_MAXHEALTH // BUBBER EDIT /** * # The path of Flesh. diff --git a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm index 09bff0f869cb1..00eb54a63ebfe 100644 --- a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm +++ b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm @@ -424,20 +424,13 @@ usable_organs -= /obj/item/organ/internal/lungs/corrupt // Their lungs are already more cursed than anything I could give them var/total_implant = 1 //BUBBERSTATION CHANGE: ALWAYS 1 INSTEAD OF 2 TO 4. - var/gave_any = FALSE for (var/i in 1 to total_implant) if (!length(usable_organs)) - break + return var/organ_path = pick_n_take(usable_organs) var/obj/item/organ/internal/to_give = new organ_path - if (!to_give.Insert(sac_target)) - qdel(to_give) - else - gave_any = TRUE - - if (!gave_any) - return + to_give.Insert(sac_target) new /obj/effect/gibspawner/human/bodypartless(get_turf(sac_target)) sac_target.visible_message(span_boldwarning("Several organs force themselves out of [sac_target]!")) diff --git a/code/modules/antagonists/nightmare/nightmare_organs.dm b/code/modules/antagonists/nightmare/nightmare_organs.dm index 5c6756439646a..4aaacb77e5f3e 100644 --- a/code/modules/antagonists/nightmare/nightmare_organs.dm +++ b/code/modules/antagonists/nightmare/nightmare_organs.dm @@ -65,9 +65,10 @@ /obj/item/organ/internal/heart/nightmare name = "heart of darkness" desc = "An alien organ that twists and writhes when exposed to light." + visual = TRUE icon_state = "demon_heart-on" base_icon_state = "demon_heart" - visual = TRUE + color = COLOR_CRAYON_BLACK decay_factor = 0 // No love is to be found in a heart so twisted. diff --git a/code/modules/antagonists/revenant/revenant_blight.dm b/code/modules/antagonists/revenant/revenant_blight.dm index dcbc9bc8181fe..13a1ff7e1d606 100644 --- a/code/modules/antagonists/revenant/revenant_blight.dm +++ b/code/modules/antagonists/revenant/revenant_blight.dm @@ -19,7 +19,6 @@ if(affected_mob) affected_mob.remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, "#1d2953") if(affected_mob.dna && affected_mob.dna.species) - affected_mob.dna.species.handle_mutant_bodyparts(affected_mob) affected_mob.set_haircolor(null, override = TRUE) to_chat(affected_mob, span_notice("You feel better.")) ..() @@ -66,7 +65,6 @@ affected_mob.adjustStaminaLoss(22.5 * seconds_per_tick, updating_stamina = FALSE) new /obj/effect/temp_visual/revenant(affected_mob.loc) if(affected_mob.dna && affected_mob.dna.species) - affected_mob.dna.species.handle_mutant_bodyparts(affected_mob,"#1d2953") affected_mob.set_haircolor("#1d2953", override = TRUE) affected_mob.visible_message(span_warning("[affected_mob] looks terrifyingly gaunt..."), span_revennotice("You suddenly feel like your skin is wrong...")) affected_mob.add_atom_colour("#1d2953", TEMPORARY_COLOUR_PRIORITY) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 069cb20d2c22a..d15227b7313fc 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -278,7 +278,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if (istype(requested_preference, /datum/preference/name)) tainted_character_profiles = TRUE //SKYRAT EDIT - update_mutant_bodyparts(requested_preference) + update_body_parts(requested_preference) for (var/datum/preference_middleware/preference_middleware as anything in middleware) if (preference_middleware.post_set_preference(usr, requested_preference_key, value)) return TRUE diff --git a/code/modules/client/preferences/_preference.dm b/code/modules/client/preferences/_preference.dm index 8eca46525277a..cfba821725f24 100644 --- a/code/modules/client/preferences/_preference.dm +++ b/code/modules/client/preferences/_preference.dm @@ -111,10 +111,6 @@ GLOBAL_LIST_INIT(preference_entries_by_key, init_preference_entries_by_key()) /// DOES have random body on, will this already be randomized? var/randomize_by_default = TRUE - /// If the selected species has this in its /datum/species/mutant_bodyparts, - /// will show the feature as selectable. - var/relevant_mutant_bodypart = null - /// If the selected species has this in its /datum/species/body_markings, /// will show the feature as selectable. var/relevant_body_markings = null @@ -336,8 +332,8 @@ GLOBAL_LIST_INIT(preference_entries_by_key, init_preference_entries_by_key()) SHOULD_NOT_SLEEP(TRUE) if ( \ - !isnull(relevant_mutant_bodypart) \ - || !isnull(relevant_inherent_trait) \ + !isnull(relevant_inherent_trait) \ + || !isnull(relevant_mutant_bodypart) /* SKYRAT EDIT ADDITION - Since we still use relevant_mutant_bodypart, we need it here. */ \ || !isnull(relevant_external_organ) \ || !isnull(relevant_head_flag) \ || !isnull(relevant_body_markings) \ diff --git a/code/modules/client/preferences/species_features/felinid.dm b/code/modules/client/preferences/species_features/felinid.dm index 8bf49fac22789..2406f666c6b51 100644 --- a/code/modules/client/preferences/species_features/felinid.dm +++ b/code/modules/client/preferences/species_features/felinid.dm @@ -21,7 +21,7 @@ savefile_identifier = PREFERENCE_CHARACTER category = PREFERENCE_CATEGORY_SECONDARY_FEATURES can_randomize = FALSE - relevant_mutant_bodypart = "ears" + relevant_external_organ = /obj/item/organ/internal/ears/cat /datum/preference/choiced/ears/init_possible_values() return assoc_to_keys_features(SSaccessories.ears_list) diff --git a/code/modules/client/preferences/species_features/lizard.dm b/code/modules/client/preferences/species_features/lizard.dm index 2ae38c9ac67c5..2292e3f3e83f3 100644 --- a/code/modules/client/preferences/species_features/lizard.dm +++ b/code/modules/client/preferences/species_features/lizard.dm @@ -94,13 +94,51 @@ savefile_key = "feature_lizard_legs" savefile_identifier = PREFERENCE_CHARACTER category = PREFERENCE_CATEGORY_SECONDARY_FEATURES - relevant_mutant_bodypart = "legs" /datum/preference/choiced/lizard_legs/init_possible_values() - return assoc_to_keys_features(SSaccessories.legs_list) + return list(NORMAL_LEGS, DIGITIGRADE_LEGS) /datum/preference/choiced/lizard_legs/apply_to_human(mob/living/carbon/human/target, value) target.dna.features["legs"] = value + // Hack to update the dummy in the preference menu + // (Because digi legs are ONLY handled on species change) + if(!isdummy(target) || target.dna.species.digitigrade_customization == DIGITIGRADE_NEVER) + return + + var/list/correct_legs = target.dna.species.bodypart_overrides.Copy() & list(BODY_ZONE_R_LEG, BODY_ZONE_L_LEG) + + if(value == DIGITIGRADE_LEGS) + correct_legs[BODY_ZONE_R_LEG] = /obj/item/bodypart/leg/right/digitigrade + correct_legs[BODY_ZONE_L_LEG] = /obj/item/bodypart/leg/left/digitigrade + + for(var/obj/item/bodypart/old_part as anything in target.bodyparts) + if(old_part.change_exempt_flags & BP_BLOCK_CHANGE_SPECIES) + continue + + var/path = correct_legs[old_part.body_zone] + if(!path) + continue + var/obj/item/bodypart/new_part = new path() + new_part.replace_limb(target, TRUE) + new_part.update_limb(is_creating = TRUE) + qdel(old_part) + +/datum/preference/choiced/lizard_legs/is_accessible(datum/preferences/preferences) + if(!..()) + return FALSE + var/datum/species/species_type = preferences.read_preference(/datum/preference/choiced/species) + return initial(species_type.digitigrade_customization) == DIGITIGRADE_OPTIONAL + + +/datum/preference/choiced/lizard_legs/is_accessible(datum/preferences/preferences) + . = ..() + + if(!.) + return + + var/datum/species/species_type = preferences.read_preference(/datum/preference/choiced/species) + + return initial(species_type.digitigrade_customization) & DIGITIGRADE_OPTIONAL /datum/preference/choiced/lizard_snout savefile_key = "feature_lizard_snout" @@ -122,7 +160,7 @@ savefile_key = "feature_lizard_spines" savefile_identifier = PREFERENCE_CHARACTER category = PREFERENCE_CATEGORY_SECONDARY_FEATURES - relevant_mutant_bodypart = "spines" + relevant_external_organ = /obj/item/organ/external/spines /datum/preference/choiced/lizard_spines/init_possible_values() return assoc_to_keys_features(SSaccessories.spines_list) diff --git a/code/modules/client/preferences/species_features/mushperson.dm b/code/modules/client/preferences/species_features/mushperson.dm index 2ed5871307918..42ff286e7d176 100644 --- a/code/modules/client/preferences/species_features/mushperson.dm +++ b/code/modules/client/preferences/species_features/mushperson.dm @@ -3,7 +3,7 @@ savefile_key = "feature_mushperson_cap" savefile_identifier = PREFERENCE_CHARACTER category = PREFERENCE_CATEGORY_SECONDARY_FEATURES - relevant_mutant_bodypart = "cap" + relevant_external_organ = /obj/item/organ/external/mushroom_cap /datum/preference/choiced/mushroom_cap/init_possible_values() return assoc_to_keys_features(SSaccessories.caps_list) diff --git a/code/modules/experisci/experiment/experiments.dm b/code/modules/experisci/experiment/experiments.dm index 1ec229cd1cd1e..c9f4f1b3d1bd7 100644 --- a/code/modules/experisci/experiment/experiments.dm +++ b/code/modules/experisci/experiment/experiments.dm @@ -387,7 +387,7 @@ if (organ.type == target_species.get_mutant_organ_type_for_slot(organ.slot)) continue else - if ((organ.type in target_species.mutant_organs) || (organ.type in target_species.external_organs)) + if ((organ.type in target_species.mutant_organs)) continue return TRUE return FALSE diff --git a/code/modules/jobs/job_types/chaplain/chaplain_vorpal_scythe.dm b/code/modules/jobs/job_types/chaplain/chaplain_vorpal_scythe.dm index b6c36058d0884..e6f34b894b3de 100644 --- a/code/modules/jobs/job_types/chaplain/chaplain_vorpal_scythe.dm +++ b/code/modules/jobs/job_types/chaplain/chaplain_vorpal_scythe.dm @@ -10,7 +10,7 @@ If the scythe isn't empowered when you sheath it, you take a heap of damage and desc = "This shard seems to be directly linked to some sinister entity. It might be your god! It also gives you a really horrible rash when you hold onto it for too long." items_to_create = list(/obj/item/vorpalscythe) -/obj/item/organ/internal/cyberimp/arm/shard/scythe/Insert(mob/living/carbon/receiver, special, movement_flags) +/obj/item/organ/internal/cyberimp/arm/shard/scythe/mob_insert(mob/living/carbon/receiver, special, movement_flags) . = ..() if(receiver.mind) ADD_TRAIT(receiver.mind, TRAIT_MORBID, ORGAN_TRAIT) diff --git a/code/modules/mining/equipment/monster_organs/monster_organ.dm b/code/modules/mining/equipment/monster_organs/monster_organ.dm index 5a7c8caadbb1a..cf6131fa92258 100644 --- a/code/modules/mining/equipment/monster_organs/monster_organ.dm +++ b/code/modules/mining/equipment/monster_organs/monster_organ.dm @@ -36,7 +36,7 @@ icon = 'icons/obj/medical/organs/mining_organs.dmi' icon_state = "hivelord_core" actions_types = list(/datum/action/cooldown/monster_core_action) - visual = FALSE + item_flags = NOBLUDGEON slot = ORGAN_SLOT_MONSTER_CORE organ_flags = ORGAN_ORGANIC @@ -66,10 +66,9 @@ deltimer(decay_timer) return ..() -/obj/item/organ/internal/monster_core/Insert(mob/living/carbon/target_carbon, special = FALSE, movement_flags) +/obj/item/organ/internal/monster_core/mob_insert(mob/living/carbon/target_carbon, special = FALSE, movement_flags) . = ..() - if(!.) - return + if (inert) to_chat(target_carbon, span_notice("[src] breaks down as you try to insert it.")) qdel(src) @@ -80,7 +79,7 @@ target_carbon.visible_message(span_notice("[src] stabilizes as it's inserted.")) return TRUE -/obj/item/organ/internal/monster_core/Remove(mob/living/carbon/target_carbon, special, movement_flags) +/obj/item/organ/internal/monster_core/mob_remove(mob/living/carbon/target_carbon, special, movement_flags) if (!inert && !special) owner.visible_message(span_notice("[src] rapidly decays as it's removed.")) go_inert() diff --git a/code/modules/mob/living/carbon/alien/organs.dm b/code/modules/mob/living/carbon/alien/organs.dm index 6335326a1ad6a..ac9fd81cf976b 100644 --- a/code/modules/mob/living/carbon/alien/organs.dm +++ b/code/modules/mob/living/carbon/alien/organs.dm @@ -1,6 +1,5 @@ /obj/item/organ/internal/alien icon_state = "acid" - visual = FALSE food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/toxin/acid = 10) /obj/item/organ/internal/alien/plasmavessel @@ -222,11 +221,11 @@ stomach_contents -= source UnregisterSignal(source, list(COMSIG_MOVABLE_MOVED, COMSIG_LIVING_DEATH, COMSIG_QDELETING)) -/obj/item/organ/internal/stomach/alien/Insert(mob/living/carbon/stomach_owner, special, movement_flags) +/obj/item/organ/internal/stomach/alien/mob_insert(mob/living/carbon/stomach_owner, special, movement_flags) RegisterSignal(stomach_owner, COMSIG_ATOM_RELAYMOVE, PROC_REF(something_moved)) return ..() -/obj/item/organ/internal/stomach/alien/Remove(mob/living/carbon/stomach_owner, special, movement_flags) +/obj/item/organ/internal/stomach/alien/mob_remove(mob/living/carbon/stomach_owner, special, movement_flags) UnregisterSignal(stomach_owner, COMSIG_ATOM_RELAYMOVE) return ..() diff --git a/code/modules/mob/living/carbon/carbon_update_icons.dm b/code/modules/mob/living/carbon/carbon_update_icons.dm index b33cb91787aa5..9f09254f6f00d 100644 --- a/code/modules/mob/living/carbon/carbon_update_icons.dm +++ b/code/modules/mob/living/carbon/carbon_update_icons.dm @@ -52,13 +52,8 @@ overlays_standing[cache_index] = null SEND_SIGNAL(src, COMSIG_CARBON_REMOVE_OVERLAY, cache_index, I) -//used when putting/removing clothes that hide certain mutant body parts to just update those and not update the whole body. -/mob/living/carbon/human/proc/update_mutant_bodyparts() - dna?.species.handle_mutant_bodyparts(src) - update_body_parts() - /mob/living/carbon/update_body(is_creating = FALSE) - dna?.species.handle_body(src) //This calls `handle_mutant_bodyparts` which calls `update_mutant_bodyparts()`. Don't double call! + dna?.species.handle_body(src) update_body_parts(is_creating) /mob/living/carbon/on_changed_z_level(turf/old_turf, turf/new_turf, same_z_layer, notify_contents) diff --git a/code/modules/mob/living/carbon/human/_species.dm b/code/modules/mob/living/carbon/human/_species.dm index 51edbcac8e5d8..1ecf796d5b5ca 100644 --- a/code/modules/mob/living/carbon/human/_species.dm +++ b/code/modules/mob/living/carbon/human/_species.dm @@ -80,10 +80,8 @@ GLOBAL_LIST_EMPTY(features_by_species) BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right, BODY_ZONE_CHEST = /obj/item/bodypart/chest, ) - ///Internal organs that are unique to this race, like a tail. list(typepath of organ 1, typepath of organ 2) + ///Internal organs that are unique to this race, like a tail or other cosmetic organs. list(typepath of organ 1, typepath of organ 2 = "Round"). var/list/mutant_organs = list() - ///List of external organs to generate like horns, frills, wings, etc. list(typepath of organ = "Round Beautiful BDSM Snout"). Still WIP - var/list/external_organs = list() ///Replaces default brain with a different organ var/obj/item/organ/internal/brain/mutantbrain = /obj/item/organ/internal/brain ///Replaces default heart with a different organ @@ -282,7 +280,10 @@ GLOBAL_LIST_EMPTY(features_by_species) if(ORGAN_SLOT_STOMACH) return mutantstomach else - CRASH("Invalid organ slot [slot]") + // Non-standard organs we might have + for(var/obj/item/organ/extra_organ as anything in mutant_organs) + if(initial(extra_organ.slot) == slot) + return extra_organ /** * Corrects organs in a carbon, removing ones it doesn't need and adding ones it does. @@ -298,46 +299,33 @@ GLOBAL_LIST_EMPTY(features_by_species) * * visual_only - boolean, only load organs that change how the species looks. Do not use for normal gameplay stuff */ /datum/species/proc/regenerate_organs(mob/living/carbon/organ_holder, datum/species/old_species, replace_current = TRUE, list/excluded_zones, visual_only = FALSE) - //what should be put in if there is no mutantorgan (brains handled separately) - var/list/organ_slots = list( - ORGAN_SLOT_BRAIN, - ORGAN_SLOT_HEART, - ORGAN_SLOT_LUNGS, - ORGAN_SLOT_APPENDIX, - ORGAN_SLOT_EYES, - ORGAN_SLOT_EARS, - ORGAN_SLOT_TONGUE, - ORGAN_SLOT_LIVER, - ORGAN_SLOT_STOMACH, - ) - - for(var/slot in organ_slots) + for(var/slot in get_all_slots()) var/obj/item/organ/existing_organ = organ_holder.get_organ_slot(slot) var/obj/item/organ/new_organ = get_mutant_organ_type_for_slot(slot) + var/old_organ_type = old_species?.get_mutant_organ_type_for_slot(slot) - if(isnull(new_organ)) // if they aren't suppose to have an organ here, remove it - if(existing_organ) - existing_organ.Remove(organ_holder, special = TRUE) + // if we have an extra organ that before changing that the species didnt have, remove it + if(!new_organ) + if(existing_organ && (old_organ_type == existing_organ.type || replace_current)) + existing_organ.Remove(organ_holder) qdel(existing_organ) continue - // we don't want to remove organs that are not the default for this species - if(!isnull(existing_organ) && !remove_features) // SKYRAT EDIT - Fixes certain species lacking a tongue (Looks at abductor) - if(!isnull(old_species) && existing_organ.type != old_species.get_mutant_organ_type_for_slot(slot)) - continue - else if(!replace_current && existing_organ.type != get_mutant_organ_type_for_slot(slot)) + if(existing_organ) + // we dont want to remove organs that were not from the old species (such as from freak surgery or prosthetics) + if(existing_organ.type != old_organ_type && !replace_current) continue - // at this point we already know new_organ is not null - if(existing_organ?.type == new_organ) - continue // we don't want to remove organs that are the same as the new one + // we don't want to remove organs that are the same as the new one + if(existing_organ.type == new_organ) + continue - if(visual_only && !initial(new_organ.visual)) + if(visual_only && (!initial(new_organ.bodypart_overlay) && !initial(new_organ.visual))) continue var/used_neworgan = FALSE new_organ = SSwardrobe.provide_type(new_organ) - var/should_have = new_organ.get_availability(src, organ_holder) + var/should_have = new_organ.get_availability(src, organ_holder) && should_visual_organ_apply_to(new_organ, organ_holder) // Check for an existing organ, and if there is one check to see if we should remove it var/health_pct = 1 @@ -361,46 +349,6 @@ GLOBAL_LIST_EMPTY(features_by_species) if(!used_neworgan) QDEL_NULL(new_organ) - if(!isnull(old_species)) - for(var/mutant_organ in old_species.mutant_organs) - if(mutant_organ in mutant_organs) - continue // need this mutant organ, but we already have it! - - var/obj/item/organ/current_organ = organ_holder.get_organ_by_type(mutant_organ) - if(current_organ) - current_organ.Remove(organ_holder) - QDEL_NULL(current_organ) - - for(var/obj/item/organ/external/external_organ in organ_holder.organs) - // External organ checking. We need to check the external organs owned by the carbon itself, - // because we want to also remove ones not shared by its species. - // This should be done even if species was not changed. - if(external_organ in external_organs) - continue // Don't remove external organs this species is supposed to have. - - external_organ.Remove(organ_holder) - QDEL_NULL(external_organ) - - var/list/species_organs = mutant_organs + external_organs - for(var/organ_path in species_organs) - var/obj/item/organ/current_organ = organ_holder.get_organ_by_type(organ_path) - if(ispath(organ_path, /obj/item/organ/external) && !should_external_organ_apply_to(organ_path, organ_holder)) - if(!isnull(current_organ) && replace_current) - // if we have an organ here and we're replacing organs, remove it - current_organ.Remove(organ_holder) - QDEL_NULL(current_organ) - continue - - if(!current_organ || replace_current) - var/obj/item/organ/replacement = SSwardrobe.provide_type(organ_path) - // If there's an existing mutant organ, we're technically replacing it. - // Let's abuse the snowflake proc that skillchips added. Basically retains - // feature parity with every other organ too. - if(current_organ) - current_organ.before_organ_replacement(replacement) - // organ.Insert will qdel any current organs in that slot, so we don't need to. - replacement.Insert(organ_holder, special=TRUE, movement_flags = DELETE_IF_REPLACED) - /datum/species/proc/worn_items_fit_body_check(mob/living/carbon/wearer) for(var/obj/item/equipped_item in wearer.get_equipped_items(INCLUDE_POCKETS)) var/equipped_item_slot = wearer.get_slot_by_item(equipped_item) @@ -439,10 +387,7 @@ GLOBAL_LIST_EMPTY(features_by_species) if(old_species.type != type) replace_body(human_who_gained_species, src) - // BUBBER EDIT BEGIN - ORGAN REFACTOR - //regenerate_organs(human_who_gained_species, old_species, replace_current = FALSE, visual_only = human_who_gained_species.visual_only_organs) - regenerate_organs(human_who_gained_species, old_species, visual_only = human_who_gained_species.visual_only_organs) - // BUBBER EDIT END + regenerate_organs(human_who_gained_species, old_species, replace_current = human_who_gained_species.visual_only_organs, visual_only = human_who_gained_species.visual_only_organs) // SKYRAT EDIT - Allows existing organs to be properly removed when regenerating organs - ORIGINAL: regenerate_organs(human_who_gained_species, old_species, replace_current = FALSE, visual_only = human_who_gained_species.visual_only_organs) // Update locked slots AFTER all organ and body stuff is handled human_who_gained_species.hud_used?.update_locked_slots() // Drop the items the new species can't wear @@ -459,16 +404,6 @@ GLOBAL_LIST_EMPTY(features_by_species) //Resets blood if it is excessively high so they don't gib normalize_blood(human_who_gained_species) - if(ishuman(human_who_gained_species)) - var/mob/living/carbon/human/human = human_who_gained_species - for(var/obj/item/organ/external/organ_path as anything in external_organs) - if(!should_external_organ_apply_to(organ_path, human)) - continue - - //Load a persons preferences from DNA - var/obj/item/organ/external/new_organ = SSwardrobe.provide_type(organ_path) - new_organ.Insert(human, special=TRUE, movement_flags = DELETE_IF_REPLACED) - //add_body_markings(human_who_gained_species) // SKYRAT EDIT REMOVAL - We do this differently if(length(inherent_traits)) @@ -509,10 +444,6 @@ GLOBAL_LIST_EMPTY(features_by_species) for(var/X in inherent_traits) REMOVE_TRAIT(C, X, SPECIES_TRAIT) - for(var/obj/item/organ/external/organ in C.organs) - organ.Remove(C) - qdel(organ) - //If their inert mutation is not the same, swap it out if((inert_mutation != new_species.inert_mutation) && LAZYLEN(C.dna.mutation_index) && (inert_mutation in C.dna.mutation_index)) C.dna.remove_mutation(inert_mutation) @@ -546,7 +477,6 @@ GLOBAL_LIST_EMPTY(features_by_species) * Handles the body of a human * * Handles lipstick, having no eyes, eye color, undergarnments like underwear, undershirts, and socks, and body layers. - * Calls [handle_mutant_bodyparts][/datum/species/proc/handle_mutant_bodyparts] * Arguments: * * species_human - Human, whoever we're handling the body for */ @@ -555,7 +485,7 @@ GLOBAL_LIST_EMPTY(features_by_species) /datum/species/proc/handle_body(mob/living/carbon/human/species_human) species_human.remove_overlay(BODY_LAYER) if(HAS_TRAIT(species_human, TRAIT_INVISIBLE_MAN)) - return handle_mutant_bodyparts(species_human) + return var/list/standing = list() if(!HAS_TRAIT(species_human, TRAIT_HUSK)) @@ -600,106 +530,8 @@ GLOBAL_LIST_EMPTY(features_by_species) species_human.overlays_standing[BODY_LAYER] = standing species_human.apply_overlay(BODY_LAYER) - handle_mutant_bodyparts(species_human) - - - -/** - * Handles the mutant bodyparts of a human - * - * Handles the adding and displaying of, layers, colors, and overlays of mutant bodyparts and accessories. - * Handles digitigrade leg displaying and squishing. - * Arguments: - * * H - Human, whoever we're handling the body for - * * forced_colour - The forced color of an accessory. Leave null to use mutant color. - */ -/datum/species/proc/handle_mutant_bodyparts(mob/living/carbon/human/source, forced_colour) - var/list/bodyparts_to_add = mutant_bodyparts.Copy() - var/list/relevent_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER, BODY_FRONT_LAYER) - var/list/standing = list() - - source.remove_overlay(BODY_BEHIND_LAYER) - source.remove_overlay(BODY_ADJ_LAYER) - source.remove_overlay(BODY_FRONT_LAYER) - - if(!mutant_bodyparts || HAS_TRAIT(source, TRAIT_INVISIBLE_MAN)) - return - - var/obj/item/bodypart/head/noggin = source.get_bodypart(BODY_ZONE_HEAD) - - - if(mutant_bodyparts["ears"]) - if(!source.dna.features["ears"] || source.dna.features["ears"] == "None" || source.head && (source.head.flags_inv & HIDEHAIR) || (source.wear_mask && (source.wear_mask.flags_inv & HIDEHAIR)) || !noggin || IS_ROBOTIC_LIMB(noggin)) - bodyparts_to_add -= "ears" - - if(!bodyparts_to_add) - return - - var/g = (source.physique == FEMALE) ? "f" : "m" - - for(var/layer in relevent_layers) - var/layertext = mutant_bodyparts_layertext(layer) - - for(var/bodypart in bodyparts_to_add) - var/datum/sprite_accessory/accessory - switch(bodypart) - if("ears") - accessory = SSaccessories.ears_list[source.dna.features["ears"]] - if("legs") - accessory = SSaccessories.legs_list[source.dna.features["legs"]] - - if(!accessory || accessory.icon_state == "none") - continue - - var/mutable_appearance/accessory_overlay = mutable_appearance(accessory.icon, layer = -layer) - - if(accessory.gender_specific) - accessory_overlay.icon_state = "[g]_[bodypart]_[accessory.icon_state]_[layertext]" - else - accessory_overlay.icon_state = "m_[bodypart]_[accessory.icon_state]_[layertext]" - - if(accessory.em_block) - accessory_overlay.overlays += emissive_blocker(accessory_overlay.icon, accessory_overlay.icon_state, source, accessory_overlay.alpha) - - if(accessory.center) - accessory_overlay = center_image(accessory_overlay, accessory.dimension_x, accessory.dimension_y) - - if(!(HAS_TRAIT(source, TRAIT_HUSK))) - if(!forced_colour) - switch(accessory.color_src) - if(MUTANT_COLOR) - accessory_overlay.color = fixed_mut_color || source.dna.features["mcolor"] - if(HAIR_COLOR) - accessory_overlay.color = get_fixed_hair_color(source) || source.hair_color - if(FACIAL_HAIR_COLOR) - accessory_overlay.color = get_fixed_hair_color(source) || source.facial_hair_color - if(EYE_COLOR) - accessory_overlay.color = source.eye_color_left - else - accessory_overlay.color = forced_colour - standing += accessory_overlay - - if(accessory.hasinner) - var/mutable_appearance/inner_accessory_overlay = mutable_appearance(accessory.icon, layer = -layer) - if(accessory.gender_specific) - inner_accessory_overlay.icon_state = "[g]_[bodypart]inner_[accessory.icon_state]_[layertext]" - else - inner_accessory_overlay.icon_state = "m_[bodypart]inner_[accessory.icon_state]_[layertext]" - - if(accessory.center) - inner_accessory_overlay = center_image(inner_accessory_overlay, accessory.dimension_x, accessory.dimension_y) - - standing += inner_accessory_overlay - - source.overlays_standing[layer] = standing.Copy() - standing = list() - - source.apply_overlay(BODY_BEHIND_LAYER) - source.apply_overlay(BODY_ADJ_LAYER) - source.apply_overlay(BODY_FRONT_LAYER) - - update_body_markings(source) -*/ + update_body_markings(species_human) + */ //SKYRAT EDIT REMOVAL END //This exists so sprite accessories can still be per-layer without having to include that layer's @@ -750,7 +582,9 @@ GLOBAL_LIST_EMPTY(features_by_species) var/list/new_features = list() var/static/list/organs_to_randomize = list() - for(var/obj/item/organ/external/organ_path as anything in external_organs) + for(var/obj/item/organ/organ_path as anything in mutant_organs) + if(!organ_path.bodypart_overlay) + continue var/overlay_path = initial(organ_path.bodypart_overlay) var/datum/bodypart_overlay/mutant/sample_overlay = organs_to_randomize[overlay_path] if(isnull(sample_overlay)) @@ -1610,20 +1444,14 @@ GLOBAL_LIST_EMPTY(features_by_species) for (var/preference_type in GLOB.preference_entries) var/datum/preference/preference = GLOB.preference_entries[preference_type] if ( \ -// BUBBER EDIT OR BEGIN - (preference.relevant_mutant_bodypart in mutant_bodyparts) \ - || (preference.relevant_inherent_trait in inherent_traits) \ - || (preference.relevant_external_organ in external_organs) \ -// NEW (preference.relevant_inherent_trait in inherent_traits) \ || (preference.relevant_external_organ in get_mut_organs()) \ -// BUBBER EDIT OR END || (preference.relevant_head_flag && check_head_flags(preference.relevant_head_flag)) \ || (preference.relevant_body_markings in body_markings) \ ) features += preference.savefile_key - for (var/obj/item/organ/external/organ_type as anything in external_organs) + for (var/obj/item/organ/organ_type as anything in mutant_organs) var/preference = initial(organ_type.preference) if (!isnull(preference)) features += preference @@ -1670,13 +1498,24 @@ GLOBAL_LIST_EMPTY(features_by_species) /datum/species/proc/get_snore_sound(mob/living/carbon/human/human) return -// BUBBER EDIT - OR BEGIN +/datum/species/proc/get_mut_organs(include_brain = TRUE) + var/list/mut_organs = list() + mut_organs += mutant_organs + if (include_brain) + mut_organs += mutantbrain + mut_organs += mutantheart + mut_organs += mutantlungs + mut_organs += mutanteyes + mut_organs += mutantears + mut_organs += mutanttongue + mut_organs += mutantliver + mut_organs += mutantstomach + mut_organs += mutantappendix + list_clear_nulls(mut_organs) + return mut_organs + /datum/species/proc/get_types_to_preload() - var/list/to_store = list() - to_store += mutant_organs - for(var/obj/item/organ/external/horny as anything in external_organs) - to_store += horny //Haha get it? - return to_store + return get_mut_organs(FALSE) /* /datum/species/proc/get_mut_organs(include_brain = TRUE) @@ -2296,6 +2135,10 @@ GLOBAL_LIST_EMPTY(features_by_species) /// Update the overlays if necessary /datum/species/proc/update_body_markings(mob/living/carbon/human/hooman) + if(HAS_TRAIT(hooman, TRAIT_INVISIBLE_MAN)) + remove_body_markings(hooman) + return + var/needs_update = FALSE for(var/datum/bodypart_overlay/simple/body_marking/marking as anything in body_markings) if(initial(marking.dna_feature_key) == body_markings[marking]) // dna is same as our species (sort of mini-cache), so no update needed diff --git a/code/modules/mob/living/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm index 2a0704d3181e6..d9f1251de19bc 100644 --- a/code/modules/mob/living/carbon/human/human_update_icons.dm +++ b/code/modules/mob/living/carbon/human/human_update_icons.dm @@ -159,10 +159,9 @@ There are several things that need to be remembered: my_chest?.worn_uniform_offset?.apply_offset(uniform_overlay) overlays_standing[UNIFORM_LAYER] = uniform_overlay - + update_body_parts() apply_overlay(UNIFORM_LAYER) check_body_shape(BODYSHAPE_DIGITIGRADE, ITEM_SLOT_ICLOTHING) - update_mutant_bodyparts() /mob/living/carbon/human/update_worn_id(update_obscured = TRUE) remove_overlay(ID_LAYER) @@ -602,13 +601,11 @@ There are several things that need to be remembered: my_chest?.worn_suit_offset?.apply_offset(suit_overlay) // SKYRAT EDIT END overlays_standing[SUIT_LAYER] = suit_overlay - update_body_parts() - update_mutant_bodyparts() + update_body_parts() apply_overlay(SUIT_LAYER) check_body_shape(BODYSHAPE_DIGITIGRADE, ITEM_SLOT_OCLOTHING) - /mob/living/carbon/human/update_pockets() if(client && hud_used) var/atom/movable/screen/inventory/inv @@ -677,7 +674,7 @@ There are several things that need to be remembered: apply_overlay(FACEMASK_LAYER) check_body_shape(BODYSHAPE_SNOUTED, ITEM_SLOT_MASK) - update_mutant_bodyparts() //e.g. upgate needed because mask now hides lizard snout + update_body_parts() //e.g. upgate needed because mask now hides lizard snout /mob/living/carbon/human/update_worn_back(update_obscured = TRUE) remove_overlay(BACK_LAYER) diff --git a/code/modules/mob/living/carbon/human/species_types/dullahan.dm b/code/modules/mob/living/carbon/human/species_types/dullahan.dm index 1d7c328f88232..d4dea2abfcc6a 100644 --- a/code/modules/mob/living/carbon/human/species_types/dullahan.dm +++ b/code/modules/mob/living/carbon/human/species_types/dullahan.dm @@ -19,7 +19,6 @@ BODY_ZONE_CHEST = /obj/item/bodypart/chest, ) inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID - mutant_bodyparts = list("wings" = "None") mutantbrain = /obj/item/organ/internal/brain/dullahan mutanteyes = /obj/item/organ/internal/eyes/dullahan mutanttongue = /obj/item/organ/internal/tongue/dullahan diff --git a/code/modules/mob/living/carbon/human/species_types/felinid.dm b/code/modules/mob/living/carbon/human/species_types/felinid.dm index 7f9dc0feafb06..10d4d351092e8 100644 --- a/code/modules/mob/living/carbon/human/species_types/felinid.dm +++ b/code/modules/mob/living/carbon/human/species_types/felinid.dm @@ -3,12 +3,11 @@ name = "Felinid" id = SPECIES_FELINE examine_limb_id = SPECIES_HUMAN - mutant_bodyparts = list("ears" = "Cat", "wings" = "None") mutantbrain = /obj/item/organ/internal/brain/felinid mutanttongue = /obj/item/organ/internal/tongue/cat /* SKYRAT EDIT REMOVAL - CUSTOMIZATION mutantears = /obj/item/organ/internal/ears/cat - external_organs = list( + mutant_organs = list( /obj/item/organ/external/tail/cat = "Cat", ) */ // SKYRAT EDIT REMOVAL END @@ -165,7 +164,7 @@ // stored_feature_id is only set once (the first time an organ is inserted), so this should be safe. var/obj/item/organ/internal/ears/cat/kitty_ears = new kitty_ears.Insert(soon_to_be_felinid, special = TRUE, movement_flags = DELETE_IF_REPLACED) - if(should_external_organ_apply_to(/obj/item/organ/external/tail/cat, soon_to_be_felinid)) //only give them a tail if they actually have sprites for it / are a compatible subspecies. + if(should_visual_organ_apply_to(/obj/item/organ/external/tail/cat, soon_to_be_felinid)) //only give them a tail if they actually have sprites for it / are a compatible subspecies. var/obj/item/organ/external/tail/cat/kitty_tail = new kitty_tail.Insert(soon_to_be_felinid, special = TRUE, movement_flags = DELETE_IF_REPLACED) @@ -188,8 +187,8 @@ old_tail.Remove(purrbated_human, special = TRUE) qdel(old_tail) // Locate does not work on assoc lists, so we do it by hand - for(var/external_organ in target_species.external_organs) - if(!should_external_organ_apply_to(external_organ, purrbated_human)) + for(var/external_organ in target_species.mutant_organs) + if(!should_visual_organ_apply_to(external_organ, purrbated_human)) continue if(ispath(external_organ, /obj/item/organ/external/tail)) var/obj/item/organ/external/tail/new_tail = new external_organ() diff --git a/code/modules/mob/living/carbon/human/species_types/humans.dm b/code/modules/mob/living/carbon/human/species_types/humans.dm index 49714b7a30fd3..e63dd0a4d14a9 100644 --- a/code/modules/mob/living/carbon/human/species_types/humans.dm +++ b/code/modules/mob/living/carbon/human/species_types/humans.dm @@ -4,7 +4,6 @@ inherent_traits = list( TRAIT_USES_SKINTONES, ) - mutant_bodyparts = list("wings" = "None") skinned_type = /obj/item/stack/sheet/animalhide/human changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT // payday_modifier = 1 // BUBBER DUMB SHIT REMOVAL diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index 609f41ab7ca53..fe3412245cdff 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -7,9 +7,8 @@ TRAIT_MUTANT_COLORS, ) inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_REPTILE - mutant_bodyparts = list("body_markings" = "None", "legs" = "Normal Legs") // SKYRAT EDIT CHANGE - ORIGINAL: mutant_bodyparts = list("legs" = "Normal Legs") - //body_markings = list(/datum/bodypart_overlay/simple/body_marking/lizard = "None") // SKYRAT EDIT REMOVAL - We do this our own way - external_organs = list( + mutant_bodyparts = list("body_markings" = "None", "legs" = "Normal Legs") // SKYRAT EDIT CHANGE - ORIGINAL: body_markings = list(/datum/bodypart_overlay/simple/body_marking/lizard = "None") + mutant_organs = list( /obj/item/organ/external/horns = "None", /obj/item/organ/external/frills = "None", /obj/item/organ/external/snout = "Round", diff --git a/code/modules/mob/living/carbon/human/species_types/monkeys.dm b/code/modules/mob/living/carbon/human/species_types/monkeys.dm index 64f10dc0455bb..922bfacc8a53b 100644 --- a/code/modules/mob/living/carbon/human/species_types/monkeys.dm +++ b/code/modules/mob/living/carbon/human/species_types/monkeys.dm @@ -3,7 +3,7 @@ /datum/species/monkey name = "\improper Monkey" id = SPECIES_MONKEY - external_organs = list( + mutant_organs = list( /obj/item/organ/external/tail/monkey = "Monkey", ) mutanttongue = /obj/item/organ/internal/tongue/monkey diff --git a/code/modules/mob/living/carbon/human/species_types/mothmen.dm b/code/modules/mob/living/carbon/human/species_types/mothmen.dm index 794621cf874eb..2045b9b0643a9 100644 --- a/code/modules/mob/living/carbon/human/species_types/mothmen.dm +++ b/code/modules/mob/living/carbon/human/species_types/mothmen.dm @@ -4,7 +4,7 @@ id = SPECIES_MOTH inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BUG mutant_bodyparts = list("moth_markings" = "None") // SKYRAT EDIT CHANGE - ORIGINAL: body_markings = list(/datum/bodypart_overlay/simple/body_marking/moth = "None") - // external_organs = list(/obj/item/organ/external/wings/moth = "Plain", /obj/item/organ/external/antennae = "Plain") // SKYRAT EDIT REMOVAL - Fixing moths + //mutant_organs = list(/obj/item/organ/external/wings/moth = "Plain", /obj/item/organ/external/antennae = "Plain") // SKYRAT EDIT REMOVAL - Fixing moths meat = /obj/item/food/meat/slab/human/mutant/moth mutanttongue = /obj/item/organ/internal/tongue/moth mutanteyes = /obj/item/organ/internal/eyes/moth @@ -24,12 +24,6 @@ BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/moth, ) -/datum/species/moth/regenerate_organs(mob/living/carbon/C, datum/species/old_species, replace_current= TRUE, list/excluded_zones, visual_only) - . = ..() - if(ishuman(C)) - var/mob/living/carbon/human/H = C - handle_mutant_bodyparts(H) - /datum/species/moth/on_species_gain(mob/living/carbon/human/human_who_gained_species, datum/species/old_species, pref_load) . = ..() RegisterSignal(human_who_gained_species, COMSIG_MOB_APPLY_DAMAGE_MODIFIERS, PROC_REF(damage_weakness)) diff --git a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm index 99eb0d756c897..9cf63ea040839 100644 --- a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm @@ -6,7 +6,7 @@ fixed_mut_color = "#DBBF92" - external_organs = list(/obj/item/organ/external/mushroom_cap = "Round") + mutant_organs = list(/obj/item/organ/external/mushroom_cap = "Round") inherent_traits = list( TRAIT_MUTANT_COLORS, diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm index 38e75704795da..83ce525ec8312 100644 --- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm @@ -7,7 +7,7 @@ TRAIT_MUTANT_COLORS, TRAIT_PLANT_SAFE, ) - external_organs = list( + mutant_organs = list( // /obj/item/organ/external/pod_hair = "None", // SKYRAT EDIT REMOVAL - Customization (it messes up unit tests.) ) inherent_biotypes = MOB_ORGANIC | MOB_HUMANOID | MOB_PLANT diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm index dd0315174e5e0..adae4b01e06d5 100644 --- a/code/modules/mob/living/carbon/human/species_types/vampire.dm +++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm @@ -16,7 +16,6 @@ TRAIT_NO_MIRROR_REFLECTION, ) inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID - mutant_bodyparts = list("wings" = "None") changesource_flags = MIRROR_BADMIN | WABBAJACK | ERT_SPAWN exotic_bloodtype = "U" blood_deficiency_drain_rate = BLOOD_DEFICIENCY_MODIFIER // vampires already passively lose blood, so this just makes them lose it slightly more quickly when they have blood deficiency. diff --git a/code/modules/mod/modules/modules_medical.dm b/code/modules/mod/modules/modules_medical.dm index 397945f41ef79..a0cf2408860d0 100644 --- a/code/modules/mod/modules/modules_medical.dm +++ b/code/modules/mod/modules/modules_medical.dm @@ -223,8 +223,7 @@ organ_evacced.Remove(target, special = TRUE) organ_evacced.forceMove(get_turf(target)) - if (!organ.Insert(target)) - organ.forceMove(drop_location()) + organ.Insert(target) organ = null ///Patrient Transport - Generates hardlight bags you can put people in. diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index c9dc7fd9c7638..5d594986a69c1 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -254,7 +254,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) QDEL_NULL(radio) QDEL_NULL(countdown) if(is_main_engine && GLOB.main_supermatter_engine == src) - SSpersistence.reset_delam_counter() // NOVA EDIT ADDITION BEGIN - DELAM SCRAM + SSpersistence.reset_delam_counter() // SKYRAT EDIT ADDITION BEGIN - DELAM SCRAM GLOB.main_supermatter_engine = null QDEL_NULL(soundloop) return ..() diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm index 3d981e9751a12..b8883c8b97bcb 100644 --- a/code/modules/surgery/bodyparts/_bodyparts.dm +++ b/code/modules/surgery/bodyparts/_bodyparts.dm @@ -987,12 +987,15 @@ if(owner_species && owner_species.specific_alpha != 255) alpha = owner_species.specific_alpha - markings = LAZYCOPY(owner_species.body_markings[body_zone]) - if(aux_zone) - aux_zone_markings = LAZYCOPY(owner_species.body_markings[aux_zone]) - markings_alpha = owner_species.markings_alpha + if(body_zone in owner_species.body_markings) + markings = LAZYCOPY(owner_species.body_markings[body_zone]) + if(aux_zone && (aux_zone in owner_species.body_markings)) + aux_zone_markings = LAZYCOPY(owner_species.body_markings[aux_zone]) + markings_alpha = owner_species.markings_alpha + else + markings = list() // SKYRAT EDIT END - recolor_external_organs() + recolor_bodypart_overlays() return TRUE //to update the bodypart's icon when not attached to a mob @@ -1364,7 +1367,7 @@ QDEL_NULL(current_gauze) ///Loops through all of the bodypart's external organs and update's their color. -/obj/item/bodypart/proc/recolor_external_organs() +/obj/item/bodypart/proc/recolor_bodypart_overlays() for(var/datum/bodypart_overlay/mutant/overlay in bodypart_overlays) overlay.inherit_color(src, force = TRUE) diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm index 7cd956b5dcc57..01ef3b3737c5d 100644 --- a/code/modules/surgery/bodyparts/dismemberment.dm +++ b/code/modules/surgery/bodyparts/dismemberment.dm @@ -412,12 +412,12 @@ qdel(phantom_loss) //Copied from /datum/species/proc/on_species_gain() - for(var/obj/item/organ/external/organ_path as anything in dna.species.external_organs) + for(var/obj/item/organ/organ_path as anything in dna.species.mutant_organs) //Load a persons preferences from DNA var/zone = initial(organ_path.zone) if(zone != limb_zone) continue - var/obj/item/organ/external/new_organ = SSwardrobe.provide_type(organ_path) + var/obj/item/organ/new_organ = SSwardrobe.provide_type(organ_path) new_organ.Insert(src) update_body_parts() diff --git a/code/modules/surgery/bodyparts/helpers.dm b/code/modules/surgery/bodyparts/helpers.dm index 8833f87e28ee8..dec8efb154eae 100644 --- a/code/modules/surgery/bodyparts/helpers.dm +++ b/code/modules/surgery/bodyparts/helpers.dm @@ -182,8 +182,8 @@ /mob/living/carbon/proc/synchronize_bodytypes() var/all_limb_flags = NONE for(var/obj/item/bodypart/limb as anything in bodyparts) - for(var/obj/item/organ/external/ext_organ in limb) - all_limb_flags |= ext_organ.external_bodytypes + for(var/obj/item/organ/organ in limb) + all_limb_flags |= organ.external_bodytypes all_limb_flags |= limb.bodytype bodytype = all_limb_flags @@ -192,8 +192,8 @@ /mob/living/carbon/proc/synchronize_bodyshapes() var/all_limb_flags = NONE for(var/obj/item/bodypart/limb as anything in bodyparts) - for(var/obj/item/organ/external/ext_organ in limb) - all_limb_flags |= ext_organ.external_bodyshapes + for(var/obj/item/organ/organ in limb) + all_limb_flags |= organ.external_bodyshapes all_limb_flags |= limb.bodyshape bodyshape = all_limb_flags diff --git a/code/modules/surgery/organ_manipulation.dm b/code/modules/surgery/organ_manipulation.dm index 7e0f5c29b8ec3..6817f3592a3d1 100644 --- a/code/modules/surgery/organ_manipulation.dm +++ b/code/modules/surgery/organ_manipulation.dm @@ -252,22 +252,20 @@ tool = tool.contents[1] target_organ = tool user.temporarilyRemoveItemFromInventory(target_organ, TRUE) - if(target_organ.Insert(target)) - if(apparatus) - apparatus.icon_state = initial(apparatus.icon_state) - apparatus.desc = initial(apparatus.desc) - apparatus.cut_overlays() - display_results( - user, - target, - span_notice("You insert [tool] into [target]'s [target.parse_zone_with_bodypart(target_zone)]."), - span_notice("[user] inserts [tool] into [target]'s [target.parse_zone_with_bodypart(target_zone)]!"), - span_notice("[user] inserts something into [target]'s [target.parse_zone_with_bodypart(target_zone)]!"), - ) - display_pain(target, "Your [target.parse_zone_with_bodypart(target_zone)] throbs with pain as your new [tool.name] comes to life!") - target_organ.on_surgical_insertion(user, target, target_zone, tool) - else - target_organ.forceMove(target.loc) + target_organ.Insert(target) + if(apparatus) + apparatus.icon_state = initial(apparatus.icon_state) + apparatus.desc = initial(apparatus.desc) + apparatus.cut_overlays() + display_results( + user, + target, + span_notice("You insert [tool] into [target]'s [target.parse_zone_with_bodypart(target_zone)]."), + span_notice("[user] inserts [tool] into [target]'s [target.parse_zone_with_bodypart(target_zone)]!"), + span_notice("[user] inserts something into [target]'s [target.parse_zone_with_bodypart(target_zone)]!"), + ) + display_pain(target, "Your [target.parse_zone_with_bodypart(target_zone)] throbs with pain as your new [tool.name] comes to life!") + target_organ.on_surgical_insertion(user, target, target_zone, tool) else if(current_type == "extract") if(target_organ && target_organ.owner == target) diff --git a/code/modules/surgery/organs/_organ.dm b/code/modules/surgery/organs/_organ.dm index a0eabfd4b0387..8584ee16eb1d2 100644 --- a/code/modules/surgery/organs/_organ.dm +++ b/code/modules/surgery/organs/_organ.dm @@ -1,4 +1,3 @@ - /obj/item/organ name = "organ" icon = 'icons/obj/medical/organs/organs.dmi' @@ -79,6 +78,9 @@ INITIALIZE_IMMEDIATE(/obj/item/organ) volume = reagent_vol,\ after_eat = CALLBACK(src, PROC_REF(OnEatFrom))) + if(bodypart_overlay) + setup_bodypart_overlay() + /obj/item/organ/Destroy() if(bodypart_owner && !owner && !QDELETED(bodypart_owner)) bodypart_remove(bodypart_owner) @@ -140,7 +142,7 @@ INITIALIZE_IMMEDIATE(/obj/item/organ) return /obj/item/organ/proc/on_life(seconds_per_tick, times_fired) - CRASH("Oh god oh fuck something is calling parent organ life") + return /obj/item/organ/examine(mob/user) . = ..() @@ -356,8 +358,7 @@ INITIALIZE_IMMEDIATE(/obj/item/organ) /obj/item/organ/proc/replace_into(mob/living/carbon/new_owner) // BUBBER EDIT - OR BEGIN return Insert(new_owner, special = TRUE, movement_flags = DELETE_IF_REPLACED) -/* - Insert(new_owner, special = TRUE, movement_flags = DELETE_IF_REPLACED) + //Insert(new_owner, special = TRUE, movement_flags = DELETE_IF_REPLACED) /// Get all possible organ slots by checking every organ, and then store it and give it whenever needed @@ -371,4 +372,3 @@ INITIALIZE_IMMEDIATE(/obj/item/organ) all_organ_slots |= initial(an_organ.slot) return all_organ_slots -*/ // BUBBER EDIT - OR END diff --git a/code/modules/surgery/organs/external/_external_organ.dm b/code/modules/surgery/organs/external/_visual_organs.dm similarity index 74% rename from code/modules/surgery/organs/external/_external_organ.dm rename to code/modules/surgery/organs/external/_visual_organs.dm index ee731bf9f62f5..bb22cd357dcb6 100644 --- a/code/modules/surgery/organs/external/_external_organ.dm +++ b/code/modules/surgery/organs/external/_visual_organs.dm @@ -1,19 +1,11 @@ -/** -* System for drawing organs with overlays. These overlays are drawn directly on the bodypart, attached to a person or not -* Works in tandem with the /datum/sprite_accessory datum to generate sprites -* Unlike normal organs, we're actually inside a persons limbs at all times +/* +System for drawing organs with overlays. These overlays are drawn directly on the bodypart, attached to a person or not +Works in tandem with the /datum/sprite_accessory datum to generate sprites +Unlike normal organs, we're actually inside a persons limbs at all times */ -/obj/item/organ/external - name = "external organ" - desc = "An external organ that is too external." - - organ_flags = ORGAN_ORGANIC | ORGAN_EDIBLE - visual = TRUE - +/obj/item/organ ///The overlay datum that actually draws stuff on the limb var/datum/bodypart_overlay/mutant/bodypart_overlay - ///If not null, overrides the appearance with this sprite accessory datum - var/sprite_accessory_override /// The savefile_key of the preference this relates to. Used for the preferences UI. var/preference @@ -23,28 +15,24 @@ ///Set to EXTERNAL_BEHIND, EXTERNAL_FRONT or EXTERNAL_ADJACENT if you want to draw one of those layers as the object sprite. FALSE to use your own ///This will not work if it doesn't have a limb to generate its icon with var/use_mob_sprite_as_obj_sprite = FALSE + ///Does this organ have any bodytypes to pass to its bodypart_owner? var/external_bodytypes = NONE ///Does this organ have any bodyshapes to pass to its bodypart_owner? var/external_bodyshapes = NONE + ///Which flags does a 'modification tool' need to have to restyle us, if it all possible (located in code/_DEFINES/mobs) var/restyle_flags = NONE -// BUBBER EDIT - OR BEGIN -/**mob_sprite is optional if you havent set sprite_datums for the object, and is used mostly to generate sprite_datums from a persons DNA -// OR NEW BELOW ///If not null, overrides the appearance with this sprite accessory datum var/sprite_accessory_override /**accessory_type is optional if you haven't set sprite_datums for the object, and is used mostly to generate sprite_datums from a persons DNA -*/ // BUBBER EDIT - OR END * For _mob_sprite we make a distinction between "Round Snout" and "round". Round Snout is the name of the sprite datum, while "round" would be part of the sprite * I'm sorry */ -/obj/item/organ/external/Initialize(mapload, accessory_type) - . = ..() - - bodypart_overlay = new bodypart_overlay() +/obj/item/organ/proc/setup_bodypart_overlay(accessory_type) + bodypart_overlay = new bodypart_overlay(src) // cache_key = jointext(generate_icon_cache(), "_") // SKYRAT EDIT - Species stuff that Goofball ported from /tg/, apparently. Commented for now, to see if I can make it work without it. // SKYRAT EDIT: we have like 145+ fucking dna blocks lmao @@ -66,73 +54,13 @@ if(restyle_flags) RegisterSignal(src, COMSIG_ATOM_RESTYLE, PROC_REF(on_attempt_feature_restyle)) -/obj/item/organ/external/Insert(mob/living/carbon/receiver, special, movement_flags) - . = ..() - receiver.update_body_parts() - -/obj/item/organ/external/Remove(mob/living/carbon/organ_owner, special, movement_flags) - // SKYRAT EDIT ADDITION START - if(mutantpart_key) - transfer_mutantpart_info(organ_owner, special) - // SKYRAT EDIT ADDITION END - . = ..() - if(!special) - organ_owner.update_body_parts() - -/obj/item/organ/external/mob_insert(mob/living/carbon/receiver, special, movement_flags) - if(!should_external_organ_apply_to(type, receiver)) - stack_trace("adding a [type] to a [receiver.type] when it shouldn't be!") - - . = ..() - - if(!.) - return - - // SKYRAT EDIT ADDITION START - if(mutantpart_key) - copy_to_mutant_bodyparts(receiver, special) - // SKYRAT EDIT ADDITION END - if(bodypart_overlay.imprint_on_next_insertion) //We only want this set *once* - var/feature_name = receiver.dna.features[bodypart_overlay.feature_key] - if (isnull(feature_name)) - if(!bodypart_overlay.set_appearance_from_dna(receiver.dna)) // SKYRAT EDIT CHANGE - ORIGINAL: feature_name = receiver.dna.species.external_organs[type] - bodypart_overlay.set_appearance_from_name(receiver.dna.species.external_organs[type]) // SKYRAT EDIT ADDITION - // SKYRAT EDIT CHANGE START - Puts the following line in an else block - else - bodypart_overlay.set_appearance_from_name(feature_name) - // SKYRAT EDIT CHANGE END - bodypart_overlay.imprint_on_next_insertion = FALSE - - if(external_bodytypes) - receiver.synchronize_bodytypes() - if(external_bodyshapes) - receiver.synchronize_bodyshapes() - - receiver.update_body_parts() - -/obj/item/organ/external/mob_remove(mob/living/carbon/organ_owner, special, moving) - if(!special) - organ_owner.synchronize_bodytypes() - organ_owner.synchronize_bodyshapes() - organ_owner.update_body_parts() - return ..() - -/obj/item/organ/external/on_bodypart_insert(obj/item/bodypart/bodypart) - bodypart.add_bodypart_overlay(bodypart_overlay) - return ..() - -/obj/item/organ/external/on_bodypart_remove(obj/item/bodypart/bodypart) - bodypart.remove_bodypart_overlay(bodypart_overlay) - - if(use_mob_sprite_as_obj_sprite) - update_appearance(UPDATE_OVERLAYS) - - color = bodypart_overlay.draw_color // so a pink felinid doesn't drop a gray tail - return ..() +/// Some sanity checks, but mostly to check if the person has their preference/dna set to load +/proc/should_visual_organ_apply_to(obj/item/organ/organpath, mob/living/carbon/target) + if(!initial(organpath.bodypart_overlay)) + return TRUE -/proc/should_external_organ_apply_to(obj/item/organ/external/organpath, mob/living/carbon/target) if(isnull(organpath) || isnull(target)) - stack_trace("passed a null path or mob to 'should_external_organ_apply_to'") + stack_trace("passed a null path or mob to 'should_visual_organ_apply_to'") return FALSE var/datum/bodypart_overlay/mutant/bodypart_overlay = initial(organpath.bodypart_overlay) @@ -145,7 +73,7 @@ return FALSE ///Update our features after something changed our appearance -/obj/item/organ/external/proc/mutate_feature(features, mob/living/carbon/human/human) +/obj/item/organ/proc/mutate_feature(features, mob/living/carbon/human/human) if(!dna_block) return @@ -154,7 +82,7 @@ bodypart_overlay.set_appearance_from_name(feature_list[deconstruct_block(get_uni_feature_block(features, dna_block), feature_list.len)]) ///If you need to change an external_organ for simple one-offs, use this. Pass the accessory type : /datum/accessory/something -/obj/item/organ/external/proc/simple_change_sprite(accessory_type) +/obj/item/organ/proc/simple_change_sprite(accessory_type) var/datum/sprite_accessory/typed_accessory = accessory_type //we only take types for maintainability bodypart_overlay.set_appearance(typed_accessory) @@ -165,10 +93,7 @@ bodypart_owner.update_icon_dropped() //else if(use_mob_sprite_as_obj_sprite) //are we out in the world, unprotected by flesh? -/obj/item/organ/external/on_life(seconds_per_tick, times_fired) - return - -/obj/item/organ/external/update_overlays() +/obj/item/organ/update_overlays() . = ..() if(!use_mob_sprite_as_obj_sprite) @@ -283,17 +208,16 @@ ///Store our old datum here for if our antennae are healed var/original_sprite_datum -/obj/item/organ/external/antennae/Insert(mob/living/carbon/receiver, special, movement_flags) +/obj/item/organ/external/antennae/mob_insert(mob/living/carbon/receiver, special, movement_flags) . = ..() - if(!.) - return + RegisterSignal(receiver, COMSIG_HUMAN_BURNING, PROC_REF(try_burn_antennae)) RegisterSignal(receiver, COMSIG_LIVING_POST_FULLY_HEAL, PROC_REF(heal_antennae)) -/obj/item/organ/external/antennae/Remove(mob/living/carbon/organ_owner, special, movement_flags) +/obj/item/organ/external/antennae/mob_remove(mob/living/carbon/organ_owner, special, movement_flags) . = ..() - if(organ_owner) - UnregisterSignal(organ_owner, list(COMSIG_HUMAN_BURNING, COMSIG_LIVING_POST_FULLY_HEAL)) + + UnregisterSignal(organ_owner, list(COMSIG_HUMAN_BURNING, COMSIG_LIVING_POST_FULLY_HEAL)) ///check if our antennae can burn off ;_; /obj/item/organ/external/antennae/proc/try_burn_antennae(mob/living/carbon/human/human) diff --git a/code/modules/surgery/organs/external/restyling.dm b/code/modules/surgery/organs/external/restyling.dm index 0ae13b68c6ad2..097f8b53bd744 100644 --- a/code/modules/surgery/organs/external/restyling.dm +++ b/code/modules/surgery/organs/external/restyling.dm @@ -1,7 +1,7 @@ //Contains a bunch of procs for different types, but in the end it just lets you restyle the bodypart overlay so that's why it's here ///Helper proc to fetch a list of styles a player might want to restyle their features into during the round : returns list("Cabbage" = /datum/sprite_accessory/cabbage) -/obj/item/organ/external/proc/get_valid_restyles() +/obj/item/organ/proc/get_valid_restyles() var/list/valid_restyles valid_restyles = list() @@ -31,23 +31,18 @@ ///Asks the external organs inside the limb if they can restyle /obj/item/bodypart/proc/attempt_feature_restyle(atom/source, mob/living/trimmer, atom/movable/original_target, body_zone, restyle_type, style_speed) var/list/valid_features = list() - for(var/obj/item/organ/external/feature in contents) + for(var/obj/item/organ/feature in contents) if(feature.restyle_flags & restyle_type) valid_features.Add(feature) - var/obj/item/organ/external/target_organ + var/obj/item/organ/target_organ switch(LAZYLEN(valid_features)) if(1) target_organ = valid_features[1] if(2 to INFINITY) var/choose_options = list() - // BUBBER EDIT - OR BEGIN - var/name_to_organ = list() //literally so I dont have to loop again after someones made their choice - for(var/obj/item/organ/external/organ_choice as anything in valid_features) - /* var/name_to_organ = list() //literally so I don't have to loop again after someone's made their choice for(var/obj/item/organ/organ_choice as anything in valid_features) - */ // BUBBER EDIT - OR END choose_options[organ_choice.name] = image(organ_choice) name_to_organ[organ_choice.name] = organ_choice var/picked_option = show_radial_menu(trimmer, original_target, choose_options, radius = 38, require_near = TRUE) @@ -61,13 +56,8 @@ target_organ.attempt_feature_restyle(source, trimmer, original_target, body_zone, restyle_type, style_speed) -// BUBBER EDIT - OR BEGIN -///Invoke async so we dont break signals -/obj/item/organ/external/proc/on_attempt_feature_restyle(atom/source, mob/living/trimmer, atom/movable/original_target, body_zone, restyle_type, style_speed) -/* ///Invoke async so we don't break signals /obj/item/organ/proc/on_attempt_feature_restyle(atom/source, mob/living/trimmer, atom/movable/original_target, body_zone, restyle_type, style_speed) -*/ // BUBBER EDIT - OR END SIGNAL_HANDLER if(restyle_flags & restyle_type) @@ -76,7 +66,7 @@ to_chat(trimmer, span_warning("This tool is incompatible with the [src.name]!")) ///Restyles the external organ from a list of valid options -/obj/item/organ/external/proc/attempt_feature_restyle(atom/source, mob/living/trimmer, atom/movable/original_target, body_zone, restyle_type, style_speed) +/obj/item/organ/proc/attempt_feature_restyle(atom/source, mob/living/trimmer, atom/movable/original_target, body_zone, restyle_type, style_speed) var/list/restyles = get_valid_restyles() var/new_style = tgui_input_list(trimmer, "Select a new style", "Grooming", restyles) @@ -90,5 +80,4 @@ span_notice("You successfully change [original_target == trimmer ? "your" : original_target.name + "'s"] [name].") ) - simple_change_sprite(restyles[new_style]) //turn name to type and pass it on diff --git a/code/modules/surgery/organs/external/spines.dm b/code/modules/surgery/organs/external/spines.dm index ade081030d0c4..c7b49df959fcd 100644 --- a/code/modules/surgery/organs/external/spines.dm +++ b/code/modules/surgery/organs/external/spines.dm @@ -14,13 +14,13 @@ bodypart_overlay = /datum/bodypart_overlay/mutant/spines -/obj/item/organ/external/spines/Insert(mob/living/carbon/receiver, special, movement_flags) +/obj/item/organ/external/spines/mob_insert(mob/living/carbon/receiver, special, movement_flags) // If we have a tail, attempt to add a tail spines overlay var/obj/item/organ/external/tail/our_tail = receiver.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL) our_tail?.try_insert_tail_spines(our_tail.bodypart_owner) return ..() -/obj/item/organ/external/spines/Remove(mob/living/carbon/organ_owner, special, movement_flags) +/obj/item/organ/external/spines/mob_remove(mob/living/carbon/organ_owner, special, movement_flags) // If we have a tail, remove any tail spines overlay var/obj/item/organ/external/tail/our_tail = organ_owner.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL) our_tail?.remove_tail_spines(our_tail.bodypart_owner) diff --git a/code/modules/surgery/organs/external/tails.dm b/code/modules/surgery/organs/external/tails.dm index 8116b2008878d..2e8b5a0407211 100644 --- a/code/modules/surgery/organs/external/tails.dm +++ b/code/modules/surgery/organs/external/tails.dm @@ -20,7 +20,7 @@ ///The overlay for tail spines, if any var/datum/bodypart_overlay/mutant/tail_spines/tail_spines_overlay -/obj/item/organ/external/tail/Insert(mob/living/carbon/receiver, special, movement_flags) +/obj/item/organ/external/tail/mob_insert(mob/living/carbon/receiver, special, movement_flags) . = ..() if(.) receiver.clear_mood_event("tail_lost") @@ -34,7 +34,7 @@ // If it's not your tail AND of different species, we are horrified if(IS_WEAKREF_OF(receiver, original_owner)) receiver.add_mood_event("tail_regained", /datum/mood_event/tail_regained_right) - else if(type in receiver.dna.species.external_organs) + else if(type in receiver.dna.species.mutant_organs) receiver.add_mood_event("tail_regained", /datum/mood_event/tail_regained_species) else receiver.add_mood_event("tail_regained", /datum/mood_event/tail_regained_wrong) @@ -66,7 +66,7 @@ tail_spines_overlay.tail_spine_key = tail_spine_key // SKYRAT EDIT ADDITION START if(!bodypart.owner.dna.mutant_bodyparts["spines"]) - bodypart.owner.dna.mutant_bodyparts["spines"][MUTANT_INDEX_NAME] = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_COLOR_LIST = list("#886600", "#886600", "#886600")) + bodypart.owner.dna.mutant_bodyparts["spines"] = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_COLOR_LIST = list("#886600", "#886600", "#886600")) // SKYRAT EDIT ADDITION END var/feature_name = bodypart.owner.dna.mutant_bodyparts["spines"][MUTANT_INDEX_NAME] // SKYRAT EDIT CHANGE - ORIGINAL: var/feature_name = bodypart.owner.dna.features["spines"] //tail spines don't live in DNA, but share feature names with regular spines tail_spines_overlay.set_appearance_from_dna(bodypart.owner.dna, feature_name, feature_key = "spines") // SKYRAT EDIT CHANGE - ORIGINAL: tail_spines_overlay.set_appearance_from_name(feature_name) @@ -87,7 +87,7 @@ organ_owner.clear_mood_event("tail_regained") - if(type in organ_owner.dna.species.external_organs) + if(type in organ_owner.dna.species.mutant_organs) organ_owner.add_mood_event("tail_lost", /datum/mood_event/tail_lost) organ_owner.add_mood_event("tail_balance_lost", /datum/mood_event/tail_balance_lost) diff --git a/code/modules/surgery/organs/external/wings/functional_wings.dm b/code/modules/surgery/organs/external/wings/functional_wings.dm index 775d88247c4ed..3d0a2a634f23f 100644 --- a/code/modules/surgery/organs/external/wings/functional_wings.dm +++ b/code/modules/surgery/organs/external/wings/functional_wings.dm @@ -33,15 +33,14 @@ QDEL_NULL(fly) return ..() -/obj/item/organ/external/wings/functional/Insert(mob/living/carbon/receiver, special, movement_flags) +/obj/item/organ/external/wings/functional/mob_insert(mob/living/carbon/receiver, special, movement_flags) . = ..() - if(!.) - return + if(QDELETED(fly)) fly = new fly.Grant(receiver) -/obj/item/organ/external/wings/functional/Remove(mob/living/carbon/organ_owner, special, movement_flags) +/obj/item/organ/external/wings/functional/mob_remove(mob/living/carbon/organ_owner, special, movement_flags) . = ..() fly?.Remove(organ_owner) if(wings_open) diff --git a/code/modules/surgery/organs/external/wings/moth_wings.dm b/code/modules/surgery/organs/external/wings/moth_wings.dm index f6b5cc4fdd764..5651602bfdb39 100644 --- a/code/modules/surgery/organs/external/wings/moth_wings.dm +++ b/code/modules/surgery/organs/external/wings/moth_wings.dm @@ -126,10 +126,11 @@ var/burnt /datum/bodypart_overlay/mutant/wings/moth/New() - . = ..() - burn_datum = fetch_sprite_datum(burn_datum) + return ..() + + /datum/bodypart_overlay/mutant/wings/moth/get_global_feature_list() return SSaccessories.sprite_accessories["wings"] // SKYRAT EDIT - Customization - ORIGINAL: return SSaccessories.moth_wings_list diff --git a/code/modules/surgery/organs/internal/appendix/_appendix.dm b/code/modules/surgery/organs/internal/appendix/_appendix.dm index 4a6d3ddaa8baf..420d4efc1185c 100644 --- a/code/modules/surgery/organs/internal/appendix/_appendix.dm +++ b/code/modules/surgery/organs/internal/appendix/_appendix.dm @@ -6,7 +6,7 @@ name = "appendix" icon_state = "appendix" base_icon_state = "appendix" - visual = FALSE + zone = BODY_ZONE_PRECISE_GROIN slot = ORGAN_SLOT_APPENDIX food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/toxin/bad_food = 5) diff --git a/code/modules/surgery/organs/internal/cyberimp/augments_eyes.dm b/code/modules/surgery/organs/internal/cyberimp/augments_eyes.dm index d4c4b57d75f6b..aa67fe0c08de8 100644 --- a/code/modules/surgery/organs/internal/cyberimp/augments_eyes.dm +++ b/code/modules/surgery/organs/internal/cyberimp/augments_eyes.dm @@ -27,14 +27,13 @@ eye_owner.remove_traits(HUD_traits, ORGAN_TRAIT) balloon_alert(eye_owner, "hud enabled") -/obj/item/organ/internal/cyberimp/eyes/hud/Insert(mob/living/carbon/eye_owner, special = FALSE, movement_flags) +/obj/item/organ/internal/cyberimp/eyes/hud/mob_insert(mob/living/carbon/eye_owner, special = FALSE, movement_flags) . = ..() - if(!.) - return + eye_owner.add_traits(HUD_traits, ORGAN_TRAIT) toggled_on = TRUE -/obj/item/organ/internal/cyberimp/eyes/hud/Remove(mob/living/carbon/eye_owner, special, movement_flags) +/obj/item/organ/internal/cyberimp/eyes/hud/mob_remove(mob/living/carbon/eye_owner, special, movement_flags) . = ..() eye_owner.remove_traits(HUD_traits, ORGAN_TRAIT) toggled_on = FALSE diff --git a/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm b/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm index e9f3a88f481c3..334c8941f6b8f 100644 --- a/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm +++ b/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm @@ -2,7 +2,7 @@ /obj/item/organ/internal/cyberimp name = "cybernetic implant" desc = "A state-of-the-art implant that improves a baseline's functionality." - visual = FALSE + organ_flags = ORGAN_ROBOTIC failing_desc = "seems to be broken." var/implant_color = COLOR_WHITE diff --git a/code/modules/surgery/organs/internal/ears/_ears.dm b/code/modules/surgery/organs/internal/ears/_ears.dm index ae8e8dd7bd213..6f6210ba90b08 100644 --- a/code/modules/surgery/organs/internal/ears/_ears.dm +++ b/code/modules/surgery/organs/internal/ears/_ears.dm @@ -4,7 +4,6 @@ desc = "There are three parts to the ear. Inner, middle and outer. Only one of these parts should be normally visible." zone = BODY_ZONE_HEAD slot = ORGAN_SLOT_EARS - visual = FALSE gender = PLURAL healing_factor = STANDARD_ORGAN_HEALING @@ -153,34 +152,11 @@ icon_state = "kitty" visual = TRUE damage_multiplier = 2 - // Keeps track of which cat ears sprite is associated with this. - var/variant = "Cat" -/obj/item/organ/internal/ears/cat/Initialize(mapload, variant_pref) - . = ..() - if(variant_pref) - variant = variant_pref + preference = "feature_human_ears" + + //dna_block = DNA_EARS_BLOCK // SKYRAT EDIT REMOVAL - Customization - We have our own system to handle DNA. -//SKYRAT EDIT REMOVAL BEGIN - CUSTOMIZATION -/* -/obj/item/organ/internal/ears/cat/on_mob_insert(mob/living/carbon/human/ear_owner) - . = ..() - if(istype(ear_owner) && ear_owner.dna) - color = ear_owner.hair_color - ear_owner.dna.features["ears"] = ear_owner.dna.species.mutant_bodyparts["ears"] = variant - ear_owner.dna.update_uf_block(DNA_EARS_BLOCK) - ear_owner.update_body() - -// BUBBER EDIT - OR BEGIN -/obj/item/organ/internal/ears/cat/on_mob_remove(mob/living/carbon/human/ear_owner) - . = ..() - if(istype(ear_owner) && ear_owner.dna) - color = ear_owner.hair_color - ear_owner.dna.species.mutant_bodyparts -= "ears" - ear_owner.update_body() -*/ -//SKYRAT EDIT REMOVAL END -/* bodypart_overlay = /datum/bodypart_overlay/mutant/cat_ears /// Bodypart overlay for the horrible cat ears @@ -193,7 +169,7 @@ var/inner_layer = EXTERNAL_FRONT /datum/bodypart_overlay/mutant/cat_ears/get_global_feature_list() - return SSaccessories.ears_list + return SSaccessories.sprite_accessories["ears"] // SKYRAT EDIT - Customization - ORIGINAL: return SSaccessories.ears_list /datum/bodypart_overlay/mutant/cat_ears/can_draw_on_bodypart(mob/living/carbon/human/human) if((human.head?.flags_inv & HIDEHAIR) || (human.wear_mask?.flags_inv & HIDEHAIR)) @@ -215,7 +191,6 @@ base_ears.overlays += inner_ears return base_ears -*/ // // BUBBER EDIT - OR END /obj/item/organ/internal/ears/penguin name = "penguin ears" diff --git a/code/modules/surgery/organs/internal/eyes/_eyes.dm b/code/modules/surgery/organs/internal/eyes/_eyes.dm index f87647cc6c49b..ebe31e747b312 100644 --- a/code/modules/surgery/organs/internal/eyes/_eyes.dm +++ b/code/modules/surgery/organs/internal/eyes/_eyes.dm @@ -50,27 +50,23 @@ /// indication that the eyes are undergoing some negative effect var/damaged = FALSE /// Native FOV that will be applied if a config is enabled - var/native_fov = FOV_180_DEGREES //SKYRAT EDIT CHANGE - Original FOV_90_DEGREES + var/native_fov = FOV_90_DEGREES /// Scarring on this organ var/scarring = NONE - -/obj/item/organ/internal/eyes/Insert(mob/living/carbon/eye_recipient, special = FALSE, movement_flags = DELETE_IF_REPLACED) +/obj/item/organ/internal/eyes/mob_insert(mob/living/carbon/receiver, special, movement_flags) // If we don't do this before everything else, heterochromia will be reset leading to eye_color_right no longer being accurate - if(ishuman(eye_recipient)) - var/mob/living/carbon/human/human_recipient = eye_recipient + if(ishuman(receiver)) + var/mob/living/carbon/human/human_recipient = receiver old_eye_color_left = human_recipient.eye_color_left old_eye_color_right = human_recipient.eye_color_right . = ..() - if(!.) - return - - eye_recipient.cure_blind(NO_EYES) + receiver.cure_blind(NO_EYES) apply_damaged_eye_effects() - refresh(eye_recipient, call_update = TRUE) - RegisterSignal(eye_recipient, COMSIG_ATOM_BULLET_ACT, PROC_REF(on_bullet_act)) + refresh(receiver, call_update = TRUE) + RegisterSignal(receiver, COMSIG_ATOM_BULLET_ACT, PROC_REF(on_bullet_act)) /// Refreshes the visuals of the eyes /// If call_update is TRUE, we also will call update_body @@ -103,48 +99,42 @@ if(call_update) affected_human.update_body() -/obj/item/organ/internal/eyes/Remove(mob/living/carbon/eye_owner, special, movement_flags) +/obj/item/organ/internal/eyes/mob_remove(mob/living/carbon/organ_owner, special, movement_flags) . = ..() - if(ishuman(eye_owner)) - var/mob/living/carbon/human/human_owner = eye_owner + + if(ishuman(organ_owner)) + var/mob/living/carbon/human/human_owner = organ_owner if(initial(eye_color_left)) human_owner.eye_color_left = old_eye_color_left if(initial(eye_color_right)) human_owner.eye_color_right = old_eye_color_right if(native_fov) - eye_owner.remove_fov_trait(type) + organ_owner.remove_fov_trait(type) if(!special) human_owner.update_body() // Cure blindness from eye damage - eye_owner.cure_blind(EYE_DAMAGE) - eye_owner.cure_nearsighted(EYE_DAMAGE) + organ_owner.cure_blind(EYE_DAMAGE) + organ_owner.cure_nearsighted(EYE_DAMAGE) // Eye blind and temp blind go to, even if this is a bit of cheesy way to clear blindness - eye_owner.remove_status_effect(/datum/status_effect/eye_blur) - eye_owner.remove_status_effect(/datum/status_effect/temporary_blindness) + organ_owner.remove_status_effect(/datum/status_effect/eye_blur) + organ_owner.remove_status_effect(/datum/status_effect/temporary_blindness) // Then become blind anyways (if not special) if(!special) - eye_owner.become_blind(NO_EYES) + organ_owner.become_blind(NO_EYES) - eye_owner.update_tint() - eye_owner.update_sight() + organ_owner.update_tint() + organ_owner.update_sight() is_emissive = FALSE // SKYRAT EDIT ADDITION - UnregisterSignal(eye_owner, COMSIG_ATOM_BULLET_ACT) + UnregisterSignal(organ_owner, COMSIG_ATOM_BULLET_ACT) -// BUBBER EDIT - REPLACES organ/eyes with organ/internal/eyes until someone can pull the rework - Needed for some qol in proc -/obj/item/organ/internal/eyes/proc/on_bullet_act(mob/living/carbon/source, obj/projectile/proj, def_zone) -// /obj/item/organ/eyes/proc/on_bullet_act(mob/living/carbon/source, obj/projectile/proj, def_zone) +/obj/item/organ/internal/eyes/proc/on_bullet_act(datum/source, obj/projectile/proj, def_zone) SIGNAL_HANDLER // Once-a-dozen-rounds level of rare if (def_zone != BODY_ZONE_HEAD || !prob(proj.damage * 0.1) || !(proj.damage_type == BRUTE || proj.damage_type == BURN)) return - var/blocked = source.check_projectile_armor(def_zone, proj, is_silent = TRUE) - if (blocked && source.is_eyes_covered()) - if (!proj.armour_penetration || prob(blocked - proj.armour_penetration)) - return - var/valid_sides = list() if (!(scarring & RIGHT_EYE_SCAR)) valid_sides += RIGHT_EYE_SCAR @@ -599,7 +589,7 @@ deactivate(close_ui = TRUE) /// Set the initial color of the eyes on insert to be the mob's previous eye color. -/obj/item/organ/internal/eyes/robotic/glow/Insert(mob/living/carbon/eye_recipient, special = FALSE, movement_flags = DELETE_IF_REPLACED) +/obj/item/organ/internal/eyes/robotic/glow/mob_insert(mob/living/carbon/eye_recipient, special = FALSE, movement_flags = DELETE_IF_REPLACED) . = ..() left_eye_color_string = old_eye_color_left right_eye_color_string = old_eye_color_right diff --git a/code/modules/surgery/organs/internal/heart/_heart.dm b/code/modules/surgery/organs/internal/heart/_heart.dm index 3f3e816584481..ce659792529bb 100644 --- a/code/modules/surgery/organs/internal/heart/_heart.dm +++ b/code/modules/surgery/organs/internal/heart/_heart.dm @@ -3,7 +3,7 @@ desc = "I feel bad for the heartless bastard who lost this." icon_state = "heart-on" base_icon_state = "heart" - visual = FALSE + zone = BODY_ZONE_CHEST slot = ORGAN_SLOT_HEART item_flags = NO_BLOOD_ON_ITEM diff --git a/code/modules/surgery/organs/internal/heart/heart_ethereal.dm b/code/modules/surgery/organs/internal/heart/heart_ethereal.dm index ff2db562d95d9..3e5762a623f51 100644 --- a/code/modules/surgery/organs/internal/heart/heart_ethereal.dm +++ b/code/modules/surgery/organs/internal/heart/heart_ethereal.dm @@ -21,15 +21,14 @@ add_atom_colour(ethereal_color, FIXED_COLOUR_PRIORITY) update_appearance() -/obj/item/organ/internal/heart/ethereal/Insert(mob/living/carbon/heart_owner, special = FALSE, movement_flags) +/obj/item/organ/internal/heart/ethereal/mob_insert(mob/living/carbon/heart_owner, special = FALSE, movement_flags) . = ..() - if(!.) - return + RegisterSignal(heart_owner, COMSIG_MOB_STATCHANGE, PROC_REF(on_stat_change)) RegisterSignal(heart_owner, COMSIG_LIVING_POST_FULLY_HEAL, PROC_REF(on_owner_fully_heal)) RegisterSignal(heart_owner, COMSIG_QDELETING, PROC_REF(owner_deleted)) -/obj/item/organ/internal/heart/ethereal/Remove(mob/living/carbon/heart_owner, special, movement_flags) +/obj/item/organ/internal/heart/ethereal/mob_remove(mob/living/carbon/heart_owner, special, movement_flags) UnregisterSignal(heart_owner, list(COMSIG_MOB_STATCHANGE, COMSIG_LIVING_POST_FULLY_HEAL, COMSIG_QDELETING)) REMOVE_TRAIT(heart_owner, TRAIT_CORPSELOCKED, SPECIES_TRAIT) stop_crystalization_process(heart_owner) diff --git a/code/modules/surgery/organs/internal/liver/_liver.dm b/code/modules/surgery/organs/internal/liver/_liver.dm index 9b0f3a7162f64..dc5374ba416b0 100644 --- a/code/modules/surgery/organs/internal/liver/_liver.dm +++ b/code/modules/surgery/organs/internal/liver/_liver.dm @@ -6,7 +6,7 @@ name = "liver" desc = "Pairing suggestion: chianti and fava beans." icon_state = "liver" - visual = FALSE + w_class = WEIGHT_CLASS_SMALL zone = BODY_ZONE_CHEST slot = ORGAN_SLOT_LIVER diff --git a/code/modules/surgery/organs/internal/lungs/_lungs.dm b/code/modules/surgery/organs/internal/lungs/_lungs.dm index 4e03945b5b7c8..af176fe9fd7da 100644 --- a/code/modules/surgery/organs/internal/lungs/_lungs.dm +++ b/code/modules/surgery/organs/internal/lungs/_lungs.dm @@ -1,7 +1,7 @@ /obj/item/organ/internal/lungs name = "lungs" icon_state = "lungs" - visual = FALSE + zone = BODY_ZONE_CHEST slot = ORGAN_SLOT_LUNGS gender = PLURAL @@ -154,17 +154,16 @@ add_gas_reaction(/datum/gas/zauker, while_present = PROC_REF(too_much_zauker)) ///Simply exists so that you don't keep any alerts from your previous lack of lungs. -/obj/item/organ/internal/lungs/Insert(mob/living/carbon/receiver, special = FALSE, movement_flags) +/obj/item/organ/internal/lungs/mob_insert(mob/living/carbon/receiver, special = FALSE, movement_flags) . = ..() - if(!.) - return . + receiver.clear_alert(ALERT_NOT_ENOUGH_OXYGEN) receiver.clear_alert(ALERT_NOT_ENOUGH_CO2) receiver.clear_alert(ALERT_NOT_ENOUGH_NITRO) receiver.clear_alert(ALERT_NOT_ENOUGH_PLASMA) receiver.clear_alert(ALERT_NOT_ENOUGH_N2O) -/obj/item/organ/internal/lungs/Remove(mob/living/carbon/organ_owner, special, movement_flags) +/obj/item/organ/internal/lungs/mob_remove(mob/living/carbon/organ_owner, special, movement_flags) . = ..() // This is very "manual" I realize, but it's useful to ensure cleanup for gases we're removing happens // Avoids stuck alerts and such diff --git a/code/modules/surgery/organs/internal/stomach/_stomach.dm b/code/modules/surgery/organs/internal/stomach/_stomach.dm index 50f52bbfa202b..26566f8405232 100644 --- a/code/modules/surgery/organs/internal/stomach/_stomach.dm +++ b/code/modules/surgery/organs/internal/stomach/_stomach.dm @@ -5,7 +5,7 @@ name = "stomach" desc = "Onaka ga suite imasu." icon_state = "stomach" - visual = FALSE + w_class = WEIGHT_CLASS_SMALL zone = BODY_ZONE_CHEST slot = ORGAN_SLOT_STOMACH @@ -248,11 +248,11 @@ disgusted.throw_alert(ALERT_DISGUST, /atom/movable/screen/alert/disgusted) disgusted.add_mood_event("disgust", /datum/mood_event/disgusted) -/obj/item/organ/internal/stomach/Insert(mob/living/carbon/receiver, special, movement_flags) +/obj/item/organ/internal/stomach/mob_insert(mob/living/carbon/receiver, special, movement_flags) . = ..() receiver.hud_used?.hunger?.update_appearance() -/obj/item/organ/internal/stomach/Remove(mob/living/carbon/stomach_owner, special, movement_flags) +/obj/item/organ/internal/stomach/mob_remove(mob/living/carbon/stomach_owner, special, movement_flags) if(ishuman(stomach_owner)) var/mob/living/carbon/human/human_owner = owner human_owner.clear_alert(ALERT_DISGUST) diff --git a/code/modules/surgery/organs/internal/tongue/_tongue.dm b/code/modules/surgery/organs/internal/tongue/_tongue.dm index a8bc5b61d8525..3ac028e276039 100644 --- a/code/modules/surgery/organs/internal/tongue/_tongue.dm +++ b/code/modules/surgery/organs/internal/tongue/_tongue.dm @@ -2,7 +2,7 @@ name = "tongue" desc = "A fleshy muscle mostly used for lying." icon_state = "tongue" - visual = FALSE + zone = BODY_ZONE_PRECISE_MOUTH slot = ORGAN_SLOT_TONGUE attack_verb_continuous = list("licks", "slobbers", "slaps", "frenches", "tongues") @@ -124,30 +124,30 @@ food_taste_reaction = FOOD_LIKED return food_taste_reaction -/obj/item/organ/internal/tongue/Insert(mob/living/carbon/tongue_owner, special = FALSE, movement_flags) +/obj/item/organ/internal/tongue/mob_insert(mob/living/carbon/receiver, special, movement_flags) . = ..() - if(!.) - return + if(modifies_speech) - RegisterSignal(tongue_owner, COMSIG_MOB_SAY, PROC_REF(handle_speech)) - tongue_owner.voice_filter = voice_filter + RegisterSignal(receiver, COMSIG_MOB_SAY, PROC_REF(handle_speech)) + receiver.voice_filter = voice_filter /* This could be slightly simpler, by making the removal of the * NO_TONGUE_TRAIT conditional on the tongue's `sense_of_taste`, but * then you can distinguish between ageusia from no tongue, and * ageusia from having a non-tasting tongue. */ - REMOVE_TRAIT(tongue_owner, TRAIT_AGEUSIA, NO_TONGUE_TRAIT) + REMOVE_TRAIT(receiver, TRAIT_AGEUSIA, NO_TONGUE_TRAIT) apply_tongue_effects() -/obj/item/organ/internal/tongue/Remove(mob/living/carbon/tongue_owner, special, movement_flags) +/obj/item/organ/internal/tongue/mob_remove(mob/living/carbon/organ_owner, special, movement_flags) . = ..() + temp_say_mod = "" - UnregisterSignal(tongue_owner, COMSIG_MOB_SAY) - REMOVE_TRAIT(tongue_owner, TRAIT_SPEAKS_CLEARLY, SPEAKING_FROM_TONGUE) - REMOVE_TRAIT(tongue_owner, TRAIT_AGEUSIA, ORGAN_TRAIT) + UnregisterSignal(organ_owner, COMSIG_MOB_SAY) + REMOVE_TRAIT(organ_owner, TRAIT_SPEAKS_CLEARLY, SPEAKING_FROM_TONGUE) + REMOVE_TRAIT(organ_owner, TRAIT_AGEUSIA, ORGAN_TRAIT) // Carbons by default start with NO_TONGUE_TRAIT caused TRAIT_AGEUSIA - ADD_TRAIT(tongue_owner, TRAIT_AGEUSIA, NO_TONGUE_TRAIT) - tongue_owner.voice_filter = initial(tongue_owner.voice_filter) + ADD_TRAIT(organ_owner, TRAIT_AGEUSIA, NO_TONGUE_TRAIT) + organ_owner.voice_filter = initial(organ_owner.voice_filter) /obj/item/organ/internal/tongue/apply_organ_damage(damage_amount, maximum = maxHealth, required_organ_flag) . = ..() diff --git a/code/modules/surgery/organs/internal/vocal_cords/_vocal_cords.dm b/code/modules/surgery/organs/internal/vocal_cords/_vocal_cords.dm index 2ef245894bd23..f6fed86a90d60 100644 --- a/code/modules/surgery/organs/internal/vocal_cords/_vocal_cords.dm +++ b/code/modules/surgery/organs/internal/vocal_cords/_vocal_cords.dm @@ -1,7 +1,6 @@ /obj/item/organ/internal/vocal_cords //organs that are activated through speech with the :x/MODE_KEY_VOCALCORDS channel name = "vocal cords" icon_state = "appendix" - visual = FALSE zone = BODY_ZONE_PRECISE_MOUTH slot = ORGAN_SLOT_VOICE gender = PLURAL @@ -87,7 +86,6 @@ next_command = world.time + (cooldown * cooldown_mod) /obj/item/organ/internal/adamantine_resonator - visual = FALSE name = "adamantine resonator" desc = "Fragments of adamantine exist in all golems, stemming from their origins as purely magical constructs. These are used to \"hear\" messages from their leaders." zone = BODY_ZONE_HEAD diff --git a/code/modules/surgery/organs/organ_movement.dm b/code/modules/surgery/organs/organ_movement.dm index 34d6b6f5251ad..689e0c6b379c4 100644 --- a/code/modules/surgery/organs/organ_movement.dm +++ b/code/modules/surgery/organs/organ_movement.dm @@ -18,7 +18,8 @@ mob_insert(receiver, special, movement_flags) bodypart_insert(limb_owner = receiver, movement_flags = movement_flags) - return TRUE + if(!special) + receiver.update_body_parts() /* * Remove the organ from the select mob. @@ -32,6 +33,9 @@ mob_remove(organ_owner, special, movement_flags) bodypart_remove(limb_owner = organ_owner, movement_flags = movement_flags) + if(!special) + organ_owner.update_body_parts() + /* * Insert the organ into the select mob. * @@ -65,6 +69,11 @@ wash(CLEAN_TYPE_BLOOD) organ_flags &= ~ORGAN_VIRGIN + if(external_bodytypes) + receiver.synchronize_bodytypes() + if(external_bodyshapes) + receiver.synchronize_bodyshapes() + receiver.organs |= src receiver.organs_slot[slot] = src owner = receiver @@ -122,6 +131,9 @@ ADD_TRAIT(src, TRAIT_NODROP, ORGAN_INSIDE_BODY_TRAIT) interaction_flags_item &= ~INTERACT_ITEM_ATTACK_HAND_PICKUP + if(bodypart_overlay) + limb.add_bodypart_overlay(bodypart_overlay) + /* * Remove the organ from the select mob. * @@ -219,6 +231,25 @@ interaction_flags_item |= INTERACT_ITEM_ATTACK_HAND_PICKUP SEND_SIGNAL(src, COMSIG_ORGAN_BODYPART_REMOVED, limb, movement_flags) // BUBBER CHANGE, added COMSIG_ORGAN_BODYPART_REMOVED to on_bodypart_remove + if(!bodypart_overlay) + return + + limb.remove_bodypart_overlay(bodypart_overlay) + + if(use_mob_sprite_as_obj_sprite) + update_appearance(UPDATE_OVERLAYS) + + color = bodypart_overlay.draw_color // so a pink felinid doesn't drop a gray tail + + if(greyscale_config) + get_greyscale_color_from_draw_color() + else + color = bodypart_overlay.draw_color // so a pink felinid doesn't drop a gray tail + +///Here we define how draw_color from the bodypart overlay sets the greyscale colors of organs that use GAGS +/obj/item/organ/proc/get_greyscale_color_from_draw_color() + color = bodypart_overlay.draw_color //Defaults to the legacy behaviour of applying the color to the item. + /// In space station videogame, nothing is sacred. If somehow an organ is removed unexpectedly, handle it properly /obj/item/organ/proc/forced_removal() SIGNAL_HANDLER diff --git a/code/modules/unit_tests/dna_infusion.dm b/code/modules/unit_tests/dna_infusion.dm index 0df63be644b98..4bd0469ca1df9 100644 --- a/code/modules/unit_tests/dna_infusion.dm +++ b/code/modules/unit_tests/dna_infusion.dm @@ -38,13 +38,19 @@ for(var/datum/infuser_entry/infuser_entry as anything in flatten_list(GLOB.infuser_entries)) var/output_organs = infuser_entry.output_organs var/mob/living/carbon/human/lab_rat = allocate(/mob/living/carbon/human/consistent) - lab_rat.dna.mutant_bodyparts["moth_antennae"] = list(MUTANT_INDEX_NAME = "Plain", MUTANT_INDEX_COLOR_LIST = list("#FFFFFF"), MUTANT_INDEX_EMISSIVE_LIST = list(FALSE)) // SKYRAT EDIT - Customization + // SKYRAT EDIT ADDITION START - Customization + lab_rat.dna.mutant_bodyparts["moth_antennae"] = list(MUTANT_INDEX_NAME = "Plain", MUTANT_INDEX_COLOR_LIST = list("#FFFFFF"), MUTANT_INDEX_EMISSIVE_LIST = list(FALSE)) + lab_rat.dna.mutant_bodyparts["tail"] = list(MUTANT_INDEX_NAME = "Light Tiger", MUTANT_INDEX_COLOR_LIST = list("#FFFFFF", "#FFFFFF", "#FFFFFF")) + lab_rat.dna.mutant_bodyparts["snout"] = list(MUTANT_INDEX_NAME = "Sharp + Light", MUTANT_INDEX_COLOR_LIST = list("#FFFFFF", "#FFFFFF", "#FFFFFF")) + lab_rat.dna.mutant_bodyparts["horns"] = list(MUTANT_INDEX_NAME = "Simple", MUTANT_INDEX_COLOR_LIST = list("#FFFFFF", "#FFFFFF", "#FFFFFF")) + lab_rat.dna.mutant_bodyparts["frills"] = list(MUTANT_INDEX_NAME = "Aquatic", MUTANT_INDEX_COLOR_LIST = list("#FFFFFF", "#FFFFFF", "#FFFFFF")) + // SKYRAT EDIT END var/list/obj/item/organ/inserted_organs = list() // Attempt to insert entire list of mutant organs for the given infusion_entry. for(var/obj/item/organ/organ as anything in output_organs) organ = new organ() - TEST_ASSERT(organ.Insert(lab_rat, special = TRUE, movement_flags = DELETE_IF_REPLACED), "The organ `[organ.type]` for `[infuser_entry.type]` was not inserted in the mob when expected, Insert() returned falsy when TRUE was expected.") + organ.Insert(lab_rat, special = TRUE, movement_flags = DELETE_IF_REPLACED) inserted_organs += organ // Search for added Status Effect. diff --git a/code/modules/unit_tests/organ_bodypart_shuffle.dm b/code/modules/unit_tests/organ_bodypart_shuffle.dm index 842dd1c6c1344..11c0bcd71becb 100644 --- a/code/modules/unit_tests/organ_bodypart_shuffle.dm +++ b/code/modules/unit_tests/organ_bodypart_shuffle.dm @@ -2,7 +2,7 @@ /datum/unit_test/organ_bodypart_shuffle /datum/unit_test/organ_bodypart_shuffle/Run() - var/mob/living/carbon/human/hollow_boy = allocate(/mob/living/carbon/human/consistent) + var/mob/living/carbon/human/hollow_boy = allocate(/mob/living/carbon/human/consistent) //freshly filled with wet insides // Test if organs are all properly updating when forcefully removed var/list/removed_organs = list() @@ -30,5 +30,3 @@ continue TEST_ASSERT(organ in hollow_boy.organs, "Organ '[organ.name] was put in an empty bodypart that replaced a humans, but the organ did not come with.") - // Test if bodyparts are all properly updating when forcefully removed - hollow_boy = allocate(/mob/living/carbon/human/consistent) //freshly filled with wet insides diff --git a/code/modules/wiremod/shell/brain_computer_interface.dm b/code/modules/wiremod/shell/brain_computer_interface.dm index 7b8fb9aa42fff..e3ddf54135af8 100644 --- a/code/modules/wiremod/shell/brain_computer_interface.dm +++ b/code/modules/wiremod/shell/brain_computer_interface.dm @@ -3,7 +3,6 @@ desc = "An implant that can be placed in a user's head to control circuits using their brain." icon = 'icons/obj/science/circuits.dmi' icon_state = "bci" - visual = FALSE zone = BODY_ZONE_HEAD w_class = WEIGHT_CLASS_TINY diff --git a/html/changelogs/archive/2025-01.yml b/html/changelogs/archive/2025-01.yml index 3095cb39b342c..84d594e225b97 100644 --- a/html/changelogs/archive/2025-01.yml +++ b/html/changelogs/archive/2025-01.yml @@ -282,3 +282,27 @@ - rscadd: Any mob can now interact - yuppie! - refactor: Arousal/pleasure code refactoring - bugfix: Mobs statuses in the UI are now properly spaced + - bugfix: Death degradation no longer instantly downs you + 00-Steven: + - bugfix: Fixed cat ears not layering properly. + - bugfix: Husked bodies show their blood with the right colours in photographs. + Arturlang: + - balance: Flesh ghouls now have 100 HP, while heretic mute ghouls have normal human + HP, ie, 135, from 25 and 50 + BurgerBB: + - rscdel: Updates Dracula Flow Brain Damage to be less weird. + IgiariValkyr: + - qol: Persistence is now in a persistent location on Lavaland, Moon, and Icebox. + LT3: + - map: Kilostation abandoned warehouse now starts unpowered + Odairu: + - bugfix: pirates spawn again + - bugfix: lone infil adds the chosen player to the spawned_mobs list + - bugfix: company import bars were invisible in stacks + Rathen Ivanov: + - rscadd: You can now purchase your very own CE Screws Plushie from the LustWish + Vendor. + ReturnToZender: + - balance: Reduces the weight of Bloodsuckers by 3, to make it notably different + from traitors + - balance: Raised the minimum number of players for a heretic to spawn. diff --git a/modular_skyrat/master_files/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm b/modular_skyrat/master_files/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm index 130d1277e45bb..54d06537b3c2a 100644 --- a/modular_skyrat/master_files/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm +++ b/modular_skyrat/master_files/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm @@ -136,7 +136,7 @@ if(mod_overlay) mod_overlay.add_overlay(sprite_datum.get_custom_mod_icon(owner, image_to_return)) - if(sprite_datum.hasinner) + if(sprite_datum.has_inner) returned_images += get_singular_image(build_icon_state(gender, image_layer, feature_key_suffix = "inner"), image_layer, owner) // Gets the icon_state of a single or matrix colored accessory and overlays it with a texture diff --git a/modular_skyrat/master_files/code/modules/client/preferences/_preference.dm b/modular_skyrat/master_files/code/modules/client/preferences/_preference.dm index 83872abb64fb0..db947e2190e48 100644 --- a/modular_skyrat/master_files/code/modules/client/preferences/_preference.dm +++ b/modular_skyrat/master_files/code/modules/client/preferences/_preference.dm @@ -1,5 +1,10 @@ #define REQUIRED_CROP_LIST_SIZE 4 +/datum/preference + /// If the selected species has this in its /datum/species/mutant_bodyparts, + /// will show the feature as selectable. + var/relevant_mutant_bodypart = null + /datum/preference/tri_color abstract_type = /datum/preference/tri_color var/type_to_check = /datum/preference/toggle/allow_mismatched_parts diff --git a/modular_skyrat/master_files/code/modules/client/preferences/mutant_parts.dm b/modular_skyrat/master_files/code/modules/client/preferences/mutant_parts.dm index 1806e0cc3a995..5727a6f51e28a 100644 --- a/modular_skyrat/master_files/code/modules/client/preferences/mutant_parts.dm +++ b/modular_skyrat/master_files/code/modules/client/preferences/mutant_parts.dm @@ -239,7 +239,7 @@ savefile_key = "feature_ears" relevant_mutant_bodypart = "ears" type_to_check = /datum/preference/toggle/mutant_toggle/ears - default_accessory_type = /datum/sprite_accessory/ears + default_accessory_type = /datum/sprite_accessory/ears/none /datum/preference/tri_color/ears category = PREFERENCE_CATEGORY_SECONDARY_FEATURES diff --git a/modular_skyrat/master_files/code/modules/client/preferences/species_features/digitigrade_legs.dm b/modular_skyrat/master_files/code/modules/client/preferences/species_features/digitigrade_legs.dm index 0dd2daddc1076..16f1032a2fb67 100644 --- a/modular_skyrat/master_files/code/modules/client/preferences/species_features/digitigrade_legs.dm +++ b/modular_skyrat/master_files/code/modules/client/preferences/species_features/digitigrade_legs.dm @@ -7,11 +7,11 @@ /datum/preference/choiced/digitigrade_legs/create_default_value() - return "Normal Legs" + return NORMAL_LEGS /datum/preference/choiced/digitigrade_legs/init_possible_values() - return assoc_to_keys_features(SSaccessories.sprite_accessories["legs"]) + return list(NORMAL_LEGS, DIGITIGRADE_LEGS) /datum/preference/choiced/digitigrade_legs/is_accessible(datum/preferences/preferences) return ..() && is_usable(preferences) diff --git a/modular_skyrat/master_files/code/modules/client/preferences_savefile.dm b/modular_skyrat/master_files/code/modules/client/preferences_savefile.dm index 54f3d0f016fcb..6a4705301eade 100644 --- a/modular_skyrat/master_files/code/modules/client/preferences_savefile.dm +++ b/modular_skyrat/master_files/code/modules/client/preferences_savefile.dm @@ -289,7 +289,7 @@ save_data["modular_version"] = MODULAR_SAVEFILE_VERSION_MAX -/datum/preferences/proc/update_mutant_bodyparts(datum/preference/preference) +/datum/preferences/proc/update_body_parts(datum/preference/preference) if (!preference.relevant_mutant_bodypart) return var/part = preference.relevant_mutant_bodypart diff --git a/modular_skyrat/master_files/code/modules/mob/living/human/species.dm b/modular_skyrat/master_files/code/modules/mob/living/human/species.dm index ac68a44e2fd25..bbc2570ed153b 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/human/species.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/human/species.dm @@ -23,7 +23,7 @@ ) features += preference.savefile_key - for (var/obj/item/organ/external/organ_type as anything in external_organs) + for (var/obj/item/organ/organ_type as anything in mutant_organs) var/preference = initial(organ_type.preference) if (!isnull(preference)) features += preference diff --git a/modular_skyrat/master_files/code/modules/reagents/medicine_reagents/medicine_reagents.dm b/modular_skyrat/master_files/code/modules/reagents/medicine_reagents/medicine_reagents.dm index faba0cdb892c3..7765e6f3cd6d4 100644 --- a/modular_skyrat/master_files/code/modules/reagents/medicine_reagents/medicine_reagents.dm +++ b/modular_skyrat/master_files/code/modules/reagents/medicine_reagents/medicine_reagents.dm @@ -17,4 +17,4 @@ if(!istype(exposed_mob) || (reac_volume < 0.5)) return - exposed_mob.update_mutant_bodyparts() + exposed_mob.update_body_parts() diff --git a/modular_skyrat/master_files/code/modules/surgery/organs/_organ.dm b/modular_skyrat/master_files/code/modules/surgery/organs/_organ.dm new file mode 100644 index 0000000000000..e5f45efb11416 --- /dev/null +++ b/modular_skyrat/master_files/code/modules/surgery/organs/_organ.dm @@ -0,0 +1,4 @@ +/obj/item/organ + /// Whether or not we're a species-specific organ that will override + /// the ear choice on a certain species, while still applying its visuals. + var/overrides_sprite_datum_organ_type = FALSE diff --git a/modular_skyrat/modules/company_imports/icons/special_metals_stack.dmi b/modular_skyrat/modules/company_imports/icons/special_metals_stack.dmi index e30c0d75014a9..854029646e07d 100644 Binary files a/modular_skyrat/modules/company_imports/icons/special_metals_stack.dmi and b/modular_skyrat/modules/company_imports/icons/special_metals_stack.dmi differ diff --git a/modular_skyrat/modules/cortical_borer/code/cortical_borer.dm b/modular_skyrat/modules/cortical_borer/code/cortical_borer.dm index d92ea4fdfac68..7609fbe5d6ccc 100644 --- a/modular_skyrat/modules/cortical_borer/code/cortical_borer.dm +++ b/modular_skyrat/modules/cortical_borer/code/cortical_borer.dm @@ -44,14 +44,14 @@ GLOBAL_LIST_EMPTY(cortical_borers) borer = null return ..() -/obj/item/organ/internal/borer_body/on_mob_insert(mob/living/carbon/carbon_target, special, movement_flags) +/obj/item/organ/internal/borer_body/mob_insert(mob/living/carbon/carbon_target, special, movement_flags) . = ..() for(var/datum/borer_focus/body_focus as anything in borer.body_focuses) body_focus.on_add() carbon_target.apply_status_effect(/datum/status_effect/grouped/screwy_hud/fake_healthy, type) //on removal, force the borer out -/obj/item/organ/internal/borer_body/on_mob_remove(mob/living/carbon/carbon_target, special) +/obj/item/organ/internal/borer_body/mob_remove(mob/living/carbon/carbon_target, special) . = ..() var/mob/living/basic/cortical_borer/cb_inside = carbon_target.has_borer() for(var/datum/borer_focus/body_focus as anything in cb_inside.body_focuses) diff --git a/modular_skyrat/modules/cortical_borer/code/evolution/evolution_things/empowered_egg.dm b/modular_skyrat/modules/cortical_borer/code/evolution/evolution_things/empowered_egg.dm index 525c4b32de465..a2c0826542b10 100644 --- a/modular_skyrat/modules/cortical_borer/code/evolution/evolution_things/empowered_egg.dm +++ b/modular_skyrat/modules/cortical_borer/code/evolution/evolution_things/empowered_egg.dm @@ -19,11 +19,11 @@ if(iscarbon(loc)) Insert(loc) -/obj/item/organ/internal/empowered_borer_egg/Insert(mob/living/carbon/M, special = FALSE, movement_flags = DELETE_IF_REPLACED) +/obj/item/organ/internal/empowered_borer_egg/mob_insert(mob/living/carbon/M, special = FALSE, movement_flags = DELETE_IF_REPLACED) ..() addtimer(CALLBACK(src, PROC_REF(try_burst)), burst_time) -/obj/item/organ/internal/empowered_borer_egg/Remove(mob/living/carbon/M, special = FALSE) +/obj/item/organ/internal/empowered_borer_egg/mob_remove(mob/living/carbon/M, special = FALSE) . = ..() visible_message(span_warning(span_italics("As [src] is cut out of [M], it quickly vibrates and shatters, leaving nothing but some goop!"))) new/obj/effect/decal/cleanable/food/egg_smudge(get_turf(src)) diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm index c9fe779c42142..e00f0eec0e406 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm @@ -22,6 +22,11 @@ ///Notable things that have it set to FALSE are things that need special setup, such as genitals var/generic + /// Whether or not this sprite accessory has an additional overlay added to + /// it as an "inner" part, which is pre-colored. + /// BUBBER TODO: See about retiring this + var/has_inner = FALSE + /// For all the flags that you need to pass from a sprite_accessory to an organ, when it's linked to one. /// (i.e. passing through the fact that a snout should or shouldn't use a muzzled sprite for head worn items) var/flags_for_organ = NONE @@ -35,7 +40,7 @@ var/factual = TRUE ///Use this as a type path to an organ that this sprite_accessory will be associated. Make sure the organ has 'mutantpart_info' set properly. - var/organ_type + var/obj/item/organ/organ_type ///Set this to true to make an accessory appear as color customizable in preferences despite advanced color settings being off, will also prevent the accessory from being reset var/always_color_customizable @@ -170,12 +175,21 @@ icon_state = "none" +/// Legs are a special case, they aren't actually sprite_accessories but are updated with them. +/// These datums exist for selecting legs on preference, and little else /datum/sprite_accessory/legs + icon = null + em_block = TRUE key = "legs" - generic = "Leg Type" color_src = null genetic = TRUE +/datum/sprite_accessory/legs/none + name = NORMAL_LEGS + +/datum/sprite_accessory/legs/digitigrade_lizard + name = DIGITIGRADE_LEGS + /datum/sprite_accessory/socks icon = 'modular_skyrat/master_files/icons/mob/clothing/underwear.dmi' use_static = TRUE diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/ears.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/ears.dm index 01583cb2682fb..37bbbb0b44e17 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/ears.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/ears.dm @@ -1,7 +1,7 @@ /datum/sprite_accessory/ears key = "ears" generic = "Ears" - organ_type = /obj/item/organ/external/ears // SET BACK TO THIS AS SOON AS WE GET EARS AS EXTERNAL ORGANS: organ_type = /obj/item/organ/internal/ears/mutant + organ_type = /obj/item/organ/internal/ears/mutant relevent_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER, BODY_FRONT_LAYER) color_src = USE_MATRIXED_COLORS genetic = TRUE @@ -34,13 +34,15 @@ recommended_species = list(SPECIES_MAMMAL, SPECIES_HUMAN, SPECIES_SYNTH, SPECIES_FELINE, SPECIES_HUMANOID, SPECIES_GHOUL) relevent_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_LAYER) color_src = USE_ONE_COLOR + has_inner = TRUE /datum/sprite_accessory/ears/fox color_src = USE_ONE_COLOR + has_inner = TRUE /datum/sprite_accessory/ears/mutant icon = 'modular_skyrat/master_files/icons/mob/sprite_accessory/ears.dmi' - organ_type = /obj/item/organ/external/ears // SET BACK TO THIS AS SOON AS WE GET EARS AS EXTERNAL ORGANS: organ_type = /obj/item/organ/internal/ears/mutant + organ_type = /obj/item/organ/internal/ears/mutant color_src = USE_MATRIXED_COLORS recommended_species = list(SPECIES_MAMMAL, SPECIES_HUMAN, SPECIES_SYNTH, SPECIES_FELINE, SPECIES_HUMANOID, SPECIES_GHOUL) uses_emissives = TRUE @@ -84,7 +86,7 @@ /datum/sprite_accessory/ears/mutant/bigwolfinner name = "Big Wolf (ALT)" icon_state = "bigwolfinner" - hasinner = TRUE + has_inner = TRUE /datum/sprite_accessory/ears/mutant/bigwolfdark //alphabetical sort ignored here for ease-of-use name = "Dark Big Wolf" @@ -93,7 +95,7 @@ /datum/sprite_accessory/ears/mutant/bigwolfinnerdark name = "Dark Big Wolf (ALT)" icon_state = "bigwolfinnerdark" - hasinner = TRUE + has_inner = TRUE /datum/sprite_accessory/ears/mutant/bunny name = "Bunny" diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/snout.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/snout.dm index daea9fce0b00b..830a1aac4fe6f 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/snout.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/snout.dm @@ -30,7 +30,7 @@ return !sprite_datum.is_hidden(human) -/obj/item/organ/external/snout/Insert(mob/living/carbon/receiver, special, movement_flags) +/obj/item/organ/external/snout/mob_insert(mob/living/carbon/receiver, special, movement_flags) if(sprite_accessory_flags & SPRITE_ACCESSORY_USE_MUZZLED_SPRITE) external_bodyshapes |= BODYSHAPE_SNOUTED if(sprite_accessory_flags & SPRITE_ACCESSORY_USE_ALT_FACEWEAR_LAYER) diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/spines.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/spines.dm index 4f631993af428..fb2cf49ad703d 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/spines.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/spines.dm @@ -24,6 +24,10 @@ default_color = DEFAULT_SECONDARY relevent_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER) +/datum/sprite_accessory/tail_spines/none + name = SPRITE_ACCESSORY_NONE + icon_state = "none" + /datum/sprite_accessory/tail_spines/is_hidden(mob/living/carbon/human/wearer) var/list/used_in_turf = list("tail") if(wearer.owned_turf?.name in used_in_turf) diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/human.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/human.dm index 3e3b27ed1a56f..fe6fb6be156da 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/human.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/human.dm @@ -130,7 +130,7 @@ // The total list of parts choosable var/static/list/total_selection = list( ORGAN_SLOT_EXTERNAL_HORNS = "horns", - ORGAN_SLOT_EXTERNAL_EARS = "ears", + ORGAN_SLOT_EARS = "ears", ORGAN_SLOT_EXTERNAL_WINGS = "wings", ORGAN_SLOT_EXTERNAL_TAIL = "tail", ORGAN_SLOT_EXTERNAL_SYNTH_ANTENNA = "ipc_antenna", @@ -159,7 +159,7 @@ else for(var/part in available_selection) LAZYOR(try_hide_mutant_parts, part) - update_mutant_bodyparts() + update_body_parts() return // Dont open the radial automatically just for one button @@ -168,7 +168,7 @@ // If 'reveal all' is our only option just do it if(!re_do && (("reveal all" in available_selection) && (length(available_selection) == 1))) LAZYNULL(try_hide_mutant_parts) - update_mutant_bodyparts() + update_body_parts() return // Radial rendering @@ -191,7 +191,7 @@ if(pick == "reveal all") to_chat(usr, span_notice("You are no longer trying to hide your mutant parts.")) LAZYNULL(try_hide_mutant_parts) - update_mutant_bodyparts() + update_body_parts() return else if(pick in try_hide_mutant_parts) @@ -200,7 +200,7 @@ else to_chat(usr, span_notice("You are now trying to hide your [pick].")) LAZYOR(try_hide_mutant_parts, pick) - update_mutant_bodyparts() + update_body_parts() // automatically re-do the menu after making a selection mutant_part_visibility(re_do = TRUE) diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species.dm index 14c7bd495eef1..408d341320fd9 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species.dm @@ -204,7 +204,6 @@ GLOBAL_LIST_EMPTY(customizable_races) species_human.overlays_standing[BODY_LAYER] = standing species_human.apply_overlay(BODY_LAYER) - handle_mutant_bodyparts(species_human) /datum/species/spec_stun(mob/living/carbon/human/target, amount) if(istype(target)) @@ -226,7 +225,18 @@ GLOBAL_LIST_EMPTY(customizable_races) var/obj/item/organ/current_organ = target.get_organ_by_type(mutant_accessory.organ_type) if(!current_organ || replace_current) - var/obj/item/organ/replacement = SSwardrobe.provide_type(mutant_accessory.organ_type) + var/organ_slot = mutant_accessory.organ_type::slot + var/obj/item/organ/current_organ_in_slot = target.get_organ_slot(organ_slot) + var/obj/item/organ/replacement + + // If the current organ in that slot should override the replacement because it's a special organ for this species, + // force it to be the replacement organ. + if(current_organ_in_slot?.overrides_sprite_datum_organ_type && istype(current_organ_in_slot, get_mutant_organ_type_for_slot(organ_slot))) + replacement = SSwardrobe.provide_type(current_organ_in_slot.type) + + else + replacement = SSwardrobe.provide_type(mutant_accessory.organ_type) + replacement.sprite_accessory_flags = mutant_accessory.flags_for_organ replacement.relevant_layers = mutant_accessory.relevent_layers diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_tumor.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_tumor.dm index 633dc3049279f..c715333654c4f 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_tumor.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_tumor.dm @@ -25,7 +25,7 @@ var/bloodloss_rate = NORMAL_BLOOD_DRAIN -/obj/item/organ/internal/heart/hemophage/Insert(mob/living/carbon/tumorful, special, movement_flags) +/obj/item/organ/internal/heart/hemophage/mob_insert(mob/living/carbon/tumorful, special, movement_flags) . = ..() if(!. || !owner) return @@ -35,7 +35,7 @@ RegisterSignal(tumorful, COMSIG_MOB_GET_STATUS_TAB_ITEMS, PROC_REF(get_status_tab_item)) -/obj/item/organ/internal/heart/hemophage/Remove(mob/living/carbon/tumorless, special = FALSE) +/obj/item/organ/internal/heart/hemophage/mob_remove(mob/living/carbon/tumorless, special = FALSE) . = ..() SEND_SIGNAL(tumorless, COMSIG_PULSATING_TUMOR_REMOVED, tumorless) diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/lizard.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/lizard.dm index 7ca2a6b8e52ff..f2b938b7e47e2 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/lizard.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/lizard.dm @@ -1,6 +1,6 @@ /datum/species/lizard mutant_bodyparts = list() - external_organs = list() + mutant_organs = list() payday_modifier = 1.0 /datum/species/lizard/get_default_mutant_bodyparts() diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm index cc322baf0c20d..8659328d9e2b4 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm @@ -333,7 +333,7 @@ alter_parts(alterer) alterer.mutant_renderkey = "" //Just in case - alterer.update_mutant_bodyparts() + alterer.update_body_parts() /** * Alter parts lets you adjust mutant bodyparts @@ -406,7 +406,7 @@ alterer.dna.species.mutant_bodyparts[chosen_key] = new_acc_list alterer.dna.mutant_bodyparts[chosen_key] = new_acc_list.Copy() alterer.dna.update_uf_block(SSaccessories.dna_mutant_bodypart_blocks[chosen_key]) - alterer.update_mutant_bodyparts() + alterer.update_body_parts() alterer.update_clothing(ALL) // for any clothing that has alternate versions (e.g. muzzled masks) /** diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/xeno.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/xeno.dm index 8d783f08ccb03..ba764842d7d4a 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/xeno.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/xeno.dm @@ -22,7 +22,6 @@ exotic_blood = /datum/reagent/toxin/acid heatmod = 2.5 mutant_bodyparts = list() - external_organs = list() payday_modifier = 1.0 changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT bodypart_overrides = list( diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/ears.dm b/modular_skyrat/modules/customization/modules/surgery/organs/ears.dm index 9bfa8f9df0ea9..d1b825b825a6a 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/ears.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/ears.dm @@ -1,29 +1,25 @@ /obj/item/organ/internal/ears/mutant name = "fluffy ears" + desc = "Wait, there's two pairs of these?" icon = 'icons/obj/clothing/head/costume.dmi' icon_state = "kitty" + bodypart_overlay = /datum/bodypart_overlay/mutant/ears /obj/item/organ/internal/ears/cat /obj/item/organ/internal/ears/fox -/obj/item/organ/external/ears - name = "fluffy ears" - desc = "Wait, there's two pairs of these?" - icon = 'icons/obj/clothing/head/costume.dmi' - icon_state = "kitty" - mutantpart_key = "ears" - mutantpart_info = list(MUTANT_INDEX_NAME = "Cat", MUTANT_INDEX_COLOR_LIST = list("#FFAA00")) - - zone = BODY_ZONE_HEAD - slot = ORGAN_SLOT_EXTERNAL_EARS - - bodypart_overlay = /datum/bodypart_overlay/mutant/ears /datum/bodypart_overlay/mutant/ears feature_key = "ears" layers = EXTERNAL_FRONT | EXTERNAL_ADJACENT | EXTERNAL_BEHIND color_source = ORGAN_COLOR_OVERRIDE +/datum/bodypart_overlay/mutant/ears/set_appearance_from_name(accessory_name) + if(isnull(accessory_name)) + accessory_name = "None" // Just to deal with the edge cases where there's some that wouldn't have an actual base appearance, since ears don't always need a visual component, but we have to proceed like this due to the unfortunate nature of this system. + + return ..() + /datum/bodypart_overlay/mutant/ears/override_color(rgb_value) return draw_color diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/organ.dm b/modular_skyrat/modules/customization/modules/surgery/organs/organ.dm index 2e07455af7b3d..2f47b2edb7f50 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/organ.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/organ.dm @@ -16,6 +16,13 @@ if(mutantpart_key) color = mutantpart_info[MUTANT_INDEX_COLOR_LIST][1] +/obj/item/organ/external/Remove(mob/living/carbon/organ_owner, special, movement_flags) + // SKYRAT EDIT ADDITION START + if(mutantpart_key) + transfer_mutantpart_info(organ_owner, special) + // SKYRAT EDIT ADDITION END + return ..() + /// Copies the organ's mutantpart_info to the owner's mutant_bodyparts /obj/item/organ/external/proc/copy_to_mutant_bodyparts(mob/living/carbon/organ_owner, special) var/mob/living/carbon/human/human_owner = organ_owner diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/tails.dm b/modular_skyrat/modules/customization/modules/surgery/organs/tails.dm index 4ce1e2ff72fd1..ab00f728f8fe2 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/tails.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/tails.dm @@ -41,7 +41,7 @@ return TRUE -/obj/item/organ/external/tail/Insert(mob/living/carbon/receiver, special, movement_flags) +/obj/item/organ/external/tail/mob_insert(mob/living/carbon/receiver, special, movement_flags) if(sprite_accessory_flags & SPRITE_ACCESSORY_WAG_ABLE) wag_flags |= WAG_ABLE return ..() diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/taur_body.dm b/modular_skyrat/modules/customization/modules/surgery/organs/taur_body.dm index 924ccd82df17a..5c1494dc31af5 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/taur_body.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/taur_body.dm @@ -105,7 +105,7 @@ return SSaccessories.sprite_accessories["taur"] -/obj/item/organ/external/taur_body/Insert(mob/living/carbon/receiver, special, movement_flags) +/obj/item/organ/external/taur_body/mob_insert(mob/living/carbon/receiver, special, movement_flags) if(sprite_accessory_flags & SPRITE_ACCESSORY_HIDE_SHOES) external_bodyshapes |= BODYSHAPE_HIDE_SHOES @@ -144,7 +144,7 @@ return ..() -/obj/item/organ/external/taur_body/Remove(mob/living/carbon/organ_owner, special, moving) +/obj/item/organ/external/taur_body/mob_remove(mob/living/carbon/organ_owner, special, moving) if(QDELETED(owner)) return ..() diff --git a/modular_skyrat/modules/emotes/code/additionalemotes/turf_emote.dm b/modular_skyrat/modules/emotes/code/additionalemotes/turf_emote.dm index 886db5b8e3efd..73451dbfbb562 100644 --- a/modular_skyrat/modules/emotes/code/additionalemotes/turf_emote.dm +++ b/modular_skyrat/modules/emotes/code/additionalemotes/turf_emote.dm @@ -96,7 +96,7 @@ user.owned_turf.dir = user.dir if(ishuman(user)) - human_user.update_mutant_bodyparts() + human_user.update_body_parts() var/list/DNA_trail = list("shoeprint", "footprint", "pawprint", "hoofprint", "clawprint") if(current_turf in DNA_trail) //These turfs leave clues of their owner diff --git a/modular_skyrat/modules/emotes/code/additionalemotes/turf_list.dm b/modular_skyrat/modules/emotes/code/additionalemotes/turf_list.dm index 55bd779f9e452..2f3e048f6e8d0 100644 --- a/modular_skyrat/modules/emotes/code/additionalemotes/turf_list.dm +++ b/modular_skyrat/modules/emotes/code/additionalemotes/turf_list.dm @@ -181,6 +181,6 @@ if(ishuman(user)) var/mob/living/carbon/human/human_user = user - human_user.update_mutant_bodyparts() + human_user.update_body_parts() #undef EXTRA_ABOVE_MOB_LAYER diff --git a/modular_skyrat/modules/modular_implants/code/nifs.dm b/modular_skyrat/modules/modular_implants/code/nifs.dm index 5fba0c6a353be..161d5c8d3e236 100644 --- a/modular_skyrat/modules/modular_implants/code/nifs.dm +++ b/modular_skyrat/modules/modular_implants/code/nifs.dm @@ -126,7 +126,7 @@ QDEL_LIST(loaded_nifsofts) return ..() -/obj/item/organ/internal/cyberimp/brain/nif/Insert(mob/living/carbon/human/insertee, special = FALSE, movement_flags = DELETE_IF_REPLACED) +/obj/item/organ/internal/cyberimp/brain/nif/mob_insert(mob/living/carbon/human/insertee, special = FALSE, movement_flags = DELETE_IF_REPLACED) . = ..() if(linked_mob && stored_ckey != insertee.ckey && theft_protection) @@ -153,7 +153,7 @@ send_message("Loading preinstalled and stored NIFSofts, please wait...") addtimer(CALLBACK(src, PROC_REF(install_preinstalled_nifsofts)), 3 SECONDS) -/obj/item/organ/internal/cyberimp/brain/nif/Remove(mob/living/carbon/organ_owner, special = FALSE) +/obj/item/organ/internal/cyberimp/brain/nif/mob_remove(mob/living/carbon/organ_owner, special = FALSE) . = ..() organ_owner.log_message("'s [src] was removed from [organ_owner]", LOG_GAME) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_helpers/human.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_helpers/human.dm index 49726990227c0..46833d7f608bf 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_helpers/human.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_helpers/human.dm @@ -274,7 +274,7 @@ overlays_standing[VAGINA_LAYER] = vagina_overlay apply_overlay(VAGINA_LAYER) - update_mutant_bodyparts() + update_body_parts() /// Updating anus slot /mob/living/carbon/human/proc/update_inv_anus() @@ -298,7 +298,7 @@ overlays_standing[ANUS_LAYER] = anus_overlay apply_overlay(ANUS_LAYER) - update_mutant_bodyparts() + update_body_parts() /// Updating nipples slot /mob/living/carbon/human/proc/update_inv_nipples() @@ -322,7 +322,7 @@ overlays_standing[NIPPLES_LAYER] = nipples_overlay apply_overlay(NIPPLES_LAYER) - update_mutant_bodyparts() + update_body_parts() /// Updating penis slot /mob/living/carbon/human/proc/update_inv_penis() @@ -346,7 +346,7 @@ overlays_standing[PENIS_LAYER] = penis_overlay apply_overlay(PENIS_LAYER) - update_mutant_bodyparts() + update_body_parts() /// Helper proc for calling all the lewd slot update_inv_ procs. /mob/living/carbon/human/proc/update_inv_lewd() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/lustwish.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/lustwish.dm index cb4acaa577aa1..d6a4312dbb8fb 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/lustwish.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/lustwish.dm @@ -154,6 +154,7 @@ premium = list( /obj/item/clothing/neck/human_petcollar/locked/holo = 3, /obj/item/clothing/neck/size_collar = 8,//It only works in the Interlink anyways + /obj/item/toy/plush/cescrewsplush = 1, ) contraband = list( diff --git a/modular_skyrat/modules/organs/code/ears.dm b/modular_skyrat/modules/organs/code/ears.dm index 462d3153c09f4..6a706d132ccaf 100644 --- a/modular_skyrat/modules/organs/code/ears.dm +++ b/modular_skyrat/modules/organs/code/ears.dm @@ -3,6 +3,8 @@ desc = "A set of four long rabbit-like ears, a Teshari's main tool while hunting. Naturally extremely sensitive to loud sounds." damage_multiplier = 1.5 actions_types = list(/datum/action/cooldown/spell/teshari_hearing) + overrides_sprite_datum_organ_type = TRUE + bodypart_overlay = /datum/bodypart_overlay/mutant/ears /obj/item/organ/internal/ears/teshari/on_mob_remove(mob/living/carbon/ear_owner) . = ..() diff --git a/modular_skyrat/modules/organs/code/tongue.dm b/modular_skyrat/modules/organs/code/tongue.dm index cb597bfc3c557..bf6580daec60a 100644 --- a/modular_skyrat/modules/organs/code/tongue.dm +++ b/modular_skyrat/modules/organs/code/tongue.dm @@ -12,29 +12,29 @@ icon_state = "tongue" modifies_speech = TRUE -/obj/item/organ/internal/tongue/dog/Insert(mob/living/carbon/signer, special = FALSE, movement_flags = DELETE_IF_REPLACED) +/obj/item/organ/internal/tongue/dog/mob_insert(mob/living/carbon/signer, special = FALSE, movement_flags = DELETE_IF_REPLACED) . = ..() signer.verb_ask = "arfs" signer.verb_exclaim = "wans" signer.verb_whisper = "whimpers" signer.verb_yell = "barks" -/obj/item/organ/internal/tongue/dog/Remove(mob/living/carbon/speaker, special = FALSE) - ..() +/obj/item/organ/internal/tongue/dog/mob_remove(mob/living/carbon/speaker, special = FALSE) + . = ..() speaker.verb_ask = initial(verb_ask) speaker.verb_exclaim = initial(verb_exclaim) speaker.verb_whisper = initial(verb_whisper) speaker.verb_sing = initial(verb_sing) speaker.verb_yell = initial(verb_yell) -/obj/item/organ/internal/tongue/cat/Insert(mob/living/carbon/signer, special = FALSE, movement_flags = DELETE_IF_REPLACED) +/obj/item/organ/internal/tongue/cat/mob_insert(mob/living/carbon/signer, special = FALSE, movement_flags = DELETE_IF_REPLACED) . = ..() signer.verb_ask = "mrrps" signer.verb_exclaim = "mrrowls" signer.verb_whisper = "purrs" signer.verb_yell = "yowls" -/obj/item/organ/internal/tongue/cat/Remove(mob/living/carbon/speaker, special = FALSE) +/obj/item/organ/internal/tongue/cat/mob_remove(mob/living/carbon/speaker, special = FALSE) . = ..() speaker.verb_ask = initial(verb_ask) speaker.verb_exclaim = initial(verb_exclaim) @@ -48,14 +48,14 @@ icon_state = "tongue" modifies_speech = TRUE -/obj/item/organ/internal/tongue/avian/Insert(mob/living/carbon/signer, special = FALSE, movement_flags = DELETE_IF_REPLACED) +/obj/item/organ/internal/tongue/avian/mob_insert(mob/living/carbon/signer, special = FALSE, movement_flags = DELETE_IF_REPLACED) . = ..() signer.verb_ask = "peeps" signer.verb_exclaim = "squawks" signer.verb_whisper = "murmurs" signer.verb_yell = "shrieks" -/obj/item/organ/internal/tongue/avian/Remove(mob/living/carbon/speaker, special = FALSE) +/obj/item/organ/internal/tongue/avian/mob_remove(mob/living/carbon/speaker, special = FALSE) . = ..() speaker.verb_ask = initial(verb_ask) speaker.verb_exclaim = initial(verb_exclaim) diff --git a/modular_skyrat/modules/primitive_catgirls/code/species.dm b/modular_skyrat/modules/primitive_catgirls/code/species.dm index d0b0f5cbaac65..9ae49a3dd9860 100644 --- a/modular_skyrat/modules/primitive_catgirls/code/species.dm +++ b/modular_skyrat/modules/primitive_catgirls/code/species.dm @@ -70,7 +70,7 @@ human_for_preview.dna.species.mutant_bodyparts["tail"] = list(MUTANT_INDEX_NAME = "Cat", MUTANT_INDEX_COLOR_LIST = list(human_for_preview.hair_color)) human_for_preview.dna.species.mutant_bodyparts["ears"] = list(MUTANT_INDEX_NAME = "Cat", MUTANT_INDEX_COLOR_LIST = list(human_for_preview.hair_color)) - human_for_preview.update_mutant_bodyparts() + human_for_preview.update_body_parts() human_for_preview.update_body(is_creating = TRUE) /datum/species/human/felinid/primitive/get_species_description() diff --git a/modular_skyrat/modules/synths/code/bodyparts/ears.dm b/modular_skyrat/modules/synths/code/bodyparts/ears.dm index 8a35e693c5c6c..0525baa7a019e 100644 --- a/modular_skyrat/modules/synths/code/bodyparts/ears.dm +++ b/modular_skyrat/modules/synths/code/bodyparts/ears.dm @@ -8,6 +8,8 @@ gender = PLURAL maxHealth = 1 * STANDARD_ORGAN_THRESHOLD organ_flags = ORGAN_ROBOTIC + overrides_sprite_datum_organ_type = TRUE + bodypart_overlay = /datum/bodypart_overlay/mutant/ears /obj/item/organ/internal/ears/synth/emp_act(severity) . = ..() diff --git a/modular_skyrat/modules/synths/code/bodyparts/stomach.dm b/modular_skyrat/modules/synths/code/bodyparts/stomach.dm index 71fd2f27d48e0..b5d9fad2e121a 100644 --- a/modular_skyrat/modules/synths/code/bodyparts/stomach.dm +++ b/modular_skyrat/modules/synths/code/bodyparts/stomach.dm @@ -47,11 +47,11 @@ ) departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE -/obj/item/organ/internal/stomach/synth/Insert(mob/living/carbon/receiver, special, movement_flags) +/obj/item/organ/internal/stomach/synth/mob_insert(mob/living/carbon/receiver, special, movement_flags) . = ..() RegisterSignal(receiver, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, PROC_REF(on_borg_charge)) -/obj/item/organ/internal/stomach/synth/Remove(mob/living/carbon/stomach_owner, special) +/obj/item/organ/internal/stomach/synth/mob_remove(mob/living/carbon/stomach_owner, special) . = ..() UnregisterSignal(stomach_owner, COMSIG_PROCESS_BORGCHARGER_OCCUPANT) diff --git a/modular_skyrat/modules/taur_mechanics/code/constrict.dm b/modular_skyrat/modules/taur_mechanics/code/constrict.dm index 0172b1bfee022..2ca443ba10697 100644 --- a/modular_skyrat/modules/taur_mechanics/code/constrict.dm +++ b/modular_skyrat/modules/taur_mechanics/code/constrict.dm @@ -202,7 +202,7 @@ var/mob/living/carbon/human/old_owner = owner set_owner(null) - old_owner?.update_mutant_bodyparts() + old_owner?.update_body_parts() tail_overlay = null return ..() @@ -521,7 +521,7 @@ RegisterSignal(owner, COMSIG_LIVING_TRY_PULL, PROC_REF(owner_tried_pull)) RegisterSignal(owner, COMSIG_LIVING_SET_BODY_POSITION, PROC_REF(owner_body_position_changed)) RegisterSignal(owner, COMSIG_ATOM_POST_DIR_CHANGE, PROC_REF(sync_direction)) - owner?.update_mutant_bodyparts() + owner?.update_body_parts() /// The time it takes for a constricted thing to do a break-out attempt. #define SERPENTINE_TAIL_UNBUCKLE_TIME 0.5 SECONDS // arbitrary diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/veil.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/veil.dm index 18f064b3f07e9..4312eb0cc05de 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/veil.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/veil.dm @@ -96,7 +96,7 @@ // Apply Appearance user.regenerate_organs() // Actually regenerates the mutant_bodyparts. user.update_body(TRUE) // Outfit and underware, also body. - user.update_mutant_bodyparts(TRUE) // Lizard tails etc + user.update_body_parts(TRUE) // Lizard tails etc RegisterSignal(user, COMSIG_HUMAN_GET_VISIBLE_NAME, PROC_REF(return_disguise_name)) diff --git a/modular_zubbers/code/modules/antagonists/pirate/pirate_event.dm b/modular_zubbers/code/modules/antagonists/pirate/pirate_event.dm new file mode 100644 index 0000000000000..6cb85ba473d11 --- /dev/null +++ b/modular_zubbers/code/modules/antagonists/pirate/pirate_event.dm @@ -0,0 +1,9 @@ +/datum/round_event/pirates/start() + //Check for admin customization - gang_list is only populated if admins manually spawn the event + if(gang_list) + send_pirate_threat(gang_list) + else + //fires with the global pirate gang lists if gang_list is empty + send_pirate_threat(GLOB.heavy_pirate_gangs + GLOB.light_pirate_gangs) + + diff --git a/modular_zubbers/code/modules/storyteller/event_defines/crewset/bloodsucker.dm b/modular_zubbers/code/modules/storyteller/event_defines/crewset/bloodsucker.dm index 61f8050d97881..e74607ae284b6 100644 --- a/modular_zubbers/code/modules/storyteller/event_defines/crewset/bloodsucker.dm +++ b/modular_zubbers/code/modules/storyteller/event_defines/crewset/bloodsucker.dm @@ -4,8 +4,8 @@ antag_flag = ROLE_BLOODSUCKER antag_datum = /datum/antagonist/bloodsucker - weight = 8 - min_players = 20 + weight = 5 + min_players = 30 maximum_antags_global = 3 diff --git a/modular_zubbers/code/modules/storyteller/event_defines/crewset/heretic.dm b/modular_zubbers/code/modules/storyteller/event_defines/crewset/heretic.dm index 60516d48d28c7..56bca57ab9714 100644 --- a/modular_zubbers/code/modules/storyteller/event_defines/crewset/heretic.dm +++ b/modular_zubbers/code/modules/storyteller/event_defines/crewset/heretic.dm @@ -5,7 +5,7 @@ antag_flag = ROLE_HERETIC antag_datum = /datum/antagonist/heretic weight = 3 - min_players = 30 + min_players = 50 maximum_antags_global = 2 diff --git a/modular_zubbers/code/modules/storyteller/event_defines/ghostset/lone_infiltrator.dm b/modular_zubbers/code/modules/storyteller/event_defines/ghostset/lone_infiltrator.dm index 0ec83cc2de64a..70337f25284bf 100644 --- a/modular_zubbers/code/modules/storyteller/event_defines/ghostset/lone_infiltrator.dm +++ b/modular_zubbers/code/modules/storyteller/event_defines/ghostset/lone_infiltrator.dm @@ -41,6 +41,7 @@ player_mind.set_assigned_role(SSjob.get_job_type(/datum/job/lone_operative)) player_mind.special_role = "Lone Infiltrator" player_mind.add_antag_datum(/datum/antagonist/traitor/lone_infiltrator) + spawned_mobs += operative message_admins("[ADMIN_LOOKUPFLW(operative)] has been made into lone infiltrator.") log_game("[key_name(operative)] was spawned as a lone infiltrator") diff --git a/modular_zubbers/maps/kilostation/area.dm b/modular_zubbers/maps/kilostation/area.dm new file mode 100644 index 0000000000000..338dbf77fc9c9 --- /dev/null +++ b/modular_zubbers/maps/kilostation/area.dm @@ -0,0 +1,3 @@ +/area/mine/eva/abandoned + name = "Abandoned EVA Warehouse" + icon_state = "mining_eva" diff --git a/modular_zubbers/maps/offstation/persistence/code.dm b/modular_zubbers/maps/offstation/persistence/code.dm deleted file mode 100644 index 33b5e86d8d598..0000000000000 --- a/modular_zubbers/maps/offstation/persistence/code.dm +++ /dev/null @@ -1,20 +0,0 @@ -/datum/map_template/ruin/icemoon/bubberstation/syndicate_crawler - name = "Syndicate Ice Moon Land Crawler" - id = "ice-crawler" - description = "A syndicate mining operation used to mine materials in spite of NT claims. Also setup to provide agent support and comms monitoring" - suffix = "icemoon_persistence.dmm" - allow_duplicates = FALSE - never_spawn_with = list(/datum/map_template/ruin/lavaland/bubberstation/dauntless, - /datum/map_template/ruin/lavaland/bubberstation/syndicate_crawler) - always_place = TRUE - ruin_type = ZTRAIT_ICE_RUINS_UNDERGROUND - -/datum/map_template/ruin/lavaland/bubberstation/syndicate_crawler - name = "Syndicate Lavaland Land Crawler" - id = "lava-crawler" - description = "A syndicate mining operation used to mine materials in spite of NT claims. Also setup to provide agent support and comms monitoring" - suffix = "lavaland_persistence.dmm" - allow_duplicates = FALSE - never_spawn_with = list(/datum/map_template/ruin/lavaland/bubberstation/dauntless, - /datum/map_template/ruin/icemoon/bubberstation/syndicate_crawler) - always_place = TRUE diff --git a/modular_zzplurt/code/datums/quirks/neutral_quirks/werewolf.dm b/modular_zzplurt/code/datums/quirks/neutral_quirks/werewolf.dm index 074a6849b1ce8..990a526c60bd1 100644 --- a/modular_zzplurt/code/datums/quirks/neutral_quirks/werewolf.dm +++ b/modular_zzplurt/code/datums/quirks/neutral_quirks/werewolf.dm @@ -151,7 +151,7 @@ // Apply Appearance //action_owner.regenerate_organs() // This causes ALL organs to be healed. Do not use it. action_owner.update_body(TRUE) - action_owner.update_mutant_bodyparts(TRUE) + action_owner.update_body_parts(TRUE) // Update possible genital organs /* Temporarily disabled @@ -204,7 +204,7 @@ // Apply Appearance //action_owner.regenerate_organs() // This causes ALL organs to be healed. Do not use it. action_owner.update_body(TRUE) - action_owner.update_mutant_bodyparts(TRUE) + action_owner.update_body_parts(TRUE) //action_owner.update_size(clamp(get_size(action_owner) - 0.5, RESIZE_MICRO, RESIZE_MACRO)) // Temporarily disabled // Revert genital organs diff --git a/modular_zzplurt/code/modules/mob/living/carbon/human/human_update_icons.dm b/modular_zzplurt/code/modules/mob/living/carbon/human/human_update_icons.dm index 8cfeeaff4c2b9..561dc426620fb 100644 --- a/modular_zzplurt/code/modules/mob/living/carbon/human/human_update_icons.dm +++ b/modular_zzplurt/code/modules/mob/living/carbon/human/human_update_icons.dm @@ -89,7 +89,7 @@ overlays_standing[UNDERWEAR_LAYER] = underwear_overlay apply_overlay(UNDERWEAR_LAYER) - update_mutant_bodyparts() + update_body_parts() /mob/living/carbon/human/update_worn_shirt(update_obscured = TRUE) remove_overlay(SHIRT_LAYER) @@ -162,7 +162,7 @@ overlays_standing[SHIRT_LAYER] = shirt_overlay apply_overlay(SHIRT_LAYER) - update_mutant_bodyparts() + update_body_parts() /mob/living/carbon/human/update_worn_bra(update_obscured = TRUE) @@ -237,7 +237,7 @@ overlays_standing[BRA_LAYER] = bra_overlay apply_overlay(BRA_LAYER) - update_mutant_bodyparts() + update_body_parts() /mob/living/carbon/human/update_worn_wrists(update_obscured = TRUE) remove_overlay(WRISTS_LAYER) diff --git a/modular_zzplurt/code/modules/species/arachnid.dm b/modular_zzplurt/code/modules/species/arachnid.dm index 5862ca26f9a81..dc1a5caedd728 100644 --- a/modular_zzplurt/code/modules/species/arachnid.dm +++ b/modular_zzplurt/code/modules/species/arachnid.dm @@ -19,7 +19,7 @@ changesource_flags = MIRROR_MAGIC | MIRROR_PRIDE | RACE_SWAP | WABBAJACK | MIRROR_BADMIN | SLIME_EXTRACT inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BUG - external_organs = list( + mutant_organs = list( /obj/item/organ/external/mandibles = "Plain", /obj/item/organ/external/spinneret = "Plain", /obj/item/organ/external/arachnid_legs = "Plain", diff --git a/strings/traumas.json b/strings/traumas.json index f0cab99ce4eff..08c04ac19f340 100644 --- a/strings/traumas.json +++ b/strings/traumas.json @@ -1,117 +1,74 @@ { "brain_damage": [ - "We straight gassing cutting straight to the bricks, ha ha.", - "This shit ain't nothing to me, man.", - "We smoking runts.", - "Shorty got a BBL took that shit out because she couldn't run.", + "We straight gassing, cutting straight to the bricks, haha. This shit ain't nothing to me, man.", "I had to do it to them, snipe.", - "I went Judge Judy on that pussy, snipe.", - "I'm not loyal to anybody; I'm a demon.", - "I have no loyalty for anyone. Never did never will.", - "Shorty chose to be with a demon. Sounds like her problem to me. Ha ha.", - "This shit ain't nothing to me, man.", - "My money longer than James Cameron.", - "On and off the court straight fundamental; no funny business.", - "This shit ain't nothing to me, man.", - "Moving like Dracula. We get it. Back in blood.", - "You see it. I really did this. I'm really him.", - "Flipped a whole brick into an empire. Stop playing with me.", - "I have no sympathy. I live for this shit.", - "This shit ain't nothing to me, man.", - "I'm nice with it. Ha ha.", + "I'm not loyal to anybody; I'm a demon. I have no loyalty for anyone, never did, never will.", + "Shorty chose to be with a demon. Sounds like her problem to me, haha.", + "On and off the court, straight fundamentals, no funny business.", + "Moving like Dracula, we get it back in blood.", + "You see it, I really did this, I'm really him.", + "Flipped a whole brick into an empire, stop playing with me.", + "I have no sympathy, I live for this shit. I'm nice with it, haha.", "My money long, my pockets deep.", - "No pocket watching in these parts.", - "We straight gassing. Cutting straight to the bricks.", - "That pussy better stank, otherwise I don't want it.", - "Popped a perc 30, got straight to fucking.", - "That pussy dulce.", - "Smoking fentanyl laced cereal milk. I see god.", - "This shit ain't nothing to me man.", - "That pussy got me screamin, cryin, pissin, shittin, shootin ropes.", - "Yeah we getting that pirate bay alien shish kabab cordycep money.", - "I hope them aliens are real so that I have more things to fuck.", - "Smoking the Qui-Gon Jinn Vietnamese Phillips head runts.", - "She suck me like a cordless Dyson v8.", - "I'm in a K-hole licking balloon knot.", - "When I got the meat cannon, I bе shooting straight rope.", - "This shit ain't nothing to me, man.", - "Chanel optics got mе seeing shit.", - "I need fentanyl slime.", + "We straight gassing, cutting straight to the bricks.", + "Smoking fentanyl-laced cereal milk; I see God.", + "I hope them aliens are real, so that I have more things to fuck.", "I just popped a whole garbanzo bean, fuck you mean?", - "I smoke real Emrānī rapscallion ghost nuggets.", "Y'all can't fuck with me.", "I'm him, I been him, I will continue to be him.", - "Yellow rubies glistening like piss.", - "Gulping sea monkeys by the gallon, my tummy feel crazy.", - "That coochie yummy, slime.", - "That coochie doing it for me, slime.", - "They thought they could stop the demon. I'm back.", - "The zaza got me speaking Esperanto.", - "This shit ain't nothing to me man.", - "We out here cloud seeding, the scope gleaming.", - "You can't trust me; I don't even trust myself.", - "I don't even know who I am anymore. I'm getting too much money.", - "Ass so fat, I'm peaking off this Danny Phantom slime.", + "Gulping sea monkeys by the gallon; my tummy feel crazy.", + "They thought they could stop a demon. I'm back.", + "This shit ain't nothing to me, man.", + "You can't trust me, I don't even trust myself.", + "I don't even know who I am anymore, I'm getting too much money.", "Can you remind me who I am?", - "Get the president on the phone now, I fronted him a brick I need my money.", - "Hello? Blac Chyna?", - "I'm movin' different.", - "This shit ain't nothin' to me, man. I'm a dog.", - "I'm bitin' the fart bubbles in the bath.", - "We smokin' Symbiotes.", - "Smokin' that Whoopie Goldberg south Egyptian furburger deluxe Mega Millions scratcher skunk bubba kush.", - "We smokin' dung beetle.", - "I'm on 12 Vicodin smokin' on Scooby-Doo dick.", - "We smokin' Sequoia banshee boogers.", - "We snortin' that good buffalo soldier tamarind Jordanian jimmies.", + "Get the president on the phone now! I fronted him a brick, I need my money!", + "I'm moving different.", "They must have amnesia, they forgot that I'm him.", - "That Burberry back woods pack hitting that pussy smell like a Hellcat V8.", - "We smokin' shit in a glass pipe, blowin' the lord's bubbles, yeah!", - "I'm sick in the head, I'm on them Broward County Tic-Tacs.", - "I'm on them Georgetown Gеronimos, I'm on them Nashville Nibblers.", - "I lеft my Margielas in the Benz truck, I'll have to stunt on them next time.", - "I don't give a fuck if I go blind, I don't need to see the price tag anyways.", - "I'm high on 12 Jason Bournes, lookin' to beat the cum out of a thick fresh oak.", - "We're smokin' filtered crack, you stupid piece of shit. I'll fuckin' kill you!", - "Call that pussy The Matrix because I'm in this bitch and I can't get out.", - "Last guy who ran off on the pack got choked out by some Givenchy gloves.", - "The last thing he ever saw was the price tag on them.", - "Slowly faded into darkness and I let the archangels take 'im.", - "I need more Sequoia banshee boogers.", - "Don't be shy, girl, I love me some pastrami mud flaps.", - "I'm movin' like French Montana--Haaanh?", - "Welcome to the cream kingdom, bitch.", - "Open up.", - "Blac Chyna, I'd drink her piss out of another man's balls.", - "My shooter a crackhead, he look like Woody Harrelson.", - "You ain't seen ten bands in your life, jit.", + "We smoking shit in a glass pipe, blowing the Lord's bubbles.", + "I don't give a fuck if I go blind. I don't need to see the price tag anyways.", + "We're smoking filtered crack, you stupid piece of shit. I'll fucking kill you.", + "Last guy who ran off on the pack got choked out by some insulated gloves. The last thing he ever saw was the price tag on them.", + "Slowly faded into darkness and I let the archangels take him.", "Reach for my neck, you'll get turned into an example.", - "Y'all gotta stop playin' with me, man.", - "I threw diamonds at the strip clubs under the great pyramids.", - "I pushed the camel through the eye of a needle.", - "This shit ain't nothin' to me, man.", - "Tied the ops to the back of a Trackhawk and dragged him around the block for 24 hours.", - "Motherfucker look like a Resident Evil 5 campaign extra after we was done with him.", - "Ops wanted some initiative, blew up their entire quadrant.", - "I'm moving like Oppenheimer.", - "She dropped that ass on me from an egregarious angle.", - "They thought I was Steven Wallace.", + "Y'all gotta stop playing with me, man.", + "Tied the nuke ops to the back of a janicart and dragged 'em around the station for 24 hours.", "Top shelf zaza disrupted my circadian rhythm.", - "I have seen the Magna Carta.", - "I've seen the Eye of Hora.", - "I was flipping bricks for Mansa Musa before y'all even became a type 1 civilization.", - "This shit ain't nothin' to me, you stupid piece of shit.", - "Step the wrong way and you will perish.", - "That pussy feel like Biscoff butter.", - "You think I care about this shit?", - "Ask me if I care about this shit.", - "'Cause I don't give a shit.", - "If I had a dollar for every time they said I gave a shit I'd be broke.", - "'Cause I don't give a shit.", - "My bitch look like David Hasselhoff.", - "I balled so hard they thought I was a fuckin' nutsack.", - "This shit ain't nothin' to me, man.", - "I'll kill you, you stupid piece of shit." + "This shit ain't nothing to me, you stupid piece of shit. Step the wrong way and you will perish.", + "You think I care about this shit? Ask me if I care about this shit, cause I don't give a shit.", + "If I had a dollar for every time they said I gave a shit, I'd be broke cause I don't give a shit.", + "I balled so hard they thought I was a fucking nutsack.", + "I'm at the bank about to withdraw all of it.", + "Caught a broke boy trying to come up on my cargo package, so I skinned his ass alive.", + "Thеy needed a stealth soldier, so I put my hands on the hot plate at the kitchen and burned my fucking fingerprints off. They will not find me.", + "Blacked out on the Percocet, ordered a Desert Eagle off Cargo.", + "Got supermatter crystalline shards poking out my lungs, fuckboy.", + "The Moonstation Armory cannon shivered his timbers.", + "I'm Dracula; I'm twelve million years old.", + "These officers are interrogating me about an ounce of weed, as if I didn't kill a bartender two z-levels away.", + "If this watch breaks, the foreign exchange market will take a twenty-eight percent hit. People will die.", + "My diamonds come from the most horrific situations possible.", + "They're sick in the head; they forgot I'm him.", + "I got my DNA test back; turns out I'm one-hundred percent him.", + "There are consequences to your crimes against Dracula.", + "I have more Percs than there are stars in the Leo Cluster.", + "I'm claiming every corner, every block. Fuck it; I'm coming for every universal enzyme.", + "All I'm saying is I paid for the tickets.", + "I'm moving lucrative.", + "War is all I think about.", + "I'm doing a lot of drugs, a lot!", + "I sold crack to myself.", + "I'm getting too much money!", + "Broke boy wasn't balling enough.", + "I got more sticks than a fucking forest.", + "I have the blueprint to the catacombs.", + "Smoked a nuke op; his meat came right off the bone.", + "I don't have any compassion for broke boys.", + "I knew the perc was fake, but I still ate it because I'm a gremlin.", + "I took two limitless pills to limit myself.", + "I got so much cheese in my pocket, they thought I was a fucking calzone.", + "I'll give you that fluoride stare.", + "Drank man, please! I'm thirsty! Drank man, please!" ], "mutations": [ diff --git a/tgstation.dme b/tgstation.dme index 0dacaaaad3526..ab517a1c40c88 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6233,7 +6233,7 @@ #include "code\modules\surgery\organs\autosurgeon.dm" #include "code\modules\surgery\organs\helpers.dm" #include "code\modules\surgery\organs\organ_movement.dm" -#include "code\modules\surgery\organs\external\_external_organ.dm" +#include "code\modules\surgery\organs\external\_visual_organs.dm" #include "code\modules\surgery\organs\external\restyling.dm" #include "code\modules\surgery\organs\external\spines.dm" #include "code\modules\surgery\organs\external\tails.dm" @@ -6972,6 +6972,7 @@ #include "modular_skyrat\master_files\code\modules\surgery\surgery.dm" #include "modular_skyrat\master_files\code\modules\surgery\bodyparts\_bodyparts.dm" #include "modular_skyrat\master_files\code\modules\surgery\bodyparts\robot_bodyparts.dm" +#include "modular_skyrat\master_files\code\modules\surgery\organs\_organ.dm" #include "modular_skyrat\master_files\code\modules\surgery\organs\tongue.dm" #include "modular_skyrat\master_files\code\modules\surgery\organs\external\wings\functional_wings.dm" #include "modular_skyrat\master_files\code\modules\surgery\organs\external\wings\wings.dm" @@ -8920,6 +8921,7 @@ #include "modular_zubbers\code\modules\antagonists\malf\doomsday.dm" #include "modular_zubbers\code\modules\antagonists\malf\remove_malf.dm" #include "modular_zubbers\code\modules\antagonists\nightmare\nightmare_species.dm" +#include "modular_zubbers\code\modules\antagonists\pirate\pirate_event.dm" #include "modular_zubbers\code\modules\antagonists\traitor\goal_overrides.dm" #include "modular_zubbers\code\modules\antagonists\traitor\uplink\uplinkdatums.dm" #include "modular_zubbers\code\modules\antagonists\traitor\uplink\uplink_items\bundle.dm" @@ -9417,6 +9419,7 @@ #include "modular_zubbers\maps\biodome\turfs.dm" #include "modular_zubbers\maps\biodome\vendcation.dm" #include "modular_zubbers\maps\biodome\weapons.dm" +#include "modular_zubbers\maps\kilostation\area.dm" #include "modular_zubbers\maps\moonstation\dp_vent_pump.dm" #include "modular_zubbers\maps\moonstation\telescreen.dm" #include "modular_zubbers\maps\offstation\mob_spawns.dm" @@ -9437,7 +9440,6 @@ #include "modular_zubbers\maps\offstation\persistence\area.dm" #include "modular_zubbers\maps\offstation\persistence\camera.dm" #include "modular_zubbers\maps\offstation\persistence\camerabutton.dm" -#include "modular_zubbers\maps\offstation\persistence\code.dm" #include "modular_zubbers\maps\offstation\persistence\ID_trims.dm" #include "modular_zubbers\maps\offstation\persistence\laws.dm" #include "modular_zubbers\maps\offstation\persistence\mob_spawns.dm"