Notice of Vendor Removal
Effective immediately, the Donksoft vendor has been removed from public access due to multiple incidents of abuse involving its inventory. Central Command prioritizes safety and responsible use of equipment in all stations. Further review and actions are underway to ensure such incidents are not repeated.
We appreciate your cooperation and understanding as we maintain a safe environment for all. Thank you.
" + }, +/turf/open/floor/carpet/green, +/area/crew_quarters/cafeteria) "jLp" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -19797,42 +19744,34 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/maint) -"jLG" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning, -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/turf_decal/siding/white{ - dir = 8 +"jLI" = ( +/obj/structure/lattice/catwalk/over, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/plating, +/area/ai_monitored/turret_protected/aisat/maint) +"jLK" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ +/obj/structure/railing/corner{ dir = 1 }, -/obj/structure/table, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = -2; - pixel_y = 12 +/obj/machinery/light{ + dir = 1 }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = -6; - pixel_y = 9 +/obj/structure/fireaxecabinet{ + pixel_x = 1; + pixel_y = 32 }, -/obj/item/storage/pill_bottle/mannitol{ - pixel_x = -5; - pixel_y = 4 +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/obj/item/wrench/medical{ - pixel_x = 5; - pixel_y = 6 +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 }, -/turf/open/floor/iron/grid/steel, -/area/medical/medbay/central) -"jLI" = ( -/obj/structure/lattice/catwalk/over, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plating, -/area/ai_monitored/turret_protected/aisat/maint) +/turf/open/floor/iron/half, +/area/engine/engineering) "jLX" = ( /obj/effect/spawner/structure/window, /obj/machinery/door/poddoor/shutters/preopen{ @@ -19913,15 +19852,6 @@ /obj/structure/closet/firecloset/full, /turf/open/floor/plating, /area/maintenance/department/bridge) -"jOK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ - dir = 8 - }, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise) "jON" = ( /obj/item/radio/intercom{ broadcasting = 1; @@ -19943,6 +19873,41 @@ /obj/structure/sign/departments/medbay/alt2, /turf/closed/wall, /area/medical/morgue) +"jPr" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/button/door{ + desc = "A remote control-switch for secure storage."; + id = "engstorage"; + name = "Engineering Secure Storage"; + pixel_x = 32; + pixel_y = 32; + req_access_txt = "10" + }, +/obj/machinery/light_switch{ + pixel_x = 24; + pixel_y = 25 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/half, +/area/engine/engineering) +"jPs" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/engine/engineering) "jQL" = ( /obj/structure/chair/fancy/sofa/old/left{ dir = 4 @@ -20083,6 +20048,19 @@ }, /turf/open/floor/iron/sepia, /area/quartermaster/storage) +"jUs" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 8; + initialize_directions = 8 + }, +/turf/open/floor/iron/textured_half{ + dir = 1 + }, +/area/engine/engineering) "jUw" = ( /turf/open/floor/plating/asteroid/basalt/planetary, /area/quartermaster/storage) @@ -20155,6 +20133,13 @@ /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/pod/dark, /area/maintenance/department/crew_quarters/dorms) +"jWD" = ( +/obj/structure/disposalpipe/multiz/down{ + dir = 4 + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "jWU" = ( /obj/effect/turf_decal/tile/blue/half{ dir = 1 @@ -20163,20 +20148,6 @@ /obj/effect/landmark/start/medical_doctor, /turf/open/floor/iron/white, /area/medical/genetics/cloning) -"jXg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/camera/directional/west, -/obj/machinery/status_display/evac{ - pixel_x = -32 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/iron, -/area/engine/engineering) "jXs" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 @@ -20208,19 +20179,6 @@ }, /turf/open/floor/carpet/orange, /area/quartermaster/qm) -"jXQ" = ( -/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hydroponics) "jYa" = ( /obj/structure/lattice/catwalk/over, /obj/item/kirbyplants/random, @@ -20236,6 +20194,9 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/hallway/primary/central) +"jYj" = ( +/turf/open/floor/iron/large, +/area/engine/engineering) "jYk" = ( /obj/machinery/modular_computer/console/preset/engineering, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -20296,17 +20257,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/grass/no_border, /area/crew_quarters/heads/chief) -"jZf" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/effect/turf_decal/bot, -/obj/structure/sign/departments/minsky/supply/hydroponics{ - pixel_x = 32 - }, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) "jZh" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -20345,6 +20295,11 @@ "jZu" = ( /turf/closed/mineral/random/air, /area/science/mixing) +"jZv" = ( +/obj/machinery/rnd/production/circuit_imprinter, +/obj/structure/window/plasma/reinforced, +/turf/open/floor/iron/large, +/area/engine/engineering) "jZG" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 4 @@ -20376,10 +20331,6 @@ }, /turf/open/floor/wood, /area/medical/exam_room) -"kaw" = ( -/obj/effect/decal/cleanable/oil, -/turf/open/floor/iron/dark, -/area/engine/engineering) "kaJ" = ( /obj/structure/fans/tiny{ density = 1; @@ -20429,6 +20380,14 @@ }, /turf/open/floor/iron/sepia, /area/quartermaster/warehouse) +"kcy" = ( +/obj/machinery/camera/directional/north, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, +/obj/structure/disposalpipe/trunk, +/turf/open/floor/iron, +/area/hydroponics) "kcD" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -20456,6 +20415,12 @@ }, /turf/open/floor/wood, /area/library/abandoned) +"kcL" = ( +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 1 + }, +/turf/open/floor/iron/smooth_half, +/area/engine/engineering) "kcN" = ( /obj/structure/railing/corner{ dir = 8 @@ -20465,6 +20430,20 @@ }, /turf/open/openspace, /area/engineering/hallway) +"kcP" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2, +/obj/structure/window/plasma/reinforced{ + dir = 1 + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/thermomachine/heater/layer_4, +/turf/open/floor/iron/smooth_half, +/area/engine/atmos) "kcX" = ( /obj/machinery/computer/security/mining{ dir = 4 @@ -20476,6 +20455,21 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/hop) +"kdh" = ( +/obj/machinery/computer/turbine_computer{ + dir = 1; + id = "incineratorturbineLeft"; + name = "gas turbine left control computer" + }, +/obj/structure/sign/warning/nosmoking{ + pixel_x = 1; + pixel_y = -32 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/iron/smooth_large, +/area/maintenance/disposal/incinerator) "kdn" = ( /obj/effect/turf_decal/trimline/white/line, /obj/effect/turf_decal/stripes/line{ @@ -20483,6 +20477,13 @@ }, /turf/open/floor/prison/dark, /area/security/prison) +"kdz" = ( +/obj/machinery/power/emitter/welded, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow, +/turf/open/floor/plating, +/area/engine/engineering) "kdJ" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -20524,6 +20525,13 @@ "kfl" = ( /turf/closed/wall/r_wall, /area/bridge/meeting_room) +"kfH" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/iron/grid/steel, +/area/hydroponics) "kgl" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -20560,27 +20568,12 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark, /area/medical/morgue) -"kgF" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible/layer5{ - dir = 6 - }, -/turf/open/floor/iron/tech, -/area/engine/atmos) +"khf" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/turf_decal/sand/plating, +/obj/structure/flora/rock/pile, +/turf/open/floor/plating/asteroid/planetary, +/area/engine/engineering) "khi" = ( /obj/machinery/button/door{ id = "Cabin4"; @@ -20594,21 +20587,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/purple, /area/crew_quarters/dorms) -"khm" = ( -/obj/machinery/power/terminal{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/engineering) "khr" = ( /obj/item/sbeacondrop/exploration, /turf/open/floor/iron/techmaint/planetary, @@ -20616,6 +20594,21 @@ "khs" = ( /turf/closed/wall/rust, /area/science/lab) +"khz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/bot, +/obj/machinery/shieldgen, +/obj/item/radio/intercom{ + pixel_x = 1; + pixel_y = -31 + }, +/turf/open/floor/iron/large, +/area/engine/engineering) +"khH" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/large, +/area/engine/engineering) "kiz" = ( /obj/effect/decal/cleanable/greenglow, /turf/open/floor/plating/dirt/jungle/wasteland, @@ -20624,6 +20617,14 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/maintenance/department/engine/atmos) +"kiM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/turf/open/floor/iron/smooth_large, +/area/engine/engineering) "kiN" = ( /obj/structure/lattice/catwalk/over, /obj/machinery/light{ @@ -20637,6 +20638,9 @@ dir = 6 }, /area/asteroid/paradise/surface/water) +"kje" = ( +/turf/open/floor/iron, +/area/science/research/abandoned) "kji" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 @@ -20657,6 +20661,13 @@ }, /turf/open/floor/iron/sepia, /area/quartermaster/storage) +"kjP" = ( +/obj/effect/landmark/start/botanist, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/iron, +/area/hydroponics) "kkA" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall, @@ -20725,6 +20736,12 @@ }, /turf/open/floor/iron, /area/science/lab) +"klF" = ( +/obj/machinery/computer/rdconsole/production{ + dir = 4 + }, +/turf/open/floor/iron/large, +/area/engine/engineering) "klI" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/effect/turf_decal/siding/wood{ @@ -20768,21 +20785,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) -"kmF" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "kmN" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/siding/wood{ @@ -20892,6 +20894,15 @@ }, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) +"koT" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/iron/smooth_large, +/area/engine/engineering) "kpC" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/railing, @@ -20924,22 +20935,6 @@ }, /turf/open/floor/iron, /area/security/brig) -"kqd" = ( -/obj/machinery/door/airlock/research/glass{ - name = "Xenobiology Lab"; - req_access_txt = "47" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/turf/open/floor/iron/white, -/area/science/xenobiology) "kqs" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -20972,6 +20967,17 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise/surface) +"kqF" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/machinery/computer/pandemic, +/obj/item/extrapolator, +/turf/open/floor/iron/white, +/area/crew_quarters/heads/cmo) "kqG" = ( /obj/machinery/atmospherics/miner/station/nitrogen, /obj/machinery/atmospherics/pipe/simple/green/hidden/layer4, @@ -21001,35 +21007,24 @@ }, /turf/open/floor/plating, /area/medical/apothecary) -"kqQ" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ +"kqR" = ( +/obj/structure/bed{ dir = 8 }, -/obj/machinery/camera/directional/south, -/turf/open/floor/iron, -/area/security/prison) -"kra" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible/layer5{ - dir = 4 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/atmos) +/obj/item/bedsheet/ian, +/obj/machinery/newscaster/directional/east, +/turf/open/floor/prison/dark, +/area/security/prison/shielded) "krj" = ( /obj/item/trash/boritos, /turf/open/floor/plating/beach/sand, /area/asteroid/paradise/surface) +"kro" = ( +/obj/machinery/atmospherics/pipe/manifold/yellow/visible/layer4{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron, +/area/engine/atmos) "krw" = ( /obj/machinery/light/small{ dir = 1 @@ -21054,6 +21049,11 @@ slowdown = 0 }, /area/asteroid/paradise/surface) +"ksd" = ( +/obj/structure/closet/secure_closet/personal, +/obj/machinery/newscaster/directional/west, +/turf/open/floor/iron, +/area/hallway/primary/fore) "ksi" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -21099,6 +21099,16 @@ }, /turf/open/floor/iron/dark, /area/security/execution/education) +"kte" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/flora/ausbushes/sparsegrass, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 8 + }, +/turf/open/floor/plating/asteroid/planetary, +/area/engine/engineering) "kti" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/status_display/evac{ @@ -21214,39 +21224,14 @@ "kuW" = ( /turf/closed/wall/r_wall/rust, /area/science/xenobiology) -"kvb" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "kvC" = ( /obj/structure/railing/corner, /turf/open/openspace, /area/hallway/primary/central) -"kvM" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/bot, -/obj/structure/closet/secure_closet/atmospherics{ - anchored = 1; - req_access = null; - req_one_access_txt = "11" - }, -/turf/open/floor/iron, -/area/engine/atmos) -"kwz" = ( -/obj/machinery/firealarm/directional/south, -/obj/machinery/portable_atmospherics/pump, -/obj/effect/turf_decal/box, -/turf/open/floor/iron/tech, -/area/engine/engineering) +"kvX" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/asteroid/paradise) "kwK" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -21270,31 +21255,6 @@ /obj/structure/closet/crate/coffin, /turf/open/floor/iron/techmaint/planetary, /area/chapel/office) -"kxc" = ( -/obj/structure/table, -/obj/machinery/smartfridge/disks{ - pixel_x = 5 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/item/radio/intercom{ - dir = 1; - pixel_x = 1; - pixel_y = -34 - }, -/obj/machinery/light, -/obj/item/storage/box/disks_plantgene{ - pixel_x = -7; - pixel_y = 9 - }, -/obj/item/reagent_containers/dropper{ - pixel_x = 5; - pixel_y = -4 - }, -/obj/item/clothing/head/utility/chefhat, -/turf/open/floor/iron/grid/steel, -/area/hydroponics) "kxf" = ( /turf/closed/wall, /area/medical/genetics/cloning) @@ -21329,17 +21289,6 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) -"kxR" = ( -/obj/structure/table, -/obj/item/stack/package_wrap, -/obj/effect/decal/cleanable/dirt, -/obj/item/hand_labeler, -/obj/item/food/grown/tea, -/obj/item/food/grown/grapes, -/obj/item/food/grown/cherries, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) "kxS" = ( /turf/open/floor/plating/dirt/planetary, /area/asteroid/paradise/surface/grass) @@ -21433,17 +21382,6 @@ /obj/structure/barricade/wooden, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/maint) -"kzK" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/dark_green/anticorner/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) "kzL" = ( /obj/structure/closet/emcloset/anchored, /turf/open/floor/plating, @@ -21468,11 +21406,6 @@ "kAp" = ( /turf/open/floor/plating/airless, /area/maintenance/disposal) -"kAO" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/kirbyplants/random, -/turf/open/floor/iron/cafeteria, -/area/maintenance/department/medical/morgue) "kBm" = ( /obj/machinery/computer/aifixer{ dir = 8 @@ -21496,6 +21429,18 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) +"kBK" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "kBL" = ( /obj/structure/railing/corner, /obj/effect/turf_decal/siding/white{ @@ -21563,6 +21508,15 @@ /obj/structure/fence/cut/large, /turf/open/floor/plating/dirt/planetary, /area/asteroid/paradise/surface/grass) +"kCg" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/orange/hidden{ + dir = 1 + }, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/engine/engineering) "kCM" = ( /turf/open/floor/plating, /area/quartermaster/warehouse) @@ -21607,34 +21561,31 @@ }, /turf/open/floor/plating, /area/security/brig) +"kDI" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance/two, +/turf/open/floor/pod/dark, +/area/maintenance/department/science/central) "kDO" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/iron, /area/maintenance/department/medical/central) -"kEB" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/cyan/visible/layer2, -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/engine/atmos) "kEO" = ( /obj/structure/sign/warning/securearea{ pixel_y = 32 }, /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) -"kEQ" = ( -/obj/structure/stairs, -/turf/open/floor/pod/dark, -/area/crew_quarters/kitchen/coldroom) +"kFc" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/visible, +/turf/open/floor/catwalk_floor/iron, +/area/engine/atmos) "kFh" = ( /obj/structure/fence/cut/large, /turf/open/floor/plating/dirt/planetary, @@ -21683,6 +21634,22 @@ }, /turf/open/floor/iron/dark, /area/bridge) +"kGt" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/newscaster{ + pixel_y = -30 + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/machinery/light, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/white, +/area/crew_quarters/heads/cmo) "kGw" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/disposal/deliveryChute{ @@ -21707,27 +21674,10 @@ }, /turf/open/floor/plating, /area/science/robotics) -"kHt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 10 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/engineering) +"kHd" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/science/research/abandoned) "kHD" = ( /obj/structure/chair{ dir = 4 @@ -21793,45 +21743,12 @@ dir = 9 }, /area/hallway/primary/central) -"kID" = ( -/obj/machinery/computer/station_alert{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/power/apc/auto_name/directional/west{ - cell_type = /obj/item/stock_parts/cell/hyper; - pixel_x = -24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/turf/open/floor/iron, -/area/engine/engineering) "kII" = ( /obj/structure/railing/corner{ dir = 8 }, /turf/open/openspace, /area/engineering/hallway) -"kIV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Gas to Chamber" - }, -/turf/open/floor/iron/tech, -/area/engine/engineering) "kJL" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -21893,6 +21810,13 @@ }, /turf/open/floor/iron/white, /area/medical/storage) +"kKG" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister, +/turf/open/floor/iron/textured_edge, +/area/engine/atmos) "kKY" = ( /obj/item/clothing/shoes/sandal{ pixel_x = -18 @@ -21919,14 +21843,6 @@ }, /turf/open/floor/iron, /area/maintenance/department/eva) -"kMN" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/reagent_dispensers/watertank, -/obj/machinery/firealarm/directional/west, -/turf/open/floor/iron, -/area/maintenance/disposal/incinerator) "kMR" = ( /obj/structure/disposalpipe/multiz/down{ dir = 4 @@ -21943,22 +21859,12 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/science/lab) -"kNq" = ( -/obj/effect/decal/cleanable/food/flour, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" +"kNl" = ( +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/turf/open/floor/iron/dark/corner{ + dir = 4 }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) +/area/bridge) "kND" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -21994,6 +21900,13 @@ }, /turf/open/floor/carpet/green, /area/chapel/main) +"kNW" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/icecream_vat, +/turf/open/floor/plating, +/area/hallway/secondary/service) "kNX" = ( /obj/structure/railing/corner{ dir = 1 @@ -22109,19 +22022,34 @@ }, /turf/open/floor/iron, /area/security/brig) -"kRx" = ( -/obj/effect/turf_decal/tile/purple/anticorner/contrasted, -/obj/structure/table_frame, -/obj/item/stack/sheet/glass/fifty{ - pixel_x = -2; - pixel_y = 3 +"kRm" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 }, -/obj/item/slime_scanner{ - pixel_x = 6; - pixel_y = -2 +/obj/machinery/portable_atmospherics/canister, +/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer4{ + dir = 4 }, -/turf/open/floor/iron, -/area/asteroid/paradise) +/turf/open/floor/iron/textured_edge{ + dir = 1 + }, +/area/engine/atmos) +"kRI" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 5 + }, +/obj/structure/table, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/gloves/color/black{ + pixel_x = 3; + pixel_y = 7 + }, +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/smooth_half, +/area/engine/atmos) "kRL" = ( /obj/structure/ladder, /turf/open/floor/pod/dark, @@ -22175,14 +22103,22 @@ /obj/effect/turf_decal/stripes/end, /turf/open/floor/noslip/white, /area/medical/medbay/central) -"kSY" = ( -/obj/structure/table, -/obj/item/crowbar, -/obj/item/wrench, -/obj/item/reagent_containers/glass/bucket, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) +"kTh" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 8; + initialize_directions = 8 + }, +/turf/open/floor/iron/textured_half{ + dir = 1 + }, +/area/engine/engineering) "kTG" = ( /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, @@ -22249,15 +22185,15 @@ /area/maintenance/department/science/central) "kUF" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/beer/light{ +/obj/item/reagent_containers/cup/glass/bottle/beer/light{ pixel_x = -8; pixel_y = 11 }, -/obj/item/reagent_containers/food/drinks/beer/light{ +/obj/item/reagent_containers/cup/glass/bottle/beer/light{ pixel_x = 9; pixel_y = 6 }, -/obj/item/reagent_containers/food/drinks/beer/light{ +/obj/item/reagent_containers/cup/glass/bottle/beer/light{ pixel_y = 3 }, /obj/effect/spawner/lootdrop/glowstick/lit, @@ -22446,7 +22382,7 @@ /area/quartermaster/qm) "lbc" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/tile/dark_green/anticorner/contrasted{ dir = 1 }, @@ -22471,6 +22407,12 @@ }, /turf/open/floor/iron/grid/steel, /area/medical/patients_rooms) +"lbJ" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/half, +/area/engine/engineering) "lbY" = ( /turf/open/floor/iron, /area/teleporter) @@ -22527,21 +22469,20 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/storage) -"ldp" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +"ldm" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 + dir = 4 }, -/obj/structure/lattice/catwalk/over, -/obj/machinery/door/window/northleft{ - dir = 2; - name = "Engi Desk"; - req_one_access_txt = "32;19" +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/catwalk_floor/iron_smooth, /area/engine/engineering) "ldt" = ( /obj/structure/railing, @@ -22555,6 +22496,20 @@ dir = 8 }, /area/hallway/primary/central) +"ldR" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/obj/item/wrench, +/turf/open/floor/iron/textured_half{ + dir = 1 + }, +/area/engine/engineering) "lea" = ( /obj/item/beacon{ pixel_y = 3 @@ -22716,6 +22671,27 @@ }, /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) +"lhP" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/bridge) "lhR" = ( /obj/effect/landmark/xeno_spawn, /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -22836,6 +22812,27 @@ "ljQ" = ( /turf/closed/wall, /area/maintenance/department/eva) +"ljY" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/lootdrop/glowstick/lit, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/iron/white/side, +/area/asteroid/paradise) +"lkr" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_access_txt = "32" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/textured_half{ + dir = 1 + }, +/area/maintenance/department/engine) "lkS" = ( /obj/structure/railing{ dir = 5 @@ -22855,12 +22852,6 @@ }, /turf/open/floor/carpet/green, /area/crew_quarters/cafeteria) -"lly" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/iron/tech, -/area/engine/atmos) "llA" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow, @@ -22873,14 +22864,6 @@ }, /turf/open/floor/plating, /area/security/brig) -"llI" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/structure/table_frame, -/obj/item/stack/rods/five, -/turf/open/floor/iron, -/area/engine/atmos) "llQ" = ( /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) @@ -22890,6 +22873,17 @@ }, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) +"lmt" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/holopad, +/obj/effect/turf_decal/box, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/iron/showroomfloor, +/area/crew_quarters/fitness/recreation) "lmF" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, /obj/effect/spawner/structure/window/depleteduranium, @@ -22993,6 +22987,12 @@ /obj/machinery/camera/directional/south, /turf/open/floor/iron/dark, /area/engine/atmos) +"loz" = ( +/obj/machinery/smartfridge{ + name = "Bulk storage" + }, +/turf/open/floor/iron, +/area/hydroponics) "loM" = ( /obj/structure/chair/fancy/sofa/old/left{ dir = 8 @@ -23013,6 +23013,21 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) +"lqa" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/half, +/area/engine/engineering) "lqc" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -23052,6 +23067,19 @@ /obj/structure/lattice, /turf/open/openspace, /area/engineering/hallway) +"lqy" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/dark/visible, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/box/white, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/maintenance/disposal/incinerator) "lqI" = ( /obj/effect/turf_decal/bot, /obj/structure/cable/yellow{ @@ -23068,22 +23096,11 @@ }, /turf/open/floor/iron, /area/janitor) -"lry" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/sign/map/echo{ - dir = 1; - name = "map - level 1"; - pixel_y = 32 - }, -/turf/open/floor/plating/asteroid/planetary, -/area/hallway/primary/fore) +"lrT" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron, +/area/maintenance/disposal/incinerator) "lsj" = ( /obj/structure/lattice/catwalk/over, /turf/open/openspace, @@ -23107,6 +23124,14 @@ }, /turf/open/openspace, /area/ai_monitored/turret_protected/aisat/maint) +"lsz" = ( +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/structure/reagent_dispensers/water_cooler, +/obj/effect/turf_decal/bot, +/obj/machinery/camera/directional/east, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron, +/area/bridge) "lsE" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -23114,7 +23139,7 @@ dir = 10 }, /obj/machinery/biogenerator, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/prison/dark, /area/security/prison) "lsH" = ( @@ -23128,19 +23153,6 @@ }, /turf/open/floor/iron/white, /area/science/robotics) -"lsV" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/ai_slipper{ - uses = 10 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "ltd" = ( /obj/structure/lattice/catwalk/over, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -23158,6 +23170,21 @@ /obj/effect/decal/cleanable/oil, /turf/open/floor/iron/sepia, /area/quartermaster/warehouse) +"lty" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/disposalpipe/multiz{ + dir = 2 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/half, +/area/engine/engineering) "ltC" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/curtain/directional{ @@ -23181,6 +23208,22 @@ /obj/structure/flora/ausbushes/ywflowers, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) +"luw" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_one_access_txt = "12;28" + }, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "lux" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/reagent_dispensers/fueltank, @@ -23189,18 +23232,6 @@ "luF" = ( /turf/open/floor/iron, /area/maintenance/department/medical/morgue) -"lvV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) "lwh" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ alpha = 180; @@ -23232,24 +23263,6 @@ }, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise/surface) -"lwX" = ( -/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, -/obj/machinery/door/airlock/medical/glass{ - name = "kitchen"; - req_one_access_txt = "28;25;35" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron, -/area/hydroponics) "lxo" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance/two, @@ -23290,15 +23303,6 @@ }, /turf/open/openspace, /area/hallway/primary/fore) -"lyd" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) "lys" = ( /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, @@ -23334,6 +23338,18 @@ /obj/machinery/portable_thermomachine, /turf/open/floor/iron, /area/maintenance/department/engine) +"lyW" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/engine/engineering) "lyZ" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/disposalpipe/segment{ @@ -23374,13 +23390,6 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/storage) -"lzQ" = ( -/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/corner, -/turf/open/floor/iron/dark, -/area/engine/engineering) "lAn" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/girder, @@ -23465,9 +23474,6 @@ }, /turf/open/floor/plating, /area/storage/tech) -"lCB" = ( -/turf/closed/wall/r_wall/rust, -/area/asteroid/paradise) "lCM" = ( /obj/structure/chair/stool/directional/west, /obj/effect/landmark/start/medical_doctor, @@ -23485,21 +23491,6 @@ "lCS" = ( /turf/closed/wall/r_wall/rust, /area/engine/engineering) -"lDe" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ - alpha = 180 - }, -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/bot, -/obj/machinery/light, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/bridge) "lDk" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -23512,14 +23503,6 @@ /obj/structure/disposalpipe/multiz, /turf/open/floor/iron, /area/maintenance/department/science/xenobiology) -"lDA" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 9 - }, -/turf/open/floor/iron/tech, -/area/engine/engineering) "lDM" = ( /obj/structure/fence/corner{ dir = 1 @@ -23548,21 +23531,6 @@ "lEg" = ( /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/aisat/foyer) -"lEt" = ( -/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ - alpha = 180 - }, -/obj/machinery/computer/message_monitor{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/dark, -/area/bridge) "lEu" = ( /turf/closed/wall, /area/quartermaster/storage) @@ -23653,6 +23621,17 @@ }, /turf/open/floor/iron, /area/maintenance/department/chapel) +"lHC" = ( +/obj/structure/reflector/box{ + anchored = 1; + dir = 1 + }, +/obj/effect/turf_decal/sand/plating, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 8 + }, +/turf/open/floor/plating/asteroid/planetary, +/area/engine/engineering) "lHU" = ( /obj/effect/turf_decal/delivery, /obj/structure/cable/yellow{ @@ -23677,19 +23656,12 @@ dir = 9 }, /area/hallway/primary/aft) -"lIt" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +"lIl" = ( +/obj/machinery/hydroponics/soil{ + alpha = 200 }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/canister, -/turf/open/floor/iron, -/area/maintenance/disposal/incinerator) +/turf/open/floor/plating/asteroid/planetary, +/area/crew_quarters/dorms) "lIu" = ( /obj/effect/turf_decal/siding/dark{ dir = 6 @@ -23707,6 +23679,14 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/iron, /area/maintenance/department/science/xenobiology) +"lIJ" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_access_txt = "12" + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/iron, +/area/hallway/primary/fore) "lIL" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -23743,10 +23723,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/engine/atmos) -"lJY" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron, -/area/asteroid/paradise) "lKa" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -23806,9 +23782,24 @@ }, /turf/open/floor/plating/dirt/planetary, /area/asteroid/paradise/surface/grass) +"lMw" = ( +/obj/machinery/atmospherics/components/unary/cryo_cell{ + dir = 8; + initialize_directions = 8 + }, +/turf/open/floor/iron/grid/steel, +/area/medical/medbay/central) "lNu" = ( /turf/closed/wall/r_wall, /area/medical/medbay/central) +"lNJ" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/power/tesla_coil, +/turf/open/floor/iron/large, +/area/engine/engineering) "lOf" = ( /obj/structure/sign/departments/minsky/security/command, /turf/closed/wall/r_wall, @@ -23872,22 +23863,6 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/iron, /area/medical/surgery) -"lPe" = ( -/obj/machinery/light_switch{ - pixel_x = 25; - pixel_y = 26 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/turf/open/floor/wood, -/area/crew_quarters/heads/captain) "lPj" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -23934,7 +23909,7 @@ /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/siding/wood, -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/cup/glass/britcup{ pixel_x = 7; pixel_y = 10 }, @@ -23944,24 +23919,6 @@ }, /turf/open/floor/carpet/blue, /area/crew_quarters/cafeteria) -"lQd" = ( -/obj/machinery/hydroponics/constructable, -/obj/effect/turf_decal/bot, -/obj/machinery/camera/directional/west, -/obj/structure/sign/warning/nosmoking/circle{ - pixel_x = -32 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/iron/grid/steel, -/area/hydroponics) "lQi" = ( /turf/open/floor/carpet/purple, /area/crew_quarters/dorms) @@ -24039,15 +23996,6 @@ /obj/effect/landmark/start/captain, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/captain/private) -"lRf" = ( -/obj/machinery/atmospherics/components/unary/shuttle/heater{ - dir = 1 - }, -/obj/structure/window/reinforced/survival_pod{ - dir = 1 - }, -/turf/open/floor/plating/dirt/planetary, -/area/asteroid/paradise/surface) "lRg" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/grille_or_trash, @@ -24066,13 +24014,9 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/medical/morgue) -"lRK" = ( -/obj/structure/flora/grass/jungle/b, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise) "lRO" = ( /obj/machinery/biogenerator, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/bot, /obj/machinery/door/window/eastright{ dir = 8; @@ -24081,15 +24025,6 @@ }, /turf/open/floor/iron, /area/hydroponics) -"lSc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron/tech, -/area/engine/engineering) "lSv" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/door/airlock/maintenance_hatch{ @@ -24227,6 +24162,12 @@ /obj/structure/flora/rock/pile, /turf/open/floor/plating/asteroid/planetary, /area/engine/engineering) +"lVl" = ( +/obj/machinery/atmospherics/components/trinary/mixer/layer4{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron, +/area/engine/atmos) "lVq" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 @@ -24254,6 +24195,10 @@ /obj/structure/ladder, /turf/open/openspace, /area/engineering/hallway) +"lVL" = ( +/obj/structure/flora/ausbushes/fullgrass, +/turf/open/floor/plating/asteroid/planetary, +/area/engine/engineering) "lVP" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable/yellow{ @@ -24308,23 +24253,6 @@ /obj/structure/flora/ausbushes/lavendergrass, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface) -"lWU" = ( -/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, -/obj/effect/decal/cleanable/food/tomato_smudge, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hydroponics) "lXL" = ( /obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/tile/black/opposingcorners{ @@ -24334,6 +24262,9 @@ /obj/structure/displaycase/labcage, /turf/open/floor/iron/white, /area/crew_quarters/heads/hor) +"lYA" = ( +/turf/closed/mineral/random/air, +/area/science/research/abandoned) "lYF" = ( /obj/machinery/power/terminal{ dir = 1 @@ -24352,23 +24283,6 @@ }, /turf/open/floor/engine, /area/ai_monitored/turret_protected/ai) -"lYU" = ( -/obj/machinery/requests_console{ - department = "Science"; - departmentType = 2; - name = "Science Requests Console"; - pixel_x = -32; - pixel_y = -33; - receive_ore_updates = 1 - }, -/obj/machinery/airalarm/directional/west, -/obj/machinery/monkey_recycler, -/obj/machinery/camera/directional/west{ - c_tag = "Xenobiology Lab"; - name = "Xeno camera" - }, -/turf/open/floor/iron/grid/steel, -/area/science/xenobiology) "lYV" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/fancy/comfy{ @@ -24419,19 +24333,6 @@ /obj/machinery/camera/directional/north, /turf/open/floor/iron, /area/medical/genetics/cloning) -"man" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) "mao" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -24443,6 +24344,12 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/ai) +"mat" = ( +/obj/structure/railing{ + dir = 9 + }, +/turf/open/openspace, +/area/maintenance/department/chapel) "maJ" = ( /obj/machinery/atmospherics/components/binary/valve{ dir = 8 @@ -24482,6 +24389,31 @@ }, /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) +"mbm" = ( +/obj/machinery/door/airlock/external/glass{ + autoclose = 0.1 + }, +/turf/open/floor/mineral/plastitanium, +/area/asteroid/paradise/surface) +"mbu" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/components/binary/pump{ + name = "Atmos to Loop" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/box/white, +/turf/open/floor/iron/half, +/area/engine/engineering) "mby" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -24521,6 +24453,12 @@ /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/iron, /area/maintenance/department/bridge) +"mbW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/ausbushes/lavendergrass, +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/engine/engineering) "mcM" = ( /obj/effect/mapping_helpers/dead_body_placer, /obj/effect/decal/cleanable/dirt/dust, @@ -24531,7 +24469,7 @@ /obj/effect/turf_decal/siding/wood/corner, /obj/structure/closet/secure_closet/captains, /obj/item/book/manual/wiki/security_space_law, -/obj/item/reagent_containers/food/drinks/flask/gold{ +/obj/item/reagent_containers/cup/glass/flask/gold{ pixel_x = 3; pixel_y = 8 }, @@ -24583,6 +24521,13 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) +"mdT" = ( +/obj/effect/spawner/structure/window/hollow/survival_pod/directional, +/obj/structure/curtain/directional{ + dir = 1 + }, +/turf/open/floor/plating, +/area/hallway/primary/fore) "meb" = ( /obj/machinery/photocopier, /obj/effect/turf_decal/bot{ @@ -24593,16 +24538,6 @@ }, /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) -"meq" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/end{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "mev" = ( /turf/closed/wall/r_wall, /area/quartermaster/qm) @@ -24618,6 +24553,19 @@ }, /turf/open/floor/iron/dark, /area/hallway/primary/aft) +"mfU" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/pool{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/chair/fancy/bench{ + dir = 8 + }, +/turf/open/floor/iron/textured_half{ + dir = 1 + }, +/area/crew_quarters/fitness/recreation) "mgk" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -24632,10 +24580,32 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/maintenance/department/bridge) +"mgo" = ( +/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, +/obj/machinery/door/airlock/medical/glass{ + name = "kitchen"; + req_one_access_txt = "28;25;35" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron, +/area/hydroponics) "mgu" = ( /obj/effect/landmark/loneops, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface/grass) +"mgw" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Mix to Ports" + }, +/obj/effect/turf_decal/box/white, +/turf/open/floor/catwalk_floor/iron, +/area/engine/atmos) "mgX" = ( /obj/machinery/cryopod{ dir = 4 @@ -24694,20 +24664,6 @@ }, /turf/open/floor/iron, /area/science/research) -"mhM" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/engineering) "mik" = ( /obj/structure/cable{ icon_state = "4-8" @@ -24721,15 +24677,6 @@ }, /turf/open/floor/iron/tech/grid, /area/ai_monitored/turret_protected/aisat_interior) -"mim" = ( -/obj/structure/chair/office{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/grid/steel, -/area/bridge) "mit" = ( /obj/structure/table, /obj/item/paicard, @@ -24747,6 +24694,14 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/plating, /area/maintenance/department/security/brig) +"mjE" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/box, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/smooth_large, +/area/engine/engineering) "mjZ" = ( /obj/machinery/flasher{ id = "AI"; @@ -24818,17 +24773,6 @@ }, /turf/open/floor/iron, /area/maintenance/department/chapel) -"mkI" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, -/obj/effect/turf_decal/bot{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/tech, -/area/engine/atmos) "mll" = ( /turf/open/openspace, /area/maintenance/department/crew_quarters/bar) @@ -24876,10 +24820,6 @@ }, /turf/open/floor/prison/dark, /area/security/prison) -"mmp" = ( -/obj/item/pipe_dispenser, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/asteroid/paradise) "mmA" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -24951,24 +24891,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/asteroid/planetary, /area/crew_quarters/dorms) -"moT" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible/layer5{ - dir = 9 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/engineering) "moU" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -25003,47 +24925,6 @@ }, /turf/open/floor/iron, /area/medical/surgery) -"mpz" = ( -/obj/structure/table, -/obj/structure/bedsheetbin, -/obj/effect/turf_decal/siding/white{ - alpha = 100 - }, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/turf/open/floor/iron/white, -/area/crew_quarters/fitness/recreation) -"mpH" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/machinery/door/window/northright{ - dir = 2; - name = "Engi Desk"; - req_one_access_txt = "32;19" - }, -/obj/item/toy/figure/engineer{ - pixel_x = 3; - pixel_y = -1 - }, -/obj/machinery/door/poddoor/preopen{ - id = "Engidesk"; - name = "engineering Security Door" - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) -"mqS" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/showroomfloor, -/area/crew_quarters/fitness/recreation) "mrb" = ( /obj/structure/railing/corner{ dir = 8 @@ -25085,15 +24966,6 @@ }, /turf/open/floor/iron, /area/science/research) -"msJ" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/ywflowers, -/obj/effect/turf_decal/sand/plating, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ - dir = 6 - }, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise) "msV" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -25103,6 +24975,14 @@ }, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface) +"mta" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/textured_half{ + dir = 1 + }, +/area/engine/engineering) "mtn" = ( /obj/structure/sign/warning/nosmoking{ pixel_x = 1 @@ -25141,38 +25021,32 @@ }, /turf/open/indestructible/sound/pool/end, /area/crew_quarters/fitness/recreation) -"muG" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" +"muJ" = ( +/turf/closed/mineral/random/air, +/area/engine/engineering) +"muR" = ( +/obj/structure/table, +/obj/structure/window/reinforced{ + dir = 4 }, -/obj/structure/table/reinforced, -/obj/item/folder/white{ - pixel_x = -5 +/obj/item/clothing/neck/stethoscope{ + pixel_x = 2; + pixel_y = -2 }, -/obj/item/holosign_creator/medical{ +/obj/item/reagent_containers/medspray/sterilizine{ pixel_x = -4; - pixel_y = 17 - }, -/obj/item/toy/figure/cmo{ - pixel_x = 5; - pixel_y = 9 - }, -/obj/item/stamp/cmo{ - pixel_x = -2 + pixel_y = 3 }, -/obj/effect/turf_decal/siding/wideplating/dark{ +/obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/computer/security/telescreen/cmo{ - dir = 1; - pixel_x = 1; - pixel_y = -32 - }, -/obj/structure/disposalpipe/segment{ - dir = 9 +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/cmo) +/obj/machinery/newscaster/directional/south, +/turf/open/floor/iron/grid/steel, +/area/medical/patients_rooms) "muU" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/decal/cleanable/dirt/dust, @@ -25211,6 +25085,18 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) +"mwd" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/turf/open/floor/iron/smooth_half{ + dir = 1 + }, +/area/engine/engineering) "mwj" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/decal/cleanable/dirt/dust, @@ -25321,21 +25207,37 @@ /obj/effect/spawner/randomvend/cola, /turf/open/floor/iron/dark, /area/medical/medbay/central) -"myl" = ( -/obj/effect/turf_decal/bot, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -2 +"myh" = ( +/obj/machinery/light{ + dir = 8 }, -/obj/item/multitool{ - pixel_x = -8; - pixel_y = 3 +/obj/structure/table, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/head/beret/atmos{ + pixel_x = 4; + pixel_y = -2 }, -/obj/structure/closet/secure_closet/hydroponics{ - req_access = null; - req_one_access_txt = "28;25;35" +/obj/item/clothing/glasses/meson{ + pixel_x = -6; + pixel_y = 7 }, -/turf/open/floor/iron/grid/steel, -/area/hydroponics) +/obj/item/clothing/glasses/meson{ + pixel_x = -6; + pixel_y = 7 + }, +/obj/item/clothing/glasses/meson/engine{ + pixel_x = 6; + pixel_y = 10 + }, +/obj/item/clothing/glasses/meson/engine{ + pixel_x = 6; + pixel_y = 10 + }, +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 8 + }, +/turf/open/floor/iron/smooth_large, +/area/engine/engineering) "myM" = ( /obj/structure/railing{ dir = 4 @@ -25462,6 +25364,52 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/security/brig) +"mBl" = ( +/obj/machinery/door/window{ + base_state = "rightsecure"; + dir = 4; + icon_state = "rightsecure"; + name = "Primary AI Core Access"; + atom_integrity = 300; + req_access_txt = "16" + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "AI Core shutters"; + name = "AI Core Shutter" + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/light_switch{ + pixel_x = 6; + pixel_y = 24 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/camera/directional/south, +/turf/open/floor/engine, +/area/ai_monitored/turret_protected/ai) +"mBs" = ( +/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer2{ + dir = 5 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/structure/window/plasma/reinforced{ + dir = 1 + }, +/obj/machinery/atmospherics/components/trinary/filter/atmos/o2/layer4{ + dir = 8 + }, +/turf/open/floor/iron/smooth_half, +/area/engine/atmos) +"mBN" = ( +/obj/effect/spawner/structure/window/hollow/survival_pod/directional, +/obj/structure/curtain/directional{ + dir = 4 + }, +/turf/open/floor/plating, +/area/hallway/primary/fore) "mBS" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -25520,22 +25468,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/storage/primary) -"mEl" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/ai_slipper{ - uses = 10 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "mEp" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -25575,28 +25507,17 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/openspace, /area/engine/atmos) -"mEJ" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "External Gas to Loop" - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "mEO" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/flora/rock/pile, /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) +"mEZ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/smooth_large, +/area/engine/engineering) "mFq" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -25615,11 +25536,6 @@ }, /turf/open/floor/iron, /area/medical/medbay/central) -"mFt" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/ywflowers, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise) "mFx" = ( /obj/structure/urinal{ dir = 1; @@ -25742,6 +25658,19 @@ }, /turf/closed/wall, /area/library/abandoned) +"mHT" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/structure/sign/painting/library{ + pixel_x = 32 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/showroomfloor, +/area/crew_quarters/fitness/recreation) "mHX" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -25865,15 +25794,14 @@ /obj/structure/closet/firecloset/full, /turf/open/floor/plating, /area/maintenance/department/bridge) -"mLQ" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/visible, -/obj/effect/decal/cleanable/dirt, +"mLH" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/cable/yellow{ - icon_state = "1-8" +/obj/structure/ladder, +/obj/structure/railing{ + dir = 1 }, -/turf/open/floor/iron/dark, -/area/maintenance/disposal/incinerator) +/turf/open/floor/pod/dark, +/area/hallway/secondary/service) "mLS" = ( /turf/closed/indestructible/riveted, /area/quartermaster/storage) @@ -26197,20 +26125,22 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/asteroid/planetary, /area/maintenance/disposal/incinerator) -"mTS" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/bot{ - dir = 1 - }, -/obj/machinery/computer/pandemic, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) "mUh" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/department/engine) +"mUA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/machinery/power/port_gen/pacman, +/obj/item/stack/sheet/mineral/plasma/ten, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/catwalk_floor/iron, +/area/engine/engineering) "mUB" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plating/asteroid/planetary, @@ -26255,6 +26185,12 @@ }, /turf/open/floor/pod/dark, /area/maintenance/department/medical/morgue) +"mVu" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plating/asteroid/planetary, +/area/engine/atmos) "mVN" = ( /obj/structure/lattice, /obj/structure/railing/corner, @@ -26378,22 +26314,6 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) -"mYS" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/holopad, -/obj/effect/turf_decal/box, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron/showroomfloor, -/area/crew_quarters/fitness/recreation) "mZd" = ( /turf/open/floor/plating/beach/coastline_b{ dir = 5 @@ -26406,6 +26326,51 @@ /mob/living/simple_animal/slime, /turf/open/floor/engine, /area/science/xenobiology) +"mZr" = ( +/obj/structure/table/reinforced, +/obj/machinery/button/door{ + id = "bridgewindows"; + name = "Bridge View Blast doors"; + pixel_x = -6; + pixel_y = -2; + req_access_txt = "19" + }, +/obj/machinery/button/door{ + id = "bridgedoors"; + name = "Bridge Access Blast door"; + pixel_x = -6; + pixel_y = 8 + }, +/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ + alpha = 180 + }, +/obj/machinery/light, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, +/obj/structure/cable/yellow, +/obj/item/camera{ + pixel_x = 2; + pixel_y = 6 + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/open/floor/iron/dark, +/area/bridge) +"mZO" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/power/apc/auto_name/directional/west{ + pixel_x = -24 + }, +/obj/structure/reagent_dispensers/fueltank, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/turf/open/floor/iron, +/area/maintenance/disposal/incinerator) "mZT" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -26445,15 +26410,6 @@ /obj/effect/landmark/start/medical_doctor, /turf/open/floor/iron/white, /area/medical/surgery) -"naX" = ( -/obj/item/kirbyplants/random, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) "nbf" = ( /obj/machinery/door/window/southleft{ dir = 1; @@ -26521,6 +26477,18 @@ slowdown = 0 }, /area/asteroid/paradise/surface) +"ncd" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/table, +/obj/machinery/plantgenes{ + pixel_y = 7 + }, +/obj/machinery/newscaster/directional/east, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron/grid/steel, +/area/hydroponics) "ncw" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -26548,11 +26516,6 @@ dir = 9 }, /area/asteroid/paradise/surface) -"ncR" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/reagent_dispensers/cooking_oil, -/turf/open/floor/iron/cafeteria, -/area/maintenance/department/medical/morgue) "ncT" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -26569,24 +26532,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) -"ndy" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 8 - }, -/obj/structure/table/reinforced, -/obj/machinery/computer/med_data/laptop{ - dir = 4; - pixel_x = 2; - pixel_y = 2 - }, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/cmo) "ndA" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -26657,37 +26602,23 @@ }, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) -"ngP" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, +"ngQ" = ( /obj/structure/cable/yellow{ - icon_state = "2-4" + icon_state = "4-8" }, -/obj/structure/cable/yellow{ - icon_state = "2-8" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "2-16" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/effect/turf_decal/trimline/yellow, -/obj/effect/landmark/start/station_engineer, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/orange/visible/layer5{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible/layer5{ dir = 4 }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "nhd" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -26744,14 +26675,13 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating, /area/quartermaster/storage) -"niN" = ( +"nip" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/trinary/filter/flipped, -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, -/turf/open/floor/iron/dark, -/area/maintenance/disposal/incinerator) +/turf/open/floor/iron/large, +/area/engine/engineering) "niR" = ( /obj/machinery/light, /obj/machinery/camera/directional/south, @@ -26771,6 +26701,11 @@ /obj/structure/marker_beacon, /turf/open/openspace, /area/engineering/hallway) +"njp" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/pickaxe, +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/science/research/abandoned) "nku" = ( /obj/structure/lattice/catwalk/over, /turf/open/openspace, @@ -26811,15 +26746,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/engine) -"nlX" = ( -/obj/machinery/power/emitter/welded{ - dir = 4 - }, -/obj/effect/turf_decal/bot, -/obj/structure/cable/yellow, -/obj/machinery/light/small, -/turf/open/floor/plating, -/area/engine/engineering) "nmv" = ( /obj/structure/sign/poster/official/moth8{ pixel_y = 31 @@ -26890,6 +26816,24 @@ /obj/structure/lattice/catwalk/over, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/maint) +"nnz" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/storage/box/lights/mixed{ + pixel_x = 4; + pixel_y = 6 + }, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil{ + pixel_x = 3; + pixel_y = -7 + }, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/turf/open/floor/iron/textured_large, +/area/engine/engineering) "nnF" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -26944,28 +26888,6 @@ /obj/machinery/digital_clock/directional/north, /turf/open/floor/pod/dark, /area/hallway/primary/aft) -"noC" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/lootdrop/glowstick/lit, -/turf/open/floor/iron/white/side, -/area/asteroid/paradise) -"noX" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer2, -/obj/structure/window/plasma/reinforced{ - dir = 1 - }, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/machinery/atmospherics/components/trinary/filter/atmos/n2/layer4{ - dir = 8 - }, -/turf/open/floor/iron, -/area/engine/atmos) "npg" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -26994,10 +26916,6 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/carpet/blue, /area/crew_quarters/cafeteria) -"npY" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible, -/turf/open/floor/iron/tech, -/area/engine/engineering) "nqk" = ( /obj/structure/extinguisher_cabinet{ pixel_y = -33 @@ -27026,12 +26944,6 @@ slowdown = 0 }, /area/asteroid/paradise/surface) -"nrc" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "nrr" = ( /obj/machinery/camera/directional/north, /turf/open/openspace, @@ -27108,12 +27020,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/bridge) -"nub" = ( -/obj/item/kirbyplants/random, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) "nuD" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/item/clothing/under/misc/assistantformal, @@ -27134,10 +27040,6 @@ }, /turf/open/floor/plating, /area/quartermaster/storage) -"nuM" = ( -/obj/structure/cable/yellow, -/turf/open/floor/plating, -/area/engine/engineering) "nuZ" = ( /obj/structure/disposalpipe/segment, /obj/machinery/firealarm/directional/east, @@ -27162,6 +27064,16 @@ /obj/structure/sign/departments/minsky/supply/cargo, /turf/closed/wall, /area/maintenance/department/engine/atmos) +"nvr" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/components/binary/valve/digital/layer4{ + name = "Waste Release" + }, +/obj/effect/turf_decal/box/white, +/turf/open/floor/iron/half, +/area/engine/engineering) "nvB" = ( /obj/structure/railing, /obj/machinery/light{ @@ -27217,6 +27129,20 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) +"nxm" = ( +/obj/machinery/air_sensor/atmos/oxygen_tank, +/obj/machinery/atmospherics/pipe/simple/green/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/yellow/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/engine/o2, +/area/engine/atmos) +"nxp" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 5 + }, +/turf/open/floor/iron/textured_large, +/area/engine/engineering) "nxt" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table, @@ -27291,14 +27217,6 @@ /obj/item/coin/gold, /turf/open/floor/carpet/orange, /area/crew_quarters/dorms) -"nye" = ( -/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hydroponics) "nyB" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -27337,6 +27255,11 @@ }, /turf/open/floor/iron, /area/security/brig) +"nyW" = ( +/obj/effect/turf_decal/sand/plating, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/engine/engineering) "nyZ" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 @@ -27359,15 +27282,6 @@ }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) -"nzj" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 1 - }, -/turf/open/floor/iron/tech, -/area/engine/atmos) "nzU" = ( /obj/effect/turf_decal/tile/black/opposingcorners{ dir = 1 @@ -27386,6 +27300,35 @@ }, /turf/open/floor/iron/white, /area/crew_quarters/heads/hor) +"nzY" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/table/reinforced, +/obj/item/folder/white{ + pixel_x = -5 + }, +/obj/item/holosign_creator/medical{ + pixel_x = -4; + pixel_y = 17 + }, +/obj/item/toy/figure/cmo{ + pixel_x = 5; + pixel_y = 9 + }, +/obj/item/stamp/cmo{ + pixel_x = -2 + }, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 8 + }, +/obj/machinery/computer/security/telescreen/cmo{ + dir = 1; + pixel_x = 1; + pixel_y = -32 + }, +/turf/open/floor/carpet/blue, +/area/crew_quarters/heads/cmo) "nzZ" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line, /obj/structure/railing, @@ -27402,15 +27345,9 @@ }, /turf/open/floor/pod/dark, /area/maintenance/department/crew_quarters/dorms) -"nAy" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/bot, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/tech, +"nAC" = ( +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating/asteroid/basalt/planetary, /area/engine/engineering) "nAD" = ( /obj/effect/spawner/structure/window/reinforced, @@ -27440,6 +27377,16 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/iron, /area/maintenance/department/science/xenobiology) +"nCG" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/textured_edge, +/area/engine/atmos) +"nCN" = ( +/obj/machinery/atmospherics/components/binary/circulator/cold{ + dir = 1 + }, +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/engine/atmos) "nCT" = ( /obj/structure/railing/corner{ dir = 4 @@ -27518,6 +27465,20 @@ /obj/structure/fans/tiny, /turf/open/floor/pod/dark, /area/maintenance/department/engine/atmos) +"nEO" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 9 + }, +/obj/structure/table, +/obj/item/stock_parts/matter_bin/super, +/obj/item/stock_parts/matter_bin/super, +/obj/item/stock_parts/micro_laser/ultra, +/obj/item/stock_parts/micro_laser/ultra, +/obj/item/screwdriver{ + pixel_y = 3 + }, +/turf/open/floor/iron/smooth_large, +/area/engine/engineering) "nEW" = ( /obj/machinery/computer/security/telescreen/minisat{ dir = 4; @@ -27582,7 +27543,7 @@ /turf/open/floor/iron/white, /area/science/lab) "nGn" = ( -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass{ pixel_x = -7; pixel_y = 6 }, @@ -27601,20 +27562,6 @@ }, /turf/open/floor/carpet/green, /area/crew_quarters/cafeteria) -"nGu" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/stripes/end{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, -/turf/open/floor/iron/tech, -/area/engine/engineering) "nGy" = ( /obj/effect/turf_decal/box, /obj/machinery/holopad, @@ -27653,6 +27600,14 @@ }, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) +"nHv" = ( +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/iron/textured_corner{ + dir = 8 + }, +/area/engine/engineering) "nHK" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -27698,35 +27653,28 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) -"nHV" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch"; - req_access_txt = "32" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +"nHR" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 4 }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 +/obj/machinery/portable_atmospherics/scrubber, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 }, -/obj/machinery/door/firedoor, -/turf/open/floor/plating, -/area/maintenance/department/engine) +/obj/machinery/light, +/turf/open/floor/iron/smooth_half, +/area/engine/atmos) "nId" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) -"nIh" = ( -/obj/machinery/vending/hydronutrients, +"nIi" = ( +/obj/machinery/chem_dispenser/mutagensaltpetersmall, /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/newscaster{ - pixel_x = 1; - pixel_y = -31 - }, /turf/open/floor/iron/grid/steel, /area/hydroponics) "nIp" = ( @@ -27795,27 +27743,25 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) -"nJy" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, +"nJm" = ( /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 +/turf/open/floor/catwalk_floor/iron_smooth, +/area/maintenance/disposal/incinerator) +"nJJ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, -/turf/open/floor/iron/dark, -/area/bridge) +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/tech/grid, +/area/ai_monitored/turret_protected/aisat_interior) "nKa" = ( /obj/structure/table/wood, /obj/item/wrench, @@ -27831,6 +27777,12 @@ }, /turf/open/floor/iron/dark, /area/science/robotics) +"nKk" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 4 + }, +/turf/open/floor/iron/textured_half, +/area/engine/engineering) "nKl" = ( /obj/structure/flora/rock, /turf/open/floor/plating/grass, @@ -27886,12 +27838,6 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/storage) -"nMG" = ( -/obj/machinery/computer/atmos_control/tank/nitrous_tank, -/obj/effect/turf_decal/bot, -/obj/item/book/manual/wiki/atmospherics, -/turf/open/floor/iron/tech, -/area/engine/atmos) "nMZ" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -27906,6 +27852,17 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/plating, /area/maintenance/department/science/central) +"nNd" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/structure/closet/secure_closet/engineering_electrical, +/obj/item/radio/intercom{ + pixel_x = 1; + pixel_y = -31 + }, +/turf/open/floor/iron/smooth_half, +/area/engine/atmos) "nNf" = ( /obj/structure/chair/fancy/bench/corporate/right{ dir = 1 @@ -27918,25 +27875,10 @@ }, /turf/open/floor/iron/dark, /area/engineering/hallway) -"nNB" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/structure/window/hollow/survival_pod/directional, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, -/area/hallway/primary/fore) "nNO" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/maintenance/department/medical/morgue) -"nNT" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise) "nNW" = ( /obj/structure/lattice, /obj/structure/railing, @@ -27993,7 +27935,7 @@ pixel_x = 9; pixel_y = 2 }, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ pixel_x = -5; pixel_y = 9 }, @@ -28005,6 +27947,24 @@ /obj/structure/flora/rock/pile, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) +"nPw" = ( +/obj/machinery/atmospherics/components/binary/pump/layer4{ + dir = 4; + name = "Port to Filter" + }, +/obj/machinery/atmospherics/components/binary/pump/layer2{ + dir = 8; + name = "Air to Ports" + }, +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/general/visible/layer5{ + dir = 4 + }, +/obj/effect/turf_decal/box/white, +/turf/open/floor/catwalk_floor/iron, +/area/engine/atmos) "nPz" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/portable_thermomachine, @@ -28016,6 +27976,18 @@ }, /turf/open/floor/wood, /area/asteroid/paradise/surface) +"nQp" = ( +/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ + alpha = 180 + }, +/obj/machinery/computer/message_monitor{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/iron/dark, +/area/bridge) "nQC" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/mineral/plastitanium, @@ -28027,13 +27999,6 @@ /obj/structure/sign/warning/securearea, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface) -"nRX" = ( -/obj/machinery/hydroponics/constructable, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/iron/grid/steel, -/area/hydroponics) "nSe" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/siding/wideplating/dark{ @@ -28148,14 +28113,6 @@ "nWb" = ( /turf/closed/wall/r_wall, /area/maintenance/department/cargo) -"nWu" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/suit_storage_unit/engine, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark, -/area/engine/engineering) "nXa" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -28166,31 +28123,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/security/brig) -"nXg" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ - dir = 4 - }, -/obj/structure/table, -/obj/item/clothing/mask/gas{ - pixel_x = -4; - pixel_y = 10 - }, -/obj/item/tank/internals/plasma{ - pixel_x = 7; - pixel_y = 7 - }, -/obj/item/analyzer{ - pixel_x = 1 - }, -/obj/item/crowbar/red{ - pixel_x = -2; - pixel_y = 11 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "nXj" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -28209,10 +28141,6 @@ }, /turf/open/floor/wood, /area/chapel/main) -"nXA" = ( -/obj/structure/flora/ausbushes/fullgrass, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise) "nXU" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Experimentation Chamber"; @@ -28389,6 +28317,9 @@ /obj/structure/flora/rock/pile, /turf/open/floor/plating/asteroid/planetary, /area/quartermaster/storage) +"odf" = ( +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/science/research/abandoned) "odM" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/small{ @@ -28396,12 +28327,6 @@ }, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/dorms) -"odU" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/bot, -/obj/machinery/field/generator, -/turf/open/floor/iron, -/area/engine/engineering) "oeh" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/techstorage/AI, @@ -28411,6 +28336,23 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/techmaint/planetary, /area/storage/tech) +"oeP" = ( +/obj/machinery/door/airlock/research/glass{ + name = "Xenobiology Lab"; + req_access_txt = "47" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/effect/turf_decal/tile/purple/fourcorners/contrasted, +/turf/open/floor/iron/white, +/area/science/xenobiology) "ofC" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/effect/decal/cleanable/blood/old, @@ -28422,27 +28364,6 @@ /obj/effect/spawner/lootdrop/glowstick/lit, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise/surface) -"ofU" = ( -/obj/machinery/hydroponics/constructable, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/turf/open/floor/iron/grid/steel, -/area/hydroponics) -"oga" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/structure/closet/secure_closet/engineering_electrical, -/obj/item/radio/intercom{ - pixel_x = 1; - pixel_y = -31 - }, -/turf/open/floor/iron, -/area/engine/atmos) "ogl" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/fans/tiny{ @@ -28466,16 +28387,23 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/engine, /area/engine/supermatter) -"ogJ" = ( -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/stripes/corner, -/obj/effect/turf_decal/siding/white{ - dir = 1 +"ogI" = ( +/obj/machinery/camera/directional/west, +/obj/structure/sign/warning/nosmoking/circle{ + pixel_x = -32 }, -/obj/structure/railing{ - dir = 1 +/obj/structure/closet/secure_closet/hydroponics{ + req_access = null; + req_one_access_txt = "28;25;35" }, -/obj/machinery/vending/wardrobe/hydro_wardrobe, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -2 + }, +/obj/item/multitool{ + pixel_x = -8; + pixel_y = 3 + }, +/obj/effect/turf_decal/bot, /turf/open/floor/iron/grid/steel, /area/hydroponics) "ohb" = ( @@ -28592,17 +28520,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/medical/morgue) -"oju" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/rnd/production/protolathe/department/engineering{ - req_access_txt = "32" - }, -/obj/structure/window/plasma/reinforced, -/turf/open/floor/iron, -/area/engine/engineering) "ojw" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/turf_decal/sand/plating, @@ -28624,25 +28541,6 @@ slowdown = 0 }, /area/asteroid/paradise/surface) -"ojT" = ( -/obj/machinery/atmospherics/components/binary/pump/layer4{ - dir = 4; - name = "Port to Filter" - }, -/obj/machinery/atmospherics/components/binary/pump/layer2{ - dir = 8; - name = "Air to Ports" - }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/tech, -/area/engine/atmos) "ojX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -28666,6 +28564,21 @@ /obj/machinery/telecomms/relay/preset/auto, /turf/open/floor/iron/dark, /area/teleporter) +"okK" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/engine/engineering) "okY" = ( /obj/structure/closet/secure_closet/personal, /obj/effect/turf_decal/bot, @@ -28741,18 +28654,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/security/warden) -"omN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/structure/sign/painting/library{ - pixel_x = 32 - }, -/turf/open/floor/iron/showroomfloor, -/area/crew_quarters/fitness/recreation) "one" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance/two, @@ -28816,6 +28717,12 @@ }, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) +"ooV" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 5 + }, +/turf/open/floor/iron/textured_half, +/area/engine/engineering) "ooY" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/turf_decal/sand/plating, @@ -28887,17 +28794,23 @@ }, /turf/open/floor/pod/dark, /area/maintenance/department/science/xenobiology) +"oqP" = ( +/obj/machinery/atmospherics/components/trinary/filter/critical{ + dir = 4 + }, +/obj/structure/sign/warning/securearea{ + pixel_y = 30 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/iron/textured_half, +/area/engine/engineering) "oqS" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/maintenance/department/engine) -"oqZ" = ( -/obj/machinery/atmospherics/components/unary/heat_exchanger{ - dir = 1 - }, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/asteroid/paradise) "orc" = ( /turf/open/floor/iron/cafeteria_red, /area/crew_quarters/cafeteria) @@ -29076,6 +28989,13 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/techmaint/planetary, /area/hallway/primary/fore) +"ouk" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/textured_large, +/area/engine/atmos) "ouA" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -29157,17 +29077,15 @@ }, /turf/open/openspace, /area/engineering/hallway) -"ovz" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 +"ovq" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = 25 }, -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 4; - initialize_directions = 4 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/smooth_half{ + dir = 1 }, -/turf/open/floor/iron/tech, -/area/engine/engineering) +/area/engine/atmos) "ovD" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/sepia/planetary{ @@ -29218,16 +29136,23 @@ /obj/structure/table/wood, /turf/open/floor/wood/broken, /area/library/abandoned) -"oxg" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 +"oxd" = ( +/obj/structure/toilet{ + pixel_x = -1; + pixel_y = 6 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/light{ - dir = 4 +/obj/machinery/button/door{ + id = "Toilet 2"; + name = "Toilet Bolt Control"; + normaldoorcontrol = 1; + pixel_y = -32; + specialfunctions = 4 }, -/turf/open/floor/iron/dark, -/area/engine/engineering) +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/small, +/obj/machinery/newscaster/directional/east, +/turf/open/floor/iron/techmaint/planetary, +/area/hallway/primary/fore) "oxj" = ( /obj/effect/turf_decal/bot{ dir = 1 @@ -29244,16 +29169,15 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron/grid/steel, /area/medical/patients_rooms) -"oyk" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ +"oyA" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/tile/purple{ dir = 4 }, -/obj/effect/turf_decal/bot{ - dir = 1 +/turf/open/floor/iron/white/side{ + dir = 9 }, -/obj/machinery/portable_atmospherics/canister, -/turf/open/floor/iron/tech, -/area/engine/atmos) +/area/science/research/abandoned) "oyM" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -29386,6 +29310,14 @@ }, /turf/open/floor/iron, /area/security/brig) +"oCm" = ( +/obj/machinery/hydroponics/constructable, +/obj/machinery/newscaster/directional/south, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron/grid/steel, +/area/hydroponics) "oCE" = ( /turf/open/openspace, /area/engine/atmos) @@ -29505,6 +29437,17 @@ "oFa" = ( /turf/closed/wall/r_wall, /area/crew_quarters/heads/cmo) +"oFj" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/machinery/camera/directional/south, +/obj/item/radio/intercom{ + dir = 1; + pixel_y = -35 + }, +/turf/open/floor/iron, +/area/security/prison) "oFn" = ( /obj/structure/window/reinforced{ dir = 4 @@ -29537,18 +29480,6 @@ }, /turf/open/floor/iron/white, /area/crew_quarters/heads/hor) -"oFu" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/engine/engineering) "oFw" = ( /obj/machinery/vending/wardrobe/det_wardrobe, /obj/item/storage/secure/safe{ @@ -29589,6 +29520,36 @@ }, /turf/open/floor/carpet/purple, /area/crew_quarters/heads/hor) +"oFM" = ( +/obj/effect/turf_decal/trimline/yellow, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "2-32" + }, +/obj/structure/lattice/catwalk/over, +/turf/open/openspace, +/area/maintenance/department/security/brig) +"oFV" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer4{ + dir = 10 + }, +/turf/open/floor/catwalk_floor/iron, +/area/engine/atmos) +"oGq" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/digital_clock/directional/east, +/turf/open/floor/iron/showroomfloor, +/area/crew_quarters/fitness/recreation) "oGy" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate, @@ -29600,23 +29561,31 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall, /area/maintenance/department/medical/morgue) +"oHz" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/components/binary/pump/on/layer4{ + dir = 8; + name = "Waste to Filter" + }, +/obj/machinery/atmospherics/components/binary/pump/on/layer2{ + dir = 4; + name = "Air to Distro"; + target_pressure = 500 + }, +/obj/machinery/atmospherics/pipe/manifold/general/visible, +/obj/machinery/atmospherics/pipe/simple/general/visible/layer5{ + dir = 4 + }, +/obj/effect/turf_decal/box/white, +/turf/open/floor/catwalk_floor/iron, +/area/engine/atmos) "oHM" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/landmark/start/cargo_technician, /turf/open/floor/iron/sepia, /area/quartermaster/storage) -"oHV" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass{ - name = "Hydroponics"; - req_one_access_txt = "28;25;35" - }, -/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hydroponics) "oIh" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/tile/blue/half{ @@ -29641,6 +29610,10 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/central) +"oIR" = ( +/obj/effect/decal/cleanable/oil, +/turf/open/floor/iron/smooth_large, +/area/engine/engineering) "oJd" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -29666,19 +29639,10 @@ "oJl" = ( /turf/closed/wall/r_wall, /area/asteroid/paradise) -"oJt" = ( -/obj/machinery/atmospherics/pipe/manifold/green/visible, -/obj/machinery/atmospherics/components/binary/pump/layer4{ - dir = 1; - name = "N2O to Pure" - }, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/structure/window/plasma/reinforced, -/turf/open/floor/iron, -/area/engine/atmos) +"oJu" = ( +/obj/machinery/vending/wardrobe/engi_wardrobe, +/turf/open/floor/iron/large, +/area/engine/engineering) "oJY" = ( /obj/structure/table/wood, /obj/item/soap{ @@ -29810,14 +29774,6 @@ }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) -"oLo" = ( -/obj/structure/ladder, -/obj/effect/turf_decal/stripes/box, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "oLK" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/stool/directional/west, @@ -29859,15 +29815,6 @@ dir = 6 }, /area/hallway/primary/aft) -"oMm" = ( -/obj/machinery/power/emitter/welded{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/obj/structure/cable/yellow, -/obj/machinery/camera/directional/south, -/turf/open/floor/plating, -/area/engine/engineering) "oMA" = ( /obj/effect/landmark/start/assistant, /obj/structure/cable/yellow{ @@ -29949,14 +29896,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/engine/atmos) -"oNv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron, -/area/engine/engineering) "oNz" = ( /obj/effect/spawner/room/threexthree, /turf/open/floor/plating, @@ -29982,20 +29921,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/fitness/recreation) -"oOA" = ( -/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, -/mob/living/simple_animal/hostile/retaliate/frog{ - attacked_sound = 'sound/effects/huuu.ogg'; - dir = 8; - name = "Larry"; - pixel_y = 12; - stepped_sound = null - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/turf/open/floor/iron, -/area/hydroponics) "oOM" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -30004,37 +29929,10 @@ /obj/machinery/telecomms/hub/preset, /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) -"oPi" = ( -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/door/airlock/research/glass{ - req_one_access_txt = "7;29" - }, -/turf/open/floor/iron/white/side{ - dir = 4 - }, -/area/science/research) "oPl" = ( /obj/structure/filingcabinet/employment, /turf/open/floor/wood/broken, /area/library/abandoned) -"oPm" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/turf/open/floor/iron/grid/steel, -/area/bridge) "oPp" = ( /obj/structure/flora/ausbushes/ywflowers, /turf/open/floor/plating/grass, @@ -30046,6 +29944,11 @@ }, /turf/open/floor/plating/asteroid/planetary, /area/crew_quarters/dorms) +"oPI" = ( +/turf/open/floor/iron/smooth_half{ + dir = 1 + }, +/area/engine/atmos) "oPR" = ( /obj/effect/turf_decal/siding/blue{ alpha = 100; @@ -30214,6 +30117,24 @@ }, /turf/open/floor/iron/white, /area/science/research) +"oTI" = ( +/obj/structure/window/plasma/reinforced{ + dir = 8 + }, +/obj/machinery/computer/atmos_control/tank/carbon_tank{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/smooth_half{ + dir = 1 + }, +/area/engine/atmos) "oUg" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -30376,24 +30297,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/library/abandoned) -"oWL" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/spawner/structure/window/depleteduranium, -/turf/open/floor/plating, -/area/asteroid/paradise) -"oWV" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 4; - initialize_directions = 4 - }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/turf/open/floor/iron/tech, -/area/engine/engineering) "oXe" = ( /turf/closed/wall, /area/maintenance/department/medical/central) @@ -30522,12 +30425,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) -"oZL" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste/layer4{ - dir = 4 - }, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/engine/atmos) "oZT" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -30558,18 +30455,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/maintenance/department/eva) -"pbi" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 8; - name = "Gas to Filter" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "pbq" = ( /obj/machinery/door/airlock/command{ name = "Head of Personnel's Office"; @@ -30589,24 +30474,6 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/crew_quarters/heads/hop) -"pbw" = ( -/obj/machinery/door/airlock{ - name = "Hydroponics"; - req_one_access_txt = "28;25;35" - }, -/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron, -/area/hydroponics) "pcm" = ( /obj/structure/closet/crate/science, /obj/effect/turf_decal/stripes/line{ @@ -30715,13 +30582,6 @@ }, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface) -"pei" = ( -/obj/item/seeds/tea, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, -/obj/machinery/hydroponics, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) "peN" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -30774,22 +30634,6 @@ }, /turf/open/floor/engine, /area/science/xenobiology) -"pfU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/atmos) "pgl" = ( /obj/machinery/firealarm/directional/north, /obj/structure/lattice/catwalk/over, @@ -30802,6 +30646,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) +"pgG" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/engine/atmos) "pgR" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -30827,6 +30675,18 @@ }, /turf/open/openspace, /area/crew_quarters/kitchen) +"phn" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/grid/steel, +/area/bridge) "pij" = ( /obj/structure/sign/departments/minsky/research/research, /turf/closed/wall/r_wall, @@ -30885,11 +30745,6 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron/dark, /area/medical/morgue) -"pjQ" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/machinery/camera/directional/east, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/asteroid/paradise) "pjU" = ( /obj/item/kirbyplants/random{ pixel_x = -6; @@ -30926,28 +30781,6 @@ /obj/structure/railing/corner, /turf/open/floor/iron/dark/side, /area/hallway/primary/central) -"pkH" = ( -/obj/machinery/chem_master/condimaster, -/obj/structure/railing{ - dir = 4 - }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) -"pkS" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron, -/area/engine/engineering) "pkZ" = ( /obj/structure/flora/grass/jungle/b, /obj/structure/flora/ausbushes/fullgrass, @@ -31011,12 +30844,24 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/science/mixing) -"plL" = ( -/obj/effect/turf_decal/siding/white/end{ - alpha = 100 +"plS" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/plating/asteroid/planetary, -/area/crew_quarters/dorms) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/bridge) "pmc" = ( /turf/open/floor/iron/dark/side{ dir = 4 @@ -31051,18 +30896,19 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/plating, /area/maintenance/department/engine/atmos) -"pnF" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/stripes/line{ +"pnv" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ - dir = 4 +/obj/machinery/atmospherics/components/binary/pump/layer2{ + name = "O2 to Pure" }, -/turf/open/floor/iron/dark, -/area/engine/engineering) +/obj/structure/window/plasma/reinforced{ + dir = 1 + }, +/obj/effect/turf_decal/box/white, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/engine/atmos) "pnX" = ( /turf/closed/wall, /area/engineering/hallway) @@ -31070,6 +30916,17 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engine/atmos) +"pon" = ( +/obj/machinery/door/airlock/engineering/glass{ + name = "Power Monitoring"; + req_access_txt = "32" + }, +/obj/machinery/door/firedoor, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/iron/smooth_large, +/area/engine/engineering) "poA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -31130,11 +30987,6 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/crew_quarters/cafeteria) -"pqU" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise) "prd" = ( /obj/structure/chair/fancy/shuttle{ dir = 1 @@ -31142,6 +30994,28 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/mineral/plastitanium, /area/asteroid/paradise/surface) +"prO" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/item/stack/cable_coil{ + amount = 5 + }, +/turf/open/floor/iron/white/side{ + dir = 1 + }, +/area/science/research/abandoned) +"psa" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/siding/dark/end{ + dir = 8 + }, +/turf/open/floor/glass/reinforced, +/area/bridge) "psm" = ( /obj/effect/spawner/lootdrop/aimodule_neutral, /obj/effect/spawner/lootdrop/aimodule_neutral, @@ -31204,15 +31078,6 @@ "pub" = ( /turf/open/openspace, /area/maintenance/department/security/brig) -"puI" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron, -/area/engine/engineering) "pvV" = ( /obj/machinery/iv_drip, /turf/open/floor/iron/grid/steel, @@ -31231,24 +31096,6 @@ /obj/structure/closet/firecloset/full, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/bar) -"pwo" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/table, -/obj/item/storage/belt/utility/full/engi, -/obj/item/rcl/pre_loaded, -/obj/item/rcl/pre_loaded, -/obj/item/clothing/ears/earmuffs{ - pixel_x = -3; - pixel_y = -2 - }, -/obj/item/clothing/ears/earmuffs{ - pixel_x = -5; - pixel_y = 6 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "pwy" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/closet/crate/miningcar{ @@ -31320,19 +31167,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/maintenance/department/cargo) -"pyo" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/sign/map/echo{ - dir = 4; - name = "map - level 3"; - pixel_y = 32 - }, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise/surface) "pyq" = ( /obj/structure/lattice/catwalk/over, /obj/structure/chair/foldable{ @@ -31389,6 +31223,18 @@ /obj/structure/sign/warning/fire, /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) +"pzC" = ( +/obj/effect/turf_decal/pool{ + dir = 8 + }, +/obj/structure/closet/athletic_mixed, +/obj/item/pool/rubber_ring, +/obj/item/pool/pool_noodle, +/obj/item/pool/pool_noodle, +/turf/open/floor/iron/textured_half{ + dir = 1 + }, +/area/crew_quarters/fitness/recreation) "pzG" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ alpha = 180; @@ -31435,32 +31281,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/science/central) -"pBl" = ( -/obj/structure/railing/corner, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/door/airlock/atmos/glass{ - req_access_txt = "11" - }, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible/layer5{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/engine/atmos) "pBm" = ( /obj/item/trash/waffles, /turf/open/floor/plating/beach/coastline_b{ @@ -31638,18 +31458,6 @@ "pEv" = ( /turf/closed/wall, /area/storage/primary) -"pFh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/dark/visible, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/catwalk_floor/iron_dark, -/area/maintenance/disposal/incinerator) "pFA" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -31663,10 +31471,26 @@ }, /turf/open/floor/iron/dark, /area/security/brig) +"pFP" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 4; + initialize_directions = 4 + }, +/turf/open/floor/iron/textured_half{ + dir = 1 + }, +/area/engine/engineering) "pFV" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/hallway/primary/central) +"pGd" = ( +/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer4{ + dir = 5 + }, +/turf/open/floor/catwalk_floor/iron, +/area/engine/atmos) "pGn" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/disposalpipe/segment{ @@ -31684,35 +31508,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) -"pGC" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/vending/wallmed{ - pixel_x = -32 - }, -/obj/machinery/camera/directional/north, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer_2, -/turf/open/floor/iron/grid/steel, -/area/medical/medbay/central) -"pHp" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/engine/engineering) "pHw" = ( /obj/structure/bed{ dir = 4 @@ -31775,6 +31570,19 @@ /obj/machinery/atmospherics/pipe/simple/cyan/visible, /turf/open/floor/plating, /area/engine/supermatter) +"pIN" = ( +/obj/machinery/atmospherics/components/trinary/filter/critical{ + dir = 4; + filter_type = "n2" + }, +/obj/structure/sign/warning/securearea{ + pixel_y = 30 + }, +/turf/open/floor/iron/textured_half, +/area/engine/engineering) +"pJb" = ( +/turf/open/floor/iron/smooth_large, +/area/engine/engineering) "pKj" = ( /obj/structure/flora/rock/pile, /obj/effect/turf_decal/sand/plating, @@ -31803,20 +31611,6 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/carpet/blue, /area/crew_quarters/cafeteria) -"pKz" = ( -/obj/machinery/door/window/brigdoor/southright{ - dir = 4; - name = "Command Chair"; - req_access_txt = "19" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/iron/grid/steel, -/area/bridge) "pLd" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -31917,6 +31711,18 @@ /obj/structure/cable/yellow, /turf/open/floor/carpet/green, /area/chapel/main) +"pMT" = ( +/obj/machinery/atmospherics/pipe/manifold/general/visible{ + dir = 1 + }, +/obj/machinery/meter, +/obj/machinery/atmospherics/components/binary/pump/layer4{ + dir = 4; + name = "Pure to Ports" + }, +/obj/effect/turf_decal/box/white, +/turf/open/floor/catwalk_floor/iron, +/area/engine/atmos) "pMW" = ( /turf/closed/wall/r_wall/rust, /area/maintenance/department/engine) @@ -31927,12 +31733,6 @@ }, /turf/open/floor/pod/dark, /area/maintenance/department/science/central) -"pNb" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/tech, -/area/engine/engineering) "pNf" = ( /obj/effect/turf_decal/tile/dark_red/corner_ramp{ alpha = 180; @@ -31970,21 +31770,6 @@ }, /turf/open/floor/iron/white, /area/science/research) -"pOA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/engineering) "pOE" = ( /obj/structure/disposalpipe/junction{ dir = 1 @@ -32032,6 +31817,15 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/maintenance/department/engine/atmos) +"pRa" = ( +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/ausbushes/ywflowers, +/obj/effect/turf_decal/sand/plating, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ + dir = 6 + }, +/turf/open/floor/plating/asteroid/planetary, +/area/engine/engineering) "pRe" = ( /obj/structure/fence{ dir = 8 @@ -32055,6 +31849,51 @@ }, /turf/open/floor/iron, /area/science/lab) +"pSz" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/northleft{ + dir = 2; + name = "Engi Desk"; + req_one_access_txt = "32;19" + }, +/obj/item/paper_bin{ + pixel_x = 7; + pixel_y = 2 + }, +/obj/item/pen{ + pixel_x = 7; + pixel_y = 4 + }, +/obj/structure/desk_bell{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/machinery/door/poddoor/preopen{ + id = "Engidesk"; + name = "engineering Security Door" + }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/turf/open/floor/iron/smooth_large, +/area/engine/engineering) +"pSH" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/door/airlock/atmos{ + name = "Incinerator"; + req_access_txt = "11" + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/dark/visible, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/maintenance/disposal/incinerator) "pSN" = ( /obj/effect/turf_decal/siding/blue{ alpha = 100; @@ -32065,6 +31904,19 @@ "pSY" = ( /turf/open/floor/plating, /area/maintenance/department/chapel) +"pSZ" = ( +/obj/machinery/computer/station_alert{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/west{ + cell_type = /obj/item/stock_parts/cell/hyper; + pixel_x = -24 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/turf/open/floor/iron/large, +/area/engine/engineering) "pTs" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/structure/flora/ausbushes/lavendergrass, @@ -32203,37 +32055,13 @@ /obj/machinery/portable_atmospherics/pump, /turf/open/floor/iron/dark, /area/science/mixing) -"pUZ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/button/door/incinerator_vent_atmos_aux{ - pixel_x = 24; - pixel_y = 8; - req_one_access = null; - req_one_access_txt = "11" - }, -/obj/machinery/button/door/incinerator_vent_atmos_main{ - pixel_x = 24; - pixel_y = -8; - req_one_access = null; - req_one_access_txt = "11" - }, -/obj/machinery/button/ignition/incinerator/atmos{ - pixel_x = 38; - pixel_y = -7 - }, +"pVf" = ( +/obj/machinery/vending/hydronutrients, /obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/computer/turbine_computer{ - dir = 1; - id = "incineratorturbineRight"; - name = "gas turbine right control computer" + dir = 4 }, -/turf/open/floor/iron, -/area/maintenance/disposal/incinerator) +/turf/open/floor/iron/grid/steel, +/area/hydroponics) "pVj" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/power/apc/auto_name/directional/east{ @@ -32431,12 +32259,8 @@ }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/captain) -"pXA" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) "pXT" = ( -/obj/item/reagent_containers/food/drinks/bottle/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = 6; pixel_y = 27 }, @@ -32449,28 +32273,11 @@ "pYd" = ( /turf/open/floor/wood/broken, /area/hallway/secondary/service) -"pYm" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/scrubber, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/machinery/light, -/turf/open/floor/iron/dark, -/area/engine/atmos) "pZC" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/department/science/central) -"pZZ" = ( -/obj/structure/flora/junglebush/large, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/asteroid/paradise) "qah" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -32481,30 +32288,17 @@ /obj/structure/fence, /turf/open/floor/plating/dirt/planetary, /area/asteroid/paradise/surface/grass) -"qaU" = ( -/turf/open/floor/iron, -/area/maintenance/department/crew_quarters/dorms) -"qbd" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Engineering Foyer"; - req_one_access_txt = "32" - }, -/obj/machinery/door/firedoor, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" +"qaO" = ( +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/turf/open/floor/iron/smooth_half{ dir = 1 }, -/turf/open/floor/iron/dark, /area/engine/engineering) +"qaU" = ( +/turf/open/floor/iron, +/area/maintenance/department/crew_quarters/dorms) "qbh" = ( /obj/machinery/door/airlock/command{ name = "Council Chamber"; @@ -32528,30 +32322,6 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/heads/captain) -"qbo" = ( -/obj/machinery/door/window{ - base_state = "rightsecure"; - dir = 4; - icon_state = "rightsecure"; - name = "Primary AI Core Access"; - obj_integrity = 300; - req_access_txt = "16" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "AI Core shutters"; - name = "AI Core Shutter" - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/light_switch{ - pixel_x = 6; - pixel_y = 24 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/camera/directional/south, -/turf/open/floor/engine, -/area/ai_monitored/turret_protected/ai) "qbw" = ( /obj/structure/lattice/catwalk/over, /obj/item/wirecutters{ @@ -32587,9 +32357,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/sepia, /area/quartermaster/storage) -"qcU" = ( -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/engine/atmos) "qcV" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -32599,17 +32366,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) -"qdc" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 1 - }, -/obj/machinery/meter, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/tech, -/area/engine/atmos) "qdf" = ( /obj/machinery/power/smes, /obj/structure/cable/yellow{ @@ -32648,25 +32404,6 @@ }, /turf/open/floor/iron/techmaint/planetary, /area/storage/tech) -"qdO" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch"; - req_one_access_txt = "12;5"; - security_level = 6 - }, -/turf/open/floor/plating, -/area/maintenance/department/medical/morgue) -"qdZ" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/turf/open/floor/iron/grid/steel, -/area/medical/medbay/central) "qeb" = ( /obj/effect/spawner/structure/window, /obj/structure/barricade/wooden/crude, @@ -32753,28 +32490,6 @@ /obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/maintenance/department/engine/atmos) -"qhg" = ( -/obj/structure/table, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/item/clothing/neck/stethoscope{ - pixel_x = 2; - pixel_y = -2 - }, -/obj/item/reagent_containers/medspray/sterilizine{ - pixel_x = -4; - pixel_y = 3 - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/grid/steel, -/area/medical/patients_rooms) "qhq" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -32846,7 +32561,7 @@ pixel_x = -8; pixel_y = 15 }, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = 6; pixel_y = 3 }, @@ -32935,10 +32650,6 @@ }, /turf/open/floor/iron/dark, /area/security/brig) -"qkE" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/cafeteria, -/area/maintenance/department/medical/morgue) "qkM" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -32973,6 +32684,14 @@ }, /turf/open/floor/engine, /area/security/nuke_storage) +"qlB" = ( +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/machinery/power/smes/engineering, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/turf/open/floor/iron/large, +/area/engine/engineering) "qlD" = ( /obj/machinery/door/poddoor{ id = "toxinsdriver"; @@ -32981,13 +32700,6 @@ /obj/structure/fans/tiny, /turf/open/floor/iron/techmaint/planetary, /area/science/mixing) -"qlO" = ( -/obj/item/seeds/flower/harebell, -/obj/machinery/light/small, -/obj/effect/turf_decal/delivery, -/obj/machinery/hydroponics, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) "qlS" = ( /obj/effect/spawner/structure/window, /obj/structure/disposalpipe/segment{ @@ -33004,14 +32716,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/maintenance/department/eva) -"qnE" = ( -/obj/structure/flora/junglebush/c, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 8 - }, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise) "qnY" = ( /obj/structure/flora/ausbushes/lavendergrass, /turf/open/floor/plating/asteroid/planetary, @@ -33048,22 +32752,19 @@ }, /turf/open/floor/iron/dark, /area/bridge/meeting_room) -"qpb" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/components/binary/volume_pump{ - dir = 8; - name = "Loop to Gas Output" - }, -/obj/machinery/atmospherics/pipe/simple/green/visible, -/turf/open/floor/iron/dark, -/area/engine/engineering) "qpc" = ( /obj/machinery/portable_thermomachine, /turf/open/floor/iron, /area/engine/atmos) +"qpg" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/half, +/area/engine/engineering) "qph" = ( /obj/structure/railing/corner{ dir = 4 @@ -33093,11 +32794,42 @@ "qpS" = ( /turf/closed/mineral/random/air, /area/maintenance/disposal) +"qqo" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/smooth_half, +/area/engine/atmos) "qqB" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/start/lawyer, /turf/open/floor/plating, /area/library/abandoned) +"qrw" = ( +/obj/machinery/door/window/brigdoor/southright{ + dir = 4; + name = "Command Chair"; + req_access_txt = "19" + }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/holopad, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/grid/steel, +/area/bridge) +"qrK" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/structure/disposalpipe/junction/flip{ + dir = 4 + }, +/turf/open/floor/iron/white/side{ + dir = 8 + }, +/area/science/research) "qrO" = ( /obj/machinery/conveyor{ dir = 4; @@ -33175,28 +32907,17 @@ }, /turf/open/floor/wood, /area/crew_quarters/cafeteria) -"qtl" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/power/tesla_coil, -/turf/open/floor/iron, -/area/engine/engineering) "qtv" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) -"qtB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible/layer5{ - dir = 9 +"qtw" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/iron/tech, -/area/engine/atmos) +/turf/open/floor/iron/grid/steel, +/area/medical/medbay/central) "qtI" = ( /turf/open/openspace, /area/bridge) @@ -33255,6 +32976,13 @@ }, /turf/open/floor/iron, /area/security/brig) +"qvT" = ( +/obj/item/beacon, +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/turf/open/floor/glass/reinforced, +/area/bridge) "qvZ" = ( /obj/structure/lattice, /turf/open/openspace, @@ -33307,15 +33035,6 @@ /obj/machinery/portable_thermomachine, /turf/open/floor/plating, /area/maintenance/department/bridge) -"qwZ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/iron, -/area/engine/atmos) "qxC" = ( /obj/structure/table/wood/fancy/blue, /obj/item/radio/intercom{ @@ -33340,16 +33059,6 @@ dir = 4 }, /area/hallway/primary/central) -"qyw" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/bot{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/engine/atmos) "qyG" = ( /obj/structure/table/wood, /obj/item/toy/figure/mime{ @@ -33415,6 +33124,17 @@ }, /turf/open/floor/carpet/blue, /area/bridge/meeting_room) +"qzH" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/catwalk_floor/iron_white, +/area/crew_quarters/fitness/recreation) "qAj" = ( /obj/structure/chair/wood/wings, /turf/open/floor/carpet/green, @@ -33460,16 +33180,6 @@ /obj/machinery/camera/directional/east, /turf/open/floor/iron/dark, /area/hallway/primary/fore) -"qBw" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/machinery/atmospherics/components/binary/valve/digital/layer4{ - name = "Waste Release" - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/engine/engineering) "qBy" = ( /obj/machinery/light_switch{ pixel_x = -24; @@ -33481,6 +33191,15 @@ "qCg" = ( /turf/open/floor/plating/beach/deep_water, /area/asteroid/paradise/surface/water) +"qCi" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 + }, +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/engine/engineering) "qCv" = ( /turf/open/floor/iron, /area/hallway/primary/fore) @@ -33513,28 +33232,20 @@ /obj/machinery/telecomms/processor/preset_four, /turf/open/floor/circuit/telecomms/mainframe, /area/tcommsat/server) +"qEu" = ( +/obj/structure/sign/poster/official/moth1{ + pixel_y = -32 + }, +/obj/machinery/firealarm/directional/east, +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/iron/grid/steel, +/area/hydroponics) "qFF" = ( /turf/open/floor/wood, /area/crew_quarters/heads/captain) -"qFI" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/sign/map/echo{ - name = "map - level 2"; - pixel_y = 32 - }, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise/surface) -"qGa" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/machinery/light/small, -/turf/open/floor/iron/tech, -/area/engine/engineering) "qGg" = ( /turf/closed/wall, /area/maintenance/department/engine/atmos) @@ -33601,6 +33312,19 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/pod/dark, /area/maintenance/department/science/central) +"qIB" = ( +/obj/effect/turf_decal/tile/purple/anticorner/contrasted, +/obj/structure/table_frame, +/obj/item/stack/sheet/glass/fifty{ + pixel_x = -2; + pixel_y = 3 + }, +/obj/item/slime_scanner{ + pixel_x = 6; + pixel_y = -2 + }, +/turf/open/floor/iron, +/area/science/research/abandoned) "qIX" = ( /obj/docking_port/stationary{ dwidth = 3; @@ -33640,6 +33364,12 @@ "qJS" = ( /turf/closed/wall/r_wall, /area/crew_quarters/cafeteria) +"qKF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/bot, +/obj/machinery/power/emitter, +/turf/open/floor/iron/large, +/area/engine/engineering) "qKI" = ( /obj/machinery/portable_atmospherics/scrubber, /obj/effect/turf_decal/bot{ @@ -33671,7 +33401,7 @@ "qMj" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/structure/table, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/cup/glass/coffee{ pixel_x = 9; pixel_y = 6 }, @@ -33691,6 +33421,14 @@ }, /turf/open/floor/plating/dirt/planetary, /area/asteroid/paradise/surface/grass) +"qMz" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/pump, +/obj/effect/turf_decal/box/white, +/turf/open/floor/iron/textured_large, +/area/engine/engineering) "qMI" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -33727,13 +33465,6 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/wood, /area/crew_quarters/heads/hop) -"qOg" = ( -/obj/machinery/suit_storage_unit/atmos, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/bot, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/iron, -/area/engine/engineering) "qOn" = ( /obj/structure/table/wood, /obj/item/soap/nanotrasen, @@ -33761,6 +33492,27 @@ }, /turf/open/floor/pod/dark, /area/science/mixing) +"qOI" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 10 + }, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/engine/engineering) "qON" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -33777,6 +33529,12 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) +"qPq" = ( +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "qPS" = ( /obj/structure/railing/corner{ dir = 1 @@ -33800,14 +33558,6 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/sorting) -"qQD" = ( -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/machinery/power/smes/engineering, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/engine/engineering) "qQU" = ( /obj/machinery/power/apc/auto_name/directional/south{ pixel_y = -24 @@ -33842,19 +33592,32 @@ /obj/structure/barricade/wooden, /turf/open/floor/iron, /area/maintenance/department/science/xenobiology) -"qRB" = ( -/obj/machinery/atmospherics/components/unary/cryo_cell, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/grid/steel, -/area/medical/medbay/central) "qRZ" = ( /obj/structure/fence/corner{ dir = 6 }, /turf/open/floor/plating/dirt/jungle/wasteland, /area/asteroid/paradise/surface) +"qSb" = ( +/obj/structure/table/reinforced, +/obj/structure/desk_bell{ + pixel_x = 5; + pixel_y = 10 + }, +/obj/item/origami/paperfrog{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/machinery/door/window/eastleft{ + dir = 8; + name = "Hydroponics Desk"; + req_one_access_txt = "28;25;35" + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hydroponics) "qSp" = ( /obj/structure/sign/warning/radiation_shelter{ pixel_x = 1; @@ -33952,15 +33715,6 @@ /obj/structure/railing, /turf/open/floor/iron, /area/bridge) -"qUr" = ( -/obj/effect/turf_decal/stripes/line, -/obj/item/kirbyplants/random, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/iron, -/area/engine/atmos) "qUt" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -33991,16 +33745,22 @@ /obj/structure/closet/emcloset/anchored, /turf/open/floor/iron, /area/maintenance/department/science/central) -"qUD" = ( -/obj/structure/flora/ash/tall_shroom, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise) "qUJ" = ( /obj/machinery/clonepod/prefilled, /obj/effect/turf_decal/bot, /obj/machinery/airalarm/directional/north, /turf/open/floor/iron, /area/medical/genetics/cloning) +"qUU" = ( +/obj/machinery/atmospherics/components/trinary/filter/atmos/n2o{ + dir = 4 + }, +/obj/structure/window/plasma/reinforced, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/smooth_half, +/area/engine/atmos) "qUZ" = ( /obj/structure/cable{ icon_state = "1-8" @@ -34021,6 +33781,12 @@ }, /turf/open/floor/carpet/red, /area/crew_quarters/theatre/backstage) +"qVf" = ( +/obj/structure/railing{ + dir = 5 + }, +/turf/open/floor/glass/reinforced/plasma, +/area/maintenance/department/eva) "qVj" = ( /obj/structure/rack, /turf/open/floor/plating, @@ -34085,13 +33851,6 @@ }, /turf/open/floor/iron/techmaint/planetary, /area/storage/tech) -"qWI" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron, -/area/engine/engineering) "qWJ" = ( /obj/machinery/door/window/southleft{ dir = 4; @@ -34119,6 +33878,10 @@ dir = 9 }, /area/hallway/primary/aft) +"qXs" = ( +/obj/structure/flora/ausbushes/fullgrass, +/turf/open/floor/plating/asteroid/planetary, +/area/engine/atmos) "qXt" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 @@ -34134,6 +33897,19 @@ }, /turf/open/floor/iron, /area/bridge) +"qXA" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/structure/table, +/obj/item/pickaxe, +/obj/machinery/firealarm/directional/north, +/obj/item/clothing/mask/gas/explorer{ + pixel_x = -5; + pixel_y = 6 + }, +/turf/open/floor/iron/smooth_half, +/area/engine/atmos) "qXE" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -34192,6 +33968,13 @@ }, /turf/open/floor/iron, /area/maintenance/department/medical/morgue) +"qYq" = ( +/obj/structure/flora/rock/pile, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating/asteroid/planetary, +/area/engine/atmos) "qYu" = ( /obj/item/storage/fancy/donut_box{ name = "Holy donut box"; @@ -34242,18 +34025,6 @@ /obj/structure/flora/tree/jungle, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface) -"qZw" = ( -/obj/machinery/power/solar_control, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/effect/turf_decal/bot, -/obj/machinery/light/floor, -/turf/open/floor/iron/techmaint/planetary, -/area/hallway/primary/fore) "qZA" = ( /obj/structure/closet/secure_closet/miner, /obj/effect/turf_decal/bot, @@ -34319,16 +34090,15 @@ }, /turf/open/floor/plating/asteroid/planetary, /area/hallway/primary/fore) -"raX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ - dir = 8 - }, -/turf/open/floor/iron/tech, -/area/engine/atmos) "rba" = ( /turf/closed/wall, /area/maintenance/department/cargo) +"rbq" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/iron, +/area/maintenance/department/science/xenobiology) "rbu" = ( /obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/bot, @@ -34362,13 +34132,6 @@ }, /turf/open/floor/iron, /area/security/brig) -"rcr" = ( -/obj/structure/sign/departments/minsky/supply/hydroponics{ - pixel_x = -33 - }, -/obj/effect/turf_decal/tile/dark_green, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) "rcx" = ( /obj/structure/railing{ dir = 4 @@ -34469,6 +34232,12 @@ }, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/bar) +"reT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/bot, +/obj/machinery/field/generator, +/turf/open/floor/iron/large, +/area/engine/engineering) "reY" = ( /obj/machinery/atmospherics/pipe/multiz/layer4, /obj/machinery/atmospherics/pipe/multiz/layer2, @@ -34509,14 +34278,8 @@ /obj/machinery/digital_clock/directional/north, /turf/open/floor/iron, /area/bridge) -"rfT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/catwalk_floor/iron_dark, +"rfX" = ( +/turf/open/floor/iron/textured_large, /area/engine/engineering) "rgj" = ( /obj/effect/turf_decal/delivery, @@ -34661,6 +34424,24 @@ }, /turf/open/floor/iron/white, /area/science/lab) +"riL" = ( +/obj/structure/table, +/obj/item/pipe_dispenser{ + pixel_y = 7 + }, +/obj/item/pipe_dispenser{ + pixel_x = 1; + pixel_y = 12 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 5 + }, +/obj/machinery/light_switch/directional/west, +/obj/item/card/id/job/atmospheric_technician{ + access = list(11) + }, +/turf/open/floor/iron/smooth_large, +/area/engine/engineering) "riT" = ( /obj/machinery/button/door{ id = "meetingshutter"; @@ -34703,6 +34484,16 @@ }, /turf/open/floor/prison, /area/security/prison) +"rjR" = ( +/obj/structure/flora/ash/stem_shroom, +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/engine/atmos) +"rjV" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste/layer4{ + dir = 4 + }, +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/engine/engineering) "rjX" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, @@ -34733,29 +34524,6 @@ /obj/structure/chair/stool/directional/west, /turf/open/floor/iron, /area/medical/medbay/central) -"rkR" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 5 - }, -/obj/structure/table, -/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ - alpha = 230; - color = "#edaa0c" - }, -/obj/item/book/manual/wiki/atmospherics{ - pixel_x = 5; - pixel_y = 3 - }, -/obj/item/clothing/head/utility/welding{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/clothing/head/utility/welding{ - pixel_x = -3; - pixel_y = 7 - }, -/turf/open/floor/iron, -/area/engine/atmos) "rlk" = ( /obj/structure/ore_box, /obj/item/pickaxe, @@ -34843,6 +34611,25 @@ /obj/structure/cable/yellow, /turf/open/floor/plating, /area/ai_monitored/security/armory) +"rmB" = ( +/obj/machinery/light_switch{ + pixel_x = 25; + pixel_y = 26 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/newscaster{ + pixel_y = 30 + }, +/turf/open/floor/wood, +/area/crew_quarters/heads/captain) "rmX" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/conveyor/inverted{ @@ -34858,7 +34645,7 @@ "rnq" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/item/clothing/under/suit/tan, -/obj/item/reagent_containers/food/drinks/bottle/champagne{ +/obj/item/reagent_containers/cup/glass/bottle/champagne{ pixel_x = 6; pixel_y = 10 }, @@ -34872,6 +34659,14 @@ /obj/structure/lattice, /turf/open/openspace, /area/engineering/hallway) +"rnC" = ( +/obj/machinery/power/emitter/welded{ + dir = 4 + }, +/obj/structure/cable/yellow, +/obj/machinery/light/small, +/turf/open/floor/plating, +/area/engine/engineering) "rnE" = ( /obj/machinery/light_switch{ pixel_x = -24; @@ -34976,6 +34771,17 @@ /obj/machinery/portable_thermomachine, /turf/open/floor/iron/dark, /area/hallway/primary/central) +"rpd" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/green/visible{ + dir = 4 + }, +/turf/open/floor/iron/smooth_half{ + dir = 1 + }, +/area/engine/engineering) "rpq" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -34993,12 +34799,6 @@ }, /turf/open/floor/iron/dark, /area/bridge/meeting_room) -"rpH" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/open/openspace, -/area/hydroponics) "rpV" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -35048,24 +34848,6 @@ /obj/effect/spawner/room/fivexthree, /turf/open/floor/plating, /area/maintenance/department/science/central) -"rrt" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 10 - }, -/turf/open/floor/iron, -/area/engine/engineering) "rrC" = ( /obj/structure/sign/departments/minsky/security/security, /turf/closed/wall/r_wall, @@ -35080,15 +34862,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/teleporter) -"rsi" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/machinery/power/port_gen/pacman, -/obj/item/stack/sheet/mineral/plasma/ten, -/turf/open/floor/plating, -/area/engine/engineering) "rsH" = ( /obj/effect/turf_decal/numbers{ dir = 1 @@ -35152,17 +34925,32 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/storage/primary) -"ruw" = ( -/obj/effect/turf_decal/tile/neutral{ +"rui" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible/layer4{ dir = 4 }, -/obj/structure/disposalpipe/junction/flip{ - dir = 4 +/obj/structure/table, +/obj/item/storage/belt/utility, +/obj/item/radio/intercom{ + pixel_y = 29 }, -/turf/open/floor/iron/dark/corner{ - dir = 8 +/obj/item/t_scanner{ + pixel_x = 4; + pixel_y = 5 }, -/area/hallway/primary/fore) +/obj/item/t_scanner{ + pixel_x = -2; + pixel_y = 3 + }, +/obj/item/clothing/gloves/color/black{ + pixel_x = -3 + }, +/obj/item/t_scanner, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/smooth_half, +/area/engine/atmos) "ruO" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 6 @@ -35177,6 +34965,14 @@ }, /turf/open/floor/carpet/orange, /area/quartermaster/qm) +"ruV" = ( +/obj/machinery/firealarm/directional/south, +/obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 4 + }, +/turf/open/floor/iron/smooth_half, +/area/engine/engineering) "ruX" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -35200,6 +34996,13 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/foyer) +"rwj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/bot, +/obj/machinery/power/emitter, +/turf/open/floor/iron/large, +/area/engine/engineering) "rwn" = ( /obj/effect/turf_decal/siding/white{ dir = 8 @@ -35240,20 +35043,6 @@ "rxi" = ( /turf/open/floor/plating/dirt/planetary, /area/asteroid/paradise/surface) -"rxA" = ( -/obj/structure/table, -/obj/item/shovel/spade, -/obj/item/reagent_containers/glass/bottle/nutrient/rh{ - pixel_x = 5 - }, -/obj/item/reagent_containers/glass/bottle/nutrient/ez{ - pixel_x = -5 - }, -/obj/item/reagent_containers/syringe, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) "rxQ" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -35292,38 +35081,6 @@ /obj/structure/cable/yellow, /turf/open/floor/iron, /area/janitor) -"ryR" = ( -/obj/effect/turf_decal/siding/white{ - alpha = 100; - dir = 4 - }, -/obj/structure/sink{ - dir = 1; - pixel_y = 28 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/camera/directional/north, -/turf/open/floor/iron/white, -/area/crew_quarters/fitness/recreation) -"rzg" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/effect/turf_decal/numbers/two_nine, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark, -/area/engine/engineering) "rzI" = ( /obj/structure/lattice/catwalk/over, /obj/structure/railing/corner{ @@ -35367,6 +35124,10 @@ }, /turf/open/floor/iron, /area/medical/surgery) +"rAm" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/closed/wall/mineral/titanium/survival/nodiagonal, +/area/hallway/primary/fore) "rAu" = ( /obj/structure/fence{ dir = 8 @@ -35414,6 +35175,9 @@ luminosity = 2 }, /area/ai_monitored/turret_protected/ai) +"rBg" = ( +/turf/open/floor/iron/textured_large, +/area/engine/atmos) "rBl" = ( /obj/structure/railing/corner{ dir = 1 @@ -35443,6 +35207,17 @@ dir = 1 }, /area/hallway/primary/central) +"rBt" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ + dir = 9 + }, +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/engine/engineering) "rBA" = ( /obj/machinery/light{ dir = 4 @@ -35461,6 +35236,10 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) +"rBT" = ( +/obj/structure/flora/junglebush/c, +/turf/open/floor/plating/asteroid/planetary, +/area/engine/engineering) "rBY" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/decal/cleanable/dirt/dust, @@ -35514,6 +35293,20 @@ }, /turf/open/floor/iron/white, /area/science/lab) +"rEf" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/airalarm/engine{ + dir = 8; + pixel_x = -23 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/large, +/area/engine/engineering) "rEh" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -35558,11 +35351,6 @@ }, /turf/open/floor/iron, /area/maintenance/department/chapel) -"rET" = ( -/obj/effect/turf_decal/sand/plating, -/obj/structure/flora/ausbushes/ywflowers, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise) "rEV" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -35575,23 +35363,19 @@ }, /turf/open/floor/plating, /area/maintenance/department/science/central) -"rFB" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - name = "Mix to Turbine" - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +"rFu" = ( +/obj/structure/railing/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "2-4" }, -/turf/open/floor/iron/tech, -/area/engine/atmos) +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/disposalpipe/junction/flip, +/turf/open/floor/iron/smooth_large, +/area/engine/engineering) "rFF" = ( /turf/closed/wall, /area/ai_monitored/turret_protected/aisat/maint) @@ -35618,17 +35402,6 @@ /obj/structure/grille/broken, /turf/open/floor/iron, /area/maintenance/department/medical/central) -"rGq" = ( -/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hydroponics) "rGG" = ( /obj/structure/railing{ dir = 4 @@ -35683,39 +35456,30 @@ dir = 10 }, /area/hallway/primary/fore) +"rIf" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible/layer4, +/obj/machinery/atmospherics/pipe/manifold4w/cyan/visible/layer2, +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/manifold/general/visible{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/general/visible/layer5{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron, +/area/engine/atmos) "rIj" = ( /obj/effect/spawner/room/threexthree, /turf/open/floor/plating, /area/maintenance/department/chapel) -"rIq" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/button/door{ - desc = "A remote control-switch for secure storage."; - id = "engstorage"; - name = "Engineering Secure Storage"; - pixel_x = 32; - pixel_y = 32; - req_access_txt = "10" - }, -/obj/machinery/light_switch{ - pixel_x = 24; - pixel_y = 25 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/engine/engineering) -"rIZ" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/table/reinforced, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high, -/obj/item/stock_parts/cell/high, -/turf/open/floor/iron, -/area/engine/engineering) +"rIE" = ( +/obj/machinery/atmospherics/pipe/simple/purple/visible, +/obj/structure/window/plasma/reinforced, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/engine/atmos) "rJc" = ( /obj/effect/decal/cleanable/generic, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, @@ -35749,6 +35513,10 @@ /obj/machinery/camera/directional/west, /turf/open/floor/iron/dark, /area/security/brig) +"rKc" = ( +/obj/structure/flora/grass/jungle, +/turf/open/floor/plating/asteroid/planetary, +/area/engine/engineering) "rKg" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, @@ -35759,8 +35527,21 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/quartermaster/warehouse) -"rKB" = ( -/turf/open/floor/iron/dark, +"rKj" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plating/asteroid/planetary, +/area/engine/engineering) +"rKk" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/half, /area/engine/engineering) "rKN" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -35808,19 +35589,21 @@ }, /turf/open/floor/iron, /area/storage/primary) -"rMf" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/vending/tool, -/turf/open/floor/iron, -/area/engine/engineering) "rMK" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, /turf/open/floor/iron/sepia, /area/quartermaster/storage) +"rMV" = ( +/obj/machinery/atmospherics/components/trinary/filter/critical{ + dir = 4 + }, +/obj/machinery/newscaster{ + pixel_y = 34 + }, +/turf/open/floor/iron/textured_half, +/area/engine/engineering) "rNa" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/flora/ausbushes/sparsegrass, @@ -35848,6 +35631,23 @@ }, /turf/open/openspace, /area/engineering/hallway) +"rOB" = ( +/obj/effect/turf_decal/siding/white{ + alpha = 100; + dir = 10 + }, +/obj/machinery/hydroponics/soil{ + alpha = 200 + }, +/turf/open/floor/plating/asteroid/planetary, +/area/crew_quarters/dorms) +"rOG" = ( +/obj/structure/ladder, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/smooth_large, +/area/engine/engineering) "rOI" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/fence/post{ @@ -35871,10 +35671,6 @@ }, /turf/open/floor/engine, /area/engine/supermatter) -"rPo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron, -/area/engine/engineering) "rPr" = ( /obj/effect/turf_decal/tile/black/opposingcorners{ dir = 1 @@ -35935,6 +35731,17 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) +"rQi" = ( +/obj/structure/table, +/obj/item/airlock_painter{ + pixel_y = 4 + }, +/obj/item/storage/toolbox/electrical, +/obj/item/clothing/gloves/color/yellow, +/turf/open/floor/iron/smooth_half{ + dir = 1 + }, +/area/engine/engineering) "rQE" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -35962,21 +35769,18 @@ }, /turf/open/floor/carpet/green, /area/crew_quarters/cafeteria) -"rRg" = ( -/obj/machinery/atmospherics/components/trinary/filter/atmos/plasma{ - dir = 4 - }, -/obj/structure/window/plasma/reinforced, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/engine/atmos) "rRm" = ( /obj/effect/turf_decal/box/white, /obj/machinery/atmospherics/pipe/heat_exchanging/junction, /turf/open/floor/circuit/telecomms/server, /area/science/server) +"rRt" = ( +/obj/machinery/suit_storage_unit/atmos, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/half, +/area/engine/engineering) "rRx" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -35987,15 +35791,9 @@ /obj/structure/cable/yellow, /turf/open/floor/plating, /area/maintenance/department/bridge) -"rRN" = ( -/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, -/obj/structure/sink{ - dir = 1; - pixel_y = 20 - }, -/obj/machinery/camera/directional/north, -/turf/open/floor/iron, -/area/hydroponics) +"rRV" = ( +/turf/open/lava/smooth, +/area/engine/atmos) "rRY" = ( /obj/effect/turf_decal/siding/yellow, /obj/effect/turf_decal/trimline/yellow/warning, @@ -36010,22 +35808,15 @@ }, /turf/open/openspace, /area/security/brig) +"rSp" = ( +/obj/machinery/atmospherics/pipe/manifold/green/visible{ + dir = 1 + }, +/turf/open/floor/iron/smooth_half, +/area/engine/engineering) "rSr" = ( /turf/open/floor/iron, /area/ai_monitored/turret_protected/aisat/maint) -"rSE" = ( -/obj/structure/closet/secure_closet/hydroponics{ - req_access = null; - req_one_access_txt = "28;25;35" - }, -/obj/effect/turf_decal/bot, -/obj/structure/extinguisher_cabinet{ - pixel_y = -33 - }, -/obj/item/book/manual/hydroponics_pod_people, -/obj/item/reagent_containers/glass/bucket, -/turf/open/floor/iron/grid/steel, -/area/hydroponics) "rSK" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -36067,6 +35858,15 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/carpet/blue, /area/bridge/meeting_room) +"rTs" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/sign/map/echo{ + dir = 8; + name = "map - level 0"; + pixel_y = 32 + }, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "rUl" = ( /obj/machinery/portable_thermomachine, /turf/open/floor/plating, @@ -36085,13 +35885,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/rust, /area/science/test_area) -"rVx" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/tech, -/area/engine/atmos) "rVy" = ( /obj/structure/cable{ icon_state = "0-4" @@ -36123,6 +35916,14 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/pod/dark, /area/quartermaster/qm) +"rXb" = ( +/obj/structure/flora/junglebush/c, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 8 + }, +/turf/open/floor/plating/asteroid/planetary, +/area/engine/engineering) "rXp" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -36136,6 +35937,12 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/ai_monitored/turret_protected/aisat/maint) +"rXA" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/iron/smooth_half{ + dir = 1 + }, +/area/engine/engineering) "rXB" = ( /obj/structure/railing, /obj/effect/turf_decal/siding/dark, @@ -36164,23 +35971,26 @@ }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) +"rXS" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/camera/directional/west, +/obj/machinery/status_display/evac{ + pixel_x = -32 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/iron/large, +/area/engine/engineering) "rXT" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/sand/plating, /obj/structure/barricade/wooden/crude, /turf/open/floor/plating/asteroid/basalt/planetary, /area/quartermaster/storage) -"rYc" = ( -/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/machinery/holopad, -/obj/effect/turf_decal/box, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/iron, -/area/hydroponics) "rYe" = ( /obj/structure/sign/poster/random{ pixel_x = 31 @@ -36209,25 +36019,6 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron, /area/bridge) -"rYi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/binary/pump{ - name = "Fuel Pipe to Incinerator" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/catwalk_floor/iron_dark, -/area/maintenance/disposal/incinerator) -"rYp" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "rYt" = ( /turf/open/floor/carpet, /area/asteroid/paradise/surface) @@ -36257,12 +36048,6 @@ /obj/effect/decal/cleanable/generic, /turf/open/floor/plating, /area/hallway/secondary/service) -"rZf" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/vending/engivend, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/engine/engineering) "rZs" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -36289,6 +36074,15 @@ "rZM" = ( /turf/open/floor/plating, /area/maintenance/department/science/central) +"saj" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise/surface) "sap" = ( /obj/docking_port/stationary{ dir = 8; @@ -36309,10 +36103,6 @@ }, /turf/open/floor/plating/airless, /area/maintenance/disposal) -"say" = ( -/obj/structure/barricade/wooden, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/asteroid/paradise) "saC" = ( /obj/machinery/light_switch{ pixel_x = -5; @@ -36369,14 +36159,10 @@ }, /turf/open/floor/engine, /area/science/xenobiology) -"sbg" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/turf/open/floor/iron, +"sbr" = ( +/obj/structure/flora/junglebush, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/asteroid/planetary, /area/engine/engineering) "sbv" = ( /obj/machinery/recycler, @@ -36423,13 +36209,6 @@ }, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/dorms) -"scW" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ - dir = 9 - }, -/turf/open/floor/iron/grid/steel, -/area/medical/medbay/central) "scX" = ( /obj/structure/railing{ dir = 6 @@ -36456,15 +36235,15 @@ }, /obj/machinery/airalarm/directional/east, /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = 5; pixel_y = 11 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = 9; pixel_y = 5 }, -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{ +/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{ pixel_x = -7; pixel_y = 17 }, @@ -36489,6 +36268,19 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/sepia, /area/quartermaster/warehouse) +"sdX" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/catwalk_floor/iron_white, +/area/crew_quarters/fitness/recreation) "sel" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -36522,27 +36314,24 @@ }, /turf/open/floor/plating, /area/maintenance/department/bridge) -"seT" = ( -/obj/item/stack/sheet/glass/fifty{ - pixel_x = -3; - pixel_y = 3 +"sex" = ( +/turf/open/floor/iron/textured_corner, +/area/engine/atmos) +"seV" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/item/stack/sheet/glass/fifty{ - pixel_x = -5; - pixel_y = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 }, -/obj/item/stack/sheet/rglass{ - amount = 30; - pixel_x = 2; - pixel_y = -2 +/obj/structure/cable/yellow{ + icon_state = "2-8" }, -/obj/item/stack/sheet/glass/fifty{ - pixel_x = -2; - pixel_y = -1 +/obj/machinery/ai_slipper{ + uses = 10 }, -/obj/item/stack/rods/fifty, -/obj/structure/table, -/turf/open/floor/iron/tech, +/turf/open/floor/iron/smooth_large, /area/engine/engineering) "sff" = ( /obj/structure/rack, @@ -36566,6 +36355,11 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/iron/dark, /area/security/execution/education) +"sfq" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/portable_atmospherics/canister/plasma, +/turf/open/floor/iron/large, +/area/engine/engineering) "sfC" = ( /obj/machinery/door/airlock/highsecurity{ name = "AI Chamber"; @@ -36604,6 +36398,16 @@ }, /turf/open/floor/iron/dark, /area/security/warden) +"shn" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron/showroomfloor, +/area/crew_quarters/fitness/recreation) "sho" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -36693,28 +36497,6 @@ /obj/item/plate, /turf/open/floor/plating/beach/sand, /area/asteroid/paradise/surface) -"sjD" = ( -/obj/structure/table/reinforced, -/obj/item/pipe_dispenser, -/obj/item/lightreplacer{ - pixel_x = 2; - pixel_y = 13 - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = 25 - }, -/obj/structure/window/plasma/reinforced, -/turf/open/floor/iron, -/area/engine/engineering) -"sjV" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/bot, -/obj/machinery/portable_atmospherics/canister/plasma, -/obj/structure/sign/warning/fire{ - pixel_y = -33 - }, -/turf/open/floor/iron, -/area/engine/engineering) "sjW" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/lavendergrass, @@ -36769,6 +36551,14 @@ }, /turf/open/floor/iron, /area/maintenance/department/cargo) +"slQ" = ( +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/iron, +/area/engine/engineering) "slT" = ( /obj/machinery/vending/cigarette, /turf/open/floor/iron, @@ -36796,6 +36586,10 @@ /obj/item/instrument/violin, /turf/open/floor/wood, /area/crew_quarters/cafeteria) +"smt" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/large, +/area/engine/engineering) "smw" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -36803,6 +36597,22 @@ }, /turf/open/floor/iron, /area/maintenance/department/cargo) +"smO" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/iron/smooth_large, +/area/engine/engineering) "smU" = ( /obj/machinery/door/morgue{ name = "Confession Booth (Chaplain)"; @@ -36813,16 +36623,6 @@ }, /turf/open/floor/iron/dark, /area/chapel/office) -"sna" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/asteroid/paradise/surface) "snu" = ( /turf/closed/wall, /area/crew_quarters/cryopods) @@ -36830,6 +36630,12 @@ /obj/structure/girder, /turf/open/floor/plating, /area/maintenance/department/cargo) +"snY" = ( +/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer2{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron, +/area/engine/atmos) "sol" = ( /obj/machinery/power/solar{ id = "portsolar"; @@ -36840,6 +36646,10 @@ }, /turf/open/floor/iron/solarpanel, /area/asteroid/paradise/surface) +"sow" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/maintenance/department/bridge) "soL" = ( /obj/machinery/porta_turret/ai{ dir = 4 @@ -36854,10 +36664,43 @@ luminosity = 2 }, /area/ai_monitored/turret_protected/ai) +"soN" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/iron, +/area/bridge) "soP" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/plating/asteroid/planetary, /area/quartermaster/storage) +"soV" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/bridge) "spj" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -37023,10 +36866,6 @@ }, /turf/open/floor/circuit/telecomms/server, /area/science/server) -"ssw" = ( -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron/tech, -/area/engine/atmos) "ssy" = ( /obj/structure/safe, /obj/item/stack/spacecash/c1000, @@ -37085,57 +36924,10 @@ /obj/structure/chair/fancy/plastic, /turf/open/floor/iron, /area/maintenance/department/chapel) -"sua" = ( -/obj/structure/chair/office{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) -"sui" = ( -/obj/machinery/computer/atmos_control{ - dir = 8 - }, -/obj/machinery/camera/directional/east, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron, -/area/engine/engineering) "suO" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) -"suW" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/structure/table, -/obj/item/pipe_dispenser{ - pixel_y = 7 - }, -/obj/item/pipe_dispenser{ - pixel_x = 1; - pixel_y = 12 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 5 - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/light_switch/directional/west, -/obj/item/card/id/job/atmospheric_technician{ - access = list(11) - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "svv" = ( /obj/effect/dummy/lighting_obj{ light_color = "#e6762c"; @@ -37159,6 +36951,10 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/sepia, /area/quartermaster/storage) +"sws" = ( +/obj/effect/turf_decal/numbers/two_nine, +/turf/open/floor/iron/smooth_large, +/area/engine/engineering) "swz" = ( /obj/structure/chair{ dir = 1 @@ -37172,26 +36968,6 @@ "swS" = ( /turf/open/floor/iron/dark, /area/quartermaster/qm) -"swW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 4 - }, -/obj/structure/railing, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible/layer5{ - dir = 4 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/atmos) "sxu" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate, @@ -37218,20 +36994,6 @@ }, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/bar) -"sxO" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/airalarm/engine{ - dir = 8; - pixel_x = -23 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/turf/open/floor/iron, -/area/engine/engineering) "syp" = ( /obj/effect/turf_decal/siding/dark{ dir = 4 @@ -37243,6 +37005,15 @@ dir = 4 }, /area/hallway/primary/central) +"sys" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "syu" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -37267,6 +37038,14 @@ }, /turf/open/floor/iron, /area/storage/primary) +"syw" = ( +/obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron/grid/steel, +/area/hydroponics) "szu" = ( /mob/living/simple_animal/pet/dog/corgi/Ian{ density = 0; @@ -37307,55 +37086,22 @@ }, /turf/open/floor/iron, /area/security/brig) -"sAm" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/air_sensor/atmos/oxygen_tank, -/obj/machinery/atmospherics/pipe/simple/green/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/yellow/hidden/layer2{ - dir = 10 - }, -/turf/open/floor/engine/o2, -/area/engine/atmos) -"sAD" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ - dir = 6 +"sAT" = ( +/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/general/hidden/layer2, -/obj/effect/turf_decal/siding/white{ - dir = 8 +/obj/structure/chair/office/light{ + dir = 4 }, -/obj/machinery/atmospherics/components/unary/portables_connector/layer4, -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/open/floor/iron/grid/steel, -/area/medical/medbay/central) +/turf/open/floor/iron, +/area/hydroponics) "sAZ" = ( /obj/effect/turf_decal/box/corners{ dir = 1 }, /turf/open/floor/dock/drydock, /area/quartermaster/storage) -"sBk" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron/dark, -/area/engine/engineering) "sBq" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, @@ -37383,16 +37129,6 @@ /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/iron, /area/maintenance/department/eva) -"sBO" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/turf/open/floor/iron/dark, -/area/engine/engineering) "sBX" = ( /obj/structure/flora/ausbushes/lavendergrass, /turf/open/floor/plating/asteroid/planetary, @@ -37409,6 +37145,11 @@ /obj/structure/sign/departments/minsky/engineering/engineering, /turf/closed/wall/r_wall, /area/engine/engineering) +"sCz" = ( +/obj/structure/flora/junglebush/c, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/engine/engineering) "sDa" = ( /turf/closed/wall, /area/maintenance/disposal) @@ -37450,22 +37191,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/bridge) -"sEH" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer2{ - dir = 4 - }, -/obj/structure/reagent_dispensers/watertank/high, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/engine/atmos) "sFa" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 @@ -37486,32 +37211,6 @@ /mob/living/simple_animal/slime/random, /turf/open/floor/engine, /area/science/xenobiology) -"sFj" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/firealarm/directional/south, -/obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) -"sFr" = ( -/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ - alpha = 180 - }, -/obj/structure/table/reinforced, -/obj/item/paicard{ - pixel_x = -10; - pixel_y = 2 - }, -/obj/item/storage/fancy/donut_box{ - pixel_x = 9; - pixel_y = -1 - }, -/obj/item/book/manual/wiki/sopcommand, -/obj/machinery/camera/directional/south, -/turf/open/floor/iron/dark, -/area/bridge) "sFy" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 5 @@ -37521,6 +37220,12 @@ name = "mainframe floor" }, /area/tcommsat/server) +"sFS" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/glass/reinforced/plasma, +/area/maintenance/department/eva) "sFV" = ( /obj/structure/flora/rock/pile, /turf/open/floor/plating/asteroid/basalt/planetary, @@ -37557,16 +37262,6 @@ }, /turf/open/floor/iron, /area/maintenance/department/bridge) -"sGK" = ( -/obj/effect/turf_decal/sand/plating, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 8 - }, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise) "sGX" = ( /obj/item/kirbyplants/random, /turf/open/floor/iron/sepia, @@ -37629,17 +37324,34 @@ }, /turf/open/floor/iron, /area/engine/atmos) +"sIJ" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/engine/engineering) "sJC" = ( /obj/effect/spawner/room/fivexfour, /turf/open/floor/plating, /area/maintenance/department/bridge) -"sKk" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 +"sJZ" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 4 + }, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 }, -/obj/machinery/light/small, /turf/open/floor/iron/dark, -/area/security/brig) +/area/engine/engineering) "sKl" = ( /obj/machinery/light_switch{ pixel_x = 25; @@ -37700,6 +37412,11 @@ /obj/effect/landmark/start/chief_engineer, /turf/open/openspace, /area/engineering/hallway) +"sLn" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/newscaster/directional/west, +/turf/open/floor/iron, +/area/hallway/primary/fore) "sLu" = ( /turf/open/openspace, /area/hallway/primary/central) @@ -37743,19 +37460,16 @@ }, /turf/open/floor/plating, /area/maintenance/department/cargo) -"sMX" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +"sMZ" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/portable_atmospherics/canister/plasma, +/obj/machinery/camera/directional/north, +/obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/structure/lattice/catwalk/over, -/turf/open/floor/plating, -/area/engine/engineering) +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/dark, +/area/science/mixing) "sNa" = ( /obj/structure/sign/poster/random{ pixel_y = 31 @@ -37809,6 +37523,31 @@ }, /turf/open/floor/pod/dark, /area/maintenance/department/engine/atmos) +"sNW" = ( +/obj/machinery/atmospherics/components/binary/pump{ + name = "Ports to Dirty" + }, +/obj/effect/turf_decal/box/white, +/obj/machinery/atmospherics/pipe/manifold/yellow/visible/layer4{ + dir = 1 + }, +/turf/open/floor/catwalk_floor/iron, +/area/engine/atmos) +"sOh" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/structure/window/plasma/reinforced{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/smooth_half, +/area/engine/atmos) "sOB" = ( /obj/structure/railing{ dir = 10 @@ -37836,14 +37575,13 @@ }, /turf/open/floor/iron/dark, /area/hallway/primary/fore) -"sQU" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/computer/atmos_control/tank/nitrogen_tank{ - dir = 1 +"sQr" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/tech, -/area/engine/atmos) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron/showroomfloor, +/area/crew_quarters/fitness/recreation) "sRi" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -37947,6 +37685,10 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/hallway/primary/fore) +"sTO" = ( +/obj/machinery/vending/tool, +/turf/open/floor/iron/large, +/area/engine/engineering) "sUf" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/turf_decal/stripes/line{ @@ -38038,27 +37780,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plating, /area/security/brig) -"sWy" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/door/poddoor{ - id = "engstorage"; - name = "Engineering Secure Storage Lockdown" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/dark, -/area/engine/engineering) "sWD" = ( /obj/machinery/gateway{ dir = 6 @@ -38076,12 +37797,6 @@ "sWT" = ( /turf/closed/wall, /area/quartermaster/sorting) -"sXg" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/structure/flora/ausbushes/lavendergrass, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/asteroid/paradise) "sXm" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -38125,21 +37840,6 @@ /obj/machinery/light, /turf/open/floor/prison, /area/security/prison) -"sYh" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/bot, -/obj/machinery/camera/directional/north, -/obj/structure/closet/secure_closet/atmospherics{ - anchored = 1; - req_access = null; - req_one_access_txt = "11" - }, -/obj/item/radio/intercom{ - pixel_x = -1; - pixel_y = 29 - }, -/turf/open/floor/iron, -/area/engine/atmos) "sYi" = ( /obj/structure/railing/corner{ dir = 4 @@ -38258,26 +37958,21 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/hallway/primary/aft) +"sZQ" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 4; + initialize_directions = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/turf/open/floor/iron/textured_half{ + dir = 1 + }, +/area/engine/engineering) "tae" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/turf_decal/sand/plating, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) -"tay" = ( -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/bot, -/obj/machinery/power/apc/auto_name/directional/west{ - pixel_x = -24 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/iron/grid/steel, -/area/hydroponics) "taR" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -38388,22 +38083,14 @@ }, /turf/open/floor/glass/reinforced, /area/medical/medbay/central) -"teA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/door/airlock/atmos{ - name = "Incinerator"; - req_access_txt = "11" +"tex" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/dark/visible, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/turf/open/floor/iron/dark/side{ + dir = 8 }, -/turf/open/floor/iron/dark, -/area/maintenance/disposal/incinerator) +/area/hallway/primary/fore) "teE" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -38412,11 +38099,11 @@ /area/ai_monitored/security/armory) "teS" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/flour{ +/obj/item/reagent_containers/condiment/flour{ pixel_x = -2; pixel_y = 13 }, -/obj/item/reagent_containers/glass/bowl, +/obj/item/reagent_containers/cup/bowl, /obj/item/clothing/head/utility/chefhat{ pixel_x = 5; pixel_y = 4 @@ -38481,15 +38168,6 @@ /obj/structure/fence, /turf/open/floor/plating/dirt/jungle/wasteland, /area/asteroid/paradise/surface) -"tfm" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/turf/open/floor/iron/white/side{ - dir = 9 - }, -/area/asteroid/paradise) "tft" = ( /obj/effect/turf_decal/siding/red{ alpha = 100; @@ -38497,19 +38175,6 @@ }, /turf/open/floor/plating/beach/water, /area/asteroid/paradise/surface/water) -"tfH" = ( -/obj/machinery/atmospherics/components/trinary/filter/critical{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/newscaster{ - pixel_y = 34 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/tech, -/area/engine/engineering) "tgg" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -38598,22 +38263,6 @@ }, /turf/open/floor/circuit/red, /area/ai_monitored/turret_protected/ai) -"thf" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, -/obj/effect/turf_decal/bot{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/machinery/light, -/obj/machinery/atmospherics/components/unary/thermomachine/heater/on/layer_4{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/engine/atmos) "thu" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -38621,21 +38270,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/eva) -"thO" = ( -/obj/structure/table, -/obj/machinery/plantgenes{ - pixel_y = 7 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/requests_console{ - department = "Hydroponics"; - departmentType = 2; - pixel_y = -33 - }, -/turf/open/floor/iron/grid/steel, -/area/hydroponics) "thR" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, @@ -38703,6 +38337,21 @@ }, /turf/open/floor/carpet/green, /area/crew_quarters/cafeteria) +"tkw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 9 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/maintenance/disposal/incinerator) "tkD" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -38793,30 +38442,6 @@ /obj/structure/stairs, /turf/open/floor/pod/dark, /area/science/mixing) -"tlH" = ( -/obj/machinery/computer/cargo/request{ - dir = 4 - }, -/obj/machinery/requests_console{ - department = "Engineering"; - departmentType = 3; - name = "Engineering RC"; - pixel_x = -32; - pixel_y = -1 - }, -/obj/machinery/camera/directional/west, -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/item/radio/intercom{ - pixel_x = 1; - pixel_y = -30 - }, -/turf/open/floor/iron, -/area/engine/engineering) "tmh" = ( /obj/structure/girder, /turf/open/floor/plating, @@ -38872,6 +38497,38 @@ }, /turf/open/floor/iron, /area/security/prison) +"tmp" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-16" + }, +/obj/effect/turf_decal/trimline/yellow, +/obj/effect/landmark/start/station_engineer, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden/layer5{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/engine/atmos) "tmO" = ( /turf/closed/wall/r_wall, /area/chapel/office) @@ -38882,26 +38539,6 @@ }, /turf/open/floor/iron/dark, /area/engine/atmos) -"tnA" = ( -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/turf/open/floor/grass/no_border, -/area/medical/storage) -"tnQ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/purple/visible, -/obj/structure/window/plasma/reinforced, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/engine/atmos) "tnS" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light_switch{ @@ -38917,15 +38554,14 @@ /obj/structure/flora/rock, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise/surface) -"tob" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 +"toh" = ( +/obj/machinery/atmospherics/components/binary/pump/layer2{ + dir = 8; + name = "N2 to Pure" }, -/turf/open/floor/grass/no_border, -/area/medical/storage) +/obj/effect/turf_decal/box/white, +/turf/open/floor/catwalk_floor/iron, +/area/engine/atmos) "top" = ( /obj/structure/stairs{ dir = 4 @@ -38942,6 +38578,25 @@ /obj/effect/spawner/room/threexfive, /turf/open/floor/plating, /area/maintenance/department/science/central) +"toU" = ( +/obj/machinery/portable_thermomachine, +/obj/effect/turf_decal/box/white, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/smooth_half{ + dir = 1 + }, +/area/engine/engineering) +"tpa" = ( +/obj/effect/turf_decal/numbers{ + dir = 1 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/iron, +/area/maintenance/department/security/brig) "tpg" = ( /obj/structure/sign/painting/library{ pixel_y = 32 @@ -38962,6 +38617,16 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/white, /area/crew_quarters/heads/hor) +"tpq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/half, +/area/engine/engineering) "tpw" = ( /obj/structure/railing, /obj/structure/cable/yellow{ @@ -39031,15 +38696,6 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/catwalk_floor/iron_dark, /area/asteroid/paradise/surface) -"trB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ - dir = 8 - }, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/asteroid/paradise) "trC" = ( /obj/structure/table, /obj/item/clipboard, @@ -39134,16 +38790,6 @@ }, /turf/open/floor/engine, /area/ai_monitored/turret_protected/ai) -"tte" = ( -/obj/structure/ladder, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/sign/warning/pods{ - pixel_y = -32 - }, -/turf/open/floor/pod/dark, -/area/maintenance/department/science/central) "tth" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -39154,21 +38800,6 @@ }, /turf/open/floor/iron/dark, /area/security/brig) -"tts" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/engineering) "ttt" = ( /obj/structure/sign/poster/official/suit_sensors{ pixel_x = -32 @@ -39221,16 +38852,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/green, /area/crew_quarters/cafeteria) -"tuz" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/chem_dispenser/mutagensaltpetersmall, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/turf/open/floor/iron/grid/steel, -/area/hydroponics) "tuU" = ( /obj/structure/lattice, /obj/structure/railing{ @@ -39265,18 +38886,6 @@ }, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) -"twg" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/structure/sign/warning/nosmoking{ - pixel_x = -32 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) "tww" = ( /obj/machinery/light{ dir = 8 @@ -39382,6 +38991,16 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/maintenance/department/science/central) +"tzi" = ( +/obj/machinery/atmospherics/components/trinary/filter/critical{ + dir = 4 + }, +/obj/item/radio/intercom{ + pixel_x = 1; + pixel_y = 28 + }, +/turf/open/floor/iron/textured_half, +/area/engine/engineering) "tzq" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall, @@ -39476,17 +39095,16 @@ }, /turf/open/floor/iron/white, /area/science/lab) -"tAT" = ( +"tAO" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/trinary/filter/atmos/n2o{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/window/plasma/reinforced, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/turf/open/floor/iron, -/area/engine/atmos) +/turf/open/floor/iron/large, +/area/engine/engineering) "tBk" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/barricade/wooden, @@ -39507,6 +39125,15 @@ /obj/effect/spawner/lootdrop/glowstick/lit, /turf/open/floor/iron, /area/maintenance/department/medical/central) +"tBF" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/structure/disposalpipe/sorting/mail/destination/library{ + dir = 1 + }, +/turf/open/floor/iron/white/side{ + dir = 4 + }, +/area/science/research) "tBS" = ( /obj/effect/turf_decal/siding/dark{ dir = 9 @@ -39569,17 +39196,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/maintenance/department/bridge) -"tDT" = ( -/obj/machinery/seed_extractor, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/firealarm/directional/east, -/obj/structure/sign/poster/official/moth1{ - pixel_y = -32 - }, -/turf/open/floor/iron/grid/steel, -/area/hydroponics) "tEn" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 8 @@ -39625,21 +39241,6 @@ slowdown = 0 }, /area/asteroid/paradise/surface) -"tFX" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/structure/window/plasma/reinforced{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/engine/atmos) "tGT" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -39698,16 +39299,6 @@ }, /turf/open/floor/dock/drydock, /area/quartermaster/storage) -"tIa" = ( -/obj/machinery/atmospherics/components/binary/pump/layer4{ - dir = 1; - name = "Pure to Ports" - }, -/obj/machinery/atmospherics/components/trinary/filter/atmos, -/obj/effect/turf_decal/delivery, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/tech, -/area/engine/atmos) "tIn" = ( /obj/structure/railing{ dir = 4 @@ -39751,14 +39342,6 @@ /obj/effect/spawner/lootdrop/maintenance/four, /turf/open/floor/plating, /area/maintenance/department/engine/atmos) -"tJa" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/tech, -/area/engine/atmos) "tJf" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, @@ -39827,11 +39410,11 @@ /area/hallway/primary/fore) "tJw" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -8; pixel_y = 5 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8 }, /obj/machinery/door/poddoor/shutters{ @@ -39970,16 +39553,6 @@ }, /turf/open/floor/iron, /area/medical/surgery) -"tNz" = ( -/obj/structure/curtain/directional{ - dir = 8 - }, -/obj/effect/spawner/structure/window, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/turf/open/floor/plating, -/area/hydroponics) "tNX" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, @@ -40140,6 +39713,13 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/security/brig) +"tRq" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/computer/station_alert{ + dir = 8 + }, +/turf/open/floor/iron/large, +/area/engine/engineering) "tRC" = ( /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 8 @@ -40187,16 +39767,6 @@ /obj/machinery/door/poddoor/incinerator_atmos_main, /turf/open/floor/plating/asteroid/planetary, /area/maintenance/disposal/incinerator) -"tRY" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron, -/area/engine/engineering) "tSb" = ( /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 1 @@ -40234,6 +39804,11 @@ /obj/structure/flora/ausbushes/lavendergrass, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface) +"tSK" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/flora/ausbushes/ywflowers, +/turf/open/floor/plating/asteroid/planetary, +/area/engine/engineering) "tSN" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -40256,6 +39831,16 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/kitchen) +"tTc" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) "tTh" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ alpha = 180 @@ -40295,18 +39880,6 @@ }, /turf/open/floor/engine/vacuum, /area/maintenance/disposal/incinerator) -"tUs" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/effect/turf_decal/siding/wood, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/airalarm/directional/north, -/obj/machinery/vending/donksofttoyvendor, -/turf/open/floor/carpet/green, -/area/crew_quarters/cafeteria) "tUu" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 @@ -40319,15 +39892,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/science/central) -"tUx" = ( -/obj/item/radio/intercom{ - pixel_x = 1; - pixel_y = -30 - }, -/obj/machinery/portable_atmospherics/scrubber, -/obj/effect/turf_decal/box, -/turf/open/floor/iron/tech, -/area/engine/engineering) "tUA" = ( /obj/item/radio/intercom{ pixel_y = -35 @@ -40380,30 +39944,9 @@ /obj/machinery/portable_thermomachine, /turf/open/floor/plating, /area/maintenance/department/science/central) -"tVm" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/tech, -/area/engine/engineering) "tVY" = ( /turf/open/floor/iron/sepia, /area/quartermaster/storage) -"tWu" = ( -/obj/machinery/atmospherics/pipe/multiz/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/multiz/layer2{ - dir = 1 - }, -/obj/machinery/light/small, -/obj/machinery/status_display/evac{ - pixel_y = -32 - }, -/obj/structure/cable/yellow{ - icon_state = "1-16" - }, -/obj/effect/turf_decal/trimline/yellow, -/turf/open/floor/pod/dark, -/area/maintenance/department/science/central) "tWx" = ( /obj/structure/lattice/catwalk/over, /obj/structure/railing{ @@ -40411,6 +39954,19 @@ }, /turf/open/openspace, /area/maintenance/department/science/central) +"tWG" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/sign/map/echo{ + dir = 4; + name = "map - level 3"; + pixel_y = 32 + }, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "tWL" = ( /obj/effect/turf_decal/bot, /obj/machinery/requests_console{ @@ -40465,18 +40021,24 @@ }, /turf/open/floor/iron, /area/crew_quarters/dorms) -"tYc" = ( -/obj/structure/sign/departments/restroom{ - pixel_y = 32 +"tXw" = ( +/obj/structure/railing{ + dir = 5 + }, +/turf/open/openspace, +/area/maintenance/department/chapel) +"tXV" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/iron/showroomfloor, -/area/crew_quarters/fitness/recreation) +/turf/open/floor/iron/white, +/area/crew_quarters/heads/cmo) "tYd" = ( /turf/closed/wall, /area/janitor) @@ -40552,6 +40114,15 @@ }, /turf/open/floor/iron, /area/engine/atmos) +"tZd" = ( +/obj/effect/turf_decal/bot, +/obj/structure/closet/secure_closet/atmospherics{ + anchored = 1; + req_access = null; + req_one_access_txt = "11" + }, +/turf/open/floor/iron, +/area/engine/atmos) "tZz" = ( /obj/structure/railing{ dir = 1 @@ -40573,6 +40144,23 @@ /obj/machinery/light, /turf/open/floor/noslip/standard, /area/quartermaster/storage) +"uaq" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "External Gas to Loop" + }, +/obj/effect/turf_decal/box/white, +/turf/open/floor/iron/smooth_half{ + dir = 1 + }, +/area/engine/engineering) "uaE" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -40662,13 +40250,6 @@ }, /turf/open/floor/iron, /area/science/mixing) -"udt" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/engine/engineering) "udM" = ( /obj/structure/railing{ dir = 4 @@ -40716,6 +40297,30 @@ }, /turf/open/floor/carpet/green, /area/chapel/main) +"ufI" = ( +/obj/item/stack/sheet/glass/fifty{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/stack/sheet/glass/fifty{ + pixel_x = -5; + pixel_y = 1 + }, +/obj/item/stack/sheet/rglass{ + amount = 30; + pixel_x = 2; + pixel_y = -2 + }, +/obj/item/stack/sheet/glass/fifty{ + pixel_x = -2; + pixel_y = -1 + }, +/obj/item/stack/rods/fifty, +/obj/structure/table, +/turf/open/floor/iron/textured_half{ + dir = 1 + }, +/area/engine/engineering) "ufL" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, /turf/closed/wall, @@ -40730,6 +40335,13 @@ }, /turf/open/floor/iron, /area/security/brig) +"ugf" = ( +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/engine/atmos) "ugo" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -40755,19 +40367,25 @@ "uhc" = ( /turf/closed/wall, /area/medical/surgery) -"uhk" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/machinery/power/port_gen/pacman, -/turf/open/floor/iron, -/area/engine/engineering) "uhm" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/sand/plating, /turf/open/floor/iron, /area/hallway/primary/fore) +"uht" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/components/binary/volume_pump{ + dir = 8; + name = "Loop to Gas Output" + }, +/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/effect/turf_decal/box/white, +/turf/open/floor/iron/smooth_half{ + dir = 1 + }, +/area/engine/engineering) "uhy" = ( /obj/effect/spawner/lootdrop/glowstick/lit, /turf/open/floor/plating, @@ -40854,10 +40472,6 @@ }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/chief) -"ujG" = ( -/obj/structure/flora/grass/jungle/b, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/asteroid/paradise) "ukH" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -40899,16 +40513,34 @@ /obj/effect/landmark/start/scientist, /turf/open/floor/iron/grid/steel, /area/science/xenobiology) -"umB" = ( -/obj/effect/decal/cleanable/generic, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +"ulR" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/manifold/cyan/visible, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/textured_large, +/area/engine/engineering) +"umm" = ( +/obj/structure/barricade/wooden/crude, +/obj/structure/barricade/wooden, +/turf/closed/mineral/random/air, +/area/asteroid/paradise) +"umI" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/visible, +/obj/machinery/airalarm/directional/west, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/computer/atmos_control/tank/oxygen_tank{ dir = 4 }, -/obj/machinery/ai_slipper{ - uses = 10 +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) +/turf/open/floor/iron/smooth_half{ + dir = 1 + }, +/area/engine/atmos) "unj" = ( /obj/structure/closet/secure_closet/medical3, /obj/item/stack/sheet/iron/fifty{ @@ -40935,6 +40567,12 @@ }, /turf/open/floor/iron, /area/medical/storage) +"unq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/bot, +/obj/structure/reflector/box, +/turf/open/floor/iron/large, +/area/engine/engineering) "unt" = ( /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 1 @@ -40975,11 +40613,6 @@ /obj/machinery/griddle, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) -"unU" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/lootdrop/glowstick/lit, -/turf/open/floor/iron/cafeteria, -/area/maintenance/department/medical/morgue) "uoe" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -41120,21 +40753,6 @@ dir = 8 }, /area/hallway/primary/central) -"urP" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/pool{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8; - pixel_x = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/chair/fancy/bench{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/crew_quarters/fitness/recreation) "urT" = ( /obj/machinery/light/small{ dir = 8 @@ -41157,11 +40775,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) -"usc" = ( -/obj/structure/barricade/wooden/crude, -/obj/structure/barricade/wooden, -/turf/open/floor/plating, -/area/maintenance/department/medical/morgue) "usq" = ( /obj/structure/lattice, /turf/open/openspace, @@ -41191,6 +40804,17 @@ name = "mainframe floor" }, /area/tcommsat/server) +"utH" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/green/visible{ + dir = 4 + }, +/turf/open/floor/iron/smooth_half{ + dir = 1 + }, +/area/engine/engineering) "utK" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating/dirt/planetary, @@ -41203,32 +40827,49 @@ /obj/effect/landmark/start/head_of_personnel, /turf/open/floor/wood, /area/crew_quarters/heads/hop) -"uuD" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +"uuH" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/engine, +/area/science/explab) +"uuN" = ( +/obj/structure/table/reinforced, +/obj/machinery/reagentgrinder{ + pixel_y = 5 }, -/obj/structure/cable/yellow{ - icon_state = "1-4" +/obj/item/storage/box/monkeycubes{ + pixel_x = -7; + pixel_y = 9 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 +/obj/item/storage/box/monkeycubes{ + pixel_x = 7; + pixel_y = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 +/obj/item/storage/box/monkeycubes{ + pixel_x = -1 }, -/obj/structure/disposalpipe/segment{ - dir = 1 +/obj/machinery/airalarm/directional/west, +/obj/machinery/camera/directional/west{ + c_tag = "Xenobiology Lab"; + name = "Xeno camera" }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark/side{ - dir = 8 +/turf/open/floor/iron/grid/steel, +/area/science/xenobiology) +"uvt" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/area/bridge) -"uuH" = ( -/obj/effect/turf_decal/delivery, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/engine, -/area/science/explab) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/engine/engineering) "uvR" = ( /obj/effect/turf_decal/trimline/yellow, /obj/structure/cable/yellow{ @@ -41280,32 +40921,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/chapel) -"uwJ" = ( -/obj/machinery/door/window{ - base_state = "leftsecure"; - dir = 8; - icon_state = "leftsecure"; - name = "Primary AI Core Access"; - obj_integrity = 300; - req_access_txt = "16" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "AI Core shutters"; - name = "AI Core Shutter" - }, -/obj/effect/turf_decal/delivery, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/turretid{ - control_area = "/area/ai_monitored/turret_protected/ai"; - icon_state = "control_stun"; - name = "AI Chamber turret control"; - pixel_x = -1; - pixel_y = 29 - }, -/turf/open/floor/engine, -/area/ai_monitored/turret_protected/ai) "uwN" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -41316,16 +40931,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/grid/steel, /area/medical/medbay/central) -"uxv" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron/dark, -/area/bridge) "uxB" = ( /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, @@ -41398,6 +41003,19 @@ }, /turf/open/floor/iron/dark, /area/hallway/primary/aft) +"uzA" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/large, +/area/hydroponics) "uzF" = ( /obj/structure/table, /obj/item/stock_parts/subspace/treatment, @@ -41425,20 +41043,6 @@ dir = 4 }, /area/hallway/primary/aft) -"uAb" = ( -/obj/machinery/atmospherics/components/trinary/filter/critical{ - dir = 4; - filter_type = "n2" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/sign/warning/securearea{ - pixel_y = 30 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/tech, -/area/engine/engineering) "uAn" = ( /turf/closed/wall/r_wall, /area/hallway/primary/fore) @@ -41449,6 +41053,13 @@ }, /turf/open/floor/plating, /area/maintenance/department/science/central) +"uAN" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/structure/disposalpipe/junction/flip{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/fore) "uBk" = ( /obj/machinery/holopad, /obj/structure/railing/corner{ @@ -41462,6 +41073,14 @@ }, /turf/open/floor/carpet/purple, /area/crew_quarters/cafeteria) +"uCc" = ( +/obj/machinery/atmospherics/pipe/manifold/green/visible{ + dir = 4 + }, +/turf/open/floor/iron/smooth_half{ + dir = 1 + }, +/area/engine/engineering) "uCw" = ( /obj/effect/spawner/structure/window/depleteduranium, /obj/machinery/atmospherics/pipe/manifold/general/visible{ @@ -41469,11 +41088,19 @@ }, /turf/open/floor/plating, /area/maintenance/disposal/incinerator) -"uCJ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/pickaxe, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/asteroid/paradise) +"uDo" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/half, +/area/engine/engineering) "uDA" = ( /turf/open/floor/plating/beach/sand, /area/asteroid/paradise/surface/sand) @@ -41670,6 +41297,11 @@ }, /turf/open/floor/wood, /area/crew_quarters/cafeteria) +"uHS" = ( +/obj/structure/table/reinforced, +/obj/machinery/fax/eng, +/turf/open/floor/iron/large, +/area/engine/engineering) "uIu" = ( /obj/effect/spawner/structure/window/shuttle, /turf/open/floor/plating, @@ -41684,7 +41316,7 @@ }, /obj/item/vending_refill/cigarette, /obj/effect/turf_decal/bot, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/cup/glass/shaker, /turf/open/floor/iron, /area/hallway/secondary/service) "uIG" = ( @@ -41715,6 +41347,12 @@ /obj/structure/disposalpipe/sorting/mail/destination/chemistry/flip, /turf/open/floor/iron, /area/medical/apothecary) +"uIN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/bot, +/obj/machinery/power/tesla_coil, +/turf/open/floor/iron/large, +/area/engine/engineering) "uIU" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/northright{ @@ -41749,6 +41387,11 @@ }, /turf/open/floor/iron/white, /area/medical/apothecary) +"uIV" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/engine/engineering) "uIW" = ( /obj/effect/turf_decal/bot, /obj/machinery/computer/camera_advanced/xenobio, @@ -41759,6 +41402,21 @@ }, /turf/open/floor/iron/grid/steel, /area/science/xenobiology) +"uJf" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 10 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/iron/textured_half, +/area/engine/engineering) "uJt" = ( /obj/machinery/power/apc/auto_name/directional/north{ pixel_y = 24 @@ -41805,13 +41463,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/engine/atmos) -"uKf" = ( -/obj/effect/turf_decal/sand/plating, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/asteroid/paradise) "uKn" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ alpha = 180; @@ -41821,6 +41472,16 @@ dir = 4 }, /area/hallway/primary/aft) +"uKo" = ( +/obj/machinery/camera/directional/north, +/obj/machinery/airalarm/directional/north, +/obj/machinery/washing_machine, +/obj/effect/turf_decal/siding/white{ + alpha = 100; + dir = 4 + }, +/turf/open/floor/iron/white, +/area/crew_quarters/fitness/recreation) "uKw" = ( /obj/structure/table, /obj/item/stock_parts/subspace/ansible, @@ -41907,18 +41568,12 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/department/medical/central) -"uLS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +"uLI" = ( +/obj/effect/turf_decal/siding/dark{ dir = 6 }, -/obj/machinery/firealarm/directional/north, -/obj/machinery/camera/directional/north, -/obj/machinery/vending/cigarette, -/turf/open/floor/iron, -/area/medical/surgery) +/turf/open/floor/glass/reinforced, +/area/bridge) "uLU" = ( /obj/structure/closet/firecloset/full, /turf/open/floor/iron, @@ -41929,7 +41584,7 @@ "uNj" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = 4; pixel_y = 9 }, @@ -41943,26 +41598,16 @@ }, /turf/open/floor/iron/white, /area/crew_quarters/kitchen) -"uNB" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/machinery/disposal/bin, -/obj/machinery/newscaster{ - pixel_y = -30 - }, -/obj/effect/turf_decal/bot{ - dir = 1 - }, -/obj/machinery/light, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +"uNE" = ( +/obj/machinery/atmospherics/pipe/manifold/green/visible, +/obj/machinery/atmospherics/components/binary/pump/layer4{ + dir = 1; + name = "N2O to Pure" }, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) +/obj/structure/window/plasma/reinforced, +/obj/effect/turf_decal/box/white, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/engine/atmos) "uNJ" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/bot, @@ -41991,23 +41636,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/cryopods) -"uOs" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible/layer4{ - dir = 4 - }, -/obj/structure/table, -/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ - alpha = 230; - color = "#edaa0c" - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/storage/belt/utility, -/obj/item/t_scanner, -/obj/item/radio/intercom{ - pixel_y = 29 - }, -/turf/open/floor/iron, -/area/engine/atmos) "uOO" = ( /obj/structure/bed, /obj/item/bedsheet/purple{ @@ -42099,20 +41727,6 @@ }, /turf/open/floor/prison, /area/security/prison) -"uQq" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/hydroponics/constructable, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/item/paper/guides/jobs/hydroponics{ - default_raw_text = "Hey there,
Sorry about the cramped space! � I know it's a bit tight in here.
But just so you know, I found a few more hydroponic trays stashed behind botany in maintenance. Feel free to grab them if you need!
Take care!
"; - pixel_x = 6 - }, -/turf/open/floor/iron/grid/steel, -/area/hydroponics) "uQu" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -42135,6 +41749,20 @@ slowdown = 0 }, /area/asteroid/paradise/surface) +"uRd" = ( +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24; + cell_type = /obj/item/stock_parts/cell/hyper + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/thermomachine/heater/on, +/turf/open/floor/iron/smooth_half, +/area/engine/atmos) "uRn" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/fence/cut{ @@ -42143,13 +41771,6 @@ /obj/structure/sign/warning/explosives/alt, /turf/open/floor/plating/dirt/jungle/wasteland, /area/asteroid/paradise/surface) -"uRt" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch"; - req_access_txt = "12" - }, -/turf/open/floor/plating, -/area/maintenance/department/medical/morgue) "uRz" = ( /obj/effect/decal/cleanable/blood/old, /obj/structure/cable/yellow{ @@ -42174,13 +41795,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/maintenance/department/security/brig) -"uRJ" = ( -/obj/effect/turf_decal/stripes/closeup{ - dir = 4 - }, -/obj/machinery/pipedispenser/disposal, -/turf/open/floor/iron, -/area/engine/engineering) "uSd" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/turf_decal/stripes/line{ @@ -42232,6 +41846,22 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/teleporter) +"uSS" = ( +/obj/item/radio/intercom{ + pixel_y = -33 + }, +/obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 4 + }, +/turf/open/floor/iron/smooth_half, +/area/engine/engineering) +"uSY" = ( +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 1 + }, +/turf/open/floor/iron/textured_large, +/area/engine/engineering) "uTt" = ( /obj/machinery/camera/directional/south, /obj/effect/turf_decal/delivery, @@ -42258,24 +41888,10 @@ }, /turf/open/floor/iron, /area/security/brig) -"uTP" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 1 - }, -/turf/open/floor/iron/tech, -/area/engine/engineering) "uTR" = ( /obj/machinery/smartfridge/chemistry, /turf/open/floor/iron/white, /area/medical/apothecary) -"uTU" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/closet/radiation, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark, -/area/engine/engineering) "uTY" = ( /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, /obj/item/kirbyplants/random, @@ -42308,24 +41924,6 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/maint) -"uUq" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible/layer5{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "uUt" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/disposalpipe/segment{ @@ -42363,12 +41961,26 @@ }, /turf/open/floor/plating, /area/maintenance/department/medical/morgue) -"uUK" = ( -/obj/effect/turf_decal/stripes/end{ +"uUY" = ( +/obj/machinery/door/airlock/engineering/glass{ + name = "Engineering Foyer"; + req_one_access_txt = "32" + }, +/obj/machinery/door/firedoor, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/pipedispenser, -/turf/open/floor/iron, +/turf/open/floor/iron/smooth_large, /area/engine/engineering) "uVd" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -42443,15 +42055,6 @@ }, /turf/open/floor/pod/dark, /area/science/lab) -"uWn" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/dark_green/half/contrasted, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) "uWt" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -42461,12 +42064,6 @@ /obj/effect/turf_decal/evac, /turf/open/floor/iron, /area/hallway/primary/central) -"uWx" = ( -/obj/structure/chair/office{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "uWI" = ( /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron/white/corner, @@ -42514,6 +42111,14 @@ "uXr" = ( /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) +"uXy" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron, +/area/hydroponics) "uXI" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/closet/wardrobe/grey, @@ -42534,6 +42139,32 @@ }, /turf/open/floor/plating, /area/crew_quarters/heads/hos) +"uYL" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible/layer4{ + dir = 6 + }, +/obj/structure/table, +/obj/item/clothing/suit/hazardvest{ + pixel_x = -5; + pixel_y = -2 + }, +/obj/item/clothing/suit/hazardvest{ + pixel_x = 5; + pixel_y = 6 + }, +/obj/item/clothing/suit/hazardvest{ + pixel_x = -7; + pixel_y = 7 + }, +/obj/item/clothing/suit/hazardvest{ + pixel_x = 8; + pixel_y = -3 + }, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/smooth_corner, +/area/engine/atmos) "uYV" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/techstorage/medical, @@ -42617,17 +42248,6 @@ }, /turf/open/floor/iron/white, /area/science/xenobiology) -"vat" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/bridge) "vaG" = ( /obj/effect/turf_decal/siding/dark{ dir = 10 @@ -42638,13 +42258,6 @@ }, /turf/open/floor/iron/dark, /area/engineering/hallway) -"vaT" = ( -/obj/structure/table, -/obj/item/clothing/suit/apron/overalls, -/obj/item/cultivator, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) "vba" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/cable/yellow{ @@ -42674,6 +42287,18 @@ /obj/machinery/door/airlock/public/glass, /turf/open/floor/iron, /area/hallway/primary/aft) +"vbo" = ( +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/engine/engineering) "vbv" = ( /obj/effect/turf_decal/evac, /turf/open/floor/iron, @@ -42690,6 +42315,37 @@ }, /turf/open/floor/iron/tech, /area/engine/engineering) +"vbE" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = -27 + }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister, +/turf/open/floor/iron, +/area/maintenance/disposal/incinerator) +"vbO" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/door/airlock/research/glass{ + req_one_access_txt = "7;29" + }, +/turf/open/floor/iron/white/side{ + dir = 8 + }, +/area/science/research) "vbQ" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/rack, @@ -42777,6 +42433,13 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating, /area/maintenance/department/eva) +"veA" = ( +/obj/effect/turf_decal/sand/plating, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 8 + }, +/turf/open/floor/plating/asteroid/planetary, +/area/engine/engineering) "vft" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 1 @@ -42842,10 +42505,6 @@ "vgG" = ( /turf/closed/wall, /area/engine/atmos) -"vgR" = ( -/obj/structure/flora/ash/stem_shroom, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/asteroid/paradise) "vhd" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -42920,20 +42579,6 @@ "vhU" = ( /turf/closed/wall/rust, /area/crew_quarters/fitness/recreation) -"vhX" = ( -/obj/structure/table, -/obj/item/seeds/flower/lily{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/seeds/flower/geranium, -/obj/effect/decal/cleanable/dirt, -/obj/item/food/grown/wheat, -/obj/item/food/grown/corn, -/obj/item/food/grown/apple, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) "vih" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -42941,14 +42586,6 @@ }, /turf/open/floor/iron, /area/maintenance/department/cargo) -"viB" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - name = "Mix to SM" - }, -/turf/open/floor/iron/tech, -/area/engine/atmos) "viT" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -42978,6 +42615,35 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/quartermaster/storage) +"vjK" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 4 + }, +/obj/structure/railing, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden/layer5{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/engine/atmos) +"vjT" = ( +/obj/machinery/meter{ + target_layer = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/yellow/visible/layer2{ + dir = 8 + }, +/turf/open/floor/catwalk_floor/iron, +/area/engine/atmos) "vjX" = ( /obj/item/trash/canned/beans, /turf/open/floor/plating/beach/coastline_b{ @@ -43007,17 +42673,19 @@ }, /turf/open/floor/plating, /area/maintenance/department/bridge) -"vkV" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +"vkN" = ( +/obj/structure/flora/junglebush/large, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/engine/engineering) +"vkZ" = ( +/obj/machinery/atmospherics/components/binary/pump/layer4{ + dir = 4; + name = "CO2 to Pure" }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/crew_quarters/fitness/recreation) +/obj/effect/turf_decal/box/white, +/turf/open/floor/catwalk_floor/iron, +/area/engine/atmos) "vlt" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -43033,6 +42701,23 @@ }, /turf/open/floor/pod/dark, /area/crew_quarters/cafeteria) +"vlx" = ( +/obj/structure/table, +/obj/item/storage/belt/utility/full/engi, +/obj/item/rcl/pre_loaded, +/obj/item/rcl/pre_loaded, +/obj/item/clothing/ears/earmuffs{ + pixel_x = -3; + pixel_y = -2 + }, +/obj/item/clothing/ears/earmuffs{ + pixel_x = -5; + pixel_y = 6 + }, +/turf/open/floor/iron/smooth_half{ + dir = 1 + }, +/area/engine/engineering) "vlQ" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt/dust, @@ -43050,6 +42735,13 @@ }, /turf/open/floor/carpet/green, /area/chapel/main) +"vmR" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/item/beacon, +/turf/open/floor/iron/dark, +/area/bridge) "vmY" = ( /obj/structure/closet/secure_closet/evidence, /obj/effect/turf_decal/bot, @@ -43143,11 +42835,19 @@ }, /turf/open/floor/iron/dark, /area/engineering/hallway) -"vnV" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/ladder, -/turf/open/floor/pod/dark, -/area/hallway/secondary/service) +"vnS" = ( +/obj/machinery/door/airlock{ + name = "Hydroponics"; + req_one_access_txt = "28;25;35" + }, +/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron/large, +/area/hydroponics) "vnY" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, @@ -43179,28 +42879,6 @@ /obj/structure/sign/warning/securearea, /turf/closed/wall/r_wall, /area/crew_quarters/heads/hop) -"voT" = ( -/obj/structure/table/reinforced, -/obj/structure/desk_bell{ - pixel_x = 5; - pixel_y = 10 - }, -/obj/item/origami/paperfrog{ - pixel_x = -4; - pixel_y = 2 - }, -/obj/machinery/door/window/eastleft{ - dir = 8; - name = "Hydroponics Desk"; - req_one_access_txt = "28;25;35" - }, -/turf/open/floor/iron, -/area/hydroponics) -"vph" = ( -/obj/effect/turf_decal/sand/plating, -/obj/structure/flora/junglebush/c, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/asteroid/paradise) "vpm" = ( /obj/structure/sign/warning/radiation/rad_area, /turf/closed/wall/r_wall, @@ -43246,11 +42924,11 @@ /obj/structure/chair/fancy/plastic{ dir = 8 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = -8; pixel_y = 17 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = -12; pixel_y = 11 }, @@ -43286,6 +42964,20 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) +"vru" = ( +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/sand/plating, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "vry" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -43335,6 +43027,12 @@ /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/air_input/layer2, /turf/open/floor/engine/air, /area/engine/atmos) +"vsR" = ( +/obj/machinery/computer/atmos_control/tank/mix_tank, +/obj/effect/turf_decal/box/corners, +/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer4, +/turf/open/floor/iron/smooth_large, +/area/engine/atmos) "vsS" = ( /obj/machinery/computer/xenoartifact_console, /obj/effect/turf_decal/bot, @@ -43420,24 +43118,6 @@ }, /turf/open/floor/mineral/titanium, /area/asteroid/paradise/surface) -"vuE" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 5 - }, -/obj/structure/table, -/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ - alpha = 230; - color = "#edaa0c" - }, -/obj/item/clothing/gloves/color/black, -/obj/effect/decal/cleanable/dirt, -/obj/item/clothing/gloves/color/black{ - pixel_x = 3; - pixel_y = 7 - }, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/iron, -/area/engine/atmos) "vvg" = ( /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/asteroid/planetary, @@ -43466,6 +43146,14 @@ }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) +"vxi" = ( +/obj/effect/turf_decal/bot, +/obj/structure/closet/secure_closet/engineering_personal, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/half, +/area/engine/engineering) "vxn" = ( /obj/machinery/vending/wardrobe/cargo_wardrobe, /obj/effect/turf_decal/stripes/line{ @@ -43477,11 +43165,6 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/storage) -"vxP" = ( -/obj/effect/turf_decal/sand/plating, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/asteroid/paradise) "vyh" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -43526,6 +43209,21 @@ luminosity = 2 }, /area/ai_monitored/turret_protected/ai) +"vyF" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/turf/open/floor/iron/smooth_half{ + dir = 1 + }, +/area/engine/engineering) "vyZ" = ( /obj/effect/landmark/start/quartermaster, /obj/structure/cable/yellow{ @@ -43549,27 +43247,25 @@ }, /turf/open/floor/iron/sepia, /area/quartermaster/storage) -"vAb" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/item/radio/intercom{ - pixel_x = 32 - }, -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/light{ - dir = 4 +"vAp" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 }, +/obj/machinery/light/small, +/obj/item/radio/intercom/directional/south, /turf/open/floor/iron/dark, -/area/engine/engineering) +/area/security/brig) "vAD" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/dark, /area/hallway/primary/central) +"vAT" = ( +/obj/machinery/seed_extractor, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/grid/steel, +/area/hydroponics) "vAX" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -43664,6 +43360,23 @@ }, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) +"vDC" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/machinery/portable_atmospherics/pump, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/iron/smooth_half, +/area/engine/atmos) "vDJ" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark, @@ -43838,23 +43551,18 @@ }, /turf/open/floor/iron/dark, /area/engineering/hallway) -"vKD" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +"vKr" = ( +/obj/machinery/computer/atmos_control/tank/air_tank{ + dir = 1 }, -/turf/open/floor/iron/dark, -/area/engine/engineering) -"vKW" = ( -/obj/structure/cable{ - icon_state = "1-4" +/obj/effect/turf_decal/box/corners{ + dir = 4 }, -/obj/structure/cable{ - icon_state = "2-4" +/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer4{ + dir = 6 }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/asteroid/paradise/surface) +/turf/open/floor/iron/smooth_large, +/area/engine/atmos) "vLu" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -43866,10 +43574,34 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/security/brig) +"vLx" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/iron/smooth_large, +/area/engine/engineering) "vLy" = ( /obj/effect/decal/cleanable/dirt, /turf/open/openspace, /area/asteroid/paradise) +"vLz" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "vLP" = ( /turf/closed/wall/r_wall, /area/storage/tech) @@ -43929,6 +43661,13 @@ /obj/structure/holosign/barrier/atmos/robust, /turf/open/floor/plating, /area/engine/engineering) +"vNl" = ( +/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer4{ + dir = 4 + }, +/obj/effect/landmark/start/station_engineer, +/turf/open/floor/catwalk_floor/iron, +/area/engine/atmos) "vNE" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -44006,6 +43745,13 @@ "vQN" = ( /turf/open/openspace, /area/medical/medbay/central) +"vRc" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/plating, +/area/engine/engineering) "vRk" = ( /obj/machinery/atmospherics/pipe/manifold/purple/visible{ dir = 1 @@ -44053,6 +43799,10 @@ }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/captain/private) +"vSf" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/textured_large, +/area/engine/engineering) "vSg" = ( /obj/structure/closet/secure_closet/genpop{ anchored = 0 @@ -44114,6 +43864,14 @@ /obj/effect/landmark/start/captain, /turf/open/floor/carpet/blue, /area/bridge/meeting_room) +"vSN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 9 + }, +/turf/open/floor/iron/textured_large, +/area/engine/engineering) "vTg" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -44145,6 +43903,15 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) +"vTE" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/large, +/area/engine/engineering) "vUl" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -44167,33 +43934,34 @@ }, /turf/open/floor/iron, /area/security/prison) -"vVo" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/machinery/light{ +"vUC" = ( +/obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/structure/fireaxecabinet{ - pixel_x = 1; - pixel_y = 32 +/obj/effect/turf_decal/numbers/two_nine{ + dir = 1; + pixel_x = -17; + pixel_y = -6 }, -/obj/structure/disposalpipe/segment{ +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 8 }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/open/floor/iron, -/area/engine/engineering) +/turf/open/floor/iron/white, +/area/medical/medbay/central) "vVE" = ( /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/bar) +"vVL" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 10 + }, +/turf/open/floor/iron/textured_large, +/area/engine/atmos) "vVS" = ( /obj/structure/table/reinforced, /obj/item/storage/box{ @@ -44310,13 +44078,6 @@ }, /turf/open/floor/iron/dark, /area/hallway/primary/central) -"vXw" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/bot, -/obj/machinery/power/emitter, -/turf/open/floor/iron, -/area/engine/engineering) "vYl" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 1 @@ -44366,19 +44127,13 @@ }, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface) -"vZP" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/structure/table, -/obj/item/wallframe/extinguisher_cabinet{ - pixel_x = -1; - pixel_y = 31 +"vZw" = ( +/obj/structure/flora/rock/pile, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 8 }, -/obj/item/storage/toolbox/electrical, -/obj/item/clothing/gloves/color/yellow, -/turf/open/floor/iron, -/area/engine/atmos) +/turf/open/floor/plating/asteroid/planetary, +/area/engine/engineering) "waf" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -44495,25 +44250,25 @@ }, /turf/open/floor/wood, /area/crew_quarters/cafeteria) -"wcv" = ( -/obj/item/radio/intercom{ - dir = 1; - pixel_x = -33; - pixel_y = -36 +"wcw" = ( +/obj/machinery/light{ + dir = 8 }, -/obj/structure/disposalpipe/multiz/down{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/turf/open/floor/iron/smooth_corner{ + dir = 1 }, -/obj/structure/rack, -/obj/item/stack/package_wrap, -/obj/item/hand_labeler, -/obj/item/book/manual/wiki/cooking_to_serve_man, -/obj/item/book/manual/wiki/barman_recipes{ - pixel_x = 4; - pixel_y = -4 +/area/engine/engineering) +"wcV" = ( +/obj/machinery/light, +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable/yellow, +/turf/open/floor/iron/grid/steel, +/area/hydroponics) "wdj" = ( /obj/structure/lattice/catwalk/over, /obj/machinery/computer/card/minor/ce{ @@ -44546,49 +44301,20 @@ }, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) -"wdJ" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/closet/toolcloset, -/obj/effect/turf_decal/bot, -/obj/machinery/firealarm/directional/north, -/obj/item/toy/spinningtoy, -/obj/structure/disposalpipe/multiz{ - dir = 2 - }, -/turf/open/floor/iron, -/area/engine/atmos) "wdQ" = ( /obj/structure/fireplace, /obj/structure/bed/dogbed, /turf/open/floor/wood, /area/asteroid/paradise/surface) -"wdR" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/two, -/turf/open/floor/pod/dark, -/area/maintenance/department/science/central) +"wdX" = ( +/obj/machinery/smartfridge, +/turf/open/floor/iron, +/area/hydroponics) "wey" = ( /obj/structure/closet/cardboard, /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/iron, /area/maintenance/department/engine) -"weD" = ( -/obj/structure/railing/corner, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) "weN" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -44599,15 +44325,6 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) -"wfB" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/computer/atmos_control/tank/air_tank{ - dir = 1 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/tech, -/area/engine/atmos) "wfD" = ( /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 @@ -44639,6 +44356,36 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark, /area/maintenance/disposal) +"wfM" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/obj/structure/closet/crate/solarpanel_small, +/obj/item/circuitboard/machine/smes, +/turf/open/floor/iron/large, +/area/engine/engineering) +"wfS" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ + alpha = 180 + }, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/bot, +/obj/machinery/light, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/dark, +/area/bridge) "wgg" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -44706,17 +44453,6 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/plating/asteroid/planetary, /area/crew_quarters/dorms) -"whz" = ( -/obj/item/storage/pod{ - pixel_x = 5; - pixel_y = 32 - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -30 - }, -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/iron, -/area/medical/surgery) "whG" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -44819,6 +44555,19 @@ }, /turf/open/floor/iron/white/side, /area/science/research) +"wjs" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/flora/ausbushes/ywflowers{ + pixel_x = 2; + pixel_y = 3 + }, +/turf/open/floor/grass/no_border, +/area/medical/storage) "wjA" = ( /obj/structure/girder, /turf/open/floor/plating/dirt/planetary, @@ -44838,19 +44587,17 @@ /obj/effect/turf_decal/box, /turf/open/floor/iron/white, /area/science/explab) -"wkE" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/lootdrop/maintenance/two, -/obj/structure/closet/firecloset/full, -/turf/open/floor/iron, -/area/maintenance/department/chapel) "wkI" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, /turf/open/floor/plating, /area/maintenance/department/cargo) +"wld" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron, +/area/maintenance/department/chapel) "wlj" = ( /obj/effect/turf_decal/tile/black/opposingcorners{ dir = 1 @@ -44868,26 +44615,6 @@ /obj/structure/ladder, /turf/open/floor/pod/dark, /area/maintenance/department/science/central) -"wlK" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/components/binary/pump/on/layer4{ - dir = 8; - name = "Waste to Filter" - }, -/obj/machinery/atmospherics/components/binary/pump/on/layer2{ - dir = 4; - name = "Air to Distro"; - target_pressure = 500 - }, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold4w/general/visible, -/turf/open/floor/iron/tech, -/area/engine/atmos) "wlY" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -44944,15 +44671,16 @@ "wnT" = ( /turf/open/floor/dock/drydock, /area/quartermaster/storage) -"wov" = ( +"woA" = ( /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/machinery/ai_slipper{ - uses = 10 +/obj/structure/disposalpipe/segment{ + dir = 10 }, -/turf/open/floor/iron/showroomfloor, -/area/crew_quarters/fitness/recreation) +/obj/effect/turf_decal/numbers/two_nine, +/turf/open/floor/iron/smooth_large, +/area/engine/engineering) "woV" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, @@ -44983,6 +44711,16 @@ }, /turf/open/floor/iron/sepia, /area/quartermaster/storage) +"wqp" = ( +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/mob/living/simple_animal/hostile/retaliate/goat{ + name = "Pete" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) "wqB" = ( /obj/structure/fence/corner{ dir = 8 @@ -45002,6 +44740,24 @@ }, /turf/open/floor/plating, /area/maintenance/department/engine) +"wqW" = ( +/obj/item/radio/intercom{ + pixel_x = 33; + pixel_y = -3 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/green/visible{ + dir = 4 + }, +/turf/open/floor/iron/smooth_half{ + dir = 1 + }, +/area/engine/engineering) "wru" = ( /obj/effect/spawner/room/fivexfour, /turf/open/floor/plating, @@ -45278,12 +45034,6 @@ /obj/effect/landmark/start/quartermaster, /turf/open/floor/iron/sepia, /area/quartermaster/storage) -"wzE" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 5 - }, -/turf/open/floor/iron/tech, -/area/engine/engineering) "wzL" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/decal/cleanable/dirt/dust, @@ -45315,24 +45065,16 @@ }, /turf/open/floor/iron/dark, /area/security/execution/education) -"wAx" = ( -/obj/structure/flora/rock, -/turf/open/floor/plating/asteroid/planetary, -/area/engine/atmos) -"wAN" = ( -/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, -/obj/effect/turf_decal/siding/white/corner{ - dir = 4 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/structure/disposalpipe/segment{ +"wAD" = ( +/obj/structure/reflector/box{ + anchored = 1; dir = 8 }, -/turf/open/floor/iron, -/area/hydroponics) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, +/turf/open/floor/plating/asteroid/planetary, +/area/engine/engineering) "wBy" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/mineral/random/air, @@ -45356,14 +45098,6 @@ }, /turf/open/floor/iron, /area/security/prison) -"wCB" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/hallway/primary/fore) "wCG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -45391,6 +45125,12 @@ }, /turf/open/floor/iron, /area/maintenance/department/eva) +"wCS" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/turf/closed/wall/mineral/titanium/survival/nodiagonal, +/area/hallway/primary/fore) "wDb" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -45410,16 +45150,11 @@ /obj/item/soap/nanotrasen, /turf/open/floor/plating, /area/hallway/secondary/service) -"wDm" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "Ports to Dirty" +"wDn" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold4w/yellow/visible/layer4, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/stripes/line, -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/start/station_engineer, -/turf/open/floor/iron/tech, +/turf/open/floor/iron, /area/engine/atmos) "wDz" = ( /obj/machinery/light{ @@ -45433,6 +45168,18 @@ dir = 8 }, /area/hallway/primary/central) +"wDC" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/glasses/meson/engine, +/obj/item/stack/sheet/mineral/copper{ + amount = 5; + pixel_x = -7; + pixel_y = 3 + }, +/obj/item/storage/belt/utility/full/engi, +/obj/structure/window/plasma/reinforced, +/turf/open/floor/iron/large, +/area/engine/engineering) "wDD" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/decal/cleanable/dirt/dust, @@ -45442,33 +45189,12 @@ }, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) -"wDK" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) -"wDW" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/hallway/secondary/service) "wEb" = ( /obj/machinery/reagentgrinder{ pixel_x = -1; pixel_y = 12 }, -/obj/item/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/cup/bucket{ pixel_x = 9; pixel_y = 3 }, @@ -45495,6 +45221,26 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/plating, /area/maintenance/department/engine/atmos) +"wEr" = ( +/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ + alpha = 180 + }, +/obj/structure/table/reinforced, +/obj/item/paicard{ + pixel_x = -10; + pixel_y = 2 + }, +/obj/item/storage/fancy/donut_box{ + pixel_x = 9; + pixel_y = -1 + }, +/obj/item/book/manual/wiki/sopcommand, +/obj/machinery/camera/directional/south, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/dark, +/area/bridge) "wEs" = ( /obj/item/radio/intercom{ dir = 1; @@ -45534,13 +45280,6 @@ /obj/structure/flora/rock/pile, /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) -"wEX" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/vending/wardrobe/engi_wardrobe, -/turf/open/floor/iron, -/area/engine/engineering) "wFm" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -45550,12 +45289,6 @@ /obj/structure/cable/yellow, /turf/open/floor/plating, /area/security/execution/education) -"wFx" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/turf/open/floor/iron/grid/steel, -/area/bridge) "wFL" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/multiz/layer4{ @@ -45581,6 +45314,20 @@ }, /turf/open/floor/plating/asteroid/planetary, /area/quartermaster/storage) +"wGy" = ( +/obj/machinery/atmospherics/components/binary/pump/layer4{ + name = "Pure to Mix" + }, +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 10 + }, +/obj/machinery/atmospherics/components/binary/pump/layer2{ + name = "Air to Mix" + }, +/obj/structure/window/plasma/reinforced, +/obj/effect/turf_decal/box/white, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/engine/atmos) "wGC" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/beach/sand, @@ -45623,21 +45370,6 @@ }, /turf/open/floor/pod/dark, /area/crew_quarters/heads/hor) -"wHx" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/disposalpipe/multiz{ - dir = 2 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/engine/engineering) "wHD" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -45758,6 +45490,22 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/qm) +"wJm" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer2{ + dir = 4 + }, +/obj/structure/reagent_dispensers/watertank/high, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/iron/smooth_half, +/area/engine/atmos) "wJp" = ( /obj/effect/turf_decal/siding/white{ dir = 1 @@ -45782,6 +45530,29 @@ }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain) +"wJS" = ( +/obj/machinery/computer/atmos_control/tank/nitrogen_tank{ + dir = 1 + }, +/obj/effect/turf_decal/box/corners{ + dir = 1 + }, +/turf/open/floor/iron/smooth_large, +/area/engine/atmos) +"wKa" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 4 + }, +/turf/open/floor/iron/smooth_corner{ + dir = 8 + }, +/area/engine/engineering) "wKs" = ( /obj/machinery/camera/directional/west, /obj/machinery/vending/medical, @@ -45874,18 +45645,6 @@ }, /turf/open/floor/iron/techmaint/planetary, /area/storage/tech) -"wMY" = ( -/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/effect/landmark/start/botanist, -/turf/open/floor/iron, -/area/hydroponics) "wNk" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -45912,16 +45671,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) -"wNN" = ( -/obj/machinery/computer/atmos_alert{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/iron, -/area/engine/engineering) "wNR" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -46070,6 +45819,14 @@ }, /turf/open/floor/iron, /area/security/brig) +"wRZ" = ( +/obj/machinery/hydroponics/constructable, +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron/grid/steel, +/area/hydroponics) "wSa" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -46079,6 +45836,13 @@ }, /turf/open/floor/iron, /area/maintenance/department/engine/atmos) +"wSj" = ( +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) "wSz" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -46132,6 +45896,15 @@ /obj/effect/turf_decal/evac/evac_big, /turf/open/floor/iron, /area/maintenance/department/science/central) +"wTZ" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/grid/steel, +/area/bridge) "wUl" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, @@ -46144,6 +45917,11 @@ "wUU" = ( /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise/surface/sand) +"wVt" = ( +/obj/effect/turf_decal/bot, +/obj/structure/reflector/box, +/turf/open/floor/iron/large, +/area/engine/engineering) "wVx" = ( /obj/structure/sign/departments/minsky/supply/janitorial{ pixel_y = 32 @@ -46160,10 +45938,10 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, /obj/effect/turf_decal/siding/wood, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_y = 28 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_y = 23 }, /obj/item/paicard, @@ -46199,12 +45977,6 @@ slowdown = 0 }, /area/asteroid/paradise/surface) -"wWC" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/engine/engineering) "wWF" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -46225,12 +45997,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/prison/dark, /area/security/prison) -"wXA" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/bot, -/obj/machinery/power/emitter, -/turf/open/floor/iron, -/area/engine/engineering) "wYk" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -46253,20 +46019,6 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/asteroid/paradise/surface) -"wYL" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/numbers/two_nine{ - dir = 1; - pixel_x = -17; - pixel_y = -6 - }, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "wYP" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Medbay Maintenance"; @@ -46327,6 +46079,20 @@ /obj/structure/sign/departments/minsky/supply/cargo, /turf/closed/wall, /area/medical/apothecary) +"wZO" = ( +/obj/structure/table/reinforced, +/obj/item/book/manual/wiki/engineering_hacking{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/book/manual/wiki/engineering_guide, +/obj/item/book/manual/wiki/engineering_construction{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/structure/window/plasma/reinforced, +/turf/open/floor/iron/large, +/area/engine/engineering) "xab" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 @@ -46407,20 +46173,6 @@ /obj/structure/lattice, /turf/open/openspace, /area/hallway/primary/fore) -"xcp" = ( -/obj/machinery/atmospherics/components/binary/pump/layer2{ - dir = 8; - name = "N2 to Pure" - }, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/tech, -/area/engine/atmos) "xct" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -46432,17 +46184,6 @@ /obj/structure/grille/broken, /turf/open/floor/plating, /area/maintenance/department/chapel) -"xcv" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/modular_computer/console/preset/engineering{ - dir = 8 - }, -/obj/machinery/camera/directional/east, -/turf/open/floor/iron/dark, -/area/engine/engineering) "xdb" = ( /obj/effect/landmark/start/cook, /obj/effect/turf_decal/tile/bar/opposingcorners, @@ -46451,31 +46192,6 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/kitchen) -"xdg" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/atmos/glass{ - req_access_txt = "11" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible/layer5{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/engine/atmos) "xdp" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 @@ -46488,15 +46204,6 @@ }, /turf/open/floor/iron, /area/security/brig) -"xdD" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/iron/grid/steel, -/area/bridge) "xdH" = ( /obj/structure/railing/corner{ dir = 1 @@ -46512,12 +46219,6 @@ }, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) -"xdJ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/four, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/asteroid/paradise) "xdL" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, @@ -46634,10 +46335,6 @@ "xgH" = ( /turf/closed/wall, /area/medical/storage) -"xgK" = ( -/obj/structure/flora/junglebush/large, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise) "xgY" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -46647,16 +46344,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating/asteroid/planetary, /area/quartermaster/storage) -"xhE" = ( -/obj/structure/reflector/box{ - anchored = 1; - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise) "xhX" = ( /obj/effect/mapping_helpers/airlock/unres{ dir = 8 @@ -46679,6 +46366,15 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/central) +"xia" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/visible, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/iron/smooth_large, +/area/maintenance/disposal/incinerator) "xiu" = ( /obj/effect/turf_decal/trimline/white/line{ dir = 1 @@ -46773,22 +46469,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/maint) -"xjD" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) -"xkb" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "xko" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -46822,16 +46502,22 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/maintenance/department/engine) -"xkV" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer2{ - dir = 4 +"xlf" = ( +/obj/structure/table/reinforced, +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/turf/open/floor/iron/large, +/area/engine/engineering) +"xlu" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 8 }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ + dir = 8 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/tech, -/area/engine/atmos) +/turf/open/floor/plating/asteroid/planetary, +/area/engine/engineering) "xlw" = ( /obj/machinery/power/apc/auto_name/directional/south{ pixel_y = -24 @@ -46860,6 +46546,16 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/department/science/xenobiology) +"xmB" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/sign/painting/library{ + pixel_y = -32 + }, +/turf/open/floor/iron/grid/steel, +/area/hydroponics) "xmL" = ( /turf/closed/wall/rust, /area/science/mixing) @@ -46958,39 +46654,24 @@ }, /turf/open/floor/plating/rust, /area/science/test_area) +"xoG" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/box, +/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/large, +/area/hydroponics) "xoR" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 }, /turf/open/floor/carpet/red, /area/crew_quarters/theatre/backstage) -"xpn" = ( -/obj/machinery/computer/turbine_computer{ - dir = 1; - id = "incineratorturbineLeft"; - name = "gas turbine left control computer" - }, -/obj/structure/sign/warning/nosmoking{ - pixel_x = 1; - pixel_y = -32 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/iron/dark, -/area/maintenance/disposal/incinerator) -"xpp" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/iron/showroomfloor, -/area/crew_quarters/fitness/recreation) "xpq" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -47017,19 +46698,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/security/brig) -"xpS" = ( -/obj/effect/turf_decal/tile/purple/half/contrasted, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/machinery/door/airlock/research/glass{ - req_one_access_txt = "7;29" - }, -/turf/open/floor/iron/white/side{ - dir = 8 - }, -/area/science/research) "xpV" = ( /obj/machinery/door/poddoor/shutters{ id = "commissaryshutters0"; @@ -47066,34 +46734,28 @@ /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) +"xqw" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_one_access_txt = "12;28" + }, +/turf/open/floor/plating, +/area/maintenance/department/medical/morgue) "xqU" = ( /obj/structure/flora/rock/pile, /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) -"xri" = ( -/obj/machinery/smartfridge{ - name = "Bulk storage" - }, -/turf/open/floor/iron/grid/steel, -/area/hydroponics) "xrC" = ( /obj/effect/turf_decal/numbers/two_nine{ dir = 1 }, /turf/open/floor/iron, /area/maintenance/department/chapel) -"xsc" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/maintenance/disposal/incinerator) "xsj" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -47123,18 +46785,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall, /area/maintenance/department/medical/morgue) -"xsU" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 9 - }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/cmo) "xsZ" = ( /obj/structure/railing{ dir = 6 @@ -47152,6 +46802,34 @@ /obj/structure/lattice/catwalk/over, /turf/open/openspace, /area/maintenance/department/engine/atmos) +"xtg" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 6 + }, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/maintenance/disposal/incinerator) +"xth" = ( +/obj/machinery/power/solar_control{ + use_power = 0; + idle_power_usage = 0 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "xty" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -47166,14 +46844,6 @@ }, /turf/open/floor/iron/dark, /area/hallway/primary/aft) -"xtP" = ( -/obj/machinery/holopad, -/obj/effect/turf_decal/box, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "xuC" = ( /obj/vehicle/ridden/janicart{ dir = 1 @@ -47265,17 +46935,6 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/qm) -"xwe" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ - dir = 6 - }, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise) "xwm" = ( /obj/machinery/teleport/station, /obj/effect/turf_decal/stripes/line{ @@ -47294,10 +46953,6 @@ }, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface) -"xwu" = ( -/obj/structure/closet/secure_closet/personal, -/turf/open/floor/iron, -/area/hallway/primary/fore) "xwB" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -47371,6 +47026,16 @@ }, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface) +"xxD" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/portable_atmospherics/canister, +/turf/open/floor/iron/textured_half{ + dir = 1 + }, +/area/engine/engineering) "xyb" = ( /obj/structure/fans/tiny{ density = 1; @@ -47398,6 +47063,18 @@ /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrogen_output/layer2, /turf/open/floor/engine/n2, /area/engine/atmos) +"xyB" = ( +/obj/effect/turf_decal/pool{ + dir = 8 + }, +/obj/item/storage/firstaid/brute{ + pixel_y = 5 + }, +/obj/structure/closet/boxinggloves, +/turf/open/floor/iron/textured_half{ + dir = 1 + }, +/area/crew_quarters/fitness/recreation) "xyS" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ @@ -47478,18 +47155,6 @@ }, /turf/open/floor/wood/broken, /area/library/abandoned) -"xAy" = ( -/obj/structure/table, -/obj/item/airlock_painter{ - pixel_y = 4 - }, -/obj/item/storage/toolbox/electrical, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/item/clothing/gloves/color/yellow, -/turf/open/floor/iron/dark, -/area/engine/engineering) "xAU" = ( /obj/structure/chair{ dir = 1 @@ -47502,6 +47167,10 @@ }, /turf/open/floor/iron, /area/medical/medbay/central) +"xBx" = ( +/obj/structure/flora/ash/tall_shroom, +/turf/open/floor/plating/asteroid/planetary, +/area/engine/engineering) "xBP" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -47519,14 +47188,19 @@ /obj/structure/closet/firecloset/full, /turf/open/floor/iron, /area/ai_monitored/turret_protected/aisat/maint) -"xCw" = ( -/obj/machinery/computer/security/hos, -/obj/item/toy/plush/carpplushie{ - pixel_x = 5; - pixel_y = 17 +"xCe" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 2 }, -/turf/open/floor/iron/dark, -/area/crew_quarters/heads/hos) +/obj/machinery/door/airlock/research/glass{ + req_one_access_txt = "7;29" + }, +/turf/open/floor/iron/white/side{ + dir = 4 + }, +/area/science/research) "xCy" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -47548,6 +47222,10 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/security/brig) +"xCJ" = ( +/obj/structure/grille, +/turf/closed/wall/r_wall, +/area/engine/engineering) "xCK" = ( /obj/machinery/power/terminal{ dir = 1 @@ -47625,30 +47303,6 @@ dir = 6 }, /area/hallway/primary/aft) -"xDX" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch"; - req_access_txt = "12" - }, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) -"xEu" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/visible, -/obj/machinery/computer/atmos_control/tank/oxygen_tank{ - dir = 1 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/tech, -/area/engine/atmos) "xFc" = ( /obj/machinery/vending/boozeomat, /turf/closed/wall/r_wall, @@ -47658,42 +47312,10 @@ /obj/structure/closet/emcloset/anchored, /turf/open/floor/iron, /area/maintenance/department/bridge) -"xGl" = ( -/obj/effect/turf_decal/siding/white{ - alpha = 100 - }, -/obj/structure/flora/ausbushes/ywflowers{ - pixel_x = 2; - pixel_y = 3 - }, -/obj/structure/flora/ausbushes/palebush{ - pixel_x = -6; - pixel_y = 10 - }, -/turf/open/floor/plating/asteroid/planetary, -/area/crew_quarters/dorms) "xGt" = ( /obj/structure/railing/corner, /turf/open/openspace, /area/engineering/hallway) -"xGG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 10 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/turf/open/floor/iron/tech, -/area/engine/engineering) "xGI" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable/yellow{ @@ -47760,6 +47382,11 @@ /obj/structure/sign/warning/securearea, /turf/closed/wall/r_wall, /area/maintenance/department/engine) +"xIg" = ( +/turf/open/floor/iron/textured_corner{ + dir = 8 + }, +/area/engine/atmos) "xIl" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/bot, @@ -47789,6 +47416,11 @@ dir = 1 }, /area/hallway/primary/central) +"xIq" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/bot_assembly/floorbot, +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/science/research/abandoned) "xIr" = ( /obj/structure/table/glass, /obj/machinery/reagentgrinder{ @@ -47943,6 +47575,21 @@ }, /turf/open/floor/iron, /area/quartermaster/sorting) +"xKV" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Gas to Chamber" + }, +/obj/effect/turf_decal/box/white, +/turf/open/floor/iron/textured_half, +/area/engine/engineering) "xLc" = ( /obj/item/paper/guides/jobs/medical/morgue, /obj/effect/turf_decal/bot, @@ -48076,26 +47723,6 @@ }, /turf/open/floor/wood, /area/chapel/office) -"xPe" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) -"xPJ" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister, -/turf/open/floor/iron/tech, -/area/engine/engineering) "xQe" = ( /obj/machinery/computer/card, /obj/item/radio/intercom{ @@ -48105,12 +47732,6 @@ }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) -"xQu" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron/tech, -/area/engine/atmos) "xQN" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -48270,6 +47891,24 @@ }, /turf/open/floor/wood, /area/crew_quarters/cafeteria) +"xTh" = ( +/obj/effect/decal/cleanable/food/flour, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/rack, +/obj/item/stack/package_wrap, +/obj/item/hand_labeler, +/obj/item/book/manual/wiki/cooking_to_serve_man, +/obj/item/book/manual/wiki/barman_recipes{ + pixel_x = 4; + pixel_y = -4 + }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "xTs" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -48286,44 +47925,6 @@ }, /turf/open/floor/iron/dark, /area/hallway/primary/central) -"xTu" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/open/floor/iron, -/area/engine/engineering) -"xTy" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible/layer4{ - dir = 6 - }, -/obj/structure/table, -/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ - alpha = 230; - color = "#edaa0c" - }, -/obj/item/clothing/suit/hazardvest{ - pixel_x = -5; - pixel_y = -2 - }, -/obj/item/clothing/suit/hazardvest{ - pixel_x = 5; - pixel_y = 6 - }, -/obj/item/clothing/suit/hazardvest{ - pixel_x = -7; - pixel_y = 7 - }, -/obj/item/clothing/suit/hazardvest{ - pixel_x = 8; - pixel_y = -3 - }, -/turf/open/floor/iron, -/area/engine/atmos) "xTA" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -48361,19 +47962,6 @@ }, /turf/open/floor/carpet/red, /area/medical/exam_room) -"xUc" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/structure/table, -/obj/item/pickaxe, -/obj/machinery/firealarm/directional/north, -/obj/item/clothing/mask/gas/explorer{ - pixel_x = -5; - pixel_y = 6 - }, -/turf/open/floor/iron, -/area/engine/atmos) "xUf" = ( /obj/machinery/newscaster{ pixel_x = 33; @@ -48397,17 +47985,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) -"xUt" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/effect/turf_decal/stripes/end{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister, -/turf/open/floor/iron/tech, -/area/engine/engineering) "xUQ" = ( /obj/structure/chair/fancy/sofa/old/right{ dir = 4 @@ -48456,6 +48033,13 @@ slowdown = 0 }, /area/asteroid/paradise/surface) +"xVJ" = ( +/obj/effect/landmark/start/captain, +/obj/effect/turf_decal/siding/dark{ + dir = 10 + }, +/turf/open/floor/glass/reinforced, +/area/bridge) "xVP" = ( /obj/machinery/airalarm/directional/west, /obj/structure/cable/yellow{ @@ -48486,6 +48070,21 @@ }, /turf/open/floor/wood/broken, /area/crew_quarters/cafeteria) +"xXa" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 8 + }, +/obj/structure/table/reinforced, +/obj/machinery/computer/med_data/laptop{ + dir = 4; + pixel_x = 2; + pixel_y = 2 + }, +/turf/open/floor/carpet/blue, +/area/crew_quarters/heads/cmo) "xXf" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/line{ @@ -48517,6 +48116,12 @@ }, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise/surface) +"xYM" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/closet/firecloset/full, +/obj/effect/spawner/lootdrop/maintenance/two, +/turf/open/floor/iron, +/area/maintenance/department/chapel) "xYT" = ( /turf/closed/wall/r_wall, /area/medical/patients_rooms) @@ -48560,10 +48165,6 @@ }, /turf/closed/wall, /area/hallway/primary/aft) -"yaf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron, -/area/engine/engineering) "yaq" = ( /turf/closed/wall/rust, /area/science/server) @@ -48588,14 +48189,6 @@ dir = 4 }, /area/medical/genetics/cloning) -"yaU" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/bot, -/obj/structure/closet/secure_closet/engineering_personal, -/turf/open/floor/iron, -/area/engine/engineering) "yaY" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -48606,10 +48199,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/maintenance/department/science/central) -"ybk" = ( -/obj/machinery/smartfridge, -/turf/open/floor/iron/grid/steel, -/area/hydroponics) "ybp" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -48624,6 +48213,22 @@ dir = 10 }, /area/hallway/primary/central) +"ybO" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/engine/engineering) "ycc" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -48681,17 +48286,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/cryopods) -"ycT" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/frame/computer{ - anchored = 1 - }, -/obj/item/wallframe/apc{ - pixel_x = -2; - pixel_y = 29 - }, -/turf/open/floor/iron, -/area/asteroid/paradise) "ydE" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/sand/plating, @@ -48766,12 +48360,6 @@ }, /turf/open/floor/pod/dark, /area/crew_quarters/cafeteria) -"yeZ" = ( -/obj/effect/turf_decal/numbers{ - dir = 1 - }, -/turf/open/floor/iron, -/area/maintenance/department/security/brig) "yfq" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/disposalpipe/multiz/down{ @@ -48815,21 +48403,6 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/iron/dark, /area/security/nuke_storage) -"ygN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/bot, -/obj/machinery/shieldgen, -/obj/item/radio/intercom{ - pixel_x = 1; - pixel_y = -31 - }, -/turf/open/floor/iron, -/area/engine/engineering) -"yhy" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/bot_assembly/floorbot, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/asteroid/paradise) "yib" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -48847,23 +48420,20 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/wood/broken, /area/chapel/office) -"yiF" = ( -/obj/effect/turf_decal/sand/plating, -/obj/effect/turf_decal/sand/plating, -/obj/structure/flora/rock/pile, +"yjm" = ( +/obj/structure/flora/grass/jungle/b, /turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise) -"yiO" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ +/area/engine/engineering) +"yjn" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/numbers{ + dir = 1 + }, +/obj/machinery/light/small{ dir = 4 }, -/obj/structure/table_frame, /turf/open/floor/iron, -/area/engine/atmos) -"yjb" = ( -/obj/effect/decal/cleanable/food/egg_smudge, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) +/area/maintenance/department/science/central) "yjC" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ alpha = 180; @@ -48873,6 +48443,10 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/security/warden) +"yjL" = ( +/obj/structure/flora/rock, +/turf/open/floor/plating/asteroid/planetary, +/area/engine/engineering) "yjV" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -56568,12 +56142,12 @@ xqe iGq vqI tHO -xTy -dLK -aoo -bdn -rkR -exo +uYL +umI +ffZ +oTI +dQA +hCQ tHO vqI vqI @@ -56825,12 +56399,12 @@ rXp faZ uli uli -uOs -aUf -hpP -fCo -gaj -vuE +rui +rBg +amR +vkZ +vVL +kRI uli uli uli @@ -57081,13 +56655,13 @@ oTt sZb faZ gLH -dtx -gpk -bSF -xEu -aww -iYV -rRg +aay +pnv +vjT +kFc +kro +pGd +iYa tuV mWX tHO @@ -57338,13 +56912,13 @@ kCM wEs vXr tPx -sAm -fsT -xcp -sQU -nMG -gJV -dzF +nxm +mBs +toh +wJS +bDG +lVl +jEN gFd jct uli @@ -57596,12 +57170,12 @@ oVA hZi fAb vgG -sEH -xkV -wfB -cHg -tJa -pYm +wJm +snY +vKr +vsR +fsp +nHR vgG drz tHO @@ -57853,18 +57427,18 @@ iVv tHO eNy kqG -noX -aPe -oyk -mkI -tJa -tAT +dbG +cZv +kRm +kKG +vNl +qUU bFY uyb uli vqI -vqI -vqI +jOo +jOo vqI vqI vqI @@ -58110,18 +57684,18 @@ jDe uli xyk bKc -eMn -cnW -qdc -tIa -wDm -oJt +fto +rBg +pMT +jpL +sNW +uNE mCk nlB uli -vqI -vqI -vqI +jOo +jOo +jOo vqI vqI vqI @@ -58367,20 +57941,20 @@ vXr tHO drz vgG -igh -nzj -raX -ePf -hfq -thf +vDC +inB +eoL +xIg +hBV +hdU vgG drz tHO -vqI -vqI -vqI -vqI -vqI +jOo +jOo +jOo +jOo +jOo vqI vqI vqI @@ -58624,21 +58198,21 @@ jOo uli vsL qMR -tFX -hZv -ojT -rVx -aDD -eyD +sOh +jwO +nPw +sex +oFV +wGy xIW tqq tHO -vqI -vqI -vqI -vqI -vqI -vqI +jOo +gid +jOo +rRV +jOo +jOo vqI vqI vqI @@ -58881,21 +58455,21 @@ jOo uli fmE sPS -jjq -qyw -kEB -jhG -bov -tnQ +kcP +ouk +rIf +mgw +dGG +rIE xDF dnm uli -nXA -xqU -vqI -vqI -vqI -vqI +qXs +bJq +pgG +rRV +rRV +jOo vqI vqI vqI @@ -59098,19 +58672,19 @@ uVy qte waJ rYY -wDW -vnV +cmb +mLH pYd kUF azS iaR -jrB -ibj -ibj -hYk -ibj -urP -boG +xyB +bBW +bBW +cAN +bBW +mfU +pzC iaR mvf ouO @@ -59138,22 +58712,22 @@ jOo tHO uli tHO -iZg -gOe -wlK -bWT -dao -oga +uRd +igv +oHz +fru +rBg +nNd tHO uli tHO -ebI -sLz -bXA -vqI -vqI -vqI -vqI +cNa +gid +rRV +rRV +rRV +jOo +jOo vqI vqI vqI @@ -59362,10 +58936,10 @@ vhT dzD kTN riv -jap -aIa -eZF -vkV +cki +hdY +sdX +qzH oMA xBP iKu @@ -59395,22 +58969,22 @@ jOo jOo jRB vgG -vZP -xQu -rFB -viB -ssw -llI +jIC +rBg +ngQ +nCG +rBg +fPF tmh -blO -cFP -jiG -oqZ -svv -bXA -vqI -vqI -vqI +giS +cKQ +giS +ugf +bLe +rRV +jOo +jOo +jOo vqI vqI vqI @@ -59611,16 +59185,16 @@ rPT uVy eZJ oRp -cAy +kNW wDf wys wys dlv wys wys -iaR -iaR -ryR +uKo +pLv +exO itk pLv aiR @@ -59652,22 +59226,22 @@ jOo giS bJq lho -yiO -xQu -jBM -duv -ssw -iiY +eKo +dML +ehW +fru +rBg +qqo lAn -nXA -mmp -nXA -eZZ -xqU -vgR -vqI -vqI -vqI +qXs +ghR +gKe +nCN +bJq +rjR +jOo +jOo +jOo vqI vqI vqI @@ -59875,10 +59449,10 @@ dVA aPU eQA wys -fYS -xIX -eyM -wov +apV +sQr +bCQ +isU jlf iaR vhU @@ -59909,21 +59483,21 @@ jOo jOo jOo vgG -xUc -lly -kgF -qtB -hAX -bxD +qXA +oPI +icP +dpe +ovq +bOk vgG -nXA -ozj -blO -sLz -xqU -vqI -vqI -vqI +qXs +qYq +mVu +iZP +bJq +jOo +jOo +jOo vqI vqI vqI @@ -60126,16 +59700,16 @@ eXB jES wys bEQ -bWw +ceZ eHY eop -weD -pkH -wys +bBT iaR iaR -tYc -mqS +iaR +gpb +shn +dji kDf noh nKV @@ -60168,7 +59742,7 @@ eJz eJz eJz gHW -pBl +eBm gHW dzW ihL @@ -60181,15 +59755,15 @@ dzW ihL ihL fhM -lCB -lCB -lCB -lCB -lCB -lCB -oJl -lCB -lCB +lCS +lCS +lCS +lCS +lCS +lCS +sXB +lCS +lCS jsp vqI vqI @@ -60383,16 +59957,16 @@ eXB nHL wys jZP -eCd -dAU -ijM -man -kEQ -kEQ -wys -eHB -xpp -mYS +tTc +wqp +wSj +bXI +iaR +fYS +xIX +hpo +lmt +hxr qXN pld dbb @@ -60424,13 +59998,13 @@ rlu tww vci eJz -wdJ -bMq +geB +iBJ fVf dzW -kMN -bku -lIt +lrT +mZO +vbE oPT urT uCw @@ -60438,15 +60012,15 @@ hGZ bGl ibg mTL -gNG -fUV -ozj -qUD -fus -qcU -oZL -iad -lCB +sbr +gGu +lUG +xBx +xCJ +jmW +rjV +eRe +lCS jsp jsp vqI @@ -60644,17 +60218,17 @@ ozM eUf mbl lhJ -wys -wys -wys -mpz +iaR +iaR +iaR +aoA oOz cgI -fsr +hpo noh oNp sjW -plL +dYk orO iZO bKy @@ -60681,13 +60255,13 @@ tHB jxW lsu eJz -qUr -swW +eZx +vjK cQe nAD -fAi -rYi -pFh +xtg +gOx +lqy fBG lLa ata @@ -60695,15 +60269,15 @@ xDA dzW ihL ihL -cFP -xqU -xwe -uKf -oWL -eTK -aST -bJq -lCB +hZM +knG +dVS +ioD +iDs +uIV +qCi +knG +lCS jsp jsp vqI @@ -60904,8 +60478,8 @@ dsv wys ePw lSv -bLZ -omN +oGq +mHT qSK tII vhU @@ -60938,13 +60512,13 @@ dEU cBs hBl eJz -sYh -ngP -pfU -teA -cxL -mLQ -niN +hfI +tmp +bfH +pSH +tkw +xia +dNp ufL eZf lmF @@ -60952,15 +60526,15 @@ tUh jYE ibg tRR -mFt -cEu -trB -dwq -fus -wAx -jmP -qcU -oJl +ekj +sCz +cgS +fbW +xCJ +yjL +cqp +jmW +sXB jsp jsp vqI @@ -61176,7 +60750,7 @@ pNv sWT sWT sWT -gXg +fRJ cBL wJi oHM @@ -61195,13 +60769,13 @@ tHB bAQ ssy eJz -kvM -kra -qwZ +tZd +aCZ +wDn nAD -xsc -csL -xpn +nJm +adv +kdh dzW ihL ihL @@ -61209,15 +60783,15 @@ aLz ihL kEO fhM -cEk -hJN -jOK -fPc -oJl -lCB -lCB -oJl -oJl +nAC +wIl +xlu +rBT +sXB +lCS +lCS +sXB +sXB jsp jsp vqI @@ -61432,7 +61006,7 @@ qbW fEV gee kBA -fMX +cYN qjP dlh fJD @@ -61453,23 +61027,23 @@ sdw roc eJz gHW -xdg +czw gHW pyW -bRk -cAK -pUZ +dHN +dKP +dCW ihL -xgK -nXA -dbV -msJ -vxP -pqU -pZZ -nNT -eHJ -sXg +eEZ +lVL +rKc +pRa +nyW +dfx +vkN +eUl +rBt +mbW vqI vqI jsp @@ -61709,21 +61283,21 @@ eJz eJz eJz eJz -qOg -uUq -yaU +eQB +hoG +vxi kbq dzW ihL ihL dzW sXB -lRK -nXA -aXj -pjQ -yiF -ujG +yjm +lVL +ipv +juA +khf +bFf sXB vNh sXB @@ -61965,22 +61539,22 @@ vLP xZu qdG vLP -xTu -eOD -uUq -jFC +slQ +rRt +hoG +vxi pVY -uUK -uRJ -ecq -bgo +grQ +daZ +gdz +toU sXB gqv gqv jnO lCS lCS -mVg +eRe sXB fHS lCS @@ -62195,8 +61769,8 @@ iUx ufD gOP slo -iLy -iuX +iCM +rOB gOP gOP dDM @@ -62222,20 +61796,20 @@ wML amy pWS lCv -rzg -efa -moT -oNv -jXg -hXN -gwr -gwr -hXN -sxO -yaf -qBw -hWP -seT +woA +rFu +cCS +cjY +rXS +khH +gxI +gxI +khH +rEf +smt +nvr +eTf +ufI biV sXB sXB @@ -62449,11 +62023,11 @@ fMX pHw bnY cyJ -fMX +iaR myV ouN -eUY -xGl +lIl +baF tEI wht qbW @@ -62469,7 +62043,7 @@ ooy ueV iMI wEx -caC +dfc ruO mev feI @@ -62480,20 +62054,20 @@ qWg oeh vLP vgi -dLq -rfT -udt -qWI -xUt -xPJ -ovz -ovz -oWV -iOp -eGr -bcS -gPs -hsk +iGI +ggi +uDo +nip +xxD +dRI +pFP +pFP +pFP +sZQ +bBd +jsN +rfX +nnz lCS wIl cEL @@ -62737,20 +62311,20 @@ vLP vLP vLP top -rrt -eUG -eCn -aIx -qpb -gkr -cwh -pnF -dvb -eBQ -oxg -hsv -tVm -iPj +lqa +kCg +mbu +erU +uht +gFA +wqW +utH +rpd +uCc +boA +ooV +vSf +rfX iQr mww hMv @@ -62983,31 +62557,31 @@ mfi gBH qWS eYZ -diQ +eQM xVP jcA qoo aqJ uHL sCr -kID -tlH +pSZ +feM pVY pVY -vVo -pOA -wWC -lzQ -nXg -hRE +jLK +okK +cku +eVt +iEj +nEO dXI glt doY ezZ dXI -uAb -wzE -qGa +pIN +nxp +gvJ lCS eGV hLg @@ -63246,15 +62820,15 @@ fFd oLh gYg ewd -cnT -sua -bHK -oju -rZf -oFu -pOA -wWC -jCp +pSz +hGU +dwi +ewQ +eWT +rKk +uvt +awj +uSS dXI dXI ifQ @@ -63262,9 +62836,9 @@ bUC nFx cdq xiB -lSc -uTP -jIs +nKk +uSY +qMz sXB lCS vbw @@ -63472,7 +63046,7 @@ rWp eXB kef hhu -tUs +jLn dGA djy kNX @@ -63504,14 +63078,14 @@ qGR nEw rlJ apZ -jxc -nrc -bJS -wEX -pHp -pOA -wWC -xjD +esn +inR +jZv +oJu +aoi +uvt +awj +rSp yjX ogE aeQ @@ -63519,13 +63093,13 @@ hBg hBg hBg baq -tfH -npY -kwz +rMV +bmU +joc sXB -cEk -gNq -ccl +nAC +aLl +ama vqI vqI vqI @@ -63760,15 +63334,15 @@ dbX lFZ qkv mNO -qbd -mEl -sMX -ldp -lsV -wDK -mhM -xtP -pbi +uUY +seV +lyW +dez +vLx +smO +jPs +mjE +eZH nnS ayf kZz @@ -63776,13 +63350,13 @@ ghT amX dbm xiB -lSc -ipT -gPs +sys +sJZ +qPq mAp -sLz -aQs -cEk +jmW +lHC +nAC vqI vqI vqI @@ -64018,14 +63592,14 @@ kzi tbf uKn sRi -hBY -cSZ -gEl -rMf -pHp -pOA -wWC -rYp +klF +mEZ +wZO +sTO +aoi +uvt +awj +kcL pIB rPi grx @@ -64033,12 +63607,12 @@ vmu vmu vmu baq -fzZ -npY -tUx +tzi +bmU +ajE lCS -vqI -hTd +muJ +vZw vqI vqI vqI @@ -64274,15 +63848,15 @@ rNb scl vBH gdS -mpH -uWx -kaw -aAj -fFu -pHp -pOA -wWC -sFj +dgu +cIz +oIR +wDC +uHS +aoi +uvt +awj +ruV dXI dXI ocx @@ -64290,13 +63864,13 @@ nKs ebk blt xiB -lSc -uTP -glb +nKk +uSY +fHc sXB -vqI -qnE -rNv +muJ +rXb +bQK vqI vqI vqI @@ -64532,28 +64106,28 @@ iHS iem xtG sCr -wNN -sui -sjD -rIZ -pHp -cmT -wWC -diz -daf -suW +gmc +eXZ +asJ +xlf +aoi +ybO +awj +kcL +myh +riL dXI hST xRJ gFg dXI -jrk -nAy -nlX +oqP +ulR +rnC sXB -xqU -eHe -vph +knG +veA +fBk vqI vqI vqI @@ -64781,9 +64355,9 @@ aYi cVm evW uDM -aJU -aFp evW +aFp +aJU evW evW evW @@ -64793,24 +64367,24 @@ pVY pVY pVY dta -wHx -kHt -dHA -gYA -bYC -mEJ -sBk -dld -kmF -xkb -sBO -kIV -lDA -gPs +lty +qOI +eMG +wKa +fqt +uaq +vyF +mwd +hxN +qaO +wcw +xKV +vSN +rfX mAp -rET -sGK -cEk +tSK +kte +nAC vqI vqI jsp @@ -65038,35 +64612,35 @@ gAD evW saP tjd -aBu +uuN tUW -lYU +bYv pfN saP kuW dcG sXB -qQD -cTa -bwz +qlB +gDA +gSx aLe -pkS -tts -tRY -bDQ -nGu -cuX -nuM -rsi -cpa -fcK -puI -xGG -bTY -dSe +dis +ldm +tpq +hVN +bXm +ldR +vRc +mUA +kTh +jUs +qpg +uJf +kdz +epN oby -aiU -xhE +rKj +wAD vqI vqI vqI @@ -65303,27 +64877,27 @@ qXK evW rqE lEQ -cvu -hos -khm -ajT -fQW -hag -hNJ -hNJ -nrc -rKB -rKB -rKB -oLo -fqc -eGr -cnk -gPs -gPs +jll +vbo +vbo +pon +hhF +sIJ +cdr +cdr +inR +pJb +pJb +pJb +rOG +sws +bBd +eed +rfX +rfX mAp -xSk -xgK +dri +eEZ vqI vqI vqI @@ -65549,7 +65123,7 @@ rgP tzP lIQ oKH -kqd +oeP eeC nGN oYP @@ -65560,24 +65134,24 @@ xZI cYR osM sXB -dRz -jqA -xcv +cmc +tRq +dgB oLV -rIq -bJQ +jPr +koT xRl ssf -vKD -rPo -rPo -rPo -sbg -jjW -eGr -eoQ -pNb -oMm +kiM +fKr +fKr +fKr +vTE +jYj +bBd +nHv +mta +fkt sXB vqI vqI @@ -65821,19 +65395,19 @@ sXB sXB pVY pVY -ifm -sWy +fEq +bEU pVY pVY -iUP -uTU -uTU -nWu -vAb -nWu -xAy -pwo -dEz +aUW +baI +iuu +hFF +jxY +hFF +rQi +vlx +rXA vpm sXB vqI @@ -66068,7 +65642,7 @@ upK hht mXB xMR -jqb +cid wHO upK evW @@ -66076,11 +65650,11 @@ fgW hSL nKW sXB -hqu -ihA -fjt -kvb -dHS +gjU +ful +drK +tAO +iYQ vpm sXB sXB @@ -66333,11 +65907,11 @@ gef rdU nHd sXB -qtl -dWg -gGH -gla -ygN +lNJ +uIN +lbJ +wfM +khz sXB jsp jsp @@ -66572,9 +66146,9 @@ lfq heR bvV uWI -fKa -hyu -xpS +bKw +tBF +xCe gfQ iti aqn @@ -66590,11 +66164,11 @@ ggs fqp orX sXB -cyj -odU -gGH -uhk -bUy +gAm +reT +lbJ +iwv +ewq sXB jsp jsp @@ -66829,9 +66403,9 @@ jso tzP ptP jZr -bOo -eDq -oPi +qrK +ibR +vbO xql uHM hNR @@ -66847,11 +66421,11 @@ hzQ nlL wey sXB -gbj -cNn -aAB -vXw -wXA +unq +wVt +hPT +rwj +qKF sXB jsp jsp @@ -67104,11 +66678,11 @@ hzQ cBx uFy sXB -gbj -gbj -meq -hkP -sjV +unq +unq +fAL +sfq +cUy sXB jsp jsp @@ -67363,7 +66937,7 @@ euN tdh xHX eIc -nHV +lkr eIc xHX eIc @@ -68357,7 +67931,7 @@ tqL eXB eXB saM -sWe +rbq lAu iUZ lUm @@ -68391,10 +67965,10 @@ mni ggs ggs ggs -vqI -vqI -vqI -vqI +lYA +lYA +lYA +lYA vqI vqI vqI @@ -68638,20 +68212,20 @@ orX aBX orX orX -vqI -vqI -xdJ -mEO -fGZ -jpa -yhy -ihC -vqI -vqI -vqI -vqI -vqI -vqI +lYA +lYA +cJL +dJr +gjo +prO +xIq +kje +lYA +lYA +lYA +lYA +lYA +lYA vqI vqI vqI @@ -68895,20 +68469,20 @@ hzQ hzQ nTR ggs -vqI -vqI -hiB -ycT -noC -tfm -bYV -say -hiB -vqI -vqI -vqI -vqI -vqI +lYA +lYA +exD +dkq +ljY +oyA +edK +izV +exD +lYA +lYA +lYA +lYA +lYA vqI vqI vqI @@ -69152,20 +68726,20 @@ hzQ hzQ hzQ orX -vqI -vqI -sLz -iek -kRx -vqI -lJY -xdJ -hiB -vqI -vqI -vqI -vqI -vqI +lYA +lYA +odf +iKR +qIB +lYA +bPY +cJL +exD +lYA +lYA +lYA +lYA +lYA vqI vqI vqI @@ -69409,19 +68983,19 @@ hzQ hzQ hzQ ggs -vqI -vqI -vqI -sLz -vqI -vqI -sLz -pmx -sLz -hiB -vqI -vqI -vqI +lYA +lYA +lYA +odf +lYA +lYA +odf +dZF +odf +exD +lYA +lYA +lYA vqI vqI vqI @@ -69666,19 +69240,19 @@ orX orX orX orX -vqI -vqI -vqI -vqI -eoc -sLz -vqI -uCJ -vqI -vqI -vqI -vqI -vqI +lYA +lYA +lYA +lYA +cIe +odf +lYA +njp +lYA +lYA +lYA +lYA +lYA vqI vqI vqI @@ -69923,19 +69497,19 @@ vqI vqI vqI vqI -vqI -vqI -vqI -mdK -sLz -mdK -mdK -xqU -vqI -vqI -vqI -vqI -vqI +lYA +lYA +lYA +kHd +odf +kHd +kHd +hHv +lYA +lYA +lYA +lYA +lYA vqI vqI vqI @@ -70180,18 +69754,18 @@ vqI vqI vqI vqI -vqI -vqI -vqI -vqI -sLz -vqI -vqI -vqI -vqI -vqI -vqI -vqI +lYA +lYA +lYA +lYA +odf +lYA +lYA +lYA +lYA +lYA +lYA +lYA vqI vqI vqI @@ -70228,7 +69802,7 @@ ycy sLz bXA svv -vqI +bXA vqI cEk sLz @@ -70438,17 +70012,17 @@ vqI vqI vqI vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI +lYA +lYA +lYA +lYA +lYA +lYA +lYA +lYA +lYA +lYA +lYA vqI vqI vqI @@ -70483,10 +70057,10 @@ vqI cEk cEk xqU -sLz bXA bXA -sLz +bXA +bXA cEk cEk vqI @@ -70696,14 +70270,14 @@ vqI vqI vqI vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI +lYA +lYA +lYA +lYA +lYA +lYA +lYA +lYA vqI vqI vqI @@ -70741,8 +70315,8 @@ hts sLz rNv sLz -sLz -xqU +bXA +bXA sLz cEk sLz @@ -70954,9 +70528,9 @@ vqI vqI vqI vqI -vqI -vqI -vqI +lYA +lYA +lYA vqI vqI vqI @@ -118982,11 +118556,11 @@ vqI vqI vqI vqI -kQw -kQw -kQw -kQw -kQw +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -119239,11 +118813,11 @@ vqI vqI vqI vqI -kQw -ncR -iVo -unU -kQw +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -119496,11 +119070,11 @@ vqI vqI vqI vqI -kQw -unU -qkE -qkE -kQw +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -119753,11 +119327,11 @@ vqI vqI vqI vqI -kQw -kAO -qkE -iiF -kQw +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -120009,13 +119583,13 @@ vqI vqI vqI vqI -kQw -kQw -usc -usc -kQw -kQw -kQw +vqI +vqI +umm +umm +vqI +vqI +vqI vqI vqI vqI @@ -120266,13 +119840,13 @@ vqI vqI vqI vqI -kQw -naX -pXA -luF -twg -nub -kQw +vqI +vqI +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -120523,13 +120097,13 @@ vqI vqI vqI vqI -kQw -vaT -luF -luF -pXA -qlO -kQw +vqI +vqI +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -120780,13 +120354,13 @@ vqI vqI vqI vqI -kQw -egS -luF -luF -luF -rxA -kQw +vqI +vqI +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -121037,13 +120611,13 @@ vqI vqI vqI vqI -kQw -vhX -pXA -luF -luF -dbT -kQw +vqI +vqI +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -121294,13 +120868,13 @@ vqI vqI vqI vqI -kQw -iyC -pXA -luF -luF -iyC -kQw +vqI +vqI +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -121551,13 +121125,13 @@ vqI vqI vqI vqI -kQw -pei -luF -luF -luF -iyC -kQw +vqI +vqI +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -121805,15 +121379,15 @@ vqI vqI vqI vqI -vqI -vqI -vqI +hiB +hiB +hiB +kQw +kQw +kQw +kQw +kQw kQw -iyL -luF -luF -luF -iyC kQw vqI vqI @@ -122062,15 +121636,15 @@ vqI vqI vqI vqI -vqI -vqI -vqI +hiB +kvX +fCZ kQw -kxR -pXA -luF -luF -kSY +fnQ +fnQ +fnQ +fnQ +rPI kQw kQw kQw @@ -122319,15 +121893,15 @@ vqI vqI vqI vqI -vqI -vqI -vqI -kQw -naX -pXA -luF -pXA -jDz +hiB +gVm +kvX +sHr +fnQ +fnQ +fnQ +fnQ +fnQ kQw fnQ fnQ @@ -122580,11 +122154,11 @@ kQw kQw kQw kQw -bnO -jZf -pXA -pXA -nub +fnQ +fnQ +fnQ +fnQ +fnQ sHr fnQ fnQ @@ -122839,7 +122413,7 @@ rPI kQw kQw kQw -uRt +sHr kQw kQw kQw @@ -123095,9 +122669,9 @@ fnQ fnQ sHr luF -giQ -aVH -rcr +dzw +dzw +luF lGc xsQ xsQ @@ -123353,10 +122927,10 @@ fnQ kQw uhy gsF -uWn -kzK eWL -qdO +eWL +eWL +xqw eWL eWL tGT @@ -123904,7 +123478,7 @@ mMq qGg qGg vgG -vgG +pob vgG hZi tHO @@ -124380,7 +123954,7 @@ fnQ xsQ kQw kQw -xDX +luw kQw kQw bxt @@ -124398,7 +123972,7 @@ lKm lyZ iwF xYT -hph +kqR bgS bam hcA @@ -124653,7 +124227,7 @@ lTW kdJ ozT ozT -qhg +muR xYT xYT bgS @@ -124923,7 +124497,7 @@ biP sRD xHH vUl -kqQ +oFj sRD sls sls @@ -125151,19 +124725,19 @@ qPg pwh afw afw -afw +vXg bDD bDD bDD -chl +cYx bDD bDD rjf xgH xgH udq -tob -tnA +wjs +xgH aaz uld oyg @@ -125409,18 +124983,18 @@ vXg afw cOp cOp -ogJ -tay -lQd -jGY -myl +gZw +cQj +ogI +bTZ +ibQ bDD jqp coF ttY vkb vkb -gDc +vLz azd gHV brZ @@ -125666,18 +125240,18 @@ cOp phi cOp cOp -dFu -jzm -wAN -aKH -iYE +ncd +dKS +kjP +bTZ +xmB bDD drs ttY ttY vkb vkb -wYL +vUC fMk gHV wjR @@ -125923,18 +125497,18 @@ cOp cOp cOp cOp -iEf -rpH -rGq -wMY -rSE +bDD +jml +loz +vnS +bDD bDD fWF ttY -pGC -sAD -jLG -xPe +cwt +aIY +hJi +kBK fMk cxj gND @@ -126180,17 +125754,17 @@ rnU jpI rys rwn -bDD -bDD -tNz -pbw -xri +wdX +pVf +hAC +bTZ +syw bDD rjf ttY -qRB -scW -iIO +lMw +aMh +abI pcu hvh jME @@ -126434,20 +126008,20 @@ eyu clO iBT unO -yjb -aeN -wcv -ybk -hUk -ofU -ifR -thO +hxx +ipP +jWD +mgo +uXy +uXy +hrM +eLz bDD fjc wYP -qdZ -hrF -cIY +qtw +qtw +bJz lbv fcl uTR @@ -126692,13 +126266,13 @@ sKV tST xdH rjX -lvV -kNq -lwX -jXQ -lWU -rYc -kxc +hXM +xTh +thc +vAT +nIi +uzA +wRZ bDD suO ttY @@ -126949,13 +126523,13 @@ mxy xdb qiO llQ -umB +cJv nOu bDD -ejD -tuz -amw -nIh +eBU +kfH +xoG +oCm bDD suO ttY @@ -127209,10 +126783,10 @@ llQ aWb acj thc -nRX -uQq -aDn -iIl +iQH +bno +fgB +wcV bDD liG ttY @@ -127466,10 +127040,10 @@ uNj ohu acw bDD -rRN -nye -oOA -tDT +kcy +sAT +bed +qEu bDD vVE ttY @@ -127724,8 +127298,8 @@ kAa giU bDD lRO -oHV -voT +qSb +eln bDD bDD kmh @@ -131093,7 +130667,7 @@ gEk vDP iwM ajB -lPe +rmB btR mZW oak @@ -131361,7 +130935,7 @@ ajB xiF aCm aCm -aCm +sow aCm aCm aCm @@ -133156,7 +132730,7 @@ mSE mSE mSE mSE -fqb +hzG mVj seu lJj @@ -133414,7 +132988,7 @@ mgk vhQ uqA tCn -jGk +bQB qSC fqb fqb @@ -133631,12 +133205,12 @@ pSY pSY eNV fZR -qsH +xYM pSY pSY pSY nEl -pSY +mat fZR uZl iaG @@ -133893,7 +133467,7 @@ qsH sHD qsH pSY -pSY +tXw fZR hdM olN @@ -134149,7 +133723,7 @@ hPz fZR fZR fZR -wkE +wld qsH oZe sld @@ -189173,8 +188747,8 @@ qhT qhT vqE vqE -vqE -vqE +aoM +aoM vqE byu kyf @@ -189432,8 +189006,8 @@ aoM jij jij jij -vqE -inI +aoM +oFM nXa fUT pPE @@ -189671,7 +189245,7 @@ ttY ttY ttY uhc -whz +iOG jUT hUe srR @@ -189689,9 +189263,9 @@ aoM jij jij jij -vqE +aoM cFb -yeZ +tpa gEN lZB fdX @@ -189928,7 +189502,7 @@ eXz mxY iej uhc -uLS +iDR wmC iKU taT @@ -190987,7 +190561,7 @@ qON gAn uov ddj -sKk +vAp vqE eWC cXI @@ -191985,8 +191559,8 @@ ikE dGt oFa hFk -jxD -mTS +hcv +kqF meb liV oFa @@ -192242,10 +191816,10 @@ idj oYY oFa aLI -lyd +tXV cfJ oVG -uNB +kGt oFa bSX vft @@ -192499,10 +192073,10 @@ jnX mFq rZs vGc -fGm -xsU -ndy -muG +iKM +eUW +xXa +nzY oFa hMj ooN @@ -193018,7 +192592,7 @@ gTA hUc rLt oFa -xCw +bhc mWc llS cty @@ -194320,8 +193894,8 @@ iSi iSi ldt pVT -wCB -fpi +tex +uAN xel jYQ rHY @@ -194333,7 +193907,7 @@ eWC iui iRv ljQ -vqI +ljQ vqI vqI vqI @@ -194544,7 +194118,7 @@ fdh hbs aEi aEi -uwJ +cVu aEi ceR gMP @@ -194577,8 +194151,8 @@ iSi iSi tcb giX -iqr -ruw +gPI +ePB ojX ucq lGo @@ -194587,8 +194161,9 @@ nZM nZM tuo uyF -ljQ -ljQ +bhL +sFS +eIx ljQ vqI vqI @@ -194645,7 +194220,6 @@ vqI vqI vqI vqI -vqI jsp jsp jsp @@ -194844,6 +194418,9 @@ xUk nbj hGq fgF +hvi +jFU +jFU ljQ vqI vqI @@ -194901,9 +194478,6 @@ vqI vqI vqI vqI -vqI -vqI -vqI jsp jsp jsp @@ -195058,14 +194632,14 @@ fdh fdh aEi aEi -qbo +mBl aEi aYp fHo aZm aEi mik -bZl +nJJ gpl awE pDe @@ -195101,6 +194675,9 @@ nZM nZM dpo btK +qVf +bpB +cbC ljQ vqI vqI @@ -195158,9 +194735,6 @@ vqI vqI vqI vqI -vqI -vqI -vqI jsp jsp jsp @@ -195359,9 +194933,9 @@ nZM gLR myY ljQ -vqI -vqI -vqI +ljQ +ljQ +ljQ vqI vqI vqI @@ -196116,9 +195690,9 @@ jhS xWg xWg wfD -lEt +nQp gsV -eIP +mZr xWg oUg oZs @@ -196369,13 +195943,13 @@ aSX ozD xWg aKw -oJf +psa rYh srV -apo -mim -apo -sFr +ehz +hir +xVJ +wEr xWg dzA jtP @@ -196626,13 +196200,13 @@ aSX gXD xWg jYk -jRL -bgn +jIM +soN deq -oPm -dry -wFx -aqI +dek +qvT +uLI +fti xWg srJ oXj @@ -196884,12 +196458,12 @@ gXD xWg hha oJf -iGr +kNl gwH -xdD -pKz -axr -lDe +wTZ +qrw +phn +wfS dur xQe cuZ @@ -197141,12 +196715,12 @@ gXD xWg uXk jRL -bGc -fJc +bSh +ihU eUg -uxv -vat -hbu +vmR +cOr +ctk dur oKf vnz @@ -197399,11 +196973,11 @@ xWg aja uXm mks -gXq -aNF -nJy -iAz -uuD +hon +iVj +plS +lhP +soV kGf vgF hoz @@ -198163,7 +197737,7 @@ aKG qvZ aKG aKG -olN +jan mad bXW xWg @@ -198428,7 +198002,7 @@ aVs cmX atd sYs -ayY +lsz atd aIF uTY @@ -198924,9 +198498,9 @@ kUD pWN sld wSN -tte -aPc -nrr +hRI +emp +fJp fJp fJp aPc @@ -198934,8 +198508,8 @@ aKG aKG aKG aKG -olN -wdR +jan +kDI rZM rZM aCm @@ -199181,9 +198755,9 @@ pZC tUu vtn wCG -tWu +ige aPc -fJp +nrr fJp fJp aPc @@ -199191,9 +198765,9 @@ aKG aKG aKG aKG -olN +jan wlF -czD +yjn jHA tkq fYX @@ -200215,7 +199789,7 @@ fJp fJp fJp aAV -bFv +sMZ itG dCL alV @@ -256519,7 +256093,7 @@ ial ial kFv vRk -lRf +eNN rxi upA khr @@ -257286,7 +256860,7 @@ mYa xOo rxi fuO -dlw +mbm xOo xOo rxi @@ -259607,7 +259181,7 @@ iSi szZ qGi rWo -ePA +sLn blA aqa hYp @@ -260122,8 +259696,8 @@ guE buU buG glK -nNB -ggb +wCS +rTs ydE vfA bIK @@ -260636,8 +260210,8 @@ aNl eDp lmY qCv -ejO -fnx +rAm +tWG nBs qKQ ggb @@ -261142,7 +260716,7 @@ dvc cKT vXe cKT -cpu +oxd cKT iSi iSi @@ -261403,9 +260977,9 @@ cKT cKT uNa cKT -exa +mBN cMd -jqK +lIJ uNa cKT jIY @@ -261663,9 +261237,9 @@ cqB gxg mwY glK -xwu +ksd uNa -pyo +saj kqB ggb cnJ @@ -261921,8 +261495,8 @@ qCv sTC qCv eZe -cKT -qFI +mdT +dUF bIK nId aqa @@ -262179,7 +261753,7 @@ tJf tJf jCZ uNa -lry +aSP bqg bqg tnT @@ -262699,11 +262273,11 @@ cnJ vvg lEc sol -elM +bzf yfQ mTe sol -vKW +cNm eXD mMf hgC @@ -265266,7 +264840,7 @@ wGC gNr uDA rAu -qZw +xth vFz sol epm @@ -266554,7 +266128,7 @@ cnJ nIF bIK sol -sna +gbM yfQ bIK sol @@ -266815,7 +266389,7 @@ sBX bIK bIK sol -aAe +vru yfQ kqB lEc diff --git a/_maps/map_files/EchoStation/job_changes.dm b/_maps/map_files/EchoStation/job_changes.dm deleted file mode 100644 index 758ea7a14a2fd..0000000000000 --- a/_maps/map_files/EchoStation/job_changes.dm +++ /dev/null @@ -1,46 +0,0 @@ -#define JOB_MODIFICATION_MAP_NAME "Echo Station" //sorry but i'm bring back the pubby config file - -//do not spawn -MAP_REMOVE_JOB(atmospheric_technician) -MAP_REMOVE_JOB(bartender) -MAP_REMOVE_JOB(brig_physician) -MAP_REMOVE_JOB(exploration_crew) -MAP_REMOVE_JOB(geneticist) -MAP_REMOVE_JOB(paramedic) -MAP_REMOVE_JOB(virologist) - -//only one position -/datum/job/cook/New() - ..() - MAP_JOB_CHECK - spawn_positions = 1 - total_positions = 1 -/datum/job/chemist/New() - ..() - MAP_JOB_CHECK - spawn_positions = 1 - total_positions = 1 -/datum/job/janitor/New() - ..() - MAP_JOB_CHECK - spawn_positions = 1 - total_positions = 1 -/datum/job/lawyer/New() - ..() - MAP_JOB_CHECK - spawn_positions = 1 - total_positions = 1 -/datum/job/botanist/New() - ..() - MAP_JOB_CHECK - spawn_positions = 1 - total_positions = 1 - -//TODO: Convert this into a mapping config please -/datum/controller/subsystem/mapping/Initialize() - . = ..() - MAP_JOB_CHECK - GLOB.disabled_tagger_locations += "Virology" - GLOB.disabled_tagger_locations += "Law Office" - -#undef JOB_MODIFICATION_MAP_NAME diff --git a/_maps/map_files/EchoStation/map_adjustment_echo.dm b/_maps/map_files/EchoStation/map_adjustment_echo.dm new file mode 100644 index 0000000000000..23ccf854583ee --- /dev/null +++ b/_maps/map_files/EchoStation/map_adjustment_echo.dm @@ -0,0 +1,29 @@ +/* + < ATTENTION > + If you need to add more map_adjustment, check 'map_adjustment_include.dm' + These 'map_adjustment.dm' files shouldn't be included in 'dme' +*/ + +/datum/map_adjustment/echo_station + map_file_name = "EchoStation.dmm" + blacklisted_jobs = list( + JOB_NAME_ATMOSPHERICTECHNICIAN, + JOB_NAME_BARTENDER, + JOB_NAME_BRIGPHYSICIAN, + JOB_NAME_EXPLORATIONCREW, + JOB_NAME_GENETICIST, + JOB_NAME_PARAMEDIC, + JOB_NAME_VIROLOGIST) + +/datum/map_adjustment/echo_station/job_change() + change_job_position(JOB_NAME_COOK, 1) + change_job_position(JOB_NAME_CHEMIST, 1) + change_job_position(JOB_NAME_JANITOR, 1) + change_job_position(JOB_NAME_LAWYER, 1) + change_job_position(JOB_NAME_BOTANIST, 1) + change_job_position(JOB_NAME_SHAFTMINER, 1) + change_job_access(JOB_NAME_ASSISTANT, ACCESS_MAINT_TUNNELS) // sample code + +/datum/map_adjustment/echo_station/on_mapping_init() + exclude_tagger_destination("Virology") + exclude_tagger_destination("Law Office") diff --git a/_maps/map_files/FlandStation/FlandStation.dmm b/_maps/map_files/FlandStation/FlandStation.dmm index 0247ebe9e24ab..9bb8b9ec73da5 100644 --- a/_maps/map_files/FlandStation/FlandStation.dmm +++ b/_maps/map_files/FlandStation/FlandStation.dmm @@ -83,6 +83,32 @@ }, /turf/open/floor/iron/white, /area/science/xenobiology) +"abi" = ( +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = 5; + pixel_y = 9 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = -2; + pixel_y = 9 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = 6; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = -3; + pixel_y = 1 + }, +/obj/item/reagent_containers/syringe/epinephrine{ + pixel_x = 3; + pixel_y = -2 + }, +/obj/item/wrench/medical, +/obj/item/storage/pill_bottle/mannitol, +/obj/structure/table/glass, +/turf/open/floor/iron/dark, +/area/medical/cryo) "abm" = ( /turf/closed/wall, /area/construction) @@ -1794,26 +1820,6 @@ }, /turf/open/floor/iron/dark/side, /area/hallway/secondary/exit/departure_lounge) -"ayM" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green{ - pixel_x = -7; - pixel_y = 7 - }, -/obj/item/reagent_containers/food/drinks/flask/det{ - pixel_x = 4; - pixel_y = -1 - }, -/obj/item/storage/secure/safe{ - pixel_x = 6; - pixel_y = 29 - }, -/obj/item/clothing/glasses/hud/security/sunglasses{ - pixel_x = 4; - pixel_y = 1 - }, -/turf/open/floor/carpet/green, -/area/security/detectives_office) "aze" = ( /obj/machinery/camera/directional/south{ c_tag = "Medbay - Cloning Lab"; @@ -2445,88 +2451,6 @@ }, /turf/open/floor/iron, /area/security/main) -"aGl" = ( -/obj/structure/closet/crate/medical, -/obj/item/reagent_containers/glass/bottle/bromine{ - pixel_x = -6 - }, -/obj/item/reagent_containers/glass/bottle/aluminium{ - pixel_x = 6 - }, -/obj/item/reagent_containers/glass/bottle/chlorine{ - pixel_x = -6 - }, -/obj/item/reagent_containers/glass/bottle/carbon{ - pixel_x = 6 - }, -/obj/item/reagent_containers/glass/bottle/ethanol{ - pixel_x = -6 - }, -/obj/item/reagent_containers/glass/bottle/copper{ - pixel_x = 6 - }, -/obj/item/reagent_containers/glass/bottle/hydrogen{ - pixel_x = -6 - }, -/obj/item/reagent_containers/glass/bottle/fluorine{ - pixel_x = 6 - }, -/obj/item/reagent_containers/glass/bottle/water{ - pixel_y = 8 - }, -/obj/item/reagent_containers/glass/bottle/lithium{ - pixel_x = -6 - }, -/obj/item/reagent_containers/glass/bottle/iron{ - pixel_x = 6 - }, -/obj/item/reagent_containers/glass/bottle/iodine{ - pixel_y = 8 - }, -/obj/item/reagent_containers/glass/bottle/oxygen{ - pixel_x = 6 - }, -/obj/item/reagent_containers/glass/bottle/phosphorus{ - pixel_x = -6 - }, -/obj/item/reagent_containers/glass/bottle/nitrogen{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/reagent_containers/glass/bottle/mercury{ - pixel_x = 6; - pixel_y = 8 - }, -/obj/item/reagent_containers/glass/bottle/radium{ - pixel_x = -6 - }, -/obj/item/reagent_containers/glass/bottle/potassium{ - pixel_x = 6 - }, -/obj/item/reagent_containers/glass/bottle/welding_fuel{ - pixel_y = 8 - }, -/obj/item/reagent_containers/glass/bottle/sacid{ - pixel_x = 6 - }, -/obj/item/reagent_containers/glass/bottle/silicon{ - pixel_x = -6 - }, -/obj/item/reagent_containers/glass/bottle/silver{ - pixel_x = 6 - }, -/obj/item/reagent_containers/glass/bottle/sodium{ - pixel_x = -6 - }, -/obj/item/reagent_containers/glass/bottle/sugar{ - pixel_x = 6 - }, -/obj/item/reagent_containers/glass/bottle/sulfur{ - pixel_x = -6 - }, -/obj/item/circuitboard/machine/chem_heater, -/turf/open/floor/iron/techmaint, -/area/medical/virology) "aGq" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -3119,29 +3043,6 @@ /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, /area/quartermaster/sorting) -"aLS" = ( -/obj/machinery/newscaster{ - pixel_x = -28; - pixel_y = 1 - }, -/obj/structure/table/reinforced, -/obj/item/reagent_containers/glass/beaker{ - pixel_x = 7 - }, -/obj/item/reagent_containers/dropper, -/obj/item/radio/headset/headset_med, -/obj/item/flashlight/pen{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron/grid/steel, -/area/medical/genetics) "aLT" = ( /obj/machinery/door/airlock/maintenance{ name = "Storage Room"; @@ -4865,19 +4766,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) -"bgd" = ( -/obj/effect/turf_decal/tile/red/opposingcorners, -/obj/structure/sink/kitchen{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - dir = 4; - name = "old sink"; - pixel_x = -11 - }, -/obj/structure/mopbucket, -/obj/item/reagent_containers/glass/bucket, -/obj/item/mop, -/turf/open/floor/iron/dark, -/area/security/main) "bgk" = ( /obj/machinery/gulag_teleporter, /obj/effect/turf_decal/bot, @@ -4980,6 +4868,22 @@ }, /turf/open/floor/iron/techmaint, /area/quartermaster/qm) +"bhK" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/structure/table/reinforced, +/obj/item/food/popcorn, +/obj/item/reagent_containers/cup/glass/bottle/vodka{ + pixel_x = 4; + pixel_y = 6 + }, +/obj/machinery/airalarm/directional/west{ + pixel_x = -22 + }, +/obj/structure/railing, +/turf/open/floor/iron/techmaint, +/area/science/misc_lab) "bhR" = ( /obj/machinery/light{ dir = 1 @@ -5151,6 +5055,20 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/medical/genetics) +"bkf" = ( +/obj/structure/table, +/obj/item/storage/box/bodybags{ + pixel_x = 3; + pixel_y = 2 + }, +/obj/item/pen, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = -6; + pixel_y = 1 + }, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "bkl" = ( /obj/structure/railing, /turf/open/floor/plating, @@ -5597,6 +5515,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/chapel/main) +"bqg" = ( +/obj/structure/rack, +/obj/item/reagent_containers/cup/glass/bottle/whiskey, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating, +/area/maintenance/central/secondary) "bqi" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -7451,6 +7375,26 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron, /area/hydroponics) +"bSN" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_x = -7; + pixel_y = 7 + }, +/obj/item/reagent_containers/cup/glass/flask/det{ + pixel_x = 4; + pixel_y = -1 + }, +/obj/item/storage/secure/safe{ + pixel_x = 6; + pixel_y = 29 + }, +/obj/item/clothing/glasses/hud/security/sunglasses{ + pixel_x = 4; + pixel_y = 1 + }, +/turf/open/floor/carpet/green, +/area/security/detectives_office) "bSS" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 @@ -8370,12 +8314,6 @@ }, /turf/open/floor/iron/dark, /area/chapel/main) -"cgB" = ( -/obj/structure/rack, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, -/area/maintenance/port/fore) "cgG" = ( /obj/machinery/nuclearbomb/beer, /obj/structure/window/reinforced{ @@ -10314,28 +10252,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/catwalk_floor, /area/maintenance/department/science) -"cIH" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/holywater{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ - pixel_x = -3; - pixel_y = 15 - }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ - pixel_x = -6; - pixel_y = 3 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/turf/open/floor/carpet, -/area/chapel/office) "cIO" = ( /obj/structure/table/wood, /obj/item/folder, @@ -11165,32 +11081,6 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/bridge) -"cSw" = ( -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 5; - pixel_y = 9 - }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = -2; - pixel_y = 9 - }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 6; - pixel_y = 2 - }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = -3; - pixel_y = 1 - }, -/obj/item/reagent_containers/syringe/epinephrine{ - pixel_x = 3; - pixel_y = -2 - }, -/obj/item/wrench/medical, -/obj/item/storage/pill_bottle/mannitol, -/obj/structure/table/glass, -/turf/open/floor/iron/dark, -/area/medical/cryo) "cSz" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -11522,6 +11412,16 @@ dir = 5 }, /area/quartermaster/warehouse) +"cVU" = ( +/obj/structure/table, +/obj/item/storage/bag/plants/portaseeder, +/obj/item/plant_analyzer, +/obj/item/reagent_containers/cup/bucket, +/obj/item/seeds/wheat, +/obj/item/seeds/wheat, +/obj/item/seeds/wheat, +/turf/open/floor/grass, +/area/hydroponics/garden) "cWa" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green{ @@ -11769,31 +11669,6 @@ }, /turf/open/floor/iron/dark, /area/gateway) -"dam" = ( -/obj/item/storage/box/papersack{ - icon_state = "paperbag_NanotrasenStandard_closed" - }, -/obj/item/storage/box/papersack{ - icon_state = "paperbag_NanotrasenStandard_closed" - }, -/obj/item/storage/box/papersack{ - icon_state = "paperbag_NanotrasenStandard_closed" - }, -/obj/item/storage/box/papersack{ - icon_state = "paperbag_NanotrasenStandard_closed" - }, -/obj/item/storage/box/papersack{ - icon_state = "paperbag_NanotrasenStandard_closed" - }, -/obj/effect/turf_decal/bot, -/obj/structure/table, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/item/reagent_containers/food/condiment/sugar, -/obj/item/reagent_containers/food/condiment/flour{ - pixel_x = 4 - }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) "dap" = ( /obj/machinery/atmospherics/pipe/simple/dark/visible{ dir = 4 @@ -12959,12 +12834,6 @@ dir = 1 }, /area/quartermaster/sorting) -"dqI" = ( -/obj/structure/rack, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, -/area/maintenance/aft) "dqS" = ( /obj/effect/turf_decal/guideline/guideline_in/red{ dir = 8 @@ -13153,6 +13022,23 @@ dir = 1 }, /area/hallway/secondary/exit/departure_lounge) +"dsX" = ( +/obj/structure/rack, +/obj/item/book/manual/wiki/robotics_cyborgs{ + pixel_x = 2; + pixel_y = 5 + }, +/obj/item/storage/belt/utility, +/obj/item/reagent_containers/cup/beaker/large, +/obj/effect/turf_decal/delivery, +/obj/machinery/requests_console{ + department = "Robotics Lab"; + name = "Robotics RC"; + pixel_y = 30; + receive_ore_updates = 1 + }, +/turf/open/floor/iron/grid/steel, +/area/science/robotics/lab) "dtE" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, @@ -13619,24 +13505,6 @@ /obj/structure/sign/departments/minsky/engineering/engineering, /turf/closed/wall/r_wall, /area/maintenance/solars/port) -"dBq" = ( -/obj/structure/table/reinforced, -/obj/item/folder/white, -/obj/item/stack/sheet/mineral/plasma{ - amount = 5 - }, -/obj/item/reagent_containers/glass/beaker/large, -/obj/item/reagent_containers/glass/beaker, -/obj/item/reagent_containers/dropper, -/obj/machinery/camera/directional/north{ - c_tag = "Xenobiology - Research Area"; - name = "xenobiology camera" - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/iron/grid/steel, -/area/science/xenobiology) "dBt" = ( /mob/living/simple_animal/cow{ desc = "Allegedly a bull."; @@ -14525,19 +14393,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/crew_quarters/locker) -"dMN" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/bot, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/item/reagent_containers/glass/beaker/large, -/obj/item/dest_tagger, -/obj/machinery/computer/security/telescreen/rd{ - pixel_y = 30 - }, -/turf/open/floor/iron/dark, -/area/bridge) "dMR" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable/yellow{ @@ -14747,6 +14602,30 @@ }, /turf/open/floor/iron/techmaint, /area/security/execution/education) +"dOQ" = ( +/obj/machinery/shieldwallgen/xenobiologyaccess, +/obj/machinery/door/window{ + base_state = "right"; + dir = 4; + icon_state = "right"; + name = "Secure Creature Pen Shield Holder"; + atom_integrity = 300; + req_one_access_txt = "55" + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/sign/warning/electricshock{ + pixel_x = -32 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/plating, +/area/science/xenobiology) "dOV" = ( /obj/machinery/atmospherics/pipe/simple/general/hidden{ dir = 5 @@ -16017,6 +15896,21 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/bridge) +"ejc" = ( +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 1 + }, +/obj/structure/table, +/obj/item/toy/batong{ + pixel_x = 1; + pixel_y = 1 + }, +/obj/item/reagent_containers/cup/glass/britcup{ + pixel_x = -6; + pixel_y = 6 + }, +/turf/open/floor/iron/techmaint, +/area/security/prison) "eje" = ( /obj/machinery/door/window/eastright{ dir = 1; @@ -16320,36 +16214,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/aft) -"emH" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/patron{ - pixel_x = -5; - pixel_y = 16 - }, -/obj/item/reagent_containers/food/drinks/bottle/grappa{ - pixel_x = 10; - pixel_y = 15 - }, -/obj/item/reagent_containers/food/drinks/bottle/absinthe{ - pixel_x = -5; - pixel_y = 4 - }, -/obj/item/reagent_containers/food/drinks/bottle/kahlua{ - pixel_x = 9; - pixel_y = 7 - }, -/obj/item/reagent_containers/food/drinks/bottle/vodka{ - pixel_x = 2; - pixel_y = 4 - }, -/obj/effect/turf_decal/tile/bar/opposingcorners{ - dir = 1 - }, -/obj/item/radio/intercom{ - pixel_y = 24 - }, -/turf/open/floor/iron/dark, -/area/crew_quarters/bar) "emV" = ( /obj/machinery/light{ dir = 1 @@ -17060,15 +16924,6 @@ /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, /area/crew_quarters/heads/chief) -"exT" = ( -/obj/item/reagent_containers/food/drinks/bottle/wine, -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/drinks/trophy{ - pixel_x = 9; - pixel_y = 8 - }, -/turf/open/floor/carpet/grimy, -/area/chapel/main) "eya" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -17461,14 +17316,6 @@ /obj/effect/landmark/start/randommaint/psychiatrist, /turf/open/floor/wood, /area/medical/exam_room) -"eDM" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/glass/bucket, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "eDN" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -18568,12 +18415,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/security/brig) -"ePp" = ( -/obj/item/reagent_containers/food/drinks/bottle/vodka{ - desc = "Aah, vodka. Prime choice of drink AND fuel by Russians worldwide. This one used to hold many secrets..." - }, -/turf/open/floor/cult, -/area/chapel/office) "ePI" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters{ @@ -19280,40 +19121,6 @@ }, /turf/open/floor/iron/dark, /area/bridge) -"eWR" = ( -/obj/effect/turf_decal/bot, -/obj/structure/table, -/obj/item/reagent_containers/food/drinks/bottle/virusfood{ - pixel_x = 2; - pixel_y = 12 - }, -/obj/item/reagent_containers/food/drinks/bottle/virusfood{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/reagent_containers/glass/bottle/spaceacillin{ - pixel_x = 9; - pixel_y = 12 - }, -/obj/item/reagent_containers/glass/bottle/spaceacillin{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/reagent_containers/glass/bottle/spaceacillin{ - pixel_x = 2; - pixel_y = -1 - }, -/obj/machinery/firealarm/directional/west, -/obj/machinery/vending/wallmed{ - contraband = list(/obj/item/reagent_containers/glass/bottle/chloralhydrate = 1, /obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/glass/bottle/random_virus = 1); - name = "Upgraded NanoMed"; - pixel_x = -1; - pixel_y = -32; - premium = list(/obj/item/storage/firstaid/regular = 3, /obj/item/storage/belt/medical = 3, /obj/item/sensor_device = 2, /obj/item/pinpointer/crew = 2, /obj/item/healthanalyzer = 2, /obj/item/wrench/medical = 1); - products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/reagent_containers/medspray = 6, /obj/item/storage/pill_bottle = 6, /obj/item/reagent_containers/glass/bottle = 10, /obj/item/reagent_containers/spray/cleaner = 1, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/hypospray/medipen = 8, /obj/item/reagent_containers/hypospray/medipen/dexalin = 8, /obj/item/reagent_containers/glass/bottle/epinephrine = 4, /obj/item/reagent_containers/glass/bottle/charcoal = 4, /obj/item/reagent_containers/glass/bottle/salglu_solution = 4, /obj/item/reagent_containers/glass/bottle/tricordrazine = 1, /obj/item/reagent_containers/glass/bottle/spaceacillin = 1, /obj/item/reagent_containers/glass/bottle/morphine = 2, /obj/item/reagent_containers/glass/bottle/toxin = 4, /obj/item/reagent_containers/medspray/sterilizine = 4) - }, -/turf/open/floor/iron/grid/steel, -/area/medical/virology) "eWS" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 @@ -20166,14 +19973,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/port) -"fiV" = ( -/obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/structure/table, -/obj/item/food/dough, -/obj/item/reagent_containers/glass/bowl, -/obj/item/food/grown/tomato, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) "fiW" = ( /obj/effect/turf_decal/stripes/end, /obj/effect/turf_decal/stripes/red/end, @@ -20410,6 +20209,15 @@ /obj/structure/disposalpipe/trunk, /turf/open/floor/iron/dark, /area/engine/atmos) +"fmn" = ( +/obj/machinery/biogenerator, +/obj/item/reagent_containers/cup/bucket{ + pixel_x = 4 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/techmaint, +/area/security/prison) "fmo" = ( /obj/structure/rack, /obj/structure/window/reinforced{ @@ -20648,6 +20456,32 @@ }, /turf/open/floor/iron/grid/steel, /area/science/explab) +"fpa" = ( +/obj/structure/table/wood, +/obj/item/paper/fluff{ + default_raw_text = "___
Dear Sir or Madam,
We extend our deepest apologies for any inconvenience caused by the current location of your office. Your feedback is invaluable, and we are committed to addressing your concerns promptly.
In response to your request for a more suitable workplace, we are actively working on relocating your office to a more convenient setting. The necessary arrangements will be implemented during the upcoming shift.
Thank you for your understanding and continued support.
Best regards,
-NT Official
"; + name = "Deepest apoligies"; + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/paper/fluff{ + default_raw_text = "___
Dear Sir or Madam,
We acknowledge receipt of your recent emails emphasizing the urgency of expediting the transfer process. Regrettably, we must address the matter with utmost consideration, given the choice words employed in your communications.Apon careful review, we have revisited the proposal to relocate your office to the security department. However, owing to the recent renovation in the security facilities; you will find the northern access point is now in closer proximity to your current office location. Consequently, the feasibility of relocating your office based on financial considerations has been reassessed, and it is not deemed necessary at this time.
We appreciate your understanding and cooperation in this matter. If you have any further inquiries or would like to discuss alternative solutions, please feel free to reach out to your onboard representative.
Thank you for your continued cooperation.
Best regards,
-NT Official
"; + name = "re:Deepest apoligies"; + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/paper/fluff{ + default_raw_text = "___
Dear Sir or madam,
We sincerely apologize for the delay in our response and appreciate your loyal, dedicated work during these times.
In our commitment to improving working conditions, we have successfully moved your office closer to the western access point. However, we regret to inform you that due to the financial burden of this relocation, a deduction of 5,000 credits will be made indefinably from your future pay cheques to cover the renovation expenses. Please enjoy the complementary high quality whisky for your continued effort
We value your understanding and cooperation throughout this transition. If you have any further concerns or inquiries, please feel free to contact your onboard representative.
Best regards,
-NT official"; + name = "re:re:Deepest apoligies"; + pixel_x = 6; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ + pixel_x = -6; + pixel_y = 6 + }, +/turf/open/floor/carpet/green, +/area/security/detectives_office) "fpe" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 @@ -21019,18 +20853,6 @@ burnt = 1 }, /area/crew_quarters/locker) -"ftA" = ( -/obj/structure/table, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = -1; - pixel_y = 9 - }, -/obj/effect/turf_decal/tile/yellow/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown/opposingcorners, -/turf/open/floor/iron, -/area/construction) "ftG" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -22240,6 +22062,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/science/robotics/lab) +"fIp" = ( +/obj/item/reagent_containers/cup/glass/bottle/vodka{ + desc = "Aah, vodka. Prime choice of drink AND fuel by Russians worldwide. This one used to hold many secrets..." + }, +/turf/open/floor/cult, +/area/chapel/office) "fIq" = ( /obj/structure/railing{ dir = 1 @@ -22454,6 +22282,35 @@ /obj/structure/plasticflaps, /turf/open/floor/plating, /area/quartermaster/storage) +"fLf" = ( +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/table/reinforced, +/obj/machinery/airalarm/directional/north{ + pixel_y = 22 + }, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/syringe{ + pixel_x = 1; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = -3 + }, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = -3; + pixel_y = 3 + }, +/turf/open/floor/iron/grid/steel, +/area/medical/apothecary) "fLr" = ( /obj/effect/turf_decal/tile/green/fourcorners/contrasted, /turf/open/floor/iron, @@ -23172,38 +23029,6 @@ }, /turf/open/floor/iron/grid/steel, /area/medical/virology) -"fTU" = ( -/obj/effect/landmark/start/ai/secondary, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/item/radio/intercom{ - freerange = 1; - name = "Common Channel"; - pixel_x = 28 - }, -/obj/item/radio/intercom{ - freerange = 1; - listening = 0; - name = "Custom Channel"; - pixel_y = 24 - }, -/obj/item/radio/intercom{ - freerange = 1; - frequency = 1447; - name = "Private Channel"; - pixel_y = -28 - }, -/obj/machinery/door/window{ - base_state = "rightsecure"; - dir = 8; - icon_state = "rightsecure"; - name = "Secondary AI Core Access"; - obj_integrity = 300; - req_access_txt = "16" - }, -/turf/open/floor/circuit/red, -/area/ai_monitored/turret_protected/ai) "fTX" = ( /turf/open/floor/iron/white, /area/medical/medbay/central) @@ -23570,6 +23395,29 @@ }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain/private) +"fYC" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/bottle/charcoal{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/epinephrine, +/obj/item/reagent_containers/syringe, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "emmd"; + name = "Emergency Medical Lockdown Shutters" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/green/fourcorners/contrasted, +/obj/item/reagent_containers/cup/glass/britcup{ + pixel_x = 5; + pixel_y = 1 + }, +/obj/structure/desk_bell{ + pixel_x = -8 + }, +/turf/open/floor/iron/dark, +/area/medical/medbay/lobby) "fYR" = ( /obj/machinery/computer/secure_data{ dir = 4 @@ -23752,6 +23600,15 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) +"gbd" = ( +/obj/item/reagent_containers/cup/glass/bottle/wine, +/obj/structure/table/wood/fancy, +/obj/item/reagent_containers/cup/glass/trophy{ + pixel_x = 9; + pixel_y = 8 + }, +/turf/open/floor/carpet/grimy, +/area/chapel/main) "gbx" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable/yellow{ @@ -24032,30 +23889,6 @@ }, /turf/open/floor/iron/dark, /area/engine/engine_smes) -"geN" = ( -/obj/machinery/shieldwallgen/xenobiologyaccess, -/obj/machinery/door/window{ - base_state = "right"; - dir = 4; - icon_state = "right"; - name = "Secure Creature Pen Shield Holder"; - obj_integrity = 300; - req_one_access_txt = "55" - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/sign/warning/electricshock{ - pixel_x = -32 - }, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/plating, -/area/science/xenobiology) "gfc" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/chair/fancy/comfy{ @@ -24434,6 +24267,28 @@ dir = 4 }, /area/quartermaster/office) +"gjN" = ( +/obj/structure/table, +/obj/item/kitchen/fork, +/obj/item/reagent_containers/condiment/saltshaker{ + desc = "Salt. From space oceans, presumably. A staple of modern medicine."; + pixel_x = -8; + pixel_y = 12 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 5; + pixel_y = 6 + }, +/obj/effect/spawner/lootdrop/three_course_meal, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/cafeteria) "gkd" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -24730,22 +24585,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/hop) -"gnN" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/door/window{ - base_state = "rightsecure"; - dir = 1; - icon_state = "rightsecure"; - name = "Primary AI Core Access"; - obj_integrity = 300; - req_access_txt = "16" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "aicoredoor"; - name = "AI Core Shutter" - }, -/turf/open/floor/engine, -/area/ai_monitored/turret_protected/ai) "gnX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -25560,28 +25399,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/library/lounge) -"gzm" = ( -/obj/machinery/shieldwallgen/xenobiologyaccess, -/obj/machinery/door/window{ - base_state = "leftsecure"; - dir = 4; - icon_state = "leftsecure"; - name = "Secure Creature Pen Shield Holder"; - obj_integrity = 300; - req_access_txt = "55" - }, -/obj/structure/sign/warning/electricshock{ - pixel_x = -32 - }, -/obj/structure/window/reinforced, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/plating, -/area/science/xenobiology) "gzo" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ @@ -25877,16 +25694,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/medical/medbay/central) -"gCw" = ( -/obj/structure/table, -/obj/item/storage/bag/plants/portaseeder, -/obj/item/plant_analyzer, -/obj/item/reagent_containers/glass/bucket, -/obj/item/seeds/wheat, -/obj/item/seeds/wheat, -/obj/item/seeds/wheat, -/turf/open/floor/grass, -/area/hydroponics/garden) "gCA" = ( /obj/item/food/canned/beans{ pixel_x = -5; @@ -26221,6 +26028,17 @@ }, /turf/open/floor/iron/grid/steel, /area/medical/virology) +"gHI" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/bot, +/obj/item/reagent_containers/cup/soda_cans/thirteenloko{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/glass/mug/cocoa{ + pixel_x = 6 + }, +/turf/open/floor/iron/sepia, +/area/engine/break_room) "gHS" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/table, @@ -26380,19 +26198,6 @@ }, /turf/open/floor/iron, /area/engine/atmos) -"gJI" = ( -/obj/item/reagent_containers/glass/bucket, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/obj/structure/reagent_dispensers/watertank/high, -/obj/effect/turf_decal/tile/green/opposingcorners, -/obj/effect/turf_decal/tile/bar/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hydroponics) "gJJ" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -26531,6 +26336,29 @@ }, /turf/open/floor/iron/dark/side, /area/engine/atmos) +"gLr" = ( +/obj/item/food/canned/peaches{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/food/canned/peaches{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/food/canned/beans{ + pixel_x = 4; + pixel_y = -1 + }, +/obj/item/reagent_containers/cup/waterbottle{ + pixel_x = -8; + pixel_y = -5 + }, +/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small, +/turf/open/floor/iron/techmaint, +/area/security/prison/shielded) "gLs" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -27146,6 +26974,31 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"gSV" = ( +/obj/item/storage/box/papersack{ + icon_state = "paperbag_NanotrasenStandard_closed" + }, +/obj/item/storage/box/papersack{ + icon_state = "paperbag_NanotrasenStandard_closed" + }, +/obj/item/storage/box/papersack{ + icon_state = "paperbag_NanotrasenStandard_closed" + }, +/obj/item/storage/box/papersack{ + icon_state = "paperbag_NanotrasenStandard_closed" + }, +/obj/item/storage/box/papersack{ + icon_state = "paperbag_NanotrasenStandard_closed" + }, +/obj/effect/turf_decal/bot, +/obj/structure/table, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/item/reagent_containers/condiment/sugar, +/obj/item/reagent_containers/condiment/flour{ + pixel_x = 4 + }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "gSY" = ( /obj/effect/mapping_helpers/airlock/abandoned, /obj/effect/turf_decal/stripes/closeup, @@ -27712,6 +27565,12 @@ /obj/item/food/chips, /turf/open/floor/iron/grid/steel, /area/science/xenobiology) +"haU" = ( +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/oven, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "hbb" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -27852,40 +27711,6 @@ "hds" = ( /turf/closed/wall/rust, /area/maintenance/port) -"hdx" = ( -/obj/structure/closet/crate{ - name = "food crate" - }, -/obj/item/reagent_containers/glass/waterbottle/large{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/reagent_containers/glass/waterbottle/large{ - pixel_x = 2; - pixel_y = 3 - }, -/obj/item/reagent_containers/glass/waterbottle/large{ - pixel_x = -2 - }, -/obj/item/reagent_containers/glass/waterbottle/large{ - pixel_x = 5 - }, -/obj/item/reagent_containers/glass/waterbottle/large{ - pixel_x = 1; - pixel_y = -3 - }, -/obj/item/reagent_containers/glass/waterbottle/large{ - pixel_x = 8; - pixel_y = -3 - }, -/obj/machinery/status_display/ai{ - pixel_x = -32 - }, -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 8 - }, -/turf/open/floor/engine, -/area/security/nuke_storage) "hdy" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/circuit/green{ @@ -28138,21 +27963,6 @@ }, /turf/open/floor/iron/grid/steel, /area/science/xenobiology) -"hih" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "aicoredoor"; - name = "AI Core Shutter" - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/window{ - base_state = "rightsecure"; - icon_state = "rightsecure"; - name = "Primary AI Core Access"; - obj_integrity = 300; - req_access_txt = "16" - }, -/turf/open/floor/engine, -/area/ai_monitored/turret_protected/ai) "hij" = ( /obj/machinery/airalarm/directional/south{ pixel_y = -22 @@ -28775,32 +28585,6 @@ /obj/item/dice/d1, /turf/open/floor/iron/dark, /area/library/lounge) -"hqs" = ( -/obj/structure/table/wood, -/obj/item/paper/fluff{ - default_raw_text = "
___
Dear Sir or Madam,
We extend our deepest apologies for any inconvenience caused by the current location of your office. Your feedback is invaluable, and we are committed to addressing your concerns promptly.
In response to your request for a more suitable workplace, we are actively working on relocating your office to a more convenient setting. The necessary arrangements will be implemented during the upcoming shift.
Thank you for your understanding and continued support.
Best regards,
-NT Official
"; - name = "Deepest apoligies"; - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/paper/fluff{ - default_raw_text = "___
Dear Sir or Madam,
We acknowledge receipt of your recent emails emphasizing the urgency of expediting the transfer process. Regrettably, we must address the matter with utmost consideration, given the choice words employed in your communications.Apon careful review, we have revisited the proposal to relocate your office to the security department. However, owing to the recent renovation in the security facilities; you will find the northern access point is now in closer proximity to your current office location. Consequently, the feasibility of relocating your office based on financial considerations has been reassessed, and it is not deemed necessary at this time.
We appreciate your understanding and cooperation in this matter. If you have any further inquiries or would like to discuss alternative solutions, please feel free to reach out to your onboard representative.
Thank you for your continued cooperation.
Best regards,
-NT Official
"; - name = "re:Deepest apoligies"; - pixel_x = -5; - pixel_y = 4 - }, -/obj/item/paper/fluff{ - default_raw_text = "___
Dear Sir or madam,
We sincerely apologize for the delay in our response and appreciate your loyal, dedicated work during these times.
In our commitment to improving working conditions, we have successfully moved your office closer to the western access point. However, we regret to inform you that due to the financial burden of this relocation, a deduction of 5,000 credits will be made indefinably from your future pay cheques to cover the renovation expenses. Please enjoy the complementary high quality whisky for your continued effort
We value your understanding and cooperation throughout this transition. If you have any further concerns or inquiries, please feel free to contact your onboard representative.
Best regards,
-NT official";
- name = "re:re:Deepest apoligies";
- pixel_x = 6;
- pixel_y = 3
- },
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
- pixel_x = -6;
- pixel_y = 6
- },
-/turf/open/floor/carpet/green,
-/area/security/detectives_office)
"hqF" = (
/obj/effect/turf_decal/siding/wood{
dir = 1
@@ -29006,23 +28790,36 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/maintenance/department/science)
-"hus" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/shaker,
-/obj/machinery/computer/security/telescreen/minisat{
- dir = 1;
- pixel_y = -29
+"hux" = (
+/obj/structure/table/reinforced,
+/obj/item/seeds/soya,
+/obj/item/seeds/cabbage,
+/obj/item/seeds/corn,
+/obj/item/seeds/onion,
+/obj/item/seeds/potato,
+/obj/item/seeds/wheat,
+/obj/item/seeds/carrot,
+/obj/item/storage/bag/plants/portaseeder{
+ pixel_x = 1;
+ pixel_y = 3
},
-/obj/item/clothing/mask/cigarette/cigar/cohiba{
- pixel_x = 3
+/obj/item/reagent_containers/cup/bucket{
+ pixel_x = 8;
+ pixel_y = -1
},
-/obj/item/clothing/mask/cigarette/cigar,
-/obj/item/clothing/mask/cigarette/cigar/havana{
- pixel_x = -3
+/obj/item/cultivator{
+ pixel_x = 1;
+ pixel_y = -1
},
-/obj/machinery/light/small,
-/turf/open/floor/carpet/royalblue,
-/area/crew_quarters/heads/captain)
+/obj/item/shovel/spade{
+ pixel_x = -5;
+ pixel_y = -4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/iron/techmaint,
+/area/security/prison)
"huM" = (
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 4
@@ -29623,6 +29420,29 @@
},
/turf/open/floor/iron,
/area/security/checkpoint/escape)
+"hDD" = (
+/obj/structure/table,
+/obj/item/food/mint{
+ pixel_y = 9
+ },
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = 2
+ },
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_y = 2
+ },
+/obj/structure/noticeboard{
+ dir = 8;
+ pixel_x = 26
+ },
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/obj/machinery/newscaster{
+ pixel_y = -28
+ },
+/turf/open/floor/iron/cafeteria,
+/area/vacant_room/commissary/commissaryFood)
"hDG" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 4
@@ -30104,29 +29924,6 @@
/obj/item/kirbyplants/random,
/turf/open/floor/iron/dark,
/area/bridge)
-"hKB" = (
-/obj/item/food/canned/peaches{
- pixel_x = -5;
- pixel_y = 4
- },
-/obj/item/food/canned/peaches{
- pixel_x = 5;
- pixel_y = 5
- },
-/obj/item/food/canned/beans{
- pixel_x = 4;
- pixel_y = -1
- },
-/obj/item/reagent_containers/glass/waterbottle{
- pixel_x = -8;
- pixel_y = -5
- },
-/obj/structure/table,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small,
-/turf/open/floor/iron/techmaint,
-/area/security/prison/shielded)
"hKD" = (
/obj/structure/sign/warning/securearea,
/turf/closed/wall,
@@ -31197,16 +30994,6 @@
},
/turf/open/floor/carpet/red,
/area/crew_quarters/heads/hos)
-"hYl" = (
-/obj/structure/table/wood,
-/obj/item/razor{
- pixel_x = -4;
- pixel_y = 2
- },
-/obj/item/clothing/mask/cigarette/cigar,
-/obj/item/reagent_containers/food/drinks/flask/gold,
-/turf/open/floor/carpet/royalblue,
-/area/crew_quarters/heads/captain/private)
"hYU" = (
/obj/structure/table/wood/fancy,
/obj/item/flashlight/lantern,
@@ -31418,19 +31205,6 @@
broken = 1
},
/area/maintenance/central)
-"ial" = (
-/obj/machinery/newscaster{
- pixel_y = 31
- },
-/obj/structure/janitorialcart,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/mop,
-/obj/item/mop,
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/janitor)
"ian" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -31845,17 +31619,6 @@
},
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/ai)
-"ifl" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/window/northleft{
- dir = 8;
- name = "Animal Pen"
- },
-/obj/item/cultivator,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/seeds/tower,
-/turf/open/floor/plating,
-/area/hydroponics/garden)
"ifn" = (
/obj/structure/flora/ausbushes/ywflowers,
/obj/machinery/vending/hydronutrients,
@@ -32063,41 +31826,6 @@
},
/turf/open/floor/iron,
/area/quartermaster/sorting)
-"iiZ" = (
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/bottle/charcoal{
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/bottle/epinephrine,
-/obj/item/reagent_containers/dropper,
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/obj/effect/turf_decal/tile/green/opposingcorners{
- dir = 1
- },
-/obj/machinery/button/door{
- id = "chemisttop";
- name = "Chemistry Shutter Control";
- pixel_x = 7;
- pixel_y = -24;
- req_access_txt = "33"
- },
-/obj/machinery/button/door{
- id = "chemistbot";
- name = "Chemistry Shutter Control";
- pixel_x = -6;
- pixel_y = -24;
- req_access_txt = "33"
- },
-/obj/item/storage/pill_bottle,
-/obj/item/reagent_containers/medspray{
- pixel_x = 6;
- pixel_y = 6
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
-/turf/open/floor/iron/grid/steel,
-/area/medical/apothecary)
"ijh" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 4
@@ -32139,38 +31867,6 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
/area/hydroponics)
-"iki" = (
-/obj/effect/landmark/start/ai/secondary,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/item/radio/intercom{
- freerange = 1;
- listening = 0;
- name = "Custom Channel";
- pixel_y = 24
- },
-/obj/item/radio/intercom{
- freerange = 1;
- frequency = 1447;
- name = "Private Channel";
- pixel_y = -28
- },
-/obj/item/radio/intercom{
- freerange = 1;
- name = "Common Channel";
- pixel_x = 28
- },
-/obj/machinery/door/window{
- base_state = "rightsecure";
- dir = 8;
- icon_state = "rightsecure";
- name = "Secondary AI Core Access";
- obj_integrity = 300;
- req_access_txt = "16"
- },
-/turf/open/floor/circuit/red,
-/area/ai_monitored/turret_protected/ai)
"ikr" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/structure/cable/yellow{
@@ -32694,20 +32390,6 @@
},
/turf/open/floor/plating,
/area/maintenance/department/security/brig)
-"irn" = (
-/obj/effect/turf_decal/tile/blue/opposingcorners,
-/obj/effect/turf_decal/tile/green/opposingcorners{
- dir = 1
- },
-/obj/structure/table,
-/obj/item/reagent_containers/glass/mortar,
-/obj/item/pestle,
-/obj/item/clothing/glasses/hud/health{
- pixel_x = 4;
- pixel_y = -1
- },
-/turf/open/floor/iron/grid,
-/area/medical/virology)
"irr" = (
/obj/machinery/camera/directional/south{
c_tag = "Atmospherics - Plasma Cell"
@@ -33614,6 +33296,15 @@
/obj/effect/turf_decal/stripes/closeup,
/turf/open/floor/iron/techmaint,
/area/security/prison)
+"iBZ" = (
+/obj/structure/table,
+/obj/effect/turf_decal/bot,
+/obj/machinery/light,
+/obj/machinery/reagentgrinder,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/effect/turf_decal/tile/bar/opposingcorners,
+/turf/open/floor/iron/cafeteria,
+/area/crew_quarters/kitchen)
"iCg" = (
/obj/effect/turf_decal/siding/wood{
dir = 4
@@ -33752,12 +33443,6 @@
/obj/effect/turf_decal/siding/wideplating_new/dark,
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/ai)
-"iDU" = (
-/obj/structure/table/wood,
-/obj/item/storage/lockbox/medal,
-/obj/item/reagent_containers/food/drinks/shaker,
-/turf/open/floor/iron/dark,
-/area/crew_quarters/heads/captain)
"iDW" = (
/obj/machinery/light{
dir = 8
@@ -34851,27 +34536,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/iron,
/area/hallway/primary/central)
-"iRk" = (
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 5
- },
-/obj/effect/turf_decal/trimline/red/corner{
- dir = 8
- },
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/coffee{
- pixel_x = 10;
- pixel_y = 9
- },
-/obj/item/food/donut/berry{
- pixel_x = -3;
- pixel_y = 2
- },
-/obj/machinery/genpop_interface{
- pixel_y = 32
- },
-/turf/open/floor/iron/dark,
-/area/security/prison)
"iRo" = (
/obj/structure/sign/warning/docking,
/turf/closed/wall/r_wall,
@@ -35304,6 +34968,15 @@
},
/turf/open/floor/iron/techmaint,
/area/ai_monitored/storage/eva)
+"iXG" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb,
+/obj/structure/railing,
+/turf/open/floor/iron/techmaint,
+/area/science/misc_lab)
"iYf" = (
/obj/structure/cable{
icon_state = "0-2"
@@ -36550,6 +36223,22 @@
},
/turf/open/floor/plating,
/area/crew_quarters/heads/hop)
+"jpj" = (
+/obj/effect/turf_decal/delivery,
+/obj/machinery/door/window{
+ base_state = "rightsecure";
+ dir = 1;
+ icon_state = "rightsecure";
+ name = "Primary AI Core Access";
+ atom_integrity = 300;
+ req_access_txt = "16"
+ },
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "aicoredoor";
+ name = "AI Core Shutter"
+ },
+/turf/open/floor/engine,
+/area/ai_monitored/turret_protected/ai)
"jpl" = (
/obj/effect/decal/cleanable/greenglow,
/obj/effect/turf_decal/tile/yellow/opposingcorners{
@@ -36755,27 +36444,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron,
/area/hallway/primary/port)
-"jsw" = (
-/obj/structure/bonfire,
-/obj/item/reagent_containers/food/drinks/bottle/orangejuice{
- desc = "For the weary spacemen on their quest to rekindle the first plasma fire.";
- name = "Carton of Estus"
- },
-/obj/effect/decal/remains/human,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/cobweb,
-/obj/item/melee/baseball_bat{
- desc = "Don't tell anyone you put any points into dex, though.";
- icon_state = "swordon";
- item_state = "swordon";
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi';
- name = "moonlight greatsword";
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- },
-/turf/open/floor/plating{
- burnt = 1
- },
-/area/maintenance/port)
"jsN" = (
/obj/structure/table/reinforced,
/obj/item/storage/toolbox/mechanical,
@@ -36824,23 +36492,6 @@
},
/turf/open/floor/iron/techmaint,
/area/crew_quarters/fitness/recreation)
-"jti" = (
-/obj/structure/rack,
-/obj/item/book/manual/wiki/robotics_cyborgs{
- pixel_x = 2;
- pixel_y = 5
- },
-/obj/item/storage/belt/utility,
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/effect/turf_decal/delivery,
-/obj/machinery/requests_console{
- department = "Robotics Lab";
- name = "Robotics RC";
- pixel_y = 30;
- receive_ore_updates = 1
- },
-/turf/open/floor/iron/grid/steel,
-/area/science/robotics/lab)
"jtj" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -37512,6 +37163,27 @@
/obj/structure/chair/wood/normal,
/turf/open/floor/iron/dark,
/area/security/courtroom)
+"jDR" = (
+/obj/structure/bonfire,
+/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice{
+ desc = "For the weary spacemen on their quest to rekindle the first plasma fire.";
+ name = "Carton of Estus"
+ },
+/obj/effect/decal/remains/human,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/cobweb,
+/obj/item/melee/baseball_bat{
+ desc = "Don't tell anyone you put any points into dex, though.";
+ icon_state = "swordon";
+ item_state = "swordon";
+ lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi';
+ name = "moonlight greatsword";
+ righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+ },
+/turf/open/floor/plating{
+ burnt = 1
+ },
+/area/maintenance/port)
"jEa" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -37634,6 +37306,19 @@
},
/turf/open/floor/iron/freezer,
/area/crew_quarters/toilet/restrooms)
+"jFK" = (
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/obj/structure/sink/kitchen{
+ desc = "A sink used for washing one's hands and face. It looks rusty and home-made";
+ dir = 4;
+ name = "old sink";
+ pixel_x = -11
+ },
+/obj/structure/mopbucket,
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/mop,
+/turf/open/floor/iron/dark,
+/area/security/main)
"jFT" = (
/obj/effect/spawner/lootdrop/maintenance/two,
/obj/structure/rack,
@@ -39733,12 +39418,6 @@
},
/turf/open/floor/iron/dark,
/area/security/main)
-"keX" = (
-/obj/structure/rack,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/plating,
-/area/maintenance/central/secondary)
"kfb" = (
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/grid/steel,
@@ -39817,6 +39496,21 @@
},
/turf/open/floor/plating,
/area/quartermaster/storage)
+"kgy" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "aicoredoor";
+ name = "AI Core Shutter"
+ },
+/obj/effect/turf_decal/delivery,
+/obj/machinery/door/window{
+ base_state = "rightsecure";
+ icon_state = "rightsecure";
+ name = "Primary AI Core Access";
+ atom_integrity = 300;
+ req_access_txt = "16"
+ },
+/turf/open/floor/engine,
+/area/ai_monitored/turret_protected/ai)
"kgB" = (
/obj/structure/flora/grass/jungle/b,
/obj/structure/flora/ausbushes/fullgrass,
@@ -40280,6 +39974,11 @@
},
/turf/open/floor/catwalk_floor,
/area/maintenance/department/engine)
+"kmD" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb,
+/turf/open/floor/carpet/grimy,
+/area/hallway/primary/port)
"kmL" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -41140,6 +40839,88 @@
},
/turf/open/floor/plating,
/area/maintenance/aft)
+"kxf" = (
+/obj/structure/closet/crate/medical,
+/obj/item/reagent_containers/cup/bottle/bromine{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/aluminium{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/chlorine{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/carbon{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/ethanol{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/copper{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/hydrogen{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/fluorine{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/water{
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/bottle/lithium{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/iron{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/iodine{
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/bottle/oxygen{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/phosphorus{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/nitrogen{
+ pixel_x = -6;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/bottle/mercury{
+ pixel_x = 6;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/bottle/radium{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/potassium{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/welding_fuel{
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/bottle/sacid{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/silicon{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/silver{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/sodium{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/sugar{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/sulfur{
+ pixel_x = -6
+ },
+/obj/item/circuitboard/machine/chem_heater,
+/turf/open/floor/iron/techmaint,
+/area/medical/virology)
"kxg" = (
/obj/structure/table,
/obj/item/storage/toolbox/mechanical,
@@ -41171,6 +40952,16 @@
},
/turf/open/floor/iron/dark,
/area/quartermaster/storage)
+"kyc" = (
+/obj/item/reagent_containers/cup/bucket,
+/obj/effect/turf_decal/bot,
+/obj/structure/reagent_dispensers/watertank/high,
+/obj/effect/turf_decal/tile/green/opposingcorners,
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/hydroponics)
"kyh" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/obj/item/kirbyplants/random,
@@ -41750,6 +41541,28 @@
},
/turf/open/floor/iron,
/area/quartermaster/sorting)
+"kGy" = (
+/obj/machinery/shieldwallgen/xenobiologyaccess,
+/obj/machinery/door/window{
+ base_state = "leftsecure";
+ dir = 4;
+ icon_state = "leftsecure";
+ name = "Secure Creature Pen Shield Holder";
+ atom_integrity = 300;
+ req_access_txt = "55"
+ },
+/obj/structure/sign/warning/electricshock{
+ pixel_x = -32
+ },
+/obj/structure/window/reinforced,
+/obj/structure/cable/yellow{
+ icon_state = "0-4"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/turf/open/floor/plating,
+/area/science/xenobiology)
"kGA" = (
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
@@ -44131,6 +43944,34 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/iron/grid/steel,
/area/hallway/secondary/exit/departure_lounge)
+"lil" = (
+/obj/structure/table,
+/obj/item/clothing/gloves/color/latex,
+/obj/item/clothing/gloves/color/latex{
+ pixel_x = 4;
+ pixel_y = 4
+ },
+/obj/item/clothing/glasses/science{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/clothing/glasses/science,
+/obj/item/reagent_containers/dropper,
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = 3
+ },
+/obj/item/reagent_containers/cup/beaker/large{
+ pixel_x = -3
+ },
+/obj/effect/turf_decal/tile/purple/opposingcorners,
+/obj/effect/turf_decal/tile/green/opposingcorners{
+ dir = 1
+ },
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/turf/open/floor/iron/white,
+/area/medical/apothecary)
"lim" = (
/turf/open/floor/iron/dark/corner{
dir = 1
@@ -45239,6 +45080,19 @@
/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating,
/area/maintenance/department/medical)
+"lvi" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/bot,
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/dest_tagger,
+/obj/machinery/computer/security/telescreen/rd{
+ pixel_y = 30
+ },
+/turf/open/floor/iron/dark,
+/area/bridge)
"lvk" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -45639,6 +45493,20 @@
/obj/machinery/light,
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/ai_upload_foyer)
+"lAL" = (
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/obj/structure/table,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = 7
+ },
+/obj/item/reagent_containers/dropper,
+/obj/item/hand_labeler,
+/obj/item/stack/package_wrap,
+/turf/open/floor/iron/dark,
+/area/science/lab)
"lAV" = (
/obj/structure/cable/yellow{
icon_state = "2-8"
@@ -47868,6 +47736,38 @@
/obj/effect/turf_decal/tile/yellow/opposingcorners,
/turf/open/floor/iron/sepia,
/area/engine/engineering)
+"mif" = (
+/obj/effect/landmark/start/ai/secondary,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/item/radio/intercom{
+ freerange = 1;
+ name = "Common Channel";
+ pixel_x = 28
+ },
+/obj/item/radio/intercom{
+ freerange = 1;
+ listening = 0;
+ name = "Custom Channel";
+ pixel_y = 24
+ },
+/obj/item/radio/intercom{
+ freerange = 1;
+ frequency = 1447;
+ name = "Private Channel";
+ pixel_y = -28
+ },
+/obj/machinery/door/window{
+ base_state = "rightsecure";
+ dir = 8;
+ icon_state = "rightsecure";
+ name = "Secondary AI Core Access";
+ atom_integrity = 300;
+ req_access_txt = "16"
+ },
+/turf/open/floor/circuit/red,
+/area/ai_monitored/turret_protected/ai)
"mii" = (
/obj/effect/turf_decal/trimline/red/arrow_cw{
dir = 4
@@ -48395,6 +48295,40 @@
"mqi" = (
/turf/open/floor/iron,
/area/hallway/primary/starboard)
+"mqw" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/window/brigdoor{
+ dir = 1;
+ name = "Virology Desk Window";
+ req_access_txt = "20"
+ },
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
+ pixel_x = 2;
+ pixel_y = 12
+ },
+/obj/item/storage/box/masks{
+ pixel_x = -5;
+ pixel_y = -3
+ },
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
+ pixel_x = 2;
+ pixel_y = -1
+ },
+/obj/effect/turf_decal/stripes/closeup,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "quarantineshutters";
+ name = "Isolation Shutters"
+ },
+/obj/structure/desk_bell{
+ pixel_x = 8;
+ pixel_y = 1
+ },
+/obj/machinery/door/window/northleft{
+ dir = 2;
+ name = "Virology Desk Window"
+ },
+/turf/open/floor/iron/grid/steel,
+/area/medical/virology)
"mqx" = (
/obj/effect/turf_decal/stripes/full,
/obj/machinery/power/smes{
@@ -50345,6 +50279,19 @@
},
/turf/open/floor/carpet/green,
/area/crew_quarters/dorms)
+"mQj" = (
+/obj/item/reagent_containers/cup/bucket,
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/effect/turf_decal/bot,
+/obj/structure/reagent_dispensers/watertank/high,
+/obj/effect/turf_decal/tile/green/opposingcorners,
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/hydroponics)
"mQl" = (
/obj/structure/table/wood,
/obj/item/book/manual/wiki/security_space_law,
@@ -50697,6 +50644,17 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/maintenance/port/central)
+"mUs" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/window/northleft{
+ dir = 8;
+ name = "Animal Pen"
+ },
+/obj/item/cultivator,
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/seeds/tower,
+/turf/open/floor/plating,
+/area/hydroponics/garden)
"mUv" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -50900,6 +50858,27 @@
},
/turf/closed/wall/r_wall,
/area/engine/supermatter)
+"mYp" = (
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/red/corner{
+ dir = 8
+ },
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/cup/glass/coffee{
+ pixel_x = 10;
+ pixel_y = 9
+ },
+/obj/item/food/donut/berry{
+ pixel_x = -3;
+ pixel_y = 2
+ },
+/obj/machinery/genpop_interface{
+ pixel_y = 32
+ },
+/turf/open/floor/iron/dark,
+/area/security/prison)
"mYB" = (
/obj/structure/sign/departments/minsky/security/security,
/turf/closed/wall/r_wall,
@@ -51237,17 +51216,6 @@
},
/turf/open/floor/iron/grid/steel,
/area/medical/genetics)
-"ndu" = (
-/obj/structure/table/wood/fancy,
-/obj/item/soulstone/anybody/chaplain,
-/obj/item/organ/heart{
- pixel_x = 8;
- pixel_y = 7
- },
-/obj/item/reagent_containers/food/drinks/bottle/holywater,
-/obj/item/book/granter/spell/smoke/lesser,
-/turf/open/floor/cult,
-/area/chapel/office)
"ndM" = (
/obj/effect/turf_decal/guideline/guideline_in/red{
dir = 4
@@ -51724,15 +51692,6 @@
},
/turf/open/floor/iron/dark,
/area/engine/engine_room)
-"njG" = (
-/obj/structure/table,
-/obj/effect/turf_decal/bot,
-/obj/machinery/light,
-/obj/machinery/reagentgrinder,
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/turf/open/floor/iron/cafeteria,
-/area/crew_quarters/kitchen)
"njM" = (
/obj/effect/turf_decal/bot,
/obj/machinery/shieldwallgen,
@@ -52637,23 +52596,6 @@
},
/turf/open/floor/plating,
/area/science/mixing)
-"nwP" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/shaker,
-/obj/item/reagent_containers/glass/rag,
-/obj/structure/sign/plaques/deempisi{
- pixel_y = 28
- },
-/obj/item/book/manual/wiki/barman_recipes{
- pixel_x = 4;
- pixel_y = -4
- },
-/obj/structure/noticeboard{
- dir = 4;
- pixel_x = -27
- },
-/turf/open/floor/iron/dark,
-/area/crew_quarters/bar)
"nwT" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -54001,6 +53943,20 @@
/obj/structure/sign/warning/electricshock,
/turf/closed/wall/r_wall,
/area/storage/tech)
+"nPp" = (
+/obj/item/folder,
+/obj/item/clipboard,
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb,
+/obj/structure/table/wood,
+/obj/item/reagent_containers/spray/cleaner{
+ pixel_x = -3;
+ pixel_y = 2
+ },
+/obj/item/radio/intercom{
+ pixel_y = 24
+ },
+/turf/open/floor/iron/dark,
+/area/science/breakroom)
"nPL" = (
/obj/item/stack/cable_coil/cut/yellow,
/obj/structure/cable/yellow{
@@ -55603,6 +55559,38 @@
/obj/machinery/light/small,
/turf/open/floor/engine,
/area/engine/supermatter)
+"onm" = (
+/obj/structure/table/reinforced,
+/obj/item/book/granter/crafting_recipe/cooking_sweets_101{
+ pixel_x = 6;
+ pixel_y = 16
+ },
+/obj/item/book/manual/chef_recipes{
+ pixel_x = 6;
+ pixel_y = 12
+ },
+/obj/item/reagent_containers/condiment/flour{
+ pixel_x = 8;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/condiment/flour{
+ pixel_x = 8;
+ pixel_y = 5
+ },
+/obj/item/reagent_containers/condiment/sugar{
+ pixel_x = 8;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/condiment/enzyme{
+ pixel_x = -4;
+ pixel_y = 17
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/open/floor/iron/techmaint,
+/area/security/prison)
"ono" = (
/obj/machinery/door/airlock/engineering/glass{
name = "Server Room";
@@ -55809,6 +55797,11 @@
},
/turf/open/floor/iron/dark,
/area/science/shuttle)
+"opu" = (
+/obj/structure/reagent_dispensers/watertank,
+/obj/item/reagent_containers/cup/bucket,
+/turf/open/floor/plating,
+/area/maintenance/department/security/brig)
"opD" = (
/obj/structure/cable/yellow{
icon_state = "2-8"
@@ -55856,15 +55849,6 @@
/obj/structure/sign/warning/electricshock,
/turf/closed/wall/r_wall,
/area/maintenance/solars/starboard/fore)
-"oqj" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
-/obj/structure/railing,
-/turf/open/floor/iron/techmaint,
-/area/science/misc_lab)
"oqm" = (
/obj/structure/table/reinforced,
/obj/effect/turf_decal/delivery,
@@ -57877,6 +57861,22 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron,
/area/hallway/primary/central)
+"oUy" = (
+/obj/structure/rack,
+/obj/item/stack/cable_coil/random/five,
+/obj/item/screwdriver,
+/obj/item/wrench,
+/obj/item/kitchen/rollingpin,
+/obj/item/reagent_containers/condiment/enzyme,
+/obj/item/knife/kitchen,
+/obj/structure/extinguisher_cabinet{
+ pixel_y = -30
+ },
+/obj/item/radio/intercom{
+ pixel_x = 28
+ },
+/turf/open/floor/iron/dark,
+/area/vacant_room/commissary/commissaryFood)
"oUA" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -59575,6 +59575,42 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/hydroponics)
+"ptv" = (
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/old,
+/obj/structure/closet/secure_closet/injection,
+/obj/item/reagent_containers/cup/bottle/toxin{
+ pixel_x = 6;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/bottle/facid{
+ name = "fluorosulfuric acid bottle";
+ pixel_x = -3;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/cup/bottle/morphine{
+ pixel_x = 5;
+ pixel_y = 1
+ },
+/obj/item/reagent_containers/cup/bottle/morphine{
+ pixel_x = -4;
+ pixel_y = 1
+ },
+/obj/item/reagent_containers/dropper,
+/obj/item/reagent_containers/syringe,
+/obj/item/reagent_containers/syringe{
+ pixel_y = 5
+ },
+/obj/item/reagent_containers/cup/bottle/chloralhydrate,
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-8"
+ },
+/turf/open/floor/iron/techmaint,
+/area/security/execution/education)
"ptH" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/yellow{
@@ -60216,15 +60252,6 @@
},
/turf/open/floor/iron/techmaint,
/area/crew_quarters/heads/hor)
-"pBN" = (
-/obj/machinery/biogenerator,
-/obj/item/reagent_containers/glass/bucket{
- pixel_x = 4
- },
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/techmaint,
-/area/security/prison)
"pBR" = (
/obj/docking_port/stationary{
dir = 2;
@@ -60292,6 +60319,12 @@
},
/turf/open/floor/iron/techmaint,
/area/science/xenobiology)
+"pCA" = (
+/obj/structure/mopbucket,
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/mop,
+/turf/open/floor/iron/techmaint,
+/area/science/research)
"pCN" = (
/obj/effect/spawner/room/fivexfour,
/turf/open/floor/plating,
@@ -60337,6 +60370,26 @@
},
/turf/open/floor/iron/dark,
/area/engine/engine_room)
+"pDz" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor,
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = 5;
+ pixel_y = -2
+ },
+/obj/machinery/door/poddoor/shutters{
+ id = "kitchencounter";
+ name = "Kitchen Bar Counter Shutters"
+ },
+/obj/structure/desk_bell{
+ pixel_x = -8
+ },
+/turf/open/floor/iron/techmaint,
+/area/crew_quarters/kitchen)
"pDL" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -61743,6 +61796,19 @@
},
/turf/open/floor/iron,
/area/engine/atmos)
+"pXS" = (
+/obj/machinery/newscaster{
+ pixel_y = 31
+ },
+/obj/structure/janitorialcart,
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/mop,
+/obj/item/mop,
+/turf/open/floor/iron/dark/side{
+ dir = 1
+ },
+/area/janitor)
"pYk" = (
/obj/structure/window/reinforced{
dir = 8
@@ -61882,36 +61948,28 @@
/obj/machinery/light,
/turf/open/floor/wood,
/area/library/lounge)
-"pZt" = (
-/obj/structure/table/reinforced,
-/obj/item/seeds/soya,
-/obj/item/seeds/cabbage,
-/obj/item/seeds/corn,
-/obj/item/seeds/onion,
-/obj/item/seeds/potato,
-/obj/item/seeds/wheat,
-/obj/item/seeds/carrot,
-/obj/item/storage/bag/plants/portaseeder{
- pixel_x = 1;
- pixel_y = 3
+"pZF" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/glass/bottle/holywater{
+ pixel_x = 4;
+ pixel_y = 4
},
-/obj/item/reagent_containers/glass/bucket{
- pixel_x = 8;
- pixel_y = -1
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = -3;
+ pixel_y = 15
},
-/obj/item/cultivator{
- pixel_x = 1;
- pixel_y = -1
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = -6;
+ pixel_y = 3
},
-/obj/item/shovel/spade{
- pixel_x = -5;
- pixel_y = -4
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 6
},
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 10
},
-/turf/open/floor/iron/techmaint,
-/area/security/prison)
+/turf/open/floor/carpet,
+/area/chapel/office)
"pZM" = (
/obj/structure/chair/fancy/sofa/old{
color = "#742925";
@@ -63141,12 +63199,6 @@
},
/turf/open/floor/iron/dark,
/area/security/brig)
-"qpL" = (
-/obj/structure/mopbucket,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/mop,
-/turf/open/floor/iron/techmaint,
-/area/science/research)
"qpP" = (
/obj/structure/noticeboard{
pixel_y = 26
@@ -63503,38 +63555,6 @@
},
/turf/open/floor/iron/dark,
/area/engine/gravity_generator)
-"qtM" = (
-/obj/structure/table/reinforced,
-/obj/item/book/granter/crafting_recipe/cooking_sweets_101{
- pixel_x = 6;
- pixel_y = 16
- },
-/obj/item/book/manual/chef_recipes{
- pixel_x = 6;
- pixel_y = 12
- },
-/obj/item/reagent_containers/food/condiment/flour{
- pixel_x = 8;
- pixel_y = 8
- },
-/obj/item/reagent_containers/food/condiment/flour{
- pixel_x = 8;
- pixel_y = 5
- },
-/obj/item/reagent_containers/food/condiment/sugar{
- pixel_x = 8;
- pixel_y = 2
- },
-/obj/item/reagent_containers/food/condiment/enzyme{
- pixel_x = -4;
- pixel_y = 17
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/iron/techmaint,
-/area/security/prison)
"qtS" = (
/obj/effect/turf_decal/trimline/blue/warning{
dir = 8
@@ -63816,21 +63836,6 @@
},
/turf/open/floor/iron,
/area/hallway/primary/central)
-"qxm" = (
-/obj/structure/table,
-/obj/item/food/spaghetti/raw,
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_x = 4;
- pixel_y = 4
- },
-/obj/item/reagent_containers/food/condiment/peppermill,
-/obj/item/reagent_containers/food/condiment/enzyme{
- pixel_y = 6
- },
-/obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/turf/open/floor/iron/cafeteria,
-/area/crew_quarters/kitchen)
"qxp" = (
/obj/effect/turf_decal/trimline/blue/line{
dir = 8
@@ -63990,22 +63995,6 @@
},
/turf/open/floor/iron/checker,
/area/quartermaster/storage)
-"qzO" = (
-/obj/structure/rack,
-/obj/item/stack/cable_coil/random/five,
-/obj/item/screwdriver,
-/obj/item/wrench,
-/obj/item/kitchen/rollingpin,
-/obj/item/reagent_containers/food/condiment/enzyme,
-/obj/item/knife/kitchen,
-/obj/structure/extinguisher_cabinet{
- pixel_y = -30
- },
-/obj/item/radio/intercom{
- pixel_x = 28
- },
-/turf/open/floor/iron/dark,
-/area/vacant_room/commissary/commissaryFood)
"qAh" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -64571,6 +64560,40 @@
/obj/machinery/atmospherics/pipe/layer_manifold,
/turf/open/floor/iron/techmaint,
/area/hallway/secondary/entry)
+"qGZ" = (
+/obj/structure/closet/crate{
+ name = "food crate"
+ },
+/obj/item/reagent_containers/cup/waterbottle/large{
+ pixel_x = -5;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/waterbottle/large{
+ pixel_x = 2;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/waterbottle/large{
+ pixel_x = -2
+ },
+/obj/item/reagent_containers/cup/waterbottle/large{
+ pixel_x = 5
+ },
+/obj/item/reagent_containers/cup/waterbottle/large{
+ pixel_x = 1;
+ pixel_y = -3
+ },
+/obj/item/reagent_containers/cup/waterbottle/large{
+ pixel_x = 8;
+ pixel_y = -3
+ },
+/obj/machinery/status_display/ai{
+ pixel_x = -32
+ },
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 8
+ },
+/turf/open/floor/engine,
+/area/security/nuke_storage)
"qHa" = (
/obj/machinery/photocopier,
/turf/open/floor/wood,
@@ -65604,6 +65627,15 @@
},
/turf/open/floor/iron,
/area/maintenance/disposal)
+"qTl" = (
+/obj/machinery/light/small{
+ dir = 8
+ },
+/obj/structure/closet/secure_closet/freezer/kitchen/maintenance,
+/obj/item/reagent_containers/condiment/sugar,
+/obj/item/food/tofu/prison,
+/turf/open/floor/iron/dark,
+/area/vacant_room/commissary/commissaryFood)
"qTo" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable/yellow{
@@ -66675,20 +66707,6 @@
},
/turf/open/floor/iron/techmaint,
/area/maintenance/department/medical)
-"rkq" = (
-/obj/item/folder,
-/obj/item/clipboard,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
-/obj/structure/table/wood,
-/obj/item/reagent_containers/spray/cleaner{
- pixel_x = -3;
- pixel_y = 2
- },
-/obj/item/radio/intercom{
- pixel_y = 24
- },
-/turf/open/floor/iron/dark,
-/area/science/breakroom)
"rkv" = (
/obj/structure/table/wood,
/turf/open/floor/carpet,
@@ -68439,21 +68457,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/engine/atmos)
-"rGZ" = (
-/obj/effect/turf_decal/tile/red/anticorner/contrasted{
- dir = 1
- },
-/obj/structure/table,
-/obj/item/toy/batong{
- pixel_x = 1;
- pixel_y = 1
- },
-/obj/item/reagent_containers/food/drinks/britcup{
- pixel_x = -6;
- pixel_y = 6
- },
-/turf/open/floor/iron/techmaint,
-/area/security/prison)
"rHd" = (
/obj/structure/sign/warning/securearea,
/turf/closed/wall/r_wall,
@@ -70992,11 +70995,6 @@
/obj/machinery/atmospherics/pipe/simple/general/visible,
/turf/open/floor/iron/white,
/area/science/xenobiology)
-"smb" = (
-/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
-/turf/open/floor/plating,
-/area/maintenance/department/security/brig)
"sme" = (
/obj/structure/sign/departments/security,
/turf/closed/wall/r_wall,
@@ -71226,17 +71224,6 @@
},
/turf/open/floor/iron/dark,
/area/security/brig)
-"soC" = (
-/obj/structure/table/wood,
-/obj/effect/turf_decal/bot,
-/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko{
- pixel_x = -6
- },
-/obj/item/reagent_containers/food/drinks/mug/cocoa{
- pixel_x = 6
- },
-/turf/open/floor/iron/sepia,
-/area/engine/break_room)
"soH" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 8
@@ -73899,22 +73886,6 @@
/obj/structure/closet/toolcloset,
/turf/open/floor/iron/techmaint,
/area/maintenance/solars/port)
-"sYd" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/obj/structure/table/reinforced,
-/obj/item/food/popcorn,
-/obj/item/reagent_containers/food/drinks/bottle/vodka{
- pixel_x = 4;
- pixel_y = 6
- },
-/obj/machinery/airalarm/directional/west{
- pixel_x = -22
- },
-/obj/structure/railing,
-/turf/open/floor/iron/techmaint,
-/area/science/misc_lab)
"sYg" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 4
@@ -74801,6 +74772,21 @@
},
/turf/open/floor/iron,
/area/hallway/secondary/entry)
+"tkK" = (
+/obj/structure/table,
+/obj/item/food/spaghetti/raw,
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = 4;
+ pixel_y = 4
+ },
+/obj/item/reagent_containers/condiment/peppermill,
+/obj/item/reagent_containers/condiment/enzyme{
+ pixel_y = 6
+ },
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/tile/bar/opposingcorners,
+/turf/open/floor/iron/cafeteria,
+/area/crew_quarters/kitchen)
"tkM" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
@@ -75426,6 +75412,12 @@
/obj/effect/landmark/start/station_engineer,
/turf/open/floor/iron/dark,
/area/engine/storage)
+"ttm" = (
+/obj/structure/table/wood,
+/obj/item/storage/lockbox/medal,
+/obj/item/reagent_containers/cup/glass/shaker,
+/turf/open/floor/iron/dark,
+/area/crew_quarters/heads/captain)
"ttn" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -75575,6 +75567,24 @@
/obj/machinery/light,
/turf/open/floor/grass/no_border,
/area/hallway/primary/port)
+"tuO" = (
+/obj/structure/table/reinforced,
+/obj/item/folder/white,
+/obj/item/stack/sheet/mineral/plasma{
+ amount = 5
+ },
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker,
+/obj/item/reagent_containers/dropper,
+/obj/machinery/camera/directional/north{
+ c_tag = "Xenobiology - Research Area";
+ name = "xenobiology camera"
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/open/floor/iron/grid/steel,
+/area/science/xenobiology)
"tuT" = (
/obj/structure/lattice,
/turf/open/space,
@@ -75594,26 +75604,6 @@
},
/turf/open/floor/carpet,
/area/crew_quarters/bar/atrium)
-"tvw" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/firedoor,
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_x = -2;
- pixel_y = 2
- },
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_x = 5;
- pixel_y = -2
- },
-/obj/machinery/door/poddoor/shutters{
- id = "kitchencounter";
- name = "Kitchen Bar Counter Shutters"
- },
-/obj/structure/desk_bell{
- pixel_x = -8
- },
-/turf/open/floor/iron/techmaint,
-/area/crew_quarters/kitchen)
"tvz" = (
/obj/item/soap/nanotrasen,
/obj/effect/turf_decal/tile/blue/opposingcorners{
@@ -77053,29 +77043,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/closed/wall/r_wall,
/area/teleporter)
-"tPo" = (
-/obj/structure/table,
-/obj/item/food/mint{
- pixel_y = 9
- },
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_x = 2
- },
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_y = 2
- },
-/obj/structure/noticeboard{
- dir = 8;
- pixel_x = 26
- },
-/obj/effect/turf_decal/tile/bar/opposingcorners{
- dir = 1
- },
-/obj/machinery/newscaster{
- pixel_y = -28
- },
-/turf/open/floor/iron/cafeteria,
-/area/vacant_room/commissary/commissaryFood)
"tPD" = (
/obj/machinery/light_switch{
pixel_x = -24;
@@ -77703,6 +77670,40 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/vacant_room/commissary/commissary2)
+"tXb" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/table,
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
+ pixel_x = 2;
+ pixel_y = 12
+ },
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
+ pixel_x = -6;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
+ pixel_x = 9;
+ pixel_y = 12
+ },
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
+ pixel_x = 5;
+ pixel_y = 5
+ },
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
+ pixel_x = 2;
+ pixel_y = -1
+ },
+/obj/machinery/firealarm/directional/west,
+/obj/machinery/vending/wallmed{
+ contraband = list(/obj/item/reagent_containers/cup/bottle/chloralhydrate = 1, /obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/cup/bottle/random_virus = 1);
+ name = "Upgraded NanoMed";
+ pixel_x = -1;
+ pixel_y = -32;
+ premium = list(/obj/item/storage/firstaid/regular = 3, /obj/item/storage/belt/medical = 3, /obj/item/sensor_device = 2, /obj/item/pinpointer/crew = 2, /obj/item/healthanalyzer = 2, /obj/item/wrench/medical = 1);
+ products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/reagent_containers/medspray = 6, /obj/item/storage/pill_bottle = 6, /obj/item/reagent_containers/cup/bottle = 10, /obj/item/reagent_containers/spray/cleaner = 1, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/hypospray/medipen = 8, /obj/item/reagent_containers/hypospray/medipen/dexalin = 8, /obj/item/reagent_containers/cup/bottle/epinephrine = 4, /obj/item/reagent_containers/cup/bottle/charcoal = 4, /obj/item/reagent_containers/cup/bottle/salglu_solution = 4, /obj/item/reagent_containers/cup/bottle/tricordrazine = 1, /obj/item/reagent_containers/cup/bottle/spaceacillin = 1, /obj/item/reagent_containers/cup/bottle/morphine = 2, /obj/item/reagent_containers/cup/bottle/toxin = 4, /obj/item/reagent_containers/medspray/sterilizine = 4)
+ },
+/turf/open/floor/iron/grid/steel,
+/area/medical/virology)
"tXc" = (
/obj/structure/window/reinforced{
dir = 4
@@ -79154,6 +79155,29 @@
},
/turf/open/floor/iron/dark,
/area/security/checkpoint)
+"uqM" = (
+/obj/machinery/newscaster{
+ pixel_x = -28;
+ pixel_y = 1
+ },
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = 7
+ },
+/obj/item/reagent_containers/dropper,
+/obj/item/radio/headset/headset_med,
+/obj/item/flashlight/pen{
+ pixel_x = 4;
+ pixel_y = 3
+ },
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/iron/grid/steel,
+/area/medical/genetics)
"uqQ" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark/side{
@@ -80976,22 +81000,6 @@
},
/turf/open/floor/iron,
/area/hallway/primary/starboard)
-"uNi" = (
-/obj/item/radio/intercom{
- pixel_x = 28
- },
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull{
- pixel_x = -6;
- pixel_y = 3
- },
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
- pixel_x = 4;
- pixel_y = 4
- },
-/obj/machinery/camera/directional/east,
-/turf/open/floor/iron/grid/steel,
-/area/science/xenobiology)
"uNj" = (
/turf/open/floor/iron/dark,
/area/science/robotics/mechbay)
@@ -81184,34 +81192,6 @@
},
/turf/open/floor/iron/techmaint,
/area/science/shuttle)
-"uPL" = (
-/obj/structure/table,
-/obj/item/clothing/gloves/color/latex,
-/obj/item/clothing/gloves/color/latex{
- pixel_x = 4;
- pixel_y = 4
- },
-/obj/item/clothing/glasses/science{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/clothing/glasses/science,
-/obj/item/reagent_containers/dropper,
-/obj/item/reagent_containers/glass/beaker{
- pixel_x = 3
- },
-/obj/item/reagent_containers/glass/beaker/large{
- pixel_x = -3
- },
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/obj/effect/turf_decal/tile/green/opposingcorners{
- dir = 1
- },
-/obj/structure/window/reinforced{
- dir = 1
- },
-/turf/open/floor/iron/white,
-/area/medical/apothecary)
"uPN" = (
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
@@ -82377,16 +82357,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
/area/chapel/main)
-"vdJ" = (
-/obj/item/reagent_containers/glass/bucket,
-/obj/effect/turf_decal/bot,
-/obj/structure/reagent_dispensers/watertank/high,
-/obj/effect/turf_decal/tile/green/opposingcorners,
-/obj/effect/turf_decal/tile/bar/opposingcorners{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/hydroponics)
"vdU" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -82698,6 +82668,23 @@
},
/turf/open/floor/iron/sepia,
/area/engine/break_room)
+"viq" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/glass/shaker,
+/obj/machinery/computer/security/telescreen/minisat{
+ dir = 1;
+ pixel_y = -29
+ },
+/obj/item/clothing/mask/cigarette/cigar/cohiba{
+ pixel_x = 3
+ },
+/obj/item/clothing/mask/cigarette/cigar,
+/obj/item/clothing/mask/cigarette/cigar/havana{
+ pixel_x = -3
+ },
+/obj/machinery/light/small,
+/turf/open/floor/carpet/royalblue,
+/area/crew_quarters/heads/captain)
"vit" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -83619,6 +83606,17 @@
},
/turf/open/floor/circuit/telecomms,
/area/science/xenobiology)
+"vsd" = (
+/obj/structure/table/wood/fancy,
+/obj/item/soulstone/anybody/chaplain,
+/obj/item/organ/heart{
+ pixel_x = 8;
+ pixel_y = 7
+ },
+/obj/item/reagent_containers/cup/glass/bottle/holywater,
+/obj/item/book/granter/spell/smoke/lesser,
+/turf/open/floor/cult,
+/area/chapel/office)
"vsi" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -83689,6 +83687,35 @@
broken = 1
},
/area/maintenance/port)
+"vsI" = (
+/obj/structure/table/wood,
+/obj/item/folder/blue{
+ pixel_x = 8
+ },
+/obj/item/stamp/captain{
+ pixel_x = 8
+ },
+/obj/structure/desk_bell/speed_demon{
+ pixel_x = -8
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = -6;
+ pixel_y = 14
+ },
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
+ desc = "A bottle of whiskey. There's a label that reads 'tears' taped to the front.";
+ name = "Bottle of Tears";
+ pixel_x = 8;
+ pixel_y = 20
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/heads/captain)
"vsR" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
@@ -84365,15 +84392,6 @@
/obj/structure/closet/secure_closet/medical1,
/turf/open/floor/iron/grid/steel,
/area/medical/virology)
-"vye" = (
-/obj/machinery/light/small{
- dir = 8
- },
-/obj/structure/closet/secure_closet/freezer/kitchen/maintenance,
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/food/tofu/prison,
-/turf/open/floor/iron/dark,
-/area/vacant_room/commissary/commissaryFood)
"vym" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 9
@@ -85434,6 +85452,22 @@
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
/area/space/nearstation)
+"vLO" = (
+/obj/item/radio/intercom{
+ pixel_x = 28
+ },
+/obj/structure/table,
+/obj/item/reagent_containers/cup/soda_cans/grey_bull{
+ pixel_x = -6;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/soda_cans/cola{
+ pixel_x = 4;
+ pixel_y = 4
+ },
+/obj/machinery/camera/directional/east,
+/turf/open/floor/iron/grid/steel,
+/area/science/xenobiology)
"vMl" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -86153,6 +86187,18 @@
},
/turf/open/floor/wood,
/area/library)
+"vSU" = (
+/obj/structure/table,
+/obj/item/reagent_containers/cup/glass/bottle/beer{
+ pixel_x = -1;
+ pixel_y = 9
+ },
+/obj/effect/turf_decal/tile/yellow/opposingcorners{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/brown/opposingcorners,
+/turf/open/floor/iron,
+/area/construction)
"vTc" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/stripes/closeup{
@@ -87111,6 +87157,20 @@
},
/turf/open/floor/iron/grid/steel,
/area/medical/apothecary)
+"wge" = (
+/obj/effect/turf_decal/tile/blue/opposingcorners,
+/obj/effect/turf_decal/tile/green/opposingcorners{
+ dir = 1
+ },
+/obj/structure/table,
+/obj/item/reagent_containers/cup/mortar,
+/obj/item/pestle,
+/obj/item/clothing/glasses/hud/health{
+ pixel_x = 4;
+ pixel_y = -1
+ },
+/turf/open/floor/iron/grid,
+/area/medical/virology)
"wgl" = (
/obj/machinery/light,
/turf/open/floor/iron,
@@ -87525,6 +87585,16 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/engine/break_room)
+"wmv" = (
+/obj/structure/table/wood,
+/obj/item/razor{
+ pixel_x = -4;
+ pixel_y = 2
+ },
+/obj/item/clothing/mask/cigarette/cigar,
+/obj/item/reagent_containers/cup/glass/flask/gold,
+/turf/open/floor/carpet/royalblue,
+/area/crew_quarters/heads/captain/private)
"wmy" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
@@ -87723,35 +87793,6 @@
},
/turf/open/floor/iron/techmaint,
/area/maintenance/port)
-"wok" = (
-/obj/structure/table/wood,
-/obj/item/folder/blue{
- pixel_x = 8
- },
-/obj/item/stamp/captain{
- pixel_x = 8
- },
-/obj/structure/desk_bell/speed_demon{
- pixel_x = -8
- },
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
- pixel_y = 2
- },
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
- pixel_x = -6;
- pixel_y = 14
- },
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
- desc = "A bottle of whiskey. There's a label that reads 'tears' taped to the front.";
- name = "Bottle of Tears";
- pixel_x = 8;
- pixel_y = 20
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/turf/open/floor/wood,
-/area/crew_quarters/heads/captain)
"woq" = (
/turf/closed/wall,
/area/chapel/main)
@@ -87809,6 +87850,14 @@
},
/turf/open/floor/plating,
/area/maintenance/port)
+"wpp" = (
+/obj/effect/turf_decal/tile/bar/opposingcorners,
+/obj/structure/table,
+/obj/item/food/dough,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/food/grown/tomato,
+/turf/open/floor/iron/cafeteria,
+/area/crew_quarters/kitchen)
"wpw" = (
/obj/structure/sign/warning/pods{
pixel_x = -32
@@ -88342,42 +88391,6 @@
},
/turf/open/floor/iron/dark,
/area/science/lobby)
-"wvS" = (
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/old,
-/obj/structure/closet/secure_closet/injection,
-/obj/item/reagent_containers/glass/bottle/toxin{
- pixel_x = 6;
- pixel_y = 8
- },
-/obj/item/reagent_containers/glass/bottle/facid{
- name = "fluorosulfuric acid bottle";
- pixel_x = -3;
- pixel_y = 6
- },
-/obj/item/reagent_containers/glass/bottle/morphine{
- pixel_x = 5;
- pixel_y = 1
- },
-/obj/item/reagent_containers/glass/bottle/morphine{
- pixel_x = -4;
- pixel_y = 1
- },
-/obj/item/reagent_containers/dropper,
-/obj/item/reagent_containers/syringe,
-/obj/item/reagent_containers/syringe{
- pixel_y = 5
- },
-/obj/item/reagent_containers/glass/bottle/chloralhydrate,
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
-/obj/structure/cable/yellow{
- icon_state = "0-8"
- },
-/turf/open/floor/iron/techmaint,
-/area/security/execution/education)
"wwl" = (
/turf/open/floor/plating{
burnt = 1
@@ -88602,6 +88615,41 @@
},
/turf/open/floor/plating,
/area/maintenance/port)
+"wzo" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/cup/bottle/charcoal{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/epinephrine,
+/obj/item/reagent_containers/dropper,
+/obj/effect/turf_decal/tile/purple/opposingcorners,
+/obj/effect/turf_decal/tile/green/opposingcorners{
+ dir = 1
+ },
+/obj/machinery/button/door{
+ id = "chemisttop";
+ name = "Chemistry Shutter Control";
+ pixel_x = 7;
+ pixel_y = -24;
+ req_access_txt = "33"
+ },
+/obj/machinery/button/door{
+ id = "chemistbot";
+ name = "Chemistry Shutter Control";
+ pixel_x = -6;
+ pixel_y = -24;
+ req_access_txt = "33"
+ },
+/obj/item/storage/pill_bottle,
+/obj/item/reagent_containers/medspray{
+ pixel_x = 6;
+ pixel_y = 6
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/turf/open/floor/iron/grid/steel,
+/area/medical/apothecary)
"wzw" = (
/obj/structure/sign/directions/science{
dir = 1;
@@ -89298,6 +89346,38 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/hallway/secondary/entry)
+"wIW" = (
+/obj/effect/landmark/start/ai/secondary,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/item/radio/intercom{
+ freerange = 1;
+ listening = 0;
+ name = "Custom Channel";
+ pixel_y = 24
+ },
+/obj/item/radio/intercom{
+ freerange = 1;
+ frequency = 1447;
+ name = "Private Channel";
+ pixel_y = -28
+ },
+/obj/item/radio/intercom{
+ freerange = 1;
+ name = "Common Channel";
+ pixel_x = 28
+ },
+/obj/machinery/door/window{
+ base_state = "rightsecure";
+ dir = 8;
+ icon_state = "rightsecure";
+ name = "Secondary AI Core Access";
+ atom_integrity = 300;
+ req_access_txt = "16"
+ },
+/turf/open/floor/circuit/red,
+/area/ai_monitored/turret_protected/ai)
"wIX" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -89381,35 +89461,6 @@
/obj/machinery/vending/modularpc,
/turf/open/floor/iron/white,
/area/science/lobby)
-"wKu" = (
-/obj/effect/turf_decal/tile/green/opposingcorners{
- dir = 1
- },
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/table/reinforced,
-/obj/machinery/airalarm/directional/north{
- pixel_y = 22
- },
-/obj/item/reagent_containers/syringe,
-/obj/item/reagent_containers/syringe{
- pixel_x = 1;
- pixel_y = 4
- },
-/obj/item/reagent_containers/glass/beaker/large{
- pixel_x = -3
- },
-/obj/item/reagent_containers/glass/beaker/large{
- pixel_x = -3;
- pixel_y = 3
- },
-/turf/open/floor/iron/grid/steel,
-/area/medical/apothecary)
"wKB" = (
/obj/structure/table,
/obj/item/stack/cable_coil{
@@ -89634,6 +89685,12 @@
},
/turf/open/floor/plating,
/area/maintenance/department/security/brig)
+"wNm" = (
+/obj/structure/rack,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/open/floor/plating,
+/area/maintenance/aft)
"wNp" = (
/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/obj/machinery/atmospherics/pipe/simple/green/visible{
@@ -89992,40 +90049,6 @@
},
/turf/open/floor/iron/grid/steel,
/area/science/xenobiology)
-"wSr" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/window/brigdoor{
- dir = 1;
- name = "Virology Desk Window";
- req_access_txt = "20"
- },
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
- pixel_x = 2;
- pixel_y = 12
- },
-/obj/item/storage/box/masks{
- pixel_x = -5;
- pixel_y = -3
- },
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
- pixel_x = 2;
- pixel_y = -1
- },
-/obj/effect/turf_decal/stripes/closeup,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "quarantineshutters";
- name = "Isolation Shutters"
- },
-/obj/structure/desk_bell{
- pixel_x = 8;
- pixel_y = 1
- },
-/obj/machinery/door/window/northleft{
- dir = 2;
- name = "Virology Desk Window"
- },
-/turf/open/floor/iron/grid/steel,
-/area/medical/virology)
"wSw" = (
/obj/effect/landmark/start/atmospheric_technician,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -92907,6 +92930,14 @@
},
/turf/open/floor/iron/techmaint,
/area/crew_quarters/dorms)
+"xvy" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/structure/reagent_dispensers/watertank,
+/obj/item/reagent_containers/cup/bucket,
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
"xvL" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/machinery/door/airlock/external{
@@ -93041,6 +93072,23 @@
},
/turf/open/floor/plating,
/area/maintenance/port/aft)
+"xxe" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/glass/shaker,
+/obj/item/reagent_containers/cup/rag,
+/obj/structure/sign/plaques/deempisi{
+ pixel_y = 28
+ },
+/obj/item/book/manual/wiki/barman_recipes{
+ pixel_x = 4;
+ pixel_y = -4
+ },
+/obj/structure/noticeboard{
+ dir = 4;
+ pixel_x = -27
+ },
+/turf/open/floor/iron/dark,
+/area/crew_quarters/bar)
"xxf" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -93380,20 +93428,6 @@
},
/turf/open/floor/iron/white,
/area/medical/apothecary)
-"xAu" = (
-/obj/structure/table,
-/obj/item/storage/box/bodybags{
- pixel_x = 3;
- pixel_y = 2
- },
-/obj/item/pen,
-/obj/item/reagent_containers/glass/beaker{
- pixel_x = -6;
- pixel_y = 1
- },
-/obj/effect/turf_decal/tile/blue,
-/turf/open/floor/iron/white,
-/area/medical/medbay/lobby)
"xAA" = (
/obj/item/kirbyplants/random,
/obj/effect/turf_decal/stripes/line{
@@ -95038,20 +95072,6 @@
/obj/effect/turf_decal/stripes/closeup,
/turf/open/floor/catwalk_floor,
/area/bridge)
-"xPy" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/obj/structure/table,
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/glass/beaker{
- pixel_x = 7
- },
-/obj/item/reagent_containers/dropper,
-/obj/item/hand_labeler,
-/obj/item/stack/package_wrap,
-/turf/open/floor/iron/dark,
-/area/science/lab)
"xPz" = (
/obj/effect/turf_decal/stripes/closeup,
/obj/effect/spawner/structure/window/plasma/reinforced,
@@ -95214,6 +95234,12 @@
},
/turf/open/floor/iron/stairs/left,
/area/hallway/primary/central)
+"xRu" = (
+/obj/structure/rack,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/open/floor/plating,
+/area/maintenance/port/fore)
"xRw" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 9
@@ -95434,11 +95460,6 @@
dir = 8
},
/area/crew_quarters/fitness/recreation)
-"xTR" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
-/turf/open/floor/carpet/grimy,
-/area/hallway/primary/port)
"xUa" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -95703,29 +95724,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron,
/area/hallway/primary/starboard)
-"xXA" = (
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/bottle/charcoal{
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/bottle/epinephrine,
-/obj/item/reagent_containers/syringe,
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "emmd";
- name = "Emergency Medical Lockdown Shutters"
- },
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/tile/green/fourcorners/contrasted,
-/obj/item/reagent_containers/food/drinks/britcup{
- pixel_x = 5;
- pixel_y = 1
- },
-/obj/structure/desk_bell{
- pixel_x = -8
- },
-/turf/open/floor/iron/dark,
-/area/medical/medbay/lobby)
"xXH" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -95933,28 +95931,36 @@
"xZW" = (
/turf/open/floor/iron,
/area/quartermaster/storage)
-"yaa" = (
-/obj/structure/table,
-/obj/item/kitchen/fork,
-/obj/item/reagent_containers/food/condiment/saltshaker{
- desc = "Salt. From space oceans, presumably. A staple of modern medicine.";
- pixel_x = -8;
- pixel_y = 12
+"yab" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/glass/bottle/patron{
+ pixel_x = -5;
+ pixel_y = 16
},
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_x = 5;
- pixel_y = 6
+/obj/item/reagent_containers/cup/glass/bottle/grappa{
+ pixel_x = 10;
+ pixel_y = 15
},
-/obj/effect/spawner/lootdrop/three_course_meal,
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/machinery/light/small{
- dir = 4
+/obj/item/reagent_containers/cup/glass/bottle/absinthe{
+ pixel_x = -5;
+ pixel_y = 4
},
-/obj/structure/cable/yellow{
- icon_state = "0-8"
+/obj/item/reagent_containers/cup/glass/bottle/kahlua{
+ pixel_x = 9;
+ pixel_y = 7
},
-/turf/open/floor/iron/cafeteria,
-/area/crew_quarters/cafeteria)
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
+ pixel_x = 2;
+ pixel_y = 4
+ },
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/obj/item/radio/intercom{
+ pixel_y = 24
+ },
+/turf/open/floor/iron/dark,
+/area/crew_quarters/bar)
"yag" = (
/obj/effect/turf_decal/guideline/guideline_in/red,
/turf/open/floor/iron/dark/corner{
@@ -111742,7 +111748,7 @@ bXv
vQG
wpn
wxd
-jsw
+jDR
wxd
kHH
kHH
@@ -113486,7 +113492,7 @@ leT
leT
leT
eFZ
-cgB
+xRu
wXp
eFZ
leT
@@ -114295,7 +114301,7 @@ ovf
ocT
cZb
qar
-vye
+qTl
sha
xDh
wxd
@@ -114797,7 +114803,7 @@ cXA
cXA
cXA
dCU
-ifl
+mUs
dCU
dCU
cXA
@@ -115580,7 +115586,7 @@ rNo
tjo
sha
led
-qzO
+oUy
sha
wuE
amH
@@ -115834,7 +115840,7 @@ cqq
cXA
foJ
mxb
-tPo
+hDD
sha
sha
sha
@@ -116045,8 +116051,8 @@ abN
abN
kHH
yjW
-ePp
-ndu
+fIp
+vsd
yjW
aMO
byH
@@ -116087,7 +116093,7 @@ jbB
mbf
tNe
tNe
-gCw
+cVU
cXA
sha
sha
@@ -116609,7 +116615,7 @@ lsd
tkV
xfm
rxd
-nwP
+xxe
wOu
gci
nnV
@@ -116866,7 +116872,7 @@ ahM
rxd
rxd
rxd
-emH
+yab
qqr
hkQ
vlF
@@ -116914,7 +116920,7 @@ abm
msj
wUY
uQX
-ftA
+vSU
jpl
sGf
ygc
@@ -117332,7 +117338,7 @@ abN
bau
blm
cAg
-cIH
+pZF
mvI
dQg
beY
@@ -118113,7 +118119,7 @@ fgq
woq
hQe
hQe
-exT
+gbd
erC
swI
swI
@@ -118144,7 +118150,7 @@ arZ
arZ
arZ
arZ
-gJI
+mQj
oje
rxd
oSW
@@ -118401,7 +118407,7 @@ mbT
mEz
txf
tdp
-vdJ
+kyc
hin
rxd
aib
@@ -119185,7 +119191,7 @@ eqe
vqH
vqH
sRp
-tvw
+pDz
sRp
sxz
vqH
@@ -119699,10 +119705,10 @@ ttS
roM
fhD
mib
-dam
+gSV
czD
mib
-iyS
+haU
wRF
hvk
vmw
@@ -119957,9 +119963,9 @@ mib
mib
rfs
sis
-fiV
+wpp
mib
-njG
+iBZ
jOJ
oZr
bwH
@@ -120211,7 +120217,7 @@ mWm
xNi
iLg
pYP
-qxm
+tkK
mib
mLj
czD
@@ -121519,7 +121525,7 @@ xTG
cnU
uOq
avq
-xTR
+kmD
lPp
piR
xPG
@@ -122242,7 +122248,7 @@ ygM
hZS
pgb
tNV
-aLS
+uqM
gms
xJa
ifW
@@ -122252,7 +122258,7 @@ cxE
hMo
dgU
aWV
-cSw
+abi
oRE
xvj
wqJ
@@ -122533,7 +122539,7 @@ qQj
qQj
hUT
xNh
-ial
+pXS
qlN
eJK
qKp
@@ -123561,7 +123567,7 @@ qQj
sXP
hUT
qQj
-smb
+opu
pji
qjc
nfx
@@ -123766,7 +123772,7 @@ cWr
bIL
ddX
jGv
-eWR
+tXb
aeJ
rqd
aya
@@ -124051,7 +124057,7 @@ mhb
esg
fTN
jId
-xAu
+bkf
fdE
uYN
wqJ
@@ -124281,7 +124287,7 @@ cpH
atK
nWX
bkU
-wSr
+mqw
ozj
uuW
aQZ
@@ -124537,7 +124543,7 @@ rGy
hfy
eBn
nbL
-irn
+wge
aPd
vqt
uuW
@@ -125846,7 +125852,7 @@ lvn
tNk
dkR
iLD
-xXA
+fYC
kXx
vhU
gwS
@@ -126586,7 +126592,7 @@ crQ
asn
aeJ
fqS
-aGl
+kxf
aeJ
fXx
hxg
@@ -126620,7 +126626,7 @@ vhU
vhU
vhU
vhU
-wKu
+fLf
heB
kVj
vhU
@@ -127390,7 +127396,7 @@ pyX
iyB
heB
ocm
-uPL
+lil
uho
lMx
nDy
@@ -127650,7 +127656,7 @@ lMx
lMx
lPU
lMx
-iiZ
+wzo
vhU
shm
xCx
@@ -127938,8 +127944,8 @@ cSo
snr
hUT
iSJ
-ayM
-hqs
+bSN
+fpa
cmy
wPJ
oRk
@@ -128429,7 +128435,7 @@ wrM
vUR
wdH
rGl
-bgd
+jFK
vUR
szG
hUW
@@ -129499,7 +129505,7 @@ cnM
cnM
oVz
rAx
-keX
+bqg
isS
vDc
qbd
@@ -129762,7 +129768,7 @@ mMf
qbd
gtO
yfq
-jti
+dsX
kAx
fIf
xJr
@@ -130294,7 +130300,7 @@ oth
tAi
eUq
ehQ
-rkq
+nPp
kDo
akh
xip
@@ -130823,13 +130829,13 @@ eNp
ozc
oYg
dlC
-geN
+dOQ
rxv
lis
tCO
lis
ide
-gzm
+kGy
siW
qTo
bmB
@@ -131073,7 +131079,7 @@ kJm
eUi
iHz
aZB
-dBq
+tuO
iQp
swU
rcR
@@ -131280,7 +131286,7 @@ uGP
nHb
gjj
pXI
-iRk
+mYp
fUO
ssT
ybT
@@ -131870,7 +131876,7 @@ sMR
qTc
tBr
qTc
-uNi
+vLO
haP
ozc
nnx
@@ -132551,7 +132557,7 @@ xIV
wyg
kkX
nVS
-wvS
+ptv
iyg
iOw
nVS
@@ -133337,7 +133343,7 @@ nWr
mCC
cuR
tJu
-pZt
+hux
bcg
qOM
mju
@@ -133653,7 +133659,7 @@ ere
kFN
lkl
eLS
-sYd
+bhK
mHj
abN
nnx
@@ -133836,7 +133842,7 @@ wOG
wzW
wyg
wYw
-rGZ
+ejc
kjg
nBj
dOq
@@ -133851,9 +133857,9 @@ oEf
oEf
tWe
rDR
-qtM
+onm
tLe
-pBN
+fmn
eRO
uxl
oYl
@@ -134167,7 +134173,7 @@ sTZ
eeu
mKd
iIX
-oqj
+iXG
mHj
abN
abN
@@ -134618,7 +134624,7 @@ fsb
hcE
mPD
aJK
-hKB
+gLr
fsb
ehr
cNy
@@ -135935,7 +135941,7 @@ xrc
gEs
wBR
cTl
-qpL
+pCA
xSV
uAE
myi
@@ -136188,7 +136194,7 @@ rlX
gad
wLT
wZg
-xPy
+lAL
gEs
abA
wiV
@@ -141260,7 +141266,7 @@ hFK
hFi
nFb
wfA
-iDU
+ttm
gwI
ivi
dVN
@@ -141318,7 +141324,7 @@ cBt
tXM
oPn
qyd
-soC
+gHI
pFP
ykQ
gfk
@@ -141515,14 +141521,14 @@ hrQ
wfA
hip
hGf
-hYl
+wmv
wfA
uzu
gwI
ivG
gUi
jvr
-hus
+viq
yiC
mqi
aTF
@@ -141764,7 +141770,7 @@ csJ
nnx
nnx
yeb
-dMN
+lvi
osY
flj
tPT
@@ -142805,7 +142811,7 @@ wfA
puK
tvl
tvl
-wok
+vsI
hcD
oFa
yiC
@@ -143929,7 +143935,7 @@ ylJ
ylJ
kEC
vXB
-dqI
+wNm
ylJ
ylJ
uBK
@@ -144086,7 +144092,7 @@ ydm
xVC
fvs
gCA
-hdx
+qGZ
hKK
qIr
ydm
@@ -150809,7 +150815,7 @@ wZD
xyd
qjE
yic
-yaa
+gjN
qjE
wCr
anQ
@@ -152094,7 +152100,7 @@ wZR
ptW
wDO
vPF
-eDM
+xvy
wDI
vjo
ycc
@@ -153336,9 +153342,9 @@ flv
gLC
eYA
bti
-gnN
+jpj
fLF
-hih
+kgy
bti
ifi
rPA
@@ -154619,13 +154625,13 @@ aYu
aYu
kOu
kOu
-fTU
+mif
kOu
goB
gQS
hnr
kOu
-iki
+wIW
kOu
kOu
aYu
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index 4c553ce62a51c..f3a2253a807ac 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -1688,6 +1688,38 @@
/obj/structure/fans/tiny/invisible,
/turf/open/space/basic,
/area/space)
+"agN" = (
+/obj/effect/landmark/start/ai/secondary,
+/obj/item/radio/intercom{
+ freerange = 1;
+ listening = 0;
+ name = "Custom Channel";
+ pixel_x = -10;
+ pixel_y = 22
+ },
+/obj/item/radio/intercom{
+ freerange = 1;
+ name = "Common Channel";
+ pixel_x = -27
+ },
+/obj/item/radio/intercom{
+ freerange = 1;
+ frequency = 1447;
+ name = "Private Channel";
+ pixel_x = -10;
+ pixel_y = -25
+ },
+/obj/machinery/door/window{
+ base_state = "rightsecure";
+ dir = 4;
+ icon_state = "rightsecure";
+ name = "Secondary AI Core Access";
+ atom_integrity = 300;
+ pixel_x = 4;
+ req_access_txt = "16"
+ },
+/turf/open/floor/circuit/red,
+/area/ai_monitored/turret_protected/ai)
"agP" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -3352,26 +3384,6 @@
},
/turf/open/floor/iron,
/area/bridge)
-"aqK" = (
-/obj/item/reagent_containers/food/drinks/flask/gold{
- pixel_x = 3;
- pixel_y = 8
- },
-/obj/item/reagent_containers/food/drinks/bottle/rum{
- pixel_x = -4;
- pixel_y = 4
- },
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
- pixel_x = 7;
- pixel_y = 4
- },
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
-/obj/machinery/status_display/evac{
- pixel_y = 32
- },
-/obj/structure/table/wood,
-/turf/open/floor/carpet/royalblue,
-/area/crew_quarters/heads/captain)
"aqQ" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -8942,6 +8954,35 @@
},
/turf/open/floor/engine,
/area/science/mixing/chamber)
+"bbG" = (
+/obj/item/book/manual/wiki/medicine,
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
+ pixel_x = -6;
+ pixel_y = 10
+ },
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
+ pixel_x = 6;
+ pixel_y = 10
+ },
+/obj/effect/turf_decal/tile/blue/anticorner/contrasted,
+/obj/structure/cable/yellow,
+/obj/machinery/power/apc{
+ areastring = "/area/medical/cryo";
+ dir = 4;
+ name = "Cryogenics APC";
+ pixel_x = 24
+ },
+/obj/item/wrench/medical,
+/obj/structure/table/glass,
+/obj/item/reagent_containers/syringe,
+/turf/open/floor/iron/showroomfloor,
+/area/medical/cryo)
"bbI" = (
/obj/machinery/doppler_array/research/science{
dir = 4
@@ -10342,39 +10383,6 @@
"bkP" = (
/turf/closed/wall/rust,
/area/quartermaster/sorting)
-"bkU" = (
-/obj/structure/table/wood,
-/obj/item/storage/box/seccarts{
- pixel_y = 5
- },
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
- desc = "A bottle of whiskey. There's a label that reads 'tears' taped to the front.";
- name = "Bottle of Tears";
- pixel_x = 3;
- pixel_y = 5
- },
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
- pixel_x = -6;
- pixel_y = 4
- },
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
- pixel_y = 2
- },
-/obj/machinery/keycard_auth{
- pixel_x = -6;
- pixel_y = -24
- },
-/obj/machinery/button/door{
- id = "hosspace";
- name = "Space Blast door Toggle";
- pixel_x = 7;
- pixel_y = -24
- },
-/obj/effect/turf_decal/siding/wood/end{
- dir = 8
- },
-/turf/open/floor/wood,
-/area/crew_quarters/heads/hos)
"bkW" = (
/obj/machinery/door/poddoor/shutters{
id = "teleshutter";
@@ -10680,27 +10688,6 @@
},
/turf/open/floor/iron/dark,
/area/quartermaster/miningoffice)
-"bmS" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/firedoor,
-/obj/item/reagent_containers/food/condiment/peppermill{
- desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
- pixel_x = -8;
- pixel_y = 2
- },
-/obj/item/reagent_containers/food/condiment/saltshaker{
- desc = "Salt. From space oceans, presumably. A staple of modern medicine.";
- pixel_x = -8;
- pixel_y = 12
- },
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "kitchen_2";
- name = "Hallway Hatch"
- },
-/obj/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/crew_quarters/kitchen)
"bmZ" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical{
@@ -10879,27 +10866,6 @@
},
/turf/open/floor/grass,
/area/hydroponics)
-"bnL" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/firedoor,
-/obj/item/reagent_containers/food/condiment/peppermill{
- desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
- pixel_x = -8;
- pixel_y = 2
- },
-/obj/item/reagent_containers/food/condiment/saltshaker{
- desc = "Salt. From space oceans, presumably. A staple of modern medicine.";
- pixel_x = -8;
- pixel_y = 12
- },
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "kitchen";
- name = "Serving Hatch"
- },
-/obj/item/toy/figure/chef,
-/turf/open/floor/plating,
-/area/crew_quarters/kitchen)
"bnP" = (
/obj/structure/window/reinforced{
dir = 1
@@ -11113,18 +11079,6 @@
},
/turf/open/floor/iron/showroomfloor,
/area/crew_quarters/kitchen)
-"boy" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
- pixel_x = 4;
- pixel_y = 4
- },
-/obj/item/candle/infinite{
- pixel_x = -4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/maintenance/central)
"boB" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/cobweb,
@@ -11313,6 +11267,28 @@
},
/turf/open/floor/iron/dark,
/area/quartermaster/office)
+"bpR" = (
+/obj/structure/table,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/reagent_containers/condiment/peppermill{
+ desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
+ pixel_x = -8;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/condiment/saltshaker{
+ desc = "Salt. From space oceans, presumably. A staple of modern medicine.";
+ pixel_x = -8;
+ pixel_y = 12
+ },
+/obj/item/paicard{
+ pixel_x = 4;
+ pixel_y = 4
+ },
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/crew_quarters/bar/atrium)
"bpV" = (
/obj/structure/sign/departments/botany,
/turf/closed/wall,
@@ -11603,31 +11579,6 @@
burnt = 1
},
/area/engine/engineering)
-"brB" = (
-/obj/structure/table,
-/obj/machinery/light/small{
- dir = 8
- },
-/obj/structure/noticeboard{
- dir = 4;
- pixel_x = -27
- },
-/obj/item/reagent_containers/food/condiment/peppermill{
- desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
- pixel_x = -8;
- pixel_y = 2
- },
-/obj/item/reagent_containers/food/condiment/saltshaker{
- desc = "Salt. From space oceans, presumably. A staple of modern medicine.";
- pixel_x = -8;
- pixel_y = 12
- },
-/obj/item/reagent_containers/food/drinks/britcup{
- pixel_x = 4;
- pixel_y = 4
- },
-/turf/open/floor/iron/dark,
-/area/crew_quarters/bar/atrium)
"brD" = (
/turf/closed/wall,
/area/crew_quarters/toilet/restrooms)
@@ -11813,18 +11764,6 @@
},
/turf/open/floor/iron/dark,
/area/chapel/office)
-"bta" = (
-/obj/structure/table/wood/fancy,
-/obj/machinery/light/small{
- dir = 4
- },
-/obj/item/clothing/suit/hooded/chaplain_hoodie,
-/obj/item/reagent_containers/food/drinks/bottle/holywater,
-/obj/item/soulstone/anybody/chaplain,
-/obj/item/organ/heart,
-/obj/item/book/granter/spell/smoke/lesser,
-/turf/open/floor/iron/dark,
-/area/chapel/office)
"btb" = (
/obj/machinery/mass_driver{
dir = 1;
@@ -11902,29 +11841,6 @@
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/iron/dark,
/area/chapel/office)
-"btq" = (
-/obj/structure/table/wood/fancy,
-/obj/effect/turf_decal/stripes/corner,
-/obj/item/paper_bin{
- pixel_x = -4;
- pixel_y = 4
- },
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
- pixel_x = 8;
- pixel_y = 6
- },
-/obj/item/pen,
-/obj/machinery/requests_console{
- department = "Chapel";
- departmentType = 2;
- name = "Chapel RC";
- pixel_y = -30
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/turf/open/floor/wood,
-/area/chapel/office)
"btw" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/corner{
@@ -14525,6 +14441,27 @@
/obj/structure/cable/yellow,
/turf/open/floor/iron/dark,
/area/quartermaster/sorting)
+"bHy" = (
+/obj/structure/table,
+/obj/item/reagent_containers/condiment/peppermill{
+ desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
+ pixel_x = -8;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/condiment/saltshaker{
+ desc = "Salt. From space oceans, presumably. A staple of modern medicine.";
+ pixel_x = -8;
+ pixel_y = 12
+ },
+/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice{
+ desc = "An emerald flask, from the Keeper's soul. High in vitamins!";
+ name = "estus flask";
+ pixel_x = 4;
+ pixel_y = 4
+ },
+/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
+/turf/open/floor/iron/dark,
+/area/crew_quarters/bar/atrium)
"bHB" = (
/obj/structure/lattice/catwalk,
/turf/open/space,
@@ -15195,38 +15132,6 @@
},
/turf/open/floor/plating,
/area/quartermaster/office)
-"bLM" = (
-/obj/effect/landmark/start/ai/secondary,
-/obj/item/radio/intercom{
- freerange = 1;
- listening = 0;
- name = "Custom Channel";
- pixel_x = 10;
- pixel_y = 22
- },
-/obj/item/radio/intercom{
- freerange = 1;
- name = "Common Channel";
- pixel_x = 27
- },
-/obj/item/radio/intercom{
- freerange = 1;
- frequency = 1447;
- name = "Private Channel";
- pixel_x = 10;
- pixel_y = -25
- },
-/obj/machinery/door/window{
- base_state = "leftsecure";
- dir = 8;
- icon_state = "leftsecure";
- name = "Tertiary AI Core Access";
- obj_integrity = 300;
- pixel_x = -3;
- req_access_txt = "16"
- },
-/turf/open/floor/circuit/red,
-/area/ai_monitored/turret_protected/ai)
"bLS" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -15533,13 +15438,6 @@
},
/turf/open/floor/iron/dark,
/area/engine/atmos)
-"bNT" = (
-/obj/effect/turf_decal/delivery,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
"bNU" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
@@ -17180,6 +17078,17 @@
},
/turf/open/floor/engine/vacuum,
/area/engine/atmos)
+"caP" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/reagent_dispensers/watertank,
+/obj/item/reagent_containers/cup/bucket,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/quartermaster/warehouse)
"caT" = (
/obj/structure/lattice,
/obj/structure/grille,
@@ -17772,28 +17681,6 @@
},
/turf/open/space/basic,
/area/space/nearstation)
-"cdW" = (
-/obj/machinery/turretid{
- icon_state = "control_stun";
- name = "AI Chamber turret control";
- pixel_x = 3;
- pixel_y = 28
- },
-/obj/machinery/door/window{
- base_state = "leftsecure";
- dir = 8;
- icon_state = "leftsecure";
- name = "Primary AI Core Access";
- obj_integrity = 300;
- req_access_txt = "16"
- },
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "AI Core shutters";
- name = "AI Core Shutter"
- },
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/engine,
-/area/ai_monitored/turret_protected/ai)
"cdX" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -18247,26 +18134,6 @@
/obj/machinery/telecomms/bus/preset_four,
/turf/open/floor/circuit/green/telecomms/mainframe,
/area/tcommsat/server)
-"cfK" = (
-/obj/machinery/door/window{
- base_state = "rightsecure";
- dir = 4;
- icon_state = "rightsecure";
- name = "Primary AI Core Access";
- obj_integrity = 300;
- req_access_txt = "16"
- },
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "AI Core shutters";
- name = "AI Core Shutter"
- },
-/obj/effect/turf_decal/delivery,
-/obj/machinery/light_switch{
- pixel_x = 6;
- pixel_y = 24
- },
-/turf/open/floor/engine,
-/area/ai_monitored/turret_protected/ai)
"cfL" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 5
@@ -24540,6 +24407,23 @@
/obj/machinery/atmospherics/pipe/layer_manifold,
/turf/open/floor/iron/dark,
/area/hallway/secondary/entry)
+"cKw" = (
+/obj/structure/table,
+/obj/item/food/mint,
+/obj/item/reagent_containers/condiment/enzyme{
+ pixel_x = -2;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/condiment/sugar{
+ pixel_x = 5;
+ pixel_y = 5
+ },
+/obj/item/reagent_containers/cup/beaker,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/crew_quarters/kitchen)
"cKx" = (
/obj/effect/turf_decal/stripes/corner,
/turf/closed/wall/r_wall,
@@ -26261,28 +26145,6 @@
},
/turf/open/floor/iron/dark,
/area/bridge)
-"cYd" = (
-/obj/structure/table,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/food/condiment/peppermill{
- desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
- pixel_x = -8;
- pixel_y = 2
- },
-/obj/item/reagent_containers/food/condiment/saltshaker{
- desc = "Salt. From space oceans, presumably. A staple of modern medicine.";
- pixel_x = -8;
- pixel_y = 12
- },
-/obj/item/paicard{
- pixel_x = 4;
- pixel_y = 4
- },
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/crew_quarters/bar/atrium)
"cYh" = (
/obj/structure/chair/office/light{
dir = 4
@@ -26898,6 +26760,10 @@
},
/turf/open/floor/iron/dark,
/area/engine/atmos)
+"dhi" = (
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb,
+/turf/open/floor/plating,
+/area/quartermaster/warehouse)
"dhx" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/poster/contraband/random{
@@ -27345,46 +27211,6 @@
broken = 1
},
/area/maintenance/port/fore)
-"dpR" = (
-/obj/effect/turf_decal/tile/yellow/half/contrasted{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
-/obj/structure/table/glass,
-/obj/effect/turf_decal/bot,
-/obj/item/reagent_containers/glass/beaker/large{
- pixel_x = -7
- },
-/obj/item/reagent_containers/glass/beaker/large{
- pixel_x = -7
- },
-/obj/item/reagent_containers/glass/beaker{
- pixel_x = 7
- },
-/obj/item/reagent_containers/glass/beaker{
- pixel_x = 7
- },
-/turf/open/floor/iron/showroomfloor,
-/area/medical/chemistry)
-"dpY" = (
-/obj/structure/flora/ausbushes/brflowers,
-/obj/structure/table/wood,
-/obj/item/cultivator{
- pixel_x = -2;
- pixel_y = -1
- },
-/obj/item/shovel/spade{
- pixel_x = -5;
- pixel_y = -4
- },
-/obj/item/reagent_containers/glass/bucket{
- pixel_x = 9;
- pixel_y = 5
- },
-/turf/open/floor/grass,
-/area/security/prison)
"dqg" = (
/obj/structure/chair/fancy/sofa/old/left{
color = "#742925"
@@ -27516,6 +27342,23 @@
},
/turf/open/floor/iron/dark,
/area/crew_quarters/theatre)
+"drK" = (
+/obj/structure/table,
+/obj/item/clipboard,
+/obj/item/reagent_containers/cup/beaker/large{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = 6
+ },
+/obj/item/clothing/glasses/science,
+/obj/item/clothing/glasses/science,
+/obj/structure/extinguisher_cabinet{
+ pixel_y = -30
+ },
+/obj/effect/turf_decal/tile/neutral/half/contrasted,
+/turf/open/floor/iron/dark,
+/area/science/lab)
"drL" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/tile/green/anticorner/contrasted,
@@ -28039,38 +27882,6 @@
},
/turf/open/floor/iron/dark,
/area/science/aft)
-"dAW" = (
-/obj/effect/landmark/start/ai/secondary,
-/obj/item/radio/intercom{
- freerange = 1;
- listening = 0;
- name = "Custom Channel";
- pixel_x = -10;
- pixel_y = 22
- },
-/obj/item/radio/intercom{
- freerange = 1;
- name = "Common Channel";
- pixel_x = -27
- },
-/obj/item/radio/intercom{
- freerange = 1;
- frequency = 1447;
- name = "Private Channel";
- pixel_x = -10;
- pixel_y = -25
- },
-/obj/machinery/door/window{
- base_state = "rightsecure";
- dir = 4;
- icon_state = "rightsecure";
- name = "Secondary AI Core Access";
- obj_integrity = 300;
- pixel_x = 4;
- req_access_txt = "16"
- },
-/turf/open/floor/circuit/red,
-/area/ai_monitored/turret_protected/ai)
"dBa" = (
/obj/machinery/light{
dir = 4
@@ -28850,6 +28661,35 @@
broken = 1
},
/area/maintenance/starboard)
+"dOp" = (
+/obj/structure/cable/yellow{
+ icon_state = "2-4"
+ },
+/obj/item/radio/intercom{
+ pixel_y = 27
+ },
+/obj/structure/table,
+/obj/item/reagent_containers/cup/glass/sillycup{
+ pixel_x = -5;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/glass/sillycup{
+ pixel_x = 5;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/glass/sillycup,
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
+ pixel_x = -8;
+ pixel_y = 7
+ },
+/obj/effect/turf_decal/tile/purple/half/contrasted{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron/showroomfloor,
+/area/science/aft)
"dOw" = (
/obj/effect/turf_decal/delivery,
/obj/structure/closet/crate/engineering,
@@ -29511,6 +29351,38 @@
},
/turf/open/floor/iron,
/area/bridge)
+"dZB" = (
+/obj/effect/landmark/start/ai/secondary,
+/obj/item/radio/intercom{
+ freerange = 1;
+ listening = 0;
+ name = "Custom Channel";
+ pixel_x = 10;
+ pixel_y = 22
+ },
+/obj/item/radio/intercom{
+ freerange = 1;
+ name = "Common Channel";
+ pixel_x = 27
+ },
+/obj/item/radio/intercom{
+ freerange = 1;
+ frequency = 1447;
+ name = "Private Channel";
+ pixel_x = 10;
+ pixel_y = -25
+ },
+/obj/machinery/door/window{
+ base_state = "leftsecure";
+ dir = 8;
+ icon_state = "leftsecure";
+ name = "Tertiary AI Core Access";
+ atom_integrity = 300;
+ pixel_x = -3;
+ req_access_txt = "16"
+ },
+/turf/open/floor/circuit/red,
+/area/ai_monitored/turret_protected/ai)
"dZN" = (
/obj/structure/table,
/obj/effect/turf_decal/stripes/corner{
@@ -30238,16 +30110,6 @@
},
/turf/open/floor/iron/dark,
/area/science/mixing)
-"eja" = (
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/flour{
- pixel_x = -2;
- pixel_y = 6
- },
-/obj/item/kitchen/rollingpin,
-/obj/item/clothing/head/utility/chefhat,
-/turf/open/floor/iron/techmaint,
-/area/security/prison)
"ejj" = (
/obj/structure/table,
/obj/item/storage/box/donkpockets{
@@ -30864,6 +30726,23 @@
burnt = 1
},
/area/maintenance/central)
+"etq" = (
+/obj/structure/flora/ausbushes/brflowers,
+/obj/structure/table/wood,
+/obj/item/cultivator{
+ pixel_x = -2;
+ pixel_y = -1
+ },
+/obj/item/shovel/spade{
+ pixel_x = -5;
+ pixel_y = -4
+ },
+/obj/item/reagent_containers/cup/bucket{
+ pixel_x = 9;
+ pixel_y = 5
+ },
+/turf/open/floor/grass,
+/area/security/prison)
"etx" = (
/obj/effect/turf_decal/loading_area{
dir = 8
@@ -31176,6 +31055,27 @@
/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/iron,
/area/quartermaster/storage)
+"exI" = (
+/obj/structure/bonfire,
+/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice{
+ desc = "For the weary spacemen on their quest to rekindle the first plasma fire.";
+ name = "Carton of Estus"
+ },
+/obj/effect/decal/remains/human,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/cobweb,
+/obj/item/melee/baseball_bat{
+ desc = "Don't tell anyone you put any points into dex, though.";
+ icon_state = "swordon";
+ item_state = "swordon";
+ lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi';
+ name = "moonlight greatsword";
+ righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+ },
+/turf/open/floor/plating{
+ burnt = 1
+ },
+/area/maintenance/starboard/fore)
"eym" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -32489,25 +32389,6 @@
},
/turf/open/floor/iron/showroomfloor,
/area/science/lab)
-"eWx" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
- pixel_x = -3;
- pixel_y = 15
- },
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
- pixel_x = -6;
- pixel_y = 3
- },
-/obj/item/reagent_containers/food/drinks/beer{
- desc = "A station exclusive. Consumption may result in seizures, blindness, drunkenness, or even death.";
- list_reagents = list(/datum/reagent/consumable/ethanol/thirteenloko=30);
- name = "Kilo-Kocktail";
- pixel_x = 5;
- pixel_y = 5
- },
-/turf/open/floor/carpet/green,
-/area/lawoffice)
"eWy" = (
/obj/effect/landmark/event_spawn,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
@@ -35790,6 +35671,28 @@
/obj/effect/spawner/mail/maintloot,
/turf/open/floor/plating,
/area/maintenance/port/aft)
+"gbr" = (
+/obj/machinery/turretid{
+ icon_state = "control_stun";
+ name = "AI Chamber turret control";
+ pixel_x = 3;
+ pixel_y = 28
+ },
+/obj/machinery/door/window{
+ base_state = "leftsecure";
+ dir = 8;
+ icon_state = "leftsecure";
+ name = "Primary AI Core Access";
+ atom_integrity = 300;
+ req_access_txt = "16"
+ },
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "AI Core shutters";
+ name = "AI Core Shutter"
+ },
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/engine,
+/area/ai_monitored/turret_protected/ai)
"gbw" = (
/obj/effect/landmark/start/scientist,
/obj/structure/cable/yellow{
@@ -36153,16 +36056,6 @@
/obj/structure/lattice,
/turf/open/space/basic,
/area/maintenance/central)
-"giB" = (
-/obj/structure/mopbucket,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/mop,
-/obj/effect/turf_decal/tile/red/opposingcorners,
-/obj/structure/sign/warning/securearea{
- pixel_x = -32
- },
-/turf/open/floor/iron/dark,
-/area/security/brig)
"gjd" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/obj/structure/cable/yellow{
@@ -37174,6 +37067,25 @@
burnt = 1
},
/area/maintenance/starboard/fore)
+"gEQ" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = -3;
+ pixel_y = 15
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = -6;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/glass/bottle/beer{
+ desc = "A station exclusive. Consumption may result in seizures, blindness, drunkenness, or even death.";
+ list_reagents = list(/datum/reagent/consumable/ethanol/thirteenloko=30);
+ name = "Kilo-Kocktail";
+ pixel_x = 5;
+ pixel_y = 5
+ },
+/turf/open/floor/carpet/green,
+/area/lawoffice)
"gFe" = (
/obj/machinery/door/poddoor/incinerator_atmos_aux,
/turf/open/floor/engine/vacuum,
@@ -38261,6 +38173,39 @@
},
/turf/open/floor/iron/dark,
/area/science/xenobiology)
+"gYn" = (
+/obj/structure/table/wood,
+/obj/item/storage/box/seccarts{
+ pixel_y = 5
+ },
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
+ desc = "A bottle of whiskey. There's a label that reads 'tears' taped to the front.";
+ name = "Bottle of Tears";
+ pixel_x = 3;
+ pixel_y = 5
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = -6;
+ pixel_y = 4
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_y = 2
+ },
+/obj/machinery/keycard_auth{
+ pixel_x = -6;
+ pixel_y = -24
+ },
+/obj/machinery/button/door{
+ id = "hosspace";
+ name = "Space Blast door Toggle";
+ pixel_x = 7;
+ pixel_y = -24
+ },
+/obj/effect/turf_decal/siding/wood/end{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/heads/hos)
"gYq" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/mining/glass{
@@ -38339,6 +38284,18 @@
},
/turf/open/floor/wood,
/area/crew_quarters/locker)
+"gZV" = (
+/obj/structure/table,
+/obj/item/reagent_containers/cup/soda_cans/cola{
+ pixel_x = 4;
+ pixel_y = 4
+ },
+/obj/item/candle/infinite{
+ pixel_x = -4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/maintenance/central)
"hak" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -38529,27 +38486,6 @@
},
/turf/open/floor/engine,
/area/engine/engineering)
-"hec" = (
-/obj/effect/turf_decal/tile/yellow/half/contrasted{
- dir = 4
- },
-/obj/item/radio/intercom{
- pixel_y = 22
- },
-/obj/structure/table/glass,
-/obj/item/clothing/gloves/color/latex,
-/obj/item/clothing/gloves/color/latex,
-/obj/item/clothing/glasses/science{
- pixel_x = 4;
- pixel_y = 4
- },
-/obj/item/clothing/glasses/science,
-/obj/effect/turf_decal/bot,
-/obj/item/reagent_containers/glass/bottle/epinephrine{
- pixel_x = -6
- },
-/turf/open/floor/iron/showroomfloor,
-/area/medical/chemistry)
"hef" = (
/obj/machinery/light_switch{
pixel_x = 1;
@@ -39290,6 +39226,29 @@
},
/turf/open/floor/iron,
/area/quartermaster/miningoffice)
+"hqf" = (
+/obj/effect/turf_decal/tile/yellow/half/contrasted{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/obj/structure/table/glass,
+/obj/effect/turf_decal/bot,
+/obj/item/reagent_containers/cup/beaker/large{
+ pixel_x = -7
+ },
+/obj/item/reagent_containers/cup/beaker/large{
+ pixel_x = -7
+ },
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = 7
+ },
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = 7
+ },
+/turf/open/floor/iron/showroomfloor,
+/area/medical/chemistry)
"hqi" = (
/obj/structure/grille,
/turf/open/floor/plating,
@@ -39547,13 +39506,6 @@
},
/turf/open/floor/iron,
/area/bridge)
-"htk" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
-/turf/open/floor/plating{
- burnt = 1
- },
-/area/quartermaster/warehouse)
"htu" = (
/obj/structure/extinguisher_cabinet{
pixel_y = -28
@@ -40444,6 +40396,31 @@
broken = 1
},
/area/maintenance/starboard/fore)
+"hGj" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = -6;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = -3;
+ pixel_y = 15
+ },
+/obj/item/reagent_containers/cup/glass/bottle/holywater{
+ pixel_x = 4;
+ pixel_y = 4
+ },
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/structure/extinguisher_cabinet{
+ pixel_x = 24
+ },
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/chapel/office)
"hGq" = (
/obj/effect/decal/cleanable/blood/old,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
@@ -42400,6 +42377,24 @@
},
/turf/open/floor/iron/showroomfloor,
/area/medical/medbay/central)
+"iod" = (
+/obj/structure/table/wood,
+/obj/item/clipboard,
+/obj/item/reagent_containers/cup/glass/shaker{
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/obj/item/toy/figure/bartender{
+ pixel_x = 8;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/cup/rag,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/turf/open/floor/iron/dark,
+/area/crew_quarters/bar)
"iok" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood/old,
@@ -42892,19 +42887,6 @@
/obj/effect/turf_decal/box,
/turf/open/floor/iron/dark,
/area/science/aft)
-"izu" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{
- pixel_x = 6;
- pixel_y = 7;
- list_reagents = list(/datum/reagent/consumable/pwr_game = 5)
- },
-/obj/item/reagent_containers/food/drinks/britcup{
- pixel_x = -5;
- pixel_y = 1
- },
-/turf/open/floor/wood,
-/area/security/prison)
"izz" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -42995,24 +42977,36 @@
},
/turf/open/floor/iron/dark,
/area/crew_quarters/bar)
-"iAH" = (
-/obj/structure/table/wood,
-/obj/item/clipboard,
-/obj/item/reagent_containers/food/drinks/shaker{
- pixel_x = -2;
- pixel_y = 2
+"iAJ" = (
+/obj/structure/table/glass,
+/obj/item/paper_bin{
+ pixel_x = -9;
+ pixel_y = 3
},
-/obj/item/toy/figure/bartender{
- pixel_x = 8;
- pixel_y = 2
+/obj/item/pen{
+ pixel_x = -8;
+ pixel_y = 3
},
-/obj/item/reagent_containers/glass/rag,
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/item/storage/box/syringes{
+ pixel_x = 6;
+ pixel_y = 11
+ },
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
+ pixel_x = 2;
+ pixel_y = -1
+ },
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
+ pixel_x = 9;
+ pixel_y = -7
+ },
+/obj/machinery/light{
+ bulb_colour = "#22bfa2";
+ bulb_vacuum_colour = "#22bfa2";
+ dir = 4;
+ nightshift_light_color = "#22bfa2"
},
-/obj/effect/turf_decal/tile/neutral/opposingcorners,
/turf/open/floor/iron/dark,
-/area/crew_quarters/bar)
+/area/medical/virology)
"iAR" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -44719,10 +44713,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron,
/area/security/execution/transfer)
-"jcF" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
-/turf/open/floor/plating,
-/area/quartermaster/warehouse)
"jcT" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -45985,95 +45975,6 @@
},
/turf/open/floor/iron/showroomfloor,
/area/medical/medbay/central)
-"juC" = (
-/obj/item/restraints/handcuffs{
- pixel_y = 4
- },
-/obj/item/circuitboard/machine/chem_heater,
-/obj/item/reagent_containers/glass/bottle/sulfur{
- pixel_x = -6
- },
-/obj/item/reagent_containers/glass/bottle/sugar{
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/bottle/sodium{
- pixel_x = -6
- },
-/obj/item/reagent_containers/glass/bottle/silicon{
- pixel_x = -6
- },
-/obj/item/reagent_containers/glass/bottle/radium{
- pixel_x = -6
- },
-/obj/item/reagent_containers/glass/bottle/phosphorus{
- pixel_x = -6
- },
-/obj/item/reagent_containers/glass/bottle/silver{
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/bottle/welding_fuel{
- pixel_y = 8
- },
-/obj/item/reagent_containers/glass/bottle/lithium{
- pixel_x = -6
- },
-/obj/item/reagent_containers/glass/bottle/nitrogen{
- pixel_x = -6;
- pixel_y = 8
- },
-/obj/item/reagent_containers/glass/bottle/hydrogen{
- pixel_x = -6
- },
-/obj/item/reagent_containers/glass/bottle/ethanol{
- pixel_x = -6
- },
-/obj/item/reagent_containers/glass/bottle/iodine{
- pixel_y = 8
- },
-/obj/item/reagent_containers/glass/bottle/sacid{
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/bottle/water{
- pixel_y = 8
- },
-/obj/item/reagent_containers/glass/bottle/chlorine{
- pixel_x = -6
- },
-/obj/item/reagent_containers/glass/bottle/mercury{
- pixel_x = 6;
- pixel_y = 8
- },
-/obj/item/reagent_containers/glass/bottle/bromine{
- pixel_x = -6
- },
-/obj/item/reagent_containers/glass/bottle/oxygen{
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/bottle/potassium{
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/bottle/iron{
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/bottle/fluorine{
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/bottle/copper{
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/bottle/carbon{
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/bottle/aluminium{
- pixel_x = 6
- },
-/obj/structure/closet/crate/secure/plasma{
- name = "virology crate";
- req_access_txt = "39"
- },
-/obj/effect/turf_decal/tile/dark_green/anticorner/contrasted,
-/turf/open/floor/iron/showroomfloor,
-/area/medical/virology)
"juE" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -47412,27 +47313,6 @@
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/docking/arrival)
-"jQD" = (
-/obj/machinery/airalarm/directional/south{
- pixel_y = -22
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
-/obj/item/radio/intercom{
- pixel_x = 28
- },
-/obj/structure/sink{
- dir = 4;
- pixel_x = 11
- },
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/mop,
-/turf/open/floor/plating{
- burnt = 1
- },
-/area/maintenance/disposal)
"jQL" = (
/obj/effect/turf_decal/plaque{
icon_state = "L2"
@@ -50400,35 +50280,6 @@
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/quartermaster/exploration_dock)
-"kRc" = (
-/obj/structure/cable/yellow{
- icon_state = "2-4"
- },
-/obj/item/radio/intercom{
- pixel_y = 27
- },
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/sillycup{
- pixel_x = -5;
- pixel_y = 3
- },
-/obj/item/reagent_containers/food/drinks/sillycup{
- pixel_x = 5;
- pixel_y = 3
- },
-/obj/item/reagent_containers/food/drinks/sillycup,
-/obj/item/reagent_containers/food/drinks/bottle/vodka{
- pixel_x = -8;
- pixel_y = 7
- },
-/obj/effect/turf_decal/tile/purple/half/contrasted{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/showroomfloor,
-/area/science/aft)
"kRl" = (
/obj/structure/girder,
/turf/open/floor/plating{
@@ -52716,6 +52567,48 @@
},
/turf/open/floor/iron,
/area/teleporter)
+"lAa" = (
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+ color = "#439C1E"
+ },
+/obj/structure/closet/crate/secure/plasma{
+ name = "virology crate";
+ req_access_txt = "39"
+ },
+/obj/item/book/manual/wiki/infections,
+/obj/item/book/manual/wiki/infections,
+/obj/item/extrapolator,
+/obj/item/storage/box/beakers{
+ pixel_x = 4;
+ pixel_y = 4
+ },
+/obj/item/storage/box/syringes{
+ pixel_x = -3;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
+ pixel_x = -6;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
+ pixel_x = 2;
+ pixel_y = -1
+ },
+/obj/item/storage/belt/medical{
+ pixel_y = 2
+ },
+/obj/item/storage/belt/medical{
+ pixel_y = 2
+ },
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#c1caff"
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/showroomfloor,
+/area/medical/virology)
"lAi" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
@@ -53225,6 +53118,27 @@
},
/turf/open/floor/iron/showroomfloor,
/area/quartermaster/exploration_prep)
+"lJJ" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/delivery,
+/obj/machinery/door/firedoor,
+/obj/item/reagent_containers/condiment/peppermill{
+ desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
+ pixel_x = -8;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/condiment/saltshaker{
+ desc = "Salt. From space oceans, presumably. A staple of modern medicine.";
+ pixel_x = -8;
+ pixel_y = 12
+ },
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "kitchen";
+ name = "Serving Hatch"
+ },
+/obj/item/toy/figure/chef,
+/turf/open/floor/plating,
+/area/crew_quarters/kitchen)
"lJO" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -54083,24 +53997,6 @@
burnt = 1
},
/area/maintenance/port/aft)
-"lXx" = (
-/obj/structure/closet/crate/hydroponics,
-/obj/item/shovel/spade,
-/obj/item/wrench,
-/obj/item/crowbar/red,
-/obj/item/cultivator,
-/obj/item/wirecutters,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/circuitboard/machine/biogenerator,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/turf/open/floor/plating,
-/area/quartermaster/warehouse)
"lXA" = (
/obj/effect/turf_decal/stripes/corner{
dir = 8
@@ -54164,6 +54060,26 @@
broken = 1
},
/area/maintenance/port)
+"lZd" = (
+/obj/machinery/door/window{
+ base_state = "rightsecure";
+ dir = 4;
+ icon_state = "rightsecure";
+ name = "Primary AI Core Access";
+ atom_integrity = 300;
+ req_access_txt = "16"
+ },
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "AI Core shutters";
+ name = "AI Core Shutter"
+ },
+/obj/effect/turf_decal/delivery,
+/obj/machinery/light_switch{
+ pixel_x = 6;
+ pixel_y = 24
+ },
+/turf/open/floor/engine,
+/area/ai_monitored/turret_protected/ai)
"lZf" = (
/obj/structure/girder,
/obj/effect/decal/cleanable/dirt,
@@ -54203,27 +54119,6 @@
/obj/effect/turf_decal/tile/neutral/opposingcorners,
/turf/open/floor/iron/dark,
/area/crew_quarters/bar)
-"lZo" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/peppermill{
- desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
- pixel_x = -8;
- pixel_y = 2
- },
-/obj/item/reagent_containers/food/condiment/saltshaker{
- desc = "Salt. From space oceans, presumably. A staple of modern medicine.";
- pixel_x = -8;
- pixel_y = 12
- },
-/obj/item/reagent_containers/food/drinks/bottle/orangejuice{
- desc = "An emerald flask, from the Keeper's soul. High in vitamins!";
- name = "estus flask";
- pixel_x = 4;
- pixel_y = 4
- },
-/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
-/turf/open/floor/iron/dark,
-/area/crew_quarters/bar/atrium)
"lZN" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
@@ -55614,6 +55509,34 @@
/obj/effect/turf_decal/tile/blue,
/turf/open/floor/iron,
/area/hydroponics)
+"mBH" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "quarantineshutters";
+ name = "Isolation Shutters"
+ },
+/obj/structure/table/reinforced,
+/obj/machinery/door/window/brigdoor{
+ name = "Virology Desk";
+ req_access_txt = "39";
+ dir = 4
+ },
+/obj/item/storage/box/masks,
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
+ pixel_x = 2;
+ pixel_y = -1
+ },
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
+ pixel_x = -9;
+ pixel_y = 5
+ },
+/obj/structure/desk_bell{
+ pixel_x = -8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/medical/virology)
"mBL" = (
/obj/structure/cable/yellow{
icon_state = "2-4"
@@ -57517,21 +57440,6 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/prison,
/area/security/prison)
-"nkq" = (
-/obj/structure/reagent_dispensers/watertank,
-/obj/effect/turf_decal/delivery,
-/obj/effect/turf_decal/stripes/corner,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/radio/intercom{
- pixel_y = 22
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/janitor)
"nkU" = (
/obj/structure/disposalpipe/sorting/mail/flip{
dir = 8;
@@ -57756,6 +57664,15 @@
burnt = 1
},
/area/maintenance/port/aft)
+"npf" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/book/manual/chef_recipes{
+ pixel_x = 2;
+ pixel_y = 6
+ },
+/turf/open/floor/iron/techmaint,
+/area/security/prison)
"npg" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
@@ -58449,6 +58366,12 @@
},
/turf/open/floor/iron/showroomfloor,
/area/science/xenobiology)
+"nDC" = (
+/obj/structure/flora/ausbushes/leafybush,
+/obj/structure/reagent_dispensers/watertank/high,
+/obj/item/reagent_containers/cup/bucket,
+/turf/open/floor/grass,
+/area/security/prison)
"nDT" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/yellow{
@@ -58937,6 +58860,19 @@
},
/turf/open/floor/iron,
/area/security/brig/aft)
+"nKS" = (
+/obj/structure/table,
+/obj/item/reagent_containers/cup/soda_cans/pwr_game{
+ pixel_x = 6;
+ pixel_y = 7;
+ list_reagents = list(/datum/reagent/consumable/pwr_game = 5)
+ },
+/obj/item/reagent_containers/cup/glass/britcup{
+ pixel_x = -5;
+ pixel_y = 1
+ },
+/turf/open/floor/wood,
+/area/security/prison)
"nKU" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -59019,27 +58955,6 @@
},
/turf/open/floor/iron/dark,
/area/engine/atmos)
-"nLF" = (
-/obj/effect/turf_decal/bot,
-/obj/structure/closet/crate/hydroponics,
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/machinery/light{
- dir = 4
- },
-/obj/item/shovel/spade,
-/obj/item/wrench,
-/obj/item/crowbar/red,
-/obj/item/cultivator,
-/obj/item/wirecutters,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/circuitboard/machine/biogenerator,
-/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/hydroponics)
"nLN" = (
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/bot,
@@ -59261,23 +59176,6 @@
broken = 1
},
/area/maintenance/starboard)
-"nPI" = (
-/obj/structure/table,
-/obj/item/food/mint,
-/obj/item/reagent_containers/food/condiment/enzyme{
- pixel_x = -2;
- pixel_y = 6
- },
-/obj/item/reagent_containers/food/condiment/sugar{
- pixel_x = 5;
- pixel_y = 5
- },
-/obj/item/reagent_containers/glass/beaker,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/crew_quarters/kitchen)
"nPL" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -59872,31 +59770,6 @@
},
/turf/open/floor/iron/showroomfloor,
/area/security/main)
-"nZh" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/peppermill{
- desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
- pixel_x = -8;
- pixel_y = 2
- },
-/obj/item/reagent_containers/food/condiment/saltshaker{
- desc = "Salt. From space oceans, presumably. A staple of modern medicine.";
- pixel_x = -8;
- pixel_y = 12
- },
-/obj/item/storage/box/donkpockets{
- pixel_x = 8;
- pixel_y = 8
- },
-/obj/item/storage/box/donkpockets{
- pixel_x = 6;
- pixel_y = 6
- },
-/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/crew_quarters/kitchen)
"nZk" = (
/obj/effect/landmark/event_spawn,
/obj/structure/cable/yellow{
@@ -60022,6 +59895,24 @@
broken = 1
},
/area/maintenance/starboard)
+"oau" = (
+/obj/structure/closet/crate/hydroponics,
+/obj/item/shovel/spade,
+/obj/item/wrench,
+/obj/item/crowbar/red,
+/obj/item/cultivator,
+/obj/item/wirecutters,
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/circuitboard/machine/biogenerator,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plating,
+/area/quartermaster/warehouse)
"oaH" = (
/obj/structure/extinguisher_cabinet{
pixel_y = -30
@@ -60474,6 +60365,20 @@
broken = 1
},
/area/maintenance/aft)
+"ohR" = (
+/obj/effect/turf_decal/delivery,
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/structure/reagent_dispensers/watertank/high,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/item/reagent_containers/cup/bucket,
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/iron/dark,
+/area/chapel/main)
"ohU" = (
/obj/machinery/power/solar{
id = "aftstarboard";
@@ -61255,6 +61160,27 @@
burnt = 1
},
/area/maintenance/port/fore)
+"ouh" = (
+/obj/effect/turf_decal/tile/yellow/half/contrasted{
+ dir = 4
+ },
+/obj/item/radio/intercom{
+ pixel_y = 22
+ },
+/obj/structure/table/glass,
+/obj/item/clothing/gloves/color/latex,
+/obj/item/clothing/gloves/color/latex,
+/obj/item/clothing/glasses/science{
+ pixel_x = 4;
+ pixel_y = 4
+ },
+/obj/item/clothing/glasses/science,
+/obj/effect/turf_decal/bot,
+/obj/item/reagent_containers/cup/bottle/epinephrine{
+ pixel_x = -6
+ },
+/turf/open/floor/iron/showroomfloor,
+/area/medical/chemistry)
"ouu" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating{
@@ -62321,34 +62247,6 @@
},
/turf/open/floor/iron/dark,
/area/crew_quarters/heads/hop)
-"oMW" = (
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "quarantineshutters";
- name = "Isolation Shutters"
- },
-/obj/structure/table/reinforced,
-/obj/machinery/door/window/brigdoor{
- name = "Virology Desk";
- req_access_txt = "39";
- dir = 4
- },
-/obj/item/storage/box/masks,
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
- pixel_x = 2;
- pixel_y = -1
- },
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
- pixel_x = -9;
- pixel_y = 5
- },
-/obj/structure/desk_bell{
- pixel_x = -8
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/medical/virology)
"oNj" = (
/obj/machinery/airalarm/directional/south{
pixel_y = -22
@@ -62365,6 +62263,18 @@
broken = 1
},
/area/engine/engineering)
+"oNw" = (
+/obj/structure/table/wood/fancy,
+/obj/machinery/light/small{
+ dir = 4
+ },
+/obj/item/clothing/suit/hooded/chaplain_hoodie,
+/obj/item/reagent_containers/cup/glass/bottle/holywater,
+/obj/item/soulstone/anybody/chaplain,
+/obj/item/organ/heart,
+/obj/item/book/granter/spell/smoke/lesser,
+/turf/open/floor/iron/dark,
+/area/chapel/office)
"oNy" = (
/obj/machinery/light,
/obj/machinery/light_switch{
@@ -63063,6 +62973,15 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
/area/science/research)
+"oYX" = (
+/obj/structure/reagent_dispensers/watertank/high,
+/obj/effect/turf_decal/delivery,
+/obj/item/reagent_containers/cup/bucket,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/hydroponics)
"oZd" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/grille/broken,
@@ -63918,27 +63837,6 @@
},
/turf/open/floor/iron/showroomfloor,
/area/security/execution/education)
-"pmx" = (
-/obj/structure/bonfire,
-/obj/item/reagent_containers/food/drinks/bottle/orangejuice{
- desc = "For the weary spacemen on their quest to rekindle the first plasma fire.";
- name = "Carton of Estus"
- },
-/obj/effect/decal/remains/human,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/cobweb,
-/obj/item/melee/baseball_bat{
- desc = "Don't tell anyone you put any points into dex, though.";
- icon_state = "swordon";
- item_state = "swordon";
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi';
- name = "moonlight greatsword";
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- },
-/turf/open/floor/plating{
- burnt = 1
- },
-/area/maintenance/starboard/fore)
"pmM" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -64119,6 +64017,27 @@
/obj/item/clothing/accessory/maidapron,
/turf/open/floor/iron/dark,
/area/security/brig)
+"ppB" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/closet/crate/hydroponics,
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/item/shovel/spade,
+/obj/item/wrench,
+/obj/item/crowbar/red,
+/obj/item/cultivator,
+/obj/item/wirecutters,
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/circuitboard/machine/biogenerator,
+/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/hydroponics)
"ppJ" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -64794,6 +64713,31 @@
},
/turf/open/floor/iron/dark,
/area/maintenance/fore)
+"pzi" = (
+/obj/structure/table,
+/obj/machinery/light/small{
+ dir = 8
+ },
+/obj/structure/noticeboard{
+ dir = 4;
+ pixel_x = -27
+ },
+/obj/item/reagent_containers/condiment/peppermill{
+ desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
+ pixel_x = -8;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/condiment/saltshaker{
+ desc = "Salt. From space oceans, presumably. A staple of modern medicine.";
+ pixel_x = -8;
+ pixel_y = 12
+ },
+/obj/item/reagent_containers/cup/glass/britcup{
+ pixel_x = 4;
+ pixel_y = 4
+ },
+/turf/open/floor/iron/dark,
+/area/crew_quarters/bar/atrium)
"pzm" = (
/obj/machinery/conveyor{
dir = 5;
@@ -65687,6 +65631,21 @@
/obj/effect/mapping_helpers/dead_body_placer/medbay_morgue,
/turf/open/floor/iron/dark,
/area/medical/morgue)
+"pPm" = (
+/obj/structure/reagent_dispensers/watertank,
+/obj/effect/turf_decal/delivery,
+/obj/effect/turf_decal/stripes/corner,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/radio/intercom{
+ pixel_y = 22
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/janitor)
"pPG" = (
/obj/machinery/light/small{
dir = 4
@@ -66691,6 +66650,19 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron/dark,
/area/teleporter)
+"qgk" = (
+/obj/structure/reagent_dispensers/watertank/high,
+/obj/effect/turf_decal/delivery,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/item/reagent_containers/cup/bucket,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/hydroponics)
"qgm" = (
/obj/effect/turf_decal/bot,
/obj/structure/closet/secure_closet/personal,
@@ -67366,35 +67338,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/quartermaster/warehouse)
-"qti" = (
-/obj/item/book/manual/wiki/medicine,
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
- pixel_x = -6
- },
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
- pixel_x = -6;
- pixel_y = 10
- },
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
- pixel_x = 6;
- pixel_y = 10
- },
-/obj/effect/turf_decal/tile/blue/anticorner/contrasted,
-/obj/structure/cable/yellow,
-/obj/machinery/power/apc{
- areastring = "/area/medical/cryo";
- dir = 4;
- name = "Cryogenics APC";
- pixel_x = 24
- },
-/obj/item/wrench/medical,
-/obj/structure/table/glass,
-/obj/item/reagent_containers/syringe,
-/turf/open/floor/iron/showroomfloor,
-/area/medical/cryo)
"qtn" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -67556,6 +67499,26 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/plating,
/area/maintenance/port/aft)
+"qvp" = (
+/obj/item/reagent_containers/cup/glass/flask/gold{
+ pixel_x = 3;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/glass/bottle/rum{
+ pixel_x = -4;
+ pixel_y = 4
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = 7;
+ pixel_y = 4
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
+/obj/machinery/status_display/evac{
+ pixel_y = 32
+ },
+/obj/structure/table/wood,
+/turf/open/floor/carpet/royalblue,
+/area/crew_quarters/heads/captain)
"qvr" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/half/contrasted,
@@ -67958,15 +67921,6 @@
/obj/effect/turf_decal/tile/neutral/opposingcorners,
/turf/open/floor/iron/showroomfloor,
/area/engine/atmos)
-"qCD" = (
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/book/manual/chef_recipes{
- pixel_x = 2;
- pixel_y = 6
- },
-/turf/open/floor/iron/techmaint,
-/area/security/prison)
"qCI" = (
/obj/structure/girder/displaced,
/turf/open/floor/plating,
@@ -68128,6 +68082,31 @@
burnt = 1
},
/area/maintenance/starboard/fore)
+"qFg" = (
+/obj/structure/table,
+/obj/item/reagent_containers/condiment/peppermill{
+ desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
+ pixel_x = -8;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/condiment/saltshaker{
+ desc = "Salt. From space oceans, presumably. A staple of modern medicine.";
+ pixel_x = -8;
+ pixel_y = 12
+ },
+/obj/item/storage/box/donkpockets{
+ pixel_x = 8;
+ pixel_y = 8
+ },
+/obj/item/storage/box/donkpockets{
+ pixel_x = 6;
+ pixel_y = 6
+ },
+/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/crew_quarters/kitchen)
"qFB" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -69026,17 +69005,6 @@
},
/turf/open/floor/noslip/white,
/area/security/main)
-"qVe" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
-/obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/quartermaster/warehouse)
"qVl" = (
/obj/machinery/status_display/evac{
pixel_y = 32
@@ -69185,25 +69153,6 @@
},
/turf/open/floor/iron/dark,
/area/hydroponics)
-"qXR" = (
-/obj/structure/sink{
- dir = 4;
- pixel_x = 11;
- pixel_y = 8
- },
-/obj/effect/turf_decal/stripes/corner,
-/obj/effect/turf_decal/loading_area,
-/obj/machinery/door/window/southright{
- name = "Trash Chute";
- req_one_access_txt = "26"
- },
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/mop,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/purple/half/contrasted,
-/obj/effect/turf_decal/tile/blue,
-/turf/open/floor/iron,
-/area/janitor)
"qXV" = (
/obj/effect/spawner/randomvend/cola,
/obj/effect/turf_decal/bot,
@@ -69728,6 +69677,16 @@
/obj/structure/sign/warning/docking,
/turf/closed/wall,
/area/science/shuttledock)
+"rft" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/reagent_containers/cup/bucket,
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plating{
+ broken = 1
+ },
+/area/maintenance/central)
"rfv" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood/old,
@@ -69805,6 +69764,21 @@
},
/turf/open/floor/iron/showroomfloor,
/area/science/storage)
+"rgL" = (
+/obj/effect/turf_decal/delivery,
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/reagent_dispensers/watertank/high,
+/obj/item/reagent_containers/cup/bucket,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/wideplating/dark{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/chapel/main)
"rgZ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/ash,
@@ -70437,29 +70411,6 @@
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron/showroomfloor,
/area/medical/medbay/central)
-"rpF" = (
-/obj/structure/table,
-/obj/item/folder,
-/obj/item/stack/sheet/mineral/plasma,
-/obj/item/stack/sheet/mineral/plasma,
-/obj/item/stack/sheet/mineral/plasma,
-/obj/item/stack/sheet/mineral/plasma,
-/obj/item/reagent_containers/glass/beaker/large{
- pixel_x = -4
- },
-/obj/item/reagent_containers/glass/beaker{
- pixel_x = 4
- },
-/obj/item/reagent_containers/dropper,
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 4
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/dark,
-/area/science/xenobiology)
"rqo" = (
/obj/effect/turf_decal/box,
/obj/machinery/power/solar{
@@ -71172,6 +71123,46 @@
},
/turf/open/floor/iron,
/area/hallway/primary/starboard)
+"rEb" = (
+/obj/structure/sign/directions/evac{
+ dir = 8;
+ pixel_y = 32
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/structure/table,
+/obj/item/reagent_containers/cup/soda_cans/starkist{
+ pixel_x = 10;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/cup/soda_cans/shamblers{
+ pixel_x = 2;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/cup/soda_cans/lemon_lime{
+ pixel_x = -7;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/cup/soda_cans/pwr_game{
+ pixel_x = -4;
+ pixel_y = 11
+ },
+/obj/item/reagent_containers/cup/soda_cans/cola{
+ pixel_x = 6;
+ pixel_y = 11
+ },
+/obj/item/reagent_containers/cup/soda_cans/thirteenloko{
+ pixel_y = 20
+ },
+/obj/effect/turf_decal/tile/purple/half/contrasted{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron/showroomfloor,
+/area/science/aft)
"rFb" = (
/obj/structure/girder,
/obj/effect/decal/cleanable/dirt,
@@ -74134,16 +74125,6 @@
broken = 1
},
/area/maintenance/aft)
-"sHz" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/bucket,
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/turf/open/floor/plating{
- broken = 1
- },
-/area/maintenance/central)
"sId" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -74420,31 +74401,6 @@
/obj/item/soap/nanotrasen,
/turf/open/floor/noslip/white,
/area/security/prison)
-"sMK" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
- pixel_x = -6;
- pixel_y = 3
- },
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
- pixel_x = -3;
- pixel_y = 15
- },
-/obj/item/reagent_containers/food/drinks/bottle/holywater{
- pixel_x = 4;
- pixel_y = 4
- },
-/obj/machinery/light{
- dir = 4
- },
-/obj/structure/extinguisher_cabinet{
- pixel_x = 24
- },
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/chapel/office)
"sMT" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/components/binary/pump{
@@ -76614,36 +76570,6 @@
},
/turf/open/floor/iron/dark/corner,
/area/hallway/primary/fore)
-"tyw" = (
-/obj/structure/table/glass,
-/obj/item/paper_bin{
- pixel_x = -9;
- pixel_y = 3
- },
-/obj/item/pen{
- pixel_x = -8;
- pixel_y = 3
- },
-/obj/item/storage/box/syringes{
- pixel_x = 6;
- pixel_y = 11
- },
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
- pixel_x = 2;
- pixel_y = -1
- },
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
- pixel_x = 9;
- pixel_y = -7
- },
-/obj/machinery/light{
- bulb_colour = "#22bfa2";
- bulb_vacuum_colour = "#22bfa2";
- dir = 4;
- nightshift_light_color = "#22bfa2"
- },
-/turf/open/floor/iron/dark,
-/area/medical/virology)
"tyN" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment{
@@ -77832,15 +77758,6 @@
},
/turf/open/floor/iron/showroomfloor,
/area/science/research)
-"tXJ" = (
-/obj/structure/reagent_dispensers/watertank/high,
-/obj/effect/turf_decal/delivery,
-/obj/item/reagent_containers/glass/bucket,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/hydroponics)
"tXU" = (
/obj/structure/cable/yellow{
icon_state = "0-2"
@@ -77879,23 +77796,6 @@
/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/iron,
/area/quartermaster/office)
-"tZQ" = (
-/obj/structure/table,
-/obj/item/clipboard,
-/obj/item/reagent_containers/glass/beaker/large{
- pixel_x = -6
- },
-/obj/item/reagent_containers/glass/beaker{
- pixel_x = 6
- },
-/obj/item/clothing/glasses/science,
-/obj/item/clothing/glasses/science,
-/obj/structure/extinguisher_cabinet{
- pixel_y = -30
- },
-/obj/effect/turf_decal/tile/neutral/half/contrasted,
-/turf/open/floor/iron/dark,
-/area/science/lab)
"uad" = (
/obj/structure/filingcabinet/chestdrawer,
/obj/effect/turf_decal/tile/neutral/opposingcorners,
@@ -78810,6 +78710,95 @@
/obj/machinery/fax/cargo,
/turf/open/floor/iron,
/area/quartermaster/storage)
+"upK" = (
+/obj/item/restraints/handcuffs{
+ pixel_y = 4
+ },
+/obj/item/circuitboard/machine/chem_heater,
+/obj/item/reagent_containers/cup/bottle/sulfur{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/sugar{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/sodium{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/silicon{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/radium{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/phosphorus{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/silver{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/welding_fuel{
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/bottle/lithium{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/nitrogen{
+ pixel_x = -6;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/bottle/hydrogen{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/ethanol{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/iodine{
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/bottle/sacid{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/water{
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/bottle/chlorine{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/mercury{
+ pixel_x = 6;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/bottle/bromine{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/oxygen{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/potassium{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/iron{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/fluorine{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/copper{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/carbon{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/aluminium{
+ pixel_x = 6
+ },
+/obj/structure/closet/crate/secure/plasma{
+ name = "virology crate";
+ req_access_txt = "39"
+ },
+/obj/effect/turf_decal/tile/dark_green/anticorner/contrasted,
+/turf/open/floor/iron/showroomfloor,
+/area/medical/virology)
"upL" = (
/obj/machinery/door/poddoor/preopen{
id = "Prisongate";
@@ -79192,6 +79181,27 @@
},
/turf/open/floor/plating,
/area/quartermaster/warehouse)
+"uuH" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/delivery,
+/obj/machinery/door/firedoor,
+/obj/item/reagent_containers/condiment/peppermill{
+ desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
+ pixel_x = -8;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/condiment/saltshaker{
+ desc = "Salt. From space oceans, presumably. A staple of modern medicine.";
+ pixel_x = -8;
+ pixel_y = 12
+ },
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "kitchen_2";
+ name = "Hallway Hatch"
+ },
+/obj/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/crew_quarters/kitchen)
"uuY" = (
/obj/structure/cable/yellow{
icon_state = "0-2"
@@ -79903,19 +79913,6 @@
broken = 1
},
/area/maintenance/starboard)
-"uGS" = (
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/reagent_dispensers/watertank,
-/obj/effect/turf_decal/delivery,
-/obj/machinery/light/small,
-/obj/item/reagent_containers/glass/bucket,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/hydroponics)
"uHp" = (
/obj/item/kirbyplants{
icon_state = "plant-22"
@@ -80021,6 +80018,29 @@
burnt = 1
},
/area/bridge)
+"uKa" = (
+/obj/structure/table/wood/fancy,
+/obj/effect/turf_decal/stripes/corner,
+/obj/item/paper_bin{
+ pixel_x = -4;
+ pixel_y = 4
+ },
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
+ pixel_x = 8;
+ pixel_y = 6
+ },
+/obj/item/pen,
+/obj/machinery/requests_console{
+ department = "Chapel";
+ departmentType = 2;
+ name = "Chapel RC";
+ pixel_y = -30
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/chapel/office)
"uKd" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
dir = 1
@@ -80195,6 +80215,29 @@
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
/turf/open/floor/iron/dark,
/area/science/mixing)
+"uLP" = (
+/obj/structure/table,
+/obj/item/folder,
+/obj/item/stack/sheet/mineral/plasma,
+/obj/item/stack/sheet/mineral/plasma,
+/obj/item/stack/sheet/mineral/plasma,
+/obj/item/stack/sheet/mineral/plasma,
+/obj/item/reagent_containers/cup/beaker/large{
+ pixel_x = -4
+ },
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = 4
+ },
+/obj/item/reagent_containers/dropper,
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron/dark,
+/area/science/xenobiology)
"uMj" = (
/obj/structure/chair{
dir = 4
@@ -80463,12 +80506,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plating,
/area/maintenance/starboard)
-"uQT" = (
-/obj/structure/flora/ausbushes/leafybush,
-/obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
-/turf/open/floor/grass,
-/area/security/prison)
"uRb" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/corner{
@@ -83726,19 +83763,6 @@
},
/turf/open/floor/iron/showroomfloor,
/area/medical/medbay/central)
-"vSy" = (
-/obj/structure/reagent_dispensers/watertank/high,
-/obj/effect/turf_decal/delivery,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/bucket,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/hydroponics)
"vSA" = (
/obj/machinery/airalarm/directional/north,
/obj/effect/turf_decal/tile/red/half/contrasted{
@@ -84362,20 +84386,6 @@
"waD" = (
/turf/open/floor/plating/asteroid/airless,
/area/quartermaster/warehouse)
-"waM" = (
-/obj/effect/turf_decal/delivery,
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/reagent_dispensers/watertank/high,
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/bucket,
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/iron/dark,
-/area/chapel/main)
"waU" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -85011,48 +85021,6 @@
},
/turf/open/floor/iron/dark,
/area/engine/engineering)
-"wkJ" = (
-/obj/effect/turf_decal/tile/blue/half/contrasted{
- color = "#439C1E"
- },
-/obj/structure/closet/crate/secure/plasma{
- name = "virology crate";
- req_access_txt = "39"
- },
-/obj/item/book/manual/wiki/infections,
-/obj/item/book/manual/wiki/infections,
-/obj/item/extrapolator,
-/obj/item/storage/box/beakers{
- pixel_x = 4;
- pixel_y = 4
- },
-/obj/item/storage/box/syringes{
- pixel_x = -3;
- pixel_y = 2
- },
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
- pixel_x = -6;
- pixel_y = 8
- },
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
- pixel_x = 2;
- pixel_y = -1
- },
-/obj/item/storage/belt/medical{
- pixel_y = 2
- },
-/obj/item/storage/belt/medical{
- pixel_y = 2
- },
-/obj/machinery/light{
- dir = 4;
- light_color = "#c1caff"
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
-/turf/open/floor/iron/showroomfloor,
-/area/medical/virology)
"wkP" = (
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
dir = 8
@@ -85142,24 +85110,6 @@
/obj/effect/loot_jobscale/medical/medkits,
/turf/open/floor/iron/showroomfloor,
/area/medical/storage)
-"wms" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/bot,
-/obj/item/storage/toolbox/mechanical{
- pixel_x = -4;
- pixel_y = 4
- },
-/obj/item/multitool,
-/obj/item/storage/toolbox/electrical,
-/obj/item/multitool{
- pixel_x = 4
- },
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/science/robotics/lab)
"wmQ" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/stripes/corner{
@@ -85346,6 +85296,25 @@
},
/turf/open/floor/iron,
/area/hallway/primary/starboard)
+"wps" = (
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = 11;
+ pixel_y = 8
+ },
+/obj/effect/turf_decal/stripes/corner,
+/obj/effect/turf_decal/loading_area,
+/obj/machinery/door/window/southright{
+ name = "Trash Chute";
+ req_one_access_txt = "26"
+ },
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/mop,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/purple/half/contrasted,
+/obj/effect/turf_decal/tile/blue,
+/turf/open/floor/iron,
+/area/janitor)
"wpt" = (
/obj/structure/closet/secure_closet/RD,
/obj/effect/turf_decal/delivery,
@@ -86643,6 +86612,19 @@
},
/turf/open/floor/iron,
/area/hallway/primary/aft)
+"wIv" = (
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/reagent_dispensers/watertank,
+/obj/effect/turf_decal/delivery,
+/obj/machinery/light/small,
+/obj/item/reagent_containers/cup/bucket,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/hydroponics)
"wIP" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/obj/effect/turf_decal/tile/purple{
@@ -87650,6 +87632,27 @@
},
/turf/open/floor/plating,
/area/engine/atmos)
+"wXc" = (
+/obj/machinery/airalarm/directional/south{
+ pixel_y = -22
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/obj/item/radio/intercom{
+ pixel_x = 28
+ },
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = 11
+ },
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/mop,
+/turf/open/floor/plating{
+ burnt = 1
+ },
+/area/maintenance/disposal)
"wXg" = (
/obj/effect/turf_decal/bot,
/obj/structure/cable/yellow{
@@ -87686,6 +87689,13 @@
name = "mainframe floor"
},
/area/tcommsat/server)
+"wXE" = (
+/obj/effect/turf_decal/delivery,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/structure/reagent_dispensers/watertank,
+/obj/item/reagent_containers/cup/bucket,
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
"wXN" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/room/threexthree,
@@ -88136,6 +88146,13 @@
/obj/effect/turf_decal/tile/blue,
/turf/open/floor/iron,
/area/engine/atmos)
+"xeX" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb,
+/turf/open/floor/plating{
+ burnt = 1
+ },
+/area/quartermaster/warehouse)
"xfb" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -89104,46 +89121,6 @@
/obj/effect/turf_decal/tile/red/anticorner/contrasted,
/turf/open/floor/iron/showroomfloor,
/area/security/main)
-"xuS" = (
-/obj/structure/sign/directions/evac{
- dir = 8;
- pixel_y = 32
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
- pixel_x = 10;
- pixel_y = 2
- },
-/obj/item/reagent_containers/food/drinks/soda_cans/shamblers{
- pixel_x = 2;
- pixel_y = 2
- },
-/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime{
- pixel_x = -7;
- pixel_y = 2
- },
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{
- pixel_x = -4;
- pixel_y = 11
- },
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
- pixel_x = 6;
- pixel_y = 11
- },
-/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko{
- pixel_y = 20
- },
-/obj/effect/turf_decal/tile/purple/half/contrasted{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/showroomfloor,
-/area/science/aft)
"xuX" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -89317,6 +89294,24 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
/area/hallway/primary/aft)
+"xyt" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/bot,
+/obj/item/storage/toolbox/mechanical{
+ pixel_x = -4;
+ pixel_y = 4
+ },
+/obj/item/multitool,
+/obj/item/storage/toolbox/electrical,
+/obj/item/multitool{
+ pixel_x = 4
+ },
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/science/robotics/lab)
"xyv" = (
/obj/structure/sign/departments/engineering{
pixel_x = 32;
@@ -90268,6 +90263,16 @@
},
/turf/open/floor/iron/dark,
/area/crew_quarters/fitness/recreation)
+"xOz" = (
+/obj/structure/mopbucket,
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/mop,
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/obj/structure/sign/warning/securearea{
+ pixel_x = -32
+ },
+/turf/open/floor/iron/dark,
+/area/security/brig)
"xON" = (
/obj/machinery/computer/holodeck/prison,
/obj/effect/turf_decal/stripes/line{
@@ -90695,6 +90700,16 @@
burnt = 1
},
/area/maintenance/starboard)
+"xVd" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/condiment/flour{
+ pixel_x = -2;
+ pixel_y = 6
+ },
+/obj/item/kitchen/rollingpin,
+/obj/item/clothing/head/utility/chefhat,
+/turf/open/floor/iron/techmaint,
+/area/security/prison)
"xVl" = (
/obj/effect/turf_decal/bot,
/turf/open/floor/glass/reinforced,
@@ -91280,21 +91295,6 @@
/obj/effect/turf_decal/tile/red/opposingcorners,
/turf/open/floor/iron/showroomfloor,
/area/crew_quarters/bar/atrium)
-"yeC" = (
-/obj/effect/turf_decal/delivery,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 8
- },
-/obj/effect/turf_decal/siding/wideplating/dark{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/chapel/main)
"yeI" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/decal/cleanable/dirt,
@@ -108976,7 +108976,7 @@ qvH
qvH
nmY
vbU
-eja
+xVd
bQy
hEG
ciO
@@ -109233,7 +109233,7 @@ qvH
qvH
jel
iTH
-qCD
+npf
aav
mkY
aXg
@@ -109510,7 +109510,7 @@ gSb
njG
uoK
njG
-giB
+xOz
eyz
njG
aaa
@@ -110797,7 +110797,7 @@ mbD
hbo
fmb
woS
-bkU
+gYn
wVu
aUz
aaa
@@ -111028,7 +111028,7 @@ aav
ijY
epb
ukl
-izu
+nKS
qbu
iQT
gJr
@@ -111246,7 +111246,7 @@ aNG
pUD
fbp
ixg
-qti
+bbG
nfy
iVR
fzU
@@ -112289,7 +112289,7 @@ dbg
lkt
aQW
afe
-oMW
+mBH
cBi
oDA
afe
@@ -112313,8 +112313,8 @@ uFY
lCW
yhn
tja
-uQT
-dpY
+nDC
+etq
avR
rnM
nhx
@@ -112797,7 +112797,7 @@ xfL
exk
hDh
aNn
-hec
+ouh
yak
cJW
swl
@@ -113311,7 +113311,7 @@ ttH
prh
jGn
aQW
-dpR
+hqf
yak
vIG
kwL
@@ -113322,8 +113322,8 @@ bMi
wKN
bAN
aWM
-wkJ
-juC
+lAa
+upK
jWX
aoH
tjn
@@ -114347,7 +114347,7 @@ buc
soa
ruo
drQ
-tyw
+iAJ
qyz
iNU
vlT
@@ -114836,7 +114836,7 @@ aWG
wCV
btf
btk
-btq
+uKa
aWG
hQz
phw
@@ -115348,7 +115348,7 @@ sSv
kRL
bsm
xTj
-sMK
+hGj
xna
lXA
aWG
@@ -115861,7 +115861,7 @@ abN
alf
unx
aWG
-bta
+oNw
btC
vJx
gfr
@@ -116380,7 +116380,7 @@ aWG
bto
xEe
aWG
-waM
+ohR
raS
bwX
btA
@@ -116637,7 +116637,7 @@ bsm
aWG
cJQ
aWG
-yeC
+rgL
qZQ
xqa
wRe
@@ -116672,7 +116672,7 @@ aoh
prB
bEY
cIB
-eWx
+gEQ
nHM
aoA
wUH
@@ -118191,7 +118191,7 @@ ant
uRI
iEg
btH
-iAH
+iod
gbc
lSB
iAC
@@ -119426,7 +119426,7 @@ aAg
aAg
asZ
asZ
-dAW
+agN
asZ
asZ
aAg
@@ -119743,7 +119743,7 @@ rFb
apX
bkj
qyJ
-boy
+gZV
apX
bmJ
bAm
@@ -120197,7 +120197,7 @@ aay
acd
cdY
cdZ
-cdW
+gbr
cdY
acx
acR
@@ -120711,7 +120711,7 @@ aaU
aaN
cdZ
cdY
-cfK
+lZd
cdY
abV
acj
@@ -121482,7 +121482,7 @@ asZ
asZ
aAg
asZ
-bLM
+dZB
asZ
aAg
asZ
@@ -124378,7 +124378,7 @@ aox
aox
bAx
asx
-aqK
+qvp
azC
bHG
cIE
@@ -124386,7 +124386,7 @@ cIL
asx
asx
bOM
-sHz
+rft
kPh
aox
vln
@@ -125905,7 +125905,7 @@ bqK
xjj
lBA
xfM
-brB
+pzi
bar
izD
ajt
@@ -125924,7 +125924,7 @@ rhI
dcE
cIA
bnT
-uGS
+wIv
bmM
wlv
bew
@@ -126138,7 +126138,7 @@ aLh
evG
iny
cDD
-pmx
+exI
cFm
vzg
ejK
@@ -126168,7 +126168,7 @@ jlV
brQ
jfd
tNl
-nZh
+qFg
mmO
uZa
bjn
@@ -126416,7 +126416,7 @@ rKa
ggQ
bna
dNG
-lZo
+bHy
eIg
ucI
kLS
@@ -126424,7 +126424,7 @@ eeK
ohZ
dsr
fKZ
-nPI
+cKw
xQc
ubM
icj
@@ -126936,7 +126936,7 @@ teM
teM
teM
fRS
-bnL
+lJJ
fNb
jJE
pbs
@@ -126953,7 +126953,7 @@ urA
vgt
drL
kEB
-nLF
+ppB
bmM
aZd
hdf
@@ -127191,7 +127191,7 @@ ybb
hCi
snt
wou
-cYd
+bpR
qjA
ajt
dxY
@@ -127206,8 +127206,8 @@ pmM
yar
sXZ
vNK
-vSy
-tXJ
+qgk
+oYX
boa
boh
bon
@@ -127454,7 +127454,7 @@ bwi
ajt
rGx
bph
-bmS
+uuH
bmZ
aZd
bqS
@@ -127694,7 +127694,7 @@ ixh
gjd
pzN
eLw
-wms
+xyt
aYH
vOl
rKa
@@ -128991,7 +128991,7 @@ vpZ
bch
aYd
vmw
-tZQ
+drK
aYd
bfn
cbk
@@ -129021,7 +129021,7 @@ bNM
wAq
lis
siW
-qXR
+wps
cjz
bNv
yaT
@@ -129222,7 +129222,7 @@ nJt
bzt
nJt
uZV
-rpF
+uLP
dNN
iBw
dZe
@@ -129789,7 +129789,7 @@ eEB
cZB
xGh
bNM
-nkq
+pPm
vqC
wag
bOH
@@ -130344,7 +130344,7 @@ fkE
coC
cNF
iKN
-jQD
+wXc
cnu
cnu
cnd
@@ -130509,7 +130509,7 @@ bbx
aWJ
bfs
alB
-kRc
+dOp
uhr
ewi
baL
@@ -131280,7 +131280,7 @@ alB
bwe
bwe
alB
-xuS
+rEb
qSD
aSr
aZF
@@ -132352,7 +132352,7 @@ ags
exE
inM
bhQ
-bNT
+wXE
bSz
dpg
qJq
@@ -144596,7 +144596,7 @@ hHu
cCU
gzN
rag
-qVe
+caP
act
tjz
vpC
@@ -144851,7 +144851,7 @@ abq
iHi
lga
fde
-lXx
+oau
wtt
oGh
act
@@ -146659,7 +146659,7 @@ sMc
iCX
kHh
act
-jcF
+dhi
ega
wKL
cCr
@@ -147941,7 +147941,7 @@ pWT
kfw
fnM
lYs
-htk
+xeX
dDY
act
act
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 6efd704bfb060..b50d40b457b81 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -1120,6 +1120,32 @@
/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating,
/area/maintenance/port/fore)
+"ald" = (
+/obj/structure/table,
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
+ pixel_x = -6;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
+ pixel_x = 6;
+ pixel_y = 6
+ },
+/obj/item/storage/pill_bottle/mannitol,
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
+ pixel_x = -2;
+ pixel_y = 9
+ },
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
+ pixel_x = 5;
+ pixel_y = 9
+ },
+/obj/item/wrench/medical,
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/iron,
+/area/medical/patients_rooms)
"aln" = (
/obj/machinery/computer/holodeck{
dir = 4
@@ -4241,24 +4267,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/crew_quarters/dorms)
-"aKp" = (
-/obj/item/reagent_containers/spray/plantbgone,
-/obj/item/reagent_containers/spray/pestspray{
- pixel_x = 3;
- pixel_y = 4
- },
-/obj/item/reagent_containers/glass/bottle/nutrient/ez,
-/obj/item/reagent_containers/glass/bottle/nutrient/rh{
- pixel_x = 2;
- pixel_y = 1
- },
-/obj/structure/table,
-/obj/structure/extinguisher_cabinet{
- pixel_x = -27
- },
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/iron,
-/area/hydroponics/garden)
"aKq" = (
/obj/machinery/biogenerator,
/obj/machinery/firealarm{
@@ -4267,19 +4275,6 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron,
/area/hydroponics/garden)
-"aKr" = (
-/obj/structure/table,
-/obj/item/cultivator,
-/obj/item/hatchet,
-/obj/item/crowbar,
-/obj/machinery/light{
- dir = 1
- },
-/obj/item/plant_analyzer,
-/obj/item/reagent_containers/glass/bucket,
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/iron,
-/area/hydroponics/garden)
"aKt" = (
/obj/item/seeds/apple,
/obj/item/seeds/banana,
@@ -5794,18 +5789,6 @@
},
/turf/open/floor/iron,
/area/hydroponics/garden)
-"aSk" = (
-/obj/structure/table,
-/obj/item/hatchet,
-/obj/item/cultivator,
-/obj/item/crowbar,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/plant_analyzer,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/hydroponics/garden)
"aSn" = (
/obj/item/storage/bag/plants/portaseeder,
/obj/structure/table,
@@ -6975,70 +6958,6 @@
},
/turf/open/floor/iron/dark/smooth_large,
/area/maintenance/disposal/incinerator)
-"aZQ" = (
-/obj/effect/landmark/start/ai/secondary,
-/obj/item/radio/intercom{
- freerange = 1;
- listening = 0;
- name = "Custom Channel";
- pixel_x = -10;
- pixel_y = 22
- },
-/obj/item/radio/intercom{
- freerange = 1;
- name = "Common Channel";
- pixel_x = -27
- },
-/obj/item/radio/intercom{
- freerange = 1;
- frequency = 1447;
- name = "Private Channel";
- pixel_x = -10;
- pixel_y = -25
- },
-/obj/machinery/door/window{
- base_state = "rightsecure";
- dir = 4;
- icon_state = "rightsecure";
- name = "Secondary AI Core Access";
- obj_integrity = 300;
- pixel_x = 4;
- req_access_txt = "16"
- },
-/turf/open/floor/circuit/green,
-/area/ai_monitored/turret_protected/ai)
-"aZY" = (
-/obj/effect/landmark/start/ai/secondary,
-/obj/item/radio/intercom{
- freerange = 1;
- listening = 0;
- name = "Custom Channel";
- pixel_x = 10;
- pixel_y = 22
- },
-/obj/item/radio/intercom{
- freerange = 1;
- name = "Common Channel";
- pixel_x = 27
- },
-/obj/item/radio/intercom{
- freerange = 1;
- frequency = 1447;
- name = "Private Channel";
- pixel_x = 10;
- pixel_y = -25
- },
-/obj/machinery/door/window{
- base_state = "leftsecure";
- dir = 8;
- icon_state = "leftsecure";
- name = "Tertiary AI Core Access";
- obj_integrity = 300;
- pixel_x = -3;
- req_access_txt = "16"
- },
-/turf/open/floor/circuit/green,
-/area/ai_monitored/turret_protected/ai)
"aZZ" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -7376,6 +7295,15 @@
"bbY" = (
/turf/open/floor/iron,
/area/hallway/primary/port)
+"bbZ" = (
+/obj/structure/table/glass,
+/obj/item/storage/box/donkpockets,
+/obj/item/reagent_containers/cup/soda_cans/thirteenloko{
+ pixel_x = -6;
+ pixel_y = 6
+ },
+/turf/open/floor/iron,
+/area/engine/break_room)
"bcc" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -8207,19 +8135,6 @@
},
/turf/open/floor/carpet/royalblue,
/area/crew_quarters/heads/captain/private)
-"bhu" = (
-/obj/machinery/light_switch{
- pixel_y = -25
- },
-/obj/structure/table/wood,
-/obj/item/razor{
- pixel_x = -4;
- pixel_y = 2
- },
-/obj/item/clothing/mask/cigarette/cigar,
-/obj/item/reagent_containers/food/drinks/flask/gold,
-/turf/open/floor/carpet/royalblue,
-/area/crew_quarters/heads/captain/private)
"bhv" = (
/obj/item/kirbyplants/random,
/turf/open/floor/carpet/royalblue,
@@ -10025,6 +9940,15 @@
/obj/item/stamp/captain,
/turf/open/floor/wood,
/area/crew_quarters/heads/captain/private)
+"btj" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/reagent_dispensers/watertank/high,
+/obj/item/reagent_containers/cup/bucket,
+/turf/open/floor/iron,
+/area/hydroponics)
"btu" = (
/obj/item/storage/toolbox/emergency,
/obj/effect/spawner/lootdrop/maintenance,
@@ -10657,11 +10581,6 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron/dark,
/area/crew_quarters/heads/captain/private)
-"byr" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/shaker,
-/turf/open/floor/carpet/royalblue,
-/area/crew_quarters/heads/captain/private)
"byv" = (
/obj/machinery/firealarm{
dir = 4;
@@ -12233,34 +12152,6 @@
},
/turf/open/floor/iron/dark/telecomms,
/area/tcommsat/server)
-"bHJ" = (
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/epinephrine{
- pixel_x = 7;
- pixel_y = -3
- },
-/obj/item/reagent_containers/glass/bottle/charcoal{
- pixel_x = -4;
- pixel_y = -3
- },
-/obj/item/reagent_containers/syringe/epinephrine{
- pixel_x = 3;
- pixel_y = -2
- },
-/obj/item/reagent_containers/dropper,
-/obj/item/reagent_containers/glass/beaker{
- pixel_x = 8;
- pixel_y = 2
- },
-/obj/effect/turf_decal/tile/blue/half/contrasted{
- dir = 4
- },
-/obj/effect/turf_decal/siding/dark_blue,
-/turf/open/floor/iron/white,
-/area/medical/medbay/lobby)
"bHK" = (
/obj/item/book/manual/wiki/security_space_law{
pixel_x = -3;
@@ -14573,24 +14464,6 @@
},
/turf/open/floor/iron,
/area/hydroponics)
-"bUn" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
-/obj/structure/window/reinforced{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/hydroponics)
-"bUo" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
-/turf/open/floor/iron,
-/area/hydroponics)
"bUq" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -15185,14 +15058,6 @@
},
/turf/open/floor/iron,
/area/hydroponics)
-"bYn" = (
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/bowl,
-/obj/structure/railing{
- dir = 1
- },
-/turf/open/floor/prison,
-/area/security/prison)
"bYs" = (
/obj/structure/table/reinforced,
/obj/item/pen,
@@ -16767,71 +16632,6 @@
/obj/effect/turf_decal/tile/brown/half/contrasted,
/turf/open/floor/iron,
/area/quartermaster/office)
-"cmb" = (
-/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/morphine{
- pixel_x = -4;
- pixel_y = 1
- },
-/obj/item/reagent_containers/glass/bottle/chloralhydrate,
-/obj/item/reagent_containers/glass/bottle/toxin{
- pixel_x = 6;
- pixel_y = 8
- },
-/obj/item/reagent_containers/glass/bottle/morphine{
- pixel_x = 5;
- pixel_y = 1
- },
-/obj/item/reagent_containers/syringe,
-/obj/item/reagent_containers/glass/bottle/facid{
- name = "fluorosulfuric acid bottle";
- pixel_x = -3;
- pixel_y = 6
- },
-/obj/item/reagent_containers/syringe{
- pixel_y = 5
- },
-/obj/item/reagent_containers/dropper,
-/obj/machinery/button/ignition{
- id = "executionburn";
- name = "Justice Ignition Switch";
- pixel_x = -25;
- pixel_y = 36
- },
-/obj/machinery/button/door{
- id = "executionfireblast";
- name = "Justice Area Lockdown";
- pixel_x = -25;
- pixel_y = 26;
- req_access_txt = "2"
- },
-/obj/item/assembly/signaler{
- pixel_x = -3;
- pixel_y = 2
- },
-/obj/machinery/button/flasher{
- id = "justiceflash";
- name = "Justice Flash Control";
- pixel_x = -36;
- pixel_y = 36;
- req_access_txt = "1"
- },
-/obj/machinery/button/door{
- id = "SecJusticeChamber";
- name = "Justice Vent Control";
- pixel_x = -36;
- pixel_y = 26;
- req_access_txt = "3"
- },
-/obj/effect/turf_decal/tile/red/half{
- dir = 4
- },
-/obj/machinery/airalarm/all_access{
- dir = 8;
- pixel_x = -24
- },
-/turf/open/floor/iron/dark/smooth_half,
-/area/security/execution/education)
"cmc" = (
/obj/structure/lattice,
/obj/structure/disposalpipe/segment,
@@ -17001,19 +16801,6 @@
/obj/effect/landmark/start/assistant,
/turf/open/floor/iron/freezer,
/area/crew_quarters/toilet/restrooms)
-"cou" = (
-/obj/item/reagent_containers/food/drinks/beer/almost_empty{
- pixel_x = 8;
- pixel_y = 12
- },
-/obj/structure/cable/yellow{
- icon_state = "1-4"
- },
-/obj/effect/turf_decal/trimline/purple/filled/line{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/science/shuttledock)
"cow" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -17905,6 +17692,28 @@
},
/turf/open/floor/iron,
/area/hallway/secondary/exit/departure_lounge)
+"cwo" = (
+/obj/structure/table,
+/obj/item/reagent_containers/cup/glass/sillycup{
+ pixel_x = -5;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/glass/sillycup,
+/obj/item/reagent_containers/cup/glass/sillycup{
+ pixel_x = 5;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/glass/sillycup{
+ pixel_x = 5;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/glass/sillycup{
+ pixel_x = 5;
+ pixel_y = 3
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/turf/open/floor/iron/dark,
+/area/crew_quarters/fitness/recreation)
"cwA" = (
/turf/open/floor/iron/white,
/area/medical/genetics)
@@ -18010,23 +17819,6 @@
},
/turf/open/floor/iron,
/area/hallway/primary/starboard)
-"cxP" = (
-/obj/structure/table/wood/poker,
-/obj/item/toy/cards/deck{
- pixel_x = -13;
- pixel_y = -10
- },
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
- pixel_x = -8;
- pixel_y = 8
- },
-/obj/item/holochip{
- credits = 30;
- pixel_x = 5;
- pixel_y = -4
- },
-/turf/open/floor/iron/techmaint,
-/area/science/shuttledock)
"cxT" = (
/obj/machinery/light{
dir = 4;
@@ -18147,26 +17939,6 @@
},
/turf/open/floor/iron/dark,
/area/science/xenobiology)
-"cyJ" = (
-/obj/structure/table/glass,
-/obj/item/stack/sheet/mineral/plasma{
- amount = 4;
- pixel_y = 4
- },
-/obj/item/reagent_containers/glass/beaker/large{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/reagent_containers/glass/beaker{
- pixel_x = 8;
- pixel_y = 2
- },
-/obj/item/reagent_containers/dropper,
-/obj/effect/turf_decal/trimline/purple/filled/line{
- dir = 1
- },
-/turf/open/floor/iron/white,
-/area/science/xenobiology)
"cyK" = (
/obj/structure/chair/office/light{
dir = 1
@@ -18558,20 +18330,6 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
/area/science/robotics/lab)
-"cDe" = (
-/obj/structure/sign/warning/nosmoking{
- pixel_y = 32
- },
-/obj/structure/rack,
-/obj/item/book/manual/wiki/robotics_cyborgs{
- pixel_x = 2;
- pixel_y = 5
- },
-/obj/item/storage/belt/utility,
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron,
-/area/science/robotics/lab)
"cDi" = (
/turf/closed/wall,
/area/science/robotics/lab)
@@ -19742,6 +19500,34 @@
},
/turf/open/floor/iron,
/area/hallway/secondary/exit/departure_lounge)
+"cPY" = (
+/obj/structure/table/glass,
+/obj/item/folder/white{
+ pixel_x = 6;
+ pixel_y = 12
+ },
+/obj/item/reagent_containers/cup/beaker/large{
+ pixel_x = -7;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = 6;
+ pixel_y = 4
+ },
+/obj/item/reagent_containers/dropper{
+ pixel_x = -2;
+ pixel_y = -4
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/requests_console{
+ department = "Chemistry Lab";
+ name = "Chemistry RC";
+ pixel_x = 32;
+ pixel_y = -2;
+ receive_ore_updates = 1
+ },
+/turf/open/floor/iron,
+/area/medical/chemistry)
"cPZ" = (
/obj/structure/closet/crate/coffin,
/turf/open/floor/plating,
@@ -21198,6 +20984,34 @@
},
/turf/open/floor/engine,
/area/engine/supermatter)
+"dfn" = (
+/obj/machinery/light/small{
+ dir = 1
+ },
+/obj/structure/table,
+/obj/item/reagent_containers/cup/bottle/epinephrine{
+ pixel_x = 7;
+ pixel_y = -3
+ },
+/obj/item/reagent_containers/cup/bottle/charcoal{
+ pixel_x = -4;
+ pixel_y = -3
+ },
+/obj/item/reagent_containers/syringe/epinephrine{
+ pixel_x = 3;
+ pixel_y = -2
+ },
+/obj/item/reagent_containers/dropper,
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = 8;
+ pixel_y = 2
+ },
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark_blue,
+/turf/open/floor/iron/white,
+/area/medical/medbay/lobby)
"dfp" = (
/obj/effect/turf_decal/bot{
dir = 1
@@ -21707,21 +21521,6 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard)
-"diw" = (
-/obj/machinery/firealarm{
- pixel_y = 29
- },
-/obj/structure/sign/poster/official/random{
- pixel_x = 32
- },
-/obj/structure/closet/crate/hydroponics,
-/obj/item/shovel/spade,
-/obj/item/wrench,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/cultivator,
-/obj/item/wirecutters,
-/turf/open/floor/iron,
-/area/hydroponics)
"diz" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -23372,16 +23171,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/engine/storage_shared)
-"dJG" = (
-/obj/structure/table/reinforced,
-/obj/item/kitchen/rollingpin,
-/obj/item/reagent_containers/food/condiment/flour{
- pixel_x = -2;
- pixel_y = 13
- },
-/obj/item/clothing/head/utility/chefhat,
-/turf/open/floor/prison,
-/area/security/prison)
"dJI" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 1
@@ -24009,6 +23798,71 @@
},
/turf/open/floor/iron,
/area/medical/storage)
+"dVH" = (
+/obj/structure/table,
+/obj/item/reagent_containers/cup/bottle/morphine{
+ pixel_x = -4;
+ pixel_y = 1
+ },
+/obj/item/reagent_containers/cup/bottle/chloralhydrate,
+/obj/item/reagent_containers/cup/bottle/toxin{
+ pixel_x = 6;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/bottle/morphine{
+ pixel_x = 5;
+ pixel_y = 1
+ },
+/obj/item/reagent_containers/syringe,
+/obj/item/reagent_containers/cup/bottle/facid{
+ name = "fluorosulfuric acid bottle";
+ pixel_x = -3;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/syringe{
+ pixel_y = 5
+ },
+/obj/item/reagent_containers/dropper,
+/obj/machinery/button/ignition{
+ id = "executionburn";
+ name = "Justice Ignition Switch";
+ pixel_x = -25;
+ pixel_y = 36
+ },
+/obj/machinery/button/door{
+ id = "executionfireblast";
+ name = "Justice Area Lockdown";
+ pixel_x = -25;
+ pixel_y = 26;
+ req_access_txt = "2"
+ },
+/obj/item/assembly/signaler{
+ pixel_x = -3;
+ pixel_y = 2
+ },
+/obj/machinery/button/flasher{
+ id = "justiceflash";
+ name = "Justice Flash Control";
+ pixel_x = -36;
+ pixel_y = 36;
+ req_access_txt = "1"
+ },
+/obj/machinery/button/door{
+ id = "SecJusticeChamber";
+ name = "Justice Vent Control";
+ pixel_x = -36;
+ pixel_y = 26;
+ req_access_txt = "3"
+ },
+/obj/effect/turf_decal/tile/red/half{
+ dir = 4
+ },
+/obj/machinery/airalarm/all_access{
+ dir = 8;
+ pixel_x = -24
+ },
+/turf/open/floor/iron/dark/smooth_half,
+/area/security/execution/education)
"dWb" = (
/obj/machinery/computer/shuttle_flight/mining{
dir = 4
@@ -26109,6 +25963,23 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/turf/open/floor/iron,
/area/hallway/primary/central)
+"ePG" = (
+/obj/structure/rack,
+/obj/item/storage/box/chemimp{
+ pixel_x = 4;
+ pixel_y = 3
+ },
+/obj/item/storage/box/trackimp,
+/obj/item/storage/lockbox/loyalty,
+/obj/item/reagent_containers/cup/bottle/morphine,
+/obj/machinery/light/small,
+/obj/machinery/firealarm{
+ dir = 4;
+ pixel_x = -26
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron,
+/area/security/main)
"eQa" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
@@ -26799,6 +26670,11 @@
},
/turf/open/floor/iron/smooth_half,
/area/security/prison)
+"feb" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/glass/shaker,
+/turf/open/floor/carpet/royalblue,
+/area/crew_quarters/heads/captain/private)
"feW" = (
/turf/open/floor/iron,
/area/maintenance/department/medical/central)
@@ -28502,21 +28378,6 @@
},
/turf/open/floor/iron,
/area/medical/storage)
-"fIY" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "kitchen";
- name = "Serving Hatch"
- },
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_x = -3
- },
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_x = 3
- },
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron/checker,
-/area/crew_quarters/kitchen)
"fJp" = (
/obj/effect/turf_decal/tile/red,
/turf/open/floor/iron/dark/smooth_corner,
@@ -29433,6 +29294,24 @@
},
/turf/open/floor/iron/dark,
/area/bridge)
+"fZX" = (
+/obj/item/reagent_containers/spray/plantbgone,
+/obj/item/reagent_containers/spray/pestspray{
+ pixel_x = 3;
+ pixel_y = 4
+ },
+/obj/item/reagent_containers/cup/bottle/nutrient/ez,
+/obj/item/reagent_containers/cup/bottle/nutrient/rh{
+ pixel_x = 2;
+ pixel_y = 1
+ },
+/obj/structure/table,
+/obj/structure/extinguisher_cabinet{
+ pixel_x = -27
+ },
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/iron,
+/area/hydroponics/garden)
"fZY" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -29825,6 +29704,18 @@
},
/turf/open/floor/iron/dark/smooth_large,
/area/maintenance/disposal/incinerator)
+"ghT" = (
+/obj/structure/table,
+/obj/item/hatchet,
+/obj/item/cultivator,
+/obj/item/crowbar,
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/plant_analyzer,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/hydroponics/garden)
"giF" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -29970,14 +29861,6 @@
/obj/item/restraints/handcuffs,
/turf/open/floor/iron/dark/smooth_large,
/area/security/main)
-"glg" = (
-/obj/structure/table/wood/poker,
-/obj/item/reagent_containers/food/drinks/bottle/wine{
- pixel_x = -9;
- pixel_y = 6
- },
-/turf/open/floor/iron/techmaint,
-/area/science/shuttledock)
"glr" = (
/obj/effect/landmark/xeno_spawn,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -30011,6 +29894,20 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/iron,
/area/engine/gravity_generator)
+"glP" = (
+/obj/structure/sign/warning/nosmoking{
+ pixel_y = 32
+ },
+/obj/structure/rack,
+/obj/item/book/manual/wiki/robotics_cyborgs{
+ pixel_x = 2;
+ pixel_y = 5
+ },
+/obj/item/storage/belt/utility,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/iron,
+/area/science/robotics/lab)
"gme" = (
/obj/item/radio/intercom{
pixel_y = 21
@@ -30688,6 +30585,29 @@
},
/turf/open/floor/plating/airless,
/area/space/nearstation)
+"gEa" = (
+/obj/machinery/button/door{
+ id = "chemistbot";
+ name = "Chemistry Shutter Control";
+ pixel_x = -36;
+ pixel_y = 37;
+ req_access_txt = "33"
+ },
+/obj/item/radio/intercom{
+ pixel_x = -32;
+ pixel_y = 23
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/obj/structure/table/glass,
+/obj/machinery/reagentgrinder{
+ pixel_y = 5
+ },
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
+/turf/open/floor/iron,
+/area/medical/chemistry)
"gEg" = (
/obj/structure/grille,
/turf/open/floor/plating,
@@ -30737,91 +30657,6 @@
},
/turf/open/floor/iron,
/area/hallway/secondary/service)
-"gEW" = (
-/obj/item/reagent_containers/glass/bottle/bromine{
- pixel_x = -6
- },
-/obj/item/reagent_containers/glass/bottle/aluminium{
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/bottle/chlorine{
- pixel_x = -6
- },
-/obj/item/reagent_containers/glass/bottle/carbon{
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/bottle/ethanol{
- pixel_x = -6
- },
-/obj/item/reagent_containers/glass/bottle/copper{
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/bottle/hydrogen{
- pixel_x = -6
- },
-/obj/item/reagent_containers/glass/bottle/fluorine{
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/bottle/water{
- pixel_y = 8
- },
-/obj/item/reagent_containers/glass/bottle/lithium{
- pixel_x = -6
- },
-/obj/item/reagent_containers/glass/bottle/iron{
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/bottle/iodine{
- pixel_y = 8
- },
-/obj/item/reagent_containers/glass/bottle/oxygen{
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/bottle/phosphorus{
- pixel_x = -6
- },
-/obj/item/reagent_containers/glass/bottle/nitrogen{
- pixel_x = -6;
- pixel_y = 8
- },
-/obj/item/reagent_containers/glass/bottle/mercury{
- pixel_x = 6;
- pixel_y = 8
- },
-/obj/item/reagent_containers/glass/bottle/radium{
- pixel_x = -6
- },
-/obj/item/reagent_containers/glass/bottle/potassium{
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/bottle/welding_fuel{
- pixel_y = 8
- },
-/obj/item/reagent_containers/glass/bottle/sacid{
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/bottle/silicon{
- pixel_x = -6
- },
-/obj/item/reagent_containers/glass/bottle/silver{
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/bottle/sodium{
- pixel_x = -6
- },
-/obj/item/reagent_containers/glass/bottle/sugar{
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/bottle/sulfur{
- pixel_x = -6
- },
-/obj/structure/closet/crate/medical,
-/obj/effect/turf_decal/box,
-/obj/item/circuitboard/machine/chem_heater,
-/obj/machinery/firealarm/directional/west,
-/obj/machinery/camera/directional/west,
-/turf/open/floor/iron,
-/area/medical/virology)
"gEX" = (
/obj/effect/decal/cleanable/cobweb,
/obj/structure/closet/crate{
@@ -30907,6 +30742,19 @@
},
/turf/open/floor/iron,
/area/hallway/primary/aft)
+"gGw" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = 11
+ },
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/mop,
+/obj/structure/sign/poster/random{
+ pixel_x = 32
+ },
+/turf/open/floor/iron,
+/area/janitor)
"gGB" = (
/obj/structure/cable/yellow{
icon_state = "2-4"
@@ -31303,6 +31151,30 @@
},
/turf/open/floor/wood,
/area/crew_quarters/bar)
+"gPx" = (
+/obj/structure/table,
+/obj/item/food/grown/tomato/blood{
+ pixel_x = 7;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/syringe{
+ pixel_x = -4;
+ pixel_y = 2
+ },
+/obj/machinery/vending/wallmed{
+ contraband = list(/obj/item/reagent_containers/cup/bottle/chloralhydrate = 1, /obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/cup/bottle/random_virus = 1);
+ name = "Upgraded NanoMed";
+ pixel_x = -1;
+ pixel_y = -32;
+ premium = list(/obj/item/storage/firstaid/regular = 3, /obj/item/storage/belt/medical = 3, /obj/item/sensor_device = 2, /obj/item/pinpointer/crew = 2, /obj/item/healthanalyzer = 2, /obj/item/wrench/medical = 1);
+ products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/reagent_containers/medspray = 6, /obj/item/storage/pill_bottle = 6, /obj/item/reagent_containers/cup/bottle = 10, /obj/item/reagent_containers/spray/cleaner = 1, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/hypospray/medipen = 8, /obj/item/reagent_containers/hypospray/medipen/dexalin = 8, /obj/item/reagent_containers/cup/bottle/epinephrine = 4, /obj/item/reagent_containers/cup/bottle/charcoal = 4, /obj/item/reagent_containers/cup/bottle/salglu_solution = 4, /obj/item/reagent_containers/cup/bottle/tricordrazine = 1, /obj/item/reagent_containers/cup/bottle/spaceacillin = 1, /obj/item/reagent_containers/cup/bottle/morphine = 2, /obj/item/reagent_containers/cup/bottle/toxin = 4, /obj/item/reagent_containers/medspray/sterilizine = 4)
+ },
+/obj/item/reagent_containers/dropper{
+ pixel_x = 2;
+ pixel_y = -5
+ },
+/turf/open/floor/iron/grid/steel,
+/area/medical/virology)
"gPy" = (
/obj/structure/cable/yellow{
icon_state = "1-8"
@@ -31781,6 +31653,19 @@
},
/turf/open/floor/iron,
/area/hallway/secondary/entry)
+"gWD" = (
+/obj/machinery/light_switch{
+ pixel_y = -25
+ },
+/obj/structure/table/wood,
+/obj/item/razor{
+ pixel_x = -4;
+ pixel_y = 2
+ },
+/obj/item/clothing/mask/cigarette/cigar,
+/obj/item/reagent_containers/cup/glass/flask/gold,
+/turf/open/floor/carpet/royalblue,
+/area/crew_quarters/heads/captain/private)
"gWG" = (
/obj/structure/rack,
/obj/item/storage/box/syringes{
@@ -34556,15 +34441,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/iron/white,
/area/medical/medbay/central)
-"hVW" = (
-/obj/structure/table/glass,
-/obj/item/storage/box/donkpockets,
-/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko{
- pixel_x = -6;
- pixel_y = 6
- },
-/turf/open/floor/iron,
-/area/engine/break_room)
"hVX" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
@@ -34864,6 +34740,14 @@
},
/turf/open/floor/iron,
/area/maintenance/disposal)
+"icb" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/cup/bowl,
+/obj/structure/railing{
+ dir = 1
+ },
+/turf/open/floor/prison,
+/area/security/prison)
"icd" = (
/obj/machinery/door/airlock/research/glass{
name = "science Shuttle Dock";
@@ -35742,6 +35626,23 @@
"irA" = (
/turf/open/floor/circuit/green/telecomms/mainframe,
/area/science/server)
+"irE" = (
+/obj/structure/table/wood/poker,
+/obj/item/toy/cards/deck{
+ pixel_x = -13;
+ pixel_y = -10
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = -8;
+ pixel_y = 8
+ },
+/obj/item/holochip{
+ credits = 30;
+ pixel_x = 5;
+ pixel_y = -4
+ },
+/turf/open/floor/iron/techmaint,
+/area/science/shuttledock)
"irK" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -36166,33 +36067,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/crew_quarters/heads/hor)
-"iBJ" = (
-/obj/structure/table/glass,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/light,
-/obj/item/stack/sheet/mineral/plasma{
- pixel_x = 2;
- pixel_y = 4
- },
-/obj/item/stack/sheet/mineral/plasma{
- pixel_x = 5
- },
-/obj/item/stack/sheet/mineral/plasma{
- pixel_x = 9
- },
-/obj/item/reagent_containers/glass/bottle/charcoal{
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/bottle/epinephrine,
-/obj/item/reagent_containers/dropper,
-/obj/item/storage/box/beakers{
- pixel_x = -6;
- pixel_y = 9
- },
-/turf/open/floor/iron/white,
-/area/medical/chemistry)
"iBM" = (
/obj/effect/turf_decal/tile/blue/fourcorners/contrasted,
/turf/open/floor/iron,
@@ -37184,30 +37058,6 @@
},
/turf/open/floor/iron,
/area/engine/break_room)
-"iTJ" = (
-/obj/structure/table,
-/obj/item/food/grown/tomato/blood{
- pixel_x = 7;
- pixel_y = 8
- },
-/obj/item/reagent_containers/syringe{
- pixel_x = -4;
- pixel_y = 2
- },
-/obj/machinery/vending/wallmed{
- contraband = list(/obj/item/reagent_containers/glass/bottle/chloralhydrate = 1, /obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/glass/bottle/random_virus = 1);
- name = "Upgraded NanoMed";
- pixel_x = -1;
- pixel_y = -32;
- premium = list(/obj/item/storage/firstaid/regular = 3, /obj/item/storage/belt/medical = 3, /obj/item/sensor_device = 2, /obj/item/pinpointer/crew = 2, /obj/item/healthanalyzer = 2, /obj/item/wrench/medical = 1);
- products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/reagent_containers/medspray = 6, /obj/item/storage/pill_bottle = 6, /obj/item/reagent_containers/glass/bottle = 10, /obj/item/reagent_containers/spray/cleaner = 1, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/hypospray/medipen = 8, /obj/item/reagent_containers/hypospray/medipen/dexalin = 8, /obj/item/reagent_containers/glass/bottle/epinephrine = 4, /obj/item/reagent_containers/glass/bottle/charcoal = 4, /obj/item/reagent_containers/glass/bottle/salglu_solution = 4, /obj/item/reagent_containers/glass/bottle/tricordrazine = 1, /obj/item/reagent_containers/glass/bottle/spaceacillin = 1, /obj/item/reagent_containers/glass/bottle/morphine = 2, /obj/item/reagent_containers/glass/bottle/toxin = 4, /obj/item/reagent_containers/medspray/sterilizine = 4)
- },
-/obj/item/reagent_containers/dropper{
- pixel_x = 2;
- pixel_y = -5
- },
-/turf/open/floor/iron/grid/steel,
-/area/medical/virology)
"iTT" = (
/obj/machinery/firealarm{
dir = 4;
@@ -37681,6 +37531,16 @@
},
/turf/open/floor/iron/white,
/area/medical/medbay/lobby)
+"jgA" = (
+/obj/structure/table/reinforced,
+/obj/item/kitchen/rollingpin,
+/obj/item/reagent_containers/condiment/flour{
+ pixel_x = -2;
+ pixel_y = 13
+ },
+/obj/item/clothing/head/utility/chefhat,
+/turf/open/floor/prison,
+/area/security/prison)
"jgG" = (
/obj/effect/turf_decal/tile/red/half,
/obj/structure/extinguisher_cabinet{
@@ -38056,6 +37916,15 @@
/obj/effect/landmark/start/medical_doctor,
/turf/open/floor/plating,
/area/medical/morgue)
+"jru" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/reagent_dispensers/watertank/high,
+/obj/item/reagent_containers/cup/bucket,
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/hydroponics)
"jrE" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -38210,6 +38079,28 @@
},
/turf/open/floor/plating,
/area/maintenance/port/fore)
+"jtD" = (
+/obj/machinery/turretid{
+ icon_state = "control_stun";
+ name = "AI Chamber turret control";
+ pixel_x = 3;
+ pixel_y = -23
+ },
+/obj/machinery/door/window{
+ base_state = "leftsecure";
+ dir = 8;
+ icon_state = "leftsecure";
+ name = "Primary AI Core Access";
+ atom_integrity = 300;
+ req_access_txt = "16"
+ },
+/obj/machinery/newscaster{
+ pixel_x = 4;
+ pixel_y = 33
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/turf/open/floor/iron/dark,
+/area/ai_monitored/turret_protected/ai)
"jtK" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -38943,6 +38834,18 @@
},
/turf/open/floor/wood/big,
/area/crew_quarters/bar)
+"jIT" = (
+/obj/structure/table/wood/poker,
+/obj/item/clothing/mask/cigarette/cigar{
+ pixel_x = -6;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{
+ pixel_x = 8;
+ pixel_y = 12
+ },
+/turf/open/floor/iron/techmaint,
+/area/science/shuttledock)
"jJj" = (
/obj/machinery/camera/directional/east{
c_tag = "Teleporter Room"
@@ -40207,6 +40110,18 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/maintenance/department/science)
+"kfb" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/table,
+/obj/item/storage/bag/plants,
+/obj/item/reagent_containers/cup/bucket,
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/item/kitchen/rollingpin,
+/obj/item/book/manual/wiki/sopservice,
+/turf/open/floor/iron,
+/area/hallway/secondary/service)
"kfm" = (
/obj/structure/closet/secure_closet/personal/cabinet,
/obj/machinery/airalarm/directional/north{
@@ -40327,29 +40242,6 @@
"kiq" = (
/turf/open/floor/iron/freezer,
/area/security/prison)
-"kir" = (
-/obj/machinery/button/door{
- id = "chemistbot";
- name = "Chemistry Shutter Control";
- pixel_x = -36;
- pixel_y = 37;
- req_access_txt = "33"
- },
-/obj/item/radio/intercom{
- pixel_x = -32;
- pixel_y = 23
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/obj/structure/table/glass,
-/obj/machinery/reagentgrinder{
- pixel_y = 5
- },
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/glass/beaker/large,
-/turf/open/floor/iron,
-/area/medical/chemistry)
"kiA" = (
/obj/structure/sign/warning/radiation/rad_area{
pixel_y = 32
@@ -40918,6 +40810,19 @@
},
/turf/open/floor/iron/dark,
/area/engine/engineering)
+"kuA" = (
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{
+ pixel_x = 8;
+ pixel_y = 12
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-4"
+ },
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/science/shuttledock)
"kuC" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/iron/dark,
@@ -42944,21 +42849,6 @@
},
/turf/open/floor/iron/white/textured_large,
/area/security/brig)
-"ljh" = (
-/obj/machinery/door/window{
- base_state = "rightsecure";
- dir = 4;
- icon_state = "rightsecure";
- name = "Primary AI Core Access";
- obj_integrity = 300;
- req_access_txt = "16"
- },
-/obj/machinery/camera/directional/north{
- c_tag = "AI Chamber - Core"
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
-/area/ai_monitored/turret_protected/ai)
"ljm" = (
/obj/machinery/door/airlock{
name = "Toilet Unit"
@@ -43724,17 +43614,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
/area/crew_quarters/fitness/recreation)
-"lyj" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/holywater{
- pixel_x = -2;
- pixel_y = 2
- },
-/obj/item/organ/heart,
-/obj/item/soulstone/anybody/chaplain,
-/obj/item/book/granter/spell/smoke/lesser,
-/turf/open/floor/cult,
-/area/chapel/office)
"lyF" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -44097,6 +43976,17 @@
},
/turf/open/floor/iron/dark/smooth_half,
/area/security/brig)
+"lGc" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/glass/bottle/holywater{
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/obj/item/organ/heart,
+/obj/item/soulstone/anybody/chaplain,
+/obj/item/book/granter/spell/smoke/lesser,
+/turf/open/floor/cult,
+/area/chapel/office)
"lGm" = (
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
@@ -44444,6 +44334,34 @@
},
/turf/open/floor/iron,
/area/science/robotics/mechbay)
+"lLe" = (
+/obj/structure/rack,
+/obj/item/storage/firstaid/regular,
+/obj/item/reagent_containers/cup/glass/bottle/beer{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/glass/bottle/beer{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/glass/bottle/beer{
+ pixel_x = -5
+ },
+/obj/item/reagent_containers/cup/glass/bottle/beer{
+ pixel_x = -5
+ },
+/obj/item/reagent_containers/cup/glass/bottle/beer{
+ pixel_x = -8;
+ pixel_y = -2
+ },
+/obj/item/reagent_containers/cup/glass/bottle/beer{
+ pixel_x = -8;
+ pixel_y = -2
+ },
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/techmaint,
+/area/science/shuttledock)
"lLf" = (
/obj/machinery/door/airlock/highsecurity{
name = "AI Upload";
@@ -44806,6 +44724,17 @@
},
/turf/open/floor/plating,
/area/maintenance/port/fore)
+"lRg" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/cup/glass/shaker,
+/obj/item/reagent_containers/cup/rag{
+ pixel_y = 5
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/turf/open/floor/wood/big,
+/area/crew_quarters/bar)
"lRs" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -44931,6 +44860,33 @@
},
/turf/open/floor/catwalk_floor/iron,
/area/engine/atmos)
+"lST" = (
+/obj/structure/table/glass,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/light,
+/obj/item/stack/sheet/mineral/plasma{
+ pixel_x = 2;
+ pixel_y = 4
+ },
+/obj/item/stack/sheet/mineral/plasma{
+ pixel_x = 5
+ },
+/obj/item/stack/sheet/mineral/plasma{
+ pixel_x = 9
+ },
+/obj/item/reagent_containers/cup/bottle/charcoal{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/epinephrine,
+/obj/item/reagent_containers/dropper,
+/obj/item/storage/box/beakers{
+ pixel_x = -6;
+ pixel_y = 9
+ },
+/turf/open/floor/iron/white,
+/area/medical/chemistry)
"lTw" = (
/obj/structure/window/reinforced{
dir = 8
@@ -45121,34 +45077,6 @@
},
/turf/open/floor/plating,
/area/maintenance/central)
-"lXA" = (
-/obj/structure/table/glass,
-/obj/item/folder/white{
- pixel_x = 6;
- pixel_y = 12
- },
-/obj/item/reagent_containers/glass/beaker/large{
- pixel_x = -7;
- pixel_y = 6
- },
-/obj/item/reagent_containers/glass/beaker{
- pixel_x = 6;
- pixel_y = 4
- },
-/obj/item/reagent_containers/dropper{
- pixel_x = -2;
- pixel_y = -4
- },
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/requests_console{
- department = "Chemistry Lab";
- name = "Chemistry RC";
- pixel_x = 32;
- pixel_y = -2;
- receive_ore_updates = 1
- },
-/turf/open/floor/iron,
-/area/medical/chemistry)
"lXH" = (
/obj/structure/cable/yellow{
icon_state = "2-8"
@@ -48082,6 +48010,19 @@
},
/turf/open/floor/iron,
/area/medical/genetics)
+"mZk" = (
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{
+ pixel_x = -4;
+ pixel_y = -7
+ },
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/science/shuttledock)
"mZn" = (
/obj/structure/table/wood,
/obj/structure/cable/yellow{
@@ -49727,34 +49668,6 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
-"nIt" = (
-/obj/structure/rack,
-/obj/item/storage/firstaid/regular,
-/obj/item/reagent_containers/food/drinks/beer{
- pixel_x = 6
- },
-/obj/item/reagent_containers/food/drinks/beer{
- pixel_x = 6
- },
-/obj/item/reagent_containers/food/drinks/beer{
- pixel_x = -5
- },
-/obj/item/reagent_containers/food/drinks/beer{
- pixel_x = -5
- },
-/obj/item/reagent_containers/food/drinks/beer{
- pixel_x = -8;
- pixel_y = -2
- },
-/obj/item/reagent_containers/food/drinks/beer{
- pixel_x = -8;
- pixel_y = -2
- },
-/obj/effect/turf_decal/trimline/purple/filled/line{
- dir = 1
- },
-/turf/open/floor/iron/techmaint,
-/area/science/shuttledock)
"nII" = (
/obj/structure/table/reinforced,
/obj/item/transfer_valve{
@@ -50050,23 +49963,6 @@
/obj/machinery/digital_clock/directional,
/turf/closed/wall,
/area/hallway/secondary/exit/departure_lounge)
-"nNC" = (
-/obj/structure/rack,
-/obj/item/storage/box/chemimp{
- pixel_x = 4;
- pixel_y = 3
- },
-/obj/item/storage/box/trackimp,
-/obj/item/storage/lockbox/loyalty,
-/obj/item/reagent_containers/glass/bottle/morphine,
-/obj/machinery/light/small,
-/obj/machinery/firealarm{
- dir = 4;
- pixel_x = -26
- },
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
-/area/security/main)
"nNG" = (
/obj/machinery/door/airlock/maintenance{
req_one_access_txt = "12;4;5;6;29"
@@ -50398,28 +50294,6 @@
},
/turf/open/floor/iron/white,
/area/medical/medbay/aft)
-"nSE" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/sillycup{
- pixel_x = -5;
- pixel_y = 3
- },
-/obj/item/reagent_containers/food/drinks/sillycup,
-/obj/item/reagent_containers/food/drinks/sillycup{
- pixel_x = 5;
- pixel_y = 3
- },
-/obj/item/reagent_containers/food/drinks/sillycup{
- pixel_x = 5;
- pixel_y = 3
- },
-/obj/item/reagent_containers/food/drinks/sillycup{
- pixel_x = 5;
- pixel_y = 3
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
-/area/crew_quarters/fitness/recreation)
"nSF" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -51237,6 +51111,19 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/iron,
/area/hallway/primary/port)
+"ogP" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -3
+ },
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = 3
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 6
+ },
+/turf/open/floor/wood/big,
+/area/crew_quarters/bar)
"ohh" = (
/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{
name = "euthanization chamber freezer"
@@ -52943,6 +52830,25 @@
},
/turf/open/floor/iron/white,
/area/medical/medbay/lobby)
+"oJk" = (
+/obj/structure/table/reinforced,
+/obj/structure/desk_bell{
+ pixel_x = 8
+ },
+/obj/item/reagent_containers/cup/glass/britcup{
+ pixel_x = -5;
+ pixel_y = 1
+ },
+/obj/effect/turf_decal/tile/blue/fourcorners/contrasted,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/white,
+/area/medical/medbay/lobby)
"oJn" = (
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 4
@@ -54426,18 +54332,6 @@
/obj/item/xenoartifact,
/turf/open/floor/engine,
/area/science/explab)
-"ppT" = (
-/obj/structure/table/wood/poker,
-/obj/item/clothing/mask/cigarette/cigar{
- pixel_x = -6;
- pixel_y = 3
- },
-/obj/item/reagent_containers/food/drinks/beer/almost_empty{
- pixel_x = 8;
- pixel_y = 12
- },
-/turf/open/floor/iron/techmaint,
-/area/science/shuttledock)
"ppV" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/holopad,
@@ -55487,6 +55381,17 @@
},
/turf/open/floor/iron,
/area/engine/engineering)
+"pLS" = (
+/obj/structure/table,
+/obj/item/kitchen/rollingpin,
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = 3
+ },
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -3
+ },
+/turf/open/floor/iron/checker,
+/area/crew_quarters/kitchen)
"pLY" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -55675,6 +55580,21 @@
},
/turf/open/floor/iron,
/area/hallway/secondary/exit/departure_lounge)
+"pPq" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "kitchen";
+ name = "Serving Hatch"
+ },
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -3
+ },
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = 3
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/checker,
+/area/crew_quarters/kitchen)
"pPJ" = (
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 4
@@ -56487,6 +56407,14 @@
},
/turf/open/floor/wood,
/area/crew_quarters/theatre)
+"qdo" = (
+/obj/structure/table/wood/poker,
+/obj/item/reagent_containers/cup/glass/bottle/wine{
+ pixel_x = -9;
+ pixel_y = 6
+ },
+/turf/open/floor/iron/techmaint,
+/area/science/shuttledock)
"qdC" = (
/obj/effect/turf_decal/trimline/blue/filled/line,
/turf/open/floor/iron/white,
@@ -60166,17 +60094,6 @@
},
/turf/open/floor/iron/white,
/area/medical/virology)
-"rwt" = (
-/obj/structure/table,
-/obj/item/kitchen/rollingpin,
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_x = 3
- },
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_x = -3
- },
-/turf/open/floor/iron/checker,
-/area/crew_quarters/kitchen)
"rxb" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "kitchen";
@@ -60913,32 +60830,6 @@
},
/turf/open/floor/iron,
/area/crew_quarters/locker)
-"rMj" = (
-/obj/structure/table,
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
- pixel_x = -6;
- pixel_y = 6
- },
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
- pixel_x = 6;
- pixel_y = 6
- },
-/obj/item/storage/pill_bottle/mannitol,
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
- pixel_x = -2;
- pixel_y = 9
- },
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
- pixel_x = 5;
- pixel_y = 9
- },
-/obj/item/wrench/medical,
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/iron,
-/area/medical/patients_rooms)
"rMo" = (
/obj/structure/cable{
icon_state = "0-8"
@@ -63433,17 +63324,6 @@
},
/turf/open/floor/iron,
/area/science/storage)
-"sGn" = (
-/obj/item/cultivator,
-/obj/item/crowbar,
-/obj/item/plant_analyzer,
-/obj/item/reagent_containers/glass/bucket,
-/obj/structure/table/glass,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/hallway/primary/central)
"sGG" = (
/obj/structure/table/wood,
/obj/item/paper_bin{
@@ -63668,6 +63548,19 @@
/obj/effect/mapping_helpers/make_non_slip,
/turf/open/floor/iron,
/area/engine/engineering)
+"sKq" = (
+/obj/structure/table,
+/obj/item/cultivator,
+/obj/item/hatchet,
+/obj/item/crowbar,
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/item/plant_analyzer,
+/obj/item/reagent_containers/cup/bucket,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/iron,
+/area/hydroponics/garden)
"sKv" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -65976,6 +65869,21 @@
/mob/living/carbon/monkey,
/turf/open/floor/iron/freezer,
/area/medical/genetics)
+"tAZ" = (
+/obj/machinery/firealarm{
+ pixel_y = 29
+ },
+/obj/structure/sign/poster/official/random{
+ pixel_x = 32
+ },
+/obj/structure/closet/crate/hydroponics,
+/obj/item/shovel/spade,
+/obj/item/wrench,
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/cultivator,
+/obj/item/wirecutters,
+/turf/open/floor/iron,
+/area/hydroponics)
"tBl" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 6
@@ -66232,30 +66140,6 @@
},
/turf/open/floor/iron/dark,
/area/bridge)
-"tGk" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
- pixel_x = 2;
- pixel_y = 12
- },
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
- pixel_x = -6;
- pixel_y = 8
- },
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
- pixel_x = 9;
- pixel_y = 12
- },
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
- pixel_x = 5;
- pixel_y = 5
- },
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
- pixel_x = 2;
- pixel_y = -1
- },
-/turf/open/floor/iron/grid/steel,
-/area/medical/virology)
"tGF" = (
/obj/structure/table,
/obj/item/storage/box/evidence,
@@ -66500,19 +66384,6 @@
},
/turf/open/floor/iron/dark/smooth_large,
/area/security/brig)
-"tLJ" = (
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_x = -3
- },
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_x = 3
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 6
- },
-/turf/open/floor/wood/big,
-/area/crew_quarters/bar)
"tLK" = (
/obj/structure/chair{
dir = 4
@@ -68484,6 +68355,38 @@
},
/turf/closed/wall,
/area/quartermaster/sorting)
+"uuJ" = (
+/obj/effect/landmark/start/ai/secondary,
+/obj/item/radio/intercom{
+ freerange = 1;
+ listening = 0;
+ name = "Custom Channel";
+ pixel_x = 10;
+ pixel_y = 22
+ },
+/obj/item/radio/intercom{
+ freerange = 1;
+ name = "Common Channel";
+ pixel_x = 27
+ },
+/obj/item/radio/intercom{
+ freerange = 1;
+ frequency = 1447;
+ name = "Private Channel";
+ pixel_x = 10;
+ pixel_y = -25
+ },
+/obj/machinery/door/window{
+ base_state = "leftsecure";
+ dir = 8;
+ icon_state = "leftsecure";
+ name = "Tertiary AI Core Access";
+ atom_integrity = 300;
+ pixel_x = -3;
+ req_access_txt = "16"
+ },
+/turf/open/floor/circuit/green,
+/area/ai_monitored/turret_protected/ai)
"uuZ" = (
/obj/machinery/light{
dir = 1
@@ -68751,25 +68654,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/maintenance/aft)
-"uzP" = (
-/obj/structure/table/reinforced,
-/obj/structure/desk_bell{
- pixel_x = 8
- },
-/obj/item/reagent_containers/food/drinks/britcup{
- pixel_x = -5;
- pixel_y = 1
- },
-/obj/effect/turf_decal/tile/blue/fourcorners/contrasted,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron/white,
-/area/medical/medbay/lobby)
"uAd" = (
/obj/machinery/door/poddoor/preopen{
id = "executionfireblast"
@@ -69823,6 +69707,26 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/white,
/area/science/xenobiology)
+"uUg" = (
+/obj/structure/table/glass,
+/obj/item/stack/sheet/mineral/plasma{
+ amount = 4;
+ pixel_y = 4
+ },
+/obj/item/reagent_containers/cup/beaker/large{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = 8;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/dropper,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/white,
+/area/science/xenobiology)
"uUA" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 8
@@ -70412,19 +70316,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plating,
/area/maintenance/starboard)
-"vfv" = (
-/obj/item/reagent_containers/food/drinks/beer/almost_empty{
- pixel_x = -4;
- pixel_y = -7
- },
-/obj/machinery/light{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/purple/filled/line{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/science/shuttledock)
"vfy" = (
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
@@ -71509,6 +71400,38 @@
},
/turf/open/floor/wood,
/area/crew_quarters/heads/captain/private)
+"vzK" = (
+/obj/effect/landmark/start/ai/secondary,
+/obj/item/radio/intercom{
+ freerange = 1;
+ listening = 0;
+ name = "Custom Channel";
+ pixel_x = -10;
+ pixel_y = 22
+ },
+/obj/item/radio/intercom{
+ freerange = 1;
+ name = "Common Channel";
+ pixel_x = -27
+ },
+/obj/item/radio/intercom{
+ freerange = 1;
+ frequency = 1447;
+ name = "Private Channel";
+ pixel_x = -10;
+ pixel_y = -25
+ },
+/obj/machinery/door/window{
+ base_state = "rightsecure";
+ dir = 4;
+ icon_state = "rightsecure";
+ name = "Secondary AI Core Access";
+ atom_integrity = 300;
+ pixel_x = 4;
+ req_access_txt = "16"
+ },
+/turf/open/floor/circuit/green,
+/area/ai_monitored/turret_protected/ai)
"vzS" = (
/obj/machinery/portable_atmospherics/canister/plasma,
/obj/effect/turf_decal/delivery/red,
@@ -72016,17 +71939,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/maintenance/central)
-"vJj" = (
-/obj/structure/table,
-/obj/item/reagent_containers/glass/beaker{
- pixel_x = 5
- },
-/obj/item/reagent_containers/food/condiment/enzyme{
- pixel_y = 6
- },
-/obj/item/food/mint,
-/turf/open/floor/iron/checker,
-/area/crew_quarters/kitchen)
"vJo" = (
/obj/machinery/power/apc{
areastring = "/area/construction/storage_wing";
@@ -72421,6 +72333,17 @@
/obj/machinery/camera/directional/west,
/turf/open/floor/iron/grid/steel,
/area/medical/virology)
+"vOq" = (
+/obj/structure/table,
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = 5
+ },
+/obj/item/reagent_containers/condiment/enzyme{
+ pixel_y = 6
+ },
+/obj/item/food/mint,
+/turf/open/floor/iron/checker,
+/area/crew_quarters/kitchen)
"vOs" = (
/obj/machinery/status_display/evac{
pixel_x = -32
@@ -73065,18 +72988,6 @@
},
/turf/open/floor/iron/white/smooth_corner,
/area/security/brig)
-"wdI" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/table,
-/obj/item/storage/bag/plants,
-/obj/item/reagent_containers/glass/bucket,
-/obj/machinery/light{
- dir = 1
- },
-/obj/item/kitchen/rollingpin,
-/obj/item/book/manual/wiki/sopservice,
-/turf/open/floor/iron,
-/area/hallway/secondary/service)
"wdQ" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 4
@@ -73395,17 +73306,6 @@
},
/turf/open/floor/iron,
/area/quartermaster/sorting)
-"wld" = (
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/shaker,
-/obj/item/reagent_containers/glass/rag{
- pixel_y = 5
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/turf/open/floor/wood/big,
-/area/crew_quarters/bar)
"wlg" = (
/obj/machinery/requests_console{
announcementConsole = 1;
@@ -76459,19 +76359,6 @@
"xol" = (
/turf/closed/wall,
/area/medical/medbay/aft)
-"xop" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sink{
- dir = 4;
- pixel_x = 11
- },
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/mop,
-/obj/structure/sign/poster/random{
- pixel_x = 32
- },
-/turf/open/floor/iron,
-/area/janitor)
"xoA" = (
/obj/machinery/camera/directional/north,
/obj/machinery/power/apc{
@@ -77444,28 +77331,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/iron/dark,
/area/aisat)
-"xFe" = (
-/obj/machinery/turretid{
- icon_state = "control_stun";
- name = "AI Chamber turret control";
- pixel_x = 3;
- pixel_y = -23
- },
-/obj/machinery/door/window{
- base_state = "leftsecure";
- dir = 8;
- icon_state = "leftsecure";
- name = "Primary AI Core Access";
- obj_integrity = 300;
- req_access_txt = "16"
- },
-/obj/machinery/newscaster{
- pixel_x = 4;
- pixel_y = 33
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron/dark,
-/area/ai_monitored/turret_protected/ai)
"xFt" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -77802,6 +77667,30 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/maintenance/aft)
+"xKt" = (
+/obj/structure/table,
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
+ pixel_x = 2;
+ pixel_y = 12
+ },
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
+ pixel_x = -6;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
+ pixel_x = 9;
+ pixel_y = 12
+ },
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
+ pixel_x = 5;
+ pixel_y = 5
+ },
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
+ pixel_x = 2;
+ pixel_y = -1
+ },
+/turf/open/floor/iron/grid/steel,
+/area/medical/virology)
"xLb" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -77814,6 +77703,91 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/iron,
/area/engine/break_room)
+"xLx" = (
+/obj/item/reagent_containers/cup/bottle/bromine{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/aluminium{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/chlorine{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/carbon{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/ethanol{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/copper{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/hydrogen{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/fluorine{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/water{
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/bottle/lithium{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/iron{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/iodine{
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/bottle/oxygen{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/phosphorus{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/nitrogen{
+ pixel_x = -6;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/bottle/mercury{
+ pixel_x = 6;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/bottle/radium{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/potassium{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/welding_fuel{
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/bottle/sacid{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/silicon{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/silver{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/sodium{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/sugar{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/sulfur{
+ pixel_x = -6
+ },
+/obj/structure/closet/crate/medical,
+/obj/effect/turf_decal/box,
+/obj/item/circuitboard/machine/chem_heater,
+/obj/machinery/firealarm/directional/west,
+/obj/machinery/camera/directional/west,
+/turf/open/floor/iron,
+/area/medical/virology)
"xLI" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
@@ -78181,6 +78155,21 @@
},
/turf/open/floor/iron/grid/steel,
/area/medical/virology)
+"xRG" = (
+/obj/machinery/door/window{
+ base_state = "rightsecure";
+ dir = 4;
+ icon_state = "rightsecure";
+ name = "Primary AI Core Access";
+ atom_integrity = 300;
+ req_access_txt = "16"
+ },
+/obj/machinery/camera/directional/north{
+ c_tag = "AI Chamber - Core"
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/turf/open/floor/iron/dark,
+/area/ai_monitored/turret_protected/ai)
"xSa" = (
/obj/structure/closet/secure_closet/security/sec,
/obj/effect/turf_decal/bot,
@@ -78702,6 +78691,17 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
/area/security/brig)
+"ybm" = (
+/obj/item/cultivator,
+/obj/item/crowbar,
+/obj/item/plant_analyzer,
+/obj/item/reagent_containers/cup/bucket,
+/obj/structure/table/glass,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/hallway/primary/central)
"ybn" = (
/obj/structure/chair/fancy/comfy,
/obj/effect/landmark/blobstart,
@@ -98701,7 +98701,7 @@ dle
wEb
npX
rEg
-gEW
+xLx
osp
fKN
dDz
@@ -98956,7 +98956,7 @@ dSx
jNU
ybs
lzI
-tGk
+xKt
gFh
vdt
lzI
@@ -99218,7 +99218,7 @@ dQx
mnd
coa
lzI
-iTJ
+gPx
cDL
avr
avr
@@ -100737,7 +100737,7 @@ mpW
mpW
feW
ycr
-rMj
+ald
smE
nqq
vNW
@@ -101795,7 +101795,7 @@ cCe
eEV
jRz
cLa
-lyj
+lGc
cLa
oUI
cOh
@@ -102720,9 +102720,9 @@ ttO
ttO
ttO
ttO
-bYn
+icb
kZQ
-dJG
+jgA
qOU
tlg
aqj
@@ -103232,7 +103232,7 @@ abx
abV
acm
uAd
-cmb
+dVH
adm
sdu
iiC
@@ -103819,7 +103819,7 @@ bSS
bSS
nll
lJT
-uzP
+oJk
bya
otF
vxg
@@ -104587,7 +104587,7 @@ aYX
iov
bXN
mdh
-bHJ
+dfn
tMi
sRD
lQG
@@ -105107,7 +105107,7 @@ uNs
rhj
wsV
fHf
-kir
+gEa
pFa
gvA
acB
@@ -105627,7 +105627,7 @@ pYp
gVH
spm
kUs
-iBJ
+lST
cga
oIj
rdQ
@@ -106135,7 +106135,7 @@ oJb
aAv
tiS
rrO
-lXA
+cPY
kKG
uml
wsV
@@ -106327,7 +106327,7 @@ jIc
veD
fnW
ipQ
-nNC
+ePG
aqa
lFK
qUA
@@ -108724,7 +108724,7 @@ ctL
ctL
ctL
cCq
-cDe
+glP
fzR
oPJ
gHe
@@ -109699,7 +109699,7 @@ iCU
bcj
bdI
bfz
-bhu
+gWD
bjg
egk
bjg
@@ -109965,7 +109965,7 @@ bqX
cDV
dCP
mZn
-byr
+feb
iWz
bcj
bDs
@@ -112296,7 +112296,7 @@ soe
oxO
oxO
mkI
-sGn
+ybm
tjn
vgq
bSS
@@ -112534,7 +112534,7 @@ boM
brd
bmO
nXB
-wld
+lRg
oFU
eaJ
eNK
@@ -112804,7 +112804,7 @@ hfh
ujJ
paP
qqj
-vJj
+vOq
bST
bUf
vWU
@@ -113059,7 +113059,7 @@ blf
rxb
ujJ
ujJ
-rwt
+pLS
qqj
nSl
bST
@@ -113602,7 +113602,7 @@ cvX
lft
cwY
thn
-cyJ
+uUg
cSt
pVv
gWG
@@ -113827,7 +113827,7 @@ xTu
kJK
xTu
blf
-fIY
+pPq
ujJ
nuZ
wde
@@ -114078,7 +114078,7 @@ kky
bmP
ifc
jIy
-tLJ
+ogP
tkd
xTu
kJK
@@ -114797,7 +114797,7 @@ aaa
aaf
aaa
acQ
-nSE
+cwo
kAr
mbZ
tsT
@@ -115119,7 +115119,7 @@ bOX
bQI
uee
bST
-bUn
+jru
mPh
gzi
nrx
@@ -115376,7 +115376,7 @@ rFZ
rFZ
aoW
bST
-bUo
+btj
bVy
bWU
xSD
@@ -115594,7 +115594,7 @@ dIq
aCH
eYL
aJh
-aKp
+fZX
hWI
vAZ
oUR
@@ -115857,7 +115857,7 @@ aNi
mlI
aNi
cNf
-aSk
+ghT
aJh
ltK
dnR
@@ -116108,7 +116108,7 @@ mpL
hmU
twq
aJh
-aKr
+sKq
mhI
aNi
lcQ
@@ -116149,7 +116149,7 @@ cgF
bSY
bUq
bKe
-diw
+tAZ
pvg
sLD
gba
@@ -116663,7 +116663,7 @@ byN
rPM
tUh
bVz
-wdI
+kfb
nKe
bVz
ogw
@@ -116684,10 +116684,10 @@ ovj
mjJ
nBT
lzk
-cou
-nIt
+kuA
+lLe
qjB
-ppT
+jIT
jqu
pVN
dJI
@@ -116943,8 +116943,8 @@ xGh
ubB
eal
oFp
-cxP
-glg
+irE
+qdo
tMl
fmT
ggj
@@ -117457,7 +117457,7 @@ mjJ
mjJ
kvL
uFK
-vfv
+mZk
hUs
hUs
bxk
@@ -117955,7 +117955,7 @@ oxX
bcd
xdW
lUZ
-xop
+gGw
kwL
bcd
nbv
@@ -121009,7 +121009,7 @@ iKI
iKI
ofV
fvZ
-hVW
+bbZ
bne
owR
owR
@@ -133338,7 +133338,7 @@ aRy
aTV
aTV
aTV
-aZQ
+vzK
aTV
aTV
aTV
@@ -134109,7 +134109,7 @@ aTV
aVn
aWN
aTV
-xFe
+jtD
aTV
aTV
sUk
@@ -134623,7 +134623,7 @@ aTX
taY
aWP
aTV
-ljh
+xRG
aTV
aTV
bew
@@ -135394,7 +135394,7 @@ aRy
aTV
aTV
aTV
-aZY
+uuJ
aTV
aTV
aTV
diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm
index 2f12771147948..ec3253b933315 100644
--- a/_maps/map_files/Mining/Lavaland.dmm
+++ b/_maps/map_files/Mining/Lavaland.dmm
@@ -943,10 +943,10 @@
/area/mine/living_quarters)
"gD" = (
/obj/structure/closet/secure_closet/freezer/kitchen/maintenance,
-/obj/item/reagent_containers/food/condiment/sugar,
+/obj/item/reagent_containers/condiment/sugar,
/obj/item/food/tofu/prison,
/obj/item/knife/kitchen,
-/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/item/reagent_containers/condiment/enzyme,
/obj/item/kitchen/rollingpin,
/obj/item/wrench,
/obj/effect/turf_decal/tile/bar/opposingcorners,
@@ -2760,7 +2760,7 @@
"tM" = (
/obj/structure/table,
/obj/effect/landmark/event_spawn,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
/obj/item/shovel/spade,
/obj/item/cultivator,
/turf/open/floor/iron/grid/steel,
@@ -2916,7 +2916,7 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"uL" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/bot,
/obj/structure/reagent_dispensers/watertank/high,
/turf/open/floor/iron/grid/steel,
@@ -3670,15 +3670,15 @@
/area/mine/laborcamp)
"Bd" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 7;
pixel_y = 5
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -1;
pixel_y = 9
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -8
},
/obj/effect/turf_decal/tile/bar/opposingcorners,
@@ -4702,10 +4702,10 @@
/area/mine/laborcamp/security)
"IX" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_y = 2
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 2
},
/obj/effect/turf_decal/tile/bar/opposingcorners,
@@ -5304,7 +5304,7 @@
/obj/structure/table,
/obj/item/plate,
/obj/item/kitchen/fork,
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
pixel_x = -5;
pixel_y = 1
},
@@ -5558,10 +5558,10 @@
"Pp" = (
/obj/structure/table,
/obj/item/storage/bag/tray,
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour{
pixel_x = 3
},
-/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
/turf/open/floor/iron/grid/steel,
/area/mine/laborcamp)
"Pz" = (
@@ -5646,8 +5646,8 @@
/area/lavaland/surface/outdoors)
"Qc" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/coffee,
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee,
+/obj/item/reagent_containers/cup/glass/coffee{
pixel_x = 8;
pixel_y = 6
},
@@ -6726,19 +6726,19 @@
/area/lavaland/surface/outdoors)
"XP" = (
/obj/structure/closet/secure_closet/freezer/fridge/open,
-/obj/item/reagent_containers/food/drinks/drinkingglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/drinkingglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass,
+/obj/item/reagent_containers/cup/glass/bottle/beer{
desc = "Whatever it is, it reeks of foul, putrid froth.";
list_reagents = list(/datum/reagent/consumable/ethanol/bacchus_blessing=15);
name = "Delta-Down";
pixel_x = 5;
pixel_y = 5
},
-/obj/item/reagent_containers/food/drinks/bottle/champagne,
-/obj/item/reagent_containers/food/drinks/bottle/cognac,
-/obj/item/reagent_containers/food/drinks/bottle/lizardwine,
+/obj/item/reagent_containers/cup/glass/bottle/champagne,
+/obj/item/reagent_containers/cup/glass/bottle/cognac,
+/obj/item/reagent_containers/cup/glass/bottle/lizardwine,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/vomit/old,
/turf/open/floor/carpet/black,
diff --git a/_maps/map_files/RadStation/RadStation.dmm b/_maps/map_files/RadStation/RadStation.dmm
index ee40069275007..9dc77b97fe12b 100644
--- a/_maps/map_files/RadStation/RadStation.dmm
+++ b/_maps/map_files/RadStation/RadStation.dmm
@@ -12,25 +12,6 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/tech,
/area/engine/engine_room)
-"aak" = (
-/obj/structure/extinguisher_cabinet{
- pixel_x = 32;
- pixel_y = -1
- },
-/obj/structure/closet/secure_closet/captains,
-/obj/item/book/manual/wiki/security_space_law,
-/obj/item/reagent_containers/food/drinks/flask/gold{
- pixel_x = 3;
- pixel_y = 8
- },
-/obj/item/pinpointer/nuke{
- pixel_y = 5
- },
-/obj/structure/extinguisher_cabinet{
- pixel_y = 32
- },
-/turf/open/floor/carpet/blue,
-/area/crew_quarters/heads/captain/private)
"aap" = (
/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{
alpha = 180;
@@ -843,6 +824,20 @@
},
/turf/open/floor/carpet/blue,
/area/bridge/meeting_room)
+"ane" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/table,
+/obj/machinery/reagentgrinder{
+ pixel_x = -1;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/condiment/enzyme{
+ pixel_x = 13;
+ pixel_y = 17
+ },
+/turf/open/floor/iron/white,
+/area/crew_quarters/kitchen)
"anx" = (
/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{
alpha = 180;
@@ -1338,6 +1333,30 @@
/obj/structure/sign/departments/minsky/research/dorms,
/turf/closed/wall,
/area/maintenance/central)
+"aug" = (
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
+ pixel_x = -1;
+ pixel_y = 1
+ },
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
+ pixel_x = -2;
+ pixel_y = 11
+ },
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
+ pixel_x = 8;
+ pixel_y = 10
+ },
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
+ pixel_x = 9
+ },
+/obj/item/storage/pill_bottle/mannitol{
+ pixel_x = -10;
+ pixel_y = 3
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/structure/table/glass,
+/turf/open/floor/iron,
+/area/medical/cryo)
"aui" = (
/obj/machinery/conveyor{
id = "MailConv"
@@ -2571,29 +2590,6 @@
"aNU" = (
/turf/closed/wall/r_wall,
/area/ai_monitored/storage/satellite)
-"aOm" = (
-/obj/structure/table,
-/obj/item/food/spaghetti/meatballspaghetti{
- pixel_x = -6;
- pixel_y = 4
- },
-/obj/item/reagent_containers/food/drinks/bottle/absinthe{
- pixel_x = -10;
- pixel_y = 15
- },
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
- pixel_x = 3;
- pixel_y = 15
- },
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
- pixel_x = 9;
- pixel_y = 10
- },
-/obj/item/candle/infinite{
- pixel_x = 8
- },
-/turf/open/floor/iron/dark,
-/area/security/execution/education)
"aOq" = (
/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{
alpha = 180;
@@ -3064,22 +3060,6 @@
/obj/structure/chair/stool/directional/west,
/turf/open/floor/carpet/royalblack,
/area/library)
-"aVk" = (
-/obj/machinery/light{
- light_color = "#7AC3FF"
- },
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_y = 25
- },
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_y = 21
- },
-/obj/machinery/computer/security/telescreen/entertainment{
- pixel_y = -32
- },
-/obj/structure/table/wood,
-/turf/open/floor/carpet/green,
-/area/crew_quarters/cafeteria)
"aVu" = (
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 1
@@ -4250,6 +4230,40 @@
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron/dark,
/area/bridge/meeting_room)
+"bqq" = (
+/obj/effect/turf_decal/tile/black/fourcorners,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/structure/table,
+/obj/machinery/reagentgrinder{
+ pixel_x = -1;
+ pixel_y = 12
+ },
+/obj/item/reagent_containers/cup/bucket{
+ pixel_x = -8
+ },
+/obj/item/reagent_containers/cup/bucket{
+ pixel_x = -4
+ },
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/reagent_containers/cup/bucket{
+ pixel_x = 4
+ },
+/obj/item/shovel/spade{
+ pixel_x = -5;
+ pixel_y = -4
+ },
+/obj/item/cultivator{
+ pixel_x = -2;
+ pixel_y = -1
+ },
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/open/floor/iron/techmaint,
+/area/security/prison)
"bqy" = (
/obj/machinery/requests_console{
department = "Security";
@@ -4366,18 +4380,6 @@
},
/turf/open/floor/iron,
/area/security/brig)
-"brj" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 4
- },
-/obj/structure/table,
-/obj/item/reagent_containers/glass/mortar,
-/obj/item/pestle,
-/obj/structure/cable/yellow{
- icon_state = "1-4"
- },
-/turf/open/floor/iron,
-/area/vacant_room/commissary/commissary2)
"brn" = (
/obj/structure/railing/corner{
dir = 1
@@ -5760,20 +5762,6 @@
},
/turf/open/floor/iron/white,
/area/medical/medbay/lobby)
-"bPM" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/table,
-/obj/machinery/reagentgrinder{
- pixel_x = -1;
- pixel_y = 8
- },
-/obj/item/reagent_containers/food/condiment/enzyme{
- pixel_x = 13;
- pixel_y = 17
- },
-/turf/open/floor/iron/white,
-/area/crew_quarters/kitchen)
"bPR" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -6610,6 +6598,15 @@
},
/turf/open/floor/iron/dark,
/area/engine/atmos)
+"cey" = (
+/obj/structure/table,
+/obj/item/reagent_containers/cup/glass/britcup{
+ pixel_x = -5;
+ pixel_y = 1
+ },
+/obj/item/paper,
+/turf/open/floor/wood,
+/area/security/prison)
"ceW" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -7261,6 +7258,43 @@
},
/turf/open/floor/iron/dark,
/area/storage/primary)
+"col" = (
+/obj/structure/table/glass,
+/obj/item/reagent_containers/cup/bottle/epinephrine{
+ pixel_x = -7;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/cup/bottle/epinephrine{
+ pixel_x = 7;
+ pixel_y = -3
+ },
+/obj/item/reagent_containers/syringe,
+/obj/item/reagent_containers/spray/cleaner{
+ pixel_x = -3;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/cup/bottle/charcoal{
+ pixel_x = -4;
+ pixel_y = -3
+ },
+/obj/item/reagent_containers/cup/bottle/epinephrine{
+ pixel_x = 8;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/syringe/antiviral,
+/obj/item/reagent_containers/syringe/antiviral,
+/obj/item/reagent_containers/cup/bottle/charcoal{
+ pixel_x = -4;
+ pixel_y = -3
+ },
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable/yellow,
+/obj/item/wallframe/defib_mount,
+/obj/item/clothing/neck/stethoscope{
+ pixel_y = 5
+ },
+/turf/open/floor/iron,
+/area/medical/sleeper)
"cow" = (
/obj/effect/turf_decal/tile/neutral/half,
/obj/machinery/camera/directional/east,
@@ -7279,22 +7313,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/iron/white,
/area/medical/chemistry)
-"coF" = (
-/obj/machinery/reagentgrinder,
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/shaker{
- pixel_x = -9;
- pixel_y = 1
- },
-/obj/machinery/light{
- dir = 1
- },
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/turf/open/floor/iron/dark,
-/area/crew_quarters/bar)
"coH" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 5
@@ -7874,91 +7892,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/plating,
/area/security/checkpoint/medical)
-"cxD" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/structure/closet/crate/medical,
-/obj/item/reagent_containers/glass/bottle/bromine{
- pixel_x = -6
- },
-/obj/item/reagent_containers/glass/bottle/aluminium{
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/bottle/chlorine{
- pixel_x = -6
- },
-/obj/item/reagent_containers/glass/bottle/carbon{
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/bottle/ethanol{
- pixel_x = -6
- },
-/obj/item/reagent_containers/glass/bottle/copper{
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/bottle/hydrogen{
- pixel_x = -6
- },
-/obj/item/reagent_containers/glass/bottle/fluorine{
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/bottle/water{
- pixel_y = 8
- },
-/obj/item/reagent_containers/glass/bottle/lithium{
- pixel_x = -6
- },
-/obj/item/reagent_containers/glass/bottle/iron{
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/bottle/iodine{
- pixel_y = 8
- },
-/obj/item/reagent_containers/glass/bottle/oxygen{
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/bottle/phosphorus{
- pixel_x = -6
- },
-/obj/item/reagent_containers/glass/bottle/nitrogen{
- pixel_x = -6;
- pixel_y = 8
- },
-/obj/item/reagent_containers/glass/bottle/mercury{
- pixel_x = 6;
- pixel_y = 8
- },
-/obj/item/reagent_containers/glass/bottle/radium{
- pixel_x = -6
- },
-/obj/item/reagent_containers/glass/bottle/potassium{
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/bottle/welding_fuel{
- pixel_y = 8
- },
-/obj/item/reagent_containers/glass/bottle/sacid{
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/bottle/silicon{
- pixel_x = -6
- },
-/obj/item/reagent_containers/glass/bottle/silver{
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/bottle/sodium{
- pixel_x = -6
- },
-/obj/item/reagent_containers/glass/bottle/sugar{
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/bottle/sulfur{
- pixel_x = -6
- },
-/obj/item/circuitboard/machine/chem_heater,
-/turf/open/floor/iron/dark,
-/area/medical/virology)
"cxF" = (
/obj/effect/turf_decal/tile/bar/opposingcorners,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -9708,17 +9641,6 @@
},
/turf/open/floor/iron/dark/side,
/area/hallway/primary/central)
-"dcy" = (
-/obj/effect/landmark/start/ai/secondary,
-/obj/machinery/door/window{
- base_state = "leftsecure";
- icon_state = "leftsecure";
- name = "Tertiary AI Core Access";
- obj_integrity = 300;
- req_access_txt = "16"
- },
-/turf/open/floor/engine/o2,
-/area/ai_monitored/turret_protected/ai)
"dcB" = (
/obj/machinery/ai_slipper{
uses = 10
@@ -11142,30 +11064,6 @@
/obj/effect/landmark/start/mime,
/turf/open/floor/wood,
/area/crew_quarters/theatre/backstage)
-"dBb" = (
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
- pixel_x = -1;
- pixel_y = 1
- },
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
- pixel_x = -2;
- pixel_y = 11
- },
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
- pixel_x = 8;
- pixel_y = 10
- },
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
- pixel_x = 9
- },
-/obj/item/storage/pill_bottle/mannitol{
- pixel_x = -10;
- pixel_y = 3
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/structure/table/glass,
-/turf/open/floor/iron,
-/area/medical/cryo)
"dBO" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 1
@@ -12554,27 +12452,6 @@
},
/turf/open/floor/iron/dark,
/area/security/warden)
-"dWm" = (
-/obj/machinery/light{
- light_color = "#7AC3FF"
- },
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_y = 28
- },
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_y = 23
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/item/storage/crayons{
- pixel_x = 3;
- pixel_y = 7
- },
-/obj/machinery/computer/security/telescreen/entertainment{
- pixel_y = -32
- },
-/obj/structure/table/wood,
-/turf/open/floor/carpet/green,
-/area/crew_quarters/cafeteria)
"dWt" = (
/obj/machinery/door/poddoor/preopen{
id = "detectivewindows";
@@ -12662,6 +12539,15 @@
},
/turf/open/floor/iron,
/area/crew_quarters/dorms)
+"dXx" = (
+/obj/structure/table/wood/fancy/black,
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb{
+ pixel_x = -2;
+ pixel_y = 12
+ },
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/open/floor/carpet/royalblack,
+/area/maintenance/port/aft)
"dXE" = (
/obj/machinery/vending/coffee,
/obj/effect/turf_decal/bot,
@@ -12939,6 +12825,35 @@
},
/turf/open/floor/iron/white,
/area/medical/chemistry)
+"edN" = (
+/obj/structure/closet/secure_closet/detective,
+/obj/item/assembly/flash/handheld,
+/obj/item/restraints/handcuffs,
+/obj/item/clothing/head/fedora/det_hat{
+ icon_state = "curator"
+ },
+/obj/item/clothing/suit/jacket/det_suit{
+ icon_state = "curator"
+ },
+/obj/item/reagent_containers/cup/glass/flask/det,
+/obj/effect/turf_decal/siding/wood{
+ dir = 9
+ },
+/obj/machinery/light_switch{
+ pixel_x = -25;
+ pixel_y = -8
+ },
+/obj/item/storage/secure/safe{
+ pixel_x = -25;
+ pixel_y = 8
+ },
+/obj/machinery/requests_console{
+ department = "Detective's office";
+ pixel_y = 25
+ },
+/obj/item/holosign_creator/security,
+/turf/open/floor/carpet/red,
+/area/security/detectives_office)
"een" = (
/obj/structure/chair/office/light{
dir = 4
@@ -15708,22 +15623,6 @@
},
/turf/open/floor/iron/tech,
/area/engine/atmos)
-"eUV" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/chair/fancy/sofa/old/right{
- dir = 4
- },
-/obj/machinery/vending/wallmed{
- pixel_y = -32;
- products = list(/obj/item/stack/medical/gauze = 4, /obj/item/reagent_containers/hypospray/medipen = 3, /obj/item/reagent_containers/hypospray/medipen/dexalin = 3, /obj/item/reagent_containers/glass/bottle/epinephrine = 2, /obj/item/reagent_containers/glass/bottle/charcoal = 2)
- },
-/obj/machinery/newscaster{
- pixel_x = -32;
- pixel_y = 2
- },
-/turf/open/floor/carpet/green,
-/area/crew_quarters/cafeteria)
"eVa" = (
/obj/machinery/atmospherics/pipe/simple/purple/visible{
dir = 4
@@ -16108,15 +16007,6 @@
/obj/machinery/power/apc/auto_name/directional/north,
/turf/open/floor/iron/sepia,
/area/maintenance/port/central)
-"faQ" = (
-/obj/effect/spawner/lootdrop/ruinloot/medical,
-/obj/effect/decal/cleanable/glass{
- dir = 1
- },
-/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/carbon,
-/turf/open/floor/plating/rust,
-/area/maintenance/starboard/aft)
"fbi" = (
/obj/structure/flora/rock/jungle,
/mob/living/simple_animal/chick,
@@ -16834,28 +16724,6 @@
"flg" = (
/turf/closed/wall/rust,
/area/quartermaster/warehouse)
-"fls" = (
-/obj/structure/table,
-/obj/item/clothing/suit/jacket/straight_jacket,
-/obj/item/clothing/mask/muzzle{
- pixel_x = -2;
- pixel_y = 4
- },
-/obj/item/clothing/glasses/blindfold{
- pixel_x = -4;
- pixel_y = 8
- },
-/obj/item/assembly/signaler{
- pixel_x = -3;
- pixel_y = 2
- },
-/obj/item/reagent_containers/glass/rag{
- pixel_x = 4;
- pixel_y = 3
- },
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/iron/dark,
-/area/security/execution/education)
"flw" = (
/obj/effect/turf_decal/siding/wood{
dir = 10
@@ -17614,20 +17482,6 @@
},
/turf/open/floor/iron,
/area/crew_quarters/heads/hop)
-"fxG" = (
-/obj/structure/table/wood,
-/obj/item/toy/cards/deck{
- pixel_x = 1;
- pixel_y = 13
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/siding/wood,
-/obj/item/reagent_containers/food/drinks/britcup{
- pixel_x = 7;
- pixel_y = 1
- },
-/turf/open/floor/carpet/blue,
-/area/crew_quarters/cafeteria)
"fxR" = (
/turf/closed/wall,
/area/medical/office)
@@ -18684,25 +18538,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/security/checkpoint/escape)
-"fOF" = (
-/obj/structure/toilet{
- dir = 8
- },
-/obj/machinery/light/small,
-/obj/machinery/status_display/door_timer{
- id = "cell";
- name = "Solitary confinement timer";
- pixel_y = 32
- },
-/obj/item/food/donut/apple{
- name = "forbidden toilet donut"
- },
-/obj/item/reagent_containers/food/drinks/beer/almost_empty{
- pixel_x = -10;
- pixel_y = 17
- },
-/turf/open/floor/iron/freezer,
-/area/security/prison)
"fOG" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -19131,15 +18966,6 @@
},
/turf/open/floor/iron,
/area/security/brig)
-"fWj" = (
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable/yellow,
-/obj/item/reagent_containers/glass/bucket{
- pixel_x = -2;
- pixel_y = 10
- },
-/turf/open/floor/iron/dark,
-/area/security/execution/education)
"fWm" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/obj/structure/disposalpipe/segment{
@@ -19305,47 +19131,18 @@
},
/turf/open/floor/iron,
/area/hallway/primary/port)
-"fZt" = (
-/obj/structure/table,
-/obj/item/storage/box/papersack{
- pixel_x = 5;
- pixel_y = 6
- },
-/obj/item/storage/box/papersack{
- pixel_x = 5;
- pixel_y = 6
- },
-/obj/item/storage/box/papersack{
- pixel_x = 5;
- pixel_y = 6
- },
-/obj/item/storage/box/papersack{
- pixel_x = 5;
- pixel_y = 6
- },
-/obj/item/storage/box/papersack{
- pixel_x = 5;
- pixel_y = 6
- },
-/obj/item/storage/box/papersack{
- pixel_x = 5;
+"fZx" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/bottle/nutrient/ez{
+ pixel_x = 9;
pixel_y = 4
},
-/obj/item/storage/box/papersack{
- pixel_x = 4;
- pixel_y = 3
- },
-/obj/machinery/requests_console{
- department = "Kitchen";
- departmentType = 2;
- pixel_y = 30
- },
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_x = -9;
+/obj/item/pen/fountain/captain{
+ pixel_x = -5;
pixel_y = 5
},
-/turf/open/floor/iron/white,
-/area/crew_quarters/kitchen)
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
"fZF" = (
/obj/structure/window/reinforced{
dir = 1
@@ -19815,6 +19612,14 @@
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron,
/area/hallway/primary/starboard)
+"ggz" = (
+/obj/effect/decal/cleanable/food/flour,
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = -9;
+ pixel_y = 44
+ },
+/turf/open/floor/iron/white,
+/area/crew_quarters/kitchen)
"ggC" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -20333,35 +20138,6 @@
},
/turf/open/floor/iron,
/area/science/robotics)
-"gnE" = (
-/obj/structure/closet/secure_closet/detective,
-/obj/item/assembly/flash/handheld,
-/obj/item/restraints/handcuffs,
-/obj/item/clothing/head/fedora/det_hat{
- icon_state = "curator"
- },
-/obj/item/clothing/suit/jacket/det_suit{
- icon_state = "curator"
- },
-/obj/item/reagent_containers/food/drinks/flask/det,
-/obj/effect/turf_decal/siding/wood{
- dir = 9
- },
-/obj/machinery/light_switch{
- pixel_x = -25;
- pixel_y = -8
- },
-/obj/item/storage/secure/safe{
- pixel_x = -25;
- pixel_y = 8
- },
-/obj/machinery/requests_console{
- department = "Detective's office";
- pixel_y = 25
- },
-/obj/item/holosign_creator/security,
-/turf/open/floor/carpet/red,
-/area/security/detectives_office)
"gnN" = (
/obj/structure/cable/yellow{
icon_state = "0-4"
@@ -22431,6 +22207,33 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/catwalk_floor/iron_dark,
/area/engine/engine_room)
+"gXg" = (
+/obj/item/reagent_containers/cup/glass/bottle/beer/light{
+ pixel_x = 9;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/cup/glass/bottle/beer/light{
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/glass/bottle/beer/light{
+ pixel_x = -8;
+ pixel_y = 11
+ },
+/obj/effect/spawner/lootdrop/glowstick/lit,
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/maintenance/central)
+"gXu" = (
+/obj/effect/turf_decal/tile/dark_green/anticorner/contrasted{
+ dir = 4
+ },
+/obj/structure/reagent_dispensers/watertank,
+/obj/item/reagent_containers/cup/bucket{
+ pixel_x = -6;
+ pixel_y = 3
+ },
+/turf/open/floor/iron,
+/area/maintenance/central)
"gXC" = (
/obj/structure/chair/office{
dir = 1
@@ -22648,6 +22451,21 @@
},
/turf/open/floor/iron/dark,
/area/engine/engine_room)
+"hbi" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/cup/glass/bottle/beer{
+ pixel_x = -5;
+ pixel_y = 16
+ },
+/obj/item/storage/firstaid/toxin{
+ pixel_x = 1;
+ pixel_y = 3
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/science/misc_lab)
"hbo" = (
/obj/structure/sink{
dir = 1;
@@ -23252,6 +23070,10 @@
},
/turf/open/floor/iron,
/area/maintenance/department/science)
+"hlD" = (
+/obj/item/reagent_containers/cup/bottle/iodine,
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
"hlI" = (
/obj/machinery/flasher{
id = "aicore";
@@ -23328,6 +23150,23 @@
/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron,
/area/crew_quarters/cafeteria)
+"hmL" = (
+/obj/structure/table,
+/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{
+ pixel_x = -7;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/soda_cans/cola{
+ pixel_x = 12;
+ pixel_y = 12
+ },
+/obj/item/reagent_containers/cup/soda_cans/starkist{
+ pixel_x = 10;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/cup/soda_cans/space_up,
+/turf/open/floor/iron,
+/area/maintenance/port/aft)
"hmO" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -23476,6 +23315,29 @@
},
/turf/open/floor/plating,
/area/maintenance/department/science)
+"hpV" = (
+/obj/structure/table,
+/obj/item/food/spaghetti/meatballspaghetti{
+ pixel_x = -6;
+ pixel_y = 4
+ },
+/obj/item/reagent_containers/cup/glass/bottle/absinthe{
+ pixel_x = -10;
+ pixel_y = 15
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = 3;
+ pixel_y = 15
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = 9;
+ pixel_y = 10
+ },
+/obj/item/candle/infinite{
+ pixel_x = 8
+ },
+/turf/open/floor/iron/dark,
+/area/security/execution/education)
"hqd" = (
/obj/effect/turf_decal/tile/blue/fourcorners/contrasted{
alpha = 200;
@@ -24683,6 +24545,24 @@
},
/turf/open/floor/iron/dark,
/area/engine/engine_room)
+"hKK" = (
+/obj/effect/turf_decal/tile/black/fourcorners,
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/structure/table/reinforced,
+/obj/item/book/manual/chef_recipes{
+ pixel_x = 2;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/condiment/flour{
+ pixel_x = -5;
+ pixel_y = 5
+ },
+/obj/item/kitchen/rollingpin,
+/obj/item/clothing/head/utility/chefhat,
+/turf/open/floor/iron/techmaint,
+/area/security/prison)
"hKT" = (
/obj/structure/disposalpipe/segment{
dir = 1
@@ -26074,16 +25954,6 @@
},
/turf/open/floor/carpet/red,
/area/security/detectives_office)
-"ijU" = (
-/obj/structure/table/wood,
-/obj/item/toy/foamblade,
-/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull{
- pixel_x = 7;
- pixel_y = 15
- },
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/wood,
-/area/library)
"ikf" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -26529,6 +26399,47 @@
},
/turf/open/floor/iron/sepia,
/area/quartermaster/office)
+"isM" = (
+/obj/structure/table,
+/obj/item/storage/box/papersack{
+ pixel_x = 5;
+ pixel_y = 6
+ },
+/obj/item/storage/box/papersack{
+ pixel_x = 5;
+ pixel_y = 6
+ },
+/obj/item/storage/box/papersack{
+ pixel_x = 5;
+ pixel_y = 6
+ },
+/obj/item/storage/box/papersack{
+ pixel_x = 5;
+ pixel_y = 6
+ },
+/obj/item/storage/box/papersack{
+ pixel_x = 5;
+ pixel_y = 6
+ },
+/obj/item/storage/box/papersack{
+ pixel_x = 5;
+ pixel_y = 4
+ },
+/obj/item/storage/box/papersack{
+ pixel_x = 4;
+ pixel_y = 3
+ },
+/obj/machinery/requests_console{
+ department = "Kitchen";
+ departmentType = 2;
+ pixel_y = 30
+ },
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -9;
+ pixel_y = 5
+ },
+/turf/open/floor/iron/white,
+/area/crew_quarters/kitchen)
"isP" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron,
@@ -26663,13 +26574,6 @@
/obj/machinery/air_sensor/atmos/air_tank,
/turf/open/floor/engine/air,
/area/engine/atmos)
-"ivW" = (
-/obj/item/reagent_containers/glass/waterbottle/empty{
- pixel_x = -10
- },
-/obj/item/storage/belt/utility,
-/turf/open/floor/iron/sepia,
-/area/maintenance/port/central)
"ivY" = (
/obj/machinery/power/terminal{
dir = 8
@@ -27067,6 +26971,16 @@
},
/turf/open/floor/iron,
/area/engine/atmos)
+"iCN" = (
+/obj/structure/table/wood,
+/obj/item/toy/foamblade,
+/obj/item/reagent_containers/cup/soda_cans/grey_bull{
+ pixel_x = 7;
+ pixel_y = 15
+ },
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/wood,
+/area/library)
"iCT" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -27269,6 +27183,34 @@
/obj/structure/closet/secure_closet/hos,
/turf/open/floor/carpet/red,
/area/crew_quarters/heads/hos)
+"iIc" = (
+/obj/structure/table,
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
+ pixel_x = 2;
+ pixel_y = 12
+ },
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
+ pixel_x = -6;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
+ pixel_x = 9;
+ pixel_y = 12
+ },
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
+ pixel_x = 5;
+ pixel_y = 5
+ },
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
+ pixel_x = 2;
+ pixel_y = -1
+ },
+/obj/structure/reagent_dispensers/virusfood{
+ pixel_x = 31;
+ pixel_y = -1
+ },
+/turf/open/floor/iron/grid/steel,
+/area/medical/virology)
"iIs" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -29136,17 +29078,6 @@
},
/turf/open/floor/iron/white,
/area/medical/office)
-"jmw" = (
-/obj/item/reagent_containers/food/drinks/drinkingglass{
- pixel_x = -7;
- pixel_y = 6
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/structure/table/wood,
-/turf/open/floor/carpet/green,
-/area/crew_quarters/cafeteria)
"jne" = (
/obj/structure/sign/warning/pods,
/turf/closed/wall,
@@ -29221,21 +29152,6 @@
/obj/structure/railing/corner,
/turf/open/floor/iron/dark/smooth_large,
/area/hallway/primary/central)
-"joH" = (
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_x = 4;
- pixel_y = 13
- },
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_x = -2;
- pixel_y = 14
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/effect/turf_decal/siding/wideplating/dark,
-/turf/open/floor/iron/cafeteria,
-/area/crew_quarters/kitchen)
"joI" = (
/obj/effect/turf_decal/siding/wood,
/obj/structure/railing,
@@ -30495,6 +30411,16 @@
},
/turf/open/floor/iron,
/area/science/lobby)
+"jIO" = (
+/obj/machinery/biogenerator,
+/obj/item/reagent_containers/cup/bucket,
+/obj/effect/turf_decal/bot,
+/obj/machinery/door/window/eastleft{
+ name = "Hydroponics Desk";
+ req_one_access_txt = "35;28"
+ },
+/turf/open/floor/iron/grid/steel,
+/area/hydroponics)
"jIR" = (
/obj/machinery/status_display/evac{
pixel_y = 32
@@ -32126,17 +32052,6 @@
},
/turf/open/floor/iron,
/area/crew_quarters/dorms)
-"kkQ" = (
-/obj/effect/turf_decal/delivery,
-/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted,
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable/yellow{
- icon_state = "0-2"
- },
-/obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
-/turf/open/floor/iron/grid/steel,
-/area/hydroponics)
"kkV" = (
/obj/effect/turf_decal/tile/dark_red/half/contrasted{
alpha = 180;
@@ -33239,6 +33154,17 @@
/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron/white,
/area/crew_quarters/kitchen)
+"kDF" = (
+/obj/machinery/light/small{
+ dir = 8
+ },
+/obj/structure/table/wood/fancy/purple,
+/obj/item/book/granter/spell/smoke/lesser,
+/obj/item/reagent_containers/cup/glass/bottle/holywater,
+/obj/item/soulstone/anybody/chaplain,
+/obj/item/organ/heart,
+/turf/open/floor/carpet/grimy,
+/area/chapel/office)
"kDQ" = (
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 4
@@ -33625,6 +33551,13 @@
/obj/machinery/vendor/exploration,
/turf/open/floor/iron/dark,
/area/quartermaster/exploration_prep)
+"kKb" = (
+/obj/item/reagent_containers/cup/waterbottle/empty{
+ pixel_x = -10
+ },
+/obj/item/storage/belt/utility,
+/turf/open/floor/iron/sepia,
+/area/maintenance/port/central)
"kKx" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -33936,37 +33869,6 @@
/obj/machinery/telecomms/bus/preset_four,
/turf/open/floor/circuit/green/telecomms/mainframe,
/area/tcommsat/server)
-"kPB" = (
-/obj/structure/table,
-/obj/item/paper_bin{
- pixel_x = -6;
- pixel_y = 6
- },
-/obj/item/pen{
- pixel_x = -5;
- pixel_y = 8
- },
-/obj/item/clothing/glasses/welding{
- pixel_x = -6;
- pixel_y = 8
- },
-/obj/item/reagent_containers/glass/beaker{
- pixel_x = 9;
- pixel_y = 10
- },
-/obj/item/reagent_containers/dropper{
- pixel_x = -3;
- pixel_y = -4
- },
-/obj/item/reagent_containers/glass/beaker/large{
- pixel_x = 8;
- pixel_y = 1
- },
-/obj/structure/extinguisher_cabinet{
- pixel_x = -32
- },
-/turf/open/floor/iron,
-/area/science/lab)
"kPT" = (
/obj/structure/flora/ausbushes/sparsegrass,
/turf/open/floor/grass,
@@ -35329,17 +35231,6 @@
},
/turf/open/floor/iron,
/area/hallway/primary/starboard)
-"llV" = (
-/obj/machinery/light/small{
- dir = 8
- },
-/obj/structure/table/wood/fancy/purple,
-/obj/item/book/granter/spell/smoke/lesser,
-/obj/item/reagent_containers/food/drinks/bottle/holywater,
-/obj/item/soulstone/anybody/chaplain,
-/obj/item/organ/heart,
-/turf/open/floor/carpet/grimy,
-/area/chapel/office)
"lmb" = (
/obj/effect/turf_decal/tile/purple,
/obj/effect/decal/cleanable/dirt,
@@ -35359,6 +35250,36 @@
},
/turf/open/space/basic,
/area/space/nearstation)
+"lmH" = (
+/obj/structure/toilet{
+ dir = 8
+ },
+/obj/machinery/light/small,
+/obj/machinery/status_display/door_timer{
+ id = "cell";
+ name = "Solitary confinement timer";
+ pixel_y = 32
+ },
+/obj/item/food/donut/apple{
+ name = "forbidden toilet donut"
+ },
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{
+ pixel_x = -10;
+ pixel_y = 17
+ },
+/turf/open/floor/iron/freezer,
+/area/security/prison)
+"lmI" = (
+/obj/effect/turf_decal/delivery,
+/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable/yellow{
+ icon_state = "0-2"
+ },
+/obj/structure/reagent_dispensers/watertank/high,
+/obj/item/reagent_containers/cup/bucket,
+/turf/open/floor/iron/grid/steel,
+/area/hydroponics)
"lmN" = (
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable/yellow{
@@ -35926,6 +35847,28 @@
/obj/structure/closet/crate,
/turf/open/floor/iron/dark,
/area/quartermaster/storage)
+"lvp" = (
+/obj/structure/table,
+/obj/item/clothing/suit/jacket/straight_jacket,
+/obj/item/clothing/mask/muzzle{
+ pixel_x = -2;
+ pixel_y = 4
+ },
+/obj/item/clothing/glasses/blindfold{
+ pixel_x = -4;
+ pixel_y = 8
+ },
+/obj/item/assembly/signaler{
+ pixel_x = -3;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/cup/rag{
+ pixel_x = 4;
+ pixel_y = 3
+ },
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/iron/dark,
+/area/security/execution/education)
"lvs" = (
/obj/effect/turf_decal/siding/wood,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
@@ -36106,6 +36049,25 @@
/obj/structure/chair,
/turf/open/floor/plating,
/area/maintenance/department/bridge)
+"lyW" = (
+/obj/structure/table,
+/obj/machinery/recharger{
+ pixel_x = 4;
+ pixel_y = 2
+ },
+/obj/item/gun/energy/disabler{
+ pixel_x = 2
+ },
+/obj/item/clothing/glasses/sunglasses/advanced{
+ pixel_x = -3;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/glass/britcup{
+ pixel_x = -8
+ },
+/obj/effect/turf_decal/tile/neutral/half/contrasted,
+/turf/open/floor/iron/dark,
+/area/security/warden)
"lzD" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/turf/open/floor/iron/dark,
@@ -37342,14 +37304,6 @@
dir = 1
},
/area/science/research)
-"lYd" = (
-/obj/effect/decal/cleanable/food/flour,
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_x = -9;
- pixel_y = 44
- },
-/turf/open/floor/iron/white,
-/area/crew_quarters/kitchen)
"lYp" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
@@ -37363,18 +37317,6 @@
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron/dark/corner,
/area/hallway/primary/central)
-"lYy" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/champagne{
- pixel_x = 6;
- pixel_y = 10
- },
-/obj/item/stack/cable_coil/random/five{
- pixel_x = 2;
- pixel_y = 8
- },
-/turf/open/floor/wood,
-/area/crew_quarters/dorms)
"lYX" = (
/obj/structure/cable/yellow{
icon_state = "2-8"
@@ -38626,10 +38568,6 @@
},
/turf/open/floor/iron,
/area/hallway/primary/port)
-"mrr" = (
-/obj/item/reagent_containers/glass/bottle/iodine,
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
"mrF" = (
/obj/effect/turf_decal/delivery,
/obj/effect/turf_decal/tile/brown/fourcorners/contrasted,
@@ -40069,17 +40007,6 @@
},
/turf/open/floor/iron/dark,
/area/engine/atmos)
-"mLo" = (
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{
- pixel_x = -7;
- pixel_y = 10
- },
-/obj/item/trash/can,
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
"mLp" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance/three,
@@ -40189,6 +40116,34 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/turf/open/floor/iron/dark,
/area/chapel/main)
+"mNu" = (
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/machinery/camera/motion{
+ c_tag = "vault";
+ dir = 10;
+ pixel_y = 8
+ },
+/obj/machinery/airalarm/directional/west{
+ pixel_x = -22
+ },
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = 5;
+ pixel_y = 11
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = 9;
+ pixel_y = 5
+ },
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{
+ pixel_x = -7;
+ pixel_y = 17
+ },
+/obj/effect/turf_decal/tile/neutral/half/contrasted,
+/turf/open/floor/iron/dark,
+/area/security/nuke_storage)
"mNL" = (
/obj/structure/closet/crate,
/obj/effect/spawner/lootdrop/maintenance/two,
@@ -40565,6 +40520,20 @@
"mTR" = (
/turf/open/space/basic,
/area/ai_monitored/turret_protected/ai)
+"mTY" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/siding/wideplating/dark,
+/obj/item/reagent_containers/cup/glass/drinkingglass{
+ pixel_x = -6;
+ pixel_y = 9
+ },
+/obj/item/reagent_containers/cup/rag{
+ pixel_x = 6;
+ pixel_y = 8
+ },
+/turf/open/floor/iron/cafeteria_red,
+/area/crew_quarters/bar)
"mUd" = (
/obj/effect/turf_decal/tile/blue/fourcorners/contrasted{
alpha = 200;
@@ -41727,6 +41696,25 @@
},
/turf/open/floor/iron/dark,
/area/science/nanite)
+"nlX" = (
+/obj/structure/extinguisher_cabinet{
+ pixel_x = 32;
+ pixel_y = -1
+ },
+/obj/structure/closet/secure_closet/captains,
+/obj/item/book/manual/wiki/security_space_law,
+/obj/item/reagent_containers/cup/glass/flask/gold{
+ pixel_x = 3;
+ pixel_y = 8
+ },
+/obj/item/pinpointer/nuke{
+ pixel_y = 5
+ },
+/obj/structure/extinguisher_cabinet{
+ pixel_y = 32
+ },
+/turf/open/floor/carpet/blue,
+/area/crew_quarters/heads/captain/private)
"nmf" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -42957,25 +42945,6 @@
},
/turf/open/floor/engine/n2,
/area/engine/atmos)
-"nFk" = (
-/obj/structure/table,
-/obj/machinery/recharger{
- pixel_x = 4;
- pixel_y = 2
- },
-/obj/item/gun/energy/disabler{
- pixel_x = 2
- },
-/obj/item/clothing/glasses/sunglasses/advanced{
- pixel_x = -3;
- pixel_y = 8
- },
-/obj/item/reagent_containers/food/drinks/britcup{
- pixel_x = -8
- },
-/obj/effect/turf_decal/tile/neutral/half/contrasted,
-/turf/open/floor/iron/dark,
-/area/security/warden)
"nFs" = (
/obj/effect/landmark/event_spawn,
/turf/open/floor/engine/vacuum,
@@ -43644,12 +43613,6 @@
/obj/effect/landmark/prisonspawn,
/turf/open/floor/iron/techmaint,
/area/security/prison/shielded)
-"nQW" = (
-/obj/structure/flora/ausbushes/fullgrass,
-/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
-/turf/open/floor/grass,
-/area/hallway/primary/central)
"nQZ" = (
/obj/effect/turf_decal/bot,
/obj/structure/rack,
@@ -44468,6 +44431,21 @@
/obj/machinery/meter,
/turf/open/floor/iron/tech,
/area/engine/engine_room)
+"oeW" = (
+/obj/effect/landmark/start/security_officer,
+/obj/structure/toilet{
+ pixel_y = 13
+ },
+/obj/machinery/flasher{
+ id = "cell";
+ pixel_x = -25
+ },
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{
+ pixel_x = 11;
+ pixel_y = 15
+ },
+/turf/open/floor/iron/dark,
+/area/security/prison/shielded)
"oeZ" = (
/obj/effect/turf_decal/tile/yellow/half/contrasted{
alpha = 180
@@ -44654,6 +44632,18 @@
/obj/machinery/deepfryer,
/turf/open/floor/iron,
/area/hallway/secondary/service)
+"ohw" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/glass/bottle/champagne{
+ pixel_x = 6;
+ pixel_y = 10
+ },
+/obj/item/stack/cable_coil/random/five{
+ pixel_x = 2;
+ pixel_y = 8
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
"ohL" = (
/obj/machinery/airalarm/directional/north,
/obj/machinery/teleport/hub,
@@ -44789,11 +44779,29 @@
/obj/structure/flora/ausbushes/ppflowers,
/turf/open/floor/grass/no_border,
/area/hallway/secondary/exit/departure_lounge)
-"okF" = (
-/obj/machinery/chem_master,
-/obj/item/reagent_containers/glass/beaker/large,
-/turf/open/floor/iron,
-/area/medical/apothecary)
+"oks" = (
+/obj/structure/table,
+/obj/item/toy/cards/deck{
+ pixel_x = -7;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/cup/glass/britcup{
+ pixel_x = -8;
+ pixel_y = 10
+ },
+/obj/item/book/manual/wiki/sopsecurity{
+ pixel_x = 5;
+ pixel_y = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/security/main)
"okN" = (
/obj/structure/disposalpipe/segment{
dir = 8
@@ -46041,29 +46049,6 @@
/obj/effect/turf_decal/guideline/guideline_edge/brown,
/turf/open/floor/iron,
/area/hallway/primary/port)
-"oHE" = (
-/obj/structure/lattice/catwalk,
-/obj/item/reagent_containers/food/drinks/bottle/beer{
- pixel_x = 9;
- pixel_y = 6
- },
-/obj/item/storage/fancy/cigarettes{
- pixel_x = -3;
- pixel_y = 4
- },
-/obj/item/reagent_containers/food/drinks/bottle/beer{
- pixel_x = 2;
- pixel_y = 1
- },
-/obj/item/trash/can{
- pixel_x = 11;
- pixel_y = -4
- },
-/obj/item/cigbutt{
- pixel_x = -9
- },
-/turf/open/space/basic,
-/area/space/nearstation)
"oHG" = (
/turf/open/floor/circuit/telecomms/server,
/area/science/xenobiology)
@@ -46639,23 +46624,6 @@
},
/turf/open/floor/iron,
/area/security/checkpoint/escape)
-"oPl" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind{
- pixel_x = -7;
- pixel_y = 8
- },
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
- pixel_x = 12;
- pixel_y = 12
- },
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
- pixel_x = 10;
- pixel_y = 2
- },
-/obj/item/reagent_containers/food/drinks/soda_cans/space_up,
-/turf/open/floor/iron,
-/area/maintenance/port/aft)
"oPx" = (
/obj/structure/chair/fancy/bench/right{
dir = 8
@@ -46814,6 +46782,28 @@
/obj/structure/lattice/catwalk/over,
/turf/open/floor/plating,
/area/maintenance/port/aft)
+"oRm" = (
+/obj/machinery/recharger,
+/obj/structure/table,
+/obj/item/reagent_containers/cup/glass/bottle/wine{
+ pixel_x = -9;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = 10;
+ pixel_y = 13
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = 10;
+ pixel_y = 5
+ },
+/obj/machinery/light,
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_y = -32
+ },
+/obj/machinery/camera/directional/south,
+/turf/open/floor/carpet,
+/area/quartermaster/exploration_prep)
"oRo" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
@@ -48017,24 +48007,27 @@
/obj/item/bedsheet/captain,
/turf/open/floor/carpet/blue,
/area/crew_quarters/heads/captain/private)
-"piH" = (
-/obj/structure/janitorialcart,
-/obj/item/reagent_containers/glass/bucket{
- pixel_x = 11;
- pixel_y = -5
+"piS" = (
+/obj/machinery/light{
+ light_color = "#7AC3FF"
},
-/obj/item/mop{
- pixel_x = -6;
- pixel_y = 3
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_y = 28
},
-/obj/effect/turf_decal/tile/purple/half/contrasted{
- dir = 8
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_y = 23
},
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/effect/decal/cleanable/dirt,
+/obj/item/storage/crayons{
+ pixel_x = 3;
+ pixel_y = 7
},
-/turf/open/floor/iron,
-/area/janitor)
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_y = -32
+ },
+/obj/structure/table/wood,
+/turf/open/floor/carpet/green,
+/area/crew_quarters/cafeteria)
"pjf" = (
/obj/machinery/door/poddoor/preopen{
id = "detectivewindows";
@@ -49251,18 +49244,6 @@
},
/turf/open/floor/iron/dark,
/area/security/brig/dock)
-"pED" = (
-/obj/machinery/chem_master,
-/obj/effect/turf_decal/bot,
-/obj/structure/sign/poster/official/random{
- pixel_x = -32
- },
-/obj/machinery/light{
- dir = 8
- },
-/obj/item/reagent_containers/glass/beaker/large,
-/turf/open/floor/iron,
-/area/medical/apothecary)
"pEF" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable/yellow{
@@ -52205,6 +52186,29 @@
/obj/item/grenade/chem_grenade/smart_metal_foam,
/turf/open/floor/iron/dark,
/area/engine/atmos)
+"qBv" = (
+/obj/structure/lattice/catwalk,
+/obj/item/reagent_containers/cup/glass/bottle/beer{
+ pixel_x = 9;
+ pixel_y = 6
+ },
+/obj/item/storage/fancy/cigarettes{
+ pixel_x = -3;
+ pixel_y = 4
+ },
+/obj/item/reagent_containers/cup/glass/bottle/beer{
+ pixel_x = 2;
+ pixel_y = 1
+ },
+/obj/item/trash/can{
+ pixel_x = 11;
+ pixel_y = -4
+ },
+/obj/item/cigbutt{
+ pixel_x = -9
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
"qBy" = (
/obj/effect/decal/cleanable/blood/tracks,
/obj/machinery/light_switch{
@@ -53825,6 +53829,22 @@
},
/turf/open/floor/iron/white,
/area/crew_quarters/kitchen)
+"rbv" = (
+/obj/machinery/reagentgrinder,
+/obj/structure/table,
+/obj/item/reagent_containers/cup/glass/shaker{
+ pixel_x = -9;
+ pixel_y = 1
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/bar/opposingcorners,
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/turf/open/floor/iron/dark,
+/area/crew_quarters/bar)
"rbJ" = (
/obj/effect/turf_decal/tile/blue{
dir = 1
@@ -54092,6 +54112,18 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
/area/science/storage)
+"rge" = (
+/obj/item/reagent_containers/cup/glass/britcup{
+ pixel_x = 3;
+ pixel_y = 12
+ },
+/obj/effect/turf_decal/bot,
+/obj/structure/table/wood{
+ name = "Coffee warmer"
+ },
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/iron/dark,
+/area/bridge/meeting_room)
"rgh" = (
/obj/structure/sign/departments/minsky/security/command,
/turf/closed/wall,
@@ -54749,6 +54781,11 @@
},
/turf/open/floor/iron,
/area/security/prison)
+"rpT" = (
+/obj/machinery/chem_master,
+/obj/item/reagent_containers/cup/beaker/large,
+/turf/open/floor/iron,
+/area/medical/apothecary)
"rqd" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -55280,34 +55317,6 @@
},
/turf/open/floor/iron,
/area/science/lobby)
-"ryj" = (
-/obj/machinery/light{
- dir = 8
- },
-/obj/machinery/camera/motion{
- c_tag = "vault";
- dir = 10;
- pixel_y = 8
- },
-/obj/machinery/airalarm/directional/west{
- pixel_x = -22
- },
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
- pixel_x = 5;
- pixel_y = 11
- },
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
- pixel_x = 9;
- pixel_y = 5
- },
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{
- pixel_x = -7;
- pixel_y = 17
- },
-/obj/effect/turf_decal/tile/neutral/half/contrasted,
-/turf/open/floor/iron/dark,
-/area/security/nuke_storage)
"ryr" = (
/obj/effect/turf_decal/guideline/guideline_edge/purple{
dir = 8
@@ -55632,6 +55641,19 @@
/obj/machinery/light,
/turf/open/floor/iron/dark,
/area/teleporter)
+"rDv" = (
+/obj/structure/table/wood,
+/obj/machinery/reagentgrinder{
+ pixel_x = 5;
+ pixel_y = 14
+ },
+/obj/item/reagent_containers/cup/glass/shaker{
+ pixel_x = -8;
+ pixel_y = 3
+ },
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/wood,
+/area/crew_quarters/heads/captain)
"rDB" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 1
@@ -56055,14 +56077,6 @@
},
/turf/open/floor/iron/dark,
/area/storage/primary)
-"rJL" = (
-/obj/effect/decal/cleanable/cobweb,
-/obj/structure/closet/cardboard,
-/obj/item/storage/toolbox/emergency,
-/obj/effect/spawner/lootdrop/maintenance/eight,
-/obj/item/reagent_containers/food/drinks/bottle/hooch,
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
"rJX" = (
/obj/structure/closet/firecloset/full,
/turf/open/floor/plating,
@@ -56342,6 +56356,15 @@
},
/turf/open/floor/catwalk_floor,
/area/maintenance/port/central)
+"rPL" = (
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable/yellow,
+/obj/item/reagent_containers/cup/bucket{
+ pixel_x = -2;
+ pixel_y = 10
+ },
+/turf/open/floor/iron/dark,
+/area/security/execution/education)
"rQd" = (
/turf/closed/wall/r_wall/rust,
/area/crew_quarters/heads/hor)
@@ -57207,19 +57230,6 @@
"seT" = (
/turf/closed/wall,
/area/lawoffice)
-"seW" = (
-/obj/structure/table/wood,
-/obj/machinery/reagentgrinder{
- pixel_x = 5;
- pixel_y = 14
- },
-/obj/item/reagent_containers/food/drinks/shaker{
- pixel_x = -8;
- pixel_y = 3
- },
-/obj/machinery/firealarm/directional/east,
-/turf/open/floor/wood,
-/area/crew_quarters/heads/captain)
"seY" = (
/obj/effect/turf_decal/tile/neutral{
alpha = 140;
@@ -57471,6 +57481,22 @@
},
/turf/open/floor/iron/techmaint,
/area/science/xenobiology)
+"sjq" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/chair/fancy/sofa/old/right{
+ dir = 4
+ },
+/obj/machinery/vending/wallmed{
+ pixel_y = -32;
+ products = list(/obj/item/stack/medical/gauze = 4, /obj/item/reagent_containers/hypospray/medipen = 3, /obj/item/reagent_containers/hypospray/medipen/dexalin = 3, /obj/item/reagent_containers/cup/bottle/epinephrine = 2, /obj/item/reagent_containers/cup/bottle/charcoal = 2)
+ },
+/obj/machinery/newscaster{
+ pixel_x = -32;
+ pixel_y = 2
+ },
+/turf/open/floor/carpet/green,
+/area/crew_quarters/cafeteria)
"sjy" = (
/obj/effect/turf_decal/guideline/guideline_in/purple{
dir = 1
@@ -58492,6 +58518,18 @@
},
/turf/open/floor/plating,
/area/maintenance/port/aft)
+"sDP" = (
+/obj/machinery/chem_master,
+/obj/effect/turf_decal/bot,
+/obj/structure/sign/poster/official/random{
+ pixel_x = -32
+ },
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/item/reagent_containers/cup/beaker/large,
+/turf/open/floor/iron,
+/area/medical/apothecary)
"sEj" = (
/obj/effect/spawner/lootdrop/grille_or_trash,
/obj/effect/decal/cleanable/dirt/dust,
@@ -59003,6 +59041,20 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron,
/area/engine/atmospherics_engine)
+"sLF" = (
+/obj/structure/table/wood,
+/obj/item/toy/cards/deck{
+ pixel_x = 1;
+ pixel_y = 13
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/siding/wood,
+/obj/item/reagent_containers/cup/glass/britcup{
+ pixel_x = 7;
+ pixel_y = 1
+ },
+/turf/open/floor/carpet/blue,
+/area/crew_quarters/cafeteria)
"sLM" = (
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
@@ -59238,6 +59290,14 @@
},
/turf/open/floor/iron/dark/corner,
/area/hallway/primary/central)
+"sQu" = (
+/obj/effect/decal/cleanable/cobweb,
+/obj/structure/closet/cardboard,
+/obj/item/storage/toolbox/emergency,
+/obj/effect/spawner/lootdrop/maintenance/eight,
+/obj/item/reagent_containers/cup/glass/bottle/hooch,
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
"sQy" = (
/obj/docking_port/stationary/random{
dir = 8;
@@ -60336,34 +60396,6 @@
dir = 9
},
/area/bridge)
-"thT" = (
-/obj/structure/table/reinforced,
-/obj/structure/railing{
- dir = 1
- },
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/food/grown/carrot{
- pixel_x = 4;
- pixel_y = 4
- },
-/obj/item/food/grown/carrot{
- pixel_x = -1;
- pixel_y = 6
- },
-/obj/item/food/grown/carrot{
- pixel_x = -1;
- pixel_y = 11
- },
-/obj/item/food/grown/carrot{
- pixel_x = -6;
- pixel_y = 12
- },
-/obj/effect/turf_decal/tile/black/fourcorners,
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/turf/open/floor/iron/techmaint,
-/area/security/prison)
"tib" = (
/obj/structure/flora/ausbushes/fullgrass,
/obj/structure/flora/tree/jungle/small,
@@ -60479,6 +60511,12 @@
/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron/grid/steel,
/area/science/xenobiology)
+"tjK" = (
+/obj/structure/flora/ausbushes/fullgrass,
+/obj/structure/reagent_dispensers/watertank,
+/obj/item/reagent_containers/cup/bucket,
+/turf/open/floor/grass,
+/area/hallway/primary/central)
"tjM" = (
/obj/structure/window/reinforced{
dir = 1
@@ -60505,6 +60543,22 @@
},
/turf/open/floor/iron,
/area/engine/engine_room)
+"tkG" = (
+/obj/machinery/light{
+ light_color = "#7AC3FF"
+ },
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_y = 25
+ },
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_y = 21
+ },
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_y = -32
+ },
+/obj/structure/table/wood,
+/turf/open/floor/carpet/green,
+/area/crew_quarters/cafeteria)
"tkM" = (
/obj/effect/turf_decal/tile/blue/fourcorners/contrasted{
alpha = 200;
@@ -61190,40 +61244,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/iron/white,
/area/science/xenobiology)
-"tuz" = (
-/obj/effect/turf_decal/tile/black/fourcorners,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/structure/table,
-/obj/machinery/reagentgrinder{
- pixel_x = -1;
- pixel_y = 12
- },
-/obj/item/reagent_containers/glass/bucket{
- pixel_x = -8
- },
-/obj/item/reagent_containers/glass/bucket{
- pixel_x = -4
- },
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/reagent_containers/glass/bucket{
- pixel_x = 4
- },
-/obj/item/shovel/spade{
- pixel_x = -5;
- pixel_y = -4
- },
-/obj/item/cultivator{
- pixel_x = -2;
- pixel_y = -1
- },
-/obj/structure/railing{
- dir = 4
- },
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/iron/techmaint,
-/area/security/prison)
"tuD" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -62539,6 +62559,24 @@
},
/turf/open/floor/iron/white,
/area/medical/apothecary)
+"tNs" = (
+/obj/structure/table/reinforced,
+/obj/item/paper/fluff/jobs/medical/hippocratic{
+ pixel_x = -4;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/cup/glass/britcup{
+ pixel_x = 2;
+ pixel_y = 9
+ },
+/obj/item/toy/plush/renault{
+ pixel_x = 8
+ },
+/obj/structure/desk_bell{
+ pixel_x = -8
+ },
+/turf/open/floor/iron/white,
+/area/medical/office)
"tNG" = (
/obj/effect/turf_decal/siding/wood{
dir = 4
@@ -63111,6 +63149,15 @@
/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/construction/mining/aux_base)
+"tYe" = (
+/obj/effect/spawner/lootdrop/ruinloot/medical,
+/obj/effect/decal/cleanable/glass{
+ dir = 1
+ },
+/obj/structure/table/glass,
+/obj/item/reagent_containers/cup/bottle/carbon,
+/turf/open/floor/plating/rust,
+/area/maintenance/starboard/aft)
"tYf" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable/yellow,
@@ -63162,6 +63209,17 @@
},
/turf/open/floor/iron/white,
/area/medical/cryo)
+"tYF" = (
+/obj/machinery/light/small{
+ dir = 1
+ },
+/obj/item/reagent_containers/cup/soda_cans/pwr_game{
+ pixel_x = -7;
+ pixel_y = 10
+ },
+/obj/item/trash/can,
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"tYL" = (
/obj/structure/closet,
/obj/item/clothing/under/color/random,
@@ -63690,21 +63748,6 @@
dir = 4
},
/area/medical/sleeper)
-"ugA" = (
-/obj/effect/landmark/start/security_officer,
-/obj/structure/toilet{
- pixel_y = 13
- },
-/obj/machinery/flasher{
- id = "cell";
- pixel_x = -25
- },
-/obj/item/reagent_containers/food/drinks/beer/almost_empty{
- pixel_x = 11;
- pixel_y = 15
- },
-/turf/open/floor/iron/dark,
-/area/security/prison/shielded)
"ugK" = (
/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{
alpha = 180
@@ -63870,24 +63913,6 @@
},
/turf/open/floor/iron,
/area/construction/mining/aux_base)
-"ukp" = (
-/obj/structure/table/reinforced,
-/obj/item/paper/fluff/jobs/medical/hippocratic{
- pixel_x = -4;
- pixel_y = 2
- },
-/obj/item/reagent_containers/food/drinks/britcup{
- pixel_x = 2;
- pixel_y = 9
- },
-/obj/item/toy/plush/renault{
- pixel_x = 8
- },
-/obj/structure/desk_bell{
- pixel_x = -8
- },
-/turf/open/floor/iron/white,
-/area/medical/office)
"uku" = (
/obj/structure/railing/corner{
dir = 1
@@ -64101,6 +64126,34 @@
/obj/structure/curtain/directional,
/turf/open/floor/plating,
/area/security/courtroom)
+"uod" = (
+/obj/structure/table/reinforced,
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/food/grown/carrot{
+ pixel_x = 4;
+ pixel_y = 4
+ },
+/obj/item/food/grown/carrot{
+ pixel_x = -1;
+ pixel_y = 6
+ },
+/obj/item/food/grown/carrot{
+ pixel_x = -1;
+ pixel_y = 11
+ },
+/obj/item/food/grown/carrot{
+ pixel_x = -6;
+ pixel_y = 12
+ },
+/obj/effect/turf_decal/tile/black/fourcorners,
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/turf/open/floor/iron/techmaint,
+/area/security/prison)
"uog" = (
/obj/item/rollerbed,
/turf/open/floor/plating,
@@ -65463,22 +65516,6 @@
},
/turf/open/floor/iron/dark,
/area/security/nuke_storage)
-"uLH" = (
-/obj/item/reagent_containers/food/drinks/beer/light{
- pixel_x = 9;
- pixel_y = 6
- },
-/obj/item/reagent_containers/food/drinks/beer/light{
- pixel_y = 3
- },
-/obj/item/reagent_containers/food/drinks/beer/light{
- pixel_x = -8;
- pixel_y = 11
- },
-/obj/effect/spawner/lootdrop/glowstick/lit,
-/obj/structure/table/wood,
-/turf/open/floor/wood,
-/area/maintenance/central)
"uLR" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -66052,6 +66089,21 @@
},
/turf/open/floor/iron,
/area/hallway/primary/starboard)
+"uWO" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = 4;
+ pixel_y = 13
+ },
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = -2;
+ pixel_y = 14
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/effect/turf_decal/siding/wideplating/dark,
+/turf/open/floor/iron/cafeteria,
+/area/crew_quarters/kitchen)
"uXd" = (
/obj/machinery/light,
/obj/machinery/newscaster{
@@ -66219,15 +66271,6 @@
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/plating,
/area/maintenance/department/science)
-"uZg" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/britcup{
- pixel_x = -5;
- pixel_y = 1
- },
-/obj/item/paper,
-/turf/open/floor/wood,
-/area/security/prison)
"uZs" = (
/obj/structure/chair/office{
dir = 1
@@ -66274,28 +66317,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/sepia,
/area/maintenance/port/central)
-"vam" = (
-/obj/machinery/recharger,
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/wine{
- pixel_x = -9;
- pixel_y = 6
- },
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
- pixel_x = 10;
- pixel_y = 13
- },
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
- pixel_x = 10;
- pixel_y = 5
- },
-/obj/machinery/light,
-/obj/machinery/computer/security/telescreen/entertainment{
- pixel_y = -32
- },
-/obj/machinery/camera/directional/south,
-/turf/open/floor/carpet,
-/area/quartermaster/exploration_prep)
"vaU" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor{
@@ -66561,6 +66582,17 @@
/obj/structure/cable/yellow,
/turf/open/floor/plating,
/area/bridge)
+"vgV" = (
+/obj/item/reagent_containers/cup/glass/drinkingglass{
+ pixel_x = -7;
+ pixel_y = 6
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/structure/table/wood,
+/turf/open/floor/carpet/green,
+/area/crew_quarters/cafeteria)
"vhc" = (
/turf/open/floor/iron/dark,
/area/crew_quarters/heads/chief)
@@ -66646,15 +66678,6 @@
},
/turf/open/floor/iron,
/area/hallway/secondary/entry)
-"viS" = (
-/obj/structure/table/wood/fancy/black,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{
- pixel_x = -2;
- pixel_y = 12
- },
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/carpet/royalblack,
-/area/maintenance/port/aft)
"viW" = (
/obj/structure/railing{
dir = 6
@@ -66770,18 +66793,6 @@
},
/turf/open/floor/iron/dark,
/area/chapel/main)
-"vkC" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/glass/bottle/nutrient/ez{
- pixel_x = 9;
- pixel_y = 4
- },
-/obj/item/pen/fountain/captain{
- pixel_x = -5;
- pixel_y = 5
- },
-/turf/open/floor/wood,
-/area/crew_quarters/dorms)
"vkD" = (
/obj/structure/sign/warning/radiation_shelter{
pixel_x = 1;
@@ -67662,43 +67673,6 @@
},
/turf/open/floor/carpet/purple,
/area/crew_quarters/heads/hor)
-"vAV" = (
-/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/epinephrine{
- pixel_x = -7;
- pixel_y = 2
- },
-/obj/item/reagent_containers/glass/bottle/epinephrine{
- pixel_x = 7;
- pixel_y = -3
- },
-/obj/item/reagent_containers/syringe,
-/obj/item/reagent_containers/spray/cleaner{
- pixel_x = -3;
- pixel_y = 2
- },
-/obj/item/reagent_containers/glass/bottle/charcoal{
- pixel_x = -4;
- pixel_y = -3
- },
-/obj/item/reagent_containers/glass/bottle/epinephrine{
- pixel_x = 8;
- pixel_y = 6
- },
-/obj/item/reagent_containers/syringe/antiviral,
-/obj/item/reagent_containers/syringe/antiviral,
-/obj/item/reagent_containers/glass/bottle/charcoal{
- pixel_x = -4;
- pixel_y = -3
- },
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable/yellow,
-/obj/item/wallframe/defib_mount,
-/obj/item/clothing/neck/stethoscope{
- pixel_y = 5
- },
-/turf/open/floor/iron,
-/area/medical/sleeper)
"vBo" = (
/obj/effect/turf_decal/guideline/guideline_edge/purple,
/turf/open/floor/iron/white/side{
@@ -68455,21 +68429,6 @@
},
/turf/open/space/basic,
/area/solar/starboard/fore)
-"vPl" = (
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/bottle/beer{
- pixel_x = -5;
- pixel_y = 16
- },
-/obj/item/storage/firstaid/toxin{
- pixel_x = 1;
- pixel_y = 3
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/science/misc_lab)
"vPD" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/delivery,
@@ -69637,17 +69596,6 @@
},
/turf/open/floor/iron/grid/steel,
/area/science/xenobiology)
-"wks" = (
-/obj/effect/turf_decal/tile/dark_green/anticorner/contrasted{
- dir = 4
- },
-/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket{
- pixel_x = -6;
- pixel_y = 3
- },
-/turf/open/floor/iron,
-/area/maintenance/central)
"wkt" = (
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/obj/machinery/disposal/bin,
@@ -70047,6 +69995,91 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/crew_quarters/heads/hos)
+"wsh" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/structure/closet/crate/medical,
+/obj/item/reagent_containers/cup/bottle/bromine{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/aluminium{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/chlorine{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/carbon{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/ethanol{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/copper{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/hydrogen{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/fluorine{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/water{
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/bottle/lithium{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/iron{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/iodine{
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/bottle/oxygen{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/phosphorus{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/nitrogen{
+ pixel_x = -6;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/bottle/mercury{
+ pixel_x = 6;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/bottle/radium{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/potassium{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/welding_fuel{
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/bottle/sacid{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/silicon{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/silver{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/sodium{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/sugar{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/sulfur{
+ pixel_x = -6
+ },
+/obj/item/circuitboard/machine/chem_heater,
+/turf/open/floor/iron/dark,
+/area/medical/virology)
"wsJ" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/extinguisher_cabinet{
@@ -70103,6 +70136,24 @@
},
/turf/open/floor/iron,
/area/bridge)
+"wuh" = (
+/obj/structure/janitorialcart,
+/obj/item/reagent_containers/cup/bucket{
+ pixel_x = 11;
+ pixel_y = -5
+ },
+/obj/item/mop{
+ pixel_x = -6;
+ pixel_y = 3
+ },
+/obj/effect/turf_decal/tile/purple/half/contrasted{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/janitor)
"wul" = (
/obj/machinery/door/airlock/command/glass{
name = "Bridge";
@@ -71521,24 +71572,6 @@
/obj/structure/girder,
/turf/open/floor/plating,
/area/maintenance/department/medical/morgue)
-"wQT" = (
-/obj/effect/turf_decal/tile/black/fourcorners,
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
-/obj/structure/table/reinforced,
-/obj/item/book/manual/chef_recipes{
- pixel_x = 2;
- pixel_y = 6
- },
-/obj/item/reagent_containers/food/condiment/flour{
- pixel_x = -5;
- pixel_y = 5
- },
-/obj/item/kitchen/rollingpin,
-/obj/item/clothing/head/utility/chefhat,
-/turf/open/floor/iron/techmaint,
-/area/security/prison)
"wRl" = (
/obj/effect/turf_decal/siding/wood{
dir = 1
@@ -71702,34 +71735,6 @@
},
/turf/open/floor/iron/grid/steel,
/area/hydroponics)
-"wUw" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
- pixel_x = 2;
- pixel_y = 12
- },
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
- pixel_x = -6;
- pixel_y = 8
- },
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
- pixel_x = 9;
- pixel_y = 12
- },
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
- pixel_x = 5;
- pixel_y = 5
- },
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
- pixel_x = 2;
- pixel_y = -1
- },
-/obj/structure/reagent_dispensers/virusfood{
- pixel_x = 31;
- pixel_y = -1
- },
-/turf/open/floor/iron/grid/steel,
-/area/medical/virology)
"wUE" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/obj/effect/turf_decal/guideline/guideline_edge/red{
@@ -72483,18 +72488,6 @@
},
/turf/open/floor/iron/dark,
/area/security/brig/dock)
-"xjA" = (
-/obj/item/reagent_containers/food/drinks/britcup{
- pixel_x = 3;
- pixel_y = 12
- },
-/obj/effect/turf_decal/bot,
-/obj/structure/table/wood{
- name = "Coffee warmer"
- },
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/iron/dark,
-/area/bridge/meeting_room)
"xjC" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -72607,29 +72600,6 @@
},
/turf/open/floor/catwalk_floor,
/area/maintenance/department/engine)
-"xkF" = (
-/obj/structure/table,
-/obj/item/toy/cards/deck{
- pixel_x = -7;
- pixel_y = 2
- },
-/obj/item/reagent_containers/food/drinks/britcup{
- pixel_x = -8;
- pixel_y = 10
- },
-/obj/item/book/manual/wiki/sopsecurity{
- pixel_x = 5;
- pixel_y = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/security/main)
"xkS" = (
/obj/effect/turf_decal/loading_area,
/obj/machinery/firealarm/directional/west,
@@ -74131,20 +74101,6 @@
},
/turf/open/floor/circuit/green/telecomms/mainframe,
/area/tcommsat/server)
-"xHw" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/siding/wideplating/dark,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
- pixel_x = -6;
- pixel_y = 9
- },
-/obj/item/reagent_containers/glass/rag{
- pixel_x = 6;
- pixel_y = 8
- },
-/turf/open/floor/iron/cafeteria_red,
-/area/crew_quarters/bar)
"xHy" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
@@ -74204,6 +74160,18 @@
},
/turf/open/floor/catwalk_floor,
/area/maintenance/central)
+"xIv" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 4
+ },
+/obj/structure/table,
+/obj/item/reagent_containers/cup/mortar,
+/obj/item/pestle,
+/obj/structure/cable/yellow{
+ icon_state = "1-4"
+ },
+/turf/open/floor/iron,
+/area/vacant_room/commissary/commissary2)
"xII" = (
/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
alpha = 180
@@ -75245,16 +75213,6 @@
},
/turf/open/floor/iron/dark,
/area/security/execution/education)
-"yaV" = (
-/obj/machinery/biogenerator,
-/obj/item/reagent_containers/glass/bucket,
-/obj/effect/turf_decal/bot,
-/obj/machinery/door/window/eastleft{
- name = "Hydroponics Desk";
- req_one_access_txt = "35;28"
- },
-/turf/open/floor/iron/grid/steel,
-/area/hydroponics)
"ybh" = (
/obj/effect/mapping_helpers/airlock/abandoned,
/obj/machinery/door/airlock/maintenance_hatch{
@@ -75355,6 +75313,17 @@
},
/turf/open/floor/iron,
/area/medical/storage)
+"ycV" = (
+/obj/effect/landmark/start/ai/secondary,
+/obj/machinery/door/window{
+ base_state = "leftsecure";
+ icon_state = "leftsecure";
+ name = "Tertiary AI Core Access";
+ atom_integrity = 300;
+ req_access_txt = "16"
+ },
+/turf/open/floor/engine/o2,
+/area/ai_monitored/turret_protected/ai)
"ydA" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -75486,6 +75455,37 @@
},
/turf/open/floor/iron/tech,
/area/engine/atmos)
+"yhq" = (
+/obj/structure/table,
+/obj/item/paper_bin{
+ pixel_x = -6;
+ pixel_y = 6
+ },
+/obj/item/pen{
+ pixel_x = -5;
+ pixel_y = 8
+ },
+/obj/item/clothing/glasses/welding{
+ pixel_x = -6;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = 9;
+ pixel_y = 10
+ },
+/obj/item/reagent_containers/dropper{
+ pixel_x = -3;
+ pixel_y = -4
+ },
+/obj/item/reagent_containers/cup/beaker/large{
+ pixel_x = 8;
+ pixel_y = 1
+ },
+/obj/structure/extinguisher_cabinet{
+ pixel_x = -32
+ },
+/turf/open/floor/iron,
+/area/science/lab)
"yhv" = (
/obj/structure/window/reinforced{
dir = 4
@@ -96779,7 +96779,7 @@ bgA
hCg
eua
ayc
-vam
+oRm
cMW
fVz
uKR
@@ -97050,7 +97050,7 @@ frc
frc
fFP
stS
-vPl
+hbi
sLX
sxX
lfC
@@ -98773,8 +98773,8 @@ xdi
yaG
cgq
bAj
-fls
-aOm
+lvp
+hpV
pmV
kZu
bAj
@@ -98826,7 +98826,7 @@ ndT
nQZ
ggJ
dvu
-kPB
+yhq
ykj
dLu
mGb
@@ -99039,7 +99039,7 @@ gsA
gsA
eSK
xkc
-ryj
+mNu
wGq
eBH
eSK
@@ -99290,7 +99290,7 @@ trr
yaP
asB
qNP
-fWj
+rPL
bAj
nmf
nmf
@@ -100658,7 +100658,7 @@ fAl
qZZ
sfR
qZZ
-viS
+dXx
rHt
vEn
xbP
@@ -101178,7 +101178,7 @@ clJ
clJ
clJ
qZZ
-oPl
+hmL
vQr
qZZ
gsA
@@ -101435,7 +101435,7 @@ jDt
eYH
efJ
fAl
-mLo
+tYF
gNm
fAl
gsA
@@ -102154,7 +102154,7 @@ aSr
lka
jdV
gOK
-ivW
+kKb
nnB
qRH
saq
@@ -102620,7 +102620,7 @@ hzk
bpo
qKg
rVu
-xkF
+oks
vwL
bNr
dTx
@@ -102630,7 +102630,7 @@ rgL
iZE
rWM
cUa
-gnE
+edN
tJT
rnw
rAQ
@@ -104676,7 +104676,7 @@ rqE
hGk
qLO
xNd
-nFk
+lyW
bDs
pVy
ifC
@@ -104937,7 +104937,7 @@ mJF
het
sSE
ifC
-ugA
+oeW
byu
ifC
erK
@@ -105704,7 +105704,7 @@ bjP
bjP
qdm
jrH
-tuz
+bqq
lHT
bBO
sFf
@@ -105956,7 +105956,7 @@ mtI
mtI
mtI
mtI
-thT
+uod
paj
tQy
pym
@@ -106214,7 +106214,7 @@ mtI
mtI
mtI
eDH
-wQT
+hKK
pNF
iee
kOb
@@ -106474,7 +106474,7 @@ hQk
uQP
pNF
xtP
-uZg
+cey
dyS
ldH
wNH
@@ -106716,7 +106716,7 @@ fZF
kjm
hsm
hsm
-aak
+nlX
piE
coK
hhv
@@ -107037,7 +107037,7 @@ bzO
mcm
hBR
cSY
-brj
+xIv
bzO
cFO
nxD
@@ -107481,7 +107481,7 @@ kYM
sZZ
kjF
tpC
-seW
+rDv
jXy
rYf
uLj
@@ -107504,7 +107504,7 @@ wgN
lCM
uml
mTK
-fOF
+lmH
mTK
dhT
kTx
@@ -107713,7 +107713,7 @@ xze
uuQ
uuQ
uTv
-dcy
+ycV
ahL
vsb
ycm
@@ -109083,7 +109083,7 @@ nfS
vDd
mTH
vJo
-nQW
+tjK
tLv
tmM
jgD
@@ -109255,7 +109255,7 @@ iVd
uuQ
uuQ
uTv
-dcy
+ycV
ahL
mhA
aoX
@@ -109280,7 +109280,7 @@ vkS
nlk
pXK
dbZ
-xjA
+rge
rQC
ydT
bqh
@@ -109366,7 +109366,7 @@ aCS
rQG
xBF
tIG
-pED
+sDP
aba
lwM
cKB
@@ -110609,7 +110609,7 @@ leD
cru
dNE
reS
-piH
+wuh
ntf
wkt
oGS
@@ -110641,7 +110641,7 @@ oIs
fxR
jlQ
mbT
-ukp
+tNs
lvJ
kDQ
xwH
@@ -110650,7 +110650,7 @@ kfv
vpR
uig
xBF
-okF
+rpT
rAO
oZL
uFU
@@ -111108,7 +111108,7 @@ yeA
gsA
efr
mIj
-uLH
+gXg
vmu
sSv
kui
@@ -111376,7 +111376,7 @@ aMA
mVN
mfr
hdp
-wks
+gXu
mdB
aMA
pCi
@@ -111429,7 +111429,7 @@ dwu
fYI
msM
teB
-faQ
+tYe
bgr
oUC
xVm
@@ -111615,7 +111615,7 @@ rNr
dea
dzY
gyP
-llV
+kDF
rNr
gsA
yeA
@@ -111938,7 +111938,7 @@ lLX
diq
ujr
tWQ
-vAV
+col
shZ
ibc
pfL
@@ -112407,7 +112407,7 @@ iOn
oio
izn
uxW
-xHw
+mTY
kok
ult
hjM
@@ -112919,17 +112919,17 @@ nXc
nXc
nXc
nXc
-coF
+rbv
soB
vge
kok
bLt
oJe
-fxG
+sLF
qXx
ykz
lFE
-eUV
+sjq
rfl
iJe
kgH
@@ -113186,7 +113186,7 @@ iWh
qXx
mWi
ubo
-dWm
+piS
rfl
iJe
kgH
@@ -113944,7 +113944,7 @@ qDa
qFY
eVo
jgI
-bPM
+ane
mQc
pGW
gmj
@@ -114179,11 +114179,11 @@ cvT
bMn
wII
rYG
-vkC
+fZx
boZ
wII
mws
-lYy
+ohw
wII
kEh
jUB
@@ -114209,7 +114209,7 @@ lFS
umg
hnl
eXD
-joH
+uWO
szP
tdk
lSp
@@ -114713,8 +114713,8 @@ wAq
mBT
dhK
fwL
-fZt
-lYd
+isM
+ggz
wlj
sZT
jlg
@@ -114727,8 +114727,8 @@ qVc
kok
bSd
mWi
-jmw
-aVk
+vgV
+tkG
rfl
iJe
pZb
@@ -115535,7 +115535,7 @@ wOB
hjA
opp
sYS
-dBb
+aug
sdl
xat
kMc
@@ -116051,7 +116051,7 @@ qjI
gqW
jBS
lQB
-rJL
+sQu
iuX
dkt
maw
@@ -116259,7 +116259,7 @@ otE
otE
iks
hmO
-yaV
+jIO
kcZ
iks
bPo
@@ -117596,7 +117596,7 @@ kkj
wLd
ujz
kMc
-mrr
+hlD
dwU
wKX
xDh
@@ -117797,7 +117797,7 @@ uKl
uKl
pKx
sxp
-kkQ
+lmI
bJj
vft
egv
@@ -118070,7 +118070,7 @@ fZQ
uTB
wTw
fZb
-ijU
+iCN
ekZ
sPf
eUC
@@ -119131,7 +119131,7 @@ kxl
tfq
sWR
lsT
-wUw
+iIc
baz
pZF
uhG
@@ -119682,7 +119682,7 @@ pQd
pQd
gsA
ewB
-oHE
+qBv
gsA
yeA
yeA
@@ -120417,7 +120417,7 @@ tfq
hzd
oWM
qRi
-cxD
+wsh
coJ
koC
oJV
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index b7bddd9b25c04..ada8a8d8a658f 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -190,7 +190,7 @@
"aH" = (
/obj/structure/table,
/obj/machinery/reagentgrinder,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/obj/effect/turf_decal/tile/green/fourcorners/contrasted,
/turf/open/floor/iron/white,
/area/centcom/holding)
@@ -492,7 +492,7 @@
"bK" = (
/obj/structure/table/reinforced,
/obj/item/food/mint,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
pixel_y = 5
},
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
@@ -953,7 +953,7 @@
/obj/structure/sign/poster/official/cohiba_robusto_ad{
pixel_x = 32
},
-/obj/item/reagent_containers/food/drinks/shaker{
+/obj/item/reagent_containers/cup/glass/shaker{
pixel_x = -10;
pixel_y = 1
},
@@ -987,7 +987,7 @@
"dH" = (
/obj/structure/table/wood,
/obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
pixel_y = 5
},
/obj/machinery/light,
@@ -1075,17 +1075,17 @@
/turf/open/floor/iron/dark,
/area/centcom/ferry)
"ef" = (
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = -3
},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -3;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = 6;
pixel_y = 8
},
@@ -1208,7 +1208,7 @@
pixel_y = 7;
pixel_x = -4
},
-/obj/item/reagent_containers/food/drinks/mug/tea{
+/obj/item/reagent_containers/cup/glass/mug/tea{
pixel_x = 9
},
/turf/open/floor/iron/dark,
@@ -1357,8 +1357,8 @@
"eQ" = (
/obj/structure/table/wood,
/obj/item/book/manual/wiki/barman_recipes,
-/obj/item/reagent_containers/food/drinks/shaker,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/glass/shaker,
+/obj/item/reagent_containers/cup/rag,
/obj/machinery/newscaster{
pixel_y = -32
},
@@ -2075,7 +2075,7 @@
/area/tdome/tdomeobserve)
"hT" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 5;
pixel_y = -2
},
@@ -4195,7 +4195,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 8
},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = 4;
pixel_y = 7
},
@@ -4798,7 +4798,7 @@
/area/centcom/evac)
"si" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/turf/open/floor/wood,
/area/syndicate_mothership/control)
"sj" = (
@@ -5765,7 +5765,7 @@
/area/centcom/holding)
"vu" = (
/obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/bottle/rum,
+/obj/item/reagent_containers/cup/glass/bottle/rum,
/obj/structure/table/wood,
/turf/open/floor/wood,
/area/syndicate_mothership/control)
@@ -6226,7 +6226,7 @@
/area/wizard_station)
"wR" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/trophy/gold_cup,
+/obj/item/reagent_containers/cup/glass/trophy/gold_cup,
/turf/open/floor/carpet/grimy,
/area/tdome/tdomeobserve)
"wS" = (
@@ -7104,7 +7104,7 @@
pixel_x = 6;
pixel_y = 1
},
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
pixel_x = -7;
pixel_y = -1
},
@@ -8030,7 +8030,7 @@
"Du" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
-/obj/item/reagent_containers/food/drinks/britcup,
+/obj/item/reagent_containers/cup/glass/britcup,
/obj/structure/window/reinforced{
dir = 8
},
@@ -9230,14 +9230,14 @@
"HK" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -8;
pixel_y = 5
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -8
},
-/obj/item/reagent_containers/food/drinks/britcup,
+/obj/item/reagent_containers/cup/glass/britcup,
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/tdome/tdomeobserve)
@@ -9389,7 +9389,7 @@
/obj/item/trash/candy{
pixel_x = 5
},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = -4;
pixel_y = 11
},
@@ -9501,7 +9501,7 @@
/area/tdome/arena)
"IG" = (
/obj/structure/bookcase/manuals,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/closed/indestructible/riveted,
/area/ctf)
"IJ" = (
@@ -9910,18 +9910,18 @@
/obj/effect/turf_decal/siding/wood{
dir = 9
},
-/obj/item/reagent_containers/food/drinks/mug{
+/obj/item/reagent_containers/cup/glass/mug{
pixel_x = 11;
pixel_y = -2
},
/obj/structure/sign/barsign{
pixel_y = 32
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = 12;
pixel_y = 15
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 8;
pixel_y = 13
},
@@ -10309,12 +10309,12 @@
"LJ" = (
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 5;
pixel_y = -2
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -5
},
/turf/open/floor/iron/dark,
@@ -10719,7 +10719,7 @@
"Nh" = (
/obj/structure/table/wood,
/obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/turf/open/floor/iron/dark,
/area/centcom/supplypod)
"Nk" = (
@@ -11478,14 +11478,14 @@
"PO" = (
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -8;
pixel_y = -2
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -5
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 6
},
/turf/open/floor/iron/dark,
@@ -11569,7 +11569,7 @@
"Qf" = (
/obj/structure/table/wood,
/obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
pixel_y = 5
},
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
@@ -11591,7 +11591,7 @@
/area/centcom/holding)
"Qj" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/sake,
+/obj/item/reagent_containers/cup/glass/bottle/sake,
/turf/open/floor/wood,
/area/centcom/holding)
"Qk" = (
@@ -11993,10 +11993,10 @@
/area/ctf)
"RK" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -4
},
/obj/item/reagent_containers/hypospray/medipen,
@@ -12201,7 +12201,7 @@
"Sn" = (
/obj/structure/table/wood,
/obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
pixel_y = 5
},
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
@@ -12473,11 +12473,11 @@
/area/tdome/tdomeobserve)
"Ti" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -8;
pixel_y = 5
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -8
},
/obj/item/knife/kitchen,
@@ -12489,7 +12489,7 @@
/area/tdome/tdomeobserve)
"Tj" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
pixel_y = 5
},
/obj/item/clothing/mask/cigarette/cigar/havana{
@@ -13492,8 +13492,8 @@
/obj/item/wrench,
/obj/item/watertank,
/obj/item/cultivator,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/tile/green/fourcorners/contrasted,
/turf/open/floor/iron/white,
/area/centcom/holding)
@@ -13894,8 +13894,8 @@
/turf/open/floor/iron,
/area/centcom/control)
"YJ" = (
-/obj/item/reagent_containers/food/condiment/enzyme,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/condiment/enzyme,
+/obj/item/reagent_containers/cup/glass/shaker,
/obj/item/book/manual/wiki/barman_recipes,
/obj/structure/closet/crate,
/turf/open/floor/iron/cafeteria,
@@ -13925,7 +13925,7 @@
/area/centcom/supplypod/loading/four)
"YQ" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
/turf/open/floor/iron/cafeteria,
/area/centcom/holding)
"YS" = (
diff --git a/_maps/shuttles/emergency/emergency_bar.dmm b/_maps/shuttles/emergency/emergency_bar.dmm
index b1720b49d0f1c..e6d1845ee49e6 100644
--- a/_maps/shuttles/emergency/emergency_bar.dmm
+++ b/_maps/shuttles/emergency/emergency_bar.dmm
@@ -115,7 +115,7 @@
"at" = (
/obj/structure/table/wood/poker,
/obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey,
/obj/machinery/light,
/obj/effect/turf_decal/siding/dark,
/turf/open/floor/carpet/royalblue,
@@ -441,7 +441,7 @@
"hS" = (
/obj/structure/table,
/obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/obj/item/storage/fancy/cigarettes/cigars/havana,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
@@ -726,7 +726,7 @@
},
/obj/structure/table,
/obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/bottle/lizardwine,
+/obj/item/reagent_containers/cup/glass/bottle/lizardwine,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/shuttle/escape)
diff --git a/_maps/shuttles/emergency/emergency_cere.dmm b/_maps/shuttles/emergency/emergency_cere.dmm
index 7dc14e723c105..ebbabaa23f450 100644
--- a/_maps/shuttles/emergency/emergency_cere.dmm
+++ b/_maps/shuttles/emergency/emergency_cere.dmm
@@ -458,7 +458,7 @@
/area/shuttle/escape)
"gd" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/beaker/cryoxadone,
+/obj/item/reagent_containers/cup/beaker/cryoxadone,
/obj/item/wrench,
/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
dir = 4
diff --git a/_maps/shuttles/emergency/emergency_corg.dmm b/_maps/shuttles/emergency/emergency_corg.dmm
index b1d5de11fe706..4f2bb9b67a7d9 100644
--- a/_maps/shuttles/emergency/emergency_corg.dmm
+++ b/_maps/shuttles/emergency/emergency_corg.dmm
@@ -293,7 +293,7 @@
/area/shuttle/escape)
"kD" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
/obj/item/reagent_containers/syringe/epinephrine,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
@@ -482,10 +482,10 @@
/area/shuttle/escape)
"rX" = (
/obj/structure/closet/secure_closet/freezer/kitchen,
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/condiment/sugar,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
/obj/item/food/meat/rawbacon,
/obj/item/food/meat/rawbacon,
/obj/item/food/meat/rawbacon,
@@ -1028,7 +1028,7 @@
dir = 4
},
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
pixel_y = 5
},
/obj/item/food/chocolatebar,
diff --git a/_maps/shuttles/emergency/emergency_delta.dmm b/_maps/shuttles/emergency/emergency_delta.dmm
index de3aa740a6542..cd967380d5889 100644
--- a/_maps/shuttles/emergency/emergency_delta.dmm
+++ b/_maps/shuttles/emergency/emergency_delta.dmm
@@ -1268,17 +1268,17 @@
/turf/open/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"Gd" = (
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = -3
},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -3;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = 6;
pixel_y = 8
},
diff --git a/_maps/shuttles/emergency/emergency_discoinferno.dmm b/_maps/shuttles/emergency/emergency_discoinferno.dmm
index 2629b06e99961..d6980dcd1f23e 100644
--- a/_maps/shuttles/emergency/emergency_discoinferno.dmm
+++ b/_maps/shuttles/emergency/emergency_discoinferno.dmm
@@ -70,7 +70,7 @@
"n" = (
/obj/structure/table/wood/poker,
/obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey,
/obj/machinery/light,
/turf/open/floor/mineral/gold,
/area/shuttle/escape)
@@ -112,12 +112,12 @@
/area/shuttle/escape)
"A" = (
/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/drinks/bottle/cognac,
+/obj/item/reagent_containers/cup/glass/bottle/cognac,
/turf/open/floor/wood,
/area/shuttle/escape)
"B" = (
/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka,
/turf/open/floor/wood,
/area/shuttle/escape)
"C" = (
@@ -152,9 +152,9 @@
/area/shuttle/escape)
"H" = (
/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
/obj/machinery/light{
dir = 4
},
@@ -176,12 +176,12 @@
/area/shuttle/escape)
"K" = (
/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/drinks/bottle/absinthe,
+/obj/item/reagent_containers/cup/glass/bottle/absinthe,
/turf/open/floor/wood,
/area/shuttle/escape)
"L" = (
/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/drinks/bottle/lizardwine,
+/obj/item/reagent_containers/cup/glass/bottle/lizardwine,
/turf/open/floor/wood,
/area/shuttle/escape)
"M" = (
diff --git a/_maps/shuttles/emergency/emergency_donut.dmm b/_maps/shuttles/emergency/emergency_donut.dmm
index 9a74f82daa4b4..5b62cf55e6e95 100644
--- a/_maps/shuttles/emergency/emergency_donut.dmm
+++ b/_maps/shuttles/emergency/emergency_donut.dmm
@@ -359,17 +359,17 @@
/area/shuttle/escape)
"bn" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = -3
},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -3;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = 6;
pixel_y = 8
},
diff --git a/_maps/shuttles/emergency/emergency_fland.dmm b/_maps/shuttles/emergency/emergency_fland.dmm
index 65b2116ce2033..a60fbc50f6c29 100644
--- a/_maps/shuttles/emergency/emergency_fland.dmm
+++ b/_maps/shuttles/emergency/emergency_fland.dmm
@@ -339,17 +339,17 @@
/turf/open/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"pF" = (
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = -3
},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -3;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = 6;
pixel_y = 8
},
@@ -658,17 +658,17 @@
/area/shuttle/escape)
"zB" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = -3
},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -3;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = 6;
pixel_y = 8
},
@@ -905,7 +905,7 @@
/obj/item/reagent_containers/hypospray/medipen{
pixel_y = -6
},
-/obj/item/reagent_containers/glass/bottle/charcoal,
+/obj/item/reagent_containers/cup/bottle/charcoal,
/obj/item/defibrillator/compact/loaded,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
diff --git a/_maps/shuttles/emergency/emergency_imfedupwiththisworld.dmm b/_maps/shuttles/emergency/emergency_imfedupwiththisworld.dmm
index c6c506d1210bf..f25f156c2401f 100644
--- a/_maps/shuttles/emergency/emergency_imfedupwiththisworld.dmm
+++ b/_maps/shuttles/emergency/emergency_imfedupwiththisworld.dmm
@@ -155,16 +155,16 @@
/area/shuttle/escape)
"U" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/shuttle/escape)
"V" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/shuttle/escape)
diff --git a/_maps/shuttles/emergency/emergency_kilo.dmm b/_maps/shuttles/emergency/emergency_kilo.dmm
index 61c5969117929..974cb677e70fe 100644
--- a/_maps/shuttles/emergency/emergency_kilo.dmm
+++ b/_maps/shuttles/emergency/emergency_kilo.dmm
@@ -463,7 +463,7 @@
/obj/item/reagent_containers/hypospray/medipen{
pixel_y = -6
},
-/obj/item/reagent_containers/glass/bottle/charcoal,
+/obj/item/reagent_containers/cup/bottle/charcoal,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/escape)
"cY" = (
diff --git a/_maps/shuttles/emergency/emergency_meta.dmm b/_maps/shuttles/emergency/emergency_meta.dmm
index 43daa06db9753..8b1be9081bdbb 100644
--- a/_maps/shuttles/emergency/emergency_meta.dmm
+++ b/_maps/shuttles/emergency/emergency_meta.dmm
@@ -436,17 +436,17 @@
/area/shuttle/escape)
"bJ" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = -3
},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -3;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = 6;
pixel_y = 8
},
diff --git a/_maps/shuttles/emergency/emergency_pubby.dmm b/_maps/shuttles/emergency/emergency_pubby.dmm
index 638c0e726d90d..f0f93bc16b853 100644
--- a/_maps/shuttles/emergency/emergency_pubby.dmm
+++ b/_maps/shuttles/emergency/emergency_pubby.dmm
@@ -374,7 +374,7 @@
/area/shuttle/escape)
"vo" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/food/drinks/bottle/wine,
+/obj/item/reagent_containers/cup/glass/bottle/wine,
/obj/effect/turf_decal/tile/green/half/contrasted{
dir = 1
},
diff --git a/_maps/shuttles/emergency/emergency_raven.dmm b/_maps/shuttles/emergency/emergency_raven.dmm
index fe28a505f0961..9a2f8ab6f9f51 100644
--- a/_maps/shuttles/emergency/emergency_raven.dmm
+++ b/_maps/shuttles/emergency/emergency_raven.dmm
@@ -447,17 +447,17 @@
/turf/open/floor/iron/white/side,
/area/shuttle/escape)
"bL" = (
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = -3
},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -3;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = 6;
pixel_y = 8
},
diff --git a/_maps/shuttles/emergency/emergency_russiafightpit.dmm b/_maps/shuttles/emergency/emergency_russiafightpit.dmm
index be30341adae41..a9f91777a46a4 100644
--- a/_maps/shuttles/emergency/emergency_russiafightpit.dmm
+++ b/_maps/shuttles/emergency/emergency_russiafightpit.dmm
@@ -58,7 +58,7 @@
"am" = (
/obj/structure/table,
/obj/item/storage/fancy/cigarettes/cigars/cohiba,
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{
pixel_x = 5;
pixel_y = 18
},
@@ -303,7 +303,7 @@
/area/shuttle/escape)
"be" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/vodka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/escape)
"bf" = (
@@ -396,7 +396,7 @@
pixel_x = 27
},
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/vodka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/escape)
"bv" = (
@@ -459,12 +459,12 @@
/area/shuttle/escape)
"bH" = (
/obj/structure/closet,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/turf/open/floor/plating,
/area/shuttle/escape)
"bI" = (
diff --git a/_maps/shuttles/emergency/emergency_theatre.dmm b/_maps/shuttles/emergency/emergency_theatre.dmm
index 445a67b1940c0..c0bdc1ab2577e 100644
--- a/_maps/shuttles/emergency/emergency_theatre.dmm
+++ b/_maps/shuttles/emergency/emergency_theatre.dmm
@@ -10,17 +10,17 @@
/turf/open/floor/carpet/black,
/area/shuttle/escape)
"eX" = (
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = -3
},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -3;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = 6;
pixel_y = 8
},
@@ -425,22 +425,22 @@
/area/shuttle/escape)
"JO" = (
/obj/structure/table/wood/fancy/royalblue,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_y = 9;
pixel_x = -6
},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_y = 9;
pixel_x = 6
},
-/obj/item/reagent_containers/food/drinks/bottle/champagne{
+/obj/item/reagent_containers/cup/glass/bottle/champagne{
pixel_y = 11
},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_y = 4;
pixel_x = 6
},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_y = 4;
pixel_x = -6
},
diff --git a/_maps/shuttles/emergency/emergency_tiny.dmm b/_maps/shuttles/emergency/emergency_tiny.dmm
index 9bdc48160d4e6..a325822887e5f 100644
--- a/_maps/shuttles/emergency/emergency_tiny.dmm
+++ b/_maps/shuttles/emergency/emergency_tiny.dmm
@@ -323,7 +323,7 @@
/obj/machinery/vending/wallmed{
pixel_x = -32;
pixel_y = 1;
- products = list(/obj/item/stack/medical/gauze = 4, /obj/item/reagent_containers/hypospray/medipen = 6, /obj/item/reagent_containers/hypospray/medipen/dexalin = 3, /obj/item/reagent_containers/glass/bottle/epinephrine = 2, /obj/item/reagent_containers/glass/bottle/charcoal = 2)
+ products = list(/obj/item/stack/medical/gauze = 4, /obj/item/reagent_containers/hypospray/medipen = 6, /obj/item/reagent_containers/hypospray/medipen/dexalin = 3, /obj/item/reagent_containers/cup/bottle/epinephrine = 2, /obj/item/reagent_containers/cup/bottle/charcoal = 2)
},
/turf/open/floor/iron/white,
/area/shuttle/escape)
diff --git a/_maps/shuttles/emergency/emergency_wabbajack.dmm b/_maps/shuttles/emergency/emergency_wabbajack.dmm
index 3d71a8948f4e4..cda35866266b3 100644
--- a/_maps/shuttles/emergency/emergency_wabbajack.dmm
+++ b/_maps/shuttles/emergency/emergency_wabbajack.dmm
@@ -186,11 +186,11 @@
/area/shuttle/escape)
"aT" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = 2;
pixel_y = 2
},
-/obj/item/reagent_containers/glass/bottle/charcoal,
+/obj/item/reagent_containers/cup/bottle/charcoal,
/turf/open/floor/mineral/titanium/white,
/area/shuttle/escape)
"be" = (
diff --git a/_maps/shuttles/exploration/exploration_fland.dmm b/_maps/shuttles/exploration/exploration_fland.dmm
index 6a75042c81328..8c61415c2cb5c 100644
--- a/_maps/shuttles/exploration/exploration_fland.dmm
+++ b/_maps/shuttles/exploration/exploration_fland.dmm
@@ -39,7 +39,7 @@
pixel_x = 6;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/syndicatebeer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -8;
pixel_y = 2
},
@@ -645,10 +645,10 @@
/area/shuttle/exploration)
"JR" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/rag{
+/obj/item/reagent_containers/cup/rag{
pixel_y = 5
},
-/obj/item/reagent_containers/food/drinks/shaker{
+/obj/item/reagent_containers/cup/glass/shaker{
pixel_x = 4;
pixel_y = 1
},
@@ -783,7 +783,7 @@
dir = 8
},
/obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/reagent_containers/spray/cleaner,
/obj/effect/turf_decal/box,
/turf/open/floor/iron/grid/steel,
@@ -870,7 +870,7 @@
/area/shuttle/exploration)
"UN" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
pixel_x = 9;
pixel_y = -3
},
@@ -879,7 +879,7 @@
pixel_x = -3;
pixel_y = 5
},
-/obj/item/reagent_containers/food/drinks/beer/light{
+/obj/item/reagent_containers/cup/glass/bottle/beer/light{
pixel_x = 4;
pixel_y = 7
},
@@ -895,7 +895,7 @@
pixel_y = 1
},
/obj/item/trash/pistachios,
-/obj/item/reagent_containers/food/drinks/beer/almost_empty{
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{
pixel_x = -8
},
/obj/machinery/light,
diff --git a/_maps/shuttles/hunter/hunter_bounty.dmm b/_maps/shuttles/hunter/hunter_bounty.dmm
index 9bc7ba09d5318..ec8b4afb4c495 100644
--- a/_maps/shuttles/hunter/hunter_bounty.dmm
+++ b/_maps/shuttles/hunter/hunter_bounty.dmm
@@ -29,7 +29,7 @@
},
/obj/effect/turf_decal/delivery,
/obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/machinery/airalarm/directional/east{
req_access = null;
req_access_txt = "181"
diff --git a/_maps/shuttles/hunter/hunter_russian.dmm b/_maps/shuttles/hunter/hunter_russian.dmm
index ebde43f81b867..3ee9fa8e724bc 100644
--- a/_maps/shuttles/hunter/hunter_russian.dmm
+++ b/_maps/shuttles/hunter/hunter_russian.dmm
@@ -108,9 +108,9 @@
/obj/item/food/rationpack,
/obj/item/food/rationpack,
/obj/item/food/rationpack,
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka,
-/obj/item/reagent_containers/food/drinks/bottle/vodka,
-/obj/item/reagent_containers/food/drinks/bottle/vodka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka,
/turf/open/floor/iron/techmaint,
/area/shuttle/hunter)
"jP" = (
@@ -157,7 +157,7 @@
/area/shuttle/hunter)
"my" = (
/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/storage/bag/trash{
pixel_x = 6
},
@@ -689,7 +689,7 @@
/area/shuttle/hunter)
"Jx" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/vodka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
pixel_x = 8;
pixel_y = 6
},
@@ -988,7 +988,7 @@
/turf/open/floor/iron/dark,
/area/shuttle/hunter)
"Ul" = (
-/obj/item/reagent_containers/food/drinks/flask/gold{
+/obj/item/reagent_containers/cup/glass/flask/gold{
list_reagents = list(/datum/reagent/consumable/ethanol/sbiten=30);
pixel_y = 8;
pixel_x = 4
@@ -1030,7 +1030,7 @@
pixel_y = 8;
pixel_x = 2
},
-/obj/item/reagent_containers/food/drinks/bottle/vodka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
pixel_x = -8;
pixel_y = 11
},
diff --git a/_maps/shuttles/hunter/hunter_space_cop.dmm b/_maps/shuttles/hunter/hunter_space_cop.dmm
index d79dd2d7bba92..8884b78dc8304 100644
--- a/_maps/shuttles/hunter/hunter_space_cop.dmm
+++ b/_maps/shuttles/hunter/hunter_space_cop.dmm
@@ -232,7 +232,7 @@
pixel_x = 8;
pixel_y = 8
},
-/obj/item/reagent_containers/food/drinks/mug{
+/obj/item/reagent_containers/cup/glass/mug{
pixel_x = 9;
pixel_y = -2
},
@@ -389,7 +389,7 @@
pixel_x = -7;
pixel_y = -7
},
-/obj/item/reagent_containers/food/drinks/mug{
+/obj/item/reagent_containers/cup/glass/mug{
pixel_x = -7;
pixel_y = 4
},
@@ -1220,7 +1220,7 @@
/obj/effect/decal/cleanable/oil{
pixel_y = 11
},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
pixel_x = -8;
pixel_y = 2
},
diff --git a/_maps/shuttles/infiltrator/infiltrator_advanced.dmm b/_maps/shuttles/infiltrator/infiltrator_advanced.dmm
index c20ea1aae749d..b8e9370fbe87b 100644
--- a/_maps/shuttles/infiltrator/infiltrator_advanced.dmm
+++ b/_maps/shuttles/infiltrator/infiltrator_advanced.dmm
@@ -34,17 +34,17 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
desc = "A bottle of whiskey. There's a label that reads 'tears' taped to the front.";
name = "Bottle of Tears";
pixel_x = 3;
pixel_y = 5
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -7;
pixel_y = 10
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -7;
pixel_y = 4
},
@@ -665,7 +665,7 @@
/obj/item/reagent_containers/hypospray/medipen{
pixel_y = -6
},
-/obj/item/reagent_containers/glass/bottle/charcoal,
+/obj/item/reagent_containers/cup/bottle/charcoal,
/obj/structure/table/reinforced,
/obj/machinery/light{
dir = 1
diff --git a/_maps/shuttles/infiltrator/infiltrator_basic.dmm b/_maps/shuttles/infiltrator/infiltrator_basic.dmm
index df51e6e24bafb..7f4b5c79544ef 100644
--- a/_maps/shuttles/infiltrator/infiltrator_basic.dmm
+++ b/_maps/shuttles/infiltrator/infiltrator_basic.dmm
@@ -283,17 +283,17 @@
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/medical)
"bt" = (
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = -3
},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -3;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = 6;
pixel_y = 8
},
@@ -851,8 +851,8 @@
/area/shuttle/syndicate/medical)
"Hs" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker,
/obj/item/reagent_containers/dropper,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
diff --git a/_maps/shuttles/pirate/pirate_default.dmm b/_maps/shuttles/pirate/pirate_default.dmm
index a7205fb084fdc..9a11216e64085 100644
--- a/_maps/shuttles/pirate/pirate_default.dmm
+++ b/_maps/shuttles/pirate/pirate_default.dmm
@@ -229,7 +229,7 @@
dir = 8;
pixel_y = 10
},
-/obj/item/reagent_containers/food/drinks/bottle/hooch{
+/obj/item/reagent_containers/cup/glass/bottle/hooch{
pixel_x = 8;
pixel_y = 4
},
@@ -402,7 +402,7 @@
pixel_x = 8;
pixel_y = -4
},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
pixel_x = -9;
pixel_y = -7
},
@@ -594,7 +594,7 @@
pixel_x = -8;
pixel_y = 14
},
-/obj/item/reagent_containers/food/drinks/mug{
+/obj/item/reagent_containers/cup/glass/mug{
pixel_x = -14;
pixel_y = 1
},
@@ -870,7 +870,7 @@
pixel_y = 10;
pixel_x = -5
},
-/obj/item/reagent_containers/food/condiment/milk{
+/obj/item/reagent_containers/condiment/milk{
pixel_y = 2;
pixel_x = -7
},
@@ -929,7 +929,7 @@
pixel_x = 6;
pixel_y = -2
},
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee{
pixel_x = 10;
pixel_y = 19
},
@@ -2004,7 +2004,7 @@
/obj/effect/turf_decal/weather/dirt/corner{
dir = 4
},
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/mop,
/obj/item/storage/bag/trash{
pixel_x = 4;
@@ -2098,40 +2098,40 @@
/area/shuttle/pirate)
"Wx" = (
/obj/effect/turf_decal/bot,
-/obj/item/reagent_containers/food/drinks/bottle/moonshine{
+/obj/item/reagent_containers/cup/glass/bottle/moonshine{
pixel_x = 7;
pixel_y = -5
},
-/obj/item/reagent_containers/food/condiment/milk{
+/obj/item/reagent_containers/condiment/milk{
pixel_y = -6;
pixel_x = 5
},
-/obj/item/reagent_containers/food/condiment/milk{
+/obj/item/reagent_containers/condiment/milk{
pixel_y = -6;
pixel_x = 1
},
-/obj/item/reagent_containers/food/condiment/milk{
+/obj/item/reagent_containers/condiment/milk{
pixel_y = -6;
pixel_x = -5
},
-/obj/item/reagent_containers/food/condiment/milk{
+/obj/item/reagent_containers/condiment/milk{
pixel_y = -6;
pixel_x = 5
},
-/obj/item/reagent_containers/food/condiment/milk{
+/obj/item/reagent_containers/condiment/milk{
pixel_y = -6;
pixel_x = 1
},
-/obj/item/reagent_containers/food/condiment/milk{
+/obj/item/reagent_containers/condiment/milk{
pixel_y = -8;
pixel_x = 8
},
-/obj/item/reagent_containers/food/condiment/milk{
+/obj/item/reagent_containers/condiment/milk{
pixel_y = -10;
pixel_x = -3
},
/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/item/reagent_containers/food/condiment/milk{
+/obj/item/reagent_containers/condiment/milk{
pixel_y = -8;
pixel_x = 8
},
diff --git a/_maps/shuttles/ruin/ruin_caravan_victim.dmm b/_maps/shuttles/ruin/ruin_caravan_victim.dmm
index bc43d0d012d66..851f1bd4af8f8 100644
--- a/_maps/shuttles/ruin/ruin_caravan_victim.dmm
+++ b/_maps/shuttles/ruin/ruin_caravan_victim.dmm
@@ -415,21 +415,21 @@
locked = 0;
name = "fridge"
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 3;
pixel_y = -3
},
-/obj/item/reagent_containers/glass/waterbottle{
+/obj/item/reagent_containers/cup/waterbottle{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/waterbottle,
-/obj/item/reagent_containers/glass/waterbottle{
+/obj/item/reagent_containers/cup/waterbottle,
+/obj/item/reagent_containers/cup/waterbottle{
pixel_x = 3;
pixel_y = -3
},
diff --git a/_maps/shuttles/ruin/ruin_pirate_cutter.dmm b/_maps/shuttles/ruin/ruin_pirate_cutter.dmm
index 929f9306ab4d2..cddb5cd3f86d1 100644
--- a/_maps/shuttles/ruin/ruin_pirate_cutter.dmm
+++ b/_maps/shuttles/ruin/ruin_pirate_cutter.dmm
@@ -357,7 +357,7 @@
/obj/item/storage/box/donkpockets{
pixel_x = -6
},
-/obj/item/reagent_containers/food/drinks/bottle/rum{
+/obj/item/reagent_containers/cup/glass/bottle/rum{
pixel_x = 8;
pixel_y = 3
},
@@ -368,7 +368,7 @@
/area/shuttle/caravan/pirate)
"qX" = (
/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/mop,
/obj/effect/turf_decal/stripes/line{
dir = 5
@@ -396,11 +396,11 @@
/area/shuttle/caravan/pirate)
"to" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/rum{
+/obj/item/reagent_containers/cup/glass/bottle/rum{
pixel_x = 3;
pixel_y = 6
},
-/obj/item/reagent_containers/food/drinks/bottle/rum,
+/obj/item/reagent_containers/cup/glass/bottle/rum,
/turf/open/floor/iron/dark,
/area/shuttle/caravan/pirate)
"tM" = (
diff --git a/_maps/shuttles/whiteship/whiteship_box.dmm b/_maps/shuttles/whiteship/whiteship_box.dmm
index 3978cda03d1e8..2276abbd60287 100644
--- a/_maps/shuttles/whiteship/whiteship_box.dmm
+++ b/_maps/shuttles/whiteship/whiteship_box.dmm
@@ -45,7 +45,7 @@
"am" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/crate/freezer/surplus_limbs,
-/obj/item/reagent_containers/glass/beaker/synthflesh,
+/obj/item/reagent_containers/cup/beaker/synthflesh,
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/shuttle/abandoned/medbay)
@@ -250,7 +250,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/reagent_dispensers/watertank,
/obj/effect/turf_decal/bot,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/mop,
/obj/item/storage/bag/trash{
pixel_x = 6
@@ -1170,11 +1170,11 @@
pixel_x = -6;
pixel_y = 6
},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = 7;
pixel_y = -3
},
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
pixel_x = -2;
pixel_y = -3
},
@@ -1407,7 +1407,7 @@
pixel_x = -5;
pixel_y = 5
},
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
pixel_x = 8;
pixel_y = 4
},
@@ -1545,25 +1545,25 @@
/obj/structure/closet/crate{
name = "food crate"
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = -5;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 2;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = -2
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 5
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 1;
pixel_y = -3
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 8;
pixel_y = -3
},
@@ -1718,11 +1718,11 @@
"sz" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = 7;
pixel_y = 1
},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = -6;
pixel_y = 6
},
@@ -1818,7 +1818,7 @@
pixel_x = 6;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
pixel_x = -6;
pixel_y = 4
},
@@ -1995,12 +1995,12 @@
locked = 0;
name = "fridge"
},
-/obj/item/reagent_containers/glass/waterbottle{
+/obj/item/reagent_containers/cup/waterbottle{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/waterbottle,
-/obj/item/reagent_containers/glass/waterbottle{
+/obj/item/reagent_containers/cup/waterbottle,
+/obj/item/reagent_containers/cup/waterbottle{
pixel_x = 3;
pixel_y = -3
},
diff --git a/_maps/shuttles/whiteship/whiteship_delta.dmm b/_maps/shuttles/whiteship/whiteship_delta.dmm
index 5295c84560583..5ca8343ad2e6a 100644
--- a/_maps/shuttles/whiteship/whiteship_delta.dmm
+++ b/_maps/shuttles/whiteship/whiteship_delta.dmm
@@ -85,21 +85,21 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/bot_white,
/obj/structure/closet/crate,
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/waterbottle/large,
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large,
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 3;
pixel_y = -3
},
-/obj/item/reagent_containers/glass/waterbottle{
+/obj/item/reagent_containers/cup/waterbottle{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/waterbottle,
-/obj/item/reagent_containers/glass/waterbottle{
+/obj/item/reagent_containers/cup/waterbottle,
+/obj/item/reagent_containers/cup/waterbottle{
pixel_x = 3;
pixel_y = -3
},
@@ -129,7 +129,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/mop,
/obj/item/storage/bag/trash{
pixel_x = 6
@@ -1267,10 +1267,10 @@
"dN" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = -3
},
/obj/item/reagent_containers/syringe,
@@ -2120,11 +2120,11 @@
name = "fridge"
},
/obj/item/food/sausage,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/obj/item/food/sandwich,
/obj/structure/spider/stickyweb,
/obj/effect/turf_decal/tile/bar/opposingcorners,
@@ -2225,7 +2225,7 @@
currenthand = list("2 of Diamonds","3 of Clubs");
pixel_x = -5
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 7;
pixel_y = 4
},
diff --git a/_maps/shuttles/whiteship/whiteship_fland.dmm b/_maps/shuttles/whiteship/whiteship_fland.dmm
index 95ab48b5e2b7c..29cee5609ea4c 100644
--- a/_maps/shuttles/whiteship/whiteship_fland.dmm
+++ b/_maps/shuttles/whiteship/whiteship_fland.dmm
@@ -33,25 +33,25 @@
/obj/structure/closet/crate{
name = "food crate"
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = -5;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 2;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = -2
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 5
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 1;
pixel_y = -3
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 8;
pixel_y = -3
},
@@ -328,10 +328,10 @@
"qb" = (
/obj/effect/turf_decal/bot,
/obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
pixel_x = -4
},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
pixel_x = 4
},
/turf/open/floor/wood,
diff --git a/_maps/shuttles/whiteship/whiteship_meta.dmm b/_maps/shuttles/whiteship/whiteship_meta.dmm
index 8b72bbc6a3d41..464a28f46c281 100644
--- a/_maps/shuttles/whiteship/whiteship_meta.dmm
+++ b/_maps/shuttles/whiteship/whiteship_meta.dmm
@@ -218,25 +218,25 @@
/obj/structure/closet/crate{
name = "food crate"
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = -5;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 2;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = -2
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 5
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 1;
pixel_y = -3
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 8;
pixel_y = -3
},
@@ -1207,11 +1207,11 @@
"dQ" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -8;
pixel_y = 10
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -8;
pixel_y = 4
},
@@ -1293,7 +1293,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/crate/medical,
/obj/item/storage/firstaid/fire,
-/obj/item/reagent_containers/glass/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine,
/obj/item/reagent_containers/syringe,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/cargo)
@@ -1345,11 +1345,11 @@
/obj/item/knife/kitchen{
pixel_x = 16
},
-/obj/item/reagent_containers/food/condiment/sugar{
+/obj/item/reagent_containers/condiment/sugar{
pixel_x = -9;
pixel_y = 14
},
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
pixel_x = -5;
pixel_y = 6
},
@@ -1723,11 +1723,11 @@
"qi" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/secure_closet/freezer/fridge/open,
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
/obj/item/food/meat/slab/synthmeat{
pixel_x = -3;
pixel_y = 3
@@ -2158,18 +2158,18 @@
/obj/machinery/light/small{
dir = 8
},
-/obj/item/reagent_containers/food/drinks/bottle/vodka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
pixel_y = 12
},
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
pixel_x = 16;
pixel_y = 12
},
-/obj/item/reagent_containers/food/drinks/bottle/gin{
+/obj/item/reagent_containers/cup/glass/bottle/gin{
pixel_x = -8;
pixel_y = 4
},
-/obj/item/reagent_containers/food/drinks/bottle/cognac{
+/obj/item/reagent_containers/cup/glass/bottle/cognac{
pixel_x = 8;
pixel_y = 4
},
@@ -2206,7 +2206,7 @@
/obj/item/shovel/spade,
/obj/item/cultivator,
/obj/item/plant_analyzer,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/tile/green/half/contrasted{
dir = 1
@@ -2239,19 +2239,19 @@
"Gj" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -8;
pixel_y = 10
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -8;
pixel_y = 4
},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = 1;
pixel_y = 8
},
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
pixel_x = 6
},
/obj/effect/decal/cleanable/dirt/dust,
@@ -2265,7 +2265,7 @@
pixel_x = -11;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 6;
pixel_y = 14
},
@@ -2491,14 +2491,14 @@
"Pb" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/wine{
+/obj/item/reagent_containers/cup/glass/bottle/wine{
pixel_y = 12
},
-/obj/item/reagent_containers/food/drinks/bottle/vermouth{
+/obj/item/reagent_containers/cup/glass/bottle/vermouth{
pixel_x = -8;
pixel_y = 4
},
-/obj/item/reagent_containers/food/drinks/bottle/tequila{
+/obj/item/reagent_containers/cup/glass/bottle/tequila{
pixel_x = 8;
pixel_y = 4
},
@@ -2582,7 +2582,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/rack,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/mop,
/obj/item/storage/bag/trash{
pixel_x = 6
diff --git a/_maps/templates/hilbertshotel.dmm b/_maps/templates/hilbertshotel.dmm
index 09452a387d909..9c372f8188786 100644
--- a/_maps/templates/hilbertshotel.dmm
+++ b/_maps/templates/hilbertshotel.dmm
@@ -64,7 +64,7 @@
pixel_x = -5;
pixel_y = 5
},
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee{
pixel_x = 9;
pixel_y = 2
},
@@ -291,7 +291,7 @@
/area/hilbertshotel)
"Z" = (
/obj/structure/table/wood/poker,
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee{
pixel_x = -6;
pixel_y = 2
},
diff --git a/_maps/templates/holodeck_asylum.dmm b/_maps/templates/holodeck_asylum.dmm
index 1168e24f0d6b5..01111577d8445 100644
--- a/_maps/templates/holodeck_asylum.dmm
+++ b/_maps/templates/holodeck_asylum.dmm
@@ -127,7 +127,7 @@
/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/syringe,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/holofloor/white,
/area/template_noop)
diff --git a/_maps/templates/holodeck_kitchen.dmm b/_maps/templates/holodeck_kitchen.dmm
index 8a37b15c0d56a..a5a53108b74a6 100644
--- a/_maps/templates/holodeck_kitchen.dmm
+++ b/_maps/templates/holodeck_kitchen.dmm
@@ -23,7 +23,7 @@
/obj/structure/window{
dir = 1
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
list_reagents = list()
},
/turf/open/floor/holofloor/white,
diff --git a/_maps/templates/holodeck_teahouse.dmm b/_maps/templates/holodeck_teahouse.dmm
index 440e69bd907e7..2502855cc318e 100644
--- a/_maps/templates/holodeck_teahouse.dmm
+++ b/_maps/templates/holodeck_teahouse.dmm
@@ -36,12 +36,12 @@
/area/template_noop)
"g" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
icon_state = "sakecup";
pixel_x = -8;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
icon_state = "sakecup";
pixel_x = 8;
pixel_y = 3
@@ -97,9 +97,9 @@
/area/template_noop)
"p" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug,
-/obj/item/reagent_containers/food/drinks/mug,
-/obj/item/reagent_containers/food/drinks/mug,
+/obj/item/reagent_containers/cup/glass/mug,
+/obj/item/reagent_containers/cup/glass/mug,
+/obj/item/reagent_containers/cup/glass/mug,
/turf/open/floor/holofloor{
dir = 9;
icon_state = "wood"
diff --git a/_maps/templates/shelter_2.dmm b/_maps/templates/shelter_2.dmm
index e7436bfc7c1be..fbbb2fbd82f26 100644
--- a/_maps/templates/shelter_2.dmm
+++ b/_maps/templates/shelter_2.dmm
@@ -112,11 +112,11 @@
light_color = "#DDFFD3"
},
/obj/structure/table/wood/fancy/black,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = 7;
pixel_y = 2
},
-/obj/item/reagent_containers/food/drinks/bottle/wine{
+/obj/item/reagent_containers/cup/glass/bottle/wine{
pixel_x = -6;
pixel_y = 10
},
@@ -162,7 +162,7 @@
/area/survivalpod)
"x" = (
/obj/structure/table/wood/fancy/black,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = 7;
pixel_y = 2
},
diff --git a/_maps/templates/shelter_3.dmm b/_maps/templates/shelter_3.dmm
index ac53b420e236c..f41c514c9fbe6 100644
--- a/_maps/templates/shelter_3.dmm
+++ b/_maps/templates/shelter_3.dmm
@@ -42,8 +42,8 @@
/area/survivalpod)
"i" = (
/obj/item/book/manual/wiki/barman_recipes,
-/obj/item/reagent_containers/food/drinks/shaker,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/glass/shaker,
+/obj/item/reagent_containers/cup/rag,
/obj/structure/table/wood/fancy/black,
/turf/open/floor/pod/dark,
/area/survivalpod)
@@ -193,11 +193,11 @@
/area/survivalpod)
"F" = (
/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -4;
pixel_y = 12
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = 4;
pixel_y = 4
},
diff --git a/_maps/templates/shelter_4.dmm b/_maps/templates/shelter_4.dmm
index 6c4bf512cbc07..5ac8f7bb92da1 100644
--- a/_maps/templates/shelter_4.dmm
+++ b/_maps/templates/shelter_4.dmm
@@ -112,7 +112,7 @@
"aB" = (
/obj/structure/rack,
/obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/machinery/light/small,
/obj/item/paper/fluff/itemnotice,
/turf/open/floor/pod/dark,
@@ -202,7 +202,7 @@
/obj/structure/closet,
/obj/item/clothing/shoes/workboots/mining,
/obj/item/clothing/gloves/fingerless,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/obj/machinery/light{
dir = 8
},
@@ -229,7 +229,7 @@
/obj/structure/closet,
/obj/item/clothing/shoes/workboots/mining,
/obj/item/clothing/gloves/fingerless,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/obj/item/pickaxe/mini,
/obj/item/clothing/under/rank/cargo/miner/lavaland,
/turf/open/floor/pod/light,
diff --git a/_maps/templates/warped_room.dmm b/_maps/templates/warped_room.dmm
index c8c87db0e8828..db521f2c32239 100644
--- a/_maps/templates/warped_room.dmm
+++ b/_maps/templates/warped_room.dmm
@@ -84,7 +84,7 @@
/area/warped_room)
"r" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle,
+/obj/item/reagent_containers/cup/glass/bottle,
/turf/open/indestructible/hotelwood,
/area/warped_room)
"s" = (
@@ -100,7 +100,7 @@
/area/warped_room)
"u" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/soda_cans/cola,
+/obj/item/reagent_containers/cup/soda_cans/cola,
/obj/item/knife/kitchen,
/obj/item/kitchen/rollingpin,
/turf/open/indestructible/hotelwood,
diff --git a/beestation.dme b/beestation.dme
index c80536ce36350..0ad5508f55aa9 100644
--- a/beestation.dme
+++ b/beestation.dme
@@ -554,6 +554,8 @@
#include "code\datums\holocall.dm"
#include "code\datums\http.dm"
#include "code\datums\hud.dm"
+#include "code\datums\map_adjustment.dm"
+#include "code\datums\map_adjustment_include.dm"
#include "code\datums\map_config.dm"
#include "code\datums\mind.dm"
#include "code\datums\movement_detector.dm"
@@ -1017,6 +1019,7 @@
#include "code\datums\wires\tesla_coil.dm"
#include "code\datums\wires\vending.dm"
#include "code\game\alternate_appearance.dm"
+#include "code\game\atom_defense.dm"
#include "code\game\atoms.dm"
#include "code\game\atoms_movable.dm"
#include "code\game\communications.dm"
@@ -2307,6 +2310,7 @@
#include "code\modules\cargo\bounties\assistant.dm"
#include "code\modules\cargo\bounties\botany.dm"
#include "code\modules\cargo\bounties\chef.dm"
+#include "code\modules\cargo\bounties\core.dm"
#include "code\modules\cargo\bounties\engineering.dm"
#include "code\modules\cargo\bounties\item.dm"
#include "code\modules\cargo\bounties\mech.dm"
@@ -2318,6 +2322,7 @@
#include "code\modules\cargo\bounties\slime.dm"
#include "code\modules\cargo\bounties\special.dm"
#include "code\modules\cargo\bounties\virus.dm"
+#include "code\modules\cargo\exports\core.dm"
#include "code\modules\cargo\exports\gear.dm"
#include "code\modules\cargo\exports\large_objects.dm"
#include "code\modules\cargo\exports\lavaland.dm"
@@ -2670,13 +2675,8 @@
#include "code\modules\fields\timestop.dm"
#include "code\modules\fields\turf_objects.dm"
#include "code\modules\flufftext\Dreaming.dm"
-#include "code\modules\food_and_drinks\food.dm"
#include "code\modules\food_and_drinks\pizzabox.dm"
#include "code\modules\food_and_drinks\plate.dm"
-#include "code\modules\food_and_drinks\drinks\drinks.dm"
-#include "code\modules\food_and_drinks\drinks\drinks\bottle.dm"
-#include "code\modules\food_and_drinks\drinks\drinks\drinkingglass.dm"
-#include "code\modules\food_and_drinks\food\condiment.dm"
#include "code\modules\food_and_drinks\kitchen_machinery\deep_fryer.dm"
#include "code\modules\food_and_drinks\kitchen_machinery\food_cart.dm"
#include "code\modules\food_and_drinks\kitchen_machinery\gibber.dm"
@@ -2876,7 +2876,6 @@
#include "code\modules\jobs\job_types\station_engineer.dm"
#include "code\modules\jobs\job_types\virologist.dm"
#include "code\modules\jobs\job_types\warden.dm"
-#include "code\modules\jobs\map_changes\map_changes.dm"
#include "code\modules\keybindings\bindings_atom.dm"
#include "code\modules\keybindings\bindings_client.dm"
#include "code\modules\keybindings\focus.dm"
@@ -3712,17 +3711,22 @@
#include "code\modules\reagents\chemistry\recipes\toxins.dm"
#include "code\modules\reagents\reagent_containers\blood_pack.dm"
#include "code\modules\reagents\reagent_containers\borghydro.dm"
-#include "code\modules\reagents\reagent_containers\bottle.dm"
#include "code\modules\reagents\reagent_containers\chem_bag.dm"
#include "code\modules\reagents\reagent_containers\chem_heirloom.dm"
+#include "code\modules\reagents\reagent_containers\condiment.dm"
#include "code\modules\reagents\reagent_containers\dropper.dm"
-#include "code\modules\reagents\reagent_containers\glass.dm"
#include "code\modules\reagents\reagent_containers\hypospray.dm"
#include "code\modules\reagents\reagent_containers\medspray.dm"
#include "code\modules\reagents\reagent_containers\patch.dm"
#include "code\modules\reagents\reagent_containers\pill.dm"
#include "code\modules\reagents\reagent_containers\spray.dm"
#include "code\modules\reagents\reagent_containers\syringes.dm"
+#include "code\modules\reagents\reagent_containers\cups\_cup.dm"
+#include "code\modules\reagents\reagent_containers\cups\bottle.dm"
+#include "code\modules\reagents\reagent_containers\cups\drinkingglass.dm"
+#include "code\modules\reagents\reagent_containers\cups\drinks.dm"
+#include "code\modules\reagents\reagent_containers\cups\glassbottle.dm"
+#include "code\modules\reagents\reagent_containers\cups\soda.dm"
#include "code\modules\recycling\conveyor.dm"
#include "code\modules\recycling\sortingmachinery.dm"
#include "code\modules\recycling\disposal\bin.dm"
diff --git a/code/__DEFINES/antagonists.dm b/code/__DEFINES/antagonists.dm
index bea77804af2a6..46c5b43e3f1ea 100644
--- a/code/__DEFINES/antagonists.dm
+++ b/code/__DEFINES/antagonists.dm
@@ -123,6 +123,22 @@
#define TRAITOR_HUMAN "human"
#define TRAITOR_AI "AI"
+/// The Classic Wizard wizard loadout.
+#define WIZARD_LOADOUT_CLASSIC "loadout_classic"
+/// Mjolnir's Power wizard loadout.
+#define WIZARD_LOADOUT_MJOLNIR "loadout_hammer"
+/// Fantastical Army wizard loadout.
+#define WIZARD_LOADOUT_WIZARMY "loadout_army"
+/// Soul Tapper wizard loadout.
+#define WIZARD_LOADOUT_SOULTAP "loadout_tap"
+/// Convenient list of all wizard loadouts for unit testing.
+#define ALL_WIZARD_LOADOUTS list( \
+ WIZARD_LOADOUT_CLASSIC, \
+ WIZARD_LOADOUT_MJOLNIR, \
+ WIZARD_LOADOUT_WIZARMY, \
+ WIZARD_LOADOUT_SOULTAP, \
+)
+
///Checks if given mob is a hive host
#define IS_HIVEHOST(mob) (mob.mind?.has_antag_datum(/datum/antagonist/hivemind))
///Checks if given mob is an awakened vessel
diff --git a/code/__DEFINES/dcs/signals/signals_atom/signals_atom.dm b/code/__DEFINES/dcs/signals/signals_atom/signals_atom.dm
index 1212051c2932a..dd0bed49487cb 100644
--- a/code/__DEFINES/dcs/signals/signals_atom/signals_atom.dm
+++ b/code/__DEFINES/dcs/signals/signals_atom/signals_atom.dm
@@ -9,6 +9,8 @@
#define COMSIG_PARENT_EXAMINE "atom_examine"
/// from base of atom/get_examine_name(): (/mob, list/overrides)
#define COMSIG_ATOM_GET_EXAMINE_NAME "atom_examine_name"
+///from base of atom/examine_more(): (/mob)
+#define COMSIG_PARENT_EXAMINE_MORE "atom_examine_more"
//Positions for overrides list
#define EXAMINE_POSITION_ARTICLE (1<<0)
#define EXAMINE_POSITION_BEFORE (1<<1)
@@ -118,6 +120,7 @@
///! from the base of atom/intercept_teleport: (channel, turf/origin, turf/destination)
#define COMSIG_ATOM_INTERCEPT_TELEPORT "intercept_teleport"
#define COMPONENT_BLOCK_TELEPORT 1
+#define COMSIG_ATOM_HEARER_IN_VIEW "atom_hearer_in_view" //called when an atom is added to the hearers on get_hearers_in_view(): (list/processing_list, list/hearers)
///called when an atom starts orbiting another atom: (atom)
#define COMSIG_ATOM_ORBIT_BEGIN "atom_orbit_begin"
/// called when an atom stops orbiting another atom: (atom)
@@ -142,7 +145,8 @@
/////////////////
#define COMSIG_CLICK "atom_click" //! from base of atom/Click(): (location, control, params, mob/user)
-#define COMSIG_CLICK_SHIFT "shift_click" //! from base of atom/ShiftClick(): (/mob)
+#define COMSIG_CLICK_SHIFT "shift_click" //from base of atom/ShiftClick(): (/mob)
+ #define COMPONENT_ALLOW_EXAMINATE 1 //Allows the user to examinate regardless of client.eye.
#define COMSIG_CLICK_CTRL "ctrl_click" //! from base of atom/CtrlClickOn(): (/mob)
#define COMSIG_CLICK_ALT "alt_click" //! from base of atom/AltClick(): (/mob)
#define COMPONENT_INTERCEPT_ALT 1
diff --git a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_attack.dm b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_attack.dm
index 2008f9d67a21f..c5d3e717def13 100644
--- a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_attack.dm
+++ b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_attack.dm
@@ -14,6 +14,16 @@
#define COMSIG_ATOM_ATTACK_ANIMAL "attack_animal"
//from base of atom/attack_basic_mob(): (/mob/user)
#define COMSIG_ATOM_ATTACK_BASIC_MOB "attack_basic_mob"
+/// from /atom/proc/atom_break: (damage_flag)
+#define COMSIG_ATOM_BREAK "atom_break"
+/// from base of [/atom/proc/atom_fix]: ()
+#define COMSIG_ATOM_FIX "atom_fix"
+///from base of [/atom/proc/update_integrity]: (old_value, new_value)
+#define COMSIG_ATOM_INTEGRITY_CHANGED "atom_integrity_changed"
+///from base of [/atom/proc/take_damage]: (damage_amount, damage_type, damage_flag, sound_effect, attack_dir, aurmor_penetration)
+#define COMSIG_ATOM_TAKE_DAMAGE "atom_take_damage"
+ /// Return bitflags for the above signal which prevents the atom taking any damage.
+ #define COMPONENT_NO_TAKE_DAMAGE (1<<0)
/* Attack signals. They should share the returned flags, to standardize the attack chain. */
/// tool_act -> pre_attack -> target.attackby (item.attack) -> afterattack
diff --git a/code/__DEFINES/dcs/signals/signals_mob/signals_mob.dm b/code/__DEFINES/dcs/signals/signals_mob/signals_mob.dm
index 016833787b053..9492d89c06ac6 100644
--- a/code/__DEFINES/dcs/signals/signals_mob/signals_mob.dm
+++ b/code/__DEFINES/dcs/signals/signals_mob/signals_mob.dm
@@ -56,6 +56,8 @@
#define SPEECH_LANGUAGE 5
#define SPEECH_IGNORE_SPAM 6
#define SPEECH_FORCED 7 */
+ #define SPEECH_RANGE 8
+
#define COMSIG_MOB_EMOTE "mob_emote" // from /mob/living/emote(): ()
#define COMSIG_MOB_SWAP_HANDS "mob_swap_hands" //from base of mob/swap_hand()
#define COMPONENT_BLOCK_SWAP 1
diff --git a/code/__DEFINES/dcs/signals/signals_movable.dm b/code/__DEFINES/dcs/signals/signals_movable.dm
index f89b79dad4d27..5b3ae553ddadc 100644
--- a/code/__DEFINES/dcs/signals/signals_movable.dm
+++ b/code/__DEFINES/dcs/signals/signals_movable.dm
@@ -41,14 +41,14 @@
///called when the movable is added to a disposal holder object for disposal movement: (obj/structure/disposalholder/holder, obj/machinery/disposal/source)
#define COMSIG_MOVABLE_DISPOSING "movable_disposing"
-
-///from base of atom/movable/setGrabState(): (newstate)
-#define COMSIG_MOVABLE_SET_GRAB_STATE "living_set_grab_state"
-
// called when movable is expelled from a disposal pipe, bin or outlet on obj/pipe_eject: (direction)
#define COMSIG_MOVABLE_PIPE_EJECTING "movable_pipe_ejecting"
///called when the movable sucessfully has it's anchored var changed, from base atom/movable/set_anchored(): (value)
#define COMSIG_MOVABLE_SET_ANCHORED "movable_set_anchored"
+///from base of atom/movable/setGrabState(): (newstate)
+#define COMSIG_MOVABLE_SET_GRAB_STATE "living_set_grab_state"
+///called when the movable's glide size is updated: (new_glide_size)
+#define COMSIG_MOVABLE_UPDATE_GLIDE_SIZE "movable_glide_size"
///from base of atom/movable/newtonian_move(): (inertia_direction)
#define COMSIG_MOVABLE_NEWTONIAN_MOVE "movable_newtonian_move"
@@ -64,6 +64,8 @@
///from base of atom/movable/on_exit_storage(): (datum/component/storage/concrete/master_storage)
#define COMSIG_STORAGE_EXITED "storage_exited"
+
+
// /datum/element/movetype_handler signals
/// Called when the floating anim has to be temporarily stopped and restarted later: (timer)
#define COMSIG_PAUSE_FLOATING_ANIM "pause_floating_anim"
diff --git a/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_food.dm b/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_food.dm
index 9be7a55a20cec..a3cd583da4d6f 100644
--- a/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_food.dm
+++ b/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_food.dm
@@ -54,3 +54,8 @@
#define COMSIG_EDIBLE_ON_COMPOST "on_compost"
// Used to stop food from being composted.
#define COMPONENT_EDIBLE_BLOCK_COMPOST 1
+
+//Drink
+
+///from base of obj/item/reagent_containers/cup/attack(): (mob/M, mob/user)
+#define COMSIG_GLASS_DRANK "glass_drank"
diff --git a/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_itemattack.dm b/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_itemattack.dm
index dc127a0a0714f..512340addc76a 100644
--- a/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_itemattack.dm
+++ b/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_itemattack.dm
@@ -9,7 +9,7 @@
#define COMSIG_MOB_ITEM_ATTACKBY "item_attackby"
///from base of obj/item/attack_self(): (/mob)
#define COMSIG_ITEM_ATTACK_SELF "item_attack_self"
-///from base of obj/item/attack_obj(): (/obj, /mob)
+///from base of obj/item/attack_atom(): (/obj, /mob)
#define COMSIG_ITEM_ATTACK_OBJ "item_attack_obj"
///from base of obj/item/pre_attack(): (atom/target, mob/user, params)
#define COMSIG_ITEM_PRE_ATTACK "item_pre_attack"
diff --git a/code/__DEFINES/dcs/signals/signals_obj/signals_machine/signals_machinery.dm b/code/__DEFINES/dcs/signals/signals_obj/signals_machine/signals_machinery.dm
index 21102eba3950d..70a267b692555 100644
--- a/code/__DEFINES/dcs/signals/signals_obj/signals_machine/signals_machinery.dm
+++ b/code/__DEFINES/dcs/signals/signals_obj/signals_machine/signals_machinery.dm
@@ -8,7 +8,7 @@
#define COMSIG_MACHINE_OPEN "machine_open"
/// Sent from /obj/machinery/close_machine(): (atom/movable/target)
#define COMSIG_MACHINE_CLOSE "machine_close"
-//from /obj/machinery/obj_break(damage_flag): (damage_flag)
+//from /obj/machinery/atom_break(damage_flag): (damage_flag)
#define COMSIG_MACHINERY_BROKEN "machinery_broken"
///from base power_change() when power is lost
#define COMSIG_MACHINERY_POWER_LOST "machinery_power_lost"
diff --git a/code/__DEFINES/dcs/signals/signals_obj/signals_object.dm b/code/__DEFINES/dcs/signals/signals_obj/signals_object.dm
index c3eb6af24a09d..357d32dc19ae0 100644
--- a/code/__DEFINES/dcs/signals/signals_obj/signals_object.dm
+++ b/code/__DEFINES/dcs/signals/signals_obj/signals_object.dm
@@ -4,12 +4,6 @@
// /obj signals
-///from base of [/obj/proc/take_damage]: (damage_amount, damage_type, damage_flag, sound_effect, attack_dir, aurmor_penetration)
-#define COMSIG_OBJ_TAKE_DAMAGE "obj_take_damage"
- /// Return bitflags for the above signal which prevents the object taking any damage.
- #define COMPONENT_NO_TAKE_DAMAGE (1<<0)
-///from base of [/obj/proc/update_integrity]: (old_value, new_value)
-#define COMSIG_OBJ_INTEGRITY_CHANGED "obj_integrity_changed"
///from base of obj/deconstruct(): (disassembled)
#define COMSIG_OBJ_DECONSTRUCT "obj_deconstruct"
///from base of code/game/machinery
@@ -17,11 +11,6 @@
///from base of /turf/proc/levelupdate(). (intact) true to hide and false to unhide
#define COMSIG_OBJ_HIDE "obj_hide"
-/// from /obj/proc/obj_break: ()
-#define COMSIG_OBJ_BREAK "obj_break"
-/// from base of [/obj/proc/obj_fix]: ()
-#define COMSIG_OBJ_FIX "obj_fix"
-
/// from /obj/proc/make_unfrozen()
#define COMSIG_OBJ_UNFREEZE "obj_unfreeze"
diff --git a/code/__DEFINES/economy.dm b/code/__DEFINES/economy.dm
index 84573363b15d6..52ab065c5ae86 100644
--- a/code/__DEFINES/economy.dm
+++ b/code/__DEFINES/economy.dm
@@ -5,8 +5,12 @@
#define PAYCHECK_EASY 15
#define PAYCHECK_MEDIUM 40
#define PAYCHECK_HARD 70
-#define PAYCHECK_COMMAND_NT 20 // given from nanotrasen to heads
-#define PAYCHECK_COMMAND_DEPT 80 // given from department budget
+// given from nanotrasen to heads
+#define PAYCHECK_COMMAND_NT 20
+// given from department budget
+#define PAYCHECK_COMMAND_DEPT 80
+// Command Total
+#define PAYCHECK_COMMAND 100
#define PAYCHECK_VIP 2000
/* Note: The current intention for crazy amount of money to VIP is that they can be a rich shitter
or be targeted by antags for their money - oh, my, being rich isn't always good.
diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
index 71ab790799e09..2ad043144f5bd 100644
--- a/code/__DEFINES/is_helpers.dm
+++ b/code/__DEFINES/is_helpers.dm
@@ -96,6 +96,7 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
#define iscatperson(A) (is_species(A, /datum/species/human/felinid) )
#define isethereal(A) (is_species(A, /datum/species/ethereal))
#define isvampire(A) (is_species(A,/datum/species/vampire))
+#define isdullahan(A) (is_species(A, /datum/species/dullahan))
#define isipc(A) (is_species(A, /datum/species/ipc))
#define isapid(A) (is_species(A, /datum/species/apid))
#define isandroid(A) (is_species(A, /datum/species/android))
@@ -234,6 +235,8 @@ GLOBAL_LIST_INIT(pointed_types, typecacheof(list(
#define isgun(A) (istype(A, /obj/item/gun))
+#define is_reagent_container(O) (istype(O, /obj/item/reagent_containers))
+
//Assemblies
#define isassembly(O) (istype(O, /obj/item/assembly))
diff --git a/code/__DEFINES/maps.dm b/code/__DEFINES/maps.dm
index 269058b4ba5df..74c18eecfb30d 100644
--- a/code/__DEFINES/maps.dm
+++ b/code/__DEFINES/maps.dm
@@ -20,11 +20,6 @@ Multi-Z stations are supported and multi-Z mining and away missions would
require only minor tweaks.
*/
-// helpers for modifying jobs, used in various job_changes.dm files. JOB_MODIFICATION_MAP_NAME = map_name set in .json file.
-#define MAP_JOB_CHECK if(SSmapping.config.map_name != JOB_MODIFICATION_MAP_NAME) { return; }
-#define MAP_JOB_CHECK_BASE if(SSmapping.config.map_name != JOB_MODIFICATION_MAP_NAME) { return ..(); }
-#define MAP_REMOVE_JOB(jobpath) /datum/job/##jobpath/map_check() { return (SSmapping.config.map_name != JOB_MODIFICATION_MAP_NAME) && ..() }
-
#define SPACERUIN_MAP_EDGE_PAD 15
/// Distance from edge to move to another z-level
diff --git a/code/__DEFINES/movement.dm b/code/__DEFINES/movement.dm
index b1ba18d0fae79..89fc09483d979 100644
--- a/code/__DEFINES/movement.dm
+++ b/code/__DEFINES/movement.dm
@@ -1,3 +1,23 @@
+/// The minimum for glide_size to be clamped to.
+#define MIN_GLIDE_SIZE 1
+/// The maximum for glide_size to be clamped to.
+/// This shouldn't be higher than the icon size, and generally you shouldn't be changing this, but it's here just in case.
+#define MAX_GLIDE_SIZE 32
+
+/// Compensating for time dilation
+GLOBAL_VAR_INIT(glide_size_multiplier, 1.0)
+
+///Broken down, here's what this does:
+/// divides the world icon_size (32) by delay divided by ticklag to get the number of pixels something should be moving each tick.
+/// The division result is given a min value of 1 to prevent obscenely slow glide sizes from being set
+/// Then that's multiplied by the global glide size multiplier. 1.25 by default feels pretty close to spot on. This is just to try to get byond to behave.
+/// The whole result is then clamped to within the range above.
+/// Not very readable but it works
+#define DELAY_TO_GLIDE_SIZE(delay) (clamp(((world.icon_size / max((delay) / world.tick_lag, 1)) * GLOB.glide_size_multiplier), MIN_GLIDE_SIZE, MAX_GLIDE_SIZE))
+
+///Similar to DELAY_TO_GLIDE_SIZE, except without the clamping, and it supports piping in an unrelated scalar
+#define MOVEMENT_ADJUSTED_GLIDE_SIZE(delay, movement_disparity) (world.icon_size / ((delay) / world.tick_lag) * movement_disparity * GLOB.glide_size_multiplier)
+
//Movement loop priority. Only one loop can run at a time, this dictates that
// Higher numbers beat lower numbers
///Standard, go lower then this if you want to override, higher otherwise
@@ -12,6 +32,8 @@
#define MOVEMENT_LOOP_START_FAST (1<<0)
///Do we not use the priority system?
#define MOVEMENT_LOOP_IGNORE_PRIORITY (1<<1)
+///Should we override the loop's glide?
+#define MOVEMENT_LOOP_IGNORE_GLIDE (1<<2)
///Should we not update our movables dir on move?
#define MOVEMENT_LOOP_NO_DIR_UPDATE (1<<3)
diff --git a/code/__DEFINES/pipe_construction.dm b/code/__DEFINES/pipe_construction.dm
index 10cf379b2a26a..fb6edab2c8647 100644
--- a/code/__DEFINES/pipe_construction.dm
+++ b/code/__DEFINES/pipe_construction.dm
@@ -75,6 +75,13 @@
//If you don't want to fuck up disposals, add to this list, and don't change the order.
//If you insist on changing the order, you'll have to change every sort junction to reflect the new order. --Pete
+/// Safe proc to remove a destination for /datum/map_adjustment.
+/proc/exclude_tagger_destination(name_to_remove)
+ GLOB.disabled_tagger_locations += name_to_remove
+#if defined(UNIT_TESTS) || defined(SPACEMAN_DMM)
+ GLOB.tagger_destination_areas -= name_to_remove // unit test only
+#endif
+
GLOBAL_LIST_INIT(disabled_tagger_locations, list())
GLOBAL_LIST_INIT(TAGGERLOCATIONS, list(
diff --git a/code/__DEFINES/power/power.dm b/code/__DEFINES/power/power.dm
index 061bbf84e1d80..4dd19e0efbef4 100644
--- a/code/__DEFINES/power/power.dm
+++ b/code/__DEFINES/power/power.dm
@@ -1,3 +1,7 @@
+#define KILOWATT *1000
+#define MEGAWATT KILOWATT *1000
+#define GIGAWATT MEGAWATT *1000
+
///conversion ratio from joules to watts
#define WATTS / 0.002
///conversion ratio from watts to joules
diff --git a/code/__DEFINES/traits/declarations.dm b/code/__DEFINES/traits/declarations.dm
index ec85d708cbd62..ab4067efffb80 100644
--- a/code/__DEFINES/traits/declarations.dm
+++ b/code/__DEFINES/traits/declarations.dm
@@ -92,7 +92,12 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_JOLLY "jolly"
#define TRAIT_NOCRITDAMAGE "no_crit"
#define TRAIT_NOSLIPWATER "noslip_water"
-#define TRAIT_NOSLIPALL "noslip_all"
+/// Stops all slipping and sliding from ocurring
+#define TRAIT_NOSLIPALL "noslip_all"
+
+/// Unlinks gliding from movement speed, meaning that there will be a delay between movements rather than a single move movement between tiles
+#define TRAIT_NO_GLIDE "no_glide"
+
#define TRAIT_NODEATH "nodeath"
#define TRAIT_NOHARDCRIT "nohardcrit"
#define TRAIT_NOSOFTCRIT "nosoftcrit"
diff --git a/code/__HELPERS/position_point_vector.dm b/code/__HELPERS/position_point_vector.dm
index 2daca044ceb32..e5091b79ca99d 100644
--- a/code/__HELPERS/position_point_vector.dm
+++ b/code/__HELPERS/position_point_vector.dm
@@ -11,8 +11,8 @@
/proc/point_midpoint_points(datum/point/a, datum/point/b) //Obviously will not support multiZ calculations! Same for the two below.
var/datum/point/P = new
- P.x = a.x + (b.x - a.x) / 2
- P.y = a.y + (b.y - a.y) / 2
+ P.x = a.x + (b.x - a.x) * 0.5
+ P.y = a.y + (b.y - a.y) * 0.5
P.z = a.z
return P
@@ -100,8 +100,10 @@
/datum/point/proc/initialize_location(tile_x, tile_y, tile_z, p_x = 0, p_y = 0)
if(!isnull(tile_x))
x = ((tile_x - 1) * world.icon_size) + world.icon_size / 2 + p_x + 1
+ x = ((tile_x - 1) * world.icon_size) + world.icon_size * 0.5 + p_x + 1
if(!isnull(tile_y))
y = ((tile_y - 1) * world.icon_size) + world.icon_size / 2 + p_y + 1
+ y = ((tile_y - 1) * world.icon_size) + world.icon_size * 0.5 + p_y + 1
if(!isnull(tile_z))
z = tile_z
@@ -151,6 +153,14 @@
starting_y = y
starting_z = z
+/datum/point/vector/proc/set_location(tile_x, tile_y, tile_z, p_x = 0, p_y = 0)
+ if(!isnull(tile_x))
+ x = ((tile_x - 1) * world.icon_size) + world.icon_size * 0.5 + p_x + 1
+ if(!isnull(tile_y))
+ y = ((tile_y - 1) * world.icon_size) + world.icon_size * 0.5 + p_y + 1
+ if(!isnull(tile_z))
+ z = tile_z
+
/datum/point/vector/copy_to(datum/point/vector/v = new)
..(v)
v.speed = speed
diff --git a/code/__HELPERS/randoms.dm b/code/__HELPERS/randoms.dm
index ca2e265b1309a..897745ec8ac95 100644
--- a/code/__HELPERS/randoms.dm
+++ b/code/__HELPERS/randoms.dm
@@ -37,10 +37,11 @@
///Gets a random drink excluding the blocked type
/proc/get_random_drink()
- var/list/blocked = list(/obj/item/reagent_containers/food/drinks/soda_cans,
- /obj/item/reagent_containers/food/drinks/bottle
+ var/list/blocked = list(
+ /obj/item/reagent_containers/cup/soda_cans,
+ /obj/item/reagent_containers/cup/glass/bottle
)
- return pick(subtypesof(/obj/item/reagent_containers/food/drinks) - blocked)
+ return pick(subtypesof(/obj/item/reagent_containers/cup/glass) - blocked)
/// Picks a string of symbols to display as the law number for hacked or ion laws
/proc/ion_num()
diff --git a/code/__HELPERS/type_processing.dm b/code/__HELPERS/type_processing.dm
index af65c582983ef..a5d006113a368 100644
--- a/code/__HELPERS/type_processing.dm
+++ b/code/__HELPERS/type_processing.dm
@@ -10,7 +10,7 @@
/obj/item/clothing/head/helmet/space = "SPESSHELMET",
/obj/item/bodypart = "BODYPART",
/obj/item/book/manual = "MANUAL",
- /obj/item/reagent_containers/food/drinks = "DRINK", //longest paths comes first
+ /obj/item/reagent_containers/cup/glass = "DRINK", //longest paths comes first
/obj/item/food = "FOOD",
/obj/item/reagent_containers = "REAGENT_CONTAINERS",
/obj/machinery/atmospherics = "ATMOS_MECH",
diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm
index 6d91a65083d92..3c7a948fdfa5b 100644
--- a/code/_globalvars/lists/flavor_misc.dm
+++ b/code/_globalvars/lists/flavor_misc.dm
@@ -341,13 +341,13 @@ GLOBAL_LIST_INIT(smoker_cigarettes, list(
))
GLOBAL_LIST_INIT(alcoholic_bottles, list(
- /obj/item/reagent_containers/food/drinks/bottle/ale,
- /obj/item/reagent_containers/food/drinks/bottle/beer,
- /obj/item/reagent_containers/food/drinks/bottle/gin,
- /obj/item/reagent_containers/food/drinks/bottle/whiskey,
- /obj/item/reagent_containers/food/drinks/bottle/vodka,
- /obj/item/reagent_containers/food/drinks/bottle/rum,
- /obj/item/reagent_containers/food/drinks/bottle/applejack
+ /obj/item/reagent_containers/cup/glass/bottle/ale,
+ /obj/item/reagent_containers/cup/glass/bottle/beer,
+ /obj/item/reagent_containers/cup/glass/bottle/gin,
+ /obj/item/reagent_containers/cup/glass/bottle/whiskey,
+ /obj/item/reagent_containers/cup/glass/bottle/vodka,
+ /obj/item/reagent_containers/cup/glass/bottle/rum,
+ /obj/item/reagent_containers/cup/glass/bottle/applejack
))
GLOBAL_LIST_INIT(junkie_drugs, list(
diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm
index a70cf8e873378..747d425ee34f2 100644
--- a/code/_globalvars/lists/maintenance_loot.dm
+++ b/code/_globalvars/lists/maintenance_loot.dm
@@ -72,11 +72,11 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
/obj/item/poster/random_official = 1,
/obj/item/radio/headset = 1,
/obj/item/radio/off = 2,
- /obj/item/reagent_containers/food/drinks/bottle/homemaderum = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/homemaderum = 1,
/obj/item/food/canned/peaches/maint = 1,
/obj/item/food/grown/citrus/orange = 1,
/obj/item/food/grown/flower/poppy = 10,
- /obj/item/reagent_containers/glass/rag = 3,
+ /obj/item/reagent_containers/cup/rag = 3,
/obj/item/reagent_containers/pill/floorpill = 4,
/obj/item/reagent_containers/spray/pestspray = 1,
/obj/item/reagent_containers/syringe/used = 4,
@@ -112,7 +112,7 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
/obj/item/weldingtool = 3,
/obj/item/wirecutters = 1,
/obj/item/wrench = 4,
- /obj/item/reagent_containers/food/drinks/bottle/homemaderum = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/homemaderum = 1,
/obj/item/xenoartifact/maint = 1,
/obj/item/paper_reader = 1,
))
diff --git a/code/_globalvars/traits/_traits.dm b/code/_globalvars/traits/_traits.dm
index 4e498da8cb96d..06ceee714da77 100644
--- a/code/_globalvars/traits/_traits.dm
+++ b/code/_globalvars/traits/_traits.dm
@@ -216,7 +216,8 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_MOVE_VENTCRAWLING" = TRAIT_MOVE_VENTCRAWLING,
"TRAIT_MOVE_FLOATING" = TRAIT_MOVE_FLOATING,
"TRAIT_MOVE_PHASING" = TRAIT_MOVE_PHASING,
- "TRAIT_NO_FLOATING_ANIM" = TRAIT_NO_FLOATING_ANIM
+ "TRAIT_NO_FLOATING_ANIM" = TRAIT_NO_FLOATING_ANIM,
+ "TRAIT_NO_GLIDE" = TRAIT_NO_GLIDE,
),
/atom = list(
"TRAIT_KEEP_TOGETHER" = TRAIT_KEEP_TOGETHER,
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index b9a4877f4e464..027d1f498fc82 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -318,8 +318,8 @@
A.ShiftClick(src)
return
/atom/proc/ShiftClick(mob/user)
- SEND_SIGNAL(src, COMSIG_CLICK_SHIFT, user)
- if(user.client && user.client.eye == user || user.client.eye == user.loc)
+ var/flags = SEND_SIGNAL(user, COMSIG_CLICK_SHIFT, src)
+ if(user.client && (user.client.eye == user || user.client.eye == user.loc || flags & COMPONENT_ALLOW_EXAMINATE))
user.examinate(src)
return
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index 39b5f2570be59..c97cea153202f 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -48,19 +48,19 @@
* Called on an object being hit by an item
*
* Arguments:
- * * obj/item/W - The item hitting this atom
+ * * obj/item/attacking_item - The item hitting this atom
* * mob/user - The wielder of this item
* * params - click params such as alt/shift etc
*
* See: [/obj/item/proc/melee_attack_chain]
*/
-/atom/proc/attackby(obj/item/W, mob/user, params)
- if(SEND_SIGNAL(src, COMSIG_PARENT_ATTACKBY, W, user, params) & COMPONENT_NO_AFTERATTACK)
+/atom/proc/attackby(obj/item/attacking_item, mob/user, params)
+ if(SEND_SIGNAL(src, COMSIG_PARENT_ATTACKBY, attacking_item, user, params) & COMPONENT_NO_AFTERATTACK)
return TRUE
return FALSE
/obj/attackby(obj/item/I, mob/living/user, params)
- return ..() || ((obj_flags & CAN_BE_HIT) && I.attack_obj(src, user))
+ return ..() || ((obj_flags & CAN_BE_HIT) && I.attack_atom(src, user, params))
/mob/living/attackby(obj/item/I, mob/living/user, params)
if(..())
@@ -88,21 +88,21 @@
* * mob/living/user - The mob hitting with this item
* * params - Click params of this attack
*/
-/obj/item/proc/attack(mob/living/M, mob/living/user, params)
- var/signal_return = SEND_SIGNAL(src, COMSIG_ITEM_ATTACK, M, user, params)
+/obj/item/proc/attack(mob/living/target_mob, mob/living/user, params)
+ var/signal_return = SEND_SIGNAL(src, COMSIG_ITEM_ATTACK, target_mob, user, params)
if(signal_return & COMPONENT_CANCEL_ATTACK_CHAIN)
return TRUE
if(signal_return & COMPONENT_SKIP_ATTACK)
return
- SEND_SIGNAL(user, COMSIG_MOB_ITEM_ATTACK, M, user, params)
- SEND_SIGNAL(M, COMSIG_MOB_ITEM_ATTACKBY, user, src)
+ SEND_SIGNAL(user, COMSIG_MOB_ITEM_ATTACK, target_mob, user, params)
+ SEND_SIGNAL(target_mob, COMSIG_MOB_ITEM_ATTACKBY, user, src)
var/nonharmfulhit = FALSE
if(user.a_intent == INTENT_HELP && !(item_flags & ISWEAPON))
nonharmfulhit = TRUE
- for(var/datum/surgery/S in M.surgeries)
+ for(var/datum/surgery/S in target_mob.surgeries)
if(S.failed_step)
nonharmfulhit = FALSE //No freebies, if you fail a surgery step you should hit your patient
S.failed_step = FALSE //In theory the hit should only happen once, upon failing the step
@@ -120,40 +120,40 @@
else if(hitsound)
playsound(loc, hitsound, get_clamped_volume(), TRUE, extrarange = stealthy_audio ? SILENCED_SOUND_EXTRARANGE : -1, falloff_distance = 0)
- M.lastattacker = user.real_name
- M.lastattackerckey = user.ckey
+ target_mob.lastattacker = user.real_name
+ target_mob.lastattackerckey = user.ckey
- user.do_attack_animation(M)
+ user.do_attack_animation(target_mob)
var/time = world.time
if(nonharmfulhit)
- M.send_item_poke_message(src, user)
+ target_mob.send_item_poke_message(src, user)
user.time_of_last_poke = time
else
user.record_accidental_poking()
- M.attacked_by(src, user)
- M.time_of_last_attack_received = time
+ target_mob.attacked_by(src, user)
+ target_mob.time_of_last_attack_received = time
user.time_of_last_attack_dealt = time
user.check_for_accidental_attack()
- log_combat(user, M, "[nonharmfulhit ? "poked" : "attacked"]", src, "(INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])", important = !nonharmfulhit)
+ log_combat(user, target_mob, "[nonharmfulhit ? "poked" : "attacked"]", src, "(INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])", important = !nonharmfulhit)
add_fingerprint(user)
-/// The equivalent of the standard version of [/obj/item/proc/attack] but for object targets.
-/obj/item/proc/attack_obj(obj/O, mob/living/user)
- if(SEND_SIGNAL(src, COMSIG_ITEM_ATTACK_OBJ, O, user) & COMPONENT_CANCEL_ATTACK_CHAIN)
+/// The equivalent of the standard version of [/obj/item/proc/attack] but for non mob targets.
+/obj/item/proc/attack_atom(atom/attacked_atom, mob/living/user, params)
+ if(SEND_SIGNAL(src, COMSIG_ITEM_ATTACK_OBJ, attacked_atom, user) & COMPONENT_CANCEL_ATTACK_CHAIN)
return
if(item_flags & NOBLUDGEON)
return
user.changeNext_move(CLICK_CD_MELEE)
- user.do_attack_animation(O)
- O.attacked_by(src, user)
+ user.do_attack_animation(attacked_atom)
+ attacked_atom.attacked_by(src, user)
-/// Called from [/obj/item/proc/attack_obj] and [/obj/item/proc/attack] if the attack succeeds
-/atom/proc/attacked_by()
- return
+/// Called from [/obj/item/proc/attack_atom] and [/obj/item/proc/attack] if the attack succeeds
+/atom/proc/attacked_by(obj/item/attacking_item, mob/living/user)
+ if(!uses_integrity)
+ CRASH("attacked_by() was called on an object that doesnt use integrity!")
-/obj/attacked_by(obj/item/attacking_item, mob/living/user)
if(!attacking_item.force)
return
@@ -164,6 +164,9 @@
"You hit [src] with [attacking_item][damage ? "." : ", without leaving a mark!"]", null, COMBAT_MESSAGE_RANGE)
log_combat(user, src, "attacked", attacking_item)
+/area/attacked_by(obj/item/attacking_item, mob/living/user)
+ CRASH("areas are NOT supposed to have attacked_by() called on them!")
+
/mob/living/attacked_by(obj/item/I, mob/living/user)
send_item_attack_message(I, user)
if(!I.force)
diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm
index b1fa8ce50c2f8..1325783c367f5 100644
--- a/code/controllers/subsystem/job.dm
+++ b/code/controllers/subsystem/job.dm
@@ -118,6 +118,9 @@ SUBSYSTEM_DEF(job)
occupations += each_job
name_occupations[each_job.title] = each_job
type_occupations[each_job.type] = each_job
+ if(SSmapping.map_adjustment)
+ SSmapping.map_adjustment.job_change()
+ log_world("Applied '[SSmapping.map_adjustment.map_file_name]' map adjustment: job_change()")
return 1
diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
index dbf2fe8c90742..86e4402d25c3e 100644
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -8,6 +8,7 @@ SUBSYSTEM_DEF(mapping)
var/datum/map_config/config
var/datum/map_config/next_map_config
+ var/datum/map_adjustment/map_adjustment
var/map_voted = FALSE
@@ -61,6 +62,13 @@ SUBSYSTEM_DEF(mapping)
#else
config = load_map_config(error_if_missing = FALSE)
#endif
+ // After assigning a config datum to var/config, we check which map ajudstment fits the current config
+ for(var/datum/map_adjustment/each_adjust as anything in subtypesof(/datum/map_adjustment))
+ if(initial(each_adjust.map_file_name) != config.map_file)
+ continue
+ map_adjustment = new each_adjust() // map_adjustment has multiple procs that'll be called from needed places (i.e. job_change)
+ log_world("Loaded '[config.map_file]' map adjustment.")
+ break
/datum/controller/subsystem/mapping/Initialize()
if(initialized)
@@ -71,6 +79,11 @@ SUBSYSTEM_DEF(mapping)
if(!config || config.defaulted)
to_chat(world, "Unable to load next or default map config, defaulting to Box Station")
config = old_config
+
+ if(map_adjustment)
+ map_adjustment.on_mapping_init()
+ log_world("Applied '[map_adjustment.map_file_name]' map adjustment: on_mapping_init()")
+
initialize_biomes()
loadWorld()
require_area_resort()
diff --git a/code/controllers/subsystem/movement/movement_types.dm b/code/controllers/subsystem/movement/movement_types.dm
index f6a48caa8ac3c..a82aa001dea17 100644
--- a/code/controllers/subsystem/movement/movement_types.dm
+++ b/code/controllers/subsystem/movement/movement_types.dm
@@ -107,6 +107,11 @@
if(QDELETED(src) || !success) //Can happen
return
+ if(flags & MOVEMENT_LOOP_IGNORE_GLIDE)
+ return
+
+ moving.set_glide_size(MOVEMENT_ADJUSTED_GLIDE_SIZE(delay, visual_delay))
+
///Handles the actual move, overriden by children
///Returns FALSE if nothing happen, TRUE otherwise
/datum/move_loop/proc/move()
diff --git a/code/controllers/subsystem/throwing.dm b/code/controllers/subsystem/throwing.dm
index 4513ff01dc85c..7d6391380a38d 100644
--- a/code/controllers/subsystem/throwing.dm
+++ b/code/controllers/subsystem/throwing.dm
@@ -152,7 +152,7 @@ SUBSYSTEM_DEF(throwing)
finalize()
return
- if(!AM.Move(step, get_dir(AM, step))) // we hit something during our move...
+ if(!AM.Move(step, get_dir(AM, step), DELAY_TO_GLIDE_SIZE(1 / speed))) // we hit something during our move...
if(AM.throwing) // ...but finalize() wasn't called on Bump() because of a higher level definition that doesn't always call parent.
finalize()
return
diff --git a/code/controllers/subsystem/time_track.dm b/code/controllers/subsystem/time_track.dm
index 2ff32f6ad0173..1da7ab31698cc 100644
--- a/code/controllers/subsystem/time_track.dm
+++ b/code/controllers/subsystem/time_track.dm
@@ -101,6 +101,7 @@ SUBSYSTEM_DEF(time_track)
time_dilation_avg_fast = MC_AVERAGE_FAST(time_dilation_avg_fast, time_dilation_current)
time_dilation_avg = MC_AVERAGE(time_dilation_avg, time_dilation_avg_fast)
time_dilation_avg_slow = MC_AVERAGE_SLOW(time_dilation_avg_slow, time_dilation_avg)
+ GLOB.glide_size_multiplier = (current_byondtime - last_tick_byond_time) / (current_realtime - last_tick_realtime)
else
first_run = FALSE
last_tick_realtime = current_realtime
diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm
index 08cef4d647255..62d52b69f8606 100644
--- a/code/controllers/subsystem/traumas.dm
+++ b/code/controllers/subsystem/traumas.dm
@@ -115,7 +115,7 @@ SUBSYSTEM_DEF(traumas)
"lizards" = typecacheof(list(
/obj/item/toy/plush/lizard_plushie, /obj/item/food/kebab/tail,
- /obj/item/organ/tail/lizard, /obj/item/reagent_containers/food/drinks/bottle/lizardwine)),
+ /obj/item/organ/tail/lizard, /obj/item/reagent_containers/cup/glass/bottle/lizardwine)),
"skeletons" = typecacheof(list(
/obj/item/organ/tongue/bone, /obj/item/clothing/suit/armor/bone, /obj/item/stack/sheet/bone,
@@ -205,7 +205,7 @@ SUBSYSTEM_DEF(traumas)
/obj/item/katana,
/obj/item/food/sashimi,
/obj/item/food/chawanmushi,
- /obj/item/reagent_containers/food/drinks/bottle/sake,
+ /obj/item/reagent_containers/cup/glass/bottle/sake,
/obj/item/throwing_star,
/obj/item/clothing/head/costume/kitty/genuine,
/obj/item/clothing/suit/space/space_ninja,
diff --git a/code/datums/ai/monkey/monkey_controller.dm b/code/datums/ai/monkey/monkey_controller.dm
index 26d53369ea247..8195daac3be6b 100644
--- a/code/datums/ai/monkey/monkey_controller.dm
+++ b/code/datums/ai/monkey/monkey_controller.dm
@@ -151,10 +151,10 @@ have ways of interacting with a specific mob and control it.
return top_force_item
/datum/ai_controller/monkey/proc/IsEdible(obj/item/thing)
- if(istype(thing, /obj/item/food))
+ if(IS_EDIBLE(thing))
return TRUE
- if(istype(thing, /obj/item/reagent_containers/food/drinks/drinkingglass))
- var/obj/item/reagent_containers/food/drinks/drinkingglass/glass = thing
+ if(istype(thing, /obj/item/reagent_containers/cup/glass/drinkingglass))
+ var/obj/item/reagent_containers/cup/glass/drinkingglass/glass = thing
if(glass.reagents.total_volume) // The glass has something in it, time to drink the mystery liquid!
return TRUE
return FALSE
diff --git a/code/datums/components/crafting/crafting_lists/drinks.dm b/code/datums/components/crafting/crafting_lists/drinks.dm
index 4749a97cdaff7..2b9aa8963ed3f 100644
--- a/code/datums/components/crafting/crafting_lists/drinks.dm
+++ b/code/datums/components/crafting/crafting_lists/drinks.dm
@@ -4,7 +4,7 @@
/datum/crafting_recipe/lizardwine
name = "Lizard Wine"
- result = /obj/item/reagent_containers/food/drinks/bottle/lizardwine
+ result = /obj/item/reagent_containers/cup/glass/bottle/lizardwine
time = 4 SECONDS
reqs = list(
/obj/item/organ/tail/lizard = 1,
@@ -14,20 +14,20 @@
/datum/crafting_recipe/moonshinejug
name = "Moonshine Jug"
- result = /obj/item/reagent_containers/food/drinks/bottle/moonshine
+ result = /obj/item/reagent_containers/cup/glass/bottle/moonshine
time = 3 SECONDS
reqs = list(
- /obj/item/reagent_containers/food/drinks/bottle/blank = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/blank = 1,
/datum/reagent/consumable/ethanol/moonshine = 100
)
category = CAT_DRINK
/datum/crafting_recipe/hoochbottle
name = "Hooch Bottle"
- result = /obj/item/reagent_containers/food/drinks/bottle/hooch
+ result = /obj/item/reagent_containers/cup/glass/bottle/hooch
time = 3 SECONDS
reqs = list(
- /obj/item/reagent_containers/food/drinks/bottle/blank = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/blank = 1,
/obj/item/storage/box/papersack = 1,
/datum/reagent/consumable/ethanol/hooch = 100
)
@@ -35,50 +35,50 @@
/datum/crafting_recipe/blazaambottle
name = "Blazaam Bottle"
- result = /obj/item/reagent_containers/food/drinks/bottle/blazaam
+ result = /obj/item/reagent_containers/cup/glass/bottle/blazaam
time = 2 SECONDS
reqs = list(
- /obj/item/reagent_containers/food/drinks/bottle/blank = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/blank = 1,
/datum/reagent/consumable/ethanol/blazaam = 100
)
category = CAT_DRINK
/datum/crafting_recipe/champagnebottle
name = "Champagne Bottle"
- result = /obj/item/reagent_containers/food/drinks/bottle/champagne
+ result = /obj/item/reagent_containers/cup/glass/bottle/champagne
time = 3 SECONDS
reqs = list(
- /obj/item/reagent_containers/food/drinks/bottle/blank = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/blank = 1,
/datum/reagent/consumable/ethanol/champagne = 100
)
category = CAT_DRINK
/datum/crafting_recipe/trappistbottle
name = "Trappist Bottle"
- result = /obj/item/reagent_containers/food/drinks/bottle/trappist
+ result = /obj/item/reagent_containers/cup/glass/bottle/trappist
time = 1.5 SECONDS
reqs = list(
- /obj/item/reagent_containers/food/drinks/bottle/blank/small = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/blank/small = 1,
/datum/reagent/consumable/ethanol/trappist = 50
)
category = CAT_DRINK
/datum/crafting_recipe/goldschlagerbottle
name = "Goldschlager Bottle"
- result = /obj/item/reagent_containers/food/drinks/bottle/goldschlager
+ result = /obj/item/reagent_containers/cup/glass/bottle/goldschlager
time = 3 SECONDS
reqs = list(
- /obj/item/reagent_containers/food/drinks/bottle/blank = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/blank = 1,
/datum/reagent/consumable/ethanol/goldschlager = 100
)
category = CAT_DRINK
/datum/crafting_recipe/patronbottle
name = "Patron Bottle"
- result = /obj/item/reagent_containers/food/drinks/bottle/patron
+ result = /obj/item/reagent_containers/cup/glass/bottle/patron
time = 3 SECONDS
reqs = list(
- /obj/item/reagent_containers/food/drinks/bottle/blank = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/blank = 1,
/datum/reagent/consumable/ethanol/patron = 100
)
category = CAT_DRINK
@@ -87,44 +87,44 @@
/datum/crafting_recipe/holybottle
name = "Holy Water Flask"
- result = /obj/item/reagent_containers/food/drinks/bottle/holywater
+ result = /obj/item/reagent_containers/cup/glass/bottle/holywater
time = 3 SECONDS
reqs = list(
- /obj/item/reagent_containers/food/drinks/bottle/blank = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/blank = 1,
/datum/reagent/water/holywater = 100
)
category = CAT_DRINK
/datum/crafting_recipe/unholybottle
name = "Unholy Water Flask"
- result = /obj/item/reagent_containers/food/drinks/bottle/unholywater
+ result = /obj/item/reagent_containers/cup/glass/bottle/unholywater
time = 3 SECONDS
reqs = list(
- /obj/item/reagent_containers/food/drinks/bottle/blank = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/blank = 1,
/datum/reagent/fuel/unholywater = 100
)
category = CAT_DRINK
/datum/crafting_recipe/nothingbottle
name = "Nothing Bottle"
- result = /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing
+ result = /obj/item/reagent_containers/cup/glass/bottle/bottleofnothing
time = 3 SECONDS
reqs = list(
- /obj/item/reagent_containers/food/drinks/bottle/blank = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/blank = 1,
/datum/reagent/consumable/nothing = 100
)
category = CAT_DRINK
/datum/crafting_recipe/smallcarton
name = "Small Carton"
- result = /obj/item/reagent_containers/food/drinks/sillycup/smallcarton
+ result = /obj/item/reagent_containers/cup/glass/sillycup/smallcarton
time = 1 SECONDS
reqs = list(/obj/item/stack/sheet/cardboard = 1)
category = CAT_DRINK
/datum/crafting_recipe/honeycomb
name = "Honeycomb"
- result = /obj/item/reagent_containers/food/drinks/honeycomb
+ result = /obj/item/reagent_containers/cup/glass/honeycomb
always_available = FALSE
time = 3 SECONDS
reqs = list(/datum/reagent/consumable/sugar = 50)
diff --git a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_egg.dm b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_egg.dm
index 08a504aad342f..ffeccbf18c8b6 100644
--- a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_egg.dm
+++ b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_egg.dm
@@ -43,7 +43,7 @@
name = "Egg bowl"
result = /obj/item/food/salad/eggbowl
reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/boiledrice = 1,
/obj/item/food/boiledegg = 1,
/obj/item/food/grown/carrot = 1,
diff --git a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_frozen.dm b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_frozen.dm
index 1d79c9f3e02e3..9f2a00e44f707 100644
--- a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_frozen.dm
+++ b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_frozen.dm
@@ -60,7 +60,7 @@
name = "Flavorless snowcone"
result = /obj/item/food/snowcones
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/consumable/ice = 15
)
subcategory = CAT_ICE
@@ -69,7 +69,7 @@
name = "Pineapple snowcone"
result = /obj/item/food/snowcones/pineapple
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/consumable/ice = 15,
/datum/reagent/consumable/pineapplejuice = 5
)
@@ -79,7 +79,7 @@
name = "Lime snowcone"
result = /obj/item/food/snowcones/lime
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/consumable/ice = 15,
/datum/reagent/consumable/limejuice = 5
)
@@ -89,7 +89,7 @@
name = "Lemon snowcone"
result = /obj/item/food/snowcones/lemon
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/consumable/ice = 15,
/datum/reagent/consumable/lemonjuice = 5
)
@@ -99,7 +99,7 @@
name = "Apple snowcone"
result = /obj/item/food/snowcones/apple
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/consumable/ice = 15,
/datum/reagent/consumable/applejuice = 5
)
@@ -109,7 +109,7 @@
name = "Grape snowcone"
result = /obj/item/food/snowcones/grape
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/consumable/ice = 15,
/datum/reagent/consumable/berryjuice = 5
)
@@ -119,7 +119,7 @@
name = "Orange snowcone"
result = /obj/item/food/snowcones/orange
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/consumable/ice = 15,
/datum/reagent/consumable/orangejuice = 5
)
@@ -129,7 +129,7 @@
name = "Bluecherry snowcone"
result = /obj/item/food/snowcones/blue
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/consumable/ice = 15,
/datum/reagent/consumable/bluecherryjelly= 5
)
@@ -139,7 +139,7 @@
name = "Cherry snowcone"
result = /obj/item/food/snowcones/red
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/consumable/ice = 15,
/datum/reagent/consumable/cherryjelly= 5
)
@@ -149,7 +149,7 @@
name = "Berry snowcone"
result = /obj/item/food/snowcones/berry
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/consumable/ice = 15,
/datum/reagent/consumable/berryjuice = 5
)
@@ -159,7 +159,7 @@
name = "Fruit Salad snowcone"
result = /obj/item/food/snowcones/fruitsalad
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/water = 5,
/datum/reagent/consumable/ice = 15,
/datum/reagent/consumable/orangejuice = 5,
@@ -172,7 +172,7 @@
name = "Mime snowcone"
result = /obj/item/food/snowcones/mime
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/consumable/ice = 15,
/datum/reagent/consumable/nothing = 5
)
@@ -182,7 +182,7 @@
name = "Clown snowcone"
result = /obj/item/food/snowcones/clown
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/consumable/ice = 15,
/datum/reagent/consumable/laughter = 5
)
@@ -192,7 +192,7 @@
name = "Space Cola snowcone"
result = /obj/item/food/snowcones/soda
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/consumable/ice = 15,
/datum/reagent/consumable/space_cola = 5
)
@@ -202,7 +202,7 @@
name = "Space Mountain Wind snowcone"
result = /obj/item/food/snowcones/spacemountainwind
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/consumable/ice = 15,
/datum/reagent/consumable/spacemountainwind = 5
)
@@ -212,7 +212,7 @@
name = "Pwrgame snowcone"
result = /obj/item/food/snowcones/pwrgame
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/consumable/ice = 15,
/datum/reagent/consumable/pwr_game = 15
)
@@ -222,7 +222,7 @@
name = "Honey snowcone"
result = /obj/item/food/snowcones/honey
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/consumable/ice = 15,
/datum/reagent/consumable/honey = 5
)
@@ -232,7 +232,7 @@
name = "Rainbow snowcone"
result = /obj/item/food/snowcones/rainbow
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/consumable/ice = 15,
/datum/reagent/colorful_reagent = 1 //Harder to make
)
diff --git a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_meat.dm b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_meat.dm
index 0af7711c7cb0f..12113261ce161 100644
--- a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_meat.dm
+++ b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_meat.dm
@@ -174,7 +174,7 @@
name = "Rice and Pork"
result = /obj/item/food/salad/ricepork
reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/boiledrice = 1,
/obj/item/food/meat/cutlet = 2
)
diff --git a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_misc.dm b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_misc.dm
index 5953785747886..22bb4f42eafc0 100644
--- a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_misc.dm
+++ b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_misc.dm
@@ -91,9 +91,9 @@
reqs = list(
/datum/reagent/consumable/ethanol/vodka = 25,
/obj/item/food/grown/holymelon = 1,
- /obj/item/reagent_containers/food/drinks/bottle/vodka = 1
+ /obj/item/reagent_containers/cup/glass/bottle/vodka = 1
)
- parts = list(/obj/item/reagent_containers/food/drinks/bottle/vodka = 1)
+ parts = list(/obj/item/reagent_containers/cup/glass/bottle/vodka = 1)
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/honeybar
@@ -131,7 +131,7 @@
name = "Rice pudding"
result = /obj/item/food/salad/ricepudding
reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/datum/reagent/consumable/milk = 5,
/datum/reagent/consumable/sugar = 5,
/obj/item/food/boiledrice = 1
diff --git a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_salad.dm b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_salad.dm
index ab12f7d7725ae..40cc955bc89b3 100644
--- a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_salad.dm
+++ b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_salad.dm
@@ -5,7 +5,7 @@
name = "Herb salad"
result = /obj/item/food/salad/herbsalad
reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/ambrosia/vulgaris = 3,
/obj/item/food/grown/apple = 1
)
@@ -15,7 +15,7 @@
name = "Aesir salad"
result = /obj/item/food/salad/aesirsalad
reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/ambrosia/deus = 3,
/obj/item/food/grown/apple/gold = 1
)
@@ -25,7 +25,7 @@
name = "Valid salad"
result = /obj/item/food/salad/validsalad
reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/ambrosia/vulgaris = 3,
/obj/item/food/grown/potato = 1,
/obj/item/food/meatball = 1
@@ -39,7 +39,7 @@
/datum/reagent/consumable/flour = 5,
/datum/reagent/consumable/sodiumchloride = 1,
/datum/reagent/consumable/blackpepper = 1,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/monkeycube = 1,
/obj/item/food/grown/banana = 1
)
@@ -62,7 +62,7 @@
name = "Fruit salad"
result = /obj/item/food/salad/fruit
reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/apple = 1,
/obj/item/food/grown/grapes = 1,
/obj/item/food/grown/citrus/orange = 1,
@@ -75,7 +75,7 @@
name = "Jungle salad"
result = /obj/item/food/salad/jungle
reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/apple = 1,
/obj/item/food/grown/grapes = 1,
/obj/item/food/grown/banana = 2,
@@ -87,7 +87,7 @@
name = "Citrus delight"
result = /obj/item/food/salad/citrusdelight
reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/citrus/lime = 1,
/obj/item/food/grown/citrus/lemon = 1,
/obj/item/food/grown/citrus/orange = 1
diff --git a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_soup.dm b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_soup.dm
index b3007f054d364..09e661f555543 100644
--- a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_soup.dm
+++ b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_soup.dm
@@ -6,7 +6,7 @@
result = /obj/item/food/soup/oatmeal
reqs = list(
/datum/reagent/consumable/milk = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/oat = 1
)
subcategory = CAT_SOUP
@@ -16,7 +16,7 @@
result = /obj/item/food/soup/meatball
reqs = list(
/datum/reagent/water = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/meatball = 1,
/obj/item/food/grown/carrot = 1,
/obj/item/food/grown/potato = 1
@@ -28,7 +28,7 @@
result = /obj/item/food/soup/vegetable
reqs = list(
/datum/reagent/water = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/carrot = 1,
/obj/item/food/grown/corn = 1,
/obj/item/food/grown/eggplant = 1,
@@ -41,7 +41,7 @@
result = /obj/item/food/soup/nettle
reqs = list(
/datum/reagent/water = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/nettle = 1,
/obj/item/food/grown/potato = 1,
/obj/item/food/boiledegg = 1
@@ -52,7 +52,7 @@
name = "Wingfangchu"
result = /obj/item/food/soup/wingfangchu
reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/datum/reagent/consumable/soysauce = 5,
/obj/item/food/meat/cutlet/xeno = 2
)
@@ -63,7 +63,7 @@
result= /obj/item/food/soup/wish
reqs = list(
/datum/reagent/water = 20,
- /obj/item/reagent_containers/glass/bowl = 1
+ /obj/item/reagent_containers/cup/bowl = 1
)
subcategory = CAT_SOUP
@@ -71,7 +71,7 @@
name = "Hot chili"
result = /obj/item/food/soup/hotchili
reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/meat/cutlet = 2,
/obj/item/food/grown/chili = 1,
/obj/item/food/grown/tomato = 1
@@ -82,7 +82,7 @@
name = "Cold chili"
result = /obj/item/food/soup/coldchili
reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/meat/cutlet = 2,
/obj/item/food/grown/icepepper = 1,
/obj/item/food/grown/tomato = 1
@@ -94,7 +94,7 @@
result = /obj/item/food/soup/tomato
reqs = list(
/datum/reagent/water = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/tomato = 2
)
subcategory = CAT_SOUP
@@ -104,7 +104,7 @@
result = /obj/item/food/soup/tomato/eyeball
reqs = list(
/datum/reagent/water = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/tomato = 2,
/obj/item/organ/eyes = 1
)
@@ -115,7 +115,7 @@
result = /obj/item/food/soup/miso
reqs = list(
/datum/reagent/water = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/soydope = 2,
/obj/item/food/tofu = 2
)
@@ -126,7 +126,7 @@
result = /obj/item/food/soup/blood
reqs = list(
/datum/reagent/blood = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/tomato/blood = 2
)
subcategory = CAT_SOUP
@@ -137,7 +137,7 @@
reqs = list(
/datum/reagent/water = 10,
/datum/reagent/toxin/slimejelly = 5,
- /obj/item/reagent_containers/glass/bowl = 1
+ /obj/item/reagent_containers/cup/bowl = 1
)
subcategory = CAT_SOUP
@@ -146,7 +146,7 @@
result = /obj/item/food/soup/clownstears
reqs = list(
/datum/reagent/water = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/banana = 1,
/obj/item/stack/sheet/mineral/bananium = 1
)
@@ -157,7 +157,7 @@
result = /obj/item/food/soup/mystery
reqs = list(
/datum/reagent/water = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/badrecipe = 1,
/obj/item/food/tofu = 1,
/obj/item/food/boiledegg = 1,
@@ -171,7 +171,7 @@
reqs = list(
/datum/reagent/consumable/milk = 5,
/datum/reagent/water = 5,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/mushroom/chanterelle = 1
)
subcategory = CAT_SOUP
@@ -181,7 +181,7 @@
result = /obj/item/food/soup/beet
reqs = list(
/datum/reagent/water = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/whitebeet = 1,
/obj/item/food/grown/cabbage = 1,
)
@@ -192,7 +192,7 @@
result = /obj/item/food/soup/stew
reqs = list(
/datum/reagent/water = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/tomato = 1,
/obj/item/food/meat/cutlet = 3,
/obj/item/food/grown/potato = 1,
@@ -207,7 +207,7 @@
result = /obj/item/food/soup/spacylibertyduff
reqs = list(
/datum/reagent/consumable/ethanol/vodka = 5,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/mushroom/libertycap = 3
)
subcategory = CAT_SOUP
@@ -217,7 +217,7 @@
result = /obj/item/food/soup/amanitajelly
reqs = list(
/datum/reagent/consumable/ethanol/vodka = 5,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/mushroom/amanita = 3
)
subcategory = CAT_SOUP
@@ -228,7 +228,7 @@
reqs = list(
/datum/reagent/water = 10,
/datum/reagent/consumable/sugar = 5,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/potato/sweet = 2
)
subcategory = CAT_SOUP
@@ -238,7 +238,7 @@
result = /obj/item/food/soup/beet/red
reqs = list(
/datum/reagent/water = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/redbeet = 1,
/obj/item/food/grown/cabbage = 1
)
@@ -248,9 +248,9 @@
name = "Bisque"
result = /obj/item/food/soup/bisque
reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/datum/reagent/water = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/meat/crab = 1,
/obj/item/food/boiledrice = 1
)
@@ -262,7 +262,7 @@
reqs = list(
/datum/reagent/water = 5,
/datum/reagent/consumable/cream = 5,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/chili = 1,
/obj/item/food/grown/bungofruit = 1
)
@@ -274,7 +274,7 @@
reqs = list(
/datum/reagent/water = 10,
/datum/reagent/consumable/sodiumchloride = 5,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/mushroom/jupitercup = 1
)
subcategory = CAT_SOUP
diff --git a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_spaghetti.dm b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_spaghetti.dm
index 60f0c1f093b85..d21436fc59c67 100644
--- a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_spaghetti.dm
+++ b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_spaghetti.dm
@@ -40,7 +40,7 @@
name = "Beef noodle"
result = /obj/item/food/spaghetti/beefnoodle
reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/spaghetti/boiledspaghetti = 1,
/obj/item/food/meat/cutlet = 2,
/obj/item/food/grown/cabbage = 1
diff --git a/code/datums/components/crafting/crafting_lists/misc.dm b/code/datums/components/crafting/crafting_lists/misc.dm
index 44c524db78190..1fde5d3a2cbbe 100644
--- a/code/datums/components/crafting/crafting_lists/misc.dm
+++ b/code/datums/components/crafting/crafting_lists/misc.dm
@@ -311,7 +311,7 @@
/datum/crafting_recipe/paper_cup
name= "Paper Cup"
- result = /obj/item/reagent_containers/food/drinks/sillycup
+ result = /obj/item/reagent_containers/cup/glass/sillycup
time = 1 SECONDS
tools = list(TOOL_WIRECUTTER)
reqs = list(/obj/item/paper = 1)
diff --git a/code/datums/components/crafting/crafting_lists/primal.dm b/code/datums/components/crafting/crafting_lists/primal.dm
index 5bbb930118f4d..8aecf2931c108 100644
--- a/code/datums/components/crafting/crafting_lists/primal.dm
+++ b/code/datums/components/crafting/crafting_lists/primal.dm
@@ -268,7 +268,7 @@
/datum/crafting_recipe/mushroom_bowl
name = "Mushroom Bowl"
- result = /obj/item/reagent_containers/glass/bowl/mushroom_bowl
+ result = /obj/item/reagent_containers/cup/bowl/mushroom_bowl
time = 3 SECONDS
reqs = list(/obj/item/food/grown/ash_flora/shavings = 5)
category = CAT_PRIMAL
diff --git a/code/datums/components/crafting/crafting_lists/robots.dm b/code/datums/components/crafting/crafting_lists/robots.dm
index 11fc03c3490ab..32d87f82c6c73 100644
--- a/code/datums/components/crafting/crafting_lists/robots.dm
+++ b/code/datums/components/crafting/crafting_lists/robots.dm
@@ -39,7 +39,7 @@
result = /mob/living/simple_animal/bot/cleanbot
time = 4 SECONDS
reqs = list(
- /obj/item/reagent_containers/glass/bucket = 1,
+ /obj/item/reagent_containers/cup/bucket = 1,
/obj/item/assembly/prox_sensor = 1,
/obj/item/bodypart/r_arm/robot = 1
)
diff --git a/code/datums/components/crafting/crafting_lists/weaponry/weapons.dm b/code/datums/components/crafting/crafting_lists/weaponry/weapons.dm
index 59d66457b5433..af1eefd2cd594 100644
--- a/code/datums/components/crafting/crafting_lists/weaponry/weapons.dm
+++ b/code/datums/components/crafting/crafting_lists/weaponry/weapons.dm
@@ -9,9 +9,9 @@
/datum/reagent/fuel = 50,
/obj/item/stack/cable_coil = 1,
/obj/item/assembly/igniter = 1,
- /obj/item/reagent_containers/food/drinks/soda_cans = 1
+ /obj/item/reagent_containers/cup/soda_cans = 1
)
- parts = list(/obj/item/reagent_containers/food/drinks/soda_cans = 1)
+ parts = list(/obj/item/reagent_containers/cup/soda_cans = 1)
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
dangerous_craft = TRUE
@@ -47,13 +47,13 @@
/datum/crafting_recipe/molotov
name = "Molotov"
- result = /obj/item/reagent_containers/food/drinks/bottle/molotov
+ result = /obj/item/reagent_containers/cup/glass/bottle/molotov
time = 4 SECONDS
reqs = list(
- /obj/item/reagent_containers/glass/rag = 1,
- /obj/item/reagent_containers/food/drinks/bottle = 1
+ /obj/item/reagent_containers/cup/rag = 1,
+ /obj/item/reagent_containers/cup/glass/bottle = 1
)
- parts = list(/obj/item/reagent_containers/food/drinks/bottle = 1)
+ parts = list(/obj/item/reagent_containers/cup/glass/bottle = 1)
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
dangerous_craft = TRUE
diff --git a/code/datums/components/food/edible.dm b/code/datums/components/food/edible.dm
index c5e2c255b9c05..32bdf25d2066e 100644
--- a/code/datums/components/food/edible.dm
+++ b/code/datums/components/food/edible.dm
@@ -324,11 +324,7 @@ Behavior that's still missing from this component that original food items had t
else if(fullness > (600 * (1 + eater.overeatduration / 2000))) // The more you eat - the more you can eat
eater.visible_message("[eater] cannot force any more of \the [parent] to go down [eater.p_their()] throat!", "You cannot force any more of \the [parent] to go down your throat!")
return
-
-
-
-
-
+
else //If you're feeding it to someone else.
if(isbrain(eater))
to_chat(feeder, "[eater] doesn't seem to have a mouth!")
diff --git a/code/datums/components/infective.dm b/code/datums/components/infective.dm
index c839dc18d2dfb..9d809165a1d91 100644
--- a/code/datums/components/infective.dm
+++ b/code/datums/components/infective.dm
@@ -33,6 +33,8 @@
RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(try_infect_attack))
RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(try_infect_equipped))
RegisterSignal(parent, COMSIG_FOOD_EATEN, PROC_REF(try_infect_eat))
+ if(istype(parent, /obj/item/reagent_containers/cup))
+ RegisterSignal(parent, COMSIG_GLASS_DRANK, PROC_REF(try_infect_drink))
else if(istype(parent, /obj/effect/decal/cleanable/blood/gibs))
RegisterSignal(parent, COMSIG_GIBS_STREAK, PROC_REF(try_infect_streak))
@@ -43,7 +45,18 @@
eater.ForceContractDisease(V)
try_infect(feeder, BODY_ZONE_L_ARM)
+/datum/component/infective/proc/try_infect_drink(datum/source, mob/living/drinker, mob/living/feeder)
+ SIGNAL_HANDLER
+
+ for(var/disease in diseases)
+ drinker.ForceContractDisease(disease)
+ var/appendage_zone = feeder.held_items.Find(source)
+ appendage_zone = appendage_zone == 0 ? BODY_ZONE_CHEST : appendage_zone % 2 ? BODY_ZONE_R_ARM : BODY_ZONE_L_ARM
+ try_infect(feeder, appendage_zone)
+
/datum/component/infective/proc/clean(datum/source, clean_types)
+ SIGNAL_HANDLER
+
if(clean_types & required_clean_types)
qdel(src)
return TRUE
diff --git a/code/datums/components/orbiter.dm b/code/datums/components/orbiter.dm
index 3db152283651f..31bafd87fcf45 100644
--- a/code/datums/components/orbiter.dm
+++ b/code/datums/components/orbiter.dm
@@ -24,7 +24,10 @@
if(ismovable(target))
tracker = new(target, CALLBACK(src, PROC_REF(move_react)))
+ RegisterSignal(parent, COMSIG_MOVABLE_UPDATE_GLIDE_SIZE, PROC_REF(orbiter_glide_size_update))
+
/datum/component/orbiter/UnregisterFromParent()
+ UnregisterSignal(parent, COMSIG_MOVABLE_UPDATE_GLIDE_SIZE)
var/atom/target = parent
target.orbit_datum = null
QDEL_NULL(tracker)
@@ -65,9 +68,12 @@
orbiter.orbiting.end_orbit(orbiter)
current_orbiters[orbiter] = TRUE
orbiter.orbiting = src
+
ADD_TRAIT(orbiter, TRAIT_NO_FLOATING_ANIM, ORBITING_TRAIT)
RegisterSignal(orbiter, COMSIG_MOVABLE_MOVED, PROC_REF(orbiter_move_react))
+
SEND_SIGNAL(parent, COMSIG_ATOM_ORBIT_BEGIN, orbiter)
+
var/matrix/initial_transform = matrix(orbiter.transform)
current_orbiters[orbiter] = initial_transform
@@ -86,6 +92,13 @@
orbiter.SpinAnimation(rotation_speed, -1, clockwise, rotation_segments, parallel = FALSE)
+ if(ismob(orbiter))
+ var/mob/orbiter_mob = orbiter
+ orbiter_mob.updating_glide_size = FALSE
+ if(ismovable(parent))
+ var/atom/movable/movable_parent = parent
+ orbiter.glide_size = movable_parent.glide_size
+
orbiter.abstract_move(get_turf(parent))
to_chat(orbiter, "Now orbiting [parent].")
@@ -100,7 +113,14 @@
current_orbiters -= orbiter
orbiter.stop_orbit(src)
orbiter.orbiting = null
+
+ if(ismob(orbiter))
+ var/mob/orbiter_mob = orbiter
+ orbiter_mob.updating_glide_size = TRUE
+ orbiter_mob.glide_size = 8
+
REMOVE_TRAIT(orbiter, TRAIT_NO_FLOATING_ANIM, ORBITING_TRAIT)
+
if(!refreshing && !length(current_orbiters) && !QDELING(src))
qdel(src)
@@ -158,6 +178,12 @@
return
end_orbit(orbiter)
+/datum/component/orbiter/proc/orbiter_glide_size_update(datum/source, target)
+ SIGNAL_HANDLER
+ for(var/orbiter in current_orbiters)
+ var/atom/movable/movable_orbiter = orbiter
+ movable_orbiter.glide_size = target
+
/////////////////////
/atom/movable/proc/check_orbitable(atom/A)
diff --git a/code/datums/components/riding.dm b/code/datums/components/riding.dm
index 038a3fedfe0b0..737d4611ba273 100644
--- a/code/datums/components/riding.dm
+++ b/code/datums/components/riding.dm
@@ -28,6 +28,7 @@
/datum/component/riding/Initialize()
if(!ismovable(parent))
return COMPONENT_INCOMPATIBLE
+ RegisterSignal(parent, COMSIG_ATOM_DIR_CHANGE, PROC_REF(vehicle_turned))
RegisterSignal(parent, COMSIG_MOVABLE_BUCKLE, PROC_REF(vehicle_mob_buckle))
RegisterSignal(parent, COMSIG_MOVABLE_UNBUCKLE, PROC_REF(vehicle_mob_unbuckle))
RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(vehicle_moved))
@@ -42,20 +43,24 @@
var/atom/movable/AM = parent
restore_position(M)
unequip_buckle_inhands(M)
+ M.updating_glide_size = TRUE
if(del_on_unbuckle_all && !AM.has_buckled_mobs())
qdel(src)
/datum/component/riding/proc/vehicle_mob_buckle(datum/source, mob/living/M, force = FALSE)
SIGNAL_HANDLER
- handle_vehicle_offsets()
+ var/atom/movable/movable_parent = parent
+ M.set_glide_size(movable_parent.glide_size)
+ M.updating_glide_size = FALSE
+ handle_vehicle_offsets(movable_parent.dir)
-/datum/component/riding/proc/handle_vehicle_layer()
+/datum/component/riding/proc/handle_vehicle_layer(dir)
var/atom/movable/AM = parent
var/static/list/defaults = list(TEXT_NORTH = OBJ_LAYER, TEXT_SOUTH = ABOVE_MOB_LAYER, TEXT_EAST = ABOVE_MOB_LAYER, TEXT_WEST = ABOVE_MOB_LAYER)
- . = defaults["[AM.dir]"]
- if(directional_vehicle_layers["[AM.dir]"])
- . = directional_vehicle_layers["[AM.dir]"]
+ . = defaults["[dir]"]
+ if(directional_vehicle_layers["[dir]"])
+ . = directional_vehicle_layers["[dir]"]
if(isnull(.)) //you can set it to null to not change it.
. = AM.layer
AM.layer = .
@@ -63,14 +68,22 @@
/datum/component/riding/proc/set_vehicle_dir_layer(dir, layer)
directional_vehicle_layers["[dir]"] = layer
-/datum/component/riding/proc/vehicle_moved(datum/source)
+/datum/component/riding/proc/vehicle_moved(datum/source, dir)
SIGNAL_HANDLER
- var/atom/movable/AM = parent
- for(var/i in AM.buckled_mobs)
- ride_check(i)
- handle_vehicle_offsets()
- handle_vehicle_layer()
+ var/atom/movable/movable_parent = parent
+ if (isnull(dir))
+ dir = movable_parent.dir
+ movable_parent.set_glide_size(DELAY_TO_GLIDE_SIZE(vehicle_move_delay))
+ for (var/m in movable_parent.buckled_mobs)
+ ride_check(m)
+ var/mob/buckled_mob = m
+ buckled_mob.set_glide_size(movable_parent.glide_size)
+ handle_vehicle_offsets(dir)
+ handle_vehicle_layer(dir)
+
+/datum/component/riding/proc/vehicle_turned(datum/source, _old_dir, new_dir)
+ vehicle_moved(source, new_dir)
/datum/component/riding/proc/ride_check(mob/living/M)
var/atom/movable/AM = parent
@@ -88,17 +101,16 @@
var/atom/movable/AM = parent
AM.unbuckle_mob(M)
-/datum/component/riding/proc/handle_vehicle_offsets()
+/datum/component/riding/proc/handle_vehicle_offsets(dir)
var/atom/movable/AM = parent
- var/AM_dir = "[AM.dir]"
+ var/AM_dir = "[dir]"
var/passindex = 0
if(AM.has_buckled_mobs())
for(var/m in AM.buckled_mobs)
passindex++
var/mob/living/buckled_mob = m
var/list/offsets = get_offsets(passindex)
- var/rider_dir = get_rider_dir(passindex)
- buckled_mob.setDir(rider_dir)
+ buckled_mob.setDir(dir)
dir_loop:
for(var/offsetdir in offsets)
if(offsetdir == AM_dir)
@@ -138,12 +150,6 @@
return FALSE
riding_offsets["[index]"] = offsets
-//Override this to set the passengers/riders dir based on which passenger they are.
-//ie: rider facing the vehicle's dir, but passenger 2 facing backwards, etc.
-/datum/component/riding/proc/get_rider_dir(pass_index)
- var/atom/movable/AM = parent
- return AM.dir
-
//KEYS
/datum/component/riding/proc/keycheck(mob/user)
return !keytype || user.is_holding_item_of_type(keytype)
@@ -200,8 +206,8 @@
else
last_move_diagonal = FALSE
- handle_vehicle_layer()
- handle_vehicle_offsets()
+ handle_vehicle_layer(AM.dir)
+ handle_vehicle_offsets(AM.dir)
else
to_chat(user, "You'll need the keys in one of your hands to [drive_verb] [AM].")
@@ -245,18 +251,18 @@
if(H.a_intent == INTENT_DISARM && (target in H.buckled_mobs))
force_dismount(target)
-/datum/component/riding/human/handle_vehicle_layer()
+/datum/component/riding/human/handle_vehicle_layer(dir)
var/atom/movable/AM = parent
if(AM.buckled_mobs?.len)
for(var/mob/M in AM.buckled_mobs) //ensure proper layering of piggyback and carry, sometimes weird offsets get applied
M.layer = MOB_LAYER
if(!AM.buckle_lying)
- if(AM.dir == SOUTH)
+ if(dir == SOUTH)
AM.layer = ABOVE_MOB_LAYER
else
AM.layer = OBJ_LAYER
else
- if(AM.dir == NORTH)
+ if(dir == NORTH)
AM.layer = OBJ_LAYER
else
AM.layer = ABOVE_MOB_LAYER
@@ -300,10 +306,10 @@
to_chat(user, "You can't grab onto [AM] with no hands!")
return
-/datum/component/riding/cyborg/handle_vehicle_layer()
+/datum/component/riding/cyborg/handle_vehicle_layer(dir)
var/atom/movable/AM = parent
if(AM.buckled_mobs && AM.buckled_mobs.len)
- if(AM.dir == SOUTH)
+ if(dir == SOUTH)
AM.layer = ABOVE_MOB_LAYER
else
AM.layer = OBJ_LAYER
@@ -313,16 +319,16 @@
/datum/component/riding/cyborg/get_offsets(pass_index) // list(dir = x, y, layer)
return list(TEXT_NORTH = list(0, 4), TEXT_SOUTH = list(0, 4), TEXT_EAST = list(-6, 3), TEXT_WEST = list( 6, 3))
-/datum/component/riding/cyborg/handle_vehicle_offsets()
+/datum/component/riding/cyborg/handle_vehicle_offsets(dir)
var/atom/movable/AM = parent
if(AM.has_buckled_mobs())
for(var/mob/living/M in AM.buckled_mobs)
- M.setDir(AM.dir)
+ M.setDir(dir)
if(iscyborg(AM))
var/mob/living/silicon/robot/R = AM
if(istype(R.module))
- M.pixel_x = R.module.ride_offset_x[dir2text(AM.dir)]
- M.pixel_y = R.module.ride_offset_y[dir2text(AM.dir)]
+ M.pixel_x = R.module.ride_offset_x[dir2text(dir)]
+ M.pixel_y = R.module.ride_offset_y[dir2text(dir)]
else
..()
diff --git a/code/datums/components/shell.dm b/code/datums/components/shell.dm
index 9a98e816e6d5e..06a109abd096c 100644
--- a/code/datums/components/shell.dm
+++ b/code/datums/components/shell.dm
@@ -133,7 +133,7 @@
if(istype(item, /obj/item/inducer))
var/obj/item/inducer/inducer = item
- INVOKE_ASYNC(inducer, TYPE_PROC_REF(/obj/item, attack_obj), attached_circuit, attacker, list())
+ INVOKE_ASYNC(inducer, TYPE_PROC_REF(/obj/item, attack_atom), attached_circuit, attacker, list())
return COMPONENT_NO_AFTERATTACK
if(attached_circuit)
diff --git a/code/datums/components/storage/concrete/pockets.dm b/code/datums/components/storage/concrete/pockets.dm
index aeae6ab3eced1..0b100b4000541 100644
--- a/code/datums/components/storage/concrete/pockets.dm
+++ b/code/datums/components/storage/concrete/pockets.dm
@@ -107,9 +107,9 @@
/datum/component/storage/concrete/pockets/helmet/Initialize()
. = ..()
- can_hold = typecacheof(list(/obj/item/reagent_containers/food/drinks/bottle/vodka,
- /obj/item/reagent_containers/food/drinks/bottle/molotov,
- /obj/item/reagent_containers/food/drinks/drinkingglass,
+ can_hold = typecacheof(list(/obj/item/reagent_containers/cup/glass/bottle/vodka,
+ /obj/item/reagent_containers/cup/glass/bottle/molotov,
+ /obj/item/reagent_containers/cup/glass/drinkingglass,
/obj/item/ammo_box/a762))
/datum/component/storage/concrete/pockets/void_cloak
diff --git a/code/datums/components/udder.dm b/code/datums/components/udder.dm
index cbb1f5ea64ca9..30a4fb400191b 100644
--- a/code/datums/components/udder.dm
+++ b/code/datums/components/udder.dm
@@ -48,7 +48,7 @@
SIGNAL_HANDLER
var/mob/living/milked = parent
- if(milked.stat == CONSCIOUS && istype(milking_tool, /obj/item/reagent_containers/glass))
+ if(milked.stat == CONSCIOUS && istype(milking_tool, /obj/item/reagent_containers/cup))
udder.milk(milking_tool, user)
if(on_milk_callback)
on_milk_callback.Invoke(udder.reagents.total_volume, udder.reagents.maximum_volume)
@@ -112,10 +112,10 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/udder)
* Proc called from attacking the component parent with the correct item, moves reagents into the glass basically.
*
* Arguments:
- * * obj/item/reagent_containers/glass/milk_holder - what we are trying to transfer the reagents to
+ * * obj/item/reagent_containers/cup/milk_holder - what we are trying to transfer the reagents to
* * mob/user - who is trying to do this
*/
-/obj/item/udder/proc/milk(obj/item/reagent_containers/glass/milk_holder, mob/user)
+/obj/item/udder/proc/milk(obj/item/reagent_containers/cup/milk_holder, mob/user)
if(milk_holder.reagents.total_volume >= milk_holder.volume)
to_chat(user, "[milk_holder] is full.")
return
diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm
index f50c971df5574..984492979b8e2 100644
--- a/code/datums/diseases/transformation.dm
+++ b/code/datums/diseases/transformation.dm
@@ -273,7 +273,7 @@
cure_text = "Something that would kill off the tiny cats."
spread_text = "Acute"
disease_flags = CURABLE|CAN_CARRY|CAN_RESIST
- cures = list(/datum/reagent/consumable/cocoa, /datum/reagent/consumable/cocoa/hot_cocoa) //kills all the tiny cats that infected your organism
+ cures = list(/datum/reagent/consumable/cocoa, /datum/reagent/consumable/hot_cocoa) //kills all the tiny cats that infected your organism
cure_chance = 25
stage_prob = 3
agent = "Nano-feline Toxoplasmosis"
diff --git a/code/datums/elements/obj_regen.dm b/code/datums/elements/obj_regen.dm
index c27d23adee610..efb55f4bfa7c0 100644
--- a/code/datums/elements/obj_regen.dm
+++ b/code/datums/elements/obj_regen.dm
@@ -21,14 +21,14 @@
return ELEMENT_INCOMPATIBLE
rate = _rate
- RegisterSignal(target, COMSIG_OBJ_TAKE_DAMAGE, PROC_REF(on_take_damage))
+ RegisterSignal(target, COMSIG_ATOM_TAKE_DAMAGE, PROC_REF(on_take_damage))
if(target.get_integrity() < target.max_integrity)
if(!length(processing))
START_PROCESSING(SSobj, src)
processing |= target
/datum/element/obj_regen/Detach(obj/target)
- UnregisterSignal(target, COMSIG_OBJ_TAKE_DAMAGE)
+ UnregisterSignal(target, COMSIG_ATOM_TAKE_DAMAGE)
processing -= target
if(!length(processing))
STOP_PROCESSING(SSobj, src)
diff --git a/code/datums/map_adjustment.dm b/code/datums/map_adjustment.dm
new file mode 100644
index 0000000000000..7687b4eb55580
--- /dev/null
+++ b/code/datums/map_adjustment.dm
@@ -0,0 +1,57 @@
+/*
+ * [What does this do?]
+ * It supports to make adjustment for each map
+ *
+ * [Why don't you just make this with map json file?]
+ * Some stuff is easy to mistake.
+ * Being a part of DM files can make a failsafe.
+ *
+ * For example, let's say "Paramedic" is removed from the game.
+ * But json file will still keep it.
+ * Or let's say you mistype Pamadic
+ * Using job defines will be safe
+ *
+ * [I want to add a map adjustment for a map]
+ * There is a live sample with 'EchoStation'
+ *
+*/
+/datum/map_adjustment
+ /// key of map_adjustment. It is used to check if '/datum/map_config/var/map_file' is matched
+ var/map_file_name = "some_station_map.dmm" // change yourself
+ /// Jobs that this station map won't use
+ var/list/blacklisted_jobs
+
+/// called on map config is loaded.
+/// You need to change things manually here.
+/datum/map_adjustment/proc/on_mapping_init()
+ return
+
+/// called upon job datum creation. Override this proc to change.
+/datum/map_adjustment/proc/job_change()
+ return
+
+/// * job_name
"
- dat += "[S.desc][desc]
"
- dat += "[S.clothes_req?"Requires wizard garb.":"Can be cast without wizard garb."]
"
- return dat
+ cooldown = S.charge_max/10
+ if(S.clothes_req)
+ clothes_req = TRUE
+ if(!desc)
+ desc = S.desc
/datum/spellbook_entry/fireball
name = "Fireball"
+ desc = "Fires an explosive fireball at a target. Considered a classic among all wizards."
spell_type = /obj/effect/proc_holder/spell/aimed/fireball
/datum/spellbook_entry/spell_cards
name = "Spell Cards"
+ desc = "Blazing hot rapid-fire homing cards. Send your foes to the shadow realm with their mystical power!"
spell_type = /obj/effect/proc_holder/spell/aimed/spell_cards
cost = 1
/datum/spellbook_entry/rod_form
name = "Rod Form"
+ desc = "Take on the form of an immovable rod, destroying all in your path. Purchasing this spell multiple times will also increase the rod's damage and travel range."
spell_type = /obj/effect/proc_holder/spell/targeted/rod_form
/datum/spellbook_entry/magicm
name = "Magic Missile"
+ desc = "Fires several, slow moving, magic projectiles at nearby targets."
spell_type = /obj/effect/proc_holder/spell/targeted/projectile/magic_missile
category = "Defensive"
/datum/spellbook_entry/disintegrate
name = "Disintegrate"
+ desc = "Charges your hand with an unholy energy that can be used to cause a touched victim to violently explode."
spell_type = /obj/effect/proc_holder/spell/targeted/touch/disintegrate
/datum/spellbook_entry/disabletech
name = "Disable Tech"
+ desc = "Disables all weapons, cameras and most other technology in range."
spell_type = /obj/effect/proc_holder/spell/targeted/emplosion/disable_tech
category = "Defensive"
cost = 1
/datum/spellbook_entry/repulse
name = "Repulse"
+ desc = "Throws everything around the user away."
spell_type = /obj/effect/proc_holder/spell/aoe_turf/repulse
category = "Defensive"
/datum/spellbook_entry/lightningPacket
name = "Lightning bolt! Lightning bolt!"
+ desc = "Forged from eldrich energies, a packet of pure power, known as a spell packet will appear in your hand, that when thrown will stun the target."
spell_type = /obj/effect/proc_holder/spell/targeted/conjure_item/spellpacket
category = "Defensive"
/datum/spellbook_entry/timestop
name = "Time Stop"
+ desc = "Stops time for everyone except for you, allowing you to move freely while your enemies and even projectiles are frozen."
spell_type = /obj/effect/proc_holder/spell/aoe_turf/conjure/timestop
category = "Defensive"
/datum/spellbook_entry/smoke
name = "Smoke"
+ desc = "Spawns a cloud of choking smoke at your location."
spell_type = /obj/effect/proc_holder/spell/targeted/smoke
category = "Defensive"
cost = 1
/datum/spellbook_entry/blind
name = "Blind"
+ desc = "Temporarily blinds a single target."
spell_type = /obj/effect/proc_holder/spell/targeted/blind
cost = 1
/datum/spellbook_entry/mindswap
name = "Mindswap"
+ desc = "Allows you to switch bodies with a target next to you. You will both fall asleep when this happens, and it will be quite obvious that you are the target's body if someone watches you do it."
spell_type = /obj/effect/proc_holder/spell/targeted/mind_transfer
category = "Mobility"
/datum/spellbook_entry/forcewall
name = "Force Wall"
+ desc = "Create a magical barrier that only you can pass through."
spell_type = /obj/effect/proc_holder/spell/targeted/forcewall
category = "Defensive"
cost = 1
/datum/spellbook_entry/blink
name = "Blink"
+ desc = "Randomly teleports you a short distance."
spell_type = /obj/effect/proc_holder/spell/targeted/turf_teleport/blink
category = "Mobility"
/datum/spellbook_entry/teleport
name = "Teleport"
+ desc = "Teleports you to an area of your selection."
spell_type = /obj/effect/proc_holder/spell/targeted/area_teleport/teleport
category = "Mobility"
/datum/spellbook_entry/mutate
name = "Mutate"
+ desc = "Causes you to turn into a hulk and gain laser vision for a short while."
spell_type = /obj/effect/proc_holder/spell/targeted/genetic/mutate
/datum/spellbook_entry/jaunt
name = "Ethereal Jaunt"
+ desc = "Turns your form ethereal, temporarily making you invisible and able to pass through walls."
spell_type = /obj/effect/proc_holder/spell/targeted/ethereal_jaunt
category = "Mobility"
/datum/spellbook_entry/knock
name = "Knock"
+ desc = "Opens nearby doors and closets."
spell_type = /obj/effect/proc_holder/spell/aoe_turf/knock
category = "Mobility"
cost = 1
/datum/spellbook_entry/fleshtostone
name = "Flesh to Stone"
+ desc = "Charges your hand with the power to turn victims into inert statues for a long period of time."
spell_type = /obj/effect/proc_holder/spell/targeted/touch/flesh_to_stone
/datum/spellbook_entry/summonitem
name = "Summon Item"
+ desc = "Recalls a previously marked item to your hand from anywhere in the universe."
spell_type = /obj/effect/proc_holder/spell/targeted/summonitem
category = "Assistance"
cost = 1
/datum/spellbook_entry/lichdom
name = "Bind Soul"
+ desc = "A dark necromantic pact that can forever bind your soul to an \
+ item of your choosing. So long as both your body and the item remain \
+ intact and on the same plane you can revive from death, though the time \
+ between reincarnations grows steadily with use, along with the weakness \
+ that the new skeleton body will experience upon 'birth'. Note that \
+ becoming a lich destroys all internal organs except the brain."
spell_type = /obj/effect/proc_holder/spell/targeted/lichdom
category = "Defensive"
cost = 3
@@ -221,10 +256,12 @@
/datum/spellbook_entry/teslablast
name = "Tesla Blast"
+ desc = "Charge up a tesla arc and release it at a random nearby target! You can move freely while it charges. The arc jumps between targets and can knock them down."
spell_type = /obj/effect/proc_holder/spell/targeted/tesla
/datum/spellbook_entry/lightningbolt
name = "Lightning Bolt"
+ desc = "Fire a lightning bolt at your foes! It will jump between targets, but can't knock them down."
spell_type = /obj/effect/proc_holder/spell/aimed/lightningbolt
/datum/spellbook_entry/lightningbolt/Buy(mob/living/carbon/human/user,obj/item/spellbook/book) //return TRUE on success
@@ -233,33 +270,39 @@
/datum/spellbook_entry/infinite_guns
name = "Lesser Summon Guns"
+ desc = "Why reload when you have infinite guns? Summons an unending stream of bolt action rifles that deal little damage, but will knock targets down. Requires both hands free to use. Learning this spell makes you unable to learn Arcane Barrage."
spell_type = /obj/effect/proc_holder/spell/targeted/infinite_guns/gun
cost = 3
no_coexistence_typecache = /obj/effect/proc_holder/spell/targeted/infinite_guns/arcane_barrage
/datum/spellbook_entry/arcane_barrage
name = "Arcane Barrage"
+ desc = "Fire a torrent of arcane energy at your foes with this (powerful) spell. Deals much more damage than Lesser Summon Guns, but won't knock targets down. Requires both hands free to use. Learning this spell makes you unable to learn Lesser Summon Gun."
spell_type = /obj/effect/proc_holder/spell/targeted/infinite_guns/arcane_barrage
no_coexistence_typecache = /obj/effect/proc_holder/spell/targeted/infinite_guns/gun
/datum/spellbook_entry/barnyard
name = "Barnyard Curse"
+ desc = "This spell dooms an unlucky soul to possess the speech and facial attributes of a barnyard animal."
spell_type = /obj/effect/proc_holder/spell/targeted/barnyardcurse
/datum/spellbook_entry/charge
name = "Charge"
+ desc = "This spell can be used to recharge a variety of things in your hands, from magical artifacts to electrical components. A creative wizard can even use it to grant magical power to a fellow magic user."
spell_type = /obj/effect/proc_holder/spell/targeted/charge
category = "Assistance"
cost = 1
/datum/spellbook_entry/shapeshift
name = "Wild Shapeshift"
+ desc = "Take on the shape of another for a time to use their natural abilities. Once you've made your choice it cannot be changed."
spell_type = /obj/effect/proc_holder/spell/targeted/shapeshift
category = "Assistance"
cost = 1
/datum/spellbook_entry/tap
name = "Soul Tap"
+ desc = "Fuel your spells using your own soul!"
spell_type = /obj/effect/proc_holder/spell/self/tap
category = "Assistance"
cost = 1
@@ -267,18 +310,21 @@
/datum/spellbook_entry/spacetime_dist
name = "Spacetime Distortion"
+ desc = "Entangle the strings of space-time in an area around you, randomizing the layout and making proper movement impossible. The strings vibrate..."
spell_type = /obj/effect/proc_holder/spell/spacetime_dist
category = "Defensive"
cost = 1
/datum/spellbook_entry/the_traps
name = "The Traps!"
+ desc = "Summon a number of traps around you. They will damage and enrage any enemies that step on them."
spell_type = /obj/effect/proc_holder/spell/aoe_turf/conjure/the_traps
category = "Defensive"
cost = 1
/datum/spellbook_entry/bees
name = "Lesser Summon Bees"
+ desc = "This spell magically kicks a transdimensional beehive, instantly summoning a swarm of bees to your location. These bees are NOT friendly to anyone."
spell_type = /obj/effect/proc_holder/spell/aoe_turf/conjure/creature/bee
category = "Defensive"
@@ -294,15 +340,6 @@
SSblackbox.record_feedback("tally", "wizard_spell_learned", 1, name)
return TRUE
-/datum/spellbook_entry/item/GetInfo()
- var/dat =""
- dat += "[name]"
- dat += " Cost:[cost]
"
- dat += "[desc]
"
- if(surplus>=0)
- dat += "[surplus] left.
"
- return dat
-
/datum/spellbook_entry/item/staffchange
name = "Staff of Change"
desc = "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself."
@@ -351,7 +388,7 @@
category = "Defensive"
/datum/spellbook_entry/item/soulstones
- name = "Six Soul Stone Shards and the spell Artificer"
+ name = "Soulstone Shard Kit"
desc = "Soul Stone Shards are ancient tools capable of capturing and harnessing the spirits of the dead and dying. The spell Artificer allows you to create arcane machines for the captured souls to pilot."
item_path = /obj/item/storage/belt/soulstone/full
category = "Assistance"
@@ -455,6 +492,22 @@
category = "Mobility"
cost = 1
+//THESE ARE NOT PURCHASABLE SPELLS! They're references to old spells that got removed + shit that sounds stupid but fun so we can painfully lock behind a dimmer component
+
+/datum/spellbook_entry/challenge
+ name = "Take the Challenge"
+ refundable = FALSE
+ category = "Challenges"
+ buy_word = "Accept"
+
+/datum/spellbook_entry/challenge/multiverse
+ name = "Multiverse Sword"
+ desc = "The Station gets a multiverse sword to stop you. Can you withstand the hordes of multiverse realities?"
+
+/datum/spellbook_entry/challenge/antiwizard
+ name = "Friendly Wizard Scum"
+ desc = "A \"Friendly\" Wizard will protect the station, and try to kill you. They get a spellbook much like you, but will use it for \"GOOD\"."
+
/// How much threat we need to let these rituals happen on dynamic
#define MINIMUM_THREAT_FOR_RITUALS 85
@@ -463,23 +516,10 @@
category = "Rituals"
refundable = FALSE
buy_word = "Cast"
- var/active = FALSE
var/ritual_invocation // This does nothing. This is a flavor to ghosts observing a wizard.
/datum/spellbook_entry/summon/CanBuy(mob/living/carbon/human/user,obj/item/spellbook/book)
- return ..() && !active
-
-/datum/spellbook_entry/summon/GetInfo()
- var/dat =""
- dat += "[name]"
- if(cost>0)
- dat += " Cost:[cost]
"
- else
- dat += " No Cost
"
- dat += "[desc]
"
- if(active)
- dat += "Already cast!
"
- return dat
+ return ..() && !times
/datum/spellbook_entry/summon/proc/say_invocation(mob/living/carbon/human/user)
if(ritual_invocation)
@@ -494,7 +534,7 @@
/datum/spellbook_entry/summon/ghosts/Buy(mob/living/carbon/human/user, obj/item/spellbook/book)
SSblackbox.record_feedback("tally", "wizard_spell_learned", 1, name)
new /datum/round_event/wizard/ghost()
- active = TRUE
+ times++
to_chat(user, "You have cast summon ghosts!")
playsound(get_turf(user), 'sound/effects/ghost2.ogg', 50, 1)
say_invocation(user)
@@ -519,7 +559,7 @@
/datum/spellbook_entry/summon/guns/Buy(mob/living/carbon/human/user,obj/item/spellbook/book)
SSblackbox.record_feedback("tally", "wizard_spell_learned", 1, name)
rightandwrong(SUMMON_GUNS, user, 10)
- active = TRUE
+ times++
playsound(get_turf(user), 'sound/magic/castsummon.ogg', 50, 1)
to_chat(user, "You have cast summon guns!")
say_invocation(user)
@@ -544,7 +584,7 @@
/datum/spellbook_entry/summon/magic/Buy(mob/living/carbon/human/user,obj/item/spellbook/book)
SSblackbox.record_feedback("tally", "wizard_spell_learned", 1, name)
rightandwrong(SUMMON_MAGIC, user, 10)
- active = TRUE
+ times++
playsound(get_turf(user), 'sound/magic/castsummon.ogg', 50, 1)
to_chat(user, "You have cast summon magic!")
say_invocation(user)
@@ -553,7 +593,6 @@
/datum/spellbook_entry/summon/events
name = "Summon Events"
desc = "Give Murphy's law a little push and replace all events with special wizard ones that will confound and confuse everyone. Multiple castings increase the rate of these events."
- var/times = 0
ritual_invocation = "ALADAL DESINARI ODORI'IN IDO'LEX MANAG'ROKT OVOR'E POR"
/datum/spellbook_entry/summon/events/IsAvailable(obj/item/spellbook/book)
@@ -577,7 +616,6 @@
return TRUE
/datum/spellbook_entry/summon/events/GetInfo()
- . = ..()
if(times>0)
. += "You cast it [times] times.
"
return .
@@ -590,7 +628,7 @@
/datum/spellbook_entry/summon/curse_of_madness/Buy(mob/living/carbon/human/user, obj/item/spellbook/book)
SSblackbox.record_feedback("tally", "wizard_spell_learned", 1, name)
- active = TRUE
+ times++
var/message
while(!message)
message = stripped_input(user, "Whisper a secret truth to drive your victims to madness.", "Whispers of Madness")
@@ -638,18 +676,17 @@
w_class = WEIGHT_CLASS_TINY
var/uses = 10
var/temp = null
- var/tab = null
var/refuses_refund = FALSE
- var/mob/living/carbon/human/owner
- var/list/datum/spellbook_entry/entries = list()
- var/list/categories = list()
+ /// The mind that first used the book. Automatically assigned when a wizard spawns.
+ var/datum/mind/owner
+ var/list/entries = list()
var/everything_robeless = FALSE //! if TRUE, all spells you learn become robeless. Ask admin.
var/bypass_lock = FALSE //! bypasses some locked ritual & spell combinations. Ask admin.
/obj/item/spellbook/examine(mob/user)
. = ..()
if(owner)
- . += {"There is a small signature on the front cover: "[owner]"."}
+ . += "There is a small signature on the front cover: \"[owner]\"."
else
. += "It appears to have no author."
@@ -657,16 +694,20 @@
. = ..()
prepare_spells()
-/obj/item/spellbook/proc/prepare_spells()
- var/entry_types = subtypesof(/datum/spellbook_entry) - /datum/spellbook_entry/item - /datum/spellbook_entry/summon
- for(var/T in entry_types)
- var/datum/spellbook_entry/E = new T
- if(E.IsAvailable(src))
- entries |= E
- categories |= E.category
+/obj/item/spellbook/attack_self(mob/user)
+ if(!owner)
+ if(!user.mind)
+ return
+ to_chat(user, "You bind the spellbook to yourself.")
+ owner = user.mind
+ return
+ if(user.mind != owner)
+ if(user.mind.special_role == "apprentice")
+ to_chat(user, "If you got caught sneaking a peek from your teacher's spellbook, you'd likely be expelled from the Wizard Academy. Better not.")
else
- qdel(E)
- tab = categories[1]
+ to_chat(user, "The [name] does not recognize you as its owner and refuses to open!")
+ return
+ return ..()
/obj/item/spellbook/attackby(obj/item/O, mob/user, params)
if(refuses_refund)
@@ -678,147 +719,168 @@
to_chat(user, "The contract has been used, you can't get your points back now!")
else
to_chat(user, "You feed the contract back into the spellbook, refunding your points.")
- uses++
+ uses += 2
for(var/datum/spellbook_entry/item/contract/CT in entries)
if(!isnull(CT.limit))
CT.limit++
qdel(O)
else if(istype(O, /obj/item/antag_spawner/slaughter_demon))
to_chat(user, "On second thought, maybe summoning a demon is a bad idea. You refund your points.")
- uses++
- for(var/datum/spellbook_entry/item/bloodbottle/BB in entries)
- if(!isnull(BB.limit))
- BB.limit++
+ if(istype(O, /obj/item/antag_spawner/slaughter_demon/laughter))
+ uses += 1
+ for(var/datum/spellbook_entry/item/hugbottle/HB in entries)
+ if(!isnull(HB.limit))
+ HB.limit++
+ else
+ uses += 2
+ for(var/datum/spellbook_entry/item/bloodbottle/BB in entries)
+ if(!isnull(BB.limit))
+ BB.limit++
qdel(O)
-/obj/item/spellbook/proc/GetCategoryHeader(category)
- var/dat = ""
- switch(category)
- if("Offensive")
- dat += "Spells and items geared towards debilitating and destroying.
"
- dat += "Items are not bound to you and can be stolen. Additionally they cannot typically be returned once purchased.
"
- dat += "For spells: the number after the spell name is the cooldown time.
"
- dat += "You can reduce this number by spending more points on the spell.
"
- if("Defensive")
- dat += "Spells and items geared towards improving your survivability or reducing foes' ability to attack.
"
- dat += "Items are not bound to you and can be stolen. Additionally they cannot typically be returned once purchased.
"
- dat += "For spells: the number after the spell name is the cooldown time.
"
- dat += "You can reduce this number by spending more points on the spell.
"
- if("Mobility")
- dat += "Spells and items geared towards improving your ability to move. It is a good idea to take at least one.
"
- dat += "Items are not bound to you and can be stolen. Additionally they cannot typically be returned once purchased.
"
- dat += "For spells: the number after the spell name is the cooldown time.
"
- dat += "You can reduce this number by spending more points on the spell.
"
- if("Assistance")
- dat += "Spells and items geared towards bringing in outside forces to aid you or improving upon your other items and abilities.
"
- dat += "Items are not bound to you and can be stolen. Additionally they cannot typically be returned once purchased.
"
- dat += "For spells: the number after the spell name is the cooldown time.
"
- dat += "You can reduce this number by spending more points on the spell.
"
- if("Challenges")
- dat += "The Wizard Federation typically has hard limits on the potency and number of spells brought to the station based on risk.
"
- dat += "Arming the station against you will increases the risk, but will grant you one more charge for your spellbook.
"
- if("Rituals")
- dat += "These powerful spells change the very fabric of reality. Not always in your favour.
"
- return dat
-
-/obj/item/spellbook/proc/wrap(content)
- var/dat = ""
- dat +="