diff --git a/_maps/RandomRuins/IceRuins/bubberstation/icemoon_interdyne.dmm b/_maps/RandomRuins/IceRuins/bubberstation/icemoon_interdyne.dmm index c59662e0050..a7b19086c0e 100644 --- a/_maps/RandomRuins/IceRuins/bubberstation/icemoon_interdyne.dmm +++ b/_maps/RandomRuins/IceRuins/bubberstation/icemoon_interdyne.dmm @@ -1959,9 +1959,9 @@ /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/item/radio/headset/syndicateciv/staff, +/obj/item/radio/headset/syndicateciv/staff, +/obj/item/radio/headset/syndicateciv/staff, /turf/open/floor/iron, /area/ruin/syndicate_lava_base/cargo) "oj" = ( diff --git a/_maps/RandomRuins/IceRuins/bubberstation/icemoon_persistence.dmm b/_maps/RandomRuins/IceRuins/bubberstation/icemoon_persistence.dmm index 7687e1d6b1e..a1cb6290465 100644 --- a/_maps/RandomRuins/IceRuins/bubberstation/icemoon_persistence.dmm +++ b/_maps/RandomRuins/IceRuins/bubberstation/icemoon_persistence.dmm @@ -17,7 +17,7 @@ name = "Turbine Vent"; req_access = list("syndicate") }, -/turf/open/floor/catwalk_floor/titanium, +/turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "ad" = ( /obj/structure/cable, @@ -64,6 +64,13 @@ }, /turf/open/floor/engine/o2, /area/ruin/space/has_grav/bubbers/persistance/engineering/gas) +"an" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/trinary/mixer{ + dir = 8 + }, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "ao" = ( /obj/effect/turf_decal/siding/dark{ dir = 8; @@ -78,7 +85,6 @@ dir = 1 }, /obj/machinery/disposal/bin, -/obj/structure/noticeboard/directional/south, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/engineering/mining) "at" = ( @@ -122,6 +128,16 @@ "ax" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) +"ay" = ( +/obj/structure/table, +/obj/item/storage/toolbox/syndicate{ + pixel_y = 5 + }, +/obj/item/pipe_dispenser{ + pixel_x = -3 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/engineering/mining) "az" = ( /obj/machinery/quantum_server, /turf/open/floor/iron/dark/small, @@ -327,9 +343,16 @@ dir = 1 }, /obj/machinery/biogenerator/medstation/directional/west, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "aY" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "aZ" = ( @@ -506,7 +529,6 @@ "bz" = ( /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) "bA" = ( @@ -547,10 +569,6 @@ /obj/effect/turf_decal/siding/dark{ dir = 8 }, -/obj/machinery/jukebox{ - req_access = list("syndicate"); - anchored = 0 - }, /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "bF" = ( @@ -587,9 +605,9 @@ /obj/effect/turf_decal/stripes/red/line{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, +/obj/effect/turf_decal/stripes/red/line, +/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) "bL" = ( @@ -607,10 +625,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/wood/tile, /area/ruin/space/has_grav/bubbers/persistance/sec/prison/rec) -"bO" = ( -/obj/structure/cable, -/turf/open/floor/pod/dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering) "bP" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/west, @@ -680,14 +694,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/med/chem) -"bY" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/processor{ - pixel_x = 1; - pixel_y = 10 - }, -/turf/open/floor/iron/kitchen/diagonal, -/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "bZ" = ( /obj/structure/sign/warning/yes_smoking/circle/directional/west, /turf/open/floor/catwalk_floor/iron_dark, @@ -701,7 +707,7 @@ dir = 5 }, /turf/open/floor/noslip, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "cc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -835,8 +841,9 @@ dir = 9 }, /obj/machinery/duct, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "cA" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -866,7 +873,7 @@ }, /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/engineering) "cE" = ( /obj/structure/extinguisher_cabinet/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, @@ -933,7 +940,7 @@ /obj/item/paper/fluff/jobs/engineering/frequencies{ pixel_x = 4 }, -/obj/item/radio/headset/interdyne, +/obj/item/radio/headset/syndicateciv/staff, /turf/open/floor/mineral/plastitanium/red{ icon_state = "plastitanium" }, @@ -953,10 +960,6 @@ /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "cT" = ( -/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) "cU" = ( @@ -993,11 +996,12 @@ /turf/open/floor/engine, /area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) "cY" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/siding/dark{ + dir = 1 }, -/obj/machinery/rnd/server/interdyne, -/turf/open/floor/mineral/plastitanium/red, +/obj/machinery/ntnet_relay, +/turf/open/floor/noslip, /area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "cZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -1025,9 +1029,7 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/griddle, /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "dd" = ( @@ -1163,6 +1165,8 @@ dir = 1 }, /obj/effect/turf_decal/stripes/red/line, +/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) "dz" = ( @@ -1173,6 +1177,9 @@ dir = 8 }, /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/wood/parquet, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "dA" = ( @@ -1239,10 +1246,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/item/circuitboard/machine/sleeper/syndie, /turf/open/floor/carpet/royalblue, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/medical) @@ -1287,7 +1290,6 @@ /obj/machinery/door/firedoor/heavy, /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /obj/effect/mapping_helpers/airlock/cutaiwire, -/obj/machinery/duct, /obj/machinery/door/airlock/mining, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/evac) @@ -1338,10 +1340,6 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/service) -"eb" = ( -/obj/structure/closet/crate/secure/trashcart/filled, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/cargo) "ec" = ( /obj/machinery/duct, /obj/structure/cable, @@ -1357,7 +1355,6 @@ /area/ruin/space/has_grav/bubbers/persistance/service/diner) "ee" = ( /obj/machinery/light_switch/directional/west, -/obj/item/healthanalyzer/advanced, /obj/machinery/light/directional/west, /obj/machinery/stasis{ dir = 1 @@ -1431,11 +1428,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/carpet/royalblack, /area/ruin/space/has_grav/bubbers/persistance/service/lounge) -"er" = ( -/obj/structure/table, -/obj/machinery/xenoarch/scanner, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/bubbers/persistance/engineering/mining) +"eq" = ( +/turf/closed/wall/r_wall/syndicate/nodiagonal, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/cargo) "es" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -1466,7 +1461,6 @@ /obj/effect/turf_decal/stripes/red/line{ dir = 4 }, -/obj/machinery/light/cold/directional/north, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "ev" = ( @@ -1506,10 +1500,21 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 10 }, -/obj/machinery/biogenerator/organic_printer, /obj/machinery/light/directional/south, +/obj/structure/rack, +/obj/item/construction/plumbing, +/obj/item/storage/toolbox/syndicate{ + pixel_y = 5 + }, /turf/open/floor/iron/terracotta/herringbone, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) +"eE" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) "eF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -1533,10 +1538,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/structure/cable, -/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/machinery/duct, /obj/structure/disposalpipe/segment, /turf/open/floor/catwalk_floor/iron_dark, @@ -1554,17 +1555,15 @@ "eN" = ( /obj/structure/window/reinforced/survival_pod/spawner/directional/north, /obj/structure/table/reinforced/plastitaniumglass, -/obj/item/circuitboard/machine/powerator/interdyne, /obj/item/storage/toolbox/syndicate{ pixel_y = 5 }, +/obj/item/storage/box/stockparts/basic{ + pixel_x = 4; + pixel_y = 10 + }, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/cargo) -"eO" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, -/obj/structure/cable, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "eP" = ( /obj/effect/turf_decal/siding/white{ dir = 10 @@ -1575,6 +1574,14 @@ }, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/med) +"eQ" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/obj/structure/flatpack_cart, +/turf/open/floor/pod/dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) "eR" = ( /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium{ polarizer_id = "syndiengi_w" @@ -1654,7 +1661,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/structure/cable, -/obj/machinery/holopad, /turf/open/floor/carpet/donk, /area/ruin/space/has_grav/bubbers/persistance/service) "fe" = ( @@ -1746,12 +1752,9 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 }, -/obj/structure/fermenting_barrel, /turf/open/floor/iron/terracotta/herringbone, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "ft" = ( -/obj/machinery/airalarm/directional/west, -/obj/effect/mapping_helpers/airalarm/syndicate_access, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, @@ -1768,18 +1771,23 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) "fw" = ( -/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/corner{ dir = 4 }, /obj/machinery/duct, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "fx" = ( /obj/structure/table/reinforced/plastitaniumglass, -/obj/effect/spawner/random/food_or_drink/donkpockets, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_y = 9; + pixel_x = 11 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_y = 15; + pixel_x = 11 + }, +/obj/item/clothing/head/utility/chefhat, /turf/open/floor/iron/kitchen/diagonal, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "fy" = ( @@ -1865,6 +1873,10 @@ /area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) "fH" = ( /obj/structure/table/reinforced/plastitaniumglass, +/obj/item/stamp/chameleon, +/obj/item/stamp/persistence{ + pixel_x = 9 + }, /turf/open/floor/mineral/plastitanium/red{ icon_state = "plastitanium" }, @@ -1931,8 +1943,16 @@ dir = 5 }, /obj/machinery/duct, +/obj/machinery/vending/engivend{ + skyrat_products = list(/obj/item/clothing/glasses/meson/engine = 5, /obj/item/construction/rcd/loaded = 0, /obj/item/storage/pouch/material = 2, /obj/item/storage/bag/construction = 2); + onstation = 0; + onstation_override = 1; + all_products_free = 1; + pixel_y = 32; + density = 0 + }, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "fW" = ( /obj/machinery/duct, /obj/structure/cable, @@ -1947,9 +1967,6 @@ /obj/effect/mapping_helpers/airlock/cutaiwire, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) -"fX" = ( -/turf/closed/wall/r_wall/syndicate/cruiser, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) "fY" = ( /obj/structure/flora/bush/flowers_br/style_random, /turf/open/floor/grass, @@ -2011,6 +2028,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/item/folder/syndicate/red, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/command/liason) "gi" = ( @@ -2159,6 +2177,14 @@ /obj/structure/cable, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) +"gP" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 9 + }, +/obj/effect/turf_decal/siding/dark, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/iron/white/diagonal, +/area/ruin/space/has_grav/bubbers/persistance/med) "gQ" = ( /obj/machinery/button/door/directional/north{ id = "syndicatesauna"; @@ -2194,6 +2220,17 @@ }, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service/diner) +"gT" = ( +/obj/machinery/duct, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) +"gU" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 4 + }, +/obj/machinery/duct, +/turf/open/floor/iron/terracotta/herringbone, +/area/ruin/space/has_grav/bubbers/persistance/service/hydro) "gV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, @@ -2308,12 +2345,27 @@ /obj/item/statuebust/hippocratic/evil, /obj/machinery/digital_clock/directional/north, /obj/structure/cable, +/obj/item/storage/box/pinpointer_pairs{ + pixel_x = -4; + pixel_y = 6 + }, /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/medical) "hx" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/sci/robotics) +"hz" = ( +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, +/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) "hC" = ( /obj/machinery/duct, /obj/structure/disposalpipe/segment{ @@ -2375,15 +2427,12 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "hK" = ( -/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/end{ dir = 4 }, -/obj/structure/reagent_dispensers/watertank/high, +/obj/structure/reagent_dispensers/foamtank, /turf/open/floor/noslip, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "hL" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/structure/disposalpipe/segment{ @@ -2446,13 +2495,6 @@ initial_gas_mix = "LAVALAND_ATMOS" }, /area/ruin/space/has_grav/bubbers/persistance/cargo) -"hQ" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/incinerator_input{ - dir = 1; - chamber_id = "dauntless_turbine" - }, -/turf/open/floor/engine, -/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "hR" = ( /obj/effect/spawner/liquids_spawner/shoulders, /obj/structure/chair/sofa/bench{ @@ -2619,8 +2661,11 @@ /area/ruin/space/has_grav/bubbers/persistance/service/sauna) "iu" = ( /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/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "iv" = ( /obj/machinery/door/airlock/highsecurity{ id_tag = "syndishipbrigoff" @@ -2638,7 +2683,7 @@ /obj/machinery/door/poddoor{ id = "syndimining" }, -/turf/open/floor/plating/reinforced, +/turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/evac) "iy" = ( /obj/machinery/computer/arcade/battle{ @@ -2743,14 +2788,6 @@ /obj/structure/sign/calendar/directional/south, /turf/open/floor/wood/parquet, /area/ruin/space/has_grav/bubbers/persistance/command/liason) -"iM" = ( -/obj/item/folded_navigation_gigabeacon, -/obj/item/stock_parts/power_store/cell/lead, -/obj/item/stock_parts/power_store/cell/lead, -/obj/structure/closet/crate/secure/syndicate/mi13, -/obj/item/stock_parts/power_store/cell/lead, -/turf/open/floor/plating/elevatorshaft, -/area/ruin/space/has_grav/bubbers/persistance/cargo) "iP" = ( /obj/item/modular_computer/laptop/preset/syndicate, /obj/structure/table/reinforced/plastitaniumglass, @@ -2798,20 +2835,13 @@ /area/ruin/space/has_grav/bubbers/persistance/service) "iV" = ( /obj/structure/table, -/obj/item/pipe_dispenser{ - pixel_x = -3 - }, /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/engineering/mining) "iW" = ( @@ -2872,8 +2902,9 @@ dir = 8 }, /obj/machinery/duct, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "jg" = ( /obj/effect/turf_decal/tile/bar/opposingcorners{ dir = 8 @@ -2934,6 +2965,7 @@ /obj/structure/cable, /obj/machinery/light/directional/east, /obj/machinery/duct, +/obj/machinery/firealarm/directional/east, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) "jt" = ( @@ -3008,9 +3040,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/iron/kitchen/diagonal, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) -"jG" = ( -/turf/closed/wall/r_wall/syndicate/nodiagonal, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +"jF" = ( +/obj/machinery/door/firedoor/heavy, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "jH" = ( /obj/machinery/air_sensor{ chamber_id = "syndiship_turbine" @@ -3105,6 +3138,66 @@ /obj/structure/reagent_dispensers/wall/peppertank/directional/north, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/sec/armory) +"jZ" = ( +/obj/structure/closet/crate/secure/syndicate/gorlex{ + name = "Gorlex Marauders MREs" + }, +/obj/item/storage/box/hecu_rations{ + pixel_x = 7 + }, +/obj/item/storage/box/hecu_rations{ + pixel_x = 7 + }, +/obj/item/storage/box/hecu_rations{ + pixel_x = 7 + }, +/obj/item/storage/box/hecu_rations{ + pixel_x = 7 + }, +/obj/item/storage/box/hecu_rations{ + pixel_x = 7 + }, +/obj/item/storage/box/hecu_rations{ + pixel_x = 7 + }, +/obj/item/storage/box/hecu_rations{ + pixel_x = 7 + }, +/obj/item/storage/box/hecu_rations{ + pixel_x = 7 + }, +/obj/item/storage/box/hecu_rations{ + pixel_x = 7 + }, +/obj/item/storage/box/hecu_rations{ + pixel_x = 7 + }, +/obj/item/storage/box/hecu_rations{ + pixel_x = 7 + }, +/obj/item/storage/box/hecu_rations{ + pixel_x = 7 + }, +/obj/item/storage/box/hecu_rations{ + pixel_x = 7 + }, +/obj/item/storage/box/hecu_rations{ + pixel_x = 7 + }, +/obj/item/storage/box/hecu_rations{ + pixel_x = 7 + }, +/obj/item/storage/box/hecu_rations{ + pixel_x = 7 + }, +/obj/item/storage/box/hecu_rations{ + pixel_x = 7 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating/elevatorshaft, +/area/ruin/space/has_grav/bubbers/persistance/cargo) "ka" = ( /obj/structure/closet/l3closet/janitor, /obj/item/grenade/chem_grenade/cleaner{ @@ -3125,8 +3218,6 @@ /obj/item/clothing/shoes/galoshes, /obj/item/soap/syndie, /obj/machinery/duct, -/obj/item/grenade/clusterbuster/cleaner, -/obj/item/grenade/clusterbuster/cleaner, /obj/item/grenade/clusterbuster/soap, /obj/item/storage/bag/trash, /turf/open/floor/mineral/plastitanium, @@ -3147,6 +3238,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, +/obj/structure/tank_dispenser, /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/cargo) "kf" = ( @@ -3174,6 +3266,9 @@ /obj/item/seeds/poppy/opiumpoppy, /obj/item/seed_mesh, /obj/item/seed_mesh, +/obj/effect/spawner/random/food_or_drink/seed_rare, +/obj/effect/spawner/random/food_or_drink/seed_rare, +/obj/item/seeds/kudzu, /turf/open/floor/grass, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "kg" = ( @@ -3214,7 +3309,25 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/spawner/random/structure/crate, +/obj/structure/closet/crate/secure/syndicate/mi13, +/obj/item/inducer/syndicate, +/obj/item/inducer/syndicate, +/obj/item/inducer/syndicate, +/obj/item/pointman_broken, +/obj/item/circuitboard/machine/rtg/advanced{ + pixel_y = 5 + }, +/obj/item/circuitboard/machine/rtg/advanced{ + pixel_y = 5 + }, +/obj/item/circuitboard/machine/rtg/advanced{ + pixel_y = 5 + }, +/obj/item/circuitboard/machine/rtg/advanced{ + pixel_y = 5 + }, +/obj/item/t_scanner, +/obj/effect/spawner/random/engineering/tool, /turf/open/floor/plating/elevatorshaft, /area/ruin/space/has_grav/bubbers/persistance/cargo) "km" = ( @@ -3233,11 +3346,9 @@ /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/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/engineering) "kr" = ( /obj/machinery/light/directional/west, /obj/machinery/computer/rdconsole{ @@ -3311,33 +3422,6 @@ /obj/effect/mapping_helpers/apc/cut_AI_wire, /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) -"kD" = ( -/obj/effect/spawner/random/engineering/tool, -/obj/item/t_scanner, -/obj/item/storage/toolbox/syndicate{ - pixel_y = 5 - }, -/obj/item/circuitboard/machine/rtg/advanced{ - pixel_y = 5 - }, -/obj/item/circuitboard/machine/rtg/advanced{ - pixel_y = 5 - }, -/obj/item/circuitboard/machine/rtg/advanced{ - pixel_y = 5 - }, -/obj/item/circuitboard/machine/rtg/advanced{ - pixel_y = 5 - }, -/obj/item/pointman_broken, -/obj/effect/spawner/random/exotic/antag_gear_weak, -/obj/effect/spawner/random/exotic/antag_gear_weak, -/obj/structure/closet/crate/secure/syndicate/mi13, -/obj/item/inducer/syndicate, -/obj/item/inducer/syndicate, -/obj/item/inducer/syndicate, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/cargo) "kE" = ( /obj/machinery/light/directional/south, /obj/effect/turf_decal/siding/dark, @@ -3451,6 +3535,8 @@ /obj/effect/turf_decal/stripes/red/corner{ dir = 1 }, +/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) "la" = ( @@ -3567,7 +3653,11 @@ /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/persistance/service) "lx" = ( -/obj/structure/reagent_dispensers/water_cooler, +/obj/machinery/vending/donksnack{ + onstation = 0; + onstation_override = 1; + all_products_free = 1 + }, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service) "ly" = ( @@ -3616,7 +3706,7 @@ dir = 10 }, /turf/open/floor/noslip, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "lC" = ( /obj/structure/chair/plastic{ dir = 8 @@ -3634,7 +3724,6 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/structure/tank_dispenser, /turf/open/floor/plating/elevatorshaft, /area/ruin/space/has_grav/bubbers/persistance/cargo) "lG" = ( @@ -3656,15 +3745,17 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) "lI" = ( -/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, +/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, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/area/ruin/space/has_grav/bubbers/persistance/engineering) "lJ" = ( /obj/structure/chair/sofa/left/maroon{ dir = 8 @@ -3719,6 +3810,13 @@ /obj/effect/mapping_helpers/airlock/cutaiwire, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) +"lO" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/structure/plasticflaps, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "lR" = ( /obj/effect/turf_decal/stripes/red/corner{ dir = 8 @@ -3845,6 +3943,7 @@ /obj/structure/table/wood/fancy/red, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/item/pai_card, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/service/lounge) "mi" = ( @@ -3864,6 +3963,19 @@ }, /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) +"ml" = ( +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/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/pod/dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) "mm" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/sec/prison/rec) @@ -3873,19 +3985,18 @@ name = "Robotics Airlock"; req_access = list("syndicate") }, -/obj/item/ai_module/reset/purge{ - pixel_y = -5 - }, -/obj/item/ai_module/supplied/freeform{ - pixel_y = 11 - }, -/obj/item/ai_module/core/full/persistence{ - pixel_y = 3 - }, /obj/machinery/digital_clock/directional/south, -/obj/structure/closet/crate/secure/syndicate/self{ - name = "A.I. law Storage" - }, +/obj/structure/closet/crate/robust, +/obj/effect/spawner/random/mod/maint, +/obj/effect/spawner/random/mod/maint, +/obj/effect/spawner/random/mod/maint, +/obj/effect/spawner/random/mod/maint, +/obj/effect/spawner/random/mod/maint, +/obj/item/mod/module/jump_jet, +/obj/item/mod/module/jump_jet, +/obj/item/mod/module/jump_jet, +/obj/item/mod/module/jump_jet, +/obj/item/mod/module/jump_jet, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/sci/robotics) "mp" = ( @@ -3955,8 +4066,6 @@ 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; @@ -4080,8 +4189,6 @@ /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) "mN" = ( @@ -4096,7 +4203,6 @@ /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 @@ -4202,19 +4308,6 @@ /area/icemoon/underground/explored) "nf" = ( /obj/machinery/light/directional/east, -/obj/item/pickaxe, -/obj/item/grapple_gun, -/obj/item/mining_voucher, -/obj/item/pickaxe, -/obj/item/clothing/glasses/meson/night, -/obj/item/clothing/glasses/meson/night, -/obj/item/tank/internals/emergency_oxygen/double, -/obj/item/tank/internals/emergency_oxygen/double, -/obj/item/storage/belt/mining/vendor, -/obj/item/storage/belt/mining/vendor, -/obj/structure/closet/crate/secure/syndicate/cybersun/dusk{ - name = "Mining gear" - }, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -4224,12 +4317,6 @@ req_access = list("syndicate"); pixel_x = 24 }, -/obj/item/construction/rcd/loaded, -/obj/item/storage/toolbox/syndicate{ - pixel_y = 5 - }, -/obj/item/mining_voucher, -/obj/item/suit_voucher, /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/cargo) "ng" = ( @@ -4256,7 +4343,6 @@ /area/ruin/space/has_grav/bubbers/persistance/sec/prison/rec) "nj" = ( /obj/machinery/light/directional/south, -/obj/structure/tank_dispenser, /obj/effect/turf_decal/stripes/red/line{ dir = 1 }, @@ -4280,6 +4366,11 @@ /area/ruin/space/has_grav/bubbers/persistance/sec/armory) "nn" = ( /obj/structure/safe/abovetilefloor, +/obj/item/encryptionkey/headset_syndicate/interdyne, +/obj/item/encryptionkey/headset_syndicate/interdyne, +/obj/item/encryptionkey/headset_syndicate/interdyne, +/obj/item/encryptionkey/headset_syndicate/interdyne, +/obj/item/encryptionkey/headset_syndicate/interdyne, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/maa) "no" = ( @@ -4335,6 +4426,7 @@ /obj/effect/turf_decal/stripes/red/line{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "nx" = ( @@ -4403,6 +4495,10 @@ /obj/machinery/duct, /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) +"nM" = ( +/obj/machinery/light/directional/west, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "nN" = ( /obj/effect/turf_decal/siding/thinplating/dark/corner, /turf/open/floor/iron/terracotta/herringbone, @@ -4422,11 +4518,11 @@ /area/ruin/space/has_grav/bubbers/persistance/cargo) "nQ" = ( /obj/structure/cable, -/obj/machinery/power/smes/full, -/obj/effect/mapping_helpers/apc/syndicate_access, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/effect/mapping_helpers/apc/cut_AI_wire, -/obj/effect/mapping_helpers/apc/full_charge, +/obj/machinery/power/smes/connector, +/obj/machinery/power/smesbank/super/full, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/duct, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "nR" = ( @@ -4514,21 +4610,18 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) "nY" = ( -/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 = "Onboard Water Plant" }, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "nZ" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -4565,63 +4658,6 @@ /obj/structure/drain/big, /turf/open/floor/iron/freezer, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) -"oh" = ( -/obj/structure/closet/crate/secure/syndicate/gorlex{ - name = "Gorlex Marauders MREs" - }, -/obj/item/storage/box/hecu_rations{ - pixel_x = 7 - }, -/obj/item/storage/box/hecu_rations{ - pixel_x = 7 - }, -/obj/item/storage/box/hecu_rations{ - pixel_x = 7 - }, -/obj/item/storage/box/hecu_rations{ - pixel_x = 7 - }, -/obj/item/storage/box/hecu_rations{ - pixel_x = 7 - }, -/obj/item/storage/box/hecu_rations{ - pixel_x = 7 - }, -/obj/item/storage/box/hecu_rations{ - pixel_x = 7 - }, -/obj/item/storage/box/hecu_rations{ - pixel_x = 7 - }, -/obj/item/storage/box/hecu_rations{ - pixel_x = 7 - }, -/obj/item/storage/box/hecu_rations{ - pixel_x = 7 - }, -/obj/item/storage/box/hecu_rations{ - pixel_x = 7 - }, -/obj/item/storage/box/hecu_rations{ - pixel_x = 7 - }, -/obj/item/storage/box/hecu_rations{ - pixel_x = 7 - }, -/obj/item/storage/box/hecu_rations{ - pixel_x = 7 - }, -/obj/item/storage/box/hecu_rations{ - pixel_x = 7 - }, -/obj/item/storage/box/hecu_rations{ - pixel_x = 7 - }, -/obj/item/storage/box/hecu_rations{ - pixel_x = 7 - }, -/turf/open/floor/plating/elevatorshaft, -/area/ruin/space/has_grav/bubbers/persistance/cargo) "oi" = ( /obj/machinery/oven/range_frontier, /obj/item/reagent_containers/cup/soup_pot, @@ -4680,6 +4716,17 @@ /obj/effect/turf_decal/stripes/red/line{ dir = 1 }, +/obj/effect/turf_decal/stripes/red/line, +/turf/open/floor/pod/dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) +"ot" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/binary/pump/off/general/visible/layer2{ + dir = 1 + }, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "ou" = ( @@ -4701,6 +4748,7 @@ /obj/effect/spawner/random/entertainment/plushie, /obj/effect/spawner/random/entertainment/plushie_delux, /obj/item/clothing/suit/jacket/runner/syndicate, +/obj/item/radio/headset/syndicateciv/command, /turf/open/floor/wood/parquet, /area/ruin/space/has_grav/bubbers/persistance/command/liason) "oz" = ( @@ -4752,7 +4800,7 @@ /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, +/turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/evac) "oG" = ( /obj/structure/chair/stool{ @@ -4850,7 +4898,9 @@ /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "oT" = ( /obj/machinery/light/directional/south, -/obj/machinery/computer/order_console/mining/interdyne, +/obj/machinery/computer/piratepad_control/syndiepad{ + dir = 1 + }, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/cargo) "oU" = ( @@ -4887,6 +4937,14 @@ }, /turf/open/floor/iron/terracotta/herringbone, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) +"pc" = ( +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/obj/structure/cable, +/obj/machinery/door/poddoor{ + id = "syndikitchen_int" + }, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "pd" = ( /obj/machinery/duct, /obj/structure/cable, @@ -4899,6 +4957,7 @@ /obj/effect/turf_decal/siding/dark{ dir = 8 }, +/obj/machinery/light/directional/south, /turf/open/floor/iron/white/small, /area/ruin/space/has_grav/bubbers/persistance/service/lockers) "pe" = ( @@ -4993,17 +5052,12 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/med) "pp" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/effect/mapping_helpers/apc/syndicate_access, -/obj/effect/mapping_helpers/apc/cut_AI_wire, -/obj/effect/mapping_helpers/apc/full_charge, /obj/machinery/plumbing/synthesizer/water_synth, /obj/effect/turf_decal/siding/dark{ dir = 6 }, /turf/open/floor/noslip, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "pq" = ( /obj/machinery/porta_turret/syndicate{ dir = 8; @@ -5038,11 +5092,6 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/vending/robotics{ - pixel_y = 28; - density = 0; - all_products_free = 1 - }, /obj/effect/mob_spawn/ghost_role/robot/persistence, /obj/effect/mob_spawn/ghost_role/robot/persistence, /turf/open/floor/iron/dark, @@ -5124,12 +5173,6 @@ }, /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/diner) -"pK" = ( -/obj/structure/fans/tiny, -/obj/machinery/light/cold/directional/east, -/obj/structure/sign/poster/contraband/grey_tide/directional/north, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) "pL" = ( /obj/machinery/digital_clock/directional/west, /obj/machinery/photocopier/gratis, @@ -5278,10 +5321,8 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/structure/sign/warning/electric_shock/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/turf/open/floor/pod/dark, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "qf" = ( /obj/machinery/light/directional/east, @@ -5422,16 +5463,13 @@ /turf/open/floor/mineral/titanium/white, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "qy" = ( -/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, +/obj/structure/sign/departments/rndserver/directional/south, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/area/ruin/space/has_grav/bubbers/persistance/engineering) "qA" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -5573,10 +5611,6 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) -"qV" = ( -/obj/machinery/power/portagrav, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering) "qW" = ( /obj/structure/fans/tiny, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -5622,10 +5656,28 @@ }, /area/ruin/space/has_grav/bubbers/persistance/evac) "rb" = ( -/obj/structure/cargo_shelf, /obj/machinery/airalarm/directional/north, /obj/effect/mapping_helpers/airalarm/syndicate_access, /obj/effect/mapping_helpers/airalarm/tlv_cold_room, +/obj/structure/closet/crate/secure/syndicate/wafflecorp{ + name = "Waffle corp. lunch boxes crate" + }, +/obj/item/clothing/head/utility/chefhat, +/obj/item/storage/belt/military/snack, +/obj/item/vending_refill/hotdog, +/obj/item/storage/lunchbox/amongus, +/obj/item/storage/lunchbox/amongus, +/obj/item/storage/lunchbox/bunny, +/obj/item/storage/lunchbox/bunny, +/obj/item/storage/lunchbox/corgi, +/obj/item/storage/lunchbox/corgi, +/obj/item/storage/lunchbox/heart, +/obj/item/storage/lunchbox/heart, +/obj/item/storage/lunchbox/medical, +/obj/item/storage/lunchbox/medical, +/obj/item/storage/lunchbox/safetymoth, +/obj/item/storage/lunchbox/safetymoth, +/obj/item/vending_refill/hotdog, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/ruin/space/has_grav/bubbers/persistance/service/freezer) "rc" = ( @@ -5645,7 +5697,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/plating/reinforced, +/turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/cargo) "rd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -5679,13 +5731,7 @@ /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "ri" = ( -/obj/machinery/vending/hotdog{ - onstation = 0; - onstation_override = 1; - density = 0; - pixel_x = 30; - all_products_free = 1 - }, +/obj/structure/sign/poster/contraband/moffuchis_pizza/directional/east, /turf/open/floor/iron/stairs, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "rj" = ( @@ -5719,7 +5765,6 @@ "rm" = ( /obj/structure/sign/warning/gas_mask/directional/south, /obj/machinery/light/directional/south, -/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "rp" = ( @@ -5729,10 +5774,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) -"rq" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/closed/wall/r_wall/syndicate/nodiagonal, -/area/ruin/space/has_grav/bubbers/persistance/engineering) "rr" = ( /obj/effect/turf_decal/siding/thinplating/dark/corner{ dir = 8 @@ -5881,6 +5922,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, +/obj/structure/window/reinforced/plasma/spawner/directional/west, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/cargo) "rN" = ( @@ -5908,13 +5950,6 @@ }, /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) -"rR" = ( -/obj/machinery/griddle, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "rS" = ( /obj/structure/flora/bush/flowers_pp, /obj/structure/window/reinforced/survival_pod/spawner/directional/north, @@ -5943,28 +5978,15 @@ /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "rV" = ( /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, +/obj/machinery/chem_dispenser/frontier_appliance, +/obj/machinery/duct, /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "rW" = ( @@ -6030,10 +6052,6 @@ 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; @@ -6158,6 +6176,15 @@ /obj/structure/closet/crate/secure/syndicate/self{ name = "S.E.L.F. access override crate" }, +/obj/item/ai_module/supplied/freeform{ + pixel_y = 11 + }, +/obj/item/ai_module/core/full/persistence{ + pixel_y = 3 + }, +/obj/item/ai_module/reset/purge{ + pixel_y = -5 + }, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/sci/robotics) "sv" = ( @@ -6185,28 +6212,12 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "sy" = ( -/obj/item/vending_refill/hotdog, /obj/machinery/light/directional/north, -/obj/machinery/light_switch/directional/north, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/item/storage/lunchbox/safetymoth, -/obj/item/storage/lunchbox/safetymoth, -/obj/item/storage/lunchbox/nanotrasen, -/obj/item/storage/lunchbox/nanotrasen, -/obj/item/storage/lunchbox/medical, -/obj/item/storage/lunchbox/medical, -/obj/item/storage/lunchbox/heart, -/obj/item/storage/lunchbox/heart, -/obj/item/storage/lunchbox/corgi, -/obj/item/storage/lunchbox/corgi, -/obj/item/storage/lunchbox/bunny, -/obj/item/storage/lunchbox/bunny, -/obj/item/storage/lunchbox/amongus, -/obj/item/storage/lunchbox/amongus, -/obj/structure/closet/crate/secure/syndicate/wafflecorp{ - name = "Waffle corp. lunch boxes crate" +/obj/machinery/jukebox{ + req_access = list("syndicate"); + anchored = 0 }, -/obj/item/vending_refill/hotdog, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/ruin/space/has_grav/bubbers/persistance/service/freezer) "sz" = ( @@ -6252,13 +6263,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/misc/grass/jungle/station, /area/ruin/space/has_grav/bubbers/persistance/med) -"sH" = ( -/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) "sL" = ( /obj/machinery/airalarm/directional/east, /obj/effect/mapping_helpers/airalarm/syndicate_access, @@ -6296,6 +6300,7 @@ /obj/item/construction/rcd/ce, /obj/item/pipe_dispenser/bluespace, /obj/item/rcd_upgrade/frames, +/obj/item/rpd_upgrade/unwrench, /turf/open/floor/iron/terracotta/small, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/engineering) "sS" = ( @@ -6344,6 +6349,19 @@ }, /turf/open/floor/carpet/royalblack, /area/ruin/space/has_grav/bubbers/persistance/sec/prison/rec) +"te" = ( +/obj/effect/turf_decal/siding/dark, +/obj/machinery/duct, +/obj/machinery/light/directional/south, +/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) +"tf" = ( +/obj/structure/cable, +/obj/machinery/light/cold/directional/north, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) "tg" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/sci/rnd) @@ -6406,6 +6424,22 @@ /obj/structure/table/wood/fancy/black, /turf/open/floor/wood/parquet, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) +"ts" = ( +/obj/machinery/button/door{ + id = "syndibridge_w"; + name = "Bridge Window Shutters"; + req_access = list("syndicate_leader"); + pixel_x = -24 + }, +/obj/structure/noticeboard/directional/north, +/obj/structure/table/reinforced/plastitaniumglass, +/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) "tt" = ( /obj/structure/extinguisher_cabinet/directional/south, /obj/structure/reagent_dispensers/water_cooler, @@ -6413,7 +6447,6 @@ /area/ruin/space/has_grav/bubbers/persistance/service/sauna) "tu" = ( /obj/structure/closet/crate/medical, -/obj/item/storage/backpack/duffelbag/syndie/surgery, /obj/structure/window/reinforced/survival_pod/spawner/directional/south, /obj/item/survivalcapsule/chemistry, /obj/machinery/vending/drugs{ @@ -6467,15 +6500,6 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/structure/safe/abovetilefloor, -/obj/item/blueprints/golem{ - name = "Persistence land crawler standard blueprints" - }, -/obj/item/sign/flag/syndicate{ - pixel_x = -3; - pixel_y = 6 - }, -/obj/item/stock_parts/power_store/cell/lead, /turf/open/floor/iron/terracotta/small, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/engineering) "tC" = ( @@ -6498,6 +6522,15 @@ }, /turf/open/floor/iron/colony/bolts, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) +"tE" = ( +/obj/structure/cable, +/obj/machinery/airalarm/directional/south, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/machinery/atmospherics/pipe/smart/simple/dark{ + dir = 4 + }, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "tG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -6546,6 +6579,9 @@ dir = 1 }, /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/wood/parquet, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "tO" = ( @@ -6565,7 +6601,7 @@ mapping_id = "dauntless_turbine"; dir = 4 }, -/turf/open/floor/catwalk_floor/titanium, +/turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "tS" = ( /obj/effect/turf_decal/stripes/line{ @@ -6612,6 +6648,9 @@ /obj/effect/turf_decal/siding/wood{ dir = 6 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/wood/parquet, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "tY" = ( @@ -6665,33 +6704,14 @@ /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) "ud" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/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/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/engineering/utilities) "uf" = ( /obj/structure/cable, /obj/structure/closet/crate/secure/syndicate/arc{ @@ -6856,19 +6876,23 @@ req_access = list("syndicate_leader"); pixel_x = -24 }, +/obj/machinery/duct, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) "uF" = ( /obj/structure/disposalpipe/segment, -/obj/item/reagent_containers/cup/fish_feed, /obj/structure/table/reinforced/plastitaniumglass, +/obj/item/reagent_containers/cup/maunamug, +/obj/item/lighter/skull, +/obj/item/storage/fancy/cigarettes/cigpack_syndicate{ + pixel_x = 3; + pixel_y = 6 + }, +/obj/machinery/duct, /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "uG" = ( -/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, @@ -6892,6 +6916,7 @@ /obj/effect/turf_decal/siding/dark{ dir = 10 }, +/obj/structure/sink/kitchen/directional/east, /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "uH" = ( @@ -7157,12 +7182,6 @@ }, /turf/open/floor/engine, /area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) -"vz" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/pod/dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering) "vA" = ( /obj/structure/window/reinforced/survival_pod/spawner/directional/east, /obj/structure/window/reinforced/survival_pod/spawner/directional/north, @@ -7206,6 +7225,7 @@ /area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) "vF" = ( /obj/structure/table/wood/fancy/red, +/obj/item/reagent_containers/cup/glass/mug/coco, /turf/open/floor/glass/reinforced/plasma, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "vG" = ( @@ -7229,9 +7249,6 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "vJ" = ( -/obj/structure/closet/radiation, -/obj/item/mod/module/rad_protection, -/obj/item/mod/module/rad_protection, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/button/door/directional/west{ @@ -7255,7 +7272,6 @@ pixel_x = -2; pixel_y = -6 }, -/obj/item/mod/core/standard, /obj/item/book/manual/wiki/robotics_cyborgs{ pixel_x = 8 }, @@ -7272,6 +7288,7 @@ pixel_x = 0; pixel_y = -30 }, +/obj/item/mod/core/plasma, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/sci/robotics) "vL" = ( @@ -7533,7 +7550,6 @@ /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "wC" = ( /obj/machinery/suit_storage_unit/industrial/moraleofficer, -/obj/machinery/light/directional/south, /turf/open/floor/carpet/donk, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/morale) "wD" = ( @@ -7560,10 +7576,6 @@ /obj/machinery/door/firedoor/heavy, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service) -"wH" = ( -/obj/effect/spawner/random/structure/crate, -/turf/open/floor/plating/elevatorshaft, -/area/ruin/space/has_grav/bubbers/persistance/cargo) "wI" = ( /obj/machinery/seed_extractor, /obj/machinery/light/directional/west, @@ -7602,13 +7614,10 @@ /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/rnd) "wQ" = ( -/obj/structure/cable, -/obj/structure/table/reinforced/plastitaniumglass, /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/item/reagent_containers/cup/mortar, -/obj/item/pestle, +/obj/machinery/deepfryer, /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "wS" = ( @@ -7681,9 +7690,11 @@ /turf/open/floor/iron/white/diagonal, /area/ruin/space/has_grav/bubbers/persistance/med) "xc" = ( +/obj/machinery/airalarm/directional/north, /obj/structure/cable, -/obj/machinery/power/smes/connector, -/obj/machinery/power/smesbank/super/full, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/machinery/power/smes/full, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "xd" = ( @@ -7730,6 +7741,7 @@ /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "xi" = ( /obj/structure/aquarium/bioelec_gen/prefilled, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "xj" = ( @@ -7750,11 +7762,17 @@ dir = 4 }, /obj/machinery/digital_clock/directional/north, -/obj/structure/flatpack_cart, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "xm" = ( /obj/machinery/food_cart, +/obj/machinery/vending/wardrobe/chef_wardrobe{ + density = 0; + onstation = 0; + onstation_override = 1; + all_products_free = 1; + pixel_y = 28 + }, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/ruin/space/has_grav/bubbers/persistance/service/freezer) "xn" = ( @@ -7837,14 +7855,6 @@ "xA" = ( /obj/structure/table/wood/fancy/black, /obj/item/modular_computer/laptop/preset/syndicate, -/obj/item/stamp{ - pixel_x = 8; - pixel_y = 1 - }, -/obj/item/stamp/denied{ - pixel_x = 8; - pixel_y = 6 - }, /obj/item/pen/fountain/captain{ name = "Liason's fountain pen"; pixel_y = 5 @@ -7853,6 +7863,18 @@ dir = 1 }, /obj/structure/sign/flag/syndicate/directional/south, +/obj/item/stamp/persistence{ + pixel_x = 8; + pixel_y = 12 + }, +/obj/item/stamp/denied{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/stamp{ + pixel_x = 8; + pixel_y = 1 + }, /turf/open/floor/wood/parquet, /area/ruin/space/has_grav/bubbers/persistance/command/liason) "xC" = ( @@ -7871,7 +7893,6 @@ /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) "xE" = ( @@ -7902,17 +7923,16 @@ /area/ruin/space/has_grav/bubbers/persistance/med/chem) "xG" = ( /obj/effect/turf_decal/siding/thinplating/dark, -/obj/item/construction/plumbing, -/obj/structure/rack, /obj/machinery/light_switch/directional/south, /turf/open/floor/iron/terracotta/herringbone, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "xH" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/clothing/head/utility/chefhat, -/obj/item/storage/belt/military/snack, /obj/machinery/light/directional/east, /obj/structure/sign/poster/contraband/calada_jelly/directional/east, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/processor{ + pixel_x = 1 + }, /turf/open/floor/iron/kitchen/diagonal, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "xJ" = ( @@ -7937,6 +7957,9 @@ /obj/item/bikehorn, /obj/item/bikehorn/rubberducky, /obj/item/reagent_containers/cup/glass/bottle/holywater, +/obj/effect/mob_spawn/ghost_role/human/persistence/syndicate/moraleofficer{ + name = "Persistence Morale Officer" + }, /turf/open/floor/iron/terracotta/diagonal, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/morale) "xK" = ( @@ -8170,7 +8193,7 @@ /obj/machinery/door/poddoor{ id = "syndihanger" }, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) "yo" = ( /obj/item/reagent_containers/cup/beaker/large, @@ -8277,16 +8300,16 @@ /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "yG" = ( /obj/structure/table/reinforced/plastitaniumglass, -/obj/item/cutting_board, /obj/machinery/duct, -/obj/item/kitchen/rollingpin{ - pixel_x = -9; - pixel_y = 4 - }, +/obj/item/cutting_board, /obj/item/knife{ pixel_y = 3; pixel_x = 6 }, +/obj/item/kitchen/rollingpin/illegal{ + pixel_x = -9; + pixel_y = 4 + }, /turf/open/floor/iron/kitchen/diagonal, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "yI" = ( @@ -8301,7 +8324,8 @@ dir = 8 }, /obj/structure/hoop{ - dir = 4 + dir = 4; + density = 0 }, /turf/open/floor/wood, /area/ruin/space/has_grav/bubbers/persistance/service/gym) @@ -8365,7 +8389,13 @@ "yT" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/machinery/light/directional/north, -/obj/machinery/light_switch/directional/north, +/obj/item/pestle, +/obj/item/reagent_containers/cup/mortar, +/obj/machinery/power/apc/auto_name/directional/north, +/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, /turf/open/floor/iron/kitchen/diagonal, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "yU" = ( @@ -8485,6 +8515,28 @@ /obj/item/clothing/gloves/boxing/evil, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/brig) +"zn" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/closet/crate/secure/syndicate/cybersun/dusk{ + name = "Mining gear" + }, +/obj/item/suit_voucher, +/obj/item/mining_voucher, +/obj/item/construction/rcd/loaded, +/obj/item/storage/belt/mining/vendor, +/obj/item/storage/belt/mining/vendor, +/obj/item/tank/internals/emergency_oxygen/double, +/obj/item/tank/internals/emergency_oxygen/double, +/obj/item/clothing/glasses/meson/night, +/obj/item/clothing/glasses/meson/night, +/obj/item/mining_voucher, +/obj/item/pickaxe, +/obj/item/grapple_gun, +/obj/item/pickaxe, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/cargo) "zo" = ( /obj/effect/turf_decal/siding/thinplating/dark/corner{ dir = 1 @@ -8497,13 +8549,9 @@ /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, +/obj/machinery/firealarm/directional/east, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/area/ruin/space/has_grav/bubbers/persistance/engineering) "zq" = ( /obj/structure/emergency_shield/cult/weak{ name = "Energy Shield" @@ -8616,13 +8664,6 @@ /turf/open/floor/wood/tile, /area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) "zD" = ( -/obj/machinery/vending/cigarette/syndicate{ - onstation = 0; - onstation_override = 1; - density = 0; - pixel_x = 28; - all_products_free = 1 - }, /obj/effect/turf_decal/tile/bar/opposingcorners{ dir = 8 }, @@ -8630,6 +8671,7 @@ /obj/effect/turf_decal/siding{ dir = 4 }, +/obj/structure/sign/poster/contraband/tipper_cream_soda/directional/east, /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "zG" = ( @@ -8638,6 +8680,15 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/cargo) +"zH" = ( +/obj/structure/cable, +/obj/machinery/door/firedoor/heavy, +/obj/structure/sign/warning/fire/directional/south, +/obj/machinery/atmospherics/pipe/smart/simple/dark{ + dir = 4 + }, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "zI" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/turf_decal/trimline/dark_red/filled/line, @@ -8687,17 +8738,21 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/med) "zO" = ( -/obj/machinery/mineral/ore_redemption/offstation, +/obj/structure/frame/machine/secured{ + anchored = 0 + }, +/obj/item/circuitboard/machine/ore_redemption, +/obj/item/assembly/igniter, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/cargo) "zQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/suit_storage_unit/industrial/bloodredsuit, /obj/structure/sign/warning/fire/directional/south, /obj/effect/turf_decal/stripes/red/line{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "zR" = ( @@ -8725,15 +8780,12 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "zW" = ( -/obj/machinery/ntnet_relay, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/structure/sign/poster/contraband/hacking_guide/directional/south, +/obj/effect/turf_decal/siding/dark{ + dir = 9 }, -/obj/machinery/light/directional/south, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/turf/open/floor/mineral/plastitanium/red, +/obj/machinery/rnd/server/interdyne, +/turf/open/floor/noslip, /area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "zX" = ( /obj/effect/turf_decal/stripes/line{ @@ -8817,15 +8869,16 @@ /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "Ai" = ( /obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/vending/dinnerware{ - density = 0; - all_products_free = 1; - pixel_x = 28 - }, /obj/machinery/light/directional/south, /obj/item/storage/box/gum/happiness, +/obj/structure/sign/poster/contraband/blasto_detergent/directional/east, /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) +"Aj" = ( +/obj/structure/sign/departments/telecomms/alt/directional/east, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) "Ak" = ( /obj/effect/turf_decal/siding/wood, /obj/structure/chair/sofa/corp{ @@ -8861,12 +8914,6 @@ initial_gas_mix = "LAVALAND_ATMOS" }, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) -"Ao" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark{ - dir = 6 - }, -/turf/closed/wall/r_wall/syndicate/nodiagonal, -/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "As" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -8896,15 +8943,8 @@ /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/ruin/space/has_grav/bubbers/persistance/service/freezer) "AC" = ( -/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 - }, -/turf/open/floor/mineral/plastitanium/red, +/obj/structure/cable, +/turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "AD" = ( /obj/machinery/porta_turret/syndicate{ @@ -8977,6 +9017,13 @@ }, /turf/open/floor/carpet/royalblack, /area/ruin/space/has_grav/bubbers/persistance/sec/prison/rec) +"AS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/structure/cable, +/obj/machinery/cell_charger_multi/wall_mounted/directional/north, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service/hydro) "AU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/effect/turf_decal/siding/dark{ @@ -9007,6 +9054,7 @@ /obj/effect/turf_decal/siding/wood, /obj/structure/safe, /obj/item/bombcore/syndicate/large, +/obj/item/book/granter/crafting_recipe/regal_condor, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "AY" = ( @@ -9104,6 +9152,9 @@ dir = 4 }, /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/wood/parquet, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "Bq" = ( @@ -9256,6 +9307,12 @@ /obj/machinery/duct, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) +"BG" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/effect/spawner/random/food_or_drink/donkpockets, +/obj/structure/cable, +/turf/open/floor/iron/kitchen/diagonal, +/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "BH" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -9379,7 +9436,8 @@ dir = 4 }, /obj/structure/hoop{ - dir = 8 + dir = 8; + density = 0 }, /turf/open/floor/wood, /area/ruin/space/has_grav/bubbers/persistance/service/gym) @@ -9429,7 +9487,7 @@ id = "syndicargo"; name = "Docking Port Blast Doors" }, -/turf/open/floor/plating/reinforced, +/turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/cargo) "Ca" = ( /obj/structure/disposalpipe/segment{ @@ -9503,6 +9561,7 @@ /obj/structure/extinguisher_cabinet/directional/north, /obj/item/encryptionkey/syndicate, /obj/item/clothing/suit/jacket/runner/syndicate, +/obj/item/radio/headset/syndicateciv/command, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "Ck" = ( @@ -9530,6 +9589,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/sauna) +"Cq" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) "Cr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -9545,6 +9610,9 @@ /obj/effect/turf_decal/stripes/red/corner{ dir = 4 }, +/obj/effect/turf_decal/stripes/red/corner, +/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) "Cv" = ( @@ -9581,11 +9649,29 @@ }, /area/ruin/space/has_grav/bubbers/persistance/service/sauna) "CB" = ( -/obj/machinery/digital_clock/directional/west, -/obj/effect/turf_decal/siding/dark/end, -/obj/structure/closet/firecloset/full, +/obj/machinery/light_switch/directional/south, +/obj/structure/closet/secure_closet/interdynefob/engie_locker, +/obj/item/construction/plumbing/engineering, +/obj/item/wrench, +/obj/effect/turf_decal/siding/dark{ + dir = 5 + }, +/obj/item/storage/box/gas_miner_beacons/syndicate{ + pixel_x = -7; + pixel_y = -4 + }, +/obj/item/storage/box/gas_miner_beacons/syndicate{ + pixel_x = 7; + pixel_y = -4 + }, +/obj/item/clothing/shoes/magboots/syndie{ + pixel_y = 8 + }, +/obj/item/clothing/shoes/magboots/syndie{ + pixel_y = 8 + }, /turf/open/floor/noslip, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "CC" = ( /obj/machinery/airalarm/directional/west, /obj/effect/mapping_helpers/airalarm/syndicate_access, @@ -9661,15 +9747,9 @@ /turf/open/floor/iron/terracotta/diagonal, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "CQ" = ( -/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/highsecurity{ - name = "utilities" - }, -/obj/effect/mapping_helpers/airlock/cutaiwire, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/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/engineering) "CR" = ( @@ -9764,9 +9844,8 @@ dir = 6 }, /obj/machinery/duct, -/obj/machinery/portable_atmospherics/canister/water_vapor, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "Dk" = ( /obj/structure/cable, /obj/effect/turf_decal/siding{ @@ -9859,10 +9938,6 @@ icon_state = "plastitanium" }, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) -"Dz" = ( -/obj/structure/plant_tank, -/turf/open/floor/grass, -/area/ruin/space/has_grav/bubbers/persistance/service/hydro) "DA" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -10002,6 +10077,7 @@ }, /obj/machinery/incident_display/delam/directional/north, /obj/machinery/newscaster/directional/west, +/obj/machinery/suit_storage_unit/industrial/bloodredsuit, /turf/open/floor/iron/terracotta/small, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/engineering) "DS" = ( @@ -10038,6 +10114,16 @@ /obj/item/kirbyplants/synthetic/plant26, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service) +"DZ" = ( +/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/duct, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "Ea" = ( /obj/machinery/light/directional/south, /obj/effect/spawner/liquids_spawner/shoulders, @@ -10200,7 +10286,7 @@ /area/ruin/space/has_grav/bubbers/persistance/engineering) "Ew" = ( /obj/structure/table, -/obj/item/storage/bag/xenoarch, +/obj/item/survivalcapsule/fan, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/engineering/mining) "Ex" = ( @@ -10296,25 +10382,24 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/sec/armory) "EK" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Engineering Bay" - }, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, -/obj/effect/mapping_helpers/airlock/cutaiwire, /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, +/obj/effect/turf_decal/stripes/red/corner{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, +/turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "EL" = ( /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) "EM" = ( @@ -10335,7 +10420,6 @@ /obj/effect/mapping_helpers/apc/syndicate_access, /obj/effect/mapping_helpers/apc/cut_AI_wire, /obj/effect/mapping_helpers/apc/full_charge, -/obj/machinery/nuclearbomb/beer, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/command/vault) "EP" = ( @@ -10419,7 +10503,11 @@ dir = 1 }, /obj/structure/sink/kitchen/directional/east, -/obj/structure/sign/warning/cold_temp/directional/west, +/obj/machinery/vending/dinnerware{ + density = 0; + all_products_free = 1; + pixel_x = -28 + }, /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "EY" = ( @@ -10499,13 +10587,6 @@ /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) "Fl" = ( -/obj/machinery/vending/donksnack{ - onstation = 0; - onstation_override = 1; - pixel_x = 32; - density = 0; - all_products_free = 1 - }, /obj/effect/turf_decal/tile/bar/opposingcorners{ dir = 8 }, @@ -10515,6 +10596,13 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, +/obj/machinery/vending/cigarette/syndicate{ + onstation = 0; + onstation_override = 1; + density = 0; + pixel_x = 28; + all_products_free = 1 + }, /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "Fm" = ( @@ -10540,17 +10628,6 @@ }, /turf/open/floor/carpet/donk, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/morale) -"Fr" = ( -/obj/structure/cable, -/obj/effect/turf_decal/stripes/red/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/red/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/red/line, -/turf/open/floor/pod/dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering) "Fu" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 1 @@ -10584,9 +10661,6 @@ /obj/effect/turf_decal/siding/dark/end{ dir = 4 }, -/obj/effect/mob_spawn/ghost_role/human/persistence/syndicate/moraleofficer{ - name = "Persistence Morale Officer" - }, /turf/open/floor/iron/terracotta/diagonal, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/morale) "FB" = ( @@ -10721,19 +10795,13 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/cargo) "FQ" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/door/firedoor/heavy, /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /obj/effect/mapping_helpers/airlock/cutaiwire, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance/glass{ name = "Emergency Escape" }, -/turf/open/floor/plating/reinforced, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/cargo) "FR" = ( /obj/effect/turf_decal/tile/bar/opposingcorners{ @@ -10764,12 +10832,23 @@ /obj/machinery/disposal/bin, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/maa) +"FU" = ( +/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/cell_charger_multi/wall_mounted/directional/north, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "FV" = ( /obj/structure/disposalpipe/segment, -/obj/structure/sign/departments/telecomms/alt/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/turf/open/floor/pod/dark, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "FW" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal, @@ -10811,8 +10890,9 @@ /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "Ge" = ( /obj/effect/turf_decal/stripes/line, -/obj/structure/cable, /obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service) "Gf" = ( @@ -10820,7 +10900,7 @@ /obj/machinery/mineral/stacking_unit_console{ pixel_x = -32 }, -/turf/open/floor/plating/reinforced, +/turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/cargo) "Gg" = ( /turf/closed/wall/r_wall/syndicate/cruiser, @@ -10862,13 +10942,13 @@ pixel_x = 3; pixel_y = 6 }, -/obj/item/stamp/syndicate{ - pixel_y = -4; - pixel_x = 9 - }, /obj/item/stamp/denied{ pixel_y = -4 }, +/obj/item/stamp/persistence{ + pixel_x = 9; + pixel_y = -4 + }, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "Go" = ( @@ -11010,8 +11090,10 @@ /obj/effect/turf_decal/stripes/red/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/turf_decal/stripes/red/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "GO" = ( @@ -11027,15 +11109,8 @@ /turf/open/floor/carpet/green, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/chef) "GP" = ( -/obj/structure/closet/secure_closet/interdynefob/electrical_supplies, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/item/stock_parts/power_store/battery/high, -/obj/item/stock_parts/power_store/battery/high, -/obj/item/stock_parts/power_store/battery/high, -/obj/item/stock_parts/power_store/battery/high, -/obj/item/stock_parts/power_store/battery/high, -/obj/item/stock_parts/power_store/battery/high, /obj/machinery/button/door/directional/west{ id = "rad_shutters"; name = "Radiation Shutters"; @@ -11205,12 +11280,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/med/chem) -"Hx" = ( -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ - dir = 9 - }, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "Hz" = ( /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium{ polarizer_id = "dauntless_interrogation" @@ -11350,7 +11419,7 @@ /area/ruin/space/has_grav/bubbers/persistance/service/lockers) "HZ" = ( /obj/machinery/light/cold/directional/north, -/obj/structure/reagent_dispensers/watertank, +/obj/machinery/power/portagrav, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "Ia" = ( @@ -11367,8 +11436,6 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/effect/spawner/random/exotic/languagebook, -/obj/effect/spawner/random/exotic/languagebook, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/service/lounge) "Id" = ( @@ -11483,6 +11550,7 @@ "Iw" = ( /obj/machinery/airalarm/directional/north, /obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "Ix" = ( @@ -11590,8 +11658,8 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) "IP" = ( -/obj/structure/frame/machine/secured, /obj/item/circuitboard/machine/stacking_machine, +/obj/structure/frame/machine, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/engineering/mining) "IQ" = ( @@ -11792,18 +11860,6 @@ }, /turf/open/floor/glass/reinforced/plasma, /area/ruin/space/has_grav/bubbers/persistance/service/diner) -"Jt" = ( -/obj/machinery/door/airlock/hatch{ - name = "Turbine Mix"; - id_tag = "syndiship_turbine_lock" - }, -/obj/structure/fans/tiny, -/obj/effect/mapping_helpers/airlock/locked, -/obj/effect/mapping_helpers/airlock/cutaiwire, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, -/obj/machinery/atmospherics/pipe/layer_manifold, -/turf/open/floor/engine, -/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "Jw" = ( /obj/effect/turf_decal/siding/dark{ dir = 6 @@ -11824,19 +11880,6 @@ }, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/service/lounge) -"JA" = ( -/obj/machinery/light/directional/south, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/structure/sign/departments/rndserver/directional/east, -/obj/machinery/vending/engivend{ - skyrat_products = list(/obj/item/clothing/glasses/meson/engine = 5, /obj/item/construction/rcd/loaded = 0, /obj/item/storage/pouch/material = 2, /obj/item/storage/bag/construction = 2); - onstation = 0; - onstation_override = 1; - all_products_free = 1 - }, -/turf/open/floor/pod/dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering) "JB" = ( /obj/effect/turf_decal/siding/dark{ dir = 10 @@ -11947,7 +11990,7 @@ id = "syndihangerb" }, /obj/structure/fans/tiny/forcefield, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "JS" = ( /obj/effect/turf_decal/siding/wood{ @@ -12374,6 +12417,22 @@ /obj/machinery/duct, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) +"Lc" = ( +/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/effect/turf_decal/trimline/purple/filled/line, +/obj/structure/noticeboard/directional/south, +/obj/item/paper/crumpled/plap, +/obj/item/paper/crumpled/retired_designs, +/obj/item/paper/crumpled/rbmk2, +/obj/item/paper/requisition, +/obj/item/paper/default_lawset_list, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/bubbers/persistance/sci/rnd) "Ld" = ( /obj/structure/cable, /obj/structure/disposalpipe/trunk{ @@ -12395,8 +12454,11 @@ "Lg" = ( /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) +/obj/item/mod/module/rad_protection, +/obj/item/mod/module/rad_protection, +/obj/structure/sign/warning/electric_shock/directional/east, +/turf/open/floor/pod/dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) "Lh" = ( /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) @@ -12431,19 +12493,7 @@ /area/ruin/space/has_grav/bubbers/persistance/cargo) "Lm" = ( /obj/machinery/bluespace_vendor/directional/north, -/obj/item/flatpacked_machine, -/obj/item/flatpacked_machine/water_synth, -/obj/item/construction/plumbing/engineering, -/obj/item/construction/plumbing, -/obj/item/clothing/shoes/magboots/syndie{ - pixel_y = 8 - }, -/obj/item/clothing/shoes/magboots/syndie{ - pixel_y = 8 - }, -/obj/structure/closet/crate/secure/syndicate/cybersun/noon{ - name = "Engineering Supplies" - }, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "Ln" = ( @@ -12474,6 +12524,8 @@ dir = 4 }, /obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/pollution_scrubber, +/obj/machinery/duct, /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "Lq" = ( @@ -12567,12 +12619,6 @@ /obj/effect/mapping_helpers/airlock/cutaiwire, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/med) -"LE" = ( -/obj/structure/cable, -/obj/machinery/door/firedoor/heavy, -/obj/structure/sign/warning/fire/directional/south, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "LF" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 @@ -12582,13 +12628,20 @@ /obj/structure/cable, /turf/open/floor/iron/terracotta/herringbone, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) -"LI" = ( -/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) +"LG" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/obj/structure/closet/secure_closet/interdynefob/electrical_supplies, +/obj/item/stock_parts/power_store/battery/high, +/obj/item/stock_parts/power_store/battery/high, +/obj/item/stock_parts/power_store/battery/high, +/obj/item/stock_parts/power_store/battery/high, +/obj/item/stock_parts/power_store/battery/high, +/obj/item/stock_parts/power_store/battery/high, +/obj/item/rwd/loaded, +/turf/open/floor/noslip, +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "LM" = ( /obj/structure/emergency_shield/cult/weak{ name = "Energy Shield" @@ -12716,11 +12769,6 @@ /obj/structure/lattice/catwalk/mining, /turf/open/floor/pod/dark, /area/icemoon/underground/explored) -"Mc" = ( -/obj/structure/flora/bush/flowers_pp/style_random, -/obj/structure/plant_tank, -/turf/open/floor/grass, -/area/ruin/space/has_grav/bubbers/persistance/service/hydro) "Me" = ( /obj/structure/fans/tiny/forcefield{ dir = 4 @@ -12738,7 +12786,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/plating/reinforced, +/turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/med) "Mg" = ( /obj/item/implanter/interdyne, @@ -12753,13 +12801,13 @@ /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/med/treatment) "Mh" = ( -/obj/machinery/smartfridge/drying, /obj/machinery/light/directional/south, /obj/machinery/button/door/directional/north{ id = "syndikitchen_s"; name = "Kitchen Shutters"; pixel_y = -24 }, +/obj/structure/table/reinforced/plastitaniumglass, /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "Mi" = ( @@ -12783,12 +12831,6 @@ /obj/effect/mapping_helpers/airalarm/syndicate_access, /turf/open/floor/wood, /area/ruin/space/has_grav/bubbers/persistance/service/gym) -"Ml" = ( -/obj/structure/cable, -/obj/machinery/airalarm/directional/south, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "Mo" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -12820,6 +12862,13 @@ "Ms" = ( /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/cargo) +"Mt" = ( +/obj/machinery/computer/order_console/mining/interdyne, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/medical) "Mu" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -12839,22 +12888,6 @@ }, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/evac) -"My" = ( -/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/effect/turf_decal/trimline/purple/filled/line, -/obj/structure/noticeboard/directional/south, -/obj/item/paper/crumpled/plap, -/obj/item/paper/crumpled/retired_designs, -/obj/item/paper/crumpled/rbmk2, -/obj/item/paper/requisition, -/obj/item/paper/default_lawset_list, -/turf/open/floor/iron/smooth, -/area/ruin/space/has_grav/bubbers/persistance/sci/rnd) "MA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/netpod, @@ -12902,24 +12935,27 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) +"ML" = ( +/obj/effect/turf_decal/stripes/red/line, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/pod/dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) "MM" = ( -/obj/machinery/button/door/directional/west{ - pixel_y = -8; - specialfunctions = 4; - name = "Dorm Bolt Switch"; - id = "syndishipcomms"; - req_access = list("syndicate"); - normaldoorcontrol = 1 +/obj/effect/turf_decal/siding/dark{ + dir = 2; + icon_state = "siding_plain_end" }, /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) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "MO" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -13029,7 +13065,6 @@ dir = 4 }, /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) @@ -13095,7 +13130,7 @@ dir = 9 }, /turf/open/floor/noslip, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "Nn" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/machinery/biogenerator/foodricator, @@ -13127,8 +13162,15 @@ "Nr" = ( /obj/effect/turf_decal/siding/dark, /obj/machinery/duct, +/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/south, +/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/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "Nt" = ( /obj/structure/chair/sofa/corner/maroon, /obj/effect/turf_decal/tile/bar/opposingcorners{ @@ -13179,7 +13221,6 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/cargo) "Ny" = ( -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/plumbing/synthesizer/water_synth, @@ -13187,7 +13228,7 @@ dir = 1 }, /turf/open/floor/noslip, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "Nz" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/spawner/random/structure/crate, @@ -13196,6 +13237,11 @@ "NA" = ( /obj/machinery/airalarm/directional/east, /obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/machinery/vending/hotdog{ + onstation = 0; + onstation_override = 1; + all_products_free = 1 + }, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/med/treatment) "NB" = ( @@ -13216,23 +13262,9 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/sec/armory) -"ND" = ( -/obj/structure/cable, -/obj/effect/turf_decal/stripes/red/line{ - dir = 8 - }, -/turf/open/floor/pod/dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering) "NF" = ( /obj/structure/table/reinforced/plastitaniumglass, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_y = 9; - pixel_x = 11 - }, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_y = 15; - pixel_x = 11 - }, +/obj/structure/cable, /turf/open/floor/iron/kitchen/diagonal, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "NG" = ( @@ -13321,9 +13353,6 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 2 }, -/obj/structure/closet/crate/secure/gear{ - name = "Persistence materials" - }, /obj/item/stack/sheet/mineral/plasma{ amount = 10 }, @@ -13359,6 +13388,7 @@ pixel_y = 2 }, /obj/structure/sign/poster/official/science/directional/south, +/obj/structure/closet/crate/secure/syndicate/cybersun, /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/rnd) "NW" = ( @@ -13446,6 +13476,7 @@ /obj/effect/mapping_helpers/apc/cut_AI_wire, /obj/effect/mapping_helpers/apc/full_charge, /obj/structure/closet/crate/freezer/donk, +/obj/structure/cargo_shelf, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/ruin/space/has_grav/bubbers/persistance/service/freezer) "Oe" = ( @@ -13474,6 +13505,12 @@ /obj/machinery/newscaster/directional/south, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) +"Oh" = ( +/obj/structure/cable, +/obj/machinery/power/smes/full, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "Oi" = ( /obj/machinery/duct, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -13521,6 +13558,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/item/vending_refill/donksoft, +/obj/item/folded_navigation_gigabeacon, /turf/open/floor/plating/elevatorshaft, /area/ruin/space/has_grav/bubbers/persistance/cargo) "Ol" = ( @@ -13563,12 +13602,6 @@ /obj/structure/chair/comfy/carp, /turf/open/floor/glass/reinforced/plasma, /area/ruin/space/has_grav/bubbers/persistance/service/diner) -"Oq" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "Or" = ( /obj/structure/table/reinforced/plastitaniumglass, /turf/open/floor/iron/kitchen/diagonal, @@ -13674,14 +13707,15 @@ /obj/structure/chair/comfy/carp{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/wood/parquet, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "OG" = ( /obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/reagentgrinder{ - pixel_y = 11; - pixel_x = -1 - }, +/obj/structure/cable, +/obj/machinery/light_switch/directional/north, /turf/open/floor/iron/kitchen/diagonal, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "OH" = ( @@ -13701,11 +13735,6 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) "OJ" = ( -/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 @@ -13845,6 +13874,11 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) +"Pa" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) "Pb" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -13922,6 +13956,11 @@ /area/ruin/space/has_grav/bubbers/persistance/med) "Pn" = ( /obj/machinery/photocopier/gratis, +/obj/machinery/vending/games{ + density = 0; + pixel_x = 28; + all_products_free = 1 + }, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/service/lounge) "Po" = ( @@ -13938,11 +13977,6 @@ }, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/med/viro) -"Pp" = ( -/obj/structure/sign/poster/contraband/moffuchis_pizza/directional/east, -/obj/structure/chair/comfy/carp, -/turf/open/floor/glass/reinforced/plasma, -/area/ruin/space/has_grav/bubbers/persistance/service/diner) "Pq" = ( /obj/structure/flora/rock/style_random, /turf/open/lava/plasma/ice_moon, @@ -14030,10 +14064,6 @@ "PD" = ( /obj/machinery/ticket_machine/directional/east, /obj/structure/table/reinforced/plastitaniumglass, -/obj/item/clothing/neck/stethoscope{ - pixel_x = 2; - pixel_y = -2 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -14199,12 +14229,11 @@ /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 }, +/obj/machinery/coffeemaker, /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "PZ" = ( @@ -14273,6 +14302,13 @@ }, /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/cargo) +"Qk" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/dark{ + dir = 5 + }, +/turf/open/floor/engine, +/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "Qm" = ( /obj/machinery/icecream_vat, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, @@ -14317,8 +14353,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/effect/turf_decal/siding/dark, /obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "Qu" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -14343,17 +14380,24 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "Qx" = ( -/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, +/obj/structure/closet/secure_closet/ds2atmos{ + anchorable = 0; + anchored = 1 + }, +/obj/item/analyzer{ + pixel_y = 10 + }, +/obj/item/holosign_creator/atmos, +/obj/item/mod/module/visor/meson{ + pixel_y = -9 + }, /turf/open/floor/noslip, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "Qz" = ( /obj/structure/fireplace, /obj/effect/turf_decal/siding/thinplating/terracotta/end, @@ -14446,9 +14490,6 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/computer/piratepad_control/syndiepad{ - dir = 1 - }, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/cargo) "QX" = ( @@ -14462,10 +14503,11 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/fishing_portal_generator, -/obj/item/storage/toolbox/fishing, /obj/machinery/airalarm/directional/south, /obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/kitchen/spoon/soup_ladle, +/obj/item/kitchen/tongs, /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "Ra" = ( @@ -14587,10 +14629,8 @@ }, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) "Rp" = ( -/obj/structure/closet/secure_closet/interdynefob/welding_supplies, /obj/machinery/airalarm/directional/south, /obj/effect/mapping_helpers/airalarm/syndicate_access, -/obj/item/weldingtool/hugetank, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/effect/turf_decal/stripes/red/corner{ @@ -14633,6 +14673,7 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/cargo) "Rx" = ( +/obj/machinery/light/directional/east, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/cargo/drone) "Ry" = ( @@ -14641,18 +14682,16 @@ /turf/open/floor/carpet/green, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/chef) "RA" = ( -/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 }, -/obj/machinery/duct, +/obj/machinery/light_switch/directional/north, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "RB" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -14666,7 +14705,7 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service/lounge) "RC" = ( -/obj/machinery/atmospherics/components/trinary/mixer/on/layer2{ +/obj/machinery/atmospherics/components/trinary/mixer/airmix/inverse/layer2{ dir = 1 }, /turf/open/floor/plating/reinforced, @@ -14681,7 +14720,7 @@ /obj/machinery/cryopod{ dir = 2 }, -/obj/machinery/computer/cryopod/interdyne/directional/north, +/obj/machinery/computer/cryopod/cybersun/directional/north, /turf/open/floor/iron/white/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "RF" = ( @@ -14713,13 +14752,17 @@ /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/machinery/duct, /obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/airlock/engineering/glass{ + name = "Engineering Bay" + }, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "dauntless-engi" + }, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) "RI" = ( @@ -14827,6 +14870,15 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) +"RW" = ( +/obj/effect/turf_decal/stripes/red/line, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/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) "RX" = ( /obj/machinery/computer/crew/syndie{ dir = 1 @@ -14839,7 +14891,6 @@ /obj/effect/turf_decal/stripes, /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /obj/effect/mapping_helpers/airlock/cutaiwire, -/obj/structure/fans/tiny/forcefield, /obj/structure/cable, /obj/machinery/door/airlock/atmos/glass{ name = "Turbine Room Airlock" @@ -14854,14 +14905,12 @@ dir = 8 }, /obj/machinery/disposal/bin, +/obj/machinery/digital_clock/directional/east, +/obj/structure/closet/emcloset/wall{ + pixel_y = 32 + }, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service) -"Sb" = ( -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ - dir = 6 - }, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "Sc" = ( /obj/effect/turf_decal/siding/dark, /turf/open/floor/iron/white/diagonal, @@ -14880,23 +14929,16 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) "Sh" = ( -/obj/structure/closet/secure_closet/ds2atmos{ - anchorable = 0; - anchored = 1 - }, -/obj/item/mod/module/visor/meson{ - pixel_y = -9 - }, -/obj/item/analyzer{ - pixel_y = 10 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/item/holosign_creator/atmos, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/light/directional/south, /obj/effect/turf_decal/stripes/red/corner{ dir = 1 }, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/red/corner{ + dir = 4 + }, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "Sj" = ( @@ -14943,6 +14985,14 @@ }, /turf/open/lava/plasma/ice_moon, /area/ruin/space/has_grav/bubbers/persistance/command/vault) +"Sm" = ( +/obj/machinery/light/directional/south, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/turf/open/floor/pod/dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) "Sn" = ( /obj/machinery/modular_computer/preset/curator{ dir = 8 @@ -15007,6 +15057,18 @@ }, /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) +"Sv" = ( +/obj/structure/safe/abovetilefloor, +/obj/item/blueprints/golem{ + name = "Persistence land crawler standard blueprints" + }, +/obj/item/sign/flag/syndicate{ + pixel_x = -3; + pixel_y = 6 + }, +/obj/item/stock_parts/power_store/cell/lead, +/turf/open/floor/iron/terracotta/small, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/engineering) "Sy" = ( /obj/item/clothing/glasses/night, /obj/item/storage/belt/military, @@ -15022,9 +15084,9 @@ /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/item/radio/headset/syndicateciv/staff, +/obj/item/radio/headset/syndicateciv/staff, +/obj/item/radio/headset/syndicateciv/staff, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/light_switch/directional/north, @@ -15096,22 +15158,6 @@ /obj/structure/lattice/catwalk/mining, /turf/open/lava/plasma/ice_moon, /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) -"SL" = ( -/obj/machinery/button/door{ - id = "syndibridge_w"; - name = "Bridge Window Shutters"; - req_access = list("syndicate_leader"); - pixel_x = -24 - }, -/obj/structure/noticeboard/directional/north, -/obj/structure/table/reinforced/plastitaniumglass, -/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) "SO" = ( /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/med/treatment) @@ -15148,6 +15194,14 @@ /obj/machinery/digital_clock/directional/east, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) +"SS" = ( +/obj/structure/plasticflaps, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/structure/cable, +/obj/machinery/duct, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) "ST" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) @@ -15163,10 +15217,6 @@ "SV" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/service/sauna) -"SW" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/hidden/layer2, -/turf/open/floor/engine, -/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "SX" = ( /obj/structure/flora/rock/icy/style_random, /turf/closed/mineral/random/snow/underground, @@ -15190,11 +15240,19 @@ /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, +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/airlock/engineering/glass{ + name = "Engineering Bay" + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/structure/sign/warning/radiation/rad_area/directional/east, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "dauntless-engi" + }, +/turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) "Tb" = ( /obj/structure/cable, @@ -15253,11 +15311,10 @@ "Th" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/cable, /obj/machinery/plumbing/synthesizer/water_synth, /obj/effect/turf_decal/siding/dark, /turf/open/floor/noslip, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "Ti" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -15342,14 +15399,13 @@ "Tu" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/machinery/light/directional/east, -/obj/machinery/vending/wardrobe/chef_wardrobe{ - pixel_x = 28; - density = 0; - onstation = 0; - onstation_override = 1; - all_products_free = 1 - }, /obj/item/food/cake/birthday/energy, +/obj/machinery/button/door/directional/north{ + id = "syndikitchen_int"; + name = "Kitchen Shutters"; + pixel_y = 0; + pixel_x = 24 + }, /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "Tz" = ( @@ -15414,6 +15470,10 @@ /obj/effect/turf_decal/stripes/red/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, +/obj/structure/cable, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "TU" = ( @@ -15481,20 +15541,7 @@ /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "Ue" = ( /obj/structure/sign/poster/contraband/self_ai_liberation/directional/north, -/obj/structure/closet/crate/robust, -/obj/item/mod/module/jump_jet, -/obj/item/mod/module/jump_jet, -/obj/item/mod/module/jump_jet, -/obj/item/mod/module/jump_jet, -/obj/item/mod/module/jump_jet, -/obj/effect/spawner/random/mod/maint, -/obj/effect/spawner/random/mod/maint, -/obj/effect/spawner/random/mod/maint, -/obj/effect/spawner/random/mod/maint, -/obj/effect/spawner/random/mod/maint, -/obj/effect/spawner/random/mod/maint, -/obj/effect/spawner/random/mod/maint, -/obj/effect/spawner/random/mod/maint, +/obj/machinery/autolathe/hacked, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/sci/robotics) "Uf" = ( @@ -15510,6 +15557,18 @@ /obj/machinery/power/energy_accumulator/tesla_coil/anchored, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) +"Uh" = ( +/obj/machinery/door/airlock/hatch{ + name = "Turbine Mix"; + id_tag = "syndiship_turbine_lock" + }, +/obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden, +/turf/open/floor/engine, +/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "Ui" = ( /obj/effect/turf_decal/vg_decals/radiation, /obj/structure/cable, @@ -15548,10 +15607,10 @@ /obj/machinery/cryopod{ dir = 4 }, -/obj/machinery/computer/cryopod/interdyne/directional/west, /obj/effect/turf_decal/siding/wood{ dir = 9 }, +/obj/machinery/computer/cryopod/cybersun/directional/west, /turf/open/floor/wood, /area/ruin/space/has_grav/bubbers/persistance/service/lockers) "Ur" = ( @@ -15579,11 +15638,12 @@ /obj/structure/plasticflaps, /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/sci/ordnance) -"Uw" = ( +"Uv" = ( +/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/simple/dark{ - dir = 4 + dir = 6 }, -/turf/closed/wall/r_wall/syndicate/nodiagonal, +/turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "Ux" = ( /obj/structure/frame/machine/secured, @@ -15606,12 +15666,6 @@ /obj/structure/cable, /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) -"UA" = ( -/obj/effect/turf_decal/stripes/red/line{ - dir = 8 - }, -/turf/open/floor/pod/dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering) "UC" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -15736,13 +15790,20 @@ /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "UZ" = ( /obj/machinery/light/directional/south, -/obj/structure/reagent_dispensers/foamtank, +/obj/structure/reagent_dispensers/fueltank/large, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "Va" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/siding/dark/corner, /obj/structure/table/reinforced/plastitaniumglass, +/obj/item/clothing/glasses/sunglasses/reagent, +/obj/item/reagent_containers/cup/rag, +/obj/item/reagent_containers/cup/glass/shaker{ + pixel_x = -6; + pixel_y = -7 + }, +/obj/machinery/duct, /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "Vb" = ( @@ -15821,6 +15882,7 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 6 }, +/obj/machinery/biogenerator/medstation/directional/south, /turf/open/floor/iron/terracotta/herringbone, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "Vn" = ( @@ -15845,22 +15907,30 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/med/viro) "Vp" = ( -/obj/machinery/deepfryer, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/reagentgrinder, /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "Vq" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) "Vr" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 4 +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/incinerator_input{ + dir = 8; + chamber_id = "dauntless_turbine" }, -/obj/machinery/duct, -/turf/open/floor/iron/terracotta/herringbone, -/area/ruin/space/has_grav/bubbers/persistance/service/hydro) +/turf/open/floor/engine, +/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "Vs" = ( /obj/machinery/bookbinder, /obj/machinery/light/directional/east, +/obj/machinery/vending/donksofttoyvendor{ + density = 0; + pixel_x = 32 + }, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/service/lounge) "Vt" = ( @@ -15876,7 +15946,6 @@ /turf/open/floor/carpet/royalblack, /area/ruin/space/has_grav/bubbers/persistance/service/lounge) "Vv" = ( -/obj/machinery/mineral/stacking_machine, /obj/structure/window/reinforced/plasma/spawner/directional/west, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -15898,7 +15967,7 @@ id = "syndihanger" }, /obj/structure/fans/tiny/forcefield, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) "Vz" = ( /obj/structure/emergency_shield/cult/weak{ @@ -15963,10 +16032,8 @@ /obj/machinery/vending/barbervend{ onstation = 0; onstation_override = 1; - pixel_y = 28; all_products_free = 1 }, -/obj/structure/table/reinforced/plastitaniumglass, /turf/open/floor/iron/kitchen/herringbone, /area/ruin/space/has_grav/bubbers/persistance/service/salon) "VI" = ( @@ -16082,6 +16149,7 @@ name = "persistence exterior east" }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/spawner/random/entertainment/plushie, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "VZ" = ( @@ -16089,7 +16157,7 @@ /obj/machinery/door/poddoor{ id = "syndihangerb" }, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "Wa" = ( /obj/effect/turf_decal/siding/wood{ @@ -16105,11 +16173,6 @@ network = list("persistence_ext"); name = "persistence exterior east" }, -/obj/machinery/vending/games{ - density = 0; - pixel_x = 28; - all_products_free = 1 - }, /turf/open/floor/carpet/royalblack, /area/ruin/space/has_grav/bubbers/persistance/service/lounge) "Wd" = ( @@ -16132,10 +16195,6 @@ /turf/open/misc/grass/jungle/station, /area/ruin/space/has_grav/bubbers/persistance/service) "Wi" = ( -/obj/item/storage/box/medipens{ - pixel_x = 4; - pixel_y = 13 - }, /obj/machinery/light/directional/west, /obj/machinery/stasis{ dir = 1 @@ -16200,6 +16259,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/wood/parquet, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "Wv" = ( @@ -16271,8 +16331,11 @@ dir = 4 }, /obj/structure/table/reinforced/plastitaniumglass, -/obj/item/storage/backpack/duffelbag/deforest_medkit/stocked, -/obj/item/storage/backpack/duffelbag/deforest_surgical/stocked, +/obj/item/storage/box/medipens{ + pixel_x = 4; + pixel_y = 13 + }, +/obj/item/healthanalyzer/advanced, /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/med/treatment) "WG" = ( @@ -16365,20 +16428,21 @@ /obj/structure/chair/sofa/right/maroon{ dir = 4 }, +/obj/machinery/newscaster/directional/south, /turf/open/floor/carpet/green, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/chef) "WR" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/structure/closet/firecloset/full, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/machinery/light/cold/directional/north, +/obj/structure/closet/secure_closet/interdynefob/welding_supplies, +/turf/open/floor/pod/dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) "WS" = ( /obj/structure/frame/machine/secured{ anchored = 0 }, -/obj/item/circuitboard/machine/ltsrbt, /obj/structure/fireaxecabinet/energy{ pixel_y = -32 }, @@ -16397,6 +16461,7 @@ /obj/effect/spawner/random/entertainment/plushie_delux, /obj/item/clothing/suit/jacket/runner/syndicate, /obj/structure/closet/secure_closet/persistence/maa_locker, +/obj/item/radio/headset/syndicateciv/command, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/maa) "WU" = ( @@ -16472,6 +16537,9 @@ normaldoorcontrol = 1; pixel_x = 24 }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/open/floor/carpet/stellar, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/cargo) "Xe" = ( @@ -16559,25 +16627,9 @@ /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/med) "Xt" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/storage/box/gas_miner_beacons/syndicate{ - pixel_x = 7; - pixel_y = -4 - }, -/obj/item/storage/box/gas_miner_beacons/syndicate{ - pixel_x = -7; - pixel_y = -4 - }, -/obj/item/rwd/loaded, +/obj/structure/reagent_dispensers/watertank/high, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) -"Xv" = ( -/obj/machinery/atmospherics/components/trinary/mixer{ - dir = 8 - }, -/obj/machinery/light/directional/west, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "Xz" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 5 @@ -16591,8 +16643,6 @@ /turf/open/floor/grass, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "XB" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/grill, /obj/item/stack/sheet/mineral/coal/five, /turf/open/floor/iron/white, @@ -16625,6 +16675,18 @@ /obj/item/borg/upgrade/transform/syndicatedauntless, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/sci/robotics) +"XH" = ( +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, +/obj/structure/tank_dispenser, +/turf/open/floor/pod/dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) "XJ" = ( /obj/structure/fans/tiny/forcefield{ dir = 4 @@ -16639,7 +16701,7 @@ id = "syndicargo"; name = "Docking Port Blast Doors" }, -/turf/open/floor/plating/reinforced, +/turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/cargo) "XK" = ( /obj/structure/cable, @@ -16829,11 +16891,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service/janitorial) -"Yi" = ( -/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) "Yj" = ( /obj/machinery/light/directional/east, /obj/effect/turf_decal/stripes/end{ @@ -16926,13 +16983,13 @@ /turf/open/floor/iron/white/small, /area/ruin/space/has_grav/bubbers/persistance/service/lockers) "Yw" = ( +/obj/structure/cable, /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) "Yy" = ( @@ -16984,12 +17041,15 @@ /obj/structure/cable, /obj/structure/disposalpipe/segment, /obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "YG" = ( /obj/structure/cable, /obj/structure/extinguisher_cabinet/directional/north, /obj/machinery/power/energy_accumulator/grounding_rod/anchored, +/obj/machinery/light/cold/directional/north, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "YH" = ( @@ -17016,6 +17076,16 @@ }, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/cargo) +"YJ" = ( +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/pod/dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) "YM" = ( /obj/machinery/duct, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -17082,7 +17152,7 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/cargo) "YU" = ( -/obj/structure/frame/machine/secured, +/obj/machinery/nuclearbomb/beer, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/command/vault) "YV" = ( @@ -17108,6 +17178,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/light_switch/directional/east, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/ruin/space/has_grav/bubbers/persistance/service/freezer) "YX" = ( @@ -17166,12 +17237,6 @@ /obj/machinery/light_switch/directional/west, /turf/open/floor/carpet/royalblack, /area/ruin/space/has_grav/bubbers/persistance/service/lounge) -"Zh" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering) "Zi" = ( /obj/machinery/conveyor{ id = "syndirecycle"; @@ -17212,7 +17277,6 @@ 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; @@ -17224,9 +17288,13 @@ /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, +/obj/machinery/firealarm/directional/east, +/obj/structure/closet/firecloset/wall{ + pixel_x = -32 + }, +/obj/machinery/light/directional/east, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) "Zl" = ( @@ -17234,7 +17302,6 @@ /obj/structure/table/wood/fancy/red, /obj/effect/spawner/random/food_or_drink/dinner, /obj/machinery/light/dim/directional/east, -/obj/item/reagent_containers/cup/glass/mug, /turf/open/floor/glass/reinforced/plasma, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "Zn" = ( @@ -17278,7 +17345,7 @@ /area/ruin/space/has_grav/bubbers/persistance/sec/brigentrance) "Zs" = ( /obj/structure/table/reinforced/plastitaniumglass, -/obj/structure/reagent_dispensers/servingdish, +/obj/item/reagent_containers/condiment/donksauce, /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "Zv" = ( @@ -17297,10 +17364,6 @@ 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, @@ -17309,10 +17372,10 @@ /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/reagent_containers/cup/watering_can, /turf/open/floor/grass, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "Zx" = ( @@ -18099,14 +18162,14 @@ pE UU Ch Lm -aY -aY +Cc +Cc wj -aY -Zh -aY +Cc +Qu +Cc nj -rq +gz Iu jX VO @@ -18116,7 +18179,7 @@ QQ wk Bk tB -Dc +Sv Dc sR GX @@ -18168,13 +18231,13 @@ HS pE sf Uu +tf +Cc +Pa +ML aY -qV -aY -wj -aY -Zh -aY +Qu +Cc AV pU MR @@ -18239,19 +18302,19 @@ lh FW gz Iw -aY -aY -wj -aY -Zh -aY +Cc +Cc +RW +Cc +Qu +Cc GP Tm Su HL -VO -Jt -SW +Uv +Uh +Qk VN XP CN @@ -18309,7 +18372,7 @@ EP xg Tm xk -qP +YJ qP kZ kg @@ -18319,9 +18382,9 @@ Rp Tm dO Iu -Ml -Ao -hQ +tE +Gd +Vr jH DD EF @@ -18389,8 +18452,8 @@ vJ Tm rl pi -LE -Uw +zH +Gd Af Gd Gd @@ -18440,7 +18503,7 @@ tg Id EZ In -My +Lc FW FW Ue @@ -18450,17 +18513,17 @@ FB Tm YG xi -Cc -dy -Cc -Zh +Bb +ml +eE +Qu Cc Ui tn wi Qi -eO -Xv +an +nM ii fO wa @@ -18479,7 +18542,7 @@ mc mc mc uQ -iX +uQ HP HP HP @@ -18521,7 +18584,7 @@ Tm Ug Cc Ug -Fr +dy Cc Qu Cc @@ -18529,8 +18592,8 @@ zQ Tm Iu eU -Sb -Hx +gC +Iu Iu HL pi @@ -18549,7 +18612,7 @@ mc mc uQ uQ -nc +iX HP cR Jj @@ -18592,9 +18655,9 @@ eu he qP Ct -UA +qP TT -ND +hz Sh Tm vb @@ -18662,10 +18725,10 @@ Cc Cc Cc bK -Ev -zu -bO -Yi +Cc +Qu +Cq +ot BD RC Wn @@ -18728,14 +18791,14 @@ vd Jw Fd Tm +tf Cc -Cc -Cc +Bb GM FV qd -vz -JA +Cq +Sm Tm jy cU @@ -18800,12 +18863,12 @@ sC Tm Cc Cc -Bb +Cc os -fQ -Pk +Aj +Cc CQ -Pk +eQ uT Nk JP @@ -18865,16 +18928,16 @@ qR qR qK bj -qK +lu qR -qR -qR -qR -Tm +lu +XH +qP +qP EK fQ -sH -UP +Pk +lO AC uT ZQ @@ -18942,7 +19005,7 @@ zp lI eI cD -LI +fQ xc UP zW @@ -19006,18 +19069,18 @@ eG Nb HI HI -Pz -Pz -Pz +HI +HI +HI HI WR kq -Pk +SS nQ Yw cY uT -pK +Yd MU qn Yd @@ -19079,13 +19142,13 @@ og lL JS pP -Pz +HI Lg qy -qR -Pk -Pk -Pk +fQ +Oh +DZ +LG Gg Gg Gg @@ -19150,9 +19213,9 @@ Qq TZ av HI -fX +Pk nY -jG +fQ MM ud CB @@ -19220,7 +19283,7 @@ Pz Pz yg Og -fX +Pk RA jf cz @@ -19237,7 +19300,7 @@ dA xj WU Gg -xz +AS As Om oY @@ -19290,12 +19353,12 @@ cw CM AO Gk -fX +Pk Qx -iu +gT Nm lB -Nr +te Gg VA bF @@ -19360,7 +19423,7 @@ Du WX ZI AX -fX +Pk hK fw Ny @@ -19430,8 +19493,8 @@ Cj zj jI mD -jG -jG +fQ +fQ fV cb pp @@ -19472,7 +19535,7 @@ EU sS vV iV -er +ay wx kc aw @@ -19718,13 +19781,13 @@ Ry oL Gg kf -Mc -Dz -Dz +fN +bF +bF to Tr jc -Vr +gU YN mG ce @@ -20006,7 +20069,7 @@ rh OG yG ji -dI +Dg zt XB IK @@ -20073,7 +20136,7 @@ ID ID hL rh -Or +BG ql ji dc @@ -20146,7 +20209,7 @@ rh NF Eb jE -Dg +dI JI Mh rh @@ -20202,7 +20265,7 @@ Ze RQ HR KV -KV +jF bJ jg KO @@ -20216,8 +20279,8 @@ ax yT fx Us -rR -Oq +Dg +JI Vp IK nc @@ -20354,7 +20417,7 @@ ID Vk Us xH -bY +Or UC sn Tu @@ -20418,15 +20481,15 @@ lJ zD Fl ri -Pp +Op Zl GV fT jd ax rh -rh -rh +pc +pc rh rh ax @@ -20513,7 +20576,7 @@ hO Up pj JE -eb +JE JE pj fk @@ -20581,7 +20644,7 @@ Pq nc Kd Qj -kD +JE JE JE Wd @@ -20620,7 +20683,7 @@ Jh IQ IQ qR -cA +FU lV cu ZC @@ -20635,7 +20698,7 @@ YY OM lu Sa -JX +cT JU JX Vy @@ -20670,7 +20733,7 @@ po gn po Pl -pF +gP Di Di kz @@ -20701,13 +20764,13 @@ qR uu qR ST -SL +ts Ca YY ia +vX +vX ia -vX -vX ia dk Lr @@ -20731,7 +20794,7 @@ zG Jp Nl YI -nb +eq ba Xd dM @@ -20791,7 +20854,7 @@ uQ wt Kd Oj -wH +pj JE JE JE @@ -20801,8 +20864,8 @@ zG TL HN HN -qs -qs +Mt +Kl qs qs Xq @@ -20860,10 +20923,10 @@ mc uQ nc hO -RO -oh +jZ +pj +JE JE -Wd JE pj sh @@ -20871,7 +20934,7 @@ zG Np sl YT -qs +Kl Gb tz bs @@ -20931,7 +20994,7 @@ uQ nc hO kl -iM +pj JE JE JE @@ -21072,7 +21135,7 @@ nc Kd UL kd -nA +zn nf Ms oe @@ -21226,7 +21289,7 @@ ms ms qs qs -BK +Xq BK Di Me diff --git a/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_syndicate_base1_skyrat.dmm b/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_syndicate_base1_skyrat.dmm index 0d4ae849efd..9b61d1148dc 100644 --- a/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_syndicate_base1_skyrat.dmm +++ b/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_syndicate_base1_skyrat.dmm @@ -2672,9 +2672,9 @@ /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/item/radio/headset/syndicateciv/staff, +/obj/item/radio/headset/syndicateciv/staff, +/obj/item/radio/headset/syndicateciv/staff, /obj/structure/closet/crate/secure/gear{ req_access = list("syndicate"); anchored = 1 diff --git a/_maps/RandomRuins/LavaRuins/bubberstation/lavaland_dauntless.dmm b/_maps/RandomRuins/LavaRuins/bubberstation/lavaland_dauntless.dmm index 79659116a9b..7513395ba15 100644 --- a/_maps/RandomRuins/LavaRuins/bubberstation/lavaland_dauntless.dmm +++ b/_maps/RandomRuins/LavaRuins/bubberstation/lavaland_dauntless.dmm @@ -10140,7 +10140,7 @@ dir = 5 }, /obj/structure/table/reinforced/plastitaniumglass, -/obj/item/radio/headset/interdyne, +/obj/item/radio/headset/syndicateciv/staff, /turf/open/floor/iron/small, /area/ruin/space/has_grav/bubbers/dauntless/command/bridge) "RU" = ( diff --git a/_maps/RandomRuins/LavaRuins/bubberstation/lavaland_persistence.dmm b/_maps/RandomRuins/LavaRuins/bubberstation/lavaland_persistence.dmm index d9266152d90..d24b1d37c54 100644 --- a/_maps/RandomRuins/LavaRuins/bubberstation/lavaland_persistence.dmm +++ b/_maps/RandomRuins/LavaRuins/bubberstation/lavaland_persistence.dmm @@ -28,7 +28,6 @@ /area/ruin/space/has_grav/bubbers/persistance/service/sauna) "af" = ( /obj/machinery/light_switch/directional/west, -/obj/item/healthanalyzer/advanced, /obj/machinery/light/directional/west, /obj/machinery/stasis{ dir = 1 @@ -40,13 +39,10 @@ /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/rnd) "ah" = ( -/obj/structure/cable, -/obj/structure/table/reinforced/plastitaniumglass, /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/item/reagent_containers/cup/mortar, -/obj/item/pestle, +/obj/machinery/deepfryer, /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "ai" = ( @@ -218,15 +214,12 @@ /turf/open/floor/grass, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "aK" = ( -/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/end{ dir = 4 }, -/obj/structure/reagent_dispensers/watertank/high, +/obj/structure/reagent_dispensers/foamtank, /turf/open/floor/noslip, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "aM" = ( /obj/structure/cable, /obj/machinery/duct, @@ -285,7 +278,6 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 }, -/obj/structure/fermenting_barrel, /turf/open/floor/iron/terracotta/herringbone, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "aV" = ( @@ -298,6 +290,12 @@ /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "aW" = ( /obj/structure/aquarium/bioelec_gen/prefilled, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) +"aZ" = ( +/obj/structure/cable, +/obj/machinery/light/cold/directional/north, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "bb" = ( @@ -330,7 +328,7 @@ /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "be" = ( /obj/machinery/light/directional/south, -/obj/structure/reagent_dispensers/foamtank, +/obj/structure/reagent_dispensers/fueltank/large, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "bf" = ( @@ -371,6 +369,15 @@ }, /turf/open/floor/wood, /area/ruin/space/has_grav/bubbers/persistance/service/lockers) +"bp" = ( +/obj/effect/turf_decal/stripes/red/line, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/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) "bq" = ( /obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, @@ -603,13 +610,13 @@ /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/rnd) "bR" = ( -/obj/machinery/smartfridge/drying, /obj/machinery/light/directional/south, /obj/machinery/button/door/directional/north{ id = "syndikitchen_s"; name = "Kitchen Shutters"; pixel_y = -24 }, +/obj/structure/table/reinforced/plastitaniumglass, /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "bS" = ( @@ -700,12 +707,6 @@ /obj/structure/window/reinforced/survival_pod/spawner/directional/east, /turf/open/floor/engine, /area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) -"ci" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark{ - dir = 6 - }, -/turf/closed/wall/r_wall/syndicate/nodiagonal, -/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "cj" = ( /obj/effect/turf_decal/siding/blue{ dir = 4 @@ -720,19 +721,7 @@ /area/ruin/space/has_grav/bubbers/persistance/med) "cn" = ( /obj/machinery/bluespace_vendor/directional/north, -/obj/item/flatpacked_machine, -/obj/item/flatpacked_machine/water_synth, -/obj/item/construction/plumbing/engineering, -/obj/item/construction/plumbing, -/obj/item/clothing/shoes/magboots/syndie{ - pixel_y = 8 - }, -/obj/item/clothing/shoes/magboots/syndie{ - pixel_y = 8 - }, -/obj/structure/closet/crate/secure/syndicate/cybersun/noon{ - name = "Engineering Supplies" - }, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "cp" = ( @@ -1166,11 +1155,19 @@ /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, +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/airlock/engineering/glass{ + name = "Engineering Bay" + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/structure/sign/warning/radiation/rad_area/directional/east, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "dauntless-engi" + }, +/turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) "dE" = ( /obj/machinery/door/airlock/highsecurity{ @@ -1218,13 +1215,6 @@ /obj/structure/chair/office/tactical, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/sec/armory) -"dJ" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/incinerator_input{ - dir = 1; - chamber_id = "dauntless_turbine" - }, -/turf/open/floor/engine, -/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "dL" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 4 @@ -1371,17 +1361,11 @@ /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "el" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/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/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/engineering/utilities) "en" = ( /obj/structure/closet/generic/wall{ pixel_x = 32 @@ -1534,6 +1518,9 @@ normaldoorcontrol = 1; pixel_x = 24 }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/open/floor/carpet/stellar, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/cargo) "eO" = ( @@ -1555,6 +1542,8 @@ /obj/structure/cable, /obj/structure/disposalpipe/segment, /obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "eS" = ( @@ -1562,10 +1551,8 @@ /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, /obj/effect/mapping_helpers/airalarm/syndicate_access, -/obj/item/weldingtool/hugetank, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/effect/turf_decal/stripes/red/corner{ @@ -1576,6 +1563,13 @@ }, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) +"eV" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) "eW" = ( /obj/structure/disposalpipe/trunk{ dir = 4 @@ -1617,20 +1611,13 @@ /area/ruin/space/has_grav/bubbers/persistance/service/janitorial) "fa" = ( /obj/structure/table, -/obj/item/pipe_dispenser{ - pixel_x = -3 - }, /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/engineering/mining) "fb" = ( @@ -1791,9 +1778,10 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/structure/closet/firecloset/full, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/bubbers/persistance/service) +/obj/machinery/light/cold/directional/north, +/obj/structure/closet/secure_closet/interdynefob/welding_supplies, +/turf/open/floor/pod/dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) "fA" = ( /obj/effect/turf_decal/siding/dark/corner, /turf/open/floor/iron/dark/small, @@ -1855,11 +1843,12 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) "fO" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/clothing/head/utility/chefhat, -/obj/item/storage/belt/military/snack, /obj/machinery/light/directional/east, /obj/structure/sign/poster/contraband/calada_jelly/directional/east, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/processor{ + pixel_x = 1 + }, /turf/open/floor/iron/kitchen/diagonal, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "fP" = ( @@ -1983,9 +1972,6 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/computer/piratepad_control/syndiepad{ - dir = 1 - }, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/cargo) "ge" = ( @@ -2052,10 +2038,6 @@ /obj/machinery/door/firedoor/heavy, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) -"gt" = ( -/obj/machinery/power/portagrav, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering) "gu" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -2143,6 +2125,13 @@ initial_gas_mix = "LAVALAND_ATMOS" }, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) +"gF" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/trinary/mixer{ + dir = 8 + }, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "gG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -2265,7 +2254,6 @@ dir = 4 }, /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) @@ -2322,13 +2310,6 @@ /turf/open/floor/engine/plasma, /area/ruin/space/has_grav/bubbers/persistance/engineering/gas) "hl" = ( -/obj/machinery/vending/donksnack{ - onstation = 0; - onstation_override = 1; - pixel_x = 32; - density = 0; - all_products_free = 1 - }, /obj/effect/turf_decal/tile/bar/opposingcorners{ dir = 8 }, @@ -2338,6 +2319,13 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, +/obj/machinery/vending/cigarette/syndicate{ + onstation = 0; + onstation_override = 1; + density = 0; + pixel_x = 28; + all_products_free = 1 + }, /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "hm" = ( @@ -2349,6 +2337,7 @@ /obj/effect/turf_decal/stripes/red/line{ dir = 1 }, +/obj/effect/turf_decal/stripes/red/line, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "hn" = ( @@ -2394,7 +2383,6 @@ pixel_x = -2; pixel_y = -6 }, -/obj/item/mod/core/standard, /obj/item/book/manual/wiki/robotics_cyborgs{ pixel_x = 8 }, @@ -2411,6 +2399,7 @@ pixel_x = 0; pixel_y = -30 }, +/obj/item/mod/core/plasma, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/sci/robotics) "hr" = ( @@ -2467,12 +2456,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/sauna) -"hz" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering) "hB" = ( /obj/machinery/light/directional/south, /obj/effect/turf_decal/siding/thinplating/dark{ @@ -2489,11 +2472,6 @@ /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 @@ -2518,15 +2496,16 @@ }, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/cargo) -"hF" = ( -/obj/structure/cable, +"hG" = ( /obj/effect/turf_decal/stripes/red/line{ - dir = 1 + dir = 8 }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /obj/effect/turf_decal/stripes/red/line{ - dir = 1 + dir = 4 }, -/obj/effect/turf_decal/stripes/red/line, +/obj/structure/tank_dispenser, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "hH" = ( @@ -2566,13 +2545,6 @@ }, /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{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "hM" = ( /obj/effect/turf_decal/siding/wood, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -2626,11 +2598,11 @@ "hT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/suit_storage_unit/industrial/bloodredsuit, /obj/structure/sign/warning/fire/directional/south, /obj/effect/turf_decal/stripes/red/line{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "hU" = ( @@ -2846,7 +2818,7 @@ /obj/item/paper/fluff/jobs/engineering/frequencies{ pixel_x = 4 }, -/obj/item/radio/headset/interdyne, +/obj/item/radio/headset/syndicateciv/staff, /turf/open/floor/mineral/plastitanium/red{ icon_state = "plastitanium" }, @@ -2872,6 +2844,22 @@ }, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service) +"iD" = ( +/obj/machinery/button/door{ + id = "syndibridge_w"; + name = "Bridge Window Shutters"; + req_access = list("syndicate_leader"); + pixel_x = -24 + }, +/obj/structure/noticeboard/directional/north, +/obj/structure/table/reinforced/plastitaniumglass, +/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) "iH" = ( /obj/effect/turf_decal/siding/dark/corner{ dir = 4 @@ -3023,6 +3011,11 @@ /area/ruin/space/has_grav/bubbers/persistance/service/lockers) "je" = ( /obj/machinery/photocopier/gratis, +/obj/machinery/vending/games{ + density = 0; + pixel_x = 28; + all_products_free = 1 + }, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/service/lounge) "jf" = ( @@ -3086,6 +3079,8 @@ dir = 4 }, /obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/pollution_scrubber, +/obj/machinery/duct, /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "ju" = ( @@ -3138,10 +3133,6 @@ "jB" = ( /obj/machinery/ticket_machine/directional/east, /obj/structure/table/reinforced/plastitaniumglass, -/obj/item/clothing/neck/stethoscope{ - pixel_x = 2; - pixel_y = -2 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -3180,19 +3171,16 @@ "jH" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) -"jK" = ( -/obj/structure/fans/tiny, -/obj/machinery/light/cold/directional/east, -/obj/structure/sign/poster/contraband/grey_tide/directional/north, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/engineering/gas) "jL" = ( /obj/structure/window/reinforced/survival_pod/spawner/directional/north, /obj/structure/table/reinforced/plastitaniumglass, -/obj/item/circuitboard/machine/powerator/interdyne, /obj/item/storage/toolbox/syndicate{ pixel_y = 5 }, +/obj/item/storage/box/stockparts/basic{ + pixel_x = 4; + pixel_y = 10 + }, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/cargo) "jN" = ( @@ -3326,6 +3314,19 @@ /obj/structure/window/reinforced/survival_pod/spawner/directional/south, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service) +"ka" = ( +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/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/pod/dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) "kc" = ( /obj/machinery/light/directional/east, /obj/structure/disposalpipe/trunk{ @@ -3346,11 +3347,6 @@ /obj/structure/window/reinforced/plasma/spawner/directional/east, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) -"kd" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, -/obj/structure/cable, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "ke" = ( /obj/effect/turf_decal/tile/bar/opposingcorners{ dir = 8 @@ -3430,8 +3426,6 @@ /obj/item/clothing/shoes/galoshes, /obj/item/soap/syndie, /obj/machinery/duct, -/obj/item/grenade/clusterbuster/cleaner, -/obj/item/grenade/clusterbuster/cleaner, /obj/item/grenade/clusterbuster/soap, /obj/item/storage/bag/trash, /turf/open/floor/mineral/plastitanium, @@ -3447,13 +3441,9 @@ /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, +/obj/machinery/firealarm/directional/east, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/area/ruin/space/has_grav/bubbers/persistance/engineering) "kq" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/machinery/pollution_scrubber, @@ -3461,7 +3451,6 @@ /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "kr" = ( -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/plumbing/synthesizer/water_synth, @@ -3469,7 +3458,7 @@ dir = 1 }, /turf/open/floor/noslip, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "ks" = ( /obj/effect/turf_decal/tile/bar/opposingcorners{ dir = 8 @@ -3527,13 +3516,13 @@ pixel_x = 3; pixel_y = 6 }, -/obj/item/stamp/syndicate{ - pixel_y = -4; - pixel_x = 9 - }, /obj/item/stamp/denied{ pixel_y = -4 }, +/obj/item/stamp/persistence{ + pixel_x = 9; + pixel_y = -4 + }, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "kA" = ( @@ -3551,9 +3540,9 @@ /obj/item/implanter/interdyne, /obj/item/implanter/interdyne, /obj/item/implanter/interdyne, -/obj/structure/safe/abovetilefloor, -/obj/structure/safe/abovetilefloor, -/obj/structure/safe/abovetilefloor, +/obj/item/implanter/interdyne, +/obj/item/implanter/interdyne, +/obj/item/implanter/interdyne, /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/med/treatment) "kC" = ( @@ -3652,15 +3641,9 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/sci/ordnance) "kS" = ( -/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/highsecurity{ - name = "utilities" - }, -/obj/effect/mapping_helpers/airlock/cutaiwire, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/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/engineering) "kT" = ( @@ -3676,10 +3659,6 @@ /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/iron/colony/bolts, /area/ruin/space/has_grav/bubbers/persistance/service) "kW" = ( @@ -3802,14 +3781,6 @@ "lq" = ( /obj/structure/table/wood/fancy/black, /obj/item/modular_computer/laptop/preset/syndicate, -/obj/item/stamp{ - pixel_x = 8; - pixel_y = 1 - }, -/obj/item/stamp/denied{ - pixel_x = 8; - pixel_y = 6 - }, /obj/item/pen/fountain/captain{ name = "Liason's fountain pen"; pixel_y = 5 @@ -3818,6 +3789,18 @@ dir = 1 }, /obj/structure/sign/flag/syndicate/directional/south, +/obj/item/stamp/persistence{ + pixel_x = 8; + pixel_y = 12 + }, +/obj/item/stamp/denied{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/stamp{ + pixel_x = 8; + pixel_y = 1 + }, /turf/open/floor/wood/parquet, /area/ruin/space/has_grav/bubbers/persistance/command/liason) "lr" = ( @@ -3852,6 +3835,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) +"lw" = ( +/turf/closed/wall/r_wall/syndicate/nodiagonal, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/cargo) "lx" = ( /obj/structure/emergency_shield/cult/weak{ name = "Energy Shield" @@ -3957,10 +3943,8 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/structure/sign/warning/electric_shock/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/turf/open/floor/pod/dark, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "lM" = ( /obj/structure/cable, @@ -4070,6 +4054,18 @@ "ma" = ( /turf/open/floor/engine, /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) +"mb" = ( +/obj/structure/safe/abovetilefloor, +/obj/item/blueprints/golem{ + name = "Persistence land crawler standard blueprints" + }, +/obj/item/sign/flag/syndicate{ + pixel_x = -3; + pixel_y = 6 + }, +/obj/item/stock_parts/power_store/cell/lead, +/turf/open/floor/iron/terracotta/small, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/engineering) "mc" = ( /obj/machinery/duct, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -4131,10 +4127,6 @@ 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; @@ -4150,12 +4142,6 @@ }, /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, -/obj/structure/cable, -/turf/open/floor/pod/dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering) "mn" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -4213,8 +4199,15 @@ "mx" = ( /obj/effect/turf_decal/siding/dark, /obj/machinery/duct, +/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/south, +/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/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "mA" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 4 @@ -4299,11 +4292,6 @@ network = list("persistence_ext"); name = "persistence exterior east" }, -/obj/machinery/vending/games{ - density = 0; - pixel_x = 28; - all_products_free = 1 - }, /turf/open/floor/carpet/royalblack, /area/ruin/space/has_grav/bubbers/persistance/service/lounge) "mR" = ( @@ -4389,10 +4377,11 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/structure/closet/emcloset/wall{ - pixel_y = -32 - }, /obj/machinery/duct, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/cut_AI_wire, +/obj/effect/mapping_helpers/apc/full_charge, +/obj/effect/mapping_helpers/apc/syndicate_access, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) "ne" = ( @@ -4434,10 +4423,6 @@ /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/table/wood/fancy/red, /obj/machinery/fax{ @@ -4459,6 +4444,12 @@ }, /turf/open/floor/iron/white/diagonal, /area/ruin/space/has_grav/bubbers/persistance/med) +"nt" = ( +/obj/structure/cable, +/obj/machinery/power/smes/full, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "nu" = ( /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium{ polarizer_id = "burnchamberbed_w" @@ -4471,20 +4462,7 @@ /area/ruin/space/has_grav/bubbers/persistance/service/dorms/engineering) "nv" = ( /obj/structure/sign/poster/contraband/self_ai_liberation/directional/north, -/obj/structure/closet/crate/robust, -/obj/item/mod/module/jump_jet, -/obj/item/mod/module/jump_jet, -/obj/item/mod/module/jump_jet, -/obj/item/mod/module/jump_jet, -/obj/item/mod/module/jump_jet, -/obj/effect/spawner/random/mod/maint, -/obj/effect/spawner/random/mod/maint, -/obj/effect/spawner/random/mod/maint, -/obj/effect/spawner/random/mod/maint, -/obj/effect/spawner/random/mod/maint, -/obj/effect/spawner/random/mod/maint, -/obj/effect/spawner/random/mod/maint, -/obj/effect/spawner/random/mod/maint, +/obj/machinery/autolathe/hacked, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/sci/robotics) "nw" = ( @@ -4506,11 +4484,6 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/vending/robotics{ - pixel_y = 28; - density = 0; - all_products_free = 1 - }, /obj/effect/mob_spawn/ghost_role/robot/persistence, /obj/effect/mob_spawn/ghost_role/robot/persistence, /turf/open/floor/iron/dark, @@ -4582,6 +4555,7 @@ /obj/effect/spawner/random/entertainment/plushie, /obj/effect/spawner/random/entertainment/plushie_delux, /obj/item/clothing/suit/jacket/runner/syndicate, +/obj/item/radio/headset/syndicateciv/command, /turf/open/floor/wood/parquet, /area/ruin/space/has_grav/bubbers/persistance/command/liason) "nJ" = ( @@ -4600,6 +4574,7 @@ /obj/structure/table/wood/fancy/red, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/item/pai_card, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/service/lounge) "nM" = ( @@ -4701,7 +4676,6 @@ /obj/effect/turf_decal/stripes/red/line{ dir = 4 }, -/obj/machinery/light/cold/directional/north, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "nY" = ( @@ -4804,6 +4778,9 @@ /obj/item/seeds/poppy/opiumpoppy, /obj/item/seed_mesh, /obj/item/seed_mesh, +/obj/effect/spawner/random/food_or_drink/seed_rare, +/obj/effect/spawner/random/food_or_drink/seed_rare, +/obj/item/seeds/kudzu, /turf/open/floor/grass, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "op" = ( @@ -4847,17 +4824,12 @@ /obj/structure/cable, /turf/open/floor/iron/colony/bolts, /area/ruin/space/has_grav/bubbers/persistance/evac) -"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; @@ -4901,6 +4873,7 @@ name = "persistence exterior east" }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/spawner/random/entertainment/plushie, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "oE" = ( @@ -5053,8 +5026,6 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/cargo) "pb" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/grill, /obj/item/stack/sheet/mineral/coal/five, /turf/open/floor/iron/white, @@ -5082,13 +5053,6 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/sci/robotics) "ph" = ( -/obj/machinery/vending/cigarette/syndicate{ - onstation = 0; - onstation_override = 1; - density = 0; - pixel_x = 28; - all_products_free = 1 - }, /obj/effect/turf_decal/tile/bar/opposingcorners{ dir = 8 }, @@ -5096,18 +5060,16 @@ /obj/effect/turf_decal/siding{ dir = 4 }, +/obj/structure/sign/poster/contraband/tipper_cream_soda/directional/east, /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "pj" = ( -/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/corner{ dir = 4 }, /obj/machinery/duct, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "pk" = ( /obj/machinery/light/directional/west, /obj/machinery/digital_clock/directional/west, @@ -5246,6 +5208,7 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 6 }, +/obj/machinery/biogenerator/medstation/directional/south, /turf/open/floor/iron/terracotta/herringbone, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "pA" = ( @@ -5462,7 +5425,6 @@ "qh" = ( /obj/structure/sign/warning/gas_mask/directional/south, /obj/machinery/light/directional/south, -/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "qi" = ( @@ -5470,8 +5432,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/effect/turf_decal/siding/dark, /obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "qm" = ( /obj/effect/turf_decal/skyrat_decals/syndicate/bottom/right, /obj/effect/turf_decal/siding/thinplating/dark/corner, @@ -5498,13 +5461,6 @@ /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{ - dir = 8 - }, -/turf/open/floor/pod/dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering) "qv" = ( /obj/machinery/power/turbine/inlet_compressor{ dir = 8 @@ -5525,18 +5481,15 @@ dir = 8 }, /obj/machinery/duct, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "qA" = ( /obj/machinery/airalarm/directional/east, /obj/effect/mapping_helpers/airalarm/syndicate_access, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/effect/mob_spawn/ghost_role/human/persistence/syndicate/enginetech{ - dir = 8; - name = "Persistence Engineer" - }, /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/engineering) "qB" = ( @@ -5580,8 +5533,17 @@ "qH" = ( /obj/machinery/bookbinder, /obj/machinery/light/directional/east, +/obj/machinery/vending/donksofttoyvendor{ + density = 0; + pixel_x = 32 + }, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/service/lounge) +"qI" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) "qJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -5621,6 +5583,7 @@ /obj/structure/cable, /obj/machinery/light/directional/east, /obj/machinery/duct, +/obj/machinery/firealarm/directional/east, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) "qO" = ( @@ -5653,7 +5616,7 @@ dir = 10 }, /turf/open/floor/noslip, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "qR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -5692,7 +5655,7 @@ }, /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/engineering) "qV" = ( /obj/structure/weightmachine/weightlifter, /obj/effect/turf_decal/siding{ @@ -5768,6 +5731,7 @@ "re" = ( /obj/machinery/airalarm/directional/north, /obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "rf" = ( @@ -5793,28 +5757,12 @@ /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, -/obj/machinery/light_switch/directional/north, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/item/storage/lunchbox/safetymoth, -/obj/item/storage/lunchbox/safetymoth, -/obj/item/storage/lunchbox/nanotrasen, -/obj/item/storage/lunchbox/nanotrasen, -/obj/item/storage/lunchbox/medical, -/obj/item/storage/lunchbox/medical, -/obj/item/storage/lunchbox/heart, -/obj/item/storage/lunchbox/heart, -/obj/item/storage/lunchbox/corgi, -/obj/item/storage/lunchbox/corgi, -/obj/item/storage/lunchbox/bunny, -/obj/item/storage/lunchbox/bunny, -/obj/item/storage/lunchbox/amongus, -/obj/item/storage/lunchbox/amongus, -/obj/structure/closet/crate/secure/syndicate/wafflecorp{ - name = "Waffle corp. lunch boxes crate" +/obj/machinery/jukebox{ + req_access = list("syndicate"); + anchored = 0 }, -/obj/item/vending_refill/hotdog, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/ruin/space/has_grav/bubbers/persistance/service/freezer) "rk" = ( @@ -5839,12 +5787,6 @@ }, /turf/open/floor/iron/dark/textured_corner, /area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) -"rn" = ( -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ - dir = 9 - }, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "rp" = ( /obj/effect/turf_decal/tile/bar/opposingcorners{ dir = 8 @@ -5957,7 +5899,7 @@ /obj/machinery/door/poddoor{ id = "syndihangerb" }, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "rC" = ( /obj/machinery/mass_driver/trash{ @@ -6016,6 +5958,13 @@ /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/siding/dark/corner, /obj/structure/table/reinforced/plastitaniumglass, +/obj/item/clothing/glasses/sunglasses/reagent, +/obj/item/reagent_containers/cup/rag, +/obj/item/reagent_containers/cup/glass/shaker{ + pixel_x = -6; + pixel_y = -7 + }, +/obj/machinery/duct, /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "rJ" = ( @@ -6047,6 +5996,7 @@ /obj/effect/spawner/random/entertainment/plushie_delux, /obj/item/clothing/suit/jacket/runner/syndicate, /obj/structure/closet/secure_closet/persistence/maa_locker, +/obj/item/radio/headset/syndicateciv/command, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/maa) "rO" = ( @@ -6265,6 +6215,10 @@ /obj/structure/window/reinforced/plasma/spawner/directional/north, /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/engineering/gas) +"ss" = ( +/obj/machinery/duct, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "st" = ( /obj/structure/sign/warning/no_smoking/directional/east, /obj/structure/fans/tiny, @@ -6334,15 +6288,6 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/structure/safe/abovetilefloor, -/obj/item/blueprints/golem{ - name = "Persistence land crawler standard blueprints" - }, -/obj/item/sign/flag/syndicate{ - pixel_x = -3; - pixel_y = 6 - }, -/obj/item/stock_parts/power_store/cell/lead, /turf/open/floor/iron/terracotta/small, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/engineering) "sE" = ( @@ -6397,7 +6342,6 @@ /obj/structure/frame/machine/secured{ anchored = 0 }, -/obj/item/circuitboard/machine/ltsrbt, /obj/structure/fireaxecabinet/energy{ pixel_y = -32 }, @@ -6461,8 +6405,11 @@ dir = 4 }, /obj/structure/table/reinforced/plastitaniumglass, -/obj/item/storage/backpack/duffelbag/deforest_medkit/stocked, -/obj/item/storage/backpack/duffelbag/deforest_surgical/stocked, +/obj/item/storage/box/medipens{ + pixel_x = 4; + pixel_y = 13 + }, +/obj/item/healthanalyzer/advanced, /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/med/treatment) "sV" = ( @@ -6514,6 +6461,66 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) +"ta" = ( +/obj/structure/closet/crate/secure/syndicate/gorlex{ + name = "Gorlex Marauders MREs" + }, +/obj/item/storage/box/hecu_rations{ + pixel_x = 7 + }, +/obj/item/storage/box/hecu_rations{ + pixel_x = 7 + }, +/obj/item/storage/box/hecu_rations{ + pixel_x = 7 + }, +/obj/item/storage/box/hecu_rations{ + pixel_x = 7 + }, +/obj/item/storage/box/hecu_rations{ + pixel_x = 7 + }, +/obj/item/storage/box/hecu_rations{ + pixel_x = 7 + }, +/obj/item/storage/box/hecu_rations{ + pixel_x = 7 + }, +/obj/item/storage/box/hecu_rations{ + pixel_x = 7 + }, +/obj/item/storage/box/hecu_rations{ + pixel_x = 7 + }, +/obj/item/storage/box/hecu_rations{ + pixel_x = 7 + }, +/obj/item/storage/box/hecu_rations{ + pixel_x = 7 + }, +/obj/item/storage/box/hecu_rations{ + pixel_x = 7 + }, +/obj/item/storage/box/hecu_rations{ + pixel_x = 7 + }, +/obj/item/storage/box/hecu_rations{ + pixel_x = 7 + }, +/obj/item/storage/box/hecu_rations{ + pixel_x = 7 + }, +/obj/item/storage/box/hecu_rations{ + pixel_x = 7 + }, +/obj/item/storage/box/hecu_rations{ + pixel_x = 7 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating/elevatorshaft, +/area/ruin/space/has_grav/bubbers/persistance/cargo) "tb" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/cargo/drone) @@ -6564,7 +6571,6 @@ /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 @@ -6594,7 +6600,6 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/structure/sink/kitchen/directional/west, /turf/open/floor/iron/terracotta/herringbone, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "tn" = ( @@ -6649,6 +6654,17 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/sec/armory) +"tu" = ( +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, +/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) "tv" = ( /obj/machinery/vending/autodrobe{ pixel_x = -28; @@ -6683,6 +6699,15 @@ }, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/service/lounge) +"tA" = ( +/obj/structure/cable, +/obj/machinery/airalarm/directional/south, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/machinery/atmospherics/pipe/smart/simple/dark{ + dir = 4 + }, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "tB" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -6737,6 +6762,10 @@ /turf/open/floor/iron/white/diagonal, /area/ruin/space/has_grav/bubbers/persistance/med) "tN" = ( +/obj/effect/mob_spawn/ghost_role/human/persistence/syndicate/enginetech{ + dir = 4; + name = "Persistence Engineer" + }, /turf/open/floor/iron/terracotta/small, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/engineering) "tO" = ( @@ -6797,29 +6826,26 @@ /obj/effect/turf_decal/stripes/red/line{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, +/obj/effect/turf_decal/stripes/red/line, +/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) "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/machinery/chem_dispenser/frontier_appliance, /obj/structure/cable, -/obj/machinery/duct, /obj/effect/turf_decal/siding/dark{ dir = 8 }, +/obj/machinery/coffeemaker, /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "tY" = ( /obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/reagentgrinder{ - pixel_y = 11; - pixel_x = -1 - }, +/obj/structure/cable, +/obj/machinery/light_switch/directional/north, /turf/open/floor/iron/kitchen/diagonal, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "tZ" = ( @@ -6854,6 +6880,7 @@ /obj/effect/turf_decal/stripes/red/line{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "uc" = ( @@ -6937,7 +6964,6 @@ /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "us" = ( /obj/structure/closet/crate/medical, -/obj/item/storage/backpack/duffelbag/syndie/surgery, /obj/structure/window/reinforced/survival_pod/spawner/directional/south, /obj/item/survivalcapsule/chemistry, /obj/machinery/vending/drugs{ @@ -6992,9 +7018,6 @@ /obj/effect/turf_decal/siding/dark/end{ dir = 4 }, -/obj/effect/mob_spawn/ghost_role/human/persistence/syndicate/moraleofficer{ - name = "Persistence Morale Officer" - }, /turf/open/floor/iron/terracotta/diagonal, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/morale) "uz" = ( @@ -7060,14 +7083,6 @@ }, /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) -"uH" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/processor{ - pixel_x = 1; - pixel_y = 10 - }, -/turf/open/floor/iron/kitchen/diagonal, -/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "uI" = ( /obj/machinery/duct, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -7131,11 +7146,15 @@ dir = 1 }, /obj/structure/sink/kitchen/directional/east, -/obj/structure/sign/warning/cold_temp/directional/west, +/obj/machinery/vending/dinnerware{ + density = 0; + all_products_free = 1; + pixel_x = -28 + }, /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "uR" = ( -/obj/machinery/atmospherics/components/trinary/mixer/on/layer2{ +/obj/machinery/atmospherics/components/trinary/mixer/airmix/inverse/layer2{ dir = 1 }, /turf/open/floor/plating/reinforced, @@ -7167,9 +7186,6 @@ "uV" = ( /obj/effect/spawner/random/engineering/tool, /obj/item/t_scanner, -/obj/item/storage/toolbox/syndicate{ - pixel_y = 5 - }, /obj/item/circuitboard/machine/rtg/advanced{ pixel_y = 5 }, @@ -7183,8 +7199,6 @@ pixel_y = 5 }, /obj/item/pointman_broken, -/obj/effect/spawner/random/exotic/antag_gear_weak, -/obj/effect/spawner/random/exotic/antag_gear_weak, /obj/structure/closet/crate/secure/syndicate/mi13, /obj/item/inducer/syndicate, /obj/item/inducer/syndicate, @@ -7327,8 +7341,25 @@ /obj/structure/closet/crate/secure/syndicate/self{ name = "S.E.L.F. access override crate" }, +/obj/item/ai_module/supplied/freeform{ + pixel_y = 11 + }, +/obj/item/ai_module/core/full/persistence{ + pixel_y = 3 + }, +/obj/item/ai_module/reset/purge{ + pixel_y = -5 + }, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/sci/robotics) +"vo" = ( +/obj/structure/plasticflaps, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/structure/cable, +/obj/machinery/duct, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) "vq" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -7347,12 +7378,6 @@ /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 - }, -/turf/open/floor/iron/white, -/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "vu" = ( /obj/structure/window/reinforced/survival_pod/spawner/directional/east, /obj/structure/disposalpipe/trunk{ @@ -7376,8 +7401,16 @@ dir = 5 }, /obj/machinery/duct, +/obj/machinery/vending/engivend{ + skyrat_products = list(/obj/item/clothing/glasses/meson/engine = 5, /obj/item/construction/rcd/loaded = 0, /obj/item/storage/pouch/material = 2, /obj/item/storage/bag/construction = 2); + onstation = 0; + onstation_override = 1; + all_products_free = 1; + pixel_y = 32; + density = 0 + }, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "vz" = ( /obj/machinery/duct, /obj/machinery/light/directional/north, @@ -7409,8 +7442,14 @@ /area/ruin/space/has_grav/bubbers/persistance/service/dorms/maa) "vC" = ( /obj/structure/disposalpipe/segment, -/obj/item/reagent_containers/cup/fish_feed, /obj/structure/table/reinforced/plastitaniumglass, +/obj/item/reagent_containers/cup/maunamug, +/obj/item/lighter/skull, +/obj/item/storage/fancy/cigarettes/cigpack_syndicate{ + pixel_x = 3; + pixel_y = 6 + }, +/obj/machinery/duct, /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "vD" = ( @@ -7510,15 +7549,8 @@ /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/command/liason) "vM" = ( -/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 - }, -/turf/open/floor/mineral/plastitanium/red, +/obj/structure/cable, +/turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "vN" = ( /turf/closed/wall/r_wall/syndicate/cruiser, @@ -7663,22 +7695,18 @@ }, /turf/open/floor/carpet/royalblack, /area/ruin/space/has_grav/bubbers/persistance/sec/prison/rec) -"wj" = ( -/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 +"wk" = ( +/obj/machinery/door/airlock/hatch{ + name = "Turbine Mix"; + id_tag = "syndiship_turbine_lock" }, -/obj/effect/turf_decal/trimline/purple/filled/line, -/obj/structure/noticeboard/directional/south, -/obj/item/paper/crumpled/plap, -/obj/item/paper/crumpled/retired_designs, -/obj/item/paper/crumpled/rbmk2, -/obj/item/paper/requisition, -/obj/item/paper/default_lawset_list, -/turf/open/floor/iron/smooth, -/area/ruin/space/has_grav/bubbers/persistance/sci/rnd) +/obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden, +/turf/open/floor/engine, +/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "wl" = ( /obj/effect/turf_decal/stripes, /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, @@ -7754,7 +7782,25 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/spawner/random/structure/crate, +/obj/structure/closet/crate/secure/syndicate/mi13, +/obj/item/inducer/syndicate, +/obj/item/inducer/syndicate, +/obj/item/inducer/syndicate, +/obj/item/pointman_broken, +/obj/item/circuitboard/machine/rtg/advanced{ + pixel_y = 5 + }, +/obj/item/circuitboard/machine/rtg/advanced{ + pixel_y = 5 + }, +/obj/item/circuitboard/machine/rtg/advanced{ + pixel_y = 5 + }, +/obj/item/circuitboard/machine/rtg/advanced{ + pixel_y = 5 + }, +/obj/item/t_scanner, +/obj/effect/spawner/random/engineering/tool, /turf/open/floor/plating/elevatorshaft, /area/ruin/space/has_grav/bubbers/persistance/cargo) "ww" = ( @@ -7823,7 +7869,6 @@ /turf/open/floor/carpet/stellar, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/cargo) "wF" = ( -/obj/item/reagent_containers/cup/glass/bottle/holywater/hell, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "wG" = ( @@ -7887,6 +7932,9 @@ dir = 1 }, /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/wood/parquet, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "wO" = ( @@ -7898,11 +7946,6 @@ /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 @@ -7977,10 +8020,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/item/circuitboard/machine/sleeper/syndie, /turf/open/floor/carpet/royalblue, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/medical) @@ -8058,7 +8097,7 @@ dir = 9 }, /obj/machinery/incident_display/delam/directional/north, -/obj/machinery/newscaster/directional/west, +/obj/machinery/suit_storage_unit/industrial/bloodredsuit, /turf/open/floor/iron/terracotta/small, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/engineering) "xt" = ( @@ -8070,6 +8109,7 @@ /area/ruin/space/has_grav/bubbers/persistance/cargo) "xu" = ( /obj/structure/table/wood/fancy/red, +/obj/item/reagent_containers/cup/glass/mug/coco, /turf/open/floor/glass/reinforced/plasma, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "xv" = ( @@ -8089,7 +8129,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/plating/reinforced, +/turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/cargo) "xw" = ( /obj/structure/cable, @@ -8173,12 +8213,11 @@ /obj/machinery/door/poddoor{ id = "syndihanger" }, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/catwalk_floor/iron_dark, /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, -/obj/effect/spawner/random/entertainment/plushie, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "xJ" = ( @@ -8206,7 +8245,11 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/service) "xO" = ( -/obj/machinery/mineral/ore_redemption/offstation, +/obj/item/circuitboard/machine/ore_redemption, +/obj/structure/frame/machine/secured{ + anchored = 0 + }, +/obj/item/assembly/igniter, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/cargo) "xP" = ( @@ -8254,6 +8297,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/light_switch/directional/east, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/ruin/space/has_grav/bubbers/persistance/service/freezer) "xV" = ( @@ -8261,7 +8305,7 @@ id = "syndihanger" }, /obj/structure/fans/tiny/forcefield, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) "xY" = ( /obj/machinery/conveyor{ @@ -8354,8 +8398,11 @@ /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "yi" = ( /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/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "yk" = ( /obj/machinery/door/window/survival_pod/left/directional/east{ name = "Slime Euthanization Chamber"; @@ -8451,8 +8498,9 @@ /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, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service) "yE" = ( @@ -8480,6 +8528,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, +/obj/structure/window/reinforced/plasma/spawner/directional/west, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/cargo) "yI" = ( @@ -8511,6 +8560,13 @@ /obj/structure/fireaxecabinet/mechremoval/directional/north, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/sci/robotics) +"yL" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/incinerator_input{ + dir = 8; + chamber_id = "dauntless_turbine" + }, +/turf/open/floor/engine, +/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "yN" = ( /obj/effect/turf_decal/tile/bar/opposingcorners{ dir = 8 @@ -8519,7 +8575,11 @@ /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "yO" = ( -/obj/machinery/deepfryer, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/reagentgrinder, /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "yQ" = ( @@ -8548,10 +8608,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/structure/cable, -/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/machinery/duct, /obj/structure/disposalpipe/segment, /turf/open/floor/catwalk_floor/iron_dark, @@ -8613,10 +8669,6 @@ /obj/effect/turf_decal/siding/dark{ dir = 8 }, -/obj/machinery/jukebox{ - req_access = list("syndicate"); - anchored = 0 - }, /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "ze" = ( @@ -8655,16 +8707,18 @@ /obj/item/bikehorn, /obj/item/bikehorn/rubberducky, /obj/item/reagent_containers/cup/glass/bottle/holywater, +/obj/effect/mob_spawn/ghost_role/human/persistence/syndicate/moraleofficer{ + name = "Persistence Morale Officer" + }, /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, -/obj/structure/cable, /obj/machinery/plumbing/synthesizer/water_synth, /obj/effect/turf_decal/siding/dark, /turf/open/floor/noslip, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "zi" = ( /turf/open/floor/iron/colony/bolts, /area/ruin/space/has_grav/bubbers/persistance/evac) @@ -8733,13 +8787,7 @@ /turf/open/floor/wood/parquet, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "zv" = ( -/obj/machinery/vending/hotdog{ - onstation = 0; - onstation_override = 1; - density = 0; - pixel_x = 30; - all_products_free = 1 - }, +/obj/structure/sign/poster/contraband/moffuchis_pizza/directional/east, /turf/open/floor/iron/stairs, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "zw" = ( @@ -8752,6 +8800,9 @@ /obj/effect/turf_decal/stripes/red/corner{ dir = 4 }, +/obj/effect/turf_decal/stripes/red/corner, +/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) "zx" = ( @@ -8782,28 +8833,15 @@ /area/ruin/space/has_grav/bubbers/persistance/service) "zB" = ( /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, +/obj/machinery/chem_dispenser/frontier_appliance, +/obj/machinery/duct, /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "zC" = ( @@ -8844,8 +8882,11 @@ "zK" = ( /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) +/obj/item/mod/module/rad_protection, +/obj/item/mod/module/rad_protection, +/obj/structure/sign/warning/electric_shock/directional/east, +/turf/open/floor/pod/dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) "zL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -8888,30 +8929,17 @@ /turf/open/floor/plating/elevatorshaft, /area/ruin/space/has_grav/bubbers/persistance/cargo) "zQ" = ( +/obj/structure/cable, /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) "zR" = ( /obj/machinery/light/directional/east, -/obj/item/pickaxe, -/obj/item/grapple_gun, -/obj/item/mining_voucher, -/obj/item/pickaxe, -/obj/item/clothing/glasses/meson/night, -/obj/item/clothing/glasses/meson/night, -/obj/item/tank/internals/emergency_oxygen/double, -/obj/item/tank/internals/emergency_oxygen/double, -/obj/item/storage/belt/mining/vendor, -/obj/item/storage/belt/mining/vendor, -/obj/structure/closet/crate/secure/syndicate/cybersun/dusk{ - name = "Mining gear" - }, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -8921,19 +8949,8 @@ req_access = list("syndicate"); pixel_x = 24 }, -/obj/item/construction/rcd/loaded, -/obj/item/storage/toolbox/syndicate{ - pixel_y = 5 - }, -/obj/item/mining_voucher, -/obj/item/suit_voucher, /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/cargo) -"zS" = ( -/obj/structure/flora/bush/flowers_pp/style_random, -/obj/structure/plant_tank, -/turf/open/floor/grass, -/area/ruin/space/has_grav/bubbers/persistance/service/hydro) "zT" = ( /obj/effect/turf_decal/skyrat_decals/syndicate/bottom/middle, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -8948,7 +8965,6 @@ dir = 1 }, /obj/machinery/disposal/bin, -/obj/structure/noticeboard/directional/south, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/engineering/mining) "zW" = ( @@ -8977,10 +8993,6 @@ dir = 8 }, /area/ruin/space/has_grav/bubbers/persistance/service/gym) -"zY" = ( -/obj/structure/plant_tank, -/turf/open/floor/grass, -/area/ruin/space/has_grav/bubbers/persistance/service/hydro) "Aa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -9023,6 +9035,13 @@ /area/ruin/space/has_grav/bubbers/persistance/sec/prison/rec) "Ai" = ( /obj/machinery/food_cart, +/obj/machinery/vending/wardrobe/chef_wardrobe{ + density = 0; + onstation = 0; + onstation_override = 1; + all_products_free = 1; + pixel_y = 28 + }, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/ruin/space/has_grav/bubbers/persistance/service/freezer) "Ak" = ( @@ -9055,14 +9074,6 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) -"An" = ( -/obj/item/folded_navigation_gigabeacon, -/obj/item/stock_parts/power_store/cell/lead, -/obj/item/stock_parts/power_store/cell/lead, -/obj/structure/closet/crate/secure/syndicate/mi13, -/obj/item/stock_parts/power_store/cell/lead, -/turf/open/floor/plating/elevatorshaft, -/area/ruin/space/has_grav/bubbers/persistance/cargo) "Ao" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 @@ -9105,7 +9116,7 @@ /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, +/turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/evac) "AB" = ( /obj/effect/turf_decal/siding/dark/corner{ @@ -9159,9 +9170,9 @@ /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/item/radio/headset/syndicateciv/staff, +/obj/item/radio/headset/syndicateciv/staff, +/obj/item/radio/headset/syndicateciv/staff, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/light_switch/directional/north, @@ -9204,13 +9215,6 @@ "AQ" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) -"AR" = ( -/obj/machinery/atmospherics/components/trinary/mixer{ - dir = 8 - }, -/obj/machinery/light/directional/west, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "AS" = ( /obj/structure/cable, /obj/machinery/duct, @@ -9228,8 +9232,12 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 10 }, -/obj/machinery/biogenerator/organic_printer, /obj/machinery/light/directional/south, +/obj/structure/rack, +/obj/item/construction/plumbing, +/obj/item/storage/toolbox/syndicate{ + pixel_y = 5 + }, /turf/open/floor/iron/terracotta/herringbone, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "AU" = ( @@ -9254,12 +9262,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/engineering) -"AZ" = ( -/obj/effect/turf_decal/stripes/red/line{ - dir = 8 - }, -/turf/open/floor/pod/dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering) "Ba" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/structure/cable, @@ -9290,19 +9292,25 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/item/vending_refill/donksoft, +/obj/item/folded_navigation_gigabeacon, /turf/open/floor/plating/elevatorshaft, /area/ruin/space/has_grav/bubbers/persistance/cargo) "Bd" = ( /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/machinery/duct, /obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/airlock/engineering/glass{ + name = "Engineering Bay" + }, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "dauntless-engi" + }, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) "Bf" = ( @@ -9319,6 +9327,9 @@ /obj/structure/cable, /turf/open/floor/plating, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/medical) +"Bi" = ( +/turf/closed/wall/r_wall/syndicate/nodiagonal, +/area/ruin/space/has_grav/bubbers/persistance/med/chem) "Bj" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -9455,63 +9466,6 @@ /obj/effect/mapping_helpers/apc/full_charge, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/sec/armory) -"Bx" = ( -/obj/structure/closet/crate/secure/syndicate/gorlex{ - name = "Gorlex Marauders MREs" - }, -/obj/item/storage/box/hecu_rations{ - pixel_x = 7 - }, -/obj/item/storage/box/hecu_rations{ - pixel_x = 7 - }, -/obj/item/storage/box/hecu_rations{ - pixel_x = 7 - }, -/obj/item/storage/box/hecu_rations{ - pixel_x = 7 - }, -/obj/item/storage/box/hecu_rations{ - pixel_x = 7 - }, -/obj/item/storage/box/hecu_rations{ - pixel_x = 7 - }, -/obj/item/storage/box/hecu_rations{ - pixel_x = 7 - }, -/obj/item/storage/box/hecu_rations{ - pixel_x = 7 - }, -/obj/item/storage/box/hecu_rations{ - pixel_x = 7 - }, -/obj/item/storage/box/hecu_rations{ - pixel_x = 7 - }, -/obj/item/storage/box/hecu_rations{ - pixel_x = 7 - }, -/obj/item/storage/box/hecu_rations{ - pixel_x = 7 - }, -/obj/item/storage/box/hecu_rations{ - pixel_x = 7 - }, -/obj/item/storage/box/hecu_rations{ - pixel_x = 7 - }, -/obj/item/storage/box/hecu_rations{ - pixel_x = 7 - }, -/obj/item/storage/box/hecu_rations{ - pixel_x = 7 - }, -/obj/item/storage/box/hecu_rations{ - pixel_x = 7 - }, -/turf/open/floor/plating/elevatorshaft, -/area/ruin/space/has_grav/bubbers/persistance/cargo) "By" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -9571,10 +9525,10 @@ /obj/machinery/cryopod{ dir = 4 }, -/obj/machinery/computer/cryopod/interdyne/directional/west, /obj/effect/turf_decal/siding/wood{ dir = 9 }, +/obj/machinery/computer/cryopod/cybersun/directional/west, /turf/open/floor/wood, /area/ruin/space/has_grav/bubbers/persistance/service/lockers) "BJ" = ( @@ -9688,6 +9642,16 @@ /obj/machinery/light/directional/east, /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/engineering/gas) +"Cf" = ( +/obj/effect/turf_decal/stripes/red/line, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/pod/dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) "Ci" = ( /obj/machinery/airalarm/directional/north, /obj/effect/mapping_helpers/airalarm/syndicate_access, @@ -9696,12 +9660,6 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) -"Cj" = ( -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ - dir = 6 - }, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "Ck" = ( /obj/item/mail/junkmail, /obj/item/mail/junkmail, @@ -9763,6 +9721,16 @@ /obj/effect/mapping_helpers/apc/cut_AI_wire, /turf/open/floor/iron/kitchen/herringbone, /area/ruin/space/has_grav/bubbers/persistance/service/salon) +"Cp" = ( +/obj/structure/table, +/obj/item/storage/toolbox/syndicate{ + pixel_y = 5 + }, +/obj/item/pipe_dispenser{ + pixel_x = -3 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/bubbers/persistance/engineering/mining) "Cr" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/service/janitorial) @@ -9803,14 +9771,7 @@ /area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) "Cy" = ( /obj/structure/table/reinforced/plastitaniumglass, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_y = 9; - pixel_x = 11 - }, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_y = 15; - pixel_x = 11 - }, +/obj/structure/cable, /turf/open/floor/iron/kitchen/diagonal, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "Cz" = ( @@ -9988,10 +9949,7 @@ /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, @@ -10015,6 +9973,7 @@ /obj/effect/turf_decal/siding/dark{ dir = 10 }, +/obj/structure/sink/kitchen/directional/east, /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "CX" = ( @@ -10053,6 +10012,16 @@ /area/ruin/space/has_grav/bubbers/persistance/sci/ordnance) "Dc" = ( /obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/button/door{ + id = "syndibridge_w"; + name = "Bridge Window Shutters"; + req_access = list("syndicate_leader"); + pixel_x = -24 + }, +/obj/item/stamp/chameleon, +/obj/item/stamp/persistence{ + pixel_x = 9 + }, /turf/open/floor/mineral/plastitanium/red{ icon_state = "plastitanium" }, @@ -10162,6 +10131,13 @@ "Ds" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/med/chem) +"Dt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/structure/cable, +/obj/machinery/cell_charger_multi/wall_mounted/directional/north, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service/hydro) "Du" = ( /obj/effect/turf_decal/skyrat_decals/syndicate/top/left, /turf/open/floor/mineral/plastitanium/red, @@ -10172,6 +10148,28 @@ }, /turf/open/floor/iron/white/diagonal, /area/ruin/space/has_grav/bubbers/persistance/med) +"Dw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/closet/crate/secure/syndicate/cybersun/dusk{ + name = "Mining gear" + }, +/obj/item/suit_voucher, +/obj/item/mining_voucher, +/obj/item/construction/rcd/loaded, +/obj/item/storage/belt/mining/vendor, +/obj/item/storage/belt/mining/vendor, +/obj/item/tank/internals/emergency_oxygen/double, +/obj/item/tank/internals/emergency_oxygen/double, +/obj/item/clothing/glasses/meson/night, +/obj/item/clothing/glasses/meson/night, +/obj/item/mining_voucher, +/obj/item/pickaxe, +/obj/item/grapple_gun, +/obj/item/pickaxe, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/cargo) "Dx" = ( /obj/machinery/door/poddoor{ id = "turbine_vent" @@ -10302,7 +10300,6 @@ 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; @@ -10466,6 +10463,14 @@ "Ei" = ( /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) +"Ej" = ( +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/obj/structure/cable, +/obj/machinery/door/poddoor{ + id = "syndikitchen_int" + }, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "Ek" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/effect/turf_decal/siding/dark{ @@ -10483,6 +10488,9 @@ }, /obj/machinery/disposal/bin, /obj/machinery/digital_clock/directional/east, +/obj/structure/closet/emcloset/wall{ + pixel_y = 32 + }, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service) "Es" = ( @@ -10530,6 +10538,20 @@ /obj/machinery/iv_drip, /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/med/treatment) +"EB" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/obj/structure/closet/secure_closet/interdynefob/electrical_supplies, +/obj/item/stock_parts/power_store/battery/high, +/obj/item/stock_parts/power_store/battery/high, +/obj/item/stock_parts/power_store/battery/high, +/obj/item/stock_parts/power_store/battery/high, +/obj/item/stock_parts/power_store/battery/high, +/obj/item/stock_parts/power_store/battery/high, +/obj/item/rwd/loaded, +/turf/open/floor/noslip, +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "EC" = ( /obj/item/reagent_containers/condiment/vinegar{ pixel_x = -3; @@ -10575,6 +10597,7 @@ /obj/effect/mapping_helpers/apc/cut_AI_wire, /obj/effect/mapping_helpers/apc/full_charge, /obj/structure/closet/crate/freezer/donk, +/obj/structure/cargo_shelf, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/ruin/space/has_grav/bubbers/persistance/service/freezer) "ED" = ( @@ -10597,18 +10620,6 @@ icon_state = "plastitanium" }, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) -"EF" = ( -/obj/machinery/door/airlock/hatch{ - name = "Turbine Mix"; - id_tag = "syndiship_turbine_lock" - }, -/obj/structure/fans/tiny, -/obj/effect/mapping_helpers/airlock/locked, -/obj/effect/mapping_helpers/airlock/cutaiwire, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, -/obj/machinery/atmospherics/pipe/layer_manifold, -/turf/open/floor/engine, -/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "EJ" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/item/market_uplink/blackmarket, @@ -10728,6 +10739,7 @@ /obj/effect/turf_decal/siding/dark{ dir = 8 }, +/obj/machinery/light/directional/south, /turf/open/floor/iron/white/small, /area/ruin/space/has_grav/bubbers/persistance/service/lockers) "EX" = ( @@ -10844,13 +10856,9 @@ /area/ruin/space/has_grav/bubbers/persistance/med/treatment) "Fi" = ( /obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/vending/dinnerware{ - density = 0; - all_products_free = 1; - pixel_x = 28 - }, /obj/machinery/light/directional/south, /obj/item/storage/box/gum/happiness, +/obj/structure/sign/poster/contraband/blasto_detergent/directional/east, /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "Fj" = ( @@ -11094,8 +11102,8 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/cargo) "FT" = ( -/obj/structure/frame/machine/secured, /obj/item/circuitboard/machine/stacking_machine, +/obj/structure/frame/machine, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/engineering/mining) "FU" = ( @@ -11137,6 +11145,16 @@ /obj/machinery/netpod, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) +"Gc" = ( +/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/duct, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "Ge" = ( /obj/structure/window/reinforced/survival_pod/spawner/directional/south, /obj/structure/window/reinforced/survival_pod/spawner/directional/west, @@ -11162,7 +11180,6 @@ /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) "Gk" = ( @@ -11207,16 +11224,16 @@ /area/ruin/space/has_grav/bubbers/persistance/service/dorms/brig) "Go" = ( /obj/structure/table/reinforced/plastitaniumglass, -/obj/item/cutting_board, /obj/machinery/duct, -/obj/item/kitchen/rollingpin{ - pixel_x = -9; - pixel_y = 4 - }, +/obj/item/cutting_board, /obj/item/knife{ pixel_y = 3; pixel_x = 6 }, +/obj/item/kitchen/rollingpin/illegal{ + pixel_x = -9; + pixel_y = 4 + }, /turf/open/floor/iron/kitchen/diagonal, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "Gr" = ( @@ -11298,7 +11315,7 @@ mapping_id = "dauntless_turbine"; dir = 4 }, -/turf/open/floor/catwalk_floor/titanium, +/turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "GE" = ( /obj/structure/disposalpipe/junction/flip{ @@ -11373,6 +11390,16 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) +"GO" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/binary/pump/off/general/visible/layer2{ + dir = 1 + }, +/turf/open/floor/pod/dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) "GP" = ( /obj/structure/bed/double/pod, /obj/effect/spawner/random/bedsheet/any/double, @@ -11443,18 +11470,6 @@ /obj/item/stack/sheet/mineral/wood/fifty, /turf/open/floor/iron/terracotta/small, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/engineering) -"GZ" = ( -/obj/structure/sign/poster/contraband/moffuchis_pizza/directional/east, -/obj/structure/chair/comfy/carp, -/turf/open/floor/glass/reinforced/plasma, -/area/ruin/space/has_grav/bubbers/persistance/service/diner) -"Ha" = ( -/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/machinery/conveyor{ id = "syndirecycle"; @@ -11514,37 +11529,24 @@ /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/structure/noticeboard/directional/north, -/obj/structure/table/reinforced/plastitaniumglass, -/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/structure/sign/poster/contraband/hacking_guide/directional/south, +/obj/effect/turf_decal/siding/dark{ + dir = 9 }, -/obj/machinery/light/directional/south, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/turf/open/floor/mineral/plastitanium/red, +/obj/machinery/rnd/server/interdyne, +/turf/open/floor/noslip, /area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "Hr" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/machinery/light/directional/north, -/obj/machinery/light_switch/directional/north, +/obj/item/pestle, +/obj/item/reagent_containers/cup/mortar, +/obj/machinery/power/apc/auto_name/directional/north, +/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, /turf/open/floor/iron/kitchen/diagonal, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "Hs" = ( @@ -11591,7 +11593,7 @@ id = "syndicargo"; name = "Docking Port Blast Doors" }, -/turf/open/floor/plating/reinforced, +/turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/cargo) "Hy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -11626,6 +11628,7 @@ req_access = list("syndicate_leader"); pixel_x = -24 }, +/obj/machinery/duct, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) "HC" = ( @@ -11660,7 +11663,7 @@ /obj/machinery/mineral/stacking_unit_console{ pixel_x = -32 }, -/turf/open/floor/plating/reinforced, +/turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/cargo) "HG" = ( /obj/structure/flora/bush/flowers_br/style_random, @@ -11760,10 +11763,11 @@ /area/ruin/space/has_grav/bubbers/persistance/service/freezer) "Ic" = ( /obj/structure/disposalpipe/segment, -/obj/structure/sign/departments/telecomms/alt/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/turf/open/floor/pod/dark, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "If" = ( /obj/structure/cable, @@ -11829,6 +11833,11 @@ /area/ruin/space/has_grav/bubbers/persistance/cargo) "Ip" = ( /obj/structure/safe/abovetilefloor, +/obj/item/encryptionkey/headset_syndicate/interdyne, +/obj/item/encryptionkey/headset_syndicate/interdyne, +/obj/item/encryptionkey/headset_syndicate/interdyne, +/obj/item/encryptionkey/headset_syndicate/interdyne, +/obj/item/encryptionkey/headset_syndicate/interdyne, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/maa) "Iq" = ( @@ -11844,10 +11853,6 @@ /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/cargo) "Is" = ( -/obj/item/storage/box/medipens{ - pixel_x = 4; - pixel_y = 13 - }, /obj/machinery/light/directional/west, /obj/machinery/stasis{ dir = 1 @@ -11895,8 +11900,14 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/item/folder/syndicate/red, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/command/liason) +"Iw" = ( +/obj/structure/sign/departments/telecomms/alt/directional/east, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) "Iz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/camera/autoname/directional/east{ @@ -11978,7 +11989,6 @@ /obj/structure/table/wood/fancy/red, /obj/effect/spawner/random/food_or_drink/dinner, /obj/machinery/light/dim/directional/east, -/obj/item/reagent_containers/cup/glass/mug, /turf/open/floor/glass/reinforced/plasma, /area/ruin/space/has_grav/bubbers/persistance/service/diner) "IM" = ( @@ -12010,8 +12020,6 @@ /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" = ( @@ -12053,6 +12061,7 @@ /obj/structure/cable, /obj/structure/extinguisher_cabinet/directional/north, /obj/machinery/power/energy_accumulator/grounding_rod/anchored, +/obj/machinery/light/cold/directional/north, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "IU" = ( @@ -12084,19 +12093,6 @@ /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" = ( @@ -12112,7 +12108,7 @@ dir = 5 }, /turf/open/floor/noslip, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "IZ" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/persistance/service/janitorial) @@ -12168,15 +12164,8 @@ /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) "Jl" = ( -/obj/structure/closet/secure_closet/interdynefob/electrical_supplies, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/item/stock_parts/power_store/battery/high, -/obj/item/stock_parts/power_store/battery/high, -/obj/item/stock_parts/power_store/battery/high, -/obj/item/stock_parts/power_store/battery/high, -/obj/item/stock_parts/power_store/battery/high, -/obj/item/stock_parts/power_store/battery/high, /obj/machinery/button/door/directional/west{ id = "rad_shutters"; name = "Radiation Shutters"; @@ -12233,7 +12222,7 @@ id = "syndicargo"; name = "Docking Port Blast Doors" }, -/turf/open/floor/plating/reinforced, +/turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/cargo) "Js" = ( /obj/effect/turf_decal/siding/thinplating/dark/corner, @@ -12241,7 +12230,7 @@ /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "Jt" = ( /obj/machinery/light/cold/directional/north, -/obj/structure/reagent_dispensers/watertank, +/obj/machinery/power/portagrav, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "Jv" = ( @@ -12299,9 +12288,6 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 2 }, -/obj/structure/closet/crate/secure/gear{ - name = "Persistence materials" - }, /obj/item/stack/sheet/mineral/plasma{ amount = 10 }, @@ -12337,6 +12323,7 @@ pixel_y = 2 }, /obj/structure/sign/poster/official/science/directional/south, +/obj/structure/closet/crate/secure/syndicate/cybersun, /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/rnd) "JE" = ( @@ -12414,6 +12401,10 @@ /obj/item/statuebust/hippocratic/evil, /obj/machinery/digital_clock/directional/north, /obj/structure/cable, +/obj/item/storage/box/pinpointer_pairs{ + pixel_x = -4; + pixel_y = 6 + }, /turf/open/floor/wood/large, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/medical) "JN" = ( @@ -12451,6 +12442,9 @@ dir = 4 }, /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/wood/parquet, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "JW" = ( @@ -12486,21 +12480,18 @@ /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/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 = "Onboard Water Plant" }, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "Kb" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/persistance/engineering) @@ -12513,7 +12504,6 @@ /area/ruin/space/has_grav/bubbers/persistance/command/vault) "Kf" = ( /obj/machinery/light/directional/south, -/obj/structure/tank_dispenser, /obj/effect/turf_decal/stripes/red/line{ dir = 1 }, @@ -12521,9 +12511,11 @@ /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "Kh" = ( +/obj/machinery/airalarm/directional/north, /obj/structure/cable, -/obj/machinery/power/smes/connector, -/obj/machinery/power/smesbank/super/full, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/machinery/power/smes/full, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "Kj" = ( @@ -12581,18 +12573,18 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "Kv" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Engineering Bay" - }, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, -/obj/effect/mapping_helpers/airlock/cutaiwire, /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, +/obj/effect/turf_decal/stripes/red/corner{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, +/turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "Kz" = ( /obj/effect/turf_decal/stripes/line{ @@ -12628,14 +12620,13 @@ "KH" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/machinery/light/directional/east, -/obj/machinery/vending/wardrobe/chef_wardrobe{ - pixel_x = 28; - density = 0; - onstation = 0; - onstation_override = 1; - all_products_free = 1 - }, /obj/item/food/cake/birthday/energy, +/obj/machinery/button/door/directional/north{ + id = "syndikitchen_int"; + name = "Kitchen Shutters"; + pixel_y = 0; + pixel_x = 24 + }, /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "KJ" = ( @@ -12692,9 +12683,6 @@ /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, -/obj/item/mod/module/rad_protection, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/button/door/directional/west{ @@ -12813,10 +12801,28 @@ /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "Ls" = ( -/obj/structure/cargo_shelf, /obj/machinery/airalarm/directional/north, /obj/effect/mapping_helpers/airalarm/syndicate_access, /obj/effect/mapping_helpers/airalarm/tlv_cold_room, +/obj/structure/closet/crate/secure/syndicate/wafflecorp{ + name = "Waffle corp. lunch boxes crate" + }, +/obj/item/clothing/head/utility/chefhat, +/obj/item/storage/belt/military/snack, +/obj/item/vending_refill/hotdog, +/obj/item/storage/lunchbox/amongus, +/obj/item/storage/lunchbox/amongus, +/obj/item/storage/lunchbox/bunny, +/obj/item/storage/lunchbox/bunny, +/obj/item/storage/lunchbox/corgi, +/obj/item/storage/lunchbox/corgi, +/obj/item/storage/lunchbox/heart, +/obj/item/storage/lunchbox/heart, +/obj/item/storage/lunchbox/medical, +/obj/item/storage/lunchbox/medical, +/obj/item/storage/lunchbox/safetymoth, +/obj/item/storage/lunchbox/safetymoth, +/obj/item/vending_refill/hotdog, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/ruin/space/has_grav/bubbers/persistance/service/freezer) "Lt" = ( @@ -12849,9 +12855,13 @@ /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, +/obj/machinery/firealarm/directional/east, +/obj/structure/closet/firecloset/wall{ + pixel_x = -32 + }, +/obj/machinery/light/directional/east, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) "LF" = ( @@ -12905,19 +12915,18 @@ /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/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/engineering) "LP" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/fishing_portal_generator, -/obj/item/storage/toolbox/fishing, /obj/machinery/airalarm/directional/south, /obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/kitchen/spoon/soup_ladle, +/obj/item/kitchen/tongs, /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "LT" = ( @@ -12936,6 +12945,8 @@ /obj/effect/turf_decal/stripes/red/corner{ dir = 1 }, +/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) "LV" = ( @@ -12948,6 +12959,14 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/wood/tile, /area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) +"LW" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/obj/structure/flatpack_cart, +/turf/open/floor/pod/dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) "LY" = ( /obj/effect/turf_decal/siding/dark, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -13001,7 +13020,6 @@ /area/ruin/space/has_grav/bubbers/persistance/service) "Md" = ( /obj/machinery/suit_storage_unit/industrial/moraleofficer, -/obj/machinery/light/directional/south, /turf/open/floor/carpet/donk, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/morale) "Me" = ( @@ -13102,6 +13120,16 @@ /obj/item/storage/box/disks_plantgene, /turf/open/floor/grass, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) +"Mv" = ( +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/pod/dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) "My" = ( /turf/open/floor/grass, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) @@ -13135,6 +13163,13 @@ /obj/effect/mapping_helpers/airalarm/syndicate_access, /turf/open/floor/wood, /area/ruin/space/has_grav/bubbers/persistance/service/gym) +"MD" = ( +/obj/machinery/computer/order_console/mining/interdyne, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/bubbers/persistance/service/dorms/medical) "ME" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -13205,6 +13240,7 @@ /obj/item/construction/rcd/ce, /obj/item/pipe_dispenser/bluespace, /obj/item/rcd_upgrade/frames, +/obj/item/rpd_upgrade/unwrench, /turf/open/floor/iron/terracotta/small, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/engineering) "MR" = ( @@ -13234,18 +13270,31 @@ }, /turf/open/floor/engine, /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) +"MV" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/effect/spawner/random/food_or_drink/donkpockets, +/obj/structure/cable, +/turf/open/floor/iron/kitchen/diagonal, +/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "MW" = ( -/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, +/obj/structure/closet/secure_closet/ds2atmos{ + anchorable = 0; + anchored = 1 + }, +/obj/item/analyzer{ + pixel_y = 10 + }, +/obj/item/holosign_creator/atmos, +/obj/item/mod/module/visor/meson{ + pixel_y = -9 + }, /turf/open/floor/noslip, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "MY" = ( /obj/machinery/duct, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -13281,11 +13330,11 @@ /area/ruin/space/has_grav/bubbers/persistance/service/dorms/chef) "Nb" = ( /obj/structure/cable, -/obj/machinery/power/smes/full, -/obj/effect/mapping_helpers/apc/syndicate_access, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/effect/mapping_helpers/apc/cut_AI_wire, -/obj/effect/mapping_helpers/apc/full_charge, +/obj/machinery/power/smes/connector, +/obj/machinery/power/smesbank/super/full, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/duct, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "Nc" = ( @@ -13327,16 +13376,7 @@ /turf/open/floor/iron/terracotta/herringbone, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "Nf" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/storage/box/gas_miner_beacons/syndicate{ - pixel_x = 7; - pixel_y = -4 - }, -/obj/item/storage/box/gas_miner_beacons/syndicate{ - pixel_x = -7; - pixel_y = -4 - }, -/obj/item/rwd/loaded, +/obj/structure/reagent_dispensers/watertank/high, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "Ni" = ( @@ -13390,6 +13430,7 @@ /obj/structure/extinguisher_cabinet/directional/north, /obj/item/encryptionkey/syndicate, /obj/item/clothing/suit/jacket/runner/syndicate, +/obj/item/radio/headset/syndicateciv/command, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "Nq" = ( @@ -13443,6 +13484,7 @@ dir = 2; icon_state = "siding_plain_end" }, +/obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "NC" = ( @@ -13505,9 +13547,8 @@ dir = 6 }, /obj/machinery/duct, -/obj/machinery/portable_atmospherics/canister/water_vapor, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "NQ" = ( /obj/structure/fans/tiny, /obj/machinery/light/cold/directional/east, @@ -13592,8 +13633,6 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/effect/spawner/random/exotic/languagebook, -/obj/effect/spawner/random/exotic/languagebook, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/service/lounge) "Od" = ( @@ -13621,7 +13660,8 @@ dir = 4 }, /obj/structure/hoop{ - dir = 8 + dir = 8; + density = 0 }, /turf/open/floor/wood, /area/ruin/space/has_grav/bubbers/persistance/service/gym) @@ -13648,7 +13688,7 @@ /area/ruin/space/has_grav/bubbers/persistance/service/sauna) "Oo" = ( /obj/structure/table/reinforced/plastitaniumglass, -/obj/structure/reagent_dispensers/servingdish, +/obj/item/reagent_containers/condiment/donksauce, /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "Op" = ( @@ -13678,7 +13718,6 @@ /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) "Ov" = ( @@ -13832,7 +13871,7 @@ /obj/machinery/cryopod{ dir = 2 }, -/obj/machinery/computer/cryopod/interdyne/directional/north, +/obj/machinery/computer/cryopod/cybersun/directional/north, /turf/open/floor/iron/white/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "OR" = ( @@ -13850,19 +13889,18 @@ name = "Robotics Airlock"; req_access = list("syndicate") }, -/obj/item/ai_module/reset/purge{ - pixel_y = -5 - }, -/obj/item/ai_module/supplied/freeform{ - pixel_y = 11 - }, -/obj/item/ai_module/core/full/persistence{ - pixel_y = 3 - }, /obj/machinery/digital_clock/directional/south, -/obj/structure/closet/crate/secure/syndicate/self{ - name = "A.I. law Storage" - }, +/obj/structure/closet/crate/robust, +/obj/effect/spawner/random/mod/maint, +/obj/effect/spawner/random/mod/maint, +/obj/effect/spawner/random/mod/maint, +/obj/effect/spawner/random/mod/maint, +/obj/effect/spawner/random/mod/maint, +/obj/item/mod/module/jump_jet, +/obj/item/mod/module/jump_jet, +/obj/item/mod/module/jump_jet, +/obj/item/mod/module/jump_jet, +/obj/item/mod/module/jump_jet, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/sci/robotics) "OT" = ( @@ -13918,7 +13956,7 @@ /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "Pc" = ( /obj/structure/table, -/obj/item/storage/bag/xenoarch, +/obj/item/survivalcapsule/fan, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/engineering/mining) "Pd" = ( @@ -14012,16 +14050,18 @@ /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) +"Py" = ( +/obj/machinery/light/directional/south, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/turf/open/floor/pod/dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) "Pz" = ( /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) @@ -14130,6 +14170,7 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/med) "PR" = ( +/obj/machinery/light/directional/east, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/cargo/drone) "PS" = ( @@ -14155,7 +14196,8 @@ dir = 8 }, /obj/structure/hoop{ - dir = 4 + dir = 4; + density = 0 }, /turf/open/floor/wood, /area/ruin/space/has_grav/bubbers/persistance/service/gym) @@ -14238,13 +14280,7 @@ 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 - }, -/turf/closed/wall/r_wall/syndicate/nodiagonal, +/turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "Qc" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal, @@ -14256,20 +14292,18 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service) "Qh" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/door/firedoor/heavy, /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /obj/effect/mapping_helpers/airlock/cutaiwire, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance/glass{ name = "Emergency Escape" }, -/turf/open/floor/plating/reinforced, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/cargo) +"Qj" = ( +/obj/machinery/light/directional/west, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "Qk" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, @@ -14387,6 +14421,10 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service) "QD" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "QE" = ( @@ -14458,6 +14496,9 @@ dir = 1 }, /obj/machinery/biogenerator/medstation/directional/west, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "QK" = ( @@ -14529,7 +14570,6 @@ /obj/machinery/door/firedoor/heavy, /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /obj/effect/mapping_helpers/airlock/cutaiwire, -/obj/machinery/duct, /obj/machinery/door/airlock/mining, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/evac) @@ -14550,6 +14590,14 @@ }, /turf/open/floor/carpet/donk, /area/ruin/space/has_grav/bubbers/persistance/service) +"QZ" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 9 + }, +/obj/effect/turf_decal/siding/dark, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/iron/white/diagonal, +/area/ruin/space/has_grav/bubbers/persistance/med) "Ra" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 4 @@ -14559,6 +14607,10 @@ "Rc" = ( /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/sci/robotics) +"Rd" = ( +/obj/machinery/door/firedoor/heavy, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "Re" = ( /obj/structure/disposalpipe/segment, /obj/machinery/power/apc/auto_name/directional/east, @@ -14569,11 +14621,12 @@ /turf/open/floor/iron/colony/bolts, /area/ruin/space/has_grav/bubbers/persistance/evac) "Rf" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/siding/dark{ + dir = 1 }, -/obj/machinery/rnd/server/interdyne, -/turf/open/floor/mineral/plastitanium/red, +/obj/machinery/ntnet_relay, +/turf/open/floor/noslip, /area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "Rg" = ( /obj/effect/turf_decal/siding/dark, @@ -14600,8 +14653,9 @@ dir = 9 }, /obj/machinery/duct, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "Rk" = ( /obj/structure/emergency_shield/cult/weak{ name = "Energy Shield" @@ -14652,6 +14706,8 @@ dir = 1 }, /obj/effect/turf_decal/stripes/red/line, +/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) "Rs" = ( @@ -14677,10 +14733,6 @@ /obj/structure/frame/machine/secured, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/evac) -"Rz" = ( -/obj/structure/cable, -/turf/open/floor/pod/dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering) "RA" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/west, @@ -14734,6 +14786,11 @@ "RG" = ( /obj/machinery/airalarm/directional/east, /obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/machinery/vending/hotdog{ + onstation = 0; + onstation_override = 1; + all_products_free = 1 + }, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service) "RH" = ( @@ -14858,6 +14915,13 @@ "Sa" = ( /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/engineering/mining) +"Sb" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/structure/plasticflaps, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "Sc" = ( /obj/effect/turf_decal/siding/dark{ dir = 6 @@ -14962,6 +15026,15 @@ /obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/cargo) +"Su" = ( +/obj/structure/cable, +/obj/machinery/door/firedoor/heavy, +/obj/structure/sign/warning/fire/directional/south, +/obj/machinery/atmospherics/pipe/smart/simple/dark{ + dir = 4 + }, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "Sv" = ( /obj/structure/window/reinforced/tinted/frosted/spawner/directional/south{ opacity = 1 @@ -14973,20 +15046,22 @@ /turf/open/floor/iron/white/small, /area/ruin/space/has_grav/bubbers/persistance/service/lockers) "Sw" = ( -/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 }, -/obj/machinery/duct, +/obj/machinery/light_switch/directional/north, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "Sx" = ( -/obj/structure/reagent_dispensers/water_cooler, +/obj/machinery/vending/donksnack{ + onstation = 0; + onstation_override = 1; + all_products_free = 1 + }, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service) "Sy" = ( @@ -15051,25 +15126,18 @@ dir = 9 }, /turf/open/floor/noslip, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "SG" = ( -/obj/machinery/button/door/directional/west{ - pixel_y = -8; - specialfunctions = 4; - name = "Dorm Bolt Switch"; - id = "syndishipcomms"; - req_access = list("syndicate"); - normaldoorcontrol = 1 +/obj/effect/turf_decal/siding/dark{ + dir = 2; + icon_state = "siding_plain_end" }, /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) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "SH" = ( /obj/structure/closet/generic/wall{ pixel_x = 32 @@ -15123,6 +15191,18 @@ "SN" = ( /turf/open/floor/glass/reinforced/plasma, /area/ruin/space/has_grav/bubbers/persistance/service/diner) +"SO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/dark{ + dir = 5 + }, +/turf/open/floor/engine, +/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) +"SR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/plasticflaps, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/engineering) "SS" = ( /obj/structure/chair/comfy/carp{ dir = 1 @@ -15155,6 +15235,12 @@ }, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/command/vault) +"SW" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/engineering) "SZ" = ( /turf/closed/wall/r_wall/syndicate/cruiser, /area/ruin/space/has_grav/bubbers/persistance/sci/ordnance) @@ -15217,6 +15303,13 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) +"Tk" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/simple/dark{ + dir = 6 + }, +/turf/open/floor/plating/reinforced, +/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "Tl" = ( /obj/machinery/porta_turret/syndicate{ dir = 8; @@ -15240,7 +15333,7 @@ /area/ruin/space/has_grav/bubbers/persistance/sec/prison/rec) "To" = ( /obj/machinery/airalarm/directional/west, -/turf/closed/wall/r_wall/syndicate/cruiser, +/turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/persistance/med) "Tr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -15275,6 +15368,9 @@ /obj/structure/chair/comfy/carp{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/wood/parquet, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "Tv" = ( @@ -15309,7 +15405,15 @@ /area/ruin/space/has_grav/bubbers/persistance/service/sauna) "TA" = ( /obj/structure/table/reinforced/plastitaniumglass, -/obj/effect/spawner/random/food_or_drink/donkpockets, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_y = 9; + pixel_x = 11 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_y = 15; + pixel_x = 11 + }, +/obj/item/clothing/head/utility/chefhat, /turf/open/floor/iron/kitchen/diagonal, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "TB" = ( @@ -15470,7 +15574,9 @@ /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "TV" = ( /obj/machinery/light/directional/south, -/obj/machinery/computer/order_console/mining/interdyne, +/obj/machinery/computer/piratepad_control/syndiepad{ + dir = 1 + }, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/cargo) "TW" = ( @@ -15537,10 +15643,8 @@ /obj/machinery/vending/barbervend{ onstation = 0; onstation_override = 1; - pixel_y = 28; all_products_free = 1 }, -/obj/structure/table/reinforced/plastitaniumglass, /turf/open/floor/iron/kitchen/herringbone, /area/ruin/space/has_grav/bubbers/persistance/service/salon) "Uf" = ( @@ -15550,6 +15654,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) +"Uh" = ( +/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/cell_charger_multi/wall_mounted/directional/north, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/bubbers/persistance/service) "Uj" = ( /obj/machinery/duct, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, @@ -15616,6 +15730,14 @@ /obj/structure/window/reinforced/survival_pod/spawner/directional/north, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/cargo) +"Uq" = ( +/obj/effect/turf_decal/siding/dark, +/obj/machinery/duct, +/obj/machinery/light/directional/south, +/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) "Ur" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -15679,7 +15801,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/structure/cable, -/obj/machinery/holopad, /turf/open/floor/carpet/donk, /area/ruin/space/has_grav/bubbers/persistance/service) "UA" = ( @@ -15706,7 +15827,7 @@ /obj/machinery/door/poddoor{ id = "syndimining" }, -/turf/open/floor/plating/reinforced, +/turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/evac) "UG" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -15722,10 +15843,6 @@ 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, @@ -15734,10 +15851,10 @@ /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/reagent_containers/cup/watering_can, /turf/open/floor/grass, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "UI" = ( @@ -15758,16 +15875,13 @@ /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) "UJ" = ( -/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, +/obj/structure/sign/departments/rndserver/directional/south, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/area/ruin/space/has_grav/bubbers/persistance/engineering) "UK" = ( /obj/structure/dresser, /turf/open/floor/carpet/donk, @@ -15813,10 +15927,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) -"UT" = ( -/obj/structure/closet/crate/secure/trashcart/filled, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/cargo) "UU" = ( /obj/machinery/light/directional/west, /obj/effect/turf_decal/siding/wood{ @@ -15834,7 +15944,7 @@ /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/persistance/cargo) "UX" = ( -/obj/structure/frame/machine/secured, +/obj/machinery/nuclearbomb/beer, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/command/vault) "UY" = ( @@ -15887,6 +15997,22 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/rnd) +"Vf" = ( +/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/effect/turf_decal/trimline/purple/filled/line, +/obj/structure/noticeboard/directional/south, +/obj/item/paper/crumpled/plap, +/obj/item/paper/crumpled/retired_designs, +/obj/item/paper/crumpled/rbmk2, +/obj/item/paper/requisition, +/obj/item/paper/default_lawset_list, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/bubbers/persistance/sci/rnd) "Vg" = ( /obj/structure/cable, /obj/structure/closet/crate/secure/syndicate/arc{ @@ -15912,6 +16038,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, +/obj/structure/tank_dispenser, /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/cargo) "Vk" = ( @@ -16015,6 +16142,9 @@ dir = 8 }, /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/wood/parquet, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "Vz" = ( @@ -16176,6 +16306,9 @@ /obj/effect/turf_decal/siding/wood{ dir = 6 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/wood/parquet, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "Wa" = ( @@ -16205,7 +16338,6 @@ /obj/effect/turf_decal/stripes, /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /obj/effect/mapping_helpers/airlock/cutaiwire, -/obj/structure/fans/tiny/forcefield, /obj/structure/cable, /obj/machinery/door/airlock/atmos/glass{ name = "Turbine Room Airlock" @@ -16232,10 +16364,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/service) -"Wg" = ( -/obj/effect/spawner/random/structure/crate, -/turf/open/floor/plating/elevatorshaft, -/area/ruin/space/has_grav/bubbers/persistance/cargo) "Wh" = ( /obj/effect/turf_decal/stripes/red/corner{ dir = 4 @@ -16244,8 +16372,6 @@ /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 }, @@ -16264,23 +16390,16 @@ /turf/open/floor/iron/white/diagonal, /area/ruin/space/has_grav/bubbers/persistance/med) "Wm" = ( -/obj/structure/closet/secure_closet/ds2atmos{ - anchorable = 0; - anchored = 1 - }, -/obj/item/mod/module/visor/meson{ - pixel_y = -9 - }, -/obj/item/analyzer{ - pixel_y = 10 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/item/holosign_creator/atmos, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/light/directional/south, /obj/effect/turf_decal/stripes/red/corner{ dir = 1 }, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/red/corner{ + dir = 4 + }, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "Wn" = ( @@ -16376,13 +16495,6 @@ /obj/effect/mapping_helpers/airlock/cutaiwire, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) -"WA" = ( -/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"; @@ -16524,12 +16636,10 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/plating/reinforced, +/turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/med) "WU" = ( /obj/effect/turf_decal/siding/thinplating/dark, -/obj/item/construction/plumbing, -/obj/structure/rack, /obj/machinery/light_switch/directional/south, /turf/open/floor/iron/terracotta/herringbone, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) @@ -16628,12 +16738,6 @@ /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, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "Xl" = ( /obj/machinery/computer/arcade/battle{ dir = 8 @@ -16642,17 +16746,12 @@ /turf/open/floor/wood/tile, /area/ruin/space/has_grav/bubbers/persistance/sec/prison/rec) "Xm" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/effect/mapping_helpers/apc/syndicate_access, -/obj/effect/mapping_helpers/apc/cut_AI_wire, -/obj/effect/mapping_helpers/apc/full_charge, /obj/machinery/plumbing/synthesizer/water_synth, /obj/effect/turf_decal/siding/dark{ dir = 6 }, /turf/open/floor/noslip, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "Xp" = ( /obj/item/xenoarch/tape_measure, /obj/item/xenoarch/handheld_scanner, @@ -16704,15 +16803,17 @@ /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/bubbers/persistance/sci/rnd) "Xx" = ( -/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, +/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, /turf/open/floor/catwalk_floor/iron_dark, -/area/ruin/space/has_grav/bubbers/persistance/service) +/area/ruin/space/has_grav/bubbers/persistance/engineering) "Xz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -16762,12 +16863,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) -"XJ" = ( -/obj/structure/cable, -/obj/machinery/door/firedoor/heavy, -/obj/structure/sign/warning/fire/directional/south, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "XK" = ( /obj/structure/cable, /obj/machinery/duct, @@ -16883,6 +16978,10 @@ /obj/effect/turf_decal/stripes/red/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, +/obj/structure/cable, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "Yf" = ( @@ -17046,11 +17145,29 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) "YE" = ( -/obj/machinery/digital_clock/directional/west, -/obj/effect/turf_decal/siding/dark/end, -/obj/structure/closet/firecloset/full, +/obj/machinery/light_switch/directional/south, +/obj/structure/closet/secure_closet/interdynefob/engie_locker, +/obj/item/construction/plumbing/engineering, +/obj/item/wrench, +/obj/effect/turf_decal/siding/dark{ + dir = 5 + }, +/obj/item/storage/box/gas_miner_beacons/syndicate{ + pixel_x = -7; + pixel_y = -4 + }, +/obj/item/storage/box/gas_miner_beacons/syndicate{ + pixel_x = 7; + pixel_y = -4 + }, +/obj/item/clothing/shoes/magboots/syndie{ + pixel_y = 8 + }, +/obj/item/clothing/shoes/magboots/syndie{ + pixel_y = 8 + }, /turf/open/floor/noslip, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) +/area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "YF" = ( /obj/structure/chair/plastic{ dir = 8 @@ -17085,7 +17202,6 @@ /obj/effect/mapping_helpers/apc/syndicate_access, /obj/effect/mapping_helpers/apc/cut_AI_wire, /obj/effect/mapping_helpers/apc/full_charge, -/obj/machinery/nuclearbomb/beer, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/command/vault) "YM" = ( @@ -17106,7 +17222,6 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/structure/tank_dispenser, /turf/open/floor/plating/elevatorshaft, /area/ruin/space/has_grav/bubbers/persistance/cargo) "YO" = ( @@ -17127,22 +17242,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/wood, /area/ruin/space/has_grav/bubbers/persistance/service/gym) -"YR" = ( -/turf/closed/wall/r_wall/syndicate/cruiser, -/area/ruin/space/has_grav/bubbers/persistance/service/dorms/assistant) -"YS" = ( -/obj/machinery/light/directional/south, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/structure/sign/departments/rndserver/directional/east, -/obj/machinery/vending/engivend{ - skyrat_products = list(/obj/item/clothing/glasses/meson/engine = 5, /obj/item/construction/rcd/loaded = 0, /obj/item/storage/pouch/material = 2, /obj/item/storage/bag/construction = 2); - onstation = 0; - onstation_override = 1; - all_products_free = 1 - }, -/turf/open/floor/pod/dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering) "YT" = ( /obj/effect/turf_decal/siding/dark/corner{ dir = 8 @@ -17166,7 +17265,7 @@ id = "syndihangerb" }, /obj/structure/fans/tiny/forcefield, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "YV" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -17201,6 +17300,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/wood/parquet, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "YX" = ( @@ -17225,9 +17325,7 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/griddle, /turf/open/floor/iron/white, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "Zc" = ( @@ -17250,11 +17348,6 @@ }, /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, -/turf/open/floor/pod/dark, -/area/ruin/space/has_grav/bubbers/persistance/engineering) "Zg" = ( /obj/machinery/light/directional/west, /obj/machinery/digital_clock/directional/west, @@ -17350,7 +17443,10 @@ dir = 1 }, /obj/effect/turf_decal/siding/dark{ - dir = 6 + dir = 4 + }, +/obj/effect/turf_decal/siding/dark/corner{ + dir = 8 }, /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/bubbers/persistance/sec/prison) @@ -17372,11 +17468,6 @@ }, /turf/open/floor/iron/terracotta/small, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/engineering) -"ZC" = ( -/obj/structure/plasticflaps, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/plating/reinforced, -/area/ruin/space/has_grav/bubbers/persistance/engineering) "ZD" = ( /obj/structure/emergency_shield/cult/weak{ name = "Energy Shield" @@ -17461,8 +17552,10 @@ /obj/effect/turf_decal/stripes/red/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/turf_decal/stripes/red/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "ZT" = ( @@ -17487,6 +17580,7 @@ /obj/effect/turf_decal/siding/wood, /obj/structure/safe, /obj/item/bombcore/syndicate/large, +/obj/item/book/granter/crafting_recipe/regal_condor, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "ZW" = ( @@ -17832,7 +17926,7 @@ CN wI CN Wh -ZC +SR sb GC Lg @@ -17894,12 +17988,12 @@ ue yE SZ cn -QD -QD +gV +gV Gg -QD -hz -QD +gV +aT +gV Kf Kb sb @@ -17911,7 +18005,7 @@ xC px an sD -tN +mb tN MQ gw @@ -17962,13 +18056,13 @@ QP ue kQ mu +aZ +gV +qI +Cf QD -gt -QD -Gg -QD -hz -QD +aT +gV cp YG DO @@ -18032,19 +18126,19 @@ YT HD Kb re -QD -QD -Gg -QD -hz -QD +gV +gV +bp +gV +aT +gV Jl Vm AN eG -bH -EF -nn +Tk +wk +SO ft Yz nu @@ -18101,7 +18195,7 @@ XU Iq Vm cI -PW +Mv PW LU Te @@ -18111,9 +18205,9 @@ eT Vm Ao sb -Xj -ci -dJ +tA +yZ +yL ow ma jr @@ -18180,8 +18274,8 @@ KT Vm Nn CU -XJ -Qb +Su +yZ pW yZ yZ @@ -18230,7 +18324,7 @@ eF FX pT DC -wj +Vf HD HD nv @@ -18240,17 +18334,17 @@ gZ Vm IT aW -gV -Rr -gV -hz +Qk +ka +eV +aT gV nP sE DZ GL -kd -AR +gF +Qj by Yf oa @@ -18268,7 +18362,7 @@ FW "} (12,1,1) = {" gq -KU +qg CL CL CL @@ -18310,7 +18404,7 @@ Vm Mj gV Mj -hF +Rr gV aT gV @@ -18318,8 +18412,8 @@ hT Vm sb JG -Cj -rn +Pj +sb sb eG CU @@ -18337,7 +18431,7 @@ FW "} (13,1,1) = {" gq -VG +KU CL KO gS @@ -18380,9 +18474,9 @@ nX lM PW zw -AZ +PW Ye -qt +tu Wm Vm Kr @@ -18449,10 +18543,10 @@ gV gV gV tV -GH -cZ -Rz -Ze +gV +aT +SW +GO IP uR xD @@ -18514,14 +18608,14 @@ RQ lK sa Vm +aZ gV -gV -gV +Qk ZR Ic lL -mm -YS +SW +Py Vm he or @@ -18585,12 +18679,12 @@ Gv Vm gV gV -Qk +gV hm -nO -kv +Iw +gV kS -kv +LW Jc lX OH @@ -18649,16 +18743,16 @@ LH LH vd sC -vd +yQ LH -LH -LH -LH -Vm +yQ +hG +PW +PW Kv nO -WA -mt +kv +Sb vM Jc xK @@ -18725,7 +18819,7 @@ kp Xx yU qU -Ha +nO Kh mt Hn @@ -18788,18 +18882,18 @@ SA gW ep ep -XO -XO -XO +ep +ep +ep ep fz LM -kv +vo Nb zQ Rf Jc -jK +NQ VS st NQ @@ -18860,13 +18954,13 @@ Ya QN IQ Au -XO +ep zK UJ -LH -kv -kv -kv +nO +nt +Gc +EB uZ uZ uZ @@ -18930,9 +19024,9 @@ gK ua nm ep -YR +kv Ka -ou +nO SG el YE @@ -18999,7 +19093,7 @@ XO XO BN Cl -YR +kv Sw qx Rj @@ -19016,7 +19110,7 @@ tj JA Fo uZ -zM +Dt Jb lo Dk @@ -19068,12 +19162,12 @@ iv mV rG kz -YR +kv MW -yi +ss SF qQ -mx +Uq uZ wp My @@ -19137,7 +19231,7 @@ gx Ei VW ZV -YR +kv aK pj kr @@ -19206,8 +19300,8 @@ Np Zv lv jN -ou -ou +nO +nO vy IX Xm @@ -19226,7 +19320,7 @@ kT Ai uP Ia -wS +kT qg gq gq @@ -19247,7 +19341,7 @@ Sa EO PD fa -hC +Cp WR aH ET @@ -19490,9 +19584,9 @@ WP fl uZ om -zS -zY -zY +TL +My +My zE tm ui @@ -19774,7 +19868,7 @@ mH tY Go zG -oM +Lr MT pb Tf @@ -19840,7 +19934,7 @@ SN SN ho mH -Zu +MV zk zG Zb @@ -19912,7 +20006,7 @@ mH Cy Pa FV -Lr +oM NG bR mH @@ -19967,7 +20061,7 @@ VD CP qL sR -sR +Rd HJ ZW is @@ -19981,8 +20075,8 @@ ZK Hr TA Nt -hL -vs +Lr +NG yO Tf VG @@ -20117,7 +20211,7 @@ SN ru Nt fO -uH +Zu lj IB KH @@ -20180,15 +20274,15 @@ OO ph hl zv -GZ +ff IL SS ND RR ZK mH -mH -mH +Ej +Ej mH mH ZK @@ -20273,7 +20367,7 @@ XB LF ol hR -UT +hR hR ol YK @@ -20360,10 +20454,10 @@ HY HY YV uk -Ds -Ds -Ds -Ds +Bi +Bi +Bi +Bi Ds lW lW @@ -20379,7 +20473,7 @@ ZA RN RN LH -eA +Uh aa iC uw @@ -20394,7 +20488,7 @@ Ji dE yQ Eq -vF +kV kF vF xV @@ -20428,11 +20522,11 @@ dQ sq dQ Sl -Og -Dz -Dz +QZ +Qc +Qc To -DJ +De BV fU gM @@ -20459,13 +20553,13 @@ LH fY LH Lj -Hl +iD fw Ji vN +un +un vN -un -un vN aB lx @@ -20488,7 +20582,7 @@ OG Up mv GS -HS +lw Yl eN EM @@ -20547,7 +20641,7 @@ FW lS Yd Bc -Wg +ol hR hR hR @@ -20557,8 +20651,8 @@ OG Ym Xd Xd -qB -qB +MD +Jp qB qB Dz @@ -20615,10 +20709,10 @@ FW (46,1,1) = {" VG XB -ec -Bx +ta +ol +hR hR -Oi hR ol zP @@ -20626,7 +20720,7 @@ OG nF pa te -qB +Jp qZ Xi lD @@ -20685,7 +20779,7 @@ FW VG XB wv -An +ol hR hR hR @@ -20824,7 +20918,7 @@ VG UV UV Vi -RT +Dw zR cc Sf @@ -20976,7 +21070,7 @@ Bh Bh qB qB -Pd +Dz Pd Qc WS diff --git a/_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_syndicate_base1_skyrat.dmm b/_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_syndicate_base1_skyrat.dmm index 2716b824813..1db68b5b3ef 100644 --- a/_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_syndicate_base1_skyrat.dmm +++ b/_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_syndicate_base1_skyrat.dmm @@ -4487,9 +4487,9 @@ /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/item/radio/headset/syndicateciv/staff, +/obj/item/radio/headset/syndicateciv/staff, +/obj/item/radio/headset/syndicateciv/staff, /obj/structure/closet/crate/secure/gear{ req_access = list("syndicate"); anchored = 1 diff --git a/_maps/RandomRuins/SpaceRuins/bubberstation/space_dauntless.dmm b/_maps/RandomRuins/SpaceRuins/bubberstation/space_dauntless.dmm index af662e7b709..557090dfc83 100644 --- a/_maps/RandomRuins/SpaceRuins/bubberstation/space_dauntless.dmm +++ b/_maps/RandomRuins/SpaceRuins/bubberstation/space_dauntless.dmm @@ -10665,7 +10665,7 @@ dir = 5 }, /obj/structure/table/reinforced/plastitaniumglass, -/obj/item/radio/headset/interdyne, +/obj/item/radio/headset/syndicateciv/staff, /turf/open/floor/iron/small, /area/ruin/space/has_grav/bubbers/dauntless/command/bridge) "TX" = ( diff --git a/_maps/bubber/automapper/automapper_config.toml b/_maps/bubber/automapper/automapper_config.toml index f3ae507a5f6..8f38289e1e8 100644 --- a/_maps/bubber/automapper/automapper_config.toml +++ b/_maps/bubber/automapper/automapper_config.toml @@ -753,11 +753,3 @@ 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/code/__DEFINES/~skyrat_defines/mapping.dm b/code/__DEFINES/~skyrat_defines/mapping.dm index 0af4ba52d7f..6e8d567b306 100644 --- a/code/__DEFINES/~skyrat_defines/mapping.dm +++ b/code/__DEFINES/~skyrat_defines/mapping.dm @@ -1,12 +1,12 @@ #define RADIO_CHANNEL_CYBERSUN "Cybersun" -#define RADIO_KEY_CYBERSUN "q" -#define RADIO_TOKEN_CYBERSUN ":q" +#define RADIO_KEY_CYBERSUN "w" +#define RADIO_TOKEN_CYBERSUN ":w" -#define FREQ_CYBERSUN 1211 +#define FREQ_CYBERSUN 1207 #define RADIO_CHANNEL_INTERDYNE "Interdyne" -#define RADIO_KEY_INTERDYNE "w" -#define RADIO_TOKEN_INTERDYNE ":w" +#define RADIO_KEY_INTERDYNE "q" +#define RADIO_TOKEN_INTERDYNE ":q" #define FREQ_INTERDYNE 1209 diff --git a/code/modules/asset_cache/assets/paper.dm b/code/modules/asset_cache/assets/paper.dm index d150e568a75..72efcf06daf 100644 --- a/code/modules/asset_cache/assets/paper.dm +++ b/code/modules/asset_cache/assets/paper.dm @@ -20,6 +20,7 @@ "stamp-closed" = 'icons/stamp_icons/large_stamp-closed.png', "stamp-crow" = 'icons/stamp_icons/crow-stamp.png', "stamp-warden" = 'icons/stamp_icons/large_stamp-warden.png', + "stamp-persistence" = 'icons/stamp_icons/large_stamp-persistence.png', //BUBBERSTATION ADDITION: END - Bubberstation Stamp Icons "stamp-clown" = 'icons/stamp_icons/large_stamp-clown.png', diff --git a/icons/stamp_icons/large_stamp-persistence.png b/icons/stamp_icons/large_stamp-persistence.png new file mode 100644 index 00000000000..0ae3142c723 Binary files /dev/null and b/icons/stamp_icons/large_stamp-persistence.png differ diff --git a/modular_skyrat/modules/mapping/code/lavaland_ruin_code.dm b/modular_skyrat/modules/mapping/code/lavaland_ruin_code.dm index 074d5b06d55..c7e584f5238 100644 --- a/modular_skyrat/modules/mapping/code/lavaland_ruin_code.dm +++ b/modular_skyrat/modules/mapping/code/lavaland_ruin_code.dm @@ -24,7 +24,7 @@ name = "Interdyne Bioweapon Scientist" uniform = /obj/item/clothing/under/rank/rnd/scientist/skyrat/utility/syndicate suit = /obj/item/clothing/suit/toggle/labcoat/interdyne - ears = /obj/item/radio/headset/interdyne + ears = /obj/item/radio/headset/syndicateciv/staff /datum/outfit/lavaland_syndicate/post_equip(mob/living/carbon/human/syndicate, visualsOnly = FALSE) syndicate.faction |= ROLE_SYNDICATE @@ -41,11 +41,11 @@ /datum/outfit/lavaland_syndicate/ice uniform = /obj/item/clothing/under/syndicate/skyrat/tactical suit = /obj/item/clothing/suit/hooded/wintercoat/skyrat/syndicate - ears = /obj/item/radio/headset/interdyne + ears = /obj/item/radio/headset/syndicateciv/staff /datum/outfit/lavaland_syndicate/comms uniform = /obj/item/clothing/under/rank/security/skyrat/utility/redsec/syndicate - ears = /obj/item/radio/headset/interdyne/comms + ears = /obj/item/radio/headset/syndicateciv/comms /datum/outfit/lavaland_syndicate/comms/space ears = /obj/item/radio/headset/syndicate/alt @@ -69,7 +69,7 @@ name = "Interdyne Deck Officer" uniform = /obj/item/clothing/under/rank/cargo/qm/skyrat/syndie neck = /obj/item/clothing/neck/cloak/qm/syndie - ears = /obj/item/radio/headset/interdyne/command + ears = /obj/item/radio/headset/syndicateciv/command id = /obj/item/card/id/advanced/silver/generic id_trim = /datum/id_trim/syndicom/skyrat/interdyne/deckofficer r_hand = /obj/item/gun/ballistic/rifle/sniper_rifle @@ -85,28 +85,6 @@ suit = /obj/item/clothing/suit/hooded/wintercoat/skyrat/syndicate //ITEMS - -/obj/item/radio/headset/interdyne - name = "interdyne headset" - desc = "A bowman headset with a large red cross on the earpiece, has a small 'IP' written on the top strap. Protects the ears from flashbangs." - icon_state = "syndie_headset" - inhand_icon_state = null - radiosound = 'modular_skyrat/modules/radiosound/sound/radio/syndie.ogg' - keyslot = /obj/item/encryptionkey/headset_syndicate/interdyne - -/obj/item/radio/headset/interdyne/Initialize(mapload) - . = ..() - AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) - -/obj/item/radio/headset/interdyne/command - name = "interdyne command headset" - desc = "A commanding headset to gather your underlings. Protects the ears from flashbangs." - command = TRUE - -/obj/item/radio/headset/interdyne/comms - keyslot = /obj/item/encryptionkey/headset_syndicate/interdyne - keyslot2 = /obj/item/encryptionkey/syndicate - /obj/structure/closet/crate/freezer/sansufentanyl name = "sansufentanyl crate" desc = "A freezer. Contains refrigerated Sansufentanyl, for managing Hereditary Manifold Sickness. A product of Interdyne Pharmaceuticals." diff --git a/modular_skyrat/modules/mapping/code/lockers/interdyne_fob/command.dm b/modular_skyrat/modules/mapping/code/lockers/interdyne_fob/command.dm index 5f6e6c8beb3..8c798163660 100644 --- a/modular_skyrat/modules/mapping/code/lockers/interdyne_fob/command.dm +++ b/modular_skyrat/modules/mapping/code/lockers/interdyne_fob/command.dm @@ -25,7 +25,7 @@ new /obj/item/storage/toolbox/guncase/skyrat/pistol/aps(src) new /obj/item/storage/bag/garment/station_admiral(src) - new /obj/item/radio/headset/interdyne/command(src) + new /obj/item/radio/headset/syndicateciv/command(src) /obj/structure/closet/secure_closet/interdynefob/maa_locker icon_door = "warden" @@ -65,7 +65,7 @@ new /obj/item/storage/belt/security/full(src) new /obj/item/watertank/pepperspray(src) new /obj/item/storage/bag/garment/master_arms(src) - new /obj/item/radio/headset/interdyne(src) + new /obj/item/radio/headset/syndicateciv/staff(src) new /obj/item/storage/toolbox/guncase/skyrat/c20r(src) /obj/structure/closet/secure_closet/interdynefob/maa_locker/populate_contents_immediate() @@ -106,4 +106,4 @@ new /obj/item/encryptionkey/headset_syndicate/interdyne(src) new /obj/item/language_manual/codespeak_manual/unlimited(src) new /obj/item/storage/bag/garment/corprate_liaison(src) - new /obj/item/radio/headset/interdyne/command(src) + new /obj/item/radio/headset/syndicateciv/command(src) diff --git a/modular_skyrat/modules/mapping/code/lockers/interdyne_fob/security.dm b/modular_skyrat/modules/mapping/code/lockers/interdyne_fob/security.dm index 2e4f7b67ea2..f5469d7a87e 100644 --- a/modular_skyrat/modules/mapping/code/lockers/interdyne_fob/security.dm +++ b/modular_skyrat/modules/mapping/code/lockers/interdyne_fob/security.dm @@ -34,7 +34,7 @@ new /obj/item/storage/belt/security/full(src) new /obj/item/storage/bag/garment/brig_officer(src) - new /obj/item/radio/headset/interdyne(src) + new /obj/item/radio/headset/syndicateciv/staff(src) /obj/structure/closet/secure_closet/interdynefob/brig_officer_locker/populate_contents_immediate() . = ..() diff --git a/modular_skyrat/modules/mapping/code/mob_spawns.dm b/modular_skyrat/modules/mapping/code/mob_spawns.dm index 51c5cca2add..33ea06040e8 100644 --- a/modular_skyrat/modules/mapping/code/mob_spawns.dm +++ b/modular_skyrat/modules/mapping/code/mob_spawns.dm @@ -188,7 +188,7 @@ name = "DS-2 Operative" uniform = /obj/item/clothing/under/syndicate/skyrat/tactical shoes = /obj/item/clothing/shoes/combat - ears = /obj/item/radio/headset/interdyne + ears = /obj/item/radio/headset/syndicateciv/staff back = /obj/item/storage/backpack backpack_contents = list( /obj/item/storage/box/survival = 1, @@ -273,7 +273,7 @@ glasses = /obj/item/clothing/glasses/hud/security/sunglasses/redsec r_pocket = /obj/item/flashlight/seclite mask = /obj/item/clothing/mask/gas/syndicate - ears = /obj/item/radio/headset/interdyne + ears = /obj/item/radio/headset/syndicateciv/staff /datum/outfit/ds2/syndicate/post_equip(mob/living/carbon/human/syndicate) syndicate.faction |= ROLE_SYNDICATE @@ -284,7 +284,7 @@ name = "DS-2 Command Operative" uniform = /obj/item/clothing/under/syndicate/skyrat/tactical shoes = /obj/item/clothing/shoes/combat - ears = /obj/item/radio/headset/interdyne/command + ears = /obj/item/radio/headset/syndicateciv/command back = /obj/item/storage/backpack backpack_contents = list( /obj/item/storage/box/survival = 1, @@ -555,9 +555,17 @@ //CRYO CONSOLES /obj/machinery/computer/cryopod/interdyne - radio = /obj/item/radio/headset/interdyne + radio = /obj/item/radio/headset/syndicateciv/staff announcement_channel = RADIO_CHANNEL_INTERDYNE req_one_access = list("syndicate_leader") MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/cryopod/interdyne, 32) +//CRYO CONSOLES +/obj/machinery/computer/cryopod/cybersun + radio = /obj/item/radio/headset/syndicateciv/staff + announcement_channel = RADIO_CHANNEL_CYBERSUN + req_one_access = list("syndicate_leader") + +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/cryopod/cybersun, 32) + diff --git a/modular_skyrat/modules/mapping/code/radio.dm b/modular_skyrat/modules/mapping/code/radio.dm index edcbbddb6b3..a7fb7ee897b 100644 --- a/modular_skyrat/modules/mapping/code/radio.dm +++ b/modular_skyrat/modules/mapping/code/radio.dm @@ -1,13 +1,3 @@ -/obj/item/encryptionkey/headset_syndicate/cybersun - name = "cybersun radio encryption key" - channels = list(RADIO_CHANNEL_CYBERSUN = 1) - special_channels = RADIO_SPECIAL_CENTCOM - -/obj/item/encryptionkey/headset_syndicate/interdyne - name = "Interdyne radio encryption key" - channels = list(RADIO_CHANNEL_INTERDYNE = 1) - special_channels = RADIO_SPECIAL_CENTCOM - /obj/item/encryptionkey/headset_syndicate/guild name = "private radio encryption key" channels = list(RADIO_CHANNEL_GUILD = 1) diff --git a/modular_zubbers/code/__DEFINES/techweb_nodes.dm b/modular_zubbers/code/__DEFINES/techweb_nodes.dm index 72ad7363664..e94eb402f55 100644 --- a/modular_zubbers/code/__DEFINES/techweb_nodes.dm +++ b/modular_zubbers/code/__DEFINES/techweb_nodes.dm @@ -1,2 +1,6 @@ -#define TECHWEB_NODE_INTERDYNE "interdyne_tech" +//Onstation Tech #define TECHWEB_NODE_EMPATHY_IMPLANT "empathy_implant" + +//Offstation Syndicate Tech +#define TECHWEB_NODE_INTERDYNE "interdyne_tech" +#define TECHWEB_NODE_INTERDYNE_ENCRYPTION "interdyne_encryption" diff --git a/modular_zubbers/code/modules/paperwork/stamps.dm b/modular_zubbers/code/modules/paperwork/stamps.dm index 54acbb0bc4b..854d92dafd7 100644 --- a/modular_zubbers/code/modules/paperwork/stamps.dm +++ b/modular_zubbers/code/modules/paperwork/stamps.dm @@ -30,3 +30,10 @@ icon = 'modular_zubbers/icons/obj/service/bureaucracy.dmi' icon_state = "stamp-warden" dye_color = DYE_HOS + +/obj/item/stamp/persistence + name = "persistence rubber stamp" + icon = 'modular_zubbers/icons/obj/service/bureaucracy.dmi' + icon_state = "stamp-persistence" + desc = "A rubber stamp for faking your legality in the sector." + dye_color = DYE_SYNDICATE diff --git a/modular_zubbers/code/modules/syndicate_offstation/code/misc-fluff/misc.dm b/modular_zubbers/code/modules/syndicate_offstation/code/misc-fluff/misc.dm new file mode 100644 index 00000000000..d77a61e1b60 --- /dev/null +++ b/modular_zubbers/code/modules/syndicate_offstation/code/misc-fluff/misc.dm @@ -0,0 +1,3 @@ +//piping layer 2 airmix mixer because the syndicate is weird and doesn't follow NT's design rules. +/obj/machinery/atmospherics/components/trinary/mixer/airmix/inverse/layer2 + piping_layer = 2 diff --git a/modular_zubbers/code/modules/syndicate_offstation/code/misc-fluff/research.dm b/modular_zubbers/code/modules/syndicate_offstation/code/misc-fluff/research.dm index e6c539d9e52..537989d2759 100644 --- a/modular_zubbers/code/modules/syndicate_offstation/code/misc-fluff/research.dm +++ b/modular_zubbers/code/modules/syndicate_offstation/code/misc-fluff/research.dm @@ -9,11 +9,11 @@ /datum/techweb/interdyne/New() . = ..() research_node_id("oldstation_surgery", TRUE, TRUE, FALSE) - research_node_id("interdyne_tech", TRUE, TRUE, FALSE) + research_node_id(TECHWEB_NODE_INTERDYNE, TRUE, TRUE, FALSE) //techweb nodes /datum/techweb_node/interdyne - id = "interdyne_tech" + id = TECHWEB_NODE_INTERDYNE display_name = "Syndicate Technology" description = "Tools used by the Syndicate." required_items_to_unlock = list( @@ -30,17 +30,33 @@ "powerator_syndicate", "exofab_syndicate", "syndicate_firing_pin", - "syndicate_headset" + "syndicate_headset", + "cybersun_encryption" + ) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS) hidden = TRUE +/datum/techweb_node/encryption + id = TECHWEB_NODE_INTERDYNE_ENCRYPTION + display_name = "Advanced Syndicate Encryption" + description = "Provides emergency use Interdyne encryption keys in case operational comms are compromised." + required_items_to_unlock = list( + /obj/item/encryptionkey/headset_syndicate/interdyne + ) + design_ids = list( + "interdyne_encryption", + ) + prereq_ids = list(TECHWEB_NODE_INTERDYNE) + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS) + hidden = TRUE + //specific techweb designs //Circuit boards /datum/design/syndicate_express_console name = "Syndicate Express Cargo Console" - desc = "The circuit board for a computer used to purchase goods." + desc = "The circuit board for a computer used to purchase goods on a black market." id = "cargoconsole_syndicate" build_type = AWAY_IMPRINTER materials = list(/datum/material/glass = SHEET_MATERIAL_AMOUNT * 1) @@ -52,7 +68,7 @@ /datum/design/syndicate_bounty_pad name = "Syndicate Bounty Pad" - desc = "The circuit board for a machine used to sell goods." + desc = "The circuit board for a machine used to sell goods on a black market." id = "bountypad_syndicate" build_type = AWAY_IMPRINTER materials = list(/datum/material/glass = SHEET_MATERIAL_AMOUNT * 1) @@ -63,8 +79,8 @@ departmental_flags = DEPARTMENT_BITFLAG_CARGO /datum/design/syndicate_bounty_pad_console - name = "Syndicate Express Cargo Console" - desc = "The circuit board for the used to sell goods to the various companies in the Syndicate." + name = "Syndicate Bounty Pad Console" + desc = "The circuit board for the computer used to control a bounty pad to sell goods on a black market." id = "bountyconsole_syndicate" build_type = AWAY_IMPRINTER materials = list(/datum/material/glass = SHEET_MATERIAL_AMOUNT * 1) @@ -87,7 +103,7 @@ departmental_flags = DEPARTMENT_BITFLAG_CARGO /datum/design/syndicate_exofab - name = "Syndicate_Exofab" + name = "Syndicate Exofab" desc = "The circuit board for a standard issue exofab produced by Interdyne." id = "exofab_syndicate" build_type = AWAY_IMPRINTER @@ -111,15 +127,39 @@ ) departmental_flags = DEPARTMENT_BITFLAG_SECURITY -/datum/design/interdyne_headset - name = "Interdyne Headset" +/datum/design/syndicateciv_headset + name = "Syndicate Headset" desc = "Standard issue headset for syndicate civillians." id = "syndicate_headset" build_type = PROTOLATHE materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*1) - build_path = /obj/item/radio/headset/interdyne + build_path = /obj/item/radio/headset/syndicateciv category = list( - RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_FIRING_PINS + RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_TELECOMMS + ) + departmental_flags = DEPARTMENT_BITFLAG_SECURITY + +/datum/design/interdyne_key + name = "Interdyne Encryption Key" + desc = "Standard issue headset for syndicate civillians." + id = "interdyne_encryption" + build_type = PROTOLATHE + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*1) + build_path = /obj/item/encryptionkey/headset_syndicate/interdyne + category = list( + RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_TELECOMMS + ) + departmental_flags = DEPARTMENT_BITFLAG_SECURITY + +/datum/design/cybersun_key + name = "Cybersun Encryption Key" + desc = "Standard issue headset for syndicate civillians." + id = "cybersun_encryption" + build_type = PROTOLATHE + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*1) + build_path = /obj/item/encryptionkey/headset_syndicate/cybersun + category = list( + RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_TELECOMMS ) departmental_flags = DEPARTMENT_BITFLAG_SECURITY diff --git a/modular_zubbers/code/modules/syndicate_offstation/comms/radio_encryption.dm b/modular_zubbers/code/modules/syndicate_offstation/comms/radio_encryption.dm new file mode 100644 index 00000000000..ea3ea2829b1 --- /dev/null +++ b/modular_zubbers/code/modules/syndicate_offstation/comms/radio_encryption.dm @@ -0,0 +1,39 @@ +//encryption keys +/obj/item/encryptionkey/headset_syndicate/cybersun + name = "cybersun radio encryption key" + channels = list(RADIO_CHANNEL_CYBERSUN = 1) + special_channels = RADIO_SPECIAL_CENTCOM + +/obj/item/encryptionkey/headset_syndicate/interdyne + name = "Interdyne radio encryption key" + channels = list(RADIO_CHANNEL_INTERDYNE = 1) + special_channels = RADIO_SPECIAL_CENTCOM + +//radios +/obj/item/radio/headset/syndicateciv + name = "Syndicate Civilian headset" + desc = "A bowman headset with a large red cross on the earpiece, it has a small three headed snake on the top strap. Protects the ears from flashbangs." + icon_state = "syndie_headset" + inhand_icon_state = null + radiosound = 'modular_skyrat/modules/radiosound/sound/radio/syndie.ogg' + keyslot = null + +/obj/item/radio/headset/syndicateciv/Initialize(mapload) + . = ..() + AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) + +/obj/item/radio/headset/syndicateciv/staff + keyslot = /obj/item/encryptionkey/headset_syndicate/cybersun + +/obj/item/radio/headset/syndicateciv/command + name = "Syndicate command headset" + desc = "A commanding headset to gather your minions. Protects the ears from flashbangs." + command = TRUE + keyslot = /obj/item/encryptionkey/headset_syndicate/cybersun + +//comms operative headset +/obj/item/radio/headset/syndicateciv/comms + keyslot = /obj/item/encryptionkey/headset_syndicate/interdyne + keyslot2 = /obj/item/encryptionkey/syndicate + + diff --git a/modular_zubbers/code/modules/syndicate_offstation/storage/lockers.dm b/modular_zubbers/code/modules/syndicate_offstation/storage/lockers.dm index 3576cad149b..e8ca41ec6a8 100644 --- a/modular_zubbers/code/modules/syndicate_offstation/storage/lockers.dm +++ b/modular_zubbers/code/modules/syndicate_offstation/storage/lockers.dm @@ -7,7 +7,7 @@ ..() new /obj/item/storage/bag/garment/station_admiral(src) - new /obj/item/radio/headset/interdyne/command(src) + new /obj/item/radio/headset/syndicateciv/command(src) /obj/structure/closet/secure_closet/persistence/maa_locker icon_door = "warden" @@ -21,6 +21,6 @@ new /obj/item/storage/belt/security/full(src) new /obj/item/watertank/pepperspray(src) new /obj/item/storage/bag/garment/master_arms(src) - new /obj/item/radio/headset/interdyne(src) + new /obj/item/radio/headset/syndicateciv/staff(src) diff --git a/modular_zubbers/icons/obj/service/bureaucracy.dmi b/modular_zubbers/icons/obj/service/bureaucracy.dmi index f3cdc1ea8f3..bbe16e8067a 100644 Binary files a/modular_zubbers/icons/obj/service/bureaucracy.dmi and b/modular_zubbers/icons/obj/service/bureaucracy.dmi differ diff --git a/modular_zubbers/maps/offstation/dauntless/mob_spawns.dm b/modular_zubbers/maps/offstation/dauntless/mob_spawns.dm index d83eb369139..8fb00848e11 100644 --- a/modular_zubbers/maps/offstation/dauntless/mob_spawns.dm +++ b/modular_zubbers/maps/offstation/dauntless/mob_spawns.dm @@ -198,7 +198,7 @@ name = "Dauntless Operative" uniform = /obj/item/clothing/under/syndicate/skyrat/tactical shoes = /obj/item/clothing/shoes/combat - ears = /obj/item/radio/headset/interdyne + ears = /obj/item/radio/headset/syndicateciv/staff back = /obj/item/storage/backpack backpack_contents = list( /obj/item/storage/box/survival = 1, @@ -271,7 +271,7 @@ head = /obj/item/clothing/head/helmet/swat/ds glasses = /obj/item/clothing/glasses/hud/security/sunglasses/redsec mask = /obj/item/clothing/mask/gas/syndicate - ears = /obj/item/radio/headset/interdyne + ears = /obj/item/radio/headset/syndicateciv/staff /datum/outfit/dauntless/syndicate/miningoff name = "Dauntless Mining Officer" @@ -291,7 +291,7 @@ /obj/item/ammo_box/magazine/m9mm ) mask = /obj/item/clothing/mask/gas/syndicate - ears = /obj/item/radio/headset/interdyne + ears = /obj/item/radio/headset/syndicateciv/staff l_pocket = /obj/item/card/mining_point_card r_pocket = /obj/item/mining_voucher head = /obj/item/clothing/head/soft/black @@ -306,7 +306,7 @@ name = "Dauntless Command Operative" uniform = /obj/item/clothing/under/syndicate/skyrat/tactical shoes = /obj/item/clothing/shoes/combat - ears = /obj/item/radio/headset/interdyne/command + ears = /obj/item/radio/headset/syndicateciv/command back = /obj/item/storage/backpack backpack_contents = list( /obj/item/storage/box/survival = 1, diff --git a/modular_zubbers/maps/offstation/persistence/mob_spawns.dm b/modular_zubbers/maps/offstation/persistence/mob_spawns.dm index 3a6d6acf12b..784f01badea 100644 --- a/modular_zubbers/maps/offstation/persistence/mob_spawns.dm +++ b/modular_zubbers/maps/offstation/persistence/mob_spawns.dm @@ -72,7 +72,7 @@ if(new_spawn.client) //It should have a client, right? new_spawn.faction += ROLE_SYNDICATE new_spawn.faction += ROLE_PERSISTENCE //This is the one to select the cyborg model. - new_spawn.radio.keyslot = new /obj/item/encryptionkey/headset_syndicate/interdyne(src) + new_spawn.radio.keyslot = new /obj/item/encryptionkey/headset_syndicate/cybersun(src) new_spawn.radio.recalculateChannels() new_spawn.UnlinkSelf() //This should prevent AI linking and consoles to see or lock them down. new_spawn.SetEmagged(TRUE) //just to be sure. @@ -199,7 +199,7 @@ name = "Persistence Operative" uniform = /obj/item/clothing/under/syndicate/skyrat/tactical shoes = /obj/item/clothing/shoes/combat - ears = /obj/item/radio/headset/interdyne + ears = /obj/item/radio/headset/syndicateciv/staff back = /obj/item/storage/backpack backpack_contents = list( /obj/item/storage/box/survival = 1, @@ -291,7 +291,7 @@ head = /obj/item/clothing/head/helmet/swat/ds glasses = /obj/item/clothing/glasses/hud/security/sunglasses/redsec mask = /obj/item/clothing/mask/gas/syndicate - ears = /obj/item/radio/headset/interdyne + ears = /obj/item/radio/headset/syndicateciv/staff /datum/outfit/persistence/syndicate/quartermaster name = "Persistence Cargo Tech" @@ -310,7 +310,7 @@ /obj/item/choice_beacon/syndicateoffstation = 1, ) mask = /obj/item/clothing/mask/gas/syndicate - ears = /obj/item/radio/headset/interdyne + ears = /obj/item/radio/headset/syndicateciv/staff l_pocket = /obj/item/card/mining_point_card r_pocket = /obj/item/mining_voucher head = /obj/item/clothing/head/soft/black @@ -336,7 +336,7 @@ name = "Persistence Command Operative" uniform = /obj/item/clothing/under/syndicate/skyrat/tactical shoes = /obj/item/clothing/shoes/combat - ears = /obj/item/radio/headset/interdyne/command + ears = /obj/item/radio/headset/syndicateciv/command back = /obj/item/storage/backpack backpack_contents = list( /obj/item/storage/box/survival = 1, diff --git a/modular_zubbers/maps/offstation/persistence/ruins.dm b/modular_zubbers/maps/offstation/persistence/ruins.dm new file mode 100644 index 00000000000..03e1c00367f --- /dev/null +++ b/modular_zubbers/maps/offstation/persistence/ruins.dm @@ -0,0 +1,14 @@ +/*Code to enable spawning of persistence on icemoon. Unlike the lava map, we let this one be random to avoid issues with +missing roofs*/ + +/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 + +/datum/map_template/ruin/icemoon/bubberstation/syndicate_crawler + always_place = TRUE + ruin_type = ZTRAIT_ICE_RUINS_UNDERGROUND + diff --git a/tgstation.dme b/tgstation.dme index a85e5327673..f50c4953238 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -9477,7 +9477,9 @@ #include "modular_zubbers\code\modules\surgery\organs\internal\eyes\_eyes.dm" #include "modular_zubbers\code\modules\surgery\organs\internal\lungs\_lungs.dm" #include "modular_zubbers\code\modules\syndicate_offstation\Aquarium\bioelectric_prefilled.dm" +#include "modular_zubbers\code\modules\syndicate_offstation\code\misc-fluff\misc.dm" #include "modular_zubbers\code\modules\syndicate_offstation\code\misc-fluff\research.dm" +#include "modular_zubbers\code\modules\syndicate_offstation\comms\radio_encryption.dm" #include "modular_zubbers\code\modules\syndicate_offstation\equipment_items\mod_types.dm" #include "modular_zubbers\code\modules\syndicate_offstation\equipment_items\suitstorage.dm" #include "modular_zubbers\code\modules\syndicate_offstation\selection_beacons\weapon_redemption.dm" @@ -9562,6 +9564,7 @@ #include "modular_zubbers\maps\offstation\persistence\laws.dm" #include "modular_zubbers\maps\offstation\persistence\mob_spawns.dm" #include "modular_zubbers\maps\offstation\persistence\robot_upgrade.dm" +#include "modular_zubbers\maps\offstation\persistence\ruins.dm" #include "modular_zubbers\master_files\code\controllers\subsystem\id_access.dm" #include "modular_zubbers\master_files\code\datums\announcers\default_announcer.dm" #include "modular_zubbers\master_files\code\datums\diseases\chronic_ilness.dm"