diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index cdd04e32c364..0c0b4f49c0d4 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -753,7 +753,7 @@ Each role inherits the lower role's responsibilities (IE: Headcoders also have c `Headcoders` are the overarching "administrators" of the repository. People included in this role are: * [farie82](https://github.com/farie82) -* [Fox P McCloud](https://github.com/Fox-McCloud) +* [Charliminator](https://github.com/hal9000PR) * [SteelSlayer](https://github.com/SteelSlayer) --- @@ -762,7 +762,6 @@ Each role inherits the lower role's responsibilities (IE: Headcoders also have c * [AffectedArc07](https://github.com/AffectedArc07) -* [Charliminator](https://github.com/hal9000PR) * [lewcc](https://github.com/lewcc) * [S34N](https://github.com/S34NW) @@ -776,6 +775,7 @@ Each role inherits the lower role's responsibilities (IE: Headcoders also have c * [Contrabang](https://github.com/Contrabang) * [Burzah](https://github.com/Burzah) * [DGamerL](https://github.com/DGamerL) +* [Warriorstar](https://github.com/warriorstar-orion) --- diff --git a/.vscode/extensions.json b/.vscode/extensions.json index b5147f210dd7..8046f3196652 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -7,6 +7,7 @@ "eamodio.gitlens", "usernamehw.errorlens", "anturk.dmi-editor", - "esbenp.prettier-vscode" + "esbenp.prettier-vscode", + "arcanis.vscode-zipfs" ] } diff --git a/.vscode/settings.json b/.vscode/settings.json index 9c4c5f94ab1f..e6261aec1a1a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -4,8 +4,16 @@ ], // ESLint settings: "eslint.workingDirectories": [ - "tgui/" + "./tgui" ], + "search.exclude": { + "**/.yarn": true, + "**/.pnp.*": true + }, + "eslint.nodePath": "tgui/.yarn/sdks", + "prettier.prettierPath": "tgui/.yarn/sdks/prettier/index.cjs", + "typescript.tsdk": "tgui/.yarn/sdks/typescript/lib", + "typescript.enablePromptUseWorkspaceTsdk": true, "eslint.rules.customizations": [ // We really want to fail the CI builds on styling errors, // but it's better to show them as yellow squigglies in IDE @@ -22,5 +30,6 @@ }, "[scss]": { "editor.rulers": [80] - } + }, + "editor.formatOnSave": true } diff --git a/.vscode/tasks.json b/.vscode/tasks.json index dca695c03ccc..47c848d24001 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -14,7 +14,7 @@ "type": "shell", "command": "tgui/bin/tgui-build", "windows": { - "command": ".\\tgui\\bin\\tgui-build.bat" + "command": ".\\tgui\\bin\\tgui.bat" }, "problemMatcher": [ "$tsc", @@ -37,18 +37,5 @@ "label": "tgui: run dev server" } , - { - "type": "shell", - "command": "tgui/bin/tgui-formatting", - "windows": { - "command": ".\\tgui\\bin\\tgui-formatting.bat" - }, - "problemMatcher": [ - "$tsc", - "$eslint-stylish" - ], - "group": "build", - "label": "tgui: run prettier formatting" - } ] } diff --git a/_build_dependencies.sh b/_build_dependencies.sh index d146ad1c518d..7e4a8ce153ec 100644 --- a/_build_dependencies.sh +++ b/_build_dependencies.sh @@ -2,7 +2,7 @@ # For dreamchecker export SPACEMANDMM_TAG=suite-1.7.1 # For TGUI -export NODE_VERSION=18 +export NODE_VERSION=20 # Stable Byond Major export STABLE_BYOND_MAJOR=515 # Stable Byond Minor diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 582b2126b749..163efb8b9007 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -1738,11 +1738,11 @@ /area/station/hallway/secondary/entry) "anA" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/snacks/meat/slab{ +/obj/item/food/snacks/meat/slab{ pixel_x = 6; pixel_y = 11 }, -/obj/item/reagent_containers/food/snacks/meat/slab, +/obj/item/food/snacks/meat/slab, /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel, /area/station/maintenance/fore2) @@ -1929,8 +1929,8 @@ /area/station/hallway/secondary/entry) "aoa" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/saltshaker, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/saltshaker, +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -4; pixel_y = 2 }, @@ -3854,7 +3854,7 @@ /area/station/maintenance/fore) "att" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/drinks/drinkingglass, /turf/simulated/floor/wood{ icon_state = "wood-broken" }, @@ -6686,7 +6686,7 @@ /area/station/maintenance/fore) "aAk" = ( /obj/structure/rack, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/drinks/bottle/whiskey, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore) @@ -7950,9 +7950,9 @@ /obj/structure/table, /obj/item/seeds/poppy/lily, /obj/item/seeds/poppy/geranium, -/obj/item/reagent_containers/food/snacks/grown/wheat, +/obj/item/food/snacks/grown/wheat, /obj/item/grown/corncob, -/obj/item/reagent_containers/food/snacks/grown/apple, +/obj/item/food/snacks/grown/apple, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, /area/station/maintenance/abandoned_garden) @@ -7974,9 +7974,9 @@ /obj/structure/table, /obj/item/stack/packageWrap, /obj/item/hand_labeler, -/obj/item/reagent_containers/food/snacks/grown/tea, -/obj/item/reagent_containers/food/snacks/grown/grapes, -/obj/item/reagent_containers/food/snacks/grown/cherries, +/obj/item/food/snacks/grown/tea, +/obj/item/food/snacks/grown/grapes, +/obj/item/food/snacks/grown/cherries, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, /area/station/maintenance/abandoned_garden) @@ -9238,7 +9238,7 @@ }, /obj/structure/table/wood, /obj/item/book/manual/barman_recipes, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/drinks/shaker, /obj/item/reagent_containers/glass/rag, /obj/machinery/requests_console{ department = "Bar"; @@ -12648,6 +12648,10 @@ /obj/item/storage/fancy/crayons, /turf/simulated/floor/plasteel, /area/station/public/storage/art) +"aPT" = ( +/obj/effect/landmark/damageturf, +/turf/simulated/floor/plating/airless, +/area/space/nearstation) "aPU" = ( /obj/structure/table/wood, /obj/item/instrument/guitar, @@ -12691,11 +12695,11 @@ /area/station/service/bar) "aQc" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -7; pixel_y = 7 }, -/obj/item/reagent_containers/food/condiment/peppermill, +/obj/item/reagent_containers/condiment/peppermill, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -12704,7 +12708,7 @@ /area/station/service/bar) "aQd" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/drinks/cans/cola, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -13274,6 +13278,15 @@ icon_state = "bar" }, /area/station/service/bar) +"aRu" = ( +/obj/structure/closet/crate, +/obj/effect/spawner/lootdrop/maintenance/eight, +/obj/effect/landmark/damageturf, +/turf/simulated/floor/plasteel/airless{ + dir = 10; + icon_state = "darkblue" + }, +/area/space/nearstation) "aRv" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -13335,7 +13348,7 @@ /area/station/service/bar) "aRC" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/cheesiehonkers, +/obj/item/food/snacks/cheesiehonkers, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -15352,14 +15365,14 @@ /area/station/supply/miningdock) "aWg" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/chips, +/obj/item/food/snacks/chips, /turf/simulated/floor/plasteel{ icon_state = "bar" }, /area/station/service/bar) "aWh" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/cans/dr_gibb, +/obj/item/reagent_containers/drinks/cans/dr_gibb, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -15368,7 +15381,7 @@ /area/station/service/bar) "aWi" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/drinks/britcup, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -19918,7 +19931,7 @@ /area/station/service/kitchen) "bhN" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/condiment/flour, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -19951,7 +19964,7 @@ /area/station/hallway/primary/fore) "bhQ" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/snacks/dough, +/obj/item/food/snacks/dough, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ @@ -21391,8 +21404,8 @@ /area/station/service/kitchen) "blk" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/snacks/mint, -/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/food/snacks/mint, +/obj/item/reagent_containers/condiment/enzyme, /obj/machinery/reagentgrinder, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, @@ -22250,8 +22263,8 @@ /area/station/hallway/primary/fore) "bne" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/saltshaker, -/obj/item/reagent_containers/food/condiment/peppermill, +/obj/item/reagent_containers/condiment/saltshaker, +/obj/item/reagent_containers/condiment/peppermill, /obj/item/kitchen/knife, /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel, @@ -24873,6 +24886,10 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/station/hallway/primary/central) +"btJ" = ( +/obj/structure/grille, +/turf/simulated/floor/plating/airless, +/area/space/nearstation) "btL" = ( /turf/simulated/wall/r_wall, /area/station/command/vault) @@ -25756,10 +25773,10 @@ /obj/item/seeds/wheat, /obj/item/seeds/potato, /obj/item/seeds/pumpkin, -/obj/item/reagent_containers/food/snacks/grown/wheat, -/obj/item/reagent_containers/food/snacks/grown/watermelon, -/obj/item/reagent_containers/food/snacks/grown/grapes, -/obj/item/reagent_containers/food/snacks/grown/tomato, +/obj/item/food/snacks/grown/wheat, +/obj/item/food/snacks/grown/watermelon, +/obj/item/food/snacks/grown/grapes, +/obj/item/food/snacks/grown/tomato, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, /area/station/service/hydroponics) @@ -26971,7 +26988,7 @@ dir = 9 }, /obj/structure/displaycase{ - start_showpiece_type = /obj/item/reagent_containers/food/snacks/donut/sprinkles + start_showpiece_type = /obj/item/food/snacks/donut/sprinkles }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -30056,7 +30073,7 @@ /area/station/engineering/break_room) "bGD" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/cans/starkist, +/obj/item/reagent_containers/drinks/cans/starkist, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -33688,7 +33705,7 @@ "bPp" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, -/obj/item/reagent_containers/food/drinks/flask/detflask, +/obj/item/reagent_containers/drinks/flask/detflask, /turf/simulated/floor/carpet, /area/station/security/detective) "bPq" = ( @@ -38599,8 +38616,8 @@ /area/station/command/office/ntrep) "cca" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/drinks/bottle/whiskey, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass, /turf/simulated/floor/wood, /area/station/command/office/ntrep) "ccb" = ( @@ -39295,7 +39312,7 @@ /area/station/command/office/ntrep) "cdN" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass, /obj/item/storage/fancy/donut_box, /turf/simulated/floor/wood, /area/station/command/office/ntrep) @@ -39339,7 +39356,7 @@ /area/station/command/office/blueshield) "cdT" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/flask/gold, +/obj/item/reagent_containers/drinks/flask/gold, /obj/item/razor, /turf/simulated/floor/carpet/black, /area/station/command/office/captain/bedroom) @@ -40498,9 +40515,9 @@ /area/station/command/office/blueshield) "chs" = ( /obj/structure/closet/cabinet, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, -/obj/item/reagent_containers/food/drinks/drinkingglass, -/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/drinks/bottle/whiskey, +/obj/item/reagent_containers/drinks/drinkingglass, +/obj/item/reagent_containers/drinks/drinkingglass, /turf/simulated/floor/wood, /area/station/command/office/blueshield) "cht" = ( @@ -43003,7 +43020,6 @@ dir = 5 }, /obj/structure/table/glass, -/obj/item/reagent_containers/food/drinks/mug, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitebluecorner" @@ -47579,7 +47595,7 @@ /area/station/science/robotics/showroom) "czO" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/drinks/bottle/whiskey, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -52287,23 +52303,6 @@ icon_state = "whiteblue" }, /area/station/medical/paramedic) -"cOe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "darkblue" - }, -/area/station/medical/storage/secondary) "cOg" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -52329,7 +52328,7 @@ "cOp" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/bananalamp, -/obj/item/reagent_containers/food/snacks/pie, +/obj/item/food/snacks/pie, /obj/machinery/power/apc{ dir = 8; name = "west bump"; @@ -64367,11 +64366,6 @@ name = "east bump"; pixel_x = 28 }, -/obj/item/reagent_containers/food/drinks/drinkingglass, -/obj/item/reagent_containers/food/drinks/cans/cola{ - pixel_y = 7; - pixel_x = -7 - }, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -64861,7 +64855,7 @@ /obj/structure/table/reinforced, /obj/item/stack/packageWrap, /obj/item/hand_labeler, -/obj/item/reagent_containers/food/drinks/coffee, +/obj/item/reagent_containers/drinks/coffee, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -65065,7 +65059,7 @@ /obj/item/clothing/gloves/color/black, /obj/item/clothing/suit/storage/hazardvest, /obj/item/clothing/mask/breath, -/obj/item/reagent_containers/food/drinks/coffee, +/obj/item/reagent_containers/drinks/coffee, /obj/machinery/newscaster{ dir = 8; name = "east bump"; @@ -65587,7 +65581,7 @@ /obj/structure/table/reinforced, /obj/item/storage/toolbox/emergency, /obj/item/wrench, -/obj/item/reagent_containers/food/drinks/coffee, +/obj/item/reagent_containers/drinks/coffee, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/apmaint) "dTg" = ( @@ -65856,7 +65850,7 @@ /area/station/service/chapel/office) "dUf" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/holywater, +/obj/item/reagent_containers/drinks/bottle/holywater, /turf/simulated/floor/carpet, /area/station/service/chapel/office) "dUg" = ( @@ -66081,8 +66075,8 @@ /area/station/service/chapel/office) "dUK" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/grown/poppy/geranium, -/obj/item/reagent_containers/food/snacks/grown/poppy/lily{ +/obj/item/food/snacks/grown/poppy/geranium, +/obj/item/food/snacks/grown/poppy/lily{ pixel_x = 4; pixel_y = 5 }, @@ -68534,11 +68528,6 @@ /area/station/science/robotics/showroom) "eNp" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/mug/med, -/obj/item/reagent_containers/food/drinks/coffee{ - pixel_x = 8; - pixel_y = 10 - }, /obj/machinery/alarm{ name = "north bump"; pixel_y = 24 @@ -68590,7 +68579,6 @@ pixel_y = 1; pixel_x = 4 }, -/obj/item/reagent_containers/food/drinks/coffee, /obj/item/reagent_containers/glass/bottle/morphine{ pixel_y = 7; pixel_x = -5 @@ -69280,7 +69268,7 @@ "fmg" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/reagent_containers/food/drinks/cans/badminbrew, +/obj/item/reagent_containers/drinks/cans/badminbrew, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -74983,7 +74971,7 @@ /area/station/service/bar) "iUZ" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/peppermill, +/obj/item/reagent_containers/condiment/peppermill, /obj/machinery/door/firedoor, /obj/machinery/door/window, /obj/effect/mapping_helpers/airlock/windoor/autoname, @@ -77083,7 +77071,7 @@ /turf/simulated/floor/plasteel/white, /area/station/medical/medbay) "knI" = ( -/obj/item/reagent_containers/food/snacks/donut/jelly/cherryjelly, +/obj/item/food/snacks/donut/jelly/cherryjelly, /obj/structure/table/reinforced, /turf/simulated/floor/plasteel{ dir = 9; @@ -77774,7 +77762,7 @@ /area/station/science/toxins/mixing) "kME" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/mug/sci, +/obj/item/reagent_containers/drinks/mug/sci, /turf/simulated/floor/plasteel/white, /area/station/science/break_room) "kNa" = ( @@ -80636,10 +80624,6 @@ }, /turf/simulated/floor/engine/n2, /area/station/engineering/atmos) -"mIl" = ( -/obj/structure/grille, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) "mJw" = ( /obj/machinery/light{ dir = 8 @@ -81809,8 +81793,8 @@ /obj/machinery/door/window, /obj/effect/mapping_helpers/airlock/windoor/autoname, /obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen, -/obj/item/reagent_containers/food/drinks/britcup, -/obj/item/reagent_containers/food/condiment/saltshaker, +/obj/item/reagent_containers/drinks/britcup, +/obj/item/reagent_containers/condiment/saltshaker, /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel{ @@ -81983,6 +81967,16 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) +"nqK" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + icon_state = "whitebluefull" + }, +/area/station/medical/storage) "nsl" = ( /obj/machinery/clonepod/biomass, /turf/simulated/floor/plasteel{ @@ -82892,7 +82886,7 @@ known_by = list("captain") }, /obj/item/gun/projectile/revolver/russian, -/obj/item/reagent_containers/food/drinks/bottle/absinthe/premium, +/obj/item/reagent_containers/drinks/bottle/absinthe/premium, /obj/item/lighter/zippo/nt_rep, /obj/item/storage/fancy/cigarettes/cigpack_robustgold, /obj/item/toy/figure/crew/captain, @@ -86239,7 +86233,7 @@ }, /obj/item/clothing/head/bearpelt, /obj/item/folder/documents, -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, +/obj/item/reagent_containers/drinks/bottle/vodka/badminka, /obj/item/lighter/zippo/nt_rep, /obj/item/storage/fancy/cigarettes/cigpack_robustgold, /obj/item/stack/spacecash/c1000, @@ -89241,7 +89235,7 @@ /obj/structure/table/reinforced, /obj/item/folder, /obj/item/pen, -/obj/item/reagent_containers/food/snacks/grown/apple, +/obj/item/food/snacks/grown/apple, /obj/machinery/door/window/classic/normal{ dir = 8 }, @@ -92168,6 +92162,10 @@ }, /turf/simulated/floor/plasteel/white, /area/station/medical/sleeper) +"tCf" = ( +/obj/effect/spawner/window/reinforced/grilled, +/turf/simulated/floor/plating, +/area/station/medical/virology) "tDw" = ( /turf/simulated/wall, /area/station/medical/reception) @@ -92455,6 +92453,7 @@ /area/station/medical/medbay) "tKX" = ( /obj/effect/spawner/window/reinforced/grilled, +/obj/structure/cable, /turf/simulated/floor/plating, /area/station/medical/virology) "tLO" = ( @@ -92701,11 +92700,11 @@ /area/station/hallway/secondary/exit) "tSt" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = -5; pixel_y = 2 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = 5 }, /turf/simulated/floor/plasteel/white, @@ -93028,7 +93027,7 @@ "uaL" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/reagent_containers/food/drinks/bottle/vodka, +/obj/item/reagent_containers/drinks/bottle/vodka, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -94402,11 +94401,6 @@ /area/station/maintenance/fore2) "uTD" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/food/drinks/coffee{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/reagent_containers/food/drinks/dry_ramen, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitebluecorner" @@ -94534,6 +94528,23 @@ /obj/item/target/syndicate, /turf/simulated/floor/plating, /area/station/security/range) +"uWm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkblue" + }, +/area/station/medical/storage/secondary) "uWt" = ( /obj/machinery/light{ dir = 8 @@ -95040,9 +95051,9 @@ /obj/item/seeds/lime, /obj/item/seeds/watermelon, /obj/item/seeds/grape, -/obj/item/reagent_containers/food/snacks/grown/wheat, -/obj/item/reagent_containers/food/snacks/grown/watermelon, -/obj/item/reagent_containers/food/snacks/grown/banana, +/obj/item/food/snacks/grown/wheat, +/obj/item/food/snacks/grown/watermelon, +/obj/item/food/snacks/grown/banana, /obj/machinery/door/window/classic/reversed{ dir = 8 }, @@ -95163,11 +95174,6 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/supply/miningdock) -"vuL" = ( -/obj/effect/spawner/window/reinforced/grilled, -/obj/structure/cable, -/turf/simulated/floor/plating, -/area/station/medical/virology) "vuX" = ( /obj/machinery/alarm{ dir = 4; @@ -96453,16 +96459,6 @@ icon_state = "whitebluecorner" }, /area/station/medical/storage) -"wjh" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel{ - icon_state = "whitebluefull" - }, -/area/station/medical/storage) "wjm" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ @@ -97926,10 +97922,6 @@ /obj/effect/decal/cleanable/fungus, /turf/simulated/wall, /area/station/maintenance/aft) -"xcn" = ( -/obj/effect/landmark/damageturf, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) "xcs" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ @@ -98902,15 +98894,6 @@ icon_state = "neutral" }, /area/station/maintenance/fsmaint) -"xGL" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/eight, -/obj/effect/landmark/damageturf, -/turf/simulated/floor/plasteel/airless{ - dir = 10; - icon_state = "darkblue" - }, -/area/space/nearstation) "xGY" = ( /obj/structure/cable{ d1 = 1; @@ -132768,7 +132751,7 @@ azd aAp awX abj -xGL +aRu ghZ aFq aVK @@ -133024,7 +133007,7 @@ aCo azd aAq awX -xcn +aPT abj aVK aGp @@ -145952,7 +145935,7 @@ lGs rYe jin lky -cOe +uWm usf dmt hLd @@ -146465,7 +146448,7 @@ cUM bSe cMz eCn -wjh +nqK kQG ewa htc @@ -148303,9 +148286,9 @@ cBf wdL dGw dGw -tKX -tKX -tKX +tCf +tCf +tCf dGw dGw hGZ @@ -150618,7 +150601,7 @@ dFG dFG vOB kce -vuL +tKX dFG dFG abj @@ -151534,7 +151517,7 @@ abj aaa abj abj -mIl +btJ aaa ygH tFK @@ -151791,7 +151774,7 @@ aaa aaa aaa aaa -mIl +btJ abj ygH aJx @@ -152048,7 +152031,7 @@ aaa aaa aaa aaa -mIl +btJ aaa ygH uUu @@ -154926,7 +154909,7 @@ nlB aaa abj abj -mIl +btJ abj abj iuY @@ -155440,7 +155423,7 @@ aaa aaa aaa abj -mIl +btJ abj abj iuY @@ -155955,7 +155938,7 @@ aaa aaa abj abj -mIl +btJ abj iuY rEQ @@ -157988,10 +157971,10 @@ aaa aaa abj abj -mIl -mIl -mIl -mIl +btJ +btJ +btJ +btJ abj abj fhF @@ -158250,7 +158233,7 @@ aaa abj abj aaa -mIl +btJ fhF fhF fhF @@ -158260,7 +158243,7 @@ fhF fhF abj abj -mIl +btJ aaa aaa aaa @@ -158504,10 +158487,10 @@ aaa abj abj abj -mIl -mIl -mIl -mIl +btJ +btJ +btJ +btJ fhF fhF fhF @@ -158517,7 +158500,7 @@ fhF fhF abj aaa -mIl +btJ aaa aaa aaa @@ -158774,7 +158757,7 @@ fhF fhF abj aaa -mIl +btJ aaa aaa aaa @@ -159021,7 +159004,7 @@ aaa aaa aaa aaa -mIl +btJ fhF fhF fhF @@ -159029,9 +159012,9 @@ fhF fhF fhF fhF -mIl +btJ abj -mIl +btJ aaa aaa aaa @@ -159272,13 +159255,13 @@ aaa aaa aaa aaa -mIl +btJ aaa aaa aaa aaa aaa -mIl +btJ fhF fhF fhF @@ -159286,7 +159269,7 @@ fhF fhF fhF fhF -mIl +btJ abj abj aaa @@ -159529,20 +159512,20 @@ aaa aaa aaa aaa -mIl +btJ aaa aaa aaa aaa aaa bPS -mIl -mIl +btJ +btJ abj bPS abj -mIl -mIl +btJ +btJ bPS aaa aaa @@ -159786,7 +159769,7 @@ aaa aaa aaa aaa -mIl +btJ aaa aaa aaa @@ -160051,11 +160034,11 @@ aaa aaa aaa aaa -mIl -mIl -mIl -mIl -mIl +btJ +btJ +btJ +btJ +btJ aaa aaa aaa diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 2a2ad0b01e0b..923970aa2549 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -237,7 +237,7 @@ /area/station/science/toxins/mixing) "adc" = ( /obj/structure/closet/secure_closet/clown, -/obj/item/reagent_containers/food/snacks/pie, +/obj/item/food/snacks/pie, /turf/simulated/floor/wood, /area/station/service/clown) "adi" = ( @@ -540,7 +540,7 @@ /area/shuttle/pod_3) "afT" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ pixel_x = 5; pixel_y = 12 }, @@ -667,7 +667,7 @@ name = "south bump"; pixel_y = -24 }, -/obj/item/reagent_containers/food/drinks/flask/detflask, +/obj/item/reagent_containers/drinks/flask/detflask, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -754,20 +754,20 @@ /area/station/public/fitness) "aii" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/sillycup{ +/obj/item/reagent_containers/drinks/sillycup{ pixel_x = -5; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/sillycup, -/obj/item/reagent_containers/food/drinks/sillycup{ +/obj/item/reagent_containers/drinks/sillycup, +/obj/item/reagent_containers/drinks/sillycup{ pixel_x = 5; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/sillycup{ +/obj/item/reagent_containers/drinks/sillycup{ pixel_x = 5; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/sillycup{ +/obj/item/reagent_containers/drinks/sillycup{ pixel_x = 5; pixel_y = 3 }, @@ -4201,7 +4201,7 @@ /area/station/maintenance/fore) "axH" = ( /obj/structure/flora/ausbushes/lavendergrass, -/obj/item/reagent_containers/food/snacks/grown/banana, +/obj/item/food/snacks/grown/banana, /turf/simulated/floor/grass/no_creep, /area/station/medical/virology) "axM" = ( @@ -9968,12 +9968,10 @@ /area/station/security/prisonlockers) "aRy" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/mint, /obj/item/kitchen/rollingpin, /obj/item/reagent_containers/glass/beaker{ pixel_x = 5 }, -/obj/item/reagent_containers/food/condiment/enzyme, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -10062,7 +10060,7 @@ /obj/item/reagent_containers/glass/beaker/waterbottle{ pixel_x = -5 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = 5 }, /obj/structure/window/reinforced{ @@ -10725,7 +10723,7 @@ /area/station/maintenance/fpmaint) "aUa" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = 5 }, /obj/item/reagent_containers/glass/beaker/waterbottle{ @@ -13900,24 +13898,24 @@ /area/station/hallway/primary/central) "bcO" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = -4; pixel_y = 6 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = 4; pixel_y = 5 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = -5; pixel_y = 2 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = 6; pixel_y = -1 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass, /obj/machinery/newscaster{ name = "north bump"; pixel_y = 28 @@ -18147,7 +18145,7 @@ pixel_y = -24 }, /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/flask/gold, +/obj/item/reagent_containers/drinks/flask/gold, /obj/item/razor{ pixel_x = -4; pixel_y = 2 @@ -18315,7 +18313,7 @@ }, /obj/item/clothing/head/bearpelt, /obj/item/folder/documents, -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, +/obj/item/reagent_containers/drinks/bottle/vodka/badminka, /obj/item/lighter/zippo/nt_rep, /obj/item/storage/fancy/cigarettes/cigpack_robustgold, /obj/item/stack/spacecash/c1000, @@ -20415,7 +20413,7 @@ /area/station/hallway/primary/port) "btq" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/chips, +/obj/item/food/snacks/chips, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -22481,7 +22479,7 @@ known_by = list("captain") }, /obj/item/gun/projectile/revolver/russian, -/obj/item/reagent_containers/food/drinks/bottle/absinthe/premium, +/obj/item/reagent_containers/drinks/bottle/absinthe/premium, /obj/item/lighter/zippo/nt_rep, /obj/item/storage/fancy/cigarettes/cigpack_robustgold, /obj/item/toy/figure/crew/captain, @@ -23299,14 +23297,6 @@ icon_state = "darkbluecorners" }, /area/station/turret_protected/aisat/interior) -"bAB" = ( -/obj/structure/table/wood, -/obj/machinery/bottler, -/obj/structure/sign/poster/random{ - pixel_y = -32 - }, -/turf/simulated/floor/wood, -/area/station/service/bar) "bAC" = ( /turf/simulated/floor/plating/airless, /area/station/engineering/solar/auxport) @@ -23503,10 +23493,6 @@ /area/station/turret_protected/aisat/interior) "bBk" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/food/snacks/grown/wheat, -/obj/item/reagent_containers/food/snacks/grown/watermelon, -/obj/item/reagent_containers/food/snacks/grown/citrus/orange, -/obj/item/reagent_containers/food/snacks/grown/grapes, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "green" @@ -24632,7 +24618,7 @@ /area/station/command/office/captain) "bEl" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/drinks/shaker, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -25396,9 +25382,6 @@ pixel_y = -1 }, /obj/structure/table, -/obj/item/reagent_containers/food/drinks/shaker{ - pixel_x = -6 - }, /obj/machinery/reagentgrinder{ pixel_x = 6; pixel_y = 6 @@ -27654,7 +27637,7 @@ /area/station/command/teleporter) "bPB" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/cans/ale, +/obj/item/reagent_containers/drinks/cans/ale, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "bPE" = ( @@ -27692,9 +27675,9 @@ /area/station/public/vacant_office) "bPS" = ( /obj/structure/closet/secure_closet/blueshield, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, -/obj/item/reagent_containers/food/drinks/drinkingglass, -/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/drinks/bottle/whiskey, +/obj/item/reagent_containers/drinks/drinkingglass, +/obj/item/reagent_containers/drinks/drinkingglass, /turf/simulated/floor/wood, /area/station/command/office/blueshield) "bPT" = ( @@ -28885,7 +28868,7 @@ pixel_x = 5; pixel_y = -1 }, -/obj/item/reagent_containers/food/drinks/mug{ +/obj/item/reagent_containers/drinks/mug{ pixel_x = -4; pixel_y = 4 }, @@ -28997,13 +28980,6 @@ "bTY" = ( /turf/simulated/floor/plating, /area/station/maintenance/port) -"bTZ" = ( -/obj/structure/table, -/obj/item/storage/bag/tray, -/turf/simulated/floor/plasteel{ - icon_state = "cafeteria" - }, -/area/station/service/kitchen) "bUi" = ( /obj/machinery/gibber, /turf/simulated/floor/plasteel{ @@ -29020,8 +28996,6 @@ /area/station/service/hydroponics) "bUl" = ( /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/food/condiment/enzyme, -/obj/item/reagent_containers/food/condiment/enzyme, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -29927,10 +29901,6 @@ "bXb" = ( /obj/machinery/plantgenes, /obj/effect/turf_decal/stripes/line, -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, /turf/simulated/floor/plasteel, /area/station/service/hydroponics) "bXi" = ( @@ -31755,6 +31725,14 @@ }, /turf/simulated/floor/plasteel, /area/station/science/robotics) +"cdj" = ( +/obj/structure/table/wood, +/obj/machinery/bottler, +/obj/structure/sign/poster/random{ + pixel_y = -32 + }, +/turf/simulated/floor/wood, +/area/station/service/bar) "cdk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -31879,7 +31857,7 @@ /area/station/maintenance/apmaint) "cdJ" = ( /obj/structure/lattice, -/obj/item/reagent_containers/food/drinks/bottle/goldschlager, +/obj/item/reagent_containers/drinks/bottle/goldschlager, /turf/space, /area/space/nearstation) "cdM" = ( @@ -32225,7 +32203,7 @@ "ceW" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/gin, +/obj/item/reagent_containers/drinks/bottle/gin, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "ceY" = ( @@ -34096,7 +34074,6 @@ }, /area/station/service/chapel/office) "cln" = ( -/obj/item/reagent_containers/food/snacks/monkeycube, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plasteel, /area/station/maintenance/asmaint) @@ -34116,6 +34093,12 @@ icon_state = "white" }, /area/station/science/rnd) +"clv" = ( +/obj/item/food/snacks/monkeycube, +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance, +/turf/simulated/floor/plating, +/area/station/maintenance/aft2) "cly" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/visible{ @@ -35218,7 +35201,7 @@ }, /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/ywflowers, -/obj/item/reagent_containers/food/snacks/grown/banana, +/obj/item/food/snacks/grown/banana, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -35945,7 +35928,6 @@ /area/station/maintenance/starboard2) "csW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/item/reagent_containers/food/snacks/monkeycube, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "csX" = ( @@ -38488,11 +38470,11 @@ dir = 1 }, /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/grown/poppy, -/obj/item/reagent_containers/food/snacks/grown/poppy, -/obj/item/reagent_containers/food/snacks/grown/poppy, -/obj/item/reagent_containers/food/snacks/grown/poppy, -/obj/item/reagent_containers/food/snacks/grown/poppy, +/obj/item/food/snacks/grown/poppy, +/obj/item/food/snacks/grown/poppy, +/obj/item/food/snacks/grown/poppy, +/obj/item/food/snacks/grown/poppy, +/obj/item/food/snacks/grown/poppy, /turf/simulated/floor/carpet, /area/station/service/chapel) "cCu" = ( @@ -39011,7 +38993,7 @@ pixel_y = 2 }, /obj/item/reagent_containers/dropper, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/drinks/shaker, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "cEk" = ( @@ -39698,7 +39680,7 @@ dir = 4 }, /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/grown/harebell, +/obj/item/food/snacks/grown/harebell, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" }, @@ -40045,10 +40027,10 @@ /area/station/science/research) "cHO" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3 }, /turf/simulated/floor/plating, @@ -40513,7 +40495,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/item/reagent_containers/food/snacks/grown/harebell, +/obj/item/food/snacks/grown/harebell, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -40885,7 +40867,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/rack, /obj/item/reagent_containers/iv_bag/blood/random, -/obj/item/reagent_containers/food/drinks/bottle/vodka, +/obj/item/reagent_containers/drinks/bottle/vodka, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -41355,7 +41337,7 @@ /area/station/maintenance/portsolar) "cMF" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/holywater{ +/obj/item/reagent_containers/drinks/bottle/holywater{ pixel_x = -2; pixel_y = 2 }, @@ -41382,8 +41364,8 @@ /area/station/medical/break_room) "cMK" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/enzyme{ layer = 5 }, /turf/simulated/floor/plating, @@ -41400,7 +41382,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/item/reagent_containers/food/drinks/bottle/tequila, +/obj/item/reagent_containers/drinks/bottle/tequila, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "cMP" = ( @@ -42992,11 +42974,11 @@ /area/station/maintenance/apmaint) "cSR" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/grown/poppy, -/obj/item/reagent_containers/food/snacks/grown/poppy, -/obj/item/reagent_containers/food/snacks/grown/poppy, -/obj/item/reagent_containers/food/snacks/grown/poppy, -/obj/item/reagent_containers/food/snacks/grown/poppy, +/obj/item/food/snacks/grown/poppy, +/obj/item/food/snacks/grown/poppy, +/obj/item/food/snacks/grown/poppy, +/obj/item/food/snacks/grown/poppy, +/obj/item/food/snacks/grown/poppy, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" }, @@ -43162,7 +43144,7 @@ /area/station/security/interrogation) "cTz" = ( /obj/structure/lattice/catwalk, -/obj/item/reagent_containers/food/drinks/bottle/rum{ +/obj/item/reagent_containers/drinks/bottle/rum{ pixel_x = -7; pixel_y = 2 }, @@ -47371,6 +47353,18 @@ icon_state = "red" }, /area/station/security/permabrig) +"dQI" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel, +/area/station/science/research) "dRt" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, @@ -50221,7 +50215,6 @@ /turf/simulated/floor/plating, /area/station/security/brig) "fbQ" = ( -/obj/item/reagent_containers/food/snacks/monkeycube, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -51482,7 +51475,7 @@ /area/station/engineering/control) "fCn" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = -5 }, /obj/item/reagent_containers/glass/beaker/waterbottle{ @@ -55711,20 +55704,20 @@ /area/station/maintenance/starboard2) "htP" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/milk{ +/obj/item/reagent_containers/condiment/milk{ pixel_x = 6; pixel_y = 8 }, -/obj/item/reagent_containers/food/condiment/soymilk{ +/obj/item/reagent_containers/condiment/soymilk{ pixel_x = -6; pixel_y = 8 }, -/obj/item/reagent_containers/food/condiment/sugar, -/obj/item/reagent_containers/food/drinks/bottle/cream{ +/obj/item/reagent_containers/condiment/sugar, +/obj/item/reagent_containers/drinks/bottle/cream{ pixel_x = 6; pixel_y = -2 }, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ pixel_x = -5; pixel_y = -2 }, @@ -55892,6 +55885,10 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/telecomms/chamber) +"hxz" = ( +/obj/structure/grille/broken, +/turf/simulated/floor/plating/airless, +/area/space/nearstation) "hxD" = ( /obj/structure/window/reinforced{ dir = 1 @@ -56604,11 +56601,11 @@ /area/station/turret_protected/ai) "hLT" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/grown/harebell, -/obj/item/reagent_containers/food/snacks/grown/harebell, -/obj/item/reagent_containers/food/snacks/grown/harebell, -/obj/item/reagent_containers/food/snacks/grown/harebell, -/obj/item/reagent_containers/food/snacks/grown/harebell, +/obj/item/food/snacks/grown/harebell, +/obj/item/food/snacks/grown/harebell, +/obj/item/food/snacks/grown/harebell, +/obj/item/food/snacks/grown/harebell, +/obj/item/food/snacks/grown/harebell, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" }, @@ -58734,9 +58731,13 @@ icon_state = "whitehall" }, /area/station/science/research) +"iFx" = ( +/obj/machinery/light, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/station/maintenance/starboard2) "iFA" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/h_chocolate, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -63589,11 +63590,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/aft2) -"kQv" = ( -/obj/structure/grille/broken, -/obj/item/reagent_containers/food/snacks/grown/poppy, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) "kQx" = ( /obj/item/kirbyplants/plant11, /turf/simulated/floor/wood, @@ -64909,15 +64905,15 @@ "lpp" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced, -/obj/item/reagent_containers/food/snacks/muffin{ +/obj/item/food/snacks/muffin{ pixel_x = -4; pixel_y = 8 }, -/obj/item/reagent_containers/food/snacks/carrotcakeslice{ +/obj/item/food/snacks/carrotcakeslice{ pixel_x = 8; pixel_y = -2 }, -/obj/item/reagent_containers/food/snacks/poppypretzel{ +/obj/item/food/snacks/poppypretzel{ pixel_x = -8; pixel_y = -3 }, @@ -64999,11 +64995,11 @@ /area/station/command/office/captain) "lrA" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8; pixel_y = 1 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -8; pixel_y = 11 }, @@ -67360,6 +67356,22 @@ icon_state = "caution" }, /area/station/engineering/controlroom) +"mor" = ( +/obj/structure/table/reinforced, +/obj/item/food/snacks/pie, +/obj/machinery/door/window/classic/normal{ + name = "Kitchen" + }, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 2; + id_tag = "kitchen_counter"; + name = "Kitchen Counter Shutters" + }, +/obj/effect/mapping_helpers/airlock/windoor/access/all/service/kitchen, +/turf/simulated/wall, +/area/station/service/kitchen) "moE" = ( /obj/structure/chair/comfy/beige{ dir = 8 @@ -67957,6 +67969,30 @@ }, /turf/simulated/floor/plating, /area/station/command/office/rd) +"mEd" = ( +/obj/structure/disposalpipe/sortjunction{ + dir = 4; + name = "Kitchen Junction"; + sort_type_txt = "20" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/wood, +/area/station/service/bar) "mEe" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -68849,11 +68885,11 @@ /area/shuttle/arrival/station) "mXE" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ pixel_x = 5; pixel_y = 12 }, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ pixel_x = -3; pixel_y = 9 }, @@ -69298,7 +69334,7 @@ /area/station/public/construction) "nfj" = ( /obj/structure/closet, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ desc = "Takes you to a whole new level of thinking."; name = "Meta-Cider" }, @@ -69918,12 +69954,6 @@ /area/station/engineering/control) "nsB" = ( /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/structure/disposalpipe/segment{ dir = 4 }, @@ -72000,12 +72030,6 @@ /area/station/public/locker) "orV" = ( /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/machinery/door/window/classic/reversed{ name = "Kitchen" }, @@ -73343,6 +73367,21 @@ /obj/effect/spawner/random_spawners/fungus_maybe, /turf/simulated/wall, /area/station/maintenance/starboard) +"oXP" = ( +/obj/machinery/reagentgrinder{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/machinery/camera{ + c_tag = "Bar - Counter"; + dir = 1 + }, +/obj/structure/table, +/obj/item/storage/bag/tray, +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/station/service/kitchen) "oXS" = ( /obj/structure/chair/office/light{ dir = 4 @@ -73388,10 +73427,6 @@ /obj/effect/turf_decal/woodsiding{ dir = 8 }, -/obj/structure/extinguisher_cabinet{ - name = "south bump"; - pixel_y = -30 - }, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -74172,9 +74207,6 @@ /area/station/aisat) "prI" = ( /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" @@ -75866,7 +75898,6 @@ }, /area/station/turret_protected/ai_upload) "qaW" = ( -/obj/item/reagent_containers/food/snacks/monkeycube, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -76859,21 +76890,21 @@ "qvp" = ( /obj/structure/closet/crate, /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/food/snacks/breadslice, -/obj/item/reagent_containers/food/snacks/breadslice, -/obj/item/reagent_containers/food/snacks/breadslice, -/obj/item/reagent_containers/food/snacks/grown/potato, -/obj/item/reagent_containers/food/snacks/grown/potato, -/obj/item/reagent_containers/food/snacks/grown/onion, -/obj/item/reagent_containers/food/snacks/grown/onion, +/obj/item/food/snacks/breadslice, +/obj/item/food/snacks/breadslice, +/obj/item/food/snacks/breadslice, +/obj/item/food/snacks/grown/potato, +/obj/item/food/snacks/grown/potato, +/obj/item/food/snacks/grown/onion, +/obj/item/food/snacks/grown/onion, /obj/item/storage/box/donkpockets, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 1 }, /obj/item/storage/fancy/egg_box, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/rice, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/rice, /obj/machinery/light{ dir = 1 }, @@ -79112,7 +79143,7 @@ /area/station/engineering/engine/supermatter) "rwj" = ( /obj/structure/safe/floor, -/obj/item/reagent_containers/food/snacks/fortunecookie, +/obj/item/food/snacks/fortunecookie, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "rwk" = ( @@ -80366,6 +80397,27 @@ icon_state = "cafeteria" }, /area/station/science/break_room) +"rXW" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -3 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 3 + }, +/obj/machinery/door/window/classic/reversed{ + name = "Kitchen" + }, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 2; + id_tag = "kitchen_counter"; + name = "Kitchen Counter Shutters" + }, +/obj/effect/mapping_helpers/airlock/windoor/access/all/service/kitchen, +/turf/simulated/wall, +/area/station/service/kitchen) "rYd" = ( /obj/machinery/chem_dispenser, /turf/simulated/floor/plasteel{ @@ -80545,18 +80597,6 @@ /obj/effect/spawner/random_spawners/fungus_maybe, /turf/simulated/wall/r_wall, /area/station/public/mrchangs) -"sdj" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel, -/area/station/science/research) "sdJ" = ( /obj/machinery/door/airlock/freezer, /obj/effect/mapping_helpers/airlock/access/all/service/kitchen, @@ -82376,12 +82416,6 @@ /area/station/maintenance/engimaint) "sTF" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/condiment/peppermill{ - pixel_x = 3 - }, -/obj/item/reagent_containers/food/condiment/saltshaker{ - pixel_x = -3 - }, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/wood, /area/station/service/bar) @@ -82465,6 +82499,12 @@ icon_state = "dark" }, /area/station/medical/morgue) +"sWd" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/wall, +/area/station/service/kitchen) "sWL" = ( /obj/machinery/atmospherics/unary/portables_connector{ dir = 1 @@ -84548,14 +84588,6 @@ icon_state = "whitepurple" }, /area/station/science/robotics) -"tXA" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, -/turf/simulated/floor/wood, -/area/station/service/bar) "tYb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -84609,12 +84641,12 @@ /area/station/security/permabrig) "tYV" = ( /obj/structure/rack, -/obj/item/reagent_containers/food/drinks/bottle/rum{ +/obj/item/reagent_containers/drinks/bottle/rum{ pixel_x = -7; pixel_y = 2 }, -/obj/item/reagent_containers/food/drinks/bottle/vodka, -/obj/item/reagent_containers/food/drinks/cans/beer, +/obj/item/reagent_containers/drinks/bottle/vodka, +/obj/item/reagent_containers/drinks/cans/beer, /obj/machinery/economy/vending/wallmed{ name = "Emergency NanoMed"; pixel_y = 28 @@ -87688,30 +87720,6 @@ icon_state = "grimy" }, /area/station/security/detective) -"voT" = ( -/obj/structure/sink{ - pixel_y = 22 - }, -/turf/simulated/floor/plating, -/area/station/maintenance/starboard2) -"voV" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/food/snacks/pie, -/obj/machinery/door/window/classic/normal{ - name = "Kitchen" - }, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 2; - id_tag = "kitchen_counter"; - name = "Kitchen Counter Shutters" - }, -/obj/effect/mapping_helpers/airlock/windoor/access/all/service/kitchen, -/turf/simulated/floor/plasteel{ - icon_state = "cafeteria" - }, -/area/station/service/kitchen) "vpj" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 4; @@ -88081,10 +88089,10 @@ /area/station/engineering/atmos) "vwA" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/food/snacks/chips{ +/obj/item/food/snacks/chips{ pixel_x = 8 }, -/obj/item/reagent_containers/food/drinks/cans/thirteenloko{ +/obj/item/reagent_containers/drinks/cans/thirteenloko{ pixel_x = -6; pixel_y = 6 }, @@ -88738,11 +88746,34 @@ icon_state = "dark" }, /area/station/engineering/atmos) +"vQf" = ( +/obj/structure/table, +/obj/item/reagent_containers/drinks/drinkingglass{ + pixel_x = 4; + pixel_y = 5 + }, +/obj/item/reagent_containers/drinks/drinkingglass{ + pixel_x = 6; + pixel_y = -1 + }, +/obj/item/reagent_containers/drinks/drinkingglass{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/syringe, +/obj/machinery/economy/vending/wallmed{ + name = "Emergency NanoMed"; + pixel_y = 28 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/starboard2) "vQo" = ( /obj/item/stack/sheet/cardboard{ amount = 2 }, -/obj/item/reagent_containers/food/snacks/monkeycube, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/blood/drip, /turf/simulated/floor/plasteel, @@ -88813,15 +88844,15 @@ "vSE" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced, -/obj/item/reagent_containers/food/drinks/tea{ +/obj/item/reagent_containers/drinks/tea{ pixel_x = 7; pixel_y = 1 }, -/obj/item/reagent_containers/food/drinks/tea{ +/obj/item/reagent_containers/drinks/tea{ pixel_x = -5; pixel_y = 9 }, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ pixel_x = -5 }, /turf/simulated/floor/plasteel/dark, @@ -89729,7 +89760,7 @@ /area/station/security/prisonlockers) "wnD" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/drinks/drinkingglass, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -91703,6 +91734,21 @@ icon_state = "darkred" }, /area/station/security/execution) +"xhN" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/classic/reversed{ + name = "Kitchen" + }, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 2; + id_tag = "kitchen_counter"; + name = "Kitchen Counter Shutters" + }, +/obj/effect/mapping_helpers/airlock/windoor/access/all/service/kitchen, +/turf/simulated/wall, +/area/station/service/kitchen) "xhX" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green{ @@ -92760,29 +92806,6 @@ icon_state = "neutral" }, /area/station/hallway/primary/central) -"xFW" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/peppermill{ - pixel_x = 3 - }, -/obj/item/reagent_containers/food/condiment/saltshaker{ - pixel_x = -3 - }, -/obj/machinery/door/window/classic/reversed{ - name = "Kitchen" - }, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 2; - id_tag = "kitchen_counter"; - name = "Kitchen Counter Shutters" - }, -/obj/effect/mapping_helpers/airlock/windoor/access/all/service/kitchen, -/turf/simulated/floor/plasteel{ - icon_state = "cafeteria" - }, -/area/station/service/kitchen) "xGg" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/disposalpipe/segment{ @@ -92876,11 +92899,11 @@ /area/station/engineering/atmos) "xIx" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8; pixel_y = 1 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -8; pixel_y = 11 }, @@ -92958,30 +92981,6 @@ icon_state = "neutralcorner" }, /area/station/supply/lobby) -"xLw" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 4; - name = "Kitchen Junction"; - sort_type_txt = "20" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/wood, -/area/station/service/bar) "xLA" = ( /obj/machinery/hydroponics/constructable, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -117858,7 +117857,7 @@ aaa aaa aaa aaa -kQv +hxz uNk uNk uNk @@ -122350,7 +122349,7 @@ tmz qKY lYB avs -cUL +clv lCO coG ech @@ -127700,9 +127699,9 @@ bEv sTF mBe bHO -voV +jQx nic -bTZ +oXP dnI bVs nic @@ -127957,7 +127956,7 @@ bEv omK udl bHO -xFW +orV nic bQJ aRy @@ -128726,7 +128725,7 @@ byM bEA bvz bEv -xLw +mEd uhV lBQ fjy @@ -129498,8 +129497,8 @@ sqp sqp sqp fsh -tXA -bQI +bEv +rXW soT tRb fnS @@ -129756,10 +129755,10 @@ rDd rDd sAP pah -bQI +mor bQI sdJ -bQI +sWd bQI bQI fWa @@ -130013,7 +130012,7 @@ uft bHP tZl ncl -bQI +xhN sgk qlh bQQ @@ -130543,7 +130542,7 @@ caS bZv bZv clC -ipj +iFx cte lXi xmO @@ -131333,7 +131332,7 @@ cQg rOD cDa mra -sdj +dQI vCB lHQ eIa @@ -131549,7 +131548,7 @@ bsp buI bwO pjb -bAB +cdj aoG aoG aoG @@ -132605,7 +132604,7 @@ cYB gSO csV cte -voT +vQf cqi fNl ool diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm index 1295070c312c..3433ee2ffdd7 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm @@ -979,7 +979,7 @@ /turf/simulated/floor/mineral/bananium/lubed, /area/ruin/powered/clownplanet) "bL" = ( -/obj/item/reagent_containers/food/drinks/trophy/gold_cup, +/obj/item/reagent_containers/drinks/trophy/gold_cup, /obj/structure/table/glass, /turf/simulated/floor/carpet, /area/ruin/powered/clownplanet) diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm index f1b2e315b9ee..3ee31c383d40 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm @@ -36,7 +36,7 @@ /turf/simulated/floor/plating, /area/ruin/powered/snow_biodome) "ah" = ( -/obj/item/reagent_containers/food/drinks/mug, +/obj/item/reagent_containers/drinks/mug, /turf/simulated/floor/plating, /area/ruin/powered/snow_biodome) "ai" = ( @@ -102,7 +102,7 @@ /area/ruin/powered/snow_cabin) "ax" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/beans, +/obj/item/food/snacks/beans, /turf/simulated/floor/wood, /area/ruin/powered/snow_cabin) "ay" = ( @@ -141,7 +141,7 @@ /area/ruin/powered/snow_cabin) "aF" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/h_chocolate, +/obj/item/reagent_containers/drinks/h_chocolate, /turf/simulated/floor/wood, /area/ruin/powered/snow_cabin) "aG" = ( diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm index 0104330f6cee..df6cb8ff2e84 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm @@ -673,7 +673,7 @@ /area/lavaland/surface/outdoors) "ie" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/badrecipe, +/obj/item/food/snacks/badrecipe, /turf/simulated/floor/plating/airless, /area/ruin/unpowered/althland_excavation) "iv" = ( @@ -959,7 +959,7 @@ "wi" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/food/drinks/oilcan, +/obj/item/reagent_containers/drinks/oilcan, /obj/machinery/constructable_frame, /turf/simulated/floor/pod/light{ oxygen = 0; @@ -1101,8 +1101,8 @@ "Cs" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table_frame, -/obj/item/reagent_containers/food/snacks/badrecipe, -/obj/item/reagent_containers/food/snacks/badrecipe{ +/obj/item/food/snacks/badrecipe, +/obj/item/food/snacks/badrecipe{ pixel_y = 14; pixel_x = 14 }, @@ -1324,7 +1324,7 @@ /area/lavaland/surface/outdoors) "OX" = ( /obj/structure/table_frame, -/obj/item/reagent_containers/food/snacks/badrecipe, +/obj/item/food/snacks/badrecipe, /turf/simulated/floor/plating/airless, /area/ruin/unpowered/althland_excavation) "Pe" = ( diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_facility.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_facility.dmm index bb91ea362faa..671f1773b33f 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_facility.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_facility.dmm @@ -1435,11 +1435,11 @@ /area/ruin/unpowered/althland_processing) "Jw" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = 8; pixel_y = 10 }, -/obj/item/reagent_containers/food/drinks/cans/beer, +/obj/item/reagent_containers/drinks/cans/beer, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ temperature = 300; diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm index 899178dd7177..4cd633eeba32 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm @@ -60,7 +60,7 @@ /obj/item/seeds/reishi, /obj/item/seeds/plump, /obj/item/seeds/plump, -/obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom, +/obj/item/food/snacks/grown/mushroom/glowshroom, /turf/simulated/floor/plating/asteroid/basalt, /area/ruin/powered) "n" = ( diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm index 4f64ee076493..c3df51e78744 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm @@ -56,7 +56,7 @@ }, /area/ruin/unpowered/misc_lavaruin) "j" = ( -/obj/item/reagent_containers/food/snacks/mushroompizzaslice, +/obj/item/food/snacks/mushroompizzaslice, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating{ nitrogen = 23; @@ -243,7 +243,7 @@ /area/ruin/unpowered/misc_lavaruin) "D" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/margheritapizzaslice, +/obj/item/food/snacks/margheritapizzaslice, /obj/item/trash/plate, /turf/simulated/floor/wood{ nitrogen = 23; @@ -253,7 +253,7 @@ /area/ruin/unpowered/misc_lavaruin) "E" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/meatpizzaslice, +/obj/item/food/snacks/meatpizzaslice, /turf/simulated/floor/wood{ nitrogen = 23; oxygen = 14; @@ -262,7 +262,7 @@ /area/ruin/unpowered/misc_lavaruin) "F" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/sliceable/birthdaycake, +/obj/item/food/snacks/sliceable/birthdaycake, /turf/simulated/floor/wood{ nitrogen = 23; oxygen = 14; diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm index 8e9f26c16a23..cd84220ae6d0 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm @@ -115,7 +115,7 @@ /obj/effect/mapping_helpers/no_lava, /obj/effect/mob_spawn/human/corpse/seed_vault_diona, /obj/item/pickaxe/mini, -/obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom{ +/obj/item/food/snacks/grown/mushroom/glowshroom{ pixel_x = 8; pixel_y = -8 }, diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm index 5607f14a46e8..c6a81c6289b1 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm @@ -25,7 +25,7 @@ /area/ruin/unpowered/misc_lavaruin) "f" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/grown/citrus/orange, +/obj/item/food/snacks/grown/citrus/orange, /turf/simulated/floor/sepia{ slowdown = 10 }, diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_watcher_grave.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_watcher_grave.dmm index 94b3daeba793..d87396e356f8 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_watcher_grave.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_watcher_grave.dmm @@ -34,7 +34,7 @@ /obj/structure/stone_tile{ dir = 1 }, -/obj/item/reagent_containers/food/snacks/egg/watcher, +/obj/item/food/snacks/egg/watcher, /obj/effect/mapping_helpers/no_lava, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm b/_maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm index 40cb7ab08a1e..32ff1af7d777 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm @@ -548,9 +548,9 @@ /obj/item/poster/random_contraband, /obj/item/poster/random_contraband, /obj/item/poster/random_contraband, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, -/obj/item/reagent_containers/food/drinks/bottle/vodka, -/obj/item/reagent_containers/food/drinks/bottle/vodka, +/obj/item/reagent_containers/drinks/bottle/whiskey, +/obj/item/reagent_containers/drinks/bottle/vodka, +/obj/item/reagent_containers/drinks/bottle/vodka, /turf/simulated/floor/plasteel, /area/ruin/space/abandoned_engi_sat) "pb" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm b/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm index 390bf2401ea0..d6ff668bb773 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm @@ -545,7 +545,7 @@ /area/ruin/space/unpowered) "bn" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/snacks/carrotfries, +/obj/item/food/snacks/carrotfries, /turf/simulated/floor/plasteel{ icon_state = "dark" }, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm b/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm index 1ea6c1179145..6ac333f53412 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm @@ -584,7 +584,7 @@ /turf/simulated/wall/r_wall, /area/space/nearstation) "Nw" = ( -/obj/item/reagent_containers/food/snacks/xenomeatbreadslice{ +/obj/item/food/snacks/xenomeatbreadslice{ name = "green mold bread slice" }, /turf/simulated/floor/plating/airless, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm index 0559b278a5d4..9fec92ec655c 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm @@ -318,20 +318,20 @@ /area/ruin/space/unpowered) "aF" = ( /obj/structure/closet/cardboard, -/obj/item/reagent_containers/food/snacks/beans, -/obj/item/reagent_containers/food/snacks/beans, -/obj/item/reagent_containers/food/snacks/beans, -/obj/item/reagent_containers/food/snacks/beans, -/obj/item/reagent_containers/food/snacks/beans, +/obj/item/food/snacks/beans, +/obj/item/food/snacks/beans, +/obj/item/food/snacks/beans, +/obj/item/food/snacks/beans, +/obj/item/food/snacks/beans, /turf/simulated/floor/plasteel, /area/ruin/space/unpowered) "aG" = ( /obj/structure/closet/cardboard, -/obj/item/reagent_containers/food/drinks/cans/cola, -/obj/item/reagent_containers/food/drinks/cans/cola, -/obj/item/reagent_containers/food/drinks/cans/cola, -/obj/item/reagent_containers/food/drinks/cans/cola, -/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/drinks/cans/cola, +/obj/item/reagent_containers/drinks/cans/cola, +/obj/item/reagent_containers/drinks/cans/cola, +/obj/item/reagent_containers/drinks/cans/cola, +/obj/item/reagent_containers/drinks/cans/cola, /turf/simulated/floor/plasteel, /area/ruin/space/unpowered) "aH" = ( @@ -390,11 +390,11 @@ /area/ruin/space/unpowered) "aP" = ( /obj/structure/closet/cardboard, -/obj/item/reagent_containers/food/drinks/cans/cola, -/obj/item/reagent_containers/food/drinks/cans/cola, -/obj/item/reagent_containers/food/drinks/cans/cola, -/obj/item/reagent_containers/food/drinks/cans/cola, -/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/drinks/cans/cola, +/obj/item/reagent_containers/drinks/cans/cola, +/obj/item/reagent_containers/drinks/cans/cola, +/obj/item/reagent_containers/drinks/cans/cola, +/obj/item/reagent_containers/drinks/cans/cola, /obj/machinery/light{ dir = 4 }, @@ -649,7 +649,7 @@ /area/ruin/space/unpowered) "bD" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/beans, +/obj/item/food/snacks/beans, /turf/simulated/floor/plasteel{ icon_state = "bar" }, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm b/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm index b7b7e3bc1845..96be2fc177cf 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm @@ -261,10 +261,10 @@ /area/ruin/space/unpowered) "SX" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/beans{ +/obj/item/food/snacks/beans{ pixel_x = 10 }, -/obj/item/reagent_containers/food/snacks/beans{ +/obj/item/food/snacks/beans{ pixel_x = -5 }, /turf/simulated/floor/plasteel, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm b/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm index 0950d75b262b..c5862def159b 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm @@ -556,15 +556,15 @@ /area/ruin/space/djstation) "bw" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/bottle/vodka{ +/obj/item/reagent_containers/drinks/bottle/vodka{ pixel_x = 7; pixel_y = 10 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_x = 28; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkblue" diff --git a/_maps/map_files/RandomRuins/SpaceRuins/druglab.dmm b/_maps/map_files/RandomRuins/SpaceRuins/druglab.dmm index 4b707a0c38e7..330d27499d54 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/druglab.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/druglab.dmm @@ -51,7 +51,7 @@ /area/ruin/space/methlab) "l" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/chips, +/obj/item/food/snacks/chips, /turf/simulated/floor/plating, /area/ruin/space/methlab) "m" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm b/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm index 89a5ba26557e..3d7f086484de 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm @@ -95,8 +95,8 @@ /area/ruin/unpowered/BMPship/Delta) "ax" = ( /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, +/obj/item/food/snacks/meat, +/obj/item/food/snacks/meat, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -104,7 +104,7 @@ /area/ruin/unpowered/BMPship/Delta) "ay" = ( /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/food/snacks/meat, +/obj/item/food/snacks/meat, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -446,8 +446,8 @@ /area/ruin/unpowered/BMPship/Delta) "bN" = ( /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/hugemushroomslice, +/obj/item/food/snacks/meat, +/obj/item/food/snacks/hugemushroomslice, /obj/effect/turf_decal/stripes/line{ dir = 2 }, @@ -564,7 +564,7 @@ "cb" = ( /obj/structure/table, /obj/item/kitchen/knife/butcher, -/obj/item/reagent_containers/food/snacks/meat, +/obj/item/food/snacks/meat, /turf/simulated/floor/plasteel{ icon_state = "barber" }, @@ -648,7 +648,7 @@ /turf/simulated/wall/mineral/titanium, /area/ruin/unpowered/BMPship/Aft) "cp" = ( -/obj/item/reagent_containers/food/snacks/hugemushroomslice, +/obj/item/food/snacks/hugemushroomslice, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -750,7 +750,7 @@ /turf/simulated/floor/carpet, /area/ruin/unpowered/BMPship/Fore) "cH" = ( -/obj/item/reagent_containers/food/snacks/hugemushroomslice, +/obj/item/food/snacks/hugemushroomslice, /turf/simulated/floor/plasteel, /area/ruin/unpowered/BMPship/Midship) "cI" = ( @@ -792,8 +792,8 @@ /area/ruin/unpowered/BMPship/Aft) "cP" = ( /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, +/obj/item/food/snacks/meat, +/obj/item/food/snacks/meat, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -898,7 +898,7 @@ }, /area/ruin/unpowered/BMPship/Midship) "di" = ( -/obj/item/reagent_containers/food/snacks/meat, +/obj/item/food/snacks/meat, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -1944,7 +1944,7 @@ /area/ruin/unpowered/BMPship/Fore) "fS" = ( /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/food/snacks/meat, +/obj/item/food/snacks/meat, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -2234,7 +2234,7 @@ /area/ruin/powered) "gO" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/cans/beer, +/obj/item/reagent_containers/drinks/cans/beer, /obj/item/grenade/chem_grenade/drugs, /turf/simulated/floor/plating/airless, /area/ruin/powered) @@ -2389,7 +2389,7 @@ /turf/simulated/floor/plating/airless, /area/ruin/powered) "hn" = ( -/obj/item/reagent_containers/food/snacks/chips, +/obj/item/food/snacks/chips, /turf/simulated/floor/plating/airless, /area/ruin/powered) "ho" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm index b6767a4fded9..a1971f408d5c 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm @@ -1,14 +1,14 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"aaa" = ( +"aa" = ( /turf/template_noop, /area/template_noop) -"aab" = ( +"ab" = ( /obj/structure/window/reinforced{ dir = 1 }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aac" = ( +"ac" = ( /obj/structure/sign/directions/medical{ pixel_x = -32; dir = 8 @@ -19,10 +19,10 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aad" = ( +"ad" = ( /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/moonbase19) -"aae" = ( +"ae" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 4 }, @@ -33,14 +33,14 @@ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"aaf" = ( +"af" = ( /obj/effect/spawner/random_spawners/wall_rusted_always, /turf/simulated/wall/r_wall, /area/ruin/space/moonbase19) -"aag" = ( +"ag" = ( /turf/simulated/wall/r_wall, /area/ruin/space/moonbase19) -"aah" = ( +"ah" = ( /obj/structure/cable{ d1 = 1; d2 = 2; @@ -51,24 +51,24 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aai" = ( +"ai" = ( /obj/structure/railing/corner, /turf/simulated/floor/plasteel{ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aaj" = ( +"aj" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/alien, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"aak" = ( +"ak" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aal" = ( +"al" = ( /obj/structure/railing/cap{ dir = 10 }, @@ -76,7 +76,7 @@ icon_state = "green" }, /area/ruin/space/moonbase19) -"aam" = ( +"am" = ( /obj/structure/window/reinforced, /obj/structure/chair{ dir = 1 @@ -87,14 +87,14 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aao" = ( +"ao" = ( /obj/structure/closet/crate, /obj/item/flashlight/flare, /obj/item/flashlight/flare, /obj/item/flashlight/flare, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aap" = ( +"ap" = ( /obj/machinery/shower{ dir = 8 }, @@ -102,7 +102,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/noslip, /area/ruin/space/moonbase19) -"aaq" = ( +"aq" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery/partial{ dir = 8 @@ -112,7 +112,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aas" = ( +"as" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/reinforced/normal, /turf/simulated/floor/plasteel{ @@ -120,7 +120,7 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"aat" = ( +"at" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/tracks{ color = "red"; @@ -132,7 +132,7 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aau" = ( +"au" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 1 }, @@ -142,12 +142,12 @@ /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/moonbase19) -"aav" = ( +"av" = ( /turf/simulated/floor/plating/asteroid/airless{ icon_state = "asteroid2" }, /area/ruin/space/moonbase19) -"aaw" = ( +"aw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -162,7 +162,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aax" = ( +"ax" = ( /obj/machinery/computer/arcade/recruiter{ dir = 1 }, @@ -171,7 +171,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aay" = ( +"ay" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 1 }, @@ -182,10 +182,10 @@ icon_state = "asteroid10" }, /area/ruin/space/moonbase19) -"aaA" = ( +"aA" = ( /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aaB" = ( +"aB" = ( /obj/structure/railing, /obj/item/storage/toolbox/mechanical{ pixel_x = 2; @@ -196,7 +196,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aaC" = ( +"aC" = ( /obj/structure/table/glass, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 8 @@ -205,7 +205,7 @@ icon_state = "whitehall" }, /area/ruin/space/moonbase19) -"aaD" = ( +"aD" = ( /obj/structure/toilet{ pixel_y = 8 }, @@ -215,14 +215,14 @@ icon_state = "freezerfloor" }, /area/ruin/space/moonbase19) -"aaE" = ( +"aE" = ( /obj/structure/railing{ dir = 1 }, /obj/structure/chair/sofa/bench/right, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aaF" = ( +"aF" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -233,7 +233,7 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aaG" = ( +"aG" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/reinforced/normal{ dir = 4 @@ -251,14 +251,14 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"aaH" = ( +"aH" = ( /obj/structure/railing/cap{ dir = 8 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aaI" = ( +"aI" = ( /obj/structure/railing{ dir = 4 }, @@ -273,7 +273,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aaJ" = ( +"aJ" = ( /obj/structure/railing, /obj/effect/turf_decal/stripes/asteroid/line, /obj/effect/turf_decal/stripes/asteroid/line{ @@ -283,34 +283,34 @@ icon_state = "asteroid12" }, /area/ruin/space/moonbase19) -"aaK" = ( +"aK" = ( /obj/structure/window/reinforced{ dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aaL" = ( +"aL" = ( /turf/simulated/wall, /area/ruin/space/moonbase19) -"aaM" = ( +"aM" = ( /obj/effect/spawner/random_spawners/wall_rusted_always, /turf/simulated/wall, /area/ruin/space/moonbase19) -"aaN" = ( +"aN" = ( /obj/machinery/door/airlock/medical/glass{ req_access_txt = "271"; name = "Storage Room" }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aaO" = ( +"aO" = ( /obj/structure/table/glass/reinforced/titanium, /turf/simulated/floor/plasteel{ icon_state = "black" }, /area/ruin/space/moonbase19) -"aaP" = ( +"aP" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 1 }, @@ -319,7 +319,7 @@ }, /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/moonbase19) -"aaQ" = ( +"aQ" = ( /obj/structure/disposaloutlet{ dir = 8 }, @@ -333,7 +333,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aaR" = ( +"aR" = ( /obj/structure/railing/cap{ dir = 1 }, @@ -346,7 +346,7 @@ dir = 6 }, /area/ruin/space/moonbase19) -"aaS" = ( +"aS" = ( /obj/structure/railing, /obj/effect/turf_decal/stripes/asteroid/line, /obj/effect/turf_decal/stripes/asteroid/line{ @@ -356,15 +356,15 @@ icon_state = "asteroid8" }, /area/ruin/space/moonbase19) -"aaU" = ( +"aU" = ( /turf/simulated/floor/mineral/titanium, /area/ruin/space/powered) -"aaV" = ( +"aV" = ( /obj/effect/decal/remains/human, /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/moonbase19) -"aaW" = ( +"aW" = ( /obj/structure/window/reinforced{ dir = 1 }, @@ -377,7 +377,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aaX" = ( +"aX" = ( /obj/structure/railing{ dir = 8 }, @@ -388,7 +388,7 @@ dir = 10 }, /area/ruin/space/moonbase19) -"aaY" = ( +"aY" = ( /obj/structure/chair/office/light{ dir = 1 }, @@ -396,7 +396,7 @@ icon_state = "black" }, /area/ruin/space/moonbase19) -"aaZ" = ( +"aZ" = ( /obj/machinery/door/poddoor/impassable{ id_tag = "awaymlock" }, @@ -406,7 +406,7 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aba" = ( +"ba" = ( /obj/machinery/door/airlock/multi_tile/glass{ req_access_txt = "271" }, @@ -414,14 +414,14 @@ icon_state = "freezerfloor" }, /area/ruin/space/moonbase19) -"abb" = ( +"bb" = ( /obj/machinery/door/airlock/multi_tile/glass, /turf/simulated/floor/plasteel{ icon_state = "darkfull"; dir = 8 }, /area/ruin/space/moonbase19) -"abd" = ( +"bd" = ( /obj/structure/sign/nosmoking_1{ pixel_x = 32 }, @@ -431,7 +431,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"abe" = ( +"be" = ( /obj/structure/chair/sofa/bench/left{ dir = 4 }, @@ -440,7 +440,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"abf" = ( +"bf" = ( /obj/structure/window/reinforced{ dir = 4 }, @@ -450,7 +450,7 @@ icon_state = "black" }, /area/ruin/space/moonbase19) -"abh" = ( +"bh" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plasteel{ @@ -458,39 +458,39 @@ dir = 4 }, /area/ruin/space/moonbase19) -"abi" = ( +"bi" = ( /obj/structure/railing{ dir = 1 }, /obj/structure/chair/sofa/bench/left, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"abj" = ( +"bj" = ( /obj/machinery/door/airlock/maintenance_hatch, /obj/structure/barricade/wooden/crude{ layer = 4 }, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"abk" = ( +"bk" = ( /obj/machinery/economy/vending/snack, /turf/simulated/floor/plasteel{ icon_state = "darkfull"; dir = 8 }, /area/ruin/space/moonbase19) -"abl" = ( +"bl" = ( /obj/structure/chair/office{ dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"abm" = ( +"bm" = ( /obj/structure/closet, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"abp" = ( +"bp" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced{ dir = 4 @@ -504,7 +504,7 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"abq" = ( +"bq" = ( /obj/structure/table/reinforced, /obj/item/book/manual/wiki/security_space_law, /obj/item/stack/rods, @@ -513,14 +513,14 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"abs" = ( +"bs" = ( /obj/structure/table/glass, /turf/simulated/floor/plasteel{ icon_state = "whitehall"; dir = 8 }, /area/ruin/space/moonbase19) -"abt" = ( +"bt" = ( /obj/structure/bed, /obj/item/bedsheet/medical, /obj/machinery/iv_drip, @@ -532,7 +532,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"abu" = ( +"bu" = ( /obj/structure/railing{ dir = 4 }, @@ -540,11 +540,11 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"abv" = ( +"bv" = ( /obj/structure/ore_box, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"abw" = ( +"bw" = ( /obj/structure/window/reinforced{ dir = 1 }, @@ -553,15 +553,15 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"abx" = ( +"bx" = ( /obj/machinery/door/airlock/external/glass, /turf/simulated/floor/mineral/titanium, /area/ruin/space/powered) -"abz" = ( +"bz" = ( /obj/structure/girder, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"abB" = ( +"bB" = ( /obj/machinery/light/small{ dir = 4 }, @@ -574,7 +574,7 @@ icon_state = "black" }, /area/ruin/space/moonbase19) -"abC" = ( +"bC" = ( /obj/machinery/atmospherics/unary/cryo_cell, /obj/structure/window/reinforced{ dir = 4 @@ -585,7 +585,7 @@ /obj/effect/turf_decal/delivery/white/hollow, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"abD" = ( +"bD" = ( /obj/structure/railing{ dir = 1 }, @@ -595,7 +595,7 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"abE" = ( +"bE" = ( /obj/effect/turf_decal/stripes/corner, /obj/structure/sign/vacuum{ desc = "A warning sign which reads 'HOSTILE ATMOSPHERE AHEAD'"; @@ -610,7 +610,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"abF" = ( +"bF" = ( /obj/structure/railing, /obj/effect/turf_decal/stripes/asteroid/end{ dir = 4 @@ -621,7 +621,7 @@ /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/moonbase19) -"abG" = ( +"bG" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, /obj/structure/rack, @@ -631,7 +631,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"abH" = ( +"bH" = ( /obj/structure/sign/restroom{ pixel_y = -32 }, @@ -639,7 +639,7 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"abJ" = ( +"bJ" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/reinforced/normal{ dir = 1 @@ -649,14 +649,14 @@ dir = 8 }, /area/ruin/space/moonbase19) -"abK" = ( +"bK" = ( /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "dark" }, /area/ruin/space/moonbase19) -"abN" = ( +"bN" = ( /obj/structure/window/reinforced{ dir = 1 }, @@ -669,15 +669,15 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"abO" = ( +"bO" = ( /obj/item/cigbutt, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"abP" = ( +"bP" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"abS" = ( +"bS" = ( /obj/effect/turf_decal/loading_area/white{ dir = 1 }, @@ -686,7 +686,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"abU" = ( +"bU" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plasteel{ @@ -694,7 +694,7 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"abW" = ( +"bW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -703,11 +703,11 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"abY" = ( +"bY" = ( /obj/structure/railing, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"abZ" = ( +"bZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -716,7 +716,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aca" = ( +"ca" = ( /obj/structure/railing/cap{ dir = 8 }, @@ -724,30 +724,30 @@ dir = 1 }, /area/ruin/space/moonbase19) -"acb" = ( +"cb" = ( /obj/structure/railing/corner, /turf/simulated/floor/plasteel/stairs{ dir = 4 }, /area/ruin/space/moonbase19) -"acc" = ( +"cc" = ( /obj/structure/flora/tree/jungle/small, /obj/structure/flora/rock/pile/largejungle, /turf/simulated/floor/grass, /area/ruin/space/moonbase19) -"acd" = ( +"cd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"ace" = ( +"ce" = ( /obj/structure/window/reinforced, /obj/machinery/light/small, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"acf" = ( +"cf" = ( /obj/effect/decal/cleanable/blood/tracks{ color = "red"; desc = "Your instincts say you shouldn't be following these."; @@ -762,13 +762,13 @@ dir = 4 }, /area/ruin/space/moonbase19) -"ach" = ( +"ch" = ( /obj/structure/chair/office{ dir = 8 }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aci" = ( +"ci" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ d1 = 1; @@ -779,22 +779,22 @@ dir = 1 }, /area/ruin/space/moonbase19) -"acj" = ( +"cj" = ( /obj/structure/chair/office/dark{ dir = 1 }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"acm" = ( +"cm" = ( /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"acn" = ( +"cn" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 8 }, /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/moonbase19) -"aco" = ( +"co" = ( /obj/structure/railing/cap{ dir = 1 }, @@ -806,11 +806,11 @@ dir = 4 }, /area/ruin/space/moonbase19) -"acp" = ( +"cp" = ( /obj/effect/landmark/damageturf, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"acq" = ( +"cq" = ( /obj/structure/railing/corner{ dir = 4 }, @@ -818,17 +818,17 @@ dir = 1 }, /area/ruin/space/moonbase19) -"acr" = ( +"cr" = ( /obj/effect/landmark/damageturf, /turf/simulated/floor/plating/airless, /area/ruin/space/moonbase19) -"acs" = ( +"cs" = ( /obj/structure/flora/ausbushes/sunnybush, /obj/structure/flora/ausbushes/ppflowers, /obj/structure/window/full/basic, /turf/simulated/floor/grass, /area/ruin/space/moonbase19) -"act" = ( +"ct" = ( /obj/structure/railing, /obj/machinery/optable, /obj/effect/turf_decal/box/white, @@ -837,7 +837,7 @@ dir = 1 }, /area/ruin/space/moonbase19) -"acv" = ( +"cv" = ( /obj/structure/table/glass/reinforced/titanium, /obj/machinery/door_control{ pixel_y = 8; @@ -853,7 +853,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"acw" = ( +"cw" = ( /obj/machinery/sleeper, /obj/effect/turf_decal/delivery/white/hollow, /obj/machinery/atmospherics/pipe/manifold/hidden, @@ -861,7 +861,7 @@ icon_state = "whitehall" }, /area/ruin/space/moonbase19) -"acx" = ( +"cx" = ( /obj/machinery/door/airlock/security/glass{ req_access_txt = "271" }, @@ -873,14 +873,14 @@ dir = 8 }, /area/ruin/space/moonbase19) -"acy" = ( +"cy" = ( /obj/structure/closet, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"acA" = ( +"cA" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -889,7 +889,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"acB" = ( +"cB" = ( /obj/structure/railing{ dir = 4 }, @@ -899,7 +899,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"acC" = ( +"cC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -907,7 +907,7 @@ icon_state = "blackcorner" }, /area/ruin/space/moonbase19) -"acD" = ( +"cD" = ( /obj/structure/railing/cap{ dir = 5 }, @@ -920,7 +920,7 @@ /obj/effect/landmark/damageturf, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"acF" = ( +"cF" = ( /obj/structure/barricade/wooden/crude{ layer = 4 }, @@ -930,7 +930,7 @@ }, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"acI" = ( +"cI" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 32 }, @@ -941,7 +941,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"acJ" = ( +"cJ" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -949,7 +949,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"acK" = ( +"cK" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -958,13 +958,13 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"acL" = ( +"cL" = ( /obj/effect/decal/cleanable/blood/splatter{ color = "red" }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"acM" = ( +"cM" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -973,7 +973,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"acN" = ( +"cN" = ( /obj/machinery/bodyscanner{ dir = 4 }, @@ -985,7 +985,7 @@ icon_state = "whitehall" }, /area/ruin/space/moonbase19) -"acR" = ( +"cR" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 8 @@ -998,18 +998,18 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"acS" = ( +"cS" = ( /obj/effect/decal/cleanable/cobweb2, /obj/structure/largecrate, /turf/simulated/floor/mineral/titanium, /area/ruin/space/powered) -"acX" = ( +"cX" = ( /turf/simulated/floor/plasteel{ dir = 1; icon_state = "black" }, /area/ruin/space/moonbase19) -"acY" = ( +"cY" = ( /obj/structure/railing{ dir = 8 }, @@ -1022,7 +1022,7 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"ada" = ( +"da" = ( /obj/structure/chair{ dir = 8 }, @@ -1031,18 +1031,18 @@ dir = 4 }, /area/ruin/space/moonbase19) -"adb" = ( +"db" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/plating/asteroid/ancient, /area/ruin/space/moonbase19) -"adc" = ( +"dc" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "black"; dir = 4 }, /area/ruin/space/moonbase19) -"add" = ( +"dd" = ( /obj/structure/table/glass, /obj/machinery/light/small{ dir = 1 @@ -1056,7 +1056,7 @@ icon_state = "darkblue" }, /area/ruin/space/moonbase19) -"adf" = ( +"df" = ( /obj/structure/railing{ dir = 1 }, @@ -1064,51 +1064,51 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"adg" = ( +"dg" = ( /obj/structure/shuttle/engine/propulsion/burst{ dir = 4 }, /turf/simulated/wall/mineral/titanium, /area/ruin/space/powered) -"adh" = ( +"dh" = ( /obj/machinery/computer, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/mineral/titanium, /area/ruin/space/powered) -"adi" = ( +"di" = ( /obj/machinery/door/airlock/centcom, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, /area/ruin/space/moonbase19) -"adj" = ( +"dj" = ( /obj/structure/closet/crate, /turf/simulated/floor/mineral/titanium, /area/ruin/space/powered) -"adk" = ( +"dk" = ( /obj/structure/window/reinforced, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"adm" = ( +"dm" = ( /obj/effect/turf_decal/stripes/asteroid/line, /obj/structure/flora/ausbushes/fullgrass, /obj/structure/railing/corner, /turf/simulated/floor/plating/asteroid/ancient, /area/ruin/space/moonbase19) -"adn" = ( +"dn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, /area/ruin/space/moonbase19) -"ado" = ( +"do" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/plating/asteroid/airless{ icon_state = "asteroid12" }, /area/ruin/space/moonbase19) -"adp" = ( +"dp" = ( /obj/structure/window/reinforced{ dir = 8 }, @@ -1121,7 +1121,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"ads" = ( +"ds" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -1133,7 +1133,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"adt" = ( +"dt" = ( /obj/effect/turf_decal/stripes/asteroid/corner{ dir = 8 }, @@ -1142,7 +1142,7 @@ }, /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/powered) -"adu" = ( +"du" = ( /obj/structure/sign/directions/cargo{ dir = 4; pixel_y = 39 @@ -1166,30 +1166,30 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"adw" = ( +"dw" = ( /turf/simulated/floor/plasteel{ icon_state = "whitehall" }, /area/ruin/space/moonbase19) -"adx" = ( +"dx" = ( /obj/machinery/suit_storage_unit/standard_unit, /turf/simulated/floor/plasteel{ icon_state = "black"; dir = 6 }, /area/ruin/space/moonbase19) -"adz" = ( +"dz" = ( /obj/structure/flora/ausbushes/fernybush, /obj/structure/flora/ausbushes/brflowers, /obj/structure/window/full/basic, /turf/simulated/floor/grass, /area/ruin/space/moonbase19) -"adA" = ( +"dA" = ( /turf/simulated/floor/plating/asteroid/airless{ icon_state = "asteroid1" }, /area/ruin/space/moonbase19) -"adB" = ( +"dB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -1201,20 +1201,20 @@ icon_state = "whitecorner" }, /area/ruin/space/moonbase19) -"adD" = ( +"dD" = ( /obj/structure/closet/walllocker/emerglocker{ pixel_y = 32 }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"adE" = ( +"dE" = ( /obj/effect/turf_decal/loading_area/white, /turf/simulated/floor/plasteel{ icon_state = "caution"; dir = 8 }, /area/ruin/space/moonbase19) -"adG" = ( +"dG" = ( /obj/machinery/door/poddoor/impassable{ id_tag = "awaycontlockdown" }, @@ -1224,7 +1224,7 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"adH" = ( +"dH" = ( /obj/structure/window/reinforced{ dir = 8 }, @@ -1236,7 +1236,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"adK" = ( +"dK" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb2, /obj/effect/decal/cleanable/blood/splatter{ @@ -1246,18 +1246,18 @@ icon_state = "freezerfloor" }, /area/ruin/space/moonbase19) -"adL" = ( +"dL" = ( /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"adM" = ( +"dM" = ( /turf/simulated/floor/plasteel/stairs{ dir = 4 }, /area/ruin/space/moonbase19) -"adN" = ( +"dN" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 1 }, @@ -1267,7 +1267,7 @@ /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/moonbase19) -"adO" = ( +"dO" = ( /obj/structure/table/glass/reinforced/plastitanium, /obj/item/clipboard, /obj/item/stamp/rd{ @@ -1279,7 +1279,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"adQ" = ( +"dQ" = ( /obj/structure/table/glass, /obj/structure/railing{ dir = 1 @@ -1292,7 +1292,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"adR" = ( +"dR" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/splatter{ color = "red" @@ -1303,20 +1303,20 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"adS" = ( +"dS" = ( /obj/effect/decal/cleanable/generic, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"adT" = ( +"dT" = ( /obj/machinery/light/small, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/carpet/royalblue, /area/ruin/space/moonbase19) -"adU" = ( +"dU" = ( /obj/machinery/computer/arcade/orion_trail{ dir = 1 }, @@ -1325,18 +1325,18 @@ dir = 8 }, /area/ruin/space/moonbase19) -"adV" = ( +"dV" = ( /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"adW" = ( +"dW" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"adX" = ( +"dX" = ( /obj/structure/sign/security{ pixel_y = 32 }, @@ -1345,13 +1345,13 @@ dir = 8 }, /area/ruin/space/moonbase19) -"adY" = ( +"dY" = ( /turf/simulated/floor/plasteel{ dir = 9; icon_state = "caution" }, /area/ruin/space/moonbase19) -"aeb" = ( +"eb" = ( /obj/structure/closet/crate/can, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plasteel{ @@ -1359,7 +1359,7 @@ temperature = 273.15 }, /area/ruin/space/moonbase19) -"aed" = ( +"ed" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -1374,14 +1374,14 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aee" = ( +"ee" = ( /obj/structure/table/glass/reinforced/titanium, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aeg" = ( +"eg" = ( /turf/simulated/floor/grass, /area/ruin/space/moonbase19) -"aeh" = ( +"eh" = ( /obj/effect/turf_decal/caution{ dir = 4 }, @@ -1394,7 +1394,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aek" = ( +"ek" = ( /obj/effect/turf_decal/stripes/asteroid/line, /obj/effect/decal/cleanable/dirt, /obj/structure/railing/corner{ @@ -1402,19 +1402,19 @@ }, /turf/simulated/floor/plating/asteroid/ancient, /area/ruin/space/moonbase19) -"ael" = ( +"el" = ( /obj/machinery/door/airlock, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, /area/ruin/space/moonbase19) -"aem" = ( +"em" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "blackcorner" }, /area/ruin/space/moonbase19) -"aeo" = ( +"eo" = ( /obj/machinery/door/poddoor/impassable{ id_tag = "awaymlock" }, @@ -1424,7 +1424,7 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aep" = ( +"ep" = ( /obj/effect/decal/cleanable/blood/splatter{ color = "red" }, @@ -1432,14 +1432,14 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aeq" = ( +"eq" = ( /obj/effect/turf_decal/loading_area/white{ dir = 1 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aer" = ( +"er" = ( /obj/structure/window/reinforced{ dir = 8 }, @@ -1452,11 +1452,11 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aes" = ( +"es" = ( /obj/structure/flora/ausbushes/fernybush, /turf/simulated/floor/grass, /area/ruin/space/moonbase19) -"aev" = ( +"ev" = ( /obj/structure/chair{ dir = 8 }, @@ -1465,7 +1465,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aew" = ( +"ew" = ( /obj/machinery/computer/security{ desc = "Used to access the various cameras on the outpost."; dir = 1; @@ -1476,7 +1476,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aey" = ( +"ey" = ( /obj/item/kirbyplants, /obj/machinery/light/small{ dir = 1 @@ -1486,7 +1486,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aez" = ( +"ez" = ( /obj/structure/chair{ dir = 8 }, @@ -1501,22 +1501,22 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aeA" = ( +"eA" = ( /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, /area/ruin/space/moonbase19) -"aeC" = ( +"eC" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/plating/asteroid/ancient, /area/ruin/space/moonbase19) -"aeE" = ( +"eE" = ( /obj/machinery/light/small{ dir = 8 }, /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/powered) -"aeH" = ( +"eH" = ( /obj/effect/turf_decal/loading_area/white, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/glass, @@ -1528,11 +1528,11 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aeJ" = ( +"eJ" = ( /obj/structure/flora/junglebush/large, /turf/simulated/floor/grass, /area/ruin/space/moonbase19) -"aeK" = ( +"eK" = ( /obj/item/kirbyplants, /obj/effect/decal/cleanable/dirt, /obj/machinery/camera{ @@ -1545,7 +1545,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aeL" = ( +"eL" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -32 }, @@ -1558,13 +1558,13 @@ icon_state = "black" }, /area/ruin/space/moonbase19) -"aeM" = ( +"eM" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, /area/ruin/space/moonbase19) -"aeO" = ( +"eO" = ( /obj/structure/mirror{ pixel_x = -28 }, @@ -1578,7 +1578,7 @@ icon_state = "freezerfloor" }, /area/ruin/space/moonbase19) -"aeR" = ( +"eR" = ( /obj/structure/railing{ dir = 8 }, @@ -1587,13 +1587,13 @@ icon_state = "black" }, /area/ruin/space/moonbase19) -"aeU" = ( +"eU" = ( /turf/simulated/floor/plasteel{ dir = 4; icon_state = "black" }, /area/ruin/space/moonbase19) -"aeW" = ( +"eW" = ( /obj/structure/railing/corner{ dir = 1 }, @@ -1601,7 +1601,7 @@ dir = 1 }, /area/ruin/space/moonbase19) -"aeX" = ( +"eX" = ( /obj/structure/barricade/wooden/crude{ layer = 4 }, @@ -1610,7 +1610,7 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aeZ" = ( +"eZ" = ( /obj/structure/window/reinforced{ dir = 1 }, @@ -1622,7 +1622,7 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"afc" = ( +"fc" = ( /obj/structure/railing{ dir = 4 }, @@ -1644,7 +1644,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"afd" = ( +"fd" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 8 }, @@ -1652,14 +1652,14 @@ icon_state = "asteroid6" }, /area/ruin/space/moonbase19) -"afe" = ( +"fe" = ( /obj/structure/railing{ dir = 8 }, /obj/structure/closet/crate, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aff" = ( +"ff" = ( /obj/structure/chair/stool{ dir = 4 }, @@ -1680,7 +1680,7 @@ }, /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"afi" = ( +"fi" = ( /obj/structure/chair/wheelchair, /obj/effect/turf_decal/delivery/white, /turf/simulated/floor/plasteel{ @@ -1688,11 +1688,11 @@ dir = 8 }, /area/ruin/space/moonbase19) -"afl" = ( +"fl" = ( /obj/structure/closet/crate, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"afm" = ( +"fm" = ( /obj/effect/decal/cleanable/cobweb, /obj/item/clothing/suit/storage/labcoat, /obj/item/clothing/suit/storage/labcoat, @@ -1706,43 +1706,43 @@ dir = 1 }, /area/ruin/space/moonbase19) -"afn" = ( +"fn" = ( /obj/machinery/door/airlock/centcom{ req_access_txt = "271" }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"afp" = ( +"fp" = ( /obj/structure/window/reinforced{ dir = 8 }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"afq" = ( +"fq" = ( /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"afr" = ( +"fr" = ( /obj/structure/window/reinforced{ dir = 4 }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"afs" = ( +"fs" = ( /obj/structure/chair/sofa/bench, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "caution" }, /area/ruin/space/moonbase19) -"afv" = ( +"fv" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/moonbase19) -"afw" = ( +"fw" = ( /obj/structure/flora/ash/rock/style_random, /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/moonbase19) -"afx" = ( +"fx" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -1755,18 +1755,18 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"afy" = ( +"fy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"afA" = ( +"fA" = ( /obj/structure/mopbucket, /obj/item/mop, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"afB" = ( +"fB" = ( /obj/structure/railing{ dir = 1 }, @@ -1778,32 +1778,32 @@ }, /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/moonbase19) -"afC" = ( +"fC" = ( /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ icon_state = "black"; dir = 10 }, /area/ruin/space/moonbase19) -"afD" = ( +"fD" = ( /obj/structure/chair, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"afF" = ( +"fF" = ( /turf/simulated/floor/plasteel{ icon_state = "black"; dir = 6 }, /area/ruin/space/moonbase19) -"afG" = ( +"fG" = ( /obj/structure/fans/tiny, /obj/machinery/door/poddoor{ id_tag = "awaycargogate1" }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"afI" = ( +"fI" = ( /obj/machinery/atmospherics/pipe/simple/visible, /obj/machinery/atmospherics/meter, /obj/effect/turf_decal/stripes/line{ @@ -1811,7 +1811,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"afJ" = ( +"fJ" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/reinforced/normal{ dir = 1 @@ -1831,26 +1831,26 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"afK" = ( +"fK" = ( /turf/simulated/floor/plasteel{ dir = 5; icon_state = "black" }, /area/ruin/space/moonbase19) -"afM" = ( +"fM" = ( /turf/simulated/floor/plasteel{ icon_state = "caution"; dir = 8 }, /area/ruin/space/moonbase19) -"afP" = ( +"fP" = ( /obj/structure/railing{ dir = 4 }, /obj/structure/closet/l3closet/general, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"afQ" = ( +"fQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, @@ -1860,7 +1860,7 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"afR" = ( +"fR" = ( /obj/machinery/light/small{ dir = 4 }, @@ -1870,24 +1870,24 @@ dir = 8 }, /area/ruin/space/moonbase19) -"afV" = ( +"fV" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/moonbase19) -"afX" = ( +"fX" = ( /obj/structure/grille/broken, /obj/effect/decal/cleanable/glass, /obj/effect/landmark/damageturf, /turf/simulated/floor/plating/airless, /area/ruin/space/moonbase19) -"afY" = ( +"fY" = ( /obj/item/stack/sheet/mineral/titanium, /obj/effect/decal/cleanable/glass, /obj/effect/decal/cleanable/molten_object/large, /obj/effect/landmark/damageturf, /turf/simulated/floor/plating/airless, /area/ruin/space/moonbase19) -"agb" = ( +"gb" = ( /obj/machinery/light/small{ dir = 4 }, @@ -1898,7 +1898,7 @@ dir = 1 }, /area/ruin/space/moonbase19) -"agc" = ( +"gc" = ( /obj/structure/chair/sofa/bench/right{ dir = 4 }, @@ -1910,7 +1910,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"agd" = ( +"gd" = ( /obj/structure/sign/directions/science{ dir = 1; pixel_y = 32 @@ -1919,34 +1919,34 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"age" = ( +"ge" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating/asteroid/ancient, /area/ruin/space/moonbase19) -"agf" = ( +"gf" = ( /obj/structure/railing{ dir = 4 }, /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"agg" = ( +"gg" = ( /obj/structure/flora/ausbushes/grassybush, /obj/machinery/light/small, /turf/simulated/floor/grass, /area/ruin/space/moonbase19) -"agh" = ( +"gh" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/alien, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"agi" = ( +"gi" = ( /turf/simulated/floor/plating/asteroid/airless{ icon_state = "asteroid4" }, /area/ruin/space/moonbase19) -"agj" = ( +"gj" = ( /obj/structure/railing, /obj/structure/railing/cap{ dir = 9 @@ -1955,14 +1955,14 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"agk" = ( +"gk" = ( /obj/machinery/atmospherics/unary/portables_connector{ dir = 1 }, /obj/machinery/atmospherics/portable/canister/oxygen, /turf/simulated/floor/plating/asteroid/ancient, /area/ruin/space/moonbase19) -"agl" = ( +"gl" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -1973,7 +1973,7 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"agm" = ( +"gm" = ( /obj/effect/turf_decal/delivery/partial{ dir = 1 }, @@ -1986,7 +1986,7 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"agn" = ( +"gn" = ( /obj/machinery/economy/vending/coffee, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plasteel{ @@ -1994,7 +1994,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"ago" = ( +"go" = ( /obj/structure/railing, /obj/structure/largecrate, /turf/simulated/floor/plasteel{ @@ -2002,7 +2002,7 @@ dir = 6 }, /area/ruin/space/moonbase19) -"agq" = ( +"gq" = ( /obj/structure/railing/corner{ dir = 1 }, @@ -2018,7 +2018,7 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"agr" = ( +"gr" = ( /obj/effect/turf_decal/delivery/red/partial{ dir = 1 }, @@ -2027,22 +2027,22 @@ dir = 1 }, /area/ruin/space/moonbase19) -"ags" = ( +"gs" = ( /obj/machinery/economy/vending/snack, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"agt" = ( +"gt" = ( /obj/machinery/economy/vending/cola, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"agv" = ( +"gv" = ( /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "caution" }, /area/ruin/space/moonbase19) -"agw" = ( +"gw" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/splatter{ color = "red" @@ -2052,7 +2052,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"agx" = ( +"gx" = ( /obj/structure/closet/secure_closet/freezer/kitchen, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -2060,11 +2060,11 @@ temperature = 273.15 }, /area/ruin/space/moonbase19) -"agy" = ( -/obj/item/reagent_containers/food/snacks/xenomeatbreadslice{ +"gy" = ( +/obj/item/food/snacks/xenomeatbreadslice{ pixel_y = 5 }, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ pixel_y = 10; pixel_x = 10 }, @@ -2074,7 +2074,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"agz" = ( +"gz" = ( /obj/machinery/light{ active_power_consumption = 0; icon_state = "tube-broken"; @@ -2085,21 +2085,21 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"agA" = ( +"gA" = ( /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes, /obj/structure/flora/ausbushes/ywflowers, /obj/structure/window/full/basic, /turf/simulated/floor/grass, /area/ruin/space/moonbase19) -"agB" = ( +"gB" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "cautioncorner"; dir = 1 }, /area/ruin/space/moonbase19) -"agC" = ( +"gC" = ( /obj/effect/decal/cleanable/greenglow, /obj/effect/landmark/damageturf, /obj/item/clothing/mask/facehugger{ @@ -2109,11 +2109,11 @@ }, /turf/simulated/floor/plating/airless, /area/ruin/space/moonbase19) -"agD" = ( +"gD" = ( /obj/structure/girder, /turf/simulated/floor/plating/airless, /area/ruin/space/moonbase19) -"agE" = ( +"gE" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 1 }, @@ -2124,19 +2124,19 @@ icon_state = "asteroid5" }, /area/ruin/space/moonbase19) -"agH" = ( +"gH" = ( /obj/structure/fans/tiny, /obj/machinery/door/airlock/external, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"agJ" = ( +"gJ" = ( /obj/effect/turf_decal/stripes/asteroid/line, /obj/structure/railing, /turf/simulated/floor/plating/asteroid/airless{ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"agL" = ( +"gL" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -2148,7 +2148,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"agM" = ( +"gM" = ( /obj/machinery/shower{ dir = 4 }, @@ -2157,47 +2157,47 @@ }, /turf/simulated/floor/noslip, /area/ruin/space/moonbase19) -"agN" = ( +"gN" = ( /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"agO" = ( +"gO" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 }, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/mineral/titanium, /area/ruin/space/powered) -"agP" = ( +"gP" = ( /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "caution" }, /area/ruin/space/moonbase19) -"agS" = ( +"gS" = ( /obj/structure/chair{ dir = 8 }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"agT" = ( +"gT" = ( /obj/structure/flora/rock/pile, /turf/simulated/floor/grass, /area/ruin/space/moonbase19) -"agU" = ( +"gU" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "whitehall" }, /area/ruin/space/moonbase19) -"agV" = ( +"gV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"agW" = ( +"gW" = ( /obj/effect/landmark/damageturf, /obj/machinery/door/airlock/titanium{ id_tag = "s_docking_airlock"; @@ -2205,7 +2205,7 @@ }, /turf/simulated/floor/mineral/titanium/airless, /area/ruin/space/moonbase19) -"agX" = ( +"gX" = ( /obj/structure/rack, /obj/effect/decal/cleanable/cobweb2, /obj/effect/spawner/lootdrop/maintenance, @@ -2214,7 +2214,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"agZ" = ( +"gZ" = ( /obj/structure/railing{ dir = 1 }, @@ -2228,7 +2228,7 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"ahc" = ( +"hc" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/alien, /turf/simulated/floor/plasteel{ @@ -2236,7 +2236,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"ahe" = ( +"he" = ( /obj/effect/turf_decal/stripes/asteroid/corner{ dir = 8 }, @@ -2247,23 +2247,23 @@ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"ahf" = ( +"hf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"ahg" = ( +"hg" = ( /turf/simulated/floor/plasteel{ icon_state = "yellowsiding"; dir = 8 }, /area/ruin/space/moonbase19) -"ahh" = ( +"hh" = ( /turf/simulated/floor/plasteel{ icon_state = "whitehall"; dir = 8 }, /area/ruin/space/moonbase19) -"ahi" = ( +"hi" = ( /obj/structure/falsewall/rock_ancient, /obj/effect/decal/cleanable/blood/tracks{ color = "red"; @@ -2275,7 +2275,7 @@ }, /turf/simulated/floor/plating/asteroid/ancient, /area/ruin/space/moonbase19) -"ahj" = ( +"hj" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 4 @@ -2287,7 +2287,7 @@ dir = 6 }, /area/ruin/space/moonbase19) -"ahk" = ( +"hk" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced{ dir = 1 @@ -2303,7 +2303,7 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"ahl" = ( +"hl" = ( /obj/structure/window/reinforced{ dir = 1 }, @@ -2315,12 +2315,12 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"ahm" = ( +"hm" = ( /obj/structure/closet/cabinet, /obj/item/clothing/under/suit/navy, /turf/simulated/floor/carpet, /area/ruin/space/moonbase19) -"ahn" = ( +"hn" = ( /obj/structure/railing/corner{ dir = 8 }, @@ -2329,14 +2329,14 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aho" = ( +"ho" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "darkbluefull"; dir = 8 }, /area/ruin/space/moonbase19) -"ahp" = ( +"hp" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/xeno{ color = "green" @@ -2346,7 +2346,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"ahq" = ( +"hq" = ( /obj/item/storage/toolbox/mechanical{ pixel_x = 2; pixel_y = 2 @@ -2357,7 +2357,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"ahr" = ( +"hr" = ( /obj/structure/window/reinforced{ dir = 8 }, @@ -2367,17 +2367,17 @@ dir = 8 }, /area/ruin/space/moonbase19) -"ahs" = ( +"hs" = ( /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "dark" }, /area/ruin/space/moonbase19) -"ahu" = ( +"hu" = ( /turf/simulated/wall/mineral/titanium, /area/ruin/space/powered) -"ahv" = ( +"hv" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 10 }, @@ -2388,7 +2388,7 @@ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"ahw" = ( +"hw" = ( /obj/structure/cable{ d1 = 4; d2 = 8; @@ -2403,7 +2403,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"ahx" = ( +"hx" = ( /obj/machinery/light/small{ dir = 8 }, @@ -2419,7 +2419,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"ahy" = ( +"hy" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 }, @@ -2432,11 +2432,11 @@ dir = 4 }, /area/ruin/space/moonbase19) -"ahz" = ( +"hz" = ( /obj/structure/flora/junglebush, /turf/simulated/floor/grass, /area/ruin/space/moonbase19) -"ahA" = ( +"hA" = ( /obj/structure/chair/sofa/bench{ dir = 4 }, @@ -2445,7 +2445,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"ahC" = ( +"hC" = ( /obj/structure/chair/office/dark{ dir = 8 }, @@ -2454,7 +2454,7 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"ahD" = ( +"hD" = ( /obj/structure/chair/office/dark{ dir = 1 }, @@ -2464,10 +2464,10 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"ahE" = ( +"hE" = ( /turf/simulated/floor/carpet, /area/ruin/space/moonbase19) -"ahF" = ( +"hF" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced{ dir = 4 @@ -2478,33 +2478,33 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"ahG" = ( +"hG" = ( /turf/simulated/floor/plating/asteroid/airless{ icon_state = "asteroid10" }, /area/ruin/space/moonbase19) -"ahH" = ( +"hH" = ( /obj/effect/decal/remains/xeno, /turf/simulated/floor/plating/asteroid/airless{ icon_state = "asteroid8" }, /area/ruin/space/moonbase19) -"ahI" = ( +"hI" = ( /turf/simulated/floor/plating/asteroid/airless{ icon_state = "asteroid5" }, /area/ruin/space/moonbase19) -"ahK" = ( +"hK" = ( /obj/machinery/door/airlock/external/glass, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"ahL" = ( +"hL" = ( /turf/simulated/floor/plasteel{ icon_state = "showroomfloor"; temperature = 273.15 }, /area/ruin/space/moonbase19) -"ahN" = ( +"hN" = ( /obj/structure/railing, /obj/structure/railing{ dir = 1 @@ -2513,17 +2513,17 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"ahO" = ( +"hO" = ( /obj/effect/spawner/window/shuttle, /turf/simulated/floor/plating, /area/ruin/space/powered) -"ahP" = ( +"hP" = ( /obj/effect/decal/cleanable/blood/splatter{ color = "red" }, /turf/simulated/floor/plating/asteroid/ancient, /area/ruin/space/moonbase19) -"ahQ" = ( +"hQ" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 5 }, @@ -2534,7 +2534,7 @@ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"ahR" = ( +"hR" = ( /obj/structure/window/reinforced{ dir = 1 }, @@ -2543,21 +2543,21 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"ahS" = ( +"hS" = ( /obj/structure/railing{ dir = 1 }, /obj/structure/closet, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"ahT" = ( +"hT" = ( /obj/structure/window/reinforced{ dir = 1 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"ahU" = ( +"hU" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/reinforced/normal{ dir = 8 @@ -2572,10 +2572,10 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"ahV" = ( +"hV" = ( /obj/structure/railing, /obj/structure/closet/secure_closet, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = -3; pixel_y = -2 }, @@ -2588,12 +2588,12 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"ahW" = ( +"hW" = ( /obj/structure/bed, /obj/item/bedsheet, /turf/simulated/floor/carpet, /area/ruin/space/moonbase19) -"ahX" = ( +"hX" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/reinforced/normal{ dir = 4 @@ -2604,30 +2604,30 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"ahY" = ( +"hY" = ( /obj/effect/decal/cleanable/blood/oil{ color = "black" }, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"ahZ" = ( +"hZ" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/plating/asteroid/airless{ icon_state = "asteroid8" }, /area/ruin/space/moonbase19) -"aia" = ( +"ia" = ( /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/ruin/space/moonbase19) -"aib" = ( +"ib" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/ruin/space/moonbase19) -"aic" = ( +"ic" = ( /obj/structure/railing{ dir = 4 }, @@ -2640,11 +2640,11 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aid" = ( +"id" = ( /obj/structure/largecrate, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aie" = ( +"ie" = ( /obj/effect/decal/cleanable/blood/splatter{ color = "red" }, @@ -2652,7 +2652,7 @@ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"aif" = ( +"if" = ( /obj/structure/bed, /obj/item/bedsheet/medical, /obj/machinery/iv_drip, @@ -2660,14 +2660,14 @@ icon_state = "whitehall" }, /area/ruin/space/moonbase19) -"aig" = ( +"ig" = ( /obj/machinery/door/poddoor/impassable{ id_tag = "awaymlock" }, /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aii" = ( +"ii" = ( /obj/machinery/light/small{ dir = 1 }, @@ -2680,14 +2680,14 @@ icon_state = "escape" }, /area/ruin/space/moonbase19) -"aij" = ( +"ij" = ( /obj/structure/fans/tiny, /obj/machinery/door/poddoor/multi_tile/impassable/four_tile_ver{ id_tag = "awaycargogate" }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"ail" = ( +"il" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -2697,7 +2697,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aim" = ( +"im" = ( /obj/effect/turf_decal/stripes/asteroid/corner{ dir = 4 }, @@ -2708,14 +2708,14 @@ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"ain" = ( +"in" = ( /obj/structure/largecrate, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"aio" = ( +"io" = ( /obj/item/kirbyplants, /obj/structure/sign/directions/engineering{ pixel_x = -32; @@ -2729,7 +2729,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aiq" = ( +"iq" = ( /obj/structure/railing{ dir = 1 }, @@ -2739,7 +2739,7 @@ /obj/effect/turf_decal/stripes/asteroid/line, /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/moonbase19) -"air" = ( +"ir" = ( /obj/structure/railing{ dir = 1 }, @@ -2751,7 +2751,7 @@ icon_state = "asteroid8" }, /area/ruin/space/moonbase19) -"ais" = ( +"is" = ( /obj/structure/railing/cap{ dir = 5 }, @@ -2760,7 +2760,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"ait" = ( +"it" = ( /obj/structure/railing/cap{ dir = 1 }, @@ -2769,20 +2769,20 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aiu" = ( +"iu" = ( /obj/structure/railing{ dir = 1 }, /obj/structure/table, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aiv" = ( +"iv" = ( /turf/simulated/floor/plasteel{ dir = 1; icon_state = "caution" }, /area/ruin/space/moonbase19) -"aiw" = ( +"iw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, @@ -2795,13 +2795,13 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aix" = ( +"ix" = ( /turf/simulated/floor/plasteel{ icon_state = "white"; dir = 8 }, /area/ruin/space/moonbase19) -"aiy" = ( +"iy" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/tracks{ color = "red"; @@ -2813,13 +2813,13 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aiz" = ( +"iz" = ( /obj/structure/flora/ausbushes/stalkybush, /obj/structure/flora/ausbushes/ppflowers, /obj/structure/window/full/basic, /turf/simulated/floor/grass, /area/ruin/space/moonbase19) -"aiA" = ( +"iA" = ( /obj/effect/decal/cleanable/blood/splatter{ color = "red" }, @@ -2829,7 +2829,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aiB" = ( +"iB" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, /turf/simulated/floor/plasteel{ @@ -2837,7 +2837,7 @@ dir = 1 }, /area/ruin/space/moonbase19) -"aiC" = ( +"iC" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -2845,7 +2845,7 @@ icon_state = "green" }, /area/ruin/space/moonbase19) -"aiD" = ( +"iD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, @@ -2859,14 +2859,14 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aiE" = ( +"iE" = ( /obj/effect/decal/cleanable/blood/splatter{ color = "red" }, /obj/effect/decal/remains/human, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aiF" = ( +"iF" = ( /obj/machinery/door/window/reinforced/normal{ dir = 8 }, @@ -2874,13 +2874,13 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aiG" = ( +"iG" = ( /turf/simulated/floor/plasteel{ icon_state = "black"; dir = 1 }, /area/ruin/space/moonbase19) -"aiI" = ( +"iI" = ( /obj/machinery/door/window/reinforced/normal{ dir = 4 }, @@ -2888,21 +2888,21 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aiJ" = ( +"iJ" = ( /obj/machinery/light/small, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aiL" = ( +"iL" = ( /turf/simulated/floor/plating/asteroid/airless{ icon_state = "asteroid6" }, /area/ruin/space/moonbase19) -"aiM" = ( +"iM" = ( /turf/simulated/floor/plating/asteroid/airless{ icon_state = "asteroid12" }, /area/ruin/space/moonbase19) -"aiN" = ( +"iN" = ( /obj/effect/turf_decal/caution{ dir = 4 }, @@ -2914,21 +2914,21 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aiO" = ( +"iO" = ( /obj/effect/turf_decal/delivery/white/partial, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "whitehall" }, /area/ruin/space/moonbase19) -"aiP" = ( +"iP" = ( /obj/structure/window/reinforced{ dir = 4 }, /obj/structure/window/reinforced, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aiQ" = ( +"iQ" = ( /obj/structure/kitchenspike, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plasteel{ @@ -2936,7 +2936,7 @@ temperature = 273.15 }, /area/ruin/space/moonbase19) -"aiR" = ( +"iR" = ( /obj/structure/railing{ dir = 1 }, @@ -2948,7 +2948,7 @@ icon_state = "asteroid12" }, /area/ruin/space/moonbase19) -"aiS" = ( +"iS" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced{ dir = 8 @@ -2965,11 +2965,11 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"aiT" = ( +"iT" = ( /obj/structure/fans/tiny, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aiW" = ( +"iW" = ( /obj/structure/chair{ dir = 4 }, @@ -2978,19 +2978,19 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aiX" = ( +"iX" = ( /obj/structure/bed, /obj/item/bedsheet, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/carpet, /area/ruin/space/moonbase19) -"aiY" = ( +"iY" = ( /obj/structure/flora/junglebush, /obj/structure/flora/ausbushes/brflowers, /obj/structure/window/full/basic, /turf/simulated/floor/grass, /area/ruin/space/moonbase19) -"aiZ" = ( +"iZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ d1 = 1; @@ -3003,24 +3003,24 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aja" = ( +"ja" = ( /obj/machinery/economy/arcade/claw, /turf/simulated/floor/plasteel{ icon_state = "darkfull"; dir = 8 }, /area/ruin/space/moonbase19) -"ajb" = ( +"jb" = ( /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"ajc" = ( +"jc" = ( /turf/simulated/floor/plasteel{ icon_state = "black" }, /area/ruin/space/moonbase19) -"ajf" = ( +"jf" = ( /obj/machinery/atmospherics/unary/cryo_cell, /obj/structure/window/reinforced{ dir = 8 @@ -3031,7 +3031,7 @@ /obj/effect/turf_decal/delivery/white/hollow, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"ajg" = ( +"jg" = ( /obj/structure/railing{ dir = 9 }, @@ -3039,14 +3039,14 @@ icon_state = "whitecorner" }, /area/ruin/space/moonbase19) -"ajh" = ( +"jh" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plasteel{ icon_state = "darkfull"; dir = 8 }, /area/ruin/space/moonbase19) -"aji" = ( +"ji" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 8 }, @@ -3057,19 +3057,19 @@ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"ajj" = ( +"jj" = ( /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ icon_state = "caution"; dir = 8 }, /area/ruin/space/moonbase19) -"ajk" = ( +"jk" = ( /obj/structure/flora/ausbushes/ppflowers, /obj/structure/flora/ash/rock/style_random, /turf/simulated/floor/grass, /area/ruin/space/moonbase19) -"ajl" = ( +"jl" = ( /obj/structure/table/reinforced, /obj/structure/railing/cap{ dir = 4 @@ -3084,7 +3084,7 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"ajm" = ( +"jm" = ( /obj/structure/railing{ dir = 1 }, @@ -3094,19 +3094,19 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"ajn" = ( +"jn" = ( /obj/machinery/door/airlock/centcom, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, /area/ruin/space/moonbase19) -"ajo" = ( +"jo" = ( /obj/structure/closet/cabinet, /obj/item/clothing/under/misc/assistantformal, /turf/simulated/floor/carpet, /area/ruin/space/moonbase19) -"ajp" = ( +"jp" = ( /obj/structure/railing, /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ @@ -3114,24 +3114,24 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"ajq" = ( +"jq" = ( /obj/structure/window/reinforced{ dir = 1 }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"ajr" = ( +"jr" = ( /obj/item/kirbyplants, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"ajt" = ( +"jt" = ( /obj/structure/railing/cap, /obj/structure/railing/cap{ dir = 5 }, /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/moonbase19) -"ajw" = ( +"jw" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/reinforced/normal{ dir = 8 @@ -3142,19 +3142,19 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"ajx" = ( +"jx" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/grille/broken, /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"ajy" = ( +"jy" = ( /obj/effect/decal/cleanable/dirt, /obj/item/trash/candy, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"ajz" = ( +"jz" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -3166,7 +3166,7 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"ajB" = ( +"jB" = ( /obj/structure/window/reinforced{ dir = 8 }, @@ -3178,22 +3178,22 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"ajC" = ( +"jC" = ( /obj/effect/landmark/damageturf, /mob/living/simple_animal/hostile/alien, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"ajD" = ( +"jD" = ( /obj/structure/closet/crate, /turf/simulated/floor/plasteel/stairs{ dir = 4 }, /area/ruin/space/moonbase19) -"ajE" = ( +"jE" = ( /obj/structure/grille, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"ajF" = ( +"jF" = ( /obj/structure/railing, /obj/effect/turf_decal/stripes/asteroid/end{ dir = 8 @@ -3203,13 +3203,13 @@ }, /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/moonbase19) -"ajH" = ( +"jH" = ( /turf/simulated/floor/plasteel{ icon_state = "cautioncorner"; dir = 4 }, /area/ruin/space/moonbase19) -"ajI" = ( +"jI" = ( /obj/structure/window/reinforced{ dir = 1 }, @@ -3222,7 +3222,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"ajJ" = ( +"jJ" = ( /obj/structure/window/reinforced, /obj/machinery/computer/security{ desc = "Used to access the various cameras on the outpost."; @@ -3234,7 +3234,7 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"ajK" = ( +"jK" = ( /obj/structure/railing{ dir = 4 }, @@ -3243,17 +3243,17 @@ dir = 4 }, /area/ruin/space/moonbase19) -"ajL" = ( +"jL" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"ajM" = ( +"jM" = ( /obj/structure/chair/office/dark{ dir = 4 }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"ajP" = ( +"jP" = ( /obj/structure/railing, /obj/effect/turf_decal/stripes/asteroid/line, /obj/effect/turf_decal/stripes/asteroid/line{ @@ -3261,36 +3261,36 @@ }, /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/moonbase19) -"ajQ" = ( +"jQ" = ( /obj/machinery/door/poddoor/shutters{ dir = 2 }, /turf/simulated/floor/mineral/titanium, /area/ruin/space/powered) -"ajR" = ( +"jR" = ( /turf/simulated/floor/plasteel{ dir = 4; icon_state = "blackcorner" }, /area/ruin/space/moonbase19) -"ajS" = ( +"jS" = ( /turf/simulated/floor/plasteel{ icon_state = "cautioncorner"; dir = 1 }, /area/ruin/space/moonbase19) -"ajU" = ( +"jU" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/ywflowers, /obj/structure/window/full/basic, /turf/simulated/floor/grass, /area/ruin/space/moonbase19) -"ajW" = ( +"jW" = ( /turf/simulated/floor/plating/asteroid/airless{ icon_state = "asteroid8" }, /area/ruin/space/moonbase19) -"ajY" = ( +"jY" = ( /obj/structure/chair{ dir = 4 }, @@ -3305,7 +3305,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"ajZ" = ( +"jZ" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 }, @@ -3321,7 +3321,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aka" = ( +"ka" = ( /obj/structure/railing/corner{ dir = 4 }, @@ -3330,12 +3330,12 @@ dir = 4 }, /area/ruin/space/moonbase19) -"akb" = ( +"kb" = ( /obj/structure/closet, /obj/item/storage/box/lights/mixed, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"akc" = ( +"kc" = ( /obj/structure/railing{ dir = 1 }, @@ -3354,7 +3354,7 @@ icon_state = "asteroid6" }, /area/ruin/space/moonbase19) -"akd" = ( +"kd" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 8 @@ -3365,7 +3365,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"ake" = ( +"ke" = ( /obj/structure/window/reinforced, /obj/structure/chair{ dir = 1 @@ -3379,7 +3379,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"akf" = ( +"kf" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plasteel{ @@ -3387,7 +3387,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"akg" = ( +"kg" = ( /obj/item/kirbyplants, /obj/effect/landmark/damageturf, /turf/simulated/floor/plasteel{ @@ -3395,7 +3395,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"akh" = ( +"kh" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/poddoor/impassable{ id_tag = "awayscilock" @@ -3406,11 +3406,11 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aki" = ( +"ki" = ( /obj/machinery/door/airlock/external, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"akj" = ( +"kj" = ( /obj/structure/window/reinforced{ dir = 1 }, @@ -3421,13 +3421,13 @@ /obj/effect/turf_decal/box, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"akk" = ( +"kk" = ( /turf/simulated/floor/plasteel{ icon_state = "caution"; dir = 4 }, /area/ruin/space/moonbase19) -"akm" = ( +"km" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -3436,17 +3436,17 @@ dir = 8 }, /area/ruin/space/moonbase19) -"ako" = ( +"ko" = ( /obj/structure/railing, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "caution" }, /area/ruin/space/moonbase19) -"akp" = ( +"kp" = ( /turf/simulated/floor/plating/asteroid/ancient, /area/ruin/space/moonbase19) -"akr" = ( +"kr" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -3456,7 +3456,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aks" = ( +"ks" = ( /obj/structure/window/reinforced{ dir = 8 }, @@ -3475,7 +3475,7 @@ dir = 9 }, /area/ruin/space/moonbase19) -"aku" = ( +"ku" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/portable/scrubber, /turf/simulated/floor/plasteel{ @@ -3483,7 +3483,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"akw" = ( +"kw" = ( /obj/structure/window/reinforced{ dir = 1 }, @@ -3496,14 +3496,14 @@ dir = 1 }, /area/ruin/space/moonbase19) -"akx" = ( +"kx" = ( /obj/structure/table/glass, /turf/simulated/floor/plasteel{ icon_state = "white"; dir = 8 }, /area/ruin/space/moonbase19) -"aky" = ( +"ky" = ( /obj/structure/railing/cap{ dir = 9 }, @@ -3511,7 +3511,7 @@ dir = 1 }, /area/ruin/space/moonbase19) -"akz" = ( +"kz" = ( /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -3521,14 +3521,14 @@ }, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"akB" = ( +"kB" = ( /obj/item/kirbyplants, /obj/structure/railing{ dir = 10 }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"akC" = ( +"kC" = ( /obj/machinery/light/small{ dir = 8 }, @@ -3543,7 +3543,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"akE" = ( +"kE" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -3553,14 +3553,14 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"akG" = ( +"kG" = ( /obj/item/kirbyplants, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plasteel{ icon_state = "whitecorner" }, /area/ruin/space/moonbase19) -"akJ" = ( +"kJ" = ( /obj/machinery/power/port_gen/pacman{ desc = "A portable generator for emergency backup power."; name = "P.A.C.M.A.N.-type portable generator" @@ -3570,13 +3570,13 @@ dir = 8 }, /area/ruin/space/moonbase19) -"akM" = ( +"kM" = ( /obj/structure/flora/ausbushes/sunnybush, /obj/structure/flora/ausbushes/ywflowers, /obj/structure/window/full/basic, /turf/simulated/floor/grass, /area/ruin/space/moonbase19) -"akN" = ( +"kN" = ( /obj/item/kirbyplants, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -3591,7 +3591,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"akO" = ( +"kO" = ( /obj/machinery/computer/security/telescreen{ desc = "Used for monitoring the research division and the labs within."; name = "research monitor"; @@ -3600,7 +3600,7 @@ }, /turf/simulated/floor/carpet/royalblue, /area/ruin/space/moonbase19) -"akQ" = ( +"kQ" = ( /obj/structure/window/reinforced{ dir = 1 }, @@ -3613,11 +3613,11 @@ dir = 1 }, /area/ruin/space/moonbase19) -"akR" = ( +"kR" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"akW" = ( +"kW" = ( /obj/machinery/door/airlock/centcom{ req_access_txt = "271" }, @@ -3626,7 +3626,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"akX" = ( +"kX" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -3638,18 +3638,18 @@ dir = 8 }, /area/ruin/space/moonbase19) -"akZ" = ( +"kZ" = ( /obj/structure/flora/rock/jungle, /turf/simulated/floor/grass, /area/ruin/space/moonbase19) -"ala" = ( +"la" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /mob/living/simple_animal/hostile/alien, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"alc" = ( +"lc" = ( /obj/machinery/shieldwallgen{ locked = 0; req_access = null @@ -3661,7 +3661,7 @@ /obj/effect/turf_decal/box, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"ali" = ( +"li" = ( /obj/structure/railing{ dir = 1 }, @@ -3670,13 +3670,13 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"alk" = ( +"lk" = ( /obj/machinery/light/small, /turf/simulated/floor/plasteel{ icon_state = "black" }, /area/ruin/space/moonbase19) -"alm" = ( +"lm" = ( /obj/effect/turf_decal/stripes/asteroid/line, /obj/effect/decal/cleanable/dirt, /obj/structure/railing, @@ -3684,20 +3684,20 @@ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"alo" = ( +"lo" = ( /obj/structure/barricade/wooden{ layer = 4 }, /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"alp" = ( +"lp" = ( /turf/simulated/floor/plasteel{ dir = 9; icon_state = "black" }, /area/ruin/space/moonbase19) -"alq" = ( +"lq" = ( /obj/machinery/door/airlock{ req_access_txt = "271" }, @@ -3709,30 +3709,30 @@ dir = 8 }, /area/ruin/space/moonbase19) -"alv" = ( +"lv" = ( /obj/structure/largecrate, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"alz" = ( +"lz" = ( /obj/machinery/photocopier, /turf/simulated/floor/plasteel{ icon_state = "darkfull"; dir = 8 }, /area/ruin/space/moonbase19) -"alC" = ( -/obj/item/reagent_containers/food/snacks/beans, -/obj/item/reagent_containers/food/snacks/beans{ +"lC" = ( +/obj/item/food/snacks/beans, +/obj/item/food/snacks/beans{ pixel_y = 6; pixel_x = 9 }, -/obj/item/reagent_containers/food/snacks/beans{ +/obj/item/food/snacks/beans{ pixel_y = 3; pixel_x = 3 }, -/obj/item/reagent_containers/food/snacks/beans{ +/obj/item/food/snacks/beans{ pixel_y = 1; pixel_x = -5 }, @@ -3742,7 +3742,7 @@ dir = 9 }, /area/ruin/space/moonbase19) -"alD" = ( +"lD" = ( /obj/item/kirbyplants, /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, @@ -3750,7 +3750,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"alF" = ( +"lF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -3764,7 +3764,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"alH" = ( +"lH" = ( /obj/machinery/power/port_gen/pacman{ desc = "A portable generator for emergency backup power."; name = "P.A.C.M.A.N.-type portable generator" @@ -3779,7 +3779,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"alI" = ( +"lI" = ( /obj/item/kirbyplants, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -3787,7 +3787,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"alL" = ( +"lL" = ( /obj/structure/railing{ dir = 8 }, @@ -3798,39 +3798,39 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"alM" = ( +"lM" = ( /obj/structure/closet/firecloset, /obj/structure/window/reinforced{ dir = 1 }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"alN" = ( +"lN" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "black"; dir = 1 }, /area/ruin/space/moonbase19) -"alP" = ( +"lP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet/royalblue, /area/ruin/space/moonbase19) -"alQ" = ( +"lQ" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "dark" }, /area/ruin/space/moonbase19) -"alS" = ( +"lS" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/plating/asteroid/airless{ icon_state = "asteroid4" }, /area/ruin/space/moonbase19) -"alT" = ( +"lT" = ( /obj/structure/chair/office/dark{ dir = 8 }, @@ -3840,23 +3840,23 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"alX" = ( +"lX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"alY" = ( +"lY" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "caution" }, /area/ruin/space/moonbase19) -"amb" = ( +"mb" = ( /obj/structure/closet/cabinet, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/carpet, /area/ruin/space/moonbase19) -"amd" = ( +"md" = ( /obj/structure/chair/sofa/bench/left{ dir = 1 }, @@ -3865,7 +3865,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"amh" = ( +"mh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, @@ -3879,7 +3879,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"amj" = ( +"mj" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel{ @@ -3887,7 +3887,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"amk" = ( +"mk" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -3900,7 +3900,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"amm" = ( +"mm" = ( /obj/machinery/conveyor/east{ id = "awayfusrodah" }, @@ -3909,7 +3909,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"amn" = ( +"mn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -3921,14 +3921,14 @@ icon_state = "cautioncorner" }, /area/ruin/space/moonbase19) -"amq" = ( +"mq" = ( /obj/machinery/atmospherics/unary/outlet_injector/on{ dir = 4; volume_rate = 200 }, /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/moonbase19) -"amr" = ( +"mr" = ( /obj/machinery/light/small{ dir = 8 }, @@ -3938,7 +3938,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"ams" = ( +"ms" = ( /obj/machinery/door/window{ dir = 8 }, @@ -3949,7 +3949,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"amt" = ( +"mt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, @@ -3961,7 +3961,7 @@ icon_state = "cautioncorner" }, /area/ruin/space/moonbase19) -"amu" = ( +"mu" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery/partial{ dir = 4 @@ -3971,21 +3971,21 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"amv" = ( +"mv" = ( /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "caution" }, /area/ruin/space/moonbase19) -"amw" = ( +"mw" = ( /obj/structure/alien/resin/wall, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"amx" = ( +"mx" = ( /obj/machinery/shieldwallgen{ locked = 0; req_access = null @@ -3994,7 +3994,7 @@ /obj/effect/turf_decal/box, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"amy" = ( +"my" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -4003,7 +4003,7 @@ icon_state = "cautioncorner" }, /area/ruin/space/moonbase19) -"amz" = ( +"mz" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/splatter{ color = "red" @@ -4012,7 +4012,7 @@ icon_state = "whitehall" }, /area/ruin/space/moonbase19) -"amB" = ( +"mB" = ( /obj/machinery/economy/vending/cigarette, /obj/machinery/light/small{ dir = 8 @@ -4027,7 +4027,7 @@ icon_state = "escape" }, /area/ruin/space/moonbase19) -"amC" = ( +"mC" = ( /obj/effect/decal/cleanable/blood/tracks{ color = "red"; desc = "Your instincts say you shouldn't be following these."; @@ -4039,7 +4039,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"amH" = ( +"mH" = ( /obj/machinery/light/small{ dir = 1 }, @@ -4054,26 +4054,26 @@ icon_state = "escape" }, /area/ruin/space/moonbase19) -"amJ" = ( +"mJ" = ( /turf/simulated/floor/plasteel{ icon_state = "darkfull"; dir = 8 }, /area/ruin/space/moonbase19) -"amK" = ( +"mK" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/alien/resin/wall, /obj/machinery/atmospherics/air_sensor, /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"amM" = ( +"mM" = ( /obj/machinery/floodlight, /turf/simulated/floor/plasteel{ icon_state = "yellowsiding"; dir = 5 }, /area/ruin/space/moonbase19) -"amS" = ( +"mS" = ( /obj/machinery/conveyor/east{ id = "awayfusrodah" }, @@ -4095,7 +4095,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"amT" = ( +"mT" = ( /obj/item/kitchen/knife, /obj/item/kitchen/rollingpin, /obj/structure/table, @@ -4104,7 +4104,7 @@ temperature = 273.15 }, /area/ruin/space/moonbase19) -"amU" = ( +"mU" = ( /obj/machinery/shieldwallgen{ locked = 0; req_access = null @@ -4126,7 +4126,7 @@ /obj/effect/turf_decal/box, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"amV" = ( +"mV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -4138,7 +4138,7 @@ /mob/living/simple_animal/hostile/alien/sentinel, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"amW" = ( +"mW" = ( /obj/effect/decal/cleanable/cobweb, /obj/machinery/computer/security{ desc = "Used to access the various cameras on the outpost."; @@ -4148,7 +4148,7 @@ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"amX" = ( +"mX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, @@ -4157,7 +4157,7 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"ana" = ( +"na" = ( /obj/structure/sign/nosmoking_1{ pixel_x = -32 }, @@ -4177,7 +4177,7 @@ }, /turf/simulated/floor/plasteel/stairs, /area/ruin/space/moonbase19) -"anc" = ( +"nc" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/machinery/light/small{ dir = 8 @@ -4188,28 +4188,28 @@ icon_state = "black" }, /area/ruin/space/moonbase19) -"anf" = ( +"nf" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 }, /obj/structure/alien/resin/wall, /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"ang" = ( +"ng" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "darkblue"; dir = 8 }, /area/ruin/space/moonbase19) -"anh" = ( +"nh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, /turf/simulated/floor/carpet/royalblue, /area/ruin/space/moonbase19) -"ank" = ( +"nk" = ( /obj/structure/sign/electricshock{ pixel_y = 32 }, @@ -4219,7 +4219,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"anl" = ( +"nl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, @@ -4236,44 +4236,44 @@ /obj/effect/spawner/window/reinforced/tinted/grilled, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"anm" = ( +"nm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"ann" = ( +"nn" = ( /obj/effect/spawner/window/reinforced/tinted/grilled, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"ant" = ( +"nt" = ( /turf/simulated/floor/plasteel{ dir = 8; icon_state = "black" }, /area/ruin/space/moonbase19) -"anu" = ( +"nu" = ( /obj/structure/lattice, /obj/item/stack/sheet/plasteel, /turf/template_noop, /area/space/nearstation) -"anw" = ( +"nw" = ( /obj/machinery/door/airlock, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/carpet, /area/ruin/space/moonbase19) -"anx" = ( +"nx" = ( /obj/machinery/door/airlock/centcom{ req_access_txt = "271"; name = "Engineering Division" }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"any" = ( +"ny" = ( /obj/effect/landmark/damageturf, /turf/simulated/floor/plating/airless, /area/space/nearstation) -"anz" = ( +"nz" = ( /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -4281,7 +4281,7 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"anA" = ( +"nA" = ( /obj/structure/rack, /obj/item/flashlight/flare, /obj/item/flashlight/flare, @@ -4292,7 +4292,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"anC" = ( +"nC" = ( /obj/structure/closet/secure_closet, /obj/machinery/camera{ c_tag = "Security Checkpoint"; @@ -4305,7 +4305,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"anE" = ( +"nE" = ( /obj/structure/cable{ d1 = 1; d2 = 2; @@ -4318,7 +4318,7 @@ }, /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"anG" = ( +"nG" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/splatter{ color = "red" @@ -4328,14 +4328,14 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"anI" = ( +"nI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"anJ" = ( +"nJ" = ( /obj/structure/railing/cap{ dir = 10 }, @@ -4350,7 +4350,7 @@ icon_state = "green" }, /area/ruin/space/moonbase19) -"anK" = ( +"nK" = ( /obj/structure/cable{ d1 = 1; d2 = 2; @@ -4361,7 +4361,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"anO" = ( +"nO" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/machinery/light/small{ dir = 1 @@ -4372,14 +4372,14 @@ dir = 9 }, /area/ruin/space/moonbase19) -"anQ" = ( +"nQ" = ( /obj/structure/railing, /obj/structure/closet/cardboard, /turf/simulated/floor/plasteel{ icon_state = "caution" }, /area/ruin/space/moonbase19) -"anV" = ( +"nV" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -4388,7 +4388,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"anW" = ( +"nW" = ( /obj/structure/railing{ dir = 10 }, @@ -4397,7 +4397,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"anX" = ( +"nX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, @@ -4407,14 +4407,14 @@ /mob/living/simple_animal/hostile/alien, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"anZ" = ( +"nZ" = ( /obj/structure/window/reinforced, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aoc" = ( +"oc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, @@ -4429,13 +4429,13 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aod" = ( +"od" = ( /obj/structure/chair/office/dark, /turf/simulated/floor/plasteel{ icon_state = "black" }, /area/ruin/space/moonbase19) -"aoh" = ( +"oh" = ( /obj/structure/sign/poster/contraband/lusty_xenomorph{ pixel_y = 32 }, @@ -4446,7 +4446,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aoi" = ( +"oi" = ( /obj/structure/chair/office/dark{ dir = 4 }, @@ -4461,7 +4461,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aok" = ( +"ok" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ @@ -4472,13 +4472,13 @@ /mob/living/simple_animal/hostile/alien, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aon" = ( +"on" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aoo" = ( +"oo" = ( /obj/structure/chair/office/dark, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -4486,14 +4486,14 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aop" = ( +"op" = ( /mob/living/simple_animal/hostile/alien/sentinel, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aor" = ( +"or" = ( /obj/machinery/light/small{ dir = 4 }, @@ -4502,13 +4502,13 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aot" = ( +"ot" = ( /obj/structure/railing{ dir = 8 }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aov" = ( +"ov" = ( /obj/effect/turf_decal/caution/stand_clear/white{ dir = 4 }, @@ -4517,14 +4517,14 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aow" = ( +"ow" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aoA" = ( +"oA" = ( /obj/effect/decal/cleanable/blood/tracks{ color = "red"; desc = "Your instincts say you shouldn't be following these."; @@ -4537,7 +4537,7 @@ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"aoD" = ( +"oD" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -4545,7 +4545,7 @@ icon_state = "escape" }, /area/ruin/space/moonbase19) -"aoF" = ( +"oF" = ( /obj/structure/chair/sofa/bench/left, /obj/machinery/camera{ c_tag = "East Research Division"; @@ -4557,7 +4557,7 @@ dir = 1 }, /area/ruin/space/moonbase19) -"aoH" = ( +"oH" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable{ d1 = 2; @@ -4574,7 +4574,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aoJ" = ( +"oJ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/tracks{ color = "red"; @@ -4586,7 +4586,7 @@ }, /turf/simulated/floor/plating/asteroid/ancient, /area/ruin/space/moonbase19) -"aoL" = ( +"oL" = ( /obj/structure/rack, /obj/structure/window/reinforced{ dir = 1 @@ -4594,7 +4594,7 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aoM" = ( +"oM" = ( /obj/structure/chair{ dir = 1 }, @@ -4603,7 +4603,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aoP" = ( +"oP" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light{ dir = 4 @@ -4616,12 +4616,12 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aoR" = ( +"oR" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/grille/broken, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aoS" = ( +"oS" = ( /obj/structure/railing{ dir = 8 }, @@ -4630,7 +4630,7 @@ dir = 1 }, /area/ruin/space/moonbase19) -"aoT" = ( +"oT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -4638,14 +4638,14 @@ icon_state = "green" }, /area/ruin/space/moonbase19) -"aoU" = ( +"oU" = ( /obj/item/kirbyplants, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, /area/ruin/space/moonbase19) -"aoX" = ( +"oX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, @@ -4653,7 +4653,7 @@ icon_state = "greencorner" }, /area/ruin/space/moonbase19) -"aoZ" = ( +"oZ" = ( /obj/effect/decal/cleanable/blood/splatter{ color = "red" }, @@ -4668,14 +4668,14 @@ }, /turf/simulated/floor/plating/asteroid/ancient, /area/ruin/space/moonbase19) -"apa" = ( +"pa" = ( /obj/structure/table, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "caution" }, /area/ruin/space/moonbase19) -"ape" = ( +"pe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, @@ -4692,13 +4692,13 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aph" = ( +"ph" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/plating/asteroid/airless{ icon_state = "asteroid4" }, /area/ruin/space/moonbase19) -"api" = ( +"pi" = ( /obj/effect/turf_decal/loading_area{ dir = 4 }, @@ -4710,20 +4710,20 @@ icon_state = "escape" }, /area/ruin/space/moonbase19) -"apm" = ( +"pm" = ( /obj/structure/largecrate, /turf/simulated/floor/plasteel{ icon_state = "darkfull"; dir = 8 }, /area/ruin/space/moonbase19) -"apn" = ( +"pn" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/plating/asteroid/airless{ icon_state = "asteroid3" }, /area/ruin/space/moonbase19) -"app" = ( +"pp" = ( /obj/structure/cable{ d1 = 1; d2 = 2; @@ -4738,7 +4738,7 @@ /obj/structure/table/reinforced, /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"apq" = ( +"pq" = ( /obj/structure/railing/cap{ dir = 5 }, @@ -4748,7 +4748,7 @@ icon_state = "blackcorner" }, /area/ruin/space/moonbase19) -"apr" = ( +"pr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, @@ -4759,7 +4759,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aps" = ( +"ps" = ( /obj/structure/window/reinforced{ dir = 1 }, @@ -4769,7 +4769,7 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"apt" = ( +"pt" = ( /obj/structure/railing{ dir = 1 }, @@ -4777,7 +4777,7 @@ /obj/item/flashlight/flare/glowstick, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"apu" = ( +"pu" = ( /obj/effect/decal/cleanable/greenglow, /obj/structure/railing/cap{ dir = 8 @@ -4787,19 +4787,19 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"apz" = ( +"pz" = ( /turf/simulated/floor/plasteel{ icon_state = "caution" }, /area/ruin/space/moonbase19) -"apB" = ( +"pB" = ( /obj/structure/rack, /obj/item/paicard{ pixel_x = -4 }, /turf/simulated/floor/carpet/royalblue, /area/ruin/space/moonbase19) -"apD" = ( +"pD" = ( /obj/structure/chair/sofa/bench/right{ dir = 4 }, @@ -4808,12 +4808,12 @@ dir = 10 }, /area/ruin/space/moonbase19) -"apE" = ( +"pE" = ( /turf/simulated/floor/plasteel{ icon_state = "yellowsiding" }, /area/ruin/space/moonbase19) -"apF" = ( +"pF" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -4821,7 +4821,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"apI" = ( +"pI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -4830,17 +4830,17 @@ dir = 1 }, /area/ruin/space/moonbase19) -"apK" = ( +"pK" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating/asteroid/ancient, /area/ruin/space/moonbase19) -"apL" = ( +"pL" = ( /obj/structure/rack, /obj/effect/decal/cleanable/cobweb2, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"apN" = ( +"pN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/xeno{ color = "green" @@ -4851,7 +4851,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"apP" = ( +"pP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, @@ -4861,7 +4861,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"apQ" = ( +"pQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -4879,11 +4879,11 @@ icon_state = "cautioncorner" }, /area/ruin/space/moonbase19) -"apR" = ( +"pR" = ( /obj/structure/closet/secure_closet/freezer/fridge, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"apS" = ( +"pS" = ( /obj/machinery/light/small{ dir = 8 }, @@ -4893,7 +4893,7 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"apV" = ( +"pV" = ( /obj/machinery/door/poddoor/impassable{ id_tag = "awayscilock" }, @@ -4903,7 +4903,7 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"apW" = ( +"pW" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable{ d1 = 2; @@ -4915,12 +4915,12 @@ dir = 8 }, /area/ruin/space/moonbase19) -"apZ" = ( +"pZ" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/food/snacks/badrecipe, +/obj/item/food/snacks/badrecipe, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aqa" = ( +"qa" = ( /obj/structure/chair/sofa/bench{ dir = 8 }, @@ -4935,7 +4935,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aqb" = ( +"qb" = ( /obj/structure/railing/cap{ dir = 10 }, @@ -4947,7 +4947,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aqc" = ( +"qc" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/alien/sentinel, /turf/simulated/floor/plasteel{ @@ -4955,7 +4955,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aqj" = ( +"qj" = ( /obj/structure/railing/cap{ dir = 9 }, @@ -4963,7 +4963,7 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"aqm" = ( +"qm" = ( /obj/structure/cable{ d1 = 1; d2 = 4; @@ -4978,7 +4978,7 @@ }, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aqo" = ( +"qo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -4989,7 +4989,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aqp" = ( +"qp" = ( /obj/structure/railing{ dir = 8 }, @@ -4998,7 +4998,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aqq" = ( +"qq" = ( /obj/structure/table/reinforced, /obj/item/clipboard{ pixel_y = 2; @@ -5013,7 +5013,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aqr" = ( +"qr" = ( /obj/structure/window/reinforced{ dir = 8 }, @@ -5022,7 +5022,7 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aqt" = ( +"qt" = ( /obj/machinery/power/smes{ input_level = 10000; inputting = 0; @@ -5032,14 +5032,14 @@ /obj/structure/cable, /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"aqu" = ( +"qu" = ( /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "escape" }, /area/ruin/space/moonbase19) -"aqv" = ( +"qv" = ( /obj/structure/disposalpipe/segment{ desc = "An underfloor disposal pipe. This one has been applied with an acid-proof coating."; dir = 2; @@ -5051,14 +5051,14 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aqx" = ( +"qx" = ( /obj/machinery/door/airlock/centcom{ req_access_txt = "271"; name = "Cafeteria" }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aqA" = ( +"qA" = ( /obj/effect/decal/cleanable/blood/tracks{ color = "red"; desc = "Your instincts say you shouldn't be following these."; @@ -5071,7 +5071,7 @@ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"aqB" = ( +"qB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -5084,7 +5084,7 @@ icon_state = "escape" }, /area/ruin/space/moonbase19) -"aqC" = ( +"qC" = ( /obj/structure/chair/sofa/bench/left{ dir = 8 }, @@ -5098,7 +5098,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aqD" = ( +"qD" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -5107,14 +5107,14 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aqF" = ( +"qF" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "caution" }, /area/ruin/space/moonbase19) -"aqI" = ( +"qI" = ( /obj/structure/railing{ dir = 1 }, @@ -5123,7 +5123,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aqM" = ( +"qM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/air_sensor, @@ -5135,7 +5135,7 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aqQ" = ( +"qQ" = ( /obj/machinery/kitchen_machine/grill, /obj/machinery/light/small{ dir = 8 @@ -5146,7 +5146,7 @@ temperature = 273.15 }, /area/ruin/space/moonbase19) -"aqS" = ( +"qS" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb2, /obj/effect/turf_decal/delivery/hollow, @@ -5156,14 +5156,14 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"aqY" = ( +"qY" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "black" }, /area/ruin/space/moonbase19) -"are" = ( +"re" = ( /obj/structure/railing/cap{ dir = 8 }, @@ -5175,14 +5175,14 @@ dir = 1 }, /area/ruin/space/moonbase19) -"arf" = ( +"rf" = ( /obj/structure/bed, /obj/item/bedsheet, /obj/effect/decal/cleanable/cobweb2, /obj/item/toy/plushie/lizardplushie, /turf/simulated/floor/carpet, /area/ruin/space/moonbase19) -"ari" = ( +"ri" = ( /obj/item/radio/off{ pixel_x = -8 }, @@ -5202,7 +5202,7 @@ /obj/structure/table, /turf/simulated/floor/plating/asteroid/ancient, /area/ruin/space/moonbase19) -"ark" = ( +"rk" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/damageturf, /obj/effect/turf_decal/delivery/partial{ @@ -5213,7 +5213,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"arl" = ( +"rl" = ( /obj/structure/sink{ dir = 8; pixel_x = -12; @@ -5224,7 +5224,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"arm" = ( +"rm" = ( /obj/structure/railing/cap, /obj/structure/railing/cap{ dir = 10 @@ -5237,7 +5237,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aro" = ( +"ro" = ( /obj/structure/railing/cap, /obj/structure/alien/resin/wall, /turf/simulated/floor/plasteel{ @@ -5245,7 +5245,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"arp" = ( +"rp" = ( /obj/effect/decal/cleanable/blood/xeno{ color = "green" }, @@ -5254,7 +5254,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"arq" = ( +"rq" = ( /obj/structure/railing/cap{ dir = 6 }, @@ -5262,7 +5262,7 @@ dir = 1 }, /area/ruin/space/moonbase19) -"ars" = ( +"rs" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/blood/splatter{ @@ -5278,27 +5278,27 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aru" = ( +"ru" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "green" }, /area/ruin/space/moonbase19) -"arv" = ( +"rv" = ( /turf/simulated/floor/plasteel{ icon_state = "whitehall"; dir = 1 }, /area/ruin/space/moonbase19) -"arx" = ( +"rx" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "caution" }, /area/ruin/space/moonbase19) -"ary" = ( +"ry" = ( /obj/structure/table/reinforced, /obj/item/clothing/glasses/meson, /obj/structure/cable{ @@ -5309,7 +5309,7 @@ /obj/item/paper/fluff/ruins/moonoutpost19/engineering, /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"arB" = ( +"rB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, @@ -5319,7 +5319,7 @@ icon_state = "escape" }, /area/ruin/space/moonbase19) -"arC" = ( +"rC" = ( /obj/structure/railing/corner{ dir = 8 }, @@ -5327,7 +5327,7 @@ icon_state = "asteroid5" }, /area/ruin/space/moonbase19) -"arD" = ( +"rD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -5337,7 +5337,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"arE" = ( +"rE" = ( /obj/effect/decal/cleanable/blood/tracks{ color = "red"; desc = "Your instincts say you shouldn't be following these."; @@ -5347,26 +5347,26 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"arG" = ( +"rG" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/plating/asteroid/ancient, /area/ruin/space/moonbase19) -"arH" = ( +"rH" = ( /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "escape" }, /area/ruin/space/moonbase19) -"arJ" = ( +"rJ" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "black" }, /area/ruin/space/moonbase19) -"arK" = ( +"rK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -5386,14 +5386,14 @@ dir = 8 }, /area/ruin/space/moonbase19) -"arL" = ( +"rL" = ( /obj/structure/chair/sofa/bench/left, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "caution" }, /area/ruin/space/moonbase19) -"arN" = ( +"rN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -5402,11 +5402,11 @@ dir = 8 }, /area/ruin/space/moonbase19) -"arP" = ( +"rP" = ( /obj/structure/flora/ash/rock/style_random, /turf/simulated/floor/plating/asteroid/ancient, /area/ruin/space/moonbase19) -"arQ" = ( +"rQ" = ( /obj/structure/railing/cap, /obj/effect/decal/cleanable/blood/splatter{ color = "red" @@ -5416,7 +5416,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"arS" = ( +"rS" = ( /obj/structure/cable{ d1 = 1; d2 = 2; @@ -5435,7 +5435,7 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"arT" = ( +"rT" = ( /obj/structure/window/reinforced{ dir = 8 }, @@ -5448,7 +5448,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"arV" = ( +"rV" = ( /obj/machinery/door/airlock{ req_access_txt = "271"; name = "Dorms" @@ -5458,13 +5458,13 @@ icon_state = "green" }, /area/ruin/space/moonbase19) -"arW" = ( +"rW" = ( /turf/simulated/floor/plasteel{ icon_state = "escapecorner"; dir = 8 }, /area/ruin/space/moonbase19) -"arY" = ( +"rY" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -5473,13 +5473,13 @@ dir = 4 }, /area/ruin/space/moonbase19) -"arZ" = ( +"rZ" = ( /obj/machinery/door/airlock/maintenance_hatch{ req_access_txt = "271" }, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"asa" = ( +"sa" = ( /obj/structure/sign/radiation/rad_area{ pixel_y = 32 }, @@ -5490,14 +5490,14 @@ dir = 4 }, /area/ruin/space/moonbase19) -"asc" = ( +"sc" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/splatter{ color = "red" }, /turf/simulated/floor/carpet, /area/ruin/space/moonbase19) -"ase" = ( +"se" = ( /obj/effect/turf_decal/stripes/asteroid/corner{ dir = 8 }, @@ -5505,7 +5505,7 @@ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"asg" = ( +"sg" = ( /obj/effect/decal/cleanable/cobweb, /obj/structure/railing, /turf/simulated/floor/plasteel{ @@ -5513,7 +5513,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"ash" = ( +"sh" = ( /obj/machinery/recharger{ pixel_y = 4 }, @@ -5525,7 +5525,7 @@ /obj/structure/table/reinforced, /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"asi" = ( +"si" = ( /obj/structure/cable{ d1 = 1; d2 = 2; @@ -5533,7 +5533,7 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"asj" = ( +"sj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -5541,7 +5541,7 @@ dir = 1 }, /area/ruin/space/moonbase19) -"ask" = ( +"sk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -5558,7 +5558,7 @@ dir = 1 }, /area/ruin/space/moonbase19) -"asl" = ( +"sl" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -5570,11 +5570,11 @@ /obj/structure/alien/resin/wall, /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"asm" = ( +"sm" = ( /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"asn" = ( +"sn" = ( /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id_tag = "awayscilock2" @@ -5587,7 +5587,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aso" = ( +"so" = ( /obj/structure/railing/corner{ dir = 8 }, @@ -5595,7 +5595,7 @@ icon_state = "asteroid6" }, /area/ruin/space/moonbase19) -"asp" = ( +"sp" = ( /obj/item/kirbyplants, /obj/structure/railing, /obj/structure/cable{ @@ -5608,7 +5608,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"asq" = ( +"sq" = ( /obj/structure/chair/office/dark{ dir = 4 }, @@ -5618,7 +5618,7 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"asv" = ( +"sv" = ( /obj/machinery/power/terminal{ dir = 1 }, @@ -5628,15 +5628,15 @@ }, /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"asy" = ( +"sy" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/wall/r_wall, /area/ruin/space/moonbase19) -"asF" = ( +"sF" = ( /obj/effect/spawner/random_spawners/wall_rusted_always, /turf/simulated/wall/indestructible/riveted, /area/ruin/space/moonbase19) -"asK" = ( +"sK" = ( /obj/structure/chair/sofa/bench/left{ dir = 8 }, @@ -5645,34 +5645,34 @@ dir = 4 }, /area/ruin/space/moonbase19) -"asL" = ( +"sL" = ( /obj/machinery/door/airlock/external/glass, /turf/simulated/floor/plating/asteroid/ancient, /area/ruin/space/moonbase19) -"asR" = ( +"sR" = ( /obj/structure/chair/sofa/bench/left, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"asV" = ( +"sV" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/grass, /area/ruin/space/moonbase19) -"asY" = ( +"sY" = ( /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "caution" }, /area/ruin/space/moonbase19) -"asZ" = ( +"sZ" = ( /obj/structure/chair/office/dark, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "dark" }, /area/ruin/space/moonbase19) -"atb" = ( +"tb" = ( /obj/structure/sign/securearea{ pixel_x = -32 }, @@ -5684,14 +5684,14 @@ dir = 8 }, /area/ruin/space/moonbase19) -"atc" = ( +"tc" = ( /obj/structure/railing{ dir = 4 }, /obj/item/kirbyplants, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"atd" = ( +"td" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -5699,7 +5699,7 @@ dir = 1 }, /area/ruin/space/moonbase19) -"ate" = ( +"te" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, @@ -5709,7 +5709,7 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"atf" = ( +"tf" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -5721,20 +5721,20 @@ /obj/machinery/atmospherics/air_sensor, /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"ath" = ( +"th" = ( /obj/structure/chair/office/dark{ dir = 1 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"atj" = ( +"tj" = ( /obj/structure/railing/cap, /obj/structure/flora/ash/rock/style_random, /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/moonbase19) -"atk" = ( +"tk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -5754,7 +5754,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"atl" = ( +"tl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/blood/tracks{ color = "red"; @@ -5766,21 +5766,21 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"atm" = ( +"tm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, /obj/effect/landmark/damageturf, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"ato" = ( +"to" = ( /obj/structure/railing{ dir = 4 }, /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/moonbase19) -"atp" = ( +"tp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, @@ -5792,7 +5792,7 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"ats" = ( +"ts" = ( /obj/structure/railing{ dir = 10 }, @@ -5809,11 +5809,11 @@ dir = 1 }, /area/ruin/space/moonbase19) -"atv" = ( +"tv" = ( /obj/structure/largecrate, /turf/simulated/floor/plating/asteroid/ancient, /area/ruin/space/moonbase19) -"atw" = ( +"tw" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced{ dir = 8 @@ -5826,12 +5826,12 @@ dir = 8 }, /area/ruin/space/moonbase19) -"atx" = ( +"tx" = ( /obj/structure/window/reinforced, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"atD" = ( +"tD" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/noticeboard{ pixel_x = -32 @@ -5840,12 +5840,12 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"atE" = ( +"tE" = ( /obj/structure/closet/crate/secure/loot, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"atG" = ( +"tG" = ( /obj/structure/cable{ d1 = 1; d2 = 4; @@ -5859,7 +5859,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"atI" = ( +"tI" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/splatter{ color = "red" @@ -5868,7 +5868,7 @@ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"atR" = ( +"tR" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced{ dir = 4 @@ -5881,7 +5881,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"atV" = ( +"tV" = ( /obj/effect/decal/cleanable/blood/splatter{ color = "red" }, @@ -5890,21 +5890,21 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"atW" = ( +"tW" = ( /obj/structure/grille/broken, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"atX" = ( +"tX" = ( /turf/simulated/wall/indestructible/rock, /area/ruin/space/moonbase19) -"atY" = ( +"tY" = ( /obj/machinery/economy/vending/dinnerware, /turf/simulated/floor/plasteel{ icon_state = "darkfull"; dir = 8 }, /area/ruin/space/moonbase19) -"atZ" = ( +"tZ" = ( /obj/structure/railing/corner{ dir = 4 }, @@ -5916,7 +5916,7 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aub" = ( +"ub" = ( /obj/structure/cable, /obj/machinery/power/smes{ input_level = 10000; @@ -5926,7 +5926,7 @@ }, /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"auf" = ( +"uf" = ( /obj/structure/window/reinforced, /mob/living/simple_animal/hostile/alien/drone, /turf/simulated/floor/plasteel{ @@ -5934,14 +5934,14 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aug" = ( +"ug" = ( /obj/structure/railing{ dir = 6 }, /obj/structure/chair, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"auh" = ( +"uh" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 }, @@ -5956,12 +5956,12 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"auj" = ( +"uj" = ( /obj/effect/decal/remains/human, /obj/item/reagent_containers/hypospray/autoinjector/survival, /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/moonbase19) -"aup" = ( +"up" = ( /obj/structure/chair/sofa/bench{ dir = 8 }, @@ -5970,7 +5970,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aur" = ( +"ur" = ( /obj/machinery/light/small{ active_power_consumption = 0; dir = 4; @@ -5983,7 +5983,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"auv" = ( +"uv" = ( /obj/structure/railing/cap{ dir = 9 }, @@ -5991,7 +5991,7 @@ icon_state = "asteroid12" }, /area/ruin/space/moonbase19) -"auw" = ( +"uw" = ( /obj/structure/chair/comfy/brown{ dir = 8 }, @@ -6001,14 +6001,14 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"auA" = ( +"uA" = ( /obj/structure/closet/crate, /turf/simulated/floor/plasteel{ icon_state = "white"; dir = 8 }, /area/ruin/space/moonbase19) -"auG" = ( +"uG" = ( /obj/structure/railing{ dir = 4 }, @@ -6016,7 +6016,7 @@ dir = 1 }, /area/ruin/space/moonbase19) -"auJ" = ( +"uJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ @@ -6034,7 +6034,7 @@ /obj/effect/spawner/window/reinforced/tinted/grilled, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"auM" = ( +"uM" = ( /obj/machinery/light/small, /obj/structure/noticeboard{ pixel_y = -32 @@ -6043,7 +6043,7 @@ icon_state = "black" }, /area/ruin/space/moonbase19) -"auO" = ( +"uO" = ( /obj/structure/table/reinforced, /obj/item/storage/fancy/vials, /turf/simulated/floor/plasteel{ @@ -6051,14 +6051,14 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"auP" = ( +"uP" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 }, /obj/structure/alien/resin/wall, /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"auR" = ( +"uR" = ( /obj/effect/decal/cleanable/blood/tracks{ color = "red"; desc = "Your instincts say you shouldn't be following these."; @@ -6068,7 +6068,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"auS" = ( +"uS" = ( /obj/structure/railing{ dir = 8 }, @@ -6080,7 +6080,7 @@ dir = 9 }, /area/ruin/space/moonbase19) -"auT" = ( +"uT" = ( /obj/structure/railing/cap{ dir = 10 }, @@ -6089,26 +6089,26 @@ dir = 4 }, /area/ruin/space/moonbase19) -"auV" = ( +"uV" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"auX" = ( +"uX" = ( /obj/structure/table/glass/reinforced/titanium, /obj/item/paper_bin, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"ava" = ( +"va" = ( /obj/machinery/economy/vending/cola, /turf/simulated/floor/plasteel{ icon_state = "darkfull"; dir = 8 }, /area/ruin/space/moonbase19) -"avd" = ( +"vd" = ( /obj/structure/cable{ d1 = 1; d2 = 2; @@ -6121,14 +6121,14 @@ }, /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"ave" = ( +"ve" = ( /obj/structure/window/reinforced{ dir = 8 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"avf" = ( +"vf" = ( /obj/machinery/light/small{ dir = 1 }, @@ -6138,7 +6138,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"avh" = ( +"vh" = ( /obj/structure/rack, /obj/item/mecha_parts/core, /obj/item/stock_parts/cell/infinite, @@ -6147,26 +6147,26 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"avm" = ( +"vm" = ( /obj/machinery/atmospherics/portable/canister/air, /turf/simulated/floor/plasteel{ icon_state = "darkfull"; dir = 8 }, /area/ruin/space/moonbase19) -"avn" = ( +"vn" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "black" }, /area/ruin/space/moonbase19) -"avq" = ( +"vq" = ( /obj/structure/railing/cap{ dir = 1 }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"avy" = ( +"vy" = ( /obj/structure/railing/cap{ dir = 1 }, @@ -6177,14 +6177,14 @@ dir = 8 }, /area/ruin/space/moonbase19) -"avz" = ( +"vz" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/plasteel{ icon_state = "whitehall"; dir = 1 }, /area/ruin/space/moonbase19) -"avA" = ( +"vA" = ( /obj/structure/table/reinforced, /obj/item/paper_bin{ pixel_y = 5 @@ -6200,7 +6200,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"avB" = ( +"vB" = ( /obj/item/kirbyplants, /obj/machinery/light/small{ dir = 4 @@ -6210,7 +6210,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"avC" = ( +"vC" = ( /obj/structure/bed, /obj/item/bedsheet/medical, /obj/machinery/iv_drip, @@ -6219,26 +6219,26 @@ dir = 1 }, /area/ruin/space/moonbase19) -"avD" = ( +"vD" = ( /obj/structure/railing{ dir = 1 }, /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/moonbase19) -"avF" = ( +"vF" = ( /obj/structure/table, /turf/simulated/floor/plasteel{ icon_state = "whitecorner"; dir = 8 }, /area/ruin/space/moonbase19) -"avH" = ( +"vH" = ( /obj/structure/railing/cap{ dir = 4 }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"avL" = ( +"vL" = ( /obj/structure/noticeboard{ pixel_y = 32 }, @@ -6247,14 +6247,14 @@ }, /turf/simulated/floor/carpet/royalblue, /area/ruin/space/moonbase19) -"avN" = ( +"vN" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor"; temperature = 273.15 }, /area/ruin/space/moonbase19) -"avO" = ( +"vO" = ( /obj/structure/chair/office/dark{ dir = 4 }, @@ -6265,14 +6265,14 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"avS" = ( +"vS" = ( /obj/structure/alien/resin/door, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"avT" = ( +"vT" = ( /obj/structure/railing/cap{ dir = 6 }, @@ -6280,7 +6280,7 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"avV" = ( +"vV" = ( /obj/structure/flora/ausbushes/pointybush, /obj/structure/flora/ausbushes/ppflowers, /obj/machinery/light/small{ @@ -6288,7 +6288,7 @@ }, /turf/simulated/floor/grass, /area/ruin/space/moonbase19) -"avY" = ( +"vY" = ( /obj/structure/railing, /obj/structure/railing{ dir = 1 @@ -6301,7 +6301,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"awb" = ( +"wb" = ( /obj/effect/decal/cleanable/blood/tracks{ color = "red"; desc = "Your instincts say you shouldn't be following these."; @@ -6313,7 +6313,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"awc" = ( +"wc" = ( /obj/effect/decal/cleanable/blood/tracks{ color = "red"; desc = "Your instincts say you shouldn't be following these."; @@ -6325,7 +6325,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"awd" = ( +"wd" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced{ dir = 1 @@ -6338,7 +6338,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"awe" = ( +"we" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/structure/sign/poster/contraband/donut_corp{ pixel_x = -32 @@ -6349,7 +6349,7 @@ icon_state = "escape" }, /area/ruin/space/moonbase19) -"awh" = ( +"wh" = ( /obj/item/chair{ dir = 4; pixel_x = -1; @@ -6360,21 +6360,21 @@ dir = 8 }, /area/ruin/space/moonbase19) -"awj" = ( +"wj" = ( /obj/structure/railing/cap, /turf/simulated/floor/plasteel/stairs{ dir = 4 }, /area/ruin/space/moonbase19) -"awk" = ( +"wk" = ( /obj/machinery/computer, /turf/simulated/floor/plating/asteroid/ancient, /area/ruin/space/moonbase19) -"awl" = ( +"wl" = ( /obj/item/stack/ore/slag, /turf/simulated/floor/engine/vacuum, /area/space/nearstation) -"awo" = ( +"wo" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8; initialize_directions = 7 @@ -6385,14 +6385,14 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"awp" = ( +"wp" = ( /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ icon_state = "caution"; dir = 5 }, /area/ruin/space/moonbase19) -"awq" = ( +"wq" = ( /obj/machinery/light/small, /obj/structure/closet/l3closet/general, /turf/simulated/floor/plasteel{ @@ -6400,26 +6400,26 @@ dir = 1 }, /area/ruin/space/moonbase19) -"awt" = ( +"wt" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"awv" = ( +"wv" = ( /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ icon_state = "darkfull"; dir = 8 }, /area/ruin/space/moonbase19) -"awC" = ( +"wC" = ( /obj/structure/closet/cabinet, /obj/effect/decal/cleanable/dirt, /obj/item/clothing/under/syndicate, /turf/simulated/floor/carpet, /area/ruin/space/moonbase19) -"awD" = ( +"wD" = ( /obj/machinery/economy/vending/cola, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -6427,7 +6427,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"awF" = ( +"wF" = ( /obj/structure/window/reinforced{ dir = 4 }, @@ -6439,26 +6439,26 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"awH" = ( +"wH" = ( /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel{ icon_state = "darkfull"; dir = 8 }, /area/ruin/space/moonbase19) -"awL" = ( -/obj/item/reagent_containers/food/drinks/drinkingglass, +"wL" = ( +/obj/item/reagent_containers/drinks/drinkingglass, /obj/structure/table, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"awP" = ( +"wP" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Engine Room" }, /obj/machinery/door/firedoor/closed, /turf/simulated/floor/plating/airless, /area/ruin/space/moonbase19) -"awQ" = ( +"wQ" = ( /obj/structure/railing{ dir = 4 }, @@ -6466,7 +6466,7 @@ /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"awR" = ( +"wR" = ( /obj/structure/sign/monkey_paint{ pixel_x = -28; pixel_y = 4 @@ -6479,7 +6479,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"awS" = ( +"wS" = ( /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/splatter{ @@ -6488,7 +6488,7 @@ /obj/effect/decal/remains/human, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"awU" = ( +"wU" = ( /obj/structure/chair/office/dark, /obj/effect/turf_decal/delivery/red/partial, /obj/effect/decal/cleanable/dirt, @@ -6497,7 +6497,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"axf" = ( +"xf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -6514,20 +6514,20 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"axh" = ( +"xh" = ( /obj/structure/railing/cap, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "green" }, /area/ruin/space/moonbase19) -"axi" = ( +"xi" = ( /obj/effect/landmark/damageturf, /turf/simulated/floor/plasteel/stairs{ dir = 8 }, /area/ruin/space/moonbase19) -"axl" = ( +"xl" = ( /obj/structure/cable{ d1 = 4; d2 = 8; @@ -6541,7 +6541,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"axm" = ( +"xm" = ( /obj/structure/window/reinforced{ dir = 4 }, @@ -6555,7 +6555,7 @@ icon_state = "black" }, /area/ruin/space/moonbase19) -"axn" = ( +"xn" = ( /obj/structure/railing{ dir = 4 }, @@ -6563,13 +6563,13 @@ icon_state = "asteroid10" }, /area/ruin/space/moonbase19) -"axo" = ( +"xo" = ( /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"axs" = ( +"xs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, @@ -6588,7 +6588,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"axt" = ( +"xt" = ( /obj/structure/railing{ dir = 8 }, @@ -6600,7 +6600,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"axu" = ( +"xu" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 1 }, @@ -6608,12 +6608,12 @@ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"axw" = ( +"xw" = ( /obj/structure/closet/crate/can, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"axz" = ( +"xz" = ( /obj/structure/sign/lifestar{ pixel_y = 32 }, @@ -6629,7 +6629,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"axA" = ( +"xA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -6637,7 +6637,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"axC" = ( +"xC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, @@ -6649,7 +6649,7 @@ icon_state = "escape" }, /area/ruin/space/moonbase19) -"axE" = ( +"xE" = ( /obj/structure/chair/sofa/bench/right{ dir = 1 }, @@ -6658,7 +6658,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"axF" = ( +"xF" = ( /obj/structure/chair/sofa/bench/right{ dir = 8 }, @@ -6667,15 +6667,15 @@ icon_state = "escape" }, /area/ruin/space/moonbase19) -"axG" = ( +"xG" = ( /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"axL" = ( +"xL" = ( /turf/simulated/floor/plasteel/stairs{ dir = 8 }, /area/ruin/space/moonbase19) -"axO" = ( +"xO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -6684,7 +6684,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"axS" = ( +"xS" = ( /obj/structure/railing/cap{ dir = 10 }, @@ -6695,18 +6695,18 @@ dir = 5 }, /area/ruin/space/moonbase19) -"axW" = ( +"xW" = ( /obj/machinery/door/airlock, /turf/simulated/floor/carpet, /area/ruin/space/moonbase19) -"axX" = ( +"xX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"axZ" = ( +"xZ" = ( /obj/machinery/disposal/deliveryChute{ dir = 8 }, @@ -6717,7 +6717,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aya" = ( +"ya" = ( /obj/structure/chair/sofa/bench{ dir = 8 }, @@ -6729,13 +6729,13 @@ dir = 4 }, /area/ruin/space/moonbase19) -"ayb" = ( +"yb" = ( /obj/machinery/light/small{ dir = 1 }, /turf/simulated/floor/carpet, /area/ruin/space/moonbase19) -"ayc" = ( +"yc" = ( /obj/machinery/computer{ dir = 8 }, @@ -6744,13 +6744,13 @@ dir = 8 }, /area/ruin/space/moonbase19) -"ayd" = ( +"yd" = ( /obj/structure/railing, /turf/simulated/floor/plasteel/stairs{ dir = 4 }, /area/ruin/space/moonbase19) -"ayf" = ( +"yf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -6759,7 +6759,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"ayi" = ( +"yi" = ( /obj/structure/rack, /obj/item/pickaxe, /obj/item/flashlight/lantern, @@ -6768,7 +6768,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"ayj" = ( +"yj" = ( /obj/item/storage/belt/utility, /obj/structure/table, /turf/simulated/floor/plasteel{ @@ -6776,7 +6776,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aym" = ( +"ym" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -6793,7 +6793,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"ays" = ( +"ys" = ( /obj/structure/railing{ dir = 8 }, @@ -6801,7 +6801,7 @@ dir = 1 }, /area/ruin/space/moonbase19) -"ayu" = ( +"yu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4; @@ -6814,7 +6814,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"ayv" = ( +"yv" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -6837,7 +6837,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"ayx" = ( +"yx" = ( /obj/structure/window/reinforced{ dir = 8 }, @@ -6846,14 +6846,14 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"ayy" = ( +"yy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"ayB" = ( +"yB" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, /turf/simulated/floor/plasteel{ @@ -6861,7 +6861,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"ayD" = ( +"yD" = ( /obj/structure/rack, /obj/effect/turf_decal/delivery, /obj/machinery/alarm/monitor{ @@ -6875,7 +6875,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"ayE" = ( +"yE" = ( /obj/item/stack/sheet/metal, /obj/effect/landmark/damageturf, /obj/effect/turf_decal/delivery/partial{ @@ -6886,12 +6886,12 @@ dir = 8 }, /area/ruin/space/moonbase19) -"ayF" = ( +"yF" = ( /obj/structure/table/wood, /obj/item/toy/plushie/nianplushie, /turf/simulated/floor/carpet, /area/ruin/space/moonbase19) -"ayG" = ( +"yG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, @@ -6900,7 +6900,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"ayI" = ( +"yI" = ( /obj/structure/railing/cap{ dir = 1 }, @@ -6909,7 +6909,7 @@ }, /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/moonbase19) -"ayM" = ( +"yM" = ( /obj/structure/railing/cap{ dir = 4 }, @@ -6918,13 +6918,13 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"ayO" = ( +"yO" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/plating/asteroid/airless{ icon_state = "asteroid8" }, /area/ruin/space/moonbase19) -"ayQ" = ( +"yQ" = ( /obj/structure/table/glass/reinforced/plastitanium, /obj/machinery/door_control{ pixel_x = -7; @@ -6951,13 +6951,13 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"ayR" = ( -/obj/item/reagent_containers/food/snacks/xenomeatbreadslice, -/obj/item/reagent_containers/food/snacks/xenomeatbreadslice{ +"yR" = ( +/obj/item/food/snacks/xenomeatbreadslice, +/obj/item/food/snacks/xenomeatbreadslice{ pixel_y = 7; pixel_x = 6 }, -/obj/item/reagent_containers/food/snacks/xenomeatbreadslice{ +/obj/item/food/snacks/xenomeatbreadslice{ pixel_y = 9; pixel_x = -5 }, @@ -6970,12 +6970,12 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"ayU" = ( -/obj/item/reagent_containers/food/snacks/candy, +"yU" = ( +/obj/item/food/snacks/candy, /obj/structure/table, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"ayX" = ( +"yX" = ( /obj/structure/railing/cap{ dir = 4 }, @@ -6988,20 +6988,20 @@ dir = 1 }, /area/ruin/space/moonbase19) -"ayZ" = ( +"yZ" = ( /obj/structure/closet/cabinet, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/carpet, /area/ruin/space/moonbase19) -"azh" = ( -/obj/item/reagent_containers/food/snacks/badrecipe, +"zh" = ( +/obj/item/food/snacks/badrecipe, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor"; temperature = 273.15 }, /area/ruin/space/moonbase19) -"azi" = ( +"zi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -7020,7 +7020,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"azj" = ( +"zj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, @@ -7031,33 +7031,33 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"azl" = ( +"zl" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plasteel{ icon_state = "darkfull"; dir = 8 }, /area/ruin/space/moonbase19) -"azm" = ( +"zm" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "escapecorner"; dir = 1 }, /area/ruin/space/moonbase19) -"azn" = ( +"zn" = ( /obj/effect/spawner/random_spawners/wall_rusted_always, /obj/effect/spawner/random_spawners/wall_rusted_always, /turf/simulated/wall/r_wall, /area/ruin/space/moonbase19) -"azr" = ( +"zr" = ( /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "green" }, /area/ruin/space/moonbase19) -"azu" = ( +"zu" = ( /obj/structure/alien/resin/wall, /obj/structure/cable{ d1 = 1; @@ -7066,22 +7066,22 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"azv" = ( +"zv" = ( /obj/structure/rack, -/obj/item/reagent_containers/food/snacks/cornchips, +/obj/item/food/snacks/cornchips, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "escape" }, /area/ruin/space/moonbase19) -"azw" = ( +"zw" = ( /obj/machinery/computer/aifixer, /obj/machinery/light/small{ dir = 1 }, /turf/simulated/floor/carpet/royalblue, /area/ruin/space/moonbase19) -"azy" = ( +"zy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, @@ -7101,7 +7101,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"azz" = ( +"zz" = ( /obj/structure/window/reinforced, /obj/structure/chair/comfy/corp{ dir = 1 @@ -7110,11 +7110,11 @@ icon_state = "black" }, /area/ruin/space/moonbase19) -"azE" = ( +"zE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"azG" = ( +"zG" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 8 @@ -7125,13 +7125,13 @@ dir = 10 }, /area/ruin/space/moonbase19) -"azI" = ( +"zI" = ( /turf/simulated/floor/plasteel{ dir = 8; icon_state = "escape" }, /area/ruin/space/moonbase19) -"azK" = ( +"zK" = ( /obj/item/kirbyplants, /obj/structure/sign/biohazard{ pixel_y = 32 @@ -7149,7 +7149,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"azL" = ( +"zL" = ( /obj/structure/window/reinforced{ dir = 8 }, @@ -7161,21 +7161,21 @@ icon_state = "freezerfloor" }, /area/ruin/space/moonbase19) -"azM" = ( +"zM" = ( /obj/machinery/cooker/deepfryer, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor"; temperature = 273.15 }, /area/ruin/space/moonbase19) -"azN" = ( +"zN" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "darkfull"; dir = 8 }, /area/ruin/space/moonbase19) -"azP" = ( +"zP" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -7183,7 +7183,7 @@ temperature = 273.15 }, /area/ruin/space/moonbase19) -"azQ" = ( +"zQ" = ( /obj/structure/disposalpipe/segment/corner{ dir = 8 }, @@ -7198,12 +7198,12 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"azT" = ( +"zT" = ( /turf/simulated/floor/plating/asteroid/airless{ icon_state = "asteroid3" }, /area/ruin/space/moonbase19) -"azV" = ( +"zV" = ( /obj/machinery/economy/vending/medical{ req_access_txt = "271" }, @@ -7212,24 +7212,24 @@ dir = 1 }, /area/ruin/space/moonbase19) -"azW" = ( +"zW" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aAa" = ( +"Aa" = ( /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aAe" = ( +"Ae" = ( /obj/machinery/economy/vending/coffee, /turf/simulated/floor/plasteel{ icon_state = "darkfull"; dir = 8 }, /area/ruin/space/moonbase19) -"aAf" = ( +"Af" = ( /obj/machinery/door/airlock/command/glass{ req_access_txt = "271"; name = "Senior Researcher's Office" @@ -7242,18 +7242,18 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aAj" = ( +"Aj" = ( /mob/living/simple_animal/hostile/alien/sentinel, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aAk" = ( +"Ak" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "cautioncorner"; dir = 4 }, /area/ruin/space/moonbase19) -"aAl" = ( +"Al" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -7263,7 +7263,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aAm" = ( +"Am" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, @@ -7271,7 +7271,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aAn" = ( +"An" = ( /obj/structure/punching_bag, /obj/effect/turf_decal/delivery/hollow, /obj/structure/railing{ @@ -7283,7 +7283,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aAo" = ( +"Ao" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -7292,7 +7292,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aAp" = ( +"Ap" = ( /obj/structure/chair{ dir = 1 }, @@ -7301,7 +7301,7 @@ dir = 1 }, /area/ruin/space/moonbase19) -"aAr" = ( +"Ar" = ( /obj/effect/turf_decal/delivery, /obj/structure/railing{ dir = 1 @@ -7311,7 +7311,7 @@ icon_state = "escape" }, /area/ruin/space/moonbase19) -"aAs" = ( +"As" = ( /obj/structure/closet/secure_closet, /obj/item/clothing/gloves/color/latex, /obj/item/storage/backpack/satchel_tox, @@ -7324,7 +7324,7 @@ /obj/item/clothing/suit/storage/labcoat, /turf/simulated/floor/carpet/royalblue, /area/ruin/space/moonbase19) -"aAv" = ( +"Av" = ( /obj/effect/decal/cleanable/blood/tracks{ color = "red"; desc = "Your instincts say you shouldn't be following these."; @@ -7338,7 +7338,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aAw" = ( +"Aw" = ( /obj/machinery/light/small, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -7351,37 +7351,37 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aAy" = ( +"Ay" = ( /obj/structure/railing{ dir = 5 }, /obj/structure/closet/l3closet/general, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aAz" = ( +"Az" = ( /obj/structure/bed, /obj/item/bedsheet, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/carpet, /area/ruin/space/moonbase19) -"aAA" = ( +"AA" = ( /obj/structure/chair{ dir = 4 }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aAH" = ( +"AH" = ( /obj/effect/decal/cleanable/dirt, /obj/item/chair{ pixel_y = -3 }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aAI" = ( +"AI" = ( /obj/structure/table, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aAJ" = ( +"AJ" = ( /obj/effect/decal/cleanable/blood/tracks{ color = "red"; desc = "Your instincts say you shouldn't be following these."; @@ -7391,13 +7391,13 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aAL" = ( +"AL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aAM" = ( +"AM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ @@ -7408,7 +7408,7 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aAN" = ( +"AN" = ( /obj/structure/grille/broken, /obj/effect/decal/cleanable/glass, /obj/item/stack/rods, @@ -7417,7 +7417,7 @@ }, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aAO" = ( +"AO" = ( /obj/structure/railing/cap{ dir = 5 }, @@ -7430,10 +7430,10 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aAP" = ( +"AP" = ( /turf/simulated/wall/indestructible/riveted, /area/ruin/space/moonbase19) -"aAQ" = ( +"AQ" = ( /obj/machinery/light/small{ dir = 1 }, @@ -7449,14 +7449,14 @@ dir = 1 }, /area/ruin/space/moonbase19) -"aAR" = ( +"AR" = ( /obj/structure/window/reinforced, /turf/simulated/floor/plasteel{ icon_state = "yellowsiding"; dir = 1 }, /area/ruin/space/moonbase19) -"aAS" = ( +"AS" = ( /obj/structure/chair/office/dark{ dir = 4 }, @@ -7466,7 +7466,7 @@ icon_state = "black" }, /area/ruin/space/moonbase19) -"aAV" = ( +"AV" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/glass/beaker{ pixel_x = -4; @@ -7485,7 +7485,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aAZ" = ( +"AZ" = ( /obj/machinery/atmospherics/unary/tank/air{ dir = 8 }, @@ -7496,7 +7496,7 @@ dir = 6 }, /area/ruin/space/moonbase19) -"aBd" = ( +"Bd" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -7505,19 +7505,19 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aBe" = ( +"Be" = ( /obj/effect/turf_decal/stripes/corner, /turf/simulated/floor/plasteel{ icon_state = "darkfull"; dir = 8 }, /area/ruin/space/moonbase19) -"aBg" = ( +"Bg" = ( /turf/simulated/floor/plasteel/stairs{ dir = 1 }, /area/ruin/space/moonbase19) -"aBj" = ( +"Bj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, @@ -7530,14 +7530,14 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aBk" = ( +"Bk" = ( /obj/effect/turf_decal/stripes/corner, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aBr" = ( +"Br" = ( /obj/structure/railing{ dir = 4 }, @@ -7549,7 +7549,7 @@ dir = 5 }, /area/ruin/space/moonbase19) -"aBt" = ( +"Bt" = ( /obj/structure/disposalpipe/segment{ desc = "An underfloor disposal pipe. This one has been applied with an acid-proof coating."; dir = 2; @@ -7559,7 +7559,7 @@ /obj/effect/landmark/damageturf, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aBu" = ( +"Bu" = ( /obj/effect/decal/cleanable/blood/tracks{ color = "red"; desc = "Your instincts say you shouldn't be following these."; @@ -7571,7 +7571,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aBv" = ( +"Bv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -7583,7 +7583,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aBw" = ( +"Bw" = ( /obj/structure/railing/cap{ dir = 6 }, @@ -7595,7 +7595,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aBx" = ( +"Bx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -7606,7 +7606,7 @@ }, /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"aBA" = ( +"BA" = ( /obj/structure/railing{ dir = 4 }, @@ -7618,7 +7618,7 @@ icon_state = "asteroid12" }, /area/ruin/space/moonbase19) -"aBB" = ( +"BB" = ( /obj/structure/railing{ dir = 8 }, @@ -7628,11 +7628,11 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aBC" = ( +"BC" = ( /obj/machinery/economy/vending/boozeomat, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aBE" = ( +"BE" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/reinforced/normal{ dir = 4; @@ -7646,7 +7646,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aBF" = ( +"BF" = ( /obj/item/chair{ pixel_y = -6; pixel_x = -3 @@ -7657,7 +7657,7 @@ dir = 1 }, /area/ruin/space/moonbase19) -"aBI" = ( +"BI" = ( /obj/machinery/door/poddoor/impassable{ id_tag = "awayscilock" }, @@ -7666,12 +7666,12 @@ }, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aBK" = ( +"BK" = ( /obj/structure/railing, /obj/structure/chair, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aBO" = ( +"BO" = ( /obj/machinery/door/airlock/engineering/glass{ req_access_txt = "271"; name = "Engineering Division" @@ -7689,13 +7689,13 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aBQ" = ( +"BQ" = ( /obj/structure/railing{ dir = 9 }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aBY" = ( +"BY" = ( /obj/structure/railing{ dir = 8 }, @@ -7705,7 +7705,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aBZ" = ( +"BZ" = ( /obj/effect/decal/cleanable/blood/splatter{ color = "red" }, @@ -7714,20 +7714,20 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aCc" = ( +"Cc" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/plating/asteroid/airless{ icon_state = "asteroid6" }, /area/ruin/space/moonbase19) -"aCd" = ( +"Cd" = ( /obj/structure/table, /turf/simulated/floor/plasteel{ icon_state = "darkfull"; dir = 8 }, /area/ruin/space/moonbase19) -"aCi" = ( +"Ci" = ( /obj/structure/railing{ dir = 1 }, @@ -7736,7 +7736,7 @@ icon_state = "whitehall" }, /area/ruin/space/moonbase19) -"aCm" = ( +"Cm" = ( /obj/structure/table/glass/reinforced/plastitanium, /obj/item/paper/fluff/ruins/moonoutpost19/boreraccountant, /turf/simulated/floor/plasteel{ @@ -7744,7 +7744,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aCr" = ( +"Cr" = ( /obj/structure/cable{ d1 = 4; d2 = 8; @@ -7759,7 +7759,7 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aCs" = ( +"Cs" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/remains/human, /turf/simulated/floor/plasteel{ @@ -7767,7 +7767,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aCt" = ( +"Ct" = ( /obj/machinery/door/airlock/highsecurity{ req_access_txt = "271" }, @@ -7779,7 +7779,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aCv" = ( +"Cv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -7798,7 +7798,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aCw" = ( +"Cw" = ( /obj/item/chair{ pixel_x = 4; pixel_y = -3 @@ -7808,7 +7808,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aCy" = ( +"Cy" = ( /obj/structure/rack, /obj/item/mop, /obj/effect/decal/cleanable/dirt, @@ -7817,7 +7817,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aCB" = ( +"CB" = ( /obj/machinery/economy/vending/coffee, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -7825,7 +7825,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aCC" = ( +"CC" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -7835,25 +7835,25 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aCE" = ( +"CE" = ( /obj/structure/table, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "caution" }, /area/ruin/space/moonbase19) -"aCH" = ( +"CH" = ( /obj/structure/rack, /obj/effect/decal/cleanable/cobweb2, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/ruin/space/moonbase19) -"aCI" = ( +"CI" = ( /turf/simulated/floor/plating/asteroid/airless{ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"aCJ" = ( +"CJ" = ( /obj/structure/chair/stool/bar{ dir = 8 }, @@ -7868,14 +7868,14 @@ icon_state = "escape" }, /area/ruin/space/moonbase19) -"aCL" = ( +"CL" = ( /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "black" }, /area/ruin/space/moonbase19) -"aCM" = ( +"CM" = ( /obj/structure/cable{ d1 = 4; d2 = 8; @@ -7886,7 +7886,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aCR" = ( +"CR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ @@ -7899,18 +7899,18 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aCS" = ( +"CS" = ( /turf/simulated/floor/plasteel{ dir = 1; icon_state = "escape" }, /area/ruin/space/moonbase19) -"aCV" = ( +"CV" = ( /obj/effect/decal/cleanable/cobweb, /obj/machinery/atmospherics/portable/scrubber, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aCW" = ( +"CW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, @@ -7924,11 +7924,11 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aCY" = ( +"CY" = ( /obj/structure/rack, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aCZ" = ( +"CZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -7938,10 +7938,10 @@ /obj/effect/decal/remains/human, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aDa" = ( +"Da" = ( /turf/simulated/floor/plasteel/stairs, /area/ruin/space/moonbase19) -"aDc" = ( +"Dc" = ( /obj/structure/chair/sofa/bench/left{ dir = 1 }, @@ -7950,30 +7950,30 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aDd" = ( +"Dd" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/plating/asteroid/airless{ icon_state = "asteroid1" }, /area/ruin/space/moonbase19) -"aDe" = ( +"De" = ( /obj/structure/closet/crate, /obj/item/reagent_containers/glass/beaker/waterbottle, /obj/item/reagent_containers/glass/beaker/waterbottle, -/obj/item/reagent_containers/food/snacks/syndicake, -/obj/item/reagent_containers/food/snacks/syndicake, +/obj/item/food/snacks/syndicake, +/obj/item/food/snacks/syndicake, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"aDf" = ( +"Df" = ( /obj/structure/chair{ dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aDi" = ( +"Di" = ( /obj/machinery/light{ dir = 8 }, @@ -7982,7 +7982,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aDk" = ( +"Dk" = ( /obj/effect/turf_decal/delivery/white/partial{ dir = 1 }, @@ -7992,12 +7992,12 @@ dir = 1 }, /area/ruin/space/moonbase19) -"aDl" = ( +"Dl" = ( /obj/structure/rack, /obj/item/tank/internals/emergency_oxygen, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aDn" = ( +"Dn" = ( /obj/structure/railing{ dir = 9 }, @@ -8007,14 +8007,14 @@ /obj/machinery/light/small, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aDp" = ( +"Dp" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "black"; dir = 10 }, /area/ruin/space/moonbase19) -"aDr" = ( +"Dr" = ( /obj/effect/turf_decal/delivery/hollow, /obj/structure/railing{ dir = 1 @@ -8023,7 +8023,7 @@ icon_state = "escape" }, /area/ruin/space/moonbase19) -"aDs" = ( +"Ds" = ( /obj/effect/turf_decal/caution/stand_clear{ dir = 8 }, @@ -8035,7 +8035,7 @@ icon_state = "escape" }, /area/ruin/space/moonbase19) -"aDt" = ( +"Dt" = ( /obj/machinery/door/airlock/medical/glass{ req_access_txt = "271" }, @@ -8050,14 +8050,14 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aDw" = ( +"Dw" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"aDy" = ( +"Dy" = ( /obj/item/kirbyplants, /obj/structure/sign/biohazard{ pixel_y = 32 @@ -8070,7 +8070,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aDA" = ( +"DA" = ( /obj/effect/turf_decal/delivery, /obj/structure/cable{ d1 = 2; @@ -8079,13 +8079,13 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aDB" = ( +"DB" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "cautioncorner" }, /area/ruin/space/moonbase19) -"aDG" = ( +"DG" = ( /obj/structure/chair/sofa/bench/right{ dir = 8 }, @@ -8094,7 +8094,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aDJ" = ( +"DJ" = ( /obj/structure/window/reinforced{ dir = 4 }, @@ -8107,7 +8107,7 @@ icon_state = "black" }, /area/ruin/space/moonbase19) -"aDK" = ( +"DK" = ( /obj/structure/railing/cap{ dir = 5 }, @@ -8116,7 +8116,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aDM" = ( +"DM" = ( /obj/structure/rack, /obj/machinery/light/small{ dir = 1 @@ -8124,7 +8124,7 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aDO" = ( +"DO" = ( /obj/machinery/light/small{ dir = 4 }, @@ -8137,12 +8137,12 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"aDR" = ( +"DR" = ( /obj/item/kitchen/utensil/spoon, /obj/structure/table, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aDU" = ( +"DU" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1; initialize_directions = 14 @@ -8152,18 +8152,18 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aDV" = ( +"DV" = ( /obj/structure/closet/crate, -/obj/item/reagent_containers/food/snacks/beans, +/obj/item/food/snacks/beans, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aEf" = ( +"Ef" = ( /turf/simulated/floor/plasteel{ dir = 8; icon_state = "dark" }, /area/ruin/space/moonbase19) -"aEg" = ( +"Eg" = ( /obj/effect/decal/cleanable/blood/xeno{ color = "green" }, @@ -8176,7 +8176,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aEl" = ( +"El" = ( /obj/machinery/light/small{ dir = 1 }, @@ -8196,7 +8196,7 @@ icon_state = "whitehall" }, /area/ruin/space/moonbase19) -"aEm" = ( +"Em" = ( /obj/structure/rack, /obj/effect/decal/cleanable/cobweb2, /obj/item/clothing/mask/facehugger{ @@ -8217,7 +8217,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aEo" = ( +"Eo" = ( /obj/structure/filingcabinet, /obj/structure/sign/poster/official/fruit_bowl{ pixel_y = 32 @@ -8225,7 +8225,7 @@ /obj/item/paper/fluff/ruins/moonoutpost19/rdnote, /turf/simulated/floor/carpet/royalblue, /area/ruin/space/moonbase19) -"aEp" = ( +"Ep" = ( /obj/item/kirbyplants, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -8233,7 +8233,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aEr" = ( +"Er" = ( /obj/structure/railing/corner{ dir = 8 }, @@ -8247,7 +8247,7 @@ icon_state = "black" }, /area/ruin/space/moonbase19) -"aEs" = ( +"Es" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -8270,13 +8270,13 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aEt" = ( +"Et" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/plating/asteroid/airless{ icon_state = "asteroid1" }, /area/ruin/space/moonbase19) -"aEv" = ( +"Ev" = ( /obj/structure/window/reinforced{ dir = 8 }, @@ -8284,9 +8284,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aEx" = ( +"Ex" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/snacks/sliceable/xenomeatbread{ +/obj/item/food/snacks/sliceable/xenomeatbread{ pixel_y = 5 }, /obj/effect/turf_decal/delivery, @@ -8295,18 +8295,18 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aEy" = ( +"Ey" = ( /obj/machinery/shower{ dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/noslip, /area/ruin/space/moonbase19) -"aEE" = ( +"EE" = ( /obj/item/stack/ore/slag, /turf/simulated/floor/plating/airless, /area/space/nearstation) -"aEF" = ( +"EF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -8323,12 +8323,12 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aEH" = ( +"EH" = ( /obj/effect/turf_decal/stripes/corner, /obj/effect/decal/cleanable/vomit/green, /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"aEL" = ( +"EL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -8338,7 +8338,7 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aEN" = ( +"EN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/greenglow, /turf/simulated/floor/plasteel{ @@ -8346,18 +8346,18 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aEP" = ( +"EP" = ( /obj/machinery/light/small, /turf/simulated/floor/plasteel{ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aEQ" = ( +"EQ" = ( /obj/structure/window/reinforced, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aER" = ( +"ER" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 }, @@ -8368,7 +8368,7 @@ icon_state = "yellowsiding" }, /area/ruin/space/moonbase19) -"aET" = ( +"ET" = ( /obj/effect/decal/cleanable/cobweb, /obj/structure/table, /turf/simulated/floor/plasteel{ @@ -8376,7 +8376,7 @@ icon_state = "escape" }, /area/ruin/space/moonbase19) -"aEV" = ( +"EV" = ( /obj/structure/closet, /obj/item/soap, /obj/item/storage/box/lights/mixed, @@ -8386,14 +8386,14 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aEZ" = ( +"EZ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/xeno{ color = "green" }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aFa" = ( +"Fa" = ( /obj/effect/turf_decal/delivery/white/partial{ dir = 1 }, @@ -8405,13 +8405,13 @@ dir = 1 }, /area/ruin/space/moonbase19) -"aFb" = ( +"Fb" = ( /obj/structure/chair/office/dark{ dir = 4 }, /turf/simulated/floor/plating/asteroid/ancient, /area/ruin/space/moonbase19) -"aFc" = ( +"Fc" = ( /obj/structure/cable{ d1 = 1; d2 = 8; @@ -8422,7 +8422,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aFd" = ( +"Fd" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -8430,7 +8430,7 @@ /mob/living/simple_animal/hostile/alien/sentinel, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aFe" = ( +"Fe" = ( /obj/structure/table/reinforced, /obj/item/stock_parts/cell/high, /obj/structure/cable{ @@ -8440,7 +8440,7 @@ }, /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"aFf" = ( +"Ff" = ( /obj/machinery/computer{ dir = 1 }, @@ -8449,14 +8449,14 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aFk" = ( +"Fk" = ( /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ icon_state = "caution"; dir = 4 }, /area/ruin/space/moonbase19) -"aFm" = ( +"Fm" = ( /obj/structure/safe, /obj/machinery/light/small{ dir = 4 @@ -8469,7 +8469,7 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"aFo" = ( +"Fo" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -8479,7 +8479,7 @@ /obj/machinery/atmospherics/air_sensor, /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"aFp" = ( +"Fp" = ( /obj/structure/sink{ dir = 4; pixel_x = 12 @@ -8489,12 +8489,12 @@ temperature = 273.15 }, /area/ruin/space/moonbase19) -"aFq" = ( +"Fq" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/grass, /area/ruin/space/moonbase19) -"aFs" = ( +"Fs" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/greenglow, /obj/item/clothing/mask/facehugger{ @@ -8504,7 +8504,7 @@ }, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aFt" = ( +"Ft" = ( /obj/effect/turf_decal/stripes/corner, /mob/living/simple_animal/hostile/alien/sentinel, /obj/effect/decal/cleanable/blood/splatter{ @@ -8515,25 +8515,25 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aFw" = ( +"Fw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aFz" = ( +"Fz" = ( /obj/structure/disposalpipe/segment/corner{ dir = 8 }, /turf/simulated/wall/r_wall, /area/ruin/space/moonbase19) -"aFB" = ( +"FB" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aFC" = ( +"FC" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plasteel{ @@ -8541,7 +8541,7 @@ dir = 10 }, /area/ruin/space/moonbase19) -"aFH" = ( +"FH" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -8550,7 +8550,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aFM" = ( +"FM" = ( /obj/structure/railing{ dir = 8 }, @@ -8559,7 +8559,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aFN" = ( +"FN" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/plasteel{ @@ -8567,7 +8567,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aFO" = ( +"FO" = ( /obj/item/kirbyplants, /obj/structure/railing{ dir = 1 @@ -8577,7 +8577,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aFP" = ( +"FP" = ( /obj/structure/mopbucket, /obj/machinery/light/small{ dir = 1 @@ -8587,7 +8587,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aFT" = ( +"FT" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plasteel{ @@ -8595,7 +8595,7 @@ icon_state = "whitecorner" }, /area/ruin/space/moonbase19) -"aFV" = ( +"FV" = ( /obj/item/kirbyplants, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plasteel{ @@ -8603,7 +8603,7 @@ icon_state = "escape" }, /area/ruin/space/moonbase19) -"aFW" = ( +"FW" = ( /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/ywflowers, /obj/machinery/light/small{ @@ -8611,20 +8611,20 @@ }, /turf/simulated/floor/grass, /area/ruin/space/moonbase19) -"aFX" = ( +"FX" = ( /obj/structure/railing{ dir = 1 }, /obj/structure/chair/sofa/bench, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aFY" = ( +"FY" = ( /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"aFZ" = ( +"FZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/air_sensor, @@ -8635,7 +8635,7 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aGd" = ( +"Gd" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -8645,14 +8645,14 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aGe" = ( +"Ge" = ( /obj/structure/closet/crate/secure/loot, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aGg" = ( +"Gg" = ( /turf/simulated/mineral/ancient, /area/ruin/space/moonbase19) -"aGh" = ( +"Gh" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/plasteel{ @@ -8660,7 +8660,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aGk" = ( +"Gk" = ( /obj/machinery/door/airlock/medical/glass{ req_access_txt = "271"; name = "Operation Room" @@ -8670,7 +8670,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aGl" = ( +"Gl" = ( /obj/structure/railing/cap{ dir = 9 }, @@ -8680,7 +8680,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aGp" = ( +"Gp" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/tracks{ color = "red"; @@ -8691,7 +8691,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aGq" = ( +"Gq" = ( /obj/structure/cable{ d1 = 4; d2 = 8; @@ -8699,7 +8699,7 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aGs" = ( +"Gs" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, @@ -8720,7 +8720,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aGw" = ( +"Gw" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -8740,25 +8740,25 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aGx" = ( +"Gx" = ( /obj/structure/closet/crate/freezer, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor"; temperature = 273.15 }, /area/ruin/space/moonbase19) -"aGy" = ( +"Gy" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/grille/broken, /obj/item/stack/rods, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aGz" = ( +"Gz" = ( /obj/structure/table/wood, /obj/item/toy/plushie/slimeplushie, /turf/simulated/floor/carpet, /area/ruin/space/moonbase19) -"aGC" = ( +"GC" = ( /obj/effect/turf_decal/caution/stand_clear/white{ dir = 8 }, @@ -8767,7 +8767,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aGD" = ( +"GD" = ( /obj/structure/holosign/barrier/engineering, /obj/effect/landmark/damageturf, /obj/structure/cable{ @@ -8780,7 +8780,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aGH" = ( +"GH" = ( /obj/machinery/light/small{ dir = 8 }, @@ -8789,7 +8789,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aGJ" = ( +"GJ" = ( /obj/structure/railing{ dir = 1 }, @@ -8805,7 +8805,7 @@ icon_state = "green" }, /area/ruin/space/moonbase19) -"aGL" = ( +"GL" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/splatter{ color = "red" @@ -8815,7 +8815,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aGP" = ( +"GP" = ( /obj/machinery/computer, /obj/structure/window/reinforced{ dir = 8 @@ -8828,19 +8828,19 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aGS" = ( +"GS" = ( /obj/structure/grille/broken, /obj/effect/decal/cleanable/glass, /obj/item/stack/rods, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aGT" = ( +"GT" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 }, /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"aGX" = ( +"GX" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -8848,7 +8848,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aHb" = ( +"Hb" = ( /obj/structure/table/wood, /obj/item/toy/plushie/greyplushie{ pixel_x = -7 @@ -8859,7 +8859,7 @@ }, /turf/simulated/floor/carpet, /area/ruin/space/moonbase19) -"aHd" = ( +"Hd" = ( /obj/machinery/light/small{ dir = 4 }, @@ -8869,7 +8869,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aHg" = ( +"Hg" = ( /obj/structure/table/reinforced, /obj/machinery/door/window{ dir = 8 @@ -8877,11 +8877,11 @@ /obj/machinery/door/poddoor/shutters/preopen{ id_tag = "awaykitchen" }, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/drinks/bottle/whiskey{ pixel_y = 10; pixel_x = -1 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_y = 7; pixel_x = 11 }, @@ -8890,7 +8890,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aHh" = ( +"Hh" = ( /obj/structure/railing/cap{ dir = 10 }, @@ -8898,7 +8898,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aHj" = ( +"Hj" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -8907,7 +8907,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aHm" = ( +"Hm" = ( /obj/structure/railing, /obj/effect/decal/cleanable/blood/splatter{ color = "red" @@ -8917,14 +8917,14 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aHp" = ( +"Hp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, /obj/structure/table, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aHq" = ( +"Hq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -8933,7 +8933,7 @@ dir = 10 }, /area/ruin/space/moonbase19) -"aHr" = ( +"Hr" = ( /obj/structure/railing{ dir = 8 }, @@ -8946,13 +8946,13 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aHu" = ( +"Hu" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "yellowsiding" }, /area/ruin/space/moonbase19) -"aHv" = ( +"Hv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, @@ -8966,7 +8966,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aHx" = ( +"Hx" = ( /obj/structure/window/reinforced{ dir = 4 }, @@ -8975,21 +8975,21 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aHA" = ( +"HA" = ( /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ icon_state = "caution"; dir = 10 }, /area/ruin/space/moonbase19) -"aHE" = ( +"HE" = ( /obj/structure/chair/sofa/bench/right, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "caution" }, /area/ruin/space/moonbase19) -"aHL" = ( +"HL" = ( /obj/machinery/light{ active_power_consumption = 0; dir = 1; @@ -9003,7 +9003,7 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aHM" = ( +"HM" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, /obj/structure/cable{ @@ -9022,7 +9022,7 @@ }, /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"aHO" = ( +"HO" = ( /obj/machinery/door/airlock/highsecurity{ req_access_txt = "271"; name = "Chamber #1" @@ -9033,13 +9033,13 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aHP" = ( +"HP" = ( /obj/item/chair{ pixel_y = -3 }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aHU" = ( +"HU" = ( /obj/structure/rack, /obj/item/stack/sheet/metal/fifty{ pixel_x = 2; @@ -9053,7 +9053,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aHV" = ( +"HV" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/decal/cleanable/dirt, @@ -9062,14 +9062,14 @@ dir = 9 }, /area/ruin/space/moonbase19) -"aHW" = ( +"HW" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/largecrate, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"aHY" = ( +"HY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, @@ -9081,12 +9081,12 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aIb" = ( +"Ib" = ( /turf/simulated/floor/plating/asteroid/airless{ icon_state = "asteroid11" }, /area/ruin/space/moonbase19) -"aIc" = ( +"Ic" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/railing{ dir = 1 @@ -9094,15 +9094,15 @@ /obj/structure/table, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aIe" = ( +"Ie" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/generic, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aIf" = ( +"If" = ( /turf/simulated/floor/bluegrid, /area/ruin/space/moonbase19) -"aIj" = ( +"Ij" = ( /obj/machinery/light/small{ dir = 1 }, @@ -9115,13 +9115,13 @@ dir = 1 }, /area/ruin/space/moonbase19) -"aIo" = ( +"Io" = ( /turf/simulated/floor/plasteel{ icon_state = "darkbluecorners"; dir = 1 }, /area/ruin/space/moonbase19) -"aIp" = ( +"Ip" = ( /obj/structure/cable{ d1 = 1; d2 = 4; @@ -9129,7 +9129,7 @@ }, /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"aIq" = ( +"Iq" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 }, @@ -9137,7 +9137,7 @@ /obj/structure/alien/weeds/node, /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"aIx" = ( +"Ix" = ( /obj/effect/decal/cleanable/blood/splatter{ color = "red" }, @@ -9146,11 +9146,11 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aIz" = ( +"Iz" = ( /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aIB" = ( +"IB" = ( /obj/machinery/light/small{ dir = 4 }, @@ -9160,7 +9160,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aIC" = ( +"IC" = ( /obj/structure/railing{ dir = 4 }, @@ -9169,7 +9169,7 @@ icon_state = "asteroid1" }, /area/ruin/space/moonbase19) -"aID" = ( +"ID" = ( /obj/structure/bed, /obj/item/bedsheet/medical, /obj/machinery/iv_drip, @@ -9178,7 +9178,7 @@ dir = 1 }, /area/ruin/space/moonbase19) -"aIE" = ( +"IE" = ( /obj/structure/window/reinforced{ dir = 1 }, @@ -9187,7 +9187,7 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aIH" = ( +"IH" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -9195,7 +9195,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aIJ" = ( +"IJ" = ( /obj/structure/window/reinforced{ dir = 1 }, @@ -9212,7 +9212,7 @@ dir = 1 }, /area/ruin/space/moonbase19) -"aIM" = ( +"IM" = ( /obj/structure/chair{ dir = 8 }, @@ -9225,12 +9225,12 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aIN" = ( +"IN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/landmark/damageturf, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aIO" = ( +"IO" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/machinery/light/small{ dir = 4 @@ -9241,7 +9241,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aIS" = ( +"IS" = ( /obj/effect/turf_decal/stripes/corner, /obj/structure/filingcabinet/chestdrawer, /obj/machinery/light/small{ @@ -9253,7 +9253,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aIU" = ( +"IU" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/airlock/highsecurity{ req_access_txt = "271"; @@ -9264,14 +9264,14 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aIV" = ( +"IV" = ( /obj/machinery/light/small, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aIW" = ( +"IW" = ( /turf/simulated/floor/engine/vacuum, /area/space/nearstation) -"aIZ" = ( +"IZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ @@ -9289,27 +9289,27 @@ }, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aJc" = ( +"Jc" = ( /obj/structure/rack, /turf/simulated/floor/plasteel{ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aJi" = ( +"Ji" = ( /obj/structure/railing/cap, /turf/simulated/floor/plasteel{ icon_state = "whitehall"; dir = 1 }, /area/ruin/space/moonbase19) -"aJl" = ( +"Jl" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 }, /obj/structure/alien/resin/wall, /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"aJm" = ( +"Jm" = ( /obj/structure/punching_bag, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ @@ -9317,20 +9317,20 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aJo" = ( +"Jo" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aJr" = ( +"Jr" = ( /obj/structure/alien/resin/wall, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aJu" = ( +"Ju" = ( /obj/machinery/autolathe, /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"aJv" = ( +"Jv" = ( /obj/effect/decal/cleanable/dirt, /obj/item/chair{ pixel_x = -1; @@ -9342,7 +9342,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aJx" = ( +"Jx" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 8 @@ -9351,13 +9351,13 @@ icon_state = "whitecorner" }, /area/ruin/space/moonbase19) -"aJy" = ( +"Jy" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aJz" = ( +"Jz" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4; initialize_directions = 11 @@ -9365,14 +9365,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aJA" = ( +"JA" = ( /obj/structure/table/glass, /obj/item/storage/backpack/duffel/medical, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, /area/ruin/space/moonbase19) -"aJB" = ( +"JB" = ( /obj/item/clothing/gloves/color/black, /obj/item/stack/tape_roll, /obj/machinery/light/small, @@ -9381,18 +9381,18 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aJE" = ( +"JE" = ( /obj/machinery/door/airlock/external{ req_access_txt = "271" }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aJG" = ( +"JG" = ( /obj/structure/flora/ash/rock/style_random, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/plating/asteroid/ancient, /area/ruin/space/moonbase19) -"aJI" = ( +"JI" = ( /obj/structure/railing/cap{ dir = 10 }, @@ -9401,14 +9401,14 @@ dir = 1 }, /area/ruin/space/moonbase19) -"aJJ" = ( +"JJ" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "black"; dir = 5 }, /area/ruin/space/moonbase19) -"aJK" = ( +"JK" = ( /obj/effect/turf_decal/delivery/partial, /obj/effect/turf_decal/caution{ pixel_y = -4 @@ -9420,13 +9420,13 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"aJL" = ( +"JL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, /turf/simulated/floor/carpet/royalblue, /area/ruin/space/moonbase19) -"aJN" = ( +"JN" = ( /obj/structure/chair{ dir = 1 }, @@ -9437,28 +9437,28 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aJP" = ( +"JP" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/newscaster{ pixel_y = 30 }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aJQ" = ( +"JQ" = ( /obj/structure/window/reinforced{ dir = 1 }, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aJR" = ( +"JR" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/sign/poster/official/nanotrasen_logo{ pixel_y = 32 }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aJS" = ( +"JS" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/tracks{ color = "red"; @@ -9474,7 +9474,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aJU" = ( +"JU" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/power/apc/off_station/empty_charge{ cell_type = 15000; @@ -9501,21 +9501,21 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aJW" = ( +"JW" = ( /obj/machinery/light/small{ dir = 1 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/carpet, /area/ruin/space/moonbase19) -"aJZ" = ( +"JZ" = ( /obj/structure/table/wood, /obj/item/lighter/zippo, /obj/effect/decal/cleanable/dirt, /obj/item/toy/plushie/tabby_cat, /turf/simulated/floor/carpet, /area/ruin/space/moonbase19) -"aKa" = ( +"Ka" = ( /obj/item/chair{ pixel_y = -3 }, @@ -9530,14 +9530,14 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aKb" = ( +"Kb" = ( /obj/structure/barricade/wooden/crude{ layer = 4 }, /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aKc" = ( +"Kc" = ( /obj/structure/railing/cap, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -9545,14 +9545,14 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aKd" = ( +"Kd" = ( /obj/structure/table, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whitecorner" }, /area/ruin/space/moonbase19) -"aKi" = ( +"Ki" = ( /obj/machinery/light/small{ dir = 4 }, @@ -9561,7 +9561,7 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"aKm" = ( +"Km" = ( /obj/structure/railing{ dir = 6 }, @@ -9570,13 +9570,13 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aKp" = ( +"Kp" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aKr" = ( +"Kr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -9591,7 +9591,7 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aKt" = ( +"Kt" = ( /obj/machinery/light/small{ dir = 4 }, @@ -9601,34 +9601,34 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aKu" = ( +"Ku" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "green" }, /area/ruin/space/moonbase19) -"aKv" = ( +"Kv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aKx" = ( +"Kx" = ( /obj/structure/closet/toolcloset, /turf/simulated/floor/plasteel{ icon_state = "darkfull"; dir = 8 }, /area/ruin/space/moonbase19) -"aKz" = ( +"Kz" = ( /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ icon_state = "escape"; dir = 4 }, /area/ruin/space/moonbase19) -"aKC" = ( +"KC" = ( /obj/machinery/disposal/deliveryChute, /obj/structure/disposalpipe/trunk{ dir = 4 @@ -9645,7 +9645,7 @@ /obj/machinery/door/window/reinforced/normal, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aKE" = ( +"KE" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -9654,7 +9654,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aKG" = ( +"KG" = ( /obj/structure/railing/cap{ dir = 9 }, @@ -9668,7 +9668,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aKI" = ( +"KI" = ( /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -9676,13 +9676,13 @@ /obj/effect/turf_decal/box, /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"aKJ" = ( +"KJ" = ( /obj/structure/railing{ dir = 4 }, /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/moonbase19) -"aKN" = ( +"KN" = ( /obj/structure/railing{ dir = 4 }, @@ -9692,13 +9692,13 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aKO" = ( +"KO" = ( /turf/simulated/floor/plasteel{ dir = 8; icon_state = "cautioncorner" }, /area/ruin/space/moonbase19) -"aKP" = ( +"KP" = ( /obj/machinery/light{ dir = 4 }, @@ -9721,7 +9721,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aKQ" = ( +"KQ" = ( /obj/effect/decal/cleanable/blood/splatter{ color = "red" }, @@ -9730,14 +9730,14 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aKR" = ( +"KR" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/splatter{ color = "red" }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aKS" = ( +"KS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -9750,11 +9750,11 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aKW" = ( +"KW" = ( /obj/structure/chair/sofa/bench/right, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aKZ" = ( +"KZ" = ( /obj/machinery/door/poddoor/impassable{ id_tag = "awaycontlockdown" }, @@ -9765,7 +9765,7 @@ /obj/effect/spawner/window/reinforced/tinted/grilled, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aLa" = ( +"La" = ( /obj/structure/closet/crate/freezer, /obj/item/clothing/mask/facehugger{ icon_state = "facehugger_impregnated"; @@ -9776,12 +9776,12 @@ icon_state = "darkbluecorners" }, /area/ruin/space/moonbase19) -"aLb" = ( +"Lb" = ( /obj/structure/rack, /obj/effect/landmark/damageturf, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aLd" = ( +"Ld" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/tracks{ color = "red"; @@ -9794,7 +9794,7 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aLf" = ( +"Lf" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -9805,7 +9805,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aLj" = ( +"Lj" = ( /obj/effect/decal/cleanable/dirt, /obj/item/chair{ pixel_x = -1; @@ -9817,7 +9817,7 @@ dir = 9 }, /area/ruin/space/moonbase19) -"aLk" = ( +"Lk" = ( /obj/machinery/light/small{ dir = 1 }, @@ -9828,21 +9828,21 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aLl" = ( +"Ll" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "escape" }, /area/ruin/space/moonbase19) -"aLn" = ( +"Ln" = ( /obj/effect/decal/cleanable/blood/splatter{ color = "red" }, /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/plating/asteroid/ancient, /area/ruin/space/moonbase19) -"aLq" = ( +"Lq" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 }, @@ -9851,7 +9851,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aLw" = ( +"Lw" = ( /obj/structure/railing{ dir = 4 }, @@ -9859,7 +9859,7 @@ icon_state = "asteroid4" }, /area/ruin/space/moonbase19) -"aLz" = ( +"Lz" = ( /obj/structure/railing{ dir = 4 }, @@ -9870,17 +9870,17 @@ dir = 1 }, /area/ruin/space/moonbase19) -"aLA" = ( +"LA" = ( /obj/structure/shuttle/engine/propulsion/burst, /turf/simulated/wall/mineral/titanium, /area/ruin/space/moonbase19) -"aLC" = ( +"LC" = ( /obj/structure/largecrate, /turf/simulated/floor/plating/asteroid/airless{ icon_state = "asteroid3" }, /area/ruin/space/moonbase19) -"aLD" = ( +"LD" = ( /obj/structure/window/reinforced{ dir = 8 }, @@ -9890,7 +9890,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aLG" = ( +"LG" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb2, /obj/structure/table, @@ -9899,7 +9899,7 @@ dir = 1 }, /area/ruin/space/moonbase19) -"aLJ" = ( +"LJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -9913,7 +9913,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aLK" = ( +"LK" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -9925,19 +9925,19 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aLL" = ( +"LL" = ( /obj/structure/table/reinforced, /obj/item/paper_bin{ pixel_x = 6; pixel_y = 5 }, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ pixel_y = 3; pixel_x = -7 }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aLS" = ( +"LS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -9947,21 +9947,21 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aLY" = ( +"LY" = ( /obj/structure/railing{ dir = 1 }, /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/moonbase19) -"aLZ" = ( +"LZ" = ( /obj/structure/disposalpipe/trunk{ dir = 1 }, /obj/structure/disposaloutlet, /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"aMe" = ( +"Me" = ( /obj/effect/turf_decal/stripes/asteroid/line, /obj/structure/railing, /obj/structure/railing/cap{ @@ -9971,7 +9971,7 @@ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"aMg" = ( +"Mg" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -9981,7 +9981,7 @@ dir = 1 }, /area/ruin/space/moonbase19) -"aMk" = ( +"Mk" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -9991,20 +9991,20 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aMl" = ( +"Ml" = ( /obj/structure/bed, /obj/item/bedsheet, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/carpet, /area/ruin/space/moonbase19) -"aMn" = ( +"Mn" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "caution" }, /area/ruin/space/moonbase19) -"aMp" = ( +"Mp" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/railing/corner{ dir = 1 @@ -10014,7 +10014,7 @@ dir = 1 }, /area/ruin/space/moonbase19) -"aMq" = ( +"Mq" = ( /obj/structure/window/reinforced{ dir = 4 }, @@ -10028,7 +10028,7 @@ icon_state = "black" }, /area/ruin/space/moonbase19) -"aMt" = ( +"Mt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, @@ -10037,7 +10037,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aMv" = ( +"Mv" = ( /obj/structure/rack, /obj/item/storage/toolbox/mechanical{ pixel_x = 2; @@ -10052,20 +10052,20 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aMx" = ( +"Mx" = ( /obj/machinery/door/airlock/maintenance_hatch{ req_access_txt = "271" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aMy" = ( +"My" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aMz" = ( +"Mz" = ( /obj/item/t_scanner, /obj/structure/table, /turf/simulated/floor/plasteel{ @@ -10073,7 +10073,7 @@ icon_state = "cautioncorner" }, /area/ruin/space/moonbase19) -"aMF" = ( +"MF" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/newscaster{ pixel_y = -30 @@ -10088,7 +10088,7 @@ dir = 6 }, /area/ruin/space/moonbase19) -"aMG" = ( +"MG" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -10101,21 +10101,21 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aMH" = ( +"MH" = ( /obj/structure/closet/emcloset, /obj/structure/window/basic{ dir = 4 }, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aMI" = ( +"MI" = ( /obj/structure/chair/sofa/bench, /obj/machinery/light/small{ dir = 1 }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aMJ" = ( +"MJ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -10124,7 +10124,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aMK" = ( +"MK" = ( /obj/machinery/door_control{ id = "awaykitchen"; name = "kitchen shutters control"; @@ -10135,7 +10135,7 @@ dir = 5 }, /area/ruin/space/moonbase19) -"aMN" = ( +"MN" = ( /obj/effect/decal/cleanable/cobweb2, /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -10145,7 +10145,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aMS" = ( +"MS" = ( /obj/effect/turf_decal/stripes/corner, /obj/machinery/light/small, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -10162,17 +10162,17 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aMT" = ( +"MT" = ( /obj/structure/lattice, /turf/template_noop, /area/space/nearstation) -"aMU" = ( +"MU" = ( /obj/machinery/light{ dir = 1 }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aMY" = ( +"MY" = ( /obj/item/kirbyplants, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/decal/cleanable/cobweb2, @@ -10181,13 +10181,13 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aMZ" = ( +"MZ" = ( /obj/structure/railing/corner{ dir = 8 }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aNb" = ( +"Nb" = ( /obj/structure/chair/sofa/bench{ dir = 1 }, @@ -10195,7 +10195,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aNc" = ( +"Nc" = ( /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -10203,7 +10203,7 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aNd" = ( +"Nd" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -10211,7 +10211,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aNe" = ( +"Ne" = ( /obj/structure/table/reinforced, /obj/machinery/flasher_button{ pixel_y = -1 @@ -10234,11 +10234,11 @@ dir = 5 }, /area/ruin/space/moonbase19) -"aNi" = ( +"Ni" = ( /obj/structure/falsewall/rock_ancient, /turf/simulated/floor/plating/asteroid/ancient, /area/ruin/space/moonbase19) -"aNm" = ( +"Nm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -10254,7 +10254,7 @@ icon_state = "cautioncorner" }, /area/ruin/space/moonbase19) -"aNn" = ( +"Nn" = ( /obj/machinery/camera{ c_tag = "South Cafeteria"; dir = 5; @@ -10268,7 +10268,7 @@ icon_state = "escape" }, /area/ruin/space/moonbase19) -"aNp" = ( +"Np" = ( /obj/structure/chair/sofa/bench{ dir = 4 }, @@ -10280,7 +10280,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aNu" = ( +"Nu" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 8 @@ -10296,12 +10296,12 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aNv" = ( +"Nv" = ( /obj/effect/decal/cleanable/cobweb2, /obj/structure/grille/broken, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aNx" = ( +"Nx" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -10312,7 +10312,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aNy" = ( +"Ny" = ( /obj/structure/alien/resin/wall, /obj/structure/cable{ d1 = 1; @@ -10324,7 +10324,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aNC" = ( +"NC" = ( /obj/effect/decal/cleanable/blood/tracks{ color = "red"; desc = "Your instincts say you shouldn't be following these."; @@ -10336,7 +10336,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aNE" = ( +"NE" = ( /obj/machinery/light/small{ active_power_consumption = 0; dir = 1; @@ -10347,7 +10347,7 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/carpet, /area/ruin/space/moonbase19) -"aNF" = ( +"NF" = ( /obj/structure/railing, /obj/effect/turf_decal/delivery/red/partial{ dir = 1 @@ -10357,14 +10357,14 @@ icon_state = "black" }, /area/ruin/space/moonbase19) -"aNJ" = ( +"NJ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, /area/ruin/space/moonbase19) -"aNM" = ( +"NM" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -10379,14 +10379,14 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aNS" = ( +"NS" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aNT" = ( +"NT" = ( /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/dirt, /obj/item/clothing/head/det_hat{ @@ -10402,14 +10402,14 @@ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"aNU" = ( +"NU" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/oil{ color = "black" }, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aNZ" = ( +"NZ" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced{ dir = 4 @@ -10425,7 +10425,7 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"aOa" = ( +"Oa" = ( /obj/structure/chair/sofa/bench{ dir = 1 }, @@ -10434,13 +10434,13 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aOb" = ( +"Ob" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/plating/asteroid/airless{ icon_state = "asteroid12" }, /area/ruin/space/moonbase19) -"aOc" = ( +"Oc" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/splatter{ color = "red" @@ -10450,7 +10450,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aOd" = ( +"Od" = ( /obj/item/kirbyplants, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plasteel{ @@ -10458,7 +10458,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aOe" = ( +"Oe" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/reinforced/normal{ dir = 1 @@ -10468,18 +10468,18 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aOf" = ( +"Of" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aOg" = ( +"Og" = ( /turf/simulated/floor/plasteel{ icon_state = "black"; dir = 8 }, /area/ruin/space/moonbase19) -"aOi" = ( +"Oi" = ( /obj/effect/decal/cleanable/blood/tracks{ color = "red"; desc = "Your instincts say you shouldn't be following these."; @@ -10492,7 +10492,7 @@ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"aOj" = ( +"Oj" = ( /obj/structure/table/glass, /obj/item/storage/fancy/donut_box, /obj/effect/decal/cleanable/dirt, @@ -10501,7 +10501,7 @@ dir = 1 }, /area/ruin/space/moonbase19) -"aOl" = ( +"Ol" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -10515,7 +10515,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aOm" = ( +"Om" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -10525,7 +10525,7 @@ icon_state = "cautioncorner" }, /area/ruin/space/moonbase19) -"aOn" = ( +"On" = ( /obj/structure/safe/floor{ known_by = list("captain") }, @@ -10537,7 +10537,7 @@ /obj/item/coin/adamantine, /turf/simulated/floor/carpet/royalblue, /area/ruin/space/moonbase19) -"aOo" = ( +"Oo" = ( /obj/item/kirbyplants, /obj/machinery/light/small{ dir = 1 @@ -10550,21 +10550,21 @@ dir = 1 }, /area/ruin/space/moonbase19) -"aOp" = ( +"Op" = ( /obj/structure/window/reinforced, /obj/structure/table, /turf/simulated/floor/plasteel{ icon_state = "black" }, /area/ruin/space/moonbase19) -"aOq" = ( +"Oq" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "yellowsiding"; dir = 6 }, /area/ruin/space/moonbase19) -"aOs" = ( +"Os" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ @@ -10574,7 +10574,7 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aOt" = ( +"Ot" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, @@ -10584,13 +10584,13 @@ /obj/effect/decal/remains/human, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aOu" = ( +"Ou" = ( /obj/structure/rack, /turf/simulated/floor/plasteel{ icon_state = "escape" }, /area/ruin/space/moonbase19) -"aOx" = ( +"Ox" = ( /obj/machinery/light{ active_power_consumption = 0; icon_state = "tube-broken"; @@ -10598,7 +10598,7 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aOD" = ( +"OD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -10606,7 +10606,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aOE" = ( +"OE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, @@ -10616,10 +10616,10 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aOG" = ( +"OG" = ( /turf/simulated/wall/mineral/titanium, /area/ruin/space/moonbase19) -"aOL" = ( +"OL" = ( /obj/structure/railing/cap{ dir = 1 }, @@ -10629,7 +10629,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aOM" = ( +"OM" = ( /obj/effect/decal/cleanable/cobweb, /obj/item/shard{ icon_state = "medium" @@ -10639,17 +10639,17 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aON" = ( +"ON" = ( /turf/template_noop, /area/space/nearstation) -"aOO" = ( +"OO" = ( /obj/item/stack/sheet/metal, /turf/simulated/floor/plasteel{ icon_state = "black"; dir = 4 }, /area/ruin/space/moonbase19) -"aOP" = ( +"OP" = ( /obj/machinery/light/small{ dir = 4 }, @@ -10660,7 +10660,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aOT" = ( +"OT" = ( /obj/effect/turf_decal/delivery/partial{ dir = 4 }, @@ -10674,13 +10674,13 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aOW" = ( +"OW" = ( /obj/structure/railing{ dir = 10 }, /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/moonbase19) -"aOX" = ( +"OX" = ( /obj/structure/cable{ d1 = 4; d2 = 8; @@ -10692,7 +10692,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aOZ" = ( +"OZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -10701,7 +10701,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aPa" = ( +"Pa" = ( /obj/structure/table/glass, /obj/machinery/light/small{ dir = 1 @@ -10711,7 +10711,7 @@ icon_state = "darkblue" }, /area/ruin/space/moonbase19) -"aPd" = ( +"Pd" = ( /obj/machinery/light/small{ active_power_consumption = 0; dir = 1; @@ -10720,21 +10720,21 @@ }, /turf/simulated/floor/carpet, /area/ruin/space/moonbase19) -"aPf" = ( +"Pf" = ( /obj/structure/railing/cap{ dir = 1 }, /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/moonbase19) -"aPh" = ( +"Ph" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "caution"; dir = 4 }, /area/ruin/space/moonbase19) -"aPj" = ( +"Pj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ d1 = 1; @@ -10746,7 +10746,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aPo" = ( +"Po" = ( /obj/structure/alien/resin/wall, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -10754,7 +10754,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aPq" = ( +"Pq" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -10762,10 +10762,10 @@ /obj/machinery/atmospherics/air_sensor, /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"aPr" = ( +"Pr" = ( /turf/simulated/floor/carpet/royalblue, /area/ruin/space/moonbase19) -"aPs" = ( +"Ps" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -10774,7 +10774,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aPt" = ( +"Pt" = ( /obj/structure/chair/comfy/brown{ dir = 4 }, @@ -10783,7 +10783,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aPv" = ( +"Pv" = ( /obj/structure/chair/office/dark{ dir = 4 }, @@ -10792,26 +10792,26 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aPA" = ( +"PA" = ( /turf/simulated/floor/plasteel{ icon_state = "yellowsiding"; dir = 10 }, /area/ruin/space/moonbase19) -"aPB" = ( +"PB" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/grille, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aPE" = ( +"PE" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/food/snacks/badrecipe, +/obj/item/food/snacks/badrecipe, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor"; temperature = 273.15 }, /area/ruin/space/moonbase19) -"aPF" = ( +"PF" = ( /obj/machinery/door/airlock/security{ req_access_txt = "271"; name = "Security Checkpoint" @@ -10821,25 +10821,25 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aPK" = ( +"PK" = ( /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, /area/ruin/space/moonbase19) -"aPL" = ( +"PL" = ( /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aPM" = ( +"PM" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, /obj/effect/landmark/damageturf, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aPP" = ( +"PP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, @@ -10852,20 +10852,20 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aPQ" = ( +"PQ" = ( /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "caution" }, /area/ruin/space/moonbase19) -"aPS" = ( +"PS" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/plating/asteroid/airless{ icon_state = "asteroid5" }, /area/ruin/space/moonbase19) -"aPT" = ( +"PT" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 }, @@ -10877,7 +10877,7 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"aPU" = ( +"PU" = ( /obj/effect/decal/cleanable/blood/splatter{ color = "red" }, @@ -10886,7 +10886,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aPY" = ( +"PY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ @@ -10907,19 +10907,19 @@ }, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aPZ" = ( +"PZ" = ( /obj/structure/railing{ dir = 8 }, /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/moonbase19) -"aQc" = ( +"Qc" = ( /obj/structure/railing/cap{ dir = 10 }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aQe" = ( +"Qe" = ( /obj/structure/railing/cap{ dir = 1 }, @@ -10929,14 +10929,14 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aQf" = ( +"Qf" = ( /obj/effect/landmark/damageturf, /turf/simulated/floor/plasteel{ icon_state = "caution"; dir = 4 }, /area/ruin/space/moonbase19) -"aQh" = ( +"Qh" = ( /obj/structure/cable{ d1 = 2; d2 = 8; @@ -10944,7 +10944,7 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aQj" = ( +"Qj" = ( /obj/machinery/light/small{ active_power_consumption = 0; dir = 1; @@ -10954,11 +10954,11 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/carpet, /area/ruin/space/moonbase19) -"aQk" = ( +"Qk" = ( /mob/living/simple_animal/hostile/alien, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aQl" = ( +"Ql" = ( /obj/structure/chair/sofa/bench/right{ dir = 1 }, @@ -10972,12 +10972,12 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aQm" = ( +"Qm" = ( /obj/structure/flora/junglebush, /obj/structure/flora/ausbushes/ywflowers, /turf/simulated/floor/grass, /area/ruin/space/moonbase19) -"aQn" = ( +"Qn" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -10989,7 +10989,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aQt" = ( +"Qt" = ( /obj/structure/window/reinforced{ dir = 8 }, @@ -11002,7 +11002,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aQu" = ( +"Qu" = ( /obj/structure/rack, /obj/item/stack/sheet/mineral/plasma{ amount = 30 @@ -11015,7 +11015,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aQv" = ( +"Qv" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 }, @@ -11023,7 +11023,7 @@ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"aQx" = ( +"Qx" = ( /obj/structure/table/reinforced, /obj/machinery/door/window{ dir = 8 @@ -11033,7 +11033,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aQy" = ( +"Qy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ @@ -11043,7 +11043,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aQz" = ( +"Qz" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/tracks{ color = "red"; @@ -11053,7 +11053,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aQB" = ( +"QB" = ( /obj/structure/sign/biohazard{ pixel_y = 32 }, @@ -11061,7 +11061,7 @@ /obj/effect/turf_decal/delivery, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aQD" = ( +"QD" = ( /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -11070,14 +11070,14 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aQE" = ( +"QE" = ( /obj/structure/table/reinforced, /turf/simulated/floor/plasteel{ icon_state = "darkfull"; dir = 8 }, /area/ruin/space/moonbase19) -"aQF" = ( +"QF" = ( /obj/structure/railing{ dir = 4 }, @@ -11088,7 +11088,7 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aQG" = ( +"QG" = ( /obj/structure/railing{ dir = 1 }, @@ -11097,7 +11097,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aQI" = ( +"QI" = ( /obj/structure/railing/cap{ dir = 10 }, @@ -11106,11 +11106,11 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aQK" = ( +"QK" = ( /obj/machinery/light/small, /turf/simulated/floor/carpet/royalblue, /area/ruin/space/moonbase19) -"aQL" = ( +"QL" = ( /obj/effect/decal/cleanable/glass, /obj/item/shard{ icon_state = "medium" @@ -11118,7 +11118,7 @@ /obj/item/stack/rods, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aQM" = ( +"QM" = ( /obj/structure/railing/cap{ dir = 1 }, @@ -11127,7 +11127,7 @@ icon_state = "blackcorner" }, /area/ruin/space/moonbase19) -"aQO" = ( +"QO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, @@ -11140,45 +11140,45 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aQP" = ( +"QP" = ( /obj/effect/landmark/damageturf, /turf/simulated/floor/plasteel/stairs, /area/ruin/space/moonbase19) -"aQQ" = ( +"QQ" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 }, /turf/simulated/floor/plating/asteroid/ancient, /area/ruin/space/moonbase19) -"aQS" = ( +"QS" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "whitecorner"; dir = 8 }, /area/ruin/space/moonbase19) -"aQT" = ( +"QT" = ( /obj/machinery/light/small{ dir = 1 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aQW" = ( +"QW" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "white"; dir = 8 }, /area/ruin/space/moonbase19) -"aQX" = ( +"QX" = ( /obj/structure/alien/weeds/node, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aQZ" = ( +"QZ" = ( /obj/structure/alien/resin/wall, /obj/structure/cable{ d1 = 4; @@ -11187,7 +11187,7 @@ }, /turf/simulated/floor/plasteel/stairs, /area/ruin/space/moonbase19) -"aRc" = ( +"Rc" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -11211,7 +11211,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aRf" = ( +"Rf" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ @@ -11224,7 +11224,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aRg" = ( +"Rg" = ( /obj/machinery/door/airlock/freezer{ req_access_txt = "271" }, @@ -11233,13 +11233,13 @@ temperature = 273.15 }, /area/ruin/space/moonbase19) -"aRh" = ( +"Rh" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/plating/asteroid/airless{ icon_state = "asteroid10" }, /area/ruin/space/moonbase19) -"aRi" = ( +"Ri" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/blood/splatter{ color = "red" @@ -11247,7 +11247,7 @@ /obj/effect/decal/remains/human, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aRl" = ( +"Rl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/railing/cap{ @@ -11255,7 +11255,7 @@ }, /turf/simulated/floor/plasteel/stairs, /area/ruin/space/moonbase19) -"aRo" = ( +"Ro" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -11273,7 +11273,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aRr" = ( +"Rr" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -11282,7 +11282,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aRu" = ( +"Ru" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, @@ -11291,23 +11291,23 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aRv" = ( +"Rv" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"aRA" = ( +"RA" = ( /obj/structure/flora/rock, /turf/simulated/floor/engine/vacuum, /area/space/nearstation) -"aRC" = ( +"RC" = ( /obj/structure/table/reinforced, /obj/structure/alien/egg/burst, /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"aRD" = ( +"RD" = ( /obj/machinery/door/airlock/multi_tile/glass{ req_access_txt = "271" }, @@ -11318,20 +11318,20 @@ icon_state = "freezerfloor" }, /area/ruin/space/moonbase19) -"aRF" = ( +"RF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aRH" = ( +"RH" = ( /obj/machinery/kitchen_machine/oven, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor"; temperature = 273.15 }, /area/ruin/space/moonbase19) -"aRI" = ( +"RI" = ( /obj/structure/railing/cap{ dir = 8 }, @@ -11340,7 +11340,7 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"aRK" = ( +"RK" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 }, @@ -11349,7 +11349,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aRN" = ( +"RN" = ( /obj/structure/sign/radiation/rad_area{ pixel_y = 32 }, @@ -11360,7 +11360,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aRQ" = ( +"RQ" = ( /obj/effect/turf_decal/delivery/hollow, /obj/machinery/porta_turret{ check_synth = 1; @@ -11369,35 +11369,35 @@ }, /turf/simulated/floor/bluegrid, /area/ruin/space/moonbase19) -"aRU" = ( +"RU" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 8 }, /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aSa" = ( +"Sa" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "cautioncorner" }, /area/ruin/space/moonbase19) -"aSb" = ( +"Sb" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "caution"; dir = 8 }, /area/ruin/space/moonbase19) -"aSc" = ( +"Sc" = ( /obj/machinery/computer/monitor/secret{ dir = 4 }, /obj/structure/cable, /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"aSd" = ( +"Sd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8; @@ -11411,7 +11411,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aSg" = ( +"Sg" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced{ dir = 1 @@ -11424,7 +11424,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aSi" = ( +"Si" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/xeno{ color = "green" @@ -11434,7 +11434,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aSj" = ( +"Sj" = ( /obj/structure/chair/office/dark{ dir = 4 }, @@ -11443,28 +11443,28 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aSk" = ( +"Sk" = ( /obj/structure/flora/ausbushes/fernybush, /obj/structure/flora/ausbushes/ppflowers, /turf/simulated/floor/grass, /area/ruin/space/moonbase19) -"aSm" = ( +"Sm" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "whitehall"; dir = 10 }, /area/ruin/space/moonbase19) -"aSp" = ( +"Sp" = ( /mob/living/simple_animal/cockroach, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aSq" = ( +"Sq" = ( /turf/simulated/floor/plasteel{ icon_state = "green" }, /area/ruin/space/moonbase19) -"aSt" = ( +"St" = ( /obj/structure/table/reinforced, /obj/machinery/door/window, /obj/machinery/door/poddoor/shutters/preopen{ @@ -11476,24 +11476,24 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aSu" = ( +"Su" = ( /obj/structure/closet/crate, /turf/simulated/floor/plasteel{ icon_state = "darkfull"; dir = 8 }, /area/ruin/space/moonbase19) -"aSv" = ( +"Sv" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/plating/asteroid/airless{ icon_state = "asteroid10" }, /area/ruin/space/moonbase19) -"aSx" = ( +"Sx" = ( /obj/effect/decal/cleanable/greenglow, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aSz" = ( +"Sz" = ( /obj/effect/landmark/damageturf, /obj/structure/cable{ d1 = 4; @@ -11505,7 +11505,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aSG" = ( +"SG" = ( /obj/structure/railing{ dir = 4 }, @@ -11515,7 +11515,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aSI" = ( +"SI" = ( /obj/structure/table/glass, /obj/effect/decal/cleanable/dirt, /obj/item/storage/box/gloves, @@ -11525,14 +11525,14 @@ dir = 1 }, /area/ruin/space/moonbase19) -"aSL" = ( +"SL" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 }, /obj/structure/alien/resin/wall, /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"aSO" = ( +"SO" = ( /obj/effect/turf_decal/stripes/asteroid/line, /obj/structure/railing, /obj/effect/decal/cleanable/cobweb, @@ -11540,7 +11540,7 @@ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"aST" = ( +"ST" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -11555,7 +11555,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aSV" = ( +"SV" = ( /obj/structure/chair/stool/bar{ dir = 8 }, @@ -11564,7 +11564,7 @@ icon_state = "escape" }, /area/ruin/space/moonbase19) -"aTc" = ( +"Tc" = ( /obj/machinery/computer{ dir = 4 }, @@ -11573,7 +11573,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aTd" = ( +"Td" = ( /obj/structure/weightmachine/stacklifter, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ @@ -11581,7 +11581,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aTe" = ( +"Te" = ( /obj/machinery/shieldwallgen{ locked = 0; req_access = null @@ -11601,7 +11601,7 @@ /obj/effect/turf_decal/box, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aTf" = ( +"Tf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -11612,7 +11612,7 @@ icon_state = "cautioncorner" }, /area/ruin/space/moonbase19) -"aTi" = ( +"Ti" = ( /obj/machinery/door/airlock/command/glass{ req_access_txt = "271"; name = "Senior Researcher's Office" @@ -11627,7 +11627,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aTm" = ( +"Tm" = ( /obj/structure/railing/cap{ dir = 9 }, @@ -11637,7 +11637,7 @@ dir = 6 }, /area/ruin/space/moonbase19) -"aTn" = ( +"Tn" = ( /obj/structure/cable{ d1 = 1; d2 = 2; @@ -11652,7 +11652,7 @@ }, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aTr" = ( +"Tr" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/alien, /turf/simulated/floor/plasteel{ @@ -11660,7 +11660,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aTu" = ( +"Tu" = ( /obj/structure/railing/corner{ dir = 8 }, @@ -11669,7 +11669,7 @@ icon_state = "black" }, /area/ruin/space/moonbase19) -"aTv" = ( +"Tv" = ( /obj/structure/chair/sofa/bench/right{ dir = 1 }, @@ -11678,7 +11678,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aTw" = ( +"Tw" = ( /obj/machinery/light/small{ active_power_consumption = 0; dir = 1; @@ -11688,7 +11688,7 @@ /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/carpet, /area/ruin/space/moonbase19) -"aTx" = ( +"Tx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, @@ -11697,14 +11697,14 @@ icon_state = "escape" }, /area/ruin/space/moonbase19) -"aTz" = ( +"Tz" = ( /obj/structure/chair/office/dark, /turf/simulated/floor/plasteel{ icon_state = "white"; dir = 8 }, /area/ruin/space/moonbase19) -"aTB" = ( +"TB" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced{ dir = 4 @@ -11720,14 +11720,14 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aTD" = ( +"TD" = ( /obj/structure/chair/comfy/corp, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aTF" = ( +"TF" = ( /obj/structure/cable{ d1 = 1; d2 = 2; @@ -11737,7 +11737,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aTI" = ( +"TI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -11754,14 +11754,14 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aTK" = ( +"TK" = ( /obj/structure/bed, /obj/item/bedsheet, /obj/effect/decal/cleanable/cobweb, /obj/item/toy/plushie/voxplushie, /turf/simulated/floor/carpet, /area/ruin/space/moonbase19) -"aTO" = ( +"TO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/barricade/wooden/crude{ @@ -11771,7 +11771,7 @@ icon_state = "freezerfloor" }, /area/ruin/space/moonbase19) -"aTS" = ( +"TS" = ( /obj/machinery/reagentgrinder, /obj/structure/table, /turf/simulated/floor/plasteel{ @@ -11779,7 +11779,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aTW" = ( +"TW" = ( /obj/structure/railing/cap{ dir = 1 }, @@ -11789,7 +11789,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aTY" = ( +"TY" = ( /obj/structure/sign/biohazard{ pixel_y = -32 }, @@ -11807,7 +11807,7 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aTZ" = ( +"TZ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/effect/decal/cleanable/dirt, @@ -11816,7 +11816,7 @@ icon_state = "cautioncorner" }, /area/ruin/space/moonbase19) -"aUa" = ( +"Ua" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/office/dark{ dir = 1 @@ -11826,7 +11826,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aUb" = ( +"Ub" = ( /obj/structure/filingcabinet, /obj/structure/sign/poster/contraband/fun_police{ pixel_y = 32 @@ -11836,7 +11836,7 @@ dir = 1 }, /area/ruin/space/moonbase19) -"aUe" = ( +"Ue" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock{ @@ -11848,7 +11848,7 @@ icon_state = "green" }, /area/ruin/space/moonbase19) -"aUg" = ( +"Ug" = ( /obj/structure/chair, /obj/machinery/light/small{ dir = 1 @@ -11858,7 +11858,7 @@ dir = 1 }, /area/ruin/space/moonbase19) -"aUl" = ( +"Ul" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, @@ -11874,7 +11874,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aUn" = ( +"Un" = ( /obj/item/shard{ icon_state = "medium" }, @@ -11884,14 +11884,14 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aUp" = ( +"Up" = ( /obj/item/chair{ pixel_y = 1; dir = 4 }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aUr" = ( +"Ur" = ( /obj/structure/cable{ d1 = 2; d2 = 4; @@ -11899,7 +11899,7 @@ }, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aUt" = ( +"Ut" = ( /obj/item/chair{ dir = 4; pixel_x = -1; @@ -11910,7 +11910,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aUu" = ( +"Uu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/blood/xeno{ @@ -11923,7 +11923,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aUv" = ( +"Uv" = ( /obj/machinery/flasher{ pixel_x = 28 }, @@ -11938,7 +11938,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aUz" = ( +"Uz" = ( /obj/structure/barricade/wooden/crude{ layer = 4 }, @@ -11954,7 +11954,7 @@ }, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aUA" = ( +"UA" = ( /obj/structure/table/glass/reinforced/plastitanium, /obj/machinery/computer/id_upgrader, /turf/simulated/floor/plasteel{ @@ -11962,7 +11962,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aUB" = ( +"UB" = ( /obj/structure/weightmachine/weightlifter, /obj/effect/turf_decal/delivery/hollow, /obj/structure/railing{ @@ -11975,30 +11975,30 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aUD" = ( +"UD" = ( /mob/living/simple_animal/hostile/alien/drone, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aUF" = ( +"UF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aUG" = ( +"UG" = ( /obj/structure/rack, /obj/effect/decal/cleanable/cobweb2, /obj/item/stack/cable_coil, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aUH" = ( +"UH" = ( /obj/structure/railing/cap{ dir = 6 }, /turf/simulated/floor/plasteel/stairs, /area/ruin/space/moonbase19) -"aUI" = ( +"UI" = ( /obj/structure/railing{ dir = 4 }, @@ -12014,7 +12014,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aUK" = ( +"UK" = ( /obj/structure/railing{ dir = 10 }, @@ -12024,20 +12024,20 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aUO" = ( +"UO" = ( /obj/structure/lattice, /obj/item/shard{ icon_state = "medium" }, /turf/template_noop, /area/space/nearstation) -"aUQ" = ( +"UQ" = ( /obj/structure/railing/corner{ dir = 1 }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aUV" = ( +"UV" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -12047,12 +12047,12 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aUX" = ( +"UX" = ( /obj/structure/alien/resin/wall, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aUZ" = ( +"UZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, @@ -12061,11 +12061,11 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aVa" = ( +"Va" = ( /obj/machinery/door/airlock/maintenance_hatch, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aVf" = ( +"Vf" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -12074,7 +12074,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aVg" = ( +"Vg" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -12083,7 +12083,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aVh" = ( +"Vh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -12092,7 +12092,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aVi" = ( +"Vi" = ( /obj/effect/turf_decal/delivery/white/partial, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 8 @@ -12107,18 +12107,18 @@ icon_state = "whitecorner" }, /area/ruin/space/moonbase19) -"aVl" = ( +"Vl" = ( /obj/structure/railing, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aVm" = ( +"Vm" = ( /obj/structure/railing/corner{ dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aVo" = ( +"Vo" = ( /obj/structure/closet/crate/can, /obj/effect/decal/cleanable/cobweb2, /obj/effect/spawner/lootdrop/maintenance, @@ -12127,13 +12127,13 @@ icon_state = "escape" }, /area/ruin/space/moonbase19) -"aVs" = ( +"Vs" = ( /obj/effect/decal/cleanable/dirt, /obj/item/kitchen/utensil/fork, /obj/structure/table, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aVv" = ( +"Vv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, @@ -12145,7 +12145,7 @@ /obj/structure/table, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aVx" = ( +"Vx" = ( /obj/machinery/light/small{ dir = 1 }, @@ -12154,14 +12154,14 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aVy" = ( +"Vy" = ( /obj/machinery/floodlight, /turf/simulated/floor/plasteel{ icon_state = "darkfull"; dir = 8 }, /area/ruin/space/moonbase19) -"aVC" = ( +"VC" = ( /obj/structure/window/reinforced{ dir = 8 }, @@ -12174,14 +12174,14 @@ dir = 10 }, /area/ruin/space/moonbase19) -"aVG" = ( +"VG" = ( /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ icon_state = "caution"; dir = 9 }, /area/ruin/space/moonbase19) -"aVH" = ( +"VH" = ( /obj/structure/cable{ d1 = 1; d2 = 2; @@ -12189,7 +12189,7 @@ }, /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"aVK" = ( +"VK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, @@ -12202,7 +12202,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aVL" = ( +"VL" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 1 }, @@ -12213,7 +12213,7 @@ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"aVM" = ( +"VM" = ( /obj/structure/rack, /obj/item/flashlight/flare, /obj/item/flashlight/flare, @@ -12223,18 +12223,18 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aVN" = ( +"VN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, /turf/simulated/wall/r_wall, /area/ruin/space/moonbase19) -"aVO" = ( +"VO" = ( /obj/machinery/computer, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aVR" = ( +"VR" = ( /obj/structure/chair{ dir = 1 }, @@ -12243,7 +12243,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aVS" = ( +"VS" = ( /obj/structure/disposalpipe/segment{ desc = "An underfloor disposal pipe. This one has been applied with an acid-proof coating."; dir = 2; @@ -12256,12 +12256,12 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aVT" = ( +"VT" = ( /obj/structure/bed, /obj/structure/closet/crate/secure/loot, /turf/simulated/floor/carpet, /area/ruin/space/moonbase19) -"aVU" = ( +"VU" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/xeno{ color = "green" @@ -12271,7 +12271,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aVV" = ( +"VV" = ( /obj/structure/railing{ dir = 4 }, @@ -12284,7 +12284,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aVX" = ( +"VX" = ( /obj/machinery/shower{ dir = 8 }, @@ -12295,17 +12295,17 @@ }, /turf/simulated/floor/noslip, /area/ruin/space/moonbase19) -"aWb" = ( +"Wb" = ( /obj/effect/decal/cleanable/blood/xeno{ color = "green" }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aWd" = ( +"Wd" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aWe" = ( +"We" = ( /obj/machinery/door/airlock/maintenance_hatch{ req_access_txt = "271" }, @@ -12315,12 +12315,12 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aWg" = ( +"Wg" = ( /obj/structure/lattice, /obj/machinery/door/firedoor/closed, /turf/template_noop, /area/ruin/space/moonbase19) -"aWi" = ( +"Wi" = ( /obj/effect/decal/cleanable/blood/splatter{ color = "red" }, @@ -12329,20 +12329,20 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aWl" = ( +"Wl" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/plating/asteroid/airless{ icon_state = "asteroid6" }, /area/ruin/space/moonbase19) -"aWn" = ( +"Wn" = ( /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "caution" }, /area/ruin/space/moonbase19) -"aWo" = ( +"Wo" = ( /obj/machinery/light/small{ dir = 4 }, @@ -12355,24 +12355,24 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aWp" = ( +"Wp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel/stairs, /area/ruin/space/moonbase19) -"aWq" = ( +"Wq" = ( /turf/simulated/floor/plasteel{ icon_state = "yellowsiding"; dir = 4 }, /area/ruin/space/moonbase19) -"aWs" = ( +"Ws" = ( /turf/simulated/floor/plasteel{ icon_state = "whitehall"; dir = 5 }, /area/ruin/space/moonbase19) -"aWv" = ( +"Wv" = ( /obj/structure/railing{ dir = 8 }, @@ -12382,7 +12382,7 @@ /obj/structure/table, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aWz" = ( +"Wz" = ( /obj/machinery/light/small, /obj/structure/table, /turf/simulated/floor/plasteel{ @@ -12390,7 +12390,7 @@ icon_state = "escape" }, /area/ruin/space/moonbase19) -"aWE" = ( +"WE" = ( /obj/structure/railing, /obj/item/cigbutt{ pixel_x = 5 @@ -12402,10 +12402,10 @@ /obj/item/cigbutt{ pixel_y = 7 }, -/obj/item/reagent_containers/food/drinks/cans/beer, +/obj/item/reagent_containers/drinks/cans/beer, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aWF" = ( +"WF" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 2; @@ -12417,14 +12417,14 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aWG" = ( +"WG" = ( /obj/machinery/door/airlock/vault{ locked = 1; req_access_txt = "271" }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aWH" = ( +"WH" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/structure/table, /turf/simulated/floor/plasteel{ @@ -12432,14 +12432,14 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aWJ" = ( +"WJ" = ( /obj/item/kirbyplants, /obj/structure/railing{ dir = 9 }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aWK" = ( +"WK" = ( /obj/effect/turf_decal/stripes/asteroid/corner{ dir = 1 }, @@ -12448,7 +12448,7 @@ }, /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/powered) -"aWM" = ( +"WM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, @@ -12457,18 +12457,18 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aWN" = ( +"WN" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/carpet, /area/ruin/space/moonbase19) -"aWS" = ( +"WS" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "escapecorner"; dir = 8 }, /area/ruin/space/moonbase19) -"aWU" = ( +"WU" = ( /obj/machinery/light{ active_power_consumption = 0; dir = 1; @@ -12483,7 +12483,7 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aWW" = ( +"WW" = ( /obj/structure/cable{ d1 = 1; d2 = 2; @@ -12494,11 +12494,11 @@ dir = 1 }, /area/ruin/space/moonbase19) -"aWX" = ( +"WX" = ( /obj/item/stack/rods, /turf/template_noop, /area/space/nearstation) -"aWZ" = ( +"WZ" = ( /obj/structure/chair{ dir = 4 }, @@ -12507,7 +12507,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aXb" = ( +"Xb" = ( /obj/structure/disposalpipe/segment{ desc = "An underfloor disposal pipe. This one has been applied with an acid-proof coating."; dir = 2; @@ -12518,14 +12518,14 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aXc" = ( +"Xc" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "black"; dir = 6 }, /area/ruin/space/moonbase19) -"aXd" = ( +"Xd" = ( /obj/effect/turf_decal/delivery/white/partial{ dir = 1 }, @@ -12534,7 +12534,7 @@ dir = 1 }, /area/ruin/space/moonbase19) -"aXg" = ( +"Xg" = ( /obj/structure/railing{ dir = 4 }, @@ -12544,7 +12544,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aXi" = ( +"Xi" = ( /obj/machinery/computer, /obj/structure/window/reinforced{ dir = 1 @@ -12554,13 +12554,13 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aXl" = ( +"Xl" = ( /obj/item/shard{ icon_state = "medium" }, /turf/template_noop, /area/space/nearstation) -"aXm" = ( +"Xm" = ( /obj/structure/railing/cap, /obj/machinery/light/small{ dir = 8 @@ -12575,7 +12575,7 @@ icon_state = "green" }, /area/ruin/space/moonbase19) -"aXp" = ( +"Xp" = ( /obj/structure/chair{ dir = 8 }, @@ -12585,7 +12585,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aXq" = ( +"Xq" = ( /obj/structure/cable{ d1 = 4; d2 = 8; @@ -12596,7 +12596,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aXr" = ( +"Xr" = ( /obj/machinery/atmospherics/unary/thermomachine/freezer/on{ dir = 1 }, @@ -12604,7 +12604,7 @@ icon_state = "asteroidplating" }, /area/ruin/space/moonbase19) -"aXs" = ( +"Xs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, @@ -12616,16 +12616,16 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aXv" = ( +"Xv" = ( /obj/machinery/reagentgrinder, -/obj/item/reagent_containers/food/drinks/shaker{ +/obj/item/reagent_containers/drinks/shaker{ pixel_y = 4; pixel_x = -12 }, /obj/structure/table, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aXw" = ( +"Xw" = ( /obj/machinery/processor{ dir = 4 }, @@ -12634,7 +12634,7 @@ temperature = 273.15 }, /area/ruin/space/moonbase19) -"aXz" = ( +"Xz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ @@ -12645,13 +12645,13 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aXB" = ( +"XB" = ( /obj/structure/railing{ dir = 10 }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aXD" = ( +"XD" = ( /obj/structure/chair/sofa/bench/right{ dir = 8 }, @@ -12660,13 +12660,13 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aXE" = ( +"XE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/carpet/royalblue, /area/ruin/space/moonbase19) -"aXF" = ( +"XF" = ( /obj/structure/table/reinforced, /obj/item/taperecorder{ pixel_x = -3 @@ -12676,7 +12676,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aXH" = ( +"XH" = ( /obj/structure/railing{ dir = 1 }, @@ -12691,7 +12691,7 @@ icon_state = "green" }, /area/ruin/space/moonbase19) -"aXK" = ( +"XK" = ( /obj/machinery/camera{ c_tag = "Exterior Hangar"; dir = 5; @@ -12699,7 +12699,7 @@ }, /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/moonbase19) -"aXL" = ( +"XL" = ( /obj/structure/window/reinforced{ dir = 4 }, @@ -12709,7 +12709,7 @@ dir = 1 }, /area/ruin/space/moonbase19) -"aXM" = ( +"XM" = ( /obj/structure/filingcabinet, /obj/structure/sign/mech{ pixel_y = 32 @@ -12720,7 +12720,7 @@ dir = 1 }, /area/ruin/space/moonbase19) -"aXN" = ( +"XN" = ( /obj/machinery/reagentgrinder, /obj/machinery/light/small{ dir = 8 @@ -12735,7 +12735,7 @@ temperature = 273.15 }, /area/ruin/space/moonbase19) -"aXO" = ( +"XO" = ( /obj/structure/railing/cap{ dir = 4 }, @@ -12743,7 +12743,7 @@ dir = 1 }, /area/ruin/space/moonbase19) -"aXR" = ( +"XR" = ( /obj/structure/chair{ dir = 1 }, @@ -12756,7 +12756,7 @@ dir = 1 }, /area/ruin/space/moonbase19) -"aXU" = ( +"XU" = ( /obj/item/airlock_electronics, /obj/item/stack/cable_coil, /obj/structure/table, @@ -12764,14 +12764,14 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aXW" = ( +"XW" = ( /obj/structure/closet/l3closet/general, /turf/simulated/floor/plasteel{ icon_state = "whitecorner"; dir = 1 }, /area/ruin/space/moonbase19) -"aXX" = ( +"XX" = ( /obj/structure/closet/crate/can, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plasteel{ @@ -12779,13 +12779,13 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aXY" = ( +"XY" = ( /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ icon_state = "whitehall" }, /area/ruin/space/moonbase19) -"aYd" = ( +"Yd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, @@ -12795,7 +12795,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aYe" = ( +"Ye" = ( /obj/structure/window/reinforced{ dir = 4 }, @@ -12806,11 +12806,11 @@ icon_state = "black" }, /area/ruin/space/moonbase19) -"aYh" = ( +"Yh" = ( /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aYi" = ( +"Yi" = ( /obj/structure/railing/cap, /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -12826,7 +12826,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aYj" = ( +"Yj" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/engineering/glass{ req_access_txt = "271"; @@ -12834,7 +12834,7 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aYk" = ( +"Yk" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery/white/partial, /turf/simulated/floor/plasteel{ @@ -12842,7 +12842,7 @@ dir = 1 }, /area/ruin/space/moonbase19) -"aYl" = ( +"Yl" = ( /obj/structure/mirror{ pixel_x = -28 }, @@ -12854,7 +12854,7 @@ icon_state = "freezerfloor" }, /area/ruin/space/moonbase19) -"aYt" = ( +"Yt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, @@ -12867,7 +12867,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aYu" = ( +"Yu" = ( /obj/structure/toilet{ pixel_y = 8 }, @@ -12877,7 +12877,7 @@ icon_state = "freezerfloor" }, /area/ruin/space/moonbase19) -"aYw" = ( +"Yw" = ( /obj/machinery/chem_master, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -12885,13 +12885,13 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aYy" = ( +"Yy" = ( /obj/structure/chair/office/dark{ dir = 1 }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aYz" = ( +"Yz" = ( /obj/machinery/light/small{ active_power_consumption = 0; dir = 4; @@ -12909,7 +12909,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aYB" = ( +"YB" = ( /obj/machinery/door/poddoor/impassable{ id_tag = "awaymlock" }, @@ -12920,7 +12920,7 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aYC" = ( +"YC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -12935,18 +12935,18 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aYJ" = ( +"YJ" = ( /obj/structure/table, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aYK" = ( +"YK" = ( /obj/structure/railing{ dir = 8 }, /mob/living/simple_animal/hostile/alien/sentinel, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aYL" = ( +"YL" = ( /obj/structure/railing{ dir = 4 }, @@ -12962,14 +12962,14 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aYM" = ( +"YM" = ( /obj/machinery/door/airlock/engineering/glass{ req_access_txt = "271"; name = "Workshop" }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aYQ" = ( +"YQ" = ( /obj/structure/railing{ dir = 8 }, @@ -12982,7 +12982,7 @@ dir = 4 }, /area/ruin/space/moonbase19) -"aYS" = ( +"YS" = ( /obj/structure/alien/resin/wall, /obj/structure/cable{ d1 = 1; @@ -12991,7 +12991,7 @@ }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aYX" = ( +"YX" = ( /obj/structure/railing, /obj/effect/turf_decal/delivery/red/partial{ dir = 1 @@ -13003,7 +13003,7 @@ dir = 10 }, /area/ruin/space/moonbase19) -"aYY" = ( +"YY" = ( /obj/structure/chair{ dir = 4 }, @@ -13018,18 +13018,18 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aZa" = ( +"Za" = ( /obj/structure/holosign/barrier/engineering, /obj/effect/landmark/damageturf, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aZb" = ( +"Zb" = ( /obj/machinery/door/airlock/external/glass{ locked = 1 }, /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) -"aZf" = ( +"Zf" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/alien/queen/large{ melee_damage_upper = 35; @@ -13040,7 +13040,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aZg" = ( +"Zg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, @@ -13055,7 +13055,7 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aZh" = ( +"Zh" = ( /obj/effect/decal/cleanable/molten_object/large, /obj/effect/decal/cleanable/glass, /obj/effect/landmark/damageturf, @@ -13067,14 +13067,14 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aZi" = ( +"Zi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aZj" = ( +"Zj" = ( /obj/effect/turf_decal/delivery/white/partial{ dir = 1 }, @@ -13082,7 +13082,7 @@ icon_state = "black" }, /area/ruin/space/moonbase19) -"aZk" = ( +"Zk" = ( /obj/machinery/atmospherics/unary/tank/air{ dir = 8 }, @@ -13096,7 +13096,7 @@ dir = 5 }, /area/ruin/space/moonbase19) -"aZn" = ( +"Zn" = ( /obj/machinery/light/small{ dir = 8 }, @@ -13104,7 +13104,7 @@ icon_state = "dark" }, /area/ruin/space/moonbase19) -"aZp" = ( +"Zp" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/structure/table, /turf/simulated/floor/plasteel{ @@ -13112,7 +13112,7 @@ icon_state = "escape" }, /area/ruin/space/moonbase19) -"aZq" = ( +"Zq" = ( /obj/structure/rack, /obj/item/taperecorder{ pixel_x = -3 @@ -13120,7 +13120,7 @@ /obj/item/storage/secure/briefcase, /turf/simulated/floor/carpet/royalblue, /area/ruin/space/moonbase19) -"aZu" = ( +"Zu" = ( /obj/machinery/computer, /obj/structure/window/reinforced{ dir = 4 @@ -13133,7 +13133,7 @@ icon_state = "caution" }, /area/ruin/space/moonbase19) -"aZw" = ( +"Zw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /mob/living/simple_animal/hostile/alien/sentinel, @@ -13144,14 +13144,14 @@ }, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aZz" = ( +"Zz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aZA" = ( +"ZA" = ( /obj/structure/railing{ dir = 1 }, @@ -13165,7 +13165,7 @@ icon_state = "whitecorner" }, /area/ruin/space/moonbase19) -"aZC" = ( +"ZC" = ( /obj/structure/railing, /obj/effect/turf_decal/stripes/asteroid/line, /obj/effect/turf_decal/stripes/asteroid/line{ @@ -13174,21 +13174,21 @@ /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/moonbase19) -"aZE" = ( +"ZE" = ( /obj/machinery/door/airlock/external/glass, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aZI" = ( +"ZI" = ( /obj/effect/decal/cleanable/cobweb2, /obj/structure/table, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aZK" = ( +"ZK" = ( /obj/machinery/light/small, /mob/living/simple_animal/cockroach, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aZL" = ( +"ZL" = ( /obj/structure/alien/resin/wall, /obj/structure/cable{ d1 = 1; @@ -13200,7 +13200,7 @@ icon_state = "cafeteria" }, /area/ruin/space/moonbase19) -"aZN" = ( +"ZN" = ( /obj/structure/chair/office/dark{ dir = 4 }, @@ -13210,7 +13210,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aZO" = ( +"ZO" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 }, @@ -13222,7 +13222,7 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/engine, /area/ruin/space/moonbase19) -"aZP" = ( +"ZP" = ( /obj/machinery/door/airlock/medical/glass{ req_access_txt = "271" }, @@ -13234,7 +13234,7 @@ dir = 8 }, /area/ruin/space/moonbase19) -"aZR" = ( +"ZR" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/space_heater, /obj/structure/window/basic{ @@ -13242,7 +13242,7 @@ }, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) -"aZU" = ( +"ZU" = ( /obj/machinery/kitchen_machine/microwave{ pixel_x = -3; pixel_y = 6 @@ -13250,13 +13250,13 @@ /obj/structure/table, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) -"aZV" = ( +"ZV" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/plating/asteroid/airless{ icon_state = "asteroid5" }, /area/ruin/space/moonbase19) -"aZX" = ( +"ZX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -13269,4802 +13269,4802 @@ /area/ruin/space/moonbase19) (1,1,1) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -atX -atX -atX -atX -atX -atX -atX -aaa -aaa -aaa -atX -atX -atX -atX -atX -atX -atX -atX -atX -atX -atX -aaa -aaa -aaa -atX -atX -atX -atX -atX -atX -aaa -atX -atX -aaa -atX -atX -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aa +aa +aa +aa +aa +aa +aa +aa +tX +tX +tX +tX +tX +tX +tX +aa +aa +aa +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +aa +aa +aa +tX +tX +tX +tX +tX +tX +aa +tX +tX +aa +tX +tX +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (2,1,1) = {" -aaa -aaa -aaa -aaa -aaa -aaa -atX -atX -atX -atX -atX -atX -atX -atX -atX -atX -atX -atX -atX -atX -atX -atX -atX -afV -aad -atX -atX -atX -atX -atX -atX -atX -atX -atX -atX -atX -atX -atX -atX -atX -atX -atX -atX -atX -atX -atX -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aa +aa +aa +aa +aa +aa +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +fV +ad +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (3,1,1) = {" -aaa -aaa -aaa -aaa -aaa -atX -atX -atX -atX -atX -atX -atX -atX -atX -atX -atX -atX -atX -atX -atX -atX -atX -afw -adA -aiM -aEt -ahG -atX -atX -aag -aaf -aaf -aag -aag -aaf -aag -aag -aag -aaf -aag -aag -aaf -aaf -aaf -aag -atX -atX -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aa +aa +aa +aa +aa +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +fw +dA +iM +Et +hG +tX +tX +ag +af +af +ag +ag +af +ag +ag +ag +af +ag +ag +af +af +af +ag +tX +tX +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (4,1,1) = {" -aaa -aaa -aaa -aaa -atX -atX -aag -aaf -aag -aag -aag -aag -aag -aaf -aag -aag -aag -aaf -aaf -atX -atX -atX -azT -aSv -ahZ -afw -amq -afV -atX -aaf -aiQ -aXw -aXN -amT -aqQ -aGx -aag -aLa -arl -awc -aDt -aOc -aZA -aTS -aag -atX -atX -atX -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aa +aa +aa +aa +tX +tX +ag +af +ag +ag +ag +ag +ag +af +ag +ag +ag +af +af +tX +tX +tX +zT +Sv +hZ +fw +mq +fV +tX +af +iQ +Xw +XN +mT +qQ +Gx +ag +La +rl +wc +Dt +Oc +ZA +TS +ag +tX +tX +tX +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (5,1,1) = {" -aaa -aaa -aaa -aaa -atX -atX -aag -ahW -ayF -aaf -aTK -ajo -aag -ahW -aHb -aag -aAz -awC -aaf -atX -atX -afV -ahZ -atj -axn -aIC -aBA -atX -atX -aag -ahL -avN -avN -ahL -avN -avN -aaf -add -aQI -ats -aWd -aAm -aCi -avz -acF -aQQ -atX -atX -atX -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aa +aa +aa +aa +tX +tX +ag +hW +yF +af +TK +jo +ag +hW +Hb +ag +Az +wC +af +tX +tX +fV +hZ +tj +xn +IC +BA +tX +tX +ag +hL +vN +vN +hL +vN +vN +af +dd +QI +ts +Wd +Am +Ci +vz +cF +QQ +tX +tX +tX +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (6,1,1) = {" -aaa -aaa -aaa -atX -atX -atX -aag -aTw -aWN -aaf -aPd -ahE -aag -aJW -aWN -aag -aNE -aWN -aaf -atX -atX -aag -aag -aaf -aWd -aWd -aKv -aag -aag -aag -agx -aPE -aeb -azM -aRH -ahL -aaf -aJA -aVU -act -aWd -aJx -aTm -awq -aag -axu -agk -atX -atX -atX -atX -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aa +aa +aa +tX +tX +tX +ag +Tw +WN +af +Pd +hE +ag +JW +WN +ag +NE +WN +af +tX +tX +ag +ag +af +Wd +Wd +Kv +ag +ag +ag +gx +PE +eb +zM +RH +hL +af +JA +VU +ct +Wd +Jx +Tm +wq +ag +xu +gk +tX +tX +tX +tX +aa +aa +aa +aa +aa +aa +aa "} (7,1,1) = {" -aaa -aaa -aaa -atX -atX -atX -aag -ann -axW -aaf -ann -axW -aag -aGS -axW -aag -ann -anw -aag -aag -atX -aag -aET -amB -azv -azI -arB -awe -aZp -aaf -azP -aFp -ahL -avN -azh -avN -aag -aPa -aho -are -aaM -aEl -aQW -aSI -aaf -aQv -aXr -atX -atX -atX -atX -atX -atX -atX -aaa -aaa -aaa -aaa +aa +aa +aa +tX +tX +tX +ag +nn +xW +af +nn +xW +ag +GS +xW +ag +nn +nw +ag +ag +tX +ag +ET +mB +zv +zI +rB +we +Zp +af +zP +Fp +hL +vN +zh +vN +ag +Pa +ho +re +aM +El +QW +SI +af +Qv +Xr +tX +tX +tX +tX +tX +tX +tX +aa +aa +aa +aa "} (8,1,1) = {" -aaa -aaa -atX -atX -atX -atX -aaf -amJ -azN -amr -amJ -adM -aGJ -aLz -aKm -aXm -auG -aKm -aru -aag -aag -aaf -aLl -aak -aNC -acL -afy -aak -api -aaf -aaf -aag -aRg -aQx -aQx -aag -aag -aGh -ang -aIo -aaL -aEm -ahh -azV -aaf -aeC -awt -apK -ajb -ajb -akp -ajb -aeC -atX -atX -aaa -aaa -aaa +aa +aa +tX +tX +tX +tX +af +mJ +zN +mr +mJ +dM +GJ +Lz +Km +Xm +uG +Km +ru +ag +ag +af +Ll +ak +NC +cL +fy +ak +pi +af +af +ag +Rg +Qx +Qx +ag +ag +Gh +ng +Io +aL +Em +hh +zV +af +eC +wt +pK +jb +jb +kp +jb +eC +tX +tX +aa +aa +aa "} (9,1,1) = {" -aaa -aaa -atX -atX -atX -atX -aag -aaf -aaf -aag -aag -aaA -aKG -aOl -aak -aQz -auR -aaA -aKu -aTd -aag -aaf -aii -aaA -aWZ -aDf -aZi -aaA -aDr -akX -alC -awR -aOg -aOg -aDp -atY -aag -aWd -aGk -aWd -aaL -aRU -aaN -aWd -aag -aUz -aag -aag -aag -aaf -arZ -aag -axo -ajb -atX -atX -aaa -aaa +aa +aa +tX +tX +tX +tX +ag +af +af +ag +ag +aA +KG +Ol +ak +Qz +uR +aA +Ku +Td +ag +af +ii +aA +WZ +Df +Zi +aA +Dr +kX +lC +wR +Og +Og +Dp +tY +ag +Wd +Gk +Wd +aL +RU +aN +Wd +ag +Uz +ag +ag +ag +af +rZ +ag +xo +jb +tX +tX +aa +aa "} (10,1,1) = {" -aaa -aaa -atX -atX -atX -atX -atX -aag -ayb -ahE -anw -anW -arE -acC -aDJ -aMq -axm -aVh -axh -aUB -aaf -aFV -azm -ayU -awL -aVs -aVv -aak -aAr -aSt -aiG -aaA -aBC -aak -ajc -aaf -aaf -akG -acf -awb -ana -aVi -amC -amC -akC -aJS -aaf -anc -aCL -aag -adX -aaf -aaf -awt -atX -atX -aaa -aaa +aa +aa +tX +tX +tX +tX +tX +ag +yb +hE +nw +nW +rE +cC +DJ +Mq +xm +Vh +xh +UB +af +FV +zm +yU +wL +Vs +Vv +ak +Ar +St +iG +aA +BC +ak +jc +af +af +kG +cf +wb +na +Vi +mC +mC +kC +JS +af +nc +CL +ag +dX +af +af +wt +tX +tX +aa +aa "} (11,1,1) = {" -aaa -aaa -atX -atX -atX -atX -atX -aag -aVT -ayZ -ann -ayd -aQk -azz -asV -aFW -aSk -akw -aIx -aiC -arV -aCS -aKR -aIM -aKa -aez -aPP -aiy -aAr -aSt -aiG -aak -aZU -apZ -alk -aaf -aKW -adw -aKQ -aJI -abC -acw -aqD -afi -ahp -agr -acx -acX -avn -awd -arx -aHA -aaf -ajb -atX -atX -aaa -aaa +aa +aa +tX +tX +tX +tX +tX +ag +VT +yZ +nn +yd +Qk +zz +sV +FW +Sk +kw +Ix +iC +rV +CS +KR +IM +Ka +ez +PP +iy +Ar +St +iG +ak +ZU +pZ +lk +af +KW +dw +KQ +JI +bC +cw +qD +fi +hp +gr +cx +cX +vn +wd +rx +HA +af +jb +tX +tX +aa +aa "} (12,1,1) = {" -aaa -aaa -atX -atX -atX -atX -atX -aag -aag -aaf -aaf -aBw -aak -aOp -aeg -acc -aFq -akQ -aaA -aSq -aWd -aLl -aaA -agN -aaL -aaL -anX -aGp -aDr -akX -aJJ -ajR -aXv -apR -ajc -aag -aMI -amz -aQW -arv -akM -aaC -ail -afi -aOc -aAp -aKb -aAS -aod -abJ -aMn -amd -aag -ajb -atX -atX -aaa -aaa +aa +aa +tX +tX +tX +tX +tX +ag +ag +af +af +Bw +ak +Op +eg +cc +Fq +kQ +aA +Sq +Wd +Ll +aA +gN +aL +aL +nX +Gp +Dr +kX +JJ +jR +Xv +pR +jc +ag +MI +mz +QW +rv +kM +aC +il +fi +Oc +Ap +Kb +AS +od +bJ +Mn +md +ag +jb +tX +tX +aa +aa "} (13,1,1) = {" -aaa -aaa -atX -atX -atX -atX -atX -aag -aMl -aGz -aAN -aHm -aak -azz -aQm -avV -akZ -aIJ -aoX -aoT -aUe -aTx -abZ -aWZ -aAA -aUp -ayG -aEg -aDs -aaL -aaL -aMK -adc -adc -afF -aag -asR -agU -aix -aJi -ajf -acN -arN -akx -aLj -aXL -alo -abf -aYe -aSg -atV -aOa -aag -aeC -atX -atX -aaa -aaa +aa +aa +tX +tX +tX +tX +tX +ag +Ml +Gz +AN +Hm +ak +zz +Qm +vV +kZ +IJ +oX +oT +Ue +Tx +bZ +WZ +AA +Up +yG +Eg +Ds +aL +aL +MK +dc +dc +fF +ag +sR +gU +ix +Ji +jf +cN +rN +kx +Lj +XL +lo +bf +Ye +Sg +tV +Oa +ag +eC +tX +tX +aa +aa "} (14,1,1) = {" -aaa -aaa -atX -atX -atX -atX -atX -aaf -aPd -asc -axW -aKm -aak -aYd -arT -aer -aQt -apI -aal -aAn -aaf -aqu -aKS -aDR -aYJ -awL -aHp -aAJ -aWS -arH -aaL -atw -aHg -atw -ams -aag -aag -aXY -aix -aTr -aDa -aiO -aym -auA -aDk -aRD -agM -aEy -aba -aDa -ajS -aQl -aag -apK -atX -atX -atX -aaa +aa +aa +tX +tX +tX +tX +tX +af +Pd +sc +xW +Km +ak +Yd +rT +er +Qt +pI +al +An +af +qu +KS +DR +YJ +wL +Hp +AJ +WS +rH +aL +tw +Hg +tw +ms +ag +ag +XY +ix +Tr +Da +iO +ym +uA +Dk +RD +gM +Ey +ba +Da +jS +Ql +ag +pK +tX +tX +tX +aa "} (15,1,1) = {" -aaa -aaa -atX -atX -atX -atX -aag -aag -aaf -aaf -aag -aaA -avH -aKp -aaA -aaA -aaA -aak -aSq -aJm -aag -aag -amH -agS -aHP -agS -afy -aak -aAH -arW -aNn -aCJ -aSV -aSV -azI -aWz -aaf -aif -aOc -avC -ajg -aaR -ayf -apP -aFa -aTO -aVX -aap -adn -aWp -ads -alD -aag -awt -atX -atX -atX -aaa +aa +aa +tX +tX +tX +tX +ag +ag +af +af +ag +aA +vH +Kp +aA +aA +aA +ak +Sq +Jm +ag +ag +mH +gS +HP +gS +fy +ak +AH +rW +Nn +CJ +SV +SV +zI +Wz +af +if +Oc +vC +jg +aR +yf +pP +Fa +TO +VX +ap +dn +Wp +ds +lD +ag +wt +tX +tX +tX +aa "} (16,1,1) = {" -aaa -aaa -atX -atX -atX -atX -aag -amJ -amJ -aKt -amJ -axL -aXH -ays -anW -anJ -aoS -aUK -azr -aag -aag -aag -axC -aMy -aMy -alX -aJz -aOt -alX -aMy -aEL -aaA -aJy -aak -acL -aOu -aaf -abt -aAv -aID -adQ -abs -aev -aHq -aWs -aLD -aKb -ahr -adH -adp -aHY -aep -arZ -ajb -atX -atX -atX -aaa +aa +aa +tX +tX +tX +tX +ag +mJ +mJ +Kt +mJ +xL +XH +ys +nW +nJ +oS +UK +zr +ag +ag +ag +xC +My +My +lX +Jz +Ot +lX +My +EL +aA +Jy +ak +cL +Ou +af +bt +Av +ID +dQ +bs +ev +Hq +Ws +LD +Kb +hr +dH +dp +HY +ep +rZ +jb +tX +tX +tX +aa "} (17,1,1) = {" -aaa -aaa -aaa -atX -atX -atX -aag -ann -axW -aag -ann -anw -aaf -ann -anw -aag -ann -axW -aaf -aag -afA -aaf -aVo -awD -apF -aEp -aXD -aya -asK -aKz -aYt -aMy -anI -aMy -awo -aoD -aag -aag -aig -aig -aag -aig -aig -aQn -aSm -aXd -aZP -aQW -aoo -aOe -aHY -aoM -aaf -atX -atX -atX -atX -aaa +aa +aa +aa +tX +tX +tX +ag +nn +xW +ag +nn +nw +af +nn +nw +ag +nn +xW +af +ag +fA +af +Vo +wD +pF +Ep +XD +ya +sK +Kz +Yt +My +nI +My +wo +oD +ag +ag +ig +ig +ag +ig +ig +Qn +Sm +Xd +ZP +QW +oo +Oe +HY +oM +af +tX +tX +tX +tX +aa "} (18,1,1) = {" -aaa -aaa -aaa -aaa -atX -atX -aag -aQj -ahE -aag -ayb -aWN -aaf -aQj -ahE -aag -aJW -ahE -aag -aCV -acm -aaf -aaf -aag -aag -aag -aaf -aag -aag -aaf -axF -aup -asK -avB -aVK -aqB -aaf -atX -atX -aPZ -ayI -aOW -aig -aig -aQS -aXR -aKb -aIO -aTz -atR -aiD -aJc -aag -atX -atX -atX -atX -aaa +aa +aa +aa +aa +tX +tX +ag +Qj +hE +ag +yb +WN +af +Qj +hE +ag +JW +hE +ag +CV +cm +af +af +ag +ag +ag +af +ag +ag +af +xF +up +sK +vB +VK +qB +af +tX +tX +PZ +yI +OW +ig +ig +QS +XR +Kb +IO +Tz +tR +iD +Jc +ag +tX +tX +tX +tX +aa "} (19,1,1) = {" -aaa -aaa -aaa -atX -atX -atX -aag -arf -amb -aaf -aAz -aJZ -aag -aiX -amb -aaf -aAz -ahm -aag -acm -acm -aBg -aBg -acm -acm -arZ -adY -aSb -aFC -aag -aag -aWd -aWd -aag -aqx -aQO -aag -atX -atX -azT -afv -aso -aOW -aig -aig -aag -aag -aag -aag -aag -axz -aJN -aag -atX -atX -atX -atX -aaa +aa +aa +aa +tX +tX +tX +ag +rf +mb +af +Az +JZ +ag +iX +mb +af +Az +hm +ag +cm +cm +Bg +Bg +cm +cm +rZ +dY +Sb +FC +ag +ag +Wd +Wd +ag +qx +QO +ag +tX +tX +zT +fv +so +OW +ig +ig +ag +ag +ag +ag +ag +xz +JN +ag +tX +tX +tX +tX +aa "} (20,1,1) = {" -aaa -aaa -aaa -atX -atX -aag -aaf -aag -aaf -aaf -aag -aag -aaf -aaf -aag -aag -aag -aaf -aag -aag -arZ -aag -aag -apL -aGe -aag -aGP -aak -aEP -aag -atX -atX -azT -agJ -aab -aGd -atX -atX -aad -afw -ajW -afV -arC -aPZ -aPZ -aPf -atX -atX -aig -awv -aiw -alY -aig -aLY -atX -atX -atX -aaa +aa +aa +aa +tX +tX +ag +af +ag +af +af +ag +ag +af +af +ag +ag +ag +af +ag +ag +rZ +ag +ag +pL +Ge +ag +GP +ak +EP +ag +tX +tX +zT +gJ +ab +Gd +tX +tX +ad +fw +jW +fV +rC +PZ +PZ +Pf +tX +tX +ig +wv +iw +lY +ig +LY +tX +tX +tX +aa "} (21,1,1) = {" -aaa -aaa -aaa -atX -aag -aag -acm -aGy -abP -abP -aMx -aYh -aaA -aak -aHu -aBK -akJ -alH -aQu -aKx -azN -aFH -aag -aag -aag -aaf -aXi -acj -alY -aaf -atX -afv -ajW -agJ -aab -aGd -aVL -aiL -afV -ado -ahI -afw -ayO -agi -aCc -aad -aDd -ajW -aig -azN -aiw -apz -aig -avD -aWl -atX -atX -atX +aa +aa +aa +tX +ag +ag +cm +Gy +bP +bP +Mx +Yh +aA +ak +Hu +BK +kJ +lH +Qu +Kx +zN +FH +ag +ag +ag +af +Xi +cj +lY +af +tX +fv +jW +gJ +ab +Gd +VL +iL +fV +do +hI +fw +yO +gi +Cc +ad +Dd +jW +ig +zN +iw +pz +ig +vD +Wl +tX +tX +tX "} (22,1,1) = {" -aaa -aaa -atX -atX -aaf -acm -abP -aag -aag -aag -aag -aag -amM -aWq -aOq -aWE -aBe -aRr -aRr -aRr -aRr -amk -aYi -aSG -aKN -aaf -aZu -ajM -asY -aaf -atX -afw -aRh -agJ -aps -aGd -aVL -aad -adA -agi -afv -ahG -adA -ahI -afw -aDd -afv -ahI -aag -aaZ -ape -aaZ -aaf -auv -agi -afV -atX -atX +aa +aa +tX +tX +af +cm +bP +ag +ag +ag +ag +ag +mM +Wq +Oq +WE +Be +Rr +Rr +Rr +Rr +mk +Yi +SG +KN +af +Zu +jM +sY +af +tX +fw +Rh +gJ +ps +Gd +VL +ad +dA +gi +fv +hG +dA +hI +fw +Dd +fv +hI +ag +aZ +pe +aZ +af +uv +gi +fV +tX +tX "} (23,1,1) = {" -aaa -atX -atX -aag -aag -aPB -aag -aag -any -aMT -aEE -aag -aag -asa -awj -aug -awH -aJu -ary -aSc -akR -ayy -acM -aBg -aBg -aYM -atV -aak -alY -aWd -aLY -aiM -aDd -agJ -ahT -aGd -aVL -ayO -afw -ahI -agi -aad -alS -afw -aiM -ajW -aad -afV -agJ -aab -amX -adk -aVL -ayO -afw -ahI -atX -atX +aa +tX +tX +ag +ag +PB +ag +ag +ny +MT +EE +ag +ag +sa +wj +ug +wH +Ju +ry +Sc +kR +yy +cM +Bg +Bg +YM +tV +ak +lY +Wd +LY +iM +Dd +gJ +hT +Gd +VL +yO +fw +hI +gi +ad +lS +fw +iM +jW +ad +fV +gJ +ab +mX +dk +VL +yO +fw +hI +tX +tX "} (24,1,1) = {" -aaa -atX -atX -aag -atE -abP -aag -awl -aMT -aXl -aON -any -awP -aZa -aUr -anK -aRf -aVH -avd -aVH -aIp -ayy -arm -axt -aHr -aWd -aiv -aZz -aKE -aWd -avD -ahI -afw -agJ -ahT -aGd -aVL -aad -aSv -aiM -atX -atX -aad -ajW -ahG -alS -aCc -aad -agJ -aIE -amX -ace -aVL -ahG -aOb -aph -atX -atX +aa +tX +tX +ag +tE +bP +ag +wl +MT +Xl +ON +ny +wP +Za +Ur +nK +Rf +VH +vd +VH +Ip +yy +rm +xt +Hr +Wd +iv +Zz +KE +Wd +vD +hI +fw +gJ +hT +Gd +VL +ad +Sv +iM +tX +tX +ad +jW +hG +lS +Cc +ad +gJ +IE +mX +ce +VL +hG +Ob +ph +tX +tX "} (25,1,1) = {" -aaa -atX -atX -aaf -aDM -abP -aag -aMT -aMT -aON -aWX -aON -aWg -aZa -aSz -aag -aJU -aVH -anE -aFe -aHM -aBx -aed -aci -aci -aiZ -aPj -aCW -alY -aWd -avD -aWl -aad -agJ -ahT -aaF -ahQ -aim -aad -atX -atX -atX -atX -aKJ -ato -ajt -aKJ -aKJ -aMe -aab -amX -adk -aVL -alS -aad -atX -atX -atX +aa +tX +tX +af +DM +bP +ag +MT +MT +ON +WX +ON +Wg +Za +Sz +ag +JU +VH +nE +Fe +HM +Bx +ed +ci +ci +iZ +Pj +CW +lY +Wd +vD +Wl +ad +gJ +hT +aF +hQ +im +ad +tX +tX +tX +tX +KJ +to +jt +KJ +KJ +Me +ab +mX +dk +VL +lS +ad +tX +tX +tX "} (26,1,1) = {" -aaa -atX -atX -aag -aUG -acm -aag -aIW -awl -aON -aRA -aUO -aWg -aGD -aFc -amJ -aoH -aqt -asv -app -aff -aIp -aqb -aFM -aBY -aag -ank -aoc -aEP -aag -atX -aad -afV -agJ -aab -ate -aNu -ahQ -aim -atX -atX -aag -aaf -aWd -aWd -aaf -aWd -aWd -aag -aeo -anl -aYB -aaf -aaf -atX -atX -atX -atX +aa +tX +tX +ag +UG +cm +ag +IW +wl +ON +RA +UO +Wg +GD +Fc +mJ +oH +qt +sv +pp +ff +Ip +qb +FM +BY +ag +nk +oc +EP +ag +tX +ad +fV +gJ +ab +te +Nu +hQ +im +tX +tX +ag +af +Wd +Wd +af +Wd +Wd +ag +eo +nl +YB +af +af +tX +tX +tX +tX "} (27,1,1) = {" -aaa -atX -atX -aag -aaf -acm -aaf -aaf -aIW -anu -aMT -aaf -aaf -aRN -aHh -aXB -apW -aub -asv -ash -aKI -aKI -acM -amJ -apm -aWd -aHE -aoc -aHU -aag -atX -afV -aiL -agJ -ahR -afq -aRu -acR -atX -atX -atX -aag -aVG -afM -afM -aGH -afM -afM -aac -agB -aBj -aKO -amv -aaf -atX -atX -atX -atX +aa +tX +tX +ag +af +cm +af +af +IW +nu +MT +af +af +RN +Hh +XB +pW +ub +sv +sh +KI +KI +cM +mJ +pm +Wd +HE +oc +HU +ag +tX +fV +iL +gJ +hR +fq +Ru +cR +tX +tX +tX +ag +VG +fM +fM +GH +fM +fM +ac +gB +Bj +KO +mv +af +tX +tX +tX +tX "} (28,1,1) = {" -aaa -atX -atX -atX -aaf -acm -aoR -aaf -aaf -aag -aag -aaf -aHV -aGL -aPA -aVl -aLq -akm -akm -aCC -akm -akm -aUV -aSu -aDn -aag -afs -amh -aJB -aaf -atX -atX -ahG -ahe -ahv -ahR -afq -ate -ayx -aEv -aEv -afQ -atd -abZ -ada -ada -aOO -aaA -aUZ -alX -aLS -aak -aEP -aag -atX -atX -atX -aaa +aa +tX +tX +tX +af +cm +oR +af +af +ag +ag +af +HV +GL +PA +Vl +Lq +km +km +CC +km +km +UV +Su +Dn +ag +fs +mh +JB +af +tX +tX +hG +he +hv +hR +fq +te +yx +Ev +Ev +fQ +td +bZ +da +da +OO +aA +UZ +lX +LS +ak +EP +ag +tX +tX +tX +aa "} (29,1,1) = {" -aaa -aaa -atX -atX -aaf -aaf -aSp -acm -aPB -abP -aMx -aak -aaA -aaA -apE -aMZ -aXB -avm -aku -ayi -ayj -anA -aVy -aBQ -aUQ -aWd -arL -amh -aMv -asy -atX -atX -aDd -afw -ahe -ahv -ahR -afr -aaK -aHx -aaK -aqx -aAk -agl -adz -ajU -acs -ajq -aTf -akk -akk -akk -aPQ -aag -atX -atX -aaa -aaa +aa +aa +tX +tX +af +af +Sp +cm +PB +bP +Mx +ak +aA +aA +pE +MZ +XB +vm +ku +yi +yj +nA +Vy +BQ +UQ +Wd +rL +mh +Mv +sy +tX +tX +Dd +fw +he +hv +hR +fr +aK +Hx +aK +qx +Ak +gl +dz +jU +cs +jq +Tf +kk +kk +kk +PQ +ag +tX +tX +aa +aa "} (30,1,1) = {" -aaa -aaa -atX -atX -atX -aaf -aaf -aMx -aaf -aag -aag -aag -aaf -aUg -agw -aPA -aMZ -aot -aot -aYK -aot -aot -aot -aUQ -aWd -aWd -aqF -amh -aXU -aag -aag -aag -aag -afv -ado -ahe -aji -aji -aji -aji -aji -aag -aVx -aOE -awh -aiW -aiW -aAj -aAw -aaM -aGS -aWd -abz -aaf -atX -atX -aaa -aaa +aa +aa +tX +tX +tX +af +af +Mx +af +ag +ag +ag +af +Ug +gw +PA +MZ +ot +ot +YK +ot +ot +ot +UQ +Wd +Wd +qF +mh +XU +ag +ag +ag +ag +fv +do +he +ji +ji +ji +ji +ji +ag +Vx +OE +wh +iW +iW +Aj +Aw +aM +GS +Wd +bz +af +tX +tX +aa +aa "} (31,1,1) = {" -aaa -aaa -atX -atX -atX -aSO -apt -aIe -abP -ajE -acm -azW -aaf -aBF -aaI -afc -aUI -aDK -arQ -aXg -aYL -aVV -aDK -ahg -aXO -afM -agB -amh -aMz -abe -ahA -apD -aaf -atX -aad -aad -ado -adA -afw -ajW -aZV -aag -akf -aDU -aOD -aMt -aOD -alX -aTZ -abb -aOM -amJ -aax -aaf -atX -atX -atX -aaa +aa +aa +tX +tX +tX +SO +pt +Ie +bP +jE +cm +zW +af +BF +aI +fc +UI +DK +rQ +Xg +YL +VV +DK +hg +XO +fM +gB +mh +Mz +be +hA +pD +af +tX +ad +ad +do +dA +fw +jW +ZV +ag +kf +DU +OD +Mt +OD +lX +TZ +bb +OM +mJ +ax +af +tX +tX +tX +aa "} (32,1,1) = {" -aaa -aaa -atX -atX -adb -aek -aMp -abP -ahY -aCY -abP -ajx -aag -aAR -aag -aag -aaf -aoL -atx -aag -aag -aag -alM -acL -aqI -aak -aJo -atp -aok -aQy -apr -apQ -aag -atX -atX -aCc -afw -aiM -ado -aRh -atX -aaf -arD -aow -ava -aAe -abk -aJQ -aOm -amJ -azN -azN -adU -aag -atX -atX -atX -aaa +aa +aa +tX +tX +db +ek +Mp +bP +hY +CY +bP +jx +ag +AR +ag +ag +af +oL +tx +ag +ag +ag +lM +cL +qI +ak +Jo +tp +ok +Qy +pr +pQ +ag +tX +tX +Cc +fw +iM +do +Rh +tX +af +rD +ow +va +Ae +bk +JQ +Om +mJ +zN +zN +dU +ag +tX +tX +tX +aa "} (33,1,1) = {" -aaa -aaa -aaa -atX -ajb -ase -aag -aag -aaf -aaf -aag -aag -aag -axS -aYQ -aqp -aBB -aTW -auT -aqp -aBB -aqp -aco -aWq -aky -aPh -akk -alF -aIB -agh -aWF -axs -aag -aag -aaf -aag -aag -atX -aLw -atX -atX -aaf -aCE -aQk -aOg -aOg -aWi -aak -aqo -aWd -afR -amJ -aja -aag -atX -atX -atX -aaa +aa +aa +aa +tX +jb +se +ag +ag +af +af +ag +ag +ag +xS +YQ +qp +BB +TW +uT +qp +BB +qp +co +Wq +ky +Ph +kk +lF +IB +gh +WF +xs +ag +ag +af +ag +ag +tX +Lw +tX +tX +af +CE +Qk +Og +Og +Wi +ak +qo +Wd +fR +mJ +ja +ag +tX +tX +tX +aa "} (34,1,1) = {" -aaa -aaa -aaa -atX -ajb -aeC -aaf -aOd -apB -aZq -aAs -alz -aag -aag -aag -aaf -aaf -aaf -aag -aaf -aaf -aag -aag -aaf -aks -aNx -aVC -aVN -aag -aYj -aNc -aBO -aag -azl -ajh -aCd -aaf -aWd -aWd -aWd -aag -aag -aey -aak -ada -aUt -aCw -aak -azi -aag -aag -arZ -aag -aag -atX -atX -atX -aaa +aa +aa +aa +tX +jb +eC +af +Od +pB +Zq +As +lz +ag +ag +ag +af +af +af +ag +af +af +ag +ag +af +ks +Nx +VC +VN +ag +Yj +Nc +BO +ag +zl +jh +Cd +af +Wd +Wd +Wd +ag +ag +ey +ak +da +Ut +Cw +ak +zi +ag +ag +rZ +ag +ag +tX +tX +tX +aa "} (35,1,1) = {" -aaa -aaa -aaa -atX -aCH -ajb -aag -avL -aPr -adL -aPr -aQK -aaf -aag -aBr -apq -ayB -aaf -anO -anC -aYX -aTc -aQE -aag -aAQ -afI -aER -aaf -abG -aak -afM -amh -atb -aSb -aqc -aSb -aSb -aSb -afM -afM -aQD -aag -aiv -atx -aiz -aiY -agA -ajq -aqo -aaf -adV -ahY -aAI -aaf -atX -atX -atX -aaa +aa +aa +aa +tX +CH +jb +ag +vL +Pr +dL +Pr +QK +af +ag +Br +pq +yB +af +nO +nC +YX +Tc +QE +ag +AQ +fI +ER +af +bG +ak +fM +mh +tb +Sb +qc +Sb +Sb +Sb +fM +fM +QD +ag +iv +tx +iz +iY +gA +jq +qo +af +dV +hY +AI +af +tX +tX +tX +aa "} (36,1,1) = {" -aaa -aaa -atX -atX -atX -akp -aag -akO -aUA -adO -aPt -aPr -aPr -aAf -aUH -aiG -aQS -aPF -aNS -aaA -aca -awU -aew -aag -aZk -ayD -aAZ -aag -avf -aaA -aak -aZg -aQy -aZw -aUu -aSd -apr -aQy -aLJ -aak -aak -afn -aak -aak -aJv -aiW -aiW -aaA -aqo -arZ -acm -abP -akb -aaf -atX -atX -atX -aaa +aa +aa +tX +tX +tX +kp +ag +kO +UA +dO +Pt +Pr +Pr +Af +UH +iG +QS +PF +NS +aA +ca +wU +ew +ag +Zk +yD +AZ +ag +vf +aA +ak +Zg +Qy +Zw +Uu +Sd +pr +Qy +LJ +ak +ak +fn +ak +ak +Jv +iW +iW +aA +qo +rZ +cm +bP +kb +af +tX +tX +tX +aa "} (37,1,1) = {" -aaa -aaa -atX -atX -atX -adb -aag -aOn -aTD -aCm -adL -aPr -awv -akz -asp -aWW -atG -aag -aOj -aak -arq -aZN -aFf -aag -aag -aag -aag -aag -apa -ahq -abh -akk -aPh -alI -aDG -aqa -aqC -aFk -aRo -aDB -aXp -aag -awp -aIB -aAk -amt -aOP -axA -aBv -aag -aNv -ajy -aZK -aaf -atX -atX -atX -aaa +aa +aa +tX +tX +tX +db +ag +On +TD +Cm +dL +Pr +wv +kz +sp +WW +tG +ag +Oj +ak +rq +ZN +Ff +ag +ag +ag +ag +ag +pa +hq +bh +kk +Ph +lI +DG +qa +qC +Fk +Ro +DB +Xp +ag +wp +IB +Ak +mt +OP +xA +Bv +ag +Nv +jy +ZK +af +tX +tX +tX +aa "} (38,1,1) = {" -aaa -aaa -atX -atX -atX -ajb -aag -aEo -aWM -ayQ -auw -anh -alP -aTi -aRl -asj -aEF -aPF -aak -aWb -aNF -ayc -acJ -aag -atX -atX -atX -aag -aag -aaf -aag -aaf -aag -aaf -aaf -aaf -aag -aag -aCv -anx -aaf -aag -aaf -aaf -akW -aST -aag -aaf -aaf -aag -aag -aZR -aIe -aag -aag -atX -atX -aaa +aa +aa +tX +tX +tX +jb +ag +Eo +WM +yQ +uw +nh +lP +Ti +Rl +sj +EF +PF +ak +Wb +NF +yc +cJ +ag +tX +tX +tX +ag +ag +af +ag +af +ag +af +af +af +ag +ag +Cv +nx +af +ag +af +af +kW +ST +ag +af +af +ag +ag +ZR +Ie +ag +ag +tX +tX +aa "} (39,1,1) = {" -aaa -aaa -atX -atX -aeC -ajb -aaf -azw -aXE -aXX -aPr -adT -aag -aag -auS -aQM -arK -aag -aXM -aak -aEr -aag -aag -aaf -aaf -aag -atX -atX -atX -atX -atX -aag -aag -agP -abe -aNp -agc -aio -ask -aSa -aeK -aYY -ajY -ajj -ajS -amn -aDi -aPM -aSx -aLb -aaf -aMH -abO -aIz -aag -aag -atX -aaa +aa +aa +tX +tX +eC +jb +af +zw +XE +XX +Pr +dT +ag +ag +uS +QM +rK +ag +XM +ak +Er +ag +ag +af +af +ag +tX +tX +tX +tX +tX +ag +ag +gP +be +Np +gc +io +sk +Sa +eK +YY +jY +jj +jS +mn +Di +PM +Sx +Lb +af +MH +bO +Iz +ag +ag +tX +aa "} (40,1,1) = {" -aaa -aaa -atX -atX -awt -apK -aaf -aMY -aJL -aPr -aPr -akN -aag -aaf -aiB -aak -aEs -aag -aUb -aak -ajc -abJ -arx -afM -aDc -aag -atX -aPS -ahG -atX -atX -aag -agn -aHv -aQy -aQy -azy -aUl -aGs -alX -aXs -aXs -aMy -alX -alX -aFd -aIN -atm -acp -acm -arZ -acm -acm -abP -atW -aag -atX -atX +aa +aa +tX +tX +wt +pK +af +MY +JL +Pr +Pr +kN +ag +af +iB +ak +Es +ag +Ub +ak +jc +bJ +rx +fM +Dc +ag +tX +PS +hG +tX +tX +ag +gn +Hv +Qy +Qy +zy +Ul +Gs +lX +Xs +Xs +My +lX +lX +Fd +IN +tm +cp +cm +rZ +cm +cm +bP +tW +ag +tX +tX "} (41,1,1) = {" -aaa -aaa -atX -atX -adb -aag -aag -aaf -akz -aTn -aqm -aag -aag -azn -aLG -aak -aTI -aag -aNe -aSj -aXc -abJ -aIH -aFw -aNb -aag -ayO -afw -aEt -azT -ayO -aaf -ags -aKr -aDB -aGC -aPU -abS -akk -akk -aeH -akk -aGC -ajH -acL -aZX -akk -akk -aQf -akg -aag -aZI -aor -ahY -acm -aaf -atX -atX +aa +aa +tX +tX +db +ag +ag +af +kz +Tn +qm +ag +ag +zn +LG +ak +TI +ag +Ne +Sj +Xc +bJ +IH +Fw +Nb +ag +yO +fw +Et +zT +yO +af +gs +Kr +DB +GC +PU +bS +kk +kk +eH +kk +GC +jH +cL +ZX +kk +kk +Qf +kg +ag +ZI +or +hY +cm +af +tX +tX "} (42,1,1) = {" -aaa -aaa -atX -atX -ajb -aag -afq -aQc -aot -aot -alL -avq -afq -aaf -aag -aJR -aMS -aag -asn -aBE -aTB -aag -aDy -abW -aTv -aaf -aae -aae -aae -aae -aae -aaf -agt -aNm -ahj -ajB -ahU -aiS -aiF -aiF -ajl -ajw -ajB -ajI -ajH -axX -aWn -aDl -aIV -aag -aag -aag -aag -aag -arZ -aag -atX -atX +aa +aa +tX +tX +jb +ag +fq +Qc +ot +ot +lL +vq +fq +af +ag +JR +MS +ag +sn +BE +TB +ag +Dy +bW +Tv +af +ae +ae +ae +ae +ae +af +gt +Nm +hj +jB +hU +iS +iF +iF +jl +jw +jB +jI +jH +xX +Wn +Dl +IV +ag +ag +ag +ag +ag +rZ +ag +tX +tX "} (43,1,1) = {" -aaa -aaa -atX -aFY -awt -aaf -aNd -adW -aBZ -aPv -aoi -avA -aah -aah -ayX -aMJ -aRc -aCt -aaq -aaq -ayE -aZh -aLf -ala -aak -akh -ave -ave -aqr -afp -afp -apV -aaA -axf -ahk -alT -aEf -ahV -alN -ajc -ajm -ahC -asZ -ajJ -aMn -aRF -akd -akj -aak -aWd -ahz -aes -ajk -aaf -ajb -atX -atX -atX +aa +aa +tX +FY +wt +af +Nd +dW +BZ +Pv +oi +vA +ah +ah +yX +MJ +Rc +Ct +aq +aq +yE +Zh +Lf +la +ak +kh +ve +ve +qr +fp +fp +pV +aA +xf +hk +lT +Ef +hV +lN +jc +jm +hC +sZ +jJ +Mn +RF +kd +kj +ak +Wd +hz +es +jk +af +jb +tX +tX +tX "} (44,1,1) = {" -aaa -atX -atX -arP -akp -aaf -aqq -adW -aYw -auO -aXF -aAV -aUa -adW -aFO -aEZ -ayv -aIZ -aqM -aFZ -aFZ -aPY -aGw -ayu -aCR -auJ -aOs -azj -azj -aOs -aAM -auJ -aXz -aaw -afJ -ahD -alQ -aDa -aYk -aZj -aBg -aEf -alQ -aas -aiv -aCZ -aam -abN -aak -aWd -aeg -acc -agg -aaf -apK -atX -atX -atX +aa +tX +tX +rP +kp +af +qq +dW +Yw +uO +XF +AV +Ua +dW +FO +EZ +yv +IZ +qM +FZ +FZ +PY +Gw +yu +CR +uJ +Os +zj +zj +Os +AM +uJ +Xz +aw +fJ +hD +lQ +Da +Yk +Zj +Bg +Ef +lQ +as +iv +CZ +am +bN +ak +Wd +eg +cc +gg +af +pK +tX +tX +tX "} (45,1,1) = {" -aaa -atX -atX -ajb -adb -aaf -aIS -agL -aRK -aHd -aFt -aMG -auh -aHd -aky -aaA -aNM -aCt -aOT -aUv -ark -aCt -aAo -aQk -aaA -apV -afr -afr -aHx -aaK -aaK -akh -aak -axO -ahl -aEf -asq -ajp -aiG -avn -ajm -alQ -avO -abq -aUn -aRF -ake -aeZ -aaA -aWd -aes -agT -aeJ -aag -adb -apK -atX -atX +aa +tX +tX +jb +db +af +IS +gL +RK +Hd +Ft +MG +uh +Hd +ky +aA +NM +Ct +OT +Uv +rk +Ct +Ao +Qk +aA +pV +fr +fr +Hx +aK +aK +kh +ak +xO +hl +Ef +sq +jp +iG +vn +jm +lQ +vO +bq +Un +RF +ke +eZ +aA +Wd +es +gT +eJ +ag +db +pK +tX +tX "} (46,1,1) = {" -aaa -atX -atX -aHW -ajb -aag -aag -aHO -aaf -aag -aag -aIU -aag -aag -aag -aJP -ajZ -aag -aag -aag -aag -aag -azK -aak -amd -aag -aji -aji -aji -aji -aji -aag -agd -amy -azG -ahF -ahX -abp -aiI -axi -aNZ -aaG -awF -aaW -ajS -axX -aVM -ajr -abH -aaf -aaf -aag -aag -aag -aag -ajb -atX -atX +aa +tX +tX +HW +jb +ag +ag +HO +af +ag +ag +IU +ag +ag +ag +JP +jZ +ag +ag +ag +ag +ag +zK +ak +md +ag +ji +ji +ji +ji +ji +ag +gd +my +zG +hF +hX +bp +iI +xi +NZ +aG +wF +aW +jS +xX +VM +jr +bH +af +af +ag +ag +ag +ag +jb +tX +tX "} (47,1,1) = {" -aaa -atX -atX -aGg -ajb -aag -afx -aBd -akr -aag -ayR -aBd -aLK -aag -afm -acL -amV -aGX -aCB -aWH -avF -aag -aLk -aak -aNb -aag -apn -ado -afw -ahI -afV -aag -afD -abW -aKO -aov -aSb -aeq -acp -aQL -adE -afM -aov -agB -aak -aRF -afM -afM -aSb -aSb -ajn -aeM -aYl -aeO -aag -akp -aRv -atX +aa +tX +tX +Gg +jb +ag +fx +Bd +kr +ag +yR +Bd +LK +ag +fm +cL +mV +GX +CB +WH +vF +ag +Lk +ak +Nb +ag +pn +do +fw +hI +fV +ag +fD +bW +KO +ov +Sb +eq +cp +QL +dE +fM +ov +gB +ak +RF +fM +fM +Sb +Sb +jn +eM +Yl +eO +ag +kp +Rv +tX "} (48,1,1) = {" -aaa -atX -atX -aGg -aeC -aaf -amS -adW -adW -aag -aBk -aPs -aRK -aag -aXW -aBu -atk -atl -ahf -aYC -awS -aag -aoh -akk -axE -aaf -atX -ahG -alS -aiM -atX -aaf -agv -aAL -aRi -agV -agV -aon -aQk -acp -aFs -aak -aak -aak -apN -aUF -azE -anm -aaA -axw -aag -aoU -aeA -azL -aag -ajb -apK -atX +aa +tX +tX +Gg +eC +af +mS +dW +dW +ag +Bk +Ps +RK +ag +XW +Bu +tk +tl +hf +YC +wS +ag +oh +kk +xE +af +tX +hG +lS +iM +tX +af +gv +AL +Ri +gV +gV +on +Qk +cp +Fs +ak +ak +ak +pN +UF +zE +nm +aA +xw +ag +oU +eA +zL +ag +jb +pK +tX "} (49,1,1) = {" -aaa -atX -atX -aGg -akp -aaf -amm -aaQ -adL -aag -amj -aEx -anV -aaf -aIj -aak -aOX -aKd -aKd -adB -aFT -aag -aag -aBI -aaf -aaf -atX -atX -aad -atX -atX -aag -aag -agX -akk -abd -aKP -arY -akk -aPh -akk -aKc -acB -acB -ajK -aka -akk -aWo -akk -aPh -adi -adK -aNJ -azL -aag -aaj -aeC -atX +aa +tX +tX +Gg +kp +af +mm +aQ +dL +ag +mj +Ex +nV +af +Ij +ak +OX +Kd +Kd +dB +FT +ag +ag +BI +af +af +tX +tX +ad +tX +tX +ag +ag +gX +kk +bd +KP +rY +kk +Ph +kk +Kc +cB +cB +jK +ka +kk +Wo +kk +Ph +di +dK +NJ +zL +ag +aj +eC +tX "} (50,1,1) = {" -aaa -aaa -atX -aGg -awt -aag -axZ -azQ -adW -aaf -aMN -aoP -aAl -aaf -aoF -aak -aCM -abz -aaL -alq -aaL -aag -abP -acm -aag -atX -atX -atX -afv -atX -atX -atX -aag -aaf -aVa -aag -aaf -ahs -abK -anz -anz -abK -aBg -afq -afq -ali -abU -aaf -aaf -aaf -aag -aaf -aeM -aaf -aag -ahP -aGg -atX +aa +aa +tX +Gg +wt +ag +xZ +zQ +dW +af +MN +oP +Al +af +oF +ak +CM +bz +aL +lq +aL +ag +bP +cm +ag +tX +tX +tX +fv +tX +tX +tX +ag +af +Va +ag +af +hs +bK +nz +nz +bK +Bg +fq +fq +li +bU +af +af +af +ag +af +eM +af +ag +hP +Gg +tX "} (51,1,1) = {" -aaa -aaa -atX -aGg -akp -aag -aag -aaf -aaf -aaf -aaf -aag -aag -aag -aOo -aUD -aCM -aaL -aCy -aOZ -aVR -aaf -abP -asy -aaf -atX -atX -azT -aad -asL -adb -aie -arG -awt -awt -atX -aag -aag -adu -acK -akE -ajz -agb -afq -afq -abD -aaf -aaf -atX -aag -aaD -ael -aeA -aaf -ajb -akp -aGg -atX +aa +aa +tX +Gg +kp +ag +ag +af +af +af +af +ag +ag +ag +Oo +UD +CM +aL +Cy +OZ +VR +af +bP +sy +af +tX +tX +zT +ad +sL +db +ie +rG +wt +wt +tX +ag +ag +du +cK +kE +jz +gb +fq +fq +bD +af +af +tX +ag +aD +el +eA +af +jb +kp +Gg +tX "} (52,1,1) = {" -aaa -aaa -atX -aGg -ajb -ajb -adm -acq -abP -ajE -abP -acm -abP -aWe -aMg -aHj -axl -aaL -aFP -acd -agy -aaf -aQT -aag -atX -atX -afv -aiM -atX -atX -atX -auV -ajb -atX -atX -atX -atX -aag -aiT -aiT -aiT -aij -aag -aJE -aJE -aag -aag -atX -atX -aag -aaL -aaL -aeA -abz -atI -aGg -aGg -atX +aa +aa +tX +Gg +jb +jb +dm +cq +bP +jE +bP +cm +bP +We +Mg +Hj +xl +aL +FP +cd +gy +af +QT +ag +tX +tX +fv +iM +tX +tX +tX +uV +jb +tX +tX +tX +tX +ag +iT +iT +iT +ij +ag +JE +JE +ag +ag +tX +tX +ag +aL +aL +eA +bz +tI +Gg +Gg +tX "} (53,1,1) = {" -aaa -aaa -atX -aGg -aJG -aeC -alm -aIc -aNU -aaL -aFB -abP -ajL -aag -aQB -aDA -aTY -aaL -aFN -aVg -aEV -aag -aPL -aZE -aad -afV -ahG -afw -atX -atX -atX -atX -atX -atX -atX -aad -afV -akc -aad -aCI -aCI -aad -ajF -aab -adk -adN -atX -atX -atX -aag -aYu -ael -aPK -aag -apK -aGg -atX -atX +aa +aa +tX +Gg +JG +eC +lm +Ic +NU +aL +FB +bP +jL +ag +QB +DA +TY +aL +FN +Vg +EV +ag +PL +ZE +ad +fV +hG +fw +tX +tX +tX +tX +tX +tX +tX +ad +fV +kc +ad +CI +CI +ad +jF +ab +dk +dN +tX +tX +tX +ag +Yu +el +PK +ag +pK +Gg +tX +tX "} (54,1,1) = {" -aaa -aaa -atX -aGg -aGg -atv -alm -aIc -acm -abP -aNU -aoR -aAP -aAP -adG -aKZ -aCr -aAP -aAP -aag -aag -aag -aag -aag -atX -azT -afv -aph -atX -atX -atX -atX -atX -atX -aad -afw -ahI -aiR -ahZ -aCI -aCI -aaV -ajP -aab -adk -agE -ado -adA -atX -aag -aag -aag -aag -aag -aLn -aGg -atX -atX +aa +aa +tX +Gg +Gg +tv +lm +Ic +cm +bP +NU +oR +AP +AP +dG +KZ +Cr +AP +AP +ag +ag +ag +ag +ag +tX +zT +fv +ph +tX +tX +tX +tX +tX +tX +ad +fw +hI +iR +hZ +CI +CI +aV +jP +ab +dk +gE +do +dA +tX +ag +ag +ag +ag +ag +Ln +Gg +tX +tX "} (55,1,1) = {" -aaa -aaa -atX -atX -aGg -aNi -aGg -aAP -asF -aAP -asF -aAP -aAP -asg -awj -atc -aAO -aQG -asF -asF -aAP -aAP -aAP -atX -atX -afw -aad -atX -atX -atX -atX -atX -atX -atX -aad -ahG -afw -aiq -aad -aCI -aCI -aiM -aZC -ahT -adk -aay -afw -ahZ -atX -atX -atX -atX -atX -atX -aqA -aGg -atX -atX +aa +aa +tX +tX +Gg +Ni +Gg +AP +sF +AP +sF +AP +AP +sg +wj +tc +AO +QG +sF +sF +AP +AP +AP +tX +tX +fw +ad +tX +tX +tX +tX +tX +tX +tX +ad +hG +fw +iq +ad +CI +CI +iM +ZC +hT +dk +ay +fw +hZ +tX +tX +tX +tX +tX +tX +qA +Gg +tX +tX "} (56,1,1) = {" -aaa -atX -atX -atX -ari -awt -atX -aAP -adL -aPo -anG -aop -aQX -apu -amu -adR -ahw -aGl -aro -auG -atZ -aAa -aAP -atX -atX -afv -ahI -atX -atX -atX -atX -atX -atX -atX -afV -ahH -afv -aiq -aiL -aCI -aCI -aad -aaS -ahT -adk -aaP -afV -ahI -aad -atX -atX -atX -atX -aoA -aOi -aGg -atX -aaa +aa +tX +tX +tX +ri +wt +tX +AP +dL +Po +nG +op +QX +pu +mu +dR +hw +Gl +ro +uG +tZ +Aa +AP +tX +tX +fv +hI +tX +tX +tX +tX +tX +tX +tX +fV +hH +fv +iq +iL +CI +CI +ad +aS +hT +dk +aP +fV +hI +ad +tX +tX +tX +tX +oA +Oi +Gg +tX +aa "} (57,1,1) = {" -aaa -atX -atX -amW -aFb -ajb -atX -aAP -adW -aUX -aJr -axL -aJr -aJr -avS -amw -aXq -adW -amw -amw -agZ -aAa -asF -atX -afV -aiM -afw -atX -atX -atX -atX -atX -atX -atX -afw -adA -ahG -aiq -aiM -aCI -aCI -afV -ajP -aab -aEQ -aau -ajW -afv -adA -atX -atX -apK -apK -aqA -aGg -aGg -atX -aaa +aa +tX +tX +mW +Fb +jb +tX +AP +dW +UX +Jr +xL +Jr +Jr +vS +mw +Xq +dW +mw +mw +gZ +Aa +sF +tX +fV +iM +fw +tX +tX +tX +tX +tX +tX +tX +fw +dA +hG +iq +iM +CI +CI +fV +jP +ab +EQ +au +jW +fv +dA +tX +tX +pK +pK +qA +Gg +Gg +tX +aa "} (58,1,1) = {" -aaa -atX -atX -awk -adS -arP -atX -aAP -aWU -amx -auP -aPq -aJl -alc -arS -aZL -aNy -avS -adL -aag -agq -agz -aAP -atX -ahI -afV -atX -atX -atX -atX -aiM -ajW -atX -atX -atX -ahI -agi -air -afv -aCI -aCI -aiL -aaJ -aab -adk -aaP -afV -afw -atX -atX -awt -apK -aGg -ahi -aGg -atX -atX -aaa +aa +tX +tX +wk +dS +rP +tX +AP +WU +mx +uP +Pq +Jl +lc +rS +ZL +Ny +vS +dL +ag +gq +gz +AP +tX +hI +fV +tX +tX +tX +tX +iM +jW +tX +tX +tX +hI +gi +ir +fv +CI +CI +iL +aJ +ab +dk +aP +fV +fw +tX +tX +wt +pK +Gg +hi +Gg +tX +tX +aa "} (59,1,1) = {" -aaa -atX -atX -alv -aDe -adb -atX -aAP -aGq -auP -aSL -aRC -anf -aJl -aGq -adL -amw -amw -anZ -aVO -ath -aat -aAP -afw -afv -aLC -atX -atX -atX -aiL -afw -ahI -aiL -atX -atX -atX -aad -afB -aad -aCI -aCI -aad -abF -aab -adk -adN -aad -ahI -atX -ajb -adb -aGg -aGg -aqA -atX -atX -atX -aaa +aa +tX +tX +lv +De +db +tX +AP +Gq +uP +SL +RC +nf +Jl +Gq +dL +mw +mw +nZ +VO +th +at +AP +fw +fv +LC +tX +tX +tX +iL +fw +hI +iL +tX +tX +tX +ad +fB +ad +CI +CI +ad +bF +ab +dk +dN +ad +hI +tX +jb +db +Gg +Gg +qA +tX +tX +tX +aa "} (60,1,1) = {" -aaa -atX -atX -atX -ain -atX -atX -aAP -aGq -aFo -aLZ -aRC -axG -amK -aQZ -acp -aSi -adL -auf -aLL -aYy -aat -aAP -auj -afV -atX -atX -atX -azT -aiL -agi -adA -ahG -atX -atX -aag -aag -aag -aiT -aiT -aiT -aij -aag -aeX -aeX -aag -aag -aag -aag -abj -aag -aag -aNT -aqA -atX -atX -atX -aaa +aa +tX +tX +tX +in +tX +tX +AP +Gq +Fo +LZ +RC +xG +mK +QZ +cp +Si +dL +uf +LL +Yy +at +AP +uj +fV +tX +tX +tX +zT +iL +gi +dA +hG +tX +tX +ag +ag +ag +iT +iT +iT +ij +ag +eX +eX +ag +ag +ag +ag +bj +ag +ag +NT +qA +tX +tX +tX +aa "} (61,1,1) = {" -aaa -atX -atX -atX -atX -atX -atX -asF -aGq -aPT -aIq -aRC -aEH -aGT -aGq -ajC -acm -amw -anZ -aKC -aiE -aLd -aAP -aPS -aiM -atX -atX -atX -aad -azT -aad -aOG -aOG -aOG -aLA -aag -awQ -acD -aeh -acA -acA -aiN -ahx -abv -afl -avY -ahS -alp -aeL -ant -afC -aag -awt -aoJ -adb -atX -atX -aaa +aa +tX +tX +tX +tX +tX +tX +sF +Gq +PT +Iq +RC +EH +GT +Gq +jC +cm +mw +nZ +KC +iE +Ld +AP +PS +iM +tX +tX +tX +ad +zT +ad +OG +OG +OG +LA +ag +wQ +cD +eh +cA +cA +iN +hx +bv +fl +vY +hS +lp +eL +nt +fC +ag +wt +oJ +db +tX +tX +aa "} (62,1,1) = {" -aaa -atX -atX -atX -atX -atX -atX -asF -aHL -aTe -aZO -atf -asl -amU -aVS -aBt -aqv -aqv -aXb -aFz -aVm -aOx -aAP -atX -afw -atX -atX -aiL -aad -aad -aiL -afX -agC -acr -agW -ahK -aQP -acm -aaA -aaA -aak -aaA -abY -ajD -adM -ahN -aaE -arJ -abl -auX -aaO -aag -age -aoZ -ajb -atX -aaa -aaa +aa +tX +tX +tX +tX +tX +tX +sF +HL +Te +ZO +tf +sl +mU +VS +Bt +qv +qv +Xb +Fz +Vm +Ox +AP +tX +fw +tX +tX +iL +ad +ad +iL +fX +gC +cr +gW +hK +QP +cm +aA +aA +ak +aA +bY +jD +dM +hN +aE +rJ +bl +uX +aO +ag +ge +oZ +jb +tX +aa +aa "} (63,1,1) = {" -aaa -atX -atX -atX -atX -atX -atX -asF -amw -aQh -asi -aTF -aYS -azu -acp -aZf -amw -aiA -ahc -adW -aAy -afP -asF -atX -atX -atX -atX -atX -aad -ahG -aad -afY -agD -aOG -aLA -aag -aWv -aQe -aiP -ahO -ahO -abw -aaH -aaA -aaA -agj -aFX -arJ -aaA -aee -aaY -aag -aDw -adb -atX -atX -aaa -aaa +aa +tX +tX +tX +tX +tX +tX +sF +mw +Qh +si +TF +YS +zu +cp +Zf +mw +iA +hc +dW +Ay +fP +sF +tX +tX +tX +tX +tX +ad +hG +ad +fY +gD +OG +LA +ag +Wv +Qe +iP +hO +hO +bw +aH +aA +aA +gj +FX +rJ +aA +ee +aY +ag +Dw +db +tX +tX +aa +aa "} (64,1,1) = {" -aaa -atX -atX -atX -atX -atX -atX -aAP -amw -amw -aEN -aCs -avS -arp -adL -adL -adW -adW -adL -adW -ars -adL -asF -atX -atX -atX -atX -atX -atX -aad -aad -aad -aad -aad -aad -aag -aic -ais -ahO -adh -agO -ahO -aak -aak -aaA -aaB -abi -acX -ach -acv -auM -aag -acy -atX -atX -atX -atX -aaa +aa +tX +tX +tX +tX +tX +tX +AP +mw +mw +EN +Cs +vS +rp +dL +dL +dW +dW +dL +dW +rs +dL +sF +tX +tX +tX +tX +tX +tX +ad +ad +ad +ad +ad +ad +ag +ic +is +hO +dh +gO +hO +ak +ak +aA +aB +bi +cX +ch +cv +uM +ag +cy +tX +tX +tX +tX +aa "} (65,1,1) = {" -aaa -atX -atX -atX -atX -atX -atX -aAP -aAP -aAP -asF -aAP -aAP -aYz -aWJ -avy -akB -aur -aAP -aAP -asF -aAP -aAP -atX -atX -atX -atX -atX -atX -aad -aad -aad -ahG -aad -aad -aZb -aDa -aiv -abx -aaU -aaU -ahu -aMU -aDV -aaA -ako -adf -afK -aqY -aeU -aMF -aag -atX -atX -atX -atX -atX -aaa +aa +tX +tX +tX +tX +tX +tX +AP +AP +AP +sF +AP +AP +Yz +WJ +vy +kB +ur +AP +AP +sF +AP +AP +tX +tX +tX +tX +tX +tX +ad +ad +ad +hG +ad +ad +Zb +Da +iv +bx +aU +aU +hu +MU +DV +aA +ko +df +fK +qY +eU +MF +ag +tX +tX +tX +tX +tX +aa "} (66,1,1) = {" -aaa -aaa -atX -atX -atX -atX -atX -atX -atX -atX -atX -aAP -aAP -aAP -aAP -aWG -aAP -aAP -aAP -aAP -atX -atX -atX -atX -atX -atX -atX -atX -atX -aad -aiL -aad -aIb -ahI -aad -aag -acY -ait -ahu -adj -aaU -ajQ -aaA -aid -aao -ako -aiu -adM -acb -agf -abu -aag -atX -atX -atX -atX -atX -aaa +aa +aa +tX +tX +tX +tX +tX +tX +tX +tX +tX +AP +AP +AP +AP +WG +AP +AP +AP +AP +tX +tX +tX +tX +tX +tX +tX +tX +tX +ad +iL +ad +Ib +hI +ad +ag +cY +it +hu +dj +aU +jQ +aA +id +ao +ko +iu +dM +cb +gf +bu +ag +tX +tX +tX +tX +tX +aa "} (67,1,1) = {" -aaa -aaa -atX -atX -atX -atX -atX -atX -atX -atX -atX -aAP -aIf -aWd -apS -afq -aZn -aWd -aIf -aAP -atX -atX -atX -atX -atX -atX -atX -atX -ahI -aad -aad -aad -afw -ajW -aad -aag -aQF -ais -ahu -acS -aaU -ajQ -aaA -abm -aOf -ahn -aeW -alp -aTu -aeR -aaX -aag -atX -atX -atX -atX -atX -aaa +aa +aa +tX +tX +tX +tX +tX +tX +tX +tX +tX +AP +If +Wd +pS +fq +Zn +Wd +If +AP +tX +tX +tX +tX +tX +tX +tX +tX +hI +ad +ad +ad +fw +jW +ad +ag +QF +is +hu +cS +aU +jQ +aA +bm +Of +hn +eW +lp +Tu +eR +aX +ag +tX +tX +tX +tX +tX +aa "} (68,1,1) = {" -aaa -aaa -atX -atX -atX -atX -atX -atX -atX -atX -atX -aAP -aIf -aWd -ayM -afq -avT -aWd -aIf -aAP -atX -atX -atX -atX -atX -atX -atX -atX -aav -aad -aiM -aad -adA -aiM -aad -aZb -aDa -aiv -adg -ahu -ahu -adg -aaA -aaA -aaA -aai -acq -arJ -aaA -aem -adx -aag -atX -atX -atX -atX -atX -aaa +aa +aa +tX +tX +tX +tX +tX +tX +tX +tX +tX +AP +If +Wd +yM +fq +vT +Wd +If +AP +tX +tX +tX +tX +tX +tX +tX +tX +av +ad +iM +ad +dA +iM +ad +Zb +Da +iv +dg +hu +hu +dg +aA +aA +aA +ai +cq +rJ +aA +em +dx +ag +tX +tX +tX +tX +tX +aa "} (69,1,1) = {" -aaa -aaa -atX -atX -atX -atX -atX -atX -atX -atX -atX -aAP -aRQ -aWd -aJK -afq -agm -aWd -aRQ -aAP -atX -atX -atX -atX -atX -atX -atX -atX -aad -aIb -aad -aad -aad -aad -aad -aag -afe -aOL -aaA -aak -aak -aak -aak -aak -aaA -anQ -aiu -afK -abB -aXc -aag -aag -atX -atX -atX -atX -atX -atX +aa +aa +tX +tX +tX +tX +tX +tX +tX +tX +tX +AP +RQ +Wd +JK +fq +gm +Wd +RQ +AP +tX +tX +tX +tX +tX +tX +tX +tX +ad +Ib +ad +ad +ad +ad +ad +ag +fe +OL +aA +ak +ak +ak +ak +ak +aA +nQ +iu +fK +bB +Xc +ag +ag +tX +tX +tX +tX +tX +tX "} (70,1,1) = {" -aaa -aaa -aaa -atX -atX -atX -atX -atX -atX -atX -atX -aAP -aIf -aWd -aqj -afq -aRI -aWd -aIf -aAP -atX -atX -atX -atX -atX -atX -atX -atX -aav -aad -aad -aad -aad -aiL -aad -aag -aag -acI -abE -aMk -aMk -aVf -aVf -aVf -ahy -ago -aag -aki -aag -aki -aag -aad -ahG -atX -atX -atX -atX -atX +aa +aa +aa +tX +tX +tX +tX +tX +tX +tX +tX +AP +If +Wd +qj +fq +RI +Wd +If +AP +tX +tX +tX +tX +tX +tX +tX +tX +av +ad +ad +ad +ad +iL +ad +ag +ag +cI +bE +Mk +Mk +Vf +Vf +Vf +hy +go +ag +ki +ag +ki +ag +ad +hG +tX +tX +tX +tX +tX "} (71,1,1) = {" -aaa -aaa -aaa -aaa -atX -atX -atX -atX -atX -atX -atX -aAP -aIf -aWd -aKi -afq -aDO -aWd -aIf -aAP -atX -atX -atX -atX -atX -atX -atX -atX -aad -aad -aav -aad -aad -aad -aad -aad -aag -aag -aag -afG -afG -afG -afG -afG -aag -aag -aag -asm -afq -afq -aag -adA -aad -atX -atX -atX -atX -atX +aa +aa +aa +aa +tX +tX +tX +tX +tX +tX +tX +AP +If +Wd +Ki +fq +DO +Wd +If +AP +tX +tX +tX +tX +tX +tX +tX +tX +ad +ad +av +ad +ad +ad +ad +ad +ag +ag +ag +fG +fG +fG +fG +fG +ag +ag +ag +sm +fq +fq +ag +dA +ad +tX +tX +tX +tX +tX "} (72,1,1) = {" -aaa -aaa -aaa -aaa -aaa -aaa -atX -atX -atX -atX -atX -aAP -aAP -aAP -aAP -aWG -aAP -aAP -aAP -aAP -atX -atX -atX -atX -atX -atX -atX -atX -atX -aad -aad -ajW -aIb -aad -ajW -aiM -aad -aXK -adt -acn -afd -acn -acn -acn -aWK -aad -aag -adD -afq -aiJ -aag -afw -azT -aad -atX -atX -atX -atX +aa +aa +aa +aa +aa +aa +tX +tX +tX +tX +tX +AP +AP +AP +AP +WG +AP +AP +AP +AP +tX +tX +tX +tX +tX +tX +tX +tX +tX +ad +ad +jW +Ib +ad +jW +iM +ad +XK +dt +cn +fd +cn +cn +cn +WK +ad +ag +dD +fq +iJ +ag +fw +zT +ad +tX +tX +tX +tX "} (73,1,1) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -atX -atX -atX -atX -atX -aAP -atD -aia -aib -aAP -atX -atX -atX -atX -atX -atX -atX -atX -atX -atX -atX -aad -aad -afw -ahI -aad -aad -afw -aav -aad -aad -aiL -aad -aad -aad -aad -adA -ajW -aag -agH -aag -agH -aag -aiM -adA -ahG -atX -atX -atX -atX +aa +aa +aa +aa +aa +aa +aa +aa +tX +tX +tX +tX +tX +AP +tD +ia +ib +AP +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +ad +ad +fw +hI +ad +ad +fw +av +ad +ad +iL +ad +ad +ad +ad +dA +jW +ag +gH +ag +gH +ag +iM +dA +hG +tX +tX +tX +tX "} (74,1,1) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -atX -atX -atX -aAP -aqS -aFm -avh -aAP -atX -atX -atX -atX -atX -atX -atX -atX -atX -atX -atX -aad -aad -ahG -agi -azT -agi -aiL -ahI -aad -aad -azT -aad -ahI -azT -aad -afw -aiM -aeE -aad -ahG -aad -aeE -ahG -afw -atX -atX -atX -atX -atX +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +tX +tX +tX +AP +qS +Fm +vh +AP +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +ad +ad +hG +gi +zT +gi +iL +hI +ad +ad +zT +ad +hI +zT +ad +fw +iM +eE +ad +hG +ad +eE +hG +fw +tX +tX +tX +tX +tX "} (75,1,1) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -atX -atX -aAP -aAP -aAP -aAP -aAP -atX -atX -atX -atX -aaa -aaa -atX -atX -atX -atX -atX -atX -aad -aad -aad -aad -aIb -aIb -aad -aad -aad -adA -aIb -aad -aad -aad -aad -aad -aad -aiL -aad -aad -ahG -azT -agi -atX -atX -atX -atX -aaa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +tX +tX +AP +AP +AP +AP +AP +tX +tX +tX +tX +aa +aa +tX +tX +tX +tX +tX +tX +ad +ad +ad +ad +Ib +Ib +ad +ad +ad +dA +Ib +ad +ad +ad +ad +ad +ad +iL +ad +ad +hG +zT +gi +tX +tX +tX +tX +aa "} (76,1,1) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -atX -atX -atX -atX -atX -atX -atX -atX -atX -aaa -aaa -aaa -aaa -atX -atX -atX -atX -atX -aad -aad -aad -aad -aIb -aad -aad -aad -aad -aIb -aIb -aad -aad -ajW -aad -aad -afw -adA -aad -adA -aad -aad -atX -atX -atX -atX -atX -aaa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +tX +tX +tX +tX +tX +tX +tX +tX +tX +aa +aa +aa +aa +tX +tX +tX +tX +tX +ad +ad +ad +ad +Ib +ad +ad +ad +ad +Ib +Ib +ad +ad +jW +ad +ad +fw +dA +ad +dA +ad +ad +tX +tX +tX +tX +tX +aa "} (77,1,1) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -atX -atX -atX -atX -atX -atX -atX -aaa -aaa -aaa -aaa -aaa -aaa -atX -atX -atX -atX -atX -atX -aad -aad -aad -aad -aad -aad -ahI -aad -aad -aad -azT -aiL -aiL -aad -aad -agi -aiM -aad -atX -atX -atX -atX -atX -atX -atX -aaa -aaa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +tX +tX +tX +tX +tX +tX +tX +aa +aa +aa +aa +aa +aa +tX +tX +tX +tX +tX +tX +ad +ad +ad +ad +ad +ad +hI +ad +ad +ad +zT +iL +iL +ad +ad +gi +iM +ad +tX +tX +tX +tX +tX +tX +tX +aa +aa "} (78,1,1) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -atX -atX -atX -atX -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -atX -atX -atX -atX -atX -atX -aad -aad -aad -aad -aad -aad -aad -azT -aad -aad -aad -aad -aad -aad -aiL -atX -atX -atX -atX -atX -atX -atX -atX -atX -aaa -aaa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +tX +tX +tX +tX +aa +aa +aa +aa +aa +aa +aa +aa +aa +tX +tX +tX +tX +tX +tX +ad +ad +ad +ad +ad +ad +ad +zT +ad +ad +ad +ad +ad +ad +iL +tX +tX +tX +tX +tX +tX +tX +tX +tX +aa +aa "} (79,1,1) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -atX -atX -atX -atX -atX -atX -aaa -aaa -aad -aad -aad -aad -aad -agi -aad -aad -aad -atX -atX -atX -atX -atX -atX -atX -atX -atX -atX -aaa -aaa -aaa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +tX +tX +tX +tX +tX +tX +aa +aa +ad +ad +ad +ad +ad +gi +ad +ad +ad +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +aa +aa +aa "} (80,1,1) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -atX -atX -atX -aaa -aaa -aaa -aaa -aaa -aad -aad -aad -aad -aad -aaa -aaa -aaa -atX -atX -atX -atX -atX -atX -atX -aaa -aaa -aaa -aaa -aaa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +tX +tX +tX +aa +aa +aa +aa +aa +ad +ad +ad +ad +ad +aa +aa +aa +tX +tX +tX +tX +tX +tX +tX +aa +aa +aa +aa +aa "} diff --git a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm index de8e02e9ab16..8dcb397ce7f3 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm @@ -2600,7 +2600,7 @@ /area/ruin/ancientstation/kitchen) "gu" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/drinks/cans/cola, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/ruin/ancientstation/sec) @@ -3354,11 +3354,11 @@ /area/ruin/ancientstation/kitchen) "ia" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -2; pixel_y = 2 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 5; pixel_y = -2 }, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm index 0cbdaba9c8e1..c6dd91f6414d 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm @@ -1321,8 +1321,8 @@ /obj/item/tank/internals/oxygen/red, /obj/item/clothing/mask/gas/syndicate, /obj/item/mod/control/pre_equipped/traitor, -/obj/item/reagent_containers/food/drinks/bottle/rum, -/obj/item/reagent_containers/food/drinks/bottle/rum, +/obj/item/reagent_containers/drinks/bottle/rum, +/obj/item/reagent_containers/drinks/bottle/rum, /obj/item/folder/syndicate/blue, /turf/simulated/floor/plating, /area/ruin/space/onehalf/abandonedbridge) diff --git a/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm b/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm index bbafdde4db70..ae4e3ab8bba3 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm @@ -371,7 +371,7 @@ pixel_y = -3 }, /obj/item/clothing/suit/hgpirate, -/obj/item/reagent_containers/food/drinks/cans/beer/sleepy_beer, +/obj/item/reagent_containers/drinks/cans/beer/sleepy_beer, /obj/item/clothing/gloves/ring/gold, /obj/item/id_decal/gold, /obj/item/screwdriver, @@ -468,7 +468,7 @@ /area/space/nearstation) "mb" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/drinks/shaker, /turf/simulated/floor/wood, /area/ruin/space/powered/bar) "mu" = ( @@ -544,7 +544,7 @@ /area/ruin/space/powered/bar) "vD" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/cans/beer, +/obj/item/reagent_containers/drinks/cans/beer, /turf/simulated/floor/wood, /area/ruin/space/powered/bar) "vE" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndicatedruglab.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndicatedruglab.dmm index d0d197efa6fd..98c894eb5b5a 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/syndicatedruglab.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/syndicatedruglab.dmm @@ -328,7 +328,7 @@ /area/ruin/space/syndicate_druglab) "JP" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = -5; pixel_y = 7 }, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm index e67e39745952..3915eb5c6954 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm @@ -4010,8 +4010,8 @@ }, /obj/item/book/manual/barman_recipes, /obj/item/lighter/zippo, -/obj/item/reagent_containers/food/drinks/flask/barflask, -/obj/item/reagent_containers/food/drinks/flask/barflask, +/obj/item/reagent_containers/drinks/flask/barflask, +/obj/item/reagent_containers/drinks/flask/barflask, /obj/structure/table/wood, /obj/machinery/alarm/syndicate{ pixel_x = -24; @@ -4743,7 +4743,7 @@ /area/ruin/unpowered/syndicate_space_base/telecomms) "Af" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ layer = 5 }, /turf/simulated/floor/plasteel{ @@ -5181,7 +5181,7 @@ /area/ruin/unpowered/syndicate_space_base/service) "CC" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/drinks/shaker, /obj/machinery/light_switch{ dir = 4; pixel_x = -24; @@ -6072,7 +6072,7 @@ /area/ruin/unpowered/syndicate_space_base/arrivals) "HC" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -6096,7 +6096,7 @@ /area/ruin/unpowered/syndicate_space_base/atmos) "HO" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/cans/beer, +/obj/item/reagent_containers/drinks/cans/beer, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -7066,10 +7066,10 @@ /turf/simulated/floor/plating, /area/ruin/unpowered/syndicate_space_base/atmos) "Nm" = ( -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3 }, /obj/structure/table, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm index e55572e89b67..4acca6b6d8fc 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm @@ -16,7 +16,7 @@ /area/ruin/space/unpowered) "bk" = ( /obj/structure/table/glass/reinforced/plastitanium, -/obj/item/reagent_containers/food/snacks/syndicake{ +/obj/item/food/snacks/syndicake{ pixel_y = 7 }, /obj/effect/decal/cleanable/dirt, @@ -111,11 +111,11 @@ /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = -32 }, -/obj/item/reagent_containers/food/snacks/donut/sprinkles{ +/obj/item/food/snacks/donut/sprinkles{ pixel_y = 8; pixel_x = -9 }, -/obj/item/reagent_containers/food/snacks/donut/sprinkles{ +/obj/item/food/snacks/donut/sprinkles{ pixel_y = -1; pixel_x = 5 }, @@ -123,8 +123,8 @@ /area/ruin/space/unpowered) "fq" = ( /obj/structure/table/glass/reinforced/plastitanium, -/obj/item/reagent_containers/food/snacks/meat/corgi, -/obj/item/reagent_containers/food/snacks/meat/corgi{ +/obj/item/food/snacks/meat/corgi, +/obj/item/food/snacks/meat/corgi{ pixel_y = 6 }, /turf/simulated/floor/plasteel{ @@ -133,14 +133,14 @@ /area/ruin/space/unpowered) "fs" = ( /obj/structure/table/glass/reinforced/plastitanium, -/obj/item/reagent_containers/food/snacks/syndicake{ +/obj/item/food/snacks/syndicake{ pixel_y = 7 }, -/obj/item/reagent_containers/food/snacks/syndicake{ +/obj/item/food/snacks/syndicake{ pixel_x = 15; pixel_y = 7 }, -/obj/item/reagent_containers/food/snacks/syndicake{ +/obj/item/food/snacks/syndicake{ pixel_y = -10 }, /obj/machinery/light/small{ @@ -152,7 +152,7 @@ /area/ruin/space/unpowered) "fE" = ( /obj/structure/table/glass/reinforced/plastitanium, -/obj/item/reagent_containers/food/snacks/syndicake, +/obj/item/food/snacks/syndicake, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -275,11 +275,11 @@ /area/ruin/space/unpowered) "ke" = ( /obj/structure/table/glass/reinforced/plastitanium, -/obj/item/reagent_containers/food/snacks/syndicake{ +/obj/item/food/snacks/syndicake{ pixel_x = 15; pixel_y = 7 }, -/obj/item/reagent_containers/food/snacks/syndicake, +/obj/item/food/snacks/syndicake, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -369,11 +369,11 @@ /area/ruin/space/unpowered) "qd" = ( /obj/structure/table/glass/reinforced/plastitanium, -/obj/item/reagent_containers/food/snacks/breadslice, -/obj/item/reagent_containers/food/snacks/breadslice{ +/obj/item/food/snacks/breadslice, +/obj/item/food/snacks/breadslice{ pixel_y = 4 }, -/obj/item/reagent_containers/food/snacks/breadslice{ +/obj/item/food/snacks/breadslice{ pixel_y = 8 }, /obj/machinery/light/small{ @@ -480,12 +480,12 @@ /area/ruin/space/unpowered) "tf" = ( /obj/structure/table/glass/reinforced/plastitanium, -/obj/item/reagent_containers/food/snacks/syndicake, -/obj/item/reagent_containers/food/snacks/syndicake{ +/obj/item/food/snacks/syndicake, +/obj/item/food/snacks/syndicake{ pixel_x = 15; pixel_y = 7 }, -/obj/item/reagent_containers/food/snacks/syndicake{ +/obj/item/food/snacks/syndicake{ pixel_x = 15 }, /turf/simulated/floor/plasteel{ @@ -692,10 +692,10 @@ /area/ruin/space/unpowered) "Bh" = ( /obj/structure/table/glass/reinforced/plastitanium, -/obj/item/reagent_containers/food/snacks/syndicake{ +/obj/item/food/snacks/syndicake{ pixel_y = 7 }, -/obj/item/reagent_containers/food/snacks/syndicake{ +/obj/item/food/snacks/syndicake{ pixel_y = -10 }, /turf/simulated/floor/plasteel{ @@ -747,7 +747,7 @@ /area/ruin/space/unpowered) "Do" = ( /obj/structure/table/glass/reinforced/plastitanium, -/obj/item/reagent_containers/food/snacks/meat/corgi, +/obj/item/food/snacks/meat/corgi, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -770,11 +770,11 @@ /area/ruin/space/unpowered) "DY" = ( /obj/structure/table/glass/reinforced/plastitanium, -/obj/item/reagent_containers/food/condiment/milk{ +/obj/item/reagent_containers/condiment/milk{ pixel_y = 5; pixel_x = 6 }, -/obj/item/reagent_containers/food/condiment/milk{ +/obj/item/reagent_containers/condiment/milk{ pixel_y = 5; pixel_x = -5 }, @@ -831,8 +831,8 @@ /area/ruin/space/unpowered) "Gn" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/snacks/syndicake, -/obj/item/reagent_containers/food/snacks/syndicake{ +/obj/item/food/snacks/syndicake, +/obj/item/food/snacks/syndicake{ pixel_y = 7 }, /turf/simulated/floor/engine, @@ -876,7 +876,7 @@ /turf/simulated/floor/engine, /area/ruin/space/unpowered) "Iz" = ( -/obj/item/reagent_containers/food/snacks/meat/corgi{ +/obj/item/food/snacks/meat/corgi{ pixel_y = 6 }, /obj/effect/decal/cleanable/dirt, @@ -946,10 +946,10 @@ /area/ruin/space/unpowered) "Lt" = ( /obj/structure/table/glass/reinforced/plastitanium, -/obj/item/reagent_containers/food/snacks/syndicake{ +/obj/item/food/snacks/syndicake{ pixel_y = 7 }, -/obj/item/reagent_containers/food/snacks/syndicake{ +/obj/item/food/snacks/syndicake{ pixel_x = 15 }, /turf/simulated/floor/plasteel{ @@ -976,8 +976,8 @@ /area/ruin/space/unpowered) "Mw" = ( /obj/structure/table/glass/reinforced/plastitanium, -/obj/item/reagent_containers/food/snacks/syndicake, -/obj/item/reagent_containers/food/snacks/syndicake{ +/obj/item/food/snacks/syndicake, +/obj/item/food/snacks/syndicake{ pixel_x = 15; pixel_y = 7 }, @@ -1002,10 +1002,10 @@ /area/ruin/space/unpowered) "MY" = ( /obj/structure/table/glass/reinforced/plastitanium, -/obj/item/reagent_containers/food/snacks/syndicake{ +/obj/item/food/snacks/syndicake{ pixel_y = 7 }, -/obj/item/reagent_containers/food/snacks/syndicake{ +/obj/item/food/snacks/syndicake{ pixel_x = 15 }, /turf/simulated/floor/plasteel{ @@ -1034,21 +1034,21 @@ /area/template_noop) "Ov" = ( /obj/structure/table/glass/reinforced/plastitanium, -/obj/item/reagent_containers/food/snacks/donkpocket{ +/obj/item/food/snacks/donkpocket{ pixel_x = 8 }, -/obj/item/reagent_containers/food/snacks/donkpocket{ +/obj/item/food/snacks/donkpocket{ pixel_x = -8 }, -/obj/item/reagent_containers/food/snacks/donkpocket{ +/obj/item/food/snacks/donkpocket{ pixel_x = -8; pixel_y = 8 }, -/obj/item/reagent_containers/food/snacks/donkpocket{ +/obj/item/food/snacks/donkpocket{ pixel_x = 8; pixel_y = 8 }, -/obj/item/reagent_containers/food/snacks/birthdaycakeslice, +/obj/item/food/snacks/birthdaycakeslice, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -1115,12 +1115,12 @@ /area/ruin/space/unpowered) "QF" = ( /obj/structure/table/glass/reinforced/plastitanium, -/obj/item/reagent_containers/food/snacks/syndicake, -/obj/item/reagent_containers/food/snacks/syndicake{ +/obj/item/food/snacks/syndicake, +/obj/item/food/snacks/syndicake{ pixel_x = 15; pixel_y = 7 }, -/obj/item/reagent_containers/food/snacks/syndicake{ +/obj/item/food/snacks/syndicake{ pixel_x = 15 }, /obj/machinery/light/small{ @@ -1161,7 +1161,7 @@ }, /area/ruin/space/unpowered) "SS" = ( -/obj/item/reagent_containers/food/snacks/meat/corgi, +/obj/item/food/snacks/meat/corgi, /turf/simulated/floor/grass, /area/ruin/space/unpowered) "TG" = ( @@ -1193,8 +1193,8 @@ /area/ruin/space/unpowered) "Vt" = ( /obj/structure/table/glass/reinforced/plastitanium, -/obj/item/reagent_containers/food/condiment/saltshaker, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/saltshaker, +/obj/item/reagent_containers/condiment/peppermill{ pixel_y = 12 }, /turf/simulated/floor/plasteel{ @@ -1202,7 +1202,7 @@ }, /area/ruin/space/unpowered) "VI" = ( -/obj/item/reagent_containers/food/snacks/meat/corgi{ +/obj/item/food/snacks/meat/corgi{ pixel_y = 6 }, /turf/simulated/floor/plasteel{ @@ -1237,7 +1237,7 @@ /area/ruin/space/unpowered) "XZ" = ( /obj/structure/table/glass/reinforced/plastitanium, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ pixel_y = 10; pixel_x = 5 }, @@ -1288,14 +1288,14 @@ /turf/simulated/floor/grass, /area/ruin/space/unpowered) "Zs" = ( -/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/condiment/flour, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, /area/ruin/space/unpowered) "Zw" = ( /obj/structure/table/glass/reinforced/plastitanium, -/obj/item/reagent_containers/food/snacks/syndicake{ +/obj/item/food/snacks/syndicake{ pixel_y = 7 }, /turf/simulated/floor/plasteel{ diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm index 6888c9dfd94d..c40f640d6c47 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm @@ -53,7 +53,7 @@ }, /area/syndicate_depot/outer) "al" = ( -/obj/item/reagent_containers/food/snacks/monstermeat/spiderleg, +/obj/item/food/snacks/monstermeat/spiderleg, /obj/structure/spider, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -85,7 +85,7 @@ /area/syndicate_depot/outer) "ar" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/cans/beer, +/obj/item/reagent_containers/drinks/cans/beer, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -128,7 +128,7 @@ }, /area/syndicate_depot/core) "ay" = ( -/obj/item/reagent_containers/food/drinks/flask/barflask, +/obj/item/reagent_containers/drinks/flask/barflask, /obj/structure/table, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -614,7 +614,7 @@ /area/syndicate_depot/core) "bO" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/syndicake, +/obj/item/food/snacks/syndicake, /turf/simulated/floor/plasteel{ icon_state = "dark" }, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/turretedoutpost.dmm b/_maps/map_files/RandomRuins/SpaceRuins/turretedoutpost.dmm index d444f1809b69..1a6635990583 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/turretedoutpost.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/turretedoutpost.dmm @@ -231,11 +231,11 @@ /area/ruin/space/unpowered) "P" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/vodka{ +/obj/item/reagent_containers/drinks/bottle/vodka{ pixel_x = -4; pixel_y = 4 }, -/obj/item/reagent_containers/food/drinks/bottle/vodka{ +/obj/item/reagent_containers/drinks/bottle/vodka{ pixel_x = 3 }, /turf/simulated/floor/plasteel, @@ -259,7 +259,7 @@ /area/ruin/space/unpowered) "S" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/rawcutlet, +/obj/item/food/snacks/rawcutlet, /obj/machinery/light{ dir = 8 }, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm index b48172ed975b..5933202a8672 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm @@ -912,13 +912,13 @@ /area/ruin/space/derelict/bridge) "cr" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood, /area/ruin/space/derelict/bridge) "cs" = ( /obj/structure/rack, -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, +/obj/item/reagent_containers/drinks/bottle/vodka/badminka, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood{ broken = 1; @@ -1160,7 +1160,7 @@ /area/ruin/space/derelict/bridge) "cV" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/bottle/vodka, +/obj/item/reagent_containers/drinks/bottle/vodka, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "darkblue" @@ -1843,7 +1843,7 @@ /area/space/nearstation) "eB" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/grown/peanuts, +/obj/item/food/snacks/grown/peanuts, /obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, @@ -2777,11 +2777,11 @@ /area/ruin/space/derelict/crew_quarters) "gI" = ( /obj/structure/closet/secure_closet/bar, -/obj/item/reagent_containers/food/drinks/bottle/vodka, -/obj/item/reagent_containers/food/drinks/bottle/vodka, -/obj/item/reagent_containers/food/drinks/bottle/vodka, -/obj/item/reagent_containers/food/drinks/bottle/rum, -/obj/item/reagent_containers/food/drinks/bottle/kahlua, +/obj/item/reagent_containers/drinks/bottle/vodka, +/obj/item/reagent_containers/drinks/bottle/vodka, +/obj/item/reagent_containers/drinks/bottle/vodka, +/obj/item/reagent_containers/drinks/bottle/rum, +/obj/item/reagent_containers/drinks/bottle/kahlua, /turf/simulated/floor/plasteel/grimy, /area/ruin/space/derelict/crew_quarters) "gJ" = ( @@ -3011,7 +3011,7 @@ /area/ruin/space/derelict/crew_quarters) "hn" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass, /turf/simulated/floor/plasteel/grimy, /area/ruin/space/derelict/crew_quarters) "ho" = ( @@ -5750,7 +5750,7 @@ /area/ruin/space/derelict/hallway/primary) "nS" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/soup/beetsoup, +/obj/item/food/snacks/soup/beetsoup, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -6025,8 +6025,8 @@ /area/ruin/space/derelict/hallway/primary) "oA" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/flour, /turf/simulated/floor/plasteel/white, /area/ruin/space/derelict/hallway/primary) "oB" = ( @@ -6524,11 +6524,11 @@ layer = 2.9 }, /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/food/snacks/grown/potato, -/obj/item/reagent_containers/food/snacks/grown/potato, -/obj/item/reagent_containers/food/snacks/grown/potato, -/obj/item/reagent_containers/food/snacks/grown/potato, -/obj/item/reagent_containers/food/snacks/grown/potato, +/obj/item/food/snacks/grown/potato, +/obj/item/food/snacks/grown/potato, +/obj/item/food/snacks/grown/potato, +/obj/item/food/snacks/grown/potato, +/obj/item/food/snacks/grown/potato, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm b/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm index a517eb1ceaec..9639069969d7 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm @@ -224,7 +224,7 @@ /turf/simulated/floor/wood, /area/ruin/space/unpowered) "aP" = ( -/obj/item/reagent_containers/food/drinks/oilcan, +/obj/item/reagent_containers/drinks/oilcan, /obj/structure/window/reinforced{ dir = 8 }, @@ -290,7 +290,7 @@ /area/ruin/space/unpowered) "bc" = ( /obj/effect/decal/remains/human, -/obj/item/reagent_containers/food/snacks/meat/monkey, +/obj/item/food/snacks/meat/monkey, /turf/simulated/floor/plating, /area/ruin/space/unpowered) "bd" = ( @@ -312,7 +312,7 @@ /turf/simulated/floor/plating, /area/ruin/space/unpowered) "bg" = ( -/obj/item/reagent_containers/food/snacks/meat/monkey, +/obj/item/food/snacks/meat/monkey, /turf/simulated/floor/plating, /area/ruin/space/unpowered) "bh" = ( @@ -328,7 +328,7 @@ }, /area/ruin/space/unpowered) "bj" = ( -/obj/item/reagent_containers/food/snacks/meat/human, +/obj/item/food/snacks/meat/human, /obj/effect/decal/cleanable/blood/old, /turf/simulated/floor/plasteel{ icon_state = "chapel" diff --git a/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm b/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm index 6314508d4d22..c34bd6c06e10 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm @@ -225,8 +225,8 @@ /area/ruin/space/wreck_cargoship) "jm" = ( /obj/item/toy/plushie/ipcplushie, -/obj/item/reagent_containers/food/snacks/breadslice, -/obj/item/reagent_containers/food/snacks/breadslice, +/obj/item/food/snacks/breadslice, +/obj/item/food/snacks/breadslice, /obj/item/paper/crumpled{ name = "unintelligible scribbles"; info = "toast... i must... the plushie..." diff --git a/_maps/map_files/RandomZLevels/beach.dmm b/_maps/map_files/RandomZLevels/beach.dmm index ad143c5af716..93ebb4b20edb 100644 --- a/_maps/map_files/RandomZLevels/beach.dmm +++ b/_maps/map_files/RandomZLevels/beach.dmm @@ -474,7 +474,7 @@ /area/awaymission/beach) "cX" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/drinks/shaker, /turf/simulated/floor/wood, /area/awaymission/beach) "cY" = ( @@ -827,7 +827,7 @@ /area/awaymission/beach) "ev" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/pie, +/obj/item/food/snacks/pie, /turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "ew" = ( diff --git a/_maps/map_files/cerestation/cerestation.dmm b/_maps/map_files/cerestation/cerestation.dmm index d2d5c8bedf44..32326c179b0e 100644 --- a/_maps/map_files/cerestation/cerestation.dmm +++ b/_maps/map_files/cerestation/cerestation.dmm @@ -3900,7 +3900,7 @@ /area/station/turret_protected/aisat/interior) "axU" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/mug/hos, +/obj/item/reagent_containers/drinks/mug/hos, /obj/item/radio{ pixel_x = 5 }, @@ -5510,7 +5510,7 @@ /area/station/supply/miningdock) "aJM" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = -5 }, /obj/item/reagent_containers/glass/beaker/waterbottle{ @@ -21848,7 +21848,7 @@ /area/station/service/hydroponics) "cld" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/condiment/peppermill, +/obj/item/reagent_containers/condiment/peppermill, /turf/simulated/floor/wood, /area/station/maintenance/starboard) "clh" = ( @@ -23236,7 +23236,7 @@ /obj/item/reagent_containers/glass/beaker/waterbottle{ pixel_x = 5 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = -5 }, /turf/simulated/floor/wood, @@ -26712,7 +26712,7 @@ /area/station/maintenance/port) "cNg" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/baguette, +/obj/item/food/snacks/baguette, /obj/structure/sign/poster/official/the_owl{ pixel_y = 32 }, @@ -38308,7 +38308,7 @@ /area/station/hallway/primary/port/south) "eZY" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/holywater, +/obj/item/reagent_containers/drinks/bottle/holywater, /obj/item/lighter/zippo/black, /turf/simulated/floor/carpet/black, /area/station/service/chapel) @@ -40919,10 +40919,10 @@ /area/station/hallway/primary/starboard/south) "fZO" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/cans/cola{ +/obj/item/reagent_containers/drinks/cans/cola{ pixel_x = 10 }, -/obj/item/reagent_containers/food/snacks/chips{ +/obj/item/food/snacks/chips{ pixel_x = -5 }, /obj/structure/railing, @@ -42459,7 +42459,7 @@ /area/station/hallway/primary/fore) "gDk" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/drinks/britcup, /obj/item/paper_bin, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" @@ -47664,7 +47664,7 @@ /area/station/turret_protected/aisat/interior/secondary) "ipE" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/mint, +/obj/item/food/snacks/mint, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -50351,7 +50351,7 @@ /area/space) "jgd" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 2; pixel_y = 6 }, @@ -51110,7 +51110,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/table, /obj/item/kitchen/knife, -/obj/item/reagent_containers/food/snacks/meat/human, +/obj/item/food/snacks/meat/human, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "jtF" = ( @@ -52067,9 +52067,9 @@ /area/station/command/office/blueshield) "jHz" = ( /obj/structure/closet/cabinet, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, -/obj/item/reagent_containers/food/drinks/drinkingglass, -/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/drinks/bottle/whiskey, +/obj/item/reagent_containers/drinks/drinkingglass, +/obj/item/reagent_containers/drinks/drinkingglass, /obj/machinery/firealarm{ dir = 4; pixel_x = 24; @@ -53931,7 +53931,7 @@ "knI" = ( /obj/structure/table, /obj/item/book/manual/wiki/chef_recipes, -/obj/item/reagent_containers/food/condiment/peppermill, +/obj/item/reagent_containers/condiment/peppermill, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -54244,7 +54244,7 @@ "ksD" = ( /obj/structure/safe, /obj/item/clothing/head/bearpelt, -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, +/obj/item/reagent_containers/drinks/bottle/vodka/badminka, /obj/item/dice/d20{ desc = "A die with twenty sides. You feel absolutely normal while looking at this."; name = "Die of Mediocre Rolling Capability" @@ -54927,7 +54927,7 @@ "kCC" = ( /obj/structure/table, /obj/item/kitchen/knife, -/obj/item/reagent_containers/food/condiment/saltshaker, +/obj/item/reagent_containers/condiment/saltshaker, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -55639,12 +55639,12 @@ /area/station/engineering/control) "kNJ" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/drinks/bottle/whiskey, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_x = 8; pixel_y = 6 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass, /turf/simulated/floor/wood, /area/station/command/office/ntrep) "kOb" = ( @@ -56989,7 +56989,7 @@ }, /area/station/service/barber) "liT" = ( -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/drinks/shaker, /obj/structure/table/wood, /turf/simulated/floor/wood, /area/station/maintenance/gambling_den) @@ -57325,7 +57325,7 @@ pixel_x = 4; pixel_y = -4 }, -/obj/item/reagent_containers/food/drinks/trophy/bronze_cup{ +/obj/item/reagent_containers/drinks/trophy/bronze_cup{ name = "Rage Cage Champion" }, /turf/simulated/floor/plating/asteroid/ancient, @@ -59040,7 +59040,7 @@ "lPU" = ( /obj/structure/table, /obj/item/reagent_containers/glass/beaker, -/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/condiment/enzyme, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -59584,7 +59584,7 @@ /area/station/service/hydroponics) "lYT" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/fried_vox, +/obj/item/food/snacks/fried_vox, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "lYX" = ( @@ -61471,7 +61471,7 @@ dir = 4 }, /obj/structure/table/wood, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -2; pixel_y = 4 }, @@ -62701,11 +62701,11 @@ dir = 1; layer = 2.9 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -2; pixel_y = 4 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 2; pixel_y = 6 }, @@ -68864,7 +68864,7 @@ "per" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/drinks/britcup, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "peB" = ( @@ -71589,7 +71589,7 @@ "pXp" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, -/obj/item/reagent_containers/food/snacks/donkpocket, +/obj/item/food/snacks/donkpocket, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "pXq" = ( @@ -72136,7 +72136,7 @@ }, /area/station/engineering/gravitygenerator) "qeX" = ( -/obj/item/reagent_containers/food/drinks/bottle/patron, +/obj/item/reagent_containers/drinks/bottle/patron, /obj/structure/table/wood, /obj/item/lighter/random, /obj/item/storage/fancy/cigarettes/cigpack_shadyjims, @@ -76573,7 +76573,7 @@ "rHk" = ( /obj/structure/table/wood, /obj/item/book/manual/wiki/security_space_law, -/obj/item/reagent_containers/food/drinks/flask/detflask, +/obj/item/reagent_containers/drinks/flask/detflask, /obj/structure/cable/orange{ d1 = 1; d2 = 4; @@ -79213,7 +79213,7 @@ dir = 4 }, /obj/structure/table/wood, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -2; pixel_y = 4 }, @@ -81715,7 +81715,7 @@ "tnY" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/bananalamp, -/obj/item/reagent_containers/food/snacks/pie, +/obj/item/food/snacks/pie, /obj/machinery/light_switch{ dir = 8; pixel_x = 24; @@ -84107,11 +84107,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/wood, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 2; pixel_y = 6 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -2; pixel_y = 4 }, @@ -87891,7 +87891,7 @@ /obj/structure/closet/wardrobe/white, /obj/item/clothing/shoes/jackboots, /obj/item/reagent_containers/iv_bag/blood/OMinus, -/obj/item/reagent_containers/food/drinks/cans/badminbrew, +/obj/item/reagent_containers/drinks/cans/badminbrew, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "vpt" = ( @@ -88853,7 +88853,7 @@ /area/station/medical/medbay) "vDS" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/drinks/britcup, /obj/machinery/door/window/classic/normal{ dir = 8; name = "Medical Reception" @@ -88992,8 +88992,8 @@ /area/station/hallway/primary/fore/east) "vFa" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/grown/potato, -/obj/item/reagent_containers/food/snacks/grown/chili, +/obj/item/food/snacks/grown/potato, +/obj/item/food/snacks/grown/chili, /obj/item/seeds/grape, /turf/simulated/floor/plasteel{ icon_state = "darkgreenfull" @@ -92096,7 +92096,7 @@ /area/station/public/storage/tools) "wzA" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 2; pixel_y = 6 }, @@ -94442,12 +94442,12 @@ pixel_x = -24; name = "west bump" }, -/obj/item/reagent_containers/food/drinks/flask/barflask, +/obj/item/reagent_containers/drinks/flask/barflask, /obj/item/clothing/head/that{ pixel_x = 4; pixel_y = 6 }, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/drinks/shaker, /obj/structure/table/wood, /turf/simulated/floor/wood, /area/station/service/bar) @@ -96143,7 +96143,7 @@ }, /obj/machinery/light, /obj/structure/table, -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/drinks/britcup{ pixel_x = 9; pixel_y = 9 }, diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 4fef82163bbe..46ac67854b3b 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -776,7 +776,7 @@ /area/station/security/main) "aeC" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/mug/hos, +/obj/item/reagent_containers/drinks/mug/hos, /turf/simulated/floor/carpet, /area/station/command/office/hos) "aeD" = ( @@ -7302,7 +7302,7 @@ /obj/item/radio{ pixel_x = 5 }, -/obj/item/reagent_containers/food/drinks/mug/sec, +/obj/item/reagent_containers/drinks/mug/sec, /turf/simulated/floor/plating, /area/station/maintenance/fore) "axX" = ( @@ -7472,7 +7472,7 @@ pixel_y = 7 }, /obj/item/pen/multi, -/obj/item/reagent_containers/food/drinks/flask/detflask, +/obj/item/reagent_containers/drinks/flask/detflask, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -7563,7 +7563,7 @@ /obj/machinery/ai_status_display{ pixel_y = -32 }, -/obj/item/reagent_containers/food/drinks/mug/sec, +/obj/item/reagent_containers/drinks/mug/sec, /obj/structure/table, /turf/simulated/floor/plasteel{ dir = 8; @@ -9027,7 +9027,7 @@ /area/station/maintenance/abandonedbar) "aCW" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/patron, +/obj/item/reagent_containers/drinks/bottle/patron, /obj/item/storage/fancy/cigarettes/cigpack_shadyjims, /turf/simulated/floor/plating, /area/station/maintenance/abandonedbar) @@ -9282,7 +9282,7 @@ /obj/item/clothing/suit/wcoat, /obj/item/clothing/suit/blacktrenchcoat, /obj/item/clothing/under/suit/tan, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/drinks/bottle/whiskey, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "aDD" = ( @@ -9762,8 +9762,8 @@ /area/station/maintenance/abandonedbar) "aFb" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/condiment/saltshaker, -/obj/item/reagent_containers/food/condiment/peppermill, +/obj/item/reagent_containers/condiment/saltshaker, +/obj/item/reagent_containers/condiment/peppermill, /turf/simulated/floor/plating, /area/station/maintenance/abandonedbar) "aFc" = ( @@ -10505,7 +10505,7 @@ /area/station/maintenance/fpmaint) "aHx" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/drinks/drinkingglass, /obj/item/radio/intercom{ name = "west bump"; pixel_x = -28 @@ -10991,7 +10991,7 @@ /obj/item/reagent_containers/glass/beaker/waterbottle{ pixel_x = 5 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = -5 }, /obj/structure/window/reinforced, @@ -11806,7 +11806,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aLG" = ( -/obj/item/reagent_containers/food/snacks/meat/slab, +/obj/item/food/snacks/meat/slab, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -12066,7 +12066,7 @@ /area/station/maintenance/fore) "aMl" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/donut, +/obj/item/food/snacks/donut, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aMo" = ( @@ -12258,7 +12258,7 @@ /area/station/maintenance/fpmaint) "aMT" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/food/snacks/meat/slab, +/obj/item/food/snacks/meat/slab, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -12307,7 +12307,7 @@ /area/station/legal/courtroom) "aNb" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = -5 }, /obj/item/reagent_containers/glass/beaker/waterbottle{ @@ -12672,7 +12672,7 @@ /area/station/maintenance/fpmaint2) "aOo" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/food/snacks/meat/slab, +/obj/item/food/snacks/meat/slab, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -12728,7 +12728,7 @@ /obj/item/reagent_containers/glass/beaker/waterbottle{ pixel_x = 5 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = -5 }, /obj/structure/window/reinforced{ @@ -12933,7 +12933,7 @@ "aPa" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random_spawners/blood_maybe, -/obj/item/reagent_containers/food/snacks/meat/slab, +/obj/item/food/snacks/meat/slab, /obj/item/clothing/mask/face/fox, /turf/simulated/floor/plasteel, /area/station/maintenance/fpmaint2) @@ -14034,7 +14034,7 @@ /obj/structure/closet/wardrobe/white, /obj/item/clothing/shoes/jackboots, /obj/item/reagent_containers/iv_bag/blood/OMinus, -/obj/item/reagent_containers/food/drinks/cans/badminbrew, +/obj/item/reagent_containers/drinks/cans/badminbrew, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "aSp" = ( @@ -14689,7 +14689,7 @@ /area/station/public/dorms) "aUe" = ( /obj/structure/closet, -/obj/item/reagent_containers/food/drinks/cans/badminbrew, +/obj/item/reagent_containers/drinks/cans/badminbrew, /obj/effect/landmark/spawner/nukedisc_respawn, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, @@ -14927,7 +14927,7 @@ /obj/item/roller{ pixel_y = 9 }, -/obj/item/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/drinks/britcup, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitehall" @@ -16642,7 +16642,7 @@ }, /obj/item/clothing/head/bearpelt, /obj/item/folder/documents, -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, +/obj/item/reagent_containers/drinks/bottle/vodka/badminka, /obj/item/lighter/zippo/nt_rep, /obj/item/storage/fancy/cigarettes/cigpack_robustgold, /obj/item/stack/spacecash/c1000, @@ -16861,7 +16861,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "baa" = ( -/obj/item/reagent_containers/food/snacks/grown/banana, +/obj/item/food/snacks/grown/banana, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "bab" = ( @@ -17358,7 +17358,7 @@ /area/station/maintenance/fpmaint) "bbH" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/baguette, +/obj/item/food/snacks/baguette, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "bbI" = ( @@ -17379,7 +17379,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "bbJ" = ( -/obj/item/reagent_containers/food/snacks/grown/banana, +/obj/item/food/snacks/grown/banana, /obj/item/storage/backpack/duffel/clown, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) @@ -17623,7 +17623,7 @@ "bcu" = ( /obj/structure/table/wood, /obj/item/pen, -/obj/item/reagent_containers/food/drinks/bottle/holywater, +/obj/item/reagent_containers/drinks/bottle/holywater, /obj/machinery/light{ dir = 1 }, @@ -17961,7 +17961,7 @@ "bdp" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/bananalamp, -/obj/item/reagent_containers/food/snacks/pie, +/obj/item/food/snacks/pie, /obj/machinery/alarm{ name = "north bump"; pixel_y = 24 @@ -19152,8 +19152,8 @@ /area/station/service/chapel) "bgj" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/chips, -/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/food/snacks/chips, +/obj/item/reagent_containers/drinks/cans/cola, /turf/simulated/floor/carpet, /area/station/hallway/secondary/entry) "bgk" = ( @@ -23881,7 +23881,7 @@ /area/station/maintenance/port) "bsS" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ layer = 5 }, /obj/item/stack/packageWrap, @@ -23904,10 +23904,10 @@ /area/station/service/kitchen) "bsU" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3 }, /turf/simulated/floor/plasteel{ @@ -24006,12 +24006,12 @@ /turf/simulated/floor/wood, /area/station/service/bar) "btg" = ( -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 2; pixel_y = 6 }, /obj/structure/table/wood, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -2; pixel_y = 4 }, @@ -24454,7 +24454,7 @@ /area/station/service/kitchen) "bus" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/mint, +/obj/item/food/snacks/mint, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -24473,7 +24473,7 @@ /area/station/service/kitchen) "buu" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/bottle/cream, +/obj/item/reagent_containers/drinks/bottle/cream, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -27847,11 +27847,11 @@ /area/station/supply/office) "bHn" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/cans/cola{ +/obj/item/reagent_containers/drinks/cans/cola{ pixel_y = 8; pixel_x = -6 }, -/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/drinks/drinkingglass, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "arrival" @@ -28647,7 +28647,7 @@ /area/station/public/toilet/unisex) "bJV" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/drinks/shaker, /obj/item/gun/projectile/revolver/doublebarrel, /obj/item/stack/sheet/metal{ amount = 50 @@ -28695,7 +28695,7 @@ pixel_x = -30 }, /obj/structure/table, -/obj/item/reagent_containers/food/drinks/cans/dr_gibb, +/obj/item/reagent_containers/drinks/cans/dr_gibb, /obj/item/storage/box/patch_packs, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" @@ -28749,7 +28749,7 @@ /area/station/science/robotics) "bKo" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/mug, +/obj/item/reagent_containers/drinks/mug, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whitepurple" @@ -28863,8 +28863,8 @@ dir = 8; layer = 2.9 }, -/obj/item/reagent_containers/food/drinks/cans/beer, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer, +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = 4; pixel_y = 4 }, @@ -30367,26 +30367,6 @@ "bQo" = ( /turf/simulated/wall, /area/station/command/office/hop) -"bQw" = ( -/obj/structure/table/wood, -/obj/item/radio/intercom{ - name = "south bump"; - pixel_y = -28 - }, -/obj/item/storage/fancy/matches, -/obj/item/reagent_containers/food/drinks/flask/gold, -/obj/item/clothing/mask/cigarette/cigar, -/obj/item/razor{ - pixel_x = -4; - pixel_y = 2 - }, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, -/turf/simulated/floor/carpet, -/area/station/command/office/captain/bedroom) "bQy" = ( /obj/machinery/door/airlock{ name = "Private Restroom" @@ -32449,7 +32429,7 @@ /area/station/maintenance/asmaint2) "bYm" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/mug, +/obj/item/reagent_containers/drinks/mug, /turf/simulated/floor/wood, /area/station/maintenance/asmaint2) "bYr" = ( @@ -33244,7 +33224,7 @@ /area/station/command/office/cmo) "caR" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/food/drinks/coffee, +/obj/item/reagent_containers/drinks/coffee, /obj/machinery/power/apc{ dir = 4; name = "east bump"; @@ -35235,9 +35215,9 @@ /area/station/medical/medbay2) "chH" = ( /obj/structure/closet/cabinet, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, -/obj/item/reagent_containers/food/drinks/drinkingglass, -/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/drinks/bottle/whiskey, +/obj/item/reagent_containers/drinks/drinkingglass, +/obj/item/reagent_containers/drinks/drinkingglass, /turf/simulated/floor/wood, /area/station/command/office/blueshield) "chI" = ( @@ -35316,7 +35296,7 @@ c_tag = "Research Director's Office"; network = list("Research","SS13") }, -/obj/item/reagent_containers/food/drinks/mug/rd, +/obj/item/reagent_containers/drinks/mug/rd, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "darkpurple" @@ -35334,10 +35314,10 @@ pixel_y = 32 }, /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/cans/bottler/glass_bottle{ +/obj/item/reagent_containers/drinks/cans/bottler/glass_bottle{ pixel_x = 4 }, -/obj/item/reagent_containers/food/drinks/cans/bottler/glass_bottle{ +/obj/item/reagent_containers/drinks/cans/bottler/glass_bottle{ pixel_x = -9 }, /turf/simulated/floor/wood, @@ -50017,14 +49997,14 @@ /area/station/maintenance/asmaint2) "dgz" = ( /obj/structure/table/holotable/wood, -/obj/item/reagent_containers/food/drinks/bottle/rum{ +/obj/item/reagent_containers/drinks/bottle/rum{ pixel_y = 2 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_x = -8; pixel_y = 7 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_x = 10 }, /turf/simulated/floor/beach/sand, @@ -50042,7 +50022,7 @@ pixel_y = -28 }, /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/mug, +/obj/item/reagent_containers/drinks/mug, /obj/machinery/power/apc{ name = "south bump"; pixel_y = -24 @@ -50134,7 +50114,7 @@ "dgY" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, -/obj/item/reagent_containers/food/snacks/donkpocket, +/obj/item/food/snacks/donkpocket, /turf/simulated/floor/plating, /area/station/maintenance/aft) "dgZ" = ( @@ -50199,7 +50179,7 @@ pixel_y = -24 }, /obj/structure/table/wood, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 2; pixel_y = 6 }, @@ -50731,8 +50711,8 @@ dir = 4 }, /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/flask/barflask, -/obj/item/reagent_containers/food/drinks/flask/barflask, +/obj/item/reagent_containers/drinks/flask/barflask, +/obj/item/reagent_containers/drinks/flask/barflask, /obj/machinery/status_display{ pixel_y = 32 }, @@ -53944,19 +53924,19 @@ /area/station/maintenance/apmaint) "dEb" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/food/snacks/meat/slab, +/obj/item/food/snacks/meat/slab, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "dEq" = ( /obj/structure/rack{ dir = 1 }, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/drinks/bottle/whiskey{ pixel_x = -3; pixel_y = -3 }, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/drinks/bottle/whiskey, +/obj/item/reagent_containers/drinks/bottle/whiskey{ pixel_x = 3; pixel_y = 3 }, @@ -54387,7 +54367,7 @@ /area/station/maintenance/asmaint) "dOb" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/bottle/rum, +/obj/item/reagent_containers/drinks/bottle/rum, /obj/item/reagent_containers/glass/rag{ pixel_x = -7 }, @@ -55230,12 +55210,12 @@ /obj/structure/rack{ dir = 1 }, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/drinks/bottle/whiskey{ pixel_x = -3; pixel_y = -3 }, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/drinks/bottle/whiskey, +/obj/item/reagent_containers/drinks/bottle/whiskey{ pixel_x = 3; pixel_y = 3 }, @@ -55934,11 +55914,11 @@ /area/station/maintenance/disposal) "esV" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8; pixel_y = 1 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -8; pixel_y = 11 }, @@ -58186,7 +58166,7 @@ /area/station/science/hallway) "fxN" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/drinks/drinkingglass, /turf/simulated/floor/wood, /area/station/maintenance/asmaint) "fxP" = ( @@ -60177,8 +60157,8 @@ /area/station/security/prisonlockers) "guQ" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/saltshaker, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/saltshaker, +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -7 }, /obj/effect/spawner/lootdrop/maintenance, @@ -60799,7 +60779,7 @@ "gMa" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/reagent_containers/food/snacks/dough{ +/obj/item/food/snacks/dough{ desc = "A piece of dough. It looks moldy and is hard as a rock. Hope you're not planning on turning this into a pizza.."; name = "old dough" }, @@ -61067,7 +61047,7 @@ /area/station/medical/morgue) "gRe" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/drinks/drinkingglass, /turf/simulated/floor/wood, /area/station/maintenance/asmaint2) "gRg" = ( @@ -62603,7 +62583,7 @@ /area/station/command/meeting_room) "hDS" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/mug/sci, +/obj/item/reagent_containers/drinks/mug/sci, /obj/machinery/light{ dir = 8 }, @@ -67430,7 +67410,7 @@ "kdh" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small, -/obj/item/reagent_containers/food/snacks/grown/cannabis, +/obj/item/food/snacks/grown/cannabis, /turf/simulated/floor/carpet, /area/station/maintenance/asmaint) "kdk" = ( @@ -67533,7 +67513,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "kgc" = ( -/obj/item/reagent_containers/food/drinks/cans/badminbrew, +/obj/item/reagent_containers/drinks/cans/badminbrew, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "kgg" = ( @@ -68103,8 +68083,8 @@ }, /obj/item/clothing/mask/cigarette/random, /obj/structure/closet/secure_closet/freezer/fridge/open, -/obj/item/reagent_containers/food/drinks/cans/beer, -/obj/item/reagent_containers/food/drinks/cans/beer, +/obj/item/reagent_containers/drinks/cans/beer, +/obj/item/reagent_containers/drinks/cans/beer, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -71136,7 +71116,7 @@ known_by = list("captain") }, /obj/item/gun/projectile/revolver/russian, -/obj/item/reagent_containers/food/drinks/bottle/absinthe/premium, +/obj/item/reagent_containers/drinks/bottle/absinthe/premium, /obj/item/lighter/zippo/nt_rep, /obj/item/storage/fancy/cigarettes/cigpack_robustgold, /obj/item/toy/figure/crew/captain, @@ -71651,7 +71631,7 @@ }, /area/station/command/server) "mdX" = ( -/obj/item/reagent_containers/food/snacks/grown/cannabis, +/obj/item/food/snacks/grown/cannabis, /obj/effect/decal/cleanable/dirt, /obj/item/clothing/mask/cigarette/medical_marijuana, /turf/simulated/floor/wood{ @@ -72440,7 +72420,7 @@ c_tag = "Medbay Reception Break Room"; dir = 4 }, -/obj/item/reagent_containers/food/drinks/mug/med, +/obj/item/reagent_containers/drinks/mug/med, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -79100,7 +79080,7 @@ /obj/structure/closet/wardrobe/white, /obj/item/clothing/shoes/jackboots, /obj/item/reagent_containers/iv_bag/blood/OMinus, -/obj/item/reagent_containers/food/drinks/cans/badminbrew, +/obj/item/reagent_containers/drinks/cans/badminbrew, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -80251,8 +80231,8 @@ /area/station/engineering/atmos) "qpi" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/cans/beer, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer, +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = -7 }, /turf/simulated/floor/plasteel, @@ -82248,7 +82228,7 @@ "rkL" = ( /obj/effect/decal/cleanable/dirt, /obj/item/seeds/cannabis, -/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris, +/obj/item/food/snacks/grown/ambrosia/vulgaris, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "rkS" = ( @@ -87134,7 +87114,7 @@ /area/station/maintenance/starboardsolar) "tNc" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/drinks/drinkingglass, /turf/simulated/floor/wood, /area/station/maintenance/aft) "tNn" = ( @@ -87330,6 +87310,25 @@ icon_state = "vault" }, /area/station/maintenance/apmaint) +"tRF" = ( +/obj/structure/table/wood, +/obj/item/radio/intercom{ + name = "south bump"; + pixel_y = -28 + }, +/obj/item/reagent_containers/drinks/flask/gold, +/obj/item/clothing/mask/cigarette/cigar, +/obj/item/razor{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/machinery/firealarm{ + dir = 8; + name = "west bump"; + pixel_x = -24 + }, +/turf/simulated/floor/carpet, +/area/station/command/office/captain/bedroom) "tRO" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable{ @@ -87547,17 +87546,17 @@ /area/station/science/test_chamber) "tWD" = ( /obj/structure/closet/crate, -/obj/item/reagent_containers/food/snacks/breadslice, -/obj/item/reagent_containers/food/snacks/breadslice, -/obj/item/reagent_containers/food/snacks/breadslice, -/obj/item/reagent_containers/food/snacks/grown/potato, -/obj/item/reagent_containers/food/snacks/grown/potato, -/obj/item/reagent_containers/food/snacks/grown/onion, -/obj/item/reagent_containers/food/snacks/grown/onion, +/obj/item/food/snacks/breadslice, +/obj/item/food/snacks/breadslice, +/obj/item/food/snacks/breadslice, +/obj/item/food/snacks/grown/potato, +/obj/item/food/snacks/grown/potato, +/obj/item/food/snacks/grown/onion, +/obj/item/food/snacks/grown/onion, /obj/item/storage/box/donkpockets, /obj/item/storage/fancy/egg_box, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/rice, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/rice, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -88124,8 +88123,8 @@ /area/station/medical/storage) "uls" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/wine, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/drinks/bottle/wine, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_x = -5 }, /turf/simulated/floor/wood{ @@ -88899,7 +88898,7 @@ /area/station/engineering/atmos/distribution) "uGf" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/snacks/grilledcheese{ +/obj/item/food/snacks/grilledcheese{ pixel_y = 9 }, /turf/simulated/floor/wood, @@ -89210,7 +89209,7 @@ /area/station/maintenance/apmaint2) "uRK" = ( /obj/item/organ/internal/heart/vox, -/obj/item/reagent_containers/food/snacks/fried_vox, +/obj/item/food/snacks/fried_vox, /obj/structure/table, /obj/item/scalpel, /turf/simulated/floor/plating, @@ -94915,7 +94914,7 @@ /area/station/medical/surgery/observation) "xII" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/pistachios, +/obj/item/food/snacks/pistachios, /obj/item/poster/random_contraband, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -95796,7 +95795,7 @@ pixel_x = 3; pixel_y = -3 }, -/obj/item/reagent_containers/food/drinks/trophy/bronze_cup, +/obj/item/reagent_containers/drinks/trophy/bronze_cup, /obj/machinery/light/small{ dir = 1 }, @@ -122995,7 +122994,7 @@ qPl bOK kdk jdt -bQw +tRF oRE bTS tvD diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm index 9ac44c603b06..ddbe009e3a37 100644 --- a/_maps/map_files/generic/Lavaland.dmm +++ b/_maps/map_files/generic/Lavaland.dmm @@ -972,7 +972,7 @@ /area/mine/outpost/storage) "cl" = ( /obj/structure/lattice/catwalk/mining, -/obj/item/reagent_containers/food/snacks/fortunecookie{ +/obj/item/food/snacks/fortunecookie{ pixel_y = -5; pixel_x = -6 }, @@ -1348,7 +1348,7 @@ "de" = ( /obj/structure/rack, /obj/item/storage/toolbox/emergency, -/obj/item/reagent_containers/food/snacks/grown/harebell, +/obj/item/food/snacks/grown/harebell, /obj/item/radio/intercom{ name = "south bump"; pixel_y = -28 @@ -2206,22 +2206,22 @@ /area/mine/outpost/medbay) "eJ" = ( /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/food/drinks/cans/beer, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer, +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = -1; pixel_y = 9 }, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = -8 }, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = 4; pixel_y = 4 }, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = -7 }, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = 7; pixel_y = 5 }, @@ -2375,11 +2375,11 @@ /area/mine/outpost/hallway/west) "eW" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 2; pixel_y = 6 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -2; pixel_y = 4 }, @@ -6328,7 +6328,7 @@ /area/mine/outpost/production) "Bu" = ( /obj/structure/reagent_dispensers/oil, -/obj/item/reagent_containers/food/drinks/oilcan, +/obj/item/reagent_containers/drinks/oilcan, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) "By" = ( diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm index ab72f851ffb3..2e68f1a049da 100644 --- a/_maps/map_files/generic/centcomm.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -855,7 +855,7 @@ /area/centcom) "du" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/drinks/shaker, /turf/simulated/floor/plasteel/freezer, /area/ninja/holding) "dv" = ( @@ -876,7 +876,7 @@ /area/ninja/holding) "dy" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/drinks/cans/cola, /turf/simulated/floor/plasteel/freezer, /area/ninja/holding) "dz" = ( @@ -1099,7 +1099,7 @@ pixel_y = 5; pixel_x = -7 }, -/obj/item/reagent_containers/food/drinks/mugwort{ +/obj/item/reagent_containers/drinks/mugwort{ pixel_y = 6; pixel_x = 8 }, @@ -1413,7 +1413,7 @@ /area/ninja/holding) "fv" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/mug/novelty, +/obj/item/reagent_containers/drinks/mug/novelty, /obj/item/candle/eternal/wizard{ pixel_y = 11 }, @@ -1449,24 +1449,24 @@ /area/shuttle/administration) "fF" = ( /obj/structure/closet/secure_closet/freezer/meat/open, -/obj/item/reagent_containers/food/snacks/raw_bacon, -/obj/item/reagent_containers/food/snacks/raw_bacon, -/obj/item/reagent_containers/food/snacks/raw_bacon, -/obj/item/reagent_containers/food/snacks/raw_bacon, -/obj/item/reagent_containers/food/snacks/sausage, -/obj/item/reagent_containers/food/snacks/sausage, -/obj/item/reagent_containers/food/snacks/rawcutlet, -/obj/item/reagent_containers/food/snacks/rawcutlet, -/obj/item/reagent_containers/food/snacks/rawcutlet, -/obj/item/reagent_containers/food/snacks/catfishmeat, -/obj/item/reagent_containers/food/snacks/catfishmeat, -/obj/item/reagent_containers/food/snacks/catfishmeat, -/obj/item/reagent_containers/food/snacks/catfishmeat, -/obj/item/reagent_containers/food/snacks/rawcutlet, -/obj/item/reagent_containers/food/snacks/rawcutlet, -/obj/item/reagent_containers/food/snacks/rawcutlet, -/obj/item/reagent_containers/food/snacks/spaghetti, -/obj/item/reagent_containers/food/snacks/spaghetti, +/obj/item/food/snacks/raw_bacon, +/obj/item/food/snacks/raw_bacon, +/obj/item/food/snacks/raw_bacon, +/obj/item/food/snacks/raw_bacon, +/obj/item/food/snacks/sausage, +/obj/item/food/snacks/sausage, +/obj/item/food/snacks/rawcutlet, +/obj/item/food/snacks/rawcutlet, +/obj/item/food/snacks/rawcutlet, +/obj/item/food/snacks/catfishmeat, +/obj/item/food/snacks/catfishmeat, +/obj/item/food/snacks/catfishmeat, +/obj/item/food/snacks/catfishmeat, +/obj/item/food/snacks/rawcutlet, +/obj/item/food/snacks/rawcutlet, +/obj/item/food/snacks/rawcutlet, +/obj/item/food/snacks/spaghetti, +/obj/item/food/snacks/spaghetti, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -2391,11 +2391,11 @@ /area/ghost_bar) "iv" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/cans/tonic{ +/obj/item/reagent_containers/drinks/cans/tonic{ pixel_x = 7; pixel_y = 4 }, -/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/drinks/cans/cola, /turf/simulated/floor/plasteel, /area/centcom/evac) "iw" = ( @@ -2634,7 +2634,7 @@ /area/syndicate_mothership) "jo" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass/devilskiss, +/obj/item/reagent_containers/drinks/drinkingglass/devilskiss, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "jp" = ( @@ -3844,7 +3844,7 @@ /area/admin) "mV" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/trophy/bronze_cup/toolbox_win, +/obj/item/reagent_containers/drinks/trophy/bronze_cup/toolbox_win, /turf/simulated/floor/plasteel/dark, /area/tdome/tdomeobserve) "mW" = ( @@ -4105,7 +4105,7 @@ /area/shuttle/administration) "nI" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = -2; pixel_y = 5 }, @@ -4218,7 +4218,7 @@ /area/centcom/suppy) "nY" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/mushroompizzaslice{ +/obj/item/food/snacks/mushroompizzaslice{ pixel_x = -5; pixel_y = 5 }, @@ -4233,7 +4233,7 @@ /area/admin) "ob" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = 5; pixel_y = -2 }, @@ -4293,7 +4293,7 @@ /area/ghost_bar) "om" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/trophy/gold_cup, +/obj/item/reagent_containers/drinks/trophy/gold_cup, /turf/simulated/floor/plasteel/dark, /area/tdome/tdomeobserve) "on" = ( @@ -4398,11 +4398,11 @@ /area/shuttle/trade/sol) "oJ" = ( /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/kitchen/knife, @@ -4411,7 +4411,7 @@ name = "west bump"; pixel_x = -28 }, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ pixel_y = 5 }, /obj/machinery/reagentgrinder{ @@ -4791,7 +4791,7 @@ /area/holodeck/source_thunderdomecourt) "ql" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/mug/med, +/obj/item/reagent_containers/drinks/mug/med, /obj/machinery/light{ dir = 8 }, @@ -4856,7 +4856,7 @@ /area/syndicate_mothership) "qw" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/drinks/shaker, /obj/item/reagent_containers/glass/rag, /obj/machinery/newscaster{ dir = 1; @@ -4976,7 +4976,7 @@ "qT" = ( /obj/structure/table/wood, /obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/food/drinks/bottle/rum, +/obj/item/reagent_containers/drinks/bottle/rum, /turf/simulated/floor/wood, /area/syndicate_mothership) "qU" = ( @@ -5113,13 +5113,13 @@ /area/admin) "ro" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/grown/citrus/lemon, -/obj/item/reagent_containers/food/snacks/grown/berries, -/obj/item/reagent_containers/food/snacks/grown/banana, -/obj/item/reagent_containers/food/snacks/grown/cherries, -/obj/item/reagent_containers/food/snacks/grown/citrus/orange, -/obj/item/reagent_containers/food/snacks/grown/corn, -/obj/item/reagent_containers/food/snacks/grown/mushroom/amanita, +/obj/item/food/snacks/grown/citrus/lemon, +/obj/item/food/snacks/grown/berries, +/obj/item/food/snacks/grown/banana, +/obj/item/food/snacks/grown/cherries, +/obj/item/food/snacks/grown/citrus/orange, +/obj/item/food/snacks/grown/corn, +/obj/item/food/snacks/grown/mushroom/amanita, /turf/simulated/floor/plasteel/freezer, /area/admin) "rp" = ( @@ -5347,7 +5347,7 @@ "rT" = ( /obj/structure/table/wood/poker, /obj/item/clothing/mask/cigarette/cigar/havana, -/obj/item/reagent_containers/food/drinks/bottle/cognac, +/obj/item/reagent_containers/drinks/bottle/cognac, /turf/simulated/floor/transparent/glass, /area/tdome/tdomeobserve) "rU" = ( @@ -5514,7 +5514,7 @@ pixel_y = -32 }, /obj/structure/rack/skeletal_bar/left, -/obj/item/reagent_containers/food/drinks/bottle/vodka, +/obj/item/reagent_containers/drinks/bottle/vodka, /turf/simulated/floor/wood, /area/syndicate_mothership) "sD" = ( @@ -5522,7 +5522,7 @@ pixel_y = -32 }, /obj/structure/rack/skeletal_bar/right, -/obj/item/reagent_containers/food/drinks/bottle/gin, +/obj/item/reagent_containers/drinks/bottle/gin, /turf/simulated/floor/wood, /area/syndicate_mothership) "sE" = ( @@ -5536,7 +5536,7 @@ /area/syndicate_mothership) "sF" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/drinks/shaker, /obj/machinery/light{ dir = 4 }, @@ -6695,15 +6695,15 @@ /area/ghost_bar) "wN" = ( /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/kitchen/knife, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ pixel_y = 5 }, /obj/machinery/reagentgrinder{ @@ -7163,22 +7163,22 @@ /area/holodeck/source_boxingcourt) "zj" = ( /obj/structure/closet/secure_closet/freezer/fridge/open, -/obj/item/reagent_containers/food/snacks/grown/potato, -/obj/item/reagent_containers/food/snacks/grown/potato, -/obj/item/reagent_containers/food/snacks/grown/whitebeet, -/obj/item/reagent_containers/food/snacks/grown/whitebeet, -/obj/item/reagent_containers/food/snacks/grown/tomato, -/obj/item/reagent_containers/food/snacks/grown/tomato, -/obj/item/reagent_containers/food/snacks/grown/rice, -/obj/item/reagent_containers/food/snacks/grown/rice, -/obj/item/reagent_containers/food/snacks/grown/icepepper, -/obj/item/reagent_containers/food/snacks/grown/icepepper, -/obj/item/reagent_containers/food/snacks/grown/citrus/lemon, -/obj/item/reagent_containers/food/snacks/grown/citrus/lime, -/obj/item/reagent_containers/food/snacks/grown/citrus/orange, -/obj/item/reagent_containers/food/snacks/grown/cherries, -/obj/item/reagent_containers/food/snacks/grown/apple, -/obj/item/reagent_containers/food/snacks/grown/ambrosia/deus, +/obj/item/food/snacks/grown/potato, +/obj/item/food/snacks/grown/potato, +/obj/item/food/snacks/grown/whitebeet, +/obj/item/food/snacks/grown/whitebeet, +/obj/item/food/snacks/grown/tomato, +/obj/item/food/snacks/grown/tomato, +/obj/item/food/snacks/grown/rice, +/obj/item/food/snacks/grown/rice, +/obj/item/food/snacks/grown/icepepper, +/obj/item/food/snacks/grown/icepepper, +/obj/item/food/snacks/grown/citrus/lemon, +/obj/item/food/snacks/grown/citrus/lime, +/obj/item/food/snacks/grown/citrus/orange, +/obj/item/food/snacks/grown/cherries, +/obj/item/food/snacks/grown/apple, +/obj/item/food/snacks/grown/ambrosia/deus, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -7458,7 +7458,7 @@ /area/admin) "As" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass/devilskiss, +/obj/item/reagent_containers/drinks/drinkingglass/devilskiss, /turf/simulated/floor/wood, /area/admin) "At" = ( @@ -7536,9 +7536,9 @@ "AL" = ( /obj/structure/table, /obj/item/storage/fancy/cigarettes/syndicate, -/obj/item/reagent_containers/food/drinks/cans/adminbooze, -/obj/item/reagent_containers/food/drinks/cans/badminbrew, -/obj/item/reagent_containers/food/drinks/cans/madminmalt, +/obj/item/reagent_containers/drinks/cans/adminbooze, +/obj/item/reagent_containers/drinks/cans/badminbrew, +/obj/item/reagent_containers/drinks/cans/madminmalt, /turf/simulated/floor/plasteel, /area/admin) "AM" = ( @@ -7677,7 +7677,7 @@ "Bo" = ( /obj/structure/table/wood, /obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/drinks/bottle/whiskey{ pixel_y = 5 }, /turf/simulated/floor/plasteel{ @@ -7901,7 +7901,7 @@ /area/centcom/suppy) "Cj" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/cans/madminmalt{ +/obj/item/reagent_containers/drinks/cans/madminmalt{ pixel_y = 2 }, /turf/simulated/floor/plasteel, @@ -9895,22 +9895,22 @@ /area/shuttle/escape) "Jl" = ( /obj/structure/closet/secure_closet/freezer/fridge/open, -/obj/item/reagent_containers/food/snacks/grown/potato, -/obj/item/reagent_containers/food/snacks/grown/potato, -/obj/item/reagent_containers/food/snacks/grown/whitebeet, -/obj/item/reagent_containers/food/snacks/grown/whitebeet, -/obj/item/reagent_containers/food/snacks/grown/tomato, -/obj/item/reagent_containers/food/snacks/grown/tomato, -/obj/item/reagent_containers/food/snacks/grown/rice, -/obj/item/reagent_containers/food/snacks/grown/rice, -/obj/item/reagent_containers/food/snacks/grown/icepepper, -/obj/item/reagent_containers/food/snacks/grown/icepepper, -/obj/item/reagent_containers/food/snacks/grown/citrus/lemon, -/obj/item/reagent_containers/food/snacks/grown/citrus/lime, -/obj/item/reagent_containers/food/snacks/grown/citrus/orange, -/obj/item/reagent_containers/food/snacks/grown/cherries, -/obj/item/reagent_containers/food/snacks/grown/apple, -/obj/item/reagent_containers/food/snacks/grown/ambrosia/deus, +/obj/item/food/snacks/grown/potato, +/obj/item/food/snacks/grown/potato, +/obj/item/food/snacks/grown/whitebeet, +/obj/item/food/snacks/grown/whitebeet, +/obj/item/food/snacks/grown/tomato, +/obj/item/food/snacks/grown/tomato, +/obj/item/food/snacks/grown/rice, +/obj/item/food/snacks/grown/rice, +/obj/item/food/snacks/grown/icepepper, +/obj/item/food/snacks/grown/icepepper, +/obj/item/food/snacks/grown/citrus/lemon, +/obj/item/food/snacks/grown/citrus/lime, +/obj/item/food/snacks/grown/citrus/orange, +/obj/item/food/snacks/grown/cherries, +/obj/item/food/snacks/grown/apple, +/obj/item/food/snacks/grown/ambrosia/deus, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -9981,24 +9981,24 @@ /area/centcom/specops) "JB" = ( /obj/structure/closet/secure_closet/freezer/meat/open, -/obj/item/reagent_containers/food/snacks/raw_bacon, -/obj/item/reagent_containers/food/snacks/raw_bacon, -/obj/item/reagent_containers/food/snacks/raw_bacon, -/obj/item/reagent_containers/food/snacks/raw_bacon, -/obj/item/reagent_containers/food/snacks/sausage, -/obj/item/reagent_containers/food/snacks/sausage, -/obj/item/reagent_containers/food/snacks/rawcutlet, -/obj/item/reagent_containers/food/snacks/rawcutlet, -/obj/item/reagent_containers/food/snacks/rawcutlet, -/obj/item/reagent_containers/food/snacks/catfishmeat, -/obj/item/reagent_containers/food/snacks/catfishmeat, -/obj/item/reagent_containers/food/snacks/catfishmeat, -/obj/item/reagent_containers/food/snacks/catfishmeat, -/obj/item/reagent_containers/food/snacks/rawcutlet, -/obj/item/reagent_containers/food/snacks/rawcutlet, -/obj/item/reagent_containers/food/snacks/rawcutlet, -/obj/item/reagent_containers/food/snacks/spaghetti, -/obj/item/reagent_containers/food/snacks/spaghetti, +/obj/item/food/snacks/raw_bacon, +/obj/item/food/snacks/raw_bacon, +/obj/item/food/snacks/raw_bacon, +/obj/item/food/snacks/raw_bacon, +/obj/item/food/snacks/sausage, +/obj/item/food/snacks/sausage, +/obj/item/food/snacks/rawcutlet, +/obj/item/food/snacks/rawcutlet, +/obj/item/food/snacks/rawcutlet, +/obj/item/food/snacks/catfishmeat, +/obj/item/food/snacks/catfishmeat, +/obj/item/food/snacks/catfishmeat, +/obj/item/food/snacks/catfishmeat, +/obj/item/food/snacks/rawcutlet, +/obj/item/food/snacks/rawcutlet, +/obj/item/food/snacks/rawcutlet, +/obj/item/food/snacks/spaghetti, +/obj/item/food/snacks/spaghetti, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -10269,25 +10269,25 @@ /area/centcom/evac) "Kw" = ( /obj/structure/closet/secure_closet/freezer/kitchen, -/obj/item/reagent_containers/food/snacks/grown/banana, -/obj/item/reagent_containers/food/snacks/grown/banana, -/obj/item/reagent_containers/food/snacks/grown/wheat, -/obj/item/reagent_containers/food/snacks/grown/wheat, -/obj/item/reagent_containers/food/snacks/grown/vanillapod, -/obj/item/reagent_containers/food/snacks/grown/vanillapod, -/obj/item/reagent_containers/food/snacks/grown/sugarcane, -/obj/item/reagent_containers/food/snacks/grown/sugarcane, -/obj/item/reagent_containers/food/snacks/grown/oat, -/obj/item/reagent_containers/food/snacks/grown/oat, -/obj/item/reagent_containers/food/snacks/grown/grapes, -/obj/item/reagent_containers/food/snacks/grown/grapes, -/obj/item/reagent_containers/food/snacks/grown/corn, -/obj/item/reagent_containers/food/snacks/grown/corn, -/obj/item/reagent_containers/food/snacks/grown/chili, -/obj/item/reagent_containers/food/snacks/grown/chili, -/obj/item/reagent_containers/food/snacks/grown/carrot, -/obj/item/reagent_containers/food/snacks/grown/apple, -/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris, +/obj/item/food/snacks/grown/banana, +/obj/item/food/snacks/grown/banana, +/obj/item/food/snacks/grown/wheat, +/obj/item/food/snacks/grown/wheat, +/obj/item/food/snacks/grown/vanillapod, +/obj/item/food/snacks/grown/vanillapod, +/obj/item/food/snacks/grown/sugarcane, +/obj/item/food/snacks/grown/sugarcane, +/obj/item/food/snacks/grown/oat, +/obj/item/food/snacks/grown/oat, +/obj/item/food/snacks/grown/grapes, +/obj/item/food/snacks/grown/grapes, +/obj/item/food/snacks/grown/corn, +/obj/item/food/snacks/grown/corn, +/obj/item/food/snacks/grown/chili, +/obj/item/food/snacks/grown/chili, +/obj/item/food/snacks/grown/carrot, +/obj/item/food/snacks/grown/apple, +/obj/item/food/snacks/grown/ambrosia/vulgaris, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -10940,8 +10940,8 @@ /area/centcom/evac) "MF" = ( /obj/structure/table/wood/fancy/royalblack, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/reagent_containers/food/drinks/bottle/cognac{ +/obj/item/reagent_containers/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/drinks/bottle/cognac{ pixel_x = 10 }, /turf/simulated/floor/carpet/black, @@ -10954,7 +10954,7 @@ /area/centcom/specops) "MH" = ( /obj/structure/table/wood/fancy/royalblack, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass, /turf/simulated/floor/carpet/black, /area/centcom/evac) "MI" = ( @@ -11101,8 +11101,8 @@ /area/centcom/suppy) "MY" = ( /obj/structure/table/wood/fancy/royalblack, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{ +/obj/item/reagent_containers/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/drinks/bottle/vodka/badminka{ pixel_x = -12 }, /turf/simulated/floor/carpet/black, @@ -11350,11 +11350,11 @@ /area/centcom/gamma) "NT" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/cans/sodawater{ +/obj/item/reagent_containers/drinks/cans/sodawater{ pixel_x = 6; pixel_y = -3 }, -/obj/item/reagent_containers/food/drinks/cans/starkist, +/obj/item/reagent_containers/drinks/cans/starkist, /turf/simulated/floor/plasteel, /area/centcom/evac) "NU" = ( @@ -11414,25 +11414,25 @@ /obj/structure/closet/secure_closet/freezer/kitchen{ req_access = null }, -/obj/item/reagent_containers/food/snacks/grown/banana, -/obj/item/reagent_containers/food/snacks/grown/banana, -/obj/item/reagent_containers/food/snacks/grown/wheat, -/obj/item/reagent_containers/food/snacks/grown/wheat, -/obj/item/reagent_containers/food/snacks/grown/vanillapod, -/obj/item/reagent_containers/food/snacks/grown/vanillapod, -/obj/item/reagent_containers/food/snacks/grown/sugarcane, -/obj/item/reagent_containers/food/snacks/grown/sugarcane, -/obj/item/reagent_containers/food/snacks/grown/oat, -/obj/item/reagent_containers/food/snacks/grown/oat, -/obj/item/reagent_containers/food/snacks/grown/grapes, -/obj/item/reagent_containers/food/snacks/grown/grapes, -/obj/item/reagent_containers/food/snacks/grown/corn, -/obj/item/reagent_containers/food/snacks/grown/corn, -/obj/item/reagent_containers/food/snacks/grown/chili, -/obj/item/reagent_containers/food/snacks/grown/chili, -/obj/item/reagent_containers/food/snacks/grown/carrot, -/obj/item/reagent_containers/food/snacks/grown/apple, -/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris, +/obj/item/food/snacks/grown/banana, +/obj/item/food/snacks/grown/banana, +/obj/item/food/snacks/grown/wheat, +/obj/item/food/snacks/grown/wheat, +/obj/item/food/snacks/grown/vanillapod, +/obj/item/food/snacks/grown/vanillapod, +/obj/item/food/snacks/grown/sugarcane, +/obj/item/food/snacks/grown/sugarcane, +/obj/item/food/snacks/grown/oat, +/obj/item/food/snacks/grown/oat, +/obj/item/food/snacks/grown/grapes, +/obj/item/food/snacks/grown/grapes, +/obj/item/food/snacks/grown/corn, +/obj/item/food/snacks/grown/corn, +/obj/item/food/snacks/grown/chili, +/obj/item/food/snacks/grown/chili, +/obj/item/food/snacks/grown/carrot, +/obj/item/food/snacks/grown/apple, +/obj/item/food/snacks/grown/ambrosia/vulgaris, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -11500,13 +11500,13 @@ /area/wizard_station) "Ov" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/cans/madminmalt, +/obj/item/reagent_containers/drinks/cans/madminmalt, /turf/simulated/floor/wood, /area/centcom/evac) "Ow" = ( /obj/structure/table, /obj/item/lighter/zippo, -/obj/item/reagent_containers/food/drinks/cans/dr_gibb, +/obj/item/reagent_containers/drinks/cans/dr_gibb, /turf/simulated/floor/wood, /area/centcom/evac) "Ox" = ( @@ -11518,12 +11518,12 @@ /area/tdome/arena) "Oy" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/drinks/cans/cola, /turf/simulated/floor/wood, /area/centcom/evac) "Oz" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/drinks/shaker, /turf/simulated/floor/wood, /area/centcom/evac) "OA" = ( @@ -11557,7 +11557,7 @@ /area/centcom/control) "OE" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/cans/space_mountain_wind, +/obj/item/reagent_containers/drinks/cans/space_mountain_wind, /turf/simulated/floor/wood, /area/centcom/evac) "OF" = ( @@ -11846,7 +11846,7 @@ "Pw" = ( /obj/structure/table/wood, /obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/drinks/bottle/whiskey{ pixel_y = 5 }, /turf/simulated/floor/plasteel/dark, @@ -13326,7 +13326,7 @@ /area/ghost_bar) "Vs" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/cans/badminbrew, +/obj/item/reagent_containers/drinks/cans/badminbrew, /turf/simulated/floor/wood, /area/centcom/evac) "Vt" = ( @@ -13344,7 +13344,7 @@ /area/tdome/tdomeadmin) "Vv" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/cans/madminmalt, +/obj/item/reagent_containers/drinks/cans/madminmalt, /turf/simulated/floor/plasteel, /area/centcom/evac) "Vx" = ( @@ -13353,7 +13353,7 @@ "Vy" = ( /obj/structure/table/wood, /obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/drinks/bottle/whiskey{ pixel_y = 5 }, /turf/simulated/floor/plasteel{ @@ -13391,7 +13391,7 @@ /area/centcom/evac) "VH" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/cans/tonic, +/obj/item/reagent_containers/drinks/cans/tonic, /turf/simulated/floor/wood, /area/centcom/evac) "VI" = ( @@ -13566,14 +13566,14 @@ /area/shuttle/escape) "Wr" = ( /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/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/drinks/britcup, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, diff --git a/_maps/map_files/shuttles/emergency_bar.dmm b/_maps/map_files/shuttles/emergency_bar.dmm index 3a9aeaf95116..96ee62dfcff4 100644 --- a/_maps/map_files/shuttles/emergency_bar.dmm +++ b/_maps/map_files/shuttles/emergency_bar.dmm @@ -45,7 +45,7 @@ /area/shuttle/escape) "an" = ( /obj/structure/table/wood/poker, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/drinks/bottle/whiskey, /turf/simulated/floor/carpet/red, /area/shuttle/escape) "ao" = ( @@ -245,7 +245,7 @@ "aU" = ( /obj/structure/table, /obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/drinks/shaker, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -296,7 +296,7 @@ "bd" = ( /obj/structure/table, /obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/drinks/shaker, /obj/item/clothing/mask/cigarette/cigar, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" diff --git a/_maps/map_files/shuttles/emergency_clown.dmm b/_maps/map_files/shuttles/emergency_clown.dmm index 4f474c5dda29..1aa2399414c1 100644 --- a/_maps/map_files/shuttles/emergency_clown.dmm +++ b/_maps/map_files/shuttles/emergency_clown.dmm @@ -148,7 +148,7 @@ icon_state = "greentext"; name = "greentext" }, -/obj/item/reagent_containers/food/condiment/saltshaker, +/obj/item/reagent_containers/condiment/saltshaker, /turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aI" = ( diff --git a/_maps/map_files/shuttles/emergency_cyb.dmm b/_maps/map_files/shuttles/emergency_cyb.dmm index ffd77b68bc53..1532d0ee28d5 100644 --- a/_maps/map_files/shuttles/emergency_cyb.dmm +++ b/_maps/map_files/shuttles/emergency_cyb.dmm @@ -891,7 +891,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/reagent_containers/food/drinks/mug/med, +/obj/item/reagent_containers/drinks/mug/med, /turf/simulated/floor/plasteel{ icon_state = "cmo" }, diff --git a/_maps/map_files/shuttles/emergency_dept.dmm b/_maps/map_files/shuttles/emergency_dept.dmm index 1a170bf230c5..d6f6a2b87054 100644 --- a/_maps/map_files/shuttles/emergency_dept.dmm +++ b/_maps/map_files/shuttles/emergency_dept.dmm @@ -341,7 +341,7 @@ /area/shuttle/escape) "bd" = ( /obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/drinks/shaker, /obj/structure/table/wood, /obj/machinery/light{ dir = 4 diff --git a/_maps/map_files/shuttles/emergency_jungle.dmm b/_maps/map_files/shuttles/emergency_jungle.dmm index 8f2900e751ad..13184bd06f12 100644 --- a/_maps/map_files/shuttles/emergency_jungle.dmm +++ b/_maps/map_files/shuttles/emergency_jungle.dmm @@ -607,7 +607,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/item/reagent_containers/food/drinks/mug/med, +/obj/item/reagent_containers/drinks/mug/med, /mob/living/carbon/human/monkey, /turf/simulated/floor/grass, /area/shuttle/escape) diff --git a/_maps/map_files/shuttles/ferry_meat.dmm b/_maps/map_files/shuttles/ferry_meat.dmm index 0d0a4f7fab4c..8a21a1c75e2d 100644 --- a/_maps/map_files/shuttles/ferry_meat.dmm +++ b/_maps/map_files/shuttles/ferry_meat.dmm @@ -36,13 +36,13 @@ /obj/structure/closet/secure_closet/freezer/meat, /obj/item/grenade/chem_grenade/meat, /obj/item/grenade/clusterbuster/meat, -/obj/item/reagent_containers/food/snacks/meat/corgi, -/obj/item/reagent_containers/food/snacks/meat/ham, -/obj/item/reagent_containers/food/snacks/meat/human, -/obj/item/reagent_containers/food/snacks/meat/monkey, -/obj/item/reagent_containers/food/snacks/meat/pug, -/obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, -/obj/item/reagent_containers/food/snacks/meat/syntiflesh, +/obj/item/food/snacks/meat/corgi, +/obj/item/food/snacks/meat/ham, +/obj/item/food/snacks/meat/human, +/obj/item/food/snacks/meat/monkey, +/obj/item/food/snacks/meat/pug, +/obj/item/food/snacks/meat/slab/meatproduct, +/obj/item/food/snacks/meat/syntiflesh, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, diff --git a/_maps/map_files/templates/biodome_beach.dmm b/_maps/map_files/templates/biodome_beach.dmm index 2f3f5db29c94..994144d3207e 100644 --- a/_maps/map_files/templates/biodome_beach.dmm +++ b/_maps/map_files/templates/biodome_beach.dmm @@ -110,8 +110,8 @@ /area/ruin/powered/beach) "au" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/flour, /turf/simulated/floor/wood, /area/ruin/powered/beach) "av" = ( @@ -120,7 +120,7 @@ dir = 8; name = "Beach Bar Desk" }, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/drinks/shaker, /obj/item/reagent_containers/glass/rag, /obj/effect/mapping_helpers/airlock/windoor/access/any/service/bar{ dir = 8 @@ -363,7 +363,7 @@ /turf/simulated/floor/beach/sand, /area/ruin/powered/beach) "bP" = ( -/obj/item/reagent_containers/food/drinks/cans/beer, +/obj/item/reagent_containers/drinks/cans/beer, /turf/simulated/floor/beach/sand, /area/ruin/powered/beach) "bQ" = ( diff --git a/_maps/map_files/templates/shelter_2.dmm b/_maps/map_files/templates/shelter_2.dmm index a5d11498f77d..0ea165cfb5e2 100644 --- a/_maps/map_files/templates/shelter_2.dmm +++ b/_maps/map_files/templates/shelter_2.dmm @@ -165,16 +165,16 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = 6; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/bottle/wine, +/obj/item/reagent_containers/drinks/bottle/wine, /turf/simulated/floor/carpet/black, /area/survivalpod) "B" = ( /obj/structure/table/wood/fancy/black, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = -4; pixel_y = 1 }, diff --git a/_maps/map_files220/MetaStation/MetaStation.dmm b/_maps/map_files220/MetaStation/MetaStation.dmm index c74bb6a8c29d..4582c1cb5528 100644 --- a/_maps/map_files220/MetaStation/MetaStation.dmm +++ b/_maps/map_files220/MetaStation/MetaStation.dmm @@ -56,11 +56,11 @@ /area/space/nearstation) "abv" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8; pixel_y = 1 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -8; pixel_y = 11 }, @@ -229,7 +229,7 @@ /area/station/security/detective) "adc" = ( /obj/structure/closet/secure_closet/clown, -/obj/item/reagent_containers/food/snacks/pie, +/obj/item/food/snacks/pie, /obj/machinery/newscaster/directional/south, /turf/simulated/floor/wood, /area/station/service/clown) @@ -551,7 +551,7 @@ /area/shuttle/pod_3) "afT" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ pixel_x = 5; pixel_y = 12 }, @@ -664,7 +664,7 @@ /obj/item/restraints/handcuffs, /obj/item/flash, /obj/machinery/alarm/directional/south, -/obj/item/reagent_containers/food/drinks/flask/detflask, +/obj/item/reagent_containers/drinks/flask/detflask, /obj/item/storage/lockbox/spy_kit, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -750,20 +750,20 @@ /area/station/public/fitness) "aii" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/sillycup{ +/obj/item/reagent_containers/drinks/sillycup{ pixel_x = -5; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/sillycup, -/obj/item/reagent_containers/food/drinks/sillycup{ +/obj/item/reagent_containers/drinks/sillycup, +/obj/item/reagent_containers/drinks/sillycup{ pixel_x = 5; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/sillycup{ +/obj/item/reagent_containers/drinks/sillycup{ pixel_x = 5; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/sillycup{ +/obj/item/reagent_containers/drinks/sillycup{ pixel_x = 5; pixel_y = 3 }, @@ -4106,7 +4106,7 @@ /area/station/maintenance/fore) "axH" = ( /obj/structure/flora/ausbushes/lavendergrass, -/obj/item/reagent_containers/food/snacks/grown/banana, +/obj/item/food/snacks/grown/banana, /turf/simulated/floor/grass/no_creep, /area/station/medical/virology) "axM" = ( @@ -9526,7 +9526,7 @@ /obj/item/reagent_containers/glass/beaker/waterbottle{ pixel_x = -5 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = 5 }, /obj/structure/window/reinforced{ @@ -10176,7 +10176,7 @@ /area/station/maintenance/fpmaint) "aUa" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = 5 }, /obj/item/reagent_containers/glass/beaker/waterbottle{ @@ -13180,24 +13180,24 @@ /area/station/hallway/primary/central) "bcO" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = -4; pixel_y = 6 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = 4; pixel_y = 5 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = -5; pixel_y = 2 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = 6; pixel_y = -1 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass, /obj/machinery/newscaster/directional/north, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) @@ -17069,7 +17069,7 @@ "bmV" = ( /obj/machinery/light_switch/south, /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/flask/gold, +/obj/item/reagent_containers/drinks/flask/gold, /obj/item/razor{ pixel_x = -4; pixel_y = 2 @@ -17229,7 +17229,7 @@ }, /obj/item/clothing/head/bearpelt, /obj/item/folder/documents, -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, +/obj/item/reagent_containers/drinks/bottle/vodka/badminka, /obj/item/lighter/zippo/nt_rep, /obj/item/storage/fancy/cigarettes/cigpack_robustgold, /obj/item/stack/spacecash/c1000, @@ -19272,7 +19272,7 @@ /area/station/hallway/primary/port) "btq" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/chips, +/obj/item/food/snacks/chips, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -21222,7 +21222,7 @@ known_by = list("captain") }, /obj/item/gun/projectile/revolver/russian, -/obj/item/reagent_containers/food/drinks/bottle/absinthe/premium, +/obj/item/reagent_containers/drinks/bottle/absinthe/premium, /obj/item/lighter/zippo/nt_rep, /obj/item/storage/fancy/cigarettes/cigpack_robustgold, /obj/item/toy/figure/crew/captain, @@ -21997,7 +21997,7 @@ /area/station/turret_protected/aisat/interior) "bAB" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/pie, +/obj/item/food/snacks/pie, /obj/machinery/light/small/directional/north, /obj/structure/sign/poster/random{ pixel_y = 32 @@ -23217,7 +23217,7 @@ /area/station/command/office/captain) "bEl" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/drinks/shaker, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -26240,7 +26240,7 @@ /area/station/science/research) "bPB" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/cans/ale, +/obj/item/reagent_containers/drinks/cans/ale, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "bPE" = ( @@ -26272,9 +26272,9 @@ /area/station/public/vacant_office) "bPS" = ( /obj/structure/closet/secure_closet/blueshield, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, -/obj/item/reagent_containers/food/drinks/drinkingglass, -/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/drinks/bottle/whiskey, +/obj/item/reagent_containers/drinks/drinkingglass, +/obj/item/reagent_containers/drinks/drinkingglass, /turf/simulated/floor/wood, /area/station/command/office/blueshield) "bPT" = ( @@ -26543,12 +26543,12 @@ /area/station/service/kitchen) "bQP" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/mint, +/obj/item/food/snacks/mint, /obj/item/kitchen/rollingpin, /obj/item/reagent_containers/glass/beaker{ pixel_x = 5 }, -/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/condiment/enzyme, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -27426,7 +27426,7 @@ pixel_x = 5; pixel_y = -1 }, -/obj/item/reagent_containers/food/drinks/mug{ +/obj/item/reagent_containers/drinks/mug{ pixel_x = -4; pixel_y = 4 }, @@ -30573,7 +30573,7 @@ /area/station/service/hydroponics) "cdJ" = ( /obj/structure/lattice, -/obj/item/reagent_containers/food/drinks/bottle/goldschlager, +/obj/item/reagent_containers/drinks/bottle/goldschlager, /turf/space, /area/space/nearstation) "cdM" = ( @@ -30897,7 +30897,7 @@ "ceW" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/gin, +/obj/item/reagent_containers/drinks/bottle/gin, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "ceY" = ( @@ -31172,10 +31172,10 @@ }, /obj/structure/table/glass, /obj/structure/extinguisher_cabinet/directional/west, -/obj/item/reagent_containers/food/snacks/grown/wheat, -/obj/item/reagent_containers/food/snacks/grown/watermelon, -/obj/item/reagent_containers/food/snacks/grown/citrus/orange, -/obj/item/reagent_containers/food/snacks/grown/grapes, +/obj/item/food/snacks/grown/wheat, +/obj/item/food/snacks/grown/watermelon, +/obj/item/food/snacks/grown/citrus/orange, +/obj/item/food/snacks/grown/grapes, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "green" @@ -31707,9 +31707,9 @@ /obj/item/seeds/potato, /obj/item/seeds/apple, /obj/item/grown/corncob, -/obj/item/reagent_containers/food/snacks/grown/carrot, -/obj/item/reagent_containers/food/snacks/grown/wheat, -/obj/item/reagent_containers/food/snacks/grown/pumpkin{ +/obj/item/food/snacks/grown/carrot, +/obj/item/food/snacks/grown/wheat, +/obj/item/food/snacks/grown/pumpkin{ pixel_y = 5 }, /obj/machinery/light/directional/south, @@ -32761,7 +32761,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/rack, /obj/item/reagent_containers/iv_bag/blood/random, -/obj/item/reagent_containers/food/drinks/bottle/vodka, +/obj/item/reagent_containers/drinks/bottle/vodka, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -33999,7 +33999,7 @@ }, /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/ywflowers, -/obj/item/reagent_containers/food/snacks/grown/banana, +/obj/item/food/snacks/grown/banana, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -37360,11 +37360,11 @@ }, /obj/machinery/light/small/directional/north, /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/grown/poppy, -/obj/item/reagent_containers/food/snacks/grown/poppy, -/obj/item/reagent_containers/food/snacks/grown/poppy, -/obj/item/reagent_containers/food/snacks/grown/poppy, -/obj/item/reagent_containers/food/snacks/grown/poppy, +/obj/item/food/snacks/grown/poppy, +/obj/item/food/snacks/grown/poppy, +/obj/item/food/snacks/grown/poppy, +/obj/item/food/snacks/grown/poppy, +/obj/item/food/snacks/grown/poppy, /turf/simulated/floor/carpet, /area/station/service/chapel) "cCu" = ( @@ -37898,7 +37898,7 @@ pixel_y = 2 }, /obj/item/reagent_containers/dropper, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/drinks/shaker, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "cEk" = ( @@ -38633,7 +38633,7 @@ dir = 4 }, /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/grown/harebell, +/obj/item/food/snacks/grown/harebell, /turf/simulated/floor/plasteel{ icon_state = "darkneutralfull" }, @@ -38969,10 +38969,10 @@ /area/station/science/research) "cHO" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3 }, /turf/simulated/floor/plating, @@ -39432,7 +39432,7 @@ "cJo" = ( /obj/machinery/hydroponics/soil, /obj/machinery/light/small/directional/north, -/obj/item/reagent_containers/food/snacks/grown/harebell, +/obj/item/food/snacks/grown/harebell, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -40167,7 +40167,7 @@ /area/station/maintenance/portsolar) "cMF" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/holywater{ +/obj/item/reagent_containers/drinks/bottle/holywater{ pixel_x = -2; pixel_y = 2 }, @@ -40179,8 +40179,8 @@ /area/station/service/chapel/office) "cMK" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/enzyme{ pixel_x = 16; pixel_y = 6 }, @@ -40198,7 +40198,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/item/reagent_containers/food/drinks/bottle/tequila, +/obj/item/reagent_containers/drinks/bottle/tequila, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "cMP" = ( @@ -41704,11 +41704,11 @@ /area/station/maintenance/apmaint) "cSR" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/grown/poppy, -/obj/item/reagent_containers/food/snacks/grown/poppy, -/obj/item/reagent_containers/food/snacks/grown/poppy, -/obj/item/reagent_containers/food/snacks/grown/poppy, -/obj/item/reagent_containers/food/snacks/grown/poppy, +/obj/item/food/snacks/grown/poppy, +/obj/item/food/snacks/grown/poppy, +/obj/item/food/snacks/grown/poppy, +/obj/item/food/snacks/grown/poppy, +/obj/item/food/snacks/grown/poppy, /turf/simulated/floor/plasteel{ icon_state = "darkneutralfull" }, @@ -41874,7 +41874,7 @@ /area/station/security/interrogation) "cTz" = ( /obj/structure/lattice/catwalk, -/obj/item/reagent_containers/food/drinks/bottle/rum{ +/obj/item/reagent_containers/drinks/bottle/rum{ pixel_x = -7; pixel_y = 2 }, @@ -49620,7 +49620,7 @@ /area/station/engineering/control) "fCn" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = -5 }, /obj/item/reagent_containers/glass/beaker/waterbottle{ @@ -53628,20 +53628,20 @@ /area/station/maintenance/starboard) "htP" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/milk{ +/obj/item/reagent_containers/condiment/milk{ pixel_x = 6; pixel_y = 8 }, -/obj/item/reagent_containers/food/condiment/soymilk{ +/obj/item/reagent_containers/condiment/soymilk{ pixel_x = -6; pixel_y = 8 }, -/obj/item/reagent_containers/food/condiment/sugar, -/obj/item/reagent_containers/food/drinks/bottle/cream{ +/obj/item/reagent_containers/condiment/sugar, +/obj/item/reagent_containers/drinks/bottle/cream{ pixel_x = 6; pixel_y = -2 }, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ pixel_x = -5; pixel_y = -2 }, @@ -54538,11 +54538,11 @@ /area/station/turret_protected/ai) "hLT" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/grown/harebell, -/obj/item/reagent_containers/food/snacks/grown/harebell, -/obj/item/reagent_containers/food/snacks/grown/harebell, -/obj/item/reagent_containers/food/snacks/grown/harebell, -/obj/item/reagent_containers/food/snacks/grown/harebell, +/obj/item/food/snacks/grown/harebell, +/obj/item/food/snacks/grown/harebell, +/obj/item/food/snacks/grown/harebell, +/obj/item/food/snacks/grown/harebell, +/obj/item/food/snacks/grown/harebell, /turf/simulated/floor/plasteel{ icon_state = "darkneutralfull" }, @@ -57672,7 +57672,7 @@ pixel_y = -1 }, /obj/structure/table, -/obj/item/reagent_containers/food/drinks/shaker{ +/obj/item/reagent_containers/drinks/shaker{ pixel_x = -6 }, /obj/machinery/requests_console{ @@ -57988,7 +57988,7 @@ }, /area/station/engineering/control) "jxj" = ( -/obj/item/reagent_containers/food/snacks/monkeycube, +/obj/item/food/snacks/monkeycube, /turf/simulated/floor/grass, /area/station/maintenance/aft2) "jyP" = ( @@ -61078,7 +61078,7 @@ /area/station/maintenance/aft2) "kQv" = ( /obj/structure/grille/broken, -/obj/item/reagent_containers/food/snacks/grown/poppy, +/obj/item/food/snacks/grown/poppy, /turf/simulated/floor/plating/airless, /area/space/nearstation) "kQx" = ( @@ -62328,15 +62328,15 @@ "lpp" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced, -/obj/item/reagent_containers/food/snacks/muffin{ +/obj/item/food/snacks/muffin{ pixel_x = -4; pixel_y = 8 }, -/obj/item/reagent_containers/food/snacks/carrotcakeslice{ +/obj/item/food/snacks/carrotcakeslice{ pixel_x = 8; pixel_y = -2 }, -/obj/item/reagent_containers/food/snacks/poppypretzel{ +/obj/item/food/snacks/poppypretzel{ pixel_x = -8; pixel_y = -3 }, @@ -65987,11 +65987,11 @@ /area/shuttle/arrival/station) "mXE" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ pixel_x = 5; pixel_y = 12 }, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ pixel_x = -3; pixel_y = 9 }, @@ -66401,7 +66401,7 @@ /area/station/public/construction) "nfj" = ( /obj/structure/closet, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ desc = "Takes you to a whole new level of thinking."; name = "Meta-Cider" }, @@ -68961,10 +68961,10 @@ /area/station/public/locker) "orV" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3 }, /obj/machinery/door/window/classic/reversed{ @@ -73333,21 +73333,21 @@ "qvp" = ( /obj/structure/closet/crate, /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/food/snacks/breadslice, -/obj/item/reagent_containers/food/snacks/breadslice, -/obj/item/reagent_containers/food/snacks/breadslice, -/obj/item/reagent_containers/food/snacks/grown/potato, -/obj/item/reagent_containers/food/snacks/grown/potato, -/obj/item/reagent_containers/food/snacks/grown/onion, -/obj/item/reagent_containers/food/snacks/grown/onion, +/obj/item/food/snacks/breadslice, +/obj/item/food/snacks/breadslice, +/obj/item/food/snacks/breadslice, +/obj/item/food/snacks/grown/potato, +/obj/item/food/snacks/grown/potato, +/obj/item/food/snacks/grown/onion, +/obj/item/food/snacks/grown/onion, /obj/item/storage/box/donkpockets, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 1 }, /obj/item/storage/fancy/egg_box, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/rice, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/rice, /obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -74670,7 +74670,7 @@ /obj/structure/rack, /obj/item/clothing/mask/gas, /obj/item/storage/box/lights/mixed, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/drinks/shaker, /obj/item/cultivator, /obj/item/clothing/head/chefhat, /obj/effect/spawner/lootdrop/maintenance, @@ -75363,7 +75363,7 @@ /area/station/engineering/engine/supermatter) "rwj" = ( /obj/structure/safe/floor, -/obj/item/reagent_containers/food/snacks/fortunecookie, +/obj/item/food/snacks/fortunecookie, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "rwk" = ( @@ -76743,7 +76743,7 @@ /area/station/public/mrchangs) "sdj" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/drinks/britcup, /obj/effect/turf_decal/tile/purple{ dir = 1 }, @@ -78601,7 +78601,7 @@ "sXU" = ( /obj/machinery/light/directional/north, /mob/living/carbon/human/monkey, -/obj/item/reagent_containers/food/snacks/grown/banana, +/obj/item/food/snacks/grown/banana, /turf/simulated/floor/grass/no_creep, /area/station/science/genetics) "sXZ" = ( @@ -80524,12 +80524,12 @@ /area/station/security/permabrig) "tYV" = ( /obj/structure/rack, -/obj/item/reagent_containers/food/drinks/bottle/rum{ +/obj/item/reagent_containers/drinks/bottle/rum{ pixel_x = -7; pixel_y = 2 }, -/obj/item/reagent_containers/food/drinks/bottle/vodka, -/obj/item/reagent_containers/food/drinks/cans/beer, +/obj/item/reagent_containers/drinks/bottle/vodka, +/obj/item/reagent_containers/drinks/cans/beer, /obj/machinery/economy/vending/wallmed/directional/north, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) @@ -83333,15 +83333,15 @@ /area/station/security/detective) "voT" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = 4; pixel_y = 5 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = 6; pixel_y = -1 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = -4; pixel_y = 6 }, @@ -83354,7 +83354,7 @@ /area/station/maintenance/starboard2) "voV" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/snacks/pie, +/obj/item/food/snacks/pie, /obj/machinery/door/window/classic/normal{ name = "Kitchen" }, @@ -83672,10 +83672,10 @@ /area/station/engineering/atmos) "vwA" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/food/snacks/chips{ +/obj/item/food/snacks/chips{ pixel_x = 8 }, -/obj/item/reagent_containers/food/drinks/cans/thirteenloko{ +/obj/item/reagent_containers/drinks/cans/thirteenloko{ pixel_x = -6; pixel_y = 6 }, @@ -84338,15 +84338,15 @@ "vSE" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced, -/obj/item/reagent_containers/food/drinks/tea{ +/obj/item/reagent_containers/drinks/tea{ pixel_x = 7; pixel_y = 1 }, -/obj/item/reagent_containers/food/drinks/tea{ +/obj/item/reagent_containers/drinks/tea{ pixel_x = -5; pixel_y = 9 }, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ pixel_x = -5 }, /turf/simulated/floor/plasteel/dark, @@ -85105,7 +85105,7 @@ /area/station/security/prisonlockers) "wnD" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/drinks/drinkingglass, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -87843,10 +87843,10 @@ /area/station/hallway/primary/central) "xFW" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3 }, /obj/machinery/door/window/classic/reversed{ @@ -87975,11 +87975,11 @@ /area/station/engineering/atmos) "xIx" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8; pixel_y = 1 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -8; pixel_y = 11 }, @@ -88070,10 +88070,10 @@ /area/station/service/bar) "xLw" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3 }, /obj/structure/window/reinforced{ diff --git a/_maps/map_files220/RandomRuins/LavaRuins/scp_facility.dmm b/_maps/map_files220/RandomRuins/LavaRuins/scp_facility.dmm index e1b05fa340bd..18ee3af06a63 100644 --- a/_maps/map_files220/RandomRuins/LavaRuins/scp_facility.dmm +++ b/_maps/map_files220/RandomRuins/LavaRuins/scp_facility.dmm @@ -23,7 +23,7 @@ "bp" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/drinks/britcup, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "bx" = ( @@ -787,7 +787,7 @@ /area/ruin/unpowered/misc_lavaruin) "Hl" = ( /obj/structure/table/glass/plasma, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ pixel_y = 6 }, /obj/effect/decal/cleanable/dust, diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/convoy_ambush.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/convoy_ambush.dmm index 4c13408974c2..1f45a5027cc6 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/convoy_ambush.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/convoy_ambush.dmm @@ -435,8 +435,8 @@ /area/ruin/space/unpowered/unpowered_structures) "uW" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/cans/beer, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer, +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = 5; pixel_y = -2 }, @@ -728,9 +728,9 @@ /obj/machinery/light/small/directional/east, /obj/effect/turf_decal/delivery/white, /obj/structure/closet/cardboard, -/obj/item/reagent_containers/food/snacks/chinese/chowmein, -/obj/item/reagent_containers/food/snacks/chinese/chowmein, -/obj/item/reagent_containers/food/snacks/chinese/rice, +/obj/item/food/snacks/chinese/chowmein, +/obj/item/food/snacks/chinese/chowmein, +/obj/item/food/snacks/chinese/rice, /obj/item/stack/spacecash/c20, /obj/item/stack/spacecash/c10, /turf/simulated/floor/plasteel/airless{ @@ -791,8 +791,8 @@ "HA" = ( /obj/effect/turf_decal/delivery/white, /obj/structure/closet/cardboard, -/obj/item/reagent_containers/food/snacks/chinese/rice, -/obj/item/reagent_containers/food/snacks/chinese/chowmein, +/obj/item/food/snacks/chinese/rice, +/obj/item/food/snacks/chinese/chowmein, /obj/item/reagent_containers/pill/methamphetamine, /obj/item/reagent_containers/pill/methamphetamine, /obj/item/reagent_containers/pill/methamphetamine, @@ -1155,10 +1155,10 @@ "UE" = ( /obj/effect/turf_decal/delivery/white, /obj/structure/closet/cardboard, -/obj/item/reagent_containers/food/snacks/chinese/rice, -/obj/item/reagent_containers/food/snacks/chinese/chowmein, -/obj/item/reagent_containers/food/snacks/chinese/chowmein, -/obj/item/reagent_containers/food/snacks/chinese/rice, +/obj/item/food/snacks/chinese/rice, +/obj/item/food/snacks/chinese/chowmein, +/obj/item/food/snacks/chinese/chowmein, +/obj/item/food/snacks/chinese/rice, /obj/item/stack/spacecash/c100, /turf/simulated/floor/plasteel/airless{ icon_state = "dark" diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/infected_ship.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/infected_ship.dmm index 3ca5f9dda489..37ae9e4d34f5 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/infected_ship.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/infected_ship.dmm @@ -375,7 +375,7 @@ name = "microwave"; pixel_y = 9 }, -/obj/item/reagent_containers/food/snacks/syndidonkpocket{ +/obj/item/food/snacks/syndidonkpocket{ pixel_x = -7 }, /turf/simulated/floor/plasteel{ @@ -801,8 +801,8 @@ /area/ruin/space/powered/requires_power_space) "rG" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/cans/beer, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer, +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = -5; pixel_y = 9 }, @@ -832,8 +832,8 @@ /area/ruin/space/powered/requires_power_space) "sj" = ( /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/food/snacks/meat/corgi, -/obj/item/reagent_containers/food/snacks/meat/corgi, +/obj/item/food/snacks/meat/corgi, +/obj/item/food/snacks/meat/corgi, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel/freezer, /area/ruin/space/powered/requires_power_space) @@ -1226,7 +1226,7 @@ "Ge" = ( /obj/structure/table/wood, /obj/item/trash/plate, -/obj/item/reagent_containers/food/snacks/syndidonkpocket{ +/obj/item/food/snacks/syndidonkpocket{ pixel_y = 14; pixel_x = 6 }, @@ -1467,7 +1467,7 @@ /turf/simulated/floor/plating, /area/ruin/space/powered/requires_power_space) "NP" = ( -/obj/item/reagent_containers/food/drinks/oilcan, +/obj/item/reagent_containers/drinks/oilcan, /obj/item/wrench, /turf/simulated/floor/plating, /area/ruin/space/powered/requires_power_space) diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/mechtransport_new.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/mechtransport_new.dmm index 422477455600..c7f36b0f18a0 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/mechtransport_new.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/mechtransport_new.dmm @@ -375,7 +375,7 @@ /area/ruin/space/powered) "jq" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = -4; pixel_y = 6 }, @@ -771,7 +771,7 @@ /area/ruin/space/powered) "rZ" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = 4; pixel_y = 4; volume = 0 @@ -906,7 +906,7 @@ /turf/simulated/floor/plating, /area/ruin/space/powered) "vo" = ( -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = 4; pixel_y = 4 }, @@ -1516,7 +1516,7 @@ /obj/machinery/light/spot{ dir = 1 }, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ list_reagents = list("coffee"=0); pixel_x = 10; pixel_y = 7 @@ -2091,7 +2091,7 @@ /turf/simulated/floor/plating, /area/ruin/space/powered) "QS" = ( -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = 4; pixel_y = 4; volume = 0 @@ -2121,8 +2121,8 @@ /area/ruin/space/powered) "RM" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/cans/beer, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer, +/obj/item/reagent_containers/drinks/cans/beer{ list_reagents = list("beer"=0); pixel_x = 9; pixel_y = -3 @@ -2346,17 +2346,17 @@ "VB" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/cardboard, -/obj/item/reagent_containers/food/snacks/baguette, -/obj/item/reagent_containers/food/snacks/baguette, -/obj/item/reagent_containers/food/snacks/beans, -/obj/item/reagent_containers/food/snacks/beans, -/obj/item/reagent_containers/food/snacks/beans, -/obj/item/reagent_containers/food/snacks/beans, -/obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/food/snacks/candy/candybar, -/obj/item/reagent_containers/food/snacks/candy/candybar, -/obj/item/reagent_containers/food/snacks/candy/candybar, -/obj/item/reagent_containers/food/snacks/candy/taffy, +/obj/item/food/snacks/baguette, +/obj/item/food/snacks/baguette, +/obj/item/food/snacks/beans, +/obj/item/food/snacks/beans, +/obj/item/food/snacks/beans, +/obj/item/food/snacks/beans, +/obj/effect/decal/cleanable/dirt, +/obj/item/food/snacks/candy/candybar, +/obj/item/food/snacks/candy/candybar, +/obj/item/food/snacks/candy/candybar, +/obj/item/food/snacks/candy/taffy, /turf/simulated/floor/mineral/titanium, /area/ruin/space/powered) "VF" = ( @@ -2522,7 +2522,7 @@ /area/template_noop) "ZS" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/flask/barflask, +/obj/item/reagent_containers/drinks/flask/barflask, /turf/simulated/floor/carpet/blue, /area/ruin/space/powered) "ZT" = ( diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm index 1cf285cb94ac..1571d4c3f6fc 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm @@ -38,11 +38,11 @@ /obj/item/candle/eternal{ pixel_y = 4 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = 9; pixel_y = 12 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 9; pixel_y = 6 }, @@ -165,11 +165,11 @@ /obj/item/candle/eternal{ pixel_y = 4 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -9; pixel_y = 12 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -9; pixel_y = 6 }, @@ -430,27 +430,27 @@ /obj/effect/turf_decal/delivery, /obj/structure/closet/crate/freezer, /obj/item/storage/box/monkeycubes, -/obj/item/reagent_containers/food/snacks/grown/carrot, -/obj/item/reagent_containers/food/snacks/grown/carrot, -/obj/item/reagent_containers/food/snacks/grown/carrot, -/obj/item/reagent_containers/food/snacks/grown/carrot, -/obj/item/reagent_containers/food/snacks/grown/carrot, -/obj/item/reagent_containers/food/snacks/grown/carrot, -/obj/item/reagent_containers/food/snacks/grown/tomato, -/obj/item/reagent_containers/food/snacks/grown/tomato, -/obj/item/reagent_containers/food/snacks/grown/tomato, -/obj/item/reagent_containers/food/snacks/grown/tomato, -/obj/item/reagent_containers/food/snacks/grown/tomato, -/obj/item/reagent_containers/food/snacks/grown/wheat, -/obj/item/reagent_containers/food/snacks/grown/wheat, -/obj/item/reagent_containers/food/snacks/grown/wheat, -/obj/item/reagent_containers/food/snacks/grown/wheat, -/obj/item/reagent_containers/food/snacks/grown/wheat, -/obj/item/reagent_containers/food/snacks/grown/wheat, -/obj/item/reagent_containers/food/snacks/grown/potato, -/obj/item/reagent_containers/food/snacks/grown/potato, -/obj/item/reagent_containers/food/snacks/grown/potato, -/obj/item/reagent_containers/food/snacks/grown/potato, +/obj/item/food/snacks/grown/carrot, +/obj/item/food/snacks/grown/carrot, +/obj/item/food/snacks/grown/carrot, +/obj/item/food/snacks/grown/carrot, +/obj/item/food/snacks/grown/carrot, +/obj/item/food/snacks/grown/carrot, +/obj/item/food/snacks/grown/tomato, +/obj/item/food/snacks/grown/tomato, +/obj/item/food/snacks/grown/tomato, +/obj/item/food/snacks/grown/tomato, +/obj/item/food/snacks/grown/tomato, +/obj/item/food/snacks/grown/wheat, +/obj/item/food/snacks/grown/wheat, +/obj/item/food/snacks/grown/wheat, +/obj/item/food/snacks/grown/wheat, +/obj/item/food/snacks/grown/wheat, +/obj/item/food/snacks/grown/wheat, +/obj/item/food/snacks/grown/potato, +/obj/item/food/snacks/grown/potato, +/obj/item/food/snacks/grown/potato, +/obj/item/food/snacks/grown/potato, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/cargostorage) "do" = ( @@ -1179,7 +1179,7 @@ /area/ruin/space/spacehotelv1/forehallway) "jb" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ pixel_x = -5; pixel_y = 5 }, @@ -1589,7 +1589,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/reagent_containers/food/drinks/mug, +/obj/item/reagent_containers/drinks/mug, /turf/simulated/floor/carpet/royalblack, /area/ruin/space/spacehotelv1/guestroom6) "lS" = ( @@ -1603,36 +1603,36 @@ dir = 8 }, /obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/reagent_containers/food/snacks/grown/meatwheat, -/obj/item/reagent_containers/food/snacks/grown/meatwheat, -/obj/item/reagent_containers/food/snacks/grown/meatwheat, -/obj/item/reagent_containers/food/snacks/grown/wheat, -/obj/item/reagent_containers/food/snacks/grown/wheat, -/obj/item/reagent_containers/food/snacks/grown/wheat, -/obj/item/reagent_containers/food/snacks/grown/tomato, -/obj/item/reagent_containers/food/snacks/grown/tomato, -/obj/item/reagent_containers/food/snacks/grown/tomato, -/obj/item/reagent_containers/food/snacks/grown/tomato, -/obj/item/reagent_containers/food/snacks/grown/whitebeet, -/obj/item/reagent_containers/food/snacks/grown/whitebeet, -/obj/item/reagent_containers/food/snacks/grown/whitebeet, -/obj/item/reagent_containers/food/snacks/grown/redbeet, -/obj/item/reagent_containers/food/snacks/grown/redbeet, -/obj/item/reagent_containers/food/snacks/grown/redbeet, -/obj/item/reagent_containers/food/snacks/grown/potato, -/obj/item/reagent_containers/food/snacks/grown/potato, -/obj/item/reagent_containers/food/snacks/grown/potato, -/obj/item/reagent_containers/food/snacks/grown/potato, -/obj/item/reagent_containers/food/snacks/grown/rice, -/obj/item/reagent_containers/food/snacks/grown/rice, -/obj/item/reagent_containers/food/snacks/grown/rice, -/obj/item/reagent_containers/food/snacks/grown/rice, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/soymilk, -/obj/item/reagent_containers/food/condiment/soymilk, -/obj/item/reagent_containers/food/condiment/soymilk, +/obj/item/food/snacks/grown/meatwheat, +/obj/item/food/snacks/grown/meatwheat, +/obj/item/food/snacks/grown/meatwheat, +/obj/item/food/snacks/grown/wheat, +/obj/item/food/snacks/grown/wheat, +/obj/item/food/snacks/grown/wheat, +/obj/item/food/snacks/grown/tomato, +/obj/item/food/snacks/grown/tomato, +/obj/item/food/snacks/grown/tomato, +/obj/item/food/snacks/grown/tomato, +/obj/item/food/snacks/grown/whitebeet, +/obj/item/food/snacks/grown/whitebeet, +/obj/item/food/snacks/grown/whitebeet, +/obj/item/food/snacks/grown/redbeet, +/obj/item/food/snacks/grown/redbeet, +/obj/item/food/snacks/grown/redbeet, +/obj/item/food/snacks/grown/potato, +/obj/item/food/snacks/grown/potato, +/obj/item/food/snacks/grown/potato, +/obj/item/food/snacks/grown/potato, +/obj/item/food/snacks/grown/rice, +/obj/item/food/snacks/grown/rice, +/obj/item/food/snacks/grown/rice, +/obj/item/food/snacks/grown/rice, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/soymilk, +/obj/item/reagent_containers/condiment/soymilk, +/obj/item/reagent_containers/condiment/soymilk, /turf/simulated/floor/plasteel/freezer, /area/ruin/space/spacehotelv1/kitchen) "lU" = ( @@ -1806,7 +1806,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/reagent_containers/food/drinks/mug, +/obj/item/reagent_containers/drinks/mug, /turf/simulated/floor/carpet/blue, /area/ruin/space/spacehotelv1/guestroom3) "nj" = ( @@ -1940,11 +1940,11 @@ /area/ruin/space/spacehotelv1/restoraunt3) "oa" = ( /obj/structure/table/wood/fancy/red, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3; pixel_y = 16 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3; pixel_y = 16 }, @@ -2272,11 +2272,11 @@ /obj/item/candle/eternal{ pixel_y = 4 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3; pixel_y = 2 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3; pixel_y = 2 }, @@ -2308,11 +2308,11 @@ /obj/item/candle/eternal{ pixel_y = 4 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = 9; pixel_y = 12 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 9; pixel_y = 6 }, @@ -2717,10 +2717,10 @@ /obj/machinery/door/window/reinforced/normal{ dir = 8 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = 3 }, -/obj/item/reagent_containers/food/condiment/peppermill, +/obj/item/reagent_containers/condiment/peppermill, /turf/simulated/floor/plasteel, /area/ruin/space/spacehotelv1/kitchen) "tI" = ( @@ -2819,7 +2819,7 @@ /area/ruin/space/spacehotelv1/reception) "uu" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/meatballspaghetti, +/obj/item/food/snacks/meatballspaghetti, /obj/item/kitchen/utensil/fork, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) @@ -2845,7 +2845,7 @@ pixel_y = 6 }, /obj/item/kitchen/rollingpin, -/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/condiment/flour, /turf/simulated/floor/plasteel, /area/ruin/space/spacehotelv1/kitchen) "uB" = ( @@ -2960,11 +2960,11 @@ /obj/item/candle/eternal{ pixel_y = 4 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -9; pixel_y = 12 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -9; pixel_y = 6 }, @@ -3070,11 +3070,11 @@ icon_state = "4-8" }, /obj/structure/table/wood/fancy/red, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3; pixel_y = 16 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3; pixel_y = 16 }, @@ -3121,7 +3121,7 @@ /area/ruin/space/spacehotelv1/bar) "wC" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/drinks/shaker, /obj/item/reagent_containers/glass/rag, /obj/item/book/manual/barman_recipes, /obj/item/lighter/zippo/engraved, @@ -3574,11 +3574,11 @@ pixel_y = -1; pixel_x = -9 }, -/obj/item/reagent_containers/food/condiment/mushroom_sauce{ +/obj/item/reagent_containers/condiment/mushroom_sauce{ pixel_x = 10; pixel_y = 5 }, -/obj/item/reagent_containers/food/condiment/garlic_sauce{ +/obj/item/reagent_containers/condiment/garlic_sauce{ pixel_x = 6; pixel_y = 3 }, @@ -4509,7 +4509,7 @@ dir = 8 }, /obj/structure/table/reinforced/brass, -/obj/item/reagent_containers/food/drinks/mug, +/obj/item/reagent_containers/drinks/mug, /turf/simulated/floor/carpet/black, /area/ruin/space/spacehotelv1/guestroom1) "FS" = ( @@ -4921,11 +4921,11 @@ /area/ruin/space/spacehotelv1/barber) "IW" = ( /obj/structure/table/wood/fancy/red, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3; pixel_y = 16 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3; pixel_y = 16 }, @@ -5042,11 +5042,11 @@ /obj/item/candle/eternal{ pixel_y = 4 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -9; pixel_y = 12 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -9; pixel_y = 6 }, @@ -5900,11 +5900,11 @@ /obj/item/candle/eternal{ pixel_y = 4 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = 9; pixel_y = 12 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 9; pixel_y = 6 }, @@ -6473,7 +6473,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/reagent_containers/food/drinks/mug, +/obj/item/reagent_containers/drinks/mug, /turf/simulated/floor/carpet/red, /area/ruin/space/spacehotelv1/guestroom4) "UL" = ( @@ -6556,11 +6556,11 @@ /obj/item/candle/eternal{ pixel_y = 4 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = 9; pixel_y = 12 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 9; pixel_y = 6 }, @@ -6658,31 +6658,31 @@ /area/ruin/space/spacehotelv1/engi2) "VM" = ( /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/food/snacks/salmonmeat, -/obj/item/reagent_containers/food/snacks/salmonmeat, -/obj/item/reagent_containers/food/snacks/salmonmeat, -/obj/item/reagent_containers/food/snacks/salmonmeat, -/obj/item/reagent_containers/food/snacks/carpmeat, -/obj/item/reagent_containers/food/snacks/carpmeat, -/obj/item/reagent_containers/food/snacks/carpmeat, -/obj/item/reagent_containers/food/snacks/carpmeat, -/obj/item/reagent_containers/food/snacks/cutlet, -/obj/item/reagent_containers/food/snacks/cutlet, -/obj/item/reagent_containers/food/snacks/cutlet, -/obj/item/reagent_containers/food/snacks/cutlet, -/obj/item/reagent_containers/food/snacks/cutlet, -/obj/item/reagent_containers/food/snacks/rawcutlet, -/obj/item/reagent_containers/food/snacks/rawcutlet, -/obj/item/reagent_containers/food/snacks/rawcutlet, -/obj/item/reagent_containers/food/snacks/rawcutlet, -/obj/item/reagent_containers/food/snacks/rawcutlet, -/obj/item/reagent_containers/food/snacks/sausage, -/obj/item/reagent_containers/food/snacks/sausage, -/obj/item/reagent_containers/food/snacks/sausage, -/obj/item/reagent_containers/food/snacks/sausage, -/obj/item/reagent_containers/food/snacks/smokedsausage, -/obj/item/reagent_containers/food/snacks/smokedsausage, -/obj/item/reagent_containers/food/snacks/smokedsausage, +/obj/item/food/snacks/salmonmeat, +/obj/item/food/snacks/salmonmeat, +/obj/item/food/snacks/salmonmeat, +/obj/item/food/snacks/salmonmeat, +/obj/item/food/snacks/carpmeat, +/obj/item/food/snacks/carpmeat, +/obj/item/food/snacks/carpmeat, +/obj/item/food/snacks/carpmeat, +/obj/item/food/snacks/cutlet, +/obj/item/food/snacks/cutlet, +/obj/item/food/snacks/cutlet, +/obj/item/food/snacks/cutlet, +/obj/item/food/snacks/cutlet, +/obj/item/food/snacks/rawcutlet, +/obj/item/food/snacks/rawcutlet, +/obj/item/food/snacks/rawcutlet, +/obj/item/food/snacks/rawcutlet, +/obj/item/food/snacks/rawcutlet, +/obj/item/food/snacks/sausage, +/obj/item/food/snacks/sausage, +/obj/item/food/snacks/sausage, +/obj/item/food/snacks/sausage, +/obj/item/food/snacks/smokedsausage, +/obj/item/food/snacks/smokedsausage, +/obj/item/food/snacks/smokedsausage, /obj/item/fish/salmon, /obj/item/fish/salmon, /obj/item/fish/salmon, @@ -6923,7 +6923,7 @@ dir = 4 }, /obj/structure/table/wood/fancy/black, -/obj/item/reagent_containers/food/drinks/mug, +/obj/item/reagent_containers/drinks/mug, /turf/simulated/floor/carpet/arcade, /area/ruin/space/spacehotelv1/guestroom2) "XV" = ( diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/transit_bar.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/transit_bar.dmm index b5282e591432..aeff84dbaac9 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/transit_bar.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/transit_bar.dmm @@ -18,7 +18,7 @@ pixel_y = -2; pixel_x = 6 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_y = 5; pixel_x = -2 }, @@ -80,8 +80,8 @@ /area/ruin/space/powered) "r" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/cans/beer, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer, +/obj/item/reagent_containers/drinks/cans/beer{ list_reagents = list("beer"=0); pixel_x = 9; pixel_y = -3 @@ -175,7 +175,7 @@ /area/ruin/space/powered) "G" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_y = 8; pixel_x = -7 }, @@ -202,7 +202,7 @@ /obj/item/reagent_containers/glass/rag{ pixel_x = -7 }, -/obj/item/reagent_containers/food/drinks/shaker{ +/obj/item/reagent_containers/drinks/shaker{ pixel_x = 7; pixel_y = 5 }, @@ -236,7 +236,7 @@ /obj/structure/table/wood, /obj/machinery/light/small/directional/east, /obj/item/ashtray/bronze, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_y = 12; pixel_x = 7; list_reagents = list("innocent_erp = 50") diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/voxraiders_1.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/voxraiders_1.dmm index 06dffdcb7476..21e525bca515 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/voxraiders_1.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/voxraiders_1.dmm @@ -538,7 +538,7 @@ pixel_x = 8 }, /obj/item/toy/plushie/voxplushie, -/obj/item/reagent_containers/food/snacks/cheesepizzaslice{ +/obj/item/food/snacks/cheesepizzaslice{ pixel_y = -2; pixel_x = -7 }, diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/whiteship.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/whiteship.dmm index 0a4f029ba84e..efed88d8467d 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/whiteship.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/whiteship.dmm @@ -159,7 +159,7 @@ /obj/machinery/light_construct/directional/west, /obj/structure/table, /obj/item/trash/plate, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ desc = "It's cold as dead body."; pixel_x = 8; pixel_y = 8; @@ -639,7 +639,7 @@ /area/shuttle/abandoned) "oB" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ desc = "It's cold as dead body."; pixel_x = 8; pixel_y = 8; @@ -1445,7 +1445,7 @@ "Jn" = ( /obj/structure/table/glass, /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/food/drinks/mug/cmo, +/obj/item/reagent_containers/drinks/mug/cmo, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkbluefull" @@ -1505,7 +1505,7 @@ }, /obj/item/clothing/accessory/stethoscope, /obj/item/flashlight/pen, -/obj/item/reagent_containers/food/snacks/grown/apple{ +/obj/item/food/snacks/grown/apple{ desc = "An apple a day - keeps doctor away..."; pixel_x = 2; pixel_y = 6 diff --git a/_maps/map_files220/RandomZLevels/beach.dmm b/_maps/map_files220/RandomZLevels/beach.dmm index 1b137e8c3416..56f26f41ebc2 100644 --- a/_maps/map_files220/RandomZLevels/beach.dmm +++ b/_maps/map_files220/RandomZLevels/beach.dmm @@ -52,7 +52,7 @@ /obj/structure/chair/plastic{ dir = 8 }, -/obj/item/reagent_containers/food/drinks/cans/thirteenloko{ +/obj/item/reagent_containers/drinks/cans/thirteenloko{ pixel_x = -18; pixel_y = 8 }, @@ -357,19 +357,19 @@ /area/awaymission/beach) "ew" = ( /obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/drinks/cans/cola{ +/obj/item/reagent_containers/drinks/cans/cola{ pixel_y = 16; pixel_x = -4 }, -/obj/item/reagent_containers/food/drinks/cans/cola{ +/obj/item/reagent_containers/drinks/cans/cola{ pixel_y = 14; pixel_x = 8 }, -/obj/item/reagent_containers/food/drinks/cans/cola{ +/obj/item/reagent_containers/drinks/cans/cola{ pixel_y = 9; pixel_x = -2 }, -/obj/item/reagent_containers/food/drinks/cans/cola{ +/obj/item/reagent_containers/drinks/cans/cola{ pixel_y = 5; pixel_x = 11 }, @@ -407,7 +407,7 @@ /area/awaymission/beach) "eT" = ( /obj/structure/fluff/beach_umbrella/syndi, -/obj/item/reagent_containers/food/drinks/cans/cola{ +/obj/item/reagent_containers/drinks/cans/cola{ pixel_x = -6; pixel_y = -6 }, @@ -444,11 +444,11 @@ /obj/structure/table/wood{ color = "#ffcc33" }, -/obj/item/reagent_containers/food/condiment/capsaicin{ +/obj/item/reagent_containers/condiment/capsaicin{ pixel_y = 8; pixel_x = -4 }, -/obj/item/reagent_containers/food/condiment/bbqsauce{ +/obj/item/reagent_containers/condiment/bbqsauce{ pixel_x = 8; pixel_y = 4 }, @@ -518,10 +518,10 @@ /obj/structure/table/wood{ color = "#ffcc33" }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_y = 8 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_y = 4; pixel_x = -8 }, @@ -732,15 +732,15 @@ /area/awaymission/beach) "iy" = ( /obj/structure/table/wood/fancy/orange, -/obj/item/reagent_containers/food/drinks/bottle/wine{ +/obj/item/reagent_containers/drinks/bottle/wine{ pixel_y = 20; pixel_x = -4 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_y = 6; pixel_x = -6 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_y = 14; pixel_x = 8 }, @@ -936,7 +936,7 @@ /obj/structure/chair/plastic{ dir = 8 }, -/obj/item/reagent_containers/food/drinks/cans/space_up{ +/obj/item/reagent_containers/drinks/cans/space_up{ pixel_y = 12; pixel_x = -8 }, @@ -960,15 +960,15 @@ /area/awaymission/beach) "lM" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ pixel_y = 7; pixel_x = -7 }, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ pixel_y = 15; pixel_x = 2 }, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ pixel_y = 5; pixel_x = 7 }, @@ -1051,7 +1051,7 @@ pixel_y = 7; pixel_x = 11 }, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ pixel_y = 12; pixel_x = -8 }, @@ -1062,11 +1062,11 @@ /area/awaymission/beach) "nb" = ( /obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/drinks/cans/cola{ +/obj/item/reagent_containers/drinks/cans/cola{ pixel_y = 8; pixel_x = 7 }, -/obj/item/reagent_containers/food/drinks/cans/cola{ +/obj/item/reagent_containers/drinks/cans/cola{ pixel_y = 13; pixel_x = -11 }, @@ -1217,7 +1217,7 @@ "pm" = ( /obj/item/storage/bag/tray, /obj/effect/turf_decal/stripes/red/box, -/obj/item/reagent_containers/food/snacks/grown/watermelon{ +/obj/item/food/snacks/grown/watermelon{ pixel_y = 2; pixel_x = 1 }, @@ -1235,7 +1235,7 @@ /area/awaymission/beach) "pp" = ( /obj/structure/chair/plastic, -/obj/item/reagent_containers/food/drinks/cans/dr_gibb{ +/obj/item/reagent_containers/drinks/cans/dr_gibb{ pixel_x = 20; pixel_y = -4 }, @@ -1257,7 +1257,7 @@ /obj/structure/chair/plastic{ dir = 4 }, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = 16; pixel_y = -16 }, @@ -1317,7 +1317,7 @@ /obj/structure/table/wood{ color = "#ffcc33" }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_x = -8; pixel_y = 8 }, @@ -1340,7 +1340,7 @@ /area/awaymission/beach) "qB" = ( /obj/structure/fluff/beach_umbrella/science, -/obj/item/reagent_containers/food/drinks/cans/starkist{ +/obj/item/reagent_containers/drinks/cans/starkist{ pixel_x = 11; pixel_y = -2 }, @@ -1407,7 +1407,7 @@ /area/awaymission/beach) "rI" = ( /obj/structure/chair/plastic, -/obj/item/reagent_containers/food/drinks/cans/space_mountain_wind{ +/obj/item/reagent_containers/drinks/cans/space_mountain_wind{ pixel_x = 18; pixel_y = 4 }, @@ -1429,7 +1429,7 @@ pixel_y = 18; pixel_x = -5 }, -/obj/item/reagent_containers/food/drinks/shaker{ +/obj/item/reagent_containers/drinks/shaker{ pixel_x = -6; pixel_y = 2 }, @@ -1552,21 +1552,21 @@ /area/awaymission/beach) "va" = ( /obj/structure/closet/secure_closet/freezer/fridge/open, -/obj/item/reagent_containers/food/snacks/catfishmeat, -/obj/item/reagent_containers/food/snacks/catfishmeat, -/obj/item/reagent_containers/food/snacks/catfishmeat, -/obj/item/reagent_containers/food/snacks/catfishmeat, -/obj/item/reagent_containers/food/snacks/catfishmeat, -/obj/item/reagent_containers/food/snacks/salmonmeat, -/obj/item/reagent_containers/food/snacks/salmonmeat, -/obj/item/reagent_containers/food/snacks/salmonmeat, -/obj/item/reagent_containers/food/snacks/salmonmeat, -/obj/item/reagent_containers/food/snacks/salmonmeat, +/obj/item/food/snacks/catfishmeat, +/obj/item/food/snacks/catfishmeat, +/obj/item/food/snacks/catfishmeat, +/obj/item/food/snacks/catfishmeat, +/obj/item/food/snacks/catfishmeat, +/obj/item/food/snacks/salmonmeat, +/obj/item/food/snacks/salmonmeat, +/obj/item/food/snacks/salmonmeat, +/obj/item/food/snacks/salmonmeat, +/obj/item/food/snacks/salmonmeat, /turf/simulated/floor/wood/fancy/cherry, /area/awaymission/beach) "vq" = ( /obj/structure/chair/plastic, -/obj/item/reagent_containers/food/drinks/cans/starkist{ +/obj/item/reagent_containers/drinks/cans/starkist{ pixel_x = 20; pixel_y = -8 }, @@ -1594,7 +1594,7 @@ pixel_x = -6; pixel_y = -5 }, -/obj/item/reagent_containers/food/snacks/donut{ +/obj/item/food/snacks/donut{ pixel_x = 13 }, /obj/item/folder/blue{ @@ -1623,7 +1623,7 @@ }, /area/awaymission/beach) "vR" = ( -/obj/item/reagent_containers/food/drinks/cans/tonic{ +/obj/item/reagent_containers/drinks/cans/tonic{ pixel_x = -12; pixel_y = 2 }, @@ -1827,7 +1827,7 @@ pixel_x = -2 }, /obj/machinery/cell_charger, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ pixel_y = 12; pixel_x = 6 }, @@ -2109,11 +2109,11 @@ /area/awaymission/beach) "Cf" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/grown/watermelon{ +/obj/item/food/snacks/grown/watermelon{ pixel_y = 8; pixel_x = 5 }, -/obj/item/reagent_containers/food/snacks/grown/watermelon{ +/obj/item/food/snacks/grown/watermelon{ pixel_y = 3; pixel_x = -3 }, @@ -2176,7 +2176,7 @@ /area/awaymission/beach) "Dg" = ( /obj/structure/chair/plastic, -/obj/item/reagent_containers/food/drinks/cans/dr_gibb{ +/obj/item/reagent_containers/drinks/cans/dr_gibb{ pixel_x = -16; pixel_y = -6 }, @@ -2205,11 +2205,11 @@ /area/awaymission/beach) "DH" = ( /obj/structure/fluff/beach_umbrella/syndi, -/obj/item/reagent_containers/food/drinks/cans/cola{ +/obj/item/reagent_containers/drinks/cans/cola{ pixel_x = -10; pixel_y = -6 }, -/obj/item/reagent_containers/food/drinks/cans/dr_gibb{ +/obj/item/reagent_containers/drinks/cans/dr_gibb{ pixel_x = 12 }, /turf/simulated/floor/beach/away/sand_alternative, @@ -2238,7 +2238,7 @@ "Eg" = ( /obj/structure/table/wood, /obj/machinery/recharger, -/obj/item/reagent_containers/food/drinks/mug{ +/obj/item/reagent_containers/drinks/mug{ pixel_x = -9; pixel_y = 13 }, @@ -2252,7 +2252,7 @@ /area/awaymission/beach) "Ek" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ pixel_x = 4; pixel_y = 4 }, @@ -2271,15 +2271,15 @@ /area/awaymission/beach) "Ez" = ( /obj/structure/table/holotable, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_y = 8; pixel_x = -8 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = 6; pixel_y = 8 }, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_y = 4; pixel_x = -1 }, @@ -2460,7 +2460,7 @@ pixel_y = 10; pixel_x = 11 }, -/obj/item/reagent_containers/food/snacks/donut/sprinkles{ +/obj/item/food/snacks/donut/sprinkles{ pixel_x = -8; pixel_y = 4 }, @@ -2503,7 +2503,7 @@ /area/awaymission/beach) "Hg" = ( /obj/structure/chair/plastic, -/obj/item/reagent_containers/food/drinks/cans/lemon_lime{ +/obj/item/reagent_containers/drinks/cans/lemon_lime{ pixel_y = -6; pixel_x = 16 }, @@ -2706,7 +2706,7 @@ /obj/structure/chair/plastic{ dir = 4 }, -/obj/item/reagent_containers/food/drinks/cans/lemon_lime{ +/obj/item/reagent_containers/drinks/cans/lemon_lime{ pixel_x = 14; pixel_y = -12 }, @@ -2805,7 +2805,7 @@ /area/awaymission/beach) "KB" = ( /obj/structure/fluff/beach_umbrella/syndi, -/obj/item/reagent_containers/food/drinks/cans/dr_gibb{ +/obj/item/reagent_containers/drinks/cans/dr_gibb{ pixel_x = -6; pixel_y = -6 }, @@ -2814,7 +2814,7 @@ "KE" = ( /obj/structure/table, /obj/item/storage/belt/utility, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_y = 16; pixel_x = -7 }, @@ -2829,15 +2829,15 @@ /area/awaymission/beach) "KK" = ( /obj/structure/table/wood/fancy/orange, -/obj/item/reagent_containers/food/snacks/grown/banana{ +/obj/item/food/snacks/grown/banana{ pixel_y = 8; pixel_x = -4 }, -/obj/item/reagent_containers/food/snacks/grown/banana{ +/obj/item/food/snacks/grown/banana{ pixel_y = 6; pixel_x = -1 }, -/obj/item/reagent_containers/food/snacks/grown/banana{ +/obj/item/food/snacks/grown/banana{ pixel_y = 4; pixel_x = 3 }, @@ -2893,13 +2893,13 @@ /area/awaymission/beach) "LI" = ( /obj/structure/closet/crate/hydroponics, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/rice, -/obj/item/reagent_containers/food/condiment/rice, -/obj/item/reagent_containers/food/snacks/grown/banana, -/obj/item/reagent_containers/food/snacks/grown/banana, -/obj/item/reagent_containers/food/snacks/grown/banana, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/rice, +/obj/item/reagent_containers/condiment/rice, +/obj/item/food/snacks/grown/banana, +/obj/item/food/snacks/grown/banana, +/obj/item/food/snacks/grown/banana, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "LM" = ( @@ -3032,7 +3032,7 @@ /area/awaymission/beach) "Ne" = ( /obj/structure/fluff/beach_umbrella/syndi, -/obj/item/reagent_containers/food/drinks/cans/space_up{ +/obj/item/reagent_containers/drinks/cans/space_up{ pixel_x = 11; pixel_y = -2 }, @@ -3130,11 +3130,11 @@ color = "#ffcc33" }, /obj/machinery/light/directional/east, -/obj/item/reagent_containers/food/condiment/ketchup{ +/obj/item/reagent_containers/condiment/ketchup{ pixel_y = 8; pixel_x = -2 }, -/obj/item/reagent_containers/food/condiment/mayonnaise{ +/obj/item/reagent_containers/condiment/mayonnaise{ pixel_x = 6; pixel_y = 6 }, @@ -3222,18 +3222,18 @@ /area/awaymission/beach) "QH" = ( /obj/structure/fluff/beach_umbrella/science, -/obj/item/reagent_containers/food/drinks/cans/cola{ +/obj/item/reagent_containers/drinks/cans/cola{ pixel_x = -10; pixel_y = -6 }, -/obj/item/reagent_containers/food/drinks/cans/space_up{ +/obj/item/reagent_containers/drinks/cans/space_up{ pixel_x = 12 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "QJ" = ( /obj/structure/chair/plastic, -/obj/item/reagent_containers/food/drinks/cans/cola{ +/obj/item/reagent_containers/drinks/cans/cola{ pixel_x = 18; pixel_y = -3 }, @@ -3381,7 +3381,7 @@ /turf/simulated/floor/wood/fancy, /area/awaymission/beach) "Ss" = ( -/obj/item/reagent_containers/food/drinks/cans/cola{ +/obj/item/reagent_containers/drinks/cans/cola{ pixel_y = 16; pixel_x = -8 }, @@ -3415,7 +3415,7 @@ pixel_y = 4; pixel_x = -4 }, -/obj/item/reagent_containers/food/condiment/soymilk{ +/obj/item/reagent_containers/condiment/soymilk{ pixel_y = 8; pixel_x = 8 }, @@ -3471,7 +3471,7 @@ /turf/simulated/floor/wood/fancy, /area/awaymission/beach) "Us" = ( -/obj/item/reagent_containers/food/drinks/cans/starkist{ +/obj/item/reagent_containers/drinks/cans/starkist{ pixel_x = -6 }, /turf/simulated/floor/beach/away/sand_alternative, @@ -3552,7 +3552,7 @@ pixel_y = 6; pixel_x = 4 }, -/obj/item/reagent_containers/food/drinks/cans/grape_juice{ +/obj/item/reagent_containers/drinks/cans/grape_juice{ pixel_x = -8; pixel_y = 9 }, @@ -3816,12 +3816,12 @@ /area/awaymission/beach) "XW" = ( /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/salmonmeat, -/obj/item/reagent_containers/food/snacks/salmonmeat, -/obj/item/reagent_containers/food/snacks/salmonmeat, +/obj/item/food/snacks/meat, +/obj/item/food/snacks/meat, +/obj/item/food/snacks/meat, +/obj/item/food/snacks/salmonmeat, +/obj/item/food/snacks/salmonmeat, +/obj/item/food/snacks/salmonmeat, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "Ya" = ( @@ -3894,11 +3894,11 @@ /area/awaymission/beach) "Ze" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/grown/watermelon{ +/obj/item/food/snacks/grown/watermelon{ pixel_y = 6; pixel_x = 6 }, -/obj/item/reagent_containers/food/snacks/watermelonslice{ +/obj/item/food/snacks/watermelonslice{ pixel_x = -6 }, /turf/simulated/floor/beach/away/sand_alternative, diff --git a/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm b/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm index a6b5ebb46218..66c94a714fc2 100644 --- a/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm +++ b/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm @@ -269,8 +269,8 @@ /area/awaymission/BMPship/Gate) "bi" = ( /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, +/obj/item/food/snacks/meat, +/obj/item/food/snacks/meat, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -290,7 +290,7 @@ /area/awaymission/BMPship/Fore) "bl" = ( /obj/structure/table/wood/fancy/royalblack, -/obj/item/reagent_containers/food/drinks/bottle/patron, +/obj/item/reagent_containers/drinks/bottle/patron, /obj/item/flashlight/lamp/green{ pixel_x = -5; pixel_y = 12; @@ -580,7 +580,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, -/obj/item/reagent_containers/food/drinks/sillycup, +/obj/item/reagent_containers/drinks/sillycup, /obj/item/reagent_containers/pill/methamphetamine, /turf/simulated/floor/wood/fancy/oak, /area/awaymission/BMPship/CommonArea) @@ -722,10 +722,10 @@ dir = 2 }, /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/food/snacks/monstermeat/bearmeat, -/obj/item/reagent_containers/food/snacks/monstermeat/bearmeat, -/obj/item/reagent_containers/food/snacks/monstermeat/bearmeat, -/obj/item/reagent_containers/food/snacks/monstermeat/bearmeat, +/obj/item/food/snacks/monstermeat/bearmeat, +/obj/item/food/snacks/monstermeat/bearmeat, +/obj/item/food/snacks/monstermeat/bearmeat, +/obj/item/food/snacks/monstermeat/bearmeat, /obj/item/clothing/gloves/furgloves, /obj/item/clothing/head/furcap, /obj/item/clothing/shoes/furboots, @@ -776,7 +776,7 @@ "cB" = ( /obj/structure/alien/weeds, /obj/effect/decal/cleanable/greenglow, -/obj/item/reagent_containers/food/snacks/monstermeat/spiderleg, +/obj/item/food/snacks/monstermeat/spiderleg, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Fore) "cC" = ( @@ -831,7 +831,7 @@ "cH" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light_construct/small/south, -/obj/item/reagent_containers/food/snacks/meat, +/obj/item/food/snacks/meat, /obj/structure/spider/stickyweb, /obj/structure/spider/cocoon, /turf/simulated/floor/plating, @@ -899,7 +899,7 @@ "cR" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light_construct/small/south, -/obj/item/reagent_containers/food/snacks/meat, +/obj/item/food/snacks/meat, /turf/simulated/floor/engine, /area/awaymission/BMPship/Containment) "cS" = ( @@ -958,8 +958,8 @@ /area/awaymission/BMPship/Fore) "cZ" = ( /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/food/snacks/monstermeat/lizardmeat, -/obj/item/reagent_containers/food/snacks/monstermeat/lizardmeat, +/obj/item/food/snacks/monstermeat/lizardmeat, +/obj/item/food/snacks/monstermeat/lizardmeat, /obj/item/stack/sheet/animalhide/lizard, /obj/effect/spawner/lootdrop/lizardboots, /obj/effect/decal/cleanable/dirt, @@ -1139,8 +1139,8 @@ /area/awaymission/BMPship/Engines) "dA" = ( /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, +/obj/item/food/snacks/meat, +/obj/item/food/snacks/meat, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -1242,7 +1242,7 @@ /obj/item/kitchen/utensil/fork{ pixel_x = 7 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_y = 15 }, /turf/simulated/floor/plasteel{ @@ -1258,11 +1258,11 @@ /obj/item/clothing/glasses/sunglasses/noir{ pixel_y = -3 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_x = 10; pixel_y = 8 }, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/drinks/bottle/whiskey{ pixel_y = 10; layer = 2.9 }, @@ -1319,7 +1319,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/BMPship/Containment) "dU" = ( -/obj/item/reagent_containers/food/drinks/sillycup, +/obj/item/reagent_containers/drinks/sillycup, /obj/effect/landmark/damageturf, /turf/simulated/floor/wood/fancy/oak, /area/awaymission/BMPship/CommonArea) @@ -1513,7 +1513,7 @@ "ey" = ( /obj/structure/table, /obj/item/kitchen/knife/butcher, -/obj/item/reagent_containers/food/snacks/monstermeat/lizardmeat, +/obj/item/food/snacks/monstermeat/lizardmeat, /obj/item/trash/plate{ pixel_x = -5; pixel_y = -1; @@ -1619,7 +1619,7 @@ layer = 2.9 }, /obj/item/kitchen/utensil/fork, -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/drinks/britcup{ pixel_x = 8 }, /turf/simulated/floor/plasteel{ @@ -1643,7 +1643,7 @@ color = "yellow"; layer = 2.9 }, -/obj/item/reagent_containers/food/snacks/grown/wheat, +/obj/item/food/snacks/grown/wheat, /turf/simulated/floor/grass, /area/awaymission/BMPship/Kitchen) "eR" = ( @@ -1902,7 +1902,7 @@ "fy" = ( /obj/structure/table, /obj/item/storage/box/donkpockets, -/obj/item/reagent_containers/food/snacks/fried_vox{ +/obj/item/food/snacks/fried_vox{ pixel_x = 4; pixel_y = 12; layer = 2.9 @@ -2250,7 +2250,7 @@ /area/space) "gv" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/sliceable/xenomeatbread, +/obj/item/food/snacks/sliceable/xenomeatbread, /obj/item/kitchen/knife, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" @@ -2352,7 +2352,7 @@ }, /area/awaymission/BMPship/Kitchen) "gM" = ( -/obj/item/reagent_containers/food/snacks/hugemushroomslice, +/obj/item/food/snacks/hugemushroomslice, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/awaymission/BMPship/Kitchen) @@ -2561,7 +2561,7 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/greenglow, -/obj/item/reagent_containers/food/snacks/monstermeat/spiderleg, +/obj/item/food/snacks/monstermeat/spiderleg, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/BMPship/Containment) @@ -2787,12 +2787,12 @@ /area/awaymission/BMPship/Kitchen) "it" = ( /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/hugemushroomslice, +/obj/item/food/snacks/meat, +/obj/item/food/snacks/hugemushroomslice, /obj/effect/turf_decal/stripes/line{ dir = 2 }, -/obj/item/reagent_containers/food/snacks/monstermeat/spidermeat, +/obj/item/food/snacks/monstermeat/spidermeat, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/awaymission/BMPship/Gate) @@ -2902,7 +2902,7 @@ /area/awaymission/BMPship/ChemLab) "iL" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/cans/beer, +/obj/item/reagent_containers/drinks/cans/beer, /obj/item/grenade/chem_grenade/drugs, /turf/simulated/floor/plating, /area/awaymission/BMPship/ChemLab) @@ -2978,7 +2978,7 @@ /turf/simulated/floor/plating, /area/awaymission/BMPship/ChemLab) "iZ" = ( -/obj/item/reagent_containers/food/snacks/chips, +/obj/item/food/snacks/chips, /turf/simulated/floor/plating, /area/awaymission/BMPship/ChemLab) "ja" = ( @@ -3040,7 +3040,7 @@ /obj/item/kitchen/utensil/fork{ pixel_x = -2 }, -/obj/item/reagent_containers/food/snacks/pastatomato, +/obj/item/food/snacks/pastatomato, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -3099,9 +3099,9 @@ "jB" = ( /obj/structure/window/reinforced, /obj/structure/table, -/obj/item/reagent_containers/food/snacks/candy/candycane, -/obj/item/reagent_containers/food/snacks/candy/confectionery/caramel_nougat, -/obj/item/reagent_containers/food/snacks/candy/confectionery/toffee, +/obj/item/food/snacks/candy/candycane, +/obj/item/food/snacks/candy/confectionery/caramel_nougat, +/obj/item/food/snacks/candy/confectionery/toffee, /turf/simulated/floor/plasteel{ icon_state = "barber"; tag = "icon-barber" @@ -3114,7 +3114,7 @@ /area/space) "jF" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/xenomeatbreadslice{ +/obj/item/food/snacks/xenomeatbreadslice{ pixel_x = -8 }, /obj/item/trash/plate{ @@ -3134,7 +3134,7 @@ "jG" = ( /obj/effect/decal/cleanable/blood/gibs/xeno, /obj/structure/alien/weeds, -/obj/item/reagent_containers/food/snacks/meat, +/obj/item/food/snacks/meat, /obj/machinery/light_construct/small/north, /turf/simulated/floor/engine, /area/awaymission/BMPship/Containment) @@ -3227,7 +3227,7 @@ "kx" = ( /obj/structure/table/survival_pod, /obj/item/reagent_containers/glass/beaker/drugs/meth, -/obj/item/reagent_containers/food/drinks/bottle/rum{ +/obj/item/reagent_containers/drinks/bottle/rum{ pixel_x = -3; pixel_y = 4; layer = 2.9 @@ -3360,7 +3360,7 @@ /obj/structure/closet/critter{ opened = 1 }, -/obj/item/reagent_containers/food/snacks/meat, +/obj/item/food/snacks/meat, /turf/simulated/floor/engine, /area/awaymission/BMPship/Containment) "lL" = ( @@ -3696,7 +3696,7 @@ icon_state = "small" }, /obj/structure/table/wood/fancy/royalblack, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_x = 11; pixel_y = 13 }, @@ -3730,12 +3730,12 @@ /turf/space, /area/space) "pc" = ( -/obj/item/reagent_containers/food/snacks/grown/banana, -/obj/item/reagent_containers/food/snacks/grown/banana{ +/obj/item/food/snacks/grown/banana, +/obj/item/food/snacks/grown/banana{ pixel_x = -6; pixel_y = 3 }, -/obj/item/reagent_containers/food/snacks/grown/banana{ +/obj/item/food/snacks/grown/banana{ pixel_x = 7; pixel_y = 3 }, @@ -3832,14 +3832,14 @@ /area/awaymission/BMPship/Dormitories) "pG" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = 3; pixel_y = 5 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_y = 2 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = -3; pixel_y = 5; layer = 2.9 @@ -4604,7 +4604,7 @@ /area/awaymission/BMPship/CommonArea) "wG" = ( /obj/effect/decal/cleanable/greenglow, -/obj/item/reagent_containers/food/snacks/monstermeat/spiderleg, +/obj/item/food/snacks/monstermeat/spiderleg, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/BMPship/Containment) @@ -4800,7 +4800,7 @@ /turf/simulated/wall/indestructible/whiteshuttle/nodiagonal, /area/awaymission/BMPship/Fore) "yu" = ( -/obj/item/reagent_containers/food/snacks/meat, +/obj/item/food/snacks/meat, /obj/effect/decal/cleanable/dirt, /obj/machinery/light_construct/small/north, /mob/living/simple_animal/hostile/poison/giant_spider/hunter{ @@ -4916,7 +4916,7 @@ opened = 1 }, /obj/structure/spider/stickyweb, -/obj/item/reagent_containers/food/snacks/meat, +/obj/item/food/snacks/meat, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/engine, /area/awaymission/BMPship/Containment) @@ -4999,7 +4999,7 @@ /obj/item/shard{ icon_state = "small" }, -/obj/item/reagent_containers/food/snacks/meat, +/obj/item/food/snacks/meat, /turf/simulated/floor/engine, /area/awaymission/BMPship/Containment) "Aw" = ( @@ -5076,7 +5076,7 @@ /obj/structure/table, /obj/item/kitchen/utensil/fork, /obj/item/trash/snack_bowl, -/obj/item/reagent_containers/food/drinks/mug/cap{ +/obj/item/reagent_containers/drinks/mug/cap{ pixel_x = 5; pixel_y = 6 }, @@ -5235,7 +5235,7 @@ /area/awaymission/BMPship/Buffer) "CI" = ( /obj/structure/alien/weeds, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = 8; pixel_y = 2 }, @@ -5304,7 +5304,7 @@ /turf/simulated/floor/engine, /area/awaymission/BMPship/Containment) "Dr" = ( -/obj/item/reagent_containers/food/snacks/meat, +/obj/item/food/snacks/meat, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/engine, /area/awaymission/BMPship/Containment) @@ -5489,7 +5489,7 @@ /turf/simulated/wall/indestructible/whiteshuttle/nodiagonal, /area/awaymission/BMPship/Kitchen) "EO" = ( -/obj/item/reagent_containers/food/snacks/meat, +/obj/item/food/snacks/meat, /obj/effect/decal/cleanable/dirt, /obj/structure/spider/stickyweb, /turf/simulated/floor/engine, @@ -5651,7 +5651,7 @@ /area/awaymission/BMPship/Containment) "Gu" = ( /obj/item/assembly/mousetrap/armed, -/obj/item/reagent_containers/food/snacks/breadslice{ +/obj/item/food/snacks/breadslice{ pixel_y = 3 }, /obj/effect/decal/cleanable/dirt, @@ -6171,7 +6171,7 @@ /area/awaymission/BMPship/Gate) "Md" = ( /obj/structure/alien/weeds, -/obj/item/reagent_containers/food/drinks/mug/novelty{ +/obj/item/reagent_containers/drinks/mug/novelty{ pixel_y = 10; pixel_x = 10 }, @@ -6496,12 +6496,12 @@ /area/awaymission/BMPship/CommonArea) "Qi" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/food/snacks/meat, +/obj/item/food/snacks/meat, /turf/simulated/floor/engine, /area/awaymission/BMPship/Containment) "Qj" = ( /obj/structure/alien/weeds, -/obj/item/reagent_containers/food/snacks/monstermeat/spiderleg, +/obj/item/food/snacks/monstermeat/spiderleg, /obj/effect/decal/cleanable/greenglow, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Fore) @@ -6556,7 +6556,7 @@ /area/awaymission/BMPship/Containment) "QT" = ( /obj/structure/rack, -/obj/item/reagent_containers/food/drinks/trophy/gold_cup, +/obj/item/reagent_containers/drinks/trophy/gold_cup, /obj/item/storage/box/flashbangs, /obj/item/fluff/dogwhistle, /obj/structure/alien/weeds, @@ -6748,16 +6748,16 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/item/reagent_containers/food/snacks/meat/corgi, -/obj/item/reagent_containers/food/snacks/meat/corgi, -/obj/item/reagent_containers/food/snacks/meat/corgi, -/obj/item/reagent_containers/food/snacks/meat/corgi, -/obj/item/reagent_containers/food/snacks/meat/corgi, +/obj/item/food/snacks/meat/corgi, +/obj/item/food/snacks/meat/corgi, +/obj/item/food/snacks/meat/corgi, +/obj/item/food/snacks/meat/corgi, +/obj/item/food/snacks/meat/corgi, /turf/simulated/floor/plating, /area/awaymission/BMPship/Gate) "Tv" = ( /mob/living/simple_animal/hostile/retaliate/poison/snake, -/obj/item/reagent_containers/food/snacks/meat, +/obj/item/food/snacks/meat, /obj/item/shard, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/engine, @@ -6876,7 +6876,7 @@ /area/awaymission/BMPship/Engines) "UI" = ( /obj/structure/alien/weeds, -/obj/item/reagent_containers/food/drinks/mug{ +/obj/item/reagent_containers/drinks/mug{ pixel_x = -8 }, /turf/simulated/floor/plating/airless, @@ -6969,7 +6969,7 @@ /area/awaymission/BMPship/CommonArea) "VG" = ( /obj/effect/decal/cleanable/greenglow, -/obj/item/reagent_containers/food/snacks/monstermeat/spiderleg, +/obj/item/food/snacks/monstermeat/spiderleg, /obj/structure/spider/stickyweb, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/mineral/plastitanium/red, @@ -7219,7 +7219,7 @@ "Yh" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light_construct/small/south, -/obj/item/reagent_containers/food/snacks/meat, +/obj/item/food/snacks/meat, /obj/structure/spider/stickyweb, /obj/structure/spider/cocoon, /turf/simulated/floor/engine, @@ -7318,7 +7318,7 @@ "Zg" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb2, -/obj/item/reagent_containers/food/snacks/meat, +/obj/item/food/snacks/meat, /turf/simulated/floor/engine, /area/awaymission/BMPship/Containment) "Zj" = ( diff --git a/_maps/map_files220/RandomZLevels/blackmesa.dmm b/_maps/map_files220/RandomZLevels/blackmesa.dmm index 964617f6404f..e1eab762b339 100644 --- a/_maps/map_files220/RandomZLevels/blackmesa.dmm +++ b/_maps/map_files220/RandomZLevels/blackmesa.dmm @@ -44,7 +44,7 @@ /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/lambda_hallway) "aez" = ( -/obj/item/reagent_containers/food/snacks/choccherrycakeslice, +/obj/item/food/snacks/choccherrycakeslice, /obj/structure/table/wood, /turf/simulated/floor/wood/fancy/cherry, /area/awaymission/black_mesa/xen/vortigaunt_village_nihilanth) @@ -1226,8 +1226,8 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/reagent_containers/food/drinks/coffee, -/obj/item/reagent_containers/food/drinks/tea{ +/obj/item/reagent_containers/drinks/coffee, +/obj/item/reagent_containers/drinks/tea{ pixel_x = 5; pixel_y = 10 }, @@ -1992,8 +1992,8 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/reagent_containers/food/snacks/grown/coffee/robusta, -/obj/item/reagent_containers/food/snacks/grown/coffee{ +/obj/item/food/snacks/grown/coffee/robusta, +/obj/item/food/snacks/grown/coffee{ pixel_x = -3; pixel_y = -3 }, @@ -2024,7 +2024,7 @@ /area/awaymission/black_mesa/xen/vortigaunt_village) "cvC" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/sliceable/xenomeatbread, +/obj/item/food/snacks/sliceable/xenomeatbread, /turf/simulated/floor/wood/fancy/cherry, /area/awaymission/black_mesa/xen/vortigaunt_village) "cwd" = ( @@ -2467,7 +2467,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/black_ops_entrance) "cZn" = ( -/obj/item/reagent_containers/food/snacks/beans, +/obj/item/food/snacks/beans, /turf/simulated/floor/plating/xen, /area/awaymission/black_mesa/xen/freeman_puzzle) "cZp" = ( @@ -2626,7 +2626,7 @@ /area/awaymission/black_mesa/equipment_room) "dko" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/tea, +/obj/item/reagent_containers/drinks/tea, /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/entrance_lobby) "dkq" = ( @@ -2716,7 +2716,7 @@ /turf/simulated/floor/beach/away/coastline/xen, /area/awaymission/black_mesa/xen/entering_zone) "dpl" = ( -/obj/item/reagent_containers/food/snacks/popcorn, +/obj/item/food/snacks/popcorn, /turf/simulated/floor/wood, /area/awaymission/black_mesa/employee_dorm_room) "dpo" = ( @@ -2977,12 +2977,12 @@ /area/awaymission/black_mesa/black_ops_armory) "dGp" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/candy/candybar, -/obj/item/reagent_containers/food/snacks/candy/confectionery{ +/obj/item/food/snacks/candy/candybar, +/obj/item/food/snacks/candy/confectionery{ pixel_x = 3; pixel_y = 3 }, -/obj/item/reagent_containers/food/snacks/candy/confectionery{ +/obj/item/food/snacks/candy/confectionery{ pixel_x = 6; pixel_y = 6 }, @@ -3002,7 +3002,7 @@ /area/awaymission/black_mesa/entrance_internal_hall) "dGU" = ( /obj/structure/alien/xenoweeds, -/obj/item/reagent_containers/food/drinks/cans/sodawater, +/obj/item/reagent_containers/drinks/cans/sodawater, /turf/simulated/floor/plating/ironsand, /area/awaymission/black_mesa) "dGY" = ( @@ -3677,7 +3677,7 @@ /area/awaymission/black_mesa/high_security_hallway) "ewJ" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/xenomeatbreadslice, +/obj/item/food/snacks/xenomeatbreadslice, /turf/simulated/floor/wood/fancy/cherry, /area/awaymission/black_mesa/xen/vortigaunt_village) "ewP" = ( @@ -3820,15 +3820,15 @@ /area/awaymission/black_mesa/entrance_internal_hall) "eHp" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/soymilk{ +/obj/item/reagent_containers/condiment/soymilk{ pixel_x = 4; pixel_y = 4 }, -/obj/item/reagent_containers/food/drinks/bottle/cream{ +/obj/item/reagent_containers/drinks/bottle/cream{ pixel_y = 4; pixel_x = -4 }, -/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/condiment/milk, /obj/machinery/light/directional/east, /turf/simulated/floor/plasteel/dark{ icon_state = "dark" @@ -4256,7 +4256,7 @@ /area/awaymission/black_mesa/entrance_lobby) "fiC" = ( /obj/structure/closet/crate/wooden/wooden_crate, -/obj/item/reagent_containers/food/snacks/meat, +/obj/item/food/snacks/meat, /turf/simulated/floor/wood/fancy/cherry, /area/awaymission/black_mesa/xen/vortigaunt_village) "fje" = ( @@ -4373,7 +4373,7 @@ /area/awaymission/black_mesa/xen/freeman_hallway) "frM" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/doshik_spicy, +/obj/item/food/snacks/doshik_spicy, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel/dark, /area/awaymission/black_mesa/xen/lost_camp) @@ -5749,7 +5749,7 @@ /area/awaymission/black_mesa/xen/lost_camp) "han" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/monstermeat/xenomeat, +/obj/item/food/snacks/monstermeat/xenomeat, /turf/simulated/floor/wood/fancy/cherry, /area/awaymission/black_mesa/xen/vortigaunt_village) "haK" = ( @@ -6269,7 +6269,7 @@ /obj/item/storage/fancy/cigarettes/cigpack_uplift{ pixel_x = 10 }, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_y = 10; pixel_x = -9 }, @@ -6525,7 +6525,7 @@ /area/awaymission/black_mesa/xen/nihilanth_computer) "ieG" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/tea, +/obj/item/reagent_containers/drinks/tea, /turf/simulated/floor/plasteel{ icon_state = "green"; dir = 4 @@ -6588,7 +6588,7 @@ /area/awaymission/black_mesa/black_ops_armory) "ikb" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_y = 3 }, /turf/simulated/floor/plasteel, @@ -6788,7 +6788,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/entrance_lobby) "ixB" = ( -/obj/item/reagent_containers/food/snacks/beans, +/obj/item/food/snacks/beans, /turf/simulated/floor/plating/xen, /area/awaymission/black_mesa/xen/nihilanth_computer) "iyO" = ( @@ -6866,13 +6866,13 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/reagent_containers/food/snacks/muffin, -/obj/item/reagent_containers/food/snacks/muffin{ +/obj/item/food/snacks/muffin, +/obj/item/food/snacks/muffin{ pixel_x = 3; pixel_y = 3 }, -/obj/item/reagent_containers/food/snacks/poppypretzel, -/obj/item/reagent_containers/food/snacks/plum_pie, +/obj/item/food/snacks/poppypretzel, +/obj/item/food/snacks/plum_pie, /turf/simulated/floor/plasteel/dark{ icon_state = "dark" }, @@ -7438,7 +7438,7 @@ /area/awaymission/black_mesa/xen/acid_lake_building) "jka" = ( /obj/structure/closet/crate/wooden/wooden_crate, -/obj/item/reagent_containers/food/snacks/doshik_spicy, +/obj/item/food/snacks/doshik_spicy, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/deep_sci_storage) "jkk" = ( @@ -7748,11 +7748,11 @@ /area/awaymission/black_mesa/dorm_computers) "jFG" = ( /obj/structure/closet, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, -/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/drinks/bottle/whiskey, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass, /turf/simulated/floor/plasteel{ icon_state = "brownfull" }, @@ -8382,7 +8382,7 @@ /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/hecu_zone_external_hall) "kqh" = ( -/obj/item/reagent_containers/food/drinks/bottle/vodka, +/obj/item/reagent_containers/drinks/bottle/vodka, /turf/simulated/floor/plating, /area/awaymission/black_mesa/security_outpost) "kqI" = ( @@ -8805,19 +8805,19 @@ /area/awaymission/black_mesa/resonant_chamber) "kRb" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/bbqsauce, -/obj/item/reagent_containers/food/condiment/diablo_sauce, -/obj/item/reagent_containers/food/condiment/tomato_sauce, -/obj/item/reagent_containers/food/condiment/garlic_sauce, -/obj/item/reagent_containers/food/drinks/chicken_soup, -/obj/item/reagent_containers/food/drinks/chicken_soup, -/obj/item/reagent_containers/food/drinks/chicken_soup, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/bbqsauce, +/obj/item/reagent_containers/condiment/diablo_sauce, +/obj/item/reagent_containers/condiment/tomato_sauce, +/obj/item/reagent_containers/condiment/garlic_sauce, +/obj/item/reagent_containers/drinks/chicken_soup, +/obj/item/reagent_containers/drinks/chicken_soup, +/obj/item/reagent_containers/drinks/chicken_soup, +/obj/item/food/snacks/meat, +/obj/item/food/snacks/meat, +/obj/item/food/snacks/meat, +/obj/item/food/snacks/meat, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -9699,7 +9699,7 @@ /area/awaymission/black_mesa/science_labs) "lTy" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/doshik, +/obj/item/food/snacks/doshik, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel/dark, /area/awaymission/black_mesa/xen/lost_camp) @@ -9730,7 +9730,7 @@ /area/awaymission/black_mesa/xen/vortigaunt_village) "lWK" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_y = 10; pixel_x = 9 }, @@ -9772,7 +9772,7 @@ /area/awaymission/black_mesa/xen/nihilanth_computer) "lZi" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/coffee, +/obj/item/reagent_containers/drinks/coffee, /turf/simulated/floor/plasteel/dark{ icon_state = "dark" }, @@ -9863,10 +9863,10 @@ /area/awaymission/black_mesa/entrance_large_office) "mdX" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/pack/ketchup, -/obj/item/reagent_containers/food/condiment/pack/hotsauce, -/obj/item/reagent_containers/food/condiment/pack/hotsauce, -/obj/item/reagent_containers/food/condiment/pack/ketchup, +/obj/item/reagent_containers/condiment/pack/ketchup, +/obj/item/reagent_containers/condiment/pack/hotsauce, +/obj/item/reagent_containers/condiment/pack/hotsauce, +/obj/item/reagent_containers/condiment/pack/ketchup, /obj/item/trash/plate, /turf/simulated/floor/plasteel/dark, /area/awaymission/black_mesa/hecu_zone_camp) @@ -10257,7 +10257,7 @@ /area/awaymission/black_mesa/security_outpost) "mHz" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/coffee, +/obj/item/reagent_containers/drinks/coffee, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/entrance_large_office) @@ -10692,12 +10692,12 @@ /area/awaymission/black_mesa/xen/vortigaunt_village) "ncG" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/beans, +/obj/item/food/snacks/beans, /turf/simulated/floor/plasteel/dark, /area/awaymission/black_mesa/xen/lost_camp) "ncU" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/meat, +/obj/item/food/snacks/meat, /turf/simulated/floor/wood/fancy/cherry, /area/awaymission/black_mesa/xen/vortigaunt_village) "ndr" = ( @@ -12132,12 +12132,12 @@ /area/awaymission/black_mesa/hecu_zone_camp) "oNw" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/grown/banana, -/obj/item/reagent_containers/food/snacks/grown/banana{ +/obj/item/food/snacks/grown/banana, +/obj/item/food/snacks/grown/banana{ pixel_x = 3; pixel_y = 3 }, -/obj/item/reagent_containers/food/snacks/grown/banana{ +/obj/item/food/snacks/grown/banana{ pixel_x = 6; pixel_y = 6 }, @@ -12567,7 +12567,7 @@ /area/awaymission/black_mesa/entrance_large_office) "pnW" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/meat, +/obj/item/food/snacks/meat, /turf/simulated/floor/wood/fancy/cherry, /area/awaymission/black_mesa/xen/vortigaunt_village_nihilanth) "ppc" = ( @@ -12793,7 +12793,7 @@ /area/awaymission/black_mesa/deep_sci_turret) "pDq" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/donut/sprinkles, +/obj/item/food/snacks/donut/sprinkles, /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/entrance_lobby) "pDE" = ( @@ -13190,7 +13190,7 @@ /area/awaymission/black_mesa/hecu_zone_camp) "qeH" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/doshik_spicy, +/obj/item/food/snacks/doshik_spicy, /turf/simulated/floor/plasteel/dark, /area/awaymission/black_mesa/xen/acid_lake_building) "qfg" = ( @@ -13834,7 +13834,7 @@ /area/awaymission/black_mesa/entrance_large_office) "qPE" = ( /obj/structure/closet/crate/wooden/wooden_crate, -/obj/item/reagent_containers/food/snacks/doshik, +/obj/item/food/snacks/doshik, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/deep_sci_storage) "qPF" = ( @@ -14665,7 +14665,7 @@ /area/awaymission/black_mesa/hecu_zone_external_hall) "rSI" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/beans, +/obj/item/food/snacks/beans, /turf/simulated/floor/plating/xen, /area/awaymission/black_mesa/xen/vortigaunt_village) "rSN" = ( @@ -15146,11 +15146,11 @@ /area/awaymission/black_mesa/black_ops_turret_blockade) "swo" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/coffee, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee, +/obj/item/reagent_containers/drinks/coffee{ pixel_x = 10 }, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ desc = "Its cold like the space outside noo!"; pixel_x = -6; pixel_y = 8; @@ -15187,22 +15187,22 @@ /area/awaymission/black_mesa/hecu_zone_infirmary) "szl" = ( /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/food/drinks/cans/sodawater, -/obj/item/reagent_containers/food/drinks/cans/sodawater, -/obj/item/reagent_containers/food/drinks/cans/sodawater, -/obj/item/reagent_containers/food/drinks/cans/sodawater, -/obj/item/reagent_containers/food/drinks/cans/sodawater, -/obj/item/reagent_containers/food/drinks/cans/lemon_lime, -/obj/item/reagent_containers/food/drinks/cans/lemon_lime, -/obj/item/reagent_containers/food/drinks/cans/lemon_lime, -/obj/item/reagent_containers/food/drinks/cans/cola, -/obj/item/reagent_containers/food/drinks/cans/cola, -/obj/item/reagent_containers/food/drinks/cans/cola, -/obj/item/reagent_containers/food/drinks/cans/grape_juice, -/obj/item/reagent_containers/food/drinks/cans/grape_juice, -/obj/item/reagent_containers/food/drinks/cans/grape_juice, -/obj/item/reagent_containers/food/drinks/cans/dr_gibb, -/obj/item/reagent_containers/food/drinks/cans/dr_gibb, +/obj/item/reagent_containers/drinks/cans/sodawater, +/obj/item/reagent_containers/drinks/cans/sodawater, +/obj/item/reagent_containers/drinks/cans/sodawater, +/obj/item/reagent_containers/drinks/cans/sodawater, +/obj/item/reagent_containers/drinks/cans/sodawater, +/obj/item/reagent_containers/drinks/cans/lemon_lime, +/obj/item/reagent_containers/drinks/cans/lemon_lime, +/obj/item/reagent_containers/drinks/cans/lemon_lime, +/obj/item/reagent_containers/drinks/cans/cola, +/obj/item/reagent_containers/drinks/cans/cola, +/obj/item/reagent_containers/drinks/cans/cola, +/obj/item/reagent_containers/drinks/cans/grape_juice, +/obj/item/reagent_containers/drinks/cans/grape_juice, +/obj/item/reagent_containers/drinks/cans/grape_juice, +/obj/item/reagent_containers/drinks/cans/dr_gibb, +/obj/item/reagent_containers/drinks/cans/dr_gibb, /obj/effect/turf_decal/stripes/line{ dir = 9 }, @@ -15438,7 +15438,7 @@ /area/awaymission/black_mesa/entrance_lobby) "sNn" = ( /obj/structure/closet/crate/can, -/obj/item/reagent_containers/food/snacks/donut/sprinkles, +/obj/item/food/snacks/donut/sprinkles, /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/gas_emitter_chamber) "sNG" = ( @@ -16055,7 +16055,7 @@ "tGv" = ( /obj/structure/table, /obj/item/clothing/glasses/regular, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ pixel_x = 10; pixel_y = 10 }, @@ -16424,7 +16424,7 @@ /area/awaymission/black_mesa/entrance_lobby) "uhs" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/candy/taffy, +/obj/item/food/snacks/candy/taffy, /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/hecu_zone_infirmary) "uhN" = ( @@ -17431,7 +17431,7 @@ /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/entrance_internal_hall) "vrW" = ( -/obj/item/reagent_containers/food/snacks/donut/sprinkles, +/obj/item/food/snacks/donut/sprinkles, /obj/structure/table/wood, /turf/simulated/floor/wood/fancy/cherry, /area/awaymission/black_mesa/xen/vortigaunt_village_nihilanth) @@ -17807,8 +17807,8 @@ /area/awaymission/black_mesa/xen/village_hallway) "vPn" = ( /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/flour, /obj/machinery/light/directional/west, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -17948,7 +17948,7 @@ /obj/structure/table, /obj/item/paper, /obj/item/pen, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ pixel_x = 10 }, /turf/simulated/floor/plasteel, @@ -18140,11 +18140,11 @@ /area/awaymission/black_mesa/xen/acid_lake_building) "wnV" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = 8; pixel_y = 2 }, -/obj/item/reagent_containers/food/snacks/chips, +/obj/item/food/snacks/chips, /turf/simulated/floor/plating/ironsand, /area/awaymission/black_mesa/hecu_zone_camp) "woi" = ( @@ -19351,7 +19351,7 @@ /area/awaymission/black_mesa/employee_dorm_room) "xKX" = ( /obj/structure/closet/crate/wooden/wooden_crate, -/obj/item/reagent_containers/food/snacks/beans, +/obj/item/food/snacks/beans, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/deep_sci_storage) "xMb" = ( diff --git a/_maps/map_files220/RandomZLevels/caves.dmm b/_maps/map_files220/RandomZLevels/caves.dmm index 46aaff30be53..7e188fad7bd8 100644 --- a/_maps/map_files220/RandomZLevels/caves.dmm +++ b/_maps/map_files220/RandomZLevels/caves.dmm @@ -458,7 +458,7 @@ pixel_y = 10 }, /obj/effect/spawner/random_spawners/dirt_often, -/obj/item/reagent_containers/food/snacks/grown/apple/poisoned, +/obj/item/food/snacks/grown/apple/poisoned, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "bY" = ( @@ -1790,7 +1790,7 @@ /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "iy" = ( -/obj/item/reagent_containers/food/snacks/grown/poppy{ +/obj/item/food/snacks/grown/poppy{ pixel_y = -15; pixel_x = -5 }, @@ -2185,7 +2185,7 @@ /area/awaymission/caves/build) "kC" = ( /obj/effect/decal/remains/human, -/obj/item/reagent_containers/food/snacks/grown/harebell, +/obj/item/food/snacks/grown/harebell, /obj/item/clothing/suit/armor/riot/knight/red, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) @@ -2348,13 +2348,13 @@ /area/awaymission/caves/build/reqpower_build) "lw" = ( /obj/structure/table/wood/fancy/red, -/obj/item/reagent_containers/food/snacks/candy/cotton/poison, -/obj/item/reagent_containers/food/snacks/candy/jellybean/poison{ +/obj/item/food/snacks/candy/cotton/poison, +/obj/item/food/snacks/candy/jellybean/poison{ pixel_x = -5; pixel_y = 4 }, -/obj/item/reagent_containers/food/snacks/candy/gummyworm/poison, -/obj/item/reagent_containers/food/snacks/candy/gummybear/poison{ +/obj/item/food/snacks/candy/gummyworm/poison, +/obj/item/food/snacks/candy/gummybear/poison{ pixel_x = 5; pixel_y = 5 }, @@ -9360,8 +9360,8 @@ /area/awaymission/caves) "Wr" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/cans/beer, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer, +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = 5; pixel_y = 7 }, @@ -9996,8 +9996,8 @@ "Zz" = ( /obj/structure/closet/crate/wooden/wooden_crate, /obj/structure/stone_tile/slab, -/obj/item/reagent_containers/food/drinks/trophy/bronze_cup, -/obj/item/reagent_containers/food/drinks/bottle/wine{ +/obj/item/reagent_containers/drinks/trophy/bronze_cup, +/obj/item/reagent_containers/drinks/bottle/wine{ name = "Thousand-year-old wine"; icon_state = "patronbottle" }, diff --git a/_maps/map_files220/RandomZLevels/gate_lizard.dmm b/_maps/map_files220/RandomZLevels/gate_lizard.dmm index 541121815f81..c85ab049a4b6 100644 --- a/_maps/map_files220/RandomZLevels/gate_lizard.dmm +++ b/_maps/map_files220/RandomZLevels/gate_lizard.dmm @@ -150,7 +150,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "ajt" = ( -/obj/item/reagent_containers/food/drinks/oilcan, +/obj/item/reagent_containers/drinks/oilcan, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) @@ -309,7 +309,7 @@ /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "ati" = ( -/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/drinks/cans/cola, /obj/effect/spawner/random_spawners/dirt_maybe, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) @@ -324,7 +324,7 @@ "atT" = ( /obj/structure/table/reinforced, /obj/item/storage/fancy/donut_box/empty, -/obj/item/reagent_containers/food/drinks/cans/cola{ +/obj/item/reagent_containers/drinks/cans/cola{ pixel_y = 9; pixel_x = 13 }, @@ -1005,9 +1005,9 @@ /area/awaymission/jungle_planet/outside/river) "bru" = ( /obj/structure/closet/crate/wooden/barrel, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, +/obj/item/food/snacks/meat, +/obj/item/food/snacks/meat, +/obj/item/food/snacks/meat, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave) "brT" = ( @@ -1219,13 +1219,13 @@ }, /area/awaymission/jungle_planet/outside) "bBR" = ( -/obj/item/reagent_containers/food/snacks/grown/chili, -/obj/item/reagent_containers/food/snacks/grown/carrot, -/obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle, -/obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle, -/obj/item/reagent_containers/food/snacks/grown/onion, -/obj/item/reagent_containers/food/snacks/grown/potato, -/obj/item/reagent_containers/food/snacks/grown/potato, +/obj/item/food/snacks/grown/chili, +/obj/item/food/snacks/grown/carrot, +/obj/item/food/snacks/grown/mushroom/chanterelle, +/obj/item/food/snacks/grown/mushroom/chanterelle, +/obj/item/food/snacks/grown/onion, +/obj/item/food/snacks/grown/potato, +/obj/item/food/snacks/grown/potato, /obj/structure/closet/crate/wooden/wooden_crate, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/small) @@ -1411,7 +1411,7 @@ }, /area/awaymission/jungle_planet/inside/complex) "bNN" = ( -/obj/item/reagent_containers/food/snacks/grown/harebell, +/obj/item/food/snacks/grown/harebell, /obj/structure/stone_tile/slab/cracked{ dir = 4 }, @@ -1574,7 +1574,7 @@ /area/awaymission/jungle_planet/outside/waterfall) "caT" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = -5 }, /obj/effect/spawner/random_spawners/dirt_frequent, @@ -1607,7 +1607,7 @@ /area/awaymission/jungle_planet/outside) "ccc" = ( /obj/structure/closet/crate/wooden/barrel, -/obj/item/reagent_containers/food/snacks/monkeykabob, +/obj/item/food/snacks/monkeykabob, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave) "cco" = ( @@ -2613,7 +2613,7 @@ /area/awaymission/jungle_planet/outside) "dpL" = ( /obj/structure/closet, -/obj/item/reagent_containers/food/snacks/candy/candybar, +/obj/item/food/snacks/candy/candybar, /obj/item/stack/spacecash/c10, /obj/item/flashlight/seclite, /obj/item/clothing/shoes/combat, @@ -3130,7 +3130,7 @@ /obj/structure/table/reinforced, /obj/item/trash/chips, /obj/item/stack/tape_roll, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ desc = "Its cold like the space outside noo!"; list_reagents = list("coffee" = 0) }, @@ -3168,7 +3168,7 @@ /area/awaymission/jungle_planet/inside/complex) "efS" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/cans/beer, +/obj/item/reagent_containers/drinks/cans/beer, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "egj" = ( @@ -3588,9 +3588,9 @@ name = "kitchen Cabinet"; req_access = list(201) }, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/sugar, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/sugar, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -3623,7 +3623,7 @@ /area/awaymission/jungle_planet/outside/river) "eJx" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ list_reagents = list("rum" = 50) }, /obj/item/clothing/mask/cigarette/pipe, @@ -4124,7 +4124,7 @@ /turf/simulated/floor/beach/away/water/deep/dense_canpass, /area/awaymission/jungle_planet/outside/river) "frZ" = ( -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ list_reagents = list("beer"=0) }, /turf/simulated/floor/plating/asteroid/ancient{ @@ -4305,12 +4305,12 @@ icon_state = "telescreen_console"; pixel_x = -32 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "fFa" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/oilcan, +/obj/item/reagent_containers/drinks/oilcan, /obj/structure/reagent_dispensers/fueltank/chem{ pixel_y = 30 }, @@ -4599,7 +4599,7 @@ /area/awaymission/jungle_planet/outside/river) "fYG" = ( /obj/effect/spawner/random_spawners/dirt_often, -/obj/item/reagent_containers/food/drinks/bottle/rum{ +/obj/item/reagent_containers/drinks/bottle/rum{ list_reagents = list("rum" = 0) }, /obj/effect/landmark/damageturf, @@ -4623,11 +4623,11 @@ /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/small) "gaG" = ( -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ list_reagents = list("beer"=0); pixel_x = 9 }, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ list_reagents = list("beer"=0) }, /turf/simulated/floor/wood/oak, @@ -4822,7 +4822,7 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside) "gpD" = ( -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ layer = 5; pixel_y = 14 }, @@ -4964,7 +4964,7 @@ /area/awaymission/jungle_planet/inside/complex) "gAD" = ( /obj/structure/curtain/black, -/obj/item/reagent_containers/food/drinks/bottle/rum{ +/obj/item/reagent_containers/drinks/bottle/rum{ list_reagents = list("rum" = 0) }, /obj/effect/mob_spawn/human/corpse/skeleton, @@ -5296,8 +5296,8 @@ /area/awaymission/jungle_planet/inside/complex) "gYH" = ( /obj/structure/stone_tile/slab/cracked, -/obj/item/reagent_containers/food/snacks/grown/poppy/lily, -/obj/item/reagent_containers/food/snacks/grown/moonflower, +/obj/item/food/snacks/grown/poppy/lily, +/obj/item/food/snacks/grown/moonflower, /turf/simulated/floor/engine/cult, /area/awaymission/jungle_planet/outside/cave) "gZm" = ( @@ -5755,10 +5755,10 @@ /area/awaymission/jungle_planet/outside/abandoned) "hws" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, +/obj/item/food/snacks/meat, +/obj/item/food/snacks/meat, +/obj/item/food/snacks/meat, +/obj/item/food/snacks/meat, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave) "hwW" = ( @@ -6008,11 +6008,11 @@ /area/awaymission/jungle_planet/outside/cave) "hOx" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/mushroom_bowl{ +/obj/item/reagent_containers/drinks/mushroom_bowl{ pixel_y = -23; pixel_x = 9 }, -/obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle, +/obj/item/food/snacks/grown/mushroom/chanterelle, /turf/simulated/floor/engine/cult, /area/awaymission/jungle_planet/outside/cave) "hPx" = ( @@ -7149,7 +7149,7 @@ /area/awaymission/jungle_planet/outside/waterfall) "jie" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/mushroom_bowl, +/obj/item/reagent_containers/drinks/mushroom_bowl, /turf/simulated/floor/engine/cult, /area/awaymission/jungle_planet/outside/cave) "jiu" = ( @@ -7590,8 +7590,8 @@ /obj/item/reagent_containers/glass/beaker/waterbottle/large, /obj/item/reagent_containers/glass/beaker/waterbottle/large, /obj/item/reagent_containers/glass/beaker/waterbottle/large, -/obj/item/reagent_containers/food/drinks/cans/cola, -/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/drinks/cans/cola, +/obj/item/reagent_containers/drinks/cans/cola, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "jIo" = ( @@ -8182,10 +8182,10 @@ /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "kvb" = ( -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3 }, /obj/structure/table, @@ -8392,7 +8392,7 @@ /area/awaymission/jungle_planet/inside/complex) "kHh" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/monkeysdelight, +/obj/item/food/snacks/monkeysdelight, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave) "kHP" = ( @@ -8616,7 +8616,7 @@ }, /area/awaymission/jungle_planet/inside/complex) "kUl" = ( -/obj/item/reagent_containers/food/drinks/bottle/tequila, +/obj/item/reagent_containers/drinks/bottle/tequila, /obj/effect/spawner/random_spawners/dirt_often, /obj/structure/closet/crate/wooden/wooden_crate, /turf/simulated/floor/wood/oak, @@ -8805,12 +8805,12 @@ "lfb" = ( /obj/effect/turf_decal/delivery/white, /obj/structure/closet/cardboard, -/obj/item/reagent_containers/food/snacks/beans, -/obj/item/reagent_containers/food/snacks/beans, -/obj/item/reagent_containers/food/snacks/beans, -/obj/item/reagent_containers/food/snacks/beans, -/obj/item/reagent_containers/food/snacks/candy/donor, -/obj/item/reagent_containers/food/snacks/candy/donor, +/obj/item/food/snacks/beans, +/obj/item/food/snacks/beans, +/obj/item/food/snacks/beans, +/obj/item/food/snacks/beans, +/obj/item/food/snacks/candy/donor, +/obj/item/food/snacks/candy/donor, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "lfj" = ( @@ -8876,19 +8876,19 @@ /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "liO" = ( -/obj/item/reagent_containers/food/drinks/mushroom_bowl{ +/obj/item/reagent_containers/drinks/mushroom_bowl{ pixel_y = -11; pixel_x = -11 }, -/obj/item/reagent_containers/food/drinks/mushroom_bowl{ +/obj/item/reagent_containers/drinks/mushroom_bowl{ pixel_y = -23; pixel_x = 9 }, -/obj/item/reagent_containers/food/snacks/grown/mushroom/libertycap, -/obj/item/reagent_containers/food/snacks/grown/mushroom/reishi{ +/obj/item/food/snacks/grown/mushroom/libertycap, +/obj/item/food/snacks/grown/mushroom/reishi{ pixel_x = -7 }, -/obj/item/reagent_containers/food/snacks/grown/mushroom/amanita, +/obj/item/food/snacks/grown/mushroom/amanita, /obj/structure/stone_tile/block/cracked, /turf/simulated/floor/engine/cult, /area/awaymission/jungle_planet/outside/cave) @@ -9991,7 +9991,7 @@ /area/awaymission/jungle_planet/inside/complex) "mBN" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/meat, +/obj/item/food/snacks/meat, /turf/simulated/floor/plating/asteroid/ancient{ name = "ground" }, @@ -10197,8 +10197,8 @@ /area/awaymission/jungle_planet/outside/cave) "mMo" = ( /obj/structure/closet/crate/wooden/barrel, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, +/obj/item/food/snacks/meat, +/obj/item/food/snacks/meat, /obj/effect/landmark/damageturf, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave) @@ -10306,7 +10306,7 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside) "mSW" = ( -/obj/item/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/drinks/bottle/whiskey, /obj/effect/spawner/random_spawners/dirt_often, /obj/structure/closet/crate/wooden/wooden_crate, /obj/effect/landmark/damageturf, @@ -10613,7 +10613,7 @@ /area/awaymission/jungle_planet/outside/abandoned) "njL" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/monkeysdelight, +/obj/item/food/snacks/monkeysdelight, /turf/simulated/floor/engine/cult, /area/awaymission/jungle_planet/outside/cave) "njP" = ( @@ -10630,8 +10630,8 @@ /area/awaymission/jungle_planet/outside/river) "nok" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/mushroom_bowl, -/obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle, +/obj/item/reagent_containers/drinks/mushroom_bowl, +/obj/item/food/snacks/grown/mushroom/chanterelle, /turf/simulated/floor/engine/cult, /area/awaymission/jungle_planet/outside/cave) "nou" = ( @@ -11118,7 +11118,7 @@ /turf/simulated/floor/mineral/plastitanium, /area/awaymission/jungle_planet/outside/abandoned) "nZe" = ( -/obj/item/reagent_containers/food/drinks/trophy/silver_cup, +/obj/item/reagent_containers/drinks/trophy/silver_cup, /obj/item/clothing/gloves/ring/gold, /obj/effect/spawner/random_spawners/dirt_often, /obj/structure/closet/crate/wooden/wooden_crate, @@ -11269,7 +11269,7 @@ /turf/simulated/floor/beach/away/sand, /area/awaymission/jungle_planet/outside/waterfall) "oke" = ( -/obj/item/reagent_containers/food/drinks/oilcan, +/obj/item/reagent_containers/drinks/oilcan, /turf/simulated/floor/beach/away/sand, /area/awaymission/jungle_planet/outside/river) "okx" = ( @@ -11299,11 +11299,11 @@ "omT" = ( /obj/effect/decal/cleanable/cobweb, /obj/structure/closet/crate/wooden/wooden_crate, -/obj/item/reagent_containers/food/snacks/grown/cannabis, -/obj/item/reagent_containers/food/snacks/grown/cannabis, -/obj/item/reagent_containers/food/snacks/grown/cannabis/ultimate, -/obj/item/reagent_containers/food/snacks/grown/cannabis/ultimate, -/obj/item/reagent_containers/food/snacks/grown/cannabis/ultimate, +/obj/item/food/snacks/grown/cannabis, +/obj/item/food/snacks/grown/cannabis, +/obj/item/food/snacks/grown/cannabis/ultimate, +/obj/item/food/snacks/grown/cannabis/ultimate, +/obj/item/food/snacks/grown/cannabis/ultimate, /obj/effect/landmark/damageturf, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave) @@ -11736,7 +11736,7 @@ "oMg" = ( /obj/structure/table/wood, /obj/item/storage/fancy/cigarettes/cigpack_robust, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ list_reagents = list("beer" = 0); pixel_x = -11; pixel_y = 2 @@ -11877,7 +11877,7 @@ /area/awaymission/jungle_planet/inside/complex) "oTJ" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/mushroom_bowl{ +/obj/item/reagent_containers/drinks/mushroom_bowl{ pixel_y = -11; pixel_x = -11 }, @@ -12205,7 +12205,7 @@ /obj/structure/table, /obj/item/wrench, /obj/item/screwdriver, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ desc = "Its cold like the space outside noo!"; pixel_x = -6; pixel_y = 8; @@ -12632,7 +12632,7 @@ /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "pZY" = ( -/obj/item/reagent_containers/food/drinks/oilcan, +/obj/item/reagent_containers/drinks/oilcan, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "qaT" = ( @@ -12715,11 +12715,11 @@ /area/awaymission/jungle_planet/outside/cave) "qgA" = ( /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, /obj/item/storage/fancy/egg_box, -/obj/item/reagent_containers/food/drinks/bottle/cream, +/obj/item/reagent_containers/drinks/bottle/cream, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -13291,11 +13291,11 @@ /area/awaymission/jungle_planet/inside/complex) "qOH" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/meat{ +/obj/item/food/snacks/meat{ pixel_y = -22; pixel_x = -7 }, -/obj/item/reagent_containers/food/snacks/monkeysdelight, +/obj/item/food/snacks/monkeysdelight, /turf/simulated/floor/engine/cult, /area/awaymission/jungle_planet/outside/cave) "qOM" = ( @@ -13438,7 +13438,7 @@ /area/awaymission/jungle_planet/inside/complex) "qVY" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/meat, +/obj/item/food/snacks/meat, /turf/simulated/floor/engine/cult, /area/awaymission/jungle_planet/outside/cave) "qVZ" = ( @@ -13580,7 +13580,7 @@ }, /obj/item/coin/gold, /obj/item/clothing/mask/cigarette/pipe/cobpipe, -/obj/item/reagent_containers/food/drinks/bottle/rum{ +/obj/item/reagent_containers/drinks/bottle/rum{ list_reagents = list("rum" = 0) }, /turf/simulated/floor/wood/oak, @@ -14011,7 +14011,7 @@ /area/awaymission/jungle_planet/outside/abandoned) "rHT" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass, /obj/item/storage/fancy/matches, /obj/effect/decal/cleanable/cobweb2, /obj/item/clothing/mask/cigarette/pipe, @@ -14846,8 +14846,8 @@ /area/awaymission/jungle_planet/inside/complex) "sDQ" = ( /obj/structure/stone_tile/slab/cracked, -/obj/item/reagent_containers/food/snacks/grown/poppy, -/obj/item/reagent_containers/food/snacks/grown/poppy/geranium, +/obj/item/food/snacks/grown/poppy, +/obj/item/food/snacks/grown/poppy/geranium, /turf/simulated/floor/engine/cult, /area/awaymission/jungle_planet/outside/cave) "sFa" = ( @@ -14884,8 +14884,8 @@ /area/awaymission/jungle_planet/outside/cave/pirate) "sIz" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/shaker, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/drinks/shaker, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_x = -4 }, /obj/effect/spawner/random_spawners/dirt_maybe, @@ -15220,13 +15220,13 @@ }, /area/awaymission/jungle_planet/outside/river) "tey" = ( -/obj/item/reagent_containers/food/snacks/grown/chili, -/obj/item/reagent_containers/food/snacks/grown/carrot, -/obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle, -/obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle, -/obj/item/reagent_containers/food/snacks/grown/onion, -/obj/item/reagent_containers/food/snacks/grown/potato, -/obj/item/reagent_containers/food/snacks/grown/potato, +/obj/item/food/snacks/grown/chili, +/obj/item/food/snacks/grown/carrot, +/obj/item/food/snacks/grown/mushroom/chanterelle, +/obj/item/food/snacks/grown/mushroom/chanterelle, +/obj/item/food/snacks/grown/onion, +/obj/item/food/snacks/grown/potato, +/obj/item/food/snacks/grown/potato, /obj/effect/decal/cleanable/cobweb2, /obj/structure/closet/crate/wooden/wooden_crate, /turf/simulated/floor/wood/oak, @@ -17310,7 +17310,7 @@ /area/awaymission/jungle_planet/outside/cave) "vCb" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/fried_vox{ +/obj/item/food/snacks/fried_vox{ pixel_y = 5 }, /turf/simulated/floor/wood/oak, @@ -17409,7 +17409,7 @@ pixel_x = -3; pixel_y = 18 }, -/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/drinks/drinkingglass, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "vHh" = ( @@ -18249,7 +18249,7 @@ /area/awaymission/jungle_planet/inside) "wMk" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ list_reagents = list("rum" = 50) }, /turf/simulated/floor/wood/oak, @@ -18702,8 +18702,8 @@ /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "xmJ" = ( -/obj/item/reagent_containers/food/drinks/mushroom_bowl, -/obj/item/reagent_containers/food/snacks/badrecipe, +/obj/item/reagent_containers/drinks/mushroom_bowl, +/obj/item/food/snacks/badrecipe, /turf/simulated/floor/engine/cult, /area/awaymission/jungle_planet/outside/cave) "xmQ" = ( @@ -19184,7 +19184,7 @@ /obj/structure/table/wood, /obj/item/flashlight/lamp, /obj/item/pen/fancy, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/drinks/bottle/whiskey{ list_reagents = list("whiskey" = 0); pixel_x = -9 }, @@ -19192,8 +19192,8 @@ /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "xSz" = ( -/obj/item/reagent_containers/food/drinks/bottle/rum, -/obj/item/reagent_containers/food/drinks/bottle/rum{ +/obj/item/reagent_containers/drinks/bottle/rum, +/obj/item/reagent_containers/drinks/bottle/rum{ list_reagents = list("rum" = 0) }, /obj/structure/closet/crate/wooden/wooden_crate, diff --git a/_maps/map_files220/RandomZLevels/wildwest.dmm b/_maps/map_files220/RandomZLevels/wildwest.dmm index 4721a0588752..8f44a39289b2 100644 --- a/_maps/map_files220/RandomZLevels/wildwest.dmm +++ b/_maps/map_files220/RandomZLevels/wildwest.dmm @@ -130,7 +130,7 @@ /area/awaymission/wildwest/wildwest_refine) "bd" = ( /obj/structure/table/holotable/wood, -/obj/item/reagent_containers/food/snacks/mint, +/obj/item/food/snacks/mint, /obj/item/kitchen/utensil/fork, /turf/simulated/floor/wood/oak, /area/awaymission/wildwest/wildwest_mines) @@ -783,7 +783,7 @@ /obj/structure/table, /obj/item/megaphone, /obj/structure/extinguisher_cabinet/directional/east, -/obj/item/reagent_containers/food/drinks/coffee, +/obj/item/reagent_containers/drinks/coffee, /obj/item/folder/yellow{ pixel_x = 2; pixel_y = 2 @@ -1006,7 +1006,7 @@ /area/awaymission/wildwest/wildwest_refine) "jM" = ( /obj/structure/table/holotable/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass, /turf/simulated/floor/wood/oak, /area/awaymission/wildwest/wildwest_mines) "jP" = ( @@ -1156,16 +1156,16 @@ /area/awaymission/wildwest/wildwest_vault) "ll" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ layer = 5; pixel_x = 8; pixel_y = 6 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -8; pixel_y = 11 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8; pixel_y = 1 }, @@ -1608,8 +1608,8 @@ /area/awaymission/wildwest/wildwest_vault) "oR" = ( /obj/structure/table/holotable/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass/soda, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/drinkingglass/soda, +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = -7 }, /turf/simulated/floor/wood/oak, @@ -1641,11 +1641,11 @@ "ps" = ( /obj/structure/table/holotable/wood, /obj/item/reagent_containers/glass/rag, -/obj/item/reagent_containers/food/drinks/shaker, -/obj/item/reagent_containers/food/drinks/drinkingglass/soda{ +/obj/item/reagent_containers/drinks/shaker, +/obj/item/reagent_containers/drinks/drinkingglass/soda{ pixel_x = 6 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/soda{ +/obj/item/reagent_containers/drinks/drinkingglass/soda{ pixel_x = 11; pixel_y = 3 }, @@ -2288,7 +2288,7 @@ /area/awaymission/wildwest/wildwest_mines) "vL" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/snacks/syndicake, +/obj/item/food/snacks/syndicake, /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/wildwest/wildwest_refine) "wh" = ( @@ -2305,7 +2305,7 @@ /turf/simulated/wall/mineral/sandstone, /area/awaymission/wildwest/wildwest_mines) "wk" = ( -/obj/item/reagent_containers/food/drinks/oilcan, +/obj/item/reagent_containers/drinks/oilcan, /obj/effect/decal/cleanable/blood/oil, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -2515,7 +2515,7 @@ /area/awaymission/wildwest/wildwest_mines) "yH" = ( /obj/structure/table/holotable/wood, -/obj/item/reagent_containers/food/drinks/cans/beer, +/obj/item/reagent_containers/drinks/cans/beer, /turf/simulated/floor/wood/oak, /area/awaymission/wildwest/wildwest_mines) "yK" = ( @@ -2525,7 +2525,7 @@ /area/awaymission/wildwest/wildwest_mines) "yP" = ( /obj/structure/table/holotable/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass/soda{ +/obj/item/reagent_containers/drinks/drinkingglass/soda{ pixel_x = 6 }, /obj/effect/decal/cleanable/dirt, @@ -2890,7 +2890,7 @@ /area/awaymission/wildwest/wildwest_vault) "Cw" = ( /obj/structure/table/holotable/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass/soda{ +/obj/item/reagent_containers/drinks/drinkingglass/soda{ pixel_x = 11 }, /obj/structure/sign/poster/official/random/south, @@ -3401,7 +3401,7 @@ /area/awaymission/wildwest/wildwest_mines) "Hj" = ( /obj/structure/table/holotable/wood, -/obj/item/reagent_containers/food/snacks/mint, +/obj/item/food/snacks/mint, /turf/simulated/floor/wood/oak, /area/awaymission/wildwest/wildwest_mines) "Hm" = ( @@ -4150,7 +4150,7 @@ /area/awaymission/wildwest/wildwest_mines) "Pz" = ( /obj/structure/table/holotable/wood, -/obj/item/reagent_containers/food/snacks/mint, +/obj/item/food/snacks/mint, /obj/item/kitchen/utensil/spoon, /obj/item/kitchen/utensil/fork{ pixel_x = 6 @@ -4419,10 +4419,10 @@ /area/awaymission/wildwest/wildwest_mines) "Sq" = ( /obj/structure/table/holotable/wood, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = -7 }, -/obj/item/reagent_containers/food/drinks/cans/beer, +/obj/item/reagent_containers/drinks/cans/beer, /turf/simulated/floor/wood/oak, /area/awaymission/wildwest/wildwest_mines) "Sr" = ( @@ -4732,7 +4732,7 @@ /area/awaymission/wildwest/wildwest_mines) "VG" = ( /obj/structure/table/holotable/wood, -/obj/item/reagent_containers/food/snacks/mint, +/obj/item/food/snacks/mint, /obj/item/kitchen/utensil/fork, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood/oak, @@ -4769,7 +4769,7 @@ "VW" = ( /obj/structure/table/holotable/wood, /obj/structure/table/holotable/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass/soda{ +/obj/item/reagent_containers/drinks/drinkingglass/soda{ pixel_x = 6 }, /turf/simulated/floor/wood/oak, @@ -5094,7 +5094,7 @@ /area/awaymission/wildwest/wildwest_mines) "ZG" = ( /obj/structure/table/holotable/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood/oak, /area/awaymission/wildwest/wildwest_mines) diff --git a/_maps/map_files220/cyberiad/cyberiad.dmm b/_maps/map_files220/cyberiad/cyberiad.dmm index a2bb6ee16d4a..38bb65fe4284 100644 --- a/_maps/map_files220/cyberiad/cyberiad.dmm +++ b/_maps/map_files220/cyberiad/cyberiad.dmm @@ -756,7 +756,7 @@ /area/station/security/main) "aeC" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/mug/hos, +/obj/item/reagent_containers/drinks/mug/hos, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -5904,7 +5904,7 @@ /obj/item/radio{ pixel_x = 5 }, -/obj/item/reagent_containers/food/drinks/mug/sec, +/obj/item/reagent_containers/drinks/mug/sec, /turf/simulated/floor/plating, /area/station/maintenance/fore) "axX" = ( @@ -6140,7 +6140,7 @@ "ayM" = ( /obj/machinery/light/directional/south, /obj/machinery/ai_status_display/south, -/obj/item/reagent_containers/food/drinks/mug/sec, +/obj/item/reagent_containers/drinks/mug/sec, /obj/structure/table, /turf/simulated/floor/plasteel{ icon_state = "redcorner" @@ -7592,7 +7592,7 @@ /area/station/maintenance/abandonedbar) "aCW" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/patron, +/obj/item/reagent_containers/drinks/bottle/patron, /obj/item/storage/fancy/cigarettes/cigpack_shadyjims, /obj/machinery/light_construct/small/east, /turf/simulated/floor/plating, @@ -7718,7 +7718,7 @@ "aDq" = ( /obj/effect/decal/cleanable/dust, /obj/structure/table, -/obj/item/reagent_containers/food/snacks/cheesewedge, +/obj/item/food/snacks/cheesewedge, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aDr" = ( @@ -7826,7 +7826,7 @@ /obj/item/clothing/suit/wcoat, /obj/item/clothing/suit/blacktrenchcoat, /obj/item/clothing/under/suit/tan, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/drinks/bottle/whiskey, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "aDD" = ( @@ -8221,7 +8221,7 @@ /obj/structure/sign/poster/contraband/random/east, /obj/structure/sink/kitchen/east, /obj/structure/closet/walllocker/medlocker/south, -/obj/item/reagent_containers/food/drinks/shaker{ +/obj/item/reagent_containers/drinks/shaker{ pixel_x = -8; pixel_y = 2 }, @@ -8230,8 +8230,8 @@ /area/station/maintenance/abandonedbar) "aFb" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/condiment/saltshaker, -/obj/item/reagent_containers/food/condiment/peppermill, +/obj/item/reagent_containers/condiment/saltshaker, +/obj/item/reagent_containers/condiment/peppermill, /turf/simulated/floor/plating, /area/station/maintenance/abandonedbar) "aFc" = ( @@ -8372,7 +8372,7 @@ /obj/item/clothing/glasses/sunglasses{ pixel_y = 6 }, -/obj/item/reagent_containers/food/drinks/flask/detflask{ +/obj/item/reagent_containers/drinks/flask/detflask{ pixel_x = 16; pixel_y = 4 }, @@ -8994,7 +8994,7 @@ /area/station/legal/courtroom) "aHx" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/drinks/drinkingglass, /obj/item/radio/intercom/directional/west, /obj/structure/window/reinforced, /turf/simulated/floor/plasteel{ @@ -9411,7 +9411,7 @@ /obj/item/reagent_containers/glass/beaker/waterbottle{ pixel_x = 5 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = -5 }, /obj/structure/window/basic, @@ -9721,7 +9721,7 @@ /area/station/maintenance/fpmaint) "aKl" = ( /obj/structure/table/wood/fancy/royalblack, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = -5 }, /obj/item/reagent_containers/glass/beaker/waterbottle{ @@ -10056,7 +10056,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aLG" = ( -/obj/item/reagent_containers/food/snacks/meat/slab, +/obj/item/food/snacks/meat/slab, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -10663,7 +10663,7 @@ /area/station/maintenance/fpmaint2) "aOo" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/food/snacks/meat/slab, +/obj/item/food/snacks/meat/slab, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -10708,7 +10708,7 @@ /obj/item/reagent_containers/glass/beaker/waterbottle{ pixel_x = 5 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = -5 }, /obj/structure/cable{ @@ -10765,7 +10765,7 @@ }, /area/station/security/interrogation) "aOF" = ( -/obj/item/reagent_containers/food/drinks/cans/beer, +/obj/item/reagent_containers/drinks/cans/beer, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aOI" = ( @@ -10856,7 +10856,7 @@ "aPa" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random_spawners/blood_maybe, -/obj/item/reagent_containers/food/snacks/meat/slab, +/obj/item/food/snacks/meat/slab, /obj/item/clothing/mask/face/fox, /turf/simulated/floor/plasteel, /area/station/maintenance/fpmaint2) @@ -11533,7 +11533,7 @@ /obj/machinery/computer/mob_healer_terminal{ pixel_y = 30 }, -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/drinks/britcup{ list_reagents = list("tea"=15); pixel_x = 4; pixel_y = 2 @@ -11852,7 +11852,7 @@ /obj/structure/closet/wardrobe/white, /obj/item/clothing/shoes/jackboots, /obj/item/reagent_containers/iv_bag/blood/OMinus, -/obj/item/reagent_containers/food/drinks/cans/badminbrew, +/obj/item/reagent_containers/drinks/cans/badminbrew, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "aSp" = ( @@ -13916,7 +13916,7 @@ /obj/machinery/light_switch/south, /obj/item/clothing/head/bearpelt, /obj/item/folder/documents, -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, +/obj/item/reagent_containers/drinks/bottle/vodka/badminka, /obj/item/lighter/zippo/nt_rep, /obj/item/storage/fancy/cigarettes/cigpack_robustgold, /obj/item/stack/spacecash/c1000, @@ -14083,7 +14083,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "baa" = ( -/obj/item/reagent_containers/food/snacks/grown/banana, +/obj/item/food/snacks/grown/banana, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "bab" = ( @@ -14464,7 +14464,7 @@ /area/station/maintenance/fpmaint) "bbH" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/baguette, +/obj/item/food/snacks/baguette, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "bbI" = ( @@ -14485,7 +14485,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "bbJ" = ( -/obj/item/reagent_containers/food/snacks/grown/banana, +/obj/item/food/snacks/grown/banana, /obj/item/storage/backpack/duffel/clown, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) @@ -14720,7 +14720,7 @@ "bcu" = ( /obj/structure/table/wood, /obj/item/pen, -/obj/item/reagent_containers/food/drinks/bottle/holywater, +/obj/item/reagent_containers/drinks/bottle/holywater, /obj/machinery/light/directional/north, /turf/simulated/floor/carpet/black, /area/station/service/chapel/office) @@ -15700,8 +15700,8 @@ /area/station/service/chapel) "bgj" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/chips, -/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/food/snacks/chips, +/obj/item/reagent_containers/drinks/cans/cola, /turf/simulated/floor/carpet, /area/station/hallway/secondary/entry) "bgk" = ( @@ -16509,7 +16509,7 @@ }, /obj/machinery/alarm/directional/north, /obj/structure/table, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ pixel_x = 8; pixel_y = 8 }, @@ -19271,7 +19271,7 @@ /area/station/maintenance/port) "bwA" = ( /obj/effect/decal/cleanable/dust, -/obj/item/reagent_containers/food/drinks/bottle/vodka, +/obj/item/reagent_containers/drinks/bottle/vodka, /obj/effect/decal/cleanable/glass, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 9 @@ -21677,11 +21677,11 @@ /area/station/supply/office) "bHn" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/cans/cola{ +/obj/item/reagent_containers/drinks/cans/cola{ pixel_x = -6; pixel_y = 8 }, -/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/drinks/drinkingglass, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "arrival" @@ -21742,7 +21742,7 @@ /area/station/medical/reception) "bHJ" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/mug/med{ +/obj/item/reagent_containers/drinks/mug/med{ pixel_x = 7; pixel_y = -10 }, @@ -21752,7 +21752,7 @@ /obj/item/storage/fancy/donut_box{ pixel_y = 5 }, -/obj/item/reagent_containers/food/drinks/cans/dr_gibb{ +/obj/item/reagent_containers/drinks/cans/dr_gibb{ pixel_y = -15; pixel_x = -5 }, @@ -22003,7 +22003,7 @@ /obj/structure/table/wood, /obj/item/radio/intercom/directional/south, /obj/item/storage/fancy/matches, -/obj/item/reagent_containers/food/drinks/flask/gold, +/obj/item/reagent_containers/drinks/flask/gold, /obj/item/clothing/mask/cigarette/cigar, /obj/item/razor{ pixel_x = -4; @@ -22125,36 +22125,36 @@ }, /area/station/medical/patients_rooms) "bJc" = ( -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ list_reagents = list("beer"=0); pixel_x = -11; pixel_y = 6 }, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ list_reagents = list("beer"=0); pixel_x = -3; pixel_y = 4 }, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ list_reagents = list("beer"=0); pixel_x = 11; pixel_y = 9 }, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ list_reagents = list("beer"=0); pixel_x = 5; pixel_y = 4 }, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ list_reagents = list("beer"=0); pixel_x = -8 }, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ list_reagents = list("beer"=0); pixel_x = -1; pixel_y = -4 }, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ list_reagents = list("beer"=0); pixel_x = 9; pixel_y = -3 @@ -22388,7 +22388,7 @@ /area/station/science/robotics) "bKo" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/mug, +/obj/item/reagent_containers/drinks/mug, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whitepurple" @@ -22458,8 +22458,8 @@ /area/station/command/office/hop) "bKQ" = ( /obj/structure/rack, -/obj/item/reagent_containers/food/drinks/cans/beer, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer, +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = 4; pixel_y = 4 }, @@ -25402,7 +25402,7 @@ /area/station/science/robotics) "bYm" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/mug, +/obj/item/reagent_containers/drinks/mug, /turf/simulated/floor/wood/oak, /area/station/maintenance/asmaint2) "bYr" = ( @@ -27868,7 +27868,7 @@ c_tag = "Research Director's Office"; network = list("Research","SS13") }, -/obj/item/reagent_containers/food/drinks/mug/rd, +/obj/item/reagent_containers/drinks/mug/rd, /obj/item/taperecorder{ pixel_x = -3 }, @@ -27901,10 +27901,10 @@ "chU" = ( /obj/structure/sign/poster/contraband/random/north, /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/cans/bottler/glass_bottle{ +/obj/item/reagent_containers/drinks/cans/bottler/glass_bottle{ pixel_x = 4 }, -/obj/item/reagent_containers/food/drinks/cans/bottler/glass_bottle{ +/obj/item/reagent_containers/drinks/cans/bottler/glass_bottle{ pixel_x = -9 }, /turf/simulated/floor/wood/oak, @@ -29126,10 +29126,10 @@ /turf/simulated/wall, /area/station/service/janitor) "cmT" = ( -/obj/item/reagent_containers/food/drinks/drinkingglass, -/obj/item/reagent_containers/food/drinks/drinkingglass, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, -/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/drinks/drinkingglass, +/obj/item/reagent_containers/drinks/drinkingglass, +/obj/item/reagent_containers/drinks/bottle/whiskey, +/obj/item/reagent_containers/drinks/drinkingglass, /obj/structure/closet/cabinet, /obj/machinery/light/directional/east, /turf/simulated/floor/wood/oak, @@ -30030,9 +30030,9 @@ icon_state = "0-4" }, /obj/structure/closet/secure_closet/psychiatrist, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, -/obj/item/reagent_containers/food/drinks/drinkingglass/soda, -/obj/item/reagent_containers/food/drinks/drinkingglass/soda, +/obj/item/reagent_containers/drinks/bottle/whiskey, +/obj/item/reagent_containers/drinks/drinkingglass/soda, +/obj/item/reagent_containers/drinks/drinkingglass/soda, /turf/simulated/floor/carpet, /area/station/medical/psych) "cre" = ( @@ -31617,7 +31617,7 @@ pixel_y = -4 }, /obj/machinery/light/directional/north, -/obj/item/reagent_containers/food/drinks/mug/sci{ +/obj/item/reagent_containers/drinks/mug/sci{ desc = "A purple mug with a small piece of duct tape on it that has 'Janitor's' written on it in sharpie. Looks a bit too.. scientific to belong to the Janitor."; name = "Janitor's mug"; pixel_x = 6; @@ -32161,7 +32161,7 @@ dir = 1 }, /obj/machinery/light/directional/south, -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/drinks/britcup{ list_reagents = list("tea"=15); pixel_x = 4; pixel_y = 2 @@ -38839,7 +38839,7 @@ }, /area/station/engineering/hallway) "cWL" = ( -/obj/item/reagent_containers/food/drinks/cans/beer, +/obj/item/reagent_containers/drinks/cans/beer, /turf/simulated/floor/plating, /area/station/command/office/blueshield) "cWM" = ( @@ -39155,7 +39155,7 @@ /area/station/engineering/supermatter_room) "cXV" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = -6; pixel_y = 3 }, @@ -41338,7 +41338,7 @@ /area/station/engineering/engine/supermatter) "dfr" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/cans/sodawater, +/obj/item/reagent_containers/drinks/cans/sodawater, /turf/simulated/floor/plasteel{ icon_state = "darkyellowfull" }, @@ -41655,14 +41655,14 @@ /area/station/maintenance/asmaint2) "dgz" = ( /obj/structure/table/holotable/wood, -/obj/item/reagent_containers/food/drinks/bottle/rum{ +/obj/item/reagent_containers/drinks/bottle/rum{ pixel_y = 2 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_x = -8; pixel_y = 7 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_x = 10 }, /turf/simulated/floor/beach/sand, @@ -41675,7 +41675,7 @@ /area/shuttle/pod_4) "dgH" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/mug, +/obj/item/reagent_containers/drinks/mug, /obj/machinery/power/apc/directional/south, /obj/structure/cable, /turf/simulated/floor/wood/oak, @@ -41814,7 +41814,7 @@ /area/station/engineering/ai_transit_tube) "dhp" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 2; pixel_y = 6 }, @@ -42247,7 +42247,7 @@ /obj/structure/railing{ dir = 8 }, -/obj/item/reagent_containers/food/drinks/mug/eng{ +/obj/item/reagent_containers/drinks/mug/eng{ pixel_x = 5; pixel_y = 5 }, @@ -45432,7 +45432,7 @@ /area/station/engineering/utility) "dEb" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/food/snacks/meat/slab, +/obj/item/food/snacks/meat/slab, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "dEc" = ( @@ -45461,12 +45461,12 @@ /area/station/security/lobby) "dEq" = ( /obj/structure/rack, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/drinks/bottle/whiskey{ pixel_x = -3; pixel_y = -3 }, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/drinks/bottle/whiskey, +/obj/item/reagent_containers/drinks/bottle/whiskey{ pixel_x = 3; pixel_y = 3 }, @@ -46017,7 +46017,7 @@ /area/station/engineering/hallway) "dOb" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/bottle/rum, +/obj/item/reagent_containers/drinks/bottle/rum, /obj/item/reagent_containers/glass/rag{ pixel_x = -7 }, @@ -46854,11 +46854,11 @@ /area/station/maintenance/portsolar) "eeF" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/shaker{ +/obj/item/reagent_containers/drinks/shaker{ pixel_x = -8; pixel_y = 2 }, -/obj/item/reagent_containers/food/drinks/flask/barflask{ +/obj/item/reagent_containers/drinks/flask/barflask{ pixel_x = 6; pixel_y = 6 }, @@ -46894,12 +46894,12 @@ /area/station/medical/reception) "efk" = ( /obj/structure/rack, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/drinks/bottle/whiskey{ pixel_x = -3; pixel_y = -3 }, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/drinks/bottle/whiskey, +/obj/item/reagent_containers/drinks/bottle/whiskey{ pixel_x = 3; pixel_y = 3 }, @@ -47688,11 +47688,11 @@ /area/station/engineering/atmos) "esV" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8; pixel_y = 1 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -8; pixel_y = 11 }, @@ -48127,15 +48127,15 @@ /area/station/security/permabrig) "eBE" = ( /obj/structure/table/glass/reinforced/plastitanium, -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{ +/obj/item/reagent_containers/drinks/bottle/vodka/badminka{ pixel_y = 12; pixel_x = 6 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_y = 8; pixel_x = -1 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_y = 2; pixel_x = -1 }, @@ -48301,7 +48301,7 @@ /obj/effect/decal/cleanable/dust, /obj/item/lighter/random, /obj/item/rollingpaper, -/obj/item/reagent_containers/food/snacks/grown/cannabis, +/obj/item/food/snacks/grown/cannabis, /obj/item/ashtray/plastic, /turf/simulated/floor/carpet/orange, /area/station/maintenance/fsmaint) @@ -49555,7 +49555,7 @@ "feq" = ( /obj/effect/decal/cleanable/dust, /obj/effect/spawner/random_spawners/blood_maybe, -/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/condiment/enzyme, /turf/simulated/floor/plating, /area/station/maintenance/abandonedbar) "fes" = ( @@ -50517,7 +50517,7 @@ /area/station/science/hallway) "fxN" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/drinks/drinkingglass, /turf/simulated/floor/wood/oak, /area/station/maintenance/asmaint) "fxP" = ( @@ -52983,7 +52983,7 @@ "gsd" = ( /obj/structure/table/wood, /obj/machinery/light/small/directional/south, -/obj/item/reagent_containers/food/drinks/mug/novelty, +/obj/item/reagent_containers/drinks/mug/novelty, /obj/effect/spawner/lootdrop/officetoys, /turf/simulated/floor/wood/oak, /area/station/command/office/ntrep) @@ -53161,8 +53161,8 @@ /area/station/maintenance/fsmaint) "guQ" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/saltshaker, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/saltshaker, +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -7 }, /obj/effect/spawner/lootdrop/maintenance, @@ -53997,7 +53997,7 @@ "gMa" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/reagent_containers/food/snacks/dough{ +/obj/item/food/snacks/dough{ desc = "A piece of dough. It looks moldy and is hard as a rock. Hope you're not planning on turning this into a pizza.."; name = "old dough" }, @@ -54387,7 +54387,7 @@ /area/station/maintenance/fsmaint) "gRe" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/drinks/drinkingglass, /turf/simulated/floor/wood/oak, /area/station/maintenance/asmaint2) "gRp" = ( @@ -56633,7 +56633,7 @@ /area/station/command/bridge) "hDS" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/mug/sci, +/obj/item/reagent_containers/drinks/mug/sci, /obj/machinery/light/directional/west, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -56789,7 +56789,7 @@ pixel_y = 10; pixel_x = 4 }, -/obj/item/reagent_containers/food/snacks/grown/banana{ +/obj/item/food/snacks/grown/banana{ pixel_x = -4; pixel_y = -6 }, @@ -57746,7 +57746,7 @@ /area/station/security/processing) "hYo" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = -4; pixel_y = 6 }, @@ -58105,7 +58105,7 @@ /area/station/maintenance/asmaint2) "ifV" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/food/drinks/bottle/wine, +/obj/item/reagent_containers/drinks/bottle/wine, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -59780,12 +59780,12 @@ "iOY" = ( /obj/structure/table/wood, /obj/structure/sign/poster/official/random/north, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/drinks/bottle/whiskey{ pixel_x = 5; pixel_y = 6 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_x = -8; pixel_y = 7 }, @@ -61252,8 +61252,8 @@ /area/station/public/toilet) "jsv" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/food/snacks/disk, -/obj/item/reagent_containers/food/snacks/disk{ +/obj/item/food/snacks/disk, +/obj/item/food/snacks/disk{ pixel_y = -6; pixel_x = 5 }, @@ -62979,7 +62979,7 @@ "kdh" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/south, -/obj/item/reagent_containers/food/snacks/grown/cannabis, +/obj/item/food/snacks/grown/cannabis, /turf/simulated/floor/carpet, /area/station/maintenance/asmaint) "kdx" = ( @@ -63121,7 +63121,7 @@ }, /area/station/engineering/hallway) "kgc" = ( -/obj/item/reagent_containers/food/drinks/cans/badminbrew, +/obj/item/reagent_containers/drinks/cans/badminbrew, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "kgg" = ( @@ -63765,8 +63765,8 @@ /obj/structure/sign/poster/contraband/random/north, /obj/item/clothing/mask/cigarette/random, /obj/structure/closet/secure_closet/freezer/fridge/open, -/obj/item/reagent_containers/food/drinks/cans/beer, -/obj/item/reagent_containers/food/drinks/cans/beer, +/obj/item/reagent_containers/drinks/cans/beer, +/obj/item/reagent_containers/drinks/cans/beer, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -63891,7 +63891,7 @@ "kua" = ( /obj/structure/table/wood, /obj/machinery/power/apc/directional/west, -/obj/item/reagent_containers/food/snacks/baguette, +/obj/item/food/snacks/baguette, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -67322,7 +67322,7 @@ pixel_y = 6; pixel_x = 4 }, -/obj/item/reagent_containers/food/drinks/bottle/holywater{ +/obj/item/reagent_containers/drinks/bottle/holywater{ pixel_y = 4; pixel_x = -8 }, @@ -68606,7 +68606,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/miningdock) "mdX" = ( -/obj/item/reagent_containers/food/snacks/grown/cannabis, +/obj/item/food/snacks/grown/cannabis, /obj/effect/decal/cleanable/dirt, /obj/item/clothing/mask/cigarette/medical_marijuana, /obj/effect/landmark/damageturf, @@ -69091,7 +69091,7 @@ /area/station/telecomms/chamber) "mll" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/food/snacks/meat/slab, +/obj/item/food/snacks/meat/slab, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -69627,7 +69627,7 @@ /area/station/supply/storage) "mwO" = ( /obj/effect/decal/cleanable/dust, -/obj/item/reagent_containers/food/drinks/cans/badminbrew, +/obj/item/reagent_containers/drinks/cans/badminbrew, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -69732,8 +69732,8 @@ /area/station/security/brig) "mze" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/snacks/breadslice, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/food/snacks/breadslice, +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -8; pixel_y = 11 }, @@ -74363,8 +74363,8 @@ /area/station/security/warden) "okb" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/vodka, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/drinks/bottle/vodka, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass, /obj/effect/turf_decal/siding/wood{ dir = 6 }, @@ -76339,7 +76339,7 @@ /area/station/security/permabrig) "oUP" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ list_reagents = list("coffee"=0); pixel_x = 6; pixel_y = 4 @@ -76637,7 +76637,7 @@ known_by = list("captain") }, /obj/item/gun/projectile/revolver/russian, -/obj/item/reagent_containers/food/drinks/bottle/absinthe/premium, +/obj/item/reagent_containers/drinks/bottle/absinthe/premium, /obj/item/storage/fancy/cigarettes/cigpack_robustgold, /obj/item/toy/figure/crew/captain, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -77864,7 +77864,7 @@ /turf/simulated/floor/wood/fancy/oak, /area/station/service/bar) "pvM" = ( -/obj/item/reagent_containers/food/drinks/mug/med{ +/obj/item/reagent_containers/drinks/mug/med{ pixel_y = 10 }, /obj/structure/table/glass, @@ -80198,8 +80198,8 @@ /area/station/engineering/break_room) "qpi" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/cans/beer, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer, +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = -7 }, /turf/simulated/floor/plasteel, @@ -82054,11 +82054,11 @@ /area/space/nearstation) "qTQ" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 4; pixel_y = 6 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -4; pixel_y = 6 }, @@ -82862,7 +82862,7 @@ "rkL" = ( /obj/effect/decal/cleanable/dirt, /obj/item/seeds/cannabis, -/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris, +/obj/item/food/snacks/grown/ambrosia/vulgaris, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "rkR" = ( @@ -83624,7 +83624,7 @@ /area/space/nearstation) "rDV" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/bottle/cream{ +/obj/item/reagent_containers/drinks/bottle/cream{ pixel_y = 8 }, /turf/simulated/floor/plasteel{ @@ -86405,7 +86405,7 @@ "sDr" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, -/obj/item/reagent_containers/food/snacks/donkpocket, +/obj/item/food/snacks/donkpocket, /turf/simulated/floor/plating, /area/station/maintenance/aft) "sDy" = ( @@ -89615,7 +89615,7 @@ /area/station/service/library) "tNc" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/drinks/drinkingglass, /turf/simulated/floor/wood/oak, /area/station/maintenance/aft) "tNg" = ( @@ -90163,17 +90163,17 @@ /area/station/science/test_chamber) "tWD" = ( /obj/structure/closet/crate, -/obj/item/reagent_containers/food/snacks/breadslice, -/obj/item/reagent_containers/food/snacks/breadslice, -/obj/item/reagent_containers/food/snacks/breadslice, -/obj/item/reagent_containers/food/snacks/grown/potato, -/obj/item/reagent_containers/food/snacks/grown/potato, -/obj/item/reagent_containers/food/snacks/grown/onion, -/obj/item/reagent_containers/food/snacks/grown/onion, +/obj/item/food/snacks/breadslice, +/obj/item/food/snacks/breadslice, +/obj/item/food/snacks/breadslice, +/obj/item/food/snacks/grown/potato, +/obj/item/food/snacks/grown/potato, +/obj/item/food/snacks/grown/onion, +/obj/item/food/snacks/grown/onion, /obj/item/storage/box/donkpockets, /obj/item/storage/fancy/egg_box, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/rice, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/rice, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -91003,8 +91003,8 @@ /area/station/medical/medbay2) "uls" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/wine, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/drinks/bottle/wine, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_x = -5 }, /obj/effect/landmark/damageturf, @@ -91424,7 +91424,7 @@ /area/station/security/permabrig) "utP" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/pie{ +/obj/item/food/snacks/pie{ pixel_y = 2 }, /obj/machinery/power/apc/directional/east, @@ -92128,7 +92128,7 @@ /area/station/security/permabrig) "uGf" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/snacks/grilledcheese{ +/obj/item/food/snacks/grilledcheese{ pixel_y = 9 }, /turf/simulated/floor/wood/oak, @@ -92681,7 +92681,7 @@ /area/station/engineering/supermatter_room) "uRK" = ( /obj/item/organ/internal/heart/vox, -/obj/item/reagent_containers/food/snacks/fried_vox, +/obj/item/food/snacks/fried_vox, /obj/structure/table, /obj/item/scalpel, /turf/simulated/floor/plating, @@ -99994,7 +99994,7 @@ "xEb" = ( /obj/effect/decal/cleanable/dust, /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/muffin{ +/obj/item/food/snacks/muffin{ pixel_x = -5; pixel_y = 9 }, @@ -100142,10 +100142,10 @@ /area/station/maintenance/abandonedbar) "xHy" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/food/snacks/disk{ +/obj/item/food/snacks/disk{ pixel_x = -6 }, -/obj/item/reagent_containers/food/snacks/disk{ +/obj/item/food/snacks/disk{ pixel_y = 10; pixel_x = 8 }, @@ -100235,7 +100235,7 @@ /area/station/medical/surgery/secondary) "xII" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/pistachios, +/obj/item/food/snacks/pistachios, /obj/item/poster/random_contraband, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -100912,7 +100912,7 @@ /area/station/maintenance/fpmaint2) "xSF" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ pixel_y = 8; pixel_x = -6 }, @@ -101300,7 +101300,7 @@ pixel_x = 3; pixel_y = -3 }, -/obj/item/reagent_containers/food/drinks/trophy/bronze_cup, +/obj/item/reagent_containers/drinks/trophy/bronze_cup, /obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/aft) diff --git a/_maps/map_files220/delta/delta.dmm b/_maps/map_files220/delta/delta.dmm index 66d9440030eb..0392321909a9 100644 --- a/_maps/map_files220/delta/delta.dmm +++ b/_maps/map_files220/delta/delta.dmm @@ -23,7 +23,7 @@ dir = 9 }, /obj/structure/table/glass, -/obj/item/reagent_containers/food/snacks/grown/banana{ +/obj/item/food/snacks/grown/banana{ pixel_x = 6; pixel_y = 4 }, @@ -1485,17 +1485,17 @@ "alR" = ( /obj/structure/closet/secure_closet/freezer/fridge/open, /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/condiment/soymilk, -/obj/item/reagent_containers/food/condiment/soymilk, -/obj/item/reagent_containers/food/condiment/soymilk, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/milk, +/obj/item/food/snacks/meat, +/obj/item/food/snacks/meat, +/obj/item/food/snacks/meat, +/obj/item/food/snacks/meat, +/obj/item/food/snacks/meat, +/obj/item/reagent_containers/condiment/soymilk, +/obj/item/reagent_containers/condiment/soymilk, +/obj/item/reagent_containers/condiment/soymilk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, /obj/item/storage/fancy/egg_box, /obj/item/storage/fancy/egg_box, /turf/simulated/floor/plasteel{ @@ -3776,7 +3776,7 @@ /area/station/maintenance/fore) "att" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/drinks/drinkingglass, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -4566,11 +4566,11 @@ "aws" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -7; pixel_y = 7 }, -/obj/item/reagent_containers/food/condiment/peppermill, +/obj/item/reagent_containers/condiment/peppermill, /obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ dir = 8; @@ -5392,7 +5392,7 @@ pixel_x = 4; pixel_y = 4 }, -/obj/item/reagent_containers/food/snacks/baguette, +/obj/item/food/snacks/baguette, /obj/item/flashlight/lamp/green{ pixel_x = 6; pixel_y = 16 @@ -5774,7 +5774,7 @@ /area/station/maintenance/fore) "aAk" = ( /obj/structure/rack, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/drinks/bottle/whiskey, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore) @@ -6886,16 +6886,16 @@ pixel_x = 6; pixel_y = 16 }, -/obj/item/reagent_containers/food/snacks/grown/banana{ +/obj/item/food/snacks/grown/banana{ pixel_x = 6 }, -/obj/item/reagent_containers/food/snacks/grown/banana{ +/obj/item/food/snacks/grown/banana{ pixel_y = 4 }, -/obj/item/reagent_containers/food/snacks/grown/banana{ +/obj/item/food/snacks/grown/banana{ pixel_x = -6 }, -/obj/item/reagent_containers/food/snacks/pie, +/obj/item/food/snacks/pie, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -12759,11 +12759,11 @@ /area/station/service/kitchen) "bdQ" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -4; pixel_y = 2 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -7; pixel_y = 7 }, @@ -13800,12 +13800,12 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/item/reagent_containers/food/snacks/dough, -/obj/item/reagent_containers/food/snacks/dough{ +/obj/item/food/snacks/dough, +/obj/item/food/snacks/dough{ pixel_x = 2; pixel_y = 2 }, -/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/condiment/enzyme, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "bhK" = ( @@ -15905,7 +15905,7 @@ /obj/structure/table/reinforced, /obj/item/folder, /obj/item/pen, -/obj/item/reagent_containers/food/snacks/grown/apple, +/obj/item/food/snacks/grown/apple, /obj/machinery/door/window/classic/normal{ dir = 8; name = "Hydroponics Desk" @@ -16342,9 +16342,9 @@ /obj/item/seeds/lime, /obj/item/seeds/watermelon, /obj/item/seeds/grape, -/obj/item/reagent_containers/food/snacks/grown/wheat, -/obj/item/reagent_containers/food/snacks/grown/watermelon, -/obj/item/reagent_containers/food/snacks/grown/banana, +/obj/item/food/snacks/grown/wheat, +/obj/item/food/snacks/grown/watermelon, +/obj/item/food/snacks/grown/banana, /obj/machinery/door/window/classic/reversed{ dir = 8; name = "Hydroponics Desk" @@ -19927,7 +19927,7 @@ /area/station/engineering/gravitygenerator) "bGD" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/cans/starkist, +/obj/item/reagent_containers/drinks/cans/starkist, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -26612,8 +26612,8 @@ /area/station/command/office/ntrep) "cca" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/drinks/bottle/whiskey, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass, /turf/simulated/floor/wood/oak, /area/station/command/office/ntrep) "ccb" = ( @@ -27105,7 +27105,7 @@ /area/station/command/office/ntrep) "cdN" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass, /obj/item/storage/fancy/donut_box, /turf/simulated/floor/wood/oak, /area/station/command/office/ntrep) @@ -27179,7 +27179,7 @@ /area/station/command/office/blueshield) "cdT" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/flask/gold, +/obj/item/reagent_containers/drinks/flask/gold, /obj/item/razor, /turf/simulated/floor/carpet/black, /area/station/command/office/captain/bedroom) @@ -28000,9 +28000,9 @@ /area/station/command/office/blueshield) "chs" = ( /obj/structure/closet/cabinet, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, -/obj/item/reagent_containers/food/drinks/drinkingglass, -/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/drinks/bottle/whiskey, +/obj/item/reagent_containers/drinks/drinkingglass, +/obj/item/reagent_containers/drinks/drinkingglass, /obj/effect/turf_decal/siding/wood{ dir = 4 }, @@ -31698,8 +31698,8 @@ /area/station/service/expedition) "cxf" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/snacks/mint, -/obj/item/reagent_containers/food/drinks/bottle/cream, +/obj/item/food/snacks/mint, +/obj/item/reagent_containers/drinks/bottle/cream, /turf/simulated/floor/plasteel{ icon_state = "redfull" }, @@ -32217,8 +32217,8 @@ /area/station/hallway/primary/fore) "cyU" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_y = 4; pixel_x = -6 }, @@ -32494,7 +32494,7 @@ /area/station/science/robotics/showroom) "czO" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/drinks/bottle/whiskey, /turf/simulated/floor/carpet, /area/station/science/robotics/showroom) "czP" = ( @@ -34532,11 +34532,11 @@ /area/station/medical/virology/lab) "cJm" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_y = 4; pixel_x = -6 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_x = 6 }, /obj/effect/decal/cleanable/dirt, @@ -40330,7 +40330,7 @@ /area/station/maintenance/apmaint) "dka" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_y = 4; pixel_x = -6 }, @@ -42032,7 +42032,7 @@ /area/station/supply/miningdock) "dsI" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ pixel_y = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -45216,7 +45216,7 @@ "dMg" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/friedegg, +/obj/item/food/snacks/friedegg, /turf/simulated/floor/wood/oak, /area/station/maintenance/starboard) "dMh" = ( @@ -46186,7 +46186,7 @@ /obj/structure/table/reinforced, /obj/item/stack/packageWrap, /obj/item/hand_labeler, -/obj/item/reagent_containers/food/drinks/coffee, +/obj/item/reagent_containers/drinks/coffee, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -46350,7 +46350,7 @@ /obj/item/clothing/gloves/color/black, /obj/item/clothing/suit/storage/hazardvest, /obj/item/clothing/mask/breath, -/obj/item/reagent_containers/food/drinks/coffee, +/obj/item/reagent_containers/drinks/coffee, /obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/apmaint) @@ -46817,7 +46817,7 @@ /obj/structure/table/reinforced, /obj/item/storage/toolbox/emergency, /obj/item/wrench, -/obj/item/reagent_containers/food/drinks/coffee, +/obj/item/reagent_containers/drinks/coffee, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/apmaint) "dTg" = ( @@ -47070,7 +47070,7 @@ /area/station/service/chapel/office) "dUf" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/holywater, +/obj/item/reagent_containers/drinks/bottle/holywater, /turf/simulated/floor/carpet, /area/station/service/chapel/office) "dUg" = ( @@ -47280,8 +47280,8 @@ /area/station/service/chapel/office) "dUK" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/grown/poppy/geranium, -/obj/item/reagent_containers/food/snacks/grown/poppy/lily{ +/obj/item/food/snacks/grown/poppy/geranium, +/obj/item/food/snacks/grown/poppy/lily{ pixel_x = 4; pixel_y = 5 }, @@ -49357,7 +49357,7 @@ /area/station/legal/courtroom) "eoB" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -4; pixel_y = 2 }, @@ -50582,7 +50582,7 @@ /area/station/hallway/primary/central/east) "eJW" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/grown/redbeet, +/obj/item/food/snacks/grown/redbeet, /obj/item/clothing/head/ushanka, /turf/simulated/floor/plating, /area/station/maintenance/old_kitchen) @@ -51364,8 +51364,8 @@ /area/station/medical/medbay2) "eUZ" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/random_drink, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/bottle/random_drink, +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = 5 }, /obj/machinery/light/small/directional/north, @@ -51737,14 +51737,14 @@ /area/station/public/fitness) "fdo" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/bottleofbanana{ +/obj/item/reagent_containers/drinks/bottle/bottleofbanana{ pixel_y = 16 }, -/obj/item/reagent_containers/food/drinks/bottle/milk{ +/obj/item/reagent_containers/drinks/bottle/milk{ pixel_y = 2; pixel_x = -6 }, -/obj/item/reagent_containers/food/drinks/bottle/orangejuice{ +/obj/item/reagent_containers/drinks/bottle/orangejuice{ pixel_y = 4; pixel_x = 6 }, @@ -55412,7 +55412,7 @@ /area/station/engineering/controlroom) "glD" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass, /obj/effect/decal/cleanable/dirt, /obj/item/gun/projectile/revolver/russian{ pixel_y = 12 @@ -55707,8 +55707,8 @@ /area/station/security/checkpoint/south) "grj" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_y = 4; pixel_x = -6 }, @@ -56243,8 +56243,8 @@ /area/station/service/theatre) "gAT" = ( /obj/effect/spawner/random_spawners/blood_maybe, -/obj/item/reagent_containers/food/snacks/meat/human, -/obj/item/reagent_containers/food/snacks/meat/human, +/obj/item/food/snacks/meat/human, +/obj/item/food/snacks/meat/human, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" @@ -57121,7 +57121,7 @@ /area/station/medical/virology) "gOz" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/food/snacks/disk, +/obj/item/food/snacks/disk, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkbluecorners" @@ -57862,7 +57862,7 @@ /obj/item/toy/figure/crew/captain, /obj/item/storage/fancy/cigarettes/cigpack_robustgold, /obj/item/lighter/zippo/nt_rep, -/obj/item/reagent_containers/food/drinks/bottle/absinthe/premium, +/obj/item/reagent_containers/drinks/bottle/absinthe/premium, /turf/simulated/floor/carpet/black, /area/station/command/office/captain/bedroom) "hbH" = ( @@ -59274,7 +59274,7 @@ /area/station/engineering/break_room) "hzw" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/food/snacks/disk{ +/obj/item/food/snacks/disk{ pixel_x = -6 }, /turf/simulated/floor/plasteel{ @@ -61306,7 +61306,7 @@ pixel_x = -4; pixel_y = -4 }, -/obj/item/reagent_containers/food/drinks/flask/detflask, +/obj/item/reagent_containers/drinks/flask/detflask, /obj/item/radio/intercom/directional/west, /turf/simulated/floor/carpet, /area/station/security/detective) @@ -61658,8 +61658,8 @@ /area/station/ai_monitored/storage/eva) "ikQ" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/cans/beer, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer, +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = 7 }, /obj/effect/decal/cleanable/dirt, @@ -63789,7 +63789,7 @@ /area/station/maintenance/medmaint) "iSe" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/vodka{ +/obj/item/reagent_containers/drinks/bottle/vodka{ pixel_y = 10 }, /obj/effect/decal/cleanable/dirt, @@ -69249,7 +69249,7 @@ "kDl" = ( /obj/structure/table/reinforced, /obj/item/trash/plate, -/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/condiment/enzyme, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -69570,7 +69570,7 @@ /area/station/service/hydroponics) "kHq" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/snacks/candy/caramel, +/obj/item/food/snacks/candy/caramel, /obj/structure/window/reinforced{ dir = 8 }, @@ -69806,7 +69806,7 @@ /area/station/science/toxins/mixing) "kME" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/mug/sci, +/obj/item/reagent_containers/drinks/mug/sci, /turf/simulated/floor/plasteel/white, /area/station/science/break_room) "kMH" = ( @@ -71077,8 +71077,8 @@ "lhR" = ( /obj/structure/table/reinforced, /obj/machinery/light/directional/west, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour{ +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/flour{ pixel_x = 2; pixel_y = 2 }, @@ -71155,20 +71155,20 @@ /area/station/maintenance/old_kitchen) "ljm" = ( /obj/structure/safe/floor, -/obj/item/reagent_containers/food/drinks/bottle/cognac, -/obj/item/reagent_containers/food/drinks/bottle/cognac, -/obj/item/reagent_containers/food/drinks/bottle/cognac, -/obj/item/reagent_containers/food/drinks/bottle/goldschlager, -/obj/item/reagent_containers/food/drinks/bottle/goldschlager, -/obj/item/reagent_containers/food/drinks/bottle/goldschlager, -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, -/obj/item/reagent_containers/food/drinks/bottle/random_drink, -/obj/item/reagent_containers/food/drinks/bottle/random_drink, -/obj/item/reagent_containers/food/drinks/bottle/random_drink, -/obj/item/reagent_containers/food/drinks/bottle/random_drink, -/obj/item/reagent_containers/food/drinks/bottle/random_drink, +/obj/item/reagent_containers/drinks/bottle/cognac, +/obj/item/reagent_containers/drinks/bottle/cognac, +/obj/item/reagent_containers/drinks/bottle/cognac, +/obj/item/reagent_containers/drinks/bottle/goldschlager, +/obj/item/reagent_containers/drinks/bottle/goldschlager, +/obj/item/reagent_containers/drinks/bottle/goldschlager, +/obj/item/reagent_containers/drinks/bottle/vodka/badminka, +/obj/item/reagent_containers/drinks/bottle/vodka/badminka, +/obj/item/reagent_containers/drinks/bottle/vodka/badminka, +/obj/item/reagent_containers/drinks/bottle/random_drink, +/obj/item/reagent_containers/drinks/bottle/random_drink, +/obj/item/reagent_containers/drinks/bottle/random_drink, +/obj/item/reagent_containers/drinks/bottle/random_drink, +/obj/item/reagent_containers/drinks/bottle/random_drink, /turf/simulated/floor/wood/oak, /area/station/maintenance/old_kitchen) "ljq" = ( @@ -71297,14 +71297,14 @@ /area/station/maintenance/old_kitchen) "lkZ" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/reagent_containers/food/snacks/frozen/icecream/icecreamcone, -/obj/item/reagent_containers/food/snacks/frozen/icecream/icecreamcone, -/obj/item/reagent_containers/food/snacks/frozen/icecream/icecreamcone, -/obj/item/reagent_containers/food/snacks/frozen/icecream/icecreamcone, -/obj/item/reagent_containers/food/snacks/frozen/icecream, -/obj/item/reagent_containers/food/snacks/frozen/icecream, -/obj/item/reagent_containers/food/snacks/frozen/icecreamsandwich, -/obj/item/reagent_containers/food/snacks/frozen/icecreamsandwich, +/obj/item/food/snacks/frozen/icecream/icecreamcone, +/obj/item/food/snacks/frozen/icecream/icecreamcone, +/obj/item/food/snacks/frozen/icecream/icecreamcone, +/obj/item/food/snacks/frozen/icecream/icecreamcone, +/obj/item/food/snacks/frozen/icecream, +/obj/item/food/snacks/frozen/icecream, +/obj/item/food/snacks/frozen/icecreamsandwich, +/obj/item/food/snacks/frozen/icecreamsandwich, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" @@ -72981,16 +72981,16 @@ /area/station/maintenance/starboard2) "lLS" = ( /obj/structure/closet/crate, -/obj/item/reagent_containers/food/snacks/breadslice, -/obj/item/reagent_containers/food/snacks/breadslice, -/obj/item/reagent_containers/food/snacks/breadslice, -/obj/item/reagent_containers/food/snacks/grown/potato, -/obj/item/reagent_containers/food/snacks/grown/potato, -/obj/item/reagent_containers/food/snacks/grown/onion, -/obj/item/reagent_containers/food/snacks/grown/onion, +/obj/item/food/snacks/breadslice, +/obj/item/food/snacks/breadslice, +/obj/item/food/snacks/breadslice, +/obj/item/food/snacks/grown/potato, +/obj/item/food/snacks/grown/potato, +/obj/item/food/snacks/grown/onion, +/obj/item/food/snacks/grown/onion, /obj/item/storage/box/donkpockets, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/rice, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/rice, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -73444,11 +73444,11 @@ /area/station/science/test_chamber) "lSB" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -7; pixel_y = 7 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -4; pixel_y = 2 }, @@ -74427,8 +74427,8 @@ name = "Kitchen Shutters" }, /obj/machinery/door/firedoor, -/obj/item/reagent_containers/food/snacks/burrito, -/obj/item/reagent_containers/food/snacks/burrito{ +/obj/item/food/snacks/burrito, +/obj/item/food/snacks/burrito{ pixel_x = 5; pixel_y = 5 }, @@ -74550,10 +74550,10 @@ /area/station/security/warden) "mng" = ( /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/food/snacks/candy/cotton/blue, -/obj/item/reagent_containers/food/snacks/candy/cotton/pink, -/obj/item/reagent_containers/food/snacks/candy/cotton/rainbow, -/obj/item/reagent_containers/food/snacks/candy/cotton/yellow, +/obj/item/food/snacks/candy/cotton/blue, +/obj/item/food/snacks/candy/cotton/pink, +/obj/item/food/snacks/candy/cotton/rainbow, +/obj/item/food/snacks/candy/cotton/yellow, /obj/structure/sign/poster/official/random/north, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -75263,15 +75263,15 @@ /area/station/service/library) "mzE" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat{ +/obj/item/food/snacks/meat, +/obj/item/food/snacks/meat{ pixel_x = 4 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -7; pixel_y = 7 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -4; pixel_y = 2 }, @@ -77372,11 +77372,11 @@ /area/station/security/warden) "njV" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing{ +/obj/item/reagent_containers/drinks/bottle/bottleofnothing{ pixel_y = 19 }, /obj/item/grown/bananapeel, -/obj/item/reagent_containers/food/drinks/bottle/cream{ +/obj/item/reagent_containers/drinks/bottle/cream{ pixel_x = -9 }, /turf/simulated/floor/plating, @@ -77700,7 +77700,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/food/snacks/grown/pineapple{ +/obj/item/food/snacks/grown/pineapple{ name = "Старый ананас"; desc = "Довольно старый ананас. Интересно как он тут оказался и почему он так странно пахнет..." }, @@ -79003,12 +79003,12 @@ "nHK" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ pixel_y = 6; pixel_x = -6; volume = 0 }, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ pixel_y = 6; pixel_x = 8; volume = 0 @@ -80464,13 +80464,13 @@ /obj/item/toy/minimeteor{ pixel_y = 6 }, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ pixel_y = 6; pixel_x = 8; initialized = 1; volume = 0 }, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ pixel_y = 6; pixel_x = -6; initialized = 1; @@ -80571,7 +80571,7 @@ /area/station/engineering/atmos) "oeG" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/bottle/holywater{ +/obj/item/reagent_containers/drinks/bottle/holywater{ pixel_y = 4; pixel_x = -8; initialized = 1 @@ -81350,7 +81350,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/reagent_containers/food/snacks/grown/redbeet, +/obj/item/food/snacks/grown/redbeet, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood/oak, @@ -82794,13 +82794,13 @@ "oSD" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ pixel_y = 6; pixel_x = -6; initialized = 1; volume = 0 }, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ pixel_y = 6; pixel_x = 8; initialized = 1; @@ -83411,14 +83411,14 @@ /area/station/service/library) "pbY" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/vodka{ +/obj/item/reagent_containers/drinks/bottle/vodka{ pixel_y = 10 }, -/obj/item/reagent_containers/food/drinks/bottle/vermouth{ +/obj/item/reagent_containers/drinks/bottle/vermouth{ pixel_x = -6; pixel_y = 4 }, -/obj/item/reagent_containers/food/drinks/bottle/tequila{ +/obj/item/reagent_containers/drinks/bottle/tequila{ pixel_x = 6; pixel_y = 6 }, @@ -85275,7 +85275,7 @@ "pER" = ( /obj/structure/table/wood, /obj/item/book/manual/barman_recipes, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/drinks/shaker, /obj/structure/sign/poster/official/high_class_martini{ pixel_y = 32 }, @@ -85890,11 +85890,11 @@ /area/station/engineering/controlroom) "pOp" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/food/snacks/disk{ +/obj/item/food/snacks/disk{ pixel_y = 10; pixel_x = 8 }, -/obj/item/reagent_containers/food/snacks/disk{ +/obj/item/food/snacks/disk{ pixel_y = -6; pixel_x = 5 }, @@ -86540,7 +86540,7 @@ }, /obj/item/clothing/head/bearpelt, /obj/item/folder/documents, -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, +/obj/item/reagent_containers/drinks/bottle/vodka/badminka, /obj/item/lighter/zippo/nt_rep, /obj/item/storage/fancy/cigarettes/cigpack_robustgold, /obj/item/stack/spacecash/c1000, @@ -88548,14 +88548,14 @@ }, /obj/structure/table/wood, /obj/machinery/light/directional/west, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = -5; pixel_y = 2 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = 5 }, -/obj/item/reagent_containers/food/drinks/bottle/wine{ +/obj/item/reagent_containers/drinks/bottle/wine{ pixel_y = 5 }, /turf/simulated/floor/plasteel/dark, @@ -89372,7 +89372,7 @@ /turf/simulated/floor/plasteel/white, /area/station/science/storage) "qTe" = ( -/obj/item/reagent_containers/food/snacks/candy/gummyworm/green, +/obj/item/food/snacks/candy/gummyworm/green, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; @@ -90342,7 +90342,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/condiment/enzyme, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -91080,7 +91080,7 @@ /area/station/security/podpilot) "ruI" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ pixel_y = 8; pixel_x = -6; initialized = 1 @@ -92102,7 +92102,7 @@ /area/station/medical/storage) "rMZ" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/beans, +/obj/item/food/snacks/beans, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -92494,7 +92494,7 @@ dir = 5 }, /obj/structure/table/glass, -/obj/item/reagent_containers/food/snacks/grown/banana{ +/obj/item/food/snacks/grown/banana{ pixel_x = 6; pixel_y = 4 }, @@ -92537,11 +92537,11 @@ pixel_y = 3 }, /obj/item/storage/fancy/donut_box, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/drinks/bottle/whiskey{ pixel_x = 3; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -92785,7 +92785,7 @@ /area/station/command/bridge) "rYu" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/drinks/britcup{ pixel_y = 2 }, /obj/machinery/newscaster/directional/south, @@ -92934,7 +92934,7 @@ pixel_x = -14; pixel_y = 8 }, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ pixel_y = 6; pixel_x = -6; initialized = 1 @@ -96971,7 +96971,7 @@ /area/station/maintenance/starboard2) "tnj" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -7; pixel_y = 7 }, @@ -97949,7 +97949,7 @@ pixel_x = 2; pixel_y = 7 }, -/obj/item/reagent_containers/food/drinks/mug/hos, +/obj/item/reagent_containers/drinks/mug/hos, /obj/machinery/camera{ c_tag = "Brig Head of Security's Bedroom"; dir = 1 @@ -98500,13 +98500,13 @@ /area/station/command/office/hos) "tOf" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_x = -6 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_x = 6 }, -/obj/item/reagent_containers/food/drinks/bottle/vodka, +/obj/item/reagent_containers/drinks/bottle/vodka, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/siding/blue{ dir = 6 @@ -98733,11 +98733,11 @@ /area/station/hallway/secondary/entry) "tSt" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = -5; pixel_y = 2 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = 5 }, /turf/simulated/floor/plasteel/white, @@ -101295,7 +101295,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "uKR" = ( -/obj/item/reagent_containers/food/snacks/candy/gummybear/green, +/obj/item/food/snacks/candy/gummybear/green, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ @@ -101802,7 +101802,7 @@ /area/station/service/bar/atrium) "uQQ" = ( /obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/condiment/saltshaker, +/obj/item/reagent_containers/condiment/saltshaker, /obj/item/kitchen/utensil/fork{ pixel_x = -5 }, @@ -102426,7 +102426,7 @@ "uYg" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dust, -/obj/item/reagent_containers/food/snacks/meat, +/obj/item/food/snacks/meat, /obj/effect/decal/cleanable/blood/old, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" @@ -102534,7 +102534,7 @@ "vaT" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/fries{ +/obj/item/food/snacks/fries{ pixel_y = 2 }, /turf/simulated/floor/plating, @@ -102745,7 +102745,7 @@ /area/station/legal/lawoffice) "veB" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/grown/poppy/geranium, +/obj/item/food/snacks/grown/poppy/geranium, /obj/item/soap/deluxe, /obj/machinery/power/apc{ cell_type = 25000; @@ -103192,11 +103192,11 @@ /area/station/service/library) "vlR" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ pixel_x = -6; pixel_y = 10 }, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ pixel_x = 6; pixel_y = 10 }, @@ -103708,7 +103708,7 @@ "vvS" = ( /obj/structure/table/wood, /obj/item/picket_sign, -/obj/item/reagent_containers/food/condiment/saltshaker, +/obj/item/reagent_containers/condiment/saltshaker, /turf/simulated/floor/wood/oak, /area/station/maintenance/old_kitchen) "vwk" = ( @@ -104214,7 +104214,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, /obj/machinery/recharger, -/obj/item/reagent_containers/food/drinks/bottle/random_drink, +/obj/item/reagent_containers/drinks/bottle/random_drink, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "vEN" = ( @@ -105880,7 +105880,7 @@ "weH" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/birthdaycakeslice, +/obj/item/food/snacks/birthdaycakeslice, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "weO" = ( @@ -106077,7 +106077,7 @@ /obj/item/clothing/mask/cigarette/pipe, /obj/item/clothing/accessory/holster, /obj/item/clothing/suit/jacket/leather/overcoat, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/drinks/bottle/whiskey, /obj/item/clothing/head/fedora/brownfedora, /turf/simulated/floor/plating, /area/station/maintenance/old_detective) @@ -107629,7 +107629,7 @@ /obj/item/stack/packageWrap{ pixel_y = 7 }, -/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/condiment/enzyme, /obj/item/reagent_containers/glass/bucket{ pixel_x = 6 }, @@ -108747,9 +108747,9 @@ /area/station/medical/virology/lab) "xcg" = ( /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/food/snacks/meat/human, -/obj/item/reagent_containers/food/snacks/meat/human, -/obj/item/reagent_containers/food/snacks/meat/human, +/obj/item/food/snacks/meat/human, +/obj/item/food/snacks/meat/human, +/obj/item/food/snacks/meat/human, /obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ dir = 10; @@ -109083,7 +109083,7 @@ }, /obj/effect/landmark/spawner/rev, /obj/machinery/light/small/directional/south, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ pixel_y = 6; pixel_x = 8; volume = 0 @@ -110782,7 +110782,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/drinks/drinkingglass, /turf/simulated/floor/plating, /area/station/maintenance/disposal/east) "xJH" = ( diff --git a/_maps/map_files220/generic/Admin_Zone.dmm b/_maps/map_files220/generic/Admin_Zone.dmm index c794f3ba7784..cb4a80df0e1e 100644 --- a/_maps/map_files220/generic/Admin_Zone.dmm +++ b/_maps/map_files220/generic/Admin_Zone.dmm @@ -691,13 +691,13 @@ /area/admin) "kQ" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/grown/citrus/lemon, -/obj/item/reagent_containers/food/snacks/grown/berries, -/obj/item/reagent_containers/food/snacks/grown/banana, -/obj/item/reagent_containers/food/snacks/grown/cherries, -/obj/item/reagent_containers/food/snacks/grown/citrus/orange, -/obj/item/reagent_containers/food/snacks/grown/corn, -/obj/item/reagent_containers/food/snacks/grown/mushroom/amanita, +/obj/item/food/snacks/grown/citrus/lemon, +/obj/item/food/snacks/grown/berries, +/obj/item/food/snacks/grown/banana, +/obj/item/food/snacks/grown/cherries, +/obj/item/food/snacks/grown/citrus/orange, +/obj/item/food/snacks/grown/corn, +/obj/item/food/snacks/grown/mushroom/amanita, /turf/simulated/floor/wood/oak, /area/admin) "kT" = ( @@ -3247,7 +3247,7 @@ "Vh" = ( /obj/structure/table/wood, /obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/drinks/bottle/whiskey{ pixel_y = 5 }, /turf/simulated/floor/plasteel{ diff --git a/_maps/map_files220/generic/Lavaland.dmm b/_maps/map_files220/generic/Lavaland.dmm index f05615226571..4a3f257705ef 100644 --- a/_maps/map_files220/generic/Lavaland.dmm +++ b/_maps/map_files220/generic/Lavaland.dmm @@ -674,22 +674,22 @@ /area/shuttle/mining) "bG" = ( /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/food/drinks/cans/beer, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer, +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = -1; pixel_y = 9 }, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = -8 }, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = 4; pixel_y = 4 }, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = -7 }, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = 7; pixel_y = 5 }, @@ -974,7 +974,7 @@ /area/mine/outpost/storage) "cl" = ( /obj/structure/lattice/catwalk/mining, -/obj/item/reagent_containers/food/snacks/fortunecookie{ +/obj/item/food/snacks/fortunecookie{ pixel_y = -5; pixel_x = -6 }, @@ -2388,11 +2388,11 @@ /area/mine/outpost/hallway/west) "eW" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 2; pixel_y = 6 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -2; pixel_y = 4 }, @@ -2438,7 +2438,7 @@ /area/mine/outpost/hallway/west) "fb" = ( /obj/structure/reagent_dispensers/oil, -/obj/item/reagent_containers/food/drinks/oilcan, +/obj/item/reagent_containers/drinks/oilcan, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) "fc" = ( @@ -5301,7 +5301,7 @@ "oB" = ( /obj/structure/rack, /obj/item/storage/toolbox/emergency, -/obj/item/reagent_containers/food/snacks/grown/harebell, +/obj/item/food/snacks/grown/harebell, /obj/item/radio/intercom/directional/south, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/east) diff --git a/_maps/map_files220/generic/centcomm.dmm b/_maps/map_files220/generic/centcomm.dmm index e0c7dae5ffc1..b5777d63a4bd 100644 --- a/_maps/map_files220/generic/centcomm.dmm +++ b/_maps/map_files220/generic/centcomm.dmm @@ -385,15 +385,15 @@ /area/centcom/ss220/admin3) "anM" = ( /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/kitchen/knife, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ pixel_y = 5 }, /obj/machinery/reagentgrinder{ @@ -1122,7 +1122,7 @@ /obj/structure/table/wood{ color = "#996633" }, -/obj/item/reagent_containers/food/snacks/lemoncakeslice, +/obj/item/food/snacks/lemoncakeslice, /turf/simulated/floor/wood/parquet/tile, /area/centcom/ss220/admin1) "aMw" = ( @@ -1386,7 +1386,7 @@ /area/ghost_bar) "aXh" = ( /obj/structure/table/wood/poker, -/obj/item/reagent_containers/food/drinks/bottle/vodka{ +/obj/item/reagent_containers/drinks/bottle/vodka{ pixel_x = -5; pixel_y = 9 }, @@ -1669,13 +1669,13 @@ /area/shuttle/trade/sol) "bjU" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ pixel_x = 10 }, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ pixel_x = 5 }, -/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/condiment/enzyme, /turf/simulated/floor/plating{ icon = 'icons/turf/floors.dmi'; icon_state = "elevatorshaft"; @@ -2662,7 +2662,7 @@ /area/syndicate_mothership) "bUl" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/bottle/vermouth, +/obj/item/reagent_containers/drinks/bottle/vermouth, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/elite_squad) "bUU" = ( @@ -3792,7 +3792,7 @@ /turf/simulated/floor/grass/jungle/no_creep, /area/centcom/ss220/admin1) "cHl" = ( -/obj/item/reagent_containers/food/drinks/bottle/rum{ +/obj/item/reagent_containers/drinks/bottle/rum{ pixel_x = 6; pixel_y = 2 }, @@ -3806,7 +3806,7 @@ pixel_x = -7; pixel_y = 5 }, -/obj/item/reagent_containers/food/drinks/mugwort{ +/obj/item/reagent_containers/drinks/mugwort{ pixel_x = 8; pixel_y = 6 }, @@ -3883,15 +3883,15 @@ /area/wizard_station) "cKt" = ( /obj/machinery/economy/vending/boozeomat, -/obj/item/reagent_containers/food/drinks/bottle/cognac{ +/obj/item/reagent_containers/drinks/bottle/cognac{ pixel_x = 9; pixel_y = 23 }, -/obj/item/reagent_containers/food/drinks/bottle/absinthe/premium{ +/obj/item/reagent_containers/drinks/bottle/absinthe/premium{ pixel_x = -8; pixel_y = 25 }, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/drinks/bottle/whiskey{ pixel_y = 23 }, /turf/simulated/floor/carpet/red, @@ -3938,7 +3938,7 @@ /area/syndicate_mothership/elite_squad) "cLC" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/food/snacks/burger/bigbite{ +/obj/item/food/snacks/burger/bigbite{ pixel_y = 4 }, /turf/simulated/floor/carpet/black, @@ -4617,11 +4617,11 @@ /area/centcom/ss220/admin3) "djm" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/shaker{ +/obj/item/reagent_containers/drinks/shaker{ pixel_x = 6; pixel_y = 4 }, -/obj/item/reagent_containers/food/drinks/shaker{ +/obj/item/reagent_containers/drinks/shaker{ pixel_x = -6; pixel_y = 4 }, @@ -4764,7 +4764,7 @@ }, /area/syndicate_mothership/jail) "doZ" = ( -/obj/item/reagent_containers/food/drinks/bottle/goldschlager, +/obj/item/reagent_containers/drinks/bottle/goldschlager, /obj/structure/table/wood/fancy/black, /turf/simulated/floor/plating{ icon = 'icons/turf/floors.dmi'; @@ -4775,13 +4775,13 @@ /area/syndicate_mothership/elite_squad) "dpf" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/bottle/cream{ +/obj/item/reagent_containers/drinks/bottle/cream{ pixel_y = 8 }, -/obj/item/reagent_containers/food/condiment/soysauce{ +/obj/item/reagent_containers/condiment/soysauce{ pixel_x = 12 }, -/obj/item/reagent_containers/food/condiment/sugar{ +/obj/item/reagent_containers/condiment/sugar{ pixel_x = -9; pixel_y = -4 }, @@ -4889,7 +4889,7 @@ /area/ninja/holding) "dsw" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/mug/med, +/obj/item/reagent_containers/drinks/mug/med, /obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ icon_state = "cmo" @@ -5104,7 +5104,7 @@ /area/syndicate_mothership/cargo) "dzI" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/sliceable/chocolatecake, +/obj/item/food/snacks/sliceable/chocolatecake, /turf/simulated/floor/wood/oak, /area/syndicate_mothership/elite_squad) "dzJ" = ( @@ -5418,11 +5418,11 @@ /area/shuttle/syndicate) "dIR" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 4; pixel_y = 6 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -4; pixel_y = 6 }, @@ -5756,7 +5756,7 @@ "dSq" = ( /obj/structure/window/reinforced, /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = -6; pixel_y = 4 }, @@ -6524,24 +6524,24 @@ /area/shuttle/syndicate_elite) "eyi" = ( /obj/structure/closet/secure_closet/freezer/meat/open, -/obj/item/reagent_containers/food/snacks/raw_bacon, -/obj/item/reagent_containers/food/snacks/raw_bacon, -/obj/item/reagent_containers/food/snacks/raw_bacon, -/obj/item/reagent_containers/food/snacks/raw_bacon, -/obj/item/reagent_containers/food/snacks/sausage, -/obj/item/reagent_containers/food/snacks/sausage, -/obj/item/reagent_containers/food/snacks/rawcutlet, -/obj/item/reagent_containers/food/snacks/rawcutlet, -/obj/item/reagent_containers/food/snacks/rawcutlet, -/obj/item/reagent_containers/food/snacks/catfishmeat, -/obj/item/reagent_containers/food/snacks/catfishmeat, -/obj/item/reagent_containers/food/snacks/catfishmeat, -/obj/item/reagent_containers/food/snacks/catfishmeat, -/obj/item/reagent_containers/food/snacks/rawcutlet, -/obj/item/reagent_containers/food/snacks/rawcutlet, -/obj/item/reagent_containers/food/snacks/rawcutlet, -/obj/item/reagent_containers/food/snacks/spaghetti, -/obj/item/reagent_containers/food/snacks/spaghetti, +/obj/item/food/snacks/raw_bacon, +/obj/item/food/snacks/raw_bacon, +/obj/item/food/snacks/raw_bacon, +/obj/item/food/snacks/raw_bacon, +/obj/item/food/snacks/sausage, +/obj/item/food/snacks/sausage, +/obj/item/food/snacks/rawcutlet, +/obj/item/food/snacks/rawcutlet, +/obj/item/food/snacks/rawcutlet, +/obj/item/food/snacks/catfishmeat, +/obj/item/food/snacks/catfishmeat, +/obj/item/food/snacks/catfishmeat, +/obj/item/food/snacks/catfishmeat, +/obj/item/food/snacks/rawcutlet, +/obj/item/food/snacks/rawcutlet, +/obj/item/food/snacks/rawcutlet, +/obj/item/food/snacks/spaghetti, +/obj/item/food/snacks/spaghetti, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -7141,11 +7141,11 @@ /obj/structure/table/reinforced{ color = "#996633" }, -/obj/item/reagent_containers/food/drinks/shaker{ +/obj/item/reagent_containers/drinks/shaker{ pixel_x = -8; pixel_y = 2 }, -/obj/item/reagent_containers/food/drinks/shaker{ +/obj/item/reagent_containers/drinks/shaker{ pixel_x = 4; pixel_y = 2 }, @@ -7510,7 +7510,7 @@ /obj/structure/table/wood{ color = "#996633" }, -/obj/item/reagent_containers/food/snacks/sliceable/pizza/diablo, +/obj/item/food/snacks/sliceable/pizza/diablo, /turf/simulated/floor/wood/parquet/tile, /area/centcom/ss220/admin1) "fbl" = ( @@ -7628,19 +7628,19 @@ /area/syndicate_mothership/cargo) "fgh" = ( /obj/structure/table/wood/fancy/black, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = 8; pixel_y = 10 }, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = 8; pixel_y = 4 }, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = -2; pixel_y = 10 }, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = -2; pixel_y = 4 }, @@ -7835,25 +7835,25 @@ /obj/structure/closet/secure_closet/freezer/kitchen{ req_access = null }, -/obj/item/reagent_containers/food/snacks/grown/banana, -/obj/item/reagent_containers/food/snacks/grown/banana, -/obj/item/reagent_containers/food/snacks/grown/wheat, -/obj/item/reagent_containers/food/snacks/grown/wheat, -/obj/item/reagent_containers/food/snacks/grown/vanillapod, -/obj/item/reagent_containers/food/snacks/grown/vanillapod, -/obj/item/reagent_containers/food/snacks/grown/sugarcane, -/obj/item/reagent_containers/food/snacks/grown/sugarcane, -/obj/item/reagent_containers/food/snacks/grown/oat, -/obj/item/reagent_containers/food/snacks/grown/oat, -/obj/item/reagent_containers/food/snacks/grown/grapes, -/obj/item/reagent_containers/food/snacks/grown/grapes, -/obj/item/reagent_containers/food/snacks/grown/corn, -/obj/item/reagent_containers/food/snacks/grown/corn, -/obj/item/reagent_containers/food/snacks/grown/chili, -/obj/item/reagent_containers/food/snacks/grown/chili, -/obj/item/reagent_containers/food/snacks/grown/carrot, -/obj/item/reagent_containers/food/snacks/grown/apple, -/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris, +/obj/item/food/snacks/grown/banana, +/obj/item/food/snacks/grown/banana, +/obj/item/food/snacks/grown/wheat, +/obj/item/food/snacks/grown/wheat, +/obj/item/food/snacks/grown/vanillapod, +/obj/item/food/snacks/grown/vanillapod, +/obj/item/food/snacks/grown/sugarcane, +/obj/item/food/snacks/grown/sugarcane, +/obj/item/food/snacks/grown/oat, +/obj/item/food/snacks/grown/oat, +/obj/item/food/snacks/grown/grapes, +/obj/item/food/snacks/grown/grapes, +/obj/item/food/snacks/grown/corn, +/obj/item/food/snacks/grown/corn, +/obj/item/food/snacks/grown/chili, +/obj/item/food/snacks/grown/chili, +/obj/item/food/snacks/grown/carrot, +/obj/item/food/snacks/grown/apple, +/obj/item/food/snacks/grown/ambrosia/vulgaris, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -8295,7 +8295,7 @@ /area/syndicate_mothership) "fAT" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/food/snacks/birthdaycakeslice, +/obj/item/food/snacks/birthdaycakeslice, /obj/item/kitchen/utensil/fork{ pixel_x = 11; pixel_y = 8 @@ -8760,7 +8760,7 @@ /obj/structure/table/wood{ color = "#996633" }, -/obj/item/reagent_containers/food/snacks/onionrings, +/obj/item/food/snacks/onionrings, /turf/simulated/floor/wood/parquet/tile, /area/centcom/ss220/admin1) "fTe" = ( @@ -9047,10 +9047,10 @@ /area/ghost_bar) "gff" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_y = 6 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/bluespace{ +/obj/item/reagent_containers/drinks/drinkingglass/shotglass/bluespace{ pixel_x = 16; pixel_y = 9 }, @@ -9379,27 +9379,27 @@ /area/syndicate_mothership) "gtk" = ( /obj/structure/table/wood/fancy/black, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = -14; pixel_y = 10 }, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = 6; pixel_y = 10 }, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = 6; pixel_y = 4 }, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = -4; pixel_y = 10 }, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = -4; pixel_y = 4 }, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = -14; pixel_y = 4 }, @@ -9526,7 +9526,7 @@ pixel_x = -18; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = -6; pixel_y = 4 }, @@ -9576,9 +9576,9 @@ /turf/simulated/floor/carpet/black, /area/ghost_bar) "gyx" = ( -/obj/item/reagent_containers/food/snacks/grown/cannabis/rainbow, -/obj/item/reagent_containers/food/snacks/grown/cannabis/rainbow, -/obj/item/reagent_containers/food/snacks/grown/cannabis/rainbow, +/obj/item/food/snacks/grown/cannabis/rainbow, +/obj/item/food/snacks/grown/cannabis/rainbow, +/obj/item/food/snacks/grown/cannabis/rainbow, /turf/simulated/floor/wood/fancy/cherry, /area/trader_station/sol) "gzd" = ( @@ -9755,22 +9755,22 @@ /area/centcom/ss220/bar) "gDl" = ( /obj/structure/closet/secure_closet/freezer/fridge/open, -/obj/item/reagent_containers/food/snacks/grown/potato, -/obj/item/reagent_containers/food/snacks/grown/potato, -/obj/item/reagent_containers/food/snacks/grown/whitebeet, -/obj/item/reagent_containers/food/snacks/grown/whitebeet, -/obj/item/reagent_containers/food/snacks/grown/tomato, -/obj/item/reagent_containers/food/snacks/grown/tomato, -/obj/item/reagent_containers/food/snacks/grown/rice, -/obj/item/reagent_containers/food/snacks/grown/rice, -/obj/item/reagent_containers/food/snacks/grown/icepepper, -/obj/item/reagent_containers/food/snacks/grown/icepepper, -/obj/item/reagent_containers/food/snacks/grown/citrus/lemon, -/obj/item/reagent_containers/food/snacks/grown/citrus/lime, -/obj/item/reagent_containers/food/snacks/grown/citrus/orange, -/obj/item/reagent_containers/food/snacks/grown/cherries, -/obj/item/reagent_containers/food/snacks/grown/apple, -/obj/item/reagent_containers/food/snacks/grown/ambrosia/deus, +/obj/item/food/snacks/grown/potato, +/obj/item/food/snacks/grown/potato, +/obj/item/food/snacks/grown/whitebeet, +/obj/item/food/snacks/grown/whitebeet, +/obj/item/food/snacks/grown/tomato, +/obj/item/food/snacks/grown/tomato, +/obj/item/food/snacks/grown/rice, +/obj/item/food/snacks/grown/rice, +/obj/item/food/snacks/grown/icepepper, +/obj/item/food/snacks/grown/icepepper, +/obj/item/food/snacks/grown/citrus/lemon, +/obj/item/food/snacks/grown/citrus/lime, +/obj/item/food/snacks/grown/citrus/orange, +/obj/item/food/snacks/grown/cherries, +/obj/item/food/snacks/grown/apple, +/obj/item/food/snacks/grown/ambrosia/deus, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -10441,7 +10441,7 @@ /area/syndicate_mothership) "gXA" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/mug/novelty, +/obj/item/reagent_containers/drinks/mug/novelty, /obj/item/candle/eternal/wizard{ pixel_y = 11 }, @@ -10841,7 +10841,7 @@ /obj/item/ashtray/glass{ pixel_x = 16 }, -/obj/item/reagent_containers/food/snacks/sliceable/turkey{ +/obj/item/food/snacks/sliceable/turkey{ pixel_y = 6 }, /turf/simulated/floor/carpet/red, @@ -10914,7 +10914,7 @@ /area/centcom/ss220/admin3) "hqi" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/holywater/hell{ +/obj/item/reagent_containers/drinks/bottle/holywater/hell{ pixel_y = 2 }, /turf/simulated/floor/carpet, @@ -11940,7 +11940,7 @@ /area/syndicate_mothership) "hTA" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/food/snacks/benedict{ +/obj/item/food/snacks/benedict{ pixel_y = 6 }, /obj/item/kitchen/utensil/fork{ @@ -12002,7 +12002,7 @@ /area/space/centcomm) "hVt" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ layer = 5; pixel_x = 12; pixel_y = 8 @@ -12710,11 +12710,11 @@ /area/centcom/ss220/admin3) "iuR" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = 6; pixel_y = 4 }, -/obj/item/reagent_containers/food/drinks/cans/beer{ +/obj/item/reagent_containers/drinks/cans/beer{ pixel_x = -6; pixel_y = 4 }, @@ -12747,18 +12747,18 @@ /area/abductor_ship) "ivy" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_x = -5 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_x = -8; pixel_y = -6 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_x = 11; pixel_y = 13 }, -/obj/item/reagent_containers/food/drinks/bottle/vodka{ +/obj/item/reagent_containers/drinks/bottle/vodka{ pixel_x = 4; pixel_y = 7 }, @@ -12803,7 +12803,7 @@ /area/shuttle/syndicate) "iwf" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/chocolatecakeslice, +/obj/item/food/snacks/chocolatecakeslice, /turf/simulated/floor/wood/oak, /area/syndicate_mothership/elite_squad) "iwk" = ( @@ -13381,7 +13381,7 @@ dir = 1; name = "Стойка выдачи" }, -/obj/item/reagent_containers/food/snacks/sliceable/braincake{ +/obj/item/food/snacks/sliceable/braincake{ pixel_y = 4 }, /turf/simulated/floor/plasteel{ @@ -14226,7 +14226,7 @@ /area/centcom/ss220/supply) "jAn" = ( /obj/machinery/kitchen_machine/oven, -/obj/item/reagent_containers/food/snacks/rawcookies/chocochips{ +/obj/item/food/snacks/rawcookies/chocochips{ pixel_x = -1; pixel_y = 6 }, @@ -14573,11 +14573,11 @@ /obj/item/stack/spacecash/c10000, /obj/item/stack/spacecash/c10000, /obj/item/stack/spacecash/c10000, -/obj/item/reagent_containers/food/drinks/bottle/goldschlager, +/obj/item/reagent_containers/drinks/bottle/goldschlager, /obj/item/coin/gold, /obj/item/toy/plushie/corgi, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass, /turf/simulated/floor/wood/parquet/tile, /area/centcom/ss220/admin2) "jNJ" = ( @@ -14792,10 +14792,10 @@ /area/centcom/ss220/admin1) "jZg" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/tofukabob, -/obj/item/reagent_containers/food/snacks/tofukabob, -/obj/item/reagent_containers/food/snacks/tofukabob, -/obj/item/reagent_containers/food/snacks/tofukabob, +/obj/item/food/snacks/tofukabob, +/obj/item/food/snacks/tofukabob, +/obj/item/food/snacks/tofukabob, +/obj/item/food/snacks/tofukabob, /turf/simulated/floor/plasteel{ icon_state = "darkyellowfull" }, @@ -16255,7 +16255,7 @@ /area/centcom/ss220/command) "liv" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/food/snacks/applepie, +/obj/item/food/snacks/applepie, /obj/item/kitchen/utensil/fork{ pixel_x = -12; pixel_y = 8 @@ -16270,7 +16270,7 @@ /area/syndicate_mothership/jail) "liW" = ( /obj/structure/table/wood/fancy/black, -/obj/item/reagent_containers/food/drinks/trophy/gold_cup, +/obj/item/reagent_containers/drinks/trophy/gold_cup, /obj/effect/turf_decal/siding/wood{ dir = 1 }, @@ -16739,7 +16739,7 @@ pixel_x = 18; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = -6; pixel_y = 4 }, @@ -18610,7 +18610,7 @@ /area/syndicate_mothership/elite_squad) "mIR" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/food/snacks/bananacakeslice{ +/obj/item/food/snacks/bananacakeslice{ pixel_y = 4 }, /obj/item/kitchen/utensil/fork{ @@ -18958,7 +18958,7 @@ amount = 115; desc = null }, -/obj/item/reagent_containers/food/snacks/soup/beetsoup{ +/obj/item/food/snacks/soup/beetsoup{ desc = "Со вкусом политических убийств"; name = "Борщ"; pixel_y = 16 @@ -19280,11 +19280,11 @@ /area/shuttle/syndicate) "nkM" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/burger/superbite, -/obj/item/reagent_containers/food/snacks/burger/superbite, -/obj/item/reagent_containers/food/snacks/burger/superbite, -/obj/item/reagent_containers/food/snacks/burger/superbite, -/obj/item/reagent_containers/food/snacks/burger/superbite, +/obj/item/food/snacks/burger/superbite, +/obj/item/food/snacks/burger/superbite, +/obj/item/food/snacks/burger/superbite, +/obj/item/food/snacks/burger/superbite, +/obj/item/food/snacks/burger/superbite, /turf/simulated/floor/plasteel{ icon_state = "darkyellowfull" }, @@ -19610,7 +19610,7 @@ /area/centcom/ss220/command) "nvT" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/drinks/shaker, /obj/structure/light_fake{ dir = 4 }, @@ -19874,7 +19874,7 @@ /area/centcom/ss220/jail) "nES" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_y = 6 }, /turf/simulated/floor/plasteel/dark, @@ -20447,7 +20447,7 @@ /obj/structure/light_fake/spot{ dir = 8 }, -/obj/item/reagent_containers/food/snacks/sliceable/limecake{ +/obj/item/food/snacks/sliceable/limecake{ pixel_y = 2 }, /turf/simulated/floor/plasteel{ @@ -20617,7 +20617,7 @@ /turf/simulated/floor/plating, /area/shuttle/administration) "oiT" = ( -/obj/item/reagent_containers/food/drinks/bottle/vodka{ +/obj/item/reagent_containers/drinks/bottle/vodka{ pixel_x = -8; pixel_y = 4 }, @@ -20664,7 +20664,7 @@ /obj/structure/table/wood{ color = "#996633" }, -/obj/item/reagent_containers/food/snacks/sliceable/pizza/bacon, +/obj/item/food/snacks/sliceable/pizza/bacon, /turf/simulated/floor/wood/parquet/tile, /area/centcom/ss220/admin1) "olA" = ( @@ -21247,7 +21247,7 @@ /obj/structure/table/holotable/wood{ color = "#996633" }, -/obj/item/reagent_containers/food/snacks/burger/cheese, +/obj/item/food/snacks/burger/cheese, /turf/simulated/floor/carpet/black, /area/trader_station/sol) "oGr" = ( @@ -21782,7 +21782,7 @@ /area/centcom/ss220/general) "oYY" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/food/snacks/burger/cheese{ +/obj/item/food/snacks/burger/cheese{ pixel_y = 3 }, /turf/simulated/floor/carpet/black, @@ -22164,11 +22164,11 @@ /obj/structure/table/wood{ color = "#996633" }, -/obj/item/reagent_containers/food/drinks/bottle/wine, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/drinks/bottle/wine, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_x = 8 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_x = -5 }, /turf/simulated/floor/plating{ @@ -23151,7 +23151,7 @@ /area/centcom/ss220/admin2) "qbf" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/drinks/cans/cola, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -24779,7 +24779,7 @@ /area/ghost_bar) "rjq" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/watermelonslice, +/obj/item/food/snacks/watermelonslice, /obj/effect/decal/syndie_logo{ icon_state = "logo11" }, @@ -24945,7 +24945,7 @@ "rqA" = ( /obj/structure/table/wood/fancy, /obj/effect/spawner/lootdrop{ - loot = list(/obj/item/reagent_containers/food/snacks/baguette=10,/obj/item/reagent_containers/food/snacks/applepie=10,/obj/item/reagent_containers/food/snacks/applepie=10,/obj/item/reagent_containers/food/snacks/soup/bloodsoup=10,/obj/item/reagent_containers/food/snacks/boiledrice=10,/obj/item/reagent_containers/food/snacks/carrotfries=10,/obj/item/reagent_containers/food/drinks/cans/cola=10,""=70); + loot = list(/obj/item/food/snacks/baguette=10,/obj/item/food/snacks/applepie=10,/obj/item/food/snacks/applepie=10,/obj/item/food/snacks/soup/bloodsoup=10,/obj/item/food/snacks/boiledrice=10,/obj/item/food/snacks/carrotfries=10,/obj/item/reagent_containers/drinks/cans/cola=10,""=70); name = "Food CC Spawner #1" }, /turf/simulated/floor/wood, @@ -25228,7 +25228,7 @@ /area/centcom/ss220/supply) "rtF" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/drinks/shaker, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -25738,7 +25738,7 @@ /area/centcom/ss220/court) "rOo" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/food/snacks/boiledbuckwheat{ +/obj/item/food/snacks/boiledbuckwheat{ pixel_y = 2 }, /obj/item/kitchen/utensil/spoon{ @@ -25994,7 +25994,7 @@ /area/ghost_bar) "rVg" = ( /obj/structure/table/wood/fancy/black, -/obj/item/reagent_containers/food/drinks/shaker{ +/obj/item/reagent_containers/drinks/shaker{ pixel_x = -8; pixel_y = 4 }, @@ -26818,11 +26818,11 @@ /area/syndicate_mothership/infteam) "sDS" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/food/snacks/appletart{ +/obj/item/food/snacks/appletart{ pixel_x = -16; pixel_y = -10 }, -/obj/item/reagent_containers/food/snacks/applecakeslice{ +/obj/item/food/snacks/applecakeslice{ pixel_y = 4 }, /obj/item/kitchen/utensil/fork{ @@ -26947,7 +26947,7 @@ /obj/structure/table/wood{ color = "#996633" }, -/obj/item/reagent_containers/food/snacks/meatsteak, +/obj/item/food/snacks/meatsteak, /turf/simulated/floor/wood/parquet/tile, /area/centcom/ss220/admin1) "sIn" = ( @@ -27695,7 +27695,7 @@ /obj/structure/table/holotable/wood{ color = "#996633" }, -/obj/item/reagent_containers/food/snacks/sliceable/turkey, +/obj/item/food/snacks/sliceable/turkey, /turf/simulated/floor/carpet/black, /area/trader_station/sol) "thG" = ( @@ -28041,7 +28041,7 @@ /turf/simulated/floor/mineral/plastitanium, /area/shuttle/syndicate) "tuO" = ( -/obj/item/reagent_containers/food/snacks/pie{ +/obj/item/food/snacks/pie{ pixel_x = -8; pixel_y = 13 }, @@ -28474,7 +28474,7 @@ pixel_x = 5; pixel_y = 5 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = -6; pixel_y = 4 }, @@ -28675,7 +28675,7 @@ /obj/structure/table/wood{ color = "#996633" }, -/obj/item/reagent_containers/food/snacks/sliceable/pizza/macpizza, +/obj/item/food/snacks/sliceable/pizza/macpizza, /turf/simulated/floor/wood/parquet/tile, /area/centcom/ss220/admin1) "tQU" = ( @@ -28701,12 +28701,12 @@ }, /obj/item/stack/cable_coil/random, /obj/item/stack/cable_coil/random, -/obj/item/reagent_containers/food/snacks/grown/banana, -/obj/item/reagent_containers/food/snacks/grown/banana, -/obj/item/reagent_containers/food/snacks/grown/banana, -/obj/item/reagent_containers/food/snacks/grown/banana, -/obj/item/reagent_containers/food/snacks/grown/banana, -/obj/item/reagent_containers/food/snacks/grown/banana, +/obj/item/food/snacks/grown/banana, +/obj/item/food/snacks/grown/banana, +/obj/item/food/snacks/grown/banana, +/obj/item/food/snacks/grown/banana, +/obj/item/food/snacks/grown/banana, +/obj/item/food/snacks/grown/banana, /turf/simulated/floor/wood/oak, /area/syndicate_mothership/infteam) "tSu" = ( @@ -29063,7 +29063,7 @@ /area/shuttle/gamma/space) "ued" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/drinks/coffee{ pixel_y = 8 }, /turf/simulated/floor/plasteel/dark, @@ -29421,7 +29421,7 @@ /obj/structure/table/wood{ color = "#996633" }, -/obj/item/reagent_containers/food/snacks/salad/herb, +/obj/item/food/snacks/salad/herb, /turf/simulated/floor/wood/parquet/tile, /area/centcom/ss220/admin1) "utb" = ( @@ -29930,10 +29930,10 @@ /area/centcom/ss220/admin1) "uMM" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/shaker{ +/obj/item/reagent_containers/drinks/shaker{ pixel_x = 7 }, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/drinks/bottle/whiskey{ pixel_x = -7; pixel_y = 7 }, @@ -30776,7 +30776,7 @@ pixel_x = 5; pixel_y = 5 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = -6; pixel_y = 4 }, @@ -30941,7 +30941,7 @@ /obj/structure/sign/poster/contraband/random{ pixel_x = 30 }, -/obj/item/reagent_containers/food/drinks/cans/beer, +/obj/item/reagent_containers/drinks/cans/beer, /turf/simulated/floor/wood/oak, /area/syndicate_mothership) "vwP" = ( @@ -32386,7 +32386,7 @@ /area/shuttle/syndicate) "wBj" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{ +/obj/item/reagent_containers/drinks/bottle/vodka/badminka{ pixel_x = 8; pixel_y = 7 }, @@ -32454,7 +32454,7 @@ /obj/structure/table/wood{ color = "#996633" }, -/obj/item/reagent_containers/food/drinks/shaker{ +/obj/item/reagent_containers/drinks/shaker{ pixel_x = -7 }, /obj/structure/curtain/black{ @@ -32761,9 +32761,9 @@ /obj/structure/closet/secure_closet/freezer/kitchen{ req_access = null }, -/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/flour, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/flour, /obj/structure/curtain/black{ pixel_y = 32; anchored = 1 @@ -33035,7 +33035,7 @@ /obj/structure/table/wood{ color = "#996633" }, -/obj/item/reagent_containers/food/snacks/hotdog, +/obj/item/food/snacks/hotdog, /turf/simulated/floor/wood/parquet/tile, /area/centcom/ss220/admin1) "wVB" = ( @@ -33778,7 +33778,7 @@ /obj/structure/table/wood{ color = "#996633" }, -/obj/item/reagent_containers/food/snacks/sliceable/birthdaycake, +/obj/item/food/snacks/sliceable/birthdaycake, /turf/simulated/floor/wood/parquet/tile, /area/centcom/ss220/admin1) "xpi" = ( @@ -33969,7 +33969,7 @@ /area/centcom/ss220/command) "xtE" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/wine{ +/obj/item/reagent_containers/drinks/bottle/wine{ pixel_x = -5; pixel_y = 6 }, diff --git a/code/__DEFINES/asset_defines.dm b/code/__DEFINES/asset_defines.dm new file mode 100644 index 000000000000..6ec6d6052691 --- /dev/null +++ b/code/__DEFINES/asset_defines.dm @@ -0,0 +1,8 @@ +/// Get html to load a url. +/// for use inside of browse() calls to html assets that might be loaded on a cdn. +#define URL2HTMLLOADER(url) {"
"} + +/// Generate a filename for this asset +/// The same asset will always lead to the same asset name +/// Generated names do not include file extension. +#define GENERATE_ASSET_NAME(file) "asset.[md5(fcopy_rsc(file))]" diff --git a/code/__DEFINES/chat.dm b/code/__DEFINES/chat.dm new file mode 100644 index 000000000000..149f5d856988 --- /dev/null +++ b/code/__DEFINES/chat.dm @@ -0,0 +1,25 @@ +/** + * Copyright (c) 2020 Aleksej Komarov + * SPDX-License-Identifier: MIT + */ + +/// How many chat payloads to keep in history +#define CHAT_RELIABILITY_HISTORY_SIZE 5 +/// How many resends to allow before giving up +#define CHAT_RELIABILITY_MAX_RESENDS 3 + +#define MESSAGE_TYPE_SYSTEM "system" +#define MESSAGE_TYPE_LOCALCHAT "localchat" +#define MESSAGE_TYPE_RADIO "radio" +#define MESSAGE_TYPE_INFO "info" +#define MESSAGE_TYPE_WARNING "warning" +#define MESSAGE_TYPE_DEADCHAT "deadchat" +#define MESSAGE_TYPE_OOC "ooc" +#define MESSAGE_TYPE_ADMINPM "adminpm" +#define MESSAGE_TYPE_COMBAT "combat" +#define MESSAGE_TYPE_ADMINCHAT "adminchat" +#define MESSAGE_TYPE_MENTORCHAT "mentorchat" +#define MESSAGE_TYPE_EVENTCHAT "eventchat" +#define MESSAGE_TYPE_ADMINLOG "adminlog" +#define MESSAGE_TYPE_ATTACKLOG "attacklog" +#define MESSAGE_TYPE_DEBUG "debug" diff --git a/code/__DEFINES/chat_box_defines.dm b/code/__DEFINES/chat_box_defines.dm index f2ffff8aa07c..40a1c491cf37 100644 --- a/code/__DEFINES/chat_box_defines.dm +++ b/code/__DEFINES/chat_box_defines.dm @@ -2,6 +2,7 @@ #define chat_box_examine(str) (" ") #define chat_box_red(str) (" ") #define chat_box_green(str) (" ") +#define chat_box_purple(str) (" ") #define chat_box_notice(str) (" ") #define chat_box_healthscan(str) (" ") #define chat_box_notice_thick(str) (" ") diff --git a/code/__DEFINES/construction_defines.dm b/code/__DEFINES/construction_defines.dm index 9612ed7f2c1f..86be91003162 100644 --- a/code/__DEFINES/construction_defines.dm +++ b/code/__DEFINES/construction_defines.dm @@ -59,19 +59,19 @@ #define FULLTILE_WINDOW_DIR NORTHEAST //Material defines, for determining how much of a given material an item contains -#define MAT_METAL "$metal" -#define MAT_GLASS "$glass" -#define MAT_SILVER "$silver" -#define MAT_GOLD "$gold" -#define MAT_DIAMOND "$diamond" -#define MAT_URANIUM "$uranium" -#define MAT_PLASMA "$plasma" -#define MAT_BLUESPACE "$bluespace" -#define MAT_BANANIUM "$bananium" -#define MAT_TRANQUILLITE "$tranquillite" -#define MAT_TITANIUM "$titanium" -#define MAT_BIOMASS "$biomass" -#define MAT_PLASTIC "$plastic" +#define MAT_METAL "metal" +#define MAT_GLASS "glass" +#define MAT_SILVER "silver" +#define MAT_GOLD "gold" +#define MAT_DIAMOND "diamond" +#define MAT_URANIUM "uranium" +#define MAT_PLASMA "plasma" +#define MAT_BLUESPACE "bluespace" +#define MAT_BANANIUM "bananium" +#define MAT_TRANQUILLITE "tranquillite" +#define MAT_TITANIUM "titanium" +#define MAT_BIOMASS "biomass" +#define MAT_PLASTIC "plastic" //The amount of materials you get from a sheet of mineral like iron/diamond/glass etc #define MINERAL_MATERIAL_AMOUNT 2000 //The maximum size of a stack object. diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm index a64306a38d1d..81b33c55517b 100644 --- a/code/__DEFINES/dcs/signals.dm +++ b/code/__DEFINES/dcs/signals.dm @@ -796,7 +796,7 @@ //Food -///from base of obj/item/reagent_containers/food/snacks/attack(): (mob/living/eater, mob/feeder) +///from base of obj/item/food/snacks/attack(): (mob/living/eater, mob/feeder) #define COMSIG_FOOD_EATEN "food_eaten" //Reagent diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index 3242f672b982..e73af05c7d61 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -119,7 +119,7 @@ GLOBAL_LIST_INIT(glass_sheet_types, typecacheof(list( #define isradio(A) istype(A, /obj/item/radio) #define ispill(A) istype(A, /obj/item/reagent_containers/pill) #define ispatch(A) istype(A, /obj/item/reagent_containers/patch) -#define isfood(A) istype(A, /obj/item/reagent_containers/food) +#define isfood(A) istype(A, /obj/item/food) // Modsuits #define ismodcontrol(A) istype(A, /obj/item/mod/control) diff --git a/code/__DEFINES/misc_defines.dm b/code/__DEFINES/misc_defines.dm index 482bc95f622c..712284f69e82 100644 --- a/code/__DEFINES/misc_defines.dm +++ b/code/__DEFINES/misc_defines.dm @@ -313,6 +313,23 @@ #define TRIGGER_GUARD_NONE 0 #define TRIGGER_GUARD_NORMAL 1 +// These comments mirror the below define in the order of operations to help you understand what it is doing + // Check if datum I is a mob + // If I is a mob, return the client of mob I + // Else, check to see if I is a client + // If I is a client, return I + // Else, check to see if I is a mind + // If I is a mind, try and return the mind's current mob's client + +/// Return a Client +#define CLIENT_FROM_VAR(I) (ismob(I) \ + ? I:client \ + : istype(I, /client) \ + ? I \ + : istype(I, /datum/mind \ + ? I:current?:client \ + : null)) + // Macro to get the current elapsed round time, rather than total world runtime #define ROUND_TIME (SSticker.time_game_started ? (world.time - SSticker.time_game_started) : 0) diff --git a/code/__DEFINES/stat.dm b/code/__DEFINES/stat.dm index addf59e2f02e..ac824022f6cf 100644 --- a/code/__DEFINES/stat.dm +++ b/code/__DEFINES/stat.dm @@ -3,12 +3,6 @@ #define UNCONSCIOUS 1 #define DEAD 2 -// TGUI flags -#define STATUS_INTERACTIVE 2 // GREEN Visability -#define STATUS_UPDATE 1 // ORANGE Visability -#define STATUS_DISABLED 0 // RED Visability -#define STATUS_CLOSE -1 // Close the interface - /* Shuttles */ diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm index 19a59ed2faf6..53962a8ee9a1 100644 --- a/code/__DEFINES/subsystems.dm +++ b/code/__DEFINES/subsystems.dm @@ -84,10 +84,12 @@ #define INIT_ORDER_LATE_MAPPING -40 #define INIT_ORDER_PATH -50 #define INIT_ORDER_PERSISTENCE -95 +#define INIT_ORDER_CHAT -100 // Should be last to ensure chat remains smooth during init. // Subsystem fire priority, from lowest to highest priority // If the subsystem isn't listed here it's either DEFAULT or PROCESS (if it's a processing subsystem child) +#define FIRE_PRIORITY_PING 10 #define FIRE_PRIORITY_NANOMOB 10 #define FIRE_PRIORITY_NIGHTSHIFT 10 #define FIRE_PRIORITY_IDLE_NPC 10 @@ -112,6 +114,7 @@ #define FIRE_PRIORITY_MOBS 100 #define FIRE_PRIORITY_TGUI 110 #define FIRE_PRIORITY_TICKER 200 +#define FIRE_PRIORITY_CHAT 400 #define FIRE_PRIORITY_RUNECHAT 410 // I hate how high the fire priority on this is -aa #define FIRE_PRIORITY_OVERLAYS 500 #define FIRE_PRIORITY_DELAYED_VERBS 950 diff --git a/code/__DEFINES/tgui_defines.dm b/code/__DEFINES/tgui_defines.dm index 6257e24d9f8c..ccd8d25f6f70 100644 --- a/code/__DEFINES/tgui_defines.dm +++ b/code/__DEFINES/tgui_defines.dm @@ -1,4 +1,4 @@ -// TGUI defines +// TGUI Modal defines #define UI_MODAL_INPUT_MAX_LENGTH 1024 #define UI_MODAL_INPUT_MAX_LENGTH_NAME 64 // Names for generally anything don't go past 32, let alone 64. @@ -6,3 +6,41 @@ #define UI_MODAL_DELEGATE 2 #define UI_MODAL_ANSWER 3 #define UI_MODAL_CLOSE 4 + +/// Green eye; fully interactive +#define UI_INTERACTIVE 2 +/// Orange eye; updates but is not interactive +#define UI_UPDATE 1 +/// Red eye; disabled, does not update +#define UI_DISABLED 0 +/// UI Should close +#define UI_CLOSE -1 + +/// Maximum number of windows that can be suspended/reused +#define TGUI_WINDOW_SOFT_LIMIT 5 +/// Maximum number of open windows +#define TGUI_WINDOW_HARD_LIMIT 9 + +/// Maximum ping timeout allowed to detect zombie windows +#define TGUI_PING_TIMEOUT (4 SECONDS) +/// Used for rate-limiting to prevent DoS by excessively refreshing a TGUI window +#define TGUI_REFRESH_FULL_UPDATE_COOLDOWN (1 SECONDS) + +/// Window does not exist +#define TGUI_WINDOW_CLOSED 0 +/// Window was just opened, but is still not ready to be sent data +#define TGUI_WINDOW_LOADING 1 +/// Window is free and ready to receive data +#define TGUI_WINDOW_READY 2 + +/// Get a window id based on the provided pool index +#define TGUI_WINDOW_ID(index) "tgui-window-[index]" +/// Get a pool index of the provided window id +#define TGUI_WINDOW_INDEX(window_id) text2num(copytext(window_id, 13)) + +/// Creates a message packet for sending via output() +#define TGUI_CREATE_MESSAGE(type, payload) ( \ + url_encode(json_encode(list( \ + "type" = type, \ + "payload" = payload, \ + )))) diff --git a/code/__HELPERS/_logging.dm b/code/__HELPERS/_logging.dm index de2800a7ccc8..c1d4dde450ca 100644 --- a/code/__HELPERS/_logging.dm +++ b/code/__HELPERS/_logging.dm @@ -40,7 +40,10 @@ GLOBAL_PROTECT(log_end) for(var/client/C in GLOB.admins) if(check_rights(R_DEBUG | R_VIEWRUNTIMES, FALSE, C.mob) && (C.prefs.toggles & PREFTOGGLE_CHAT_DEBUGLOGS)) - to_chat(C, "DEBUG: [text]") + to_chat(C, + type = MESSAGE_TYPE_DEBUG, + html = "DEBUG: [text]", + confidential = TRUE) /proc/log_game(text) if(GLOB.configuration.logging.game_logging) @@ -149,8 +152,19 @@ GLOBAL_PROTECT(log_end) /proc/log_runtime_summary(text) rustg_log_write(GLOB.runtime_summary_log, "[text][GLOB.log_end]") -/proc/log_tgui(text) - rustg_log_write(GLOB.tgui_log, "[text][GLOB.log_end]") +/proc/log_tgui(user_or_client, text) + var/list/messages = list() + if(!user_or_client) + messages.Add("no user") + else if(ismob(user_or_client)) + var/mob/user = user_or_client + messages.Add("[user.ckey] (as [user])") + else if(isclient(user_or_client)) + var/client/client = user_or_client + messages.Add("[client.ckey]") + messages.Add(": [text]") + messages.Add("[GLOB.log_end]") + rustg_log_write(GLOB.tgui_log, messages.Join()) #ifdef REFERENCE_TRACKING /proc/log_gc(text) diff --git a/code/__HELPERS/files.dm b/code/__HELPERS/files.dm index 397c05c466c8..114bd52c7b4a 100644 --- a/code/__HELPERS/files.dm +++ b/code/__HELPERS/files.dm @@ -33,11 +33,6 @@ return text -//Sends resource files to client cache -/client/proc/getFiles() - for(var/file in args) - src << browse_rsc(file) - /client/proc/browse_files(root="data/logs/", max_iterations=10, list/valid_extensions=list("txt", "log", "htm", "json")) // wow why was this ever a parameter root = "data/logs/" diff --git a/code/__HELPERS/iconprocs.dm b/code/__HELPERS/iconprocs.dm index eb86df49e86d..067aabb188d3 100644 --- a/code/__HELPERS/iconprocs.dm +++ b/code/__HELPERS/iconprocs.dm @@ -299,3 +299,44 @@ world M.Blend("#ffffff", ICON_SUBTRACT) // apply mask Blend(M, ICON_ADD) + +// Converts an icon to base64. Operates by putting the icon in the iconCache savefile, +// exporting it as text, and then parsing the base64 from that. +// (This relies on byond automatically storing icons in savefiles as base64) +GLOBAL_DATUM_INIT(iconCache, /savefile, new /savefile("data/iconCache.sav")) + +GLOBAL_LIST_EMPTY(bicon_cache) + +/proc/icon2base64(icon/icon, iconKey = "misc") + if(!isicon(icon)) return 0 + + GLOB.iconCache[iconKey] << icon + var/iconData = GLOB.iconCache.ExportText(iconKey) + var/list/partial = splittext(iconData, "{") + return replacetext(copytext(partial[2], 3, -5), "\n", "") + +/proc/bicon(obj, use_class = 1) + var/class = use_class ? "class='icon misc'" : null + if(!obj) + return + + if(isicon(obj)) + if(!GLOB.bicon_cache["\ref[obj]"]) // Doesn't exist yet, make it. + GLOB.bicon_cache["\ref[obj]"] = icon2base64(obj) + + return "" + + // Either an atom or somebody fucked up and is gonna get a runtime, which I'm fine with. + var/atom/A = obj + var/key = "[istype(A.icon, /icon) ? "\ref[A.icon]" : A.icon]:[A.icon_state]" + if(!GLOB.bicon_cache[key]) // Doesn't exist, make it. + var/icon/I = icon(A.icon, A.icon_state, SOUTH, 1) + if(ishuman(obj)) // Shitty workaround for a BYOND issue. + var/icon/temp = I + I = icon() + I.Insert(temp, dir = SOUTH) + GLOB.bicon_cache[key] = icon2base64(I, key) + if(use_class) + class = "class='icon [A.icon_state]'" + + return "" diff --git a/code/__HELPERS/lists.dm b/code/__HELPERS/lists.dm index c4f932574a6e..cf6642875ffa 100644 --- a/code/__HELPERS/lists.dm +++ b/code/__HELPERS/lists.dm @@ -410,13 +410,6 @@ var/middle = L.len / 2 + 1 // Copy is first,second-1 return mergeLists(sortList(L.Copy(0,middle)), sortList(L.Copy(middle))) //second parameter null = to end of list -//Mergsorge: uses sortAssoc() but uses the var's name specifically. This should probably be using mergeAtom() instead -/proc/sortNames(list/L) - var/list/Q = new() - for(var/atom/x in L) - Q[x.name] = x - return sortAssoc(Q) - /proc/mergeLists(list/L, list/R) var/Li=1 var/Ri=1 diff --git a/code/__HELPERS/name_helpers.dm b/code/__HELPERS/name_helpers.dm index 5f97da0fd55a..389d8a9759db 100644 --- a/code/__HELPERS/name_helpers.dm +++ b/code/__HELPERS/name_helpers.dm @@ -108,6 +108,10 @@ GLOBAL_VAR(syndicate_name) GLOBAL_VAR(syndicate_code_phrase) //Code phrase for traitors. GLOBAL_VAR(syndicate_code_response) //Code response for traitors. +//Cached regex search - for checking if codewords are used. +GLOBAL_DATUM(syndicate_code_phrase_regex, /regex) +GLOBAL_DATUM(syndicate_code_response_regex, /regex) + /* Should be expanded. How this works: @@ -122,9 +126,12 @@ GLOBAL_VAR(syndicate_code_response) //Code response for traitors. /N */ -/proc/generate_code_phrase()//Proc is used for phrase and response in master_controller.dm +/proc/generate_code_phrase(return_list = FALSE) // Proc is used for phrase and response in master_controller.dm - var/code_phrase = ""//What is returned when the proc finishes. + if(!return_list) + . = "" + else + . = list() var/words = pick(//How many words there will be. Minimum of two. 2, 4 and 5 have a lesser chance of being selected. 3 is the most likely. 50; 2, 200; 3, @@ -152,34 +159,34 @@ GLOBAL_VAR(syndicate_code_response) //Code response for traitors. switch(pick(safety))//Chance based on the safety list. if(1)//1 and 2 can only be selected once each to prevent more than two specific names/places/etc. - switch(rand(1,2))//Mainly to add more options later. + switch(rand(1, 2)) // Mainly to add more options later. if(1) - if(names.len) - code_phrase += pick(names) + if(length(names)) + . += pick(names) if(2) - code_phrase += pick(GLOB.jobs)//Returns a job. // SS220 EDIT - ORIGINAL: (GLOB.joblist) + . += pick(GLOB.jobs)//Returns a job. // SS220 EDIT - ORIGINAL: (GLOB.joblist) safety -= 1 if(2) switch(rand(1,2))//Places or things. if(1) - code_phrase += pick(GLOB.cocktails) // SS220 EDIT - ORIGINAL: (drinks) + . += pick(GLOB.cocktails) // SS220 EDIT - ORIGINAL: (drinks) if(2) - code_phrase += pick(GLOB.locations) // SS220 EDIT - ORIGINAL: (locations) + . += pick(GLOB.locations) // SS220 EDIT - ORIGINAL: (locations) safety -= 2 if(3) - switch(rand(1,3))//Nouns, adjectives, verbs. Can be selected more than once. + switch(rand(1, 3)) // Nouns, adjectives, verbs. Can be selected more than once. if(1) - code_phrase += pick(GLOB.nouns) // SS220 EDIT - ORIGINAL: (nouns) + . += pick(GLOB.nouns) // SS220 EDIT - ORIGINAL: (nouns) if(2) - code_phrase += pick(GLOB.adjectives) + . += pick(GLOB.adjectives) if(3) - code_phrase += pick(GLOB.verbs) - if(words==1) - code_phrase += "." - else - code_phrase += ", " + . += pick(GLOB.verbs) - return code_phrase + if(!return_list) + if(words == 1) + . += "." + else + . += ", " /proc/GenerateKey() var/newKey @@ -187,89 +194,3 @@ GLOBAL_VAR(syndicate_code_response) //Code response for traitors. newKey += pick("diamond", "beer", "mushroom", "assistant", "clown", "captain", "twinkie", "security", "nuke", "small", "big", "escape", "yellow", "gloves", "monkey", "engine", "nuclear", "ai") newKey += pick("1", "2", "3", "4", "5", "6", "7", "8", "9", "0") return newKey - -/* -//This proc tests the gen above. -/client/verb/test_code_phrase() - set name = "Generate Code Phrase" - set category = "Debug" - - to_chat(world, "Code Phrase is: [generate_code_phrase()]") - return - - - This was an earlier attempt at code phrase system, aside from an even earlier attempt (and failure). - This system more or less works as intended--aside from being unfinished--but it's still very predictable. - Particularly, the phrase opening statements are pretty easy to recognize and identify when metagaming. - I think the above-used method solves this issue by using words in a sequence, providing for much greater flexibility. - /N - - switch(choice) - if(1) - syndicate_code_phrase += pick("I'm looking for","Have you seen","Maybe you've seen","I'm trying to find","I'm tracking") - syndicate_code_phrase += " " - syndicate_code_phrase += pick(pick(GLOB.first_names_male,GLOB.first_names_female)) - syndicate_code_phrase += " " - syndicate_code_phrase += pick(GLOB.last_names) - syndicate_code_phrase += "." - if(2) - syndicate_code_phrase += pick("How do I get to","How do I find","Where is","Where do I find") - syndicate_code_phrase += " " - syndicate_code_phrase += pick("Escape","Engineering","Atmos","the bridge","the brig","CentComm","the library","the chapel","a bathroom","Med Bay","Tool Storage","the escape shuttle","Robotics","a locker room","the living quarters","the gym","the autolathe","QM","the bar","the theater","the derelict") - syndicate_code_phrase += "?" - if(3) - if(prob(70)) - syndicate_code_phrase += pick("Get me","I want","I'd like","Make me") - syndicate_code_phrase += " a " - else - syndicate_code_phrase += pick("One") - syndicate_code_phrase += " " - syndicate_code_phrase += pick("vodka and tonic","gin fizz","bahama mama","manhattan","black Russian","whiskey soda","long island tea","margarita","Irish coffee"," manly dwarf","Irish cream","doctor's delight","Beepksy Smash","tequila sunrise","brave bull","gargle blaster","bloody mary","whiskey cola","white Russian","vodka martini","martini","Cuba libre","kahlua","vodka","wine","moonshine") - syndicate_code_phrase += "." - if(4) - syndicate_code_phrase += pick("I wish I was","My dad was","His mom was","Where do I find","The hero this station needs is","I'd fuck","I wouldn't trust","Someone caught","HoS caught","Someone found","I'd wrestle","I wanna kill") - syndicate_code_phrase += " [pick("a","the")] " - syndicate_code_phrase += pick("wizard","ninja","xeno","lizard","slime","monkey","syndicate","cyborg","clown","space carp","singularity","singulo","mime") - syndicate_code_phrase += "." - if(5) - syndicate_code_phrase += pick("Do we have","Is there","Where is","Where's","Who's") - syndicate_code_phrase += " " - syndicate_code_phrase += "[pick(GLOB.joblist)]" - syndicate_code_phrase += "?" - - switch(choice) - if(1) - if(prob(80)) - syndicate_code_response += pick("Try looking for them near","I they ran off to","Yes. I saw them near","Nope. I'm heading to","Try searching") - syndicate_code_response += " " - syndicate_code_response += pick("Escape","Engineering","Atmos","the bridge","the brig","CentComm","the library","the chapel","a bathroom","Med Bay","Tool Storage","the escape shuttle","Robotics","a locker room","the living quarters","the gym","the autolathe","QM","the bar","the theater","the derelict") - syndicate_code_response += "." - else if(prob(60)) - syndicate_code_response += pick("No. I'm busy, sorry.","I don't have the time.","Not sure, maybe?","There is no time.") - else - syndicate_code_response += pick("*shrug*","*smile*","*blink*","*sigh*","*laugh*","*nod*","*giggle*") - if(2) - if(prob(80)) - syndicate_code_response += pick("Go to","Navigate to","Try","Sure, run to","Try searching","It's near","It's around") - syndicate_code_response += " the " - syndicate_code_response += pick("[pick("south","north","east","west")] maitenance door","nearby maitenance","teleporter","[pick("cold","dead")] space","morgue","vacuum","[pick("south","north","east","west")] hall ","[pick("south","north","east","west")] hallway","[pick("white","black","red","green","blue","pink","purple")] [pick("rabbit","frog","lion","tiger","panther","snake","facehugger")]") - syndicate_code_response += "." - else if(prob(60)) - syndicate_code_response += pick("Try asking","Ask","Talk to","Go see","Follow","Hunt down") - syndicate_code_response += " " - if(prob(50)) - syndicate_code_response += pick(pick(GLOB.first_names_male,GLOB.first_names_female)) - syndicate_code_response += " " - syndicate_code_response += pick(GLOB.last_names) - else - syndicate_code_response += " the " - syndicate_code_response += "[pic(GLOB.joblist)]" - syndicate_code_response += "." - else - syndicate_code_response += pick("*shrug*","*smile*","*blink*","*sigh*","*laugh*","*nod*","*giggle*") - if(3) - if(4) - if(5) - - return -*/ diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 751daeca3ac8..0fa6df637dae 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -1667,8 +1667,8 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) /obj/item/reagent_containers/glass/bottle = "BOTTLE", /obj/item/reagent_containers/patch = "PATCH", /obj/item/reagent_containers/pill = "PILL", - /obj/item/reagent_containers/food/drinks = "DRINK", - /obj/item/reagent_containers/food = "FOOD", + /obj/item/reagent_containers/drinks = "DRINK", + /obj/item/food = "FOOD", /obj/item/reagent_containers/syringe = "SYRINGE", /obj/item/reagent_containers = "REAGENT_CONTAINERS", /obj/item/robot_parts = "ROBOT_PARTS", diff --git a/code/_onclick/click_override.dm b/code/_onclick/click_override.dm index c3044a480b40..c53bbb3d2f8e 100644 --- a/code/_onclick/click_override.dm +++ b/code/_onclick/click_override.dm @@ -33,7 +33,7 @@ to_chat(user, "You draw a bit of power from [src], you can use middle click or alt click to release the power!") /datum/middleClickOverride/badminClicker - var/summon_path = /obj/item/reagent_containers/food/snacks/cookie + var/summon_path = /obj/item/food/snacks/cookie /datum/middleClickOverride/badminClicker/onClick(atom/A, mob/living/user) var/atom/movable/newObject = new summon_path diff --git a/code/controllers/configuration/configuration_core.dm b/code/controllers/configuration/configuration_core.dm index 26d3647ae7ee..0ace31c5bd89 100644 --- a/code/controllers/configuration/configuration_core.dm +++ b/code/controllers/configuration/configuration_core.dm @@ -46,6 +46,8 @@ GLOBAL_DATUM_INIT(configuration, /datum/server_configuration, new()) var/datum/configuration_section/url_configuration/url /// Holder for the voting configuration datum var/datum/configuration_section/vote_configuration/vote + /// Holder for the asset cache configuration datum + var/datum/configuration_section/asset_cache_configuration/asset_cache /// Raw data. Stored here to avoid passing data between procs constantly var/list/raw_data = list() @@ -92,6 +94,7 @@ GLOBAL_DATUM_INIT(configuration, /datum/server_configuration, new()) system = new() url = new() vote = new() + asset_cache = new() // Load our stuff up var/config_file = "config/config.toml" @@ -129,6 +132,7 @@ GLOBAL_DATUM_INIT(configuration, /datum/server_configuration, new()) safe_load(system, "system_configuration") safe_load(url, "url_configuration") safe_load(vote, "voting_configuration") + safe_load(asset_cache, "asset_cache_configuration") // Proc to load up instance-specific overrides /datum/server_configuration/proc/load_overrides() diff --git a/code/controllers/configuration/sections/asset_cache_configuration.dm b/code/controllers/configuration/sections/asset_cache_configuration.dm new file mode 100644 index 000000000000..35fa4fef85d5 --- /dev/null +++ b/code/controllers/configuration/sections/asset_cache_configuration.dm @@ -0,0 +1,23 @@ +/datum/configuration_section/asset_cache_configuration + /// Type of asset transport that will be used for asset delivery. + /// Available options are "simple" or "webroot". + var/asset_transport = "simple" + /// Whether to make server passively send all browser assets to each client in the background + /// (instead of waiting for them to be needed) + var/asset_simple_preload = TRUE + /// Local folder to save assets to. + /// Assets will be saved in the format of asset.MD5HASH.EXT or in namespaces/hash/ + /// as ASSET_FILE_NAME or asset.MD5HASH.EXT + var/asset_cdn_webroot = "data/asset-store/" + /// URL the `asset_cdn_webroot` can be accessed from. + /// For best results the webserver powering this should return a long cache validity time, + /// as all assets sent via this transport use hash based urls + /// if you want to test this locally, you simpily run the `localhost-asset-webroot-server.py` python3 script + /// to host assets stored in `data/asset-store/` via http://localhost:58715/ + var/asset_cdn_url = "http://localhost:58715/" + +/datum/configuration_section/asset_cache_configuration/load_data(list/data) + CONFIG_LOAD_STR(asset_transport, data["asset_transport"]) + CONFIG_LOAD_BOOL(asset_simple_preload, data["asset_simple_preload"]) + CONFIG_LOAD_STR(asset_cdn_webroot, data["asset_cdn_webroot"]) + CONFIG_LOAD_STR(asset_cdn_url, data["asset_cdn_url"]) diff --git a/code/controllers/controller.dm b/code/controllers/controller.dm index 3645cea82e83..93c78e915bf9 100644 --- a/code/controllers/controller.dm +++ b/code/controllers/controller.dm @@ -23,5 +23,8 @@ */ /datum/controller/proc/log_startup_progress(message) Master.last_init_info = "([name]): [message]" - to_chat(world, "\[[name]] [message]") + to_chat(world, + type = MESSAGE_TYPE_DEBUG, + html = "\[[name]] [message]", + confidential = TRUE) log_world("\[[name]] [message]") diff --git a/code/controllers/subsystem/SSchat.dm b/code/controllers/subsystem/SSchat.dm new file mode 100644 index 000000000000..604f18c2d7c4 --- /dev/null +++ b/code/controllers/subsystem/SSchat.dm @@ -0,0 +1,99 @@ +/** + * Copyright (c) 2020 Aleksej Komarov + * SPDX-License-Identifier: MIT + */ + +SUBSYSTEM_DEF(chat) + name = "Chat" + flags = SS_TICKER|SS_NO_INIT + wait = 1 + priority = FIRE_PRIORITY_CHAT + init_order = INIT_ORDER_CHAT + offline_implications = "Chat will no longer function correctly. Immediate server restart recommended." + + /// Associates a ckey with a list of messages to send to them. + var/list/list/datum/chat_payload/client_to_payloads = list() + + /// Associates a ckey with an associative list of their last CHAT_RELIABILITY_HISTORY_SIZE messages. + var/list/list/datum/chat_payload/client_to_reliability_history = list() + + /// Associates a ckey with their next sequence number. + var/list/client_to_sequence_number = list() + +/datum/controller/subsystem/chat/proc/generate_payload(client/target, message_data) + var/sequence = client_to_sequence_number[target.ckey] + client_to_sequence_number[target.ckey] += 1 + + var/datum/chat_payload/payload = new + payload.sequence = sequence + payload.content = message_data + + if(!(target.ckey in client_to_reliability_history)) + client_to_reliability_history[target.ckey] = list() + var/list/client_history = client_to_reliability_history[target.ckey] + client_history["[sequence]"] = payload + + if(length(client_history) > CHAT_RELIABILITY_HISTORY_SIZE) + var/oldest = text2num(client_history[1]) + for(var/index in 2 to length(client_history)) + var/test = text2num(client_history[index]) + if(test < oldest) + oldest = test + client_history -= "[oldest]" + return payload + +/datum/controller/subsystem/chat/proc/send_payload_to_client(client/target, datum/chat_payload/payload) + target.tgui_panel.window.send_message("chat/message", payload.into_message()) + SEND_TEXT(target, payload.get_content_as_html()) + +/datum/controller/subsystem/chat/fire() + for(var/ckey in client_to_payloads) + var/client/target = GLOB.directory[ckey] + if(isnull(target)) // verify client still exists + LAZYREMOVE(client_to_payloads, ckey) + continue + + for(var/datum/chat_payload/payload as anything in client_to_payloads[ckey]) + send_payload_to_client(target, payload) + LAZYREMOVE(client_to_payloads, ckey) + + if(MC_TICK_CHECK) + return + +/datum/controller/subsystem/chat/proc/queue(queue_target, list/message_data) + var/list/targets = islist(queue_target) ? queue_target : list(queue_target) + for(var/target in targets) + var/client/client = CLIENT_FROM_VAR(target) + if(isnull(client)) + continue + LAZYADDASSOC(client_to_payloads, client.ckey, generate_payload(client, message_data)) + +/datum/controller/subsystem/chat/proc/send_immediate(send_target, list/message_data) + var/list/targets = islist(send_target) ? send_target : list(send_target) + for(var/target in targets) + var/client/client = CLIENT_FROM_VAR(target) + if(isnull(client)) + continue + send_payload_to_client(client, generate_payload(client, message_data)) + +/datum/controller/subsystem/chat/proc/handle_resend(client/client, sequence) + var/list/client_history = client_to_reliability_history[client.ckey] + sequence = "[sequence]" + if(isnull(client_history) || !(sequence in client_history)) + return + + var/datum/chat_payload/payload = client_history[sequence] + if(payload.resends > CHAT_RELIABILITY_MAX_RESENDS) + return // we tried but byond said no + + payload.resends += 1 + send_payload_to_client(client, client_history[sequence]) + SSblackbox.record_feedback( + "nested tally", + "chat_resend_byond_version", + 1, + list( + "[client.byond_version]", + "[client.byond_build]", + ), + ) diff --git a/code/controllers/subsystem/SSchat_pings.dm b/code/controllers/subsystem/SSchat_pings.dm deleted file mode 100644 index 24fb85d0bd87..000000000000 --- a/code/controllers/subsystem/SSchat_pings.dm +++ /dev/null @@ -1,17 +0,0 @@ -SUBSYSTEM_DEF(chat_pings) - name = "Chat Pings" - flags = SS_NO_INIT - runlevels = RUNLEVEL_INIT | RUNLEVEL_LOBBY | RUNLEVEL_SETUP | RUNLEVEL_GAME | RUNLEVEL_POSTGAME // ALL OF THEM - wait = 30 SECONDS // Chat pings every 30 seconds - cpu_display = SS_CPUDISPLAY_LOW - /// List of all held chat datums - var/list/datum/chatOutput/chat_datums = list() // Do NOT put this in Initialize(). You will cause issues. - -/datum/controller/subsystem/chat_pings/fire(resumed) - for(var/datum/chatOutput/CO as anything in chat_datums) - CO.updatePing() - if(MC_TICK_CHECK) - return - -/datum/controller/subsystem/chat_pings/get_stat_details() - return "P: [length(chat_datums)]" diff --git a/code/controllers/subsystem/SSdbcore.dm b/code/controllers/subsystem/SSdbcore.dm index e0dfe5c1067a..de652c3faf4d 100644 --- a/code/controllers/subsystem/SSdbcore.dm +++ b/code/controllers/subsystem/SSdbcore.dm @@ -386,7 +386,10 @@ SUBSYSTEM_DEF(dbcore) if(!.) SSdbcore.total_errors++ if(usr) - to_chat(usr, "A SQL error occurred during this operation, please inform an admin or a coder.") + to_chat(usr, + type = MESSAGE_TYPE_ADMINLOG, + html = "A SQL error occurred during this operation, please inform an admin or a coder.", + confidential = TRUE) message_admins("An SQL error has occurred. Please check the server logs, with the following timestamp ID: \[[time_stamp()]]") /** diff --git a/code/controllers/subsystem/SSdebugview.dm b/code/controllers/subsystem/SSdebugview.dm index 6b145b416be3..0f973a5deb21 100644 --- a/code/controllers/subsystem/SSdebugview.dm +++ b/code/controllers/subsystem/SSdebugview.dm @@ -31,7 +31,7 @@ SUBSYSTEM_DEF(debugview) entries += "\[Processing] Cost: [round(SSprocessing.cost, 1)]ms | P: [length(SSprocessing.processing)]" entries += "\[Projectiles] Cost: [round(SSprojectiles.cost, 1)]ms | P: [length(SSprojectiles.processing)]" entries += "\[Runechat] Cost: [round(SSrunechat.cost, 1)]ms | AM: [SSrunechat.bucket_count] | SQ: [length(SSrunechat.second_queue)]" - entries += "\[TGUI] Cost: [round(SStgui.cost, 1)]ms | P: [length(SStgui.processing_uis)]" + entries += "\[TGUI] Cost: [round(SStgui.cost, 1)]ms | P: [length(SStgui.open_uis)]]" entries += "\[Timer] Cost: [round(SStimer.cost, 1)]ms | B: [SStimer.bucket_count] | P: [length(SStimer.second_queue)] | RST: [SStimer.bucket_reset_count]" // Do some parsing to format it properly diff --git a/code/controllers/subsystem/SSping.dm b/code/controllers/subsystem/SSping.dm new file mode 100644 index 000000000000..d8fda04bddd6 --- /dev/null +++ b/code/controllers/subsystem/SSping.dm @@ -0,0 +1,41 @@ +/*! + * Copyright (c) 2022 Aleksej Komarov + * SPDX-License-Identifier: MIT + */ + +SUBSYSTEM_DEF(ping) + name = "Ping" + priority = FIRE_PRIORITY_PING + wait = 4 SECONDS + flags = SS_NO_INIT + runlevels = RUNLEVEL_LOBBY | RUNLEVEL_SETUP | RUNLEVEL_GAME | RUNLEVEL_POSTGAME + offline_implications = "Chat ping system will no longer function correctly. No immediate action is needed." + + /// List used each time SS fires to track which clients have been processed so far + var/list/current_run = list() + +/datum/controller/subsystem/ping/stat_entry() + ..("P:[length(GLOB.clients)]") + +/datum/controller/subsystem/ping/fire(resumed = FALSE) + // Prepare the new batch of clients + if(!resumed) + src.current_run = GLOB.clients.Copy() + + // De-reference the list for sanic speeds + var/list/current_run = src.current_run + + while(length(current_run)) + var/client/client = current_run[current_run.len] + current_run.len-- + + if(client?.tgui_panel?.is_ready()) + // Send a soft ping + client.tgui_panel.window.send_message("ping/soft", list( + // Slightly less than the subsystem timer (somewhat arbitrary) + // to prevent incoming pings from resetting the afk state + "afk" = client.is_afk(3.5 SECONDS), + )) + + if(MC_TICK_CHECK) + return diff --git a/code/controllers/subsystem/SStgui.dm b/code/controllers/subsystem/SStgui.dm index 8ef9384f09c3..924a5f02919b 100644 --- a/code/controllers/subsystem/SStgui.dm +++ b/code/controllers/subsystem/SStgui.dm @@ -1,311 +1,357 @@ - /** - * tgui subsystem - * - * Contains all tgui state and subsystem code. - **/ - +/** + * tgui subsystem + * + * Contains all tgui state and subsystem code. + * + * Copyright (c) 2020 Aleksej Komarov + * SPDX-License-Identifier: MIT + */ SUBSYSTEM_DEF(tgui) - name = "TGUI" + name = "tgui" wait = 9 flags = SS_NO_INIT priority = FIRE_PRIORITY_TGUI runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT - offline_implications = "All TGUIs will no longer process. Shuttle call recommended." - var/list/currentrun = list() - var/list/open_uis = list() // A list of open UIs, grouped by src_object and ui_key. - var/list/processing_uis = list() // A list of processing UIs, ungrouped. - var/basehtml // The HTML base used for all UIs. + /// A list of UIs scheduled to process + var/list/current_run = list() + /// A list of open UIs + var/list/open_uis = list() + /// A list of open UIs, grouped by src_object. + var/list/open_uis_by_src = list() + /// The HTML base used for all UIs. + var/basehtml /datum/controller/subsystem/tgui/PreInit() - basehtml = file2text('tgui/packages/tgui/public/tgui.html') + basehtml = file2text('tgui/public/tgui.html') + // Inject inline polyfills + var/polyfill = file2text('tgui/public/tgui-polyfill.min.js') + polyfill = "" + basehtml = replacetextEx(basehtml, "", polyfill) /datum/controller/subsystem/tgui/Shutdown() close_all_uis() -/datum/controller/subsystem/tgui/get_stat_details() - return "P:[length(processing_uis)]" - -/datum/controller/subsystem/tgui/get_metrics() - . = ..() - var/list/cust = list() - cust["processing"] = length(processing_uis) - .["custom"] = cust +/datum/controller/subsystem/tgui/stat_entry(msg) + msg = "P:[length(open_uis)]" + return ..() - -/datum/controller/subsystem/tgui/fire(resumed = 0) +/datum/controller/subsystem/tgui/fire(resumed = FALSE) if(!resumed) - src.currentrun = processing_uis.Copy() - //cache for sanic speed (lists are references anyways) - var/list/currentrun = src.currentrun - - while(currentrun.len) - var/datum/tgui/ui = currentrun[currentrun.len] - currentrun.len-- + src.current_run = open_uis.Copy() + // Cache for sanic speed (lists are references anyways) + var/list/current_run = src.current_run + while(current_run.len) + var/datum/tgui/ui = current_run[current_run.len] + current_run.len-- + // TODO: Move user/src_object check to process() if(ui && ui.user && ui.src_object) ui.process() else - processing_uis.Remove(ui) + open_uis.Remove(ui) if(MC_TICK_CHECK) return /** * public * - * Get an open UI given a user, src_object, and ui_key and try to update it with data. - * Returns the found UI. + * Requests a usable tgui window from the pool. + * Returns null if pool was exhausted. * - * * mob/user - The mob who opened/is using the UI. (REQUIRED) - * * datum/src_object - The object/datum which owns the UI. (REQUIRED) - * * ui_key - The ui_key of the UI. (REQUIRED) - * * datum/tgui/ui - The UI to be updated, if it exists. (OPTIONAL) - * * force_open - If the UI should be re-opened instead of updated. (OPTIONAL) + * required user mob + * return datum/tgui */ -/datum/controller/subsystem/tgui/proc/try_update_ui(mob/user, datum/src_object, ui_key, datum/tgui/ui, force_open = FALSE) - if(isnull(ui)) // No UI was passed, so look for one. - ui = get_open_ui(user, src_object, ui_key) - - if(!isnull(ui)) - var/data = src_object.ui_data(user) // Get data from the src_object. - if(!force_open) // UI is already open; update it. - ui.push_data(data) - else // Re-open it anyways. - ui.reinitialize(null, data) - return ui // We found the UI, return it. - else - return null // We couldn't find a UI. +/datum/controller/subsystem/tgui/proc/request_pooled_window(mob/user) + if(!user.client) + return + var/list/windows = user.client.tgui_windows + var/window_id + var/datum/tgui_window/window + var/window_found = FALSE + // Find a usable window + for(var/i in 1 to TGUI_WINDOW_HARD_LIMIT) + window_id = TGUI_WINDOW_ID(i) + window = windows[window_id] + // As we are looping, create missing window datums + if(!window) + window = new(user.client, window_id, pooled = TRUE) + // Skip windows with acquired locks + if(window.locked) + continue + if(window.status == TGUI_WINDOW_READY) + return window + if(window.status == TGUI_WINDOW_CLOSED) + window.status = TGUI_WINDOW_LOADING + window_found = TRUE + break + if(!window_found) + log_tgui(user, "Error: Pool exhausted") + return + return window /** - * private + * public * - * Get an open UI given a user, src_object, and ui_key. - * Returns the found UI. + * Force closes all tgui windows. * - * * mob/user - The mob who opened/is using the UI. (REQUIRED) - * * datum/src_object - The object/datum which owns the UI. (REQUIRED) - * * ui_key - The ui_key of the UI. (REQUIRED) + * required user mob */ -/datum/controller/subsystem/tgui/proc/get_open_ui(mob/user, datum/src_object, ui_key) - var/src_object_key = "[src_object.UID()]" - if(isnull(open_uis[src_object_key]) || !islist(open_uis[src_object_key])) - return null // No UIs open. - else if(isnull(open_uis[src_object_key][ui_key]) || !islist(open_uis[src_object_key][ui_key])) - return null // No UIs open for this object. - - for(var/datum/tgui/ui in open_uis[src_object_key][ui_key]) // Find UIs for this object. - if(ui.user == user) // Make sure we have the right user - return ui - - return null // Couldn't find a UI! +/datum/controller/subsystem/tgui/proc/force_close_all_windows(mob/user) + log_tgui(user, "force_close_all_windows") + if(user.client) + user.client.tgui_windows = list() + for(var/i in 1 to TGUI_WINDOW_HARD_LIMIT) + var/window_id = TGUI_WINDOW_ID(i) + user << browse(null, "window=[window_id]") /** - * private + * public * - * Update all UIs attached to src_object. - * Returns the number of UIs updated. + * Force closes the tgui window by window_id. * - * * datum/src_object - The object/datum which owns the UIs. - * * update_static_data - If the static data of the `src_object` should be updated for every viewing user. + * required user mob + * required window_id string */ -/datum/controller/subsystem/tgui/proc/update_uis(datum/src_object, update_static_data = FALSE) - var/src_object_key = "[src_object.UID()]" - if(isnull(open_uis[src_object_key]) || !islist(open_uis[src_object_key])) - return 0 // Couldn't find any UIs for this object. - - var/update_count = 0 - for(var/ui_key in open_uis[src_object_key]) - for(var/datum/tgui/ui in open_uis[src_object_key][ui_key]) - if(ui && ui.src_object && ui.user && ui.src_object.ui_host(ui.user)) // Check the UI is valid. - if(update_static_data) - src_object.update_static_data(ui.user, ui, ui_key) - ui.process(force = 1) // Update the UI. - update_count++ // Count each UI we update. - return update_count +/datum/controller/subsystem/tgui/proc/force_close_window(mob/user, window_id) + log_tgui(user, "force_close_window") + // Close all tgui datums based on window_id. + for(var/datum/tgui/ui in user.tgui_open_uis) + if(ui.window && ui.window.id == window_id) + ui.close(can_be_suspended = FALSE) + // Unset machine just to be sure. + user.unset_machine() + // Close window directly just to be sure. + user << browse(null, "window=[window_id]") /** - * private + * public * - * Close all UIs attached to src_object. - * Returns the number of UIs closed. + * Try to find an instance of a UI, and push an update to it. + * + * required user mob The mob who opened/is using the UI. + * required src_object datum The object/datum which owns the UI. + * optional ui datum/tgui The UI to be updated, if it exists. + * optional force_open bool If the UI should be re-opened instead of updated. * - * * datum/src_object - The object/datum which owns the UIs. + * return datum/tgui The found UI. */ -/datum/controller/subsystem/tgui/proc/close_uis(datum/src_object) - if(!src_object.unique_datum_id) // First check if the datum has an UID set - return 0 - var/src_object_key = "[src_object.UID()]" - if(isnull(open_uis[src_object_key]) || !islist(open_uis[src_object_key])) - return 0 // Couldn't find any UIs for this object. - - var/close_count = 0 - for(var/ui_key in open_uis[src_object_key]) - for(var/datum/tgui/ui in open_uis[src_object_key][ui_key]) - if(ui && ui.src_object && ui.user && ui.src_object.ui_host(ui.user)) // Check the UI is valid. - ui.close() // Close the UI. - close_count++ // Count each UI we close. - return close_count +/datum/controller/subsystem/tgui/proc/try_update_ui(mob/user, datum/src_object, datum/tgui/ui, force_open = FALSE) + // Look up a UI if it wasn't passed + if(isnull(ui)) + ui = get_open_ui(user, src_object) + // Couldn't find a UI. + if(isnull(ui)) + return + var/data = src_object.ui_data(user) // Get data from the src_object. + if(force_open) // UI is already open; update it. + ui.send_full_update(data, TRUE) + return ui // We found the UI, return it + ui.process_status() + // UI ended up with the closed status + // or is actively trying to close itself. + // FIXME: Doesn't actually fix the paper bug. + if(ui.status <= UI_CLOSE) + ui.close() + return + ui.send_update() + return ui /** + * public + * + * Get a open UI given a user and src_object. * - * Gets the amount of open UIs on an object - * Returns the number of UIs open. + * required user mob The mob who opened/is using the UI. + * required src_object datum The object/datum which owns the UI. * - * * datum/src_object - The object/datum which owns the UIs. + * return datum/tgui The found UI. */ -/datum/controller/subsystem/tgui/proc/get_open_ui_count(datum/src_object) - if(!src_object.unique_datum_id) // First check if the datum has an UID set - return 0 - var/src_object_key = "[src_object.UID()]" - if(isnull(open_uis[src_object_key]) || !islist(open_uis[src_object_key])) - return 0 // Couldn't find any UIs for this object. - - var/open_count = 0 - for(var/ui_key in open_uis[src_object_key]) - for(var/datum/tgui/ui in open_uis[src_object_key][ui_key]) - if(ui && ui.src_object && ui.user && ui.src_object.ui_host(ui.user)) // Check the UI is valid. - open_count++ // Count each UI thats open +/datum/controller/subsystem/tgui/proc/get_open_ui(mob/user, datum/src_object) + var/key = "[src_object.UID()]" + // No UIs opened for this src_object + if(isnull(open_uis_by_src[key]) || !islist(open_uis_by_src[key])) + return + for(var/datum/tgui/ui in open_uis_by_src[key]) + // Make sure we have the right user + if(ui.user == user) + return ui + return - return open_count +/** + * public + * + * Update all UIs attached to src_object. + * + * required src_object datum The object/datum which owns the UIs. + * + * return int The number of UIs updated. + */ +/datum/controller/subsystem/tgui/proc/update_uis(datum/src_object) + var/count = 0 + var/key = "[src_object.UID()]" + // No UIs opened for this src_object + if(isnull(open_uis_by_src[key]) || !islist(open_uis_by_src[key])) + return count + for(var/datum/tgui/ui in open_uis_by_src[key]) + // Check if UI is valid. + if(ui && ui.src_object && ui.user && ui.src_object.ui_host(ui.user)) + ui.process(force = TRUE) + count++ + return count +/** + * public + * + * Close all UIs attached to src_object. + * + * required src_object datum The object/datum which owns the UIs. + * + * return int The number of UIs closed. + */ +/datum/controller/subsystem/tgui/proc/close_uis(datum/src_object) + . = 0 + var/key = "[src_object.UID()]" + // No UIs opened for this src_object + if(isnull(open_uis_by_src[key]) || !islist(open_uis_by_src[key])) + return + for(var/datum/tgui/ui in open_uis_by_src[key]) + // Check if UI is valid. + if(ui && ui.src_object && ui.user && ui.src_object.ui_host(ui.user)) + ui.close() + .++ + return /** - * private + * public + * + * Close all UIs regardless of their attachment to src_object. * - * Close *ALL* UIs - * Returns the number of UIs closed. + * return int The number of UIs closed. */ /datum/controller/subsystem/tgui/proc/close_all_uis() - var/close_count = 0 - for(var/src_object_key in open_uis) - for(var/ui_key in open_uis[src_object_key]) - for(var/datum/tgui/ui in open_uis[src_object_key][ui_key]) - if(ui && ui.src_object && ui.user && ui.src_object.ui_host(ui.user)) // Check the UI is valid. - ui.close() // Close the UI. - close_count++ // Count each UI we close. - return close_count + var/count = 0 + for(var/key in open_uis_by_src) + for(var/datum/tgui/ui in open_uis_by_src[key]) + // Check if UI is valid. + if(ui && ui.src_object && ui.user && ui.src_object.ui_host(ui.user)) + ui.close() + count++ + return count /** - * private + * public * * Update all UIs belonging to a user. - * Returns the number of UIs updated. * - * * mob/user - The mob who opened/is using the UI. (REQUIRED) - * * datum/src_object - If provided, only update UIs belonging this src_object. (OPTIONAL) - * * ui_key - If provided, only update UIs with this UI key. (OPTIONAL) + * required user mob The mob who opened/is using the UI. + * optional src_object datum If provided, only update UIs belonging this src_object. + * + * return int The number of UIs updated. */ -/datum/controller/subsystem/tgui/proc/update_user_uis(mob/user, datum/src_object = null, ui_key = null) - if(isnull(user.open_uis) || !islist(user.open_uis) || open_uis.len == 0) - return 0 // Couldn't find any UIs for this user. - - var/update_count = 0 - for(var/datum/tgui/ui in user.open_uis) - if((isnull(src_object) || !isnull(src_object) && ui.src_object == src_object) && (isnull(ui_key) || !isnull(ui_key) && ui.ui_key == ui_key)) - ui.process(force = 1) // Update the UI. - update_count++ // Count each UI we upadte. - return update_count +/datum/controller/subsystem/tgui/proc/update_user_uis(mob/user, datum/src_object) + var/count = 0 + if(length(user?.tgui_open_uis) == 0) + return count + for(var/datum/tgui/ui in user.tgui_open_uis) + if(isnull(src_object) || ui.src_object == src_object) + ui.process(force = TRUE) + count++ + return count /** - * private + * public * * Close all UIs belonging to a user. - * Returns the number of UIs closed. * - * * mob/user - The mob who opened/is using the UI. (REQUIRED) - * * datum/src_object - If provided, only close UIs belonging this src_object. (OPTIONAL) - * * ui_key - If provided, only close UIs with this UI key. (OPTIONAL) + * required user mob The mob who opened/is using the UI. + * optional src_object datum If provided, only close UIs belonging this src_object. + * + * return int The number of UIs closed. */ -/datum/controller/subsystem/tgui/proc/close_user_uis(mob/user, datum/src_object = null, ui_key = null) - if(isnull(user.open_uis) || !islist(user.open_uis) || open_uis.len == 0) - return 0 // Couldn't find any UIs for this user. - - var/close_count = 0 - for(var/datum/tgui/ui in user.open_uis) - if((isnull(src_object) || !isnull(src_object) && ui.src_object == src_object) && (isnull(ui_key) || !isnull(ui_key) && ui.ui_key == ui_key)) - ui.close() // Close the UI. - close_count++ // Count each UI we close. - return close_count +/datum/controller/subsystem/tgui/proc/close_user_uis(mob/user, datum/src_object) + var/count = 0 + if(length(user?.tgui_open_uis) == 0) + return count + for(var/datum/tgui/ui in user.tgui_open_uis) + if(isnull(src_object) || ui.src_object == src_object) + ui.close() + count++ + return count /** * private * * Add a UI to the list of open UIs. * - * * datum/tgui/ui - The UI to be added. + * required ui datum/tgui The UI to be added. */ /datum/controller/subsystem/tgui/proc/on_open(datum/tgui/ui) - var/src_object_key = "[ui.src_object.UID()]" - if(isnull(open_uis[src_object_key]) || !islist(open_uis[src_object_key])) - open_uis[src_object_key] = list(ui.ui_key = list()) // Make a list for the ui_key and src_object. - else if(isnull(open_uis[src_object_key][ui.ui_key]) || !islist(open_uis[src_object_key][ui.ui_key])) - open_uis[src_object_key][ui.ui_key] = list() // Make a list for the ui_key. - - // Append the UI to all the lists. - ui.user.open_uis |= ui - var/list/uis = open_uis[src_object_key][ui.ui_key] + var/key = "[ui.src_object.UID()]" + if(isnull(open_uis_by_src[key]) || !islist(open_uis_by_src[key])) + open_uis_by_src[key] = list() + ui.user.tgui_open_uis |= ui + var/list/uis = open_uis_by_src[key] uis |= ui - processing_uis |= ui + open_uis |= ui /** * private * * Remove a UI from the list of open UIs. - * Returns TRUE if removed, and FALSE if not. * - * * datum/tgui/ui - The UI to be removed. + * required ui datum/tgui The UI to be removed. + * + * return bool If the UI was removed or not. */ /datum/controller/subsystem/tgui/proc/on_close(datum/tgui/ui) - var/src_object_key = "[ui.src_object.UID()]" - if(isnull(open_uis[src_object_key]) || !islist(open_uis[src_object_key])) - return FALSE // It wasn't open. - else if(isnull(open_uis[src_object_key][ui.ui_key]) || !islist(open_uis[src_object_key][ui.ui_key])) - return FALSE // It wasn't open. - - processing_uis.Remove(ui) // Remove it from the list of processing UIs. - if(ui.user) // If the user exists, remove it from them too. - ui.user.open_uis.Remove(ui) - var/Ukey = ui.ui_key - var/list/uis = open_uis[src_object_key][Ukey] // Remove it from the list of open UIs. + var/key = "[ui.src_object.UID()]" + if(isnull(open_uis_by_src[key]) || !islist(open_uis_by_src[key])) + return FALSE + // Remove it from the list of processing UIs. + open_uis.Remove(ui) + // If the user exists, remove it from them too. + if(ui.user) + ui.user.tgui_open_uis.Remove(ui) + var/list/uis = open_uis_by_src[key] uis.Remove(ui) - if(!uis.len) - var/list/uiobj = open_uis[src_object_key] - uiobj.Remove(Ukey) - if(!uiobj.len) - open_uis.Remove(src_object_key) - - return TRUE // Let the caller know we did it. + if(length(uis) == 0) + open_uis_by_src.Remove(key) + return TRUE /** * private * * Handle client logout, by closing all their UIs. - * Returns the number of UIs closed. * - * * mob/user - The mob which logged out. + * required user mob The mob which logged out. + * + * return int The number of UIs closed. */ /datum/controller/subsystem/tgui/proc/on_logout(mob/user) - return close_user_uis(user) + close_user_uis(user) /** * private * * Handle clients switching mobs, by transferring their UIs. - * Returns TRUE if the UIs were transferred, and FALSE if not. * - * * mob/source - The client's original mob. - * * mob/target - The client's new mob. + * required user source The client's original mob. + * required user target The client's new mob. + * + * return bool If the UIs were transferred. */ /datum/controller/subsystem/tgui/proc/on_transfer(mob/source, mob/target) - if(!source || isnull(source.open_uis) || !islist(source.open_uis) || open_uis.len == 0) - return FALSE // The old mob had no open UIs. - - if(isnull(target.open_uis) || !islist(target.open_uis)) - target.open_uis = list() // Create a list for the new mob if needed. - - for(var/datum/tgui/ui in source.open_uis) - ui.user = target // Inform the UIs of their new owner. - target.open_uis.Add(ui) // Transfer all the UIs. - - source.open_uis.Cut() // Clear the old list. - return TRUE // Let the caller know we did it. + // The old mob had no open UIs. + if(length(source?.tgui_open_uis) == 0) + return FALSE + if(isnull(target.tgui_open_uis) || !istype(target.tgui_open_uis, /list)) + target.tgui_open_uis = list() + // Transfer all the UIs. + for(var/datum/tgui/ui in source.tgui_open_uis) + // Inform the UIs of their new owner. + ui.user = target + target.tgui_open_uis.Add(ui) + // Clear the old list. + source.tgui_open_uis.Cut() + return TRUE diff --git a/code/controllers/subsystem/SSticker.dm b/code/controllers/subsystem/SSticker.dm index 0e99b37bcd5d..101de6720822 100644 --- a/code/controllers/subsystem/SSticker.dm +++ b/code/controllers/subsystem/SSticker.dm @@ -296,9 +296,25 @@ SUBSYSTEM_DEF(ticker) // Generate code phrases and responses if(!GLOB.syndicate_code_phrase) - GLOB.syndicate_code_phrase = generate_code_phrase() + var/temp_syndicate_code_phrase = generate_code_phrase(return_list = TRUE) + + var/codewords = jointext(temp_syndicate_code_phrase, "|") + var/regex/codeword_match = new("([codewords])", "ig") + + GLOB.syndicate_code_phrase_regex = codeword_match + temp_syndicate_code_phrase = jointext(temp_syndicate_code_phrase, ", ") + GLOB.syndicate_code_phrase = temp_syndicate_code_phrase + + if(!GLOB.syndicate_code_response) - GLOB.syndicate_code_response = generate_code_phrase() + var/temp_syndicate_code_response = generate_code_phrase(return_list = TRUE) + + var/codewords = jointext(temp_syndicate_code_response, "|") + var/regex/codeword_match = new("([codewords])", "ig") + + GLOB.syndicate_code_response_regex = codeword_match + temp_syndicate_code_response = jointext(temp_syndicate_code_response, ", ") + GLOB.syndicate_code_response = temp_syndicate_code_response // Run post setup stuff mode.post_setup() diff --git a/code/controllers/subsystem/non_firing/SSassets.dm b/code/controllers/subsystem/non_firing/SSassets.dm index d2c9a90217df..83bd6b5b9b5b 100644 --- a/code/controllers/subsystem/non_firing/SSassets.dm +++ b/code/controllers/subsystem/non_firing/SSassets.dm @@ -2,15 +2,38 @@ SUBSYSTEM_DEF(assets) name = "Assets" init_order = INIT_ORDER_ASSETS flags = SS_NO_FIRE + /// Contains /datum/asset_cache_item var/list/cache = list() var/list/preload = list() + var/datum/asset_transport/transport = new() -/datum/controller/subsystem/assets/Initialize() - for(var/type in typesof(/datum/asset) - list(/datum/asset, /datum/asset/simple)) - var/datum/asset/A = new type() - A.register() +/datum/controller/subsystem/assets/Initialize(timeofday) + load_assets() + apply_configuration() - preload = cache.Copy() //don't preload assets generated during the round +/datum/controller/subsystem/assets/Recover() + cache = SSassets.cache + preload = SSassets.preload - for(var/client/C in GLOB.clients) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(getFilesSlow), C, preload, FALSE), 10) +/datum/controller/subsystem/assets/proc/apply_configuration(initialize_transport = TRUE) + var/newtransporttype = /datum/asset_transport + switch(GLOB.configuration.asset_cache.asset_transport) + if("webroot") + newtransporttype = /datum/asset_transport/webroot + + if(newtransporttype == transport.type) + return + + var/datum/asset_transport/newtransport = new newtransporttype + if(newtransport.validate_config()) + transport = newtransport + + if(initialize_transport) + transport.Initialize(cache) + +/datum/controller/subsystem/assets/proc/load_assets() + for(var/datum/asset/asset_to_load as anything in typesof(/datum/asset)) + if(initial(asset_to_load._abstract)) + continue + + get_asset_datum(type) diff --git a/code/controllers/subsystem/non_firing/SSchangelog.dm b/code/controllers/subsystem/non_firing/SSchangelog.dm index cfff6afee409..d72b78c09cac 100644 --- a/code/controllers/subsystem/non_firing/SSchangelog.dm +++ b/code/controllers/subsystem/non_firing/SSchangelog.dm @@ -53,12 +53,6 @@ SUBSYSTEM_DEF(changelog) if(!ss_ready) return // Only return here, we dont have to worry about a queue list because this will be called from ShowChangelog() - if(C.prefs.toggles & PREFTOGGLE_UI_DARKMODE) - winset(C, "rpane.changelog", "background-color=#40628a;font-color=#ffffff;font-style=none") - else - winset(C, "rpane.changelog", "background-color=none;font-style=none") - - C.prefs.lastchangelog = current_cl_timestamp var/datum/db_query/updatePlayerCLTime = SSdbcore.NewQuery( @@ -76,22 +70,12 @@ SUBSYSTEM_DEF(changelog) /datum/controller/subsystem/changelog/proc/UpdatePlayerChangelogButton(client/C) // If SQL aint even enabled, or we aint ready just set the button to default style if(!SSdbcore.IsConnected() || !ss_ready) - if(C.prefs.toggles & PREFTOGGLE_UI_DARKMODE) - winset(C, "rpane.changelog", "background-color=#40628a;text-color=#FFFFFF") - else - winset(C, "rpane.changelog", "background-color=none;text-color=#000000") return // If we are ready, process the button style if(C.prefs.lastchangelog != current_cl_timestamp) - winset(C, "rpane.changelog", "background-color=#bb7700;text-color=#FFFFFF;font-style=bold") + winset(C, "rpane.changelog", "border=line;font-style=bold") to_chat(C, "Changelog has changed since your last visit.") - else - if(C.prefs.toggles & PREFTOGGLE_UI_DARKMODE) - winset(C, "rpane.changelog", "background-color=#40628a;text-color=#FFFFFF") - else - winset(C, "rpane.changelog", "background-color=none;text-color=#000000") - /datum/controller/subsystem/changelog/proc/OpenChangelog(client/C) // If SQL isnt enabled, dont even queue them, just tell them it wont work @@ -204,10 +188,13 @@ SUBSYSTEM_DEF(changelog) return data -/datum/controller/subsystem/changelog/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.always_state) - ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) +/datum/controller/subsystem/changelog/ui_state(mob/user) + return GLOB.always_state + +/datum/controller/subsystem/changelog/ui_interact(mob/user, datum/tgui/ui = null) + ui = SStgui.try_update_ui(user, src, ui) if(!ui) - ui = new(user, src, ui_key, "ChangelogView", name, 750, 800, master_ui, state) + ui = new(user, src, "ChangelogView", name) ui.set_autoupdate(FALSE) ui.open() diff --git a/code/datums/browser.dm b/code/datums/browser.dm index 24d324d6e77f..e48861f533fd 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -1,24 +1,29 @@ /datum/browser var/mob/user var/title - var/window_id // window_id is used as the window name for browse and onclose + /// window_id is used as the window name for browse and onclose calls + var/window_id var/width = 0 var/height = 0 - var/atom/ref = null - var/window_options = "focus=0;can_close=1;can_minimize=1;can_maximize=0;can_resize=1;titlebar=1;" // window option is set using window_id + /// UID of the host atom + var/atom_uid = null + /// Various options to control elements such as titlebar buttons for the window + var/list/window_options = list("focus=0;can_close=1;can_minimize=1;can_maximize=0;can_resize=1;titlebar=1;") // window option is set using window_id + /// Assoc list of stylesheets for use by the datum var/stylesheets[0] + /// Assoc list of script files for use by the datum var/scripts[0] - var/title_image - var/head_elements - var/body_elements - var/head_content = "" - var/content = "" - var/title_buttons = "" + /// Should default stylesheets be loaded + var/include_default_stylesheet = TRUE + /// Header HTML content of the browser datum + var/list/head_content = list() + /// HTML content of the browser datum + var/list/content = list() -/datum/browser/New(nuser, nwindow_id, ntitle = 0, nwidth = 0, nheight = 0, atom/nref = null) - +/datum/browser/New(nuser, nwindow_id, ntitle = 0, nwidth = 0, nheight = 0, atom/atom = null) user = nuser + RegisterSignal(user, COMSIG_PARENT_QDELETING, PROC_REF(user_deleted)) window_id = nwindow_id if(ntitle) title = format_text(ntitle) @@ -26,64 +31,71 @@ width = nwidth if(nheight) height = nheight - if(nref) - ref = nref - add_stylesheet("common", 'html/browser/common.css') // this CSS sheet is common to all UIs + if(atom) + atom_uid = atom.UID() + +/datum/browser/proc/user_deleted(datum/source) + SIGNAL_HANDLER + user = null /datum/browser/proc/set_title(ntitle) - title = format_text(ntitle) + title = islist(ntitle) ? ntitle : list(ntitle) /datum/browser/proc/add_head_content(nhead_content) - head_content = nhead_content - -/datum/browser/proc/set_title_buttons(ntitle_buttons) - title_buttons = ntitle_buttons + head_content = islist(nhead_content) ? nhead_content : list(nhead_content) /datum/browser/proc/set_window_options(nwindow_options) - window_options = nwindow_options - -/datum/browser/proc/set_title_image(ntitle_image) - //title_image = ntitle_image + window_options = islist(nwindow_options) ? nwindow_options : list(nwindow_options) /datum/browser/proc/add_stylesheet(name, file) - stylesheets[name] = file + if(istype(name, /datum/asset/spritesheet)) + var/datum/asset/spritesheet/sheet = name + stylesheets["spritesheet_[sheet.name].css"] = "data/spritesheets/[sheet.name]" + else + var/asset_name = "[name].css" + + stylesheets[asset_name] = file + + if(!SSassets.cache[asset_name]) + SSassets.transport.register_asset(asset_name, file) + +/datum/browser/proc/add_scss_stylesheet(name, file) + var/asset_name = "[name].scss" + stylesheets[asset_name] = file + + if(!SSassets.cache[asset_name]) + SSassets.transport.register_asset(asset_name, file) /datum/browser/proc/add_script(name, file) - scripts[name] = file + scripts["[ckey(name)].js"] = file + SSassets.transport.register_asset("[ckey(name)].js", file) /datum/browser/proc/set_content(ncontent) - content = ncontent + content = islist(ncontent) ? ncontent : list(ncontent) /datum/browser/proc/add_content(ncontent) content += ncontent /datum/browser/proc/get_header() - var/key - var/filename - for(key in stylesheets) - filename = "[ckey(key)].css" - user << browse_rsc(stylesheets[key], filename) - head_content += "" - - for(key in scripts) - filename = "[ckey(key)].js" - user << browse_rsc(scripts[key], filename) - head_content += "" - - var/title_attributes = "class='uiTitle'" - if(title_image) - title_attributes = "class='uiTitle icon' style='background-image: url([title_image]);'" - - return {" + if(include_default_stylesheet) + head_content += "" + + for(var/file in stylesheets) + head_content += "" + + for(var/file in scripts) + head_content += "" + + return {" - - - [head_content] + + + [head_content.Join("")]" - dat += "" - dat += " | "
- else
- dat += "ERR: Unable to retrieve image data for occupant."
- dat += "Probe " - dat += "Dissect " - dat += "Analyze " - dat += " |