diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
index 582b2126b74..163efb8b900 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 2a2ad0b01e0..923970aa254 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 1295070c312..3433ee2ffdd 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 f1b2e315b9e..3ee31c383d4 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 0104330f6ce..df6cb8ff2e8 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 bb91ea362fa..671f1773b33 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 899178dd717..4cd633eeba3 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 4f64ee07649..c3df51e7874 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 8e9f26c16a2..cd84220ae6d 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 5607f14a46e..c6a81c6289b 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 94b3daeba79..d87396e356f 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 40cb7ab08a1..32ff1af7d77 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 390bf2401ea..d6ff668bb77 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 1ea6c117914..6ac333f5341 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 0559b278a5d..9fec92ec655 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 b7b7e3bc184..96be2fc177c 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 0950d75b262..c5862def159 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 4b707a0c38e..330d27499d5 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 89a5ba26557..3d7f086484d 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 b6767a4fded..a1971f408d5 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 de8e02e9ab1..8dcb397ce7f 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 0cbdaba9c8e..c6dd91f6414 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 bbafdde4db7..ae4e3ab8bba 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 d0d197efa6f..98c894eb5b5 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 e67e3974595..3915eb5c695 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 e55572e89b6..4acca6b6d8f 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 6888c9dfd94..c40f640d6c4 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 d444f1809b6..1a663599058 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 b48172ed975..5933202a867 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 a517eb1ceae..9639069969d 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 6314508d4d2..c34bd6c06e1 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 ad143c5af71..93ebb4b20ed 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 d2d5c8bedf4..32326c179b0 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 4fef82163bb..46ac67854b3 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 9ac44c603b0..ddbe009e3a3 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 ab72f851ffb..2e68f1a049d 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 3a9aeaf9511..96ee62dfcff 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 4f474c5dda2..1aa2399414c 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 ffd77b68bc5..1532d0ee28d 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 1a170bf230c..d6f6a2b8705 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 8f2900e751a..13184bd06f1 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 0d0a4f7fab4..8a21a1c75e2 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 2f3f5db29c9..994144d3207 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 a5d11498f77..0ea165cfb5e 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/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm
index a64306a38d1..81b33c55517 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 3242f672b98..e73af05c7d6 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/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index 12c4573f633..9d93e81540f 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 c3044a480b4..c53bbb3d2f8 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/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm
index 908dd295b4f..5ae57ee5e01 100644
--- a/code/datums/outfits/outfit_admin.dm
+++ b/code/datums/outfits/outfit_admin.dm
@@ -50,7 +50,7 @@
/obj/item/storage/box/engineer = 1,
/obj/item/flashlight = 1,
/obj/item/card/emag = 1,
- /obj/item/reagent_containers/food/snacks/syndidonkpocket = 1
+ /obj/item/food/snacks/syndidonkpocket = 1
)
var/id_icon = "syndie"
@@ -103,7 +103,7 @@
/obj/item/ammo_box/magazine/m10mm = 1,
/obj/item/crowbar/red = 1,
/obj/item/grenade/plastic/c4 = 1,
- /obj/item/reagent_containers/food/snacks/syndidonkpocket = 1,
+ /obj/item/food/snacks/syndidonkpocket = 1,
/obj/item/flashlight = 1,
/obj/item/clothing/shoes/combat = 1
)
@@ -377,13 +377,13 @@
l_ear = /obj/item/radio/headset
glasses = /obj/item/clothing/glasses/thermal/monocle
id = /obj/item/card/id
- l_pocket = /obj/item/reagent_containers/food/snacks/grown/banana
+ l_pocket = /obj/item/food/snacks/grown/banana
r_pocket = /obj/item/bikehorn
r_hand = /obj/item/fireaxe
backpack_contents = list(
/obj/item/storage/box/survival = 1,
/obj/item/flashlight = 1,
- /obj/item/reagent_containers/food/drinks/bottle/bottleofbanana = 1,
+ /obj/item/reagent_containers/drinks/bottle/bottleofbanana = 1,
/obj/item/grenade/clown_grenade = 1,
/obj/item/melee/baton/cattleprod = 1,
/obj/item/stock_parts/cell/super = 1,
@@ -416,14 +416,14 @@
pda = /obj/item/pda/mime
backpack_contents = list(
/obj/item/storage/box/survival = 1,
- /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing = 1,
+ /obj/item/reagent_containers/drinks/bottle/bottleofnothing = 1,
/obj/item/toy/crayon/mime = 1,
/obj/item/gun/projectile/automatic/pistol = 1,
/obj/item/ammo_box/magazine/m10mm = 1,
/obj/item/suppressor = 1,
/obj/item/card/emag = 1,
/obj/item/radio/uplink = 1,
- /obj/item/reagent_containers/food/snacks/syndidonkpocket = 1,
+ /obj/item/food/snacks/syndidonkpocket = 1,
/obj/item/flashlight = 1
)
@@ -1307,7 +1307,7 @@
/obj/item/stamp/clown = 1,
/obj/item/toy/crayon/rainbow = 1,
/obj/item/reagent_containers/spray/waterflower = 1,
- /obj/item/reagent_containers/food/snacks/grown/banana = 1,
+ /obj/item/food/snacks/grown/banana = 1,
)
shoes = /obj/item/clothing/shoes/clown_shoes
diff --git a/code/datums/outfits/outfit_debug.dm b/code/datums/outfits/outfit_debug.dm
index 28460989c29..32183aa50ad 100644
--- a/code/datums/outfits/outfit_debug.dm
+++ b/code/datums/outfits/outfit_debug.dm
@@ -313,7 +313,7 @@
// put cool admin-only shit here :)
/obj/item/storage/box/debug/misc_debug/populate_contents()
new /obj/item/badminBook(src)
- new /obj/item/reagent_containers/food/drinks/bottle/vodka/badminka(src)
+ new /obj/item/reagent_containers/drinks/bottle/vodka/badminka(src)
new /obj/item/crowbar/power(src) // >admin only lol
new /obj/item/clothing/gloves/fingerless/rapid/admin(src)
new /obj/item/clothing/under/misc/acj(src)
diff --git a/code/datums/recipe.dm b/code/datums/recipe.dm
index 484b8d5bc50..3582772446a 100644
--- a/code/datums/recipe.dm
+++ b/code/datums/recipe.dm
@@ -36,7 +36,7 @@
/datum/recipe
var/list/reagents // example: = list("berryjuice" = 5) // do not list same reagent twice
var/list/items // example: =list(/obj/item/crowbar, /obj/item/welder) // place /foo/bar before /foo
- var/result //example: = /obj/item/reagent_containers/food/snacks/donut
+ var/result //example: = /obj/item/food/snacks/donut
var/time = 100 // 1/10 part of second
/// Whether or not an upgraded kitchen machine will create more products using the same amount of ingredients
var/duplicate = TRUE
diff --git a/code/datums/uplink_items/uplink_traitor.dm b/code/datums/uplink_items/uplink_traitor.dm
index 241069ebbd0..b2a6d7c70b8 100644
--- a/code/datums/uplink_items/uplink_traitor.dm
+++ b/code/datums/uplink_items/uplink_traitor.dm
@@ -91,7 +91,7 @@
name = "Chef Excellence's Special Sauce"
desc = "A custom sauce made from the highly poisonous fly amanita mushrooms. Anyone who ingests it will take variable toxin damage depending on how long it has been in their system, with a higher dosage taking longer to metabolize."
reference = "CESS"
- item = /obj/item/reagent_containers/food/condiment/syndisauce
+ item = /obj/item/reagent_containers/condiment/syndisauce
cost = 10
job = list("Chef")
surplus = 0 // Far too specific in its use.
diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm
index ee9c00bfb53..6e909935309 100644
--- a/code/game/gamemodes/cult/cult_items.dm
+++ b/code/game/gamemodes/cult/cult_items.dm
@@ -260,7 +260,7 @@
to_chat(user, "[src] crumbles to ashes.")
qdel(src)
-/obj/item/reagent_containers/food/drinks/bottle/unholywater
+/obj/item/reagent_containers/drinks/bottle/unholywater
name = "flask of unholy water"
desc = "Toxic to nonbelievers; this water renews and reinvigorates the faithful of a cult."
icon_state = "holyflask"
diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm
index 7db14947e37..efd2e7a02b5 100644
--- a/code/game/gamemodes/cult/cult_structures.dm
+++ b/code/game/gamemodes/cult/cult_structures.dm
@@ -145,7 +145,7 @@
selection_prompt = "You study the rituals on the altar..."
selection_title = "Altar"
creation_message = "You kneel before the altar and your faith is rewarded with a %ITEM%!"
- choosable_items = list("Eldritch Whetstone" = /obj/item/whetstone/cult, "Flask of Unholy Water" = /obj/item/reagent_containers/food/drinks/bottle/unholywater,
+ choosable_items = list("Eldritch Whetstone" = /obj/item/whetstone/cult, "Flask of Unholy Water" = /obj/item/reagent_containers/drinks/bottle/unholywater,
"Construct Shell" = /obj/structure/constructshell)
/obj/structure/cult/functional/altar/Initialize(mapload)
diff --git a/code/game/gamemodes/miniantags/abduction/gland.dm b/code/game/gamemodes/miniantags/abduction/gland.dm
index 0cb5317bb8a..917b73b48d6 100644
--- a/code/game/gamemodes/miniantags/abduction/gland.dm
+++ b/code/game/gamemodes/miniantags/abduction/gland.dm
@@ -265,7 +265,7 @@
/obj/item/organ/internal/heart/gland/egg/activate()
owner.visible_message("[owner] [pick(EGG_LAYING_MESSAGES)]")
- new /obj/item/reagent_containers/food/snacks/egg/gland(get_turf(owner))
+ new /obj/item/food/snacks/egg/gland(get_turf(owner))
/obj/item/organ/internal/heart/gland/electric
cooldown_low = 800
diff --git a/code/game/gamemodes/miniantags/guardian/guardian.dm b/code/game/gamemodes/miniantags/guardian/guardian.dm
index bf2cc95482d..c0cbe14476b 100644
--- a/code/game/gamemodes/miniantags/guardian/guardian.dm
+++ b/code/game/gamemodes/miniantags/guardian/guardian.dm
@@ -29,7 +29,7 @@
melee_damage_lower = 15
melee_damage_upper = 15
AIStatus = AI_OFF
- butcher_results = list(/obj/item/reagent_containers/food/snacks/ectoplasm = 1)
+ butcher_results = list(/obj/item/food/snacks/ectoplasm = 1)
var/summoned = FALSE
var/cooldown = 0
var/damage_transfer = 1 //how much damage from each attack we transfer to the owner
diff --git a/code/game/gamemodes/miniantags/morph/morph.dm b/code/game/gamemodes/miniantags/morph/morph.dm
index be867dcdab5..312117880f0 100644
--- a/code/game/gamemodes/miniantags/morph/morph.dm
+++ b/code/game/gamemodes/miniantags/morph/morph.dm
@@ -34,7 +34,7 @@
wander = FALSE
attacktext = "glomps"
attack_sound = 'sound/effects/blobattack.ogg'
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 2)
+ butcher_results = list(/obj/item/food/snacks/meat/slab = 2)
/// If the morph is disguised or not
var/morphed = FALSE
diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm
index 09504233ca0..1b3a9e9e9c5 100644
--- a/code/game/gamemodes/wizard/artefact.dm
+++ b/code/game/gamemodes/wizard/artefact.dm
@@ -880,12 +880,12 @@ GLOBAL_LIST_EMPTY(multiverse)
heal_burn = 25
heal_oxy = 25
-/obj/item/reagent_containers/food/drinks/everfull
+/obj/item/reagent_containers/drinks/everfull
name = "everfull mug"
desc = "An enchanted mug which can be filled with any of various liquids on command."
icon_state = "evermug"
-/obj/item/reagent_containers/food/drinks/everfull/attack_self(mob/user)
+/obj/item/reagent_containers/drinks/everfull/attack_self(mob/user)
var/static/list/options = list("Omnizine" = image(icon = 'icons/obj/storage.dmi', icon_state = "firstaid"),
"Ale" = image(icon = 'icons/obj/drinks.dmi', icon_state = "alebottle"),
"Wine" = image(icon = 'icons/obj/drinks.dmi', icon_state = "wineglass"),
@@ -911,7 +911,7 @@ GLOBAL_LIST_EMPTY(multiverse)
to_chat(user, "The [name] fills to brimming with [options_to_descriptions[choice]].")
magic_fill(options_to_reagent[choice])
-/obj/item/reagent_containers/food/drinks/everfull/proc/magic_fill(reagent_choice)
+/obj/item/reagent_containers/drinks/everfull/proc/magic_fill(reagent_choice)
reagents.clear_reagents()
reagents.add_reagent(reagent_choice, volume)
diff --git a/code/game/gamemodes/wizard/raginmages.dm b/code/game/gamemodes/wizard/raginmages.dm
index 43405943673..e710e024147 100644
--- a/code/game/gamemodes/wizard/raginmages.dm
+++ b/code/game/gamemodes/wizard/raginmages.dm
@@ -127,7 +127,7 @@
if(harry)
var/mob/living/carbon/human/new_character = makeBody(harry)
new_character.mind.make_Wizard() // This puts them at the wizard spawn, worry not
- new_character.equip_to_slot_or_del(new /obj/item/reagent_containers/food/drinks/mugwort(harry), SLOT_HUD_IN_BACKPACK)
+ new_character.equip_to_slot_or_del(new /obj/item/reagent_containers/drinks/mugwort(harry), SLOT_HUD_IN_BACKPACK)
// The first wiznerd can get their mugwort from the wizard's den, new ones will also need mugwort!
mages_made++
dust_if_respawnable(harry)
diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm
index a0849e4c800..0d31ce60e1d 100644
--- a/code/game/gamemodes/wizard/spellbook.dm
+++ b/code/game/gamemodes/wizard/spellbook.dm
@@ -469,7 +469,7 @@
/datum/spellbook_entry/item/everfull_mug
name = "Everfull Mug"
desc = "A magical mug that can be filled with omnizine at will, though beware of addiction! It can also produce alchohol and other less useful substances."
- item_path = /obj/item/reagent_containers/food/drinks/everfull
+ item_path = /obj/item/reagent_containers/drinks/everfull
cost = 1
category = "Artefacts"
diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm
index 578d490c412..4d457348868 100644
--- a/code/game/jobs/job/support.dm
+++ b/code/game/jobs/job/support.dm
@@ -281,12 +281,12 @@
id = /obj/item/card/id/clown
pda = /obj/item/pda/clown
backpack_contents = list(
- /obj/item/reagent_containers/food/snacks/grown/banana = 1,
+ /obj/item/food/snacks/grown/banana = 1,
/obj/item/stamp/clown = 1,
/obj/item/toy/crayon/rainbow = 1,
/obj/item/storage/fancy/crayons = 1,
/obj/item/reagent_containers/spray/waterflower = 1,
- /obj/item/reagent_containers/food/drinks/bottle/bottleofbanana = 1,
+ /obj/item/reagent_containers/drinks/bottle/bottleofbanana = 1,
/obj/item/instrument/bikehorn = 1
)
@@ -377,7 +377,7 @@
pda = /obj/item/pda/mime
backpack_contents = list(
/obj/item/toy/crayon/mime = 1,
- /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing = 1,
+ /obj/item/reagent_containers/drinks/bottle/bottleofnothing = 1,
/obj/item/cane = 1
)
diff --git a/code/game/machinery/clonepod.dm b/code/game/machinery/clonepod.dm
index 1a1eaa0e5ba..9a0b0b34589 100644
--- a/code/game/machinery/clonepod.dm
+++ b/code/game/machinery/clonepod.dm
@@ -10,12 +10,12 @@
// Not a comprehensive list: Further PRs should add appropriate items here.
// Meat as usual, monstermeat covers goliath, xeno, spider, bear meat
GLOBAL_LIST_INIT(cloner_biomass_items, list(\
-/obj/item/reagent_containers/food/snacks/meat,\
-/obj/item/reagent_containers/food/snacks/monstermeat,
-/obj/item/reagent_containers/food/snacks/carpmeat,
-/obj/item/reagent_containers/food/snacks/salmonmeat,
-/obj/item/reagent_containers/food/snacks/catfishmeat,
-/obj/item/reagent_containers/food/snacks/tofurkey))
+/obj/item/food/snacks/meat,\
+/obj/item/food/snacks/monstermeat,
+/obj/item/food/snacks/carpmeat,
+/obj/item/food/snacks/salmonmeat,
+/obj/item/food/snacks/catfishmeat,
+/obj/item/food/snacks/tofurkey))
#define MINIMUM_HEAL_LEVEL 40
#define CLONE_INITIAL_DAMAGE 190
diff --git a/code/game/machinery/dish_drive.dm b/code/game/machinery/dish_drive.dm
index 8e43922363a..0a35e1e34b7 100644
--- a/code/game/machinery/dish_drive.dm
+++ b/code/game/machinery/dish_drive.dm
@@ -14,7 +14,7 @@
/obj/item/trash/plate,
/obj/item/trash/tray,
/obj/item/trash/snack_bowl,
- /obj/item/reagent_containers/food/drinks/drinkingglass,
+ /obj/item/reagent_containers/drinks/drinkingglass,
/obj/item/kitchen/utensil/fork,
/obj/item/shard,
/obj/item/broken_bottle)
diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm
index 6dc6c55a039..1dc4d706e2d 100644
--- a/code/game/machinery/syndicatebomb.dm
+++ b/code/game/machinery/syndicatebomb.dm
@@ -399,7 +399,7 @@
qdel(src)
/obj/item/bombcore/badmin/summon
- var/summon_path = /obj/item/reagent_containers/food/snacks/cookie
+ var/summon_path = /obj/item/food/snacks/cookie
var/amt_summon = 1
/obj/item/bombcore/badmin/summon/detonate()
diff --git a/code/game/machinery/vendors/contraband_vendors.dm b/code/game/machinery/vendors/contraband_vendors.dm
index be658bffa8e..3fc5db5bb5e 100644
--- a/code/game/machinery/vendors/contraband_vendors.dm
+++ b/code/game/machinery/vendors/contraband_vendors.dm
@@ -68,10 +68,10 @@
icon_off = "nutri"
icon_panel = "thin_vendor"
category = VENDOR_TYPE_FOOD
- products = list(/obj/item/reagent_containers/food/snacks/chips = 6,
- /obj/item/reagent_containers/food/snacks/sosjerky = 6,
- /obj/item/reagent_containers/food/snacks/syndicake = 6,
- /obj/item/reagent_containers/food/snacks/cheesiehonkers = 6)
+ products = list(/obj/item/food/snacks/chips = 6,
+ /obj/item/food/snacks/sosjerky = 6,
+ /obj/item/food/snacks/syndicake = 6,
+ /obj/item/food/snacks/cheesiehonkers = 6)
/obj/machinery/economy/vending/hydroseeds/syndicate_druglab
products = list(/obj/item/seeds/ambrosia/deus = 2,
diff --git a/code/game/machinery/vendors/departmental_vendors.dm b/code/game/machinery/vendors/departmental_vendors.dm
index 15dc44926ef..ab966f70998 100644
--- a/code/game/machinery/vendors/departmental_vendors.dm
+++ b/code/game/machinery/vendors/departmental_vendors.dm
@@ -100,13 +100,13 @@
/obj/item/kitchen/knife = 3,
/obj/item/kitchen/rollingpin = 2,
/obj/item/kitchen/sushimat = 3,
- /obj/item/reagent_containers/food/drinks/drinkingglass = 8,
+ /obj/item/reagent_containers/drinks/drinkingglass = 8,
/obj/item/clothing/suit/chef/classic = 2,
/obj/item/storage/belt/chef = 2,
- /obj/item/reagent_containers/food/condiment/pack/ketchup = 5,
- /obj/item/reagent_containers/food/condiment/pack/hotsauce = 5,
- /obj/item/reagent_containers/food/condiment/saltshaker =5,
- /obj/item/reagent_containers/food/condiment/peppermill =5,
+ /obj/item/reagent_containers/condiment/pack/ketchup = 5,
+ /obj/item/reagent_containers/condiment/pack/hotsauce = 5,
+ /obj/item/reagent_containers/condiment/saltshaker =5,
+ /obj/item/reagent_containers/condiment/peppermill =5,
/obj/item/whetstone = 2,
/obj/item/mixing_bowl = 10,
/obj/item/kitchen/mould/bear = 1,
@@ -328,7 +328,7 @@
/obj/item/grenade/flashbang = 4,
/obj/item/flash = 5,
/obj/item/reagent_containers/spray/pepper = 5,
- /obj/item/reagent_containers/food/snacks/donut = 12,
+ /obj/item/food/snacks/donut = 12,
/obj/item/storage/box/evidence = 6,
/obj/item/flashlight/seclite = 4,
/obj/item/restraints/legcuffs/bola/energy = 7,
@@ -340,5 +340,5 @@
/obj/item/hailer = 5)
refill_canister = /obj/item/vending_refill/security
- prices = list(/obj/item/reagent_containers/food/snacks/donut = 40,
+ prices = list(/obj/item/food/snacks/donut = 40,
/obj/item/storage/fancy/donut_box = 200) //Bulk discount
diff --git a/code/game/machinery/vendors/generic_vendors.dm b/code/game/machinery/vendors/generic_vendors.dm
index 92fa6419b23..94ba7c4470f 100644
--- a/code/game/machinery/vendors/generic_vendors.dm
+++ b/code/game/machinery/vendors/generic_vendors.dm
@@ -41,32 +41,32 @@
icon_panel = "smartfridge"
icon_broken = "smartfridge"
category = VENDOR_TYPE_DRINK
- products = list(/obj/item/reagent_containers/food/drinks/bottle/gin = 5,
- /obj/item/reagent_containers/food/drinks/bottle/whiskey = 5,
- /obj/item/reagent_containers/food/drinks/bottle/tequila = 5,
- /obj/item/reagent_containers/food/drinks/bottle/vodka = 5,
- /obj/item/reagent_containers/food/drinks/bottle/vermouth = 5,
- /obj/item/reagent_containers/food/drinks/bottle/rum = 5,
- /obj/item/reagent_containers/food/drinks/bottle/wine = 5,
- /obj/item/reagent_containers/food/drinks/bag/goonbag = 3,
- /obj/item/reagent_containers/food/drinks/bottle/cognac = 5,
- /obj/item/reagent_containers/food/drinks/bottle/kahlua = 5,
- /obj/item/reagent_containers/food/drinks/cans/beer = 6,
- /obj/item/reagent_containers/food/drinks/cans/ale = 6,
- /obj/item/reagent_containers/food/drinks/cans/synthanol = 15,
- /obj/item/reagent_containers/food/drinks/bottle/orangejuice = 4,
- /obj/item/reagent_containers/food/drinks/bottle/tomatojuice = 4,
- /obj/item/reagent_containers/food/drinks/bottle/limejuice = 4,
- /obj/item/reagent_containers/food/drinks/bottle/cream = 4,
- /obj/item/reagent_containers/food/drinks/cans/tonic = 8,
- /obj/item/reagent_containers/food/drinks/cans/cola = 8,
- /obj/item/reagent_containers/food/drinks/cans/sodawater = 15,
- /obj/item/reagent_containers/food/drinks/drinkingglass = 30,
- /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 30,
- /obj/item/reagent_containers/food/drinks/ice = 9)
+ products = list(/obj/item/reagent_containers/drinks/bottle/gin = 5,
+ /obj/item/reagent_containers/drinks/bottle/whiskey = 5,
+ /obj/item/reagent_containers/drinks/bottle/tequila = 5,
+ /obj/item/reagent_containers/drinks/bottle/vodka = 5,
+ /obj/item/reagent_containers/drinks/bottle/vermouth = 5,
+ /obj/item/reagent_containers/drinks/bottle/rum = 5,
+ /obj/item/reagent_containers/drinks/bottle/wine = 5,
+ /obj/item/reagent_containers/drinks/bag/goonbag = 3,
+ /obj/item/reagent_containers/drinks/bottle/cognac = 5,
+ /obj/item/reagent_containers/drinks/bottle/kahlua = 5,
+ /obj/item/reagent_containers/drinks/cans/beer = 6,
+ /obj/item/reagent_containers/drinks/cans/ale = 6,
+ /obj/item/reagent_containers/drinks/cans/synthanol = 15,
+ /obj/item/reagent_containers/drinks/bottle/orangejuice = 4,
+ /obj/item/reagent_containers/drinks/bottle/tomatojuice = 4,
+ /obj/item/reagent_containers/drinks/bottle/limejuice = 4,
+ /obj/item/reagent_containers/drinks/bottle/cream = 4,
+ /obj/item/reagent_containers/drinks/cans/tonic = 8,
+ /obj/item/reagent_containers/drinks/cans/cola = 8,
+ /obj/item/reagent_containers/drinks/cans/sodawater = 15,
+ /obj/item/reagent_containers/drinks/drinkingglass = 30,
+ /obj/item/reagent_containers/drinks/drinkingglass/shotglass = 30,
+ /obj/item/reagent_containers/drinks/ice = 9)
- contraband = list(/obj/item/reagent_containers/food/drinks/tea = 10,
- /obj/item/reagent_containers/food/drinks/bottle/fernet = 5)
+ contraband = list(/obj/item/reagent_containers/drinks/tea = 10,
+ /obj/item/reagent_containers/drinks/bottle/fernet = 5)
vend_delay = 15
slogan_list = list("I hope nobody asks me for a bloody cup o' tea...",
@@ -120,25 +120,25 @@
item_slot = TRUE
vend_delay = 34
category = VENDOR_TYPE_DRINK
- products = list(/obj/item/reagent_containers/food/drinks/coffee = 25,
- /obj/item/reagent_containers/food/drinks/tea = 25,
- /obj/item/reagent_containers/food/drinks/h_chocolate = 25,
- /obj/item/reagent_containers/food/drinks/chocolate = 10,
- /obj/item/reagent_containers/food/drinks/chicken_soup = 10,
- /obj/item/reagent_containers/food/drinks/weightloss = 10,
- /obj/item/reagent_containers/food/drinks/mug = 15,
- /obj/item/reagent_containers/food/drinks/mug/novelty = 5)
+ products = list(/obj/item/reagent_containers/drinks/coffee = 25,
+ /obj/item/reagent_containers/drinks/tea = 25,
+ /obj/item/reagent_containers/drinks/h_chocolate = 25,
+ /obj/item/reagent_containers/drinks/chocolate = 10,
+ /obj/item/reagent_containers/drinks/chicken_soup = 10,
+ /obj/item/reagent_containers/drinks/weightloss = 10,
+ /obj/item/reagent_containers/drinks/mug = 15,
+ /obj/item/reagent_containers/drinks/mug/novelty = 5)
- contraband = list(/obj/item/reagent_containers/food/drinks/ice = 10)
+ contraband = list(/obj/item/reagent_containers/drinks/ice = 10)
- prices = list(/obj/item/reagent_containers/food/drinks/coffee = 80,
- /obj/item/reagent_containers/food/drinks/tea = 80,
- /obj/item/reagent_containers/food/drinks/h_chocolate = 64,
- /obj/item/reagent_containers/food/drinks/chocolate = 120,
- /obj/item/reagent_containers/food/drinks/chicken_soup = 100,
- /obj/item/reagent_containers/food/drinks/weightloss = 50,
- /obj/item/reagent_containers/food/drinks/mug = 75,
- /obj/item/reagent_containers/food/drinks/mug/novelty = 100)
+ prices = list(/obj/item/reagent_containers/drinks/coffee = 80,
+ /obj/item/reagent_containers/drinks/tea = 80,
+ /obj/item/reagent_containers/drinks/h_chocolate = 64,
+ /obj/item/reagent_containers/drinks/chocolate = 120,
+ /obj/item/reagent_containers/drinks/chicken_soup = 100,
+ /obj/item/reagent_containers/drinks/weightloss = 50,
+ /obj/item/reagent_containers/drinks/mug = 75,
+ /obj/item/reagent_containers/drinks/mug/novelty = 100)
refill_canister = /obj/item/vending_refill/coffee
@@ -146,7 +146,7 @@
prices = list()
/obj/machinery/economy/vending/coffee/item_slot_check(mob/user, obj/item/I)
- if(!(istype(I, /obj/item/reagent_containers/glass) || istype(I, /obj/item/reagent_containers/food/drinks)))
+ if(!(istype(I, /obj/item/reagent_containers/glass) || istype(I, /obj/item/reagent_containers/drinks)))
return FALSE
if(!..())
return FALSE
@@ -158,9 +158,9 @@
/obj/machinery/economy/vending/coffee/do_vend(datum/data/vending_product/R, mob/user)
if(..())
return
- var/obj/item/reagent_containers/food/drinks/vended = new R.product_path()
+ var/obj/item/reagent_containers/drinks/vended = new R.product_path()
- if(istype(vended, /obj/item/reagent_containers/food/drinks/mug))
+ if(istype(vended, /obj/item/reagent_containers/drinks/mug))
var/put_on_turf = TRUE
if(user && iscarbon(user) && user.Adjacent(src))
if(user.put_in_hands(vended))
@@ -863,12 +863,12 @@
icon_off = "nutri"
icon_panel = "thin_vendor"
category = VENDOR_TYPE_FOOD
- products = list(/obj/item/reagent_containers/food/snacks/tofu = 24,
- /obj/item/reagent_containers/food/drinks/ice = 12,
- /obj/item/reagent_containers/food/snacks/candy/candy_corn = 6)
+ products = list(/obj/item/food/snacks/tofu = 24,
+ /obj/item/reagent_containers/drinks/ice = 12,
+ /obj/item/food/snacks/candy/candy_corn = 6)
contraband = list(/obj/item/kitchen/knife = 6,
- /obj/item/reagent_containers/food/drinks/coffee = 12,
+ /obj/item/reagent_containers/drinks/coffee = 12,
/obj/item/tank/internals/emergency_oxygen = 6,
/obj/item/clothing/mask/breath = 6)
@@ -886,9 +886,9 @@
"We are simple people, for this is all we eat.",
"If there is a person, there is a problem. If there is no person, then there is no problem.")
- products = list(/obj/item/reagent_containers/food/drinks/cans/sodawater = 10)
+ products = list(/obj/item/reagent_containers/drinks/cans/sodawater = 10)
- contraband = list(/obj/item/reagent_containers/food/drinks/cans/cola = 7)
+ contraband = list(/obj/item/reagent_containers/drinks/cans/cola = 7)
resistance_flags = FIRE_PROOF
refill_canister = /obj/item/vending_refill/sovietsoda
@@ -915,32 +915,32 @@
icon_off = "nutri"
icon_panel = "thin_vendor"
category = VENDOR_TYPE_FOOD
- products = list(/obj/item/reagent_containers/food/snacks/candy/candybar = 6,
- /obj/item/reagent_containers/food/drinks/dry_ramen = 6,
- /obj/item/reagent_containers/food/snacks/chips = 6,
- /obj/item/reagent_containers/food/snacks/twimsts = 6,
- /obj/item/reagent_containers/food/snacks/sosjerky = 6,
- /obj/item/reagent_containers/food/snacks/no_raisin = 6,
- /obj/item/reagent_containers/food/snacks/pistachios = 6,
- /obj/item/reagent_containers/food/snacks/spacetwinkie = 6,
- /obj/item/reagent_containers/food/snacks/cheesiehonkers = 6,
- /obj/item/reagent_containers/food/snacks/tastybread = 6,
- /obj/item/reagent_containers/food/snacks/stroopwafel = 2)
+ products = list(/obj/item/food/snacks/candy/candybar = 6,
+ /obj/item/reagent_containers/drinks/dry_ramen = 6,
+ /obj/item/food/snacks/chips = 6,
+ /obj/item/food/snacks/twimsts = 6,
+ /obj/item/food/snacks/sosjerky = 6,
+ /obj/item/food/snacks/no_raisin = 6,
+ /obj/item/food/snacks/pistachios = 6,
+ /obj/item/food/snacks/spacetwinkie = 6,
+ /obj/item/food/snacks/cheesiehonkers = 6,
+ /obj/item/food/snacks/tastybread = 6,
+ /obj/item/food/snacks/stroopwafel = 2)
- contraband = list(/obj/item/reagent_containers/food/snacks/syndicake = 6)
+ contraband = list(/obj/item/food/snacks/syndicake = 6)
- prices = list(/obj/item/reagent_containers/food/snacks/candy/candybar = 64,
- /obj/item/reagent_containers/food/drinks/dry_ramen = 32,
- /obj/item/reagent_containers/food/snacks/chips = 64,
- /obj/item/reagent_containers/food/snacks/twimsts = 64,
- /obj/item/reagent_containers/food/snacks/sosjerky = 64,
- /obj/item/reagent_containers/food/snacks/no_raisin = 80,
- /obj/item/reagent_containers/food/snacks/pistachios = 80,
- /obj/item/reagent_containers/food/snacks/spacetwinkie = 64,
- /obj/item/reagent_containers/food/snacks/cheesiehonkers = 64,
- /obj/item/reagent_containers/food/snacks/tastybread = 80,
- /obj/item/reagent_containers/food/snacks/stroopwafel = 100,
- /obj/item/reagent_containers/food/snacks/syndicake = 175) //syndicakes are genuinely kind of powerful
+ prices = list(/obj/item/food/snacks/candy/candybar = 64,
+ /obj/item/reagent_containers/drinks/dry_ramen = 32,
+ /obj/item/food/snacks/chips = 64,
+ /obj/item/food/snacks/twimsts = 64,
+ /obj/item/food/snacks/sosjerky = 64,
+ /obj/item/food/snacks/no_raisin = 80,
+ /obj/item/food/snacks/pistachios = 80,
+ /obj/item/food/snacks/spacetwinkie = 64,
+ /obj/item/food/snacks/cheesiehonkers = 64,
+ /obj/item/food/snacks/tastybread = 80,
+ /obj/item/food/snacks/stroopwafel = 100,
+ /obj/item/food/snacks/syndicake = 175) //syndicakes are genuinely kind of powerful
refill_canister = /obj/item/vending_refill/snack
@@ -958,19 +958,19 @@
icon_state = "chang"
icon_lightmask = "chang"
category = VENDOR_TYPE_FOOD
- products = list(/obj/item/reagent_containers/food/snacks/chinese/chowmein = 6,
- /obj/item/reagent_containers/food/snacks/chinese/tao = 6,
- /obj/item/reagent_containers/food/snacks/chinese/sweetsourchickenball = 6,
- /obj/item/reagent_containers/food/snacks/chinese/newdles = 6,
- /obj/item/reagent_containers/food/snacks/chinese/rice = 6,
- /obj/item/reagent_containers/food/snacks/fortunecookie = 6)
+ products = list(/obj/item/food/snacks/chinese/chowmein = 6,
+ /obj/item/food/snacks/chinese/tao = 6,
+ /obj/item/food/snacks/chinese/sweetsourchickenball = 6,
+ /obj/item/food/snacks/chinese/newdles = 6,
+ /obj/item/food/snacks/chinese/rice = 6,
+ /obj/item/food/snacks/fortunecookie = 6)
- prices = list(/obj/item/reagent_containers/food/snacks/chinese/chowmein = 125,
- /obj/item/reagent_containers/food/snacks/chinese/tao = 125,
- /obj/item/reagent_containers/food/snacks/chinese/sweetsourchickenball = 125,
- /obj/item/reagent_containers/food/snacks/chinese/newdles = 100,
- /obj/item/reagent_containers/food/snacks/chinese/rice = 100,
- /obj/item/reagent_containers/food/snacks/fortunecookie = 50)
+ prices = list(/obj/item/food/snacks/chinese/chowmein = 125,
+ /obj/item/food/snacks/chinese/tao = 125,
+ /obj/item/food/snacks/chinese/sweetsourchickenball = 125,
+ /obj/item/food/snacks/chinese/newdles = 100,
+ /obj/item/food/snacks/chinese/rice = 100,
+ /obj/item/food/snacks/fortunecookie = 50)
refill_canister = /obj/item/vending_refill/chinese
@@ -993,22 +993,22 @@
"The best drinks in space.")
category = VENDOR_TYPE_DRINK
- products = list(/obj/item/reagent_containers/food/drinks/cans/cola = 10,
- /obj/item/reagent_containers/food/drinks/cans/space_mountain_wind = 10,
- /obj/item/reagent_containers/food/drinks/cans/dr_gibb = 10,
- /obj/item/reagent_containers/food/drinks/cans/starkist = 10,
- /obj/item/reagent_containers/food/drinks/cans/space_up = 10,
- /obj/item/reagent_containers/food/drinks/cans/grape_juice = 10,
+ products = list(/obj/item/reagent_containers/drinks/cans/cola = 10,
+ /obj/item/reagent_containers/drinks/cans/space_mountain_wind = 10,
+ /obj/item/reagent_containers/drinks/cans/dr_gibb = 10,
+ /obj/item/reagent_containers/drinks/cans/starkist = 10,
+ /obj/item/reagent_containers/drinks/cans/space_up = 10,
+ /obj/item/reagent_containers/drinks/cans/grape_juice = 10,
/obj/item/reagent_containers/glass/beaker/waterbottle = 10)
- contraband = list(/obj/item/reagent_containers/food/drinks/cans/thirteenloko = 5)
+ contraband = list(/obj/item/reagent_containers/drinks/cans/thirteenloko = 5)
- prices = list(/obj/item/reagent_containers/food/drinks/cans/cola = 45,
- /obj/item/reagent_containers/food/drinks/cans/space_mountain_wind = 50,
- /obj/item/reagent_containers/food/drinks/cans/dr_gibb = 50,
- /obj/item/reagent_containers/food/drinks/cans/starkist = 50,
- /obj/item/reagent_containers/food/drinks/cans/space_up = 50,
- /obj/item/reagent_containers/food/drinks/cans/grape_juice = 50,
+ prices = list(/obj/item/reagent_containers/drinks/cans/cola = 45,
+ /obj/item/reagent_containers/drinks/cans/space_mountain_wind = 50,
+ /obj/item/reagent_containers/drinks/cans/dr_gibb = 50,
+ /obj/item/reagent_containers/drinks/cans/starkist = 50,
+ /obj/item/reagent_containers/drinks/cans/space_up = 50,
+ /obj/item/reagent_containers/drinks/cans/grape_juice = 50,
/obj/item/reagent_containers/glass/beaker/waterbottle = 20)
refill_canister = /obj/item/vending_refill/cola
diff --git a/code/game/machinery/vendors/wardrobe_vendors.dm b/code/game/machinery/vendors/wardrobe_vendors.dm
index 67530ab7458..c6c9ebda4a5 100644
--- a/code/game/machinery/vendors/wardrobe_vendors.dm
+++ b/code/game/machinery/vendors/wardrobe_vendors.dm
@@ -112,7 +112,7 @@
/obj/item/clothing/head/fedora/whitefedora = 1,
/obj/item/clothing/gloves/color/black = 2,
/obj/item/clothing/gloves/color/latex = 2,
- /obj/item/reagent_containers/food/drinks/flask/detflask = 2,
+ /obj/item/reagent_containers/drinks/flask/detflask = 2,
/obj/item/storage/fancy/cigarettes/dromedaryco = 5)
prices = list(/obj/item/clothing/under/rank/security/detective = 50,
@@ -134,7 +134,7 @@
/obj/item/clothing/head/fedora/whitefedora = 20,
/obj/item/clothing/gloves/color/black = 20,
/obj/item/clothing/gloves/color/latex = 20,
- /obj/item/reagent_containers/food/drinks/flask/detflask = 50,
+ /obj/item/reagent_containers/drinks/flask/detflask = 50,
/obj/item/storage/fancy/cigarettes/dromedaryco = 5)
contraband = list(/obj/item/toy/figure/crew/detective = 1)
diff --git a/code/game/objects/effects/effects.dm b/code/game/objects/effects/effects.dm
index 2ca15c2fe7a..1d74ec9bb0d 100644
--- a/code/game/objects/effects/effects.dm
+++ b/code/game/objects/effects/effects.dm
@@ -99,7 +99,7 @@
reagents.add_reagent_list(scoop_reagents)
/obj/effect/decal/attackby(obj/item/I, mob/user)
- if(istype(I, /obj/item/reagent_containers/glass) || istype(I, /obj/item/reagent_containers/food/drinks))
+ if(istype(I, /obj/item/reagent_containers/glass) || istype(I, /obj/item/reagent_containers/drinks))
scoop(I, user)
else if(issimulatedturf(loc))
I.melee_attack_chain(user, loc)
diff --git a/code/game/objects/effects/meteors.dm b/code/game/objects/effects/meteors.dm
index ec519dfeca5..edb05feb8e9 100644
--- a/code/game/objects/effects/meteors.dm
+++ b/code/game/objects/effects/meteors.dm
@@ -304,7 +304,7 @@ GLOBAL_LIST_INIT(meteors_ops, list(/obj/effect/meteor/goreops)) //Meaty Ops
hits = 2
heavy = TRUE
meteorsound = 'sound/effects/blobattack.ogg'
- meteordrop = list(/obj/item/reagent_containers/food/snacks/meat/human, /obj/item/organ/internal/heart, /obj/item/organ/internal/lungs, /obj/item/organ/internal/appendix)
+ meteordrop = list(/obj/item/food/snacks/meat/human, /obj/item/organ/internal/heart, /obj/item/organ/internal/lungs, /obj/item/organ/internal/appendix)
var/meteorgibs = /obj/effect/gibspawner/generic
/obj/effect/meteor/meaty/make_debris()
@@ -323,7 +323,7 @@ GLOBAL_LIST_INIT(meteors_ops, list(/obj/effect/meteor/goreops)) //Meaty Ops
//Meaty Ore Xeno edition
/obj/effect/meteor/meaty/xeno
color = "#5EFF00"
- meteordrop = list(/obj/item/reagent_containers/food/snacks/monstermeat/xenomeat)
+ meteordrop = list(/obj/item/food/snacks/monstermeat/xenomeat)
meteorgibs = /obj/effect/gibspawner/xeno
/obj/effect/meteor/meaty/xeno/Initialize(mapload, target)
@@ -342,7 +342,7 @@ GLOBAL_LIST_INIT(meteors_ops, list(/obj/effect/meteor/goreops)) //Meaty Ops
hits = 10
hitpwr = EXPLODE_DEVASTATE
meteorsound = 'sound/effects/blobattack.ogg'
- meteordrop = list(/obj/item/reagent_containers/food/snacks/meat)
+ meteordrop = list(/obj/item/food/snacks/meat)
var/meteorgibs = /obj/effect/gibspawner/generic
/obj/effect/meteor/goreops/make_debris()
@@ -370,7 +370,7 @@ GLOBAL_LIST_INIT(meteors_ops, list(/obj/effect/meteor/goreops)) //Meaty Ops
hits = 10
heavy = TRUE
dropamt = 1
- meteordrop = list(/obj/item/clothing/head/hardhat/pumpkinhead, /obj/item/reagent_containers/food/snacks/grown/pumpkin)
+ meteordrop = list(/obj/item/clothing/head/hardhat/pumpkinhead, /obj/item/food/snacks/grown/pumpkin)
/obj/effect/meteor/pumpkin/Initialize(mapload, target)
. = ..()
diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
index d8600cbfb6c..b54a46802ea 100644
--- a/code/game/objects/effects/spawners/lootdrop.dm
+++ b/code/game/objects/effects/spawners/lootdrop.dm
@@ -421,20 +421,20 @@
lootcount = 3
lootdoubles = FALSE
var/soups = list(
- /obj/item/reagent_containers/food/snacks/soup/beetsoup,
- /obj/item/reagent_containers/food/snacks/soup/stew,
- /obj/item/reagent_containers/food/snacks/soup/hotchili,
- /obj/item/reagent_containers/food/snacks/soup/nettlesoup,
- /obj/item/reagent_containers/food/snacks/soup/meatballsoup)
+ /obj/item/food/snacks/soup/beetsoup,
+ /obj/item/food/snacks/soup/stew,
+ /obj/item/food/snacks/soup/hotchili,
+ /obj/item/food/snacks/soup/nettlesoup,
+ /obj/item/food/snacks/soup/meatballsoup)
var/salads = list(
- /obj/item/reagent_containers/food/snacks/salad/herb,
- /obj/item/reagent_containers/food/snacks/salad/valid,
- /obj/item/reagent_containers/food/snacks/salad/aesir)
+ /obj/item/food/snacks/salad/herb,
+ /obj/item/food/snacks/salad/valid,
+ /obj/item/food/snacks/salad/aesir)
var/mains = list(
- /obj/item/reagent_containers/food/snacks/enchiladas,
- /obj/item/reagent_containers/food/snacks/stewedsoymeat,
- /obj/item/reagent_containers/food/snacks/burger/bigbite,
- /obj/item/reagent_containers/food/snacks/burger/superbite)
+ /obj/item/food/snacks/enchiladas,
+ /obj/item/food/snacks/stewedsoymeat,
+ /obj/item/food/snacks/burger/bigbite,
+ /obj/item/food/snacks/burger/superbite)
/obj/effect/spawner/lootdrop/three_course_meal/Initialize(mapload)
loot = list(pick(soups) = 1,pick(salads) = 1,pick(mains) = 1)
diff --git a/code/game/objects/effects/spawners/random_spawners.dm b/code/game/objects/effects/spawners/random_spawners.dm
index 2b46924ff0d..9fe0686aefd 100644
--- a/code/game/objects/effects/spawners/random_spawners.dm
+++ b/code/game/objects/effects/spawners/random_spawners.dm
@@ -266,7 +266,7 @@
spawn_inside = null
result = list(/datum/nothing = 1,
/obj/item/wrench = 1,
- /obj/item/reagent_containers/food/snacks/syndicake = 1,
+ /obj/item/food/snacks/syndicake = 1,
/obj/item/coin/antagtoken/syndicate = 1,
/obj/item/gun/projectile/automatic/pistol = 1)
diff --git a/code/game/objects/items/granters/action_granters/summon_cheese.dm b/code/game/objects/items/granters/action_granters/summon_cheese.dm
index c115a46b73c..62645a34def 100644
--- a/code/game/objects/items/granters/action_granters/summon_cheese.dm
+++ b/code/game/objects/items/granters/action_granters/summon_cheese.dm
@@ -22,7 +22,7 @@
/obj/item/book/granter/spell/summon_cheese/recoil(mob/living/user)
to_chat(user, "[src] turns into a wedge of cheese!")
- var/obj/item/reagent_containers/food/snacks/cheesewedge/presliced/book_cheese = new
+ var/obj/item/food/snacks/cheesewedge/presliced/book_cheese = new
user.drop_item()
user.put_in_hands(book_cheese)
qdel(src)
@@ -35,7 +35,7 @@
overlay = null
action_icon_state = "cheese_wedge"
action_background_icon_state = "bg_spell"
- summon_type = list(/obj/item/reagent_containers/food/snacks/cheesewedge/presliced)
+ summon_type = list(/obj/item/food/snacks/cheesewedge/presliced)
summon_amt = 9
aoe_range = 1
summon_ignore_prev_spawn_points = TRUE
diff --git a/code/game/objects/items/mixing_bowl.dm b/code/game/objects/items/mixing_bowl.dm
index 996ab847b0c..4b81d55974a 100644
--- a/code/game/objects/items/mixing_bowl.dm
+++ b/code/game/objects/items/mixing_bowl.dm
@@ -39,7 +39,7 @@
return add_item(S, user)
else
return add_item(I, user)
- else if(is_type_in_list(I, list(/obj/item/reagent_containers/glass, /obj/item/reagent_containers/food/drinks, /obj/item/reagent_containers/food/condiment)))
+ else if(is_type_in_list(I, list(/obj/item/reagent_containers/glass, /obj/item/reagent_containers/drinks, /obj/item/reagent_containers/condiment)))
if(!I.reagents)
return 1
for(var/datum/reagent/R in I.reagents.reagent_list)
@@ -68,20 +68,20 @@
var/list/items_measures_p = new
for(var/obj/O in contents)
var/display_name = O.name
- if(istype(O,/obj/item/reagent_containers/food/snacks/egg))
+ if(istype(O,/obj/item/food/snacks/egg))
items_measures[display_name] = "egg"
items_measures_p[display_name] = "eggs"
- if(istype(O,/obj/item/reagent_containers/food/snacks/tofu))
+ if(istype(O,/obj/item/food/snacks/tofu))
items_measures[display_name] = "tofu chunk"
items_measures_p[display_name] = "tofu chunks"
- if(istype(O,/obj/item/reagent_containers/food/snacks/meat)) //any meat
+ if(istype(O,/obj/item/food/snacks/meat)) //any meat
items_measures[display_name] = "slab of meat"
items_measures_p[display_name] = "slabs of meat"
- if(istype(O,/obj/item/reagent_containers/food/snacks/donkpocket))
+ if(istype(O,/obj/item/food/snacks/donkpocket))
display_name = "Turnovers"
items_measures[display_name] = "turnover"
items_measures_p[display_name] = "turnovers"
- if(istype(O,/obj/item/reagent_containers/food/snacks/carpmeat))
+ if(istype(O,/obj/item/food/snacks/carpmeat))
items_measures[display_name] = "fillet of meat"
items_measures_p[display_name] = "fillets of meat"
items_counts[display_name]++
@@ -165,7 +165,7 @@
if(id)
amount += reagents.get_reagent_amount(id)
reagents.clear_reagents()
- var/obj/item/reagent_containers/food/snacks/badrecipe/mysteryfood = new(get_turf(source))
+ var/obj/item/food/snacks/badrecipe/mysteryfood = new(get_turf(source))
mysteryfood.reagents.add_reagent("carbon", amount)
mysteryfood.reagents.add_reagent("????", amount / 10)
make_dirty(75)
diff --git a/code/game/objects/items/random_items.dm b/code/game/objects/items/random_items.dm
index bea4ba78d01..c32d3397a1c 100644
--- a/code/game/objects/items/random_items.dm
+++ b/code/game/objects/items/random_items.dm
@@ -25,11 +25,11 @@
new T(loc)
qdel(src)
-/obj/item/reagent_containers/food/drinks/bottle/random_drink
+/obj/item/reagent_containers/drinks/bottle/random_drink
name = "unlabelled drink"
icon = 'icons/obj/drinks.dmi'
-/obj/item/reagent_containers/food/drinks/bottle/random_drink/Initialize(mapload)
+/obj/item/reagent_containers/drinks/bottle/random_drink/Initialize(mapload)
. = ..()
var/list/possible_drinks = GLOB.drinks.Copy()
if(prob(50))
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index f229ce8b956..4f629249649 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -68,7 +68,7 @@
return
/obj/item/toy/balloon/attackby(obj/O as obj, mob/user as mob, params)
- if(istype(O, /obj/item/reagent_containers/glass) || istype(O, /obj/item/reagent_containers/food/drinks/drinkingglass))
+ if(istype(O, /obj/item/reagent_containers/glass) || istype(O, /obj/item/reagent_containers/drinks/drinkingglass))
if(O.reagents)
if(O.reagents.total_volume < 1)
to_chat(user, "[O] is empty.")
@@ -781,8 +781,8 @@
item_state = "plushie_ipc"
/obj/item/toy/plushie/ipcplushie/attackby(obj/item/B, mob/user, params)
- if(istype(B, /obj/item/reagent_containers/food/snacks/breadslice))
- new /obj/item/reagent_containers/food/snacks/toast(get_turf(loc))
+ if(istype(B, /obj/item/food/snacks/breadslice))
+ new /obj/item/food/snacks/toast(get_turf(loc))
to_chat(user, " You insert bread into the toaster. ")
playsound(loc, 'sound/machines/ding.ogg', 50, 1)
qdel(B)
diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm
index 66951e2e044..970916bba0d 100644
--- a/code/game/objects/items/weapons/RSF.dm
+++ b/code/game/objects/items/weapons/RSF.dm
@@ -22,15 +22,15 @@
to_chat(user, "Choose an item to dispense!")
else
to_chat(user, "You are currently dispensing a [initial(currently_dispensing.name)].")
- var/static/list/rsf_items = list("Drinking Glass" = /obj/item/reagent_containers/food/drinks/drinkingglass,
+ var/static/list/rsf_items = list("Drinking Glass" = /obj/item/reagent_containers/drinks/drinkingglass,
"Paper" = /obj/item/paper,
"Pen" = /obj/item/pen,
"Dice Pack" = /obj/item/storage/bag/dice,
"Cigarette" = /obj/item/clothing/mask/cigarette,
- "Newdles" = /obj/item/reagent_containers/food/snacks/chinese/newdles,
- "Donut" = /obj/item/reagent_containers/food/snacks/donut,
- "Chicken Soup" = /obj/item/reagent_containers/food/drinks/chicken_soup,
- "Tofu Burger" = /obj/item/reagent_containers/food/snacks/burger/tofu)
+ "Newdles" = /obj/item/food/snacks/chinese/newdles,
+ "Donut" = /obj/item/food/snacks/donut,
+ "Chicken Soup" = /obj/item/reagent_containers/drinks/chicken_soup,
+ "Tofu Burger" = /obj/item/food/snacks/burger/tofu)
var/static/list/rsf_icons = list("Drinking Glass" = image(icon = 'icons/obj/drinks.dmi', icon_state = "glass_empty"),
"Paper" = image(icon = 'icons/obj/bureaucracy.dmi', icon_state = "paper"),
"Pen" = image(icon = 'icons/obj/bureaucracy.dmi', icon_state = "pen"),
diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm
index 6e2d363c319..e3daad3f710 100644
--- a/code/game/objects/items/weapons/cigs.dm
+++ b/code/game/objects/items/weapons/cigs.dm
@@ -534,8 +534,8 @@ LIGHTERS ARE IN LIGHTERS.DM
/obj/item/rollingpaper/afterattack(atom/target, mob/user, proximity)
if(!proximity)
return
- if(istype(target, /obj/item/reagent_containers/food/snacks/grown))
- var/obj/item/reagent_containers/food/snacks/grown/O = target
+ if(istype(target, /obj/item/food/snacks/grown))
+ var/obj/item/food/snacks/grown/O = target
if(O.dry)
user.unEquip(target, 1)
user.unEquip(src, 1)
diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm
index 6363f02b638..998dd526021 100644
--- a/code/game/objects/items/weapons/dice.dm
+++ b/code/game/objects/items/weapons/dice.dm
@@ -225,7 +225,7 @@
if(11)
//Cookie
T.visible_message("A cookie appears out of thin air!")
- var/obj/item/reagent_containers/food/snacks/cookie/C = new(drop_location())
+ var/obj/item/food/snacks/cookie/C = new(drop_location())
create_smoke(2)
C.name = "Cookie of Fate"
if(12)
diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm
index 45c788385bc..c070e1d1f98 100644
--- a/code/game/objects/items/weapons/gift_wrappaper.dm
+++ b/code/game/objects/items/weapons/gift_wrappaper.dm
@@ -79,8 +79,8 @@
/obj/random/mech,
/obj/item/toy/spinningtoy,
/obj/item/toy/sword,
- /obj/item/reagent_containers/food/snacks/grown/ambrosia/deus,
- /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris,
+ /obj/item/food/snacks/grown/ambrosia/deus,
+ /obj/item/food/snacks/grown/ambrosia/vulgaris,
/obj/item/paicard,
/obj/item/instrument/violin,
/obj/item/instrument/guitar,
diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm
index 5d18e4321d8..5b8cebe360d 100644
--- a/code/game/objects/items/weapons/grenades/chem_grenade.dm
+++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm
@@ -324,8 +324,8 @@
desc = "A custom made large grenade. It affects a larger area."
icon_state = "large_grenade"
bomb_state = "largebomb"
- allowed_containers = list(/obj/item/reagent_containers/glass,/obj/item/reagent_containers/food/condiment,
- /obj/item/reagent_containers/food/drinks)
+ allowed_containers = list(/obj/item/reagent_containers/glass,/obj/item/reagent_containers/condiment,
+ /obj/item/reagent_containers/drinks)
origin_tech = "combat=3;engineering=3"
affected_area = 5
ignition_temp = 25 // Large grenades are slightly more effective at setting off heat-sensitive mixtures than smaller grenades.
diff --git a/code/game/objects/items/weapons/grenades/clusterbuster.dm b/code/game/objects/items/weapons/grenades/clusterbuster.dm
index aeae35cc645..46aebed6b25 100644
--- a/code/game/objects/items/weapons/grenades/clusterbuster.dm
+++ b/code/game/objects/items/weapons/grenades/clusterbuster.dm
@@ -141,7 +141,7 @@
/obj/item/grenade/clusterbuster/booze
name = "\improper Booze Grenade"
- payload = /obj/item/reagent_containers/food/drinks/bottle/random_drink
+ payload = /obj/item/reagent_containers/drinks/bottle/random_drink
/obj/item/grenade/clusterbuster/honk
name = "\improper Mega Honk Grenade"
diff --git a/code/game/objects/items/weapons/grenades/ghettobomb.dm b/code/game/objects/items/weapons/grenades/ghettobomb.dm
index 15d827677b5..92310e2484c 100644
--- a/code/game/objects/items/weapons/grenades/ghettobomb.dm
+++ b/code/game/objects/items/weapons/grenades/ghettobomb.dm
@@ -27,7 +27,7 @@
/obj/item/grenade/iedcasing/CheckParts(list/parts_list)
..()
- var/obj/item/reagent_containers/food/drinks/cans/can = locate() in contents
+ var/obj/item/reagent_containers/drinks/cans/can = locate() in contents
if(can)
can.pixel_x = 0 //Reset the sprite's position to make it consistent with the rest of the IED
can.pixel_y = 0
diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm
index 6b08bf0d9d0..dec7bbee03f 100644
--- a/code/game/objects/items/weapons/kitchen.dm
+++ b/code/game/objects/items/weapons/kitchen.dm
@@ -57,7 +57,7 @@
return ..()
if(length(contents))
- var/obj/item/reagent_containers/food/snacks/toEat = contents[1]
+ var/obj/item/food/snacks/toEat = contents[1]
if(istype(toEat))
if(C.eat(toEat, user))
toEat.On_Consume(C, user)
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index 3a23ce318ab..d14eb7ddec5 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -116,12 +116,12 @@
new /obj/item/radio/headset/headset_service(src)
new /obj/item/pda/clown(src)
new /obj/item/storage/box/survival(src)
- new /obj/item/reagent_containers/food/snacks/grown/banana(src)
+ new /obj/item/food/snacks/grown/banana(src)
new /obj/item/stamp/clown(src)
new /obj/item/toy/crayon/rainbow(src)
new /obj/item/storage/fancy/crayons(src)
new /obj/item/reagent_containers/spray/waterflower(src)
- new /obj/item/reagent_containers/food/drinks/bottle/bottleofbanana(src)
+ new /obj/item/reagent_containers/drinks/bottle/bottleofbanana(src)
new /obj/item/instrument/bikehorn(src)
new /obj/item/bikehorn(src)
new /obj/item/dnainjector/comic(src)
@@ -717,7 +717,7 @@
/obj/item/organ/internal/heart/cursed/wizard = 1,
/obj/item/organ/internal/vocal_cords/colossus/wizard = 2,
/obj/item/warp_cube/red = 1,
- /obj/item/reagent_containers/food/drinks/everfull = 2,
+ /obj/item/reagent_containers/drinks/everfull = 2,
/obj/item/clothing/suit/space/hardsuit/shielded/wizard = 2,
/obj/item/immortality_talisman = 1 ) //spells recharge when invincible
var/obj/item/pickeda = pick(list_a)
@@ -749,7 +749,7 @@
value += 1
if(8)
if(prob(25))
- new /obj/item/reagent_containers/food/snacks/grown/nymph_pod(src)
+ new /obj/item/food/snacks/grown/nymph_pod(src)
new /obj/item/slimepotion/sentience(src)
else
new /obj/item/paicard(src) //Still useful, not a point useful.
@@ -757,10 +757,10 @@
//Treat / potion. Free.
var/obj/item/pickedt = pick(
/obj/item/storage/box/syndidonkpockets, // Healing + speed
- /obj/item/reagent_containers/food/drinks/bottle/dragonsbreath, // Killing
- /obj/item/reagent_containers/food/drinks/bottle/immortality, // Super healing for 20 seconds
- /obj/item/reagent_containers/food/snacks/meatsteak/stimulating, //Healing + stun immunity
- /obj/item/reagent_containers/food/snacks/plum_pie ) // Great healing over long period of time
+ /obj/item/reagent_containers/drinks/bottle/dragonsbreath, // Killing
+ /obj/item/reagent_containers/drinks/bottle/immortality, // Super healing for 20 seconds
+ /obj/item/food/snacks/meatsteak/stimulating, //Healing + stun immunity
+ /obj/item/food/snacks/plum_pie ) // Great healing over long period of time
new pickedt(src)
@@ -774,7 +774,7 @@
#undef NANNY_MAX_VALUE
#undef NANNY_MIN_VALUE
-/obj/item/reagent_containers/food/drinks/bottle/dragonsbreath
+/obj/item/reagent_containers/drinks/bottle/dragonsbreath
name = "flask of dragons breath"
desc = "Not recommended for wizardly consumption. Recommended for mundane consumption!"
icon_state = "holyflask"
@@ -782,7 +782,7 @@
volume = 100
list_reagents = list("dragonsbreath" = 80, "hell_water" = 20)
-/obj/item/reagent_containers/food/drinks/bottle/immortality
+/obj/item/reagent_containers/drinks/bottle/immortality
name = "drop of immortality"
desc = "Drinking this will make you immortal. For a moment or two, at least."
icon_state = "holyflask"
@@ -790,13 +790,13 @@
volume = 5
list_reagents = list("adminordrazine" = 5)
-/obj/item/reagent_containers/food/snacks/meatsteak/stimulating
+/obj/item/food/snacks/meatsteak/stimulating
name = "stimulating steak"
desc = "Stimulate your senses."
list_reagents = list("nutriment" = 5, "stimulants" = 25)
bitesize = 100
-/obj/item/reagent_containers/food/snacks/plum_pie
+/obj/item/food/snacks/plum_pie
name = "perfect plum pie"
desc = "The Jack Horner brand of pie. 2 big thumbs up."
icon = 'icons/obj/food/bakedgoods.dmi'
diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm
index fbcd813e504..2a61f0b5e0f 100644
--- a/code/game/objects/items/weapons/storage/bags.dm
+++ b/code/game/objects/items/weapons/storage/bags.dm
@@ -206,7 +206,7 @@
max_combined_w_class = 100 //Doesn't matter what this is, so long as it's more or equal to storage_slots * plants.w_class
max_w_class = WEIGHT_CLASS_NORMAL
w_class = WEIGHT_CLASS_TINY
- can_hold = list(/obj/item/reagent_containers/food/snacks/grown,/obj/item/seeds,/obj/item/grown,/obj/item/reagent_containers/food/snacks/grown/ash_flora,/obj/item/reagent_containers/food/snacks/honeycomb)
+ can_hold = list(/obj/item/food/snacks/grown,/obj/item/seeds,/obj/item/grown,/obj/item/food/snacks/grown/ash_flora,/obj/item/food/snacks/honeycomb)
resistance_flags = FLAMMABLE
/obj/item/storage/bag/plants/portaseeder
@@ -497,7 +497,7 @@
/obj/item/storage/bag/tray/cookies_tray
- var/cookie = /obj/item/reagent_containers/food/snacks/cookie
+ var/cookie = /obj/item/food/snacks/cookie
/obj/item/storage/bag/tray/cookies_tray/populate_contents() // By Azule Utama, thank you a lot!
for(var/i in 1 to 6)
@@ -506,7 +506,7 @@
update_icon(UPDATE_OVERLAYS)
/obj/item/storage/bag/tray/cookies_tray/sugarcookie
- cookie = /obj/item/reagent_containers/food/snacks/sugarcookie
+ cookie = /obj/item/food/snacks/sugarcookie
/*
* Chemistry bag
@@ -537,7 +537,7 @@
storage_slots = 25
max_combined_w_class = 200
w_class = WEIGHT_CLASS_TINY
- can_hold = list(/obj/item/slime_extract, /obj/item/reagent_containers/food/snacks/monkeycube,
+ can_hold = list(/obj/item/slime_extract, /obj/item/food/snacks/monkeycube,
/obj/item/reagent_containers/syringe, /obj/item/reagent_containers/glass/beaker,
/obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/iv_bag,
/obj/item/reagent_containers/hypospray/autoinjector/epinephrine)
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index 717b00c0bb8..ac92f8aa512 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -278,7 +278,7 @@
/obj/item/clothing/glasses,
/obj/item/ammo_casing/shotgun,
/obj/item/ammo_box,
- /obj/item/reagent_containers/food/snacks/donut,
+ /obj/item/food/snacks/donut,
/obj/item/kitchen/knife/combat,
/obj/item/melee/baton,
/obj/item/melee/classic_baton,
@@ -329,7 +329,7 @@
/obj/item/clothing/glasses,
/obj/item/ammo_casing/shotgun,
/obj/item/ammo_box,
- /obj/item/reagent_containers/food/snacks/donut,
+ /obj/item/food/snacks/donut,
/obj/item/kitchen/knife/combat,
/obj/item/melee/baton,
/obj/item/melee/classic_baton,
@@ -420,7 +420,7 @@
can_hold = list(
/obj/item/grenade,
/obj/item/lighter,
- /obj/item/reagent_containers/food/drinks/bottle/molotov
+ /obj/item/reagent_containers/drinks/bottle/molotov
)
/obj/item/storage/belt/grenade/full/populate_contents()
@@ -919,7 +919,7 @@
/obj/item/stack/sheet/bone,
/obj/item/lighter,
/obj/item/storage/fancy/cigarettes,
- /obj/item/reagent_containers/food/drinks/bottle,
+ /obj/item/reagent_containers/drinks/bottle,
/obj/item/stack/medical,
/obj/item/kitchen/knife,
/obj/item/reagent_containers/hypospray,
@@ -930,7 +930,7 @@
/obj/item/reagent_containers/pill,
/obj/item/storage/pill_bottle,
/obj/item/stack/ore,
- /obj/item/reagent_containers/food/drinks,
+ /obj/item/reagent_containers/drinks,
/obj/item/organ/internal/regenerative_core,
/obj/item/wormhole_jaunter,
/obj/item/storage/bag/plants,
@@ -968,11 +968,11 @@
/obj/item/kitchen/cutter,
/obj/item/assembly/mousetrap,
/obj/item/reagent_containers/spray/pestspray,
- /obj/item/reagent_containers/food/drinks/flask,
- /obj/item/reagent_containers/food/drinks/drinkingglass,
- /obj/item/reagent_containers/food/drinks/bottle,
- /obj/item/reagent_containers/food/drinks/cans,
- /obj/item/reagent_containers/food/drinks/shaker,
- /obj/item/reagent_containers/food/snacks,
- /obj/item/reagent_containers/food/condiment,
+ /obj/item/reagent_containers/drinks/flask,
+ /obj/item/reagent_containers/drinks/drinkingglass,
+ /obj/item/reagent_containers/drinks/bottle,
+ /obj/item/reagent_containers/drinks/cans,
+ /obj/item/reagent_containers/drinks/shaker,
+ /obj/item/food/snacks,
+ /obj/item/reagent_containers/condiment,
/obj/item/reagent_containers/glass/beaker)
diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm
index 35432af8c70..e4bafc9d70f 100644
--- a/code/game/objects/items/weapons/storage/bible.dm
+++ b/code/game/objects/items/weapons/storage/bible.dm
@@ -58,8 +58,8 @@
icon_state ="bible"
/obj/item/storage/bible/booze/populate_contents()
- new /obj/item/reagent_containers/food/drinks/cans/beer(src)
- new /obj/item/reagent_containers/food/drinks/cans/beer(src)
+ new /obj/item/reagent_containers/drinks/cans/beer(src)
+ new /obj/item/reagent_containers/drinks/cans/beer(src)
new /obj/item/stack/spacecash(src)
new /obj/item/stack/spacecash(src)
new /obj/item/stack/spacecash(src)
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index b8e166396aa..4627eb960b6 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -302,7 +302,7 @@
/obj/item/storage/box/cups/populate_contents()
for(var/I in 1 to 7)
- new /obj/item/reagent_containers/food/drinks/sillycup(src)
+ new /obj/item/reagent_containers/drinks/sillycup(src)
/obj/item/storage/box/drinkingglasses
name = "box of drinking glasses"
@@ -310,7 +310,7 @@
/obj/item/storage/box/drinkingglasses/populate_contents()
for(var/I in 1 to 6)
- new /obj/item/reagent_containers/food/drinks/drinkingglass(src)
+ new /obj/item/reagent_containers/drinks/drinkingglass(src)
/obj/item/storage/box/condimentbottles
name = "box of condiment bottles"
@@ -318,7 +318,7 @@
/obj/item/storage/box/condimentbottles/populate_contents()
for(var/I in 1 to 6)
- new /obj/item/reagent_containers/food/condiment(src)
+ new /obj/item/reagent_containers/condiment(src)
/obj/item/storage/box/mousetraps
name = "box of Pest-B-Gon mousetraps"
@@ -424,9 +424,9 @@
desc = "A box intended for experienced chefs."
/obj/item/storage/box/chef_rare_ingredients_kit/populate_contents()
- new /obj/item/reagent_containers/food/condiment/soysauce(src)
- new /obj/item/reagent_containers/food/condiment/enzyme(src)
- new /obj/item/reagent_containers/food/condiment/pack/hotsauce(src)
+ new /obj/item/reagent_containers/condiment/soysauce(src)
+ new /obj/item/reagent_containers/condiment/enzyme(src)
+ new /obj/item/reagent_containers/condiment/pack/hotsauce(src)
new /obj/item/kitchen/knife/butcher(src)
var/list/reagent_list = list("msg", "triple_citrus", "salglu_solution", "nutriment", "gravy", "honey", "vitfro")
for(var/reag in reagent_list)
@@ -490,8 +490,8 @@
desc = "Drymate brand monkey cubes. Just add water!"
icon_state = "monkey_box"
storage_slots = 7
- can_hold = list(/obj/item/reagent_containers/food/snacks/monkeycube)
- var/monkey_cube_type = /obj/item/reagent_containers/food/snacks/monkeycube
+ can_hold = list(/obj/item/food/snacks/monkeycube)
+ var/monkey_cube_type = /obj/item/food/snacks/monkeycube
/obj/item/storage/box/monkeycubes/populate_contents()
for(var/I in 1 to 5)
@@ -499,31 +499,31 @@
/obj/item/storage/box/monkeycubes/syndicate
desc = "Waffle Co. brand monkey cubes. Just add water and a dash of subterfuge!"
- monkey_cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/syndicate
+ monkey_cube_type = /obj/item/food/snacks/monkeycube/syndicate
/obj/item/storage/box/monkeycubes/farwacubes
name = "farwa cube box"
desc = "Drymate brand farwa cubes. Just add water!"
icon_state = "farwa_box"
- monkey_cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/farwacube
+ monkey_cube_type = /obj/item/food/snacks/monkeycube/farwacube
/obj/item/storage/box/monkeycubes/stokcubes
name = "stok cube box"
desc = "Drymate brand stok cubes. Just add water!"
icon_state = "stok_box"
- monkey_cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/stokcube
+ monkey_cube_type = /obj/item/food/snacks/monkeycube/stokcube
/obj/item/storage/box/monkeycubes/neaeracubes
name = "neaera cube box"
desc = "Drymate brand neaera cubes. Just add water!"
icon_state = "neaera_box"
- monkey_cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/neaeracube
+ monkey_cube_type = /obj/item/food/snacks/monkeycube/neaeracube
/obj/item/storage/box/monkeycubes/wolpincubes
name = "wolpin cube box"
desc = "Drymate brand wolpin cubes. Just add water!"
icon_state = "wolpin_box"
- monkey_cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/wolpincube
+ monkey_cube_type = /obj/item/food/snacks/monkeycube/wolpincube
///////////////////
/* Medical Boxes */
@@ -864,14 +864,14 @@
icon_state = "donk_box"
storage_slots = 6
can_hold = list(
- /obj/item/reagent_containers/food/snacks/donkpocket,
- /obj/item/reagent_containers/food/snacks/warmdonkpocket,
- /obj/item/reagent_containers/food/snacks/warmdonkpocket_weak,
- /obj/item/reagent_containers/food/snacks/syndidonkpocket)
+ /obj/item/food/snacks/donkpocket,
+ /obj/item/food/snacks/warmdonkpocket,
+ /obj/item/food/snacks/warmdonkpocket_weak,
+ /obj/item/food/snacks/syndidonkpocket)
/obj/item/storage/box/donkpockets/populate_contents()
for(var/I in 1 to 6)
- new /obj/item/reagent_containers/food/snacks/donkpocket(src)
+ new /obj/item/food/snacks/donkpocket(src)
/obj/item/storage/box/donkpockets/empty/populate_contents()
return
@@ -883,7 +883,7 @@
/obj/item/storage/box/syndidonkpockets/populate_contents()
for(var/I in 1 to 6)
- new /obj/item/reagent_containers/food/snacks/syndidonkpocket(src)
+ new /obj/item/food/snacks/syndidonkpocket(src)
////////////////
/* Misc Boxes */
diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm
index 95bdd28570b..7e4d2106f3b 100644
--- a/code/game/objects/items/weapons/storage/fancy.dm
+++ b/code/game/objects/items/weapons/storage/fancy.dm
@@ -41,7 +41,7 @@
icon_type = "donut"
icon_state = "donutbox"
storage_slots = 6
- can_hold = list(/obj/item/reagent_containers/food/snacks/donut)
+ can_hold = list(/obj/item/food/snacks/donut)
icon_type = "donut"
foldable = /obj/item/stack/sheet/cardboard
foldable_amt = 1
@@ -49,7 +49,7 @@
/obj/item/storage/fancy/donut_box/update_overlays()
. = ..()
for(var/I = 1 to length(contents))
- var/obj/item/reagent_containers/food/snacks/donut/donut = contents[I]
+ var/obj/item/food/snacks/donut/donut = contents[I]
var/icon/new_donut_icon = icon('icons/obj/food/containers.dmi', "[(I - 1)]donut[donut.donut_sprite_type]")
. += new_donut_icon
@@ -58,7 +58,7 @@
/obj/item/storage/fancy/donut_box/populate_contents()
for(var/I in 1 to storage_slots)
- new /obj/item/reagent_containers/food/snacks/donut(src)
+ new /obj/item/food/snacks/donut(src)
update_icon(UPDATE_OVERLAYS)
/obj/item/storage/fancy/donut_box/empty/populate_contents()
@@ -82,11 +82,11 @@
item_state = "eggbox"
name = "egg box"
storage_slots = 12
- can_hold = list(/obj/item/reagent_containers/food/snacks/egg)
+ can_hold = list(/obj/item/food/snacks/egg)
/obj/item/storage/fancy/egg_box/populate_contents()
for(var/I in 1 to storage_slots)
- new /obj/item/reagent_containers/food/snacks/egg(src)
+ new /obj/item/food/snacks/egg(src)
/*
* Candle Box
diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm
index b3c1d30fa90..ec70bb04062 100644
--- a/code/game/objects/items/weapons/storage/uplink_kits.dm
+++ b/code/game/objects/items/weapons/storage/uplink_kits.dm
@@ -68,7 +68,7 @@
/obj/item/storage/box/syndie_kit/emp, // 10TC
/obj/item/clothing/glasses/hud/security/chameleon, // 10TC
/obj/item/encryptionkey/syndicate, // 10TC
- /obj/item/reagent_containers/food/drinks/drinkingglass/alliescocktail, // 0TC
+ /obj/item/reagent_containers/drinks/drinkingglass/alliescocktail, // 0TC
/obj/item/storage/box/syndie_kit/pen_bomb, // 30 TC
/obj/item/CQC_manual) // 13TC
@@ -310,9 +310,9 @@
name = "combat bakery kit"
/obj/item/storage/box/syndie_kit/combat_baking/populate_contents()
- new /obj/item/reagent_containers/food/snacks/baguette/combat(src)
+ new /obj/item/food/snacks/baguette/combat(src)
for(var/i in 1 to 2)
- new /obj/item/reagent_containers/food/snacks/croissant/throwing(src)
+ new /obj/item/food/snacks/croissant/throwing(src)
new /obj/item/book/granter/crafting_recipe/combat_baking(src)
/obj/item/storage/box/syndie_kit/atmosn2ogrenades
diff --git a/code/game/objects/mail.dm b/code/game/objects/mail.dm
index 13f6601ecb7..8da165a7be1 100644
--- a/code/game/objects/mail.dm
+++ b/code/game/objects/mail.dm
@@ -56,13 +56,13 @@
/obj/item/envelope/security
icon_state = "mail_sec"
- possible_contents = list(/obj/item/reagent_containers/food/snacks/donut/sprinkles,
+ possible_contents = list(/obj/item/food/snacks/donut/sprinkles,
/obj/item/megaphone,
/obj/item/clothing/mask/whistle,
/obj/item/poster/random_official,
/obj/item/restraints/handcuffs/pinkcuffs,
/obj/item/restraints/legcuffs/bola/energy,
- /obj/item/reagent_containers/food/drinks/coffee,
+ /obj/item/reagent_containers/drinks/coffee,
/obj/item/stock_parts/cell/super,
/obj/item/grenade/barrier/dropwall,
/obj/item/toy/figure/crew/detective,
@@ -92,7 +92,7 @@
/obj/item/envelope/supply
icon_state = "mail_sup"
possible_contents = list(/obj/item/reagent_containers/hypospray/autoinjector/survival,
- /obj/item/reagent_containers/food/drinks/bottle/absinthe/premium,
+ /obj/item/reagent_containers/drinks/bottle/absinthe/premium,
/obj/item/clothing/glasses/meson/gar,
/obj/item/stack/marker_beacon/ten,
/obj/item/stack/medical/splint,
@@ -113,7 +113,7 @@
/obj/item/reagent_containers/applicator/brute,
/obj/item/reagent_containers/applicator/burn,
/obj/item/clothing/glasses/sunglasses,
- /obj/item/reagent_containers/food/snacks/fortunecookie,
+ /obj/item/food/snacks/fortunecookie,
/obj/item/scalpel/laser/laser1,
/obj/item/toy/figure/crew/cmo,
/obj/item/toy/figure/crew/chemist,
@@ -126,8 +126,8 @@
/obj/item/envelope/engineering
icon_state = "mail_eng"
possible_contents = list(/obj/item/airlock_electronics,
- /obj/item/reagent_containers/food/drinks/cans/beer,
- /obj/item/reagent_containers/food/snacks/candy/confectionery/nougat,
+ /obj/item/reagent_containers/drinks/cans/beer,
+ /obj/item/food/snacks/candy/confectionery/nougat,
/obj/item/mod/module/storage/large_capacity,
/obj/item/weldingtool/hugetank,
/obj/item/geiger_counter,
@@ -143,7 +143,7 @@
icon_state = "mail_serv"
possible_contents = list(/obj/item/painter,
/obj/item/gun/energy/floragun,
- /obj/item/reagent_containers/food/drinks/bottle/fernet,
+ /obj/item/reagent_containers/drinks/bottle/fernet,
/obj/item/whetstone,
/obj/item/soap/deluxe,
/obj/item/stack/tile/disco_light/thirty,
@@ -162,7 +162,7 @@
possible_contents = list(/obj/item/painter,
/obj/item/stack/sheet/mineral/tranquillite/ten,
/obj/item/stack/sheet/mineral/bananium/ten,
- /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing,
+ /obj/item/reagent_containers/drinks/bottle/bottleofnothing,
/obj/item/gun/throw/piecannon,
/obj/item/ammo_box/shotgun/confetti,
/obj/item/book/manual/wiki/sop_security, // They'll need this.
@@ -183,7 +183,7 @@
/obj/item/book/manual/wiki/sop_command,
/obj/item/reagent_containers/patch/synthflesh,
/obj/item/paper_bin/nanotrasen,
- /obj/item/reagent_containers/food/snacks/spesslaw,
+ /obj/item/food/snacks/spesslaw,
/obj/item/clothing/head/collectable/petehat,
/obj/item/toy/figure/crew/captain,
/obj/item/toy/figure/crew/lawyer,
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
index d27a430d7e9..0cf7d24743a 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
@@ -11,13 +11,13 @@
close_sound_volume = 50
/obj/structure/closet/secure_closet/bar/populate_contents()
- new /obj/item/reagent_containers/food/drinks/cans/beer(src)
- new /obj/item/reagent_containers/food/drinks/cans/beer(src)
- new /obj/item/reagent_containers/food/drinks/cans/beer(src)
- new /obj/item/reagent_containers/food/drinks/cans/beer(src)
- new /obj/item/reagent_containers/food/drinks/cans/beer(src)
- new /obj/item/reagent_containers/food/drinks/cans/beer(src)
- new /obj/item/reagent_containers/food/drinks/cans/beer(src)
- new /obj/item/reagent_containers/food/drinks/cans/beer(src)
- new /obj/item/reagent_containers/food/drinks/cans/beer(src)
- new /obj/item/reagent_containers/food/drinks/cans/beer(src)
+ new /obj/item/reagent_containers/drinks/cans/beer(src)
+ new /obj/item/reagent_containers/drinks/cans/beer(src)
+ new /obj/item/reagent_containers/drinks/cans/beer(src)
+ new /obj/item/reagent_containers/drinks/cans/beer(src)
+ new /obj/item/reagent_containers/drinks/cans/beer(src)
+ new /obj/item/reagent_containers/drinks/cans/beer(src)
+ new /obj/item/reagent_containers/drinks/cans/beer(src)
+ new /obj/item/reagent_containers/drinks/cans/beer(src)
+ new /obj/item/reagent_containers/drinks/cans/beer(src)
+ new /obj/item/reagent_containers/drinks/cans/beer(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm
index 7938db08302..23e43d86390 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm
@@ -27,7 +27,7 @@
new /obj/item/clothing/accessory/medal/supply(src)
new /obj/item/rcs(src)
new /obj/item/destTagger(src)
- new /obj/item/reagent_containers/food/drinks/mug/qm(src)
+ new /obj/item/reagent_containers/drinks/mug/qm(src)
new /obj/item/flash(src)
new /obj/item/cartridge/qm(src)
new /obj/item/storage/bag/mail(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering_lockers.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering_lockers.dm
index 7794cdbbc10..641f75e6262 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/engineering_lockers.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering_lockers.dm
@@ -24,7 +24,7 @@
new /obj/item/clothing/glasses/meson/engine(src)
new /obj/item/door_remote/chief_engineer(src)
new /obj/item/rpd(src)
- new /obj/item/reagent_containers/food/drinks/mug/ce(src)
+ new /obj/item/reagent_containers/drinks/mug/ce(src)
new /obj/item/organ/internal/eyes/cybernetic/meson(src)
new /obj/item/clothing/accessory/medal/engineering(src)
new /obj/item/holosign_creator/atmos(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
index a4a2f4a7708..e678e495210 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
@@ -15,9 +15,9 @@
/obj/structure/closet/secure_closet/freezer/kitchen/populate_contents()
for(var/i in 1 to 3)
- new /obj/item/reagent_containers/food/condiment/flour(src)
- new /obj/item/reagent_containers/food/condiment/rice(src)
- new /obj/item/reagent_containers/food/condiment/sugar(src)
+ new /obj/item/reagent_containers/condiment/flour(src)
+ new /obj/item/reagent_containers/condiment/rice(src)
+ new /obj/item/reagent_containers/condiment/sugar(src)
/obj/structure/closet/secure_closet/freezer/kitchen/mining
@@ -30,9 +30,9 @@
/obj/structure/closet/secure_closet/freezer/kitchen/maintenance/populate_contents()
for(var/i = 0, i < 5, i++)
- new /obj/item/reagent_containers/food/condiment/milk(src)
+ new /obj/item/reagent_containers/condiment/milk(src)
for(var/i = 0, i < 5, i++)
- new /obj/item/reagent_containers/food/condiment/soymilk(src)
+ new /obj/item/reagent_containers/condiment/soymilk(src)
for(var/i = 0, i < 2, i++)
new /obj/item/storage/fancy/egg_box(src)
@@ -43,7 +43,7 @@
/obj/structure/closet/secure_closet/freezer/meat/populate_contents()
for(var/i in 1 to 4)
- new /obj/item/reagent_containers/food/snacks/meat/monkey(src)
+ new /obj/item/food/snacks/meat/monkey(src)
/obj/structure/closet/secure_closet/freezer/meat/open
req_access = null
@@ -56,8 +56,8 @@
/obj/structure/closet/secure_closet/freezer/fridge/populate_contents()
for(var/i in 1 to 5)
- new /obj/item/reagent_containers/food/condiment/milk(src)
- new /obj/item/reagent_containers/food/condiment/soymilk(src)
+ new /obj/item/reagent_containers/condiment/milk(src)
+ new /obj/item/reagent_containers/condiment/soymilk(src)
for(var/i in 1 to 2)
new /obj/item/storage/fancy/egg_box(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical_lockers.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical_lockers.dm
index 7ef37f41ed3..9a0f455f0d4 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical_lockers.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical_lockers.dm
@@ -135,7 +135,7 @@
new /obj/item/storage/pill_bottle/psychiatrist(src)
new /obj/random/plushie(src)
for(var/i in 0 to 3)
- var/candy = pick(subtypesof(/obj/item/reagent_containers/food/snacks/candy/fudge))
+ var/candy = pick(subtypesof(/obj/item/food/snacks/candy/fudge))
new candy(src)
/obj/structure/closet/secure_closet/CMO
@@ -163,7 +163,7 @@
new /obj/item/reagent_containers/hypospray/CMO(src)
new /obj/item/organ/internal/cyberimp/eyes/hud/medical(src)
new /obj/item/door_remote/chief_medical_officer(src)
- new /obj/item/reagent_containers/food/drinks/mug/cmo(src)
+ new /obj/item/reagent_containers/drinks/mug/cmo(src)
new /obj/item/clothing/accessory/medal/medical(src)
new /obj/item/storage/briefcase(src)
new /obj/item/clothing/mask/gas(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm b/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm
index fc7bafad01d..ee2c5e262ea 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm
@@ -17,7 +17,7 @@
new /obj/item/clown_recorder(src)
new /obj/item/bikehorn(src)
new /obj/item/reagent_containers/spray/waterflower(src)
- new /obj/item/reagent_containers/food/drinks/bottle/bottleofbanana(src)
+ new /obj/item/reagent_containers/drinks/bottle/bottleofbanana(src)
new /obj/item/toy/crayon/rainbow(src)
new /obj/item/seeds/banana(src)
new /obj/item/restraints/handcuffs/toy(src)
@@ -44,7 +44,7 @@
new /obj/item/clothing/shoes/black(src)
new /obj/item/storage/backpack/mime(src)
new /obj/item/toy/crayon/mime(src)
- new /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing(src)
+ new /obj/item/reagent_containers/drinks/bottle/bottleofnothing(src)
new /obj/item/cane(src)
/obj/structure/closet/secure_closet/syndicate_officer
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
index 73f75df0569..85cf3434504 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
@@ -57,7 +57,7 @@
new /obj/item/flash(src)
new /obj/item/laser_pointer(src)
new /obj/item/door_remote/research_director(src)
- new /obj/item/reagent_containers/food/drinks/mug/rd(src)
+ new /obj/item/reagent_containers/drinks/mug/rd(src)
new /obj/item/organ/internal/cyberimp/eyes/hud/diagnostic(src)
new /obj/item/clothing/accessory/medal/science(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm b/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm
index ebda73462c8..d341e859856 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm
@@ -18,7 +18,7 @@
new /obj/item/gun/energy/gun(src)
new /obj/item/flash(src)
new /obj/item/door_remote/captain(src)
- new /obj/item/reagent_containers/food/drinks/mug/cap(src)
+ new /obj/item/reagent_containers/drinks/mug/cap(src)
new /obj/item/tank/internals/emergency_oxygen/double(src)
/obj/structure/closet/secure_closet/hop
@@ -35,7 +35,7 @@
new /obj/item/gun/energy/gun/mini(src)
new /obj/item/flash(src)
new /obj/item/door_remote/civillian(src)
- new /obj/item/reagent_containers/food/drinks/mug/hop(src)
+ new /obj/item/reagent_containers/drinks/mug/hop(src)
new /obj/item/clothing/accessory/medal/service(src)
new /obj/item/storage/bag/garment/head_of_personnel(src)
@@ -62,10 +62,10 @@
new /obj/item/storage/belt/security/full(src)
new /obj/item/gun/energy/gun/hos(src)
new /obj/item/door_remote/head_of_security(src)
- new /obj/item/reagent_containers/food/drinks/mug/hos(src)
+ new /obj/item/reagent_containers/drinks/mug/hos(src)
new /obj/item/organ/internal/cyberimp/eyes/hud/security(src)
new /obj/item/clothing/accessory/medal/security(src)
- new /obj/item/reagent_containers/food/drinks/flask/barflask(src)
+ new /obj/item/reagent_containers/drinks/flask/barflask(src)
new /obj/item/clothing/mask/gas/sechailer(src)
/obj/structure/closet/secure_closet/warden
diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm
index c7310b9141d..ef49a478bb2 100644
--- a/code/game/objects/structures/statues.dm
+++ b/code/game/objects/structures/statues.dm
@@ -332,7 +332,7 @@
desc = "Just like the ones you remember from childhood!"
/obj/structure/snowman/built/Destroy()
- new /obj/item/reagent_containers/food/snacks/grown/carrot(drop_location())
+ new /obj/item/food/snacks/grown/carrot(drop_location())
new /obj/item/grown/log(drop_location())
new /obj/item/grown/log(drop_location())
return ..()
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 75214461abf..56f63a57e17 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1786,10 +1786,10 @@
to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
return
- H.equip_to_slot_or_del( new /obj/item/reagent_containers/food/snacks/cookie(H), SLOT_HUD_LEFT_HAND )
- if(!(istype(H.l_hand,/obj/item/reagent_containers/food/snacks/cookie)))
- H.equip_to_slot_or_del( new /obj/item/reagent_containers/food/snacks/cookie(H), SLOT_HUD_RIGHT_HAND )
- if(!(istype(H.r_hand,/obj/item/reagent_containers/food/snacks/cookie)))
+ H.equip_to_slot_or_del( new /obj/item/food/snacks/cookie(H), SLOT_HUD_LEFT_HAND )
+ if(!(istype(H.l_hand,/obj/item/food/snacks/cookie)))
+ H.equip_to_slot_or_del( new /obj/item/food/snacks/cookie(H), SLOT_HUD_RIGHT_HAND )
+ if(!(istype(H.r_hand,/obj/item/food/snacks/cookie)))
log_admin("[key_name(H)] has their hands full, so they did not receive their cookie, spawned by [key_name(src.owner)].")
message_admins("[key_name_admin(H)] has [H.p_their()] hands full, so [H.p_they()] did not receive [H.p_their()] cookie, spawned by [key_name_admin(src.owner)].")
return
@@ -2119,7 +2119,7 @@
ADD_TRAIT(H, TRAIT_BADDNA, "smiting")
logmsg = "cluwned."
if("Mutagen Cookie")
- var/obj/item/reagent_containers/food/snacks/cookie/evilcookie = new /obj/item/reagent_containers/food/snacks/cookie
+ var/obj/item/food/snacks/cookie/evilcookie = new /obj/item/food/snacks/cookie
evilcookie.reagents.add_reagent("mutagen", 10)
evilcookie.desc = "It has a faint green glow."
evilcookie.bitesize = 100
@@ -2128,7 +2128,7 @@
H.equip_to_slot_or_del(evilcookie, SLOT_HUD_LEFT_HAND)
logmsg = "a mutagen cookie."
if("Hellwater Cookie")
- var/obj/item/reagent_containers/food/snacks/cookie/evilcookie = new /obj/item/reagent_containers/food/snacks/cookie
+ var/obj/item/food/snacks/cookie/evilcookie = new /obj/item/food/snacks/cookie
evilcookie.reagents.add_reagent("hell_water", 25)
evilcookie.desc = "Sulphur-flavored."
evilcookie.bitesize = 100
@@ -2192,7 +2192,7 @@
if("Bread")
var/mob/living/simple_animal/shade/sword/bread/breadshade = new(H.loc)
- var/bready = pick(/obj/item/reagent_containers/food/snacks/customizable/cook/bread, /obj/item/reagent_containers/food/snacks/sliceable/meatbread, /obj/item/reagent_containers/food/snacks/sliceable/xenomeatbread, /obj/item/reagent_containers/food/snacks/sliceable/spidermeatbread, /obj/item/reagent_containers/food/snacks/sliceable/bananabread, /obj/item/reagent_containers/food/snacks/sliceable/tofubread, /obj/item/reagent_containers/food/snacks/sliceable/bread, /obj/item/reagent_containers/food/snacks/sliceable/creamcheesebread, /obj/item/reagent_containers/food/snacks/sliceable/banarnarbread, /obj/item/reagent_containers/food/snacks/flatbread, /obj/item/reagent_containers/food/snacks/baguette)
+ var/bready = pick(/obj/item/food/snacks/customizable/cook/bread, /obj/item/food/snacks/sliceable/meatbread, /obj/item/food/snacks/sliceable/xenomeatbread, /obj/item/food/snacks/sliceable/spidermeatbread, /obj/item/food/snacks/sliceable/bananabread, /obj/item/food/snacks/sliceable/tofubread, /obj/item/food/snacks/sliceable/bread, /obj/item/food/snacks/sliceable/creamcheesebread, /obj/item/food/snacks/sliceable/banarnarbread, /obj/item/food/snacks/flatbread, /obj/item/food/snacks/baguette)
var/obj/item/bread = new bready(get_turf(H))
breadshade.forceMove(bread)
breadshade.key = H.key
diff --git a/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm b/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm
index 82d4ca3ea70..19bf47f722d 100644
--- a/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm
+++ b/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm
@@ -23,8 +23,8 @@
/obj/item/clothing/under/syndicate/tacticool,
/obj/item/coin/antagtoken/syndicate,
/obj/item/poster/syndicate_recruitment,
- /obj/item/reagent_containers/food/snacks/syndicake,
- /obj/item/reagent_containers/food/snacks/tatortot,
+ /obj/item/food/snacks/syndicake,
+ /obj/item/food/snacks/tatortot,
/obj/item/storage/box/fakesyndiesuit,
/obj/item/storage/fancy/cigarettes/cigpack_syndicate,
/obj/item/toy/figure/crew/syndie,
@@ -422,7 +422,7 @@
M.update_icons()
// Supply them with some chow. How generous is the Syndicate?
- var/obj/item/reagent_containers/food/snacks/breadslice/food = new(get_turf(M))
+ var/obj/item/food/snacks/breadslice/food = new(get_turf(M))
food.name = "stale bread"
food.desc = "Looks like your captors care for their prisoners as much as their bread."
food.trash = null
@@ -432,7 +432,7 @@
food.name = "moldy bread"
food.reagents.add_reagent("fungus", 1)
- var/obj/item/reagent_containers/food/drinks/drinkingglass/drink = new(get_turf(M))
+ var/obj/item/reagent_containers/drinks/drinkingglass/drink = new(get_turf(M))
drink.reagents.add_reagent("tea", 25) // British coders beware, tea in glasses
var/obj/item/coin/antagtoken/passingtime = new(get_turf(M))
diff --git a/code/modules/awaymissions/mission_code/ruins/watcher_grave.dm b/code/modules/awaymissions/mission_code/ruins/watcher_grave.dm
index 003c2b2da8d..1bfb0792373 100644
--- a/code/modules/awaymissions/mission_code/ruins/watcher_grave.dm
+++ b/code/modules/awaymissions/mission_code/ruins/watcher_grave.dm
@@ -16,7 +16,7 @@
#define WATCHER_EGG_ACTIVE_MOD 0.5
/// Egg which hatches into a helpful pet. Or you can eat it if you want.
-/obj/item/reagent_containers/food/snacks/egg/watcher
+/obj/item/food/snacks/egg/watcher
name = "watcher egg"
desc = "A lonely egg still pulsing with life, somehow untouched by the corruption of the Necropolis."
icon_state = "egg_watcher"
@@ -30,15 +30,15 @@
/// Datum used to measure our steps
var/datum/movement_detector/pedometer
-/obj/item/reagent_containers/food/snacks/egg/watcher/Initialize(mapload)
+/obj/item/food/snacks/egg/watcher/Initialize(mapload)
. = ..()
pedometer = new(src, CALLBACK(src, PROC_REF(on_stepped)))
-/obj/item/reagent_containers/food/snacks/egg/watcher/Destroy(force)
+/obj/item/food/snacks/egg/watcher/Destroy(force)
. = ..()
QDEL_NULL(pedometer)
-/obj/item/reagent_containers/food/snacks/egg/watcher/examine(mob/user)
+/obj/item/food/snacks/egg/watcher/examine(mob/user)
. = ..()
if(steps_travelled < (steps_to_hatch * WATCHER_EGG_ACTIVE_MOD))
. += "Something stirs listlessly inside."
@@ -50,7 +50,7 @@
/// Called when we are moved, whether inside an inventory or by ourself somehow
-/obj/item/reagent_containers/food/snacks/egg/watcher/proc/on_stepped(atom/movable/egg, atom/mover, atom/old_loc, direction)
+/obj/item/food/snacks/egg/watcher/proc/on_stepped(atom/movable/egg, atom/mover, atom/old_loc, direction)
var/new_loc = get_turf(egg)
if(isnull(new_loc) || new_loc == get_turf(old_loc))
return // Didn't actually go anywhere
@@ -67,7 +67,7 @@
qdel(src)
/// Animate the egg
-/obj/item/reagent_containers/food/snacks/egg/watcher/proc/jiggle()
+/obj/item/food/snacks/egg/watcher/proc/jiggle()
var/animation = isturf(loc) ? rand(1, 3) : 1 // Pixel_x/y animations don't work in an inventory
switch(animation)
if(1)
diff --git a/code/modules/client/preference/loadout/loadout_general.dm b/code/modules/client/preference/loadout/loadout_general.dm
index 4def22c447b..2549eff6d9c 100644
--- a/code/modules/client/preference/loadout/loadout_general.dm
+++ b/code/modules/client/preference/loadout/loadout_general.dm
@@ -174,20 +174,20 @@
/datum/gear/mug
display_name = "Coffee mug, random"
description = "A randomly colored coffee mug. You'll need to supply your own beverage though."
- path = /obj/item/reagent_containers/food/drinks/mug
+ path = /obj/item/reagent_containers/drinks/mug
sort_category = "Mugs"
/datum/gear/novelty_mug
display_name = "Coffee mug, novelty"
description = "A random novelty coffee mug. You'll need to supply your own beverage though."
- path = /obj/item/reagent_containers/food/drinks/mug/novelty
+ path = /obj/item/reagent_containers/drinks/mug/novelty
cost = 2
sort_category = "Mugs"
/datum/gear/mug/flask
display_name = "Flask"
description = "A flask for drink transportation. You'll need to supply your own beverage though."
- path = /obj/item/reagent_containers/food/drinks/flask/barflask
+ path = /obj/item/reagent_containers/drinks/flask/barflask
/datum/gear/mug/department
main_typepath = /datum/gear/mug/department
@@ -198,30 +198,30 @@
display_name = "Coffee mug, engineering"
description = "An engineer's coffee mug, emblazoned in the colors of the Engineering department."
allowed_roles = list("Chief Engineer", "Station Engineer", "Life Support Specialist")
- path = /obj/item/reagent_containers/food/drinks/mug/eng
+ path = /obj/item/reagent_containers/drinks/mug/eng
/datum/gear/mug/department/med
display_name = "Coffee mug, medical"
description = "A doctor's coffee mug, emblazoned in the colors of the Medical department."
allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Psychiatrist", "Paramedic", "Virologist", "Coroner")
- path = /obj/item/reagent_containers/food/drinks/mug/med
+ path = /obj/item/reagent_containers/drinks/mug/med
/datum/gear/mug/department/sci
display_name = "Coffee mug, science"
description = "A scientist's coffee mug, emblazoned in the colors of the Science department."
allowed_roles = list("Research Director", "Scientist", "Roboticist")
- path = /obj/item/reagent_containers/food/drinks/mug/sci
+ path = /obj/item/reagent_containers/drinks/mug/sci
/datum/gear/mug/department/sec
display_name = "Coffee mug, security"
description = "An officer's coffee mug, emblazoned in the colors of the Security department."
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Internal Affairs Agent")
- path = /obj/item/reagent_containers/food/drinks/mug/sec
+ path = /obj/item/reagent_containers/drinks/mug/sec
/datum/gear/mug/department/serv
display_name = "Coffee mug, service"
description = "A crewmember's coffee mug, emblazoned in the colors of the Service department."
- path = /obj/item/reagent_containers/food/drinks/mug/serv
+ path = /obj/item/reagent_containers/drinks/mug/serv
//////////////////////
diff --git a/code/modules/clothing/head/job_hats.dm b/code/modules/clothing/head/job_hats.dm
index 3641624520c..94d268d4110 100644
--- a/code/modules/clothing/head/job_hats.dm
+++ b/code/modules/clothing/head/job_hats.dm
@@ -120,7 +120,7 @@
name = "hat"
desc = "Someone who wears this will look very smart."
icon_state = "detective"
- allowed = list(/obj/item/reagent_containers/food/snacks/candy/candy_corn, /obj/item/pen)
+ allowed = list(/obj/item/food/snacks/candy/candy_corn, /obj/item/pen)
armor = list(MELEE = 15, BULLET = 5, LASER = 15, ENERGY = 5, BOMB = 0, RAD = 0, FIRE = 20, ACID = 50)
dog_fashion = /datum/dog_fashion/head/detective
diff --git a/code/modules/clothing/suits/armor_suits.dm b/code/modules/clothing/suits/armor_suits.dm
index 846b5d033e9..47c2b602ff7 100644
--- a/code/modules/clothing/suits/armor_suits.dm
+++ b/code/modules/clothing/suits/armor_suits.dm
@@ -190,7 +190,7 @@
armor = list(MELEE = 50, BULLET = 35, LASER = 50, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = INFINITY, ACID = 450)
dog_fashion = null
resistance_flags = FIRE_PROOF
- allowed = list(/obj/item/disk, /obj/item/stamp, /obj/item/reagent_containers/food/drinks/flask, /obj/item/melee, /obj/item/storage/lockbox/medal, /obj/item/flash, /obj/item/storage/fancy/matches, /obj/item/lighter, /obj/item/clothing/mask/cigarette, /obj/item/storage/fancy/cigarettes, /obj/item/tank/internals/emergency_oxygen, /obj/item/gun/energy, /obj/item/gun/projectile)
+ allowed = list(/obj/item/disk, /obj/item/stamp, /obj/item/reagent_containers/drinks/flask, /obj/item/melee, /obj/item/storage/lockbox/medal, /obj/item/flash, /obj/item/storage/fancy/matches, /obj/item/lighter, /obj/item/clothing/mask/cigarette, /obj/item/storage/fancy/cigarettes, /obj/item/tank/internals/emergency_oxygen, /obj/item/gun/energy, /obj/item/gun/projectile)
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
diff --git a/code/modules/clothing/suits/job_suits.dm b/code/modules/clothing/suits/job_suits.dm
index 4b3232679f5..db2fcc1981d 100644
--- a/code/modules/clothing/suits/job_suits.dm
+++ b/code/modules/clothing/suits/job_suits.dm
@@ -44,7 +44,7 @@
item_state = "chaplain_hoodie"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
hoodtype = /obj/item/clothing/head/hooded/chaplain_hood
- allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
+ allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
@@ -59,7 +59,7 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS
flags_inv = HIDESHOES|HIDEJUMPSUIT
hoodtype = /obj/item/clothing/head/hooded/nun_hood
- allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
+ allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
@@ -74,7 +74,7 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS
flags_inv = HIDESHOES|HIDEJUMPSUIT
hoodtype = /obj/item/clothing/head/hooded/monk_hood
- allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
+ allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
/obj/item/clothing/suit/witchhunter
name = "witchhunter garb"
@@ -82,7 +82,7 @@
icon_state = "witchhunter"
item_state = "witchhunter"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
- allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
+ allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
//Chef
diff --git a/code/modules/clothing/suits/misc_suits.dm b/code/modules/clothing/suits/misc_suits.dm
index bfa4b04a399..d24cb224559 100644
--- a/code/modules/clothing/suits/misc_suits.dm
+++ b/code/modules/clothing/suits/misc_suits.dm
@@ -153,7 +153,7 @@
item_state = "imperium_monk"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
flags_inv = HIDESHOES|HIDEJUMPSUIT
- allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
+ allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
/obj/item/clothing/suit/chickensuit
name = "chicken suit"
@@ -220,7 +220,7 @@
item_state = "holidaypriest"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
flags_inv = HIDEJUMPSUIT
- allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
+ allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
/obj/item/clothing/suit/cardborg
name = "cardborg suit"
@@ -1261,7 +1261,7 @@
icon_state = "abaya"
item_state = "abaya"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
- allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
+ allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
hoodtype = /obj/item/clothing/head/hooded/screened_niqab
flags_inv = HIDEJUMPSUIT
var/list/options = list(
diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm
index 5ac0d342449..4e9df5d3961 100644
--- a/code/modules/crafting/recipes.dm
+++ b/code/modules/crafting/recipes.dm
@@ -31,19 +31,19 @@
reqs = list(/datum/reagent/fuel = 50,
/obj/item/stack/cable_coil = 1,
/obj/item/assembly/igniter = 1,
- /obj/item/reagent_containers/food/drinks/cans = 1)
- parts = list(/obj/item/reagent_containers/food/drinks/cans = 1)
+ /obj/item/reagent_containers/drinks/cans = 1)
+ parts = list(/obj/item/reagent_containers/drinks/cans = 1)
time = 15
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
/datum/crafting_recipe/molotov
name = "Molotov"
- result = list(/obj/item/reagent_containers/food/drinks/bottle/molotov)
+ result = list(/obj/item/reagent_containers/drinks/bottle/molotov)
reqs = list(/obj/item/reagent_containers/glass/rag = 1,
- /obj/item/reagent_containers/food/drinks/bottle = 1)
- blacklist = list(/obj/item/reagent_containers/food/drinks/bottle/molotov)
- parts = list(/obj/item/reagent_containers/food/drinks/bottle = 1)
+ /obj/item/reagent_containers/drinks/bottle = 1)
+ blacklist = list(/obj/item/reagent_containers/drinks/bottle/molotov)
+ parts = list(/obj/item/reagent_containers/drinks/bottle = 1)
time = 40
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
@@ -91,10 +91,10 @@
/datum/crafting_recipe/throwing_croissant
name = "Throwing croissant"
reqs = list(
- /obj/item/reagent_containers/food/snacks/croissant = 1,
+ /obj/item/food/snacks/croissant = 1,
/obj/item/stack/rods = 1
)
- result = list(/obj/item/reagent_containers/food/snacks/croissant/throwing)
+ result = list(/obj/item/food/snacks/croissant/throwing)
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
always_available = FALSE
@@ -888,7 +888,7 @@
name = "Snowman"
result = list(/obj/structure/snowman/built)
reqs = list(/obj/item/snowball = 10,
- /obj/item/reagent_containers/food/snacks/grown/carrot = 1,
+ /obj/item/food/snacks/grown/carrot = 1,
/obj/item/grown/log = 2)
time = 50
category = CAT_MISC
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index cc753c4d261..26592194f5d 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -269,9 +269,9 @@
storage_slots = 3
/obj/item/storage/toolbox/fluff/lunchbox/populate_contents()
- new /obj/item/reagent_containers/food/snacks/sandwich(src)
- new /obj/item/reagent_containers/food/snacks/chips(src)
- new /obj/item/reagent_containers/food/drinks/cans/cola(src)
+ new /obj/item/food/snacks/sandwich(src)
+ new /obj/item/food/snacks/chips(src)
+ new /obj/item/reagent_containers/drinks/cans/cola(src)
/obj/item/fluff/wingler_comb
diff --git a/code/modules/events/meaty_ores.dm b/code/modules/events/meaty_ores.dm
index 76d7fac990e..751f8dbe334 100644
--- a/code/modules/events/meaty_ores.dm
+++ b/code/modules/events/meaty_ores.dm
@@ -32,7 +32,7 @@
if(prob(80))
gibs(where)
if(prob(45))
- new /obj/item/reagent_containers/food/snacks/meat(where)
+ new /obj/item/food/snacks/meat(where)
else if(prob(10))
explosion(where, 0, pick(0,1), pick(2,3), 0)
else
diff --git a/code/modules/fish/fish_items.dm b/code/modules/fish/fish_items.dm
index 758a36ebb1a..707eb46ca9c 100644
--- a/code/modules/fish/fish_items.dm
+++ b/code/modules/fish/fish_items.dm
@@ -66,7 +66,7 @@
can_hold = list(
/obj/item/fish,
/obj/item/fish_eggs,
- /obj/item/reagent_containers/food/snacks/shrimp,
+ /obj/item/food/snacks/shrimp,
)
resistance_flags = FLAMMABLE
@@ -74,7 +74,7 @@
// Fish Items //
//////////////////////////////////////////////
-/obj/item/reagent_containers/food/snacks/shrimp
+/obj/item/food/snacks/shrimp
name = "shrimp"
desc = "A single raw shrimp."
icon = 'icons/obj/food/seafood.dmi'
@@ -82,12 +82,12 @@
filling_color = "#FF1C1C"
bitesize = 1
-/obj/item/reagent_containers/food/snacks/shrimp/Initialize(mapload)
+/obj/item/food/snacks/shrimp/Initialize(mapload)
. = ..()
desc = pick("Anyway, like I was sayin', shrimp is the fruit of the sea.", "You can barbecue it, boil it, broil it, bake it, saute it.")
reagents.add_reagent("protein", 1)
-/obj/item/reagent_containers/food/snacks/feederfish
+/obj/item/food/snacks/feederfish
name = "feeder fish"
desc = "A tiny feeder fish. Sure doesn't look very filling..."
icon = 'icons/obj/food/seafood.dmi'
@@ -95,7 +95,7 @@
filling_color = "#FF1C1C"
bitesize = 1
-/obj/item/reagent_containers/food/snacks/feederfish/Initialize(mapload)
+/obj/item/food/snacks/feederfish/Initialize(mapload)
. = ..()
reagents.add_reagent("protein", 1)
@@ -170,8 +170,8 @@
/obj/item/fish/catfish/attackby(obj/item/O, mob/user as mob)
if(is_sharp(O))
to_chat(user, "You carefully clean and gut \the [src.name].")
- new /obj/item/reagent_containers/food/snacks/catfishmeat(get_turf(src))
- new /obj/item/reagent_containers/food/snacks/catfishmeat(get_turf(src))
+ new /obj/item/food/snacks/catfishmeat(get_turf(src))
+ new /obj/item/food/snacks/catfishmeat(get_turf(src))
qdel(src)
return
..()
@@ -189,8 +189,8 @@
/obj/item/fish/salmon/attackby(obj/item/O, mob/user as mob)
if(is_sharp(O))
to_chat(user, "You carefully clean and gut \the [src.name].")
- new /obj/item/reagent_containers/food/snacks/salmonmeat(get_turf(src))
- new /obj/item/reagent_containers/food/snacks/salmonmeat(get_turf(src))
+ new /obj/item/food/snacks/salmonmeat(get_turf(src))
+ new /obj/item/food/snacks/salmonmeat(get_turf(src))
qdel(src)
return
..()
@@ -205,7 +205,7 @@
/obj/item/fish/babycarp/attackby(obj/item/O, mob/user as mob)
if(is_sharp(O))
to_chat(user, "You carefully clean and gut \the [src.name].")
- new /obj/item/reagent_containers/food/snacks/carpmeat(get_turf(src)) //just one fillet; this is a baby, afterall.
+ new /obj/item/food/snacks/carpmeat(get_turf(src)) //just one fillet; this is a baby, afterall.
qdel(src)
return
..()
diff --git a/code/modules/fish/fish_types.dm b/code/modules/fish/fish_types.dm
index f7c2e6659cc..f90cda4efc9 100644
--- a/code/modules/fish/fish_types.dm
+++ b/code/modules/fish/fish_types.dm
@@ -52,13 +52,13 @@
/datum/fish/shrimp
fish_name = "shrimp"
egg_item = /obj/item/fish_eggs/shrimp
- fish_item = /obj/item/reagent_containers/food/snacks/shrimp
+ fish_item = /obj/item/food/snacks/shrimp
crossbreeder = 0
/datum/fish/feederfish
fish_name = "feeder fish"
egg_item = /obj/item/fish_eggs/feederfish
- fish_item = /obj/item/reagent_containers/food/snacks/feederfish
+ fish_item = /obj/item/food/snacks/feederfish
/datum/fish/feederfish/special_interact(obj/machinery/fishtank/my_tank)
if(!my_tank || !istype(my_tank))
diff --git a/code/modules/food_and_drinks/drinks/bottler/bottler.dm b/code/modules/food_and_drinks/drinks/bottler/bottler.dm
index 10f1065f444..60672679bea 100644
--- a/code/modules/food_and_drinks/drinks/bottler/bottler.dm
+++ b/code/modules/food_and_drinks/drinks/bottler/bottler.dm
@@ -28,8 +28,8 @@
available_recipes = list()
acceptable_items = list()
//These are going to be acceptable even if they aren't in a recipe
- acceptable_items |= /obj/item/reagent_containers/food/snacks
- acceptable_items |= /obj/item/reagent_containers/food/drinks/cans
+ acceptable_items |= /obj/item/food/snacks
+ acceptable_items |= /obj/item/reagent_containers/drinks/cans
//the rest is based on what is used in recipes so we don't have people destroying the nuke disc
for(var/type in subtypesof(/datum/bottler_recipe))
var/datum/bottler_recipe/recipe = new type
@@ -45,8 +45,8 @@
to_chat(user, "[O] is stuck to your hand, you can't seem to put it down!")
return 0
if(is_type_in_list(O,acceptable_items))
- if(istype(O, /obj/item/reagent_containers/food/snacks))
- var/obj/item/reagent_containers/food/snacks/S = O
+ if(istype(O, /obj/item/food/snacks))
+ var/obj/item/food/snacks/S = O
user.unEquip(S)
if(S.reagents && !S.reagents.total_volume) //This prevents us from using empty foods, should one occur due to some sort of error
to_chat(user, "[S] is gone, oh no!")
@@ -54,8 +54,8 @@
else
insert_item(S, user)
return 1
- else if(istype(O, /obj/item/reagent_containers/food/drinks/cans))
- var/obj/item/reagent_containers/food/drinks/cans/C = O
+ else if(istype(O, /obj/item/reagent_containers/drinks/cans))
+ var/obj/item/reagent_containers/drinks/cans/C = O
if(C.reagents)
if(C.can_opened && C.reagents.total_volume) //This prevents us from using opened cans that still have something in them
to_chat(user, "Only unopened cans and bottles can be processed to ensure product integrity.")
@@ -141,8 +141,8 @@
else
con_type = "metal can"
max_define = MAX_METAL
- else if(istype(O, /obj/item/reagent_containers/food/drinks/cans))
- var/obj/item/reagent_containers/food/drinks/cans/C = O
+ else if(istype(O, /obj/item/reagent_containers/drinks/cans))
+ var/obj/item/reagent_containers/drinks/cans/C = O
if(C.is_glass)
con_type = "glass bottle"
max_define = MAX_GLASS
@@ -215,17 +215,17 @@
/obj/machinery/bottler/proc/dispense_empty_container(container)
var/con_type
- var/obj/item/reagent_containers/food/drinks/cans/bottler/drink_container
+ var/obj/item/reagent_containers/drinks/cans/bottler/drink_container
switch(container)
if(1) //glass bottle
con_type = "glass bottle"
- drink_container = /obj/item/reagent_containers/food/drinks/cans/bottler/glass_bottle
+ drink_container = /obj/item/reagent_containers/drinks/cans/bottler/glass_bottle
if(2) //plastic bottle
con_type = "plastic bottle"
- drink_container = /obj/item/reagent_containers/food/drinks/cans/bottler/plastic_bottle
+ drink_container = /obj/item/reagent_containers/drinks/cans/bottler/plastic_bottle
if(3) //metal can
con_type = "metal can"
- drink_container = /obj/item/reagent_containers/food/drinks/cans/bottler/metal_can
+ drink_container = /obj/item/reagent_containers/drinks/cans/bottler/metal_can
if(containers[con_type])
//empties aren't sealed, so let's open it quietly
drink_container = new drink_container()
@@ -240,18 +240,18 @@
visible_message("There are no ingredients to process! Please insert some first.")
return
//prep a container
- var/obj/item/reagent_containers/food/drinks/cans/bottler/drink_container
+ var/obj/item/reagent_containers/drinks/cans/bottler/drink_container
var/con_type
switch(container)
if(1) //glass bottle
con_type = "glass bottle"
- drink_container = /obj/item/reagent_containers/food/drinks/cans/bottler/glass_bottle
+ drink_container = /obj/item/reagent_containers/drinks/cans/bottler/glass_bottle
if(2) //plastic bottle
con_type = "plastic bottle"
- drink_container = /obj/item/reagent_containers/food/drinks/cans/bottler/plastic_bottle
+ drink_container = /obj/item/reagent_containers/drinks/cans/bottler/plastic_bottle
if(3) //metal can
con_type = "metal can"
- drink_container = /obj/item/reagent_containers/food/drinks/cans/bottler/metal_can
+ drink_container = /obj/item/reagent_containers/drinks/cans/bottler/metal_can
if(!con_type)
visible_message("Error 404: Drink Container Not Found.")
diff --git a/code/modules/food_and_drinks/drinks/bottler/bottler_recipes.dm b/code/modules/food_and_drinks/drinks/bottler/bottler_recipes.dm
index 5f13f593892..3a923c5428a 100644
--- a/code/modules/food_and_drinks/drinks/bottler/bottler_recipes.dm
+++ b/code/modules/food_and_drinks/drinks/bottler/bottler_recipes.dm
@@ -22,48 +22,48 @@ There is no excuse to do this wrong now that there is an example for you. --Fals
/datum/bottler_recipe/Paradise_Punch
name = "Paradise Punch"
description = "Tastes just how you'd think Paradise would if you could bottle it."
- ingredients = list(/obj/item/reagent_containers/food/snacks/grown/grapes,
- /obj/item/reagent_containers/food/snacks/grown/banana,
- /obj/item/reagent_containers/food/snacks/grown/cherries)
+ ingredients = list(/obj/item/food/snacks/grown/grapes,
+ /obj/item/food/snacks/grown/banana,
+ /obj/item/food/snacks/grown/cherries)
result = "paradise_punch"
/datum/bottler_recipe/Applepocalypse
name = "Apple-pocalypse"
description = "If doomsday came in fruit form, it'd probably be apples."
- ingredients = list(/obj/item/reagent_containers/food/snacks/grown/apple,
- /obj/item/reagent_containers/food/snacks/grown/apple,
- /obj/item/reagent_containers/food/snacks/grown/apple)
+ ingredients = list(/obj/item/food/snacks/grown/apple,
+ /obj/item/food/snacks/grown/apple,
+ /obj/item/food/snacks/grown/apple)
result = "apple-pocalypse"
/datum/bottler_recipe/Berry_Banned
name = "Berry Banned"
description = "Reason for ban: Excessive Flavor."
- ingredients = list(/obj/item/reagent_containers/food/snacks/grown/berries,
- /obj/item/reagent_containers/food/snacks/grown/berries,
- /obj/item/reagent_containers/food/snacks/grown/berries)
+ ingredients = list(/obj/item/food/snacks/grown/berries,
+ /obj/item/food/snacks/grown/berries,
+ /obj/item/food/snacks/grown/berries)
result = "berry_banned"
/datum/bottler_recipe/Berry_Banned2
name = "Berry Banned"
description = "Reason for ban: Excessive Flavor."
- ingredients = list(/obj/item/reagent_containers/food/snacks/grown/berries/poison,
- /obj/item/reagent_containers/food/snacks/grown/berries/poison,
- /obj/item/reagent_containers/food/snacks/grown/berries/poison)
+ ingredients = list(/obj/item/food/snacks/grown/berries/poison,
+ /obj/item/food/snacks/grown/berries/poison,
+ /obj/item/food/snacks/grown/berries/poison)
result = "berry_banned2"
/datum/bottler_recipe/Blackeye_Brew
name = "Blackeye Brew"
description = "Creamy, smooth flavor, just like the bald heads of the masses. Supposedly aged for 30 years."
- ingredients = list(/obj/item/reagent_containers/food/drinks/cans/cola,
- /obj/item/reagent_containers/food/snacks/grown/sugarcane,
- /obj/item/reagent_containers/food/snacks/frozen/icecream)
+ ingredients = list(/obj/item/reagent_containers/drinks/cans/cola,
+ /obj/item/food/snacks/grown/sugarcane,
+ /obj/item/food/snacks/frozen/icecream)
result = "blackeye_brew"
/datum/bottler_recipe/Grape_Granade
name = "Grape Granade"
description = "Exploding with grape flavor and a favorite among ERT members system-wide."
- ingredients = list(/obj/item/reagent_containers/food/drinks/cans/grape_juice,
- /obj/item/reagent_containers/food/snacks/grown/grapes,
+ ingredients = list(/obj/item/reagent_containers/drinks/cans/grape_juice,
+ /obj/item/food/snacks/grown/grapes,
/obj/item/flash)
result = "grape_granade"
@@ -71,6 +71,6 @@ There is no excuse to do this wrong now that there is an example for you. --Fals
name = "Meteor Malt"
description = "Soft drinks have been detected on collision course with your tastebuds."
ingredients = list(/obj/item/stack/ore,
- /obj/item/reagent_containers/food/snacks/grown/wheat,
+ /obj/item/food/snacks/grown/wheat,
/obj/item/stack/ore)
result = "meteor_malt"
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index 5307f00752d..88d923bb445 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -4,7 +4,7 @@
//Functionally identical to regular drinks. The only difference is that the default bottle size is 100. - Darem
//Bottles now weaken and break when smashed on people's heads. - Giacom
-/obj/item/reagent_containers/food/drinks/bottle
+/obj/item/reagent_containers/drinks/bottle
amount_per_transfer_from_this = 10
volume = 100
throwforce = 15
@@ -12,7 +12,7 @@
var/const/duration = 13 //Directly relates to the 'weaken' duration. Lowered by armor (i.e. helmets)
var/is_glass = TRUE //Whether the 'bottle' is made of glass or not so that milk cartons dont shatter when someone gets hit by it
-/obj/item/reagent_containers/food/drinks/bottle/proc/smash(mob/living/target, mob/living/user, ranged = FALSE)
+/obj/item/reagent_containers/drinks/bottle/proc/smash(mob/living/target, mob/living/user, ranged = FALSE)
//Creates a shattering noise and replaces the bottle with a broken_bottle
var/new_location = get_turf(loc)
@@ -42,7 +42,7 @@
qdel(src)
-/obj/item/reagent_containers/food/drinks/bottle/attack(mob/living/target, mob/living/user)
+/obj/item/reagent_containers/drinks/bottle/attack(mob/living/target, mob/living/user)
if(!target)
return
@@ -119,18 +119,18 @@
//Finally, smash the bottle. This kills (qdel) the bottle.
smash(target, user)
-/obj/item/reagent_containers/food/drinks/bottle/proc/SplashReagents(mob/M)
+/obj/item/reagent_containers/drinks/bottle/proc/SplashReagents(mob/M)
if(reagents && reagents.total_volume)
M.visible_message("The contents of \the [src] splashes all over [M]!")
reagents.reaction(M, REAGENT_TOUCH)
reagents.clear_reagents()
-/obj/item/reagent_containers/food/drinks/bottle/throw_impact(atom/target,mob/thrower)
+/obj/item/reagent_containers/drinks/bottle/throw_impact(atom/target,mob/thrower)
..()
SplashReagents(target)
smash(target, thrower, ranged = TRUE)
-/obj/item/reagent_containers/food/drinks/bottle/decompile_act(obj/item/matter_decompiler/C, mob/user)
+/obj/item/reagent_containers/drinks/bottle/decompile_act(obj/item/matter_decompiler/C, mob/user)
if(!reagents.total_volume)
C.stored_comms["glass"] += 3
qdel(src)
@@ -159,119 +159,119 @@
qdel(src)
return TRUE
-/obj/item/reagent_containers/food/drinks/bottle/gin
+/obj/item/reagent_containers/drinks/bottle/gin
name = "Griffeater Gin"
desc = "A bottle of high quality gin, produced in the New London Space Station."
icon_state = "ginbottle"
list_reagents = list("gin" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/whiskey
+/obj/item/reagent_containers/drinks/bottle/whiskey
name = "Uncle Git's Special Reserve"
desc = "A premium single-malt whiskey, gently matured inside the tunnels of a nuclear shelter. TUNNEL WHISKEY RULES."
icon_state = "whiskeybottle"
list_reagents = list("whiskey" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/vodka
+/obj/item/reagent_containers/drinks/bottle/vodka
name = "Tunguska Triple Distilled"
desc = "Aah, vodka. Prime choice of drink AND fuel by Russians worldwide."
icon_state = "vodkabottle"
list_reagents = list("vodka" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka
+/obj/item/reagent_containers/drinks/bottle/vodka/badminka
name = "Badminka Vodka"
desc = "The label's written in Cyrillic. All you can make out is the name and a word that looks vaguely like 'Vodka'."
icon_state = "badminka"
list_reagents = list("vodka" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/tequila
+/obj/item/reagent_containers/drinks/bottle/tequila
name = "Caccavo Guaranteed Quality Tequila"
desc = "Made from premium petroleum distillates, pure thalidomide and other fine quality ingredients!"
icon_state = "tequilabottle"
list_reagents = list("tequila" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing
+/obj/item/reagent_containers/drinks/bottle/bottleofnothing
name = "Bottle of Nothing"
desc = "A bottle filled with nothing."
icon_state = "bottleofnothing"
list_reagents = list("nothing" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/bottleofbanana
+/obj/item/reagent_containers/drinks/bottle/bottleofbanana
name = "Jolly Jug"
desc = "A jug filled with banana juice."
icon_state = "bottleofjolly"
list_reagents = list("banana" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/patron
+/obj/item/reagent_containers/drinks/bottle/patron
name = "Wrapp Artiste Patron"
desc = "Silver laced tequila, served in space night clubs across the galaxy."
icon_state = "patronbottle"
list_reagents = list("patron" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/rum
+/obj/item/reagent_containers/drinks/bottle/rum
name = "Captain Pete's Cuban Spiced Rum"
desc = "This isn't just rum, oh no. It's practically GRIFF in a bottle."
icon_state = "rumbottle"
list_reagents = list("rum" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/holywater
+/obj/item/reagent_containers/drinks/bottle/holywater
name = "flask of holy water"
desc = "A flask of the chaplain's holy water."
icon_state = "holyflask"
list_reagents = list("holywater" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/holywater/hell
+/obj/item/reagent_containers/drinks/bottle/holywater/hell
desc = "A flask of holy water...it's been sitting in the Necropolis a while though."
list_reagents = list("hell_water" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/vermouth
+/obj/item/reagent_containers/drinks/bottle/vermouth
name = "Goldeneye Vermouth"
desc = "Sweet, sweet dryness~"
icon_state = "vermouthbottle"
list_reagents = list("vermouth" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/kahlua
+/obj/item/reagent_containers/drinks/bottle/kahlua
name = "Robert Robust's Coffee Liqueur"
desc = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936, HONK."
icon_state = "kahluabottle"
list_reagents = list("kahlua" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/goldschlager
+/obj/item/reagent_containers/drinks/bottle/goldschlager
name = "College Girl Goldschlager"
desc = "Because they are the only ones who will drink 100 proof cinnamon schnapps."
icon_state = "goldschlagerbottle"
list_reagents = list("goldschlager" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/cognac
+/obj/item/reagent_containers/drinks/bottle/cognac
name = "Chateau De Baton Premium Cognac"
desc = "A sweet and strongly alcoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time."
icon_state = "cognacbottle"
list_reagents = list("cognac" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/wine
+/obj/item/reagent_containers/drinks/bottle/wine
name = "Doublebeard Bearded Special Wine"
desc = "A faint aura of unease and asspainery surrounds the bottle."
icon_state = "winebottle"
list_reagents = list("wine" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/absinthe
+/obj/item/reagent_containers/drinks/bottle/absinthe
name = "Yellow Marquee Absinthe"
desc = "A strong alcoholic drink brewed and distributed by Yellow Marquee."
icon_state = "absinthebottle"
list_reagents = list("absinthe" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/absinthe/premium
+/obj/item/reagent_containers/drinks/bottle/absinthe/premium
name = "Gwyn's Premium Absinthe"
desc = "A potent alcoholic beverage, almost makes you forget the ash in your lungs."
icon_state = "absinthepremium"
-/obj/item/reagent_containers/food/drinks/bottle/hcider
+/obj/item/reagent_containers/drinks/bottle/hcider
name = "Jian Hard Cider"
desc = "Apple juice for adults."
icon_state = "hcider"
volume = 50
list_reagents = list("suicider" = 50)
-/obj/item/reagent_containers/food/drinks/bottle/fernet
+/obj/item/reagent_containers/drinks/bottle/fernet
name = "Fernet Bronca"
desc = "A bottle of pure Fernet Bronca, produced in Cordoba Space Station"
icon_state = "fernetbottle"
@@ -279,7 +279,7 @@
//////////////////////////JUICES AND STUFF ///////////////////////
-/obj/item/reagent_containers/food/drinks/bottle/orangejuice
+/obj/item/reagent_containers/drinks/bottle/orangejuice
name = "orange juice"
desc = "Full of vitamins and deliciousness!"
icon_state = "orangejuice"
@@ -288,7 +288,7 @@
is_glass = FALSE
list_reagents = list("orangejuice" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/cream
+/obj/item/reagent_containers/drinks/bottle/cream
name = "milk cream"
desc = "It's cream. Made from milk. What else did you think you'd find in there?"
icon_state = "cream"
@@ -297,7 +297,7 @@
is_glass = FALSE
list_reagents = list("cream" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/tomatojuice
+/obj/item/reagent_containers/drinks/bottle/tomatojuice
name = "tomato juice"
desc = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness."
icon_state = "tomatojuice"
@@ -306,7 +306,7 @@
is_glass = FALSE
list_reagents = list("tomatojuice" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/limejuice
+/obj/item/reagent_containers/drinks/bottle/limejuice
name = "lime juice"
desc = "Sweet-sour goodness."
icon_state = "limejuice"
@@ -315,7 +315,7 @@
is_glass = FALSE
list_reagents = list("limejuice" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/milk
+/obj/item/reagent_containers/drinks/bottle/milk
name = "milk"
desc = "Soothing milk."
icon_state = "milk"
@@ -325,7 +325,7 @@
list_reagents = list("milk" = 100)
////////////////////////// MOLOTOV ///////////////////////
-/obj/item/reagent_containers/food/drinks/bottle/molotov
+/obj/item/reagent_containers/drinks/bottle/molotov
name = "molotov cocktail"
desc = "A throwing weapon used to ignite things, typically filled with an accelerant. Recommended highly by rioters and revolutionaries. Light and toss."
icon_state = "vodkabottle"
@@ -334,32 +334,32 @@
/datum/reagent/napalm,/datum/reagent/hellwater,/datum/reagent/plasma,/datum/reagent/plasma_dust)
var/active = FALSE
-/obj/item/reagent_containers/food/drinks/bottle/molotov/update_desc()
+/obj/item/reagent_containers/drinks/bottle/molotov/update_desc()
. = ..()
desc = initial(desc)
if(!is_glass)
desc += " You're not sure if making this out of a carton was the brightest idea."
-/obj/item/reagent_containers/food/drinks/bottle/molotov/update_icon_state()
- var/obj/item/reagent_containers/food/drinks/bottle/B = locate() in contents
+/obj/item/reagent_containers/drinks/bottle/molotov/update_icon_state()
+ var/obj/item/reagent_containers/drinks/bottle/B = locate() in contents
if(B)
icon_state = B.icon_state
-/obj/item/reagent_containers/food/drinks/bottle/molotov/update_overlays()
+/obj/item/reagent_containers/drinks/bottle/molotov/update_overlays()
. = ..()
if(active)
. += GLOB.fire_overlay
-/obj/item/reagent_containers/food/drinks/bottle/molotov/CheckParts(list/parts_list)
+/obj/item/reagent_containers/drinks/bottle/molotov/CheckParts(list/parts_list)
..()
- var/obj/item/reagent_containers/food/drinks/bottle/B = locate() in contents
+ var/obj/item/reagent_containers/drinks/bottle/B = locate() in contents
if(B)
B.reagents.copy_to(src, 100)
if(!B.is_glass)
is_glass = FALSE
update_appearance(UPDATE_DESC|UPDATE_ICON)
-/obj/item/reagent_containers/food/drinks/bottle/molotov/throw_impact(atom/target,mob/thrower)
+/obj/item/reagent_containers/drinks/bottle/molotov/throw_impact(atom/target,mob/thrower)
var/firestarter = FALSE
for(var/datum/reagent/R in reagents.reagent_list)
for(var/A in accelerants)
@@ -371,7 +371,7 @@
target.fire_act()
new /obj/effect/hotspot(get_turf(target))
-/obj/item/reagent_containers/food/drinks/bottle/molotov/attackby(obj/item/I, mob/user, params)
+/obj/item/reagent_containers/drinks/bottle/molotov/attackby(obj/item/I, mob/user, params)
if(I.get_heat() && !active)
active = TRUE
var/turf/bombturf = get_turf(src)
@@ -395,7 +395,7 @@
A.fire_act()
qdel(src)
-/obj/item/reagent_containers/food/drinks/bottle/molotov/attack_self(mob/user)
+/obj/item/reagent_containers/drinks/bottle/molotov/attack_self(mob/user)
if(active)
if(!is_glass)
to_chat(user, "The flame's spread too far on it!")
diff --git a/code/modules/food_and_drinks/drinks/drinks/cans.dm b/code/modules/food_and_drinks/drinks/drinks/cans.dm
index f3125e60df1..c98487ba69c 100644
--- a/code/modules/food_and_drinks/drinks/drinks/cans.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/cans.dm
@@ -1,4 +1,4 @@
-/obj/item/reagent_containers/food/drinks/cans
+/obj/item/reagent_containers/drinks/cans
container_type = NONE
var/can_opened = FALSE
var/is_glass = FALSE
@@ -8,14 +8,14 @@
var/can_burst = FALSE
var/burst_chance = 0
-/obj/item/reagent_containers/food/drinks/cans/examine(mob/user)
+/obj/item/reagent_containers/drinks/cans/examine(mob/user)
. = ..()
if(can_opened)
. += "It has been opened."
else
. += "Ctrl-click to shake it up!"
-/obj/item/reagent_containers/food/drinks/cans/attack_self(mob/user)
+/obj/item/reagent_containers/drinks/cans/attack_self(mob/user)
if(can_opened)
return ..()
if(times_shaken)
@@ -27,7 +27,7 @@
to_chat(user, "You open the drink with an audible pop!")
return ..()
-/obj/item/reagent_containers/food/drinks/cans/proc/crush(mob/user)
+/obj/item/reagent_containers/drinks/cans/proc/crush(mob/user)
var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(user.loc)
crushed_can.icon_state = icon_state
//inherit material vars for recycling purposes
@@ -41,7 +41,7 @@
qdel(src)
return crushed_can
-/obj/item/reagent_containers/food/drinks/cans/CtrlClick(mob/user)
+/obj/item/reagent_containers/drinks/cans/CtrlClick(mob/user)
var/mob/living/carbon/human/H
if(!can_shake || !ishuman(user))
return ..()
@@ -67,7 +67,7 @@
else
return ..()
-/obj/item/reagent_containers/food/drinks/cans/attack(mob/M, mob/user, proximity)
+/obj/item/reagent_containers/drinks/cans/attack(mob/M, mob/user, proximity)
if(!can_opened)
to_chat(user, "You need to open the drink!")
return
@@ -77,7 +77,7 @@
return
return ..()
-/obj/item/reagent_containers/food/drinks/cans/attackby(obj/item/I, mob/user, params)
+/obj/item/reagent_containers/drinks/cans/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/storage/bag/trash/cyborg))
user.visible_message("[user] crushes [src] in [user.p_their()] trash compactor.", "You crush [src] in your trash compactor.")
var/obj/can = crush(user)
@@ -85,7 +85,7 @@
return TRUE
..()
-/obj/item/reagent_containers/food/drinks/cans/afterattack(obj/target, mob/user, proximity)
+/obj/item/reagent_containers/drinks/cans/afterattack(obj/target, mob/user, proximity)
if(!proximity)
return
if(istype(target, /obj/structure/reagent_dispensers) && !can_opened)
@@ -97,14 +97,14 @@
else
return ..(target, user, proximity)
-/obj/item/reagent_containers/food/drinks/cans/throw_impact(atom/A)
+/obj/item/reagent_containers/drinks/cans/throw_impact(atom/A)
. = ..()
if(times_shaken < 5)
times_shaken++
else
handle_bursting()
-/obj/item/reagent_containers/food/drinks/cans/proc/fizzy_open(mob/user, burstopen = FALSE)
+/obj/item/reagent_containers/drinks/cans/proc/fizzy_open(mob/user, burstopen = FALSE)
playsound(loc, 'sound/effects/canopenfizz.ogg', rand(10, 50), 1)
can_opened = TRUE
container_type |= OPENCONTAINER
@@ -130,7 +130,7 @@
reagents.remove_any(times_shaken / 5 * reagents.total_volume)
-/obj/item/reagent_containers/food/drinks/cans/proc/handle_bursting(mob/user)
+/obj/item/reagent_containers/drinks/cans/proc/handle_bursting(mob/user)
if(times_shaken != 5 || can_opened)
return
@@ -148,10 +148,10 @@
else
fizzy_open(burstopen = TRUE)
-/obj/item/reagent_containers/food/drinks/cans/proc/reset_shakable()
+/obj/item/reagent_containers/drinks/cans/proc/reset_shakable()
can_shake = TRUE
-/obj/item/reagent_containers/food/drinks/cans/proc/reset_shaken()
+/obj/item/reagent_containers/drinks/cans/proc/reset_shaken()
times_shaken--
if(can_burst)
can_burst = FALSE
@@ -159,41 +159,41 @@
if(times_shaken)
addtimer(CALLBACK(src, PROC_REF(reset_shaken)), (70 - (times_shaken * 10)) SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_NO_HASH_WAIT)
-/obj/item/reagent_containers/food/drinks/cans/cola
+/obj/item/reagent_containers/drinks/cans/cola
name = "space cola"
desc = "Cola. In space."
icon_state = "cola"
list_reagents = list("cola" = 30)
-/obj/item/reagent_containers/food/drinks/cans/beer
+/obj/item/reagent_containers/drinks/cans/beer
name = "space beer"
desc = "Contains only water, malt and hops."
icon_state = "beer"
is_glass = TRUE
list_reagents = list("beer" = 30)
-/obj/item/reagent_containers/food/drinks/cans/adminbooze
+/obj/item/reagent_containers/drinks/cans/adminbooze
name = "admin booze"
desc = "Bottled Griffon tears. Drink with caution."
icon_state = "adminbooze"
is_glass = TRUE
list_reagents = list("adminordrazine" = 5, "capsaicin" = 5, "methamphetamine"= 20, "thirteenloko" = 20)
-/obj/item/reagent_containers/food/drinks/cans/madminmalt
+/obj/item/reagent_containers/drinks/cans/madminmalt
name = "madmin malt"
desc = "Bottled essence of angry admins. Drink with EXTREME caution."
icon_state = "madminmalt"
is_glass = TRUE
list_reagents = list("hell_water" = 20, "neurotoxin" = 15, "thirteenloko" = 15)
-/obj/item/reagent_containers/food/drinks/cans/badminbrew
+/obj/item/reagent_containers/drinks/cans/badminbrew
name = "badmin brew"
desc = "Bottled trickery and terrible admin work. Probably shouldn't drink this one at all."
icon_state = "badminbrew"
is_glass = TRUE
list_reagents = list("mutagen" = 25, "charcoal" = 10, "thirteenloko" = 15)
-/obj/item/reagent_containers/food/drinks/cans/ale
+/obj/item/reagent_containers/drinks/cans/ale
name = "Magm-Ale"
desc = "A true dorf's drink of choice."
icon_state = "alebottle"
@@ -201,82 +201,82 @@
is_glass = TRUE
list_reagents = list("ale" = 30)
-/obj/item/reagent_containers/food/drinks/cans/space_mountain_wind
+/obj/item/reagent_containers/drinks/cans/space_mountain_wind
name = "Space Mountain Wind"
desc = "Blows right through you like a space wind."
icon_state = "space_mountain_wind"
list_reagents = list("spacemountainwind" = 30)
-/obj/item/reagent_containers/food/drinks/cans/thirteenloko
+/obj/item/reagent_containers/drinks/cans/thirteenloko
name = "Thirteen Loko"
desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkenness, or even death. Please Drink Responsibly."
icon_state = "thirteen_loko"
list_reagents = list("thirteenloko" = 25, "psilocybin" = 5)
-/obj/item/reagent_containers/food/drinks/cans/dr_gibb
+/obj/item/reagent_containers/drinks/cans/dr_gibb
name = "Dr. Gibb"
desc = "A delicious mixture of 42 different flavors."
icon_state = "dr_gibb"
list_reagents = list("dr_gibb" = 30)
-/obj/item/reagent_containers/food/drinks/cans/starkist
+/obj/item/reagent_containers/drinks/cans/starkist
name = "Star-kist"
desc = "The taste of a star in liquid form. And, a bit of tuna...?"
icon_state = "starkist"
list_reagents = list("brownstar" = 30)
-/obj/item/reagent_containers/food/drinks/cans/space_up
+/obj/item/reagent_containers/drinks/cans/space_up
name = "Space-Up"
desc = "Tastes like a hull breach in your mouth."
icon_state = "space-up"
list_reagents = list("space_up" = 30)
-/obj/item/reagent_containers/food/drinks/cans/lemon_lime
+/obj/item/reagent_containers/drinks/cans/lemon_lime
name = "Lemon-Lime"
desc = "You wanted ORANGE. It gave you Lemon Lime."
icon_state = "lemon-lime"
list_reagents = list("lemon_lime" = 30)
-/obj/item/reagent_containers/food/drinks/cans/iced_tea
+/obj/item/reagent_containers/drinks/cans/iced_tea
name = "Vrisk Serket Iced Tea"
desc = "That sweet, refreshing southern earthy flavor. That's where it's from, right? South Earth?"
icon_state = "ice_tea_can"
list_reagents = list("icetea" = 30)
-/obj/item/reagent_containers/food/drinks/cans/grape_juice
+/obj/item/reagent_containers/drinks/cans/grape_juice
name = "Grapel Juice"
desc = "500 pages of rules of how to appropriately enter into a combat with this juice!"
icon_state = "purple_can"
list_reagents = list("grapejuice" = 30)
-/obj/item/reagent_containers/food/drinks/cans/tonic
+/obj/item/reagent_containers/drinks/cans/tonic
name = "T-Borg's Tonic Water"
desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
icon_state = "tonic"
list_reagents = list("tonic" = 50)
-/obj/item/reagent_containers/food/drinks/cans/sodawater
+/obj/item/reagent_containers/drinks/cans/sodawater
name = "soda water"
desc = "A can of soda water. Still water's more refreshing cousin."
icon_state = "sodawater"
list_reagents = list("sodawater" = 50)
-/obj/item/reagent_containers/food/drinks/cans/synthanol
+/obj/item/reagent_containers/drinks/cans/synthanol
name = "Beep's Classic Synthanol"
desc = "A can of IPC booze, however that works."
icon_state = "synthanolcan"
list_reagents = list("synthanol" = 50)
-/obj/item/reagent_containers/food/drinks/cans/bottler
+/obj/item/reagent_containers/drinks/cans/bottler
name = "generic beverage container"
desc = "this shouldn't ever be spawned. shame on you"
icon_state = "glass_bottle"
-/obj/item/reagent_containers/food/drinks/cans/bottler/on_reagent_change()
+/obj/item/reagent_containers/drinks/cans/bottler/on_reagent_change()
update_icon(UPDATE_OVERLAYS)
-/obj/item/reagent_containers/food/drinks/cans/bottler/update_overlays()
+/obj/item/reagent_containers/drinks/cans/bottler/update_overlays()
. = ..()
if(reagents.total_volume)
var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]10")
@@ -298,19 +298,19 @@
filling.icon += mix_color_from_reagents(reagents.reagent_list)
. += filling
-/obj/item/reagent_containers/food/drinks/cans/bottler/glass_bottle
+/obj/item/reagent_containers/drinks/cans/bottler/glass_bottle
name = "glass bottle"
desc = "A glass bottle suitable for beverages."
icon_state = "glass_bottle"
is_glass = TRUE
-/obj/item/reagent_containers/food/drinks/cans/bottler/plastic_bottle
+/obj/item/reagent_containers/drinks/cans/bottler/plastic_bottle
name = "plastic bottle"
desc = "A plastic bottle suitable for beverages."
icon_state = "plastic_bottle"
is_plastic = TRUE
-/obj/item/reagent_containers/food/drinks/cans/bottler/metal_can
+/obj/item/reagent_containers/drinks/cans/bottler/metal_can
name = "metal can"
desc = "A metal can suitable for beverages."
icon_state = "metal_can"
diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
index 5ba474cf76e..35f67923976 100644
--- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
@@ -1,6 +1,6 @@
-/obj/item/reagent_containers/food/drinks/drinkingglass
+/obj/item/reagent_containers/drinks/drinkingglass
name = "glass"
desc = "Your standard drinking glass."
icon_state = "glass_empty"
@@ -15,9 +15,9 @@
drop_sound = 'sound/items/handling/drinkglass_drop.ogg'
pickup_sound = 'sound/items/handling/drinkglass_pickup.ogg'
-/obj/item/reagent_containers/food/drinks/drinkingglass/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/reagent_containers/food/snacks/egg)) //breaking eggs
- var/obj/item/reagent_containers/food/snacks/egg/E = I
+/obj/item/reagent_containers/drinks/drinkingglass/attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/food/snacks/egg)) //breaking eggs
+ var/obj/item/food/snacks/egg/E = I
if(reagents)
if(reagents.total_volume >= reagents.maximum_volume)
to_chat(user, "[src] is full.")
@@ -29,16 +29,16 @@
else
..()
-/obj/item/reagent_containers/food/drinks/drinkingglass/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE)
+/obj/item/reagent_containers/drinks/drinkingglass/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE)
if(!reagents.total_volume)
return
..()
-/obj/item/reagent_containers/food/drinks/drinkingglass/burn()
+/obj/item/reagent_containers/drinks/drinkingglass/burn()
reagents.clear_reagents()
extinguish()
-/obj/item/reagent_containers/food/drinks/drinkingglass/on_reagent_change()
+/obj/item/reagent_containers/drinks/drinkingglass/on_reagent_change()
overlays.Cut()
if(reagents.reagent_list.len)
var/datum/reagent/R = reagents.get_master_reagent()
@@ -56,15 +56,15 @@
desc = "Your standard drinking glass."
// for /obj/machinery/economy/vending/sovietsoda
-/obj/item/reagent_containers/food/drinks/drinkingglass/soda
+/obj/item/reagent_containers/drinks/drinkingglass/soda
list_reagents = list("sodawater" = 50)
-/obj/item/reagent_containers/food/drinks/drinkingglass/cola
+/obj/item/reagent_containers/drinks/drinkingglass/cola
list_reagents = list("cola" = 50)
-/obj/item/reagent_containers/food/drinks/drinkingglass/devilskiss
+/obj/item/reagent_containers/drinks/drinkingglass/devilskiss
list_reagents = list("devilskiss" = 50)
-/obj/item/reagent_containers/food/drinks/drinkingglass/alliescocktail
+/obj/item/reagent_containers/drinks/drinkingglass/alliescocktail
list_reagents = list("alliescocktail" = 25, "omnizine" = 25)
diff --git a/code/modules/food_and_drinks/drinks/drinks/mugs.dm b/code/modules/food_and_drinks/drinks/drinks/mugs.dm
index 5238d8a8874..637ed8ec646 100644
--- a/code/modules/food_and_drinks/drinks/drinks/mugs.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/mugs.dm
@@ -1,5 +1,5 @@
-/obj/item/reagent_containers/food/drinks/mug
+/obj/item/reagent_containers/drinks/mug
name = "coffee mug"
desc = "A mug for sipping hot beverages out of."
icon = 'icons/obj/mugs.dmi'
@@ -7,7 +7,7 @@
var/novelty = FALSE
var/preset = FALSE
-/obj/item/reagent_containers/food/drinks/mug/novelty
+/obj/item/reagent_containers/drinks/mug/novelty
name = "novelty coffee mug"
desc = "A fun mug for your coffee or other hot beverage!"
novelty = TRUE
@@ -86,7 +86,7 @@
description = "So mesmerizing!"
state = "mug_rainbow"
-/obj/item/reagent_containers/food/drinks/mug/Initialize(mapload)
+/obj/item/reagent_containers/drinks/mug/Initialize(mapload)
. = ..()
if(preset)
return
@@ -99,73 +99,73 @@
else
icon_state = pick("mug_black", "mug_white", "mug_red", "mug_blue", "mug_green", "mug_pink")
-/obj/item/reagent_containers/food/drinks/mug/eng
+/obj/item/reagent_containers/drinks/mug/eng
name = "engineer's mug"
desc = "A mug engineered to hold your beverage... IN SPACE!"
icon_state = "mug_eng"
preset = TRUE
-/obj/item/reagent_containers/food/drinks/mug/med
+/obj/item/reagent_containers/drinks/mug/med
name = "doctor's mug"
desc = "A mug that can hold the cure for what ails you!"
icon_state = "mug_med"
preset = TRUE
-/obj/item/reagent_containers/food/drinks/mug/sci
+/obj/item/reagent_containers/drinks/mug/sci
name = "scientist's mug"
desc = "Nothing fuels research like a coffee mug... or grant money!"
icon_state = "mug_sci"
preset = TRUE
-/obj/item/reagent_containers/food/drinks/mug/sec
+/obj/item/reagent_containers/drinks/mug/sec
name = "officer's mug"
desc = "The perfect partner for a sprinkled donut or stunbaton!"
icon_state = "mug_sec"
preset = TRUE
-/obj/item/reagent_containers/food/drinks/mug/serv
+/obj/item/reagent_containers/drinks/mug/serv
name = "crewmember's mug"
desc = "Serve your thirst better than you serve the rest of the crew!"
icon_state = "mug_serv"
preset = TRUE
-/obj/item/reagent_containers/food/drinks/mug/ce
+/obj/item/reagent_containers/drinks/mug/ce
name = "chief engineer's mug"
desc = "Broken and welded back together countless times, just like the station! Probably microwave safe."
icon_state = "mug_ce"
preset = TRUE
-/obj/item/reagent_containers/food/drinks/mug/hos
+/obj/item/reagent_containers/drinks/mug/hos
name = "head of security's mug"
desc = "If only your officers were as robust as this coffee's flavor!"
icon_state = "mug_hos"
preset = TRUE
-/obj/item/reagent_containers/food/drinks/mug/rd
+/obj/item/reagent_containers/drinks/mug/rd
name = "research director's mug"
desc = "Energy tech level: 99"
icon_state = "mug_rd"
preset = TRUE
-/obj/item/reagent_containers/food/drinks/mug/cmo
+/obj/item/reagent_containers/drinks/mug/cmo
name = "chief medical officer's mug"
desc = "Fill it with something to keep you awake while you try to keep the crew alive."
icon_state = "mug_cmo"
preset = TRUE
-/obj/item/reagent_containers/food/drinks/mug/qm
+/obj/item/reagent_containers/drinks/mug/qm
name = "quartermaster's mug"
desc = "A newly imported mug, express delivery."
icon_state = "mug_qm"
preset = TRUE
-/obj/item/reagent_containers/food/drinks/mug/hop
+/obj/item/reagent_containers/drinks/mug/hop
name = "head of personnel's mug"
desc = "Are the stains on the bottom coffee or ink?"
icon_state = "mug_hop"
preset = TRUE
-/obj/item/reagent_containers/food/drinks/mug/cap
+/obj/item/reagent_containers/drinks/mug/cap
name = "captain's mug"
desc = "An inscription on the side reads \"Best Captain 2559\"... The last time the station had a worthy captain."
icon_state = "mug_cap"
diff --git a/code/modules/food_and_drinks/drinks/drinks/shotglass.dm b/code/modules/food_and_drinks/drinks/drinks/shotglass.dm
index c181349498b..5947abb4a52 100644
--- a/code/modules/food_and_drinks/drinks/drinks/shotglass.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/shotglass.dm
@@ -1,4 +1,4 @@
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass
+/obj/item/reagent_containers/drinks/drinkingglass/shotglass
name = "shot glass"
desc = "No glasses were shot in the making of this glass."
icon_state = "shotglass"
@@ -10,14 +10,14 @@
light_color = LIGHT_COLOR_LIGHTBLUE
resistance_flags = FLAMMABLE
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/bluespace
+/obj/item/reagent_containers/drinks/drinkingglass/shotglass/bluespace
name = "bluespace shot glass"
desc = "For when you need to make the Bartender's life extra hell."
amount_per_transfer_from_this = 50
volume = 50
icon_state = "bluespaceshotglass"
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/bluespace/update_name()
+/obj/item/reagent_containers/drinks/drinkingglass/shotglass/bluespace/update_name()
. = ..()
if(reagents.total_volume)
name = "bluespace shot glass of " + reagents.get_master_reagent_name() //No matter what, the glass will tell you the reagent's name. Might be too abusable in the future.
@@ -26,12 +26,12 @@
else
name = "bluespace shot glass"
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/on_reagent_change()
+/obj/item/reagent_containers/drinks/drinkingglass/shotglass/on_reagent_change()
if(!isShotFlammable() && (resistance_flags & ON_FIRE))
extinguish()
update_appearance(UPDATE_NAME|UPDATE_OVERLAYS)
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/update_name()
+/obj/item/reagent_containers/drinks/drinkingglass/shotglass/update_name()
. = ..()
if(reagents.total_volume)
name = "shot glass of " + reagents.get_master_reagent_name() //No matter what, the glass will tell you the reagent's name. Might be too abusable in the future.
@@ -40,7 +40,7 @@
else
name = "shot glass"
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/update_overlays()
+/obj/item/reagent_containers/drinks/drinkingglass/shotglass/update_overlays()
. = ..()
if(reagents.total_volume)
var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]1")
@@ -56,7 +56,7 @@
filling.icon += mix_color_from_reagents(reagents.reagent_list)
. += filling
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/proc/clumsilyDrink(mob/living/carbon/human/user) //Clowns beware
+/obj/item/reagent_containers/drinks/drinkingglass/shotglass/proc/clumsilyDrink(mob/living/carbon/human/user) //Clowns beware
if(!(resistance_flags & ON_FIRE))
return
user.visible_message("[user] pours [src] all over [user.p_themselves()]!", "You pour [src] all over yourself!", "You hear a 'whoompf' and a sizzle.")
@@ -65,14 +65,14 @@
reagents.clear_reagents()
user.IgniteMob()
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/proc/isShotFlammable()
+/obj/item/reagent_containers/drinks/drinkingglass/shotglass/proc/isShotFlammable()
var/datum/reagent/R = reagents.get_master_reagent()
if(istype(R, /datum/reagent/consumable/ethanol))
var/datum/reagent/consumable/ethanol/A = R
if(A.volume >= 5 && A.alcohol_perc >= 0.35) //Only an approximation to if something's flammable but it will do
return TRUE
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = FALSE)
+/obj/item/reagent_containers/drinks/drinkingglass/shotglass/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = FALSE)
if(!isShotFlammable() || (resistance_flags & ON_FIRE)) //You can't light a shot that's not flammable!
return
..()
@@ -80,31 +80,31 @@
visible_message("[src] begins to burn with a blue hue!")
update_appearance(UPDATE_NAME|UPDATE_OVERLAYS)
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/extinguish(silent = FALSE)
+/obj/item/reagent_containers/drinks/drinkingglass/shotglass/extinguish(silent = FALSE)
..()
set_light(0)
if(!silent)
visible_message("The dancing flame on [src] dies out.")
update_appearance(UPDATE_NAME|UPDATE_OVERLAYS)
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/burn() //Let's override fire deleting the reagents inside the shot
+/obj/item/reagent_containers/drinks/drinkingglass/shotglass/burn() //Let's override fire deleting the reagents inside the shot
return
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/attack(mob/living/carbon/human/user)
+/obj/item/reagent_containers/drinks/drinkingglass/shotglass/attack(mob/living/carbon/human/user)
if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50) && (resistance_flags & ON_FIRE))
clumsilyDrink(user)
else
..()
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/attackby(obj/item/W)
+/obj/item/reagent_containers/drinks/drinkingglass/shotglass/attackby(obj/item/W)
..()
if(W.get_heat())
fire_act()
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/attack_hand(mob/user, pickupfireoverride = TRUE)
+/obj/item/reagent_containers/drinks/drinkingglass/shotglass/attack_hand(mob/user, pickupfireoverride = TRUE)
..()
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/attack_self(mob/living/carbon/human/user)
+/obj/item/reagent_containers/drinks/drinkingglass/shotglass/attack_self(mob/living/carbon/human/user)
..()
if(!(resistance_flags & ON_FIRE))
return
@@ -114,7 +114,7 @@
user.visible_message("[user] places [user.p_their()] hand over [src] to put it out!", "You use your hand to extinguish [src]!")
extinguish()
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/MouseDrop(mob/living/carbon/human/user)
+/obj/item/reagent_containers/drinks/drinkingglass/shotglass/MouseDrop(mob/living/carbon/human/user)
if(!ishuman(user))
return
if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50) && (resistance_flags & ON_FIRE))
diff --git a/code/modules/food_and_drinks/drinks/drinks_base.dm b/code/modules/food_and_drinks/drinks/drinks_base.dm
index bb7d7365c62..3ad002ed0ee 100644
--- a/code/modules/food_and_drinks/drinks/drinks_base.dm
+++ b/code/modules/food_and_drinks/drinks/drinks_base.dm
@@ -1,30 +1,23 @@
////////////////////////////////////////////////////////////////////////////////
/// Drinks.
////////////////////////////////////////////////////////////////////////////////
-/obj/item/reagent_containers/food/drinks
+/obj/item/reagent_containers/drinks
name = "drink"
desc = "yummy"
icon = 'icons/obj/drinks.dmi'
icon_state = null
container_type = OPENCONTAINER
- consume_sound = 'sound/items/drink.ogg'
possible_transfer_amounts = list(5,10,15,20,25,30,50)
visible_transfer_rate = TRUE
volume = 50
resistance_flags = NONE
- antable = FALSE
+ var/consume_sound = 'sound/items/drink.ogg'
var/chugging = FALSE
-/obj/item/reagent_containers/food/drinks/Initialize(mapload)
- . = ..()
- bitesize = amount_per_transfer_from_this
- if(bitesize < 5)
- bitesize = 5
-
-/obj/item/reagent_containers/food/drinks/attack_self(mob/user)
+/obj/item/reagent_containers/drinks/attack_self(mob/user)
return
-/obj/item/reagent_containers/food/drinks/attack(mob/M, mob/user, def_zone)
+/obj/item/reagent_containers/drinks/attack(mob/M, mob/user, def_zone)
if(!reagents || !reagents.total_volume)
to_chat(user, " None of [src] left, oh no!")
return FALSE
@@ -35,11 +28,11 @@
if(iscarbon(M))
var/mob/living/carbon/C = M
- if(C.eat(src, user))
+ if(C.drink(src, user))
return TRUE
return FALSE
-/obj/item/reagent_containers/food/drinks/MouseDrop(atom/over_object) //CHUG! CHUG! CHUG!
+/obj/item/reagent_containers/drinks/MouseDrop(atom/over_object) //CHUG! CHUG! CHUG!
if(!iscarbon(over_object))
return
var/mob/living/carbon/chugger = over_object
@@ -61,7 +54,7 @@
break
chugging = FALSE
-/obj/item/reagent_containers/food/drinks/afterattack(obj/target, mob/user, proximity)
+/obj/item/reagent_containers/drinks/afterattack(obj/target, mob/user, proximity)
if(!proximity)
return
if(chugging)
@@ -96,7 +89,7 @@
return FALSE
-/obj/item/reagent_containers/food/drinks/examine(mob/user)
+/obj/item/reagent_containers/drinks/examine(mob/user)
. = ..()
if(in_range(user, src))
if(!reagents || reagents.total_volume == 0)
@@ -115,7 +108,7 @@
/// Drinks. END
////////////////////////////////////////////////////////////////////////////////
-/obj/item/reagent_containers/food/drinks/trophy
+/obj/item/reagent_containers/drinks/trophy
name = "pewter cup"
desc = "Everyone gets a trophy."
icon_state = "pewter_cup"
@@ -130,7 +123,7 @@
container_type = OPENCONTAINER
resistance_flags = FIRE_PROOF
-/obj/item/reagent_containers/food/drinks/trophy/gold_cup
+/obj/item/reagent_containers/drinks/trophy/gold_cup
name = "gold cup"
desc = "You're winner!"
icon_state = "golden_cup"
@@ -141,7 +134,7 @@
materials = list(MAT_GOLD=1000)
volume = 150
-/obj/item/reagent_containers/food/drinks/trophy/silver_cup
+/obj/item/reagent_containers/drinks/trophy/silver_cup
name = "silver cup"
desc = "Best loser!"
icon_state = "silver_cup"
@@ -152,7 +145,7 @@
materials = list(MAT_SILVER=800)
volume = 100
-/obj/item/reagent_containers/food/drinks/trophy/bronze_cup
+/obj/item/reagent_containers/drinks/trophy/bronze_cup
name = "bronze cup"
desc = "At least you ranked!"
icon_state = "bronze_cup"
@@ -163,7 +156,7 @@
materials = list(MAT_METAL=400)
volume = 25
-/obj/item/reagent_containers/food/drinks/trophy/bronze_cup/toolbox_win //2023 toolbox tournament 3rd place went to paradise station.
+/obj/item/reagent_containers/drinks/trophy/bronze_cup/toolbox_win //2023 toolbox tournament 3rd place went to paradise station.
name = "3rd place toolbox tournament 2567"
desc = "Awarded to centcomms elite toolbox warriors raising money for the GBS research institute."
icon_state = "reward_cup"
@@ -176,39 +169,39 @@
// Formatting is the same as food.
-/obj/item/reagent_containers/food/drinks/coffee
+/obj/item/reagent_containers/drinks/coffee
name = "Robust Coffee"
desc = "Careful, the beverage you're about to enjoy is extremely hot."
icon_state = "coffee"
list_reagents = list("coffee" = 30)
resistance_flags = FREEZE_PROOF
-/obj/item/reagent_containers/food/drinks/ice
+/obj/item/reagent_containers/drinks/ice
name = "ice cup"
desc = "Careful, cold ice, do not chew."
icon_state = "icecup"
list_reagents = list("ice" = 30)
-/obj/item/reagent_containers/food/drinks/tea
+/obj/item/reagent_containers/drinks/tea
name = "Duke Purple tea"
desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea."
icon_state = "teacup"
item_state = "coffee"
list_reagents = list("tea" = 30)
-/obj/item/reagent_containers/food/drinks/tea/Initialize(mapload)
+/obj/item/reagent_containers/drinks/tea/Initialize(mapload)
. = ..()
if(prob(20))
reagents.add_reagent("mugwort", 3)
-/obj/item/reagent_containers/food/drinks/mugwort
+/obj/item/reagent_containers/drinks/mugwort
name = "mugwort tea"
desc = "A bitter herbal tea."
icon_state = "manlydorfglass"
item_state = "coffee"
list_reagents = list("mugwort" = 30)
-/obj/item/reagent_containers/food/drinks/h_chocolate
+/obj/item/reagent_containers/drinks/h_chocolate
name = "Dutch hot coco"
desc = "Made in Space South America."
icon_state = "hot_coco"
@@ -216,7 +209,7 @@
list_reagents = list("hot_coco" = 30, "sugar" = 5)
resistance_flags = FREEZE_PROOF
-/obj/item/reagent_containers/food/drinks/chocolate
+/obj/item/reagent_containers/drinks/chocolate
name = "hot chocolate"
desc = "Made in Space Switzerland."
icon_state = "hot_coco"
@@ -224,32 +217,32 @@
list_reagents = list("hot_coco" = 15, "chocolate" = 6, "water" = 9)
resistance_flags = FREEZE_PROOF
-/obj/item/reagent_containers/food/drinks/weightloss
+/obj/item/reagent_containers/drinks/weightloss
name = "weight-loss shake"
desc = "A shake designed to cause weight loss, now in a berry-flavored formulation. The package proudly proclaims that it is 'tapeworm free.'"
icon_state = "weightshake"
list_reagents = list("lipolicide" = 30, "berryjuice" = 5)
-/obj/item/reagent_containers/food/drinks/dry_ramen
+/obj/item/reagent_containers/drinks/dry_ramen
name = "cup ramen"
desc = "Just add 10ml of water, self heats! A taste that reminds you of your school years."
icon_state = "ramen"
item_state = "ramen"
list_reagents = list("dry_ramen" = 30)
-/obj/item/reagent_containers/food/drinks/dry_ramen/Initialize(mapload)
+/obj/item/reagent_containers/drinks/dry_ramen/Initialize(mapload)
. = ..()
if(prob(20))
reagents.add_reagent("enzyme", 3)
-/obj/item/reagent_containers/food/drinks/chicken_soup
+/obj/item/reagent_containers/drinks/chicken_soup
name = "canned chicken soup"
desc = "A delicious and soothing can of chicken noodle soup; just like spessmom used to microwave it."
icon_state = "soupcan"
item_state = "soupcan"
list_reagents = list("chicken_soup" = 30)
-/obj/item/reagent_containers/food/drinks/sillycup
+/obj/item/reagent_containers/drinks/sillycup
name = "paper cup"
desc = "A paper water cup."
icon_state = "water_cup_e"
@@ -257,7 +250,7 @@
possible_transfer_amounts = null
volume = 10
-/obj/item/reagent_containers/food/drinks/sillycup/on_reagent_change()
+/obj/item/reagent_containers/drinks/sillycup/on_reagent_change()
if(reagents.total_volume)
icon_state = "water_cup"
else
@@ -268,7 +261,7 @@
// itself), in Chemistry-Recipes.dm (for the reaction that changes the components into the drink), and here (for the drinking glass
// icon states.
-/obj/item/reagent_containers/food/drinks/shaker
+/obj/item/reagent_containers/drinks/shaker
name = "shaker"
desc = "A metal shaker to mix drinks in."
icon_state = "shaker"
@@ -279,11 +272,11 @@
COOLDOWN_DECLARE(shaking_cooldown)
-/obj/item/reagent_containers/food/drinks/shaker/Initialize(mapload)
+/obj/item/reagent_containers/drinks/shaker/Initialize(mapload)
. = ..()
reagents.set_reacting(FALSE)
-/obj/item/reagent_containers/food/drinks/shaker/attack_self(mob/user)
+/obj/item/reagent_containers/drinks/shaker/attack_self(mob/user)
if(!reagents.total_volume)
to_chat(user, "You won't shake an empty shaker now, will you?")
return
@@ -313,54 +306,54 @@
shaking = FALSE
reagents.set_reacting(FALSE)
-/obj/item/reagent_containers/food/drinks/shaker/dropped(mob/user)
+/obj/item/reagent_containers/drinks/shaker/dropped(mob/user)
. = ..()
icon_state = "shaker"
-/obj/item/reagent_containers/food/drinks/flask
+/obj/item/reagent_containers/drinks/flask
name = "flask"
desc = "Every good spaceman knows it's a good idea to bring along a couple of pints of whiskey wherever they go."
icon_state = "flask"
materials = list(MAT_METAL=250)
volume = 60
-/obj/item/reagent_containers/food/drinks/flask/barflask
+/obj/item/reagent_containers/drinks/flask/barflask
name = "flask"
desc = "For those who can't be bothered to hang out at the bar to drink."
icon_state = "barflask"
-/obj/item/reagent_containers/food/drinks/flask/gold
+/obj/item/reagent_containers/drinks/flask/gold
name = "captain's flask"
desc = "A gold flask belonging to the captain."
icon_state = "flask_gold"
materials = list(MAT_GOLD=500)
-/obj/item/reagent_containers/food/drinks/flask/detflask
+/obj/item/reagent_containers/drinks/flask/detflask
name = "detective's flask"
desc = "The detective's only true friend."
icon_state = "detflask"
list_reagents = list("whiskey" = 30)
-/obj/item/reagent_containers/food/drinks/flask/hand_made
+/obj/item/reagent_containers/drinks/flask/hand_made
name = "handmade flask"
desc = "A wooden flask with a silver lid and bottom. It has a matte, dark blue paint on it with the initials \"W.H.\" etched in black."
icon = 'icons/obj/custom_items.dmi'
icon_state = "williamhackett"
materials = list()
-/obj/item/reagent_containers/food/drinks/flask/thermos
+/obj/item/reagent_containers/drinks/flask/thermos
name = "vintage thermos"
desc = "An older thermos with a faint shine."
icon_state = "thermos"
volume = 50
-/obj/item/reagent_containers/food/drinks/flask/shiny
+/obj/item/reagent_containers/drinks/flask/shiny
name = "shiny flask"
desc = "A shiny metal flask. It appears to have a Greek symbol inscribed on it."
icon_state = "shinyflask"
volume = 50
-/obj/item/reagent_containers/food/drinks/flask/lithium
+/obj/item/reagent_containers/drinks/flask/lithium
name = "lithium flask"
desc = "A flask with a Lithium Atom symbol on it."
icon = 'icons/obj/custom_items.dmi'
@@ -368,30 +361,30 @@
volume = 50
-/obj/item/reagent_containers/food/drinks/britcup
+/obj/item/reagent_containers/drinks/britcup
name = "cup"
desc = "A cup with the british flag emblazoned on it."
icon_state = "britcup"
volume = 30
-/obj/item/reagent_containers/food/drinks/bag
+/obj/item/reagent_containers/drinks/bag
name = "drink bag"
desc = "Normally put in wine boxes, or down pants at stadium events."
icon_state = "goonbag"
volume = 70
-/obj/item/reagent_containers/food/drinks/bag/goonbag
+/obj/item/reagent_containers/drinks/bag/goonbag
name = "goon from a Blue Toolbox special edition"
desc = "Wine from the land down under, where the dingos roam and the roos do wander."
icon_state = "goonbag"
list_reagents = list("wine" = 70)
-/obj/item/reagent_containers/food/drinks/oilcan
+/obj/item/reagent_containers/drinks/oilcan
name = "oil can"
desc = "Contains oil intended for use on cyborgs, robots, and other synthetics."
icon = 'icons/goonstation/objects/oil.dmi'
icon_state = "oilcan"
volume = 100
-/obj/item/reagent_containers/food/drinks/oilcan/full
+/obj/item/reagent_containers/drinks/oilcan/full
list_reagents = list("oil" = 100)
diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm
index 69128c5d568..01c99264ebf 100644
--- a/code/modules/food_and_drinks/food/condiment.dm
+++ b/code/modules/food_and_drinks/food/condiment.dm
@@ -5,7 +5,7 @@
// to mixed-drinks code. If you want an object that starts pre-loaded, you need to make it in addition to the other code.
//Food items that aren't eaten normally and leave an empty container behind.
-/obj/item/reagent_containers/food/condiment
+/obj/item/reagent_containers/condiment
name = "condiment container"
desc = "Just your average condiment container."
icon = 'icons/obj/food/containers.dmi'
@@ -38,10 +38,10 @@
"rice" = list("rice", "rice sack", "A big bag of rice. Good for cooking!"))
var/originalname = "condiment" //Can't use initial(name) for this. This stores the name set by condimasters.
-/obj/item/reagent_containers/food/condiment/attack_self(mob/user)
+/obj/item/reagent_containers/condiment/attack_self(mob/user)
return
-/obj/item/reagent_containers/food/condiment/attack(mob/M, mob/user, def_zone)
+/obj/item/reagent_containers/condiment/attack(mob/M, mob/user, def_zone)
if(!reagents || !reagents.total_volume)
to_chat(user, "None of [src] left, oh no!")
@@ -68,7 +68,7 @@
playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
return 1
-/obj/item/reagent_containers/food/condiment/afterattack(obj/target, mob/user , proximity)
+/obj/item/reagent_containers/condiment/afterattack(obj/target, mob/user , proximity)
if(!proximity)
return
if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us.
@@ -85,7 +85,7 @@
to_chat(user, "You fill [src] with [trans] units of the contents of [target].")
//Something like a glass or a food item. Player probably wants to transfer TO it.
- else if(target.is_drainable() || istype(target, /obj/item/reagent_containers/food/snacks))
+ else if(target.is_drainable() || istype(target, /obj/item/food/snacks))
if(!reagents.total_volume)
to_chat(user, "[src] is empty!")
return
@@ -95,7 +95,7 @@
var/trans = reagents.trans_to(target, amount_per_transfer_from_this)
to_chat(user, "You transfer [trans] units of the condiment to [target].")
-/obj/item/reagent_containers/food/condiment/on_reagent_change()
+/obj/item/reagent_containers/condiment/on_reagent_change()
if(!possible_states.len)
return
if(reagents.reagent_list.len > 0)
@@ -118,16 +118,16 @@
name = "condiment bottle"
desc = "An empty condiment bottle."
-/obj/item/reagent_containers/food/condiment/enzyme
+/obj/item/reagent_containers/condiment/enzyme
name = "universal enzyme"
desc = "Used in cooking various dishes."
icon_state = "enzyme"
list_reagents = list("enzyme" = 50)
-/obj/item/reagent_containers/food/condiment/enzyme/cyborg_recharge(coeff, emagged)
+/obj/item/reagent_containers/condiment/enzyme/cyborg_recharge(coeff, emagged)
reagents.check_and_add("enzyme", volume, 2 * coeff) // Only recharge if the current amount of enzyme is under `volume`.
-/obj/item/reagent_containers/food/condiment/sugar
+/obj/item/reagent_containers/condiment/sugar
name = "sugar sack"
desc = "Tasty spacey sugar!"
icon_state = "sugar"
@@ -135,7 +135,7 @@
list_reagents = list("sugar" = 50)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/saltshaker //Seperate from above since it's a small shaker rather then
+/obj/item/reagent_containers/condiment/saltshaker //Seperate from above since it's a small shaker rather then
name = "salt shaker" // a large one.
desc = "Salt. From space oceans, presumably."
icon_state = "saltshakersmall"
@@ -145,7 +145,7 @@
list_reagents = list("sodiumchloride" = 20)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/saltshaker/suicide_act(mob/user)
+/obj/item/reagent_containers/condiment/saltshaker/suicide_act(mob/user)
user.visible_message("[user] begins to swap forms with the salt shaker! It looks like [user.p_theyre()] trying to commit suicide.")
var/newname = "[name]"
name = "[user.name]"
@@ -154,7 +154,7 @@
desc = "Salt. From dead crew, presumably."
return BRUTELOSS
-/obj/item/reagent_containers/food/condiment/peppermill
+/obj/item/reagent_containers/condiment/peppermill
name = "pepper mill"
desc = "Often used to flavor food or make people sneeze."
icon_state = "peppermillsmall"
@@ -164,7 +164,7 @@
list_reagents = list("blackpepper" = 20)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/milk
+/obj/item/reagent_containers/condiment/milk
name = "space milk"
desc = "It's milk. White and nutritious goodness!"
icon_state = "milk"
@@ -172,7 +172,7 @@
list_reagents = list("milk" = 50)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/flour
+/obj/item/reagent_containers/condiment/flour
name = "flour sack"
desc = "A big bag of flour. Good for baking!"
icon_state = "flour"
@@ -180,14 +180,14 @@
list_reagents = list("flour" = 30)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/bbqsauce
+/obj/item/reagent_containers/condiment/bbqsauce
name = "BBQ sauce"
desc = "Sweet, smoky, savory, and gets everywhere. Perfect for grilling."
icon_state = "bbqsauce"
list_reagents = list("bbqsauce" = 50)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/soymilk
+/obj/item/reagent_containers/condiment/soymilk
name = "soy milk"
desc = "It's soy milk. White and nutritious goodness!"
icon_state = "soymilk"
@@ -195,7 +195,7 @@
list_reagents = list("soymilk" = 50)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/rice
+/obj/item/reagent_containers/condiment/rice
name = "rice sack"
desc = "A big bag of rice. Good for cooking!"
icon_state = "rice"
@@ -203,83 +203,83 @@
list_reagents = list("rice" = 30)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/soysauce
+/obj/item/reagent_containers/condiment/soysauce
name = "soy sauce"
desc = "A salty soy-based flavoring."
icon_state = "soysauce"
list_reagents = list("soysauce" = 50)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/syndisauce
+/obj/item/reagent_containers/condiment/syndisauce
name = "\improper Chef Excellence's Special Sauce"
desc = "A potent sauce extracted from the potent amanita mushrooms. Death never tasted quite so delicious."
list_reagents = list("amanitin" = 50)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/mayonnaise
+/obj/item/reagent_containers/condiment/mayonnaise
name = "mayonnaise"
desc = "An oily condiment made from egg yolks."
icon_state = "mayonnaise"
list_reagents = list("mayonnaise" = 50)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/cherryjelly
+/obj/item/reagent_containers/condiment/cherryjelly
name = "cherry jelly"
desc = "A sweet jelly made out of red cherries."
icon_state = "cherryjelly"
list_reagents = list("cherryjelly" = 50)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/peanutbutter
+/obj/item/reagent_containers/condiment/peanutbutter
name = "peanut butter"
desc = "A smooth, nutty spread. Perfect for sandwiches."
icon_state = "peanutbutter"
list_reagents = list("peanutbutter" = 50)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/honey
+/obj/item/reagent_containers/condiment/honey
name = "honey"
desc = "A sweet substance produced by bees."
icon_state = "honey"
list_reagents = list("honey" = 50)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/oliveoil
+/obj/item/reagent_containers/condiment/oliveoil
name = "olive oil"
desc = "A high quality oil derived from olives."
icon_state = "oliveoil"
list_reagents = list("oliveoil" = 50)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/frostoil
+/obj/item/reagent_containers/condiment/frostoil
name = "cold sauce"
desc = "A special oil that noticably chills the body. Extraced from Icepeppers."
icon_state = "coldsauce"
list_reagents = list("frostoil" = 50)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/capsaicin
+/obj/item/reagent_containers/condiment/capsaicin
name = "hot sauce"
desc = "You can almost TASTE the stomach ulcers now!"
icon_state = "hotsauce"
list_reagents = list("capsaicin" = 50)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/wasabi
+/obj/item/reagent_containers/condiment/wasabi
name = "wasabi"
desc= "A pungent paste commonly served in tiny amounts with sushi. Spicy!"
icon_state = "wasabibottle"
list_reagents = list("wasabi" = 50)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/vinegar
+/obj/item/reagent_containers/condiment/vinegar
name = "vinegar"
desc = "Useful for pickling, or putting on chips."
icon_state = "vinegar"
list_reagents = list("vinegar" = 50)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/ketchup
+/obj/item/reagent_containers/condiment/ketchup
name = "ketchup"
desc = "You feel more American already."
icon_state = "ketchup"
@@ -288,7 +288,7 @@
//Food packs. To easily apply deadly toxi... delicious sauces to your food!
-/obj/item/reagent_containers/food/condiment/pack
+/obj/item/reagent_containers/condiment/pack
name = "condiment pack"
desc = "A small plastic pack with condiments to put on your food."
icon_state = "condi_empty"
@@ -306,14 +306,14 @@
"sugar" = list("condi_sugar", "Sugar", "Tasty spacey sugar!"),
"vinegar" =list("condi_mixed", "vinegar", "Perfect for chips, if you're feeling Space British."))
-/obj/item/reagent_containers/food/condiment/pack/attack(mob/M, mob/user, def_zone) //Can't feed these to people directly.
+/obj/item/reagent_containers/condiment/pack/attack(mob/M, mob/user, def_zone) //Can't feed these to people directly.
return
-/obj/item/reagent_containers/food/condiment/pack/afterattack(obj/target, mob/user , proximity)
+/obj/item/reagent_containers/condiment/pack/afterattack(obj/target, mob/user , proximity)
if(!proximity) return
//You can tear the bag open above food to put the condiments on it, obviously.
- if(istype(target, /obj/item/reagent_containers/food/snacks))
+ if(istype(target, /obj/item/food/snacks))
if(!reagents.total_volume)
to_chat(user, "You tear open [src], but there's nothing in it.")
qdel(src)
@@ -327,7 +327,7 @@
reagents.trans_to(target, amount_per_transfer_from_this)
qdel(src)
-/obj/item/reagent_containers/food/condiment/pack/on_reagent_change()
+/obj/item/reagent_containers/condiment/pack/on_reagent_change()
if(reagents.reagent_list.len > 0)
var/main_reagent = reagents.get_master_reagent_id()
if(main_reagent in possible_states)
@@ -342,13 +342,13 @@
desc = "A small condiment pack. It is empty."
//Ketchup
-/obj/item/reagent_containers/food/condiment/pack/ketchup
+/obj/item/reagent_containers/condiment/pack/ketchup
name = "ketchup pack"
originalname = "ketchup"
list_reagents = list("ketchup" = 10)
//Hot sauce
-/obj/item/reagent_containers/food/condiment/pack/hotsauce
+/obj/item/reagent_containers/condiment/pack/hotsauce
name = "hotsauce pack"
originalname = "hotsauce"
list_reagents = list("capsaicin" = 10)
diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm
index 4dd12564d29..8d22dd0d9db 100644
--- a/code/modules/food_and_drinks/food/customizables.dm
+++ b/code/modules/food_and_drinks/food/customizables.dm
@@ -1,40 +1,40 @@
#define MAKE_CUSTOM_FOOD(snack_to_add, user, type) \
do {\
- var/obj/item/reagent_containers/food/snacks/customizable/custom_snack = new type(get_turf(user));\
+ var/obj/item/food/snacks/customizable/custom_snack = new type(get_turf(user));\
custom_snack.add_ingredient(snack_to_add, user); \
user.put_in_active_hand(custom_snack); \
qdel(src);\
} while(FALSE)
-/obj/item/reagent_containers/food/snacks/breadslice/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/reagent_containers/food/snacks) && !(W.flags & NODROP))
- MAKE_CUSTOM_FOOD(W, user, /obj/item/reagent_containers/food/snacks/customizable/sandwich)
+/obj/item/food/snacks/breadslice/attackby(obj/item/W, mob/user, params)
+ if(istype(W, /obj/item/food/snacks) && !(W.flags & NODROP))
+ MAKE_CUSTOM_FOOD(W, user, /obj/item/food/snacks/customizable/sandwich)
return
..()
-/obj/item/reagent_containers/food/snacks/bun/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/reagent_containers/food/snacks) && !(W.flags & NODROP))
- MAKE_CUSTOM_FOOD(W, user, /obj/item/reagent_containers/food/snacks/customizable/burger)
+/obj/item/food/snacks/bun/attackby(obj/item/W, mob/user, params)
+ if(istype(W, /obj/item/food/snacks) && !(W.flags & NODROP))
+ MAKE_CUSTOM_FOOD(W, user, /obj/item/food/snacks/customizable/burger)
return
..()
-/obj/item/reagent_containers/food/snacks/sliceable/flatdough/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/reagent_containers/food/snacks) && !(W.flags & NODROP))
- MAKE_CUSTOM_FOOD(W, user, /obj/item/reagent_containers/food/snacks/customizable/pizza)
+/obj/item/food/snacks/sliceable/flatdough/attackby(obj/item/W, mob/user, params)
+ if(istype(W, /obj/item/food/snacks) && !(W.flags & NODROP))
+ MAKE_CUSTOM_FOOD(W, user, /obj/item/food/snacks/customizable/pizza)
return
..()
-/obj/item/reagent_containers/food/snacks/boiledspaghetti/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/reagent_containers/food/snacks) && !(W.flags & NODROP))
- MAKE_CUSTOM_FOOD(W, user, /obj/item/reagent_containers/food/snacks/customizable/pasta)
+/obj/item/food/snacks/boiledspaghetti/attackby(obj/item/W, mob/user, params)
+ if(istype(W, /obj/item/food/snacks) && !(W.flags & NODROP))
+ MAKE_CUSTOM_FOOD(W, user, /obj/item/food/snacks/customizable/pasta)
return
..()
/obj/item/trash/plate/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/reagent_containers/food/snacks) && !(W.flags & NODROP))
- MAKE_CUSTOM_FOOD(W, user, /obj/item/reagent_containers/food/snacks/customizable/fullycustom)
+ if(istype(W, /obj/item/food/snacks) && !(W.flags & NODROP))
+ MAKE_CUSTOM_FOOD(W, user, /obj/item/food/snacks/customizable/fullycustom)
return
..()
@@ -47,14 +47,14 @@ do {\
icon_state = "soup"
/obj/item/trash/bowl/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/reagent_containers/food/snacks) && !(I.flags & NODROP))
- var/obj/item/reagent_containers/food/snacks/customizable/soup/S = new(get_turf(user))
+ if(istype(I, /obj/item/food/snacks) && !(I.flags & NODROP))
+ var/obj/item/food/snacks/customizable/soup/S = new(get_turf(user))
S.attackby(I, user, params)
qdel(src)
else
..()
-/obj/item/reagent_containers/food/snacks/customizable
+/obj/item/food/snacks/customizable
name = "sandwich"
desc = "A sandwich! A timeless classic."
icon = 'icons/obj/food/custom.dmi'
@@ -74,20 +74,20 @@ do {\
var/list/ingredients = list()
list_reagents = list("nutriment" = 8)
-/obj/item/reagent_containers/food/snacks/customizable/Initialize(mapload)
+/obj/item/food/snacks/customizable/Initialize(mapload)
. = ..()
if(top)
top_image = new(icon, "[baseicon]_top")
add_overlay(top_image)
-/obj/item/reagent_containers/food/snacks/customizable/sandwich
+/obj/item/food/snacks/customizable/sandwich
name = "sandwich"
desc = "A sandwich! A timeless classic."
icon_state = "sandwichcustom"
baseicon = "sandwichcustom"
basename = "sandwich"
-/obj/item/reagent_containers/food/snacks/customizable/pizza
+/obj/item/food/snacks/customizable/pizza
name = "personal pizza"
desc = "A personalized pan pizza meant for only one person."
icon_state = "personal_pizza"
@@ -97,7 +97,7 @@ do {\
top = 0
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1)
-/obj/item/reagent_containers/food/snacks/customizable/pasta
+/obj/item/food/snacks/customizable/pasta
name = "spaghetti"
desc = "Noodles. With stuff. Delicious."
icon_state = "pasta_bot"
@@ -106,7 +106,7 @@ do {\
snack_overlays = 0
top = 0
-/obj/item/reagent_containers/food/snacks/customizable/cook/bread
+/obj/item/food/snacks/customizable/cook/bread
name = "bread"
desc = "Tasty bread."
icon_state = "breadcustom"
@@ -116,7 +116,7 @@ do {\
top = 0
tastes = list("bread" = 10)
-/obj/item/reagent_containers/food/snacks/customizable/cook/pie
+/obj/item/food/snacks/customizable/cook/pie
name = "pie"
desc = "Tasty pie."
icon_state = "piecustom"
@@ -126,7 +126,7 @@ do {\
top = 0
tastes = list("pie" = 1)
-/obj/item/reagent_containers/food/snacks/customizable/cook/cake
+/obj/item/food/snacks/customizable/cook/cake
name = "cake"
desc = "A popular band."
icon_state = "cakecustom"
@@ -136,7 +136,7 @@ do {\
top = 0
tastes = list("cake" = 1)
-/obj/item/reagent_containers/food/snacks/customizable/cook/jelly
+/obj/item/food/snacks/customizable/cook/jelly
name = "jelly"
desc = "Totally jelly."
icon_state = "jellycustom"
@@ -145,7 +145,7 @@ do {\
snack_overlays = 0
top = 0
-/obj/item/reagent_containers/food/snacks/customizable/cook/donkpocket
+/obj/item/food/snacks/customizable/cook/donkpocket
name = "donk pocket"
desc = "You wanna put a bangin-Oh nevermind."
icon_state = "donkcustom"
@@ -154,7 +154,7 @@ do {\
snack_overlays = 0
top = 0
-/obj/item/reagent_containers/food/snacks/customizable/cook/kebab
+/obj/item/food/snacks/customizable/cook/kebab
name = "kebab"
desc = "Kebab or Kabab?"
icon_state = "kababcustom"
@@ -164,7 +164,7 @@ do {\
top = 0
tastes = list("meat" = 3, "metal" = 1)
-/obj/item/reagent_containers/food/snacks/customizable/cook/salad
+/obj/item/food/snacks/customizable/cook/salad
name = "salad"
desc = "Very tasty."
icon_state = "saladcustom"
@@ -174,7 +174,7 @@ do {\
top = 0
tastes = list("leaves" = 1)
-/obj/item/reagent_containers/food/snacks/customizable/cook/waffles
+/obj/item/food/snacks/customizable/cook/waffles
name = "waffles"
desc = "Made with love."
icon_state = "wafflecustom"
@@ -184,7 +184,7 @@ do {\
top = 0
tastes = list("waffles" = 1)
-/obj/item/reagent_containers/food/snacks/customizable/candy/cookie
+/obj/item/food/snacks/customizable/candy/cookie
name = "cookie"
desc = "COOKIE!!1!"
icon_state = "cookiecustom"
@@ -194,7 +194,7 @@ do {\
top = 0
tastes = list("cookie" = 1)
-/obj/item/reagent_containers/food/snacks/customizable/candy/cotton
+/obj/item/food/snacks/customizable/candy/cotton
name = "flavored cotton candy"
desc = "Who can take a sunrise, sprinkle it with dew,"
icon_state = "cottoncandycustom"
@@ -203,7 +203,7 @@ do {\
snack_overlays = 0
top = 0
-/obj/item/reagent_containers/food/snacks/customizable/candy/gummybear
+/obj/item/food/snacks/customizable/candy/gummybear
name = "flavored giant gummy bear"
desc = "Cover it in chocolate and a miracle or two,"
icon_state = "gummybearcustom"
@@ -212,7 +212,7 @@ do {\
snack_overlays = 0
top = 0
-/obj/item/reagent_containers/food/snacks/customizable/candy/gummyworm
+/obj/item/food/snacks/customizable/candy/gummyworm
name = "flavored giant gummy worm"
desc = "The Candy Man can 'cause he mixes it with love,"
icon_state = "gummywormcustom"
@@ -221,7 +221,7 @@ do {\
snack_overlays = 0
top = 0
-/obj/item/reagent_containers/food/snacks/customizable/candy/jellybean
+/obj/item/food/snacks/customizable/candy/jellybean
name = "flavored giant jelly bean"
desc = "And makes the world taste good."
icon_state = "jellybeancustom"
@@ -230,7 +230,7 @@ do {\
snack_overlays = 0
top = 0
-/obj/item/reagent_containers/food/snacks/customizable/candy/jawbreaker
+/obj/item/food/snacks/customizable/candy/jawbreaker
name = "flavored jawbreaker"
desc = "Who can take a rainbow, Wrap it in a sigh,"
icon_state = "jawbreakercustom"
@@ -239,7 +239,7 @@ do {\
snack_overlays = 0
top = 0
-/obj/item/reagent_containers/food/snacks/customizable/candy/candycane
+/obj/item/food/snacks/customizable/candy/candycane
name = "flavored candy cane"
desc = "Soak it in the sun and make strawberry-lemon pie,"
icon_state = "candycanecustom"
@@ -248,7 +248,7 @@ do {\
snack_overlays = 0
top = 0
-/obj/item/reagent_containers/food/snacks/customizable/candy/gum
+/obj/item/food/snacks/customizable/candy/gum
name = "flavored gum"
desc = "The Candy Man can 'cause he mixes it with love and makes the world taste good. And the world tastes good 'cause the Candy Man thinks it should..."
icon_state = "gumcustom"
@@ -257,7 +257,7 @@ do {\
snack_overlays = 0
top = 0
-/obj/item/reagent_containers/food/snacks/customizable/candy/donut
+/obj/item/food/snacks/customizable/candy/donut
name = "filled donut"
desc = "Donut eat this!" // kill me
icon_state = "donutcustom"
@@ -266,7 +266,7 @@ do {\
snack_overlays = 0
top = 0
-/obj/item/reagent_containers/food/snacks/customizable/candy/bar
+/obj/item/food/snacks/customizable/candy/bar
name = "flavored chocolate bar"
desc = "Made in a factory downtown."
icon_state = "barcustom"
@@ -275,7 +275,7 @@ do {\
snack_overlays = 0
top = 0
-/obj/item/reagent_containers/food/snacks/customizable/candy/sucker
+/obj/item/food/snacks/customizable/candy/sucker
name = "flavored sucker"
desc = "Suck suck suck."
icon_state = "suckercustom"
@@ -284,7 +284,7 @@ do {\
snack_overlays = 0
top = 0
-/obj/item/reagent_containers/food/snacks/customizable/candy/cash
+/obj/item/food/snacks/customizable/candy/cash
name = "flavored chocolate cash"
desc = "I got piles!"
icon_state = "cashcustom"
@@ -293,7 +293,7 @@ do {\
snack_overlays = 0
top = 0
-/obj/item/reagent_containers/food/snacks/customizable/candy/coin
+/obj/item/food/snacks/customizable/candy/coin
name = "flavored chocolate coin"
desc = "Clink, clink, clink."
icon_state = "coincustom"
@@ -302,7 +302,7 @@ do {\
snack_overlays = 0
top = 0
-/obj/item/reagent_containers/food/snacks/customizable/fullycustom // In the event you fuckers find something I forgot to add a customizable food for.
+/obj/item/food/snacks/customizable/fullycustom // In the event you fuckers find something I forgot to add a customizable food for.
name = "on a plate"
desc = "A unique dish."
icon_state = "fullycustom"
@@ -313,7 +313,7 @@ do {\
ingredient_limit = 20
fullycustom = 1
-/obj/item/reagent_containers/food/snacks/customizable/soup
+/obj/item/food/snacks/customizable/soup
name = "soup"
desc = "A bowl with liquid and... stuff in it."
icon_state = "soup"
@@ -325,7 +325,7 @@ do {\
top = 0
tastes = list("soup" = 1)
-/obj/item/reagent_containers/food/snacks/customizable/burger
+/obj/item/food/snacks/customizable/burger
name = "burger bun"
desc = "A bun for a burger. Delicious."
icon_state = "burgercustom"
@@ -334,8 +334,8 @@ do {\
tastes = list("bun" = 4)
-/obj/item/reagent_containers/food/snacks/customizable/attackby(obj/item/I, mob/user, params)
- if(!istype(I, /obj/item/reagent_containers/food/snacks))
+/obj/item/food/snacks/customizable/attackby(obj/item/I, mob/user, params)
+ if(!istype(I, /obj/item/food/snacks))
to_chat(user, "[I] isn't exactly something that you would want to eat.")
return
@@ -347,14 +347,14 @@ do {\
* Arguments:
* * snack - The ingredient that will be added
*/
-/obj/item/reagent_containers/food/snacks/customizable/proc/add_ingredient(obj/item/reagent_containers/food/snacks/snack, mob/user)
+/obj/item/food/snacks/customizable/proc/add_ingredient(obj/item/food/snacks/snack, mob/user)
if(length(ingredients) > ingredient_limit)
to_chat(user, "If you put anything else in or on [src] it's going to make a mess.")
return
// Fully custom snacks don't add the ingredients. So no need to check
- if(!fullycustom && istype(snack, /obj/item/reagent_containers/food/snacks/customizable))
- var/obj/item/reagent_containers/food/snacks/customizable/origin = snack
+ if(!fullycustom && istype(snack, /obj/item/food/snacks/customizable))
+ var/obj/item/food/snacks/customizable/origin = snack
if(length(ingredients) + length(origin.ingredients) > ingredient_limit)
to_chat(user, "Merging [snack] and [src] together is going to make a mess.")
return
@@ -369,8 +369,8 @@ do {\
var/list/added_ingredients = list(snack)
// Only merge when it is not fullycustom. Else it looks weird
- if(!fullycustom && istype(snack, /obj/item/reagent_containers/food/snacks/customizable))
- var/obj/item/reagent_containers/food/snacks/customizable/origin = snack
+ if(!fullycustom && istype(snack, /obj/item/food/snacks/customizable))
+ var/obj/item/food/snacks/customizable/origin = snack
added_ingredients += origin.ingredients
origin.ingredients.Cut()
origin.name = initial(origin.name) // Reset the name for the examine text
@@ -387,12 +387,12 @@ do {\
* Arguments:
* * new_ingredients - The new ingredients to be added
*/
-/obj/item/reagent_containers/food/snacks/customizable/proc/add_ingredients(list/new_ingredients)
+/obj/item/food/snacks/customizable/proc/add_ingredients(list/new_ingredients)
cut_overlay(top_image) // Remove the top image so we can change it again
var/ingredient_num = length(ingredients)
ingredients += new_ingredients
- for(var/obj/item/reagent_containers/food/snacks/food as anything in new_ingredients)
+ for(var/obj/item/food/snacks/food as anything in new_ingredients)
ingredient_num++
var/image/ingredient_image
if(!fullycustom)
@@ -418,20 +418,20 @@ do {\
add_overlay(top_image)
-/obj/item/reagent_containers/food/snacks/customizable/Destroy()
+/obj/item/food/snacks/customizable/Destroy()
QDEL_LIST_CONTENTS(ingredients)
qdel(top_image)
return ..()
-/obj/item/reagent_containers/food/snacks/customizable/examine(mob/user)
+/obj/item/food/snacks/customizable/examine(mob/user)
. = ..()
if(LAZYLEN(ingredients))
var/whatsinside = pick(ingredients)
. += " You think you can see [whatsinside] in there."
-/obj/item/reagent_containers/food/snacks/customizable/proc/newname()
+/obj/item/food/snacks/customizable/proc/newname()
var/unsorteditems[0]
var/sorteditems[0]
var/unsortedtypes[0]
@@ -449,8 +449,8 @@ do {\
continue
- if(istype(ing, /obj/item/reagent_containers/food/snacks/customizable)) // split the ingredients into ones with basenames (sandwich, burger, etc) and ones without, keeping track of how many of each there are
- var/obj/item/reagent_containers/food/snacks/customizable/gettype = ing
+ if(istype(ing, /obj/item/food/snacks/customizable)) // split the ingredients into ones with basenames (sandwich, burger, etc) and ones without, keeping track of how many of each there are
+ var/obj/item/food/snacks/customizable/gettype = ing
if(unsortedtypes[gettype.basename])
unsortedtypes[gettype.basename]++
if(unsortedtypes[gettype.basename] > ct)
@@ -511,7 +511,7 @@ do {\
sendback = "[pick(list("absurd","colossal","enormous","ridiculous","massive","oversized","cardiac-arresting","pipe-clogging","edible but sickening","sickening","gargantuan","mega","belly-burster","chest-burster"))] [basename]"
return sendback
-/obj/item/reagent_containers/food/snacks/customizable/proc/sortlist(list/unsorted, highest)
+/obj/item/food/snacks/customizable/proc/sortlist(list/unsorted, highest)
var/sorted[0]
for(var/i = 1, i<= highest, i++)
for(var/it in unsorted)
diff --git a/code/modules/food_and_drinks/food/foods/baked_goods.dm b/code/modules/food_and_drinks/food/foods/baked_goods.dm
index 3cb816deaf6..a4ab2d626ba 100644
--- a/code/modules/food_and_drinks/food/foods/baked_goods.dm
+++ b/code/modules/food_and_drinks/food/foods/baked_goods.dm
@@ -5,19 +5,19 @@
// Cakes //
//////////////////////
-/obj/item/reagent_containers/food/snacks/sliceable/carrotcake
+/obj/item/food/snacks/sliceable/carrotcake
name = "carrot cake"
desc = "A favorite desert of a certain wascally wabbit. Not a lie."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "carrotcake"
- slice_path = /obj/item/reagent_containers/food/snacks/carrotcakeslice
+ slice_path = /obj/item/food/snacks/carrotcakeslice
slices_num = 5
bitesize = 3
filling_color = "#FFD675"
list_reagents = list("nutriment" = 20, "oculine" = 10, "vitamin" = 5)
tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1)
-/obj/item/reagent_containers/food/snacks/carrotcakeslice
+/obj/item/food/snacks/carrotcakeslice
name = "carrot cake slice"
desc = "Carrotty slice of Carrot Cake, carrots are good for your eyes! Also not a lie."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -27,19 +27,19 @@
tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1)
-/obj/item/reagent_containers/food/snacks/sliceable/braincake
+/obj/item/food/snacks/sliceable/braincake
name = "brain cake"
desc = "A squishy cake-thing."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "braincake"
- slice_path = /obj/item/reagent_containers/food/snacks/braincakeslice
+ slice_path = /obj/item/food/snacks/braincakeslice
slices_num = 5
filling_color = "#E6AEDB"
bitesize = 3
list_reagents = list("protein" = 10, "nutriment" = 10, "mannitol" = 10, "vitamin" = 5)
tastes = list("cake" = 5, "sweetness" = 2, "brains" = 1)
-/obj/item/reagent_containers/food/snacks/braincakeslice
+/obj/item/food/snacks/braincakeslice
name = "brain cake slice"
desc = "Lemme tell you something about brains. THEY'RE DELICIOUS."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -48,19 +48,19 @@
filling_color = "#E6AEDB"
tastes = list("cake" = 5, "sweetness" = 2, "brains" = 1)
-/obj/item/reagent_containers/food/snacks/sliceable/cheesecake
+/obj/item/food/snacks/sliceable/cheesecake
name = "cheese cake"
desc = "DANGEROUSLY cheesy."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "cheesecake"
- slice_path = /obj/item/reagent_containers/food/snacks/cheesecakeslice
+ slice_path = /obj/item/food/snacks/cheesecakeslice
slices_num = 5
filling_color = "#FAF7AF"
bitesize = 3
list_reagents = list("nutriment" = 20, "vitamin" = 5)
tastes = list("cake" = 4, "cream cheese" = 3)
-/obj/item/reagent_containers/food/snacks/cheesecakeslice
+/obj/item/food/snacks/cheesecakeslice
name = "cheese cake slice"
desc = "Slice of pure cheestisfaction."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -69,19 +69,19 @@
filling_color = "#FAF7AF"
tastes = list("cake" = 4, "cream cheese" = 3)
-/obj/item/reagent_containers/food/snacks/sliceable/plaincake
+/obj/item/food/snacks/sliceable/plaincake
name = "vanilla cake"
desc = "A plain cake, not a lie."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "plaincake"
- slice_path = /obj/item/reagent_containers/food/snacks/plaincakeslice
+ slice_path = /obj/item/food/snacks/plaincakeslice
slices_num = 5
bitesize = 3
filling_color = "#F7EDD5"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
tastes = list("cake" = 5, "vanilla" = 1, "sweetness" = 2)
-/obj/item/reagent_containers/food/snacks/plaincakeslice
+/obj/item/food/snacks/plaincakeslice
name = "vanilla cake slice"
desc = "Just a slice of cake, it is enough for everyone."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -90,19 +90,19 @@
filling_color = "#F7EDD5"
tastes = list("cake" = 5, "vanilla" = 1, "sweetness" = 2)
-/obj/item/reagent_containers/food/snacks/sliceable/orangecake
+/obj/item/food/snacks/sliceable/orangecake
name = "orange cake"
desc = "A cake with added orange."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "orangecake"
- slice_path = /obj/item/reagent_containers/food/snacks/orangecakeslice
+ slice_path = /obj/item/food/snacks/orangecakeslice
slices_num = 5
bitesize = 3
filling_color = "#FADA8E"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
tastes = list("cake" = 5, "sweetness" = 2, "oranges" = 2)
-/obj/item/reagent_containers/food/snacks/orangecakeslice
+/obj/item/food/snacks/orangecakeslice
name = "orange cake slice"
desc = "Just a slice of cake, it is enough for everyone."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -111,19 +111,19 @@
filling_color = "#FADA8E"
tastes = list("cake" = 5, "sweetness" = 2, "oranges" = 2)
-/obj/item/reagent_containers/food/snacks/sliceable/bananacake
+/obj/item/food/snacks/sliceable/bananacake
name = "banana cake"
desc = "A cake with added bananas."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "bananacake"
- slice_path = /obj/item/reagent_containers/food/snacks/bananacakeslice
+ slice_path = /obj/item/food/snacks/bananacakeslice
slices_num = 5
bitesize = 3
filling_color = "#FADA8E"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
tastes = list("cake" = 5, "sweetness" = 2, "banana" = 2)
-/obj/item/reagent_containers/food/snacks/bananacakeslice
+/obj/item/food/snacks/bananacakeslice
name = "banana cake slice"
desc = "Just a slice of cake, it is enough for everyone."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -132,19 +132,19 @@
filling_color = "#FADA8E"
tastes = list("cake" = 5, "sweetness" = 2, "banana" = 2)
-/obj/item/reagent_containers/food/snacks/sliceable/limecake
+/obj/item/food/snacks/sliceable/limecake
name = "lime cake"
desc = "A cake with added lime."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "limecake"
bitesize = 3
- slice_path = /obj/item/reagent_containers/food/snacks/limecakeslice
+ slice_path = /obj/item/food/snacks/limecakeslice
slices_num = 5
filling_color = "#CBFA8E"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2)
-/obj/item/reagent_containers/food/snacks/limecakeslice
+/obj/item/food/snacks/limecakeslice
name = "lime cake slice"
desc = "Just a slice of cake, it is enough for everyone."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -153,19 +153,19 @@
filling_color = "#CBFA8E"
tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2)
-/obj/item/reagent_containers/food/snacks/sliceable/lemoncake
+/obj/item/food/snacks/sliceable/lemoncake
name = "lemon cake"
desc = "A cake with added lemon."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "lemoncake"
- slice_path = /obj/item/reagent_containers/food/snacks/lemoncakeslice
+ slice_path = /obj/item/food/snacks/lemoncakeslice
slices_num = 5
bitesize = 3
filling_color = "#FAFA8E"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
tastes = list("cake" = 5, "sweetness" = 2, "sourness" = 2)
-/obj/item/reagent_containers/food/snacks/lemoncakeslice
+/obj/item/food/snacks/lemoncakeslice
name = "lemon cake slice"
desc = "Just a slice of cake, it is enough for everyone."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -174,19 +174,19 @@
filling_color = "#FAFA8E"
tastes = list("cake" = 5, "sweetness" = 2, "sourness" = 2)
-/obj/item/reagent_containers/food/snacks/sliceable/chocolatecake
+/obj/item/food/snacks/sliceable/chocolatecake
name = "chocolate cake"
desc = "A cake with added chocolate."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "chocolatecake"
- slice_path = /obj/item/reagent_containers/food/snacks/chocolatecakeslice
+ slice_path = /obj/item/food/snacks/chocolatecakeslice
slices_num = 5
bitesize = 3
filling_color = "#805930"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
tastes = list("cake" = 5, "sweetness" = 1, "chocolate" = 4)
-/obj/item/reagent_containers/food/snacks/chocolatecakeslice
+/obj/item/food/snacks/chocolatecakeslice
name = "chocolate cake slice"
desc = "Just a slice of cake, it is enough for everyone."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -195,19 +195,19 @@
filling_color = "#805930"
tastes = list("cake" = 5, "sweetness" = 1, "chocolate" = 4)
-/obj/item/reagent_containers/food/snacks/sliceable/birthdaycake
+/obj/item/food/snacks/sliceable/birthdaycake
name = "birthday cake"
desc = "Happy Birthday..."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "birthdaycake"
- slice_path = /obj/item/reagent_containers/food/snacks/birthdaycakeslice
+ slice_path = /obj/item/food/snacks/birthdaycakeslice
slices_num = 5
filling_color = "#FFD6D6"
bitesize = 3
list_reagents = list("nutriment" = 20, "sprinkles" = 10, "vitamin" = 5)
tastes = list("cake" = 5, "sweetness" = 1)
-/obj/item/reagent_containers/food/snacks/birthdaycakeslice
+/obj/item/food/snacks/birthdaycakeslice
name = "birthday cake slice"
desc = "A slice of your birthday"
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -216,19 +216,19 @@
filling_color = "#FFD6D6"
tastes = list("cake" = 5, "sweetness" = 1)
-/obj/item/reagent_containers/food/snacks/sliceable/applecake
+/obj/item/food/snacks/sliceable/applecake
name = "apple cake"
desc = "A cake centered with Apple."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "applecake"
- slice_path = /obj/item/reagent_containers/food/snacks/applecakeslice
+ slice_path = /obj/item/food/snacks/applecakeslice
slices_num = 5
bitesize = 3
filling_color = "#EBF5B8"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
tastes = list("cake" = 5, "sweetness" = 1, "apple" = 1)
-/obj/item/reagent_containers/food/snacks/applecakeslice
+/obj/item/food/snacks/applecakeslice
name = "apple cake slice"
desc = "A slice of heavenly cake."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -242,7 +242,7 @@
// Cookies //
//////////////////////
-/obj/item/reagent_containers/food/snacks/cookie
+/obj/item/food/snacks/cookie
name = "cookie"
desc = "COOKIE!!!"
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -252,7 +252,7 @@
list_reagents = list("nutriment" = 1, "sugar" = 3, "hot_coco" = 5 )
tastes = list("cookie" = 1, "crunchy chocolate" = 1)
-/obj/item/reagent_containers/food/snacks/fortunecookie
+/obj/item/food/snacks/fortunecookie
name = "fortune cookie"
desc = "A true prophecy in each cookie!"
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -262,7 +262,7 @@
trash = /obj/item/paper/fortune
tastes = list("cookie" = 1)
-/obj/item/reagent_containers/food/snacks/sugarcookie
+/obj/item/food/snacks/sugarcookie
name = "sugar cookie"
desc = "Just like your little sister used to make."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -275,7 +275,7 @@
// Pies //
//////////////////////
-/obj/item/reagent_containers/food/snacks/pie
+/obj/item/food/snacks/pie
name = "banana cream pie"
desc = "One of the five essential food groups of clowns."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -286,13 +286,13 @@
list_reagents = list("nutriment" = 6, "banana" = 5, "vitamin" = 2)
tastes = list("pie" = 1)
-/obj/item/reagent_containers/food/snacks/pie/throw_impact(atom/hit_atom)
+/obj/item/food/snacks/pie/throw_impact(atom/hit_atom)
..()
new/obj/effect/decal/cleanable/pie_smudge(loc)
visible_message("[src] splats.","You hear a splat.")
qdel(src)
-/obj/item/reagent_containers/food/snacks/meatpie
+/obj/item/food/snacks/meatpie
name = "meat-pie"
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "meatpie"
@@ -303,7 +303,7 @@
list_reagents = list("nutriment" = 10, "vitamin" = 2)
tastes = list("pie" = 1, "meat" = 1)
-/obj/item/reagent_containers/food/snacks/tofupie
+/obj/item/food/snacks/tofupie
name = "tofu-pie"
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "meatpie"
@@ -314,7 +314,7 @@
list_reagents = list("nutriment" = 10, "vitamin" = 2)
tastes = list("pie" = 1, "tofu" = 1)
-/obj/item/reagent_containers/food/snacks/amanita_pie
+/obj/item/food/snacks/amanita_pie
name = "amanita pie"
desc = "Sweet and tasty poison pie."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -324,7 +324,7 @@
list_reagents = list("nutriment" = 6, "amanitin" = 3, "psilocybin" = 1, "vitamin" = 4)
tastes = list("pie" = 1, "mushroom" = 1)
-/obj/item/reagent_containers/food/snacks/plump_pie
+/obj/item/food/snacks/plump_pie
name = "plump pie"
desc = "I bet you love stuff made out of plump helmets!"
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -334,14 +334,14 @@
list_reagents = list("nutriment" = 10, "vitamin" = 2)
tastes = list("pie" = 1, "mushroom" = 1)
-/obj/item/reagent_containers/food/snacks/plump_pie/Initialize(mapload)
+/obj/item/food/snacks/plump_pie/Initialize(mapload)
. = ..()
if(prob(10))
name = "exceptional plump pie"
desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump pie!" // What
reagents.add_reagent("omnizine", 5)
-/obj/item/reagent_containers/food/snacks/xemeatpie
+/obj/item/food/snacks/xemeatpie
name = "xeno-pie"
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "xenomeatpie"
@@ -352,7 +352,7 @@
tastes = list("pie" = 1, "meat" = 1, "acid" = 1)
-/obj/item/reagent_containers/food/snacks/applepie
+/obj/item/food/snacks/applepie
name = "apple pie"
desc = "A pie containing sweet sweet love... or apple."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -363,7 +363,7 @@
tastes = list("pie" = 1, "apple" = 1)
-/obj/item/reagent_containers/food/snacks/cherrypie
+/obj/item/food/snacks/cherrypie
name = "cherry pie"
desc = "Taste so good, make a grown man cry."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -373,19 +373,19 @@
list_reagents = list("nutriment" = 10, "vitamin" = 2)
tastes = list("pie" = 1, "cherries" = 1)
-/obj/item/reagent_containers/food/snacks/sliceable/pumpkinpie
+/obj/item/food/snacks/sliceable/pumpkinpie
name = "pumpkin pie"
desc = "A delicious treat for the autumn months."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "pumpkinpie"
- slice_path = /obj/item/reagent_containers/food/snacks/pumpkinpieslice
+ slice_path = /obj/item/food/snacks/pumpkinpieslice
slices_num = 5
bitesize = 3
filling_color = "#F5B951"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
tastes = list("pie" = 1, "pumpkin" = 1)
-/obj/item/reagent_containers/food/snacks/pumpkinpieslice
+/obj/item/food/snacks/pumpkinpieslice
name = "pumpkin pie slice"
desc = "A slice of pumpkin pie, with whipped cream on top. Perfection."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -398,7 +398,7 @@
// Donuts //
//////////////////////
-/obj/item/reagent_containers/food/snacks/donut
+/obj/item/food/snacks/donut
name = "donut"
desc = "Goes great with Robust Coffee."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -411,7 +411,7 @@
var/donut_sprite_type = DONUT_NORMAL
tastes = list("donut" = 1)
-/obj/item/reagent_containers/food/snacks/donut/Initialize(mapload)
+/obj/item/food/snacks/donut/Initialize(mapload)
. = ..()
if(randomized_sprinkles && prob(30))
icon_state = "donut2"
@@ -420,7 +420,7 @@
donut_sprite_type = DONUT_FROSTED
filling_color = "#FF69B4"
-/obj/item/reagent_containers/food/snacks/donut/sprinkles
+/obj/item/food/snacks/donut/sprinkles
name = "frosted donut"
icon_state = "donut2"
list_reagents = list("nutriment" = 3, "sugar" = 2, "sprinkles" = 2)
@@ -428,13 +428,13 @@
donut_sprite_type = DONUT_FROSTED
randomized_sprinkles = 0
-/obj/item/reagent_containers/food/snacks/donut/chaos
+/obj/item/food/snacks/donut/chaos
name = "chaos donut"
desc = "Like life, it never quite tastes the same."
bitesize = 10
tastes = list("donut" = 3, "chaos" = 1)
-/obj/item/reagent_containers/food/snacks/donut/chaos/Initialize(mapload)
+/obj/item/food/snacks/donut/chaos/Initialize(mapload)
. = ..()
extra_reagent = pick("nutriment", "capsaicin", "frostoil", "krokodil", "plasma", "cocoa", "slimejelly", "banana", "berryjuice", "omnizine")
reagents.add_reagent("[extra_reagent]", 3)
@@ -444,14 +444,14 @@
reagents.add_reagent("sprinkles", 2)
filling_color = "#FF69B4"
-/obj/item/reagent_containers/food/snacks/donut/jelly
+/obj/item/food/snacks/donut/jelly
name = "jelly donut"
desc = "You jelly?"
icon_state = "jdonut1"
extra_reagent = "berryjuice"
tastes = list("jelly" = 1, "donut" = 3)
-/obj/item/reagent_containers/food/snacks/donut/jelly/Initialize(mapload)
+/obj/item/food/snacks/donut/jelly/Initialize(mapload)
. = ..()
if(extra_reagent)
reagents.add_reagent("[extra_reagent]", 3)
@@ -462,13 +462,13 @@
reagents.add_reagent("sprinkles", 2)
filling_color = "#FF69B4"
-/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly
+/obj/item/food/snacks/donut/jelly/slimejelly
name = "jelly donut"
desc = "You jelly?"
icon_state = "jdonut1"
extra_reagent = "slimejelly"
-/obj/item/reagent_containers/food/snacks/donut/jelly/cherryjelly
+/obj/item/food/snacks/donut/jelly/cherryjelly
name = "jelly donut"
desc = "You jelly?"
icon_state = "jdonut1"
@@ -478,7 +478,7 @@
// Pancakes //
//////////////////////
-/obj/item/reagent_containers/food/snacks/pancake
+/obj/item/food/snacks/pancake
name = "pancake"
desc = "A plain pancake."
icon = 'icons/obj/food/breakfast.dmi'
@@ -488,7 +488,7 @@
list_reagents = list("nutriment" = 3, "sugar" = 3)
tastes = list("sweet cake" = 1)
-/obj/item/reagent_containers/food/snacks/pancake/attack_tk(mob/user)
+/obj/item/food/snacks/pancake/attack_tk(mob/user)
if(src in user.tkgrabbed_objects)
to_chat(user, "You start channeling psychic energy into [src].")
visible_message("The syrup on [src] starts to boil...")
@@ -503,14 +503,14 @@
return
return ..()
-/obj/item/reagent_containers/food/snacks/pancake/berry_pancake
+/obj/item/food/snacks/pancake/berry_pancake
name = "berry pancake"
desc = "A pancake loaded with berries."
icon_state = "berry_pancake"
list_reagents = list("nutriment" = 3, "sugar" = 3, "berryjuice" = 3)
tastes = list("sweet cake" = 2, "berries" = 2)
-/obj/item/reagent_containers/food/snacks/pancake/choc_chip_pancake
+/obj/item/food/snacks/pancake/choc_chip_pancake
name = "choc-chip pancake"
desc = "A pancake loaded with chocolate chips."
icon_state = "choc_chip_pancake"
@@ -521,7 +521,7 @@
// Misc //
//////////////////////
-/obj/item/reagent_containers/food/snacks/muffin
+/obj/item/food/snacks/muffin
name = "muffin"
desc = "A delicious and spongy little cake."
icon = 'icons/obj/food/breakfast.dmi'
@@ -530,7 +530,7 @@
list_reagents = list("nutriment" = 6)
tastes = list("muffin" = 1)
-/obj/item/reagent_containers/food/snacks/berryclafoutis
+/obj/item/food/snacks/berryclafoutis
name = "berry clafoutis"
desc = "No black birds, this is a good sign."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -541,7 +541,7 @@
tastes = list("pie" = 1, "blackberries" = 1)
-/obj/item/reagent_containers/food/snacks/poppypretzel
+/obj/item/food/snacks/poppypretzel
name = "poppy pretzel"
desc = "A large soft pretzel full of POP! It's all twisted up!"
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -550,7 +550,7 @@
list_reagents = list("nutriment" = 5)
tastes = list("pretzel" = 1)
-/obj/item/reagent_containers/food/snacks/plumphelmetbiscuit
+/obj/item/food/snacks/plumphelmetbiscuit
name = "plump helmet biscuit"
desc = "This is a finely-prepared plump helmet biscuit. The ingredients are exceptionally minced plump helmet, and well-minced dwarven wheat flour."
icon = 'icons/obj/food/breakfast.dmi'
@@ -559,14 +559,14 @@
list_reagents = list("nutriment" = 5)
tastes = list("mushroom" = 1, "biscuit" = 1)
-/obj/item/reagent_containers/food/snacks/plumphelmetbiscuit/Initialize(mapload)
+/obj/item/food/snacks/plumphelmetbiscuit/Initialize(mapload)
. = ..()
if(prob(10))
name = "exceptional plump helmet biscuit"
desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump helmet biscuit!" // Is this a reference?
reagents.add_reagent("omnizine", 5)
-/obj/item/reagent_containers/food/snacks/appletart
+/obj/item/food/snacks/appletart
name = "golden apple streusel tart"
desc = "A tasty dessert that won't make it through a metal detector."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -578,7 +578,7 @@
tastes = list("pie" = 1, "apple" = 1, "expensive metal" = 1)
-/obj/item/reagent_containers/food/snacks/cracker
+/obj/item/food/snacks/cracker
name = "cracker"
desc = "It's a salted cracker."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -588,7 +588,7 @@
list_reagents = list("nutriment" = 1)
tastes = list("cracker" = 1)
-/obj/item/reagent_containers/food/snacks/croissant
+/obj/item/food/snacks/croissant
name = "croissant"
desc = "Once a pastry reserved for the bourgeois, this flaky goodness is now on your table."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -598,13 +598,13 @@
list_reagents = list("nutriment" = 4, "sugar" = 2)
tastes = list("croissant" = 1)
-/obj/item/reagent_containers/food/snacks/croissant/throwing
+/obj/item/food/snacks/croissant/throwing
throwforce = 20
throw_range = 9 //now with extra throwing action
tastes = list("croissant" = 2, "butter" = 1, "metal" = 1)
list_reagents = list("nutriment" = 4, "sugar" = 2, "iron" = 1)
-/obj/item/reagent_containers/food/snacks/croissant/throwing/Initialize(mapload)
+/obj/item/food/snacks/croissant/throwing/Initialize(mapload)
. = ..()
AddComponent(/datum/component/boomerang, throw_range, TRUE)
diff --git a/code/modules/food_and_drinks/food/foods/bread.dm b/code/modules/food_and_drinks/food/foods/bread.dm
index f3b30727f14..c2cfd50226b 100644
--- a/code/modules/food_and_drinks/food/foods/bread.dm
+++ b/code/modules/food_and_drinks/food/foods/bread.dm
@@ -3,53 +3,53 @@
// Breads //
//////////////////////
-/obj/item/reagent_containers/food/snacks/sliceable/meatbread
+/obj/item/food/snacks/sliceable/meatbread
name = "meatbread loaf"
desc = "The culinary base of every self-respecting eloquen/tg/entleman."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "meatbread"
- slice_path = /obj/item/reagent_containers/food/snacks/meatbreadslice
+ slice_path = /obj/item/food/snacks/meatbreadslice
slices_num = 5
filling_color = "#FF7575"
list_reagents = list("protein" = 20, "nutriment" = 10, "vitamin" = 5)
tastes = list("bread" = 10, "meat" = 10)
-/obj/item/reagent_containers/food/snacks/meatbreadslice
+/obj/item/food/snacks/meatbreadslice
name = "meatbread slice"
desc = "A slice of delicious meatbread."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "meatbreadslice"
filling_color = "#FF7575"
-/obj/item/reagent_containers/food/snacks/sliceable/xenomeatbread
+/obj/item/food/snacks/sliceable/xenomeatbread
name = "xenomeatbread loaf"
desc = "The culinary base of every self-respecting eloquent gentleman. Extra Heretical."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "xenomeatbread"
- slice_path = /obj/item/reagent_containers/food/snacks/xenomeatbreadslice
+ slice_path = /obj/item/food/snacks/xenomeatbreadslice
slices_num = 5
filling_color = "#8AFF75"
list_reagents = list("protein" = 20, "nutriment" = 10, "vitamin" = 5)
tastes = list("bread" = 10, "acid" = 10)
-/obj/item/reagent_containers/food/snacks/xenomeatbreadslice
+/obj/item/food/snacks/xenomeatbreadslice
name = "xenomeatbread slice"
desc = "A slice of delicious meatbread. Extra Heretical."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "xenobreadslice"
filling_color = "#8AFF75"
-/obj/item/reagent_containers/food/snacks/sliceable/spidermeatbread
+/obj/item/food/snacks/sliceable/spidermeatbread
name = "spider meat loaf"
desc = "Reassuringly green meatloaf made from spider meat."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "spidermeatbread"
- slice_path = /obj/item/reagent_containers/food/snacks/spidermeatbreadslice
+ slice_path = /obj/item/food/snacks/spidermeatbreadslice
slices_num = 5
list_reagents = list("protein" = 20, "nutriment" = 10, "toxin" = 15, "vitamin" = 5)
tastes = list("bread" = 10, "cobwebs" = 5)
-/obj/item/reagent_containers/food/snacks/spidermeatbreadslice
+/obj/item/food/snacks/spidermeatbreadslice
name = "spider meat bread slice"
desc = "A slice of meatloaf made from an animal that most likely still wants you dead."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -57,18 +57,18 @@
tastes = list("bread" = 10, "cobwebs" = 5)
list_reagents = list("toxin" = 2)
-/obj/item/reagent_containers/food/snacks/sliceable/bananabread
+/obj/item/food/snacks/sliceable/bananabread
name = "banana-nut bread"
desc = "A heavenly and filling treat."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "bananabread"
- slice_path = /obj/item/reagent_containers/food/snacks/bananabreadslice
+ slice_path = /obj/item/food/snacks/bananabreadslice
slices_num = 5
filling_color = "#EDE5AD"
list_reagents = list("banana" = 20, "nutriment" = 20)
tastes = list("bread" = 10, "banana" = 5)
-/obj/item/reagent_containers/food/snacks/bananabreadslice
+/obj/item/food/snacks/bananabreadslice
name = "banana-nut bread slice"
desc = "A slice of delicious banana bread."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -76,36 +76,36 @@
filling_color = "#EDE5AD"
tastes = list("bread" = 10, "banana" = 5)
-/obj/item/reagent_containers/food/snacks/sliceable/tofubread
+/obj/item/food/snacks/sliceable/tofubread
name = "tofubread"
desc = "Like meatbread but for vegetarians. Not guaranteed to give superpowers."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "tofubread"
- slice_path = /obj/item/reagent_containers/food/snacks/tofubreadslice
+ slice_path = /obj/item/food/snacks/tofubreadslice
slices_num = 5
filling_color = "#F7FFE0"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
tastes = list("bread" = 10, "tofu" = 10)
-/obj/item/reagent_containers/food/snacks/tofubreadslice
+/obj/item/food/snacks/tofubreadslice
name = "tofubread slice"
desc = "A slice of delicious tofubread."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "tofubreadslice"
filling_color = "#F7FFE0"
-/obj/item/reagent_containers/food/snacks/sliceable/bread
+/obj/item/food/snacks/sliceable/bread
name = "bread"
desc = "Some plain old Earthen bread."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "bread"
- slice_path = /obj/item/reagent_containers/food/snacks/breadslice
+ slice_path = /obj/item/food/snacks/breadslice
slices_num = 6
filling_color = "#FFE396"
list_reagents = list("nutriment" = 10)
tastes = list("bread" = 1)
-/obj/item/reagent_containers/food/snacks/breadslice
+/obj/item/food/snacks/breadslice
name = "bread slice"
desc = "A slice of home."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -114,18 +114,18 @@
list_reagents = list("nutriment" = 2, "bread" = 5)
tastes = list("bread" = 1)
-/obj/item/reagent_containers/food/snacks/sliceable/creamcheesebread
+/obj/item/food/snacks/sliceable/creamcheesebread
name = "cream cheese bread"
desc = "Yum yum yum!"
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "creamcheesebread"
- slice_path = /obj/item/reagent_containers/food/snacks/creamcheesebreadslice
+ slice_path = /obj/item/food/snacks/creamcheesebreadslice
slices_num = 5
filling_color = "#FFF896"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
tastes = list("bread" = 10, "cheese" = 10)
-/obj/item/reagent_containers/food/snacks/creamcheesebreadslice
+/obj/item/food/snacks/creamcheesebreadslice
name = "cream cheese bread slice"
desc = "A slice of yum!"
icon = 'icons/obj/food/burgerbread.dmi'
@@ -134,18 +134,18 @@
list_reagents = list("nutriment" = 4, "vitamin" = 1)
tastes = list("bread" = 10, "cheese" = 10)
-/obj/item/reagent_containers/food/snacks/sliceable/banarnarbread
+/obj/item/food/snacks/sliceable/banarnarbread
name = "banarnarbread loaf"
desc = "A loaf of delicious mah'weyh pleggh at e'ntrath!"
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "banarnarbread"
- slice_path = /obj/item/reagent_containers/food/snacks/banarnarbreadslice
+ slice_path = /obj/item/food/snacks/banarnarbreadslice
slices_num = 5
filling_color = "#6F0000"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
tastes = list("heresy" = 10, "banana" = 10)
-/obj/item/reagent_containers/food/snacks/banarnarbreadslice
+/obj/item/food/snacks/banarnarbreadslice
name = "banarnarbread slice"
desc = "A slice of delicious mah'weyh pleggh at e'ntrath!"
icon = 'icons/obj/food/burgerbread.dmi'
@@ -159,7 +159,7 @@
// Misc //
//////////////////////
-/obj/item/reagent_containers/food/snacks/bun
+/obj/item/food/snacks/bun
name = "bun"
desc = "The base for any self-respecting burger."
icon = 'icons/obj/food/food_ingredients.dmi'
@@ -168,7 +168,7 @@
tastes = list("bun" = 1)
-/obj/item/reagent_containers/food/snacks/flatbread
+/obj/item/food/snacks/flatbread
name = "flatbread"
desc = "Bland but filling."
icon = 'icons/obj/food/food_ingredients.dmi'
@@ -176,7 +176,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("bread" = 1)
-/obj/item/reagent_containers/food/snacks/baguette
+/obj/item/food/snacks/baguette
name = "baguette"
desc = "Bon appetit!"
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -188,15 +188,15 @@
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("bread" = 1)
-/obj/item/reagent_containers/food/snacks/baguette/combat
+/obj/item/food/snacks/baguette/combat
sharp = TRUE
force = 20
-/obj/item/reagent_containers/food/snacks/baguette/combat/Initialize(mapload)
+/obj/item/food/snacks/baguette/combat/Initialize(mapload)
. = ..()
AddComponent(/datum/component/parry, _stamina_constant = 2, _stamina_coefficient = 0.5, _parryable_attack_types = ALL_ATTACK_TYPES)
-/obj/item/reagent_containers/food/snacks/twobread
+/obj/item/food/snacks/twobread
name = "two bread"
desc = "It is very bitter and winy."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -206,7 +206,7 @@
list_reagents = list("nutriment" = 2, "vitamin" = 2)
tastes = list("bread" = 1)
-/obj/item/reagent_containers/food/snacks/toast
+/obj/item/food/snacks/toast
name = "toast"
desc = "Yeah! Toast!"
icon = 'icons/obj/food/burgerbread.dmi'
@@ -216,7 +216,7 @@
list_reagents = list("nutriment" = 3)
tastes = list("toast" = 1)
-/obj/item/reagent_containers/food/snacks/jelliedtoast
+/obj/item/food/snacks/jelliedtoast
name = "jellied toast"
desc = "A slice of bread covered with delicious jam."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -225,13 +225,13 @@
bitesize = 3
tastes = list("toast" = 1, "jelly" = 1)
-/obj/item/reagent_containers/food/snacks/jelliedtoast/cherry
+/obj/item/food/snacks/jelliedtoast/cherry
list_reagents = list("nutriment" = 1, "cherryjelly" = 5, "vitamin" = 2)
-/obj/item/reagent_containers/food/snacks/jelliedtoast/slime
+/obj/item/food/snacks/jelliedtoast/slime
list_reagents = list("nutriment" = 1, "slimejelly" = 5, "vitamin" = 2)
-/obj/item/reagent_containers/food/snacks/rofflewaffles
+/obj/item/food/snacks/rofflewaffles
name = "roffle waffles"
desc = "Waffles from Roffle. Co."
icon = 'icons/obj/food/breakfast.dmi'
@@ -242,7 +242,7 @@
list_reagents = list("nutriment" = 8, "psilocybin" = 2, "vitamin" = 2)
tastes = list("waffle" = 1, "mushrooms" = 1)
-/obj/item/reagent_containers/food/snacks/waffles
+/obj/item/food/snacks/waffles
name = "waffles"
desc = "Mmm, waffles."
icon = 'icons/obj/food/breakfast.dmi'
diff --git a/code/modules/food_and_drinks/food/foods/candy.dm b/code/modules/food_and_drinks/food/foods/candy.dm
index fb4d3c2fc86..fe3fe0ac48a 100644
--- a/code/modules/food_and_drinks/food/foods/candy.dm
+++ b/code/modules/food_and_drinks/food/foods/candy.dm
@@ -7,7 +7,7 @@
//Candy / Candy Ingredients
//Subclass so we can pass on values
-/obj/item/reagent_containers/food/snacks/candy
+/obj/item/food/snacks/candy
name = "generic candy"
desc = "It's placeholder flavored. This shouldn't be seen."
icon = 'icons/obj/food/candy.dmi'
@@ -18,7 +18,7 @@
// Candy Ingredients / Flavorings / Byproduct
// ***********************************************************
-/obj/item/reagent_containers/food/snacks/chocolatebar
+/obj/item/food/snacks/chocolatebar
name = "chocolate bar"
desc = "Such sweet, fattening food."
icon_state = "chocolatebar"
@@ -26,7 +26,7 @@
list_reagents = list("nutriment" = 2, "chocolate" = 4)
tastes = list("chocolate" = 1)
-/obj/item/reagent_containers/food/snacks/candy/caramel
+/obj/item/food/snacks/candy/caramel
name = "caramel"
desc = "Chewy and dense, yet it practically melts in your mouth!"
icon_state = "caramel"
@@ -34,32 +34,32 @@
list_reagents = list("cream" = 2, "sugar" = 2)
-/obj/item/reagent_containers/food/snacks/candy/toffee
+/obj/item/food/snacks/candy/toffee
name = "toffee"
desc = "A hard, brittle candy with a distinctive taste."
icon_state = "toffee"
filling_color = "#7D5F46"
list_reagents = list("nutriment" = 3, "sugar" = 3)
-/obj/item/reagent_containers/food/snacks/candy/nougat
+/obj/item/food/snacks/candy/nougat
name = "nougat"
desc = "A soft, chewy candy commonly found in candybars."
icon_state = "nougat"
filling_color = "#7D5F46"
list_reagents = list("nutriment" = 3, "sugar" = 3)
-/obj/item/reagent_containers/food/snacks/candy/taffy
+/obj/item/food/snacks/candy/taffy
name = "saltwater taffy"
desc = "Old fashioned saltwater taffy. Chewy!"
icon_state = "candy1"
filling_color = "#7D5F46"
list_reagents = list("nutriment" = 3, "sugar" = 3)
-/obj/item/reagent_containers/food/snacks/candy/taffy/Initialize(mapload)
+/obj/item/food/snacks/candy/taffy/Initialize(mapload)
. = ..()
icon_state = pick("candy1", "candy2", "candy3", "candy4", "candy5")
-/obj/item/reagent_containers/food/snacks/candy/fudge
+/obj/item/food/snacks/candy/fudge
name = "fudge"
desc = "Chocolate fudge, a timeless classic treat."
icon_state = "fudge"
@@ -67,26 +67,26 @@
bitesize = 3
list_reagents = list("cream" = 3, "chocolate" = 6)
-/obj/item/reagent_containers/food/snacks/candy/fudge/peanut
+/obj/item/food/snacks/candy/fudge/peanut
name = "peanut fudge"
desc = "Chocolate fudge, with bits of peanuts mixed in. People with nut allergies shouldn't eat this."
icon_state = "fudge_peanut"
filling_color = "#7D5F46"
-/obj/item/reagent_containers/food/snacks/candy/fudge/cherry
+/obj/item/food/snacks/candy/fudge/cherry
name = "chocolate cherry fudge"
desc = "Chocolate fudge surrounding sweet cherries. Good for tricking kids into eating some fruit."
icon_state = "fudge_cherry"
filling_color = "#7D5F46"
-/obj/item/reagent_containers/food/snacks/candy/fudge/cookies_n_cream
+/obj/item/food/snacks/candy/fudge/cookies_n_cream
name = "cookies 'n' cream fudge"
desc = "An extra creamy fudge with bits of real chocolate cookie mixed in. Crunchy!"
icon_state = "fudge_cookies_n_cream"
filling_color = "#7D5F46"
list_reagents = list("cream" = 6, "chocolate" = 6)
-/obj/item/reagent_containers/food/snacks/candy/fudge/turtle
+/obj/item/food/snacks/candy/fudge/turtle
name = "turtle fudge"
desc = "Chocolate fudge with caramel and nuts. It doesn't contain real turtles, thankfully."
icon_state = "fudge_turtle"
@@ -96,14 +96,14 @@
// Candy Products (Pre-existing)
// ***********************************************************
-/obj/item/reagent_containers/food/snacks/candy/donor
+/obj/item/food/snacks/candy/donor
name = "donor candy"
desc = "A little treat for blood donors."
trash = /obj/item/trash/candy
bitesize = 5
list_reagents = list("nutriment" = 10, "sugar" = 3)
-/obj/item/reagent_containers/food/snacks/candy/candy_corn
+/obj/item/food/snacks/candy/candy_corn
name = "candy corn"
desc = "It's a handful of candy corn. Cannot be stored in a detective's hat, alas."
icon_state = "candycorn"
@@ -115,7 +115,7 @@
// Candy Products (plain / unflavored)
// ***********************************************************
-/obj/item/reagent_containers/food/snacks/candy/cotton
+/obj/item/food/snacks/candy/cotton
name = "cotton candy"
desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_plain"
@@ -124,7 +124,7 @@
bitesize = 4
list_reagents = list("sugar" = 15)
-/obj/item/reagent_containers/food/snacks/candy/candybar
+/obj/item/food/snacks/candy/candybar
name = "candy"
desc = "A chocolate candybar, wrapped in a bit of foil."
icon_state = "candy"
@@ -137,14 +137,14 @@
tastes = list("chocolate" = 1)
-/obj/item/reagent_containers/food/snacks/candy/candycane
+/obj/item/food/snacks/candy/candycane
name = "candy cane"
desc = "A festive mint candy cane."
icon_state = "candycane"
filling_color = "#F2F2F2"
list_reagents = list("minttoxin" = 1, "sugar" = 5)
-/obj/item/reagent_containers/food/snacks/candy/gummybear
+/obj/item/food/snacks/candy/gummybear
name = "gummy bear"
desc = "A small edible bear. It's squishy and chewy!"
icon_state = "gbear"
@@ -152,7 +152,7 @@
bitesize = 3
list_reagents = list("sugar" = 10)
-/obj/item/reagent_containers/food/snacks/candy/gummyworm
+/obj/item/food/snacks/candy/gummyworm
name = "gummy worm"
desc = "An edible worm, made from gelatin."
icon_state = "gworm"
@@ -160,7 +160,7 @@
bitesize = 3
list_reagents = list("sugar" = 10)
-/obj/item/reagent_containers/food/snacks/candy/jellybean
+/obj/item/food/snacks/candy/jellybean
name = "jelly bean"
desc = "A candy bean, guaranteed to not give you gas."
icon_state = "jbean"
@@ -168,7 +168,7 @@
bitesize = 3
list_reagents = list("sugar" = 10)
-/obj/item/reagent_containers/food/snacks/candy/jawbreaker
+/obj/item/food/snacks/candy/jawbreaker
name = "jawbreaker"
desc = "An unbelievably hard candy. The name is fitting."
icon_state = "jawbreaker"
@@ -176,7 +176,7 @@
bitesize = 0.1 //this is gonna take a while, you'll be working at this all shift.
list_reagents = list("sugar" = 10)
-/obj/item/reagent_containers/food/snacks/candy/cash
+/obj/item/food/snacks/candy/cash
name = "candy cash"
desc = "Not legal tender. Tasty though."
icon_state = "candy_cash"
@@ -185,7 +185,7 @@
tastes = list("chocolate" = 1)
-/obj/item/reagent_containers/food/snacks/candy/coin
+/obj/item/food/snacks/candy/coin
name = "chocolate coin"
desc = "Probably won't work in the vending machines."
icon_state = "choc_coin"
@@ -195,7 +195,7 @@
tastes = list("chocolate" = 1)
-/obj/item/reagent_containers/food/snacks/candy/gum
+/obj/item/food/snacks/candy/gum
name = "bubblegum"
desc = "Chewy!"
icon_state = "bubblegum"
@@ -204,7 +204,7 @@
bitesize = 0.2
list_reagents = list("sugar" = 5)
-/obj/item/reagent_containers/food/snacks/candy/sucker
+/obj/item/food/snacks/candy/sucker
name = "sucker"
desc = "For being such a good sport!"
icon_state = "sucker"
@@ -215,56 +215,56 @@
// Gummy Bear Flavors
// ***********************************************************
-/obj/item/reagent_containers/food/snacks/candy/gummybear/red
+/obj/item/food/snacks/candy/gummybear/red
name = "gummy bear"
desc = "A small edible bear. It's red!"
icon_state = "gbear_red"
filling_color = "#801E28"
list_reagents = list("sugar" = 10, "cherryjelly" = 2)
-/obj/item/reagent_containers/food/snacks/candy/gummybear/blue
+/obj/item/food/snacks/candy/gummybear/blue
name = "gummy bear"
desc = "A small edible bear. It's blue!"
icon_state = "gbear_blue"
filling_color = "#863333"
list_reagents = list("sugar" = 10, "berryjuice" = 2)
-/obj/item/reagent_containers/food/snacks/candy/gummybear/poison
+/obj/item/food/snacks/candy/gummybear/poison
name = "gummy bear"
desc = "A small edible bear. It's blue!"
icon_state = "gbear_blue"
filling_color = "#863353"
list_reagents = list("poisonberryjuice" = 12)
-/obj/item/reagent_containers/food/snacks/candy/gummybear/green
+/obj/item/food/snacks/candy/gummybear/green
name = "gummy bear"
desc = "A small edible bear. It's green!"
icon_state = "gbear_green"
filling_color = "#365E30"
list_reagents = list("sugar" = 10, "limejuice" = 2)
-/obj/item/reagent_containers/food/snacks/candy/gummybear/yellow
+/obj/item/food/snacks/candy/gummybear/yellow
name = "gummy bear"
desc = "A small edible bear. It's yellow!"
icon_state = "gbear_yellow"
filling_color = "#863333"
list_reagents = list("sugar" = 10, "lemonjuice" = 2)
-/obj/item/reagent_containers/food/snacks/candy/gummybear/orange
+/obj/item/food/snacks/candy/gummybear/orange
name = "gummy bear"
desc = "A small edible bear. It's orange!"
icon_state = "gbear_orange"
filling_color = "#E78108"
list_reagents = list("sugar" = 10, "orangejuice" = 2)
-/obj/item/reagent_containers/food/snacks/candy/gummybear/purple
+/obj/item/food/snacks/candy/gummybear/purple
name = "gummy bear"
desc = "A small edible bear. It's purple!"
icon_state = "gbear_purple"
filling_color = "#993399"
list_reagents = list("sugar" = 10, "grapejuice" = 2)
-/obj/item/reagent_containers/food/snacks/candy/gummybear/wtf
+/obj/item/food/snacks/candy/gummybear/wtf
name = "gummy bear"
desc = "A small bear. Wait... what?"
icon_state = "gbear_rainbow"
@@ -275,56 +275,56 @@
// Gummy Worm Flavors
// ***********************************************************
-/obj/item/reagent_containers/food/snacks/candy/gummyworm/red
+/obj/item/food/snacks/candy/gummyworm/red
name = "gummy worm"
desc = "An edible worm, made from gelatin. It's red!"
icon_state = "gworm_red"
filling_color = "#801E28"
list_reagents = list("sugar" = 10, "cherryjelly" = 2)
-/obj/item/reagent_containers/food/snacks/candy/gummyworm/blue
+/obj/item/food/snacks/candy/gummyworm/blue
name = "gummy worm"
desc = "An edible worm, made from gelatin. It's blue!"
icon_state = "gworm_blue"
filling_color = "#863333"
list_reagents = list("sugar" = 10, "berryjuice" = 2)
-/obj/item/reagent_containers/food/snacks/candy/gummyworm/poison
+/obj/item/food/snacks/candy/gummyworm/poison
name = "gummy worm"
desc = "An edible worm, made from gelatin. It's blue!"
icon_state = "gworm_blue"
filling_color = "#863353"
list_reagents = list("poisonberryjuice" = 12)
-/obj/item/reagent_containers/food/snacks/candy/gummyworm/green
+/obj/item/food/snacks/candy/gummyworm/green
name = "gummy worm"
desc = "An edible worm, made from gelatin. It's green!"
icon_state = "gworm_green"
filling_color = "#365E30"
list_reagents = list("sugar" = 10, "limejuice" = 2)
-/obj/item/reagent_containers/food/snacks/candy/gummyworm/yellow
+/obj/item/food/snacks/candy/gummyworm/yellow
name = "gummy worm"
desc = "An edible worm, made from gelatin. It's yellow!"
icon_state = "gworm_yellow"
filling_color = "#863333"
list_reagents = list("sugar" = 10, "lemonjuice" = 2)
-/obj/item/reagent_containers/food/snacks/candy/gummyworm/orange
+/obj/item/food/snacks/candy/gummyworm/orange
name = "gummy worm"
desc = "An edible worm, made from gelatin. It's orange!"
icon_state = "gworm_orange"
filling_color = "#E78108"
list_reagents = list("sugar" = 10, "orangejuice" = 2)
-/obj/item/reagent_containers/food/snacks/candy/gummyworm/purple
+/obj/item/food/snacks/candy/gummyworm/purple
name = "gummy worm"
desc = "An edible worm, made from gelatin. It's purple!"
icon_state = "gworm_purple"
filling_color = "#993399"
list_reagents = list("sugar" = 10, "grapejuice" = 2)
-/obj/item/reagent_containers/food/snacks/candy/gummyworm/wtf
+/obj/item/food/snacks/candy/gummyworm/wtf
name = "gummy worm"
desc = "An edible worm. Did it just move?"
icon_state = "gworm_rainbow"
@@ -335,91 +335,91 @@
// Jelly Bean Flavors
// ***********************************************************
-/obj/item/reagent_containers/food/snacks/candy/jellybean/red
+/obj/item/food/snacks/candy/jellybean/red
name = "jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's red!"
icon_state = "jbean_red"
filling_color = "#801E28"
list_reagents = list("sugar" = 10, "cherryjelly" = 2)
-/obj/item/reagent_containers/food/snacks/candy/jellybean/blue
+/obj/item/food/snacks/candy/jellybean/blue
name = "jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's blue!"
icon_state = "jbean_blue"
filling_color = "#863333"
list_reagents = list("sugar" = 10, "berryjuice" = 2)
-/obj/item/reagent_containers/food/snacks/candy/jellybean/poison
+/obj/item/food/snacks/candy/jellybean/poison
name = "jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's blue!"
icon_state = "jbean_blue"
filling_color = "#863353"
list_reagents = list("poisonberryjuice" = 12)
-/obj/item/reagent_containers/food/snacks/candy/jellybean/green
+/obj/item/food/snacks/candy/jellybean/green
name = "jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's green!"
icon_state = "jbean_green"
filling_color = "#365E30"
list_reagents = list("sugar" = 10, "limejuice" = 2)
-/obj/item/reagent_containers/food/snacks/candy/jellybean/yellow
+/obj/item/food/snacks/candy/jellybean/yellow
name = "jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's yellow!"
icon_state = "jbean_yellow"
filling_color = "#863333"
list_reagents = list("sugar" = 10, "lemonjuice" = 2)
-/obj/item/reagent_containers/food/snacks/candy/jellybean/orange
+/obj/item/food/snacks/candy/jellybean/orange
name = "jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's orange!"
icon_state = "jbean_orange"
filling_color = "#E78108"
list_reagents = list("sugar" = 10, "orangejuice" = 2)
-/obj/item/reagent_containers/food/snacks/candy/jellybean/purple
+/obj/item/food/snacks/candy/jellybean/purple
name = "jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's purple!"
icon_state = "jbean_purple"
filling_color = "#993399"
list_reagents = list("sugar" = 10, "grapejuice" = 2)
-/obj/item/reagent_containers/food/snacks/candy/jellybean/chocolate
+/obj/item/food/snacks/candy/jellybean/chocolate
name = "jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's chocolate!"
icon_state = "jbean_choc"
filling_color = "#302000"
list_reagents = list("sugar" = 10, "chocolate" = 2)
-/obj/item/reagent_containers/food/snacks/candy/jellybean/popcorn
+/obj/item/food/snacks/candy/jellybean/popcorn
name = "jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's popcorn flavored!"
icon_state = "jbean_popcorn"
filling_color = "#664330"
list_reagents = list("sugar" = 10, "nutriment" = 2)
-/obj/item/reagent_containers/food/snacks/candy/jellybean/cola
+/obj/item/food/snacks/candy/jellybean/cola
name = "jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's Cola flavored!"
icon_state = "jbean_cola"
filling_color = "#102000"
list_reagents = list("sugar" = 10, "cola" = 2)
-/obj/item/reagent_containers/food/snacks/candy/jellybean/drgibb
+/obj/item/food/snacks/candy/jellybean/drgibb
name = "jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's Dr. Gibb flavored!"
icon_state = "jbean_cola"
filling_color = "#102000"
list_reagents = list("sugar" = 10, "dr_gibb" = 2)
-/obj/item/reagent_containers/food/snacks/candy/jellybean/coffee
+/obj/item/food/snacks/candy/jellybean/coffee
name = "jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's Coffee flavored!"
icon_state = "jbean_choc"
filling_color = "#482000"
list_reagents = list("sugar" = 10, "coffee" = 2)
-/obj/item/reagent_containers/food/snacks/candy/jellybean/wtf
+/obj/item/food/snacks/candy/jellybean/wtf
name = "jelly bean"
desc = "A candy bean, guaranteed to not give you gas. You aren't sure what color it is."
icon_state = "jbean_rainbow"
@@ -430,7 +430,7 @@
// Cotton Candy Flavors
// ***********************************************************
-/obj/item/reagent_containers/food/snacks/candy/cotton/red
+/obj/item/food/snacks/candy/cotton/red
name = "cotton candy"
desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_red"
@@ -438,7 +438,7 @@
filling_color = "#801E28"
list_reagents = list("sugar" = 15, "cherryjelly" = 5)
-/obj/item/reagent_containers/food/snacks/candy/cotton/blue
+/obj/item/food/snacks/candy/cotton/blue
name = "cotton candy"
desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_blue"
@@ -446,7 +446,7 @@
filling_color = "#863333"
list_reagents = list("sugar" = 15, "berryjuice" = 5)
-/obj/item/reagent_containers/food/snacks/candy/cotton/poison
+/obj/item/food/snacks/candy/cotton/poison
name = "cotton candy"
desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_blue"
@@ -454,7 +454,7 @@
filling_color = "#863353"
list_reagents = list("poisonberryjuice" = 20)
-/obj/item/reagent_containers/food/snacks/candy/cotton/green
+/obj/item/food/snacks/candy/cotton/green
name = "cotton candy"
desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_green"
@@ -462,7 +462,7 @@
filling_color = "#365E30"
list_reagents = list("sugar" = 15, "limejuice" = 5)
-/obj/item/reagent_containers/food/snacks/candy/cotton/yellow
+/obj/item/food/snacks/candy/cotton/yellow
name = "cotton candy"
desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_yellow"
@@ -470,7 +470,7 @@
filling_color = "#863333"
list_reagents = list("sugar" = 15, "lemonjuice" = 5)
-/obj/item/reagent_containers/food/snacks/candy/cotton/orange
+/obj/item/food/snacks/candy/cotton/orange
name = "cotton candy"
desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_orange"
@@ -478,7 +478,7 @@
filling_color = "#E78108"
list_reagents = list("sugar" = 15, "orangejuice" = 5)
-/obj/item/reagent_containers/food/snacks/candy/cotton/purple
+/obj/item/food/snacks/candy/cotton/purple
name = "cotton candy"
desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_purple"
@@ -486,7 +486,7 @@
filling_color = "#993399"
list_reagents = list("sugar" = 15, "grapejuice" = 5)
-/obj/item/reagent_containers/food/snacks/candy/cotton/pink
+/obj/item/food/snacks/candy/cotton/pink
name = "cotton candy"
desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_pink"
@@ -494,7 +494,7 @@
filling_color = "#863333"
list_reagents = list("sugar" = 15, "watermelonjuice" = 5)
-/obj/item/reagent_containers/food/snacks/candy/cotton/rainbow
+/obj/item/food/snacks/candy/cotton/rainbow
name = "cotton candy"
desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_rainbow"
@@ -502,7 +502,7 @@
filling_color = "#C8A5DC"
list_reagents = list("omnizine" = 20)
-/obj/item/reagent_containers/food/snacks/candy/cotton/bad_rainbow
+/obj/item/food/snacks/candy/cotton/bad_rainbow
name = "cotton candy"
desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_rainbow"
@@ -514,35 +514,35 @@
// Candybar Flavors
// ***********************************************************
-/obj/item/reagent_containers/food/snacks/candy/confectionery
+/obj/item/food/snacks/candy/confectionery
list_reagents = list("nutriment" = 1, "chocolate" = 1)
-/obj/item/reagent_containers/food/snacks/candy/confectionery/rice
+/obj/item/food/snacks/candy/confectionery/rice
name = "Asteroid Crunch Bar"
desc = "Crunchy rice deposits in delicious chocolate! A favorite of miners galaxy-wide."
icon_state = "asteroidcrunch"
trash = /obj/item/trash/candy
filling_color = "#7D5F46"
-/obj/item/reagent_containers/food/snacks/candy/confectionery/toffee
+/obj/item/food/snacks/candy/confectionery/toffee
name = "Yum-Baton Bar"
desc = "Chocolate and toffee in the shape of a baton. Security sure knows how to pound these down!"
icon_state = "yumbaton"
filling_color = "#7D5F46"
-/obj/item/reagent_containers/food/snacks/candy/confectionery/caramel
+/obj/item/food/snacks/candy/confectionery/caramel
name = "Malper Bar"
desc = "A chocolate syringe filled with a caramel injection. Just what the doctor ordered!"
icon_state = "malper"
filling_color = "#7D5F46"
-/obj/item/reagent_containers/food/snacks/candy/confectionery/caramel_nougat
+/obj/item/food/snacks/candy/confectionery/caramel_nougat
name = "Toxins Test Bar"
desc = "An explosive combination of chocolate, caramel, and nougat. Research has never been so tasty!"
icon_state = "toxinstest"
filling_color = "#7D5F46"
-/obj/item/reagent_containers/food/snacks/candy/confectionery/nougat
+/obj/item/food/snacks/candy/confectionery/nougat
name = "Tool-erone Bar"
desc = "Chocolate-covered nougat, shaped like a wrench. Great for an engineer on the go!"
icon_state = "toolerone"
diff --git a/code/modules/food_and_drinks/food/foods/desserts.dm b/code/modules/food_and_drinks/food/foods/desserts.dm
index 692c8c06208..c68b8bc55f1 100644
--- a/code/modules/food_and_drinks/food/foods/desserts.dm
+++ b/code/modules/food_and_drinks/food/foods/desserts.dm
@@ -2,13 +2,13 @@
// Misc //
//////////////////////
-/obj/item/reagent_containers/food/snacks/friedbanana
+/obj/item/food/snacks/friedbanana
name = "fried banana"
desc = "Goreng Pisang, also known as fried bananas."
icon_state = "friedbanana"
list_reagents = list("sugar" = 5, "nutriment" = 8, "cornoil" = 4)
-/obj/item/reagent_containers/food/snacks/ricepudding
+/obj/item/food/snacks/ricepudding
name = "rice pudding"
desc = "Where's the Jam!"
icon_state = "rpudding"
@@ -17,7 +17,7 @@
list_reagents = list("nutriment" = 7, "vitamin" = 2)
tastes = list("rice" = 1, "sweetness" = 1)
-/obj/item/reagent_containers/food/snacks/spacylibertyduff
+/obj/item/food/snacks/spacylibertyduff
name = "spacy liberty duff"
desc = "Jello gelatin, from Alfred Hubbard's cookbook."
icon_state = "spacylibertyduff"
@@ -27,7 +27,7 @@
list_reagents = list("nutriment" = 6, "psilocybin" = 6)
tastes = list("jelly" = 1, "mushroom" = 1)
-/obj/item/reagent_containers/food/snacks/amanitajelly
+/obj/item/food/snacks/amanitajelly
name = "amanita jelly"
desc = "Looks curiously toxic."
icon_state = "amanitajelly"
@@ -37,7 +37,7 @@
list_reagents = list("nutriment" = 6, "amanitin" = 6, "psilocybin" = 3)
tastes = list("jelly" = 1, "mushroom" = 1)
-/obj/item/reagent_containers/food/snacks/candiedapple
+/obj/item/food/snacks/candiedapple
name = "candied apple"
desc = "An apple coated in sugary sweetness."
icon_state = "candiedapple"
@@ -46,7 +46,7 @@
list_reagents = list("nutriment" = 3, "sugar" = 2)
tastes = list("apple" = 2, "sweetness" = 2)
-/obj/item/reagent_containers/food/snacks/mint
+/obj/item/food/snacks/mint
name = "mint"
desc = "it is only wafer thin."
icon_state = "mint"
diff --git a/code/modules/food_and_drinks/food/foods/ethnic.dm b/code/modules/food_and_drinks/food/foods/ethnic.dm
index d57032656c3..153dc2b7407 100644
--- a/code/modules/food_and_drinks/food/foods/ethnic.dm
+++ b/code/modules/food_and_drinks/food/foods/ethnic.dm
@@ -3,7 +3,7 @@
// Mexican //
//////////////////////
-/obj/item/reagent_containers/food/snacks/taco
+/obj/item/food/snacks/taco
name = "taco"
desc = "Take a bite!"
icon_state = "taco"
@@ -11,7 +11,7 @@
list_reagents = list("nutriment" = 7, "vitamin" = 1)
tastes = list("taco" = 4, "meat" = 2, "cheese" = 2, "lettuce" = 1)
-/obj/item/reagent_containers/food/snacks/burrito
+/obj/item/food/snacks/burrito
name = "burrito"
desc = "Meat, beans, cheese, and rice wrapped up as an easy-to-hold meal."
icon_state = "burrito"
@@ -21,7 +21,7 @@
tastes = list("torilla" = 2, "meat" = 3)
-/obj/item/reagent_containers/food/snacks/chimichanga
+/obj/item/food/snacks/chimichanga
name = "chimichanga"
desc = "Time to eat a chimi-f***ing-changa."
icon_state = "chimichanga"
@@ -29,7 +29,7 @@
filling_color = "#A36A1F"
list_reagents = list("omnizine" = 4, "cheese" = 2) //Deadpool reference. Deal with it.
-/obj/item/reagent_containers/food/snacks/enchiladas
+/obj/item/food/snacks/enchiladas
name = "enchiladas"
desc = "Viva la Mexico!"
icon_state = "enchiladas"
@@ -39,7 +39,7 @@
list_reagents = list("nutriment" = 8, "capsaicin" = 6)
tastes = list("hot peppers" = 1, "meat" = 3, "cheese" = 1, "sour cream" = 1)
-/obj/item/reagent_containers/food/snacks/cornchips
+/obj/item/food/snacks/cornchips
name = "corn chips"
desc = "Goes great with salsa! OLE!"
icon_state = "chips"
@@ -53,7 +53,7 @@
// Chinese //
//////////////////////
-/obj/item/reagent_containers/food/snacks/chinese/chowmein
+/obj/item/food/snacks/chinese/chowmein
name = "chow mein"
desc = "What is in this anyways?"
icon_state = "chinese1"
@@ -62,7 +62,7 @@
list_reagents = list("nutriment" = 1, "beans" = 3, "msg" = 4, "sugar" = 2)
tastes = list("noodle" = 1, "vegetables" = 1)
-/obj/item/reagent_containers/food/snacks/chinese/sweetsourchickenball
+/obj/item/food/snacks/chinese/sweetsourchickenball
name = "sweet & sour chicken balls"
desc = "Is this chicken cooked? The odds are better than wok paper scissors."
icon = 'icons/obj/food/meat.dmi'
@@ -72,7 +72,7 @@
list_reagents = list("nutriment" = 2, "msg" = 4, "sugar" = 2)
tastes = list("chicken" = 1, "sweetness" = 1)
-/obj/item/reagent_containers/food/snacks/chinese/tao
+/obj/item/food/snacks/chinese/tao
name = "Admiral Yamamoto carp"
desc = "Tastes like chicken."
icon_state = "chinese2"
@@ -81,7 +81,7 @@
list_reagents = list("nutriment" = 1, "protein" = 1, "msg" = 4, "sugar" = 4)
tastes = list("chicken" = 1)
-/obj/item/reagent_containers/food/snacks/chinese/newdles
+/obj/item/food/snacks/chinese/newdles
name = "chinese newdles"
desc = "Made fresh, weekly!"
icon_state = "chinese3"
@@ -90,7 +90,7 @@
list_reagents = list("nutriment" = 1, "msg" = 4, "sugar" = 3)
tastes = list("noodles" = 1)
-/obj/item/reagent_containers/food/snacks/chinese/rice
+/obj/item/food/snacks/chinese/rice
name = "fried rice"
desc = "A timeless classic."
icon_state = "chinese4"
@@ -105,7 +105,7 @@
// Japanese //
//////////////////////
-/obj/item/reagent_containers/food/snacks/chawanmushi
+/obj/item/food/snacks/chawanmushi
name = "chawanmushi"
desc = "A legendary egg custard that makes friends out of enemies. Probably too hot for a cat to eat."
icon_state = "chawanmushi"
@@ -114,7 +114,7 @@
list_reagents = list("nutriment" = 5)
tastes = list("custard" = 1)
-/obj/item/reagent_containers/food/snacks/yakiimo
+/obj/item/food/snacks/yakiimo
name = "yaki imo"
desc = "Made with roasted sweet potatoes!"
icon_state = "yakiimo"
@@ -128,7 +128,7 @@
// Middle Eastern //
//////////////////////
-/obj/item/reagent_containers/food/snacks/human/kabob
+/obj/item/food/snacks/human/kabob
name = "-kabob"
icon_state = "kabob"
desc = "Human meat, on a stick."
@@ -136,7 +136,7 @@
filling_color = "#A85340"
list_reagents = list("nutriment" = 8)
-/obj/item/reagent_containers/food/snacks/monkeykabob
+/obj/item/food/snacks/monkeykabob
name = "meat-kabob"
icon_state = "kabob"
desc = "Delicious meat, on a stick."
@@ -144,7 +144,7 @@
filling_color = "#A85340"
list_reagents = list("nutriment" = 8)
-/obj/item/reagent_containers/food/snacks/tofukabob
+/obj/item/food/snacks/tofukabob
name = "tofu-kabob"
icon_state = "kabob"
desc = "Vegan meat, on a stick."
@@ -152,7 +152,7 @@
filling_color = "#FFFEE0"
list_reagents = list("nutriment" = 8)
-/obj/item/reagent_containers/food/snacks/picoss_kabob
+/obj/item/food/snacks/picoss_kabob
name = "picoss-kabob"
desc = "A popular Moghes streetfood consisting of vinegar-marinated space carp on a skewer with onion and chillis."
icon_state = "picoss_skewer"
diff --git a/code/modules/food_and_drinks/food/foods/frozen.dm b/code/modules/food_and_drinks/food/foods/frozen.dm
index 069dfa29711..d00db915ed0 100644
--- a/code/modules/food_and_drinks/food/foods/frozen.dm
+++ b/code/modules/food_and_drinks/food/foods/frozen.dm
@@ -5,24 +5,24 @@
//Abstract item for inheritence.
-/obj/item/reagent_containers/food/snacks/frozen
+/obj/item/food/snacks/frozen
name = "frozen treat"
desc = "If you got this, something broke! Contact a coder if this somehow spawns."
icon = 'icons/obj/food/frozen_treats.dmi'
icon_state = "flavorless_sc"
-/obj/item/reagent_containers/food/snacks/sliceable/clowncake
+/obj/item/food/snacks/sliceable/clowncake
name = "clown cake"
desc = "A funny cake with a clown face on it."
icon = 'icons/obj/food/frozen_treats.dmi'
icon_state = "clowncake"
- slice_path = /obj/item/reagent_containers/food/snacks/frozen/clowncakeslice
+ slice_path = /obj/item/food/snacks/frozen/clowncakeslice
slices_num = 5
bitesize = 3
list_reagents = list("nutriment" = 20, "sugar" = 5, "vitamin" = 5, "banana" = 15)
tastes = list("cake" = 5, "sweetness" = 2, "banana" = 1, "sad clowns" = 1, "ice-cream" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/clowncakeslice
+/obj/item/food/snacks/frozen/clowncakeslice
name = "clown cake slice"
desc = "A slice of bad jokes, and silly props."
icon_state = "clowncake_slice"
@@ -31,7 +31,7 @@
list_reagents = list("nutriment" = 4, "sugar" = 1, "vitamin" = 1, "banana" = 3)
tastes = list("cake" = 5, "sweetness" = 2, "sad clowns" = 1, "ice-cream" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/sundae
+/obj/item/food/snacks/frozen/sundae
name = "sundae"
desc = "Portable ice cream in its own packaging."
icon_state = "sundae"
@@ -42,7 +42,7 @@
// Ice Cream //
//////////////////
-/obj/item/reagent_containers/food/snacks/frozen/icecream
+/obj/item/food/snacks/frozen/icecream
name = "ice cream"
desc = "Delicious ice cream."
icon_state = "icecream_cone"
@@ -50,11 +50,11 @@
list_reagents = list("nutriment" = 1, "sugar" = 1)
tastes = list("ice cream" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/icecream/Initialize(mapload)
+/obj/item/food/snacks/frozen/icecream/Initialize(mapload)
. = ..()
update_icon(UPDATE_OVERLAYS)
-/obj/item/reagent_containers/food/snacks/frozen/icecream/update_overlays()
+/obj/item/food/snacks/frozen/icecream/update_overlays()
. = ..()
var/mutable_appearance/filling = mutable_appearance('icons/obj/food/frozen_treats.dmi', "icecream_color")
var/list/reagent_colors = rgb2num(mix_color_from_reagents(reagents.reagent_list), COLORSPACE_HSV) //switching to HSV colorspace lets us easily manipulate the saturation and brightness independently
@@ -62,7 +62,7 @@
filling.color = rgb(reagent_colors[1], ((1.5 * reagent_colors[2]) - 10), (clamp(reagent_colors[3], 85, 100) - 10), space = COLORSPACE_HSV)
. += filling
-/obj/item/reagent_containers/food/snacks/frozen/icecream/icecreamcone
+/obj/item/food/snacks/frozen/icecream/icecreamcone
name = "ice cream cone"
desc = "Delicious ice cream."
icon_state = "icecream_cone"
@@ -70,7 +70,7 @@
bitesize = 3
list_reagents = list("nutriment" = 3, "sugar" = 7, "ice" = 2)
-/obj/item/reagent_containers/food/snacks/frozen/icecream/wafflecone
+/obj/item/food/snacks/frozen/icecream/wafflecone
name = "ice cream in a waffle cone"
desc = "Delicious ice cream."
icon_state = "icecream_cone_waffle"
@@ -78,7 +78,7 @@
bitesize = 3
list_reagents = list("nutriment" = 3, "sugar" = 7, "ice" = 2)
-/obj/item/reagent_containers/food/snacks/frozen/icecream/icecreamcup
+/obj/item/food/snacks/frozen/icecream/icecreamcup
name = "chocolate ice cream cone"
desc = "Delicious ice cream."
icon_state = "icecream_cone_chocolate"
@@ -86,7 +86,7 @@
bitesize = 3
list_reagents = list("nutriment" = 5, "chocolate" = 8, "ice" = 2)
-/obj/item/reagent_containers/food/snacks/wafflecone
+/obj/item/food/snacks/wafflecone
name = "waffle cone"
desc = "Delicious waffle cone, but no ice cream."
icon = 'icons/obj/food/frozen_treats.dmi'
@@ -94,49 +94,49 @@
list_reagents = list("nutriment" = 5)
tastes = list("cream" = 2, "waffle" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/icecreamsandwich
+/obj/item/food/snacks/frozen/icecreamsandwich
name = "icecream sandwich"
desc = "Portable ice cream in its own packaging."
icon_state = "icecreamsandwich"
list_reagents = list("nutriment" = 2, "ice" = 2)
tastes = list("ice cream" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/berryicecreamsandwich
+/obj/item/food/snacks/frozen/berryicecreamsandwich
name = "strawberry icecream sandwich"
desc = "Portable ice cream in its own packaging."
icon_state = "strawberryicecreamsandwich"
list_reagents = list("nutriment" = 2, "ice" = 2)
tastes = list("ice cream" = 1, "strawberry" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/sundae
+/obj/item/food/snacks/frozen/sundae
name = "sundae"
desc = "A classic dessert."
icon_state = "sundae"
list_reagents = list("nutriment" = 6, "banana" = 5, "vitamin" = 2)
tastes = list("ice cream" = 1, "banana" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/honkdae
+/obj/item/food/snacks/frozen/honkdae
name = "honkdae"
desc = "The clown's favorite dessert."
icon_state = "honkdae"
list_reagents = list("nutriment" = 6, "banana" = 10, "vitamin" = 4)
tastes = list("ice cream" = 1, "banana" = 1, "a bad joke" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/cornuto
+/obj/item/food/snacks/frozen/cornuto
name = "cornuto"
desc = "A neapolitan vanilla and chocolate ice cream cone. It menaces with a sprinkling of caramelized nuts."
icon_state = "cornuto"
list_reagents = list("nutriment" = 6, "hot_coco" = 4, "cream" = 2, "vanilla" = 4, "sugar" = 2)
tastes = list("chopped hazelnuts" = 3, "waffle" = 5)
-/obj/item/reagent_containers/food/snacks/frozen/peanutbuttermochi
+/obj/item/food/snacks/frozen/peanutbuttermochi
name = "peanut butter ice cream mochi"
desc = "A classic dessert at the Arabia Street Night Market in Prospect, peanut butter ice cream mochi is made with a peanut-butter flavoured ice cream as the main filling, and coated in crushed peanuts in the Taiwanese tradition."
icon_state = "pb_ice_cream_mochi"
list_reagents = list("nutriment" = 4, "sugar" = 6, "peanutbutter" = 4, "milk" = 2)
tastes = list("peanut butter" = 1, "mochi" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/spacefreezy
+/obj/item/food/snacks/frozen/spacefreezy
name = "spacefreezy"
desc = "The best ice cream in space."
icon_state = "spacefreezy"
@@ -147,113 +147,113 @@
// Snow Cones //
//////////////////
-/obj/item/reagent_containers/food/snacks/frozen/snowcone
+/obj/item/food/snacks/frozen/snowcone
name = "flavorless snowcone"
desc = "It's just shaved ice. Still fun to chew on."
icon_state = "flavorless_sc"
- trash = /obj/item/reagent_containers/food/drinks/sillycup
+ trash = /obj/item/reagent_containers/drinks/sillycup
list_reagents = list("water" = 10, "ice" = 5)
tastes = list("cold water" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/snowcone/apple
+/obj/item/food/snacks/frozen/snowcone/apple
name = "apple snowcone"
desc = "Apple syrup drizzled over a snowball in a paper cup."
icon_state = "amber_sc"
list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "applejuice" = 5)
tastes = list("ice" = 1, "water" = 1, "apples" = 5)
-/obj/item/reagent_containers/food/snacks/frozen/snowcone/berry
+/obj/item/food/snacks/frozen/snowcone/berry
name = "berry snowcone"
desc = "Berry syrup drizzled over a snowball in a paper cup."
icon_state = "berry_sc"
list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "berryjuice" = 5)
tastes = list("ice" = 1, "water" = 1, "berries" = 5)
-/obj/item/reagent_containers/food/snacks/frozen/snowcone/bluecherry
+/obj/item/food/snacks/frozen/snowcone/bluecherry
name = "bluecherry snowcone"
desc = "Bluecherry syrup drizzled over a snowball in a paper cup, how rare!"
icon_state = "blue_sc"
list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "bluecherryjelly" = 5)
tastes = list("ice" = 1, "water" = 1, "bluecherries" = 5)
-/obj/item/reagent_containers/food/snacks/frozen/snowcone/cherry
+/obj/item/food/snacks/frozen/snowcone/cherry
name = "cherry snowcone"
desc = "Cherry syrup drizzled over a snowball in a paper cup."
icon_state = "red_sc"
list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "cherryjelly" = 5)
tastes = list("ice" = 1, "water" = 1, "cherries" = 5)
-/obj/item/reagent_containers/food/snacks/frozen/snowcone/fruitsalad
+/obj/item/food/snacks/frozen/snowcone/fruitsalad
name = "fruit salad snowcone"
desc = "A delightful mix of citrus syrups drizzled over a snowball in a paper cup."
icon_state = "fruitsalad_sc"
list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "limejuice" = 5, "lemonjuice" = 5, "orangejuice" = 5)
tastes = list("ice" = 1, "water" = 1, "oranges" = 5, "lemons" = 5, "limes" = 5)
-/obj/item/reagent_containers/food/snacks/frozen/snowcone/grape
+/obj/item/food/snacks/frozen/snowcone/grape
name = "grape snowcone"
desc = "Grape syrup drizzled over a snowball in a paper cup."
icon_state = "grape_sc"
list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "grapejuice" = 5)
tastes = list("ice" = 1, "water" = 1, "grapes" = 5)
-/obj/item/reagent_containers/food/snacks/frozen/snowcone/honey
+/obj/item/food/snacks/frozen/snowcone/honey
name = "honey snowcone"
desc = "Honey drizzled over a snowball in a paper cup."
icon_state = "amber_sc"
list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "honey" = 5)
tastes = list("ice" = 1, "water" = 1, "honey" = 5)
-/obj/item/reagent_containers/food/snacks/frozen/snowcone/lemon
+/obj/item/food/snacks/frozen/snowcone/lemon
name = "lemon snowcone"
desc = "Lemon syrup drizzled over a snowball in a paper cup."
icon_state = "lemon_sc"
list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "lemonjuice" = 5)
tastes = list("ice" = 1, "water" = 1, "lemons" = 5)
-/obj/item/reagent_containers/food/snacks/frozen/snowcone/lime
+/obj/item/food/snacks/frozen/snowcone/lime
name = "lime snowcone"
desc = "Lime syrup drizzled over a snowball in a paper cup."
icon_state = "lime_sc"
list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "limejuice" = 5)
tastes = list("ice" = 1, "water" = 1, "limes" = 5)
-/obj/item/reagent_containers/food/snacks/frozen/snowcone/mime
+/obj/item/food/snacks/frozen/snowcone/mime
name = "mime snowcone"
desc = "..."
icon_state = "mime_sc"
list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "nothing" = 5)
tastes = list("ice" = 1, "water" = 1, "silence" = 5)
-/obj/item/reagent_containers/food/snacks/frozen/snowcone/orange
+/obj/item/food/snacks/frozen/snowcone/orange
name = "orange snowcone"
desc = "Orange syrup drizzled over a snowball in a paper cup."
icon_state = "orange_sc"
list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "orangejuice" = 5)
tastes = list("ice" = 1, "water" = 1, "oranges" = 5)
-/obj/item/reagent_containers/food/snacks/frozen/snowcone/pineapple
+/obj/item/food/snacks/frozen/snowcone/pineapple
name = "pineapple snowcone"
desc = "Pineapple syrup drizzled over a snowball in a paper cup."
icon_state = "pineapple_sc"
list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "pineapplejuice" = 5)
tastes = list("ice" = 1, "water" = 1, "pineapple" = 5)
-/obj/item/reagent_containers/food/snacks/frozen/snowcone/rainbow
+/obj/item/food/snacks/frozen/snowcone/rainbow
name = "rainbow snowcone"
desc = "A very colorful snowball in a paper cup."
icon_state = "rainbow_sc"
list_reagents = list("water" = 10, "ice" = 5, "colorful_reagent" = 5)
tastes = list("ice" = 1, "water" = 1, "rainbows" = 5)
-/obj/item/reagent_containers/food/snacks/frozen/snowcone/cola
+/obj/item/food/snacks/frozen/snowcone/cola
name = "space cola snowcone"
desc = "Space Cola drizzled over a snowball in a paper cup."
icon_state = "soda_sc"
list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "cola" = 5)
tastes = list("ice" = 1, "water" = 1, "soda" = 5)
-/obj/item/reagent_containers/food/snacks/frozen/snowcone/spacemountain
+/obj/item/food/snacks/frozen/snowcone/spacemountain
name = "space mountain wind snowcone"
desc = "Space Mountain Wind drizzled over a snowball in a paper cup."
icon_state = "mountainwind_sc"
@@ -264,7 +264,7 @@
// Popsicles //
/////////////////
-/obj/item/reagent_containers/food/snacks/frozen/popsicle
+/obj/item/food/snacks/frozen/popsicle
name = "jumbo icecream"
desc = "A luxurious ice cream covered in rich chocolate. It seems smaller than you remember it being."
icon_state = "jumbo"
@@ -272,63 +272,63 @@
list_reagents = list("nutriment" = 4, "sugar" = 4, "chocolate" = 3)
tastes = list("ice cream" = 1, "chocolate" = 1, "vanilla" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/popsicle/bananatop
+/obj/item/food/snacks/frozen/popsicle/bananatop
name = "banana topsicle"
desc = "A frozen treat made from tofu and banana juice blended smooth, then frozen. Popular in rural Japan in the summer."
icon_state = "topsicle_banana"
list_reagents = list("vitamin" = 4, "sugar" = 6, "banana" = 4)
tastes = list("bananas" = 1, "tofu" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/popsicle/berrytop
+/obj/item/food/snacks/frozen/popsicle/berrytop
name = "berry topsicle"
desc = "A frozen treat made from tofu and berry juice blended smooth, then frozen. Supposedly a favourite of bears, but that makes no sense..."
icon_state = "topsicle_berry"
list_reagents = list("vitamin" = 4, "sugar" = 6, "berryjuice" = 4)
tastes = list("berries" = 1, "tofu" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/popsicle/pineappletop
+/obj/item/food/snacks/frozen/popsicle/pineappletop
name = "pineapple topsicle"
desc = "A frozen treat made from tofu and pineapple juice blended smooth, then frozen. As seen on TV."
icon_state = "topsicle_pineapple"
list_reagents = list("vitamin" = 4, "sugar" = 6, "pineapplejuice" = 4)
tastes = list("pineapples" = 1, "tofu" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/popsicle/licoricecream
+/obj/item/food/snacks/frozen/popsicle/licoricecream
name = "licorice creamsicle"
desc = "A salty licorice ice cream. A salty frozen treat."
icon_state = "licorice_creamsicle"
list_reagents = list("nutriment" = 4, "cream" = 2, "vanilla" = 1, "sugar" = 4, "salt" = 1)
tastes = list("salty licorice" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/popsicle/orangecream
+/obj/item/food/snacks/frozen/popsicle/orangecream
name = "orange creamsicle"
desc = "A classic orange creamsicle. A sunny frozen treat."
icon_state = "creamsicle_o"
list_reagents = list("orangejuice" = 4, "cream" = 2, "vanilla" = 2, "sugar" = 4)
tastes = list("ice cream" = 1, "oranges" = 1, "vanilla" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/popsicle/berrycream
+/obj/item/food/snacks/frozen/popsicle/berrycream
name = "berry creamsicle"
desc = "A vibrant berry creamsicle. A berry good frozen treat."
icon_state = "creamsicle_m"
list_reagents = list("berryjuice" = 4, "cream" = 2, "vanilla" = 2, "sugar" = 4)
tastes = list("ice cream" = 1, "berries" = 1, "vanilla" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/popsicle/frozenpineapple
+/obj/item/food/snacks/frozen/popsicle/frozenpineapple
name = "frozen pineapple pop"
desc = "Few cultures love pineapple as much as the Martians, and this dessert proves that- frozen pineapple, on a stick, with just a little dunk of dark chocolate."
icon_state = "pineapple_pop"
list_reagents = list("pineapplejuice" = 4, "sugar" = 4, "nutriment" = 2, "vitamin" = 2)
tastes = list("cold pineapple" = 1, "chocolate" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/popsicle/sea_salt
+/obj/item/food/snacks/frozen/popsicle/sea_salt
name = "sea salt ice-cream bar"
desc = "This sky-blue ice-cream bar is flavoured with only the finest imported sea salt. Salty... no, sweet!"
icon_state = "sea_salt_pop"
list_reagents = list("salt" = 1, "nutriment" = 2, "cream" = 2, "vanilla" = 2, "sugar"= 4,)
tastes = list("salt" = 1, "sweet" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/popsicle/ant
+/obj/item/food/snacks/frozen/popsicle/ant
name = "ant popsicle"
desc = "A colony of ants suspended in hardened sugar. Those things are dead, right?"
icon_state = "ant_pop"
diff --git a/code/modules/food_and_drinks/food/foods/ingredients.dm b/code/modules/food_and_drinks/food/foods/ingredients.dm
index b6b9baa121b..a0cf80c61b6 100644
--- a/code/modules/food_and_drinks/food/foods/ingredients.dm
+++ b/code/modules/food_and_drinks/food/foods/ingredients.dm
@@ -3,7 +3,7 @@
// Tofu & Soy //
//////////////////////
-/obj/item/reagent_containers/food/snacks/tofu
+/obj/item/food/snacks/tofu
name = "tofu"
icon_state = "tofu"
desc = "We all love tofu."
@@ -13,7 +13,7 @@
tastes = list("tofu" = 1)
ingredient_name = "tofu chunk"
-/obj/item/reagent_containers/food/snacks/fried_tofu
+/obj/item/food/snacks/fried_tofu
name = "fried tofu"
icon_state = "tofu"
desc = "Proof that even vegetarians crave unhealthy foods."
@@ -22,7 +22,7 @@
list_reagents = list("plantmatter" = 3)
tastes = list("tofu" = 1)
-/obj/item/reagent_containers/food/snacks/soydope
+/obj/item/food/snacks/soydope
name = "soy dope"
icon_state = "soydope"
desc = "Like regular dope, but for the health conscious consumer."
@@ -36,27 +36,27 @@
// Cheese //
//////////////////////
-/obj/item/reagent_containers/food/snacks/sliceable/cheesewheel
+/obj/item/food/snacks/sliceable/cheesewheel
name = "cheese wheel"
desc = "A big wheel of delicious Cheddar."
icon_state = "cheesewheel"
- slice_path = /obj/item/reagent_containers/food/snacks/cheesewedge
+ slice_path = /obj/item/food/snacks/cheesewedge
slices_num = 5
filling_color = "#FFF700"
list_reagents = list("nutriment" = 15, "vitamin" = 5, "cheese" = 20)
tastes = list("cheese" = 1)
-/obj/item/reagent_containers/food/snacks/cheesewedge
+/obj/item/food/snacks/cheesewedge
name = "cheese wedge"
desc = "A wedge of delicious Cheddar. The cheese wheel it was cut from can't have gone far."
icon_state = "cheesewedge"
filling_color = "#FFF700"
tastes = list("cheese" = 1)
-/obj/item/reagent_containers/food/snacks/cheesewedge/presliced
+/obj/item/food/snacks/cheesewedge/presliced
list_reagents = list("nutriment" = 3, "vitamin" = 1, "cheese" = 4)
-
-/obj/item/reagent_containers/food/snacks/weirdcheesewedge
+
+/obj/item/food/snacks/weirdcheesewedge
name = "weird cheese"
desc = "Some kind of... gooey, messy, gloopy thing. Similar to cheese, but only in the broad sense of the word."
icon_state = "weirdcheesewedge"
@@ -68,7 +68,7 @@
// Plants //
//////////////////////
-/obj/item/reagent_containers/food/snacks/hugemushroomslice
+/obj/item/food/snacks/hugemushroomslice
name = "huge mushroom slice"
desc = "A slice from a huge mushroom."
icon_state = "hugemushroomslice"
@@ -77,14 +77,14 @@
list_reagents = list("plantmatter" = 3, "vitamin" = 1)
tastes = list("mushroom" = 1)
-/obj/item/reagent_containers/food/snacks/watermelonslice
+/obj/item/food/snacks/watermelonslice
name = "watermelon slice"
desc = "A slice of watery goodness."
icon_state = "watermelonslice" // Sprite created by https://github.com/binarysudoku for Goonstation, They have relicensed it for our use.
filling_color = "#FF3867"
tastes = list("watermelon" = 1)
-/obj/item/reagent_containers/food/snacks/tomatoslice
+/obj/item/food/snacks/tomatoslice
name = "tomato slice"
desc = "A fresh slice of tomato."
icon_state = "tomatoslice"
@@ -92,7 +92,7 @@
list_reagents = list("plantmatter" = 2)
tastes = list("tomato" = 1)
-/obj/item/reagent_containers/food/snacks/pineappleslice
+/obj/item/food/snacks/pineappleslice
name = "pineapple slices"
desc = "Rings of pineapple."
icon_state = "pineappleslice" // Sprite created by https://github.com/binarysudoku for Goonstation, They have relicensed it for our use.
@@ -104,7 +104,7 @@
// Dough //
//////////////////////
-/obj/item/reagent_containers/food/snacks/dough
+/obj/item/food/snacks/dough
name = "dough"
desc = "A piece of dough."
icon = 'icons/obj/food/food_ingredients.dmi'
@@ -113,10 +113,10 @@
tastes = list("dough" = 1)
// Dough + rolling pin = flat dough
-/obj/item/reagent_containers/food/snacks/dough/attackby(obj/item/I, mob/user, params)
+/obj/item/food/snacks/dough/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/kitchen/rollingpin))
if(isturf(loc))
- new /obj/item/reagent_containers/food/snacks/sliceable/flatdough(loc)
+ new /obj/item/food/snacks/sliceable/flatdough(loc)
to_chat(user, "You flatten [src].")
qdel(src)
else
@@ -125,18 +125,18 @@
..()
// slicable into 3xdoughslices
-/obj/item/reagent_containers/food/snacks/sliceable/flatdough
+/obj/item/food/snacks/sliceable/flatdough
name = "flat dough"
desc = "Some flattened dough."
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "flat dough"
- slice_path = /obj/item/reagent_containers/food/snacks/doughslice
+ slice_path = /obj/item/food/snacks/doughslice
slices_num = 3
list_reagents = list("nutriment" = 6)
tastes = list("dough" = 1)
-/obj/item/reagent_containers/food/snacks/doughslice
+/obj/item/food/snacks/doughslice
name = "dough slice"
desc = "The building block of an impressive dish."
icon = 'icons/obj/food/food_ingredients.dmi'
@@ -147,7 +147,7 @@
///cookies by Ume
-/obj/item/reagent_containers/food/snacks/cookiedough
+/obj/item/food/snacks/cookiedough
var/flat = FALSE
name = "pastry dough"
icon = 'icons/obj/food/food_ingredients.dmi'
@@ -156,19 +156,19 @@
list_reagents = list("nutriment" = 5, "sugar" = 5)
tastes = list("dough" = 1, "sugar" = 1)
-/obj/item/reagent_containers/food/snacks/cookiedough/update_name()
+/obj/item/food/snacks/cookiedough/update_name()
. = ..()
if(flat)
name = "flat pastry dough"
-/obj/item/reagent_containers/food/snacks/cookiedough/update_icon_state()
+/obj/item/food/snacks/cookiedough/update_icon_state()
if(flat)
icon_state = "cookiedough_flat"
else
icon_state = "cookiedough"
// Dough + rolling pin = flat cookie dough // Flat dough + circular cutter = unbaked cookies
-/obj/item/reagent_containers/food/snacks/cookiedough/attackby(obj/item/I, mob/user, params)
+/obj/item/food/snacks/cookiedough/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/kitchen/rollingpin) && !flat)
if(isturf(loc))
to_chat(user, "You flatten [src].")
@@ -178,7 +178,7 @@
to_chat(user, "You need to put [src] on a surface to roll it out!")
else if(istype(I, /obj/item/kitchen/cutter) && flat)
if(isturf(loc))
- new /obj/item/reagent_containers/food/snacks/rawcookies(loc)
+ new /obj/item/food/snacks/rawcookies(loc)
to_chat(user, "You cut [src] into cookies.")
qdel(src)
else
@@ -187,17 +187,17 @@
return ..()
-/obj/item/reagent_containers/food/snacks/rawcookies
+/obj/item/food/snacks/rawcookies
name = "raw cookies"
desc = "Ready for oven!"
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "unbaked_cookies"
list_reagents = list("nutriment" = 5, "sugar" = 5)
-/obj/item/reagent_containers/food/snacks/rawcookies/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/reagent_containers/food/snacks/choc_pile))
+/obj/item/food/snacks/rawcookies/attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/food/snacks/choc_pile))
if(isturf(loc))
- new /obj/item/reagent_containers/food/snacks/rawcookies/chocochips(loc)
+ new /obj/item/food/snacks/rawcookies/chocochips(loc)
to_chat(user, "You sprinkle [I] all over the cookies.")
qdel(src)
qdel(I)
@@ -206,7 +206,7 @@
else
return ..()
-/obj/item/reagent_containers/food/snacks/rawcookies/chocochips
+/obj/item/food/snacks/rawcookies/chocochips
name = "raw cookies"
desc = "Ready for oven! They have little pieces of chocolate all over them"
icon = 'icons/obj/food/food_ingredients.dmi'
@@ -218,7 +218,7 @@
// Chocolate //
//////////////////////
-/obj/item/reagent_containers/food/snacks/chocolatebar
+/obj/item/food/snacks/chocolatebar
name = "chocolate bar"
desc = "Such sweet, fattening food."
icon_state = "chocolatebar"
@@ -227,10 +227,10 @@
tastes = list("chocolate" = 1)
///Chocolate crumbles/pile
-/obj/item/reagent_containers/food/snacks/chocolatebar/attackby(obj/item/I, mob/user, params)
+/obj/item/food/snacks/chocolatebar/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/kitchen/knife))
if(isturf(loc))
- new /obj/item/reagent_containers/food/snacks/choc_pile(loc)
+ new /obj/item/food/snacks/choc_pile(loc)
to_chat(user, "You cut [src] into little crumbles.")
qdel(src)
else
@@ -239,7 +239,7 @@
return ..()
-/obj/item/reagent_containers/food/snacks/choc_pile //for reagent chocolate being spilled on turfs
+/obj/item/food/snacks/choc_pile //for reagent chocolate being spilled on turfs
name = "pile of chocolate"
desc = "A pile of pure chocolate pieces."
icon_state = "cocoa"
@@ -252,7 +252,7 @@
// Misc //
//////////////////////
-/obj/item/reagent_containers/food/snacks/ectoplasm
+/obj/item/food/snacks/ectoplasm
name = "ectoplasm"
desc = "A luminescent blob of what scientists refer to as 'ghost goo'."
icon = 'icons/obj/wizard.dmi'
diff --git a/code/modules/food_and_drinks/food/foods/junkfood.dm b/code/modules/food_and_drinks/food/foods/junkfood.dm
index 3c3397fa0c9..f410d2db2ff 100644
--- a/code/modules/food_and_drinks/food/foods/junkfood.dm
+++ b/code/modules/food_and_drinks/food/foods/junkfood.dm
@@ -3,7 +3,7 @@
// Vendor //
//////////////////////
-/obj/item/reagent_containers/food/snacks/chips
+/obj/item/food/snacks/chips
name = "chips"
desc = "Commander Riker's What-The-Crisps."
icon_state = "chips"
@@ -15,7 +15,7 @@
list_reagents = list("nutriment" = 1, "sodiumchloride" = 1, "sugar" = 3)
tastes = list("crisps" = 1)
-/obj/item/reagent_containers/food/snacks/sosjerky
+/obj/item/food/snacks/sosjerky
name = "Scaredy's Private Reserve Beef Jerky"
icon_state = "sosjerky"
desc = "Beef jerky made from the finest space cows."
@@ -26,7 +26,7 @@
list_reagents = list("protein" = 1, "sugar" = 3)
tastes = list("chewy beef" = 1)
-/obj/item/reagent_containers/food/snacks/pistachios
+/obj/item/food/snacks/pistachios
name = "pistachios"
icon_state = "pistachios"
desc = "Deliciously salted pistachios. A perfectly valid choice..."
@@ -37,7 +37,7 @@
list_reagents = list("plantmatter" = 2, "sodiumchloride" = 1, "sugar" = 4)
tastes = list("pistachios" = 1)
-/obj/item/reagent_containers/food/snacks/no_raisin
+/obj/item/food/snacks/no_raisin
name = "4no Raisins"
icon_state = "4no_raisins"
desc = "Best raisins in the universe. Not sure why."
@@ -48,7 +48,7 @@
list_reagents = list("plantmatter" = 2, "sugar" = 4)
tastes = list("dried raisins" = 1)
-/obj/item/reagent_containers/food/snacks/spacetwinkie
+/obj/item/food/snacks/spacetwinkie
name = "Space Twinkie"
icon_state = "space_twinkie"
desc = "Guaranteed to survive longer then you will."
@@ -58,7 +58,7 @@
list_reagents = list("sugar" = 4)
tastes = list("twinkies" = 1)
-/obj/item/reagent_containers/food/snacks/cheesiehonkers
+/obj/item/food/snacks/cheesiehonkers
name = "Cheesie Honkers"
icon_state = "cheesie_honkers"
desc = "Bite sized cheesie snacks that will honk all over your mouth."
@@ -69,7 +69,7 @@
list_reagents = list("nutriment" = 1, "fake_cheese" = 2, "sugar" = 3)
tastes = list("cheese" = 1, "crisps" = 2)
-/obj/item/reagent_containers/food/snacks/syndicake
+/obj/item/food/snacks/syndicake
name = "Syndi-Cakes"
icon_state = "syndi_cakes"
desc = "An extremely moist snack cake that tastes just as good after being nuked."
@@ -80,7 +80,7 @@
list_reagents = list("nutriment" = 4, "salglu_solution" = 5)
tastes = list("sweetness" = 3, "cake" = 1)
-/obj/item/reagent_containers/food/snacks/tastybread
+/obj/item/food/snacks/tastybread
name = "bread tube"
desc = "Bread in a tube. Chewy and surprisingly tasty."
icon_state = "tastybread"
@@ -91,7 +91,7 @@
list_reagents = list("nutriment" = 2, "sugar" = 4)
tastes = list("bread" = 1)
-/obj/item/reagent_containers/food/snacks/stroopwafel
+/obj/item/food/snacks/stroopwafel
name = "stroopwafel"
desc = "Straight from the snack factories of Space Den Haag comes a classic dutch treat!"
icon_state = "stroopwafel"
@@ -100,7 +100,7 @@
list_reagents = list("nutriment" = 10, "sugar" = 4)
tastes = list("syrup" = 3, "waffle" = 2)
-/obj/item/reagent_containers/food/snacks/twimsts
+/obj/item/food/snacks/twimsts
name = "Twimsts"
desc = "Sweet twisted sticks made of liquorice, can be used to make edible handcuffs!"
icon_state = "twimsts"
@@ -111,7 +111,7 @@
list_reagents = list("nutriment" = 2, "sugar" = 10)
tastes = list("sweetness" = 3, "liquorice" = 2)
-/obj/item/reagent_containers/food/snacks/twimsts/attack_self(mob/user)
+/obj/item/food/snacks/twimsts/attack_self(mob/user)
var/obj/item/restraints/handcuffs/twimsts/L = new /obj/item/restraints/handcuffs/twimsts
L.create_reagents(100)
reagents.copy_to(L, reagents.total_volume)
@@ -125,13 +125,13 @@
// Homemade //
//////////////////////
-/obj/item/reagent_containers/food/snacks/sosjerky/healthy
+/obj/item/food/snacks/sosjerky/healthy
name = "homemade beef jerky"
desc = "Homemade beef jerky made from the finest space cows."
list_reagents = list("nutriment" = 3, "vitamin" = 1)
junkiness = 0
-/obj/item/reagent_containers/food/snacks/no_raisin/healthy
+/obj/item/food/snacks/no_raisin/healthy
name = "homemade raisins"
desc = "homemade raisins, the best in all of spess."
list_reagents = list("nutriment" = 3, "vitamin" = 2)
diff --git a/code/modules/food_and_drinks/food/foods/meat.dm b/code/modules/food_and_drinks/food/foods/meat.dm
index 921a42adf7d..f03044731ce 100644
--- a/code/modules/food_and_drinks/food/foods/meat.dm
+++ b/code/modules/food_and_drinks/food/foods/meat.dm
@@ -3,7 +3,7 @@
// Raw Meat //
//////////////////////
-/obj/item/reagent_containers/food/snacks/meat
+/obj/item/food/snacks/meat
name = "meat"
desc = "A slab of meat."
icon = 'icons/obj/food/meat.dmi'
@@ -15,11 +15,11 @@
ingredient_name = "slab of meat"
ingredient_name_plural = "slabs of meat"
-/obj/item/reagent_containers/food/snacks/meat/attackby(obj/item/W, mob/user, params)
+/obj/item/food/snacks/meat/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/kitchen/knife) || istype(W, /obj/item/scalpel))
- new /obj/item/reagent_containers/food/snacks/rawcutlet(src)
- new /obj/item/reagent_containers/food/snacks/rawcutlet(src)
- new /obj/item/reagent_containers/food/snacks/rawcutlet(src)
+ new /obj/item/food/snacks/rawcutlet(src)
+ new /obj/item/food/snacks/rawcutlet(src)
+ new /obj/item/food/snacks/rawcutlet(src)
user.visible_message( \
"[user] cuts [src] with [W]!", \
"You cut [src] with [W]!" \
@@ -28,42 +28,42 @@
else
..()
-/obj/item/reagent_containers/food/snacks/meat/syntiflesh
+/obj/item/food/snacks/meat/syntiflesh
name = "synthetic meat"
desc = "A synthetic slab of flesh."
-/obj/item/reagent_containers/food/snacks/meat/human
+/obj/item/food/snacks/meat/human
name = "-meat"
var/subjectname = ""
var/subjectjob = null
tastes = list("salty meat" = 1)
-/obj/item/reagent_containers/food/snacks/meat/slab/meatproduct
+/obj/item/food/snacks/meat/slab/meatproduct
name = "meat product"
desc = "A slab of reclaimed and chemically processed meat product."
-/obj/item/reagent_containers/food/snacks/meat/slab/gorilla
+/obj/item/food/snacks/meat/slab/gorilla
name = "gorilla meat"
desc = "Much meatier than monkey meat."
list_reagents = list("nutriment" = 5, "vitamin" = 1)
-/obj/item/reagent_containers/food/snacks/meat/monkey
+/obj/item/food/snacks/meat/monkey
//same as plain meat
-/obj/item/reagent_containers/food/snacks/meat/corgi
+/obj/item/food/snacks/meat/corgi
name = "corgi meat"
desc = "Tastes like the Head of Personnel's hopes and dreams."
-/obj/item/reagent_containers/food/snacks/meat/pug
+/obj/item/food/snacks/meat/pug
name = "pug meat"
desc = "Slightly less adorable in sliced form."
-/obj/item/reagent_containers/food/snacks/meat/ham
+/obj/item/food/snacks/meat/ham
name = "ham"
desc = "For when you need to go ham."
list_reagents = list("protein" = 3, "porktonium" = 10)
-/obj/item/reagent_containers/food/snacks/meat/meatwheat
+/obj/item/food/snacks/meat/meatwheat
name = "meatwheat clump"
desc = "This doesn't look like meat, but your standards aren't that high to begin with."
list_reagents = list("nutriment" = 3, "vitamin" = 2, "blood" = 5)
@@ -71,7 +71,7 @@
icon_state = "meatwheat_clump"
bitesize = 4
-/obj/item/reagent_containers/food/snacks/meat/tomatomeat
+/obj/item/food/snacks/meat/tomatomeat
name = "tomato meat slice"
desc = "A slice from a huge tomato."
icon_state = "tomatomeat"
@@ -80,7 +80,7 @@
list_reagents = list("protein" = 2)
tastes = list("tomato" = 1)
-/obj/item/reagent_containers/food/snacks/rawcutlet
+/obj/item/food/snacks/rawcutlet
name = "raw cutlet"
desc = "A thin strip of raw meat."
icon = 'icons/obj/food/food_ingredients.dmi'
@@ -88,13 +88,13 @@
bitesize = 1
list_reagents = list("protein" = 1)
-/obj/item/reagent_containers/food/snacks/rawcutlet/attackby(obj/item/W, mob/user, params)
+/obj/item/food/snacks/rawcutlet/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/kitchen/knife) || istype(W, /obj/item/scalpel))
user.visible_message( \
"[user] cuts the raw cutlet with [W]!", \
"You cut the raw cutlet with [W]!" \
)
- var/obj/item/reagent_containers/food/snacks/raw_bacon/bacon = new(get_turf(src))
+ var/obj/item/food/snacks/raw_bacon/bacon = new(get_turf(src))
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
qdel(src)
@@ -108,7 +108,7 @@
// Cannot be used in the usual meat-based food recipies but can be used as cloning pod biomass.
-/obj/item/reagent_containers/food/snacks/monstermeat
+/obj/item/food/snacks/monstermeat
// Abstract object used for inheritance. I don't see why you would want one.
// It's just a convenience to set all monstermeats as biomass-able at once,
// in the GLOB.cloner_biomass_items list.
@@ -118,7 +118,7 @@
icon = 'icons/obj/food/meat.dmi'
icon_state = "bearmeat"
-/obj/item/reagent_containers/food/snacks/monstermeat/bearmeat
+/obj/item/food/snacks/monstermeat/bearmeat
name = "bear meat"
desc = "A very manly slab of meat."
icon_state = "bearmeat"
@@ -127,7 +127,7 @@
list_reagents = list("protein" = 12, "morphine" = 5, "vitamin" = 2)
tastes = list("meat" = 1, "salmon" = 1)
-/obj/item/reagent_containers/food/snacks/monstermeat/xenomeat
+/obj/item/food/snacks/monstermeat/xenomeat
name = "meat"
desc = "A slab of meat. It's green!"
icon_state = "xenomeat"
@@ -136,7 +136,7 @@
list_reagents = list("protein" = 3, "vitamin" = 1)
tastes = list("meat" = 1, "acid" = 1)
-/obj/item/reagent_containers/food/snacks/monstermeat/spidermeat
+/obj/item/food/snacks/monstermeat/spidermeat
name = "spider meat"
desc = "A slab of spider meat. Not very appetizing."
icon_state = "spidermeat"
@@ -144,7 +144,7 @@
list_reagents = list("protein" = 3, "toxin" = 3, "vitamin" = 1)
tastes = list("cobwebs" = 1)
-/obj/item/reagent_containers/food/snacks/monstermeat/lizardmeat
+/obj/item/food/snacks/monstermeat/lizardmeat
name = "mutant lizard meat"
desc = "A peculiar slab of meat. It looks scaly and radioactive."
icon_state = "xenomeat"
@@ -153,14 +153,14 @@
list_reagents = list("protein" = 3, "toxin" = 3)
tastes = list("tough meat" = 1)
-/obj/item/reagent_containers/food/snacks/monstermeat/spiderleg
+/obj/item/food/snacks/monstermeat/spiderleg
name = "spider leg"
desc = "A still twitching leg of a giant spider. You don't really want to eat this, do you?"
icon_state = "spiderleg"
list_reagents = list("protein" = 2, "toxin" = 2)
tastes = list("cobwebs" = 1, "creepy motion" = 1)
-/obj/item/reagent_containers/food/snacks/raw_bacon
+/obj/item/food/snacks/raw_bacon
name = "raw bacon"
desc = "God's gift to man in uncooked form."
icon = 'icons/obj/food/meat.dmi'
@@ -168,30 +168,30 @@
list_reagents = list("nutriment" = 1, "porktonium" = 10)
tastes = list("bacon" = 1)
-/obj/item/reagent_containers/food/snacks/monstermeat/spidereggs
+/obj/item/food/snacks/monstermeat/spidereggs
name = "spider eggs"
desc = "A cluster of juicy spider eggs. A great side dish for when you don't care about your health."
icon_state = "spidereggs"
list_reagents = list("protein" = 2, "toxin" = 2)
tastes = list("cobwebs" = 1, "spider juice" = 1)
-/obj/item/reagent_containers/food/snacks/monstermeat/goliath
+/obj/item/food/snacks/monstermeat/goliath
name = "goliath meat"
desc = "A slab of goliath meat. It's not very edible now, but it cooks great in lava."
icon_state = "goliathmeat"
list_reagents = list("protein" = 3, "toxin" = 5)
tastes = list("tough meat" = 1)
-/obj/item/reagent_containers/food/snacks/monstermeat/goliath/burn()
+/obj/item/food/snacks/monstermeat/goliath/burn()
visible_message("[src] finishes cooking!")
- new /obj/item/reagent_containers/food/snacks/goliath_steak(loc)
+ new /obj/item/food/snacks/goliath_steak(loc)
qdel(src)
//////////////////////
// Cooked Meat //
//////////////////////
-/obj/item/reagent_containers/food/snacks/meatsteak
+/obj/item/food/snacks/meatsteak
name = "meat steak"
desc = "A piece of hot spicy meat."
icon = 'icons/obj/food/meat.dmi'
@@ -202,7 +202,7 @@
list_reagents = list("nutriment" = 5)
tastes = list("meat" = 1)
-/obj/item/reagent_containers/food/snacks/bacon
+/obj/item/food/snacks/bacon
name = "bacon"
desc = "It looks crispy and tastes amazing! Mmm... Bacon."
icon = 'icons/obj/food/meat.dmi'
@@ -210,7 +210,7 @@
list_reagents = list("nutriment" = 4, "porktonium" = 10, "msg" = 4)
tastes = list("bacon" = 1)
-/obj/item/reagent_containers/food/snacks/telebacon
+/obj/item/food/snacks/telebacon
name = "tele bacon"
desc = "It tastes a little odd but it's still delicious."
icon = 'icons/obj/food/meat.dmi'
@@ -219,21 +219,21 @@
list_reagents = list("nutriment" = 4, "porktonium" = 10)
tastes = list("bacon" = 1)
-/obj/item/reagent_containers/food/snacks/telebacon/Initialize(mapload)
+/obj/item/food/snacks/telebacon/Initialize(mapload)
. = ..()
baconbeacon = new /obj/item/radio/beacon/bacon(src)
-/obj/item/reagent_containers/food/snacks/telebacon/Destroy()
+/obj/item/food/snacks/telebacon/Destroy()
QDEL_NULL(baconbeacon)
return ..()
-/obj/item/reagent_containers/food/snacks/telebacon/On_Consume(mob/M, mob/user)
+/obj/item/food/snacks/telebacon/On_Consume(mob/M, mob/user)
if(!reagents.total_volume)
baconbeacon.forceMove(user)
baconbeacon.digest_delay()
baconbeacon = null
-/obj/item/reagent_containers/food/snacks/meatball
+/obj/item/food/snacks/meatball
name = "meatball"
desc = "A great meal all round."
icon = 'icons/obj/food/meat.dmi'
@@ -242,7 +242,7 @@
list_reagents = list("protein" = 4, "vitamin" = 1)
tastes = list("meat" = 1)
-/obj/item/reagent_containers/food/snacks/sausage
+/obj/item/food/snacks/sausage
name = "sausage"
desc = "A piece of mixed and cased meat."
icon = 'icons/obj/food/meat.dmi'
@@ -251,7 +251,7 @@
list_reagents = list("protein" = 6, "vitamin" = 1, "porktonium" = 10)
tastes = list("meat" = 1)
-/obj/item/reagent_containers/food/snacks/cutlet
+/obj/item/food/snacks/cutlet
name = "cutlet"
desc = "A tasty meat slice."
icon = 'icons/obj/food/food_ingredients.dmi'
@@ -259,7 +259,7 @@
list_reagents = list("protein" = 2)
tastes = list("meat" = 1)
-/obj/item/reagent_containers/food/snacks/spidereggsham
+/obj/item/food/snacks/spidereggsham
name = "green eggs and ham"
desc = "Would you eat them on a train? Would you eat them on a plane? Would you eat them on a state of the art corporate deathtrap floating through space?"
icon = 'icons/obj/food/meat.dmi'
@@ -269,7 +269,7 @@
list_reagents = list("nutriment" = 6)
tastes = list("cobwebs" = 1, "the colour green" = 1)
-/obj/item/reagent_containers/food/snacks/boiledspiderleg
+/obj/item/food/snacks/boiledspiderleg
name = "boiled spider leg"
desc = "A giant spider's leg that's still twitching after being cooked. Gross!"
icon = 'icons/obj/food/meat.dmi'
@@ -279,7 +279,7 @@
list_reagents = list("nutriment" = 3, "capsaicin" = 2)
tastes = list("cobwebs" = 1, "hot peppers" = 1)
-/obj/item/reagent_containers/food/snacks/wingfangchu
+/obj/item/food/snacks/wingfangchu
name = "wing fang chu"
desc = "A savory dish of alien wing wang in soy. Wait, what?"
icon = 'icons/obj/food/soupsalad.dmi'
@@ -289,7 +289,7 @@
list_reagents = list("nutriment" = 6, "soysauce" = 5, "vitamin" = 2)
tastes = list("soy" = 1)
-/obj/item/reagent_containers/food/snacks/goliath_steak
+/obj/item/food/snacks/goliath_steak
name = "goliath steak"
desc = "A delicious, lava cooked steak."
resistance_flags = LAVA_PROOF | FIRE_PROOF
@@ -299,7 +299,7 @@
list_reagents = list("protein" = 6, "vitamin" = 2)
tastes = list("meat" = 1)
-/obj/item/reagent_containers/food/snacks/fried_vox
+/obj/item/food/snacks/fried_vox
name = "Kentucky Fried Vox"
desc = "Bucket of voxxy, yaya!"
icon = 'icons/obj/food/meat.dmi'
@@ -312,7 +312,7 @@
// Cubes //
//////////////////////
-/obj/item/reagent_containers/food/snacks/monkeycube
+/obj/item/food/snacks/monkeycube
name = "monkey cube"
desc = "Just add water!"
icon_state = "monkeycube"
@@ -323,17 +323,17 @@
list_reagents = list("nutriment" = 2)
tastes = list("the jungle" = 1, "bananas" = 1)
-/obj/item/reagent_containers/food/snacks/monkeycube/water_act(volume, temperature, source, method = REAGENT_TOUCH)
+/obj/item/food/snacks/monkeycube/water_act(volume, temperature, source, method = REAGENT_TOUCH)
. = ..()
if(volume >= 1)
return Expand()
-/obj/item/reagent_containers/food/snacks/monkeycube/wash(mob/user, atom/source)
+/obj/item/food/snacks/monkeycube/wash(mob/user, atom/source)
user.drop_item()
forceMove(get_turf(source))
return 1
-/obj/item/reagent_containers/food/snacks/monkeycube/proc/Expand()
+/obj/item/food/snacks/monkeycube/proc/Expand()
if(LAZYLEN(SSmobs.cubemonkeys) >= GLOB.configuration.general.monkey_cube_cap)
if(fingerprintslast)
to_chat(get_mob_by_ckey(fingerprintslast), "Bluespace harmonics prevent the spawning of more than [GLOB.configuration.general.monkey_cube_cap] monkeys on the station at one time!")
@@ -355,22 +355,22 @@
SSmobs.cubemonkeys += creature
qdel(src)
-/obj/item/reagent_containers/food/snacks/monkeycube/syndicate
+/obj/item/food/snacks/monkeycube/syndicate
faction = list("neutral", "syndicate")
-/obj/item/reagent_containers/food/snacks/monkeycube/farwacube
+/obj/item/food/snacks/monkeycube/farwacube
name = "farwa cube"
monkey_type = /datum/species/monkey/tajaran
-/obj/item/reagent_containers/food/snacks/monkeycube/wolpincube
+/obj/item/food/snacks/monkeycube/wolpincube
name = "wolpin cube"
monkey_type = /datum/species/monkey/vulpkanin
-/obj/item/reagent_containers/food/snacks/monkeycube/stokcube
+/obj/item/food/snacks/monkeycube/stokcube
name = "stok cube"
monkey_type = /datum/species/monkey/unathi
-/obj/item/reagent_containers/food/snacks/monkeycube/neaeracube
+/obj/item/food/snacks/monkeycube/neaeracube
name = "neaera cube"
monkey_type = /datum/species/monkey/skrell
@@ -379,7 +379,7 @@
// Eggs //
//////////////////////
-/obj/item/reagent_containers/food/snacks/egg
+/obj/item/food/snacks/egg
name = "egg"
desc = "An egg!"
icon = 'icons/obj/food/breakfast.dmi'
@@ -387,8 +387,9 @@
filling_color = "#FDFFD1"
list_reagents = list("protein" = 1, "egg" = 5)
tastes = list("egg" = 1)
+ var/amount_grown = 0
-/obj/item/reagent_containers/food/snacks/egg/throw_impact(atom/hit_atom)
+/obj/item/food/snacks/egg/throw_impact(atom/hit_atom)
..()
var/turf/T = get_turf(hit_atom)
new/obj/effect/decal/cleanable/egg_smudge(T)
@@ -396,7 +397,7 @@
reagents.reaction(hit_atom, REAGENT_TOUCH)
qdel(src)
-/obj/item/reagent_containers/food/snacks/egg/attackby(obj/item/W, mob/user, params)
+/obj/item/food/snacks/egg/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/toy/crayon))
var/obj/item/toy/crayon/C = W
var/clr = C.colourName
@@ -411,49 +412,49 @@
else
..()
-/obj/item/reagent_containers/food/snacks/egg/blue
+/obj/item/food/snacks/egg/blue
icon_state = "egg-blue"
item_color = "blue"
-/obj/item/reagent_containers/food/snacks/egg/green
+/obj/item/food/snacks/egg/green
icon_state = "egg-green"
item_color = "green"
-/obj/item/reagent_containers/food/snacks/egg/mime
+/obj/item/food/snacks/egg/mime
icon_state = "egg-mime"
item_color = "mime"
-/obj/item/reagent_containers/food/snacks/egg/orange
+/obj/item/food/snacks/egg/orange
icon_state = "egg-orange"
item_color = "orange"
-/obj/item/reagent_containers/food/snacks/egg/purple
+/obj/item/food/snacks/egg/purple
icon_state = "egg-purple"
item_color = "purple"
-/obj/item/reagent_containers/food/snacks/egg/rainbow
+/obj/item/food/snacks/egg/rainbow
icon_state = "egg-rainbow"
item_color = "rainbow"
-/obj/item/reagent_containers/food/snacks/egg/red
+/obj/item/food/snacks/egg/red
icon_state = "egg-red"
item_color = "red"
-/obj/item/reagent_containers/food/snacks/egg/yellow
+/obj/item/food/snacks/egg/yellow
icon_state = "egg-yellow"
item_color = "yellow"
-/obj/item/reagent_containers/food/snacks/egg/gland
+/obj/item/food/snacks/egg/gland
desc = "An egg! It looks weird..."
-/obj/item/reagent_containers/food/snacks/egg/gland/Initialize(mapload)
+/obj/item/food/snacks/egg/gland/Initialize(mapload)
. = ..()
reagents.add_reagent(get_random_reagent_id(), 15)
var/reagent_color = mix_color_from_reagents(reagents.reagent_list)
color = reagent_color
-/obj/item/reagent_containers/food/snacks/friedegg
+/obj/item/food/snacks/friedegg
name = "fried egg"
desc = "A fried egg, with a touch of salt and pepper."
icon = 'icons/obj/food/breakfast.dmi'
@@ -463,7 +464,7 @@
list_reagents = list("nutriment" = 3, "egg" = 5)
tastes = list("egg" = 1, "salt" = 1, "pepper" = 1)
-/obj/item/reagent_containers/food/snacks/boiledegg
+/obj/item/food/snacks/boiledegg
name = "boiled egg"
desc = "A hard boiled egg."
icon = 'icons/obj/food/breakfast.dmi'
@@ -471,7 +472,7 @@
filling_color = "#FFFFFF"
list_reagents = list("nutriment" = 2, "egg" = 5, "vitamin" = 1)
-/obj/item/reagent_containers/food/snacks/chocolateegg
+/obj/item/food/snacks/chocolateegg
name = "chocolate egg"
desc = "Such sweet, fattening food."
icon = 'icons/obj/food/breakfast.dmi'
@@ -479,7 +480,7 @@
filling_color = "#7D5F46"
list_reagents = list("nutriment" = 4, "sugar" = 2, "cocoa" = 2)
-/obj/item/reagent_containers/food/snacks/omelette
+/obj/item/food/snacks/omelette
name = "omelette du fromage"
desc = "That's all you can say!"
icon = 'icons/obj/food/breakfast.dmi'
@@ -490,7 +491,7 @@
bitesize = 1
tastes = list("egg" = 1, "cheese" = 1)
-/obj/item/reagent_containers/food/snacks/benedict
+/obj/item/food/snacks/benedict
name = "eggs benedict"
desc = "There is only one egg on this, how rude."
icon = 'icons/obj/food/breakfast.dmi'
@@ -504,7 +505,7 @@
// Misc //
//////////////////////
-/obj/item/reagent_containers/food/snacks/hotdog
+/obj/item/food/snacks/hotdog
name = "hotdog"
desc = "Not made with actual dogs. Hopefully."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -513,7 +514,7 @@
list_reagents = list("nutriment" = 6, "ketchup" = 3, "vitamin" = 3)
tastes = list("bun" = 3, "meat" = 2)
-/obj/item/reagent_containers/food/snacks/meatbun
+/obj/item/food/snacks/meatbun
name = "meat bun"
desc = "Has the potential to not be dog."
icon = 'icons/obj/food/meat.dmi'
@@ -522,17 +523,17 @@
list_reagents = list("nutriment" = 6, "vitamin" = 2)
tastes = list("bun" = 3, "meat" = 2)
-/obj/item/reagent_containers/food/snacks/sliceable/turkey
+/obj/item/food/snacks/sliceable/turkey
name = "turkey"
desc = "A traditional turkey served with stuffing."
icon = 'icons/obj/food/meat.dmi'
icon_state = "turkey"
- slice_path = /obj/item/reagent_containers/food/snacks/turkeyslice
+ slice_path = /obj/item/food/snacks/turkeyslice
slices_num = 6
list_reagents = list("protein" = 24, "nutriment" = 18, "vitamin" = 5)
tastes = list("turkey" = 2, "stuffing" = 2)
-/obj/item/reagent_containers/food/snacks/turkeyslice
+/obj/item/food/snacks/turkeyslice
name = "turkey serving"
desc = "A serving of some tender and delicious turkey."
icon = 'icons/obj/food/meat.dmi'
@@ -541,7 +542,7 @@
filling_color = "#B97A57"
tastes = list("turkey" = 1)
-/obj/item/reagent_containers/food/snacks/organ
+/obj/item/food/snacks/organ
name = "organ"
desc = "Technically qualifies as organic."
icon = 'icons/obj/surgery.dmi'
@@ -550,7 +551,7 @@
bitesize = 3
list_reagents = list("protein" = 4, "vitamin" = 4)
-/obj/item/reagent_containers/food/snacks/appendix
+/obj/item/food/snacks/appendix
//yes, this is the same as meat. I might do something different in future
name = "appendix"
desc = "An appendix which looks perfectly healthy."
@@ -560,13 +561,13 @@
bitesize = 3
list_reagents = list("protein" = 3, "vitamin" = 2)
-/obj/item/reagent_containers/food/snacks/appendix/inflamed
+/obj/item/food/snacks/appendix/inflamed
name = "inflamed appendix"
desc = "An appendix which appears to be inflamed."
icon_state = "appendixinflamed"
filling_color = "#E00D7A"
-/obj/item/reagent_containers/food/snacks/bbqribs
+/obj/item/food/snacks/bbqribs
name = "BBQ ribs"
desc = "Sweet, smokey, savory, and gets everywhere. Perfect for Grilling."
icon = 'icons/obj/food/meat.dmi'
diff --git a/code/modules/food_and_drinks/food/foods/misc_food.dm b/code/modules/food_and_drinks/food/foods/misc_food.dm
index 870fa54b00b..26624dbd595 100644
--- a/code/modules/food_and_drinks/food/foods/misc_food.dm
+++ b/code/modules/food_and_drinks/food/foods/misc_food.dm
@@ -3,7 +3,7 @@
// Meals //
//////////////////////
-/obj/item/reagent_containers/food/snacks/eggplantparm
+/obj/item/food/snacks/eggplantparm
name = "eggplant parmigiana"
desc = "The only good recipe for eggplant."
icon_state = "eggplantparm"
@@ -12,7 +12,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 2)
tastes = list("eggplant" = 2, "cheese" = 2)
-/obj/item/reagent_containers/food/snacks/soylentgreen
+/obj/item/food/snacks/soylentgreen
name = "soylent green"
desc = "Not made of people. Honest." //Totally people.
icon_state = "soylent_green"
@@ -21,7 +21,7 @@
list_reagents = list("nutriment" = 10, "vitamin" = 1)
tastes = list("waffles" = 7, "people" = 1)
-/obj/item/reagent_containers/food/snacks/soylentviridians
+/obj/item/food/snacks/soylentviridians
name = "soylent virdians"
desc = "Not made of people. Honest." //Actually honest for once.
icon_state = "soylent_yellow"
@@ -30,7 +30,7 @@
list_reagents = list("nutriment" = 10, "vitamin" = 1)
tastes = list("waffles" = 1)
-/obj/item/reagent_containers/food/snacks/monkeysdelight
+/obj/item/food/snacks/monkeysdelight
name = "monkey's delight"
desc = "Eeee Eee!"
icon_state = "monkeysdelight"
@@ -40,7 +40,7 @@
list_reagents = list("nutriment" = 10, "banana" = 5, "vitamin" = 5)
tastes = list("banana" = 1, "the jungle" = 1)
-/obj/item/reagent_containers/food/snacks/dionaroast
+/obj/item/food/snacks/dionaroast
name = "roast diona"
desc = "It's like an enormous leathery carrot... With an eye."
icon_state = "dionaroast"
@@ -49,7 +49,7 @@
list_reagents = list("plantmatter" = 4, "nutriment" = 2, "radium" = 2, "vitamin" = 4)
tastes = list("chewy vegetables" = 1)
-/obj/item/reagent_containers/food/snacks/tofurkey
+/obj/item/food/snacks/tofurkey
name = "tofurkey"
desc = "A fake turkey made from tofu."
icon_state = "tofurkey"
@@ -63,7 +63,7 @@
// Salads //
//////////////////////
-/obj/item/reagent_containers/food/snacks/salad
+/obj/item/food/snacks/salad
name = "salad"
desc = "This salad is blander than the jokes of the clown, but is also low in carbohydrates!"
icon = 'icons/obj/food/soupsalad.dmi'
@@ -74,70 +74,70 @@
list_reagents = list("nutriment" = 6,"vitamin" = 4)
tastes = list("lettuce" = 1)
-/obj/item/reagent_containers/food/snacks/salad/aesir
+/obj/item/food/snacks/salad/aesir
name = "aesir salad"
desc = "Probably too incredible for mortal men to fully enjoy."
icon_state = "aesirsalad"
list_reagents = list("nutriment" = 8, "omnizine" = 8, "vitamin" = 6)
tastes = list("divinity" = 1, "lettuce" = 1)
-/obj/item/reagent_containers/food/snacks/salad/antipasto
+/obj/item/food/snacks/salad/antipasto
name = "antipasto salad"
desc = "A traditional Italian salad made of salami, mozzarella cheese, olives, and tomatoes. Often served as a first course meal."
icon_state = "antipasto_salad"
list_reagents = list("nutriment" = 12, "protein" = 6, "vitamin" = 6)
tastes = list("lettuce" = 2, "salami" = 2, "mozzarella cheese" = 2, "tomatoes" = 2, "dressing" = 1)
-/obj/item/reagent_containers/food/snacks/salad/caesar
+/obj/item/food/snacks/salad/caesar
name = "Caesar salad"
desc = "A simple yet flavorful salad of onions, lettuce, croutons, and shreds of cheese dressed in oil. Comes with a slice of pita bread!"
icon_state = "caesar_salad"
list_reagents = list("nutriment" = 12, "vitamin" = 6)
tastes = list("healthy greens" = 2, "olive dressing" = 2, "feta cheese" = 2, "pita bread" = 1)
-/obj/item/reagent_containers/food/snacks/salad/fruit
+/obj/item/food/snacks/salad/fruit
name = "fruit salad"
desc = "Your standard fruit salad."
icon_state = "fruitsalad"
list_reagents = list("nutriment" = 9, "vitamin" = 4)
tastes = list("fruit" = 1)
-/obj/item/reagent_containers/food/snacks/salad/greek
+/obj/item/food/snacks/salad/greek
name = "Greek salad"
desc = "A popular salad made of tomatoes, onions, feta cheese, and olives all drizzled in olive oil. Though it feels like it's missing something..."
icon_state = "greek_salad"
list_reagents = list("nutriment" = 13, "vitamin" = 14)
tastes = list("healthy greens" = 2, "olive dressing" = 1, "feta cheese" = 1)
-/obj/item/reagent_containers/food/snacks/salad/citrusdelight
+/obj/item/food/snacks/salad/citrusdelight
name = "citrus delight"
desc = "Citrus overload!"
icon_state = "citrusdelight"
list_reagents = list("nutriment" = 11, "vitamin" = 7)
tastes = list("sourness" = 1, "leaves" = 1)
-/obj/item/reagent_containers/food/snacks/salad/jungle
+/obj/item/food/snacks/salad/jungle
name = "jungle salad"
desc = "Exotic fruits in a bowl."
icon_state = "junglesalad"
list_reagents = list("banana" = 5, "nutriment" = 11, "vitamin" = 7)
tastes = list("fruit" = 1, "the jungle" = 1)
-/obj/item/reagent_containers/food/snacks/salad/kale
+/obj/item/food/snacks/salad/kale
name = "kale salad"
desc = "A healthy kale salad drizzled in oil, perfect for warm summer months."
icon_state = "kale_salad"
list_reagents = list("nutriment" = 12, "vitamin" = 12)
tastes = list("healthy greens" = 2, "olive dressing" = 1)
-/obj/item/reagent_containers/food/snacks/salad/potato
+/obj/item/food/snacks/salad/potato
name = "potato salad"
desc = "A dish of boiled potatoes mixed with boiled eggs, onions, and mayonnaise. A staple of every self-respecting barbeque."
icon_state = "potato_salad"
list_reagents = list("nutriment" = 10, "protein" = 4)
tastes = list("potato" = 2, "egg" = 2, "mayonnaise" = 2)
-/obj/item/reagent_containers/food/snacks/salad/melonfruitbowl
+/obj/item/food/snacks/salad/melonfruitbowl
name = "melon fruit bowl"
desc = "For people who wants edible fruit bowls."
icon_state = "melonfruitbowl"
@@ -145,7 +145,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 4)
tastes = list("melon" = 1)
-/obj/item/reagent_containers/food/snacks/salad/herb
+/obj/item/food/snacks/salad/herb
name = "herb salad"
desc = "A tasty salad with apples on top."
icon_state = "herbsalad"
@@ -153,7 +153,7 @@
list_reagents = list("nutriment" = 8, "vitamin" = 2)
tastes = list("lettuce" = 1, "apple" = 1)
-/obj/item/reagent_containers/food/snacks/salad/valid
+/obj/item/food/snacks/salad/valid
name = "valid salad"
desc = "It's just an herb salad with meatballs and fried potato slices. Nothing suspicious about it."
icon_state = "validsalad"
@@ -166,7 +166,7 @@
// Donk Pockets //
//////////////////////
-/obj/item/reagent_containers/food/snacks/donkpocket
+/obj/item/food/snacks/donkpocket
name = "Donk-pocket"
desc = "The food of choice for the seasoned traitor."
icon_state = "donkpocket"
@@ -175,7 +175,7 @@
tastes = list("meat" = 2, "dough" = 2, "laziness" = 1)
ingredient_name = "turnover"
-/obj/item/reagent_containers/food/snacks/warmdonkpocket
+/obj/item/food/snacks/warmdonkpocket
name = "warm Donk-pocket"
desc = "The food of choice for the seasoned traitor."
icon_state = "donkpocket"
@@ -191,20 +191,20 @@
/// This tracks how much time the donk pocket has already been cooling for when its timer is paused
var/subtracted_time = 0
-/obj/item/reagent_containers/food/snacks/warmdonkpocket/Initialize(mapload)
+/obj/item/food/snacks/warmdonkpocket/Initialize(mapload)
. = ..()
donk_heat()
-/obj/item/reagent_containers/food/snacks/warmdonkpocket/proc/donk_heat()
+/obj/item/food/snacks/warmdonkpocket/proc/donk_heat()
heated_at = world.time
cool_timer = addtimer(CALLBACK(src, PROC_REF(donk_cool)), 7 MINUTES - subtracted_time, TIMER_UNIQUE|TIMER_STOPPABLE)
-/obj/item/reagent_containers/food/snacks/warmdonkpocket/proc/donk_cool()
+/obj/item/food/snacks/warmdonkpocket/proc/donk_cool()
name = "cold Donk-pocket"
desc = "The food of choice for the seasoned traitor. This one is cold."
warm = FALSE
-/obj/item/reagent_containers/food/snacks/warmdonkpocket/on_enter_storage(obj/item/storage/S)
+/obj/item/food/snacks/warmdonkpocket/on_enter_storage(obj/item/storage/S)
. = ..()
if(!cool_timer)
return
@@ -213,25 +213,25 @@
subtracted_time += (world.time - heated_at)
cool_timer = null
-/obj/item/reagent_containers/food/snacks/warmdonkpocket/on_exit_storage(obj/item/storage/S)
+/obj/item/food/snacks/warmdonkpocket/on_exit_storage(obj/item/storage/S)
. = ..()
if(warm)
donk_heat()
-/obj/item/reagent_containers/food/snacks/warmdonkpocket/Post_Consume(mob/living/M)
+/obj/item/food/snacks/warmdonkpocket/Post_Consume(mob/living/M)
if(warm)
M.reagents.add_reagent("omnizine", 15)
return
M.reagents.add_reagent("weak_omnizine", 5)
-/obj/item/reagent_containers/food/snacks/warmdonkpocket_weak
+/obj/item/food/snacks/warmdonkpocket_weak
name = "lukewarm Donk-pocket"
desc = "The food of choice for the seasoned traitor. This one is lukewarm."
icon_state = "donkpocket"
filling_color = "#DEDEAB"
list_reagents = list("nutriment" = 4, "weak_omnizine" = 3)
-/obj/item/reagent_containers/food/snacks/syndidonkpocket
+/obj/item/food/snacks/syndidonkpocket
name = "Donk-pocket"
desc = "This donk-pocket is emitting a small amount of heat."
icon_state = "donkpocket"
@@ -239,7 +239,7 @@
bitesize = 100 //nom the whole thing at once.
list_reagents = list("nutriment" = 1)
-/obj/item/reagent_containers/food/snacks/syndidonkpocket/Post_Consume(mob/living/M)
+/obj/item/food/snacks/syndidonkpocket/Post_Consume(mob/living/M)
M.reagents.add_reagent("omnizine", 15)
M.reagents.add_reagent("teporone", 15)
M.reagents.add_reagent("synaptizine", 15)
@@ -252,7 +252,7 @@
// Misc //
//////////////////////
-/obj/item/reagent_containers/food/snacks/boiledslimecore
+/obj/item/food/snacks/boiledslimecore
name = "boiled slime core"
desc = "A boiled red thing."
icon_state = "boiledrorocore"
@@ -260,7 +260,7 @@
list_reagents = list("slimejelly" = 5)
tastes = list("jelly" = 1)
-/obj/item/reagent_containers/food/snacks/popcorn
+/obj/item/food/snacks/popcorn
name = "popcorn"
desc = "Now let's find some cinema."
icon_state = "popcorn"
@@ -271,17 +271,17 @@
list_reagents = list("nutriment" = 2)
tastes = list("popcorn" = 3, "butter" = 1)
-/obj/item/reagent_containers/food/snacks/popcorn/Initialize(mapload)
+/obj/item/food/snacks/popcorn/Initialize(mapload)
. = ..()
unpopped = rand(1,10)
-/obj/item/reagent_containers/food/snacks/popcorn/On_Consume(mob/M, mob/user)
+/obj/item/food/snacks/popcorn/On_Consume(mob/M, mob/user)
if(prob(unpopped)) //lol ...what's the point?
to_chat(user, "You bite down on an un-popped kernel!")
unpopped = max(0, unpopped-1)
..()
-/obj/item/reagent_containers/food/snacks/liquidfood
+/obj/item/food/snacks/liquidfood
name = "\improper LiquidFood ration"
desc = "A prepackaged grey slurry of all the essential nutrients for a spacefarer on the go. Should this be crunchy?"
icon_state = "liquidfood"
diff --git a/code/modules/food_and_drinks/food/foods/pasta.dm b/code/modules/food_and_drinks/food/foods/pasta.dm
index bd6be224225..984fb60c1a8 100644
--- a/code/modules/food_and_drinks/food/foods/pasta.dm
+++ b/code/modules/food_and_drinks/food/foods/pasta.dm
@@ -3,7 +3,7 @@
// Raw Pasta //
//////////////////////
-/obj/item/reagent_containers/food/snacks/spaghetti
+/obj/item/food/snacks/spaghetti
name = "spaghetti"
desc = "A bundle of raw spaghetti."
icon = 'icons/obj/food/pasta.dmi'
@@ -12,7 +12,7 @@
list_reagents = list("nutriment" = 1, "vitamin" = 1)
tastes = list("raw pasta" = 1)
-/obj/item/reagent_containers/food/snacks/macaroni
+/obj/item/food/snacks/macaroni
name = "macaroni twists"
desc = "These are little twists of raw macaroni."
icon = 'icons/obj/food/pasta.dmi'
@@ -26,7 +26,7 @@
// Pasta Dishes //
//////////////////////
-/obj/item/reagent_containers/food/snacks/boiledspaghetti
+/obj/item/food/snacks/boiledspaghetti
name = "boiled spaghetti"
desc = "A plain dish of noodles. This sucks."
icon = 'icons/obj/food/pasta.dmi'
@@ -36,7 +36,7 @@
list_reagents = list("nutriment" = 2, "vitamin" = 1)
tastes = list("pasta" = 1)
-/obj/item/reagent_containers/food/snacks/pastatomato
+/obj/item/food/snacks/pastatomato
name = "spaghetti"
desc = "Spaghetti and crushed tomatoes. Just like your abusive father used to make!"
icon = 'icons/obj/food/pasta.dmi'
@@ -47,7 +47,7 @@
list_reagents = list("nutriment" = 6, "tomatojuice" = 10, "vitamin" = 4)
tastes = list("pasta" = 1, "tomato" = 1)
-/obj/item/reagent_containers/food/snacks/meatballspaghetti
+/obj/item/food/snacks/meatballspaghetti
name = "spaghetti & meatballs"
desc = "Now that's a nice'a meatball!"
icon = 'icons/obj/food/pasta.dmi'
@@ -57,7 +57,7 @@
list_reagents = list("nutriment" = 8, "synaptizine" = 5, "vitamin" = 4)
tastes = list("pasta" = 1, "tomato" = 1, "meat" = 1)
-/obj/item/reagent_containers/food/snacks/spesslaw
+/obj/item/food/snacks/spesslaw
name = "spesslaw"
desc = "A lawyer's favourite."
icon = 'icons/obj/food/pasta.dmi'
@@ -66,7 +66,7 @@
list_reagents = list("nutriment" = 8, "synaptizine" = 10, "vitamin" = 6)
tastes = list("pasta" = 1, "tomato" = 1, "meat" = 2)
-/obj/item/reagent_containers/food/snacks/macncheese
+/obj/item/food/snacks/macncheese
name = "mac 'n' cheese"
desc = "One of the most comforting foods in the world. Apparently."
trash = /obj/item/trash/snack_bowl
@@ -76,7 +76,7 @@
list_reagents = list("nutriment" = 5, "vitamin" = 2, "cheese" = 4)
tastes = list("pasta" = 1, "cheese" = 1, "comfort" = 1)
-/obj/item/reagent_containers/food/snacks/lasagna
+/obj/item/food/snacks/lasagna
name = "lasagna"
desc = "Tajara love to eat this, for some reason."
icon = 'icons/obj/food/pasta.dmi'
diff --git a/code/modules/food_and_drinks/food/foods/pizza.dm b/code/modules/food_and_drinks/food/foods/pizza.dm
index 4b3e20b0880..d157b6067e3 100644
--- a/code/modules/food_and_drinks/food/foods/pizza.dm
+++ b/code/modules/food_and_drinks/food/foods/pizza.dm
@@ -3,21 +3,21 @@
// Pizzas //
//////////////////////
-/obj/item/reagent_containers/food/snacks/sliceable/pizza
+/obj/item/food/snacks/sliceable/pizza
icon = 'icons/obj/food/pizza.dmi'
slices_num = 6
filling_color = "#BAA14C"
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1)
// Margherita
-/obj/item/reagent_containers/food/snacks/sliceable/pizza/margheritapizza
+/obj/item/food/snacks/sliceable/pizza/margheritapizza
name = "margherita pizza"
desc = "The golden standard of pizzas."
icon_state = "margheritapizza"
- slice_path = /obj/item/reagent_containers/food/snacks/margheritapizzaslice
+ slice_path = /obj/item/food/snacks/margheritapizzaslice
list_reagents = list("nutriment" = 30, "tomatojuice" = 6, "vitamin" = 5)
-/obj/item/reagent_containers/food/snacks/margheritapizzaslice
+/obj/item/food/snacks/margheritapizzaslice
name = "margherita slice"
desc = "A slice of the classic pizza."
icon = 'icons/obj/food/pizza.dmi'
@@ -26,15 +26,15 @@
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1)
// Meat Pizza
-/obj/item/reagent_containers/food/snacks/sliceable/pizza/meatpizza
+/obj/item/food/snacks/sliceable/pizza/meatpizza
name = "meat pizza"
desc = "A pizza with meat topping."
icon_state = "meatpizza"
- slice_path = /obj/item/reagent_containers/food/snacks/meatpizzaslice
+ slice_path = /obj/item/food/snacks/meatpizzaslice
list_reagents = list("protein" = 30, "tomatojuice" = 6, "vitamin" = 8)
tastes = list("crust" = 1, "cheese" = 1, "meat" = 1)
-/obj/item/reagent_containers/food/snacks/meatpizzaslice
+/obj/item/food/snacks/meatpizzaslice
name = "meat pizza slice"
desc = "A slice of a meaty pizza."
icon = 'icons/obj/food/pizza.dmi'
@@ -43,15 +43,15 @@
tastes = list("crust" = 1, "cheese" = 1, "meat" = 1)
// Mushroom Pizza
-/obj/item/reagent_containers/food/snacks/sliceable/pizza/mushroompizza
+/obj/item/food/snacks/sliceable/pizza/mushroompizza
name = "mushroom pizza"
desc = "Very special pizza."
icon_state = "mushroompizza"
- slice_path = /obj/item/reagent_containers/food/snacks/mushroompizzaslice
+ slice_path = /obj/item/food/snacks/mushroompizzaslice
list_reagents = list("plantmatter" = 30, "vitamin" = 5)
tastes = list("crust" = 1, "cheese" = 1, "mushroom" = 1)
-/obj/item/reagent_containers/food/snacks/mushroompizzaslice
+/obj/item/food/snacks/mushroompizzaslice
name = "mushroom pizza slice"
desc = "Maybe it is the last slice of pizza in your life."
icon = 'icons/obj/food/pizza.dmi'
@@ -60,15 +60,15 @@
tastes = list("crust" = 1, "cheese" = 1, "mushroom" = 1)
// Vegetable Pizza
-/obj/item/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza
+/obj/item/food/snacks/sliceable/pizza/vegetablepizza
name = "vegetable pizza"
desc = "No Tomato Sapiens were harmed during the making of this pizza."
icon_state = "vegetablepizza"
- slice_path = /obj/item/reagent_containers/food/snacks/vegetablepizzaslice
+ slice_path = /obj/item/food/snacks/vegetablepizzaslice
list_reagents = list("plantmatter" = 25, "tomatojuice" = 6, "oculine" = 12, "vitamin" = 5)
tastes = list("crust" = 1, "tomato" = 1, "carrot" = 1, "vegetables" = 1)
-/obj/item/reagent_containers/food/snacks/vegetablepizzaslice
+/obj/item/food/snacks/vegetablepizzaslice
name = "vegetable pizza slice"
desc = "A slice of the most green pizza of all pizzas not containing green ingredients."
icon = 'icons/obj/food/pizza.dmi'
@@ -77,15 +77,15 @@
tastes = list("crust" = 1, "tomato" = 1, "carrot" = 1, "vegetables" = 1)
// Hawaiian Pizza
-/obj/item/reagent_containers/food/snacks/sliceable/pizza/hawaiianpizza
+/obj/item/food/snacks/sliceable/pizza/hawaiianpizza
name = "hawaiian pizza"
desc = "Love it or hate it, this pizza divides opinions. Complete with juicy pineapple."
icon_state = "hawaiianpizza"
- slice_path = /obj/item/reagent_containers/food/snacks/hawaiianpizzaslice
+ slice_path = /obj/item/food/snacks/hawaiianpizzaslice
list_reagents = list("protein" = 15, "tomatojuice" = 6, "plantmatter" = 20, "pineapplejuice" = 6, "vitamin" = 5)
tastes = list("crust" = 1, "cheese" = 1, "pineapple" = 1)
-/obj/item/reagent_containers/food/snacks/hawaiianpizzaslice
+/obj/item/food/snacks/hawaiianpizzaslice
name = "hawaiian pizza slice"
desc = "A slice of polarising pizza."
icon = 'icons/obj/food/pizza.dmi'
@@ -94,16 +94,16 @@
tastes = list("crust" = 1, "cheese" = 1, "pineapple" = 1)
// Mac 'n' Cheese Pizza
-/obj/item/reagent_containers/food/snacks/sliceable/pizza/macpizza
+/obj/item/food/snacks/sliceable/pizza/macpizza
name = "mac 'n' cheese pizza"
desc = "Gastronomists have yet to classify this dish as 'pizza'."
icon_state = "macpizza"
- slice_path = /obj/item/reagent_containers/food/snacks/macpizzaslice
+ slice_path = /obj/item/food/snacks/macpizzaslice
list_reagents = list("nutriment" = 40, "vitamin" = 5) //More nutriment because carbs, but it's not any more vitaminicious
filling_color = "#ffe45d"
tastes = list("crust" = 1, "cheese" = 2, "pasta" = 1)
-/obj/item/reagent_containers/food/snacks/macpizzaslice
+/obj/item/food/snacks/macpizzaslice
name = "mac 'n' cheese pizza slice"
desc = "A delicious slice of pizza topped with macaroni & cheese... wait, what the hell? Who would do this?!"
icon = 'icons/obj/food/pizza.dmi'
@@ -112,16 +112,16 @@
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 2, "pasta" = 1)
// Pepperoni Pizza
-/obj/item/reagent_containers/food/snacks/sliceable/pizza/pepperonipizza
+/obj/item/food/snacks/sliceable/pizza/pepperonipizza
name = "pepperoni pizza"
desc = "What did the pepperoni say to the pizza?"
icon_state = "pepperonipizza"
- slice_path = /obj/item/reagent_containers/food/snacks/pepperonipizzaslice
+ slice_path = /obj/item/food/snacks/pepperonipizzaslice
list_reagents = list("protein" = 30, "tomatojuice" = 6, "vitamin" = 8)
filling_color = "#ffe45d"
tastes = list("cheese" = 3, "pepperoni" = 3, "grease" = 1)
-/obj/item/reagent_containers/food/snacks/pepperonipizzaslice
+/obj/item/food/snacks/pepperonipizzaslice
name = "pepperoni pizza slice"
desc = "Nice to meat you!"
icon = 'icons/obj/food/pizza.dmi'
@@ -130,14 +130,14 @@
tastes = list("cheese" = 3, "pepperoni" = 3, "grease" = 1)
// Cheese Pizza
-/obj/item/reagent_containers/food/snacks/sliceable/pizza/cheesepizza
+/obj/item/food/snacks/sliceable/pizza/cheesepizza
name = "cheese pizza"
desc = "Cheese, bread, cheese, tomato, and cheese."
icon_state = "cheesepizza"
- slice_path = /obj/item/reagent_containers/food/snacks/cheesepizzaslice
+ slice_path = /obj/item/food/snacks/cheesepizzaslice
list_reagents = list("nutriment" = 40, "tomatojuice" = 6, "vitamin" = 5)
-/obj/item/reagent_containers/food/snacks/cheesepizzaslice
+/obj/item/food/snacks/cheesepizzaslice
name = "cheese pizza slice"
desc = "Dangerously cheesy?"
icon = 'icons/obj/food/pizza.dmi'
@@ -146,15 +146,15 @@
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 3)
// Donk-pocket Pizza
-/obj/item/reagent_containers/food/snacks/sliceable/pizza/donkpocketpizza
+/obj/item/food/snacks/sliceable/pizza/donkpocketpizza
name = "donk-pocket pizza"
desc = "Who thought this would be a good idea?"
icon_state = "donkpocketpizza"
- slice_path = /obj/item/reagent_containers/food/snacks/donkpocketpizzaslice
+ slice_path = /obj/item/food/snacks/donkpocketpizzaslice
list_reagents = list("nutriment" = 35, "tomatojuice" = 6, "vitamin" = 2, "weak_omnizine" = 6)
tastes = list("crust" = 1, "meat" = 1, "laziness" = 1)
-/obj/item/reagent_containers/food/snacks/donkpocketpizzaslice
+/obj/item/food/snacks/donkpocketpizzaslice
name = "donk-pocket pizza slice"
desc = "Smells like lukewarm donk-pocket."
icon = 'icons/obj/food/pizza.dmi'
@@ -163,15 +163,15 @@
tastes = list("crust" = 1, "meat" = 1, "laziness" = 1)
// Dank Pizza
-/obj/item/reagent_containers/food/snacks/sliceable/pizza/dankpizza
+/obj/item/food/snacks/sliceable/pizza/dankpizza
name = "dank pizza"
desc = "The hippie's pizza of choice."
icon_state = "dankpizza"
- slice_path = /obj/item/reagent_containers/food/snacks/dankpizzaslice
+ slice_path = /obj/item/food/snacks/dankpizzaslice
list_reagents = list("nutriment" = 30, "tomatojuice" = 6, "vitamin" = 5, "cbd" = 6, "thc" = 6)
tastes = list("crust" = 1, "cheese" = 1, "special herbs" = 2)
-/obj/item/reagent_containers/food/snacks/dankpizzaslice
+/obj/item/food/snacks/dankpizzaslice
name = "dank pizza slice"
desc = "So good, man..."
icon = 'icons/obj/food/pizza.dmi'
@@ -180,15 +180,15 @@
tastes = list("crust" = 1, "cheese" = 1, "special herbs" = 2)
// Firecracker Pizza
-/obj/item/reagent_containers/food/snacks/sliceable/pizza/firecrackerpizza
+/obj/item/food/snacks/sliceable/pizza/firecrackerpizza
name = "firecracker pizza"
desc = "Tastes HOT HOT HOT!"
icon_state = "firecrackerpizza"
- slice_path = /obj/item/reagent_containers/food/snacks/firecrackerpizzaslice
+ slice_path = /obj/item/food/snacks/firecrackerpizzaslice
list_reagents = list("nutriment" = 30, "vitamin" = 5, "capsaicin" = 12)
tastes = list("crust" = 1, "cheese" = 1, "HOTNESS" = 1)
-/obj/item/reagent_containers/food/snacks/firecrackerpizzaslice
+/obj/item/food/snacks/firecrackerpizzaslice
name = "firecracker pizza slice"
desc = "A spicy slice of something quite nice"
icon = 'icons/obj/food/pizza.dmi'
@@ -197,15 +197,15 @@
tastes = list("crust" = 1, "cheese" = 1, "HOTNESS" = 1)
// "Pesto" Pizza
-/obj/item/reagent_containers/food/snacks/sliceable/pizza/pestopizza
+/obj/item/food/snacks/sliceable/pizza/pestopizza
name = "\"pesto\" pizza"
desc = "Wait a second...this doesn't taste like pesto!"
icon_state = "pestopizza"
- slice_path = /obj/item/reagent_containers/food/snacks/pestopizzaslice
+ slice_path = /obj/item/food/snacks/pestopizzaslice
list_reagents = list("nutriment" = 30, "tomatojuice" = 12, "vitamin" = 5, "wasabi" = 12)
tastes = list("tomato" = 1, "cheese" = 1, "wasabi" = 1)
-/obj/item/reagent_containers/food/snacks/pestopizzaslice
+/obj/item/food/snacks/pestopizzaslice
name = "\"pesto\" pizza slice"
desc = "Delicious and suspicious(ly green)."
icon = 'icons/obj/food/pizza.dmi'
@@ -214,15 +214,15 @@
tastes = list("tomato" = 1, "cheese" = 1, "wasabi" = 1)
// Garlic Pizza
-/obj/item/reagent_containers/food/snacks/sliceable/pizza/garlicpizza
+/obj/item/food/snacks/sliceable/pizza/garlicpizza
name = "garlic pizza"
desc = "Ahh, garlic. A universally loved ingredient, except possibly by vampires."
icon_state = "garlicpizza"
- slice_path = /obj/item/reagent_containers/food/snacks/garlicpizzaslice
+ slice_path = /obj/item/food/snacks/garlicpizzaslice
list_reagents = list("plantmatter" = 30, "vitamin" = 5, "garlic" = 12)
tastes = list("crust" = 1, "cheese" = 1, "garlic" = 1)
-/obj/item/reagent_containers/food/snacks/garlicpizzaslice
+/obj/item/food/snacks/garlicpizzaslice
name = "garlic pizza slice"
desc = "What's not to love?"
icon = 'icons/obj/food/pizza.dmi'
@@ -243,7 +243,7 @@
var/open = FALSE // Is the box open?
var/is_messy = FALSE // Fancy mess on the lid
- var/obj/item/reagent_containers/food/snacks/sliceable/pizza/pizza // Content pizza
+ var/obj/item/food/snacks/sliceable/pizza/pizza // Content pizza
var/list/boxes = list() // If the boxes are stacked, they come here
var/box_tag = ""
@@ -322,7 +322,7 @@
..()
if(length(boxes) || !Adjacent(user))
return
- open = !open
+ open = !open
update_appearance(UPDATE_DESC|UPDATE_ICON)
/obj/item/pizzabox/attack_self(mob/user)
@@ -356,7 +356,7 @@
to_chat(user, "Close [box] first!")
return
- if(istype(I, /obj/item/reagent_containers/food/snacks/sliceable/pizza/)) // Long ass fucking object name
+ if(istype(I, /obj/item/food/snacks/sliceable/pizza)) // Long ass fucking object name
if(open)
user.drop_item()
I.loc = src
@@ -383,42 +383,42 @@
/obj/item/pizzabox/margherita/Initialize(mapload)
- pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/margheritapizza(src)
+ pizza = new /obj/item/food/snacks/sliceable/pizza/margheritapizza(src)
box_tag = "margherita deluxe"
. = ..()
/obj/item/pizzabox/vegetable/Initialize(mapload)
- pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza(src)
+ pizza = new /obj/item/food/snacks/sliceable/pizza/vegetablepizza(src)
box_tag = "gourmet vegetable"
. = ..()
/obj/item/pizzabox/mushroom/Initialize(mapload)
- pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/mushroompizza(src)
+ pizza = new /obj/item/food/snacks/sliceable/pizza/mushroompizza(src)
box_tag = "mushroom special"
. = ..()
/obj/item/pizzabox/meat/Initialize(mapload)
- pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/meatpizza(src)
+ pizza = new /obj/item/food/snacks/sliceable/pizza/meatpizza(src)
box_tag = "meatlover's supreme"
. = ..()
/obj/item/pizzabox/hawaiian/Initialize(mapload)
- pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/hawaiianpizza(src)
+ pizza = new /obj/item/food/snacks/sliceable/pizza/hawaiianpizza(src)
box_tag = "Hawaiian feast"
. = ..()
/obj/item/pizzabox/pepperoni/Initialize(mapload)
- pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/pepperonipizza(src)
+ pizza = new /obj/item/food/snacks/sliceable/pizza/pepperonipizza(src)
box_tag = "classic pepperoni"
. = ..()
/obj/item/pizzabox/garlic/Initialize(mapload)
- pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/garlicpizza(src)
+ pizza = new /obj/item/food/snacks/sliceable/pizza/garlicpizza(src)
box_tag = "triple garlic"
. = ..()
/obj/item/pizzabox/firecracker/Initialize(mapload)
- pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/firecrackerpizza(src)
+ pizza = new /obj/item/food/snacks/sliceable/pizza/firecrackerpizza(src)
box_tag = "extra spicy pie"
. = ..()
diff --git a/code/modules/food_and_drinks/food/foods/sandwiches.dm b/code/modules/food_and_drinks/food/foods/sandwiches.dm
index e912b6fbafc..05d58422984 100644
--- a/code/modules/food_and_drinks/food/foods/sandwiches.dm
+++ b/code/modules/food_and_drinks/food/foods/sandwiches.dm
@@ -5,13 +5,13 @@
// Abstract object used for inheritance. Should never spawn. Needed to not break recipes that use plain burgers; recipes that use "burger" would accept any burger and transfer reagents otherwise.
-/obj/item/reagent_containers/food/snacks/burger
+/obj/item/food/snacks/burger
name = "burger"
desc = "If you got this, something broke! Contact a coder if this somehow spawns."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "burger"
-/obj/item/reagent_containers/food/snacks/burger/plain
+/obj/item/food/snacks/burger/plain
name = "burger"
desc = "The cornerstone of every nutritious breakfast."
icon_state = "hburger"
@@ -20,7 +20,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("bun" = 4, "meat" = 1)
-/obj/item/reagent_containers/food/snacks/burger/brain
+/obj/item/food/snacks/burger/brain
name = "brainburger"
desc = "A strange looking burger. It appears almost sentient."
icon_state = "brainburger"
@@ -29,7 +29,7 @@
list_reagents = list("nutriment" = 6, "prions" = 10, "vitamin" = 1)
tastes = list("bun" = 4, "brains" = 2)
-/obj/item/reagent_containers/food/snacks/burger/ghost
+/obj/item/food/snacks/burger/ghost
name = "ghost burger"
desc = "Spooky! It doesn't look very filling."
icon_state = "ghostburger"
@@ -38,12 +38,12 @@
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("bun" = 4, "ectoplasm" = 2)
-/obj/item/reagent_containers/food/snacks/human
+/obj/item/food/snacks/human
var/hname = ""
var/job = null
filling_color = "#D63C3C"
-/obj/item/reagent_containers/food/snacks/human/burger
+/obj/item/food/snacks/human/burger
name = "-burger"
desc = "A bloody burger."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -52,7 +52,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("bun" = 4, "tender meat" = 2)
-/obj/item/reagent_containers/food/snacks/burger/cheese
+/obj/item/food/snacks/burger/cheese
name = "cheeseburger"
desc = "The cheese adds a good flavor."
icon_state = "cheeseburger"
@@ -60,7 +60,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("bun" = 4, "meat" = 1, "cheese" = 1)
-/obj/item/reagent_containers/food/snacks/burger/tofu
+/obj/item/food/snacks/burger/tofu
name = "tofu burger"
desc = "Making this should probably be a criminal offense."
icon_state = "tofuburger"
@@ -69,7 +69,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("bun" = 4, "tofu" = 4)
-/obj/item/reagent_containers/food/snacks/burger/hamborger
+/obj/item/food/snacks/burger/hamborger
name = "hamborger"
desc = "Looking at this makes your flesh feel like a weakness."
icon_state = "roburger"
@@ -78,11 +78,11 @@
list_reagents = list("nutriment" = 6, "nanomachines" = 10, "vitamin" = 1)
tastes = list("bun" = 4, "lettuce" = 2, "sludge" = 1)
-/obj/item/reagent_containers/food/snacks/burger/hamborger/Initialize(mapload)
+/obj/item/food/snacks/burger/hamborger/Initialize(mapload)
. = ..()
message_admins("A [name] has been created at [ADMIN_COORDJMP(src)].")
-/obj/item/reagent_containers/food/snacks/burger/xeno
+/obj/item/food/snacks/burger/xeno
name = "xenoburger"
desc = "Smells caustic and tastes like heresy."
icon_state = "xburger"
@@ -91,7 +91,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("bun" = 4, "acid" = 4)
-/obj/item/reagent_containers/food/snacks/burger/clown
+/obj/item/food/snacks/burger/clown
name = "clown burger"
desc = "This tastes funny..."
icon_state = "clownburger"
@@ -100,7 +100,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("bun" = 4, "banana" = 1, "magic" = 2)
-/obj/item/reagent_containers/food/snacks/burger/mime
+/obj/item/food/snacks/burger/mime
name = "mime burger"
desc = "Its taste defies language."
icon_state = "mimeburger"
@@ -109,7 +109,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("bun" = 4, "silence" = 2)
-/obj/item/reagent_containers/food/snacks/burger/baseball
+/obj/item/food/snacks/burger/baseball
name = "home run baseball burger"
desc = "It's still warm. Batter up!"
icon_state = "baseball"
@@ -118,7 +118,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("bun" = 4, "a homerun" = 3)
-/obj/item/reagent_containers/food/snacks/burger/spell
+/obj/item/food/snacks/burger/spell
name = "spell burger"
desc = "This is absolutely Ei Nath."
icon_state = "spellburger"
@@ -127,7 +127,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("bun" = 4, "magic" = 2)
-/obj/item/reagent_containers/food/snacks/burger/bigbite
+/obj/item/food/snacks/burger/bigbite
name = "BigBite burger"
desc = "Forget the Big Mac, THIS is the future!"
icon_state = "bigbiteburger"
@@ -136,7 +136,7 @@
list_reagents = list("nutriment" = 10, "vitamin" = 2)
tastes = list("bun" = 4, "meat" = 2, "cheese" = 2, "type two diabetes" = 10)
-/obj/item/reagent_containers/food/snacks/burger/superbite
+/obj/item/food/snacks/burger/superbite
name = "SuperBite burger"
desc = "This is a mountain of a burger. FOOD!"
icon_state = "superbiteburger"
@@ -145,7 +145,7 @@
list_reagents = list("nutriment" = 40, "vitamin" = 5)
tastes = list("bun" = 4, "meat" = 2, "cheese" = 2, "type two diabetes" = 10)
-/obj/item/reagent_containers/food/snacks/burger/crazy
+/obj/item/food/snacks/burger/crazy
name = "crazy hamburger"
desc = "This looks like the sort of food that a demented clown in a trenchcoat would make."
icon_state = "crazyburger"
@@ -154,7 +154,7 @@
list_reagents = list("nutriment" = 10, "vitamin" = 2, "capsaicin" = 3, "condensedcapsaicin" = 2)
tastes = list("bun" = 2, "meat" = 4, "cheese" = 2, "beef soaked in chili" = 3, "a smoking flare" = 2)
-/obj/item/reagent_containers/food/snacks/burger/ppatty/white
+/obj/item/food/snacks/burger/ppatty/white
name = "white pretty patty"
desc = "Delicious titanium!"
icon_state = "ppatty-mime"
@@ -163,7 +163,7 @@
list_reagents = list("nutriment" = 7, "protein" = 1)
tastes = list("bun" = 2, "meat" = 2, "white" = 2)
-/obj/item/reagent_containers/food/snacks/burger/ppatty/red
+/obj/item/food/snacks/burger/ppatty/red
name = "red pretty patty"
desc = "Perfect for hiding the fact that it's burnt to a crisp."
icon_state = "ppatty-red"
@@ -172,7 +172,7 @@
list_reagents = list("nutriment" = 7, "protein" = 1)
tastes = list("bun" = 2, "meat" = 2, "red" = 2)
-/obj/item/reagent_containers/food/snacks/burger/ppatty/orange
+/obj/item/food/snacks/burger/ppatty/orange
name = "orange pretty patty"
desc = "Contains 0% juice."
icon_state = "ppatty-orange"
@@ -181,7 +181,7 @@
list_reagents = list("nutriment" = 7, "protein" = 1)
tastes = list("bun" = 2, "meat" = 2, "orange" = 2)
-/obj/item/reagent_containers/food/snacks/burger/ppatty/yellow
+/obj/item/food/snacks/burger/ppatty/yellow
name = "yellow pretty patty"
desc = "Bright to the last bite."
icon_state = "ppatty-yellow"
@@ -190,7 +190,7 @@
list_reagents = list("nutriment" = 7, "protein" = 1)
tastes = list("bun" = 2, "meat" = 2, "yellow" = 2)
-/obj/item/reagent_containers/food/snacks/burger/ppatty/green
+/obj/item/food/snacks/burger/ppatty/green
name = "green pretty patty"
desc = "It's not tainted meat, it's painted meat!"
icon_state = "ppatty-green"
@@ -199,7 +199,7 @@
list_reagents = list("nutriment" = 7, "protein" = 1)
tastes = list("bun" = 2, "meat" = 2, "green" = 2)
-/obj/item/reagent_containers/food/snacks/burger/ppatty/blue
+/obj/item/food/snacks/burger/ppatty/blue
name = "blue pretty patty"
desc = "Is this blue rare?"
icon_state = "ppatty-blue"
@@ -208,7 +208,7 @@
list_reagents = list("nutriment" = 7, "protein" = 1)
tastes = list("bun" = 2, "meat" = 2, "blue" = 2)
-/obj/item/reagent_containers/food/snacks/burger/ppatty/purple
+/obj/item/food/snacks/burger/ppatty/purple
name = "purple pretty patty"
desc = "Regal and low class at the same time."
icon_state = "ppatty-purple"
@@ -217,7 +217,7 @@
list_reagents = list("nutriment" = 7, "protein" = 1)
tastes = list("bun" = 2, "meat" = 2, "purple" = 2)
-/obj/item/reagent_containers/food/snacks/burger/ppatty/rainbow
+/obj/item/food/snacks/burger/ppatty/rainbow
name = "rainbow pretty patty"
desc = "Taste the rainbow, eat the rainbow."
icon_state = "ppatty-rainbow"
@@ -226,7 +226,7 @@
list_reagents = list("nutriment" = 14, "protein" = 5, "omnizine" = 10)
tastes = list("bun" = 2, "meat" = 2, "rainbow" = 5)
-/obj/item/reagent_containers/food/snacks/burger/elec
+/obj/item/food/snacks/burger/elec
name = "empowered burger"
desc = "It's shockingly good, if you live off of electricity that is."
icon_state = "empoweredburger"
@@ -235,7 +235,7 @@
list_reagents = list("nutriment" = 5, "protein" = 1, "plasma" = 2)
tastes = list("bun" = 2, "pure electricity" = 5)
-/obj/item/reagent_containers/food/snacks/burger/rat
+/obj/item/food/snacks/burger/rat
name = "mouse burger"
desc = "Pretty much what you'd expect..."
icon_state = "ratburger"
@@ -244,7 +244,7 @@
list_reagents = list("nutriment" = 5, "protein" = 1)
tastes = list("bun" = 2, "dead rat" = 5)
-/obj/item/reagent_containers/food/snacks/burger/appendix
+/obj/item/food/snacks/burger/appendix
name = "appendix burger"
desc = "Tastes like appendicitis."
icon_state = "appendixburger"
@@ -253,7 +253,7 @@
list_reagents = list("nutriment" = 2, "protein" = 6, "vitamin" = 6)
tastes = list("bun" = 1, "grass" = 1)
-/obj/item/reagent_containers/food/snacks/burger/bacon
+/obj/item/food/snacks/burger/bacon
name = "bacon burger"
desc = "The perfect combination of all things American."
icon_state = "baconburger"
@@ -263,7 +263,7 @@
tastes = list("bun" = 1, "bacon" = 1)
-/obj/item/reagent_containers/food/snacks/burger/bearger
+/obj/item/food/snacks/burger/bearger
name = "bearger"
desc = "Best served rawr."
icon_state = "bearger"
@@ -272,7 +272,7 @@
list_reagents = list("nutriment" = 3, "protein" = 6, "vitamin" = 2)
tastes = list("bun" = 1, "meat" = 1, "salmon" = 1)
-/obj/item/reagent_containers/food/snacks/burger/fivealarm
+/obj/item/food/snacks/burger/fivealarm
name = "five alarm burger"
desc = "HOT! HOT!"
icon_state = "fivealarmburger"
@@ -281,7 +281,7 @@
list_reagents = list("nutriment" = 4, "protein" = 6, "condensedcapsaicin" = 5, "capsaicin" = 5)
tastes = list("bun" = 1, "extreme heat" = 1)
-/obj/item/reagent_containers/food/snacks/burger/mcguffin
+/obj/item/food/snacks/burger/mcguffin
name = "mcGuffin"
desc = "A cheap and greasy imitation of an eggs benedict."
icon_state = "mcguffin"
@@ -290,7 +290,7 @@
list_reagents = list("nutriment" = 2, "protein" = 7, "vitamin" = 1)
tastes = list("muffin" = 1, "bacon" = 1)
-/obj/item/reagent_containers/food/snacks/burger/mcrib
+/obj/item/food/snacks/burger/mcrib
name = "mcRib"
desc = "An elusive rib shaped burger with limited availablity across the galaxy. Not as good as you remember it."
icon_state = "mcrib"
@@ -299,7 +299,7 @@
list_reagents = list("nutriment" = 2, "protein" = 7, "vitamin" = 4, "bbqsauce" = 1)
tastes = list("bun" = 1, "pork" = 1, "patty" = 1)
-/obj/item/reagent_containers/food/snacks/burger/jelly
+/obj/item/food/snacks/burger/jelly
name = "jelly burger"
desc = "Culinary delight...?"
icon_state = "jellyburger"
@@ -307,10 +307,10 @@
bitesize = 3
tastes = list("bun" = 4, "jelly" = 2)
-/obj/item/reagent_containers/food/snacks/burger/jelly/slime
+/obj/item/food/snacks/burger/jelly/slime
list_reagents = list("nutriment" = 6, "slimejelly" = 5, "vitamin" = 1)
-/obj/item/reagent_containers/food/snacks/burger/jelly/cherry
+/obj/item/food/snacks/burger/jelly/cherry
list_reagents = list("nutriment" = 6, "cherryjelly" = 5, "vitamin" = 1)
@@ -318,7 +318,7 @@
// Sandwiches //
//////////////////////
-/obj/item/reagent_containers/food/snacks/sandwich
+/obj/item/food/snacks/sandwich
name = "sandwich"
desc = "A grand creation of meat, cheese, bread, and several leaves of lettuce! Arthur Dent would be proud."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -327,7 +327,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("meat" = 2, "cheese" = 1, "bread" = 2, "lettuce" = 1)
-/obj/item/reagent_containers/food/snacks/toastedsandwich
+/obj/item/food/snacks/toastedsandwich
name = "toasted sandwich"
desc = "Now if you only had a pepper bar."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -336,7 +336,7 @@
list_reagents = list("nutriment" = 6, "carbon" = 2)
tastes = list("toast" = 1)
-/obj/item/reagent_containers/food/snacks/grilledcheese
+/obj/item/food/snacks/grilledcheese
name = "grilled cheese sandwich"
desc = "Goes great with tomato soup!"
icon = 'icons/obj/food/burgerbread.dmi'
@@ -345,7 +345,7 @@
list_reagents = list("nutriment" = 7, "vitamin" = 1) //why make a regualr sandwhich when you can make grilled cheese, with this nutriment value?
tastes = list("toast" = 1, "grilled cheese" = 1)
-/obj/item/reagent_containers/food/snacks/jellysandwich
+/obj/item/food/snacks/jellysandwich
name = "jelly sandwich"
desc = "You wish you had some peanut butter to go with this..."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -354,13 +354,13 @@
bitesize = 3
tastes = list("toast" = 1, "jelly" = 1)
-/obj/item/reagent_containers/food/snacks/jellysandwich/slime
+/obj/item/food/snacks/jellysandwich/slime
list_reagents = list("nutriment" = 2, "slimejelly" = 5, "vitamin" = 2)
-/obj/item/reagent_containers/food/snacks/jellysandwich/cherry
+/obj/item/food/snacks/jellysandwich/cherry
list_reagents = list("nutriment" = 2, "cherryjelly" = 5, "vitamin" = 2)
-/obj/item/reagent_containers/food/snacks/notasandwich
+/obj/item/food/snacks/notasandwich
name = "not-a-sandwich"
desc = "Something seems to be wrong with this, you can't quite figure what. Maybe it's his moustache."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -368,7 +368,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 6)
tastes = list("nothing suspicious" = 1)
-/obj/item/reagent_containers/food/snacks/wrap
+/obj/item/food/snacks/wrap
name = "egg wrap"
desc = "The precursor to Pigs in a Blanket."
icon = 'icons/obj/food/food.dmi'
@@ -376,7 +376,7 @@
list_reagents = list("nutriment" = 5)
tastes = list("egg" = 1)
-/obj/item/reagent_containers/food/snacks/blt
+/obj/item/food/snacks/blt
name = "\improper BLT"
desc = "A classic bacon, lettuce, and tomato sandwich."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -386,7 +386,7 @@
list_reagents = list("nutriment" = 5, "protein" = 2)
tastes = list("bacon" = 3, "lettuce" = 2, "tomato" = 2, "bread" = 2)
-/obj/item/reagent_containers/food/snacks/peanut_butter_jelly
+/obj/item/food/snacks/peanut_butter_jelly
name = "peanut butter and jelly sandwich"
desc = "A classic PB&J sandwich, just like your mom used to make."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -395,13 +395,13 @@
bitesize = 2
tastes = list("peanut butter" = 3, "jelly" = 3, "bread" = 2)
-/obj/item/reagent_containers/food/snacks/peanut_butter_jelly/slime
+/obj/item/food/snacks/peanut_butter_jelly/slime
list_reagents = list("peanutbutter" = 2, "slimejelly" = 5, "nutriment" = 5, "protein" = 2)
-/obj/item/reagent_containers/food/snacks/peanut_butter_jelly/cherry
+/obj/item/food/snacks/peanut_butter_jelly/cherry
list_reagents = list("peanutbutter" = 2, "cherryjelly" = 5, "nutriment" = 5, "protein" = 2)
-/obj/item/reagent_containers/food/snacks/philly_cheesesteak
+/obj/item/food/snacks/philly_cheesesteak
name = "Philly cheesesteak"
desc = "A popular sandwich made of sliced meat, onions, melted cheese in a long hoagie roll. Mouthwatering doesn't even begin to describe it."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -411,7 +411,7 @@
list_reagents = list("nutriment" = 10, "protein" = 4)
tastes = list("steak" = 3, "melted cheese" = 3, "onions" = 2, "bread" = 2)
-/obj/item/reagent_containers/food/snacks/peanut_butter_banana
+/obj/item/food/snacks/peanut_butter_banana
name = "peanut butter and banana sandwich"
desc = "A peanut butter sandwich with banana slices mixed in, a good high protein treat."
icon = 'icons/obj/food/burgerbread.dmi'
diff --git a/code/modules/food_and_drinks/food/foods/seafood.dm b/code/modules/food_and_drinks/food/foods/seafood.dm
index 72114a5d554..629886de6b5 100644
--- a/code/modules/food_and_drinks/food/foods/seafood.dm
+++ b/code/modules/food_and_drinks/food/foods/seafood.dm
@@ -1,5 +1,5 @@
-/obj/item/reagent_containers/food/snacks/carpmeat
+/obj/item/food/snacks/carpmeat
name = "carp fillet"
desc = "A fillet of spess carp meat."
icon = 'icons/obj/food/seafood.dmi'
@@ -11,7 +11,7 @@
ingredient_name = "fillet of meat"
ingredient_name_plural = "fillets of meat"
-/obj/item/reagent_containers/food/snacks/salmonmeat
+/obj/item/food/snacks/salmonmeat
name = "raw salmon"
desc = "A fillet of raw salmon."
icon = 'icons/obj/food/seafood.dmi'
@@ -21,7 +21,7 @@
list_reagents = list("protein" = 3, "vitamin" = 2)
tastes = list("raw salmon" = 1)
-/obj/item/reagent_containers/food/snacks/salmonsteak
+/obj/item/food/snacks/salmonsteak
name = "salmon steak"
desc = "A fillet of freshly-grilled salmon meat."
icon = 'icons/obj/food/seafood.dmi'
@@ -32,7 +32,7 @@
list_reagents = list("nutriment" = 4, "vitamin" = 2)
tastes = list("cooked salmon" = 1)
-/obj/item/reagent_containers/food/snacks/catfishmeat
+/obj/item/food/snacks/catfishmeat
name = "raw catfish"
desc = "A fillet of raw catfish."
icon = 'icons/obj/food/seafood.dmi'
@@ -42,7 +42,7 @@
list_reagents = list("protein" = 3, "vitamin" = 2)
tastes = list("catfish" = 1)
-/obj/item/reagent_containers/food/snacks/fishfingers
+/obj/item/food/snacks/fishfingers
name = "fish fingers"
desc = "A finger of fish."
icon = 'icons/obj/food/seafood.dmi'
@@ -52,7 +52,7 @@
list_reagents = list("nutriment" = 4)
tastes = list("fish" = 1, "bread" = 1)
-/obj/item/reagent_containers/food/snacks/fishburger
+/obj/item/food/snacks/fishburger
name = "Fillet-O-Carp sandwich"
desc = "Almost like a carp is yelling somewhere... Give me back that fillet -o- carp, give me that carp."
icon = 'icons/obj/food/seafood.dmi'
@@ -62,7 +62,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("bun" = 4, "fish" = 4)
-/obj/item/reagent_containers/food/snacks/cubancarp
+/obj/item/food/snacks/cubancarp
name = "cuban carp"
desc = "A grifftastic sandwich that burns your tongue and then leaves it numb!"
icon = 'icons/obj/food/seafood.dmi'
@@ -73,7 +73,7 @@
list_reagents = list("nutriment" = 6, "capsaicin" = 1)
tastes = list("fish" = 4, "batter" = 1, "hot peppers" = 1)
-/obj/item/reagent_containers/food/snacks/fishandchips
+/obj/item/food/snacks/fishandchips
name = "fish and chips"
desc = "I do say so myself old chap. Indubitably!"
icon = 'icons/obj/food/seafood.dmi'
@@ -83,7 +83,7 @@
list_reagents = list("nutriment" = 6)
tastes = list("fish" = 1, "chips" = 1)
-/obj/item/reagent_containers/food/snacks/sashimi
+/obj/item/food/snacks/sashimi
name = "carp sashimi"
desc = "Celebrate surviving attack from hostile alien lifeforms by hospitalising yourself."
icon = 'icons/obj/food/seafood.dmi'
@@ -92,7 +92,7 @@
list_reagents = list("nutriment" = 6, "capsaicin" = 5)
tastes = list("raw carp" = 1, "hot peppers" = 1)
-/obj/item/reagent_containers/food/snacks/fried_shrimp
+/obj/item/food/snacks/fried_shrimp
name = "fried shrimp"
desc = "Just one of the many things you can do with shrimp!"
icon = 'icons/obj/food/seafood.dmi'
@@ -101,7 +101,7 @@
list_reagents = list("nutriment" = 2)
tastes = list("shrimp" = 1, "bread crumbs" = 1)
-/obj/item/reagent_containers/food/snacks/boiled_shrimp
+/obj/item/food/snacks/boiled_shrimp
name = "boiled shrimp"
desc = "Just one of the many things you can do with shrimp!"
icon = 'icons/obj/food/seafood.dmi'
@@ -110,7 +110,7 @@
list_reagents = list("nutriment" = 2)
tastes = list("shrimp" = 1)
-/obj/item/reagent_containers/food/snacks/shrimp_skewer
+/obj/item/food/snacks/shrimp_skewer
name = "shrimp skewer"
desc = "Four shrimp lightly grilled on a skewer. Yummy!"
trash = /obj/item/stack/rods
@@ -120,7 +120,7 @@
list_reagents = list("nutriment" = 8)
tastes = list("shrimp" = 4)
-/obj/item/reagent_containers/food/snacks/fish_skewer
+/obj/item/food/snacks/fish_skewer
name = "fish skewer"
desc = "A whole fish battered and grilled on a skewer. Hope you're hungry!"
trash = /obj/item/stack/rods
@@ -130,18 +130,18 @@
list_reagents = list("protein" = 6, "vitamin" = 4)
tastes = list("shrimp" = 1, "batter" = 1)
-/obj/item/reagent_containers/food/snacks/sliceable/Ebi_maki
+/obj/item/food/snacks/sliceable/Ebi_maki
name = "ebi maki roll"
desc = "A large unsliced roll of Ebi Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "Ebi_maki"
- slice_path = /obj/item/reagent_containers/food/snacks/sushi_Ebi
+ slice_path = /obj/item/food/snacks/sushi_Ebi
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8)
tastes = list("shrimp" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sushi_Ebi
+/obj/item/food/snacks/sushi_Ebi
name = "ebi sushi"
desc = "A simple sushi consisting of cooked shrimp and rice."
icon = 'icons/obj/food/seafood.dmi'
@@ -150,18 +150,18 @@
list_reagents = list("nutriment" = 2)
tastes = list("shrimp" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sliceable/Ikura_maki
+/obj/item/food/snacks/sliceable/Ikura_maki
name = "ikura maki roll"
desc = "A large unsliced roll of Ikura Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "Ikura_maki"
- slice_path = /obj/item/reagent_containers/food/snacks/sushi_Ikura
+ slice_path = /obj/item/food/snacks/sushi_Ikura
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8, "protein" = 4)
tastes = list("salmon roe" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sushi_Ikura
+/obj/item/food/snacks/sushi_Ikura
name = "ikura sushi"
desc = "A simple sushi consisting of salmon roe."
icon = 'icons/obj/food/seafood.dmi'
@@ -170,18 +170,18 @@
list_reagents = list("nutriment" = 2, "protein" = 1)
tastes = list("salmon roe" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sliceable/Sake_maki
+/obj/item/food/snacks/sliceable/Sake_maki
name = "sake maki roll"
desc = "A large unsliced roll of Sake Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "Sake_maki"
- slice_path = /obj/item/reagent_containers/food/snacks/sushi_Sake
+ slice_path = /obj/item/food/snacks/sushi_Sake
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8)
tastes = list("raw salmon" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sushi_Sake
+/obj/item/food/snacks/sushi_Sake
name = "sake sushi"
desc = "A simple sushi consisting of raw salmon and rice."
icon = 'icons/obj/food/seafood.dmi'
@@ -190,18 +190,18 @@
list_reagents = list("nutriment" = 2)
tastes = list("raw salmon" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sliceable/SmokedSalmon_maki
+/obj/item/food/snacks/sliceable/SmokedSalmon_maki
name = "smoked salmon maki roll"
desc = "A large unsliced roll of Smoked Salmon Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "SmokedSalmon_maki"
- slice_path = /obj/item/reagent_containers/food/snacks/sushi_SmokedSalmon
+ slice_path = /obj/item/food/snacks/sushi_SmokedSalmon
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8)
tastes = list("smoked salmon" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sushi_SmokedSalmon
+/obj/item/food/snacks/sushi_SmokedSalmon
name = "smoked salmon sushi"
desc = "A simple sushi consisting of cooked salmon and rice."
icon = 'icons/obj/food/seafood.dmi'
@@ -210,18 +210,18 @@
list_reagents = list("nutriment" = 2)
tastes = list("smoked salmon" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sliceable/Tamago_maki
+/obj/item/food/snacks/sliceable/Tamago_maki
name = "tamago maki roll"
desc = "A large unsliced roll of Tamago Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "Tamago_maki"
- slice_path = /obj/item/reagent_containers/food/snacks/sushi_Tamago
+ slice_path = /obj/item/food/snacks/sushi_Tamago
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8)
tastes = list("egg" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sushi_Tamago
+/obj/item/food/snacks/sushi_Tamago
name = "tamago sushi"
desc = "A simple sushi consisting of egg and rice."
icon = 'icons/obj/food/seafood.dmi'
@@ -230,18 +230,18 @@
list_reagents = list("nutriment" = 2)
tastes = list("egg" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sliceable/Inari_maki
+/obj/item/food/snacks/sliceable/Inari_maki
name = "inari maki roll"
desc = "A large unsliced roll of Inari Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "Inari_maki"
- slice_path = /obj/item/reagent_containers/food/snacks/sushi_Inari
+ slice_path = /obj/item/food/snacks/sushi_Inari
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8)
tastes = list("fried tofu" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sushi_Inari
+/obj/item/food/snacks/sushi_Inari
name = "inari sushi"
desc = "A piece of fried tofu stuffed with rice."
icon = 'icons/obj/food/seafood.dmi'
@@ -250,18 +250,18 @@
list_reagents = list("nutriment" = 2)
tastes = list("fried tofu" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sliceable/Masago_maki
+/obj/item/food/snacks/sliceable/Masago_maki
name = "masago maki roll"
desc = "A large unsliced roll of Masago Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "Masago_maki"
- slice_path = /obj/item/reagent_containers/food/snacks/sushi_Masago
+ slice_path = /obj/item/food/snacks/sushi_Masago
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8, "protein" = 4)
tastes = list("goldfish roe" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sushi_Masago
+/obj/item/food/snacks/sushi_Masago
name = "masago sushi"
desc = "A simple sushi consisting of goldfish roe."
icon = 'icons/obj/food/seafood.dmi'
@@ -270,18 +270,18 @@
list_reagents = list("nutriment" = 2, "protein" = 1)
tastes = list("goldfish roe" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sliceable/Tobiko_maki
+/obj/item/food/snacks/sliceable/Tobiko_maki
name = "tobiko maki roll"
desc = "A large unsliced roll of Tobkio Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "Tobiko_maki"
- slice_path = /obj/item/reagent_containers/food/snacks/sushi_Tobiko
+ slice_path = /obj/item/food/snacks/sushi_Tobiko
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8, "protein" = 4)
tastes = list("shark roe" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sushi_Tobiko
+/obj/item/food/snacks/sushi_Tobiko
name = "tobiko sushi"
desc = "A simple sushi consisting of shark roe."
icon = 'icons/obj/food/seafood.dmi'
@@ -290,18 +290,18 @@
list_reagents = list("nutriment" = 2, "protein" = 1)
tastes = list("shark roe" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sliceable/TobikoEgg_maki
+/obj/item/food/snacks/sliceable/TobikoEgg_maki
name = "tobiko and egg maki roll"
desc = "A large unsliced roll of Tobkio and Egg Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "TobikoEgg_maki"
- slice_path = /obj/item/reagent_containers/food/snacks/sushi_TobikoEgg
+ slice_path = /obj/item/food/snacks/sushi_TobikoEgg
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8, "protein" = 4)
tastes = list("shark roe" = 1, "rice" = 1, "egg" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sushi_TobikoEgg
+/obj/item/food/snacks/sushi_TobikoEgg
name = "tobiko and egg sushi"
desc = "A sushi consisting of shark roe and an egg."
icon = 'icons/obj/food/seafood.dmi'
@@ -310,18 +310,18 @@
list_reagents = list("nutriment" = 2, "protein" = 1)
tastes = list("shark roe" = 1, "rice" = 1, "egg" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sliceable/Tai_maki
+/obj/item/food/snacks/sliceable/Tai_maki
name = "tai maki roll"
desc = "A large unsliced roll of Tai Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "Tai_maki"
- slice_path = /obj/item/reagent_containers/food/snacks/sushi_Tai
+ slice_path = /obj/item/food/snacks/sushi_Tai
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8)
tastes = list("catfish" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sushi_Tai
+/obj/item/food/snacks/sushi_Tai
name = "tai sushi"
desc = "A simple sushi consisting of catfish and rice."
icon = 'icons/obj/food/seafood.dmi'
@@ -330,7 +330,7 @@
list_reagents = list("nutriment" = 2)
tastes = list("catfish" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sushi_Unagi
+/obj/item/food/snacks/sushi_Unagi
name = "unagi sushi"
desc = "A simple sushi consisting of eel and rice."
icon = 'icons/obj/food/seafood.dmi'
diff --git a/code/modules/food_and_drinks/food/foods/side_dishes.dm b/code/modules/food_and_drinks/food/foods/side_dishes.dm
index ec73c20f812..fbfdf039462 100644
--- a/code/modules/food_and_drinks/food/foods/side_dishes.dm
+++ b/code/modules/food_and_drinks/food/foods/side_dishes.dm
@@ -3,7 +3,7 @@
// Raw //
//////////////////////
-/obj/item/reagent_containers/food/snacks/rawsticks
+/obj/item/food/snacks/rawsticks
name = "raw potato sticks"
desc = "Raw fries, not very tasty."
icon = 'icons/obj/food/food_ingredients.dmi'
@@ -16,7 +16,7 @@
// Fried //
//////////////////////
-/obj/item/reagent_containers/food/snacks/fries
+/obj/item/food/snacks/fries
name = "space fries"
desc = "AKA: French Fries, Freedom Fries, etc."
icon_state = "fries"
@@ -25,7 +25,7 @@
list_reagents = list("nutriment" = 4)
tastes = list("fries" = 3, "salt" = 1)
-/obj/item/reagent_containers/food/snacks/cheesyfries
+/obj/item/food/snacks/cheesyfries
name = "cheesy fries"
desc = "Fries. Covered in cheese. Duh."
icon_state = "cheesyfries"
@@ -34,7 +34,7 @@
list_reagents = list("nutriment" = 6)
tastes = list("fries" = 3, "cheese" = 1)
-/obj/item/reagent_containers/food/snacks/tatortot
+/obj/item/food/snacks/tatortot
name = "tator tot"
desc = "A large fried potato nugget that may or may not try to valid you."
icon_state = "tatortot"
@@ -42,7 +42,7 @@
filling_color = "FFD700"
tastes = list("fried potato" = 3, "valids" = 1)
-/obj/item/reagent_containers/food/snacks/onionrings
+/obj/item/food/snacks/onionrings
name = "onion rings"
desc = "Onion slices coated in batter."
icon_state = "onionrings"
@@ -51,7 +51,7 @@
gender = PLURAL
tastes = list("onion" = 3, "batter" = 1)
-/obj/item/reagent_containers/food/snacks/carrotfries
+/obj/item/food/snacks/carrotfries
name = "carrot fries"
desc = "Tasty fries from fresh carrots."
icon_state = "carrotfries"
@@ -65,14 +65,14 @@
// Misc //
//////////////////////
-/obj/item/reagent_containers/food/snacks/beans
+/obj/item/food/snacks/beans
name = "tin of beans"
desc = "Musical fruit in a slightly less musical container."
icon_state = "beans"
list_reagents = list("nutriment" = 10, "beans" = 10, "vitamin" = 3)
tastes = list("beans" = 1)
-/obj/item/reagent_containers/food/snacks/mashed_potatoes //mashed taters
+/obj/item/food/snacks/mashed_potatoes //mashed taters
name = "mashed potatoes"
desc = "Some soft, creamy, and irresistible mashed potatoes."
icon_state = "mashedtaters"
@@ -81,7 +81,7 @@
list_reagents = list("nutriment" = 5, "gravy" = 5, "mashedpotatoes" = 10, "vitamin" = 2)
tastes = list("mashed potato" = 3, "gravy" = 1)
-/obj/item/reagent_containers/food/snacks/stuffing
+/obj/item/food/snacks/stuffing
name = "stuffing"
desc = "Moist, peppery breadcrumbs for filling the body cavities of dead birds. Dig in!"
icon_state = "stuffing"
@@ -89,7 +89,7 @@
list_reagents = list("nutriment" = 3)
tastes = list("bread crumbs" = 1, "herbs" = 1)
-/obj/item/reagent_containers/food/snacks/loadedbakedpotato
+/obj/item/food/snacks/loadedbakedpotato
name = "loaded baked potato"
desc = "Totally baked."
icon_state = "loadedbakedpotato"
@@ -97,7 +97,7 @@
list_reagents = list("nutriment" = 6)
tastes = list("potato" = 1, "cheese" = 1, "herbs" = 1)
-/obj/item/reagent_containers/food/snacks/boiledrice
+/obj/item/food/snacks/boiledrice
name = "boiled rice"
desc = "A boring dish of boring rice."
icon_state = "boiledrice"
@@ -107,7 +107,7 @@
tastes = list("rice" = 1)
-/obj/item/reagent_containers/food/snacks/roastparsnip
+/obj/item/food/snacks/roastparsnip
name = "roast parsnip"
desc = "Sweet and crunchy."
icon_state = "roastparsnip"
diff --git a/code/modules/food_and_drinks/food/foods/soups.dm b/code/modules/food_and_drinks/food/foods/soups.dm
index efe2cc630fe..d60b10a0d6e 100644
--- a/code/modules/food_and_drinks/food/foods/soups.dm
+++ b/code/modules/food_and_drinks/food/foods/soups.dm
@@ -4,7 +4,7 @@
//////////////////////
// Base object for soups, should never appear ingame.
-/obj/item/reagent_containers/food/snacks/soup
+/obj/item/food/snacks/soup
name = "impossible soup"
desc = "This soup is so good, it shouldn't even exist!"
icon = 'icons/obj/food/soupsalad.dmi'
@@ -13,7 +13,7 @@
trash = /obj/item/trash/snack_bowl
bitesize = 5
-/obj/item/reagent_containers/food/snacks/soup/meatballsoup
+/obj/item/food/snacks/soup/meatballsoup
name = "meatball soup"
desc = "You've got balls kid, BALLS!"
icon_state = "meatballsoup"
@@ -21,7 +21,7 @@
list_reagents = list("nutriment" = 8, "water" = 5, "vitamin" = 4)
tastes = list("meatball" = 1)
-/obj/item/reagent_containers/food/snacks/soup/slimesoup
+/obj/item/food/snacks/soup/slimesoup
name = "slime soup"
desc = "If no water is available, you may substitute tears."
icon_state = "slimesoup"
@@ -29,7 +29,7 @@
list_reagents = list("nutriment" = 5, "slimejelly" = 5, "water" = 5, "vitamin" = 4)
tastes = list("slime" = 1)
-/obj/item/reagent_containers/food/snacks/soup/bloodsoup
+/obj/item/food/snacks/soup/bloodsoup
name = "tomato soup"
desc = "Smells like copper."
icon_state = "tomatosoup"
@@ -37,7 +37,7 @@
list_reagents = list("nutriment" = 2, "blood" = 10, "water" = 5, "vitamin" = 4)
tastes = list("iron" = 1)
-/obj/item/reagent_containers/food/snacks/soup/clownstears
+/obj/item/food/snacks/soup/clownstears
name = "clown's tears"
desc = "Not very funny."
icon_state = "clownstears"
@@ -45,7 +45,7 @@
list_reagents = list("nutriment" = 4, "banana" = 5, "water" = 5, "vitamin" = 8)
tastes = list("a bad joke" = 1)
-/obj/item/reagent_containers/food/snacks/soup/vegetablesoup
+/obj/item/food/snacks/soup/vegetablesoup
name = "vegetable soup"
desc = "A true vegan meal." //TODO
icon_state = "vegetablesoup"
@@ -53,7 +53,7 @@
list_reagents = list("nutriment" = 8, "water" = 5, "vitamin" = 4)
tastes = list("vegetables" = 1)
-/obj/item/reagent_containers/food/snacks/soup/nettlesoup
+/obj/item/food/snacks/soup/nettlesoup
name = "nettle soup"
desc = "To think, the botanist would've beaten you to death with one of these."
icon_state = "nettlesoup"
@@ -61,7 +61,7 @@
list_reagents = list("nutriment" = 8, "water" = 5, "vitamin" = 4)
tastes = list("nettles" = 1)
-/obj/item/reagent_containers/food/snacks/soup/mysterysoup
+/obj/item/food/snacks/soup/mysterysoup
name = "mystery soup"
desc = "The mystery is, why aren't you eating it?"
icon_state = "mysterysoup"
@@ -69,12 +69,12 @@
list_reagents = list("nutriment" = 6)
tastes = list("chaos" = 1)
-/obj/item/reagent_containers/food/snacks/soup/mysterysoup/Initialize(mapload)
+/obj/item/food/snacks/soup/mysterysoup/Initialize(mapload)
. = ..()
extra_reagent = pick("capsaicin", "frostoil", "omnizine", "banana", "blood", "slimejelly", "toxin", "banana", "carbon", "oculine")
reagents.add_reagent("[extra_reagent]", 5)
-/obj/item/reagent_containers/food/snacks/soup/wishsoup
+/obj/item/food/snacks/soup/wishsoup
name = "wish soup"
desc = "I wish this was soup."
icon_state = "wishsoup"
@@ -82,14 +82,14 @@
list_reagents = list("water" = 10)
tastes = list("wishes" = 1)
-/obj/item/reagent_containers/food/snacks/soup/wishsoup/Initialize(mapload)
+/obj/item/food/snacks/soup/wishsoup/Initialize(mapload)
. = ..()
if(prob(25))
desc = "A wish come true!" // hue
reagents.add_reagent("nutriment", 9)
reagents.add_reagent("vitamin", 1)
-/obj/item/reagent_containers/food/snacks/soup/tomatosoup
+/obj/item/food/snacks/soup/tomatosoup
name = "tomato soup"
desc = "Drinking this feels like being a vampire! A tomato vampire..."
icon_state = "tomatosoup"
@@ -97,14 +97,14 @@
list_reagents = list("nutriment" = 5, "tomatojuice" = 10, "vitamin" = 3)
tastes = list("tomato" = 1)
-/obj/item/reagent_containers/food/snacks/soup/misosoup
+/obj/item/food/snacks/soup/misosoup
name = "miso soup"
desc = "The universe's best soup! Yum!!!"
icon_state = "misosoup"
list_reagents = list("nutriment" = 7, "vitamin" = 2)
tastes = list("miso" = 1)
-/obj/item/reagent_containers/food/snacks/soup/mushroomsoup
+/obj/item/food/snacks/soup/mushroomsoup
name = "chantrelle soup"
desc = "A delicious and hearty mushroom soup."
icon_state = "mushroomsoup"
@@ -112,7 +112,7 @@
list_reagents = list("nutriment" = 8, "vitamin" = 4)
tastes = list("mushroom" = 1)
-/obj/item/reagent_containers/food/snacks/soup/beetsoup
+/obj/item/food/snacks/soup/beetsoup
name = "beet soup"
desc = "Wait, how do you spell it again..?"
icon_state = "beetsoup"
@@ -120,11 +120,11 @@
list_reagents = list("nutriment" = 7, "vitamin" = 2)
tastes = list("beet" = 1)
-/obj/item/reagent_containers/food/snacks/soup/beetsoup/Initialize(mapload)
+/obj/item/food/snacks/soup/beetsoup/Initialize(mapload)
. = ..()
name = pick("borsch", "bortsch", "borstch", "borsh", "borshch", "borscht")
-/obj/item/reagent_containers/food/snacks/soup/eyesoup
+/obj/item/food/snacks/soup/eyesoup
name = "eyeball soup"
desc = "It looks back at you..."
icon_state = "eyeballsoup"
@@ -132,63 +132,63 @@
list_reagents = list("nutriment" = 7, "protein" = 2)
tastes = list("squirming" = 2, "tomato" = 2)
-/obj/item/reagent_containers/food/snacks/soup/sweetpotatosoup
+/obj/item/food/snacks/soup/sweetpotatosoup
name = "sweet potato soup"
desc = "Delicious sweet potato in soup form."
icon_state = "sweetpotatosoup"
list_reagents = list("nutriment" = 5)
tastes = list("sweet potato" = 1)
-/obj/item/reagent_containers/food/snacks/soup/redbeetsoup
+/obj/item/food/snacks/soup/redbeetsoup
name = "red beet soup"
desc = "Quite a delicacy."
icon_state = "redbeetsoup"
list_reagents = list("nutriment" = 5)
tastes = list("red beet" = 1)
-/obj/item/reagent_containers/food/snacks/soup/frenchonionsoup
+/obj/item/food/snacks/soup/frenchonionsoup
name = "french onion soup"
desc = "Good enough to make a grown mime cry."
icon_state = "onionsoup"
list_reagents = list("nutriment" = 8)
tastes = list("caramelized onions" = 3, "cheese" = 1)
-/obj/item/reagent_containers/food/snacks/soup/zurek
+/obj/item/food/snacks/soup/zurek
name = "zurek"
desc = "A traditional Polish soup composed of vegetables, meat, and an egg. Goes great with bread."
icon_state = "zurek"
list_reagents = list("nutriment" = 10, "protein" = 4)
tastes = list("creamy vegetables" = 3, "sausage" = 2)
-/obj/item/reagent_containers/food/snacks/soup/cullenskink
+/obj/item/food/snacks/soup/cullenskink
name = "cullen skink"
desc = "A thick Scottish soup made of smoked fish, potatoes and onions."
icon_state = "cullen_skink"
list_reagents = list("nutriment" = 10, "protein" = 4)
tastes = list("creamy broth" = 2, "fish" = 2, "vegetables" = 2)
-/obj/item/reagent_containers/food/snacks/soup/chicken_noodle_soup
+/obj/item/food/snacks/soup/chicken_noodle_soup
name = "chicken noodle soup"
desc = "A hearty bowl of chicken noodle soup, perfect for when you're stuck at home and sick."
icon_state = "chicken_noodle_soup"
list_reagents = list("nutriment" = 10, "protein" = 4)
tastes = list("broth" = 1, "chicken" = 1, "carrots" = 1, "noodles" = 1)
-/obj/item/reagent_containers/food/snacks/soup/cornchowder
+/obj/item/food/snacks/soup/cornchowder
name = "corn chowder"
desc = "A creamy bowl of corn chowder, with bacon bits and mixed vegetables. One bowl is never enough."
icon_state = "corn_chowder"
list_reagents = list("nutriment" = 10, "protein" = 4)
tastes = list("creamy broth" = 1, "bacon" = 1, "mixed vegetables" = 1)
-/obj/item/reagent_containers/food/snacks/soup/meatball_noodles
+/obj/item/food/snacks/soup/meatball_noodles
name = "meatball noodle soup"
desc = "A hearty noodle soup made from meatballs and pasta in a rich broth. Commonly topped with a handful of chopped nuts."
icon_state = "meatball_noodles"
list_reagents = list("nutriment" = 10, "protein" = 4)
tastes = list("bone broth" = 1, "meat" = 1, "gnocchi" = 1, "peanuts" = 1)
-/obj/item/reagent_containers/food/snacks/soup/seedsoup
+/obj/item/food/snacks/soup/seedsoup
name = "Misklmæsch" //miskl = seed, mæsch = soup
desc = "A seed based soup, made by germinating seeds and then boiling them. \
Produces a particularly bitter broth which is usually balanced by the addition of vinegar."
@@ -200,7 +200,7 @@
// Stews //
//////////////////////
-/obj/item/reagent_containers/food/snacks/soup/stew
+/obj/item/food/snacks/soup/stew
name = "stew"
desc = "A nice and warm stew. Healthy and strong."
icon_state = "stew"
@@ -209,7 +209,7 @@
list_reagents = list("nutriment" = 10, "oculine" = 5, "tomatojuice" = 5, "vitamin" = 5)
tastes = list("tomato" = 1, "carrot" = 1)
-/obj/item/reagent_containers/food/snacks/stewedsoymeat
+/obj/item/food/snacks/stewedsoymeat
name = "stewed soy meat"
desc = "Even non-vegetarians will LOVE this!"
icon = 'icons/obj/food/soupsalad.dmi'
@@ -218,28 +218,28 @@
list_reagents = list("nutriment" = 8)
tastes = list("soy" = 1, "vegetables" = 1)
-/obj/item/reagent_containers/food/snacks/soup/beanstew
+/obj/item/food/snacks/soup/beanstew
name = "Prickeldröndolhaskl" //prickeld = spicy, röndol = bean, haskl = stew
desc = "A spicy bean stew with lots of veggies, commonly served aboard the fleet as a filling and satisfying meal with rice or bread."
icon_state = "moth_bean_stew"
list_reagents = list("nutriment" = 10)
tastes = list("beans" = 1, "cabbage" = 1, "spicy sauce" = 1)
-/obj/item/reagent_containers/food/snacks/soup/oatstew
+/obj/item/food/snacks/soup/oatstew
name = "Häfmisklhaskl" //häfmiskl = oat (häf from German hafer meaning oat, miskl meaning seed), haskl = stew
desc = "A spicy bean stew with lots of veggies, commonly served aboard the fleet as a filling and satisfying meal with rice or bread."
icon_state = "moth_oat_stew"
list_reagents = list("nutriment" = 10)
tastes = list("oats" = 1, "sweet potato" = 1, "carrot" = 1, "pumpkin" = 1, "parsnip" = 1)
-/obj/item/reagent_containers/food/snacks/soup/hong_kong_borscht
+/obj/item/food/snacks/soup/hong_kong_borscht
name = "hong kong borscht"
desc = "Also known as luo song tang or Russian soup, this dish bears little to no resemblance to Eastern European borscht- indeed, it's a tomato-based soup with no beets in sight."
icon_state = "hong_kong_borscht"
list_reagents = list("nutriment" = 10, "protein" = 2)
tastes = list("tomato" = 1, "cabbage" = 1, "meat" = 1)
-/obj/item/reagent_containers/food/snacks/soup/hong_kong_macaroni
+/obj/item/food/snacks/soup/hong_kong_macaroni
name = "hong kong macaroni"
desc = "A favourite from Hong Kong's Cha Chaan Tengs, this macaroni soup came to Mars with Cantonese settlers under Cybersun Industries, and has become as much of a breakfast staple there as it is in its homeland."
icon_state = "hong_kong_macaroni"
@@ -250,7 +250,7 @@
// Chili //
//////////////////////
-/obj/item/reagent_containers/food/snacks/soup/hotchili
+/obj/item/food/snacks/soup/hotchili
name = "hot chili"
desc = "A five alarm Texan Chili!"
icon_state = "hotchili"
@@ -258,7 +258,7 @@
list_reagents = list("nutriment" = 5, "capsaicin" = 1, "tomatojuice" = 2, "vitamin" = 2)
tastes = list("hot peppers" = 1, "tomato" = 1)
-/obj/item/reagent_containers/food/snacks/soup/coldchili
+/obj/item/food/snacks/soup/coldchili
name = "cold chili"
desc = "This slush is barely a liquid!"
icon_state = "coldchili"
@@ -266,7 +266,7 @@
list_reagents = list("nutriment" = 5, "frostoil" = 1, "tomatojuice" = 2, "vitamin" = 2)
tastes = list("tomato" = 1, "mint" = 1)
-/obj/item/reagent_containers/food/snacks/soup/clownchili
+/obj/item/food/snacks/soup/clownchili
name = "chili con carnival"
desc = "A delicious stew of meat, chiles, and salty, salty clown tears."
icon_state = "clownchili"
diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm
index db1d85d77ed..6a46a51c925 100644
--- a/code/modules/food_and_drinks/food/snacks.dm
+++ b/code/modules/food_and_drinks/food/snacks.dm
@@ -1,6 +1,6 @@
#define MAX_WEIGHT_CLASS WEIGHT_CLASS_SMALL
//Food items that are eaten normally and don't leave anything behind.
-/obj/item/reagent_containers/food/snacks
+/obj/item/food/snacks
name = "snack"
desc = "yummy"
icon = 'icons/obj/food/food.dmi'
@@ -16,8 +16,8 @@
var/total_w_class = 0 //for the total weight an item of food can carry
var/list/tastes // for example list("crisps" = 2, "salt" = 1)
-/obj/item/reagent_containers/food/snacks/add_initial_reagents()
- if(tastes && tastes.len)
+/obj/item/food/snacks/add_initial_reagents()
+ if(tastes && length(tastes))
if(list_reagents)
for(var/rid in list_reagents)
var/amount = list_reagents[rid]
@@ -29,13 +29,13 @@
..()
//Placeholder for effect that trigger on eating that aren't tied to reagents.
-/obj/item/reagent_containers/food/snacks/proc/On_Consume(mob/M, mob/user)
+/obj/item/food/snacks/proc/On_Consume(mob/M, mob/user)
if(!user)
return
if(!reagents.total_volume)
if(M == user)
- to_chat(user, "You finish eating \the [src].")
- user.visible_message("[M] finishes eating \the [src].")
+ to_chat(user, "You finish eating [src].")
+ user.visible_message("[M] finishes eating [src].")
user.unEquip(src) //so icons update :[
Post_Consume(M)
var/obj/item/trash_item = generate_trash(usr)
@@ -43,13 +43,13 @@
qdel(src)
return
-/obj/item/reagent_containers/food/snacks/proc/Post_Consume(mob/living/M)
+/obj/item/food/snacks/proc/Post_Consume(mob/living/M)
return
-/obj/item/reagent_containers/food/snacks/attack_self(mob/user)
+/obj/item/food/snacks/attack_self(mob/user)
return
-/obj/item/reagent_containers/food/snacks/attack(mob/M, mob/user, def_zone)
+/obj/item/food/snacks/attack(mob/M, mob/user, def_zone)
if(reagents && !reagents.total_volume) //Shouldn't be needed but it checks to see if it has anything left in it.
to_chat(user, "None of [src] left, oh no!")
M.unEquip(src) //so icons update :[
@@ -64,10 +64,10 @@
return TRUE
return FALSE
-/obj/item/reagent_containers/food/snacks/afterattack(obj/target, mob/user, proximity)
+/obj/item/food/snacks/afterattack(obj/target, mob/user, proximity)
return
-/obj/item/reagent_containers/food/snacks/examine(mob/user)
+/obj/item/food/snacks/examine(mob/user)
. = ..()
if(in_range(user, src))
if(bitecount > 0)
@@ -79,7 +79,7 @@
. += "[src] was bitten multiple times!"
-/obj/item/reagent_containers/food/snacks/attackby(obj/item/W, mob/user, params)
+/obj/item/food/snacks/attackby(obj/item/W, mob/user, params)
if(is_pen(W))
rename_interactive(user, W, use_prefix = FALSE, prompt = "What would you like to name this dish?")
return
@@ -105,7 +105,7 @@
I.color = filling_color
U.overlays += I
- var/obj/item/reagent_containers/food/snacks/collected = new type
+ var/obj/item/food/snacks/collected = new type
collected.name = name
collected.loc = U
collected.reagents.remove_any(collected.reagents.total_volume)
@@ -126,7 +126,7 @@
else
return ..()
-/obj/item/reagent_containers/food/snacks/proc/generate_trash(atom/location)
+/obj/item/food/snacks/proc/generate_trash(atom/location)
if(trash)
if(ispath(trash, /obj/item))
. = new trash(location)
@@ -139,13 +139,13 @@
trash = null
return
-/obj/item/reagent_containers/food/snacks/Destroy()
+/obj/item/food/snacks/Destroy()
if(contents)
for(var/atom/movable/something in contents)
something.loc = get_turf(src)
return ..()
-/obj/item/reagent_containers/food/snacks/attack_animal(mob/M)
+/obj/item/food/snacks/attack_animal(mob/M)
if(isanimal(M))
M.changeNext_move(CLICK_CD_MELEE)
if(isdog(M))
@@ -173,11 +173,11 @@
N.adjustHealth(-2)
N.taste(reagents)
-/obj/item/reagent_containers/food/snacks/sliceable/examine(mob/user)
+/obj/item/food/snacks/sliceable/examine(mob/user)
. = ..()
. += "Alt-click to put something small inside."
-/obj/item/reagent_containers/food/snacks/sliceable/AltClick(mob/user)
+/obj/item/food/snacks/sliceable/AltClick(mob/user)
var/obj/item/I = user.get_active_hand()
if(!I)
return
@@ -199,7 +199,7 @@
add_fingerprint(user)
I.forceMove(src)
-/obj/item/reagent_containers/food/snacks/sliceable/attackby(obj/item/I, mob/user, params)
+/obj/item/food/snacks/sliceable/attackby(obj/item/I, mob/user, params)
if((slices_num <= 0 || !slices_num) || !slice_path)
return FALSE
@@ -259,25 +259,14 @@
// bitesize of 2, then it'll take 3 bites to eat. Unlike the old system, the contained reagents are evenly spread among all
// the bites. No more contained reagents = no more bites.
-//Here is an example of the new formatting for anyone who wants to add more food items.
-///obj/item/reagent_containers/food/snacks/xenoburger //Identification path for the object.
-// name = "Xenoburger" //Name that displays in the UI.
-// desc = "Smells caustic. Tastes like heresy." //Duh
-// icon_state = "xburger" //Refers to an icon in food/food.dmi
-// New() //Don't mess with this.
-// ..() //Same here.
-// reagents.add_reagent("xenomicrobes", 10) //This is what is in the food item. you may copy/paste
-// reagents.add_reagent("nutriment", 2) // this line of code for all the contents.
-// bitesize = 3 //This is the amount each bite consumes.
-
-/obj/item/reagent_containers/food/snacks/badrecipe
+/obj/item/food/snacks/badrecipe
name = "burned mess"
desc = "Someone should be demoted from chef for this."
icon_state = "badrecipe"
filling_color = "#211F02"
list_reagents = list("????" = 30)
-/obj/item/reagent_containers/food/snacks/badrecipe/Initialize(mapload)
+/obj/item/food/snacks/badrecipe/Initialize(mapload)
. = ..()
// it's burned! it should start off being classed as any cooktype that burns
cooktype["grilled"] = TRUE
@@ -285,14 +274,14 @@
// MISC
-/obj/item/reagent_containers/food/snacks/cereal
+/obj/item/food/snacks/cereal
name = "box of cereal"
desc = "A box of cereal."
icon = 'icons/obj/food/food.dmi'
icon_state = "cereal_box"
list_reagents = list("nutriment" = 3)
-/obj/item/reagent_containers/food/snacks/deepfryholder
+/obj/item/food/snacks/deepfryholder
name = "Deep Fried Foods Holder Obj"
desc = "If you can see this description the code for the deep fryer fucked up."
icon = 'icons/obj/food/food.dmi'
diff --git a/code/modules/food_and_drinks/food_base.dm b/code/modules/food_and_drinks/food_base.dm
index 51bca61fe51..30f9e964635 100644
--- a/code/modules/food_and_drinks/food_base.dm
+++ b/code/modules/food_and_drinks/food_base.dm
@@ -1,19 +1,17 @@
////////////////////////////////////////////////////////////////////////////////
/// Food.
////////////////////////////////////////////////////////////////////////////////
-/obj/item/reagent_containers/food
- possible_transfer_amounts = null
- visible_transfer_rate = FALSE
- volume = 50
- /// Used by sandwiches
- var/filling_color = "#FFFFFF"
- /// Used by junk food to lower satiety
- var/junkiness = 0
+
+/obj/item/food
+ resistance_flags = FLAMMABLE
+ container_type = INJECTABLE
+ var/filling_color = "#FFFFFF" //Used by sandwiches.
+ var/junkiness = 0 //for junk food. used to lower human satiety.
var/bitesize = 2
var/consume_sound = 'sound/items/eatfood.ogg'
- /// Will ants infest it?
+ /// Will ants come near it?
var/antable = TRUE
- /// Location checked every 5 minutes. If its the same place, the food has a chance to spawn ants
+ /// location checked every 5 minutes. If its the same place, the food has a chance to spawn ants
var/ant_location
/// Things that suppress food from being infested by ants when on the same turf
var/static/list/ant_suppressors
@@ -22,10 +20,15 @@
/// Name of the food to show up in kitchen machines (microwaves, ovens, etc)
var/ingredient_name
var/ingredient_name_plural
- resistance_flags = FLAMMABLE
- container_type = INJECTABLE
+ /// Sets the default container amount for all food items.
+ var/volume = 50
+ /// The list of reagents to create on Initialize()
+ var/list/list_reagents = list()
-/obj/item/reagent_containers/food/Initialize(mapload)
+ var/temperature_min = 0 // To limit the temperature of a reagent container can attain when exposed to heat/cold
+ var/temperature_max = 10000
+
+/obj/item/food/Initialize(mapload)
. = ..()
if(!antable)
return
@@ -40,19 +43,27 @@
ant_location = get_turf(src)
last_ant_time = world.time
-/obj/item/reagent_containers/food/Destroy()
+ if(!reagents) // Some subtypes create their own reagents
+ create_reagents(volume, temperature_min, temperature_max)
+ add_initial_reagents()
+
+/obj/item/food/Destroy()
ant_location = null
if(isprocessing)
STOP_PROCESSING(SSobj, src)
return ..()
-/obj/item/reagent_containers/food/process()
+/obj/item/food/proc/add_initial_reagents() // This literally is only a proc for junk food
+ if(list_reagents)
+ reagents.add_reagent_list(list_reagents)
+
+/obj/item/food/process()
if(!antable)
return PROCESS_KILL
if(world.time > last_ant_time + 5 MINUTES)
check_for_ants()
-/obj/item/reagent_containers/food/proc/check_for_ants()
+/obj/item/food/proc/check_for_ants()
last_ant_time = world.time
// Are we unshielded from the fury of space ants?
@@ -77,3 +88,10 @@
antable = FALSE
desc += " It appears to be infested with ants. Yuck!"
reagents.add_reagent("ants", 1) // Don't eat things with ants in it you weirdo.
+
+/obj/item/food/ex_act()
+ if(reagents)
+ for(var/datum/reagent/R in reagents.reagent_list)
+ R.on_ex_act()
+ if(!QDELETED(src))
+ ..()
diff --git a/code/modules/food_and_drinks/kitchen_machinery/cereal_maker.dm b/code/modules/food_and_drinks/kitchen_machinery/cereal_maker.dm
index 59fe4b78bcd..a0d53480943 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/cereal_maker.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/cereal_maker.dm
@@ -19,6 +19,6 @@
setme.desc = "[name.desc] It has been [thiscooktype]"
/obj/machinery/cooker/cerealmaker/gettype()
- var/obj/item/reagent_containers/food/snacks/cereal/type = new(get_turf(src))
+ var/obj/item/food/snacks/cereal/type = new(get_turf(src))
return type
diff --git a/code/modules/food_and_drinks/kitchen_machinery/cooker.dm b/code/modules/food_and_drinks/kitchen_machinery/cooker.dm
index e6b9d5dadc0..6ea19108e8b 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/cooker.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/cooker.dm
@@ -34,13 +34,13 @@
return ..()
// checks if the snack has been cooked in a certain way
-/obj/machinery/cooker/proc/checkCooked(obj/item/reagent_containers/food/snacks/D)
+/obj/machinery/cooker/proc/checkCooked(obj/item/food/snacks/D)
if(D.cooktype[thiscooktype])
return 1
return 0
// Sets the new snack's cooktype list to the same as the old one - no more cooking something in the same machine more than once!
-/obj/machinery/cooker/proc/setCooked(obj/item/reagent_containers/food/snacks/oldtypes, obj/item/reagent_containers/food/snacks/newtypes)
+/obj/machinery/cooker/proc/setCooked(obj/item/food/snacks/oldtypes, obj/item/food/snacks/newtypes)
var/ct
for(ct in oldtypes.cooktype)
newtypes.cooktype[ct] = oldtypes.cooktype[ct]
@@ -115,7 +115,7 @@
return FALSE
if(has_specials && checkSpecials(check))
return TRUE
- if(istype(check, /obj/item/reagent_containers/food/snacks) || emagged)
+ if(istype(check, /obj/item/food/snacks) || emagged)
if(istype(check, /obj/item/disk/nuclear)) //(1984 voice) you will not deep fry the NAD
to_chat(user, "The disk is more useful raw than [thiscooktype].")
return FALSE
@@ -147,7 +147,7 @@
// if burns = FALSE then it'll just tell you that the item is already that foodtype and it would do nothing
// if you wanted a different side effect set burns to 1 and override burn_food()
/obj/machinery/cooker/proc/burn_food(mob/user, obj/item/reagent_containers/props)
- var/obj/item/reagent_containers/food/snacks/badrecipe/burnt = new(get_turf(src))
+ var/obj/item/food/snacks/badrecipe/burnt = new(get_turf(src))
setRegents(props, burnt)
soundloop.stop()
to_chat(user, "You smell burning coming from [src]!")
@@ -177,7 +177,7 @@
// Override this with the correct snack type
/obj/machinery/cooker/proc/gettype()
- var/obj/item/reagent_containers/food/snacks/type = new(get_turf(src))
+ var/obj/item/food/snacks/type = new(get_turf(src))
return type
/obj/machinery/cooker/attackby(obj/item/I, mob/user, params)
@@ -197,7 +197,7 @@
if(!checkValid(I, user))
return
if(!burns)
- if(istype(I, /obj/item/reagent_containers/food/snacks))
+ if(istype(I, /obj/item/food/snacks))
if(checkCooked(I))
to_chat(user, "That is already [thiscooktype], it would do nothing!")
return
@@ -226,17 +226,17 @@
cookSpecial(special) //Handle cooking the item as appropriate
turnoff(I) //Shut off the machine and qdel the original item
return
- if(istype(I, /obj/item/reagent_containers/food/snacks))
+ if(istype(I, /obj/item/food/snacks))
if(checkCooked(I))
burn_food(user, I)
turnoff(I)
return
- var/obj/item/reagent_containers/food/snacks/newfood = gettype()
+ var/obj/item/food/snacks/newfood = gettype()
setIcon(I, newfood)
changename(I, newfood)
if(istype(I, /obj/item/reagent_containers))
setRegents(I, newfood)
- if(istype(I, /obj/item/reagent_containers/food/snacks))
+ if(istype(I, /obj/item/food/snacks))
setCooked(I, newfood)
newfood.cooktype[thiscooktype] = TRUE
turnoff(I)
diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
index ea92ab36e5e..3e815a0d96a 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
@@ -40,11 +40,11 @@
cooktime = (200 - (E * 20)) //Effectively each laser improves cooktime by 20 per rating beyond the first (200 base, 80 max upgrade)
/obj/machinery/cooker/deepfryer/gettype()
- var/obj/item/reagent_containers/food/snacks/deepfryholder/type = new(get_turf(src))
+ var/obj/item/food/snacks/deepfryholder/type = new(get_turf(src))
return type
/obj/machinery/cooker/deepfryer/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/reagent_containers/glass) || istype(I, /obj/item/reagent_containers/food/drinks/ice))
+ if(istype(I, /obj/item/reagent_containers/glass) || istype(I, /obj/item/reagent_containers/drinks/ice))
var/ice_amount = I.reagents.get_reagent_amount("ice")
if(ice_amount)
I.reagents.remove_all(I.reagents.total_volume)
@@ -156,44 +156,44 @@
return istype(I, input)
/datum/deepfryer_special/shrimp
- input = /obj/item/reagent_containers/food/snacks/shrimp
- output = /obj/item/reagent_containers/food/snacks/fried_shrimp
+ input = /obj/item/food/snacks/shrimp
+ output = /obj/item/food/snacks/fried_shrimp
/datum/deepfryer_special/banana
- input = /obj/item/reagent_containers/food/snacks/grown/banana
- output = /obj/item/reagent_containers/food/snacks/friedbanana
+ input = /obj/item/food/snacks/grown/banana
+ output = /obj/item/food/snacks/friedbanana
/datum/deepfryer_special/fries
- input = /obj/item/reagent_containers/food/snacks/rawsticks
- output = /obj/item/reagent_containers/food/snacks/fries
+ input = /obj/item/food/snacks/rawsticks
+ output = /obj/item/food/snacks/fries
/datum/deepfryer_special/corn_chips
- input = /obj/item/reagent_containers/food/snacks/grown/corn
- output = /obj/item/reagent_containers/food/snacks/cornchips
+ input = /obj/item/food/snacks/grown/corn
+ output = /obj/item/food/snacks/cornchips
/datum/deepfryer_special/fried_tofu
- input = /obj/item/reagent_containers/food/snacks/tofu
- output = /obj/item/reagent_containers/food/snacks/fried_tofu
+ input = /obj/item/food/snacks/tofu
+ output = /obj/item/food/snacks/fried_tofu
/datum/deepfryer_special/chimichanga
- input = /obj/item/reagent_containers/food/snacks/burrito
- output = /obj/item/reagent_containers/food/snacks/chimichanga
+ input = /obj/item/food/snacks/burrito
+ output = /obj/item/food/snacks/chimichanga
/datum/deepfryer_special/potato_chips
- input = /obj/item/reagent_containers/food/snacks/grown/potato/wedges
- output = /obj/item/reagent_containers/food/snacks/chips
+ input = /obj/item/food/snacks/grown/potato/wedges
+ output = /obj/item/food/snacks/chips
/datum/deepfryer_special/carrotfries
- input = /obj/item/reagent_containers/food/snacks/grown/carrot/wedges
- output = /obj/item/reagent_containers/food/snacks/carrotfries
+ input = /obj/item/food/snacks/grown/carrot/wedges
+ output = /obj/item/food/snacks/carrotfries
/datum/deepfryer_special/onionrings
- input = /obj/item/reagent_containers/food/snacks/onion_slice
- output = /obj/item/reagent_containers/food/snacks/onionrings
+ input = /obj/item/food/snacks/onion_slice
+ output = /obj/item/food/snacks/onionrings
/datum/deepfryer_special/fried_vox
input = /obj/item/organ/external
- output = /obj/item/reagent_containers/food/snacks/fried_vox
+ output = /obj/item/food/snacks/fried_vox
/datum/deepfryer_special/fried_vox/validate(obj/item/I)
if(!..())
diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
index 515af3acb84..cc354f726b3 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
@@ -259,13 +259,13 @@
var/slab_name = occupant.name
var/slab_count = 3
- var/slab_type = /obj/item/reagent_containers/food/snacks/meat/human //gibber can only gib humans on paracode, no need to check meat type
+ var/slab_type = /obj/item/food/snacks/meat/human //gibber can only gib humans on paracode, no need to check meat type
var/slab_nutrition = occupant.nutrition / 15
slab_nutrition /= slab_count
for(var/i=1 to slab_count)
- var/obj/item/reagent_containers/food/snacks/meat/new_meat = new slab_type(src)
+ var/obj/item/food/snacks/meat/new_meat = new slab_type(src)
new_meat.name = "[slab_name] [new_meat.name]"
new_meat.reagents.add_reagent("nutriment", slab_nutrition)
diff --git a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm
index f28d4f13e50..437e0658e61 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm
@@ -40,7 +40,7 @@
to_chat(user, "You add [I] to [src]")
updateUsrDialog()
return
- if(istype(I, /obj/item/reagent_containers/food/snacks/frozen/icecream))
+ if(istype(I, /obj/item/food/snacks/frozen/icecream))
if(!I.reagents.has_reagent("sprinkles"))
if(I.reagents.total_volume > 29)
I.reagents.remove_any(1)
@@ -147,7 +147,7 @@
else if(href_list["createchoco"])
var/name = generate_name(reagents.get_master_reagent_name())
name += " Chocolate Cone"
- var/obj/item/reagent_containers/food/snacks/frozen/icecream/icecreamcup/C = new(loc)
+ var/obj/item/food/snacks/frozen/icecream/icecreamcup/C = new(loc)
C.name = "[name]"
C.pixel_x = rand(-8, 8)
C.pixel_y = -16
@@ -159,7 +159,7 @@
else if(href_list["createcone"])
var/name = generate_name(reagents.get_master_reagent_name())
name += " Cone"
- var/obj/item/reagent_containers/food/snacks/frozen/icecream/icecreamcone/C = new(loc)
+ var/obj/item/food/snacks/frozen/icecream/icecreamcone/C = new(loc)
C.name = "[name]"
C.pixel_x = rand(-8, 8)
C.pixel_y = -16
@@ -171,7 +171,7 @@
else if(href_list["createwaffle"])
var/name = generate_name(reagents.get_master_reagent_name())
name += " Waffle Cone"
- var/obj/item/reagent_containers/food/snacks/frozen/icecream/wafflecone/C = new(loc)
+ var/obj/item/food/snacks/frozen/icecream/wafflecone/C = new(loc)
C.name = "[name]"
C.pixel_x = rand(-8, 8)
C.pixel_y = -16
diff --git a/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm b/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm
index 389853410bf..8db5fa8e319 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm
@@ -65,7 +65,7 @@
GLOB.cooking_reagents[recipe_type] |= reagent
else
qdel(recipe)
- GLOB.cooking_ingredients[recipe_type] |= /obj/item/reagent_containers/food/snacks/grown
+ GLOB.cooking_ingredients[recipe_type] |= /obj/item/food/snacks/grown
/*******************
* Item Adding
@@ -108,7 +108,7 @@
add_item(S, user)
else
add_item(O, user)
- else if(is_type_in_list(O, list(/obj/item/reagent_containers/glass, /obj/item/reagent_containers/food/drinks, /obj/item/reagent_containers/food/condiment)))
+ else if(is_type_in_list(O, list(/obj/item/reagent_containers/glass, /obj/item/reagent_containers/drinks, /obj/item/reagent_containers/condiment)))
if(!O.reagents)
return TRUE
for(var/datum/reagent/R in O.reagents.reagent_list)
@@ -199,8 +199,8 @@
var/list/name_overrides = list()
for(var/obj/O in contents)
var/display_name = O.name
- if(istype(O, /obj/item/reagent_containers/food))
- var/obj/item/reagent_containers/food/food = O
+ if(isfood(O))
+ var/obj/item/food/food = O
if(!items_counts[display_name])
if(food.ingredient_name)
name_overrides[display_name] = food.ingredient_name
@@ -364,7 +364,7 @@
/obj/machinery/kitchen_machine/proc/has_extra_item()
for(var/obj/O in contents)
- if(!is_type_in_list(O, list(/obj/item/reagent_containers/food, /obj/item/grown, /obj/item/mixing_bowl)))
+ if(!is_type_in_list(O, list(/obj/item/food, /obj/item/grown, /obj/item/mixing_bowl)))
return TRUE
return FALSE
@@ -416,7 +416,7 @@
amount += reagents.total_volume
reagents.clear_reagents()
if(amount)
- var/obj/item/reagent_containers/food/snacks/badrecipe/mysteryfood = new(src)
+ var/obj/item/food/snacks/badrecipe/mysteryfood = new(src)
mysteryfood.reagents.add_reagent("carbon", amount / 2)
mysteryfood.reagents.add_reagent("????", amount / 15)
mysteryfood.forceMove(get_turf(src))
@@ -476,8 +476,8 @@
var/list/name_overrides = list()
for(var/obj/O in contents)
var/display_name = O.name
- if(istype(O, /obj/item/reagent_containers/food))
- var/obj/item/reagent_containers/food/food = O
+ if(istype(O, /obj/item/food))
+ var/obj/item/food/food = O
if(!items_counts[display_name])
if(food.ingredient_name)
name_overrides[display_name] = food.ingredient_name
diff --git a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm
index 8510e6bce62..512d3359c99 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm
@@ -14,7 +14,7 @@ GLOBAL_LIST_EMPTY(monkey_recyclers)
var/required_grind = 5
var/cube_production = 1
var/cycle_through = 0
- var/obj/item/reagent_containers/food/snacks/monkeycube/cube_type = /obj/item/reagent_containers/food/snacks/monkeycube
+ var/obj/item/food/snacks/monkeycube/cube_type = /obj/item/food/snacks/monkeycube
var/list/connected = list()
/obj/machinery/monkey_recycler/Initialize(mapload)
@@ -73,15 +73,15 @@ GLOBAL_LIST_EMPTY(monkey_recyclers)
cycle_through++
switch(cycle_through)
if(1)
- cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/farwacube
+ cube_type = /obj/item/food/snacks/monkeycube/farwacube
if(2)
- cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/wolpincube
+ cube_type = /obj/item/food/snacks/monkeycube/wolpincube
if(3)
- cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/stokcube
+ cube_type = /obj/item/food/snacks/monkeycube/stokcube
if(4)
- cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/neaeracube
+ cube_type = /obj/item/food/snacks/monkeycube/neaeracube
if(5)
- cube_type = /obj/item/reagent_containers/food/snacks/monkeycube
+ cube_type = /obj/item/food/snacks/monkeycube
cycle_through = 0
to_chat(user, "You change the monkeycube type to [initial(cube_type.name)].")
else
diff --git a/code/modules/food_and_drinks/kitchen_machinery/oven.dm b/code/modules/food_and_drinks/kitchen_machinery/oven.dm
index 0b571d393c3..40fad0fd59f 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/oven.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/oven.dm
@@ -22,7 +22,7 @@
return
else
var/obj/item/F = I
- var/obj/item/reagent_containers/food/snacks/customizable/C
+ var/obj/item/food/snacks/customizable/C
C = input("Select food to make.", "Cooking", C) in food_choices
if(!C)
return
@@ -59,8 +59,8 @@
/obj/machinery/cooking/oven/updatefood()
for(var/U in food_choices)
food_choices.Remove(U)
- for(var/U in subtypesof(/obj/item/reagent_containers/food/snacks/customizable/cook))
- var/obj/item/reagent_containers/food/snacks/customizable/cook/V = new U
+ for(var/U in subtypesof(/obj/item/food/snacks/customizable/cook))
+ var/obj/item/food/snacks/customizable/cook/V = new U
food_choices += V
return
@@ -74,7 +74,7 @@
/obj/machinery/cooking/candy/updatefood()
for(var/U in food_choices)
food_choices.Remove(U)
- for(var/U in subtypesof(/obj/item/reagent_containers/food/snacks/customizable/candy))
- var/obj/item/reagent_containers/food/snacks/customizable/candy/V = new U
+ for(var/U in subtypesof(/obj/item/food/snacks/customizable/candy))
+ var/obj/item/food/snacks/customizable/candy/V = new U
food_choices += V
return
diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm
index 6c6224bf572..6d7ef45eb2c 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm
@@ -88,36 +88,36 @@
/////OBJECT RECIPIES/////
/////////////////////////
/datum/food_processor_process/meat
- input = /obj/item/reagent_containers/food/snacks/meat
- output = /obj/item/reagent_containers/food/snacks/meatball
+ input = /obj/item/food/snacks/meat
+ output = /obj/item/food/snacks/meatball
/datum/food_processor_process/potato
- input = /obj/item/reagent_containers/food/snacks/grown/potato
- output = /obj/item/reagent_containers/food/snacks/rawsticks
+ input = /obj/item/food/snacks/grown/potato
+ output = /obj/item/food/snacks/rawsticks
/datum/food_processor_process/rawsticks
- input = /obj/item/reagent_containers/food/snacks/rawsticks
- output = /obj/item/reagent_containers/food/snacks/tatortot
+ input = /obj/item/food/snacks/rawsticks
+ output = /obj/item/food/snacks/tatortot
/datum/food_processor_process/soybeans
- input = /obj/item/reagent_containers/food/snacks/grown/soybeans
- output = /obj/item/reagent_containers/food/snacks/soydope
+ input = /obj/item/food/snacks/grown/soybeans
+ output = /obj/item/food/snacks/soydope
/datum/food_processor_process/spaghetti
- input = /obj/item/reagent_containers/food/snacks/doughslice
- output = /obj/item/reagent_containers/food/snacks/spaghetti
+ input = /obj/item/food/snacks/doughslice
+ output = /obj/item/food/snacks/spaghetti
/datum/food_processor_process/macaroni
- input = /obj/item/reagent_containers/food/snacks/spaghetti
- output = /obj/item/reagent_containers/food/snacks/macaroni
+ input = /obj/item/food/snacks/spaghetti
+ output = /obj/item/food/snacks/macaroni
/datum/food_processor_process/parsnip
- input = /obj/item/reagent_containers/food/snacks/grown/parsnip
- output = /obj/item/reagent_containers/food/snacks/roastparsnip
+ input = /obj/item/food/snacks/grown/parsnip
+ output = /obj/item/food/snacks/roastparsnip
/datum/food_processor_process/carrot
- input = /obj/item/reagent_containers/food/snacks/grown/carrot
- output = /obj/item/reagent_containers/food/snacks/grown/carrot/wedges
+ input = /obj/item/food/snacks/grown/carrot
+ output = /obj/item/food/snacks/grown/carrot/wedges
/datum/food_processor_process/towercap
input = /obj/item/grown/log
diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
index 2a6aa9fb36d..cfe1baa8d2a 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
@@ -82,7 +82,7 @@
update_icon(UPDATE_OVERLAYS)
// Accepted items
accepted_items_typecache = typecacheof(list(
- /obj/item/reagent_containers/food/snacks/grown,
+ /obj/item/food/snacks/grown,
/obj/item/seeds,
/obj/item/grown,
))
@@ -421,18 +421,18 @@
. = ..()
accepted_items_typecache = typecacheof(list(
/obj/item/kitchen,
- /obj/item/reagent_containers/food))
+ /obj/item/food))
// Syndicate Druglab Ruin
/obj/machinery/smartfridge/food/syndicate_druglab
starting_items = list(
- /obj/item/reagent_containers/food/snacks/boiledrice = 2,
- /obj/item/reagent_containers/food/snacks/macncheese = 1,
- /obj/item/reagent_containers/food/snacks/syndicake = 3,
- /obj/item/reagent_containers/food/snacks/beans = 4,
+ /obj/item/food/snacks/boiledrice = 2,
+ /obj/item/food/snacks/macncheese = 1,
+ /obj/item/food/snacks/syndicake = 3,
+ /obj/item/food/snacks/beans = 4,
/obj/item/reagent_containers/glass/beaker/waterbottle/large = 7,
- /obj/item/reagent_containers/food/drinks/bottle/kahlua = 1,
- /obj/item/reagent_containers/food/drinks/bottle/orangejuice = 2)
+ /obj/item/reagent_containers/drinks/bottle/kahlua = 1,
+ /obj/item/reagent_containers/drinks/bottle/orangejuice = 2)
/**
* # Seed Storage
@@ -474,9 +474,9 @@
/obj/machinery/smartfridge/foodcart/Initialize(mapload)
. = ..()
accepted_items_typecache = typecacheof(list(
- /obj/item/reagent_containers/food/snacks,
- /obj/item/reagent_containers/food/drinks,
- /obj/item/reagent_containers/food/condiment,
+ /obj/item/food/snacks,
+ /obj/item/reagent_containers/drinks,
+ /obj/item/reagent_containers/condiment,
))
/obj/machinery/smartfridge/foodcart/screwdriver_act(mob/living/user, obj/item/I)
@@ -805,8 +805,8 @@
. = ..()
accepted_items_typecache = typecacheof(list(
/obj/item/reagent_containers/glass,
- /obj/item/reagent_containers/food/drinks,
- /obj/item/reagent_containers/food/condiment,
+ /obj/item/reagent_containers/drinks,
+ /obj/item/reagent_containers/condiment,
))
/**
@@ -835,7 +835,7 @@
component_parts = null
// Accepted items
accepted_items_typecache = typecacheof(list(
- /obj/item/reagent_containers/food/snacks,
+ /obj/item/food/snacks,
/obj/item/stack/sheet/wetleather,
))
@@ -884,8 +884,8 @@
/obj/machinery/smartfridge/drying_rack/accept_check(obj/item/O)
. = ..()
// If it's a food, reject non driable ones
- if(istype(O, /obj/item/reagent_containers/food/snacks))
- var/obj/item/reagent_containers/food/snacks/S = O
+ if(istype(O, /obj/item/food/snacks))
+ var/obj/item/food/snacks/S = O
if(!S.dried_type)
return FALSE
@@ -906,7 +906,7 @@
* Called in [/obj/machinery/smartfridge/drying_rack/process] to dry the contents.
*/
/obj/machinery/smartfridge/drying_rack/proc/rack_dry()
- for(var/obj/item/reagent_containers/food/snacks/S in contents)
+ for(var/obj/item/food/snacks/S in contents)
if(S.dried_type == S.type)//if the dried type is the same as the object's type, don't bother creating a whole new item...
S.color = "#ad7257"
S.dry = TRUE
diff --git a/code/modules/food_and_drinks/recipes/recipes_candy.dm b/code/modules/food_and_drinks/recipes/recipes_candy.dm
index 2339acd3ffa..e47449af193 100644
--- a/code/modules/food_and_drinks/recipes/recipes_candy.dm
+++ b/code/modules/food_and_drinks/recipes/recipes_candy.dm
@@ -3,7 +3,7 @@
* /datum/recipe/candy/
* reagents = list()
* items = list()
-* result = /obj/item/reagent_containers/food/snacks/
+* result = /obj/item/food/snacks/
* byproduct = /obj/item/ // only set this if the recipe has a byproduct, like returning it's mould
*
* NOTE: If using a mould, make sure to list it in *BOTH* the items and byproduct lists if it is to be returned.
@@ -18,74 +18,74 @@
/datum/recipe/candy/chocolate_bar
reagents = list("soymilk" = 2, "cocoa" = 2, "sugar" = 2)
items = list()
- result = /obj/item/reagent_containers/food/snacks/chocolatebar
+ result = /obj/item/food/snacks/chocolatebar
/datum/recipe/candy/chocolate_bar2
reagents = list("milk" = 2, "cocoa" = 2, "sugar" = 2)
items = list()
- result = /obj/item/reagent_containers/food/snacks/chocolatebar
+ result = /obj/item/food/snacks/chocolatebar
/datum/recipe/candy/fudge_peanut
reagents = list("sugar" = 5, "milk" = 5)
- items = list(/obj/item/reagent_containers/food/snacks/chocolatebar, /obj/item/reagent_containers/food/snacks/grown/peanuts,
- /obj/item/reagent_containers/food/snacks/grown/peanuts, /obj/item/reagent_containers/food/snacks/grown/peanuts)
- result = /obj/item/reagent_containers/food/snacks/candy/fudge/peanut
+ items = list(/obj/item/food/snacks/chocolatebar, /obj/item/food/snacks/grown/peanuts,
+ /obj/item/food/snacks/grown/peanuts, /obj/item/food/snacks/grown/peanuts)
+ result = /obj/item/food/snacks/candy/fudge/peanut
/datum/recipe/candy/fudge_cherry
reagents = list("sugar" = 5, "milk" = 5)
- items = list(/obj/item/reagent_containers/food/snacks/chocolatebar, /obj/item/reagent_containers/food/snacks/grown/cherries,
- /obj/item/reagent_containers/food/snacks/grown/cherries, /obj/item/reagent_containers/food/snacks/grown/cherries)
- result = /obj/item/reagent_containers/food/snacks/candy/fudge/cherry
+ items = list(/obj/item/food/snacks/chocolatebar, /obj/item/food/snacks/grown/cherries,
+ /obj/item/food/snacks/grown/cherries, /obj/item/food/snacks/grown/cherries)
+ result = /obj/item/food/snacks/candy/fudge/cherry
/datum/recipe/candy/fudge_cookies_n_cream
reagents = list("sugar" = 5, "milk" = 5, "cream" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/chocolatebar,
- /obj/item/reagent_containers/food/snacks/cookie,
+ /obj/item/food/snacks/chocolatebar,
+ /obj/item/food/snacks/cookie,
)
- result = /obj/item/reagent_containers/food/snacks/candy/fudge/cookies_n_cream
+ result = /obj/item/food/snacks/candy/fudge/cookies_n_cream
/datum/recipe/candy/fudge_turtle
reagents = list("sugar" = 5, "milk" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/chocolatebar,
- /obj/item/reagent_containers/food/snacks/candy/caramel,
- /obj/item/reagent_containers/food/snacks/grown/peanuts
+ /obj/item/food/snacks/chocolatebar,
+ /obj/item/food/snacks/candy/caramel,
+ /obj/item/food/snacks/grown/peanuts
)
- result = /obj/item/reagent_containers/food/snacks/candy/fudge/turtle
+ result = /obj/item/food/snacks/candy/fudge/turtle
/datum/recipe/candy/fudge
reagents = list("sugar" = 5, "milk" = 5)
- items = list(/obj/item/reagent_containers/food/snacks/chocolatebar)
- result = /obj/item/reagent_containers/food/snacks/candy/fudge
+ items = list(/obj/item/food/snacks/chocolatebar)
+ result = /obj/item/food/snacks/candy/fudge
/datum/recipe/candy/caramel
reagents = list("sugar" = 5, "cream" = 5)
items = list()
- result = /obj/item/reagent_containers/food/snacks/candy/caramel
+ result = /obj/item/food/snacks/candy/caramel
/datum/recipe/candy/toffee
reagents = list("sugar" = 5, "flour" = 10)
- result = /obj/item/reagent_containers/food/snacks/candy/toffee
+ result = /obj/item/food/snacks/candy/toffee
/datum/recipe/candy/taffy
reagents = list("salglu_solution" = 15)
items = list()
- result = /obj/item/reagent_containers/food/snacks/candy/taffy
+ result = /obj/item/food/snacks/candy/taffy
/datum/recipe/candy/nougat
reagents = list("sugar" = 5, "cornoil" = 5)
- items = list(/obj/item/reagent_containers/food/snacks/egg)
- result = /obj/item/reagent_containers/food/snacks/candy/nougat
+ items = list(/obj/item/food/snacks/egg)
+ result = /obj/item/food/snacks/candy/nougat
/datum/recipe/candy/nougat/make_food(obj/container)
- var/obj/item/reagent_containers/food/snacks/candy/nougat/being_cooked = ..()
+ var/obj/item/food/snacks/candy/nougat/being_cooked = ..()
being_cooked.reagents.del_reagent("egg")
return being_cooked
/datum/recipe/candy/wafflecone
reagents = list("milk" = 1, "sugar" = 1)
- result = /obj/item/reagent_containers/food/snacks/wafflecone
+ result = /obj/item/food/snacks/wafflecone
// ***********************************************************
// Base Candy Recipes (unflavored / plain)
@@ -96,14 +96,14 @@
items = list(
/obj/item/c_tube,
)
- result = /obj/item/reagent_containers/food/snacks/candy/cotton
+ result = /obj/item/food/snacks/candy/cotton
/datum/recipe/candy/gummybear
reagents = list("sugar" = 5, "water" = 5, "cornoil" = 5)
items = list(
/obj/item/kitchen/mould/bear,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummybear
+ result = /obj/item/food/snacks/candy/gummybear
byproduct = /obj/item/kitchen/mould/bear
/datum/recipe/candy/gummyworm
@@ -111,7 +111,7 @@
items = list(
/obj/item/kitchen/mould/worm,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummyworm
+ result = /obj/item/food/snacks/candy/gummyworm
byproduct = /obj/item/kitchen/mould/worm
/datum/recipe/candy/jellybean
@@ -119,7 +119,7 @@
items = list(
/obj/item/kitchen/mould/bean,
)
- result = /obj/item/reagent_containers/food/snacks/candy/jellybean
+ result = /obj/item/food/snacks/candy/jellybean
byproduct = /obj/item/kitchen/mould/bean
/datum/recipe/candy/jawbreaker
@@ -127,44 +127,44 @@
items = list(
/obj/item/kitchen/mould/ball,
)
- result = /obj/item/reagent_containers/food/snacks/candy/jawbreaker
+ result = /obj/item/food/snacks/candy/jawbreaker
byproduct = /obj/item/kitchen/mould/ball
/datum/recipe/candy/candycane
reagents = list("sugar" = 5)
items = list(
/obj/item/kitchen/mould/cane,
- /obj/item/reagent_containers/food/snacks/mint,
+ /obj/item/food/snacks/mint,
)
- result = /obj/item/reagent_containers/food/snacks/candy/candycane
+ result = /obj/item/food/snacks/candy/candycane
byproduct = /obj/item/kitchen/mould/cane
/datum/recipe/candy/gum
reagents = list("sugar" = 5, "water" = 5, "cornoil" = 5)
items = list()
- result = /obj/item/reagent_containers/food/snacks/candy/gum
+ result = /obj/item/food/snacks/candy/gum
/datum/recipe/candy/candybar
reagents = list("sugar" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/chocolatebar,
+ /obj/item/food/snacks/chocolatebar,
)
- result = /obj/item/reagent_containers/food/snacks/candy/candybar
+ result = /obj/item/food/snacks/candy/candybar
/datum/recipe/candy/cash
items = list(
/obj/item/kitchen/mould/cash,
- /obj/item/reagent_containers/food/snacks/chocolatebar,
+ /obj/item/food/snacks/chocolatebar,
)
- result = /obj/item/reagent_containers/food/snacks/candy/cash
+ result = /obj/item/food/snacks/candy/cash
byproduct = /obj/item/kitchen/mould/cash
/datum/recipe/candy/coin
items = list(
/obj/item/kitchen/mould/coin,
- /obj/item/reagent_containers/food/snacks/chocolatebar,
+ /obj/item/food/snacks/chocolatebar,
)
- result = /obj/item/reagent_containers/food/snacks/candy/coin
+ result = /obj/item/food/snacks/candy/coin
byproduct = /obj/item/kitchen/mould/coin
/datum/recipe/candy/sucker
@@ -172,7 +172,7 @@
items = list(
/obj/item/kitchen/mould/loli,
)
- result = /obj/item/reagent_containers/food/snacks/candy/sucker
+ result = /obj/item/food/snacks/candy/sucker
byproduct = /obj/item/kitchen/mould/loli
// ***********************************************************
@@ -182,84 +182,84 @@
/datum/recipe/candy/cottoncandy_red
reagents = list("cherryjelly" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/cotton,
+ /obj/item/food/snacks/candy/cotton,
)
- result = /obj/item/reagent_containers/food/snacks/candy/cotton/red
+ result = /obj/item/food/snacks/candy/cotton/red
/datum/recipe/candy/cottoncandy_blue
reagents = list("berryjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/cotton,
+ /obj/item/food/snacks/candy/cotton,
)
- result = /obj/item/reagent_containers/food/snacks/candy/cotton/blue
+ result = /obj/item/food/snacks/candy/cotton/blue
/datum/recipe/candy/cottoncandy_poison
reagents = list("poisonberryjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/cotton,
+ /obj/item/food/snacks/candy/cotton,
)
- result = /obj/item/reagent_containers/food/snacks/candy/cotton/poison
+ result = /obj/item/food/snacks/candy/cotton/poison
/datum/recipe/candy/cottoncandy_green
reagents = list("limejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/cotton,
+ /obj/item/food/snacks/candy/cotton,
)
- result = /obj/item/reagent_containers/food/snacks/candy/cotton/green
+ result = /obj/item/food/snacks/candy/cotton/green
/datum/recipe/candy/cottoncandy_yellow
reagents = list("lemonjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/cotton,
+ /obj/item/food/snacks/candy/cotton,
)
- result = /obj/item/reagent_containers/food/snacks/candy/cotton/yellow
+ result = /obj/item/food/snacks/candy/cotton/yellow
/datum/recipe/candy/cottoncandy_orange
reagents = list("orangejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/cotton,
+ /obj/item/food/snacks/candy/cotton,
)
- result = /obj/item/reagent_containers/food/snacks/candy/cotton/orange
+ result = /obj/item/food/snacks/candy/cotton/orange
/datum/recipe/candy/cottoncandy_purple
reagents = list("grapejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/cotton,
+ /obj/item/food/snacks/candy/cotton,
)
- result = /obj/item/reagent_containers/food/snacks/candy/cotton/purple
+ result = /obj/item/food/snacks/candy/cotton/purple
/datum/recipe/candy/cottoncandy_pink
reagents = list("watermelonjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/cotton,
+ /obj/item/food/snacks/candy/cotton,
)
- result = /obj/item/reagent_containers/food/snacks/candy/cotton/pink
+ result = /obj/item/food/snacks/candy/cotton/pink
/datum/recipe/candy/cottoncandy_rainbow
reagents = list()
items = list(
- /obj/item/reagent_containers/food/snacks/candy/cotton/red,
- /obj/item/reagent_containers/food/snacks/candy/cotton/blue,
- /obj/item/reagent_containers/food/snacks/candy/cotton/green,
- /obj/item/reagent_containers/food/snacks/candy/cotton/yellow,
- /obj/item/reagent_containers/food/snacks/candy/cotton/orange,
- /obj/item/reagent_containers/food/snacks/candy/cotton/purple,
- /obj/item/reagent_containers/food/snacks/candy/cotton/pink,
+ /obj/item/food/snacks/candy/cotton/red,
+ /obj/item/food/snacks/candy/cotton/blue,
+ /obj/item/food/snacks/candy/cotton/green,
+ /obj/item/food/snacks/candy/cotton/yellow,
+ /obj/item/food/snacks/candy/cotton/orange,
+ /obj/item/food/snacks/candy/cotton/purple,
+ /obj/item/food/snacks/candy/cotton/pink,
)
- result = /obj/item/reagent_containers/food/snacks/candy/cotton/rainbow
+ result = /obj/item/food/snacks/candy/cotton/rainbow
/datum/recipe/candy/cottoncandy_rainbow2
reagents = list()
items = list(
- /obj/item/reagent_containers/food/snacks/candy/cotton/red,
- /obj/item/reagent_containers/food/snacks/candy/cotton/poison,
- /obj/item/reagent_containers/food/snacks/candy/cotton/green,
- /obj/item/reagent_containers/food/snacks/candy/cotton/yellow,
- /obj/item/reagent_containers/food/snacks/candy/cotton/orange,
- /obj/item/reagent_containers/food/snacks/candy/cotton/purple,
- /obj/item/reagent_containers/food/snacks/candy/cotton/pink,
+ /obj/item/food/snacks/candy/cotton/red,
+ /obj/item/food/snacks/candy/cotton/poison,
+ /obj/item/food/snacks/candy/cotton/green,
+ /obj/item/food/snacks/candy/cotton/yellow,
+ /obj/item/food/snacks/candy/cotton/orange,
+ /obj/item/food/snacks/candy/cotton/purple,
+ /obj/item/food/snacks/candy/cotton/pink,
)
- result = /obj/item/reagent_containers/food/snacks/candy/cotton/bad_rainbow
+ result = /obj/item/food/snacks/candy/cotton/bad_rainbow
// ***********************************************************
// Gummy Bear Recipes (flavored)
@@ -268,63 +268,63 @@
/datum/recipe/candy/gummybear_red
reagents = list("cherryjelly" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/gummybear,
+ /obj/item/food/snacks/candy/gummybear,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummybear/red
+ result = /obj/item/food/snacks/candy/gummybear/red
/datum/recipe/candy/gummybear_blue
reagents = list("berryjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/gummybear,
+ /obj/item/food/snacks/candy/gummybear,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummybear/blue
+ result = /obj/item/food/snacks/candy/gummybear/blue
/datum/recipe/candy/gummybear_poison
reagents = list("poisonberryjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/gummybear,
+ /obj/item/food/snacks/candy/gummybear,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummybear/poison
+ result = /obj/item/food/snacks/candy/gummybear/poison
/datum/recipe/candy/gummybear_green
reagents = list("limejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/gummybear,
+ /obj/item/food/snacks/candy/gummybear,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummybear/green
+ result = /obj/item/food/snacks/candy/gummybear/green
/datum/recipe/candy/gummybear_yellow
reagents = list("lemonjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/gummybear,
+ /obj/item/food/snacks/candy/gummybear,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummybear/yellow
+ result = /obj/item/food/snacks/candy/gummybear/yellow
/datum/recipe/candy/gummybear_orange
reagents = list("orangejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/gummybear,
+ /obj/item/food/snacks/candy/gummybear,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummybear/orange
+ result = /obj/item/food/snacks/candy/gummybear/orange
/datum/recipe/candy/gummybear_purple
reagents = list("grapejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/gummybear,
+ /obj/item/food/snacks/candy/gummybear,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummybear/purple
+ result = /obj/item/food/snacks/candy/gummybear/purple
/datum/recipe/candy/gummybear_wtf
reagents = list("space_drugs" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/gummybear,
+ /obj/item/food/snacks/candy/gummybear,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummybear/wtf
+ result = /obj/item/food/snacks/candy/gummybear/wtf
/datum/recipe/candy/gummybear_wtf2
reagents = list()
- items = list(/obj/item/reagent_containers/food/snacks/candy/gummybear, /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris)
- result = /obj/item/reagent_containers/food/snacks/candy/gummybear/wtf
+ items = list(/obj/item/food/snacks/candy/gummybear, /obj/item/food/snacks/grown/ambrosia/vulgaris)
+ result = /obj/item/food/snacks/candy/gummybear/wtf
// ***********************************************************
// Gummy Worm Recipes (flavored)
@@ -333,62 +333,62 @@
/datum/recipe/candy/gummyworm_red
reagents = list("cherryjelly" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/gummyworm,
+ /obj/item/food/snacks/candy/gummyworm,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummyworm/red
+ result = /obj/item/food/snacks/candy/gummyworm/red
/datum/recipe/candy/gummyworm_blue
reagents = list("berryjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/gummyworm,
+ /obj/item/food/snacks/candy/gummyworm,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummyworm/blue
+ result = /obj/item/food/snacks/candy/gummyworm/blue
/datum/recipe/candy/gummyworm_poison
reagents = list("poisonberryjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/gummyworm,
+ /obj/item/food/snacks/candy/gummyworm,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummyworm/poison
+ result = /obj/item/food/snacks/candy/gummyworm/poison
/datum/recipe/candy/gummyworm_green
reagents = list("limejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/gummyworm,
+ /obj/item/food/snacks/candy/gummyworm,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummyworm/green
+ result = /obj/item/food/snacks/candy/gummyworm/green
/datum/recipe/candy/gummyworm_yellow
reagents = list("lemonjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/gummyworm,
+ /obj/item/food/snacks/candy/gummyworm,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummyworm/yellow
+ result = /obj/item/food/snacks/candy/gummyworm/yellow
/datum/recipe/candy/gummyworm_orange
reagents = list("orangejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/gummyworm,
+ /obj/item/food/snacks/candy/gummyworm,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummyworm/orange
+ result = /obj/item/food/snacks/candy/gummyworm/orange
/datum/recipe/candy/gummyworm_purple
reagents = list("grapejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/gummyworm,
+ /obj/item/food/snacks/candy/gummyworm,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummyworm/purple
+ result = /obj/item/food/snacks/candy/gummyworm/purple
/datum/recipe/candy/gummyworm_wtf
reagents = list("space_drugs" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/gummyworm,
+ /obj/item/food/snacks/candy/gummyworm,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummyworm/wtf
+ result = /obj/item/food/snacks/candy/gummyworm/wtf
/datum/recipe/candy/gummyworm_wtf2
- items = list(/obj/item/reagent_containers/food/snacks/candy/gummyworm, /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris)
- result = /obj/item/reagent_containers/food/snacks/candy/gummyworm/wtf
+ items = list(/obj/item/food/snacks/candy/gummyworm, /obj/item/food/snacks/grown/ambrosia/vulgaris)
+ result = /obj/item/food/snacks/candy/gummyworm/wtf
// ***********************************************************
// Jelly Bean Recipes (flavored)
@@ -397,99 +397,99 @@
/datum/recipe/candy/jellybean_red
reagents = list("cherryjelly" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/jellybean,
+ /obj/item/food/snacks/candy/jellybean,
)
- result = /obj/item/reagent_containers/food/snacks/candy/jellybean/red
+ result = /obj/item/food/snacks/candy/jellybean/red
/datum/recipe/candy/jellybean_blue
reagents = list("berryjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/jellybean,
+ /obj/item/food/snacks/candy/jellybean,
)
- result = /obj/item/reagent_containers/food/snacks/candy/jellybean/blue
+ result = /obj/item/food/snacks/candy/jellybean/blue
/datum/recipe/candy/jellybean_poison
reagents = list("poisonberryjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/jellybean,
+ /obj/item/food/snacks/candy/jellybean,
)
- result = /obj/item/reagent_containers/food/snacks/candy/jellybean/poison
+ result = /obj/item/food/snacks/candy/jellybean/poison
/datum/recipe/candy/jellybean_green
reagents = list("limejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/jellybean,
+ /obj/item/food/snacks/candy/jellybean,
)
- result = /obj/item/reagent_containers/food/snacks/candy/jellybean/green
+ result = /obj/item/food/snacks/candy/jellybean/green
/datum/recipe/candy/jellybean_yellow
reagents = list("lemonjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/jellybean,
+ /obj/item/food/snacks/candy/jellybean,
)
- result = /obj/item/reagent_containers/food/snacks/candy/jellybean/yellow
+ result = /obj/item/food/snacks/candy/jellybean/yellow
/datum/recipe/candy/jellybean_orange
reagents = list("orangejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/jellybean,
+ /obj/item/food/snacks/candy/jellybean,
)
- result = /obj/item/reagent_containers/food/snacks/candy/jellybean/orange
+ result = /obj/item/food/snacks/candy/jellybean/orange
/datum/recipe/candy/jellybean_purple
reagents = list("grapejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/jellybean,
+ /obj/item/food/snacks/candy/jellybean,
)
- result = /obj/item/reagent_containers/food/snacks/candy/jellybean/purple
+ result = /obj/item/food/snacks/candy/jellybean/purple
/datum/recipe/candy/jellybean_chocolate
reagents = list()
items = list(
- /obj/item/reagent_containers/food/snacks/candy/jellybean,
- /obj/item/reagent_containers/food/snacks/chocolatebar,
+ /obj/item/food/snacks/candy/jellybean,
+ /obj/item/food/snacks/chocolatebar,
)
- result = /obj/item/reagent_containers/food/snacks/candy/jellybean/chocolate
+ result = /obj/item/food/snacks/candy/jellybean/chocolate
/datum/recipe/candy/jellybean_cola
reagents = list("cola" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/jellybean,
+ /obj/item/food/snacks/candy/jellybean,
)
- result = /obj/item/reagent_containers/food/snacks/candy/jellybean/cola
+ result = /obj/item/food/snacks/candy/jellybean/cola
/datum/recipe/candy/jellybean_popcorn
reagents = list()
items = list(
- /obj/item/reagent_containers/food/snacks/popcorn,
- /obj/item/reagent_containers/food/snacks/candy/jellybean,
+ /obj/item/food/snacks/popcorn,
+ /obj/item/food/snacks/candy/jellybean,
)
- result = /obj/item/reagent_containers/food/snacks/candy/jellybean/popcorn
+ result = /obj/item/food/snacks/candy/jellybean/popcorn
/datum/recipe/candy/jellybean_coffee
reagents = list("coffee" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/jellybean,
+ /obj/item/food/snacks/candy/jellybean,
)
- result = /obj/item/reagent_containers/food/snacks/candy/jellybean/cola
+ result = /obj/item/food/snacks/candy/jellybean/cola
/datum/recipe/candy/jellybean_drgibb
reagents = list("dr_gibb" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/jellybean,
+ /obj/item/food/snacks/candy/jellybean,
)
- result = /obj/item/reagent_containers/food/snacks/candy/jellybean/cola
+ result = /obj/item/food/snacks/candy/jellybean/cola
/datum/recipe/candy/jellybean_wtf
reagents = list("space_drugs" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/jellybean,
+ /obj/item/food/snacks/candy/jellybean,
)
- result = /obj/item/reagent_containers/food/snacks/candy/jellybean/wtf
+ result = /obj/item/food/snacks/candy/jellybean/wtf
/datum/recipe/candy/jellybean_wtf2
- items = list(/obj/item/reagent_containers/food/snacks/candy/jellybean, /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris)
- result = /obj/item/reagent_containers/food/snacks/candy/jellybean/wtf
+ items = list(/obj/item/food/snacks/candy/jellybean, /obj/item/food/snacks/grown/ambrosia/vulgaris)
+ result = /obj/item/food/snacks/candy/jellybean/wtf
// ***********************************************************
// Candybar Recipes (flavored)
@@ -498,39 +498,39 @@
/datum/recipe/candy/malper
reagents = list()
items = list(
- /obj/item/reagent_containers/food/snacks/candy/candybar,
- /obj/item/reagent_containers/food/snacks/candy/caramel,
+ /obj/item/food/snacks/candy/candybar,
+ /obj/item/food/snacks/candy/caramel,
)
- result = /obj/item/reagent_containers/food/snacks/candy/confectionery/caramel
+ result = /obj/item/food/snacks/candy/confectionery/caramel
/datum/recipe/candy/toolerone
reagents = list()
items = list(
- /obj/item/reagent_containers/food/snacks/candy/candybar,
- /obj/item/reagent_containers/food/snacks/candy/nougat,
+ /obj/item/food/snacks/candy/candybar,
+ /obj/item/food/snacks/candy/nougat,
)
- result = /obj/item/reagent_containers/food/snacks/candy/confectionery/nougat
+ result = /obj/item/food/snacks/candy/confectionery/nougat
/datum/recipe/candy/yumbaton
reagents = list()
items = list(
- /obj/item/reagent_containers/food/snacks/candy/candybar,
- /obj/item/reagent_containers/food/snacks/candy/toffee,
+ /obj/item/food/snacks/candy/candybar,
+ /obj/item/food/snacks/candy/toffee,
)
- result = /obj/item/reagent_containers/food/snacks/candy/confectionery/toffee
+ result = /obj/item/food/snacks/candy/confectionery/toffee
/datum/recipe/candy/crunch
reagents = list("rice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/candybar,
+ /obj/item/food/snacks/candy/candybar,
)
- result = /obj/item/reagent_containers/food/snacks/candy/confectionery/rice
+ result = /obj/item/food/snacks/candy/confectionery/rice
/datum/recipe/candy/toxinstest
reagents = list()
items = list(
- /obj/item/reagent_containers/food/snacks/candy/candybar,
- /obj/item/reagent_containers/food/snacks/candy/caramel,
- /obj/item/reagent_containers/food/snacks/candy/nougat,
+ /obj/item/food/snacks/candy/candybar,
+ /obj/item/food/snacks/candy/caramel,
+ /obj/item/food/snacks/candy/nougat,
)
- result = /obj/item/reagent_containers/food/snacks/candy/confectionery/caramel_nougat
+ result = /obj/item/food/snacks/candy/confectionery/caramel_nougat
diff --git a/code/modules/food_and_drinks/recipes/recipes_grill.dm b/code/modules/food_and_drinks/recipes/recipes_grill.dm
index a12287ee890..cbe5f7bcf92 100644
--- a/code/modules/food_and_drinks/recipes/recipes_grill.dm
+++ b/code/modules/food_and_drinks/recipes/recipes_grill.dm
@@ -3,289 +3,289 @@
/datum/recipe/grill/bacon
items = list(
- /obj/item/reagent_containers/food/snacks/raw_bacon,
+ /obj/item/food/snacks/raw_bacon,
)
- result = /obj/item/reagent_containers/food/snacks/bacon
+ result = /obj/item/food/snacks/bacon
/datum/recipe/grill/telebacon
items = list(
- /obj/item/reagent_containers/food/snacks/meat,
+ /obj/item/food/snacks/meat,
/obj/item/assembly/signaler
)
- result = /obj/item/reagent_containers/food/snacks/telebacon
+ result = /obj/item/food/snacks/telebacon
/datum/recipe/grill/syntitelebacon
items = list(
- /obj/item/reagent_containers/food/snacks/meat/syntiflesh,
+ /obj/item/food/snacks/meat/syntiflesh,
/obj/item/assembly/signaler
)
- result = /obj/item/reagent_containers/food/snacks/telebacon
+ result = /obj/item/food/snacks/telebacon
/datum/recipe/grill/friedegg
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
items = list(
- /obj/item/reagent_containers/food/snacks/egg
+ /obj/item/food/snacks/egg
)
- result = /obj/item/reagent_containers/food/snacks/friedegg
+ result = /obj/item/food/snacks/friedegg
/datum/recipe/grill/meatsteak
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
items = list(
- /obj/item/reagent_containers/food/snacks/meat
+ /obj/item/food/snacks/meat
)
- result = /obj/item/reagent_containers/food/snacks/meatsteak
+ result = /obj/item/food/snacks/meatsteak
/datum/recipe/grill/salmonsteak
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
items = list(
- /obj/item/reagent_containers/food/snacks/salmonmeat
+ /obj/item/food/snacks/salmonmeat
)
- result = /obj/item/reagent_containers/food/snacks/salmonsteak
+ result = /obj/item/food/snacks/salmonsteak
/datum/recipe/grill/syntisteak
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
items = list(
- /obj/item/reagent_containers/food/snacks/meat/syntiflesh
+ /obj/item/food/snacks/meat/syntiflesh
)
- result = /obj/item/reagent_containers/food/snacks/meatsteak
+ result = /obj/item/food/snacks/meatsteak
/datum/recipe/grill/waffles
reagents = list("sugar" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough
)
- result = /obj/item/reagent_containers/food/snacks/waffles
+ result = /obj/item/food/snacks/waffles
/datum/recipe/grill/rofflewaffles
reagents = list("psilocybin" = 5, "sugar" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
)
- result = /obj/item/reagent_containers/food/snacks/rofflewaffles
+ result = /obj/item/food/snacks/rofflewaffles
/datum/recipe/grill/grilledcheese
items = list(
- /obj/item/reagent_containers/food/snacks/breadslice,
- /obj/item/reagent_containers/food/snacks/breadslice,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/food/snacks/breadslice,
+ /obj/item/food/snacks/breadslice,
+ /obj/item/food/snacks/cheesewedge,
)
- result = /obj/item/reagent_containers/food/snacks/grilledcheese
+ result = /obj/item/food/snacks/grilledcheese
/datum/recipe/grill/sausage
items = list(
- /obj/item/reagent_containers/food/snacks/meatball,
- /obj/item/reagent_containers/food/snacks/cutlet,
+ /obj/item/food/snacks/meatball,
+ /obj/item/food/snacks/cutlet,
)
- result = /obj/item/reagent_containers/food/snacks/sausage
+ result = /obj/item/food/snacks/sausage
/datum/recipe/grill/fishfingers
reagents = list("flour" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/egg,
- /obj/item/reagent_containers/food/snacks/carpmeat,
+ /obj/item/food/snacks/egg,
+ /obj/item/food/snacks/carpmeat,
)
- result = /obj/item/reagent_containers/food/snacks/fishfingers
+ result = /obj/item/food/snacks/fishfingers
/datum/recipe/grill/fishfingers/make_food(obj/container)
- var/obj/item/reagent_containers/food/snacks/fishfingers/being_cooked = ..()
+ var/obj/item/food/snacks/fishfingers/being_cooked = ..()
being_cooked.reagents.del_reagent("egg")
return being_cooked
/datum/recipe/grill/cutlet
items = list(
- /obj/item/reagent_containers/food/snacks/rawcutlet
+ /obj/item/food/snacks/rawcutlet
)
- result = /obj/item/reagent_containers/food/snacks/cutlet
+ result = /obj/item/food/snacks/cutlet
/datum/recipe/grill/omelette
items = list(
- /obj/item/reagent_containers/food/snacks/egg,
- /obj/item/reagent_containers/food/snacks/egg,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/food/snacks/egg,
+ /obj/item/food/snacks/egg,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
)
- result = /obj/item/reagent_containers/food/snacks/omelette
+ result = /obj/item/food/snacks/omelette
/datum/recipe/grill/wingfangchu
reagents = list("soysauce" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/monstermeat/xenomeat
+ /obj/item/food/snacks/monstermeat/xenomeat
)
- result = /obj/item/reagent_containers/food/snacks/wingfangchu
+ result = /obj/item/food/snacks/wingfangchu
/datum/recipe/grill/human/kabob
items = list(
/obj/item/stack/rods,
- /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,
)
- result = /obj/item/reagent_containers/food/snacks/human/kabob
+ result = /obj/item/food/snacks/human/kabob
/datum/recipe/grill/monkeykabob
items = list(
/obj/item/stack/rods,
- /obj/item/reagent_containers/food/snacks/meat/monkey,
- /obj/item/reagent_containers/food/snacks/meat/monkey,
+ /obj/item/food/snacks/meat/monkey,
+ /obj/item/food/snacks/meat/monkey,
)
- result = /obj/item/reagent_containers/food/snacks/monkeykabob
+ result = /obj/item/food/snacks/monkeykabob
/datum/recipe/grill/syntikabob
items = list(
/obj/item/stack/rods,
- /obj/item/reagent_containers/food/snacks/meat/syntiflesh,
- /obj/item/reagent_containers/food/snacks/meat/syntiflesh,
+ /obj/item/food/snacks/meat/syntiflesh,
+ /obj/item/food/snacks/meat/syntiflesh,
)
- result = /obj/item/reagent_containers/food/snacks/monkeykabob
+ result = /obj/item/food/snacks/monkeykabob
/datum/recipe/grill/tofukabob
items = list(
/obj/item/stack/rods,
- /obj/item/reagent_containers/food/snacks/tofu,
- /obj/item/reagent_containers/food/snacks/tofu,
+ /obj/item/food/snacks/tofu,
+ /obj/item/food/snacks/tofu,
)
- result = /obj/item/reagent_containers/food/snacks/tofukabob
+ result = /obj/item/food/snacks/tofukabob
/datum/recipe/grill/picoss_kabob
reagents = list("vinegar" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/carpmeat,
- /obj/item/reagent_containers/food/snacks/carpmeat,
- /obj/item/reagent_containers/food/snacks/grown/onion,
- /obj/item/reagent_containers/food/snacks/grown/chili,
+ /obj/item/food/snacks/carpmeat,
+ /obj/item/food/snacks/carpmeat,
+ /obj/item/food/snacks/grown/onion,
+ /obj/item/food/snacks/grown/chili,
/obj/item/stack/rods
)
- result = /obj/item/reagent_containers/food/snacks/picoss_kabob
+ result = /obj/item/food/snacks/picoss_kabob
/datum/recipe/grill/sushi_Tamago
reagents = list("sake" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/egg,
- /obj/item/reagent_containers/food/snacks/boiledrice,
+ /obj/item/food/snacks/egg,
+ /obj/item/food/snacks/boiledrice,
)
- result = /obj/item/reagent_containers/food/snacks/sushi_Tamago
+ result = /obj/item/food/snacks/sushi_Tamago
/datum/recipe/grill/sushi_Unagi
reagents = list("sake" = 5)
items = list(
/obj/item/fish/electric_eel,
- /obj/item/reagent_containers/food/snacks/boiledrice,
+ /obj/item/food/snacks/boiledrice,
)
- result = /obj/item/reagent_containers/food/snacks/sushi_Unagi
+ result = /obj/item/food/snacks/sushi_Unagi
/datum/recipe/grill/sushi_Ebi
items = list(
- /obj/item/reagent_containers/food/snacks/boiledrice,
- /obj/item/reagent_containers/food/snacks/boiled_shrimp,
+ /obj/item/food/snacks/boiledrice,
+ /obj/item/food/snacks/boiled_shrimp,
)
- result = /obj/item/reagent_containers/food/snacks/sushi_Ebi
+ result = /obj/item/food/snacks/sushi_Ebi
/datum/recipe/grill/sushi_Ikura
items = list(
- /obj/item/reagent_containers/food/snacks/boiledrice,
+ /obj/item/food/snacks/boiledrice,
/obj/item/fish_eggs/salmon,
)
- result = /obj/item/reagent_containers/food/snacks/sushi_Ikura
+ result = /obj/item/food/snacks/sushi_Ikura
/datum/recipe/grill/sushi_Inari
items = list(
- /obj/item/reagent_containers/food/snacks/boiledrice,
- /obj/item/reagent_containers/food/snacks/fried_tofu,
+ /obj/item/food/snacks/boiledrice,
+ /obj/item/food/snacks/fried_tofu,
)
- result = /obj/item/reagent_containers/food/snacks/sushi_Inari
+ result = /obj/item/food/snacks/sushi_Inari
/datum/recipe/grill/sushi_Sake
items = list(
- /obj/item/reagent_containers/food/snacks/boiledrice,
- /obj/item/reagent_containers/food/snacks/salmonmeat,
+ /obj/item/food/snacks/boiledrice,
+ /obj/item/food/snacks/salmonmeat,
)
- result = /obj/item/reagent_containers/food/snacks/sushi_Sake
+ result = /obj/item/food/snacks/sushi_Sake
/datum/recipe/grill/sushi_SmokedSalmon
items = list(
- /obj/item/reagent_containers/food/snacks/boiledrice,
- /obj/item/reagent_containers/food/snacks/salmonsteak,
+ /obj/item/food/snacks/boiledrice,
+ /obj/item/food/snacks/salmonsteak,
)
- result = /obj/item/reagent_containers/food/snacks/sushi_SmokedSalmon
+ result = /obj/item/food/snacks/sushi_SmokedSalmon
/datum/recipe/grill/sushi_Masago
items = list(
- /obj/item/reagent_containers/food/snacks/boiledrice,
+ /obj/item/food/snacks/boiledrice,
/obj/item/fish_eggs/goldfish,
)
- result = /obj/item/reagent_containers/food/snacks/sushi_Masago
+ result = /obj/item/food/snacks/sushi_Masago
/datum/recipe/grill/sushi_Tobiko
items = list(
- /obj/item/reagent_containers/food/snacks/boiledrice,
+ /obj/item/food/snacks/boiledrice,
/obj/item/fish_eggs/shark,
)
- result = /obj/item/reagent_containers/food/snacks/sushi_Tobiko
+ result = /obj/item/food/snacks/sushi_Tobiko
/datum/recipe/grill/sushi_TobikoEgg
items = list(
- /obj/item/reagent_containers/food/snacks/sushi_Tobiko,
- /obj/item/reagent_containers/food/snacks/egg,
+ /obj/item/food/snacks/sushi_Tobiko,
+ /obj/item/food/snacks/egg,
)
- result = /obj/item/reagent_containers/food/snacks/sushi_TobikoEgg
+ result = /obj/item/food/snacks/sushi_TobikoEgg
/datum/recipe/grill/sushi_Tai
items = list(
- /obj/item/reagent_containers/food/snacks/boiledrice,
- /obj/item/reagent_containers/food/snacks/catfishmeat,
+ /obj/item/food/snacks/boiledrice,
+ /obj/item/food/snacks/catfishmeat,
)
- result = /obj/item/reagent_containers/food/snacks/sushi_Tai
+ result = /obj/item/food/snacks/sushi_Tai
/datum/recipe/grill/goliath
- items = list(/obj/item/reagent_containers/food/snacks/monstermeat/goliath)
- result = /obj/item/reagent_containers/food/snacks/goliath_steak
+ items = list(/obj/item/food/snacks/monstermeat/goliath)
+ result = /obj/item/food/snacks/goliath_steak
/datum/recipe/grill/shrimp_skewer
items = list(
- /obj/item/reagent_containers/food/snacks/shrimp,
- /obj/item/reagent_containers/food/snacks/shrimp,
- /obj/item/reagent_containers/food/snacks/shrimp,
- /obj/item/reagent_containers/food/snacks/shrimp,
+ /obj/item/food/snacks/shrimp,
+ /obj/item/food/snacks/shrimp,
+ /obj/item/food/snacks/shrimp,
+ /obj/item/food/snacks/shrimp,
/obj/item/stack/rods,
)
- result = /obj/item/reagent_containers/food/snacks/shrimp_skewer
+ result = /obj/item/food/snacks/shrimp_skewer
/datum/recipe/grill/fish_skewer
reagents = list("flour" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/salmonmeat,
- /obj/item/reagent_containers/food/snacks/salmonmeat,
+ /obj/item/food/snacks/salmonmeat,
+ /obj/item/food/snacks/salmonmeat,
/obj/item/stack/rods,
)
- result = /obj/item/reagent_containers/food/snacks/fish_skewer
+ result = /obj/item/food/snacks/fish_skewer
/datum/recipe/grill/pancake
items = list(
- /obj/item/reagent_containers/food/snacks/cookiedough
+ /obj/item/food/snacks/cookiedough
)
- result = /obj/item/reagent_containers/food/snacks/pancake
+ result = /obj/item/food/snacks/pancake
/datum/recipe/grill/berry_pancake
items = list(
- /obj/item/reagent_containers/food/snacks/cookiedough,
- /obj/item/reagent_containers/food/snacks/grown/berries
+ /obj/item/food/snacks/cookiedough,
+ /obj/item/food/snacks/grown/berries
)
- result = /obj/item/reagent_containers/food/snacks/pancake/berry_pancake
+ result = /obj/item/food/snacks/pancake/berry_pancake
/datum/recipe/grill/choc_chip_pancake
items = list(
- /obj/item/reagent_containers/food/snacks/cookiedough,
- /obj/item/reagent_containers/food/snacks/choc_pile
+ /obj/item/food/snacks/cookiedough,
+ /obj/item/food/snacks/choc_pile
)
- result = /obj/item/reagent_containers/food/snacks/pancake/choc_chip_pancake
+ result = /obj/item/food/snacks/pancake/choc_chip_pancake
/datum/recipe/grill/bbqribs
reagents = list("bbqsauce" = 5)
items = list(
- /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/stack/rods
)
- result = /obj/item/reagent_containers/food/snacks/bbqribs
+ result = /obj/item/food/snacks/bbqribs
diff --git a/code/modules/food_and_drinks/recipes/recipes_microwave.dm b/code/modules/food_and_drinks/recipes/recipes_microwave.dm
index 112dcc6ca87..53904858aaa 100644
--- a/code/modules/food_and_drinks/recipes/recipes_microwave.dm
+++ b/code/modules/food_and_drinks/recipes/recipes_microwave.dm
@@ -5,791 +5,791 @@
/datum/recipe/microwave/boiledegg
reagents = list("water" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/egg
+ /obj/item/food/snacks/egg
)
- result = /obj/item/reagent_containers/food/snacks/boiledegg
+ result = /obj/item/food/snacks/boiledegg
/datum/recipe/microwave/dionaroast
reagents = list("facid" = 5) //It dissolves the carapace. Still poisonous, though.
- items = list(/obj/item/holder/diona, /obj/item/reagent_containers/food/snacks/grown/apple)
- result = /obj/item/reagent_containers/food/snacks/dionaroast
+ items = list(/obj/item/holder/diona, /obj/item/food/snacks/grown/apple)
+ result = /obj/item/food/snacks/dionaroast
/datum/recipe/microwave/jellydonut
reagents = list("berryjuice" = 5, "sugar" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/dough
+ /obj/item/food/snacks/dough
)
- result = /obj/item/reagent_containers/food/snacks/donut/jelly
+ result = /obj/item/food/snacks/donut/jelly
/datum/recipe/microwave/jellydonut/slime
reagents = list("slimejelly" = 5, "sugar" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/dough
+ /obj/item/food/snacks/dough
)
- result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly
+ result = /obj/item/food/snacks/donut/jelly/slimejelly
/datum/recipe/microwave/jellydonut/cherry
reagents = list("cherryjelly" = 5, "sugar" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/dough
+ /obj/item/food/snacks/dough
)
- result = /obj/item/reagent_containers/food/snacks/donut/jelly/cherryjelly
+ result = /obj/item/food/snacks/donut/jelly/cherryjelly
/datum/recipe/microwave/donut
reagents = list("sugar" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/dough
+ /obj/item/food/snacks/dough
)
- result = /obj/item/reagent_containers/food/snacks/donut
+ result = /obj/item/food/snacks/donut
/datum/recipe/microwave/donut/sprinkles
reagents = list("sugar" = 5, "sprinkles" = 2)
items = list(
- /obj/item/reagent_containers/food/snacks/dough
+ /obj/item/food/snacks/dough
)
- result = /obj/item/reagent_containers/food/snacks/donut/sprinkles
+ result = /obj/item/food/snacks/donut/sprinkles
/datum/recipe/microwave/human/burger
items = list(
- /obj/item/reagent_containers/food/snacks/meat/human,
- /obj/item/reagent_containers/food/snacks/bun
+ /obj/item/food/snacks/meat/human,
+ /obj/item/food/snacks/bun
)
- result = /obj/item/reagent_containers/food/snacks/human/burger
+ result = /obj/item/food/snacks/human/burger
/datum/recipe/microwave/plainburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/meat //do not place this recipe before /datum/recipe/microwave/humanburger
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/meat //do not place this recipe before /datum/recipe/microwave/humanburger
)
- result = /obj/item/reagent_containers/food/snacks/burger/plain
+ result = /obj/item/food/snacks/burger/plain
/datum/recipe/microwave/syntiburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/meat/syntiflesh
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/meat/syntiflesh
)
- result = /obj/item/reagent_containers/food/snacks/burger/plain
+ result = /obj/item/food/snacks/burger/plain
/datum/recipe/microwave/brainburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
+ /obj/item/food/snacks/bun,
/obj/item/organ/internal/brain
)
- result = /obj/item/reagent_containers/food/snacks/burger/brain
+ result = /obj/item/food/snacks/burger/brain
/datum/recipe/microwave/hamborger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
+ /obj/item/food/snacks/bun,
/obj/item/robot_parts/head
)
- result = /obj/item/reagent_containers/food/snacks/burger/hamborger
+ result = /obj/item/food/snacks/burger/hamborger
/datum/recipe/microwave/xenoburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/monstermeat/xenomeat )
- result = /obj/item/reagent_containers/food/snacks/burger/xeno
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/monstermeat/xenomeat)
+ result = /obj/item/food/snacks/burger/xeno
/datum/recipe/microwave/fishburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/carpmeat
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/carpmeat
)
- result = /obj/item/reagent_containers/food/snacks/fishburger
+ result = /obj/item/food/snacks/fishburger
/datum/recipe/microwave/tofuburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/tofu
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/tofu
)
- result = /obj/item/reagent_containers/food/snacks/burger/tofu
+ result = /obj/item/food/snacks/burger/tofu
/datum/recipe/microwave/ghostburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/ectoplasm //where do you even find this stuff
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/ectoplasm //where do you even find this stuff
)
- result = /obj/item/reagent_containers/food/snacks/burger/ghost
+ result = /obj/item/food/snacks/burger/ghost
/datum/recipe/microwave/clownburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
+ /obj/item/food/snacks/bun,
/obj/item/clothing/mask/gas/clown_hat,
)
- result = /obj/item/reagent_containers/food/snacks/burger/clown
+ result = /obj/item/food/snacks/burger/clown
/datum/recipe/microwave/mimeburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
+ /obj/item/food/snacks/bun,
/obj/item/clothing/head/beret
)
- result = /obj/item/reagent_containers/food/snacks/burger/mime
+ result = /obj/item/food/snacks/burger/mime
/datum/recipe/microwave/baseballburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
+ /obj/item/food/snacks/bun,
/obj/item/melee/baseball_bat
)
- result = /obj/item/reagent_containers/food/snacks/burger/baseball
+ result = /obj/item/food/snacks/burger/baseball
/datum/recipe/microwave/cheeseburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/meat,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/cheesewedge,
)
- result = /obj/item/reagent_containers/food/snacks/burger/cheese
+ result = /obj/item/food/snacks/burger/cheese
/datum/recipe/microwave/appendixburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
+ /obj/item/food/snacks/bun,
/obj/item/organ/internal/appendix
)
- result = /obj/item/reagent_containers/food/snacks/burger/appendix
+ result = /obj/item/food/snacks/burger/appendix
/datum/recipe/microwave/appendixburger_bitten
items = list(
- /obj/item/reagent_containers/food/snacks/appendix,
- /obj/item/reagent_containers/food/snacks/bun
+ /obj/item/food/snacks/appendix,
+ /obj/item/food/snacks/bun
)
- result = /obj/item/reagent_containers/food/snacks/burger/appendix
+ result = /obj/item/food/snacks/burger/appendix
/datum/recipe/microwave/bearger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/monstermeat/bearmeat
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/monstermeat/bearmeat
)
- result = /obj/item/reagent_containers/food/snacks/burger/bearger
+ result = /obj/item/food/snacks/burger/bearger
/datum/recipe/microwave/fivealarmburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/grown/ghost_chili,
- /obj/item/reagent_containers/food/snacks/grown/ghost_chili
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/grown/ghost_chili,
+ /obj/item/food/snacks/grown/ghost_chili
)
- result = /obj/item/reagent_containers/food/snacks/burger/fivealarm
+ result = /obj/item/food/snacks/burger/fivealarm
/datum/recipe/microwave/baconburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/bacon,
- /obj/item/reagent_containers/food/snacks/bacon,
- /obj/item/reagent_containers/food/snacks/cheesewedge
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/bacon,
+ /obj/item/food/snacks/bacon,
+ /obj/item/food/snacks/cheesewedge
)
- result = /obj/item/reagent_containers/food/snacks/burger/bacon
+ result = /obj/item/food/snacks/burger/bacon
/datum/recipe/microwave/mcrib
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/bbqribs,
- /obj/item/reagent_containers/food/snacks/onion_slice
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/bbqribs,
+ /obj/item/food/snacks/onion_slice
)
- result = /obj/item/reagent_containers/food/snacks/burger/mcrib
+ result = /obj/item/food/snacks/burger/mcrib
/datum/recipe/microwave/mcguffin
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/bacon,
- /obj/item/reagent_containers/food/snacks/bacon,
- /obj/item/reagent_containers/food/snacks/friedegg
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/bacon,
+ /obj/item/food/snacks/bacon,
+ /obj/item/food/snacks/friedegg
)
- result = /obj/item/reagent_containers/food/snacks/burger/mcguffin
+ result = /obj/item/food/snacks/burger/mcguffin
/datum/recipe/microwave/hotdog
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/sausage
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/sausage
)
- result = /obj/item/reagent_containers/food/snacks/hotdog
+ result = /obj/item/food/snacks/hotdog
/datum/recipe/microwave/donkpocket
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/meatball
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/meatball
)
- result = /obj/item/reagent_containers/food/snacks/donkpocket
+ result = /obj/item/food/snacks/donkpocket
/datum/recipe/microwave/warmdonkpocket
duplicate = FALSE
items = list(
- /obj/item/reagent_containers/food/snacks/donkpocket
+ /obj/item/food/snacks/donkpocket
)
- result = /obj/item/reagent_containers/food/snacks/warmdonkpocket
+ result = /obj/item/food/snacks/warmdonkpocket
/datum/recipe/microwave/reheatwarmdonkpocket
duplicate = FALSE
items = list(
- /obj/item/reagent_containers/food/snacks/warmdonkpocket
+ /obj/item/food/snacks/warmdonkpocket
)
- result = /obj/item/reagent_containers/food/snacks/warmdonkpocket
+ result = /obj/item/food/snacks/warmdonkpocket
/datum/recipe/microwave/eggplantparm
items = list(
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/grown/eggplant
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/grown/eggplant
)
- result = /obj/item/reagent_containers/food/snacks/eggplantparm
+ result = /obj/item/food/snacks/eggplantparm
/datum/recipe/microwave/soylentviridians
reagents = list("flour" = 10)
- items = list(/obj/item/reagent_containers/food/snacks/grown/soybeans)
- result = /obj/item/reagent_containers/food/snacks/soylentviridians
+ items = list(/obj/item/food/snacks/grown/soybeans)
+ result = /obj/item/food/snacks/soylentviridians
/datum/recipe/microwave/soylentgreen
reagents = list("flour" = 10)
items = list(
- /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,
)
- result = /obj/item/reagent_containers/food/snacks/soylentgreen
+ result = /obj/item/food/snacks/soylentgreen
/datum/recipe/microwave/chaosdonut
reagents = list("frostoil" = 5, "capsaicin" = 5, "sugar" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/dough
+ /obj/item/food/snacks/dough
)
- result = /obj/item/reagent_containers/food/snacks/donut/chaos
+ result = /obj/item/food/snacks/donut/chaos
/datum/recipe/microwave/cheesyfries
items = list(
- /obj/item/reagent_containers/food/snacks/fries,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/food/snacks/fries,
+ /obj/item/food/snacks/cheesewedge,
)
- result = /obj/item/reagent_containers/food/snacks/cheesyfries
+ result = /obj/item/food/snacks/cheesyfries
/datum/recipe/microwave/cubancarp
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/carpmeat,
- /obj/item/reagent_containers/food/snacks/grown/chili
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/carpmeat,
+ /obj/item/food/snacks/grown/chili
)
- result = /obj/item/reagent_containers/food/snacks/cubancarp
+ result = /obj/item/food/snacks/cubancarp
/datum/recipe/microwave/popcorn
- items = list(/obj/item/reagent_containers/food/snacks/grown/corn)
- result = /obj/item/reagent_containers/food/snacks/popcorn
+ items = list(/obj/item/food/snacks/grown/corn)
+ result = /obj/item/food/snacks/popcorn
/datum/recipe/microwave/spacylibertyduff
reagents = list("water" = 5, "vodka" = 5)
- items = list(/obj/item/reagent_containers/food/snacks/grown/mushroom/libertycap, /obj/item/reagent_containers/food/snacks/grown/mushroom/libertycap,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/libertycap)
- result = /obj/item/reagent_containers/food/snacks/spacylibertyduff
+ items = list(/obj/item/food/snacks/grown/mushroom/libertycap, /obj/item/food/snacks/grown/mushroom/libertycap,
+ /obj/item/food/snacks/grown/mushroom/libertycap)
+ result = /obj/item/food/snacks/spacylibertyduff
/datum/recipe/microwave/amanitajelly
reagents = list("water" = 5, "vodka" = 5)
- items = list(/obj/item/reagent_containers/food/snacks/grown/mushroom/amanita, /obj/item/reagent_containers/food/snacks/grown/mushroom/amanita,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/amanita)
- result = /obj/item/reagent_containers/food/snacks/amanitajelly
+ items = list(/obj/item/food/snacks/grown/mushroom/amanita, /obj/item/food/snacks/grown/mushroom/amanita,
+ /obj/item/food/snacks/grown/mushroom/amanita)
+ result = /obj/item/food/snacks/amanitajelly
/datum/recipe/microwave/amanitajelly/make_food(obj/container)
- var/obj/item/reagent_containers/food/snacks/amanitajelly/being_cooked = ..()
+ var/obj/item/food/snacks/amanitajelly/being_cooked = ..()
being_cooked.reagents.del_reagent("amanitin")
return being_cooked
/datum/recipe/microwave/meatballsoup
reagents = list("water" = 10)
- items = list(/obj/item/reagent_containers/food/snacks/meatball, /obj/item/reagent_containers/food/snacks/grown/potato, /obj/item/reagent_containers/food/snacks/grown/carrot)
- result = /obj/item/reagent_containers/food/snacks/soup/meatballsoup
+ items = list(/obj/item/food/snacks/meatball, /obj/item/food/snacks/grown/potato, /obj/item/food/snacks/grown/carrot)
+ result = /obj/item/food/snacks/soup/meatballsoup
/datum/recipe/microwave/vegetablesoup
reagents = list("water" = 10)
- items = list(/obj/item/reagent_containers/food/snacks/grown/potato, /obj/item/reagent_containers/food/snacks/grown/carrot,
- /obj/item/reagent_containers/food/snacks/grown/corn, /obj/item/reagent_containers/food/snacks/grown/eggplant)
- result = /obj/item/reagent_containers/food/snacks/soup/vegetablesoup
+ items = list(/obj/item/food/snacks/grown/potato, /obj/item/food/snacks/grown/carrot,
+ /obj/item/food/snacks/grown/corn, /obj/item/food/snacks/grown/eggplant)
+ result = /obj/item/food/snacks/soup/vegetablesoup
/datum/recipe/microwave/nettlesoup
reagents = list("water" = 10)
- items = list(/obj/item/reagent_containers/food/snacks/egg, /obj/item/grown/nettle/basic, /obj/item/reagent_containers/food/snacks/grown/potato)
- result = /obj/item/reagent_containers/food/snacks/soup/nettlesoup
+ items = list(/obj/item/food/snacks/egg, /obj/item/grown/nettle/basic, /obj/item/food/snacks/grown/potato)
+ result = /obj/item/food/snacks/soup/nettlesoup
/datum/recipe/microwave/wishsoup
reagents = list("water" = 20)
- result = /obj/item/reagent_containers/food/snacks/soup/wishsoup
+ result = /obj/item/food/snacks/soup/wishsoup
/datum/recipe/microwave/hotchili
- items = list(/obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/grown/chili, /obj/item/reagent_containers/food/snacks/grown/tomato)
- result = /obj/item/reagent_containers/food/snacks/soup/hotchili
+ items = list(/obj/item/food/snacks/meat, /obj/item/food/snacks/grown/chili, /obj/item/food/snacks/grown/tomato)
+ result = /obj/item/food/snacks/soup/hotchili
/datum/recipe/microwave/coldchili
- items = list(/obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/grown/icepepper, /obj/item/reagent_containers/food/snacks/grown/tomato)
- result = /obj/item/reagent_containers/food/snacks/soup/coldchili
+ items = list(/obj/item/food/snacks/meat, /obj/item/food/snacks/grown/icepepper, /obj/item/food/snacks/grown/tomato)
+ result = /obj/item/food/snacks/soup/coldchili
/datum/recipe/microwave/spellburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
+ /obj/item/food/snacks/bun,
/obj/item/clothing/head/wizard/fake,
)
- result = /obj/item/reagent_containers/food/snacks/burger/spell
+ result = /obj/item/food/snacks/burger/spell
/datum/recipe/microwave/spellburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
+ /obj/item/food/snacks/bun,
/obj/item/clothing/head/wizard,
)
- result = /obj/item/reagent_containers/food/snacks/burger/spell
+ result = /obj/item/food/snacks/burger/spell
/datum/recipe/microwave/bigbiteburger
items = list(
- /obj/item/reagent_containers/food/snacks/burger/plain,
- /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/egg,
+ /obj/item/food/snacks/burger/plain,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/egg,
)
- result = /obj/item/reagent_containers/food/snacks/burger/bigbite
+ result = /obj/item/food/snacks/burger/bigbite
/datum/recipe/microwave/enchiladas
items = list(
- /obj/item/reagent_containers/food/snacks/cutlet,
- /obj/item/reagent_containers/food/snacks/grown/chili,
- /obj/item/reagent_containers/food/snacks/grown/chili,
- /obj/item/reagent_containers/food/snacks/grown/corn)
- result = /obj/item/reagent_containers/food/snacks/enchiladas
+ /obj/item/food/snacks/cutlet,
+ /obj/item/food/snacks/grown/chili,
+ /obj/item/food/snacks/grown/chili,
+ /obj/item/food/snacks/grown/corn)
+ result = /obj/item/food/snacks/enchiladas
/datum/recipe/microwave/burrito
reagents = list("capsaicin" = 5, "rice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/cutlet,
- /obj/item/reagent_containers/food/snacks/beans,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/cutlet,
+ /obj/item/food/snacks/beans,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/sliceable/flatdough,
)
- result = /obj/item/reagent_containers/food/snacks/burrito
+ result = /obj/item/food/snacks/burrito
/datum/recipe/microwave/monkeysdelight
reagents = list("sodiumchloride" = 1, "blackpepper" = 1, "flour" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/monkeycube,
- /obj/item/reagent_containers/food/snacks/grown/banana)
- result = /obj/item/reagent_containers/food/snacks/monkeysdelight
+ /obj/item/food/snacks/monkeycube,
+ /obj/item/food/snacks/grown/banana)
+ result = /obj/item/food/snacks/monkeysdelight
/datum/recipe/microwave/fishandchips
items = list(
- /obj/item/reagent_containers/food/snacks/fries,
- /obj/item/reagent_containers/food/snacks/carpmeat,
+ /obj/item/food/snacks/fries,
+ /obj/item/food/snacks/carpmeat,
)
- result = /obj/item/reagent_containers/food/snacks/fishandchips
+ result = /obj/item/food/snacks/fishandchips
/datum/recipe/microwave/sandwich
items = list(
- /obj/item/reagent_containers/food/snacks/meatsteak,
- /obj/item/reagent_containers/food/snacks/breadslice,
- /obj/item/reagent_containers/food/snacks/breadslice,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/food/snacks/meatsteak,
+ /obj/item/food/snacks/breadslice,
+ /obj/item/food/snacks/breadslice,
+ /obj/item/food/snacks/cheesewedge,
)
- result = /obj/item/reagent_containers/food/snacks/sandwich
+ result = /obj/item/food/snacks/sandwich
/datum/recipe/microwave/tomatosoup
reagents = list("water" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/grown/tomato)
- result = /obj/item/reagent_containers/food/snacks/soup/tomatosoup
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/grown/tomato)
+ result = /obj/item/food/snacks/soup/tomatosoup
/datum/recipe/microwave/stew
reagents = list("water" = 10)
items= list(
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/grown/potato,
- /obj/item/reagent_containers/food/snacks/grown/carrot,
- /obj/item/reagent_containers/food/snacks/grown/eggplant,
- /obj/item/reagent_containers/food/snacks/grown/mushroom,
- /obj/item/reagent_containers/food/snacks/meat)
- result = /obj/item/reagent_containers/food/snacks/soup/stew
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/grown/potato,
+ /obj/item/food/snacks/grown/carrot,
+ /obj/item/food/snacks/grown/eggplant,
+ /obj/item/food/snacks/grown/mushroom,
+ /obj/item/food/snacks/meat)
+ result = /obj/item/food/snacks/soup/stew
/datum/recipe/microwave/slimetoast
reagents = list("slimejelly" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/breadslice,
+ /obj/item/food/snacks/breadslice,
)
- result = /obj/item/reagent_containers/food/snacks/jelliedtoast/slime
+ result = /obj/item/food/snacks/jelliedtoast/slime
/datum/recipe/microwave/jelliedtoast
reagents = list("cherryjelly" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/breadslice,
+ /obj/item/food/snacks/breadslice,
)
- result = /obj/item/reagent_containers/food/snacks/jelliedtoast/cherry
+ result = /obj/item/food/snacks/jelliedtoast/cherry
/datum/recipe/microwave/misosoup
reagents = list("water" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/soydope,
- /obj/item/reagent_containers/food/snacks/soydope,
- /obj/item/reagent_containers/food/snacks/tofu,
- /obj/item/reagent_containers/food/snacks/tofu,
+ /obj/item/food/snacks/soydope,
+ /obj/item/food/snacks/soydope,
+ /obj/item/food/snacks/tofu,
+ /obj/item/food/snacks/tofu,
)
- result = /obj/item/reagent_containers/food/snacks/soup/misosoup
+ result = /obj/item/food/snacks/soup/misosoup
/datum/recipe/microwave/stewedsoymeat
- items = list(/obj/item/reagent_containers/food/snacks/soydope, /obj/item/reagent_containers/food/snacks/soydope,
- /obj/item/reagent_containers/food/snacks/grown/carrot, /obj/item/reagent_containers/food/snacks/grown/tomato)
- result = /obj/item/reagent_containers/food/snacks/stewedsoymeat
+ items = list(/obj/item/food/snacks/soydope, /obj/item/food/snacks/soydope,
+ /obj/item/food/snacks/grown/carrot, /obj/item/food/snacks/grown/tomato)
+ result = /obj/item/food/snacks/stewedsoymeat
/datum/recipe/microwave/boiledspaghetti
reagents = list("water" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/spaghetti,
+ /obj/item/food/snacks/spaghetti,
)
- result = /obj/item/reagent_containers/food/snacks/boiledspaghetti
+ result = /obj/item/food/snacks/boiledspaghetti
/datum/recipe/microwave/boiledrice
reagents = list("water" = 5, "rice" = 10)
- result = /obj/item/reagent_containers/food/snacks/boiledrice
+ result = /obj/item/food/snacks/boiledrice
/datum/recipe/microwave/ricepudding
reagents = list("milk" = 5, "rice" = 10)
- result = /obj/item/reagent_containers/food/snacks/ricepudding
+ result = /obj/item/food/snacks/ricepudding
/datum/recipe/microwave/pastatomato
reagents = list("water" = 5)
- items = list(/obj/item/reagent_containers/food/snacks/spaghetti, /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/grown/tomato)
- result = /obj/item/reagent_containers/food/snacks/pastatomato
+ items = list(/obj/item/food/snacks/spaghetti, /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/grown/tomato)
+ result = /obj/item/food/snacks/pastatomato
/datum/recipe/microwave/poppypretzel
- items = list(/obj/item/seeds/poppy, /obj/item/reagent_containers/food/snacks/dough)
- result = /obj/item/reagent_containers/food/snacks/poppypretzel
+ items = list(/obj/item/seeds/poppy, /obj/item/food/snacks/dough)
+ result = /obj/item/food/snacks/poppypretzel
/datum/recipe/microwave/meatballspaggetti
reagents = list("water" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/spaghetti,
- /obj/item/reagent_containers/food/snacks/meatball,
- /obj/item/reagent_containers/food/snacks/meatball,
+ /obj/item/food/snacks/spaghetti,
+ /obj/item/food/snacks/meatball,
+ /obj/item/food/snacks/meatball,
)
- result = /obj/item/reagent_containers/food/snacks/meatballspaghetti
+ result = /obj/item/food/snacks/meatballspaghetti
/datum/recipe/microwave/spesslaw
reagents = list("water" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/spaghetti,
- /obj/item/reagent_containers/food/snacks/meatball,
- /obj/item/reagent_containers/food/snacks/meatball,
- /obj/item/reagent_containers/food/snacks/meatball,
- /obj/item/reagent_containers/food/snacks/meatball,
+ /obj/item/food/snacks/spaghetti,
+ /obj/item/food/snacks/meatball,
+ /obj/item/food/snacks/meatball,
+ /obj/item/food/snacks/meatball,
+ /obj/item/food/snacks/meatball,
)
- result = /obj/item/reagent_containers/food/snacks/spesslaw
+ result = /obj/item/food/snacks/spesslaw
/datum/recipe/microwave/macncheese
reagents = list("water" = 5, "milk" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/macaroni,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/macaroni,
)
- result = /obj/item/reagent_containers/food/snacks/macncheese
+ result = /obj/item/food/snacks/macncheese
/datum/recipe/microwave/superbiteburger
reagents = list("sodiumchloride" = 5, "blackpepper" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/burger/bigbite,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/meat,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/boiledegg,
- /obj/item/reagent_containers/food/snacks/tomatoslice
+ /obj/item/food/snacks/burger/bigbite,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/boiledegg,
+ /obj/item/food/snacks/tomatoslice
)
- result = /obj/item/reagent_containers/food/snacks/burger/superbite
+ result = /obj/item/food/snacks/burger/superbite
/datum/recipe/microwave/crazyburger
reagents = list("cornoil" = 15)
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/meat,
- /obj/item/reagent_containers/food/snacks/meat,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/grown/cabbage,
- /obj/item/reagent_containers/food/snacks/grown/chili,
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/grown/cabbage,
+ /obj/item/food/snacks/grown/chili,
/obj/item/toy/crayon/green,
/obj/item/flashlight/flare
)
- result = /obj/item/reagent_containers/food/snacks/burger/crazy
+ result = /obj/item/food/snacks/burger/crazy
/datum/recipe/microwave/blt
items = list(
- /obj/item/reagent_containers/food/snacks/breadslice,
- /obj/item/reagent_containers/food/snacks/breadslice,
- /obj/item/reagent_containers/food/snacks/grown/cabbage,
- /obj/item/reagent_containers/food/snacks/tomatoslice,
- /obj/item/reagent_containers/food/snacks/bacon
+ /obj/item/food/snacks/breadslice,
+ /obj/item/food/snacks/breadslice,
+ /obj/item/food/snacks/grown/cabbage,
+ /obj/item/food/snacks/tomatoslice,
+ /obj/item/food/snacks/bacon
)
- result = /obj/item/reagent_containers/food/snacks/blt
+ result = /obj/item/food/snacks/blt
/datum/recipe/microwave/peanut_butter_jelly/cherry
reagents = list("cherryjelly" = 5, "peanutbutter" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/breadslice,
- /obj/item/reagent_containers/food/snacks/breadslice
+ /obj/item/food/snacks/breadslice,
+ /obj/item/food/snacks/breadslice
)
- result = /obj/item/reagent_containers/food/snacks/peanut_butter_jelly/cherry
+ result = /obj/item/food/snacks/peanut_butter_jelly/cherry
/datum/recipe/microwave/peanut_butter_jelly/slime
reagents = list("slimejelly" = 5, "peanutbutter" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/breadslice,
- /obj/item/reagent_containers/food/snacks/breadslice
+ /obj/item/food/snacks/breadslice,
+ /obj/item/food/snacks/breadslice
)
- result = /obj/item/reagent_containers/food/snacks/peanut_butter_jelly/slime
+ result = /obj/item/food/snacks/peanut_butter_jelly/slime
/datum/recipe/microwave/peanut_butter_banana
reagents = list("peanutbutter" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/breadslice,
- /obj/item/reagent_containers/food/snacks/breadslice,
- /obj/item/reagent_containers/food/snacks/grown/banana
+ /obj/item/food/snacks/breadslice,
+ /obj/item/food/snacks/breadslice,
+ /obj/item/food/snacks/grown/banana
)
- result = /obj/item/reagent_containers/food/snacks/peanut_butter_banana
+ result = /obj/item/food/snacks/peanut_butter_banana
/datum/recipe/microwave/philly_cheesesteak
items = list(
- /obj/item/reagent_containers/food/snacks/breadslice,
- /obj/item/reagent_containers/food/snacks/breadslice,
- /obj/item/reagent_containers/food/snacks/cutlet,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/grown/onion
+ /obj/item/food/snacks/breadslice,
+ /obj/item/food/snacks/breadslice,
+ /obj/item/food/snacks/cutlet,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/grown/onion
)
- result = /obj/item/reagent_containers/food/snacks/philly_cheesesteak
+ result = /obj/item/food/snacks/philly_cheesesteak
/datum/recipe/microwave/ppattyred
reagents = list("cherryjelly" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/meat
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/meat
)
- result = /obj/item/reagent_containers/food/snacks/burger/ppatty/red
+ result = /obj/item/food/snacks/burger/ppatty/red
/datum/recipe/microwave/ppattyorange
reagents = list("orangejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/meat
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/meat
)
- result = /obj/item/reagent_containers/food/snacks/burger/ppatty/orange
+ result = /obj/item/food/snacks/burger/ppatty/orange
/datum/recipe/microwave/ppattyyellow
reagents = list("lemonjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/meat
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/meat
)
- result = /obj/item/reagent_containers/food/snacks/burger/ppatty/yellow
+ result = /obj/item/food/snacks/burger/ppatty/yellow
/datum/recipe/microwave/ppattygreen
reagents = list("limejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/meat
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/meat
)
- result = /obj/item/reagent_containers/food/snacks/burger/ppatty/green
+ result = /obj/item/food/snacks/burger/ppatty/green
/datum/recipe/microwave/ppattyblue
reagents = list("berryjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/meat
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/meat
)
- result = /obj/item/reagent_containers/food/snacks/burger/ppatty/blue
+ result = /obj/item/food/snacks/burger/ppatty/blue
/datum/recipe/microwave/ppattypurple
reagents = list("grapejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/meat
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/meat
)
- result = /obj/item/reagent_containers/food/snacks/burger/ppatty/purple
+ result = /obj/item/food/snacks/burger/ppatty/purple
/datum/recipe/microwave/ppattywhite
reagents = list("sugar" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/meat
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/meat
)
- result = /obj/item/reagent_containers/food/snacks/burger/ppatty/white
+ result = /obj/item/food/snacks/burger/ppatty/white
/datum/recipe/microwave/ppattyrainbow
items = list(
- /obj/item/reagent_containers/food/snacks/burger/ppatty/red,
- /obj/item/reagent_containers/food/snacks/burger/ppatty/orange,
- /obj/item/reagent_containers/food/snacks/burger/ppatty/yellow,
- /obj/item/reagent_containers/food/snacks/burger/ppatty/green,
- /obj/item/reagent_containers/food/snacks/burger/ppatty/blue,
- /obj/item/reagent_containers/food/snacks/burger/ppatty/purple,
- /obj/item/reagent_containers/food/snacks/burger/ppatty/white
+ /obj/item/food/snacks/burger/ppatty/red,
+ /obj/item/food/snacks/burger/ppatty/orange,
+ /obj/item/food/snacks/burger/ppatty/yellow,
+ /obj/item/food/snacks/burger/ppatty/green,
+ /obj/item/food/snacks/burger/ppatty/blue,
+ /obj/item/food/snacks/burger/ppatty/purple,
+ /obj/item/food/snacks/burger/ppatty/white
)
- result = /obj/item/reagent_containers/food/snacks/burger/ppatty/rainbow
+ result = /obj/item/food/snacks/burger/ppatty/rainbow
/datum/recipe/microwave/elecburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
+ /obj/item/food/snacks/bun,
/obj/item/stack/sheet/mineral/plasma,
/obj/item/stack/sheet/mineral/plasma
)
- result = /obj/item/reagent_containers/food/snacks/burger/elec
+ result = /obj/item/food/snacks/burger/elec
/datum/recipe/microwave/ratburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
+ /obj/item/food/snacks/bun,
/obj/item/holder/mouse
)
- result = /obj/item/reagent_containers/food/snacks/burger/rat
+ result = /obj/item/food/snacks/burger/rat
/datum/recipe/microwave/candiedapple
reagents = list("water" = 5, "sugar" = 5)
- items = list(/obj/item/reagent_containers/food/snacks/grown/apple)
- result = /obj/item/reagent_containers/food/snacks/candiedapple
+ items = list(/obj/item/food/snacks/grown/apple)
+ result = /obj/item/food/snacks/candiedapple
/datum/recipe/microwave/slimeburger
reagents = list("slimejelly" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/bun
+ /obj/item/food/snacks/bun
)
- result = /obj/item/reagent_containers/food/snacks/burger/jelly/slime
+ result = /obj/item/food/snacks/burger/jelly/slime
/datum/recipe/microwave/jellyburger
reagents = list("cherryjelly" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/bun
+ /obj/item/food/snacks/bun
)
- result = /obj/item/reagent_containers/food/snacks/burger/jelly/cherry
+ result = /obj/item/food/snacks/burger/jelly/cherry
/datum/recipe/microwave/twobread
reagents = list("wine" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/breadslice,
- /obj/item/reagent_containers/food/snacks/breadslice,
+ /obj/item/food/snacks/breadslice,
+ /obj/item/food/snacks/breadslice,
)
- result = /obj/item/reagent_containers/food/snacks/twobread
+ result = /obj/item/food/snacks/twobread
/datum/recipe/microwave/slimesandwich
reagents = list("slimejelly" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/breadslice,
- /obj/item/reagent_containers/food/snacks/breadslice,
+ /obj/item/food/snacks/breadslice,
+ /obj/item/food/snacks/breadslice,
)
- result = /obj/item/reagent_containers/food/snacks/jellysandwich/slime
+ result = /obj/item/food/snacks/jellysandwich/slime
/datum/recipe/microwave/cherrysandwich
reagents = list("cherryjelly" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/breadslice,
- /obj/item/reagent_containers/food/snacks/breadslice,
+ /obj/item/food/snacks/breadslice,
+ /obj/item/food/snacks/breadslice,
)
- result = /obj/item/reagent_containers/food/snacks/jellysandwich/cherry
+ result = /obj/item/food/snacks/jellysandwich/cherry
/datum/recipe/microwave/bloodsoup
reagents = list("blood" = 10)
- items = list(/obj/item/reagent_containers/food/snacks/grown/tomato/blood, /obj/item/reagent_containers/food/snacks/grown/tomato/blood)
- result = /obj/item/reagent_containers/food/snacks/soup/bloodsoup
+ items = list(/obj/item/food/snacks/grown/tomato/blood, /obj/item/food/snacks/grown/tomato/blood)
+ result = /obj/item/food/snacks/soup/bloodsoup
/datum/recipe/microwave/slimesoup
reagents = list("water" = 10, "slimejelly" = 5)
- result = /obj/item/reagent_containers/food/snacks/soup/slimesoup
+ result = /obj/item/food/snacks/soup/slimesoup
/datum/recipe/microwave/clownstears
reagents = list("water" = 10)
items = list(
/obj/item/stack/ore/bananium,
- /obj/item/reagent_containers/food/snacks/grown/banana
+ /obj/item/food/snacks/grown/banana
)
- result = /obj/item/reagent_containers/food/snacks/soup/clownstears
+ result = /obj/item/food/snacks/soup/clownstears
/datum/recipe/microwave/clownchili
reagents = list("water" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/cutlet,
- /obj/item/reagent_containers/food/snacks/cutlet,
- /obj/item/reagent_containers/food/snacks/grown/chili,
- /obj/item/reagent_containers/food/snacks/grown/tomato,
+ /obj/item/food/snacks/cutlet,
+ /obj/item/food/snacks/cutlet,
+ /obj/item/food/snacks/grown/chili,
+ /obj/item/food/snacks/grown/tomato,
/obj/item/clothing/shoes/clown_shoes
)
- result = /obj/item/reagent_containers/food/snacks/soup/clownchili
+ result = /obj/item/food/snacks/soup/clownchili
/datum/recipe/microwave/eyesoup
reagents = list("water" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/grown/tomato,
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/grown/tomato,
/obj/item/organ/internal/eyes
)
- result = /obj/item/reagent_containers/food/snacks/soup/eyesoup
+ result = /obj/item/food/snacks/soup/eyesoup
/datum/recipe/microwave/sweetpotatosoup
reagents = list("water" = 10, "milk" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/grown/potato/sweet,
- /obj/item/reagent_containers/food/snacks/grown/potato/sweet
+ /obj/item/food/snacks/grown/potato/sweet,
+ /obj/item/food/snacks/grown/potato/sweet
)
- result = /obj/item/reagent_containers/food/snacks/soup/sweetpotatosoup
+ result = /obj/item/food/snacks/soup/sweetpotatosoup
/datum/recipe/microwave/redbeetsoup
reagents = list("water" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/grown/redbeet,
- /obj/item/reagent_containers/food/snacks/grown/redbeet,
- /obj/item/reagent_containers/food/snacks/grown/cabbage
+ /obj/item/food/snacks/grown/redbeet,
+ /obj/item/food/snacks/grown/redbeet,
+ /obj/item/food/snacks/grown/cabbage
)
- result = /obj/item/reagent_containers/food/snacks/soup/redbeetsoup
+ result = /obj/item/food/snacks/soup/redbeetsoup
/datum/recipe/microwave/frenchonionsoup
reagents = list("water" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/grown/onion,
- /obj/item/reagent_containers/food/snacks/cheesewedge
+ /obj/item/food/snacks/grown/onion,
+ /obj/item/food/snacks/cheesewedge
)
- result = /obj/item/reagent_containers/food/snacks/soup/frenchonionsoup
+ result = /obj/item/food/snacks/soup/frenchonionsoup
/datum/recipe/microwave/zurek
reagents = list("water" = 10, "flour" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/boiledegg,
- /obj/item/reagent_containers/food/snacks/sausage,
- /obj/item/reagent_containers/food/snacks/grown/carrot,
- /obj/item/reagent_containers/food/snacks/grown/onion
+ /obj/item/food/snacks/boiledegg,
+ /obj/item/food/snacks/sausage,
+ /obj/item/food/snacks/grown/carrot,
+ /obj/item/food/snacks/grown/onion
)
- result = /obj/item/reagent_containers/food/snacks/soup/zurek
+ result = /obj/item/food/snacks/soup/zurek
/datum/recipe/microwave/cullenskink
reagents = list("water" = 10, "milk" = 10, "blackpepper" = 4)
items = list(
- /obj/item/reagent_containers/food/snacks/salmonmeat,
- /obj/item/reagent_containers/food/snacks/grown/onion,
- /obj/item/reagent_containers/food/snacks/grown/potato
+ /obj/item/food/snacks/salmonmeat,
+ /obj/item/food/snacks/grown/onion,
+ /obj/item/food/snacks/grown/potato
)
- result = /obj/item/reagent_containers/food/snacks/soup/cullenskink
+ result = /obj/item/food/snacks/soup/cullenskink
/datum/recipe/microwave/chicken_noodle_soup
reagents = list("water" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/meat,
- /obj/item/reagent_containers/food/snacks/grown/carrot,
- /obj/item/reagent_containers/food/snacks/boiledspaghetti
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/grown/carrot,
+ /obj/item/food/snacks/boiledspaghetti
)
- result = /obj/item/reagent_containers/food/snacks/soup/chicken_noodle_soup
+ result = /obj/item/food/snacks/soup/chicken_noodle_soup
/datum/recipe/microwave/cornchowder
reagents = list("water" = 10, "cream" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/grown/corn,
- /obj/item/reagent_containers/food/snacks/grown/potato,
- /obj/item/reagent_containers/food/snacks/grown/carrot,
- /obj/item/reagent_containers/food/snacks/bacon
+ /obj/item/food/snacks/grown/corn,
+ /obj/item/food/snacks/grown/potato,
+ /obj/item/food/snacks/grown/carrot,
+ /obj/item/food/snacks/bacon
)
- result = /obj/item/reagent_containers/food/snacks/soup/cornchowder
+ result = /obj/item/food/snacks/soup/cornchowder
/datum/recipe/microwave/meatball_noodles
reagents = list("water" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/cutlet,
- /obj/item/reagent_containers/food/snacks/cutlet,
- /obj/item/reagent_containers/food/snacks/grown/onion,
- /obj/item/reagent_containers/food/snacks/grown/peanuts,
- /obj/item/reagent_containers/food/snacks/meatball,
- /obj/item/reagent_containers/food/snacks/meatball,
- /obj/item/reagent_containers/food/snacks/spaghetti
+ /obj/item/food/snacks/cutlet,
+ /obj/item/food/snacks/cutlet,
+ /obj/item/food/snacks/grown/onion,
+ /obj/item/food/snacks/grown/peanuts,
+ /obj/item/food/snacks/meatball,
+ /obj/item/food/snacks/meatball,
+ /obj/item/food/snacks/spaghetti
)
- result = /obj/item/reagent_containers/food/snacks/soup/meatball_noodles
+ result = /obj/item/food/snacks/soup/meatball_noodles
/datum/recipe/microwave/seedsoup
reagents = list("water" = 10, "vinegar" = 10)
@@ -798,218 +798,218 @@
/obj/item/seeds/poppy/lily,
/obj/item/seeds/ambrosia
)
- result = /obj/item/reagent_containers/food/snacks/soup/seedsoup
+ result = /obj/item/food/snacks/soup/seedsoup
/datum/recipe/microwave/beanstew
reagents = list("water" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/beans,
- /obj/item/reagent_containers/food/snacks/grown/cabbage,
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/grown/onion,
- /obj/item/reagent_containers/food/snacks/grown/chili,
- /obj/item/reagent_containers/food/snacks/grown/corn
+ /obj/item/food/snacks/beans,
+ /obj/item/food/snacks/grown/cabbage,
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/grown/onion,
+ /obj/item/food/snacks/grown/chili,
+ /obj/item/food/snacks/grown/corn
)
- result = /obj/item/reagent_containers/food/snacks/soup/beanstew
+ result = /obj/item/food/snacks/soup/beanstew
/datum/recipe/microwave/oatstew
reagents = list("water" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/grown/oat,
- /obj/item/reagent_containers/food/snacks/grown/potato/sweet,
- /obj/item/reagent_containers/food/snacks/grown/parsnip,
- /obj/item/reagent_containers/food/snacks/grown/carrot
+ /obj/item/food/snacks/grown/oat,
+ /obj/item/food/snacks/grown/potato/sweet,
+ /obj/item/food/snacks/grown/parsnip,
+ /obj/item/food/snacks/grown/carrot
)
- result = /obj/item/reagent_containers/food/snacks/soup/oatstew
+ result = /obj/item/food/snacks/soup/oatstew
/datum/recipe/microwave/hong_kong_borscht
reagents = list("water" = 10, "soysauce" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/grown/cabbage,
- /obj/item/reagent_containers/food/snacks/grown/onion,
- /obj/item/reagent_containers/food/snacks/grown/carrot,
- /obj/item/reagent_containers/food/snacks/cutlet
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/grown/cabbage,
+ /obj/item/food/snacks/grown/onion,
+ /obj/item/food/snacks/grown/carrot,
+ /obj/item/food/snacks/cutlet
)
- result = /obj/item/reagent_containers/food/snacks/soup/hong_kong_borscht
+ result = /obj/item/food/snacks/soup/hong_kong_borscht
/datum/recipe/microwave/hong_kong_macaroni
reagents = list("water" = 10, "cream" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/boiledspaghetti,
- /obj/item/reagent_containers/food/snacks/cutlet,
- /obj/item/reagent_containers/food/snacks/bacon
+ /obj/item/food/snacks/boiledspaghetti,
+ /obj/item/food/snacks/cutlet,
+ /obj/item/food/snacks/bacon
)
- result = /obj/item/reagent_containers/food/snacks/soup/hong_kong_macaroni
+ result = /obj/item/food/snacks/soup/hong_kong_macaroni
/datum/recipe/microwave/boiledslimeextract
reagents = list("water" = 5)
items = list(
/obj/item/slime_extract,
)
- result = /obj/item/reagent_containers/food/snacks/boiledslimecore
+ result = /obj/item/food/snacks/boiledslimecore
/datum/recipe/microwave/mint
reagents = list("toxin" = 5)
- result = /obj/item/reagent_containers/food/snacks/mint
+ result = /obj/item/food/snacks/mint
/datum/recipe/microwave/chocolateegg
items = list(
- /obj/item/reagent_containers/food/snacks/egg,
- /obj/item/reagent_containers/food/snacks/chocolatebar,
+ /obj/item/food/snacks/egg,
+ /obj/item/food/snacks/chocolatebar,
)
- result = /obj/item/reagent_containers/food/snacks/chocolateegg
+ result = /obj/item/food/snacks/chocolateegg
/datum/recipe/microwave/mysterysoup
reagents = list("water" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/badrecipe,
- /obj/item/reagent_containers/food/snacks/tofu,
- /obj/item/reagent_containers/food/snacks/egg,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/food/snacks/badrecipe,
+ /obj/item/food/snacks/tofu,
+ /obj/item/food/snacks/egg,
+ /obj/item/food/snacks/cheesewedge,
)
- result = /obj/item/reagent_containers/food/snacks/soup/mysterysoup
+ result = /obj/item/food/snacks/soup/mysterysoup
/datum/recipe/microwave/mushroomsoup
reagents = list("water" = 5, "milk" = 5)
- items = list(/obj/item/reagent_containers/food/snacks/grown/mushroom)
- result = /obj/item/reagent_containers/food/snacks/soup/mushroomsoup
+ items = list(/obj/item/food/snacks/grown/mushroom)
+ result = /obj/item/food/snacks/soup/mushroomsoup
/datum/recipe/microwave/chawanmushi
reagents = list("water" = 5, "soysauce" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/egg,
- /obj/item/reagent_containers/food/snacks/egg,
- /obj/item/reagent_containers/food/snacks/grown/mushroom
+ /obj/item/food/snacks/egg,
+ /obj/item/food/snacks/egg,
+ /obj/item/food/snacks/grown/mushroom
)
- result = /obj/item/reagent_containers/food/snacks/chawanmushi
+ result = /obj/item/food/snacks/chawanmushi
/datum/recipe/microwave/beetsoup
reagents = list("water" = 10)
- items = list(/obj/item/reagent_containers/food/snacks/grown/whitebeet, /obj/item/reagent_containers/food/snacks/grown/cabbage)
- result = /obj/item/reagent_containers/food/snacks/soup/beetsoup
+ items = list(/obj/item/food/snacks/grown/whitebeet, /obj/item/food/snacks/grown/cabbage)
+ result = /obj/item/food/snacks/soup/beetsoup
/datum/recipe/microwave/salad
items = list(
- /obj/item/reagent_containers/food/snacks/grown/cabbage,
- /obj/item/reagent_containers/food/snacks/grown/cabbage
+ /obj/item/food/snacks/grown/cabbage,
+ /obj/item/food/snacks/grown/cabbage
)
- result = /obj/item/reagent_containers/food/snacks/salad
+ result = /obj/item/food/snacks/salad
/datum/recipe/microwave/antipasto_salad
items = list(
- /obj/item/reagent_containers/food/snacks/grown/cabbage,
- /obj/item/reagent_containers/food/snacks/grown/cabbage,
- /obj/item/reagent_containers/food/snacks/grown/olive,
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/cutlet,
- /obj/item/reagent_containers/food/snacks/cheesewedge
+ /obj/item/food/snacks/grown/cabbage,
+ /obj/item/food/snacks/grown/cabbage,
+ /obj/item/food/snacks/grown/olive,
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/cutlet,
+ /obj/item/food/snacks/cheesewedge
)
- result = /obj/item/reagent_containers/food/snacks/salad/antipasto
+ result = /obj/item/food/snacks/salad/antipasto
/datum/recipe/microwave/caesar_salad
reagents = list("oliveoil" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/grown/cabbage,
- /obj/item/reagent_containers/food/snacks/onion_slice/red,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/breadslice
+ /obj/item/food/snacks/grown/cabbage,
+ /obj/item/food/snacks/onion_slice/red,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/breadslice
)
- result = /obj/item/reagent_containers/food/snacks/salad/caesar
+ result = /obj/item/food/snacks/salad/caesar
/datum/recipe/microwave/citrusdelight
items = list(
- /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/citrus/lemon
+ /obj/item/food/snacks/grown/citrus/lime,
+ /obj/item/food/snacks/grown/citrus/orange,
+ /obj/item/food/snacks/grown/citrus/lemon
)
- result = /obj/item/reagent_containers/food/snacks/salad/citrusdelight
+ result = /obj/item/food/snacks/salad/citrusdelight
/datum/recipe/microwave/fruitsalad
items = list(
- /obj/item/reagent_containers/food/snacks/grown/citrus/orange,
- /obj/item/reagent_containers/food/snacks/grown/apple,
- /obj/item/reagent_containers/food/snacks/grown/grapes,
- /obj/item/reagent_containers/food/snacks/watermelonslice
+ /obj/item/food/snacks/grown/citrus/orange,
+ /obj/item/food/snacks/grown/apple,
+ /obj/item/food/snacks/grown/grapes,
+ /obj/item/food/snacks/watermelonslice
)
- result = /obj/item/reagent_containers/food/snacks/salad/fruit
+ result = /obj/item/food/snacks/salad/fruit
/datum/recipe/microwave/greek_salad
reagents = list("oliveoil" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/grown/olive,
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/onion_slice/red,
- /obj/item/reagent_containers/food/snacks/onion_slice/red,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge
+ /obj/item/food/snacks/grown/olive,
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/onion_slice/red,
+ /obj/item/food/snacks/onion_slice/red,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge
)
- result = /obj/item/reagent_containers/food/snacks/salad/greek
+ result = /obj/item/food/snacks/salad/greek
/datum/recipe/microwave/junglesalad
items = list(
- /obj/item/reagent_containers/food/snacks/grown/apple,
- /obj/item/reagent_containers/food/snacks/grown/grapes,
- /obj/item/reagent_containers/food/snacks/grown/banana,
- /obj/item/reagent_containers/food/snacks/grown/banana,
- /obj/item/reagent_containers/food/snacks/watermelonslice,
- /obj/item/reagent_containers/food/snacks/watermelonslice
+ /obj/item/food/snacks/grown/apple,
+ /obj/item/food/snacks/grown/grapes,
+ /obj/item/food/snacks/grown/banana,
+ /obj/item/food/snacks/grown/banana,
+ /obj/item/food/snacks/watermelonslice,
+ /obj/item/food/snacks/watermelonslice
)
- result = /obj/item/reagent_containers/food/snacks/salad/jungle
+ result = /obj/item/food/snacks/salad/jungle
/datum/recipe/microwave/kale_salad
reagents = list("oliveoil" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/grown/carrot,
- /obj/item/reagent_containers/food/snacks/grown/cabbage,
- /obj/item/reagent_containers/food/snacks/onion_slice/red,
- /obj/item/reagent_containers/food/snacks/onion_slice/red
+ /obj/item/food/snacks/grown/carrot,
+ /obj/item/food/snacks/grown/cabbage,
+ /obj/item/food/snacks/onion_slice/red,
+ /obj/item/food/snacks/onion_slice/red
)
- result = /obj/item/reagent_containers/food/snacks/salad/kale
+ result = /obj/item/food/snacks/salad/kale
/datum/recipe/microwave/potato_salad
reagents = list("mayonnaise" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/grown/potato,
- /obj/item/reagent_containers/food/snacks/grown/potato,
- /obj/item/reagent_containers/food/snacks/boiledegg
+ /obj/item/food/snacks/grown/potato,
+ /obj/item/food/snacks/grown/potato,
+ /obj/item/food/snacks/boiledegg
)
- result = /obj/item/reagent_containers/food/snacks/salad/potato
+ result = /obj/item/food/snacks/salad/potato
/datum/recipe/microwave/melonfruitbowl
items = list(
- /obj/item/reagent_containers/food/snacks/grown/watermelon,
- /obj/item/reagent_containers/food/snacks/grown/apple,
- /obj/item/reagent_containers/food/snacks/grown/ambrosia,
- /obj/item/reagent_containers/food/snacks/grown/banana,
- /obj/item/reagent_containers/food/snacks/grown/citrus/orange,
- /obj/item/reagent_containers/food/snacks/grown/citrus/lemon
+ /obj/item/food/snacks/grown/watermelon,
+ /obj/item/food/snacks/grown/apple,
+ /obj/item/food/snacks/grown/ambrosia,
+ /obj/item/food/snacks/grown/banana,
+ /obj/item/food/snacks/grown/citrus/orange,
+ /obj/item/food/snacks/grown/citrus/lemon
)
- result = /obj/item/reagent_containers/food/snacks/salad/melonfruitbowl
+ result = /obj/item/food/snacks/salad/melonfruitbowl
/datum/recipe/microwave/herbsalad
- items = list(/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris, /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris,
- /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris, /obj/item/reagent_containers/food/snacks/grown/apple)
- result = /obj/item/reagent_containers/food/snacks/salad/herb
+ items = list(/obj/item/food/snacks/grown/ambrosia/vulgaris, /obj/item/food/snacks/grown/ambrosia/vulgaris,
+ /obj/item/food/snacks/grown/ambrosia/vulgaris, /obj/item/food/snacks/grown/apple)
+ result = /obj/item/food/snacks/salad/herb
/datum/recipe/microwave/herbsalad/make_food(obj/container)
- var/obj/item/reagent_containers/food/snacks/salad/herb/being_cooked = ..()
+ var/obj/item/food/snacks/salad/herb/being_cooked = ..()
being_cooked.reagents.del_reagent("toxin")
return being_cooked
/datum/recipe/microwave/aesirsalad
- items = list(/obj/item/reagent_containers/food/snacks/grown/ambrosia/deus, /obj/item/reagent_containers/food/snacks/grown/ambrosia/deus,
- /obj/item/reagent_containers/food/snacks/grown/ambrosia/deus, /obj/item/reagent_containers/food/snacks/grown/apple/gold)
- result = /obj/item/reagent_containers/food/snacks/salad/aesir
+ items = list(/obj/item/food/snacks/grown/ambrosia/deus, /obj/item/food/snacks/grown/ambrosia/deus,
+ /obj/item/food/snacks/grown/ambrosia/deus, /obj/item/food/snacks/grown/apple/gold)
+ result = /obj/item/food/snacks/salad/aesir
/datum/recipe/microwave/validsalad
- items = list(/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris, /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris,
- /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris, /obj/item/reagent_containers/food/snacks/grown/potato,
- /obj/item/reagent_containers/food/snacks/meatball)
- result = /obj/item/reagent_containers/food/snacks/salad/valid
+ items = list(/obj/item/food/snacks/grown/ambrosia/vulgaris, /obj/item/food/snacks/grown/ambrosia/vulgaris,
+ /obj/item/food/snacks/grown/ambrosia/vulgaris, /obj/item/food/snacks/grown/potato,
+ /obj/item/food/snacks/meatball)
+ result = /obj/item/food/snacks/salad/valid
/datum/recipe/microwave/validsalad/make_food(obj/container)
- var/obj/item/reagent_containers/food/snacks/salad/valid/being_cooked = ..()
+ var/obj/item/food/snacks/salad/valid/being_cooked = ..()
being_cooked.reagents.del_reagent("toxin")
return being_cooked
@@ -1017,325 +1017,325 @@
/datum/recipe/microwave/wrap
reagents = list("soysauce" = 10)
- items = list(/obj/item/reagent_containers/food/snacks/friedegg, /obj/item/reagent_containers/food/snacks/grown/cabbage )
- result = /obj/item/reagent_containers/food/snacks/wrap
+ items = list(/obj/item/food/snacks/friedegg, /obj/item/food/snacks/grown/cabbage )
+ result = /obj/item/food/snacks/wrap
/datum/recipe/microwave/beans
reagents = list("ketchup" = 5)
- items = list(/obj/item/reagent_containers/food/snacks/grown/soybeans, /obj/item/reagent_containers/food/snacks/grown/soybeans)
- result = /obj/item/reagent_containers/food/snacks/beans
+ items = list(/obj/item/food/snacks/grown/soybeans, /obj/item/food/snacks/grown/soybeans)
+ result = /obj/item/food/snacks/beans
/datum/recipe/microwave/benedict
items = list(
- /obj/item/reagent_containers/food/snacks/friedegg,
- /obj/item/reagent_containers/food/snacks/meatsteak,
- /obj/item/reagent_containers/food/snacks/breadslice,
+ /obj/item/food/snacks/friedegg,
+ /obj/item/food/snacks/meatsteak,
+ /obj/item/food/snacks/breadslice,
)
- result = /obj/item/reagent_containers/food/snacks/benedict
+ result = /obj/item/food/snacks/benedict
/datum/recipe/microwave/meatbun
reagents = list("soysauce" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/meatball,
- /obj/item/reagent_containers/food/snacks/grown/cabbage
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/meatball,
+ /obj/item/food/snacks/grown/cabbage
)
- result = /obj/item/reagent_containers/food/snacks/meatbun
+ result = /obj/item/food/snacks/meatbun
/datum/recipe/microwave/icecreamsandwich
reagents = list("ice" = 5, "cream" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/frozen/icecream,
+ /obj/item/food/snacks/frozen/icecream,
)
- result = /obj/item/reagent_containers/food/snacks/frozen/icecreamsandwich
+ result = /obj/item/food/snacks/frozen/icecreamsandwich
/datum/recipe/microwave/berryicecreamsandwich
reagents = list("ice" = 5, "cream" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/grown/cherries,
- /obj/item/reagent_containers/food/snacks/grown/cherries,
- /obj/item/reagent_containers/food/snacks/wafflecone
+ /obj/item/food/snacks/grown/cherries,
+ /obj/item/food/snacks/grown/cherries,
+ /obj/item/food/snacks/wafflecone
)
- result = /obj/item/reagent_containers/food/snacks/frozen/berryicecreamsandwich
+ result = /obj/item/food/snacks/frozen/berryicecreamsandwich
/datum/recipe/microwave/sundae
reagents = list("cream" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/wafflecone,
- /obj/item/reagent_containers/food/snacks/grown/cherries,
- /obj/item/reagent_containers/food/snacks/grown/banana
+ /obj/item/food/snacks/wafflecone,
+ /obj/item/food/snacks/grown/cherries,
+ /obj/item/food/snacks/grown/banana
)
- result = /obj/item/reagent_containers/food/snacks/frozen/sundae
+ result = /obj/item/food/snacks/frozen/sundae
/datum/recipe/microwave/bananatopsicle
reagents = list("sugar" = 5, "banana" = 5)
items = list(
/obj/item/popsicle_stick,
- /obj/item/reagent_containers/food/snacks/tofu
+ /obj/item/food/snacks/tofu
)
- result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/bananatop
+ result = /obj/item/food/snacks/frozen/popsicle/bananatop
/datum/recipe/microwave/berrytopsicle
reagents = list("sugar" = 5, "berryjuice" = 5)
items = list(
/obj/item/popsicle_stick,
- /obj/item/reagent_containers/food/snacks/tofu
+ /obj/item/food/snacks/tofu
)
- result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/berrytop
+ result = /obj/item/food/snacks/frozen/popsicle/berrytop
/datum/recipe/microwave/pineappletopsicle
reagents = list("sugar" = 5, "pineapplejuice" = 5)
items = list(
/obj/item/popsicle_stick,
- /obj/item/reagent_containers/food/snacks/tofu
+ /obj/item/food/snacks/tofu
)
- result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/pineappletop
+ result = /obj/item/food/snacks/frozen/popsicle/pineappletop
/datum/recipe/microwave/licoricecreamsicle
reagents = list("sugar" = 2, "blumpkinjuice" = 4, "ice" = 2, "vanilla" = 2, "cream" = 2)
items = list(
/obj/item/popsicle_stick
)
- result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/licoricecream
+ result = /obj/item/food/snacks/frozen/popsicle/licoricecream
/datum/recipe/microwave/orangecreamsicle
reagents = list("sugar" = 2, "orangejuice" = 4, "ice" = 2, "vanilla" = 2, "cream" = 2)
items = list(
/obj/item/popsicle_stick
)
- result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/orangecream
+ result = /obj/item/food/snacks/frozen/popsicle/orangecream
/datum/recipe/microwave/berrycreamsicle
reagents = list("sugar" = 2, "berryjuice" = 4, "ice" = 2, "vanilla" = 2, "cream" = 2)
items = list(
/obj/item/popsicle_stick
)
- result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/berrycream
+ result = /obj/item/food/snacks/frozen/popsicle/berrycream
/datum/recipe/microwave/frozenpineapplepop
items = list(
/obj/item/popsicle_stick,
- /obj/item/reagent_containers/food/snacks/pineappleslice,
- /obj/item/reagent_containers/food/snacks/chocolatebar
+ /obj/item/food/snacks/pineappleslice,
+ /obj/item/food/snacks/chocolatebar
)
- result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/frozenpineapple
+ result = /obj/item/food/snacks/frozen/popsicle/frozenpineapple
/datum/recipe/microwave/jumboicecream
reagents = list("sugar" = 2, "ice" = 2, "vanilla" = 3, "cream" = 2)
items = list(
/obj/item/popsicle_stick,
- /obj/item/reagent_containers/food/snacks/chocolatebar
+ /obj/item/food/snacks/chocolatebar
)
- result = /obj/item/reagent_containers/food/snacks/frozen/popsicle
+ result = /obj/item/food/snacks/frozen/popsicle
/datum/recipe/microwave/seasalticecream
reagents = list("sugar" = 5, "sodiumchloride" = 3, "cream" = 5)
items = list(
/obj/item/popsicle_stick
)
- result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/sea_salt
+ result = /obj/item/food/snacks/frozen/popsicle/sea_salt
/datum/recipe/microwave/cornuto
reagents = list("ice" = 2, "sugar" = 4, "cream" = 4)
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/chocolatebar
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/chocolatebar
)
- result = /obj/item/reagent_containers/food/snacks/frozen/cornuto
+ result = /obj/item/food/snacks/frozen/cornuto
/datum/recipe/microwave/honkdae
reagents = list("cream" = 5, "ice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/wafflecone,
- /obj/item/reagent_containers/food/snacks/grown/cherries,
- /obj/item/reagent_containers/food/snacks/grown/banana,
- /obj/item/reagent_containers/food/snacks/grown/banana,
+ /obj/item/food/snacks/wafflecone,
+ /obj/item/food/snacks/grown/cherries,
+ /obj/item/food/snacks/grown/banana,
+ /obj/item/food/snacks/grown/banana,
/obj/item/clothing/mask/gas/clown_hat
)
- result = /obj/item/reagent_containers/food/snacks/frozen/honkdae
+ result = /obj/item/food/snacks/frozen/honkdae
/datum/recipe/microwave/peanutbuttermochi
reagents = list("cream" = 5, "rice" = 5, "sugar" = 5, "peanutbutter" = 2)
items = list(
- /obj/item/reagent_containers/food/snacks/wafflecone
+ /obj/item/food/snacks/wafflecone
)
- result = /obj/item/reagent_containers/food/snacks/frozen/peanutbuttermochi
+ result = /obj/item/food/snacks/frozen/peanutbuttermochi
/datum/recipe/microwave/spacefreezy
reagents = list("bluecherryjelly" = 5,"spacemountainwind" = 15)
items = list(
- /obj/item/reagent_containers/food/snacks/frozen/icecream
+ /obj/item/food/snacks/frozen/icecream
)
- result = /obj/item/reagent_containers/food/snacks/frozen/spacefreezy
+ result = /obj/item/food/snacks/frozen/spacefreezy
/datum/recipe/microwave/snowcone/apple
reagents = list("ice" = 15, "applejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/drinks/sillycup
+ /obj/item/reagent_containers/drinks/sillycup
)
- result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/apple
+ result = /obj/item/food/snacks/frozen/snowcone/apple
/datum/recipe/microwave/snowcone/berry
reagents = list("ice" = 15, "berryjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/drinks/sillycup
+ /obj/item/reagent_containers/drinks/sillycup
)
- result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/berry
+ result = /obj/item/food/snacks/frozen/snowcone/berry
/datum/recipe/microwave/snowcone/bluecherry
reagents = list("ice" = 15, "bluecherryjelly" = 5)
items = list(
- /obj/item/reagent_containers/food/drinks/sillycup
+ /obj/item/reagent_containers/drinks/sillycup
)
- result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/bluecherry
+ result = /obj/item/food/snacks/frozen/snowcone/bluecherry
/datum/recipe/microwave/snowcone/cherry
reagents = list("ice" = 15, "cherryjelly" = 5)
items = list(
- /obj/item/reagent_containers/food/drinks/sillycup
+ /obj/item/reagent_containers/drinks/sillycup
)
- result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/cherry
+ result = /obj/item/food/snacks/frozen/snowcone/cherry
/datum/recipe/microwave/snowcone/flavorless
reagents = list("ice" = 15)
items = list(
- /obj/item/reagent_containers/food/drinks/sillycup
+ /obj/item/reagent_containers/drinks/sillycup
)
- result = /obj/item/reagent_containers/food/snacks/frozen/snowcone
+ result = /obj/item/food/snacks/frozen/snowcone
/datum/recipe/microwave/snowcone/fruitsalad
reagents = list("ice" = 15, "orangejuice" = 5, "limejuice" = 5, "lemonjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/drinks/sillycup
+ /obj/item/reagent_containers/drinks/sillycup
)
- result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/fruitsalad
+ result = /obj/item/food/snacks/frozen/snowcone/fruitsalad
/datum/recipe/microwave/snowcone/grape
reagents = list("ice" = 15, "grapejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/drinks/sillycup
+ /obj/item/reagent_containers/drinks/sillycup
)
- result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/grape
+ result = /obj/item/food/snacks/frozen/snowcone/grape
/datum/recipe/microwave/snowcone/honey
reagents = list("ice" = 15, "honey" = 5)
items = list(
- /obj/item/reagent_containers/food/drinks/sillycup
+ /obj/item/reagent_containers/drinks/sillycup
)
- result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/honey
+ result = /obj/item/food/snacks/frozen/snowcone/honey
/datum/recipe/microwave/snowcone/lemon
reagents = list("ice" = 15, "lemonjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/drinks/sillycup
+ /obj/item/reagent_containers/drinks/sillycup
)
- result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/lemon
+ result = /obj/item/food/snacks/frozen/snowcone/lemon
/datum/recipe/microwave/snowcone/lime
reagents = list("ice" = 15, "limejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/drinks/sillycup
+ /obj/item/reagent_containers/drinks/sillycup
)
- result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/lime
+ result = /obj/item/food/snacks/frozen/snowcone/lime
/datum/recipe/microwave/snowcone/mime
reagents = list("ice" = 15, "nothing" = 5)
items = list(
- /obj/item/reagent_containers/food/drinks/sillycup
+ /obj/item/reagent_containers/drinks/sillycup
)
- result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/mime
+ result = /obj/item/food/snacks/frozen/snowcone/mime
/datum/recipe/microwave/snowcone/orange
reagents = list("ice" = 15, "orangejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/drinks/sillycup
+ /obj/item/reagent_containers/drinks/sillycup
)
- result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/orange
+ result = /obj/item/food/snacks/frozen/snowcone/orange
/datum/recipe/microwave/snowcone/pineapple
reagents = list("ice" = 15, "pineapplejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/drinks/sillycup
+ /obj/item/reagent_containers/drinks/sillycup
)
- result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/pineapple
+ result = /obj/item/food/snacks/frozen/snowcone/pineapple
/datum/recipe/microwave/snowcone/rainbow
reagents = list("ice" = 15, "colorful_reagent" = 5)
items = list(
- /obj/item/reagent_containers/food/drinks/sillycup
+ /obj/item/reagent_containers/drinks/sillycup
)
- result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/rainbow
+ result = /obj/item/food/snacks/frozen/snowcone/rainbow
/datum/recipe/microwave/snowcone/cola
reagents = list("ice" = 15, "cola" = 5)
items = list(
- /obj/item/reagent_containers/food/drinks/sillycup
+ /obj/item/reagent_containers/drinks/sillycup
)
- result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/cola
+ result = /obj/item/food/snacks/frozen/snowcone/cola
/datum/recipe/microwave/snowcone/spacemountainwind
reagents = list("ice" = 15, "spacemountainwind" = 5)
items = list(
- /obj/item/reagent_containers/food/drinks/sillycup
+ /obj/item/reagent_containers/drinks/sillycup
)
- result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/spacemountain
+ result = /obj/item/food/snacks/frozen/snowcone/spacemountain
/datum/recipe/microwave/antpopsicle
reagents = list("sugar" = 5, "water" = 5, "ants" = 10)
items = list(
/obj/item/popsicle_stick
)
- result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/ant
+ result = /obj/item/food/snacks/frozen/popsicle/ant
/datum/recipe/microwave/notasandwich
items = list(
- /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/clothing/mask/fakemoustache,
)
- result = /obj/item/reagent_containers/food/snacks/notasandwich
+ result = /obj/item/food/snacks/notasandwich
/datum/recipe/microwave/friedbanana
reagents = list("sugar" = 10, "cornoil" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/grown/banana
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/grown/banana
)
- result = /obj/item/reagent_containers/food/snacks/friedbanana
+ result = /obj/item/food/snacks/friedbanana
/datum/recipe/microwave/stuffing
reagents = list("water" = 5, "sodiumchloride" = 1, "blackpepper" = 1)
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/bread,
+ /obj/item/food/snacks/sliceable/bread,
)
- result = /obj/item/reagent_containers/food/snacks/stuffing
+ result = /obj/item/food/snacks/stuffing
/datum/recipe/microwave/boiledspiderleg
reagents = list("water" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/monstermeat/spiderleg
+ /obj/item/food/snacks/monstermeat/spiderleg
)
- result = /obj/item/reagent_containers/food/snacks/boiledspiderleg
+ result = /obj/item/food/snacks/boiledspiderleg
/datum/recipe/microwave/spidereggsham
reagents = list("sodiumchloride" = 1)
items = list(
- /obj/item/reagent_containers/food/snacks/monstermeat/spidereggs,
- /obj/item/reagent_containers/food/snacks/monstermeat/spidermeat
+ /obj/item/food/snacks/monstermeat/spidereggs,
+ /obj/item/food/snacks/monstermeat/spidermeat
)
- result = /obj/item/reagent_containers/food/snacks/spidereggsham
+ result = /obj/item/food/snacks/spidereggsham
/datum/recipe/microwave/sashimi
reagents = list("soysauce" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/monstermeat/spidereggs,
- /obj/item/reagent_containers/food/snacks/carpmeat,
+ /obj/item/food/snacks/monstermeat/spidereggs,
+ /obj/item/food/snacks/carpmeat,
)
- result = /obj/item/reagent_containers/food/snacks/sashimi
+ result = /obj/item/food/snacks/sashimi
/datum/recipe/microwave/mashedtaters
reagents = list("gravy" = 5)
- items = list(/obj/item/reagent_containers/food/snacks/grown/potato)
- result = /obj/item/reagent_containers/food/snacks/mashed_potatoes
+ items = list(/obj/item/food/snacks/grown/potato)
+ result = /obj/item/food/snacks/mashed_potatoes
//////////////////////////////////////////
// bs12 food port stuff
@@ -1343,19 +1343,19 @@
/datum/recipe/microwave/taco
items = list(
- /obj/item/reagent_containers/food/snacks/doughslice,
- /obj/item/reagent_containers/food/snacks/cutlet,
- /obj/item/reagent_containers/food/snacks/cheesewedge
+ /obj/item/food/snacks/doughslice,
+ /obj/item/food/snacks/cutlet,
+ /obj/item/food/snacks/cheesewedge
)
- result = /obj/item/reagent_containers/food/snacks/taco
+ result = /obj/item/food/snacks/taco
/datum/recipe/microwave/mint_2
reagents = list("sugar" = 5, "frostoil" = 5)
- result = /obj/item/reagent_containers/food/snacks/mint
+ result = /obj/item/food/snacks/mint
/datum/recipe/microwave/boiled_shrimp
reagents = list("water" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/shrimp
+ /obj/item/food/snacks/shrimp
)
- result = /obj/item/reagent_containers/food/snacks/boiled_shrimp
+ result = /obj/item/food/snacks/boiled_shrimp
diff --git a/code/modules/food_and_drinks/recipes/recipes_oven.dm b/code/modules/food_and_drinks/recipes/recipes_oven.dm
index a06b87d8883..e95dad37b10 100644
--- a/code/modules/food_and_drinks/recipes/recipes_oven.dm
+++ b/code/modules/food_and_drinks/recipes/recipes_oven.dm
@@ -4,209 +4,209 @@
/datum/recipe/oven/bun
items = list(
- /obj/item/reagent_containers/food/snacks/dough
+ /obj/item/food/snacks/dough
)
- result = /obj/item/reagent_containers/food/snacks/bun
+ result = /obj/item/food/snacks/bun
/datum/recipe/oven/meatbread
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /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/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/meatbread
+ result = /obj/item/food/snacks/sliceable/meatbread
/datum/recipe/oven/syntibread
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/meat/syntiflesh,
- /obj/item/reagent_containers/food/snacks/meat/syntiflesh,
- /obj/item/reagent_containers/food/snacks/meat/syntiflesh,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/meat/syntiflesh,
+ /obj/item/food/snacks/meat/syntiflesh,
+ /obj/item/food/snacks/meat/syntiflesh,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/meatbread
+ result = /obj/item/food/snacks/sliceable/meatbread
/datum/recipe/oven/xenomeatbread
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/monstermeat/xenomeat,
- /obj/item/reagent_containers/food/snacks/monstermeat/xenomeat,
- /obj/item/reagent_containers/food/snacks/monstermeat/xenomeat,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/monstermeat/xenomeat,
+ /obj/item/food/snacks/monstermeat/xenomeat,
+ /obj/item/food/snacks/monstermeat/xenomeat,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/xenomeatbread
+ result = /obj/item/food/snacks/sliceable/xenomeatbread
/datum/recipe/oven/bananabread
reagents = list("milk" = 5, "sugar" = 15)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/grown/banana
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/grown/banana
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/bananabread
+ result = /obj/item/food/snacks/sliceable/bananabread
/datum/recipe/oven/banarnarbread
reagents = list("milk" = 5, "sugar" = 5, "blood" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/grown/banana
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/grown/banana
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/banarnarbread
+ result = /obj/item/food/snacks/sliceable/banarnarbread
/datum/recipe/oven/muffin
reagents = list("milk" = 5, "sugar" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
+ /obj/item/food/snacks/dough,
)
- result = /obj/item/reagent_containers/food/snacks/muffin
+ result = /obj/item/food/snacks/muffin
/datum/recipe/oven/carrotcake
reagents = list("milk" = 5, "sugar" = 15)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /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/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/grown/carrot,
+ /obj/item/food/snacks/grown/carrot,
+ /obj/item/food/snacks/grown/carrot
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/carrotcake
+ result = /obj/item/food/snacks/sliceable/carrotcake
/datum/recipe/oven/cheesecake
reagents = list("milk" = 5, "sugar" = 15)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/cheesecake
+ result = /obj/item/food/snacks/sliceable/cheesecake
/datum/recipe/oven/plaincake
reagents = list("milk" = 5, "sugar" = 15)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/plaincake
+ result = /obj/item/food/snacks/sliceable/plaincake
/datum/recipe/oven/clowncake
reagents = list("milk" = 5, "sugar" = 15)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/frozen/sundae,
- /obj/item/reagent_containers/food/snacks/frozen/sundae,
- /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/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/frozen/sundae,
+ /obj/item/food/snacks/frozen/sundae,
+ /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
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/clowncake
+ result = /obj/item/food/snacks/sliceable/clowncake
/datum/recipe/oven/meatpie
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/meat,
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/meat,
)
- result = /obj/item/reagent_containers/food/snacks/meatpie
+ result = /obj/item/food/snacks/meatpie
/datum/recipe/oven/tofupie
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/tofu,
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/tofu,
)
- result = /obj/item/reagent_containers/food/snacks/tofupie
+ result = /obj/item/food/snacks/tofupie
/datum/recipe/oven/xemeatpie
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/monstermeat/xenomeat
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/monstermeat/xenomeat
)
- result = /obj/item/reagent_containers/food/snacks/xemeatpie
+ result = /obj/item/food/snacks/xemeatpie
/datum/recipe/oven/pie
reagents = list("sugar" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/grown/banana
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/grown/banana
)
- result = /obj/item/reagent_containers/food/snacks/pie
+ result = /obj/item/food/snacks/pie
/datum/recipe/oven/cherrypie
reagents = list("sugar" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/grown/cherries
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/grown/cherries
)
- result = /obj/item/reagent_containers/food/snacks/cherrypie
+ result = /obj/item/food/snacks/cherrypie
/datum/recipe/oven/berryclafoutis
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/grown/berries
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/grown/berries
)
- result = /obj/item/reagent_containers/food/snacks/berryclafoutis
+ result = /obj/item/food/snacks/berryclafoutis
/datum/recipe/oven/tofubread
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/tofu,
- /obj/item/reagent_containers/food/snacks/tofu,
- /obj/item/reagent_containers/food/snacks/tofu,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/tofu,
+ /obj/item/food/snacks/tofu,
+ /obj/item/food/snacks/tofu,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/tofubread
+ result = /obj/item/food/snacks/sliceable/tofubread
/datum/recipe/oven/loadedbakedpotato
items = list(
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/grown/potato
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/grown/potato
)
- result = /obj/item/reagent_containers/food/snacks/loadedbakedpotato
+ result = /obj/item/food/snacks/loadedbakedpotato
/datum/recipe/oven/yakiimo
items = list(
- /obj/item/reagent_containers/food/snacks/grown/potato/sweet
+ /obj/item/food/snacks/grown/potato/sweet
)
- result = /obj/item/reagent_containers/food/snacks/yakiimo
+ result = /obj/item/food/snacks/yakiimo
////cookies by Ume
/datum/recipe/oven/cookies
items = list(
- /obj/item/reagent_containers/food/snacks/rawcookies/chocochips,
+ /obj/item/food/snacks/rawcookies/chocochips,
)
result = /obj/item/storage/bag/tray/cookies_tray
/datum/recipe/oven/sugarcookies
items = list(
- /obj/item/reagent_containers/food/snacks/rawcookies,
+ /obj/item/food/snacks/rawcookies,
)
result = /obj/item/storage/bag/tray/cookies_tray/sugarcookie
@@ -216,15 +216,15 @@
/datum/recipe/oven/fortunecookie
reagents = list("sugar" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/doughslice,
+ /obj/item/food/snacks/doughslice,
/obj/item/paper,
)
- result = /obj/item/reagent_containers/food/snacks/fortunecookie
+ result = /obj/item/food/snacks/fortunecookie
/datum/recipe/oven/fortunecookie/make_food(obj/container)
var/obj/item/paper/P = locate() in container
P.loc = null //So we don't delete the paper while cooking the cookie
- var/obj/item/reagent_containers/food/snacks/fortunecookie/being_cooked = ..()
+ var/obj/item/food/snacks/fortunecookie/being_cooked = ..()
if(P.info) //If there's anything written on the paper, just move it into the fortune cookie
P.forceMove(being_cooked) //Prevents the oven deleting our paper
being_cooked.trash = P //so the paper is left behind as trash without special-snowflake(TM Nodrak) code ~carn
@@ -235,367 +235,367 @@
// Pizzas
/datum/recipe/oven/pizzamargherita
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/margheritapizza
+ result = /obj/item/food/snacks/sliceable/pizza/margheritapizza
/datum/recipe/oven/meatpizza
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /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/cheesewedge,
- /obj/item/reagent_containers/food/snacks/grown/tomato
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/grown/tomato
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/meatpizza
+ result = /obj/item/food/snacks/sliceable/pizza/meatpizza
/datum/recipe/oven/mushroompizza
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/grown/mushroom,
- /obj/item/reagent_containers/food/snacks/grown/mushroom,
- /obj/item/reagent_containers/food/snacks/grown/mushroom,
- /obj/item/reagent_containers/food/snacks/grown/mushroom,
- /obj/item/reagent_containers/food/snacks/grown/mushroom,
- /obj/item/reagent_containers/food/snacks/grown/tomato
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/grown/mushroom,
+ /obj/item/food/snacks/grown/mushroom,
+ /obj/item/food/snacks/grown/mushroom,
+ /obj/item/food/snacks/grown/mushroom,
+ /obj/item/food/snacks/grown/mushroom,
+ /obj/item/food/snacks/grown/tomato
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/mushroompizza
+ result = /obj/item/food/snacks/sliceable/pizza/mushroompizza
/datum/recipe/oven/vegetablepizza
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/grown/eggplant,
- /obj/item/reagent_containers/food/snacks/grown/carrot,
- /obj/item/reagent_containers/food/snacks/grown/corn,
- /obj/item/reagent_containers/food/snacks/grown/tomato
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/grown/eggplant,
+ /obj/item/food/snacks/grown/carrot,
+ /obj/item/food/snacks/grown/corn,
+ /obj/item/food/snacks/grown/tomato
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza
+ result = /obj/item/food/snacks/sliceable/pizza/vegetablepizza
/datum/recipe/oven/hawaiianpizza
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/pineappleslice,
- /obj/item/reagent_containers/food/snacks/pineappleslice,
- /obj/item/reagent_containers/food/snacks/meat,
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/pineappleslice,
+ /obj/item/food/snacks/pineappleslice,
+ /obj/item/food/snacks/meat,
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/hawaiianpizza
+ result = /obj/item/food/snacks/sliceable/pizza/hawaiianpizza
/datum/recipe/oven/macncheesepizza
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/macncheese,
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/macncheese,
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/macpizza
+ result = /obj/item/food/snacks/sliceable/pizza/macpizza
/datum/recipe/oven/cheesepizza
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/cheesepizza
+ result = /obj/item/food/snacks/sliceable/pizza/cheesepizza
/datum/recipe/oven/pepperonipizza
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/sausage
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/sausage
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/pepperonipizza
+ result = /obj/item/food/snacks/sliceable/pizza/pepperonipizza
/datum/recipe/oven/donkpocketpizza
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/donkpocket,
- /obj/item/reagent_containers/food/snacks/donkpocket
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/donkpocket,
+ /obj/item/food/snacks/donkpocket
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/donkpocketpizza
+ result = /obj/item/food/snacks/sliceable/pizza/donkpocketpizza
/datum/recipe/oven/dankpizza
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/grown/cannabis,
- /obj/item/reagent_containers/food/snacks/grown/cannabis,
- /obj/item/reagent_containers/food/snacks/grown/cannabis,
- /obj/item/reagent_containers/food/snacks/grown/cannabis
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/grown/cannabis,
+ /obj/item/food/snacks/grown/cannabis,
+ /obj/item/food/snacks/grown/cannabis,
+ /obj/item/food/snacks/grown/cannabis
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/dankpizza
+ result = /obj/item/food/snacks/sliceable/pizza/dankpizza
/datum/recipe/oven/firecrackerpizza
reagents = list("capsaicin" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/grown/chili,
- /obj/item/reagent_containers/food/snacks/grown/chili
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/grown/chili,
+ /obj/item/food/snacks/grown/chili
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/firecrackerpizza
+ result = /obj/item/food/snacks/sliceable/pizza/firecrackerpizza
/datum/recipe/oven/pestopizza
reagents = list("wasabi" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/cheesewedge
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/cheesewedge
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/pestopizza
+ result = /obj/item/food/snacks/sliceable/pizza/pestopizza
/datum/recipe/oven/garlicpizza
reagents = list("garlic" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/grown/garlic,
- /obj/item/reagent_containers/food/snacks/grown/garlic,
- /obj/item/reagent_containers/food/snacks/cheesewedge
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/grown/garlic,
+ /obj/item/food/snacks/grown/garlic,
+ /obj/item/food/snacks/cheesewedge
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/garlicpizza
+ result = /obj/item/food/snacks/sliceable/pizza/garlicpizza
/datum/recipe/oven/amanita_pie
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/amanita
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/grown/mushroom/amanita
)
- result = /obj/item/reagent_containers/food/snacks/amanita_pie
+ result = /obj/item/food/snacks/amanita_pie
/datum/recipe/oven/plump_pie
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/plumphelmet
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/grown/mushroom/plumphelmet
)
- result = /obj/item/reagent_containers/food/snacks/plump_pie
+ result = /obj/item/food/snacks/plump_pie
/datum/recipe/oven/plumphelmetbiscuit
reagents = list("water" = 5, "flour" = 5)
- items = list(/obj/item/reagent_containers/food/snacks/grown/mushroom/plumphelmet)
- result = /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit
+ items = list(/obj/item/food/snacks/grown/mushroom/plumphelmet)
+ result = /obj/item/food/snacks/plumphelmetbiscuit
/datum/recipe/oven/creamcheesebread
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/creamcheesebread
+ result = /obj/item/food/snacks/sliceable/creamcheesebread
/datum/recipe/oven/baguette
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
)
- result = /obj/item/reagent_containers/food/snacks/baguette
+ result = /obj/item/food/snacks/baguette
/datum/recipe/oven/croissant
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/egg
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/egg
)
reagents = list("sodiumchloride" = 1, "milk" = 5, "sugar" = 5)
- result = /obj/item/reagent_containers/food/snacks/croissant
+ result = /obj/item/food/snacks/croissant
/datum/recipe/oven/birthdaycake
reagents = list("milk" = 5, "sugar" = 15, "vanilla" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
/obj/item/candle,
/obj/item/candle,
/obj/item/candle,
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/birthdaycake
+ result = /obj/item/food/snacks/sliceable/birthdaycake
/datum/recipe/oven/bread
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/egg
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/egg
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/bread
+ result = /obj/item/food/snacks/sliceable/bread
/datum/recipe/oven/bread/make_food(obj/container)
- var/obj/item/reagent_containers/food/snacks/sliceable/bread/being_cooked = ..()
+ var/obj/item/food/snacks/sliceable/bread/being_cooked = ..()
being_cooked.reagents.del_reagent("egg")
return being_cooked
/datum/recipe/oven/applepie
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/grown/apple
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/grown/apple
)
- result = /obj/item/reagent_containers/food/snacks/applepie
+ result = /obj/item/food/snacks/applepie
/datum/recipe/oven/applecake
reagents = list("milk" = 5, "sugar" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/grown/apple,
- /obj/item/reagent_containers/food/snacks/grown/apple
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/grown/apple,
+ /obj/item/food/snacks/grown/apple
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/applecake
+ result = /obj/item/food/snacks/sliceable/applecake
/datum/recipe/oven/orangecake
reagents = list("milk" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/grown/citrus/orange,
- /obj/item/reagent_containers/food/snacks/grown/citrus/orange
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/grown/citrus/orange,
+ /obj/item/food/snacks/grown/citrus/orange
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/orangecake
+ result = /obj/item/food/snacks/sliceable/orangecake
/datum/recipe/oven/bananacake
reagents = list("milk" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/grown/banana,
- /obj/item/reagent_containers/food/snacks/grown/banana
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/grown/banana,
+ /obj/item/food/snacks/grown/banana
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/bananacake
+ result = /obj/item/food/snacks/sliceable/bananacake
/datum/recipe/oven/limecake
reagents = list("milk" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/grown/citrus/lime,
- /obj/item/reagent_containers/food/snacks/grown/citrus/lime
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/grown/citrus/lime,
+ /obj/item/food/snacks/grown/citrus/lime
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/limecake
+ result = /obj/item/food/snacks/sliceable/limecake
/datum/recipe/oven/lemoncake
reagents = list("milk" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/grown/citrus/lemon,
- /obj/item/reagent_containers/food/snacks/grown/citrus/lemon
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/grown/citrus/lemon,
+ /obj/item/food/snacks/grown/citrus/lemon
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/lemoncake
+ result = /obj/item/food/snacks/sliceable/lemoncake
/datum/recipe/oven/chocolatecake
reagents = list("milk" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/chocolatebar,
- /obj/item/reagent_containers/food/snacks/chocolatebar,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/chocolatebar,
+ /obj/item/food/snacks/chocolatebar,
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/chocolatecake
+ result = /obj/item/food/snacks/sliceable/chocolatecake
/datum/recipe/oven/braincake
reagents = list("milk" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
/obj/item/organ/internal/brain
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/braincake
+ result = /obj/item/food/snacks/sliceable/braincake
/datum/recipe/oven/pumpkinpie
reagents = list("milk" = 5, "sugar" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/grown/pumpkin
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/grown/pumpkin
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/pumpkinpie
+ result = /obj/item/food/snacks/sliceable/pumpkinpie
/datum/recipe/oven/appletart
reagents = list("sugar" = 5, "milk" = 5, "flour" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/egg,
- /obj/item/reagent_containers/food/snacks/grown/apple/gold
+ /obj/item/food/snacks/egg,
+ /obj/item/food/snacks/grown/apple/gold
)
- result = /obj/item/reagent_containers/food/snacks/appletart
+ result = /obj/item/food/snacks/appletart
/datum/recipe/oven/appletart/make_food(obj/container)
- var/obj/item/reagent_containers/food/snacks/appletart/being_cooked = ..()
+ var/obj/item/food/snacks/appletart/being_cooked = ..()
being_cooked.reagents.del_reagent("egg")
return being_cooked
/datum/recipe/oven/cracker
reagents = list("sodiumchloride" = 1)
items = list(
- /obj/item/reagent_containers/food/snacks/doughslice
+ /obj/item/food/snacks/doughslice
)
- result = /obj/item/reagent_containers/food/snacks/cracker
+ result = /obj/item/food/snacks/cracker
/datum/recipe/oven/sugarcookie/make_food(obj/container)
- var/obj/item/reagent_containers/food/snacks/sugarcookie/being_cooked = ..()
+ var/obj/item/food/snacks/sugarcookie/being_cooked = ..()
being_cooked.reagents.del_reagent("egg")
return being_cooked
/datum/recipe/oven/flatbread
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough
+ /obj/item/food/snacks/sliceable/flatdough
)
- result = /obj/item/reagent_containers/food/snacks/flatbread
+ result = /obj/item/food/snacks/flatbread
/datum/recipe/oven/toastedsandwich
items = list(
- /obj/item/reagent_containers/food/snacks/sandwich
+ /obj/item/food/snacks/sandwich
)
- result = /obj/item/reagent_containers/food/snacks/toastedsandwich
+ result = /obj/item/food/snacks/toastedsandwich
/datum/recipe/oven/turkey // Magic
items = list(
- /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/stuffing,
- /obj/item/reagent_containers/food/snacks/stuffing
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/stuffing,
+ /obj/item/food/snacks/stuffing
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/turkey
+ result = /obj/item/food/snacks/sliceable/turkey
/datum/recipe/oven/tofurkey
items = list(
- /obj/item/reagent_containers/food/snacks/tofu,
- /obj/item/reagent_containers/food/snacks/tofu,
- /obj/item/reagent_containers/food/snacks/stuffing,
+ /obj/item/food/snacks/tofu,
+ /obj/item/food/snacks/tofu,
+ /obj/item/food/snacks/stuffing,
)
- result = /obj/item/reagent_containers/food/snacks/tofurkey
+ result = /obj/item/food/snacks/tofurkey
/datum/recipe/oven/lasagna
items = list(
- /obj/item/reagent_containers/food/snacks/meat,
- /obj/item/reagent_containers/food/snacks/meat,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/dough
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/dough
)
- result = /obj/item/reagent_containers/food/snacks/lasagna
+ result = /obj/item/food/snacks/lasagna
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm
index c13c81bb5ab..5aaf7023d7f 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm
@@ -11,11 +11,11 @@
/datum/crafting_recipe/sandwich
name = "Sandwich"
reqs = list(
- /obj/item/reagent_containers/food/snacks/meatsteak = 1,
- /obj/item/reagent_containers/food/snacks/breadslice = 2,
- /obj/item/reagent_containers/food/snacks/cheesewedge = 1,
+ /obj/item/food/snacks/meatsteak = 1,
+ /obj/item/food/snacks/breadslice = 2,
+ /obj/item/food/snacks/cheesewedge = 1,
)
- result = list(/obj/item/reagent_containers/food/snacks/sandwich)
+ result = list(/obj/item/food/snacks/sandwich)
category = CAT_FOOD
subcategory = CAT_SANDWICH
@@ -23,9 +23,9 @@
name = "Slime Jelly Sandwich"
reqs = list(
/datum/reagent/slimejelly = 5,
- /obj/item/reagent_containers/food/snacks/breadslice = 2,
+ /obj/item/food/snacks/breadslice = 2,
)
- result = list(/obj/item/reagent_containers/food/snacks/jellysandwich/slime)
+ result = list(/obj/item/food/snacks/jellysandwich/slime)
category = CAT_FOOD
subcategory = CAT_SANDWICH
@@ -33,9 +33,9 @@
name = "Cherry Jelly Sandwich"
reqs = list(
/datum/reagent/consumable/cherryjelly = 5,
- /obj/item/reagent_containers/food/snacks/breadslice = 2,
+ /obj/item/food/snacks/breadslice = 2,
)
- result = list(/obj/item/reagent_containers/food/snacks/jellysandwich/cherry)
+ result = list(/obj/item/food/snacks/jellysandwich/cherry)
category = CAT_FOOD
subcategory = CAT_SANDWICH
@@ -43,9 +43,9 @@
name = "Slime Jelly Burger"
reqs = list(
/datum/reagent/slimejelly = 5,
- /obj/item/reagent_containers/food/snacks/bun = 1,
+ /obj/item/food/snacks/bun = 1,
)
- result = list(/obj/item/reagent_containers/food/snacks/burger/jelly/slime)
+ result = list(/obj/item/food/snacks/burger/jelly/slime)
category = CAT_FOOD
subcategory = CAT_SANDWICH
@@ -53,9 +53,9 @@
name = "Cherry Jelly Burger"
reqs = list(
/datum/reagent/consumable/cherryjelly = 5,
- /obj/item/reagent_containers/food/snacks/bun = 1,
+ /obj/item/food/snacks/bun = 1,
)
- result = list(/obj/item/reagent_containers/food/snacks/burger/jelly/cherry)
+ result = list(/obj/item/food/snacks/burger/jelly/cherry)
category = CAT_FOOD
subcategory = CAT_SANDWICH
@@ -63,208 +63,208 @@
name = "Home run baseball burger"
reqs = list(
/obj/item/melee/baseball_bat = 1,
- /obj/item/reagent_containers/food/snacks/bun = 1,
+ /obj/item/food/snacks/bun = 1,
)
- result = list(/obj/item/reagent_containers/food/snacks/burger/baseball)
+ result = list(/obj/item/food/snacks/burger/baseball)
category = CAT_FOOD
subcategory = CAT_SANDWICH
/datum/crafting_recipe/notasandwich
name = "not-a-sandwich"
reqs = list(
- /obj/item/reagent_containers/food/snacks/breadslice = 2,
+ /obj/item/food/snacks/breadslice = 2,
/obj/item/clothing/mask/fakemoustache = 1,
)
- result = list(/obj/item/reagent_containers/food/snacks/notasandwich)
+ result = list(/obj/item/food/snacks/notasandwich)
category = CAT_FOOD
subcategory = CAT_SANDWICH
/datum/crafting_recipe/sushi_Ebi
name = "Ebi Sushi"
reqs = list(
- /obj/item/reagent_containers/food/snacks/boiledrice = 1,
- /obj/item/reagent_containers/food/snacks/boiled_shrimp = 1,
+ /obj/item/food/snacks/boiledrice = 1,
+ /obj/item/food/snacks/boiled_shrimp = 1,
)
- result = list(/obj/item/reagent_containers/food/snacks/sushi_Ebi)
+ result = list(/obj/item/food/snacks/sushi_Ebi)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/Ebi_maki
name = "Ebi Maki Roll"
reqs = list(
- /obj/item/reagent_containers/food/snacks/boiledrice = 1,
- /obj/item/reagent_containers/food/snacks/boiled_shrimp = 4,
+ /obj/item/food/snacks/boiledrice = 1,
+ /obj/item/food/snacks/boiled_shrimp = 4,
)
pathtools = list(/obj/item/kitchen/sushimat)
- result = list(/obj/item/reagent_containers/food/snacks/sliceable/Ebi_maki)
+ result = list(/obj/item/food/snacks/sliceable/Ebi_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/sushi_Ikura
name = "Ikura Sushi"
reqs = list(
- /obj/item/reagent_containers/food/snacks/boiledrice = 1,
+ /obj/item/food/snacks/boiledrice = 1,
/obj/item/fish_eggs/salmon = 1,
)
- result = list(/obj/item/reagent_containers/food/snacks/sushi_Ikura)
+ result = list(/obj/item/food/snacks/sushi_Ikura)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/Ikura_maki
name = "Ikura Maki Roll"
reqs = list(
- /obj/item/reagent_containers/food/snacks/boiledrice = 1,
+ /obj/item/food/snacks/boiledrice = 1,
/obj/item/fish_eggs/salmon = 4,
)
pathtools = list(/obj/item/kitchen/sushimat)
- result = list(/obj/item/reagent_containers/food/snacks/sliceable/Ikura_maki)
+ result = list(/obj/item/food/snacks/sliceable/Ikura_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/sushi_Inari
name = "Inari Sushi"
reqs = list(
- /obj/item/reagent_containers/food/snacks/boiledrice = 1,
- /obj/item/reagent_containers/food/snacks/fried_tofu = 1,
+ /obj/item/food/snacks/boiledrice = 1,
+ /obj/item/food/snacks/fried_tofu = 1,
)
- result = list(/obj/item/reagent_containers/food/snacks/sushi_Inari)
+ result = list(/obj/item/food/snacks/sushi_Inari)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/Inari_maki
name = "Inari Maki Roll"
reqs = list(
- /obj/item/reagent_containers/food/snacks/boiledrice = 1,
- /obj/item/reagent_containers/food/snacks/fried_tofu = 4,
+ /obj/item/food/snacks/boiledrice = 1,
+ /obj/item/food/snacks/fried_tofu = 4,
)
pathtools = list(/obj/item/kitchen/sushimat)
- result = list(/obj/item/reagent_containers/food/snacks/sliceable/Inari_maki)
+ result = list(/obj/item/food/snacks/sliceable/Inari_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/sushi_Sake
name = "Sake Sushi"
reqs = list(
- /obj/item/reagent_containers/food/snacks/boiledrice = 1,
- /obj/item/reagent_containers/food/snacks/salmonmeat = 1,
+ /obj/item/food/snacks/boiledrice = 1,
+ /obj/item/food/snacks/salmonmeat = 1,
)
- result = list(/obj/item/reagent_containers/food/snacks/sushi_Sake)
+ result = list(/obj/item/food/snacks/sushi_Sake)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/Sake_maki
name = "Sake Maki Roll"
reqs = list(
- /obj/item/reagent_containers/food/snacks/boiledrice = 1,
- /obj/item/reagent_containers/food/snacks/salmonmeat = 4,
+ /obj/item/food/snacks/boiledrice = 1,
+ /obj/item/food/snacks/salmonmeat = 4,
)
pathtools = list(/obj/item/kitchen/sushimat)
- result = list(/obj/item/reagent_containers/food/snacks/sliceable/Sake_maki)
+ result = list(/obj/item/food/snacks/sliceable/Sake_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/sushi_SmokedSalmon
name = "Smoked Salmon Sushi"
reqs = list(
- /obj/item/reagent_containers/food/snacks/boiledrice = 1,
- /obj/item/reagent_containers/food/snacks/salmonsteak = 1,
+ /obj/item/food/snacks/boiledrice = 1,
+ /obj/item/food/snacks/salmonsteak = 1,
)
- result = list(/obj/item/reagent_containers/food/snacks/sushi_SmokedSalmon)
+ result = list(/obj/item/food/snacks/sushi_SmokedSalmon)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/SmokedSalmon_maki
name = "Smoked Salmon Maki Roll"
reqs = list(
- /obj/item/reagent_containers/food/snacks/boiledrice = 1,
- /obj/item/reagent_containers/food/snacks/salmonsteak = 4,
+ /obj/item/food/snacks/boiledrice = 1,
+ /obj/item/food/snacks/salmonsteak = 4,
)
pathtools = list(/obj/item/kitchen/sushimat)
- result = list(/obj/item/reagent_containers/food/snacks/sliceable/SmokedSalmon_maki)
+ result = list(/obj/item/food/snacks/sliceable/SmokedSalmon_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/sushi_Masago
name = "Masago Sushi"
reqs = list(
- /obj/item/reagent_containers/food/snacks/boiledrice = 1,
+ /obj/item/food/snacks/boiledrice = 1,
/obj/item/fish_eggs/goldfish = 1,
)
- result = list(/obj/item/reagent_containers/food/snacks/sushi_Masago)
+ result = list(/obj/item/food/snacks/sushi_Masago)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/Masago_maki
name = "Masago Maki Roll"
reqs = list(
- /obj/item/reagent_containers/food/snacks/boiledrice = 1,
+ /obj/item/food/snacks/boiledrice = 1,
/obj/item/fish_eggs/goldfish = 4,
)
pathtools = list(/obj/item/kitchen/sushimat)
- result = list(/obj/item/reagent_containers/food/snacks/sliceable/Masago_maki)
+ result = list(/obj/item/food/snacks/sliceable/Masago_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/sushi_Tobiko
name = "Tobiko Sushi"
reqs = list(
- /obj/item/reagent_containers/food/snacks/boiledrice = 1,
+ /obj/item/food/snacks/boiledrice = 1,
/obj/item/fish_eggs/shark = 1,
)
- result = list(/obj/item/reagent_containers/food/snacks/sushi_Tobiko)
+ result = list(/obj/item/food/snacks/sushi_Tobiko)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/Tobiko_maki
name = "Tobiko Maki Roll"
reqs = list(
- /obj/item/reagent_containers/food/snacks/boiledrice = 1,
+ /obj/item/food/snacks/boiledrice = 1,
/obj/item/fish_eggs/shark = 4,
)
pathtools = list(/obj/item/kitchen/sushimat)
- result = list(/obj/item/reagent_containers/food/snacks/sliceable/Tobiko_maki)
+ result = list(/obj/item/food/snacks/sliceable/Tobiko_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/sushi_TobikoEgg
name = "Tobiko and Egg Sushi"
reqs = list(
- /obj/item/reagent_containers/food/snacks/sushi_Tobiko = 1,
- /obj/item/reagent_containers/food/snacks/egg = 1,
+ /obj/item/food/snacks/sushi_Tobiko = 1,
+ /obj/item/food/snacks/egg = 1,
)
- result = list(/obj/item/reagent_containers/food/snacks/sushi_TobikoEgg)
+ result = list(/obj/item/food/snacks/sushi_TobikoEgg)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/TobikoEgg_maki
name = "Tobiko and Egg Maki Roll"
reqs = list(
- /obj/item/reagent_containers/food/snacks/sushi_Tobiko = 4,
- /obj/item/reagent_containers/food/snacks/egg = 4,
+ /obj/item/food/snacks/sushi_Tobiko = 4,
+ /obj/item/food/snacks/egg = 4,
)
pathtools = list(/obj/item/kitchen/sushimat)
- result = list(/obj/item/reagent_containers/food/snacks/sliceable/TobikoEgg_maki)
+ result = list(/obj/item/food/snacks/sliceable/TobikoEgg_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/sushi_Tai
name = "Tai Sushi"
reqs = list(
- /obj/item/reagent_containers/food/snacks/boiledrice = 1,
- /obj/item/reagent_containers/food/snacks/catfishmeat = 1,
+ /obj/item/food/snacks/boiledrice = 1,
+ /obj/item/food/snacks/catfishmeat = 1,
)
- result = list(/obj/item/reagent_containers/food/snacks/sushi_Tai)
+ result = list(/obj/item/food/snacks/sushi_Tai)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/Tai_maki
name = "Tai Maki Roll"
reqs = list(
- /obj/item/reagent_containers/food/snacks/boiledrice = 1,
- /obj/item/reagent_containers/food/snacks/catfishmeat = 4,
+ /obj/item/food/snacks/boiledrice = 1,
+ /obj/item/food/snacks/catfishmeat = 4,
)
pathtools = list(/obj/item/kitchen/sushimat)
- result = list(/obj/item/reagent_containers/food/snacks/sliceable/Tai_maki)
+ result = list(/obj/item/food/snacks/sliceable/Tai_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
@@ -278,8 +278,8 @@
reqs = list(
/obj/item/organ/internal/brain = 1,
/obj/item/organ/internal/heart = 1,
- /obj/item/reagent_containers/food/snacks/sliceable/birthdaycake = 1,
- /obj/item/reagent_containers/food/snacks/meat = 3,
+ /obj/item/food/snacks/sliceable/birthdaycake = 1,
+ /obj/item/food/snacks/meat = 3,
/datum/reagent/blood = 30,
/datum/reagent/consumable/sprinkles = 5,
/datum/reagent/teslium = 1,
diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm
index 57a5eb504ed..20919459e93 100644
--- a/code/modules/hydroponics/beekeeping/beebox.dm
+++ b/code/modules/hydroponics/beekeeping/beebox.dm
@@ -95,7 +95,7 @@
if(queen_bee)
if(bee_resources >= BEE_RESOURCE_HONEYCOMB_COST && honeycombs.len < get_max_honeycomb())
bee_resources = max(bee_resources-BEE_RESOURCE_HONEYCOMB_COST, 0)
- var/obj/item/reagent_containers/food/snacks/honeycomb/HC = new(src)
+ var/obj/item/food/snacks/honeycomb/HC = new(src)
if(queen_bee.beegent)
HC.set_reagent(queen_bee.beegent.id)
honeycombs += HC
@@ -240,7 +240,7 @@
var/amtH = HF.honeycomb_capacity
var/fallen = 0
while(honeycombs.len && amtH) //let's pretend you always grab the frame with the most honeycomb on it
- var/obj/item/reagent_containers/food/snacks/honeycomb/HC = pick_n_take(honeycombs)
+ var/obj/item/food/snacks/honeycomb/HC = pick_n_take(honeycombs)
if(HC)
HC.forceMove(get_turf(src))
amtH--
diff --git a/code/modules/hydroponics/beekeeping/honeycomb.dm b/code/modules/hydroponics/beekeeping/honeycomb.dm
index ce9d923f43c..7f27bdb9841 100644
--- a/code/modules/hydroponics/beekeeping/honeycomb.dm
+++ b/code/modules/hydroponics/beekeeping/honeycomb.dm
@@ -1,24 +1,20 @@
-/obj/item/reagent_containers/food/snacks/honeycomb
+/obj/item/food/snacks/honeycomb
name = "honeycomb"
desc = "A hexagonal mesh of honeycomb."
icon = 'icons/obj/hydroponics/harvest.dmi'
icon_state = "honeycomb"
- possible_transfer_amounts = null
- disease_amount = 0
volume = 10
- amount_per_transfer_from_this = 0
- visible_transfer_rate = FALSE
list_reagents = list("honey" = 5)
var/honey_color = ""
-/obj/item/reagent_containers/food/snacks/honeycomb/Initialize(mapload)
+/obj/item/food/snacks/honeycomb/Initialize(mapload)
. = ..()
pixel_x = rand(8,-8)
pixel_y = rand(8,-8)
update_icon(UPDATE_OVERLAYS)
-/obj/item/reagent_containers/food/snacks/honeycomb/update_overlays()
+/obj/item/food/snacks/honeycomb/update_overlays()
. = ..()
var/image/honey
if(honey_color)
@@ -29,7 +25,7 @@
. += honey
-/obj/item/reagent_containers/food/snacks/honeycomb/proc/set_reagent(reagent)
+/obj/item/food/snacks/honeycomb/proc/set_reagent(reagent)
var/datum/reagent/R = GLOB.chemical_reagents_list[reagent]
if(istype(R))
name = "honeycomb ([R.name])"
diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm
index e77848b73ab..24a936cbb3c 100644
--- a/code/modules/hydroponics/biogenerator.dm
+++ b/code/modules/hydroponics/biogenerator.dm
@@ -127,7 +127,7 @@
return
var/obj/item/storage/bag/plants/PB = O
- for(var/obj/item/reagent_containers/food/snacks/grown/G in PB.contents)
+ for(var/obj/item/food/snacks/grown/G in PB.contents)
if(length(stored_plants) >= max_storable_plants)
break
PB.remove_from_storage(G, src)
@@ -141,7 +141,7 @@
SStgui.update_uis(src)
return TRUE
- else if(istype(O, /obj/item/reagent_containers/food/snacks/grown))
+ else if(istype(O, /obj/item/food/snacks/grown))
if(length(stored_plants) >= max_storable_plants)
to_chat(user, "[src] can't hold any more plants!")
return
diff --git a/code/modules/hydroponics/compost_bin.dm b/code/modules/hydroponics/compost_bin.dm
index fdaeefb95e7..50ff4c918da 100644
--- a/code/modules/hydroponics/compost_bin.dm
+++ b/code/modules/hydroponics/compost_bin.dm
@@ -40,7 +40,7 @@
return default_deconstruction_crowbar(user, I, ignore_panel = TRUE)
// Accepts inserted plants and converts them to biomass
-/obj/machinery/compost_bin/proc/make_biomass(obj/item/reagent_containers/food/snacks/grown/O)
+/obj/machinery/compost_bin/proc/make_biomass(obj/item/food/snacks/grown/O)
// calculate biomass from plant nutriment and plant matter
var/plant_biomass = O.reagents.get_reagent_amount("nutriment") + O.reagents.get_reagent_amount("plantmatter")
biomass += clamp(plant_biomass * 10, 1, biomass_capacity - biomass)
@@ -58,7 +58,7 @@
return
var/obj/item/storage/bag/plants/PB = O
- for(var/obj/item/reagent_containers/food/snacks/grown/G in PB.contents)
+ for(var/obj/item/food/snacks/grown/G in PB.contents)
PB.remove_from_storage(G, src)
make_biomass(G)
@@ -74,7 +74,7 @@
update_icon_state()
return TRUE
- if(istype(O, /obj/item/reagent_containers/food/snacks/grown))
+ if(istype(O, /obj/item/food/snacks/grown))
if(biomass >= biomass_capacity)
to_chat(user, "[src] can't hold any more plants!")
return
diff --git a/code/modules/hydroponics/fermenting_barrel.dm b/code/modules/hydroponics/fermenting_barrel.dm
index ef4b978936f..22252511956 100644
--- a/code/modules/hydroponics/fermenting_barrel.dm
+++ b/code/modules/hydroponics/fermenting_barrel.dm
@@ -19,7 +19,7 @@
. = ..()
. += "It is currently [open ? "open, letting you pour liquids in." : "closed, letting you draw liquids from the tap."] "
-/obj/structure/fermenting_barrel/proc/makeWine(obj/item/reagent_containers/food/snacks/grown/G)
+/obj/structure/fermenting_barrel/proc/makeWine(obj/item/food/snacks/grown/G)
if(G.reagents)
G.reagents.trans_to(src, G.reagents.total_volume)
var/amount = G.seed.potency / 4
@@ -39,7 +39,7 @@
playsound(src, 'sound/effects/bubbles.ogg', 50, TRUE)
/obj/structure/fermenting_barrel/attackby(obj/item/I, mob/user, params)
- var/obj/item/reagent_containers/food/snacks/grown/G = I
+ var/obj/item/food/snacks/grown/G = I
if(istype(G))
if(!G.can_distill)
to_chat(user, "You can't distill this into anything...")
diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
index 2e40c78ed7e..eb3b7576058 100644
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -4,7 +4,7 @@
// ***********************************************************
// Base type. Subtypes are found in /grown dir.
-/obj/item/reagent_containers/food/snacks/grown
+/obj/item/food/snacks/grown
icon = 'icons/obj/hydroponics/harvest.dmi'
var/obj/item/seeds/seed = null // type path, gets converted to item on New(). It's safe to assume it's always a seed item.
var/plantname = ""
@@ -18,7 +18,7 @@
resistance_flags = FLAMMABLE
origin_tech = "biotech=1"
-/obj/item/reagent_containers/food/snacks/grown/Initialize(mapload, obj/item/seeds/new_seed = null)
+/obj/item/food/snacks/grown/Initialize(mapload, obj/item/seeds/new_seed = null)
. = ..()
if(!tastes)
tastes = list("[name]" = 1)
@@ -45,25 +45,25 @@
if(seed.variant)
name += " \[[seed.variant]]"
-/obj/item/reagent_containers/food/snacks/grown/Destroy()
+/obj/item/food/snacks/grown/Destroy()
QDEL_NULL(seed)
return ..()
-/obj/item/reagent_containers/food/snacks/grown/proc/add_juice()
+/obj/item/food/snacks/grown/proc/add_juice()
if(reagents)
if(bitesize_mod)
bitesize = 1 + round(reagents.total_volume / bitesize_mod)
return 1
return 0
-/obj/item/reagent_containers/food/snacks/grown/examine(user)
+/obj/item/food/snacks/grown/examine(user)
. = ..()
if(seed)
for(var/datum/plant_gene/trait/T in seed.genes)
if(T.examine_line)
. += T.examine_line
-/obj/item/reagent_containers/food/snacks/grown/attackby(obj/item/O, mob/user, params)
+/obj/item/food/snacks/grown/attackby(obj/item/O, mob/user, params)
..()
if(slices_num && slice_path)
var/inaccurate = TRUE
@@ -112,12 +112,12 @@
// Various gene procs
-/obj/item/reagent_containers/food/snacks/grown/attack_self(mob/user)
+/obj/item/food/snacks/grown/attack_self(mob/user)
if(seed && seed.get_gene(/datum/plant_gene/trait/squash))
squash(user)
..()
-/obj/item/reagent_containers/food/snacks/grown/throw_impact(atom/hit_atom)
+/obj/item/food/snacks/grown/throw_impact(atom/hit_atom)
if(!..()) //was it caught by a mob?
if(seed)
log_action(locateUID(thrownby), hit_atom, "Thrown [src] at")
@@ -126,7 +126,7 @@
if(seed.get_gene(/datum/plant_gene/trait/squash))
squash(hit_atom)
-/obj/item/reagent_containers/food/snacks/grown/proc/squash(atom/target)
+/obj/item/food/snacks/grown/proc/squash(atom/target)
var/turf/T = get_turf(target)
if(ispath(splat_type, /obj/effect/decal/cleanable/plant_smudge))
if(filling_color)
@@ -151,28 +151,28 @@
qdel(src)
-/obj/item/reagent_containers/food/snacks/grown/On_Consume(mob/M, mob/user)
+/obj/item/food/snacks/grown/On_Consume(mob/M, mob/user)
if(iscarbon(M))
if(seed)
for(var/datum/plant_gene/trait/T in seed.genes)
T.on_consume(src, M)
..()
-/obj/item/reagent_containers/food/snacks/grown/after_slip(mob/living/carbon/human/H)
+/obj/item/food/snacks/grown/after_slip(mob/living/carbon/human/H)
if(!seed)
return
for(var/datum/plant_gene/trait/T in seed.genes)
T.on_slip(src, H)
// Glow gene procs
-/obj/item/reagent_containers/food/snacks/grown/generate_trash(atom/location)
+/obj/item/food/snacks/grown/generate_trash(atom/location)
if(trash && ispath(trash, /obj/item/grown))
. = new trash(location, seed)
trash = null
return
return ..()
-/obj/item/reagent_containers/food/snacks/grown/decompile_act(obj/item/matter_decompiler/C, mob/user)
+/obj/item/food/snacks/grown/decompile_act(obj/item/matter_decompiler/C, mob/user)
if(isdrone(user))
C.stored_comms["wood"] += 4
qdel(src)
@@ -180,7 +180,7 @@
return ..()
// For item-containing growns such as eggy or gatfruit
-/obj/item/reagent_containers/food/snacks/grown/shell/attack_self(mob/user)
+/obj/item/food/snacks/grown/shell/attack_self(mob/user)
if(!do_after(user, 1.5 SECONDS, target = user))
return
user.unEquip(src)
@@ -191,14 +191,14 @@
qdel(src)
// Diona Nymphs can eat these as well as weeds to gain nutrition.
-/obj/item/reagent_containers/food/snacks/grown/attack_animal(mob/living/simple_animal/M)
+/obj/item/food/snacks/grown/attack_animal(mob/living/simple_animal/M)
if(isnymph(M))
var/mob/living/simple_animal/diona/D = M
D.consume(src)
else
return ..()
-/obj/item/reagent_containers/food/snacks/grown/proc/log_action(mob/user, atom/target, what_done)
+/obj/item/food/snacks/grown/proc/log_action(mob/user, atom/target, what_done)
var/reagent_str = reagents.log_list()
var/genes_str = "No genes"
if(seed && length(seed.genes))
@@ -211,7 +211,7 @@
add_attack_logs(user, target, "[what_done] ([reagent_str] | [genes_str])")
-/obj/item/reagent_containers/food/snacks/grown/extinguish_light(force = FALSE)
+/obj/item/food/snacks/grown/extinguish_light(force = FALSE)
if(!force)
return
if(seed.get_gene(/datum/plant_gene/trait/glow/shadow))
diff --git a/code/modules/hydroponics/grown/ambrosia.dm b/code/modules/hydroponics/grown/ambrosia.dm
index 9f1f8d8744a..0cd8dfcdb5e 100644
--- a/code/modules/hydroponics/grown/ambrosia.dm
+++ b/code/modules/hydroponics/grown/ambrosia.dm
@@ -1,5 +1,5 @@
// Ambrosia - base type
-/obj/item/reagent_containers/food/snacks/grown/ambrosia
+/obj/item/food/snacks/grown/ambrosia
seed = /obj/item/seeds/ambrosia
name = "ambrosia branch"
desc = "This is a plant."
@@ -20,7 +20,7 @@
icon_state = "seed-ambrosiavulgaris"
species = "ambrosiavulgaris"
plantname = "Ambrosia Vulgaris"
- product = /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris
+ product = /obj/item/food/snacks/grown/ambrosia/vulgaris
lifespan = 60
endurance = 25
yield = 6
@@ -30,7 +30,7 @@
mutatelist = list(/obj/item/seeds/ambrosia/deus)
reagents_add = list("space_drugs" = 0.15, "bicaridine" = 0.1, "kelotane" = 0.1, "vitamin" = 0.04, "plantmatter" = 0.05, "toxin" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris
+/obj/item/food/snacks/grown/ambrosia/vulgaris
seed = /obj/item/seeds/ambrosia
name = "ambrosia vulgaris branch"
desc = "This is a plant containing various healing chemicals."
@@ -44,12 +44,12 @@
icon_state = "seed-ambrosiadeus"
species = "ambrosiadeus"
plantname = "Ambrosia Deus"
- product = /obj/item/reagent_containers/food/snacks/grown/ambrosia/deus
+ product = /obj/item/food/snacks/grown/ambrosia/deus
mutatelist = list(/obj/item/seeds/ambrosia/gaia)
reagents_add = list("weak_omnizine" = 0.15, "synaptizine" = 0.15, "space_drugs" = 0.1, "vitamin" = 0.04, "plantmatter" = 0.05)
rarity = 40
-/obj/item/reagent_containers/food/snacks/grown/ambrosia/deus
+/obj/item/food/snacks/grown/ambrosia/deus
seed = /obj/item/seeds/ambrosia/deus
name = "ambrosia deus branch"
desc = "Eating this makes you feel immortal!"
@@ -70,7 +70,7 @@
icon_state = "seed-ambrosia_gaia"
species = "ambrosia_gaia"
plantname = "Ambrosia Gaia"
- product = /obj/item/reagent_containers/food/snacks/grown/ambrosia/gaia
+ product = /obj/item/food/snacks/grown/ambrosia/gaia
mutatelist = list()
reagents_add = list("earthsblood" = 0.05, "nutriment" = 0.06, "vitamin" = 0.05)
rarity = 30 //These are some pretty good plants right here
@@ -78,7 +78,7 @@
weed_rate = 4
weed_chance = 100
-/obj/item/reagent_containers/food/snacks/grown/ambrosia/gaia
+/obj/item/food/snacks/grown/ambrosia/gaia
name = "ambrosia gaia branch"
desc = "Eating this makes you immortal."
icon_state = "ambrosia_gaia"
@@ -92,12 +92,12 @@
// Ambrosia Cruciatus
/obj/item/seeds/ambrosia/cruciatus
- product = /obj/item/reagent_containers/food/snacks/grown/ambrosia/cruciatus
+ product = /obj/item/food/snacks/grown/ambrosia/cruciatus
potency = 10
mutatelist = list()
reagents_add = list("thc" = 0.15, "kelotane" = 0.15, "bicaridine" = 0.1, "bath_salts" = 0.20, "plantmatter" = 0.05)
-/obj/item/reagent_containers/food/snacks/grown/ambrosia/cruciatus
+/obj/item/food/snacks/grown/ambrosia/cruciatus
seed = /obj/item/seeds/ambrosia/cruciatus
wine_power = 0.7
tastes = list("ambrosia cruciatus" = 1)
diff --git a/code/modules/hydroponics/grown/apple.dm b/code/modules/hydroponics/grown/apple.dm
index 7510c3cdfb6..f1cd1275231 100644
--- a/code/modules/hydroponics/grown/apple.dm
+++ b/code/modules/hydroponics/grown/apple.dm
@@ -5,7 +5,7 @@
icon_state = "seed-apple"
species = "apple"
plantname = "Apple Tree"
- product = /obj/item/reagent_containers/food/snacks/grown/apple
+ product = /obj/item/food/snacks/grown/apple
lifespan = 55
endurance = 35
yield = 5
@@ -16,7 +16,7 @@
mutatelist = list(/obj/item/seeds/apple/gold)
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/apple
+/obj/item/food/snacks/grown/apple
seed = /obj/item/seeds/apple
name = "apple"
desc = "It's a little piece of Eden."
@@ -28,12 +28,12 @@
// Posioned Apple
/obj/item/seeds/apple/poisoned
- product = /obj/item/reagent_containers/food/snacks/grown/apple/poisoned
+ product = /obj/item/food/snacks/grown/apple/poisoned
mutatelist = list()
reagents_add = list("cyanide" = 0.5, "vitamin" = 0.04, "plantmatter" = 0.1)
rarity = 50 // Source of cyanide, and hard (almost impossible) to obtain normally.
-/obj/item/reagent_containers/food/snacks/grown/apple/poisoned
+/obj/item/food/snacks/grown/apple/poisoned
seed = /obj/item/seeds/apple/poisoned
// Gold Apple
@@ -43,14 +43,14 @@
icon_state = "seed-goldapple"
species = "goldapple"
plantname = "Golden Apple Tree"
- product = /obj/item/reagent_containers/food/snacks/grown/apple/gold
+ product = /obj/item/food/snacks/grown/apple/gold
maturation = 10
production = 10
mutatelist = list()
reagents_add = list("gold" = 0.2, "vitamin" = 0.04, "plantmatter" = 0.1)
rarity = 40 // Alchemy!
-/obj/item/reagent_containers/food/snacks/grown/apple/gold
+/obj/item/food/snacks/grown/apple/gold
seed = /obj/item/seeds/apple/gold
name = "golden apple"
desc = "Emblazoned upon the apple is the word 'Kallisti'."
diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm
index 67b3df02b90..57d8f8c7e5d 100644
--- a/code/modules/hydroponics/grown/banana.dm
+++ b/code/modules/hydroponics/grown/banana.dm
@@ -5,7 +5,7 @@
icon_state = "seed-banana"
species = "banana"
plantname = "Banana Tree"
- product = /obj/item/reagent_containers/food/snacks/grown/banana
+ product = /obj/item/food/snacks/grown/banana
lifespan = 50
endurance = 30
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
@@ -14,7 +14,7 @@
mutatelist = list(/obj/item/seeds/banana/mime, /obj/item/seeds/banana/bluespace)
reagents_add = list("banana" = 0.1, "potassium" = 0.1, "vitamin" = 0.04, "plantmatter" = 0.02)
-/obj/item/reagent_containers/food/snacks/grown/banana
+/obj/item/food/snacks/grown/banana
seed = /obj/item/seeds/banana
name = "banana"
desc = "It's an excellent prop for a clown."
@@ -26,11 +26,11 @@
distill_reagent = "bananahonk"
tastes = list("banana" = 1)
-/obj/item/reagent_containers/food/snacks/grown/banana/Initialize(mapload)
+/obj/item/food/snacks/grown/banana/Initialize(mapload)
. = ..()
ADD_TRAIT(src, TRAIT_CAN_POINT_WITH, ROUNDSTART_TRAIT)
-/obj/item/reagent_containers/food/snacks/grown/banana/suicide_act(mob/user)
+/obj/item/food/snacks/grown/banana/suicide_act(mob/user)
user.visible_message("[user] is aiming [src] at [user.p_themselves()]! It looks like [user.p_theyre()] trying to commit suicide.")
playsound(loc, 'sound/items/bikehorn.ogg', 50, 1, -1)
sleep(25)
@@ -81,13 +81,13 @@
icon_state = "seed-mimana"
species = "mimana"
plantname = "Mimana Tree"
- product = /obj/item/reagent_containers/food/snacks/grown/banana/mime
+ product = /obj/item/food/snacks/grown/banana/mime
growthstages = 4
mutatelist = list()
reagents_add = list("nothing" = 0.1, "capulettium_plus" = 0.1, "nutriment" = 0.02)
rarity = 15
-/obj/item/reagent_containers/food/snacks/grown/banana/mime
+/obj/item/food/snacks/grown/banana/mime
seed = /obj/item/seeds/banana/mime
name = "mimana"
desc = "It's an excellent prop for a mime."
@@ -110,13 +110,13 @@
species = "bluespacebanana"
icon_grow = "banana-grow"
plantname = "Bluespace Banana Tree"
- product = /obj/item/reagent_containers/food/snacks/grown/banana/bluespace
+ product = /obj/item/food/snacks/grown/banana/bluespace
mutatelist = list()
genes = list(/datum/plant_gene/trait/slip, /datum/plant_gene/trait/teleport, /datum/plant_gene/trait/repeated_harvest)
reagents_add = list("singulo" = 0.2, "banana" = 0.1, "vitamin" = 0.04, "plantmatter" = 0.02)
rarity = 30
-/obj/item/reagent_containers/food/snacks/grown/banana/bluespace
+/obj/item/food/snacks/grown/banana/bluespace
seed = /obj/item/seeds/banana/bluespace
name = "bluespace banana"
icon_state = "bluenana"
diff --git a/code/modules/hydroponics/grown/beans.dm b/code/modules/hydroponics/grown/beans.dm
index 3482fd89ecb..4c0ad33b5f4 100644
--- a/code/modules/hydroponics/grown/beans.dm
+++ b/code/modules/hydroponics/grown/beans.dm
@@ -5,7 +5,7 @@
icon_state = "seed-soybean"
species = "soybean"
plantname = "Soybean Plants"
- product = /obj/item/reagent_containers/food/snacks/grown/soybeans
+ product = /obj/item/food/snacks/grown/soybeans
maturation = 4
production = 4
potency = 15
@@ -17,7 +17,7 @@
mutatelist = list(/obj/item/seeds/soya/koi)
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.05, "soybeanoil" = 0.03)
-/obj/item/reagent_containers/food/snacks/grown/soybeans
+/obj/item/food/snacks/grown/soybeans
seed = /obj/item/seeds/soya
name = "soybeans"
desc = "It's pretty bland, but oh the possibilities..."
@@ -35,13 +35,13 @@
icon_state = "seed-koibean"
species = "koibean"
plantname = "Koibean Plants"
- product = /obj/item/reagent_containers/food/snacks/grown/koibeans
+ product = /obj/item/food/snacks/grown/koibeans
potency = 10
mutatelist = list()
reagents_add = list("carpotoxin" = 0.1, "vitamin" = 0.04, "plantmatter" = 0.05)
rarity = 20
-/obj/item/reagent_containers/food/snacks/grown/koibeans
+/obj/item/food/snacks/grown/koibeans
seed = /obj/item/seeds/soya/koi
name = "koibean"
desc = "Something about these seems fishy."
diff --git a/code/modules/hydroponics/grown/berries.dm b/code/modules/hydroponics/grown/berries.dm
index 07eb158689e..78f65129498 100644
--- a/code/modules/hydroponics/grown/berries.dm
+++ b/code/modules/hydroponics/grown/berries.dm
@@ -5,7 +5,7 @@
icon_state = "seed-berry"
species = "berry"
plantname = "Berry Bush"
- product = /obj/item/reagent_containers/food/snacks/grown/berries
+ product = /obj/item/food/snacks/grown/berries
lifespan = 20
maturation = 5
production = 5
@@ -17,7 +17,7 @@
mutatelist = list(/obj/item/seeds/berry/glow, /obj/item/seeds/berry/poison)
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/berries
+/obj/item/food/snacks/grown/berries
seed = /obj/item/seeds/berry
name = "bunch of berries"
desc = "Nutritious!"
@@ -35,12 +35,12 @@
icon_state = "seed-poisonberry"
species = "poisonberry"
plantname = "Poison-Berry Bush"
- product = /obj/item/reagent_containers/food/snacks/grown/berries/poison
+ product = /obj/item/food/snacks/grown/berries/poison
mutatelist = list(/obj/item/seeds/berry/death)
reagents_add = list("cyanide" = 0.15, "tirizene" = 0.2, "vitamin" = 0.04, "plantmatter" = 0.1)
rarity = 10 // Mildly poisonous berries are common in reality
-/obj/item/reagent_containers/food/snacks/grown/berries/poison
+/obj/item/food/snacks/grown/berries/poison
seed = /obj/item/seeds/berry/poison
name = "bunch of poison-berries"
desc = "Taste so good, you could die!"
@@ -57,14 +57,14 @@
icon_state = "seed-deathberry"
species = "deathberry"
plantname = "Death Berry Bush"
- product = /obj/item/reagent_containers/food/snacks/grown/berries/death
+ product = /obj/item/food/snacks/grown/berries/death
lifespan = 30
potency = 50
mutatelist = list()
reagents_add = list("coniine" = 0.08, "tirizene" = 0.1, "vitamin" = 0.04, "plantmatter" = 0.1)
rarity = 30
-/obj/item/reagent_containers/food/snacks/grown/berries/death
+/obj/item/food/snacks/grown/berries/death
seed = /obj/item/seeds/berry/death
name = "bunch of death-berries"
desc = "Taste so good, you could die!"
@@ -81,7 +81,7 @@
icon_state = "seed-glowberry"
species = "glowberry"
plantname = "Glow-Berry Bush"
- product = /obj/item/reagent_containers/food/snacks/grown/berries/glow
+ product = /obj/item/food/snacks/grown/berries/glow
lifespan = 30
endurance = 25
mutatelist = list()
@@ -89,7 +89,7 @@
reagents_add = list("uranium" = 0.25, "iodine" = 0.2, "vitamin" = 0.04, "plantmatter" = 0.1)
rarity = 20
-/obj/item/reagent_containers/food/snacks/grown/berries/glow
+/obj/item/food/snacks/grown/berries/glow
seed = /obj/item/seeds/berry/glow
name = "bunch of glow-berries"
desc = "Nutritious!"
@@ -109,7 +109,7 @@
icon_state = "seed-cherry"
species = "cherry"
plantname = "Cherry Tree"
- product = /obj/item/reagent_containers/food/snacks/grown/cherries
+ product = /obj/item/food/snacks/grown/cherries
lifespan = 35
endurance = 35
maturation = 5
@@ -122,7 +122,7 @@
mutatelist = list(/obj/item/seeds/cherry/blue)
reagents_add = list("plantmatter" = 0.07, "sugar" = 0.07)
-/obj/item/reagent_containers/food/snacks/grown/cherries
+/obj/item/food/snacks/grown/cherries
seed = /obj/item/seeds/cherry
name = "cherries"
desc = "Great for toppings!"
@@ -140,12 +140,12 @@
icon_state = "seed-bluecherry"
species = "bluecherry"
plantname = "Blue Cherry Tree"
- product = /obj/item/reagent_containers/food/snacks/grown/bluecherries
+ product = /obj/item/food/snacks/grown/bluecherries
mutatelist = list()
reagents_add = list("plantmatter" = 0.07, "sugar" = 0.07)
rarity = 10
-/obj/item/reagent_containers/food/snacks/grown/bluecherries
+/obj/item/food/snacks/grown/bluecherries
seed = /obj/item/seeds/cherry/blue
name = "blue cherries"
desc = "They're cherries that are blue."
@@ -162,7 +162,7 @@
icon_state = "seed-grapes"
species = "grape"
plantname = "Grape Vine"
- product = /obj/item/reagent_containers/food/snacks/grown/grapes
+ product = /obj/item/food/snacks/grown/grapes
lifespan = 50
endurance = 25
maturation = 3
@@ -176,12 +176,12 @@
mutatelist = list(/obj/item/seeds/grape/green)
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.1, "sugar" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/grapes
+/obj/item/food/snacks/grown/grapes
seed = /obj/item/seeds/grape
name = "bunch of grapes"
desc = "Nutritious!"
icon_state = "grapes"
- dried_type = /obj/item/reagent_containers/food/snacks/no_raisin/healthy
+ dried_type = /obj/item/food/snacks/no_raisin/healthy
filling_color = "#FF1493"
bitesize_mod = 2
tastes = list("grapes" = 1)
@@ -194,12 +194,12 @@
icon_state = "seed-greengrapes"
species = "greengrape"
plantname = "Green-Grape Vine"
- product = /obj/item/reagent_containers/food/snacks/grown/grapes/green
+ product = /obj/item/food/snacks/grown/grapes/green
reagents_add = list("kelotane" = 0.2, "vitamin" = 0.04, "plantmatter" = 0.1, "sugar" = 0.1)
// No rarity: technically it's a beneficial mutant, but it's not exactly "new"...
mutatelist = list()
-/obj/item/reagent_containers/food/snacks/grown/grapes/green
+/obj/item/food/snacks/grown/grapes/green
seed = /obj/item/seeds/grape/green
name = "bunch of green grapes"
icon_state = "greengrapes"
diff --git a/code/modules/hydroponics/grown/cannabis.dm b/code/modules/hydroponics/grown/cannabis.dm
index 9dedaa18d83..ce96f21d666 100644
--- a/code/modules/hydroponics/grown/cannabis.dm
+++ b/code/modules/hydroponics/grown/cannabis.dm
@@ -5,7 +5,7 @@
icon_state = "seed-cannabis"
species = "cannabis"
plantname = "Cannabis Plant"
- product = /obj/item/reagent_containers/food/snacks/grown/cannabis
+ product = /obj/item/food/snacks/grown/cannabis
maturation = 8
potency = 20
growthstages = 1
@@ -24,7 +24,7 @@
icon_state = "seed-megacannabis"
species = "megacannabis"
plantname = "Rainbow Weed"
- product = /obj/item/reagent_containers/food/snacks/grown/cannabis/rainbow
+ product = /obj/item/food/snacks/grown/cannabis/rainbow
mutatelist = list(/obj/item/seeds/cannabis/death,
/obj/item/seeds/cannabis/ultimate)
reagents_add = list("lsd" = 0.15, "thc" = 0.15, "cbd" = 0.15, "happiness" = 0.15)
@@ -36,7 +36,7 @@
icon_state = "seed-blackcannabis"
species = "blackcannabis"
plantname = "Deathweed"
- product = /obj/item/reagent_containers/food/snacks/grown/cannabis/death
+ product = /obj/item/food/snacks/grown/cannabis/death
mutatelist = list()
reagents_add = list("cyanide" = 0.35, "thc" = 0.15, "cbd" = 0.15)
rarity = 40
@@ -47,7 +47,7 @@
icon_state = "seed-whitecannabis"
species = "whitecannabis"
plantname = "Lifeweed"
- product = /obj/item/reagent_containers/food/snacks/grown/cannabis/white
+ product = /obj/item/food/snacks/grown/cannabis/white
mutatelist = list(/obj/item/seeds/cannabis/death,
/obj/item/seeds/cannabis/ultimate)
reagents_add = list("omnizine" = 0.35, "thc" = 0.15, "cbd" = 0.15)
@@ -60,7 +60,7 @@
icon_state = "seed-ocannabis"
species = "ocannabis"
plantname = "Omega Weed"
- product = /obj/item/reagent_containers/food/snacks/grown/cannabis/ultimate
+ product = /obj/item/food/snacks/grown/cannabis/ultimate
mutatelist = list()
reagents_add = list("lsd" = 0.05,
"suicider" = 0.05,
@@ -85,7 +85,7 @@
// ---------------------------------------------------------------
-/obj/item/reagent_containers/food/snacks/grown/cannabis
+/obj/item/food/snacks/grown/cannabis
seed = /obj/item/seeds/cannabis
icon = 'icons/goonstation/objects/hydroponics.dmi'
name = "cannabis leaf"
@@ -97,28 +97,28 @@
wine_power = 0.2
-/obj/item/reagent_containers/food/snacks/grown/cannabis/rainbow
+/obj/item/food/snacks/grown/cannabis/rainbow
seed = /obj/item/seeds/cannabis/rainbow
name = "rainbow cannabis leaf"
desc = "Is it supposed to be glowing like that...?"
icon_state = "megacannabis"
wine_power = 0.6
-/obj/item/reagent_containers/food/snacks/grown/cannabis/death
+/obj/item/food/snacks/grown/cannabis/death
seed = /obj/item/seeds/cannabis/death
name = "death cannabis leaf"
desc = "Looks a bit dark. Oh well."
icon_state = "blackcannabis"
wine_power = 0.4
-/obj/item/reagent_containers/food/snacks/grown/cannabis/white
+/obj/item/food/snacks/grown/cannabis/white
seed = /obj/item/seeds/cannabis/white
name = "white cannabis leaf"
desc = "It feels smooth and nice to the touch."
icon_state = "whitecannabis"
wine_power = 0.1
-/obj/item/reagent_containers/food/snacks/grown/cannabis/ultimate
+/obj/item/food/snacks/grown/cannabis/ultimate
seed = /obj/item/seeds/cannabis/ultimate
name = "omega cannibas leaf"
desc = "You feel dizzy looking at it. What the fuck?"
diff --git a/code/modules/hydroponics/grown/cereals.dm b/code/modules/hydroponics/grown/cereals.dm
index 89b462a19e1..3ed26694751 100644
--- a/code/modules/hydroponics/grown/cereals.dm
+++ b/code/modules/hydroponics/grown/cereals.dm
@@ -5,7 +5,7 @@
icon_state = "seed-wheat"
species = "wheat"
plantname = "Wheat Stalks"
- product = /obj/item/reagent_containers/food/snacks/grown/wheat
+ product = /obj/item/food/snacks/grown/wheat
production = 1
yield = 4
potency = 15
@@ -13,7 +13,7 @@
mutatelist = list(/obj/item/seeds/wheat/oat, /obj/item/seeds/wheat/meat)
reagents_add = list("plantmatter" = 0.04)
-/obj/item/reagent_containers/food/snacks/grown/wheat
+/obj/item/food/snacks/grown/wheat
seed = /obj/item/seeds/wheat
name = "wheat"
desc = "Sigh... wheat... a-grain?"
@@ -31,10 +31,10 @@
icon_state = "seed-oat"
species = "oat"
plantname = "Oat Stalks"
- product = /obj/item/reagent_containers/food/snacks/grown/oat
+ product = /obj/item/food/snacks/grown/oat
mutatelist = list()
-/obj/item/reagent_containers/food/snacks/grown/oat
+/obj/item/food/snacks/grown/oat
seed = /obj/item/seeds/wheat/oat
name = "oat"
desc = "Eat oats, do squats."
@@ -52,11 +52,11 @@
icon_state = "seed-rice"
species = "rice"
plantname = "Rice Stalks"
- product = /obj/item/reagent_containers/food/snacks/grown/rice
+ product = /obj/item/food/snacks/grown/rice
mutatelist = list()
growthstages = 3
-/obj/item/reagent_containers/food/snacks/grown/rice
+/obj/item/food/snacks/grown/rice
seed = /obj/item/seeds/wheat/rice
name = "rice"
desc = "Rice to meet you."
@@ -74,11 +74,11 @@
icon_state = "seed-meatwheat"
species = "meatwheat"
plantname = "Meatwheat"
- product = /obj/item/reagent_containers/food/snacks/grown/meatwheat
+ product = /obj/item/food/snacks/grown/meatwheat
mutatelist = list()
reagents_add = list("protein" = 0.04)
-/obj/item/reagent_containers/food/snacks/grown/meatwheat
+/obj/item/food/snacks/grown/meatwheat
name = "meatwheat"
desc = "Some blood-drenched wheat stalks. You can crush them into what passes for meat if you squint hard enough."
icon_state = "meatwheat"
@@ -89,10 +89,10 @@
tastes = list("meatwheat" = 1)
can_distill = FALSE
-/obj/item/reagent_containers/food/snacks/grown/meatwheat/attack_self(mob/living/user)
+/obj/item/food/snacks/grown/meatwheat/attack_self(mob/living/user)
user.visible_message("[user] crushes [src] into meat.", "You crush [src] into something that resembles meat.")
playsound(user, 'sound/effects/blobattack.ogg', 50, 1)
- var/obj/item/reagent_containers/food/snacks/meat/meatwheat/M = new(get_turf(user))
+ var/obj/item/food/snacks/meat/meatwheat/M = new(get_turf(user))
user.drop_item()
qdel(src)
user.put_in_hands(M)
diff --git a/code/modules/hydroponics/grown/chili.dm b/code/modules/hydroponics/grown/chili.dm
index 3908262a6a2..63202491bff 100644
--- a/code/modules/hydroponics/grown/chili.dm
+++ b/code/modules/hydroponics/grown/chili.dm
@@ -5,7 +5,7 @@
icon_state = "seed-chili"
species = "chili"
plantname = "Chili Plants"
- product = /obj/item/reagent_containers/food/snacks/grown/chili
+ product = /obj/item/food/snacks/grown/chili
lifespan = 20
maturation = 5
production = 5
@@ -18,7 +18,7 @@
mutatelist = list(/obj/item/seeds/chili/ice, /obj/item/seeds/chili/ghost)
reagents_add = list("capsaicin" = 0.25, "vitamin" = 0.04, "plantmatter" = 0.04)
-/obj/item/reagent_containers/food/snacks/grown/chili
+/obj/item/food/snacks/grown/chili
seed = /obj/item/seeds/chili
name = "chili"
desc = "It's spicy! Wait... IT'S BURNING ME!!"
@@ -35,7 +35,7 @@
icon_state = "seed-icepepper"
species = "chiliice"
plantname = "Chilly Pepper Plants"
- product = /obj/item/reagent_containers/food/snacks/grown/icepepper
+ product = /obj/item/food/snacks/grown/icepepper
lifespan = 25
maturation = 4
production = 4
@@ -43,7 +43,7 @@
mutatelist = list()
reagents_add = list("frostoil" = 0.25, "vitamin" = 0.02, "plantmatter" = 0.02)
-/obj/item/reagent_containers/food/snacks/grown/icepepper
+/obj/item/food/snacks/grown/icepepper
seed = /obj/item/seeds/chili/ice
name = "chilly pepper"
desc = "It's a mutant strain of chili"
@@ -61,7 +61,7 @@
icon_state = "seed-chilighost"
species = "chilighost"
plantname = "Ghost Chili Plants"
- product = /obj/item/reagent_containers/food/snacks/grown/ghost_chili
+ product = /obj/item/food/snacks/grown/ghost_chili
endurance = 10
maturation = 10
production = 10
@@ -70,7 +70,7 @@
mutatelist = list()
reagents_add = list("condensedcapsaicin" = 0.3, "capsaicin" = 0.55, "plantmatter" = 0.04)
-/obj/item/reagent_containers/food/snacks/grown/ghost_chili
+/obj/item/food/snacks/grown/ghost_chili
seed = /obj/item/seeds/chili/ghost
name = "ghost chili"
desc = "It seems to be vibrating gently."
diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm
index aeda25fc74d..0f624c37e1d 100644
--- a/code/modules/hydroponics/grown/citrus.dm
+++ b/code/modules/hydroponics/grown/citrus.dm
@@ -1,5 +1,5 @@
// Citrus - base type
-/obj/item/reagent_containers/food/snacks/grown/citrus
+/obj/item/food/snacks/grown/citrus
seed = /obj/item/seeds/lime
name = "citrus"
desc = "It's so sour, your face will twist."
@@ -14,7 +14,7 @@
icon_state = "seed-lime"
species = "lime"
plantname = "Lime Tree"
- product = /obj/item/reagent_containers/food/snacks/grown/citrus/lime
+ product = /obj/item/food/snacks/grown/citrus/lime
lifespan = 55
endurance = 50
yield = 4
@@ -24,7 +24,7 @@
mutatelist = list(/obj/item/seeds/orange)
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.05)
-/obj/item/reagent_containers/food/snacks/grown/citrus/lime
+/obj/item/food/snacks/grown/citrus/lime
seed = /obj/item/seeds/lime
name = "lime"
desc = "It's so sour, your face will twist."
@@ -39,7 +39,7 @@
icon_state = "seed-orange"
species = "orange"
plantname = "Orange Tree"
- product = /obj/item/reagent_containers/food/snacks/grown/citrus/orange
+ product = /obj/item/food/snacks/grown/citrus/orange
lifespan = 60
endurance = 50
yield = 5
@@ -51,7 +51,7 @@
mutatelist = list(/obj/item/seeds/lime)
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.05)
-/obj/item/reagent_containers/food/snacks/grown/citrus/orange
+/obj/item/food/snacks/grown/citrus/orange
seed = /obj/item/seeds/orange
name = "orange"
desc = "It's an tangy fruit."
@@ -67,7 +67,7 @@
icon_state = "seed-lemon"
species = "lemon"
plantname = "Lemon Tree"
- product = /obj/item/reagent_containers/food/snacks/grown/citrus/lemon
+ product = /obj/item/food/snacks/grown/citrus/lemon
lifespan = 55
endurance = 45
yield = 4
@@ -78,7 +78,7 @@
mutatelist = list(/obj/item/seeds/firelemon)
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.05)
-/obj/item/reagent_containers/food/snacks/grown/citrus/lemon
+/obj/item/food/snacks/grown/citrus/lemon
seed = /obj/item/seeds/lemon
name = "lemon"
desc = "When life gives you lemons, make lemonade."
@@ -93,7 +93,7 @@
icon_state = "seed-firelemon"
species = "firelemon"
plantname = "Combustible Lemon Tree"
- product = /obj/item/reagent_containers/food/snacks/grown/firelemon
+ product = /obj/item/food/snacks/grown/firelemon
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
icon_grow = "lime-grow"
icon_dead = "lime-dead"
@@ -103,7 +103,7 @@
yield = 4
reagents_add = list("plantmatter" = 0.05)
-/obj/item/reagent_containers/food/snacks/grown/firelemon
+/obj/item/food/snacks/grown/firelemon
seed = /obj/item/seeds/firelemon
name = "combustible lemon"
desc = "Made for burning houses down."
@@ -113,7 +113,7 @@
tastes = list("burning lemon" = 1)
wine_flavor = "fire"
-/obj/item/reagent_containers/food/snacks/grown/firelemon/attack_self(mob/living/user)
+/obj/item/food/snacks/grown/firelemon/attack_self(mob/living/user)
var/area/A = get_area(user)
user.visible_message("[user] primes [src]!", "You prime [src]!")
investigate_log("[key_name(user)] primed a combustible lemon for detonation at [A] [COORD(user)].", INVESTIGATE_BOMB)
@@ -126,19 +126,19 @@
playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
addtimer(CALLBACK(src, PROC_REF(prime)), rand(10, 60))
-/obj/item/reagent_containers/food/snacks/grown/firelemon/burn()
+/obj/item/food/snacks/grown/firelemon/burn()
prime()
..()
-/obj/item/reagent_containers/food/snacks/grown/firelemon/proc/update_mob()
+/obj/item/food/snacks/grown/firelemon/proc/update_mob()
if(ismob(loc))
var/mob/M = loc
M.unEquip(src)
-/obj/item/reagent_containers/food/snacks/grown/firelemon/ex_act(severity)
+/obj/item/food/snacks/grown/firelemon/ex_act(severity)
qdel(src) //Ensuring that it's deleted by its own explosion
-/obj/item/reagent_containers/food/snacks/grown/firelemon/proc/prime()
+/obj/item/food/snacks/grown/firelemon/proc/prime()
switch(seed.potency) //Combustible lemons are alot like IEDs, lots of flame, very little bang.
if(0 to 30)
update_mob()
diff --git a/code/modules/hydroponics/grown/cocoa_vanilla.dm b/code/modules/hydroponics/grown/cocoa_vanilla.dm
index b00c4b1aded..9e21671169b 100644
--- a/code/modules/hydroponics/grown/cocoa_vanilla.dm
+++ b/code/modules/hydroponics/grown/cocoa_vanilla.dm
@@ -5,7 +5,7 @@
icon_state = "seed-cocoapod"
species = "cocoapod"
plantname = "Cocao Tree"
- product = /obj/item/reagent_containers/food/snacks/grown/cocoapod
+ product = /obj/item/food/snacks/grown/cocoapod
lifespan = 20
maturation = 5
production = 5
@@ -18,7 +18,7 @@
mutatelist = list(/obj/item/seeds/cocoapod/vanillapod)
reagents_add = list("cocoa" = 0.25, "plantmatter" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/cocoapod
+/obj/item/food/snacks/grown/cocoapod
seed = /obj/item/seeds/cocoapod
name = "cocoa pod"
desc = "Fattening... Mmmmm... chucklate."
@@ -34,12 +34,12 @@
icon_state = "seed-vanillapod"
species = "vanillapod"
plantname = "Vanilla Tree"
- product = /obj/item/reagent_containers/food/snacks/grown/vanillapod
+ product = /obj/item/food/snacks/grown/vanillapod
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list()
reagents_add = list("vanilla" = 0.25, "plantmatter" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/vanillapod
+/obj/item/food/snacks/grown/vanillapod
seed = /obj/item/seeds/cocoapod/vanillapod
name = "vanilla pod"
desc = "Fattening... Mmmmm... vanilla."
diff --git a/code/modules/hydroponics/grown/corn.dm b/code/modules/hydroponics/grown/corn.dm
index ac7946b3864..256fc42e88c 100644
--- a/code/modules/hydroponics/grown/corn.dm
+++ b/code/modules/hydroponics/grown/corn.dm
@@ -5,7 +5,7 @@
icon_state = "seed-corn"
species = "corn"
plantname = "Corn Stalks"
- product = /obj/item/reagent_containers/food/snacks/grown/corn
+ product = /obj/item/food/snacks/grown/corn
maturation = 8
potency = 20
growthstages = 3
@@ -15,12 +15,12 @@
mutatelist = list(/obj/item/seeds/corn/snapcorn)
reagents_add = list("cornoil" = 0.2, "vitamin" = 0.04, "plantmatter" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/corn
+/obj/item/food/snacks/grown/corn
seed = /obj/item/seeds/corn
name = "ear of corn"
desc = "Needs some butter!"
icon_state = "corn"
- cooked_type = /obj/item/reagent_containers/food/snacks/popcorn
+ cooked_type = /obj/item/food/snacks/popcorn
filling_color = "#FFFF00"
trash = /obj/item/grown/corncob
bitesize_mod = 2
diff --git a/code/modules/hydroponics/grown/eggplant.dm b/code/modules/hydroponics/grown/eggplant.dm
index 7aa15c61fa9..e31e07e215b 100644
--- a/code/modules/hydroponics/grown/eggplant.dm
+++ b/code/modules/hydroponics/grown/eggplant.dm
@@ -5,7 +5,7 @@
icon_state = "seed-eggplant"
species = "eggplant"
plantname = "Eggplants"
- product = /obj/item/reagent_containers/food/snacks/grown/eggplant
+ product = /obj/item/food/snacks/grown/eggplant
yield = 2
potency = 20
growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
@@ -15,7 +15,7 @@
mutatelist = list(/obj/item/seeds/eggplant/eggy)
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/eggplant
+/obj/item/food/snacks/grown/eggplant
seed = /obj/item/seeds/eggplant
name = "eggplant"
desc = "Maybe there's a chicken inside?"
@@ -32,18 +32,18 @@
icon_state = "seed-eggy"
species = "eggy"
plantname = "Egg-Plants"
- product = /obj/item/reagent_containers/food/snacks/grown/shell/eggy
+ product = /obj/item/food/snacks/grown/shell/eggy
lifespan = 75
production = 12
mutatelist = list()
reagents_add = list("nutriment" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/shell/eggy
+/obj/item/food/snacks/grown/shell/eggy
seed = /obj/item/seeds/eggplant/eggy
name = "Egg-plant"
desc = "There MUST be a chicken inside."
icon_state = "eggyplant"
- trash = /obj/item/reagent_containers/food/snacks/egg
+ trash = /obj/item/food/snacks/egg
filling_color = "#F8F8FF"
bitesize_mod = 2
tastes = list("egg-plant" = 1)
diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm
index ea4dc842233..42d7eaa2e9c 100644
--- a/code/modules/hydroponics/grown/flowers.dm
+++ b/code/modules/hydroponics/grown/flowers.dm
@@ -5,7 +5,7 @@
icon_state = "seed-poppy"
species = "poppy"
plantname = "Poppy Plants"
- product = /obj/item/reagent_containers/food/snacks/grown/poppy
+ product = /obj/item/food/snacks/grown/poppy
endurance = 10
maturation = 8
yield = 6
@@ -17,7 +17,7 @@
mutatelist = list(/obj/item/seeds/poppy/geranium, /obj/item/seeds/poppy/lily)
reagents_add = list("bicaridine" = 0.2, "plantmatter" = 0.05)
-/obj/item/reagent_containers/food/snacks/grown/poppy
+/obj/item/food/snacks/grown/poppy
seed = /obj/item/seeds/poppy
name = "poppy"
desc = "Long-used as a symbol of rest, peace, and death."
@@ -37,10 +37,10 @@
plantname = "Lily Plants"
icon_grow = "lily-grow"
icon_dead = "lily-dead"
- product = /obj/item/reagent_containers/food/snacks/grown/poppy/lily
+ product = /obj/item/food/snacks/grown/poppy/lily
mutatelist = list()
-/obj/item/reagent_containers/food/snacks/grown/poppy/lily
+/obj/item/food/snacks/grown/poppy/lily
seed = /obj/item/seeds/poppy/lily
name = "lily"
desc = "A beautiful white flower."
@@ -57,10 +57,10 @@
plantname = "Geranium Plants"
icon_grow = "geranium-grow"
icon_dead = "geranium-dead"
- product = /obj/item/reagent_containers/food/snacks/grown/poppy/geranium
+ product = /obj/item/food/snacks/grown/poppy/geranium
mutatelist = list()
-/obj/item/reagent_containers/food/snacks/grown/poppy/geranium
+/obj/item/food/snacks/grown/poppy/geranium
seed = /obj/item/seeds/poppy/geranium
name = "geranium"
desc = "A beautiful purple flower."
@@ -76,7 +76,7 @@
icon_state = "seed-harebell"
species = "harebell"
plantname = "Harebells"
- product = /obj/item/reagent_containers/food/snacks/grown/harebell
+ product = /obj/item/food/snacks/grown/harebell
lifespan = 100
endurance = 20
maturation = 7
@@ -88,7 +88,7 @@
growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi'
reagents_add = list("plantmatter" = 0.04)
-/obj/item/reagent_containers/food/snacks/grown/harebell
+/obj/item/food/snacks/grown/harebell
seed = /obj/item/seeds/harebell
name = "harebell"
desc = "\"I'll sweeten thy sad grave: thou shalt not lack the flower that's like thy face, pale primrose, nor the azured hare-bell, like thy veins; no, nor the leaf of eglantine, whom not to slander, out-sweeten'd not thy breath.\""
@@ -144,12 +144,12 @@
plantname = "Moonflowers"
icon_grow = "moonflower-grow"
icon_dead = "sunflower-dead"
- product = /obj/item/reagent_containers/food/snacks/grown/moonflower
+ product = /obj/item/food/snacks/grown/moonflower
mutatelist = list()
reagents_add = list("moonshine" = 0.2, "vitamin" = 0.02, "plantmatter" = 0.02)
rarity = 15
-/obj/item/reagent_containers/food/snacks/grown/moonflower
+/obj/item/food/snacks/grown/moonflower
seed = /obj/item/seeds/sunflower/moonflower
name = "moonflower"
desc = "Store in a location at least 50 yards away from werewolves."
diff --git a/code/modules/hydroponics/grown/garlic.dm b/code/modules/hydroponics/grown/garlic.dm
index 3c1b2b38b1d..82d802a0b92 100644
--- a/code/modules/hydroponics/grown/garlic.dm
+++ b/code/modules/hydroponics/grown/garlic.dm
@@ -4,14 +4,14 @@
icon_state = "seed-garlic"
species = "garlic"
plantname = "Garlic Sprouts"
- product = /obj/item/reagent_containers/food/snacks/grown/garlic
+ product = /obj/item/food/snacks/grown/garlic
yield = 6
potency = 25
growthstages = 3
growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
reagents_add = list("garlic" = 0.15, "plantmatter" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/garlic
+/obj/item/food/snacks/grown/garlic
seed = /obj/item/seeds/garlic
name = "garlic"
desc = "Delicious, but with a potentially overwhelming odor."
diff --git a/code/modules/hydroponics/grown/grass_carpet.dm b/code/modules/hydroponics/grown/grass_carpet.dm
index 832645c95cd..84c177d2b07 100644
--- a/code/modules/hydroponics/grown/grass_carpet.dm
+++ b/code/modules/hydroponics/grown/grass_carpet.dm
@@ -5,7 +5,7 @@
icon_state = "seed-grass"
species = "grass"
plantname = "Grass"
- product = /obj/item/reagent_containers/food/snacks/grown/grass
+ product = /obj/item/food/snacks/grown/grass
lifespan = 40
endurance = 40
maturation = 2
@@ -18,7 +18,7 @@
mutatelist = list(/obj/item/seeds/grass/carpet)
reagents_add = list("plantmatter" = 0.02, "hydrogen" = 0.05)
-/obj/item/reagent_containers/food/snacks/grown/grass
+/obj/item/food/snacks/grown/grass
seed = /obj/item/seeds/grass
name = "grass"
desc = "Green and lush."
@@ -30,10 +30,10 @@
tastes = list("grass" = 1)
wine_power = 0.15
-/obj/item/reagent_containers/food/snacks/grown/grass/attack_self(mob/user)
+/obj/item/food/snacks/grown/grass/attack_self(mob/user)
to_chat(user, "You prepare the astroturf.")
var/grassAmt = 1 + round(seed.potency * tile_coefficient) // The grass we're holding
- for(var/obj/item/reagent_containers/food/snacks/grown/grass/G in user.loc) // The grass on the floor
+ for(var/obj/item/food/snacks/grown/grass/G in user.loc) // The grass on the floor
if(G.type != type)
continue
grassAmt += 1 + round(G.seed.potency * tile_coefficient)
@@ -48,11 +48,11 @@
icon_state = "seed-carpet"
species = "carpet"
plantname = "Carpet"
- product = /obj/item/reagent_containers/food/snacks/grown/grass/carpet
+ product = /obj/item/food/snacks/grown/grass/carpet
mutatelist = list()
rarity = 10
-/obj/item/reagent_containers/food/snacks/grown/grass/carpet
+/obj/item/food/snacks/grown/grass/carpet
seed = /obj/item/seeds/grass/carpet
name = "carpet"
desc = "The textile industry's dark secret."
diff --git a/code/modules/hydroponics/grown/herbals.dm b/code/modules/hydroponics/grown/herbals.dm
index e98247d8cb5..87ff2959c04 100644
--- a/code/modules/hydroponics/grown/herbals.dm
+++ b/code/modules/hydroponics/grown/herbals.dm
@@ -4,14 +4,14 @@
icon_state = "seed-cabbage"
species = "cabbage"
plantname = "comfrey"
- product = /obj/item/reagent_containers/food/snacks/grown/comfrey
+ product = /obj/item/food/snacks/grown/comfrey
yield = 2
maturation = 3
growthstages = 1
growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
reagents_add = list("styptic_powder" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/comfrey
+/obj/item/food/snacks/grown/comfrey
seed = /obj/item/seeds/comfrey
name = "comfrey leaf"
desc = "Mash to turn into a poultice."
@@ -20,7 +20,7 @@
tastes = list("comfrey" = 1)
bitesize_mod = 2
-/obj/item/reagent_containers/food/snacks/grown/comfrey/attack_self(mob/user)
+/obj/item/food/snacks/grown/comfrey/attack_self(mob/user)
var/obj/item/stack/medical/bruise_pack/comfrey/C = new(get_turf(user))
C.heal_brute = seed.potency
to_chat(user, "You mash [src] into a poultice.")
@@ -33,12 +33,12 @@
icon_state = "seed-ambrosiavulgaris"
species = "ambrosiavulgaris"
plantname = "Aloe Vera Plant"
- product = /obj/item/reagent_containers/food/snacks/grown/aloe
+ product = /obj/item/food/snacks/grown/aloe
yield = 2
icon_dead = "ambrosia-dead"
reagents_add = list("silver_sulfadiazine" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/aloe
+/obj/item/food/snacks/grown/aloe
seed = /obj/item/seeds/aloe
name = "aloe leaf"
desc = "Mash to turn into a poultice."
@@ -47,7 +47,7 @@
tastes = list("aloe" = 1)
bitesize_mod = 2
-/obj/item/reagent_containers/food/snacks/grown/aloe/attack_self(mob/user)
+/obj/item/food/snacks/grown/aloe/attack_self(mob/user)
var/obj/item/stack/medical/ointment/aloe/A = new(get_turf(user))
A.heal_burn = seed.potency
to_chat(user, "You mash [src] into a poultice.")
@@ -61,7 +61,7 @@
icon_state = "seed-mint"
species = "mint"
plantname = "Mint Plant"
- product = /obj/item/reagent_containers/food/snacks/grown/mint
+ product = /obj/item/food/snacks/grown/mint
lifespan = 20
maturation = 4
production = 5
@@ -70,7 +70,7 @@
icon_dead = "mint-dead"
reagents_add = list("mint" = 0.03, "plantmatter" = 0.03)
-/obj/item/reagent_containers/food/snacks/grown/mint
+/obj/item/food/snacks/grown/mint
seed = /obj/item/seeds/mint
name = "mint leaves"
desc = "Process for mint. Distill for menthol. No need to experi-mint." //haha
diff --git a/code/modules/hydroponics/grown/kudzu.dm b/code/modules/hydroponics/grown/kudzu.dm
index fdaa9750a20..537356c9b47 100644
--- a/code/modules/hydroponics/grown/kudzu.dm
+++ b/code/modules/hydroponics/grown/kudzu.dm
@@ -6,7 +6,7 @@
icon_state = "seed-kudzu"
species = "kudzu"
plantname = "Kudzu"
- product = /obj/item/reagent_containers/food/snacks/grown/kudzupod
+ product = /obj/item/food/snacks/grown/kudzupod
genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/plant_type/weed_hardy)
lifespan = 20
endurance = 10
@@ -88,7 +88,7 @@
adjust_potency(rand(15, -5))
-/obj/item/reagent_containers/food/snacks/grown/kudzupod
+/obj/item/food/snacks/grown/kudzupod
seed = /obj/item/seeds/kudzu
name = "kudzu pod"
desc = "Pueraria Virallis: An invasive species with vines that rapidly creep and wrap around whatever they contact."
diff --git a/code/modules/hydroponics/grown/melon.dm b/code/modules/hydroponics/grown/melon.dm
index e4e20fd1f7c..702640618ab 100644
--- a/code/modules/hydroponics/grown/melon.dm
+++ b/code/modules/hydroponics/grown/melon.dm
@@ -5,7 +5,7 @@
icon_state = "seed-watermelon"
species = "watermelon"
plantname = "Watermelon Vines"
- product = /obj/item/reagent_containers/food/snacks/grown/watermelon
+ product = /obj/item/food/snacks/grown/watermelon
lifespan = 50
endurance = 40
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
@@ -21,12 +21,12 @@
qdel(src)
return OBLITERATION
-/obj/item/reagent_containers/food/snacks/grown/watermelon
+/obj/item/food/snacks/grown/watermelon
seed = /obj/item/seeds/watermelon
name = "watermelon"
desc = "It's full of watery goodness."
icon_state = "watermelon" // Sprite created by https://github.com/binarysudoku for Goonstation, They have relicensed it for our use.
- slice_path = /obj/item/reagent_containers/food/snacks/watermelonslice
+ slice_path = /obj/item/food/snacks/watermelonslice
slices_num = 5
dried_type = null
w_class = WEIGHT_CLASS_NORMAL
@@ -42,12 +42,12 @@
icon_state = "seed-holymelon"
species = "holymelon"
plantname = "Holy Melon Vines"
- product = /obj/item/reagent_containers/food/snacks/grown/holymelon
+ product = /obj/item/food/snacks/grown/holymelon
mutatelist = list()
reagents_add = list("holywater" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1)
rarity = 20
-/obj/item/reagent_containers/food/snacks/grown/holymelon
+/obj/item/food/snacks/grown/holymelon
seed = /obj/item/seeds/watermelon/holy
name = "holymelon"
desc = "The water within this melon has been blessed by some deity that's particularly fond of watermelon."
diff --git a/code/modules/hydroponics/grown/misc_seeds.dm b/code/modules/hydroponics/grown/misc_seeds.dm
index 1d34ff8a0eb..6e4bf03af16 100644
--- a/code/modules/hydroponics/grown/misc_seeds.dm
+++ b/code/modules/hydroponics/grown/misc_seeds.dm
@@ -34,7 +34,7 @@
icon_state = "seed-cabbage"
species = "cabbage"
plantname = "Cabbages"
- product = /obj/item/reagent_containers/food/snacks/grown/cabbage
+ product = /obj/item/food/snacks/grown/cabbage
lifespan = 50
endurance = 25
maturation = 3
@@ -46,7 +46,7 @@
mutatelist = list(/obj/item/seeds/replicapod)
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/cabbage
+/obj/item/food/snacks/grown/cabbage
seed = /obj/item/seeds/cabbage
name = "cabbage"
desc = "Ewwwwwwwwww. Cabbage."
@@ -64,7 +64,7 @@
icon_state = "seed-sugarcane"
species = "sugarcane"
plantname = "Sugarcane"
- product = /obj/item/reagent_containers/food/snacks/grown/sugarcane
+ product = /obj/item/food/snacks/grown/sugarcane
genes = list(/datum/plant_gene/trait/repeated_harvest)
lifespan = 60
endurance = 50
@@ -73,7 +73,7 @@
growthstages = 3
reagents_add = list("sugar" = 0.25)
-/obj/item/reagent_containers/food/snacks/grown/sugarcane
+/obj/item/food/snacks/grown/sugarcane
seed = /obj/item/seeds/sugarcane
name = "sugarcane"
desc = "Sickly sweet."
@@ -91,7 +91,7 @@
icon_state = "seed-gatfruit"
species = "gatfruit"
plantname = "Gatfruit Tree"
- product = /obj/item/reagent_containers/food/snacks/grown/shell/gatfruit
+ product = /obj/item/food/snacks/grown/shell/gatfruit
genes = list(/datum/plant_gene/trait/repeated_harvest)
lifespan = 20
endurance = 20
@@ -104,7 +104,7 @@
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
reagents_add = list("sulfur" = 0.1, "carbon" = 0.1, "nitrogen" = 0.07, "potassium" = 0.05)
-/obj/item/reagent_containers/food/snacks/grown/shell/gatfruit
+/obj/item/food/snacks/grown/shell/gatfruit
seed = /obj/item/seeds/gatfruit
name = "gatfruit"
desc = "It smells like burning."
@@ -122,12 +122,12 @@
icon_state = "seed-cherry_bomb"
species = "cherry_bomb"
plantname = "Cherry Bomb Tree"
- product = /obj/item/reagent_containers/food/snacks/grown/cherry_bomb
+ product = /obj/item/food/snacks/grown/cherry_bomb
mutatelist = list()
reagents_add = list("plantmatter" = 0.1, "sugar" = 0.1, "blackpowder" = 0.7)
rarity = 60 //See above
-/obj/item/reagent_containers/food/snacks/grown/cherry_bomb
+/obj/item/food/snacks/grown/cherry_bomb
name = "cherry bombs"
desc = "You think you can hear the hissing of a tiny fuse."
icon_state = "cherry_bomb"
@@ -139,7 +139,7 @@
max_integrity = 40
wine_power = 0.8
-/obj/item/reagent_containers/food/snacks/grown/cherry_bomb/attack_self(mob/living/user)
+/obj/item/food/snacks/grown/cherry_bomb/attack_self(mob/living/user)
var/area/A = get_area(user)
user.visible_message("[user] plucks the stem from [src]!", "You pluck the stem from [src], which begins to hiss loudly!")
message_admins("[user] ([user.key ? user.key : "no key"]) primed a cherry bomb for detonation at [A] ([user.x], [user.y], [user.z]) (JMP)")
@@ -149,16 +149,16 @@
C.throw_mode_on()
prime()
-/obj/item/reagent_containers/food/snacks/grown/cherry_bomb/deconstruct(disassembled = TRUE)
+/obj/item/food/snacks/grown/cherry_bomb/deconstruct(disassembled = TRUE)
if(!disassembled)
prime()
if(!QDELETED(src))
qdel(src)
-/obj/item/reagent_containers/food/snacks/grown/cherry_bomb/ex_act(severity)
+/obj/item/food/snacks/grown/cherry_bomb/ex_act(severity)
qdel(src) //Ensuring that it's deleted by its own explosion. Also prevents mass chain reaction with piles of cherry bombs
-/obj/item/reagent_containers/food/snacks/grown/cherry_bomb/proc/prime()
+/obj/item/food/snacks/grown/cherry_bomb/proc/prime()
icon_state = "cherry_bomb_lit"
playsound(src, 'sound/goonstation/misc/fuse.ogg', seed.potency, 0)
reagents.set_reagent_temp(1000) //Sets off the black powder
diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm
index 9f516da18d5..88e447ec798 100644
--- a/code/modules/hydroponics/grown/mushrooms.dm
+++ b/code/modules/hydroponics/grown/mushrooms.dm
@@ -1,4 +1,4 @@
-/obj/item/reagent_containers/food/snacks/grown/mushroom
+/obj/item/food/snacks/grown/mushroom
name = "mushroom"
bitesize_mod = 2
wine_power = 0.4
@@ -11,7 +11,7 @@
icon_state = "mycelium-reishi"
species = "reishi"
plantname = "Reishi"
- product = /obj/item/reagent_containers/food/snacks/grown/mushroom/reishi
+ product = /obj/item/food/snacks/grown/mushroom/reishi
lifespan = 35
endurance = 35
maturation = 10
@@ -23,7 +23,7 @@
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
reagents_add = list("morphine" = 0.35, "charcoal" = 0.35, "nutriment" = 0)
-/obj/item/reagent_containers/food/snacks/grown/mushroom/reishi
+/obj/item/food/snacks/grown/mushroom/reishi
seed = /obj/item/seeds/reishi
name = "reishi"
desc = "Ganoderma lucidum: A special fungus known for its medicinal and stress relieving properties."
@@ -39,7 +39,7 @@
icon_state = "mycelium-amanita"
species = "amanita"
plantname = "Fly Amanitas"
- product = /obj/item/reagent_containers/food/snacks/grown/mushroom/amanita
+ product = /obj/item/food/snacks/grown/mushroom/amanita
lifespan = 50
endurance = 35
maturation = 10
@@ -51,7 +51,7 @@
mutatelist = list(/obj/item/seeds/angel)
reagents_add = list("psilocybin" = 0.04, "amanitin" = 0.35, "nutriment" = 0, "growthserum" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/mushroom/amanita
+/obj/item/food/snacks/grown/mushroom/amanita
seed = /obj/item/seeds/amanita
name = "fly amanita"
desc = "Amanita Muscaria: Learn poisonous mushrooms by heart. Only pick mushrooms you know."
@@ -67,7 +67,7 @@
icon_state = "mycelium-angel"
species = "angel"
plantname = "Destroying Angels"
- product = /obj/item/reagent_containers/food/snacks/grown/mushroom/angel
+ product = /obj/item/food/snacks/grown/mushroom/angel
lifespan = 50
endurance = 35
maturation = 12
@@ -81,7 +81,7 @@
rarity = 30
origin_tech = "biotech=5"
-/obj/item/reagent_containers/food/snacks/grown/mushroom/angel
+/obj/item/food/snacks/grown/mushroom/angel
seed = /obj/item/seeds/angel
name = "destroying angel"
desc = "Amanita Virosa: Deadly poisonous basidiomycete fungus filled with alpha amanitin."
@@ -98,7 +98,7 @@
icon_state = "mycelium-liberty"
species = "liberty"
plantname = "Liberty-Caps"
- product = /obj/item/reagent_containers/food/snacks/grown/mushroom/libertycap
+ product = /obj/item/food/snacks/grown/mushroom/libertycap
maturation = 7
production = 1
yield = 5
@@ -108,7 +108,7 @@
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
reagents_add = list("psilocybin" = 0.25, "nutriment" = 0.02)
-/obj/item/reagent_containers/food/snacks/grown/mushroom/libertycap
+/obj/item/food/snacks/grown/mushroom/libertycap
seed = /obj/item/seeds/liberty
name = "liberty-cap"
desc = "Psilocybe Semilanceata: Liberate yourself!"
@@ -126,7 +126,7 @@
icon_state = "mycelium-plump"
species = "plump"
plantname = "Plump-Helmet Mushrooms"
- product = /obj/item/reagent_containers/food/snacks/grown/mushroom/plumphelmet
+ product = /obj/item/food/snacks/grown/mushroom/plumphelmet
maturation = 8
production = 1
yield = 4
@@ -137,7 +137,7 @@
mutatelist = list(/obj/item/seeds/plump/walkingmushroom)
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/mushroom/plumphelmet
+/obj/item/food/snacks/grown/mushroom/plumphelmet
seed = /obj/item/seeds/plump
name = "plump-helmet"
desc = "Plumus Hellmus: Plump, soft and s-so inviting~"
@@ -154,7 +154,7 @@
icon_state = "mycelium-walkingmushroom"
species = "walkingmushroom"
plantname = "Walking Mushrooms"
- product = /obj/item/reagent_containers/food/snacks/grown/mushroom/walkingmushroom
+ product = /obj/item/food/snacks/grown/mushroom/walkingmushroom
lifespan = 30
endurance = 30
maturation = 5
@@ -164,7 +164,7 @@
reagents_add = list("vitamin" = 0.05, "nutriment" = 0.15)
rarity = 30
-/obj/item/reagent_containers/food/snacks/grown/mushroom/walkingmushroom
+/obj/item/food/snacks/grown/mushroom/walkingmushroom
seed = /obj/item/seeds/plump/walkingmushroom
name = "walking mushroom"
desc = "Plumus Locomotus: The beginning of the great walk."
@@ -174,7 +174,7 @@
tastes = list("walking mushroom" = 1, "motion" = 1)
can_distill = FALSE
-/obj/item/reagent_containers/food/snacks/grown/mushroom/walkingmushroom/attack_self(mob/user)
+/obj/item/food/snacks/grown/mushroom/walkingmushroom/attack_self(mob/user)
if(isspaceturf(user.loc))
return
var/mob/living/simple_animal/hostile/mushroom/M = new /mob/living/simple_animal/hostile/mushroom(user.loc)
@@ -194,7 +194,7 @@
icon_state = "mycelium-chanter"
species = "chanter"
plantname = "Chanterelle Mushrooms"
- product = /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle
+ product = /obj/item/food/snacks/grown/mushroom/chanterelle
lifespan = 35
endurance = 20
maturation = 7
@@ -206,7 +206,7 @@
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
reagents_add = list("nutriment" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle
+/obj/item/food/snacks/grown/mushroom/chanterelle
seed = /obj/item/seeds/chanter
name = "chanterelle cluster"
desc = "Cantharellus Cibarius: These jolly yellow little shrooms sure look tasty!"
@@ -222,7 +222,7 @@
icon_state = "mycelium-glowshroom"
species = "glowshroom"
plantname = "Glowshrooms"
- product = /obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom
+ product = /obj/item/food/snacks/grown/mushroom/glowshroom
lifespan = 100 //ten times that is the delay
endurance = 30
maturation = 15
@@ -236,7 +236,7 @@
mutatelist = list(/obj/item/seeds/glowshroom/glowcap, /obj/item/seeds/glowshroom/shadowshroom)
reagents_add = list("radium" = 0.1, "phosphorus" = 0.1, "nutriment" = 0.04)
-/obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom
+/obj/item/food/snacks/grown/mushroom/glowshroom
seed = /obj/item/seeds/glowshroom
name = "glowshroom cluster"
desc = "Mycena Bregprox: This species of mushroom glows in the dark."
@@ -248,7 +248,7 @@
tastes = list("warmth" = 1, "light" = 1, "glowshroom" = 1)
wine_power = 0.5
-/obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/attack_self(mob/user)
+/obj/item/food/snacks/grown/mushroom/glowshroom/attack_self(mob/user)
if(isspaceturf(user.loc))
return FALSE
if(!isturf(user.loc))
@@ -279,13 +279,13 @@
species = "glowcap"
icon_harvest = "glowcap-harvest"
plantname = "Glowcaps"
- product = /obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/glowcap
+ product = /obj/item/food/snacks/grown/mushroom/glowshroom/glowcap
genes = list(/datum/plant_gene/trait/glow/red, /datum/plant_gene/trait/cell_charge, /datum/plant_gene/trait/plant_type/fungal_metabolism)
mutatelist = list()
reagents_add = list("teslium" = 0.1, "nutriment" = 0.04)
rarity = 30
-/obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/glowcap
+/obj/item/food/snacks/grown/mushroom/glowshroom/glowcap
seed = /obj/item/seeds/glowshroom/glowcap
name = "glowcap cluster"
desc = "Mycena Ruthenia: This species of mushroom glows in the dark, but isn't actually bioluminescent. They're warm to the touch..."
@@ -305,7 +305,7 @@
icon_state = "mycelium-tower"
species = "mold"
plantname = "Fungus"
- product = /obj/item/reagent_containers/food/snacks/grown/mushroom/fungus
+ product = /obj/item/food/snacks/grown/mushroom/fungus
yield = 4
icon_grow = "mold-grow"
icon_dead = "mold-dead"
@@ -314,7 +314,7 @@
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism)
reagents_add = list("fungus" = 0.35)
-/obj/item/reagent_containers/food/snacks/grown/mushroom/fungus
+/obj/item/food/snacks/grown/mushroom/fungus
seed = /obj/item/seeds/fungus
name = "fungus"
desc = "A fungus ideal for making antibacterials."
@@ -331,13 +331,13 @@
icon_grow = "shadowshroom-grow"
icon_dead = "shadowshroom-dead"
plantname = "Shadowshrooms"
- product = /obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/shadowshroom
+ product = /obj/item/food/snacks/grown/mushroom/glowshroom/shadowshroom
genes = list(/datum/plant_gene/trait/glow/shadow, /datum/plant_gene/trait/plant_type/fungal_metabolism)
mutatelist = list()
reagents_add = list("radium" = 0.2, "nutriment" = 0.04)
rarity = 30
-/obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/shadowshroom
+/obj/item/food/snacks/grown/mushroom/glowshroom/shadowshroom
seed = /obj/item/seeds/glowshroom/shadowshroom
name = "shadowshroom cluster"
desc = "Mycena Umbra: This species of mushroom emits shadow instead of light."
diff --git a/code/modules/hydroponics/grown/nymph.dm b/code/modules/hydroponics/grown/nymph.dm
index 34bbffc4c9d..af1a0506b78 100644
--- a/code/modules/hydroponics/grown/nymph.dm
+++ b/code/modules/hydroponics/grown/nymph.dm
@@ -4,7 +4,7 @@
icon_state = "seed-replicapod"
species = "replicapod"
plantname = "Nymph Pod"
- product = /obj/item/reagent_containers/food/snacks/grown/nymph_pod
+ product = /obj/item/food/snacks/grown/nymph_pod
lifespan = 50
endurance = 8
maturation = 10
@@ -12,14 +12,14 @@
yield = 1
reagents_add = list("plantmatter" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/nymph_pod
+/obj/item/food/snacks/grown/nymph_pod
seed = /obj/item/seeds/nymph
name = "nymph pod"
desc = "A peculiar wriggling pod with a grown nymph inside. Crack it open to let the nymph out."
icon_state = "mushy"
bitesize_mod = 2
-/obj/item/reagent_containers/food/snacks/grown/nymph_pod/attack_self(mob/user)
+/obj/item/food/snacks/grown/nymph_pod/attack_self(mob/user)
new /mob/living/simple_animal/diona(get_turf(user))
to_chat(user, "You crack open [src] letting the nymph out.")
user.drop_item()
diff --git a/code/modules/hydroponics/grown/olive.dm b/code/modules/hydroponics/grown/olive.dm
index d8958703bca..05f46a5a58f 100644
--- a/code/modules/hydroponics/grown/olive.dm
+++ b/code/modules/hydroponics/grown/olive.dm
@@ -5,7 +5,7 @@
icon_state = "seed-olive"
species = "olive"
plantname = "Olive Tree"
- product = /obj/item/reagent_containers/food/snacks/grown/olive
+ product = /obj/item/food/snacks/grown/olive
lifespan = 150
endurance = 35
yield = 5
@@ -15,7 +15,7 @@
mutatelist = list()
reagents_add = list("vitamin" = 0.02, "plantmatter" = 0.2, "sodiumchloride" = 0.2)
-/obj/item/reagent_containers/food/snacks/grown/olive
+/obj/item/food/snacks/grown/olive
seed = /obj/item/seeds/olive
name = "olive"
desc = "A small cylindrical salty fruit closely related to mangoes. Can be ground into a paste and mixed with water to make quality oil."
diff --git a/code/modules/hydroponics/grown/onion.dm b/code/modules/hydroponics/grown/onion.dm
index 8594c6f37ea..b59a3bfa5e0 100644
--- a/code/modules/hydroponics/grown/onion.dm
+++ b/code/modules/hydroponics/grown/onion.dm
@@ -4,7 +4,7 @@
icon_state = "seed-onion"
species = "onion"
plantname = "Onion Sprouts"
- product = /obj/item/reagent_containers/food/snacks/grown/onion
+ product = /obj/item/food/snacks/grown/onion
lifespan = 20
maturation = 3
production = 4
@@ -16,14 +16,14 @@
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.1)
mutatelist = list(/obj/item/seeds/onion/red)
-/obj/item/reagent_containers/food/snacks/grown/onion
+/obj/item/food/snacks/grown/onion
seed = /obj/item/seeds/onion
name = "onion"
desc = "Nothing to cry over."
icon_state = "onion"
filling_color = "#C0C9A0"
bitesize_mod = 2
- slice_path = /obj/item/reagent_containers/food/snacks/onion_slice
+ slice_path = /obj/item/food/snacks/onion_slice
tastes = list("onion" = 1, "pungentness" = 1)
slices_num = 2
wine_power = 0.3
@@ -36,22 +36,22 @@
species = "onion_red"
plantname = "Red Onion Sprouts"
weed_chance = 1
- product = /obj/item/reagent_containers/food/snacks/grown/onion/red
+ product = /obj/item/food/snacks/grown/onion/red
mutatelist = list()
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.1, "onionjuice" = 0.05)
-/obj/item/reagent_containers/food/snacks/grown/onion/red
+/obj/item/food/snacks/grown/onion/red
seed = /obj/item/seeds/onion/red
name = "red onion"
desc = "Purple despite the name."
icon_state = "onion_red"
filling_color = "#C29ACF"
- slice_path = /obj/item/reagent_containers/food/snacks/onion_slice/red
+ slice_path = /obj/item/food/snacks/onion_slice/red
tastes = list("red onion" = 1, "pungentness" = 3)
wine_power = 0.6
wine_flavor = "powerful pungentness"
-/obj/item/reagent_containers/food/snacks/onion_slice
+/obj/item/food/snacks/onion_slice
name = "onion slices"
desc = "Rings, not for wearing."
icon_state = "onionslice"
@@ -59,9 +59,9 @@
filling_color = "#C0C9A0"
tastes = list("onion" = 1, "pungentness" = 1)
gender = PLURAL
- cooked_type = /obj/item/reagent_containers/food/snacks/onionrings
+ cooked_type = /obj/item/food/snacks/onionrings
-/obj/item/reagent_containers/food/snacks/onion_slice/red
+/obj/item/food/snacks/onion_slice/red
name = "red onion slices"
desc = "They shine like exceptionally low quality amethyst."
icon_state = "onionslice_red"
diff --git a/code/modules/hydroponics/grown/peanut.dm b/code/modules/hydroponics/grown/peanut.dm
index 836f2148888..8226df87fca 100644
--- a/code/modules/hydroponics/grown/peanut.dm
+++ b/code/modules/hydroponics/grown/peanut.dm
@@ -5,7 +5,7 @@
icon_state = "seed-potato"
species = "potato"
plantname = "Peanut Vines"
- product = /obj/item/reagent_containers/food/snacks/grown/peanuts
+ product = /obj/item/food/snacks/grown/peanuts
lifespan = 30
maturation = 10
production = 1
@@ -17,7 +17,7 @@
genes = list(/datum/plant_gene/trait/repeated_harvest)
reagents_add = list("plantmatter" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/peanuts
+/obj/item/food/snacks/grown/peanuts
seed = /obj/item/seeds/peanuts
name = "patch of peanuts"
desc = "Best avoided if you have spess allergies."
diff --git a/code/modules/hydroponics/grown/pineapple.dm b/code/modules/hydroponics/grown/pineapple.dm
index aa1946aee4e..dd4727a2c31 100644
--- a/code/modules/hydroponics/grown/pineapple.dm
+++ b/code/modules/hydroponics/grown/pineapple.dm
@@ -5,7 +5,7 @@
icon_state = "seed-pineapple"
species = "pineapple"
plantname = "Pineapple Plant"
- product = /obj/item/reagent_containers/food/snacks/grown/pineapple
+ product = /obj/item/food/snacks/grown/pineapple
lifespan = 40
endurance = 30
growthstages = 3
@@ -14,7 +14,7 @@
mutatelist = list(/obj/item/seeds/apple)
reagents_add = list("vitamin" = 0.02, "plantmatter" = 0.2, "water" = 0.04)
-/obj/item/reagent_containers/food/snacks/grown/pineapple
+/obj/item/food/snacks/grown/pineapple
seed = /obj/item/seeds/pineapple
name = "pineapple"
desc = "A soft sweet interior surrounded by a spiky skin."
@@ -25,7 +25,7 @@
attack_verb = list("stung", "pined")
throw_speed = 1
throw_range = 5
- slice_path = /obj/item/reagent_containers/food/snacks/pineappleslice
+ slice_path = /obj/item/food/snacks/pineappleslice
slices_num = 3
filling_color = "#F6CB0B"
w_class = WEIGHT_CLASS_NORMAL
diff --git a/code/modules/hydroponics/grown/potato.dm b/code/modules/hydroponics/grown/potato.dm
index a4d85416328..319343fac18 100644
--- a/code/modules/hydroponics/grown/potato.dm
+++ b/code/modules/hydroponics/grown/potato.dm
@@ -5,7 +5,7 @@
icon_state = "seed-potato"
species = "potato"
plantname = "Potato Plants"
- product = /obj/item/reagent_containers/food/snacks/grown/potato
+ product = /obj/item/food/snacks/grown/potato
lifespan = 30
maturation = 10
production = 1
@@ -18,7 +18,7 @@
mutatelist = list(/obj/item/seeds/potato/sweet)
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/potato
+/obj/item/food/snacks/grown/potato
seed = /obj/item/seeds/potato
name = "potato"
desc = "Boil 'em! Mash 'em! Stick 'em in a stew!"
@@ -29,7 +29,7 @@
distill_reagent = "vodka"
-/obj/item/reagent_containers/food/snacks/grown/potato/wedges
+/obj/item/food/snacks/grown/potato/wedges
name = "potato wedges"
desc = "Slices of neatly cut potato."
icon_state = "potato_wedges"
@@ -39,10 +39,10 @@
distill_reagent = "sbiten"
-/obj/item/reagent_containers/food/snacks/grown/potato/attackby(obj/item/W, mob/user, params)
+/obj/item/food/snacks/grown/potato/attackby(obj/item/W, mob/user, params)
if(is_sharp(W))
to_chat(user, "You cut the potato into wedges with [W].")
- var/obj/item/reagent_containers/food/snacks/grown/potato/wedges/Wedges = new /obj/item/reagent_containers/food/snacks/grown/potato/wedges
+ var/obj/item/food/snacks/grown/potato/wedges/Wedges = new /obj/item/food/snacks/grown/potato/wedges
if(!remove_item_from_storage(user))
user.unEquip(src)
user.put_in_hands(Wedges)
@@ -58,11 +58,11 @@
icon_state = "seed-sweetpotato"
species = "sweetpotato"
plantname = "Sweet Potato Plants"
- product = /obj/item/reagent_containers/food/snacks/grown/potato/sweet
+ product = /obj/item/food/snacks/grown/potato/sweet
mutatelist = list()
reagents_add = list("vitamin" = 0.1, "sugar" = 0.1, "plantmatter" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/potato/sweet
+/obj/item/food/snacks/grown/potato/sweet
seed = /obj/item/seeds/potato/sweet
name = "sweet potato"
desc = "It's sweet."
diff --git a/code/modules/hydroponics/grown/pumpkin.dm b/code/modules/hydroponics/grown/pumpkin.dm
index 718b16c6b1f..93b5da9980c 100644
--- a/code/modules/hydroponics/grown/pumpkin.dm
+++ b/code/modules/hydroponics/grown/pumpkin.dm
@@ -5,7 +5,7 @@
icon_state = "seed-pumpkin"
species = "pumpkin"
plantname = "Pumpkin Vines"
- product = /obj/item/reagent_containers/food/snacks/grown/pumpkin
+ product = /obj/item/food/snacks/grown/pumpkin
lifespan = 50
endurance = 40
growthstages = 3
@@ -17,7 +17,7 @@
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.2)
-/obj/item/reagent_containers/food/snacks/grown/pumpkin
+/obj/item/food/snacks/grown/pumpkin
seed = /obj/item/seeds/pumpkin
name = "pumpkin"
desc = "It's large and scary."
@@ -28,7 +28,7 @@
wine_power = 0.2
var/carved_type = /obj/item/clothing/head/hardhat/pumpkinhead
-/obj/item/reagent_containers/food/snacks/grown/pumpkin/attackby(obj/item/W as obj, mob/user as mob, params)
+/obj/item/food/snacks/grown/pumpkin/attackby(obj/item/W as obj, mob/user as mob, params)
if(is_sharp(W))
user.show_message("You carve a face into [src]!", 1)
new carved_type(user.loc)
@@ -44,13 +44,13 @@
icon_state = "seed-blumpkin"
species = "blumpkin"
plantname = "Blumpkin Vines"
- product = /obj/item/reagent_containers/food/snacks/grown/pumpkin/blumpkin
+ product = /obj/item/food/snacks/grown/pumpkin/blumpkin
mutatelist = list()
reagents_add = list("ammonia" = 0.2, "chlorine" = 0.1, "plasma" = 0.1, "plantmatter" = 0.2)
rarity = 20
-/obj/item/reagent_containers/food/snacks/grown/pumpkin/blumpkin
+/obj/item/food/snacks/grown/pumpkin/blumpkin
seed = /obj/item/seeds/pumpkin/blumpkin
name = "blumpkin"
desc = "The pumpkin's toxic sibling."
diff --git a/code/modules/hydroponics/grown/random_seeds.dm b/code/modules/hydroponics/grown/random_seeds.dm
index c01513e1011..3be1c302f87 100644
--- a/code/modules/hydroponics/grown/random_seeds.dm
+++ b/code/modules/hydroponics/grown/random_seeds.dm
@@ -6,7 +6,7 @@
icon_state = "seed-x"
species = "?????"
plantname = "strange plant"
- product = /obj/item/reagent_containers/food/snacks/grown/random
+ product = /obj/item/food/snacks/grown/random
icon_grow = "xpod-grow"
icon_dead = "xpod-dead"
icon_harvest = "xpod-harvest"
@@ -30,14 +30,14 @@
add_random_plant_type(100)
desc = "Label: \n" + get_analyzer_text()
-/obj/item/reagent_containers/food/snacks/grown/random
+/obj/item/food/snacks/grown/random
seed = /obj/item/seeds/random
name = "strange plant"
desc = "What could this even be?"
icon_state = "crunchy"
bitesize_mod = 2
-/obj/item/reagent_containers/food/snacks/grown/random/Initialize()
+/obj/item/food/snacks/grown/random/Initialize()
. = ..()
wine_power = rand(0.1,1.5)
if(prob(1))
diff --git a/code/modules/hydroponics/grown/root.dm b/code/modules/hydroponics/grown/root.dm
index 263f5256817..4d8e9ab629c 100644
--- a/code/modules/hydroponics/grown/root.dm
+++ b/code/modules/hydroponics/grown/root.dm
@@ -5,7 +5,7 @@
icon_state = "seed-carrot"
species = "carrot"
plantname = "Carrots"
- product = /obj/item/reagent_containers/food/snacks/grown/carrot
+ product = /obj/item/food/snacks/grown/carrot
maturation = 10
production = 1
yield = 5
@@ -14,7 +14,7 @@
mutatelist = list(/obj/item/seeds/carrot/parsnip)
reagents_add = list("oculine" = 0.25, "vitamin" = 0.04, "plantmatter" = 0.05)
-/obj/item/reagent_containers/food/snacks/grown/carrot
+/obj/item/food/snacks/grown/carrot
seed = /obj/item/seeds/carrot
name = "carrot"
desc = "It's good for the eyes!"
@@ -24,14 +24,14 @@
tastes = list("carrot" = 1)
wine_power = 0.3
-/obj/item/reagent_containers/food/snacks/grown/carrot/wedges
+/obj/item/food/snacks/grown/carrot/wedges
name = "carrot wedges"
desc = "Slices of neatly cut carrot."
icon_state = "carrot_wedges"
filling_color = "#FFA500"
bitesize_mod = 2
-/obj/item/reagent_containers/food/snacks/grown/carrot/attackby(obj/item/I, mob/user, params)
+/obj/item/food/snacks/grown/carrot/attackby(obj/item/I, mob/user, params)
if(is_sharp(I))
to_chat(user, "You sharpen the carrot into a shiv with [I].")
var/obj/item/kitchen/knife/shiv/carrot/Shiv = new ()
@@ -50,12 +50,12 @@
icon_state = "seed-parsnip"
species = "parsnip"
plantname = "Parsnip"
- product = /obj/item/reagent_containers/food/snacks/grown/parsnip
+ product = /obj/item/food/snacks/grown/parsnip
icon_dead = "carrot-dead"
mutatelist = list()
reagents_add = list("vitamin" = 0.05, "plantmatter" = 0.05)
-/obj/item/reagent_containers/food/snacks/grown/parsnip
+/obj/item/food/snacks/grown/parsnip
seed = /obj/item/seeds/carrot/parsnip
name = "parsnip"
desc = "Closely related to carrots."
@@ -72,7 +72,7 @@
icon_state = "seed-whitebeet"
species = "whitebeet"
plantname = "White Beet Plants"
- product = /obj/item/reagent_containers/food/snacks/grown/whitebeet
+ product = /obj/item/food/snacks/grown/whitebeet
lifespan = 60
endurance = 50
yield = 6
@@ -81,7 +81,7 @@
mutatelist = list(/obj/item/seeds/redbeet)
reagents_add = list("vitamin" = 0.04, "sugar" = 0.2, "plantmatter" = 0.05)
-/obj/item/reagent_containers/food/snacks/grown/whitebeet
+/obj/item/food/snacks/grown/whitebeet
seed = /obj/item/seeds/whitebeet
name = "white beet"
desc = "You can't beat white beet."
@@ -98,7 +98,7 @@
icon_state = "seed-redbeet"
species = "redbeet"
plantname = "Red Beet Plants"
- product = /obj/item/reagent_containers/food/snacks/grown/redbeet
+ product = /obj/item/food/snacks/grown/redbeet
lifespan = 60
endurance = 50
yield = 6
@@ -107,7 +107,7 @@
genes = list(/datum/plant_gene/trait/maxchem)
reagents_add = list("vitamin" = 0.05, "plantmatter" = 0.05)
-/obj/item/reagent_containers/food/snacks/grown/redbeet
+/obj/item/food/snacks/grown/redbeet
seed = /obj/item/seeds/redbeet
name = "red beet"
desc = "You can't beat red beet."
diff --git a/code/modules/hydroponics/grown/tea_coffee.dm b/code/modules/hydroponics/grown/tea_coffee.dm
index 0bba20ad4c0..6289b1abda7 100644
--- a/code/modules/hydroponics/grown/tea_coffee.dm
+++ b/code/modules/hydroponics/grown/tea_coffee.dm
@@ -5,7 +5,7 @@
icon_state = "seed-teaaspera"
species = "teaaspera"
plantname = "Tea Aspera Plant"
- product = /obj/item/reagent_containers/food/snacks/grown/tea
+ product = /obj/item/food/snacks/grown/tea
lifespan = 20
maturation = 5
production = 5
@@ -16,7 +16,7 @@
mutatelist = list(/obj/item/seeds/tea/astra)
reagents_add = list("vitamin" = 0.04, "teapowder" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/tea
+/obj/item/food/snacks/grown/tea
seed = /obj/item/seeds/tea
name = "Tea Aspera tips"
desc = "These aromatic tips of the tea plant can be dried to make tea."
@@ -32,12 +32,12 @@
desc = "These seeds grow into Tea Astra, a more potent variant of tea"
species = "teaastra"
plantname = "Tea Astra Plant"
- product = /obj/item/reagent_containers/food/snacks/grown/tea/astra
+ product = /obj/item/food/snacks/grown/tea/astra
mutatelist = list()
reagents_add = list("synaptizine" = 0.1, "vitamin" = 0.04, "teapowder" = 0.1)
rarity = 20
-/obj/item/reagent_containers/food/snacks/grown/tea/astra
+/obj/item/food/snacks/grown/tea/astra
seed = /obj/item/seeds/tea/astra
name = "Tea Astra tips"
desc = "Knock away your fatigue!"
@@ -53,7 +53,7 @@
icon_state = "seed-coffeea"
species = "coffeea"
plantname = "Coffee Arabica Bush"
- product = /obj/item/reagent_containers/food/snacks/grown/coffee
+ product = /obj/item/food/snacks/grown/coffee
lifespan = 30
endurance = 20
maturation = 5
@@ -65,7 +65,7 @@
mutatelist = list(/obj/item/seeds/coffee/robusta)
reagents_add = list("vitamin" = 0.04, "coffeepowder" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/coffee
+/obj/item/food/snacks/grown/coffee
seed = /obj/item/seeds/coffee
name = "coffee arabica beans"
desc = "Dry them out to make coffee."
@@ -82,12 +82,12 @@
icon_state = "seed-coffeer"
species = "coffeer"
plantname = "Coffee Robusta Bush"
- product = /obj/item/reagent_containers/food/snacks/grown/coffee/robusta
+ product = /obj/item/food/snacks/grown/coffee/robusta
mutatelist = list()
reagents_add = list("ephedrine" = 0.1, "vitamin" = 0.04, "coffeepowder" = 0.1)
rarity = 20
-/obj/item/reagent_containers/food/snacks/grown/coffee/robusta
+/obj/item/food/snacks/grown/coffee/robusta
seed = /obj/item/seeds/coffee/robusta
name = "coffee robusta beans"
desc = "Increases robustness by 37 percent!"
diff --git a/code/modules/hydroponics/grown/tobacco.dm b/code/modules/hydroponics/grown/tobacco.dm
index 36be1599728..6a74a4e02f4 100644
--- a/code/modules/hydroponics/grown/tobacco.dm
+++ b/code/modules/hydroponics/grown/tobacco.dm
@@ -5,7 +5,7 @@
icon_state = "seed-tobacco"
species = "tobacco"
plantname = "Tobacco Plant"
- product = /obj/item/reagent_containers/food/snacks/grown/tobacco
+ product = /obj/item/food/snacks/grown/tobacco
lifespan = 20
maturation = 5
production = 5
@@ -15,7 +15,7 @@
mutatelist = list(/obj/item/seeds/tobacco/space)
reagents_add = list("nicotine" = 0.03, "plantmatter" = 0.03)
-/obj/item/reagent_containers/food/snacks/grown/tobacco
+/obj/item/food/snacks/grown/tobacco
seed = /obj/item/seeds/tobacco
name = "tobacco leaves"
desc = "Dry them out to make some smokes."
@@ -31,12 +31,12 @@
icon_state = "seed-stobacco"
species = "stobacco"
plantname = "Space Tobacco Plant"
- product = /obj/item/reagent_containers/food/snacks/grown/tobacco/space
+ product = /obj/item/food/snacks/grown/tobacco/space
mutatelist = list()
reagents_add = list("salbutamol" = 0.05, "nicotine" = 0.08, "plantmatter" = 0.03)
rarity = 20
-/obj/item/reagent_containers/food/snacks/grown/tobacco/space
+/obj/item/food/snacks/grown/tobacco/space
seed = /obj/item/seeds/tobacco/space
name = "space tobacco leaves"
desc = "Dry them out to make some space-smokes."
diff --git a/code/modules/hydroponics/grown/tomato.dm b/code/modules/hydroponics/grown/tomato.dm
index 6236d56994e..0de416b0972 100644
--- a/code/modules/hydroponics/grown/tomato.dm
+++ b/code/modules/hydroponics/grown/tomato.dm
@@ -5,7 +5,7 @@
icon_state = "seed-tomato"
species = "tomato"
plantname = "Tomato Plants"
- product = /obj/item/reagent_containers/food/snacks/grown/tomato
+ product = /obj/item/food/snacks/grown/tomato
maturation = 8
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
icon_grow = "tomato-grow"
@@ -14,12 +14,12 @@
mutatelist = list(/obj/item/seeds/tomato/blue, /obj/item/seeds/tomato/blood)
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/tomato
+/obj/item/food/snacks/grown/tomato
seed = /obj/item/seeds/tomato
name = "tomato"
desc = "I say to-mah-to, you say tom-mae-to."
icon_state = "tomato"
- slice_path = /obj/item/reagent_containers/food/snacks/tomatoslice
+ slice_path = /obj/item/food/snacks/tomatoslice
slices_num = 4
splat_type = /obj/effect/decal/cleanable/tomato_smudge
filling_color = "#FF6347"
@@ -34,12 +34,12 @@
icon_state = "seed-bloodtomato"
species = "bloodtomato"
plantname = "Blood-Tomato Plants"
- product = /obj/item/reagent_containers/food/snacks/grown/tomato/blood
+ product = /obj/item/food/snacks/grown/tomato/blood
mutatelist = list(/obj/item/seeds/tomato/killer)
reagents_add = list("blood" = 0.2, "vitamin" = 0.04, "plantmatter" = 0.1)
rarity = 20
-/obj/item/reagent_containers/food/snacks/grown/tomato/blood
+/obj/item/food/snacks/grown/tomato/blood
seed = /obj/item/seeds/tomato/blood
name = "blood-tomato"
desc = "So bloody...so...very...bloody....AHHHH!!!!"
@@ -58,7 +58,7 @@
icon_state = "seed-bluetomato"
species = "bluetomato"
plantname = "Blue-Tomato Plants"
- product = /obj/item/reagent_containers/food/snacks/grown/tomato/blue
+ product = /obj/item/food/snacks/grown/tomato/blue
yield = 2
icon_grow = "bluetomato-grow"
mutatelist = list(/obj/item/seeds/tomato/blue/bluespace)
@@ -66,7 +66,7 @@
reagents_add = list("lube" = 0.2, "vitamin" = 0.04, "plantmatter" = 0.1)
rarity = 20
-/obj/item/reagent_containers/food/snacks/grown/tomato/blue
+/obj/item/food/snacks/grown/tomato/blue
seed = /obj/item/seeds/tomato/blue
name = "blue-tomato"
desc = "I say blue-mah-to, you say blue-mae-to."
@@ -83,14 +83,14 @@
icon_state = "seed-bluespacetomato"
species = "bluespacetomato"
plantname = "Bluespace Tomato Plants"
- product = /obj/item/reagent_containers/food/snacks/grown/tomato/blue/bluespace
+ product = /obj/item/food/snacks/grown/tomato/blue/bluespace
yield = 2
mutatelist = list()
genes = list(/datum/plant_gene/trait/squash, /datum/plant_gene/trait/slip, /datum/plant_gene/trait/teleport, /datum/plant_gene/trait/repeated_harvest)
reagents_add = list("lube" = 0.2, "singulo" = 0.2, "vitamin" = 0.04, "plantmatter" = 0.1)
rarity = 50
-/obj/item/reagent_containers/food/snacks/grown/tomato/blue/bluespace
+/obj/item/food/snacks/grown/tomato/blue/bluespace
seed = /obj/item/seeds/tomato/blue/bluespace
name = "bluespace tomato"
desc = "So lubricated, you might slip through space-time."
@@ -108,7 +108,7 @@
icon_state = "seed-killertomato"
species = "killertomato"
plantname = "Killer-Tomato Plants"
- product = /obj/item/reagent_containers/food/snacks/grown/tomato/killer
+ product = /obj/item/food/snacks/grown/tomato/killer
yield = 2
genes = list(/datum/plant_gene/trait/squash)
growthstages = 2
@@ -119,7 +119,7 @@
reagents_add = list("vitamin" = 0.04, "protein" = 0.1)
rarity = 30
-/obj/item/reagent_containers/food/snacks/grown/tomato/killer
+/obj/item/food/snacks/grown/tomato/killer
seed = /obj/item/seeds/tomato/killer
name = "killer-tomato"
desc = "I say to-mah-to, you say tom-mae-to... OH GOD IT'S EATING MY LEGS!!"
@@ -129,13 +129,13 @@
origin_tech = "biotech=4;combat=5"
distill_reagent = "demonsblood"
-/obj/item/reagent_containers/food/snacks/grown/tomato/killer/attack(mob/M, mob/user, def_zone)
+/obj/item/food/snacks/grown/tomato/killer/attack(mob/M, mob/user, def_zone)
if(awakening)
to_chat(user, "The tomato is twitching and shaking, preventing you from eating it.")
return
..()
-/obj/item/reagent_containers/food/snacks/grown/tomato/killer/attack_self(mob/user)
+/obj/item/food/snacks/grown/tomato/killer/attack_self(mob/user)
if(awakening || isspaceturf(user.loc))
return
to_chat(user, "You begin to awaken the Killer Tomato...")
diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm
index 43525465b32..1c33b6ce5da 100644
--- a/code/modules/hydroponics/grown/towercap.dm
+++ b/code/modules/hydroponics/grown/towercap.dm
@@ -44,11 +44,11 @@
attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
var/plank_type = /obj/item/stack/sheet/wood
var/plank_name = "wooden planks"
- var/static/list/accepted = typecacheof(list(/obj/item/reagent_containers/food/snacks/grown/tobacco,
- /obj/item/reagent_containers/food/snacks/grown/tea,
- /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris,
- /obj/item/reagent_containers/food/snacks/grown/ambrosia/deus,
- /obj/item/reagent_containers/food/snacks/grown/wheat))
+ var/static/list/accepted = typecacheof(list(/obj/item/food/snacks/grown/tobacco,
+ /obj/item/food/snacks/grown/tea,
+ /obj/item/food/snacks/grown/ambrosia/vulgaris,
+ /obj/item/food/snacks/grown/ambrosia/deus,
+ /obj/item/food/snacks/grown/wheat))
/obj/item/grown/log/attackby(obj/item/W, mob/user, params)
if(is_sharp(W))
@@ -69,7 +69,7 @@
qdel(src)
if(CheckAccepted(W))
- var/obj/item/reagent_containers/food/snacks/grown/leaf = W
+ var/obj/item/food/snacks/grown/leaf = W
if(leaf.dry)
user.show_message("You wrap \the [W] around the log, turning it into a torch!")
var/obj/item/flashlight/flare/torch/T = new /obj/item/flashlight/flare/torch(user.loc)
diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm
index 19791649548..4fcbe25430e 100644
--- a/code/modules/hydroponics/growninedible.dm
+++ b/code/modules/hydroponics/growninedible.dm
@@ -6,9 +6,9 @@
name = "grown_weapon"
icon = 'icons/obj/hydroponics/harvest.dmi'
resistance_flags = FLAMMABLE
- var/obj/item/seeds/seed = null // type path, gets converted to item on New(). It's safe to assume it's always a seed item.
+ var/obj/item/seeds/seed // type path, gets converted to item on New(). It's safe to assume it's always a seed item.
-/obj/item/grown/Initialize(mapload, obj/item/seeds/new_seed = null)
+/obj/item/grown/Initialize(mapload, obj/item/seeds/new_seed)
. = ..()
create_reagents(50)
diff --git a/code/modules/hydroponics/hydroponics_tray.dm b/code/modules/hydroponics/hydroponics_tray.dm
index 3d539334b25..01a5aa3fa2d 100644
--- a/code/modules/hydroponics/hydroponics_tray.dm
+++ b/code/modules/hydroponics/hydroponics_tray.dm
@@ -756,7 +756,7 @@
var/irrigate = 0 //How am I supposed to irrigate pill contents?
var/transfer_amount
- if(istype(reagent_source, /obj/item/reagent_containers/food/snacks) || ispill(reagent_source))
+ if(istype(reagent_source, /obj/item/food/snacks) || ispill(reagent_source))
visi_msg="[user] composts [reagent_source], spreading it through [target]"
transfer_amount = reagent_source.reagents.total_volume
else
@@ -794,7 +794,7 @@
S.my_atom = H
reagent_source.reagents.trans_to(S,split)
- if(istype(reagent_source, /obj/item/reagent_containers/food/snacks) || ispill(reagent_source))
+ if(istype(reagent_source, /obj/item/food/snacks) || ispill(reagent_source))
qdel(reagent_source)
H.applyChemicals(S, user)
@@ -850,7 +850,7 @@
else if(istype(O, /obj/item/storage/bag/plants))
attack_hand(user)
var/obj/item/storage/bag/plants/S = O
- for(var/obj/item/reagent_containers/food/snacks/grown/G in locate(user.x,user.y,user.z))
+ for(var/obj/item/food/snacks/grown/G in locate(user.x,user.y,user.z))
if(!S.can_be_inserted(G))
return
S.handle_item_insertion(G, 1)
diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm
index 5c207ada6e6..f1db47c1cab 100644
--- a/code/modules/hydroponics/plant_genes.dm
+++ b/code/modules/hydroponics/plant_genes.dm
@@ -203,7 +203,7 @@
return FALSE
return TRUE
-/datum/plant_gene/trait/proc/on_new(obj/item/reagent_containers/food/snacks/grown/G)
+/datum/plant_gene/trait/proc/on_new(obj/item/food/snacks/grown/G)
if(!origin_tech) // This ugly code segment adds RnD tech levels to resulting plants.
return
@@ -218,19 +218,19 @@
else
G.origin_tech = list2params(origin_tech)
-/datum/plant_gene/trait/proc/on_consume(obj/item/reagent_containers/food/snacks/grown/G, mob/living/carbon/target)
+/datum/plant_gene/trait/proc/on_consume(obj/item/food/snacks/grown/G, mob/living/carbon/target)
return
-/datum/plant_gene/trait/proc/on_slip(obj/item/reagent_containers/food/snacks/grown/G, mob/living/carbon/target)
+/datum/plant_gene/trait/proc/on_slip(obj/item/food/snacks/grown/G, mob/living/carbon/target)
return
-/datum/plant_gene/trait/proc/on_squash(obj/item/reagent_containers/food/snacks/grown/G, atom/target)
+/datum/plant_gene/trait/proc/on_squash(obj/item/food/snacks/grown/G, atom/target)
return
-/datum/plant_gene/trait/proc/on_attackby(obj/item/reagent_containers/food/snacks/grown/G, obj/item/I, mob/user)
+/datum/plant_gene/trait/proc/on_attackby(obj/item/food/snacks/grown/G, obj/item/I, mob/user)
return
-/datum/plant_gene/trait/proc/on_throw_impact(obj/item/reagent_containers/food/snacks/grown/G, atom/target)
+/datum/plant_gene/trait/proc/on_throw_impact(obj/item/food/snacks/grown/G, atom/target)
return
/datum/plant_gene/trait/squash
@@ -250,7 +250,7 @@
examine_line = "It has a very slippery skin."
dangerous = TRUE
-/datum/plant_gene/trait/slip/on_new(obj/item/reagent_containers/food/snacks/grown/G)
+/datum/plant_gene/trait/slip/on_new(obj/item/food/snacks/grown/G)
. = ..()
if(istype(G) && ispath(G.trash, /obj/item/grown))
return
@@ -274,19 +274,19 @@
origin_tech = list("powerstorage" = 5)
dangerous = TRUE
-/datum/plant_gene/trait/cell_charge/on_slip(obj/item/reagent_containers/food/snacks/grown/G, mob/living/carbon/C)
+/datum/plant_gene/trait/cell_charge/on_slip(obj/item/food/snacks/grown/G, mob/living/carbon/C)
var/power = G.seed.potency*rate
if(prob(power))
C.electrocute_act(round(power), G, 1, SHOCK_NOGLOVES)
-/datum/plant_gene/trait/cell_charge/on_squash(obj/item/reagent_containers/food/snacks/grown/G, atom/target)
+/datum/plant_gene/trait/cell_charge/on_squash(obj/item/food/snacks/grown/G, atom/target)
if(isliving(target))
var/mob/living/carbon/C = target
var/power = G.seed.potency*rate
if(prob(power))
C.electrocute_act(round(power), G, 1, SHOCK_NOGLOVES)
-/datum/plant_gene/trait/cell_charge/on_consume(obj/item/reagent_containers/food/snacks/grown/G, mob/living/carbon/target)
+/datum/plant_gene/trait/cell_charge/on_consume(obj/item/food/snacks/grown/G, mob/living/carbon/target)
if(!G.reagents.total_volume)
var/batteries_recharged = 0
for(var/obj/item/stock_parts/cell/C in target.GetAllContents())
@@ -318,7 +318,7 @@
/datum/plant_gene/trait/glow/proc/glow_power(obj/item/seeds/S)
return max(S.potency*(rate + 0.01), 0.1)
-/datum/plant_gene/trait/glow/on_new(obj/item/reagent_containers/food/snacks/grown/G)
+/datum/plant_gene/trait/glow/on_new(obj/item/food/snacks/grown/G)
..()
G.set_light(glow_range(G.seed), glow_power(G.seed), glow_color)
@@ -349,7 +349,7 @@
origin_tech = list("bluespace" = 5)
dangerous = TRUE
-/datum/plant_gene/trait/teleport/on_squash(obj/item/reagent_containers/food/snacks/grown/G, atom/target)
+/datum/plant_gene/trait/teleport/on_squash(obj/item/food/snacks/grown/G, atom/target)
if(isliving(target))
var/mob/living/L = target
var/teleport_radius = max(round(G.seed.potency / 10), 1)
@@ -358,7 +358,7 @@
do_teleport(L, T, teleport_radius)
L.apply_status_effect(STATUS_EFFECT_TELEPORTSICK)
-/datum/plant_gene/trait/teleport/on_slip(obj/item/reagent_containers/food/snacks/grown/G, mob/living/carbon/C)
+/datum/plant_gene/trait/teleport/on_slip(obj/item/food/snacks/grown/G, mob/living/carbon/C)
var/teleport_radius = max(round(G.seed.potency / 10), 1)
var/turf/T = get_turf(C)
if(do_teleport(C, T, teleport_radius))
@@ -379,7 +379,7 @@
name = "Densified Chemicals"
rate = 2
-/datum/plant_gene/trait/maxchem/on_new(obj/item/reagent_containers/food/snacks/grown/G)
+/datum/plant_gene/trait/maxchem/on_new(obj/item/food/snacks/grown/G)
..()
G.reagents.maximum_volume *= rate
@@ -396,7 +396,7 @@
/datum/plant_gene/trait/battery
name = "Capacitive Cell Production"
-/datum/plant_gene/trait/battery/on_attackby(obj/item/reagent_containers/food/snacks/grown/G, obj/item/I, mob/user)
+/datum/plant_gene/trait/battery/on_attackby(obj/item/food/snacks/grown/G, obj/item/I, mob/user)
if(istype(I, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/C = I
if(C.use(5))
@@ -425,7 +425,7 @@
name = "Hypodermic Prickles"
dangerous = TRUE
-/datum/plant_gene/trait/stinging/on_throw_impact(obj/item/reagent_containers/food/snacks/grown/G, atom/target)
+/datum/plant_gene/trait/stinging/on_throw_impact(obj/item/food/snacks/grown/G, atom/target)
if(isliving(target) && G.reagents && G.reagents.total_volume)
var/mob/living/L = target
// It would be nice to inject the body part the original thrower aimed at,
@@ -442,7 +442,7 @@
name = "gaseous decomposition"
dangerous = TRUE
-/datum/plant_gene/trait/smoke/on_squash(obj/item/reagent_containers/food/snacks/grown/G, atom/target)
+/datum/plant_gene/trait/smoke/on_squash(obj/item/food/snacks/grown/G, atom/target)
var/datum/effect_system/smoke_spread/chem/S = new
var/splat_location = get_turf(target)
var/smoke_amount = round(sqrt(G.seed.potency * 0.1), 1)
@@ -456,7 +456,7 @@
if(!(S.resistance_flags & FIRE_PROOF))
S.resistance_flags |= FIRE_PROOF
-/datum/plant_gene/trait/fire_resistance/on_new(obj/item/reagent_containers/food/snacks/grown/G)
+/datum/plant_gene/trait/fire_resistance/on_new(obj/item/food/snacks/grown/G)
if(!(G.resistance_flags & FIRE_PROOF))
G.resistance_flags |= FIRE_PROOF
diff --git a/code/modules/hydroponics/seed_extractor.dm b/code/modules/hydroponics/seed_extractor.dm
index c5260907dd0..30b3c34b6aa 100644
--- a/code/modules/hydroponics/seed_extractor.dm
+++ b/code/modules/hydroponics/seed_extractor.dm
@@ -16,8 +16,8 @@
if(extractor)
seedloc = extractor.loc
- if(istype(O, /obj/item/reagent_containers/food/snacks/grown/))
- var/obj/item/reagent_containers/food/snacks/grown/F = O
+ if(istype(O, /obj/item/food/snacks/grown))
+ var/obj/item/food/snacks/grown/F = O
if(F.seed)
if(user && !user.drop_item()) //couldn't drop the item
return
diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm
index 71f263b80ff..16387e4818a 100644
--- a/code/modules/hydroponics/seeds.dm
+++ b/code/modules/hydroponics/seeds.dm
@@ -169,8 +169,8 @@
data = list("blood_type" = "O-")
if(rid == "nutriment" || rid == "vitamin" || rid == "protein" || rid == "plantmatter")
// Apple tastes of apple.
- if(istype(T, /obj/item/reagent_containers/food/snacks/grown))
- var/obj/item/reagent_containers/food/snacks/grown/grown_edible = T
+ if(istype(T, /obj/item/food/snacks/grown))
+ var/obj/item/food/snacks/grown/grown_edible = T
data = grown_edible.tastes.Copy()
T.reagents.add_reagent(rid, amount, data)
diff --git a/code/modules/mining/abandonedcrates.dm b/code/modules/mining/abandonedcrates.dm
index 022981c2872..1246798c39f 100644
--- a/code/modules/mining/abandonedcrates.dm
+++ b/code/modules/mining/abandonedcrates.dm
@@ -23,9 +23,9 @@
var/loot = rand(1,100) //100 different crates with varying chances of spawning
switch(loot)
if(1 to 5) //5% chance
- new /obj/item/reagent_containers/food/drinks/bottle/rum(src)
- new /obj/item/reagent_containers/food/snacks/grown/ambrosia/deus(src)
- new /obj/item/reagent_containers/food/drinks/bottle/whiskey(src)
+ new /obj/item/reagent_containers/drinks/bottle/rum(src)
+ new /obj/item/food/snacks/grown/ambrosia/deus(src)
+ new /obj/item/reagent_containers/drinks/bottle/whiskey(src)
new /obj/item/lighter(src)
if(6 to 10)
new /obj/item/bedsheet(src)
@@ -113,7 +113,7 @@
new /obj/item/bikehorn(src)
new /obj/item/toy/crayon/rainbow(src)
new /obj/item/reagent_containers/spray/waterflower(src)
- new /obj/item/reagent_containers/food/drinks/bottle/bottleofbanana(src)
+ new /obj/item/reagent_containers/drinks/bottle/bottleofbanana(src)
if(89) //1% chance
new /obj/item/weed_extract(src)
if(90)
@@ -135,7 +135,7 @@
new /obj/item/clothing/head/beret(src)
new /obj/item/clothing/suit/suspenders(src)
new /obj/item/toy/crayon/mime(src)
- new /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing(src)
+ new /obj/item/reagent_containers/drinks/bottle/bottleofnothing(src)
if(96)
new /obj/item/hand_tele(src)
if(97)
diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm
index b7f65bf4fdc..520b8a38e5e 100644
--- a/code/modules/mining/equipment/survival_pod.dm
+++ b/code/modules/mining/equipment/survival_pod.dm
@@ -225,7 +225,7 @@
return
for(var/i in 1 to 5)
- var/obj/item/reagent_containers/food/snacks/warmdonkpocket_weak/W = new(src)
+ var/obj/item/food/snacks/warmdonkpocket_weak/W = new(src)
load(W)
if(prob(50))
var/obj/item/storage/bag/dice/D = new(src)
diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm
index 7a9d08733e3..668442ccf5f 100644
--- a/code/modules/mining/lavaland/ash_flora.dm
+++ b/code/modules/mining/lavaland/ash_flora.dm
@@ -9,7 +9,7 @@
var/harvested_name = "shortened mushrooms"
var/harvested_desc = "Some quickly regrowing mushrooms, formerly known to be quite large."
var/needs_sharp_harvest = TRUE
- var/harvest = /obj/item/reagent_containers/food/snacks/grown/ash_flora/shavings
+ var/harvest = /obj/item/food/snacks/grown/ash_flora/shavings
var/harvest_amount_low = 1
var/harvest_amount_high = 3
var/harvest_time = 60
@@ -84,7 +84,7 @@
desc = "A number of mushrooms, each of which surrounds a greenish sporangium with a number of leaf-like structures."
harvested_name = "leafless mushrooms"
harvested_desc = "A bunch of formerly-leafed mushrooms, with their sporangiums exposed. Scandalous?"
- harvest = /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf
+ harvest = /obj/item/food/snacks/grown/ash_flora/mushroom_leaf
needs_sharp_harvest = FALSE
harvest_amount_high = 4
harvest_time = 20
@@ -100,7 +100,7 @@
desc = "Several mushrooms, the larger of which have a ring of conks at the midpoint of their stems."
harvested_name = "small mushrooms"
harvested_desc = "Several small mushrooms near the stumps of what likely were larger mushrooms."
- harvest = /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_cap
+ harvest = /obj/item/food/snacks/grown/ash_flora/mushroom_cap
harvest_amount_high = 4
harvest_time = 50
harvest_message_low = "You slice the cap off of a mushroom."
@@ -117,7 +117,7 @@
light_power = 2.1
harvested_name = "tiny mushrooms"
harvested_desc = "A few tiny mushrooms around larger stumps. You can already see them growing back."
- harvest = /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_stem
+ harvest = /obj/item/food/snacks/grown/ash_flora/mushroom_stem
harvest_amount_high = 4
harvest_time = 40
harvest_message_low = "You pick and slice the cap off of a mushroom, leaving the stem."
@@ -132,7 +132,7 @@
desc = "Several prickly cacti, brimming with ripe fruit and covered in a thin layer of ash."
harvested_name = "cacti"
harvested_desc = "A bunch of prickly cacti. You can see fruits slowly growing beneath the covering of ash."
- harvest = /obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit
+ harvest = /obj/item/food/snacks/grown/ash_flora/cactus_fruit
needs_sharp_harvest = FALSE
harvest_amount_high = 2
harvest_time = 10
@@ -181,7 +181,7 @@
. = ..()
icon_state = "basalt[rand(1, 4)]"
-/obj/item/reagent_containers/food/snacks/grown/ash_flora
+/obj/item/food/snacks/grown/ash_flora
name = "mushroom shavings"
desc = "Some shavings from a tall mushroom. With enough, might serve as a bowl."
icon = 'icons/obj/lavaland/ash_flora.dmi'
@@ -192,35 +192,35 @@
seed = /obj/item/seeds/lavaland/polypore
wine_power = 0.2
-/obj/item/reagent_containers/food/snacks/grown/ash_flora/Initialize(mapload)
+/obj/item/food/snacks/grown/ash_flora/Initialize(mapload)
. = ..()
pixel_x = rand(-4, 4)
pixel_y = rand(-4, 4)
-/obj/item/reagent_containers/food/snacks/grown/ash_flora/shavings //for actual crafting
+/obj/item/food/snacks/grown/ash_flora/shavings //for actual crafting
-/obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf
+/obj/item/food/snacks/grown/ash_flora/mushroom_leaf
name = "mushroom leaf"
desc = "A leaf, from a mushroom."
icon_state = "mushroom_leaf"
seed = /obj/item/seeds/lavaland/porcini
wine_power = 0.4
-/obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_cap
+/obj/item/food/snacks/grown/ash_flora/mushroom_cap
name = "mushroom cap"
desc = "The cap of a large mushroom."
icon_state = "mushroom_cap"
seed = /obj/item/seeds/lavaland/inocybe
wine_power = 0.7
-/obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_stem
+/obj/item/food/snacks/grown/ash_flora/mushroom_stem
name = "mushroom stem"
desc = "A long mushroom stem. It's slightly glowing."
icon_state = "mushroom_stem"
seed = /obj/item/seeds/lavaland/ember
wine_power = 0.6
-/obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit
+/obj/item/food/snacks/grown/ash_flora/cactus_fruit
name = "cactus fruit"
desc = "A cactus fruit covered in a thick, reddish skin. And some ash."
icon_state = "cactus_fruit"
@@ -249,7 +249,7 @@
icon_state = "seed-cactus"
species = "cactus"
plantname = "Fruiting Cactus"
- product = /obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit
+ product = /obj/item/food/snacks/grown/ash_flora/cactus_fruit
genes = list(/datum/plant_gene/trait/fire_resistance)
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
growthstages = 2
@@ -261,7 +261,7 @@
icon_state = "mycelium-polypore"
species = "polypore"
plantname = "Polypore Mushrooms"
- product = /obj/item/reagent_containers/food/snacks/grown/ash_flora/shavings
+ product = /obj/item/food/snacks/grown/ash_flora/shavings
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/fire_resistance)
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
reagents_add = list("sugar" = 0.06, "ethanol" = 0.04, "stabilizing_agent" = 0.06, "minttoxin" = 0.02)
@@ -272,7 +272,7 @@
icon_state = "mycelium-porcini"
species = "porcini"
plantname = "Porcini Mushrooms"
- product = /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf
+ product = /obj/item/food/snacks/grown/ash_flora/mushroom_leaf
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/fire_resistance)
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
reagents_add = list("nutriment" = 0.06, "vitfro" = 0.04, "nicotine" = 0.04)
@@ -284,7 +284,7 @@
icon_state = "mycelium-inocybe"
species = "inocybe"
plantname = "Inocybe Mushrooms"
- product = /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_cap
+ product = /obj/item/food/snacks/grown/ash_flora/mushroom_cap
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/fire_resistance)
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
reagents_add = list("lsd" = 0.04, "entpoly" = 0.08, "psilocybin" = 0.04)
@@ -295,7 +295,7 @@
icon_state = "mycelium-ember"
species = "ember"
plantname = "Embershroom Mushrooms"
- product = /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_stem
+ product = /obj/item/food/snacks/grown/ash_flora/mushroom_stem
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/glow, /datum/plant_gene/trait/fire_resistance)
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
reagents_add = list("tinlux" = 0.04, "vitamin" = 0.02, "space_drugs" = 0.02)
@@ -305,12 +305,12 @@
//what you can craft with these things
/datum/crafting_recipe/mushroom_bowl
name = "Mushroom Bowl"
- result = list(/obj/item/reagent_containers/food/drinks/mushroom_bowl)
- reqs = list(/obj/item/reagent_containers/food/snacks/grown/ash_flora/shavings = 5)
+ result = list(/obj/item/reagent_containers/drinks/mushroom_bowl)
+ reqs = list(/obj/item/food/snacks/grown/ash_flora/shavings = 5)
time = 30
category = CAT_PRIMAL
-/obj/item/reagent_containers/food/drinks/mushroom_bowl
+/obj/item/reagent_containers/drinks/mushroom_bowl
name = "mushroom bowl"
desc = "A bowl made out of mushrooms. Not food, though it might have contained some at some point."
icon = 'icons/obj/lavaland/ash_flora.dmi'
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index 7d221a5f641..8a47ee4838f 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -63,7 +63,7 @@
if(20)
new /obj/item/grenade/clusterbuster/inferno(src)
if(21)
- new /obj/item/reagent_containers/food/drinks/bottle/holywater/hell(src)
+ new /obj/item/reagent_containers/drinks/bottle/holywater/hell(src)
if(22)
new /obj/item/spellbook/oneuse/summonitem(src)
if(23)
diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm
index 873ebd0c954..2c942dc578b 100644
--- a/code/modules/mining/machine_vending.dm
+++ b/code/modules/mining/machine_vending.dm
@@ -83,7 +83,7 @@
EQUIPMENT("Minebot Melee Upgrade", /obj/item/mine_bot_upgrade, 400),
)
prize_list["Miscellaneous"] = list(
- EQUIPMENT("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe/premium, 100),
+ EQUIPMENT("Absinthe", /obj/item/reagent_containers/drinks/bottle/absinthe/premium, 100),
EQUIPMENT("Alien Toy", /obj/item/clothing/mask/facehugger/toy, 300),
EQUIPMENT("Cigar", /obj/item/clothing/mask/cigarette/cigar/havana, 150),
EQUIPMENT("GAR Meson Scanners", /obj/item/clothing/glasses/meson/gar, 500),
@@ -91,7 +91,7 @@
EQUIPMENT("Luxury Shelter Capsule", /obj/item/survivalcapsule/luxury, 3000),
EQUIPMENT("Soap", /obj/item/soap/nanotrasen, 200),
EQUIPMENT("Space Cash", /obj/item/stack/spacecash/c200, 2000),
- EQUIPMENT("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 100),
+ EQUIPMENT("Whiskey", /obj/item/reagent_containers/drinks/bottle/whiskey, 100),
EQUIPMENT("HRD-MDE Project Box", /obj/item/storage/box/hardmode_box, 3500) //I want miners have to pay a lot to get this, but be set once they do.
)
prize_list["Extra"] = list() // Used in child vendors
@@ -307,7 +307,7 @@
EQUIPMENT("Extra ID", /obj/item/card/id/golem, 250),
EQUIPMENT("Science Backpack", /obj/item/storage/backpack/science, 250),
EQUIPMENT("Full Toolbelt", /obj/item/storage/belt/utility/full/multitool, 250),
- EQUIPMENT("Monkey Cube", /obj/item/reagent_containers/food/snacks/monkeycube, 250),
+ EQUIPMENT("Monkey Cube", /obj/item/food/snacks/monkeycube, 250),
EQUIPMENT("Royal Cape of the Liberator", /obj/item/bedsheet/rd/royal_cape, 500),
EQUIPMENT("Grey Slime Extract", /obj/item/slime_extract/grey, 1000),
EQUIPMENT("KA Trigger Modification Kit", /obj/item/borg/upgrade/modkit/trigger_guard, 1000),
@@ -336,16 +336,16 @@
prize_list = list()
prize_list["Scum"] += list(
EQUIPMENT("Trauma Kit", /obj/item/stack/medical/bruise_pack/advanced, 150),
- EQUIPMENT("Whisky", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 100),
- EQUIPMENT("Beer", /obj/item/reagent_containers/food/drinks/cans/beer, 50),
- EQUIPMENT("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe/premium, 250),
+ EQUIPMENT("Whisky", /obj/item/reagent_containers/drinks/bottle/whiskey, 100),
+ EQUIPMENT("Beer", /obj/item/reagent_containers/drinks/cans/beer, 50),
+ EQUIPMENT("Absinthe", /obj/item/reagent_containers/drinks/bottle/absinthe/premium, 250),
EQUIPMENT("Cigarettes", /obj/item/storage/fancy/cigarettes, 100),
EQUIPMENT("Medical Marijuana", /obj/item/storage/fancy/cigarettes/cigpack_med, 250),
EQUIPMENT("Cigar", /obj/item/clothing/mask/cigarette/cigar/havana, 150),
EQUIPMENT("Box of matches", /obj/item/storage/fancy/matches, 50),
- EQUIPMENT("Cheeseburger", /obj/item/reagent_containers/food/snacks/burger/cheese, 150),
- EQUIPMENT("Big Burger", /obj/item/reagent_containers/food/snacks/burger/bigbite, 250),
- EQUIPMENT("Recycled Prisoner", /obj/item/reagent_containers/food/snacks/soylentgreen, 500),
+ EQUIPMENT("Cheeseburger", /obj/item/food/snacks/burger/cheese, 150),
+ EQUIPMENT("Big Burger", /obj/item/food/snacks/burger/bigbite, 250),
+ EQUIPMENT("Recycled Prisoner", /obj/item/food/snacks/soylentgreen, 500),
EQUIPMENT("Crayons", /obj/item/storage/fancy/crayons, 350),
EQUIPMENT("Plushie", /obj/random/plushie, 750),
EQUIPMENT("Dnd set", /obj/item/storage/box/characters, 500),
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
index 31240725f06..91701035d03 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
@@ -2,7 +2,7 @@
name = "alien"
icon_state = "alien_s"
- butcher_results = list(/obj/item/reagent_containers/food/snacks/monstermeat/xenomeat= 5, /obj/item/stack/sheet/animalhide/xeno = 1)
+ butcher_results = list(/obj/item/food/snacks/monstermeat/xenomeat = 5, /obj/item/stack/sheet/animalhide/xeno = 1)
var/obj/item/r_store = null
var/obj/item/l_store = null
var/caste = ""
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 1c353efde8b..bbcbd03671b 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -1158,26 +1158,22 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
/mob/living/carbon/proc/can_eat(flags = 255)
return TRUE
-/mob/living/carbon/proc/eat(obj/item/reagent_containers/to_eat, mob/user, bitesize_override)
- if(ispill(to_eat) || ispatch(to_eat))
+/mob/living/carbon/proc/eat(obj/item/food/to_eat, mob/user, bitesize_override)
+ if(ispill(to_eat) || ispatch(to_eat)) // We first have to know if it's either a pill or a patch, only then can we check if it's a food item
return consume_patch_or_pill(to_eat, user)
- if(!isfood(to_eat)) // We first have to know if it's either a pill or a patch, only then can we check if it's a food item
+ if(!isfood(to_eat))
return FALSE
- var/obj/item/reagent_containers/food/food = to_eat // It's not a patch or a pill so it must be food
+ var/obj/item/food/food = to_eat // It's not a patch or a pill so it must be food
var/fullness = nutrition + 10
- if(istype(food, /obj/item/reagent_containers/food/snacks))
+ if(istype(food, /obj/item/food/snacks))
for(var/datum/reagent/consumable/C in reagents.reagent_list) //we add the nutrition value of what we're currently digesting
fullness += C.nutriment_factor * C.volume / (C.metabolization_rate * metabolism_efficiency)
if(user == src)
- if(istype(food, /obj/item/reagent_containers/food/drinks))
- if(!selfDrink(food))
- return FALSE
- else
- if(!selfFeed(food, fullness))
- return FALSE
+ if(!selfFeed(food, fullness))
+ return FALSE
else
if(!forceFed(food, user, fullness))
return FALSE
@@ -1186,7 +1182,27 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
SSticker.score.score_food_eaten++
return TRUE
-/mob/living/carbon/proc/selfFeed(obj/item/reagent_containers/food/to_eat, fullness)
+/mob/living/carbon/proc/drink(obj/item/reagent_containers/drinks/to_eat, mob/user)
+ if(user == src)
+ if(!selfDrink(to_eat))
+ return FALSE
+ else if(!forceFed(to_eat, user, nutrition))
+ return FALSE
+
+ if(to_eat.consume_sound)
+ playsound(loc, to_eat.consume_sound, rand(10, 50), TRUE)
+ if(to_eat.reagents.total_volume)
+ taste(to_eat.reagents)
+ var/fraction = min(1 / to_eat.reagents.total_volume, 1)
+ var/drink_size = to_eat.amount_per_transfer_from_this > 5 ? 5 : to_eat.amount_per_transfer_from_this
+ if(fraction)
+ to_eat.reagents.reaction(src, REAGENT_INGEST, fraction)
+ to_eat.reagents.trans_to(src, drink_size)
+
+ SSticker.score.score_food_eaten++
+ return TRUE
+
+/mob/living/carbon/proc/selfFeed(obj/item/food/to_eat, fullness)
if(ispill(to_eat))
to_chat(src, "You swallow [to_eat].")
else if(ispatch(to_eat))
@@ -1208,7 +1224,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
return FALSE
return TRUE
-/mob/living/carbon/proc/selfDrink(obj/item/reagent_containers/food/drinks/toDrink, mob/user)
+/mob/living/carbon/proc/selfDrink(obj/item/reagent_containers/drinks/toDrink, mob/user)
return TRUE
/mob/living/carbon/proc/forceFed(obj/item/reagent_containers/to_eat, mob/user, fullness)
@@ -1228,7 +1244,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
/*TO DO - If/when stomach organs are introduced, override this at the human level sending the item to the stomach
so that different stomachs can handle things in different ways VB*/
-/mob/living/carbon/proc/consume(obj/item/reagent_containers/food/to_eat, bitesize_override)
+/mob/living/carbon/proc/consume(obj/item/food/to_eat, bitesize_override)
var/this_bite = bitesize_override ? bitesize_override : to_eat.bitesize
if(!to_eat.reagents)
return
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 04d9bb6f745..79d2c7a7669 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -455,7 +455,7 @@ emp_act
return FALSE
if(HAS_TRAIT(I, TRAIT_BUTCHERS_HUMANS) && stat == DEAD && user.a_intent == INTENT_HARM)
- var/obj/item/reagent_containers/food/snacks/meat/human/newmeat = new /obj/item/reagent_containers/food/snacks/meat/human(get_turf(loc))
+ var/obj/item/food/snacks/meat/human/newmeat = new /obj/item/food/snacks/meat/human(get_turf(loc))
newmeat.name = real_name + newmeat.name
newmeat.subjectname = real_name
newmeat.subjectjob = job
diff --git a/code/modules/mob/living/carbon/human/human_mob.dm b/code/modules/mob/living/carbon/human/human_mob.dm
index d47e6d168f4..0474ba11860 100644
--- a/code/modules/mob/living/carbon/human/human_mob.dm
+++ b/code/modules/mob/living/carbon/human/human_mob.dm
@@ -1867,20 +1867,20 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
/mob/living/carbon/human/can_eat(flags = 255)
return dna.species && (dna.species.dietflags & flags)
-/mob/living/carbon/human/selfFeed(obj/item/reagent_containers/food/toEat, fullness)
+/mob/living/carbon/human/selfFeed(obj/item/food/toEat, fullness)
if(!check_has_mouth())
to_chat(src, "Where do you intend to put \the [toEat]? You don't have a mouth!")
return 0
return ..()
-/mob/living/carbon/human/forceFed(obj/item/reagent_containers/food/toEat, mob/user, fullness)
+/mob/living/carbon/human/forceFed(obj/item/food/toEat, mob/user, fullness)
if(!check_has_mouth())
- if(!((istype(toEat, /obj/item/reagent_containers/food/drinks) && (ismachineperson(src)))))
+ if(!((istype(toEat, /obj/item/reagent_containers/drinks) && (ismachineperson(src)))))
to_chat(user, "Where do you intend to put \the [toEat]? \The [src] doesn't have a mouth!")
return 0
return ..()
-/mob/living/carbon/human/selfDrink(obj/item/reagent_containers/food/drinks/toDrink)
+/mob/living/carbon/human/selfDrink(obj/item/reagent_containers/drinks/toDrink)
if(!check_has_mouth())
if(!ismachineperson(src))
to_chat(src, "Where do you intend to put \the [src]? You don't have a mouth!")
diff --git a/code/modules/mob/living/carbon/human/species/golem.dm b/code/modules/mob/living/carbon/human/species/golem.dm
index 84a9006f9e0..554048b09f3 100644
--- a/code/modules/mob/living/carbon/human/species/golem.dm
+++ b/code/modules/mob/living/carbon/human/species/golem.dm
@@ -572,7 +572,7 @@
..()
last_banana = world.time
last_honk = world.time
- H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/drinks/bottle/bottleofbanana(H), SLOT_HUD_RIGHT_STORE)
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/drinks/bottle/bottleofbanana(H), SLOT_HUD_RIGHT_STORE)
H.equip_to_slot_or_del(new /obj/item/bikehorn(H), SLOT_HUD_LEFT_STORE)
H.AddElement(/datum/element/waddling)
@@ -651,7 +651,7 @@
/datum/species/golem/tranquillite/on_species_gain(mob/living/carbon/human/H)
..()
H.equip_to_slot_or_del(new /obj/item/clothing/head/beret(H), SLOT_HUD_HEAD)
- H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing(H), SLOT_HUD_RIGHT_STORE)
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/drinks/bottle/bottleofnothing(H), SLOT_HUD_RIGHT_STORE)
H.equip_to_slot_or_del(new /obj/item/cane(H), SLOT_HUD_LEFT_HAND)
if(H.mind)
H.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe/conjure/build/mime_wall(null))
diff --git a/code/modules/mob/living/carbon/human/species/monkey.dm b/code/modules/mob/living/carbon/human/species/monkey.dm
index 0ab9e22ebef..02439084da1 100644
--- a/code/modules/mob/living/carbon/human/species/monkey.dm
+++ b/code/modules/mob/living/carbon/human/species/monkey.dm
@@ -64,7 +64,7 @@
..()
H.real_name = "[lowertext(name)] ([rand(100,999)])"
H.name = H.real_name
- H.butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/monkey = 5)
+ H.butcher_results = list(/obj/item/food/snacks/meat/monkey = 5)
/datum/species/monkey/handle_dna(mob/living/carbon/human/H, remove)
..()
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 6d779daa3b9..0eac5028132 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -522,22 +522,22 @@
/obj/item/reagent_containers/dropper/cyborg,
/obj/item/lighter/zippo,
/obj/item/storage/bag/tray/cyborg,
- /obj/item/reagent_containers/food/drinks/shaker
+ /obj/item/reagent_containers/drinks/shaker
)
- emag_override_modules = list(/obj/item/reagent_containers/food/drinks/cans/beer/sleepy_beer)
+ emag_override_modules = list(/obj/item/reagent_containers/drinks/cans/beer/sleepy_beer)
emag_modules = list(/obj/item/restraints/handcuffs/cable/zipties/cyborg)
special_rechargables = list(
- /obj/item/reagent_containers/food/condiment/enzyme,
- /obj/item/reagent_containers/food/drinks/cans/beer/sleepy_beer
+ /obj/item/reagent_containers/condiment/enzyme,
+ /obj/item/reagent_containers/drinks/cans/beer/sleepy_beer
)
// This is a special type of beer given when emagged, one sip and the target falls asleep.
-/obj/item/reagent_containers/food/drinks/cans/beer/sleepy_beer
+/obj/item/reagent_containers/drinks/cans/beer/sleepy_beer
name = "Mickey Finn's Special Brew"
list_reagents = list("beer2" = 50)
-/obj/item/reagent_containers/food/drinks/cans/beer/sleepy_beer/cyborg_recharge(coeff, emagged)
+/obj/item/reagent_containers/drinks/cans/beer/sleepy_beer/cyborg_recharge(coeff, emagged)
if(emagged)
reagents.check_and_add("beer2", volume, 5)
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index cb20e8ac943..2b6a6b2e6a9 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -49,7 +49,7 @@
/mob/living/simple_animal/bot/secbot/beepsky/explode()
var/turf/Tsec = get_turf(src)
new /obj/item/stock_parts/cell/potato(Tsec)
- var/obj/item/reagent_containers/food/drinks/drinkingglass/S = new(Tsec)
+ var/obj/item/reagent_containers/drinks/drinkingglass/S = new(Tsec)
S.reagents.add_reagent("whiskey", 15)
S.on_reagent_change()
..()
diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm
index 2707f7f988f..1e74d1162df 100644
--- a/code/modules/mob/living/simple_animal/constructs.dm
+++ b/code/modules/mob/living/simple_animal/constructs.dm
@@ -22,7 +22,7 @@
pressure_resistance = 100
universal_speak = TRUE
AIStatus = AI_OFF //normal constructs don't have AI
- loot = list(/obj/item/reagent_containers/food/snacks/ectoplasm)
+ loot = list(/obj/item/food/snacks/ectoplasm)
del_on_death = TRUE
deathmessage = "collapses in a shattered heap."
var/construct_type = "shade"
diff --git a/code/modules/mob/living/simple_animal/friendly/bunny.dm b/code/modules/mob/living/simple_animal/friendly/bunny.dm
index fdefe785ffd..5a58869a620 100644
--- a/code/modules/mob/living/simple_animal/friendly/bunny.dm
+++ b/code/modules/mob/living/simple_animal/friendly/bunny.dm
@@ -12,7 +12,7 @@
see_in_dark = 6
maxHealth = 10
health = 10
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 1)
+ butcher_results = list(/obj/item/food/snacks/meat = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
diff --git a/code/modules/mob/living/simple_animal/friendly/butterfly.dm b/code/modules/mob/living/simple_animal/friendly/butterfly.dm
index 4ab5c015612..4489fc9be89 100644
--- a/code/modules/mob/living/simple_animal/friendly/butterfly.dm
+++ b/code/modules/mob/living/simple_animal/friendly/butterfly.dm
@@ -21,7 +21,7 @@
ventcrawler = VENTCRAWLER_ALWAYS
mob_size = MOB_SIZE_TINY
mob_biotypes = MOB_ORGANIC | MOB_BUG
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 0)
+ butcher_results = list(/obj/item/food/snacks/meat = 0)
gold_core_spawnable = FRIENDLY_SPAWN
/mob/living/simple_animal/butterfly/Initialize(mapload) //Not the poor butterfly!
diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index 5eed02aed76..3fd3b86ac79 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -17,7 +17,7 @@
mob_size = MOB_SIZE_SMALL
animal_species = /mob/living/simple_animal/pet/cat
childtype = list(/mob/living/simple_animal/pet/cat/kitten)
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 3)
+ butcher_results = list(/obj/item/food/snacks/meat = 3)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
@@ -233,8 +233,8 @@
butcher_results = list(
/obj/item/organ/internal/brain = 1,
/obj/item/organ/internal/heart = 1,
- /obj/item/reagent_containers/food/snacks/birthdaycakeslice = 3,
- /obj/item/reagent_containers/food/snacks/meat/slab = 2
+ /obj/item/food/snacks/birthdaycakeslice = 3,
+ /obj/item/food/snacks/meat/slab = 2
)
response_harm = "takes a bite out of"
attacked_sound = "sound/items/eatfood.ogg"
@@ -247,7 +247,7 @@
return
if(health < maxHealth)
adjustBruteLoss(-4)
- for(var/obj/item/reagent_containers/food/snacks/donut/D in range(1, src))
+ for(var/obj/item/food/snacks/donut/D in range(1, src))
if(D.icon_state != "donut2")
D.name = "frosted donut"
D.icon_state = "donut2"
diff --git a/code/modules/mob/living/simple_animal/friendly/crab.dm b/code/modules/mob/living/simple_animal/friendly/crab.dm
index 10724db9ad8..e1a7390a7c7 100644
--- a/code/modules/mob/living/simple_animal/friendly/crab.dm
+++ b/code/modules/mob/living/simple_animal/friendly/crab.dm
@@ -10,7 +10,7 @@
emote_see = list("clacks")
speak_chance = 1
turns_per_move = 5
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 1)
+ butcher_results = list(/obj/item/food/snacks/meat = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "stomps"
diff --git a/code/modules/mob/living/simple_animal/friendly/deer.dm b/code/modules/mob/living/simple_animal/friendly/deer.dm
index e7e0586ca3d..745bede9898 100644
--- a/code/modules/mob/living/simple_animal/friendly/deer.dm
+++ b/code/modules/mob/living/simple_animal/friendly/deer.dm
@@ -11,7 +11,7 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 0 //I'm so funny
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 4)
+ butcher_results = list(/obj/item/food/snacks/meat = 4)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
diff --git a/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm b/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm
index 9cf8dba0953..a54014b9fa3 100644
--- a/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm
+++ b/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm
@@ -210,7 +210,7 @@
return TRUE
// Consumes plant matter other than weeds to evolve
-/mob/living/simple_animal/diona/proc/consume(obj/item/reagent_containers/food/snacks/grown/G)
+/mob/living/simple_animal/diona/proc/consume(obj/item/food/snacks/grown/G)
if(nutrition >= nutrition_need) // Prevents griefing by overeating plant items without evolving.
to_chat(src, "You're too full to consume this! Perhaps it's time to grow bigger...")
else
diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm
index 8195b998a4d..33c4c02b433 100644
--- a/code/modules/mob/living/simple_animal/friendly/dog.dm
+++ b/code/modules/mob/living/simple_animal/friendly/dog.dm
@@ -70,7 +70,7 @@
icon_state = "corgi"
icon_living = "corgi"
icon_dead = "corgi_dead"
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/corgi = 3, /obj/item/stack/sheet/animalhide/corgi = 1)
+ butcher_results = list(/obj/item/food/snacks/meat/corgi = 3, /obj/item/stack/sheet/animalhide/corgi = 1)
childtype = list(/mob/living/simple_animal/pet/dog/corgi/puppy = 95, /mob/living/simple_animal/pet/dog/corgi/puppy/void = 5)
animal_species = /mob/living/simple_animal/pet/dog
collar_type = "corgi"
@@ -555,7 +555,7 @@
stop_automated_movement = FALSE
var/obj/item/possible_target = null
for(var/I in snack_range)
- if(istype(I, /obj/item/reagent_containers/food/snacks)) // Noms
+ if(istype(I, /obj/item/food/snacks)) // Noms
possible_target = I
break
else if(istype(I, /obj/item/paper)) // Important noms
@@ -590,7 +590,7 @@
else if(prob(30) && ishuman(movement_target.loc)) // mean hooman has stolen it
custom_emote(EMOTE_VISIBLE, "stares at [movement_target.loc]'s [movement_target] with a sad puppy-face.")
-/obj/item/reagent_containers/food/snacks/meat/corgi
+/obj/item/food/snacks/meat/corgi
name = "Corgi meat"
desc = "Tastes like... well you know..."
@@ -782,7 +782,7 @@
icon_state = "pug"
icon_living = "pug"
icon_dead = "pug_dead"
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/pug = 3)
+ butcher_results = list(/obj/item/food/snacks/meat/pug = 3)
collar_type = "pug"
/mob/living/simple_animal/pet/dog/pug/handle_automated_movement()
diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
index c92cb90d460..f8aa127e2a8 100644
--- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
@@ -12,7 +12,7 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 4)
+ butcher_results = list(/obj/item/food/snacks/meat = 4)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
@@ -122,7 +122,7 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 6)
+ butcher_results = list(/obj/item/food/snacks/meat/slab = 6)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
@@ -202,7 +202,7 @@
density = FALSE
speak_chance = 2
turns_per_move = 2
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 1)
+ butcher_results = list(/obj/item/food/snacks/meat = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
@@ -255,9 +255,9 @@ GLOBAL_VAR_INIT(chicken_count, 0)
density = FALSE
speak_chance = 2
turns_per_move = 3
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 2)
- var/egg_type = /obj/item/reagent_containers/food/snacks/egg
- var/food_type = /obj/item/reagent_containers/food/snacks/grown/wheat
+ butcher_results = list(/obj/item/food/snacks/meat = 2)
+ var/egg_type = /obj/item/food/snacks/egg
+ var/food_type = /obj/item/food/snacks/grown/wheat
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
@@ -329,8 +329,7 @@ GLOBAL_VAR_INIT(chicken_count, 0)
if(GLOB.chicken_count < MAX_CHICKENS && prob(25))
START_PROCESSING(SSobj, E)
-/obj/item/reagent_containers/food/snacks/egg/var/amount_grown = 0
-/obj/item/reagent_containers/food/snacks/egg/process()
+/obj/item/food/snacks/egg/process()
if(isturf(loc))
amount_grown += rand(1,2)
if(amount_grown >= 100)
@@ -381,7 +380,7 @@ GLOBAL_VAR_INIT(chicken_count, 0)
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/ham = 6)
+ butcher_results = list(/obj/item/food/snacks/meat/ham = 6)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
@@ -407,7 +406,7 @@ GLOBAL_VAR_INIT(chicken_count, 0)
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 4)
+ butcher_results = list(/obj/item/food/snacks/meat = 4)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
@@ -432,7 +431,7 @@ GLOBAL_VAR_INIT(chicken_count, 0)
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 6)
+ butcher_results = list(/obj/item/food/snacks/meat = 6)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
@@ -457,7 +456,7 @@ GLOBAL_VAR_INIT(chicken_count, 0)
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 6)
+ butcher_results = list(/obj/item/food/snacks/meat = 6)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
@@ -482,7 +481,7 @@ GLOBAL_VAR_INIT(chicken_count, 0)
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 6)
+ butcher_results = list(/obj/item/food/snacks/meat = 6)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
diff --git a/code/modules/mob/living/simple_animal/friendly/fox.dm b/code/modules/mob/living/simple_animal/friendly/fox.dm
index 37d1f47e5b6..329d43fb7d0 100644
--- a/code/modules/mob/living/simple_animal/friendly/fox.dm
+++ b/code/modules/mob/living/simple_animal/friendly/fox.dm
@@ -13,7 +13,7 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 3)
+ butcher_results = list(/obj/item/food/snacks/meat = 3)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
diff --git a/code/modules/mob/living/simple_animal/friendly/lizard.dm b/code/modules/mob/living/simple_animal/friendly/lizard.dm
index 493022c5f23..0fa7edbf6d2 100644
--- a/code/modules/mob/living/simple_animal/friendly/lizard.dm
+++ b/code/modules/mob/living/simple_animal/friendly/lizard.dm
@@ -22,7 +22,7 @@
mob_size = MOB_SIZE_SMALL
can_hide = TRUE
pass_door_while_hidden = TRUE
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 1)
+ butcher_results = list(/obj/item/food/snacks/meat = 1)
can_collar = TRUE
mob_biotypes = MOB_ORGANIC | MOB_BEAST | MOB_REPTILE
gold_core_spawnable = FRIENDLY_SPAWN
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index 3d8747084b6..958806c6b50 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -16,7 +16,7 @@
see_in_dark = 6
maxHealth = 5
health = 5
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 1)
+ butcher_results = list(/obj/item/food/snacks/meat = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "stamps on"
@@ -92,7 +92,7 @@
..()
/mob/living/simple_animal/mouse/start_pulling(atom/movable/AM, state, force = pull_force, show_message = FALSE)//Prevents mouse from pulling things
- if(istype(AM, /obj/item/reagent_containers/food/snacks/cheesewedge))
+ if(istype(AM, /obj/item/food/snacks/cheesewedge))
return ..() // Get dem
if(show_message)
to_chat(src, "You are too small to pull anything except cheese.")
diff --git a/code/modules/mob/living/simple_animal/friendly/sloth.dm b/code/modules/mob/living/simple_animal/friendly/sloth.dm
index 077b0508a04..0f094e9d81a 100644
--- a/code/modules/mob/living/simple_animal/friendly/sloth.dm
+++ b/code/modules/mob/living/simple_animal/friendly/sloth.dm
@@ -13,7 +13,7 @@
faction = list("neutral", "jungle")
speak_chance = 1
turns_per_move = 5
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 3)
+ butcher_results = list(/obj/item/food/snacks/meat = 3)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
diff --git a/code/modules/mob/living/simple_animal/hostile/alien_types.dm b/code/modules/mob/living/simple_animal/hostile/alien_types.dm
index 423753aa5b2..38eb627a191 100644
--- a/code/modules/mob/living/simple_animal/hostile/alien_types.dm
+++ b/code/modules/mob/living/simple_animal/hostile/alien_types.dm
@@ -11,7 +11,7 @@
response_disarm = "shoves"
response_harm = "hits"
speed = 0
- butcher_results = list(/obj/item/reagent_containers/food/snacks/monstermeat/xenomeat= 3, /obj/item/stack/sheet/animalhide/xeno = 1)
+ butcher_results = list(/obj/item/food/snacks/monstermeat/xenomeat= 3, /obj/item/stack/sheet/animalhide/xeno = 1)
maxHealth = 125
health = 125
harm_intent_damage = 5
@@ -83,7 +83,7 @@
retreat_distance = 5
minimum_distance = 5
move_to_delay = 4
- butcher_results = list(/obj/item/reagent_containers/food/snacks/monstermeat/xenomeat= 4, /obj/item/stack/sheet/animalhide/xeno = 1)
+ butcher_results = list(/obj/item/food/snacks/monstermeat/xenomeat= 4, /obj/item/stack/sheet/animalhide/xeno = 1)
projectiletype = /obj/item/projectile/neurotox
projectilesound = 'sound/weapons/pierce.ogg'
status_flags = 0
@@ -131,7 +131,7 @@
move_to_delay = 4
maxHealth = 400
health = 400
- butcher_results = list(/obj/item/reagent_containers/food/snacks/monstermeat/xenomeat= 10, /obj/item/stack/sheet/animalhide/xeno = 2)
+ butcher_results = list(/obj/item/food/snacks/monstermeat/xenomeat= 10, /obj/item/stack/sheet/animalhide/xeno = 2)
mob_size = MOB_SIZE_LARGE
/obj/item/projectile/neurotox
diff --git a/code/modules/mob/living/simple_animal/hostile/bat.dm b/code/modules/mob/living/simple_animal/hostile/bat.dm
index ff57b4758ad..66f76186713 100644
--- a/code/modules/mob/living/simple_animal/hostile/bat.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bat.dm
@@ -9,7 +9,7 @@
mob_biotypes = MOB_ORGANIC | MOB_BEAST
speak_chance = 0
turns_per_move = 3
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 1)
+ butcher_results = list(/obj/item/food/snacks/meat = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "hits"
diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm
index 646cd514615..3b045ce67ef 100644
--- a/code/modules/mob/living/simple_animal/hostile/bear.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bear.dm
@@ -14,7 +14,7 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- butcher_results = list(/obj/item/reagent_containers/food/snacks/monstermeat/bearmeat= 5, /obj/item/clothing/head/bearpelt = 1)
+ butcher_results = list(/obj/item/food/snacks/monstermeat/bearmeat = 5, /obj/item/clothing/head/bearpelt = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "hits"
diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm
index df6751f4021..de32d0f6bab 100644
--- a/code/modules/mob/living/simple_animal/hostile/carp.dm
+++ b/code/modules/mob/living/simple_animal/hostile/carp.dm
@@ -11,7 +11,7 @@
mob_biotypes = MOB_ORGANIC | MOB_BEAST
speak_chance = 0
turns_per_move = 5
- butcher_results = list(/obj/item/reagent_containers/food/snacks/carpmeat = 2)
+ butcher_results = list(/obj/item/food/snacks/carpmeat = 2)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "hits"
diff --git a/code/modules/mob/living/simple_animal/hostile/feral_cat.dm b/code/modules/mob/living/simple_animal/hostile/feral_cat.dm
index b10cd9c761d..3f8204a152e 100644
--- a/code/modules/mob/living/simple_animal/hostile/feral_cat.dm
+++ b/code/modules/mob/living/simple_animal/hostile/feral_cat.dm
@@ -18,7 +18,7 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 2)
+ butcher_results = list(/obj/item/food/snacks/meat/slab = 2)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
index b9fa11bcbb9..5ada8062c4f 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -19,7 +19,7 @@
see_in_dark = 8
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
footstep_type = FOOTSTEP_MOB_CLAW
- butcher_results = list(/obj/item/reagent_containers/food/snacks/monstermeat/spidermeat= 2, /obj/item/reagent_containers/food/snacks/monstermeat/spiderleg= 8)
+ butcher_results = list(/obj/item/food/snacks/monstermeat/spidermeat = 2, /obj/item/food/snacks/monstermeat/spiderleg = 8)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "hits"
@@ -70,7 +70,7 @@
icon_state = "nurse"
icon_living = "nurse"
icon_dead = "nurse_dead"
- butcher_results = list(/obj/item/reagent_containers/food/snacks/monstermeat/spidermeat= 2, /obj/item/reagent_containers/food/snacks/monstermeat/spiderleg= 8, /obj/item/reagent_containers/food/snacks/monstermeat/spidereggs= 4)
+ butcher_results = list(/obj/item/food/snacks/monstermeat/spidermeat= 2, /obj/item/food/snacks/monstermeat/spiderleg= 8, /obj/item/food/snacks/monstermeat/spidereggs= 4)
maxHealth = 40
health = 40
diff --git a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm
index 3efddf12f41..c400bedb1cc 100644
--- a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm
+++ b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm
@@ -9,7 +9,7 @@
speak_chance = 80
maxHealth = 220
health = 220
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/gorilla = 4)
+ butcher_results = list(/obj/item/food/snacks/meat/slab/gorilla = 4)
response_help = "prods"
response_disarm = "challenges"
response_harm = "thumps"
diff --git a/code/modules/mob/living/simple_animal/hostile/jungle_animals.dm b/code/modules/mob/living/simple_animal/hostile/jungle_animals.dm
index 5328b974d15..f3982ed9a97 100644
--- a/code/modules/mob/living/simple_animal/hostile/jungle_animals.dm
+++ b/code/modules/mob/living/simple_animal/hostile/jungle_animals.dm
@@ -14,7 +14,7 @@
mob_biotypes = MOB_ORGANIC | MOB_BEAST
speak_chance = 0
turns_per_move = 3
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 3)
+ butcher_results = list(/obj/item/food/snacks/meat = 3)
faction = list("hostile", "jungle")
response_help = "pets the"
response_disarm = "gently pushes aside the"
diff --git a/code/modules/mob/living/simple_animal/hostile/killertomato.dm b/code/modules/mob/living/simple_animal/hostile/killertomato.dm
index adb59e96397..b8c1b2b3097 100644
--- a/code/modules/mob/living/simple_animal/hostile/killertomato.dm
+++ b/code/modules/mob/living/simple_animal/hostile/killertomato.dm
@@ -10,7 +10,7 @@
maxHealth = 30
health = 30
see_in_dark = 3
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/tomatomeat = 2)
+ butcher_results = list(/obj/item/food/snacks/meat/tomatomeat = 2)
response_help = "prods"
response_disarm = "pushes aside"
response_harm = "smacks"
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/goliath.dm b/code/modules/mob/living/simple_animal/hostile/mining/goliath.dm
index 4894c3799ef..6d5ed62d05e 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/goliath.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/goliath.dm
@@ -91,7 +91,7 @@
throw_message = "does nothing to the tough hide of the"
pre_attack_icon = "goliath2"
crusher_loot = /obj/item/crusher_trophy/goliath_tentacle
- butcher_results = list(/obj/item/reagent_containers/food/snacks/monstermeat/goliath= 2, /obj/item/stack/sheet/animalhide/goliath_hide = 1, /obj/item/stack/sheet/bone = 2)
+ butcher_results = list(/obj/item/food/snacks/monstermeat/goliath = 2, /obj/item/stack/sheet/animalhide/goliath_hide = 1, /obj/item/stack/sheet/bone = 2)
loot = list()
stat_attack = UNCONSCIOUS
robust_searching = TRUE
@@ -110,7 +110,7 @@
pre_attack_icon = "Goliath_preattack"
throw_message = "does nothing to the rocky hide of the"
loot = list(/obj/item/stack/sheet/animalhide/goliath_hide) //A throwback to the asteroid days
- butcher_results = list(/obj/item/reagent_containers/food/snacks/monstermeat/goliath= 2, /obj/item/stack/sheet/bone = 2)
+ butcher_results = list(/obj/item/food/snacks/monstermeat/goliath= 2, /obj/item/stack/sheet/bone = 2)
crusher_loot = /obj/item/crusher_trophy/goliath_tentacle/ancient
crusher_drop_mod = 30
wander = FALSE
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
index c7c33b6daa6..ea3714913e5 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
@@ -386,7 +386,7 @@
belt = null
backpack_contents = list()
if(prob(70))
- backpack_contents += pick(list(/obj/item/stamp/clown = 1, /obj/item/reagent_containers/spray/waterflower = 1, /obj/item/reagent_containers/food/snacks/grown/banana = 1, /obj/item/megaphone = 1))
+ backpack_contents += pick(list(/obj/item/stamp/clown = 1, /obj/item/reagent_containers/spray/waterflower = 1, /obj/item/food/snacks/grown/banana = 1, /obj/item/megaphone = 1))
if(prob(30))
backpack_contents += list(/obj/item/stack/sheet/mineral/bananium = pickweight(list( 1 = 3, 2 = 2, 3 = 1)))
if(prob(10))
@@ -430,6 +430,6 @@
suit_store = /obj/item/melee/cultblade
l_pocket = /obj/item/melee/cultblade/dagger
if(prob(60))
- r_pocket = /obj/item/reagent_containers/food/drinks/bottle/unholywater
+ r_pocket = /obj/item/reagent_containers/drinks/bottle/unholywater
backpack_contents = list(/obj/item/tome = 1, /obj/item/restraints/legcuffs/bola/cult = 1, /obj/item/stack/sheet/runed_metal = 15)
. = ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
index b30334e96de..6e2fb046dbd 100644
--- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
@@ -9,7 +9,7 @@
turns_per_move = 1
maxHealth = 10
health = 10
- butcher_results = list(/obj/item/reagent_containers/food/snacks/hugemushroomslice = 1)
+ butcher_results = list(/obj/item/food/snacks/hugemushroomslice = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "whacks"
@@ -152,7 +152,7 @@
bruised = 1
/mob/living/simple_animal/hostile/mushroom/attackby(obj/item/I as obj, mob/user as mob, params)
- if(istype(I, /obj/item/reagent_containers/food/snacks/grown/mushroom))
+ if(istype(I, /obj/item/food/snacks/grown/mushroom))
if(stat == DEAD && !recovery_cooldown)
Recover()
qdel(I)
@@ -182,7 +182,7 @@
/mob/living/simple_animal/hostile/mushroom/harvest()
var/counter
for(counter=0, counter<=powerlevel, counter++)
- var/obj/item/reagent_containers/food/snacks/hugemushroomslice/S = new /obj/item/reagent_containers/food/snacks/hugemushroomslice(src.loc)
+ var/obj/item/food/snacks/hugemushroomslice/S = new (src.loc)
S.reagents.add_reagent("psilocybin", powerlevel)
S.reagents.add_reagent("omnizine", powerlevel)
S.reagents.add_reagent("synaptizine", powerlevel)
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/fish.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/fish.dm
index d40f38ee267..1aa4eb05f49 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/fish.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/fish.dm
@@ -8,7 +8,7 @@
mob_biotypes = MOB_ORGANIC | MOB_BEAST
speak_chance = 0
turns_per_move = 5
- butcher_results = list(/obj/item/reagent_containers/food/snacks/carpmeat = 1)
+ butcher_results = list(/obj/item/food/snacks/carpmeat = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "hits"
@@ -68,7 +68,7 @@
melee_damage_lower = 2
melee_damage_upper = 2
speak_emote = list("blurps")
- butcher_results = list(/obj/item/reagent_containers/food/snacks/salmonmeat = 1)
+ butcher_results = list(/obj/item/food/snacks/salmonmeat = 1)
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm
index 1d958b3e561..91ffa0591cc 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm
@@ -51,7 +51,7 @@
pressure_resistance = 300
gold_core_spawnable = NO_SPAWN //too spooky for science
faction = list("undead") // did I mention ghost
- loot = list(/obj/item/reagent_containers/food/snacks/ectoplasm)
+ loot = list(/obj/item/food/snacks/ectoplasm)
del_on_death = TRUE
/mob/living/simple_animal/hostile/retaliate/ghost/Process_Spacemove(check_drift = 0)
diff --git a/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm b/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm
index 260d3d8f2b0..2ba65d00bf4 100644
--- a/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm
@@ -59,7 +59,7 @@
icon_state = "reindeer"
icon_living = "reindeer"
icon_dead = "reindeer-dead"
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 3)
+ butcher_results = list(/obj/item/food/snacks/meat = 3)
maxHealth = 80
health = 80
melee_damage_lower = 5
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index 1b9056c5654..6215f31061b 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -49,7 +49,7 @@
speak_chance = 1//1% (1 in 100) chance every tick; So about once per 150 seconds, assuming an average tick is 1.5s
turns_per_move = 5
- butcher_results = list(/obj/item/reagent_containers/food/snacks/cracker = 3)
+ butcher_results = list(/obj/item/food/snacks/cracker = 3)
response_help = "pets"
response_disarm = "gently moves aside"
diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm
index 2878a7d4595..789e61be214 100644
--- a/code/modules/mob/living/simple_animal/shade.dm
+++ b/code/modules/mob/living/simple_animal/shade.dm
@@ -29,7 +29,7 @@
faction = list("cult")
status_flags = CANPUSH
flying = TRUE
- loot = list(/obj/item/reagent_containers/food/snacks/ectoplasm)
+ loot = list(/obj/item/food/snacks/ectoplasm)
del_on_death = TRUE
deathmessage = "lets out a contented sigh as their form unwinds."
var/holy = FALSE
diff --git a/code/modules/mod/modules/modules_general.dm b/code/modules/mod/modules/modules_general.dm
index 0e97863a532..aca7ce0cb29 100644
--- a/code/modules/mod/modules/modules_general.dm
+++ b/code/modules/mod/modules/modules_general.dm
@@ -303,7 +303,7 @@
incompatible_modules = list(/obj/item/mod/module/dispenser)
cooldown_time = 5 SECONDS
/// Path we dispense.
- var/dispense_type = /obj/item/reagent_containers/food/snacks/burger/cheese
+ var/dispense_type = /obj/item/food/snacks/burger/cheese
/// Time it takes for us to dispense.
var/dispense_time = 0 SECONDS
diff --git a/code/modules/projectiles/guns/throw/crossbow.dm b/code/modules/projectiles/guns/throw/crossbow.dm
index b4a49a9f18b..218d7e41254 100644
--- a/code/modules/projectiles/guns/throw/crossbow.dm
+++ b/code/modules/projectiles/guns/throw/crossbow.dm
@@ -157,7 +157,7 @@
/obj/item/gun/throw/crossbow/french
name = "french powered crossbow"
icon_state = "fcrossbow"
- valid_projectile_type = /obj/item/reagent_containers/food/snacks/baguette
+ valid_projectile_type = /obj/item/food/snacks/baguette
/obj/item/gun/throw/crossbow/french/modify_projectile(obj/item/I, on_chamber = 0)
return
diff --git a/code/modules/projectiles/guns/throw/pielauncher.dm b/code/modules/projectiles/guns/throw/pielauncher.dm
index a69cf6d0312..7f70d999098 100644
--- a/code/modules/projectiles/guns/throw/pielauncher.dm
+++ b/code/modules/projectiles/guns/throw/pielauncher.dm
@@ -8,7 +8,7 @@
force = 5
clumsy_check = FALSE
- valid_projectile_type = /obj/item/reagent_containers/food/snacks/pie
+ valid_projectile_type = /obj/item/food/snacks/pie
max_capacity = 5
projectile_speed = 2
projectile_range = 30
@@ -17,7 +17,7 @@
/obj/item/gun/throw/piecannon/Initialize(mapload)
. = ..()
for(var/i in 1 to max_capacity)
- var/obj/item/reagent_containers/food/snacks/pie/P = new /obj/item/reagent_containers/food/snacks/pie(src)
+ var/obj/item/food/snacks/pie/P = new (src)
loaded_projectiles += P
process_chamber()
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index 61d68032bba..d195f287305 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -240,7 +240,7 @@
if(isrobot(user))
return
- if((istype(I, /obj/item/reagent_containers/glass) || istype(I, /obj/item/reagent_containers/food/drinks)) && user.a_intent != INTENT_HARM)
+ if((istype(I, /obj/item/reagent_containers/glass) || istype(I, /obj/item/reagent_containers/drinks)) && user.a_intent != INTENT_HARM)
if(panel_open)
to_chat(user, "Close the maintenance panel first.")
return
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index ce029b3d4bc..e8c208d6d89 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -122,7 +122,7 @@
to_chat(user, "You can't use [src] while it's panel is opened!")
return TRUE
- if((istype(I, /obj/item/reagent_containers/glass) || istype(I, /obj/item/reagent_containers/food/drinks/drinkingglass)) && user.a_intent != INTENT_HARM)
+ if((istype(I, /obj/item/reagent_containers/glass) || istype(I, /obj/item/reagent_containers/drinks/drinkingglass)) && user.a_intent != INTENT_HARM)
if(!user.drop_item())
to_chat(user, "[I] is stuck to you!")
return
@@ -327,7 +327,7 @@
if("create_condi_bottle")
if(!condi || !reagents.total_volume)
return
- var/obj/item/reagent_containers/food/condiment/P = new(loc)
+ var/obj/item/reagent_containers/condiment/P = new(loc)
reagents.trans_to(P, 50)
if("create_pills")
var/medicine_name = pillname
@@ -577,7 +577,7 @@
return
if(!length(answer))
answer = reagents.get_master_reagent_name()
- var/obj/item/reagent_containers/food/condiment/pack/P = new(loc)
+ var/obj/item/reagent_containers/condiment/pack/P = new(loc)
P.originalname = answer
P.name = "[answer] pack"
P.desc = "A small condiment pack. The label says it contains [answer]."
diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
index c4a6674285c..45f5c8cd089 100644
--- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
@@ -35,25 +35,25 @@
/obj/item/grown/novaflower = list("capsaicin" = 0, "condensedcapsaicin" = 0),
//Blender Stuff
- /obj/item/reagent_containers/food/snacks/grown/tomato = list("ketchup" = 0),
- /obj/item/reagent_containers/food/snacks/grown/wheat = list("flour" = -5),
- /obj/item/reagent_containers/food/snacks/grown/oat = list("flour" = -5),
- /obj/item/reagent_containers/food/snacks/grown/cherries = list("cherryjelly" = 0),
- /obj/item/reagent_containers/food/snacks/grown/bluecherries = list("bluecherryjelly" = 0),
- /obj/item/reagent_containers/food/snacks/egg = list("egg" = -5),
- /obj/item/reagent_containers/food/snacks/grown/rice = list("rice" = -5),
- /obj/item/reagent_containers/food/snacks/grown/olive = list("olivepaste" = 0, "sodiumchloride" = 0),
- /obj/item/reagent_containers/food/snacks/grown/peanuts = list("peanutbutter" = 0),
+ /obj/item/food/snacks/grown/tomato = list("ketchup" = 0),
+ /obj/item/food/snacks/grown/wheat = list("flour" = -5),
+ /obj/item/food/snacks/grown/oat = list("flour" = -5),
+ /obj/item/food/snacks/grown/cherries = list("cherryjelly" = 0),
+ /obj/item/food/snacks/grown/bluecherries = list("bluecherryjelly" = 0),
+ /obj/item/food/snacks/egg = list("egg" = -5),
+ /obj/item/food/snacks/grown/rice = list("rice" = -5),
+ /obj/item/food/snacks/grown/olive = list("olivepaste" = 0, "sodiumchloride" = 0),
+ /obj/item/food/snacks/grown/peanuts = list("peanutbutter" = 0),
//Grinder stuff, but only if dry
- /obj/item/reagent_containers/food/snacks/grown/coffee/robusta = list("coffeepowder" = 0, "morphine" = 0),
- /obj/item/reagent_containers/food/snacks/grown/coffee = list("coffeepowder" = 0),
- /obj/item/reagent_containers/food/snacks/grown/tea/astra = list("teapowder" = 0, "salglu_solution" = 0),
- /obj/item/reagent_containers/food/snacks/grown/tea = list("teapowder" = 0),
+ /obj/item/food/snacks/grown/coffee/robusta = list("coffeepowder" = 0, "morphine" = 0),
+ /obj/item/food/snacks/grown/coffee = list("coffeepowder" = 0),
+ /obj/item/food/snacks/grown/tea/astra = list("teapowder" = 0, "salglu_solution" = 0),
+ /obj/item/food/snacks/grown/tea = list("teapowder" = 0),
//All types that you can put into the grinder to transfer the reagents to the beaker. !Put all recipes above this.!
/obj/item/slime_extract = list(),
- /obj/item/reagent_containers/food = list(),
+ /obj/item/food = list(),
/obj/item/reagent_containers/pill = list(),
/obj/item/reagent_containers/patch = list()
)
@@ -61,33 +61,33 @@
var/list/juice_items = list (
//Juicer Stuff
- /obj/item/reagent_containers/food/snacks/grown/soybeans = list("soymilk" = 0),
- /obj/item/reagent_containers/food/snacks/grown/corn = list("corn_starch" = 0),
- /obj/item/reagent_containers/food/snacks/grown/tomato = list("tomatojuice" = 0),
- /obj/item/reagent_containers/food/snacks/grown/carrot = list("carrotjuice" = 0),
- /obj/item/reagent_containers/food/snacks/grown/berries = list("berryjuice" = 0),
- /obj/item/reagent_containers/food/snacks/grown/banana = list("banana" = 0),
- /obj/item/reagent_containers/food/snacks/grown/potato = list("potato" = 0),
- /obj/item/reagent_containers/food/snacks/grown/citrus/lemon = list("lemonjuice" = 0),
- /obj/item/reagent_containers/food/snacks/grown/citrus/orange = list("orangejuice" = 0),
- /obj/item/reagent_containers/food/snacks/grown/citrus/lime = list("limejuice" = 0),
- /obj/item/reagent_containers/food/snacks/grown/watermelon = list("watermelonjuice" = 0),
- /obj/item/reagent_containers/food/snacks/watermelonslice = list("watermelonjuice" = 0),
- /obj/item/reagent_containers/food/snacks/grown/berries/poison = list("poisonberryjuice" = 0),
- /obj/item/reagent_containers/food/snacks/grown/pumpkin/blumpkin = list("blumpkinjuice" = 0), //order is important here as blumpkin is a subtype of pumpkin, if switched blumpkins will produce pumpkin juice
- /obj/item/reagent_containers/food/snacks/grown/pumpkin = list("pumpkinjuice" = 0),
- /obj/item/reagent_containers/food/snacks/grown/apple = list("applejuice" = 0),
- /obj/item/reagent_containers/food/snacks/grown/grapes = list("grapejuice" = 0),
- /obj/item/reagent_containers/food/snacks/grown/pineapple = list("pineapplejuice" = 0)
+ /obj/item/food/snacks/grown/soybeans = list("soymilk" = 0),
+ /obj/item/food/snacks/grown/corn = list("corn_starch" = 0),
+ /obj/item/food/snacks/grown/tomato = list("tomatojuice" = 0),
+ /obj/item/food/snacks/grown/carrot = list("carrotjuice" = 0),
+ /obj/item/food/snacks/grown/berries = list("berryjuice" = 0),
+ /obj/item/food/snacks/grown/banana = list("banana" = 0),
+ /obj/item/food/snacks/grown/potato = list("potato" = 0),
+ /obj/item/food/snacks/grown/citrus/lemon = list("lemonjuice" = 0),
+ /obj/item/food/snacks/grown/citrus/orange = list("orangejuice" = 0),
+ /obj/item/food/snacks/grown/citrus/lime = list("limejuice" = 0),
+ /obj/item/food/snacks/grown/watermelon = list("watermelonjuice" = 0),
+ /obj/item/food/snacks/watermelonslice = list("watermelonjuice" = 0),
+ /obj/item/food/snacks/grown/berries/poison = list("poisonberryjuice" = 0),
+ /obj/item/food/snacks/grown/pumpkin/blumpkin = list("blumpkinjuice" = 0), //order is important here as blumpkin is a subtype of pumpkin, if switched blumpkins will produce pumpkin juice
+ /obj/item/food/snacks/grown/pumpkin = list("pumpkinjuice" = 0),
+ /obj/item/food/snacks/grown/apple = list("applejuice" = 0),
+ /obj/item/food/snacks/grown/grapes = list("grapejuice" = 0),
+ /obj/item/food/snacks/grown/pineapple = list("pineapplejuice" = 0)
)
var/list/dried_items = list(
//Grinder stuff, but only if dry,
- /obj/item/reagent_containers/food/snacks/grown/coffee/robusta = list("coffeepowder" = 0, "morphine" = 0),
- /obj/item/reagent_containers/food/snacks/grown/coffee = list("coffeepowder" = 0),
- /obj/item/reagent_containers/food/snacks/grown/tea/astra = list("teapowder" = 0, "salglu_solution" = 0),
- /obj/item/reagent_containers/food/snacks/grown/tea = list("teapowder" = 0)
+ /obj/item/food/snacks/grown/coffee/robusta = list("coffeepowder" = 0, "morphine" = 0),
+ /obj/item/food/snacks/grown/coffee = list("coffeepowder" = 0),
+ /obj/item/food/snacks/grown/tea/astra = list("teapowder" = 0, "salglu_solution" = 0),
+ /obj/item/food/snacks/grown/tea = list("teapowder" = 0)
)
var/list/holdingitems = list()
@@ -180,8 +180,8 @@
return TRUE //no afterattack
if(is_type_in_list(I, dried_items))
- if(istype(I, /obj/item/reagent_containers/food/snacks/grown))
- var/obj/item/reagent_containers/food/snacks/grown/G = I
+ if(istype(I, /obj/item/food/snacks/grown))
+ var/obj/item/food/snacks/grown/G = I
if(!G.dry)
to_chat(user, "You must dry that first!")
return FALSE
@@ -285,8 +285,8 @@
items_counts[display_name] += S.amount
continue
- else if(istype(O, /obj/item/reagent_containers/food))
- var/obj/item/reagent_containers/food/food = O
+ else if(isfood(O))
+ var/obj/item/food/food = O
if(!items_counts[display_name])
if(food.ingredient_name)
name_overrides[display_name] = food.ingredient_name
@@ -366,12 +366,12 @@
if(istype(O, i))
return blend_items[i]
-/obj/machinery/reagentgrinder/proc/get_allowed_snack_by_id(obj/item/reagent_containers/food/snacks/O)
+/obj/machinery/reagentgrinder/proc/get_allowed_snack_by_id(obj/item/food/snacks/O)
for(var/i in blend_items)
if(istype(O, i))
return blend_items[i]
-/obj/machinery/reagentgrinder/proc/get_allowed_juice_by_id(obj/item/reagent_containers/food/snacks/O)
+/obj/machinery/reagentgrinder/proc/get_allowed_juice_by_id(obj/item/food/snacks/O)
for(var/i in juice_items)
if(istype(O, i))
return juice_items[i]
@@ -384,7 +384,7 @@
else
return round(O.seed.potency)
-/obj/machinery/reagentgrinder/proc/get_juice_amount(obj/item/reagent_containers/food/snacks/grown/O)
+/obj/machinery/reagentgrinder/proc/get_juice_amount(obj/item/food/snacks/grown/O)
if(!istype(O) || !O.seed)
return 5
else if(O.seed.potency == -1)
@@ -413,7 +413,7 @@
SStgui.update_uis(src)
//Snacks
- for(var/obj/item/reagent_containers/food/snacks/O in holdingitems)
+ for(var/obj/item/food/snacks/O in holdingitems)
if(beaker.reagents.holder_full())
break
@@ -451,13 +451,19 @@
SStgui.update_uis(src)
//Snacks and Plants
- for(var/obj/item/reagent_containers/food/snacks/O in holdingitems)
+ for(var/obj/item/food/snacks/O in holdingitems)
if(beaker.reagents.holder_full())
break
var/allowed = get_allowed_snack_by_id(O)
- if(isnull(allowed))
- break
+ if(!length(allowed)) // We don't have anything specific allowed therefore we can just transfer everything
+ if(beaker.reagents.holder_full())
+ continue
+ var/amount = O.reagents.total_volume
+ O.reagents.trans_to(beaker, amount)
+ if(!O.reagents.total_volume)
+ remove_object(O)
+ continue
for(var/r_id in allowed)
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index 49ed5546a19..6ff6e2acbcf 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -601,7 +601,7 @@
/datum/reagent/consumable/chocolate/reaction_turf(turf/T, volume)
if(volume >= 5 && !isspaceturf(T))
- new /obj/item/reagent_containers/food/snacks/choc_pile(T)
+ new /obj/item/food/snacks/choc_pile(T)
/datum/reagent/consumable/mugwort
name = "Mugwort"
@@ -669,7 +669,7 @@
/datum/reagent/consumable/cheese/reaction_turf(turf/T, volume)
if(volume >= 5 && !isspaceturf(T))
- new /obj/item/reagent_containers/food/snacks/cheesewedge(T)
+ new /obj/item/food/snacks/cheesewedge(T)
/datum/reagent/consumable/fake_cheese
name = "Cheese substitute"
@@ -711,7 +711,7 @@
/datum/reagent/consumable/weird_cheese/reaction_turf(turf/T, volume)
if(volume >= 5 && !isspaceturf(T))
- new /obj/item/reagent_containers/food/snacks/weirdcheesewedge(T)
+ new /obj/item/food/snacks/weirdcheesewedge(T)
/datum/reagent/consumable/beans
name = "Refried beans"
@@ -935,11 +935,11 @@
/datum/reagent/ectoplasm/reaction_turf(turf/T, volume)
if(volume >= 10 && !isspaceturf(T))
- new /obj/item/reagent_containers/food/snacks/ectoplasm(T)
+ new /obj/item/food/snacks/ectoplasm(T)
/datum/reagent/consumable/bread/reaction_turf(turf/T, volume)
if(volume >= 5 && !isspaceturf(T))
- new /obj/item/reagent_containers/food/snacks/breadslice(T)
+ new /obj/item/food/snacks/breadslice(T)
/datum/reagent/soap
name = "Soap"
diff --git a/code/modules/reagents/chemistry/recipes/food_reactions.dm b/code/modules/reagents/chemistry/recipes/food_reactions.dm
index 76609ad8dd9..b91a8a25bcc 100644
--- a/code/modules/reagents/chemistry/recipes/food_reactions.dm
+++ b/code/modules/reagents/chemistry/recipes/food_reactions.dm
@@ -10,7 +10,7 @@
/datum/chemical_reaction/tofu/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
- new /obj/item/reagent_containers/food/snacks/tofu(location)
+ new /obj/item/food/snacks/tofu(location)
/datum/chemical_reaction/chocolate_bar
name = "Chocolate Bar"
@@ -22,7 +22,7 @@
/datum/chemical_reaction/chocolate_bar/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
- new /obj/item/reagent_containers/food/snacks/chocolatebar(location)
+ new /obj/item/food/snacks/chocolatebar(location)
/datum/chemical_reaction/chocolate_bar2
name = "Chocolate Bar"
@@ -34,7 +34,7 @@
/datum/chemical_reaction/chocolate_bar2/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
- new /obj/item/reagent_containers/food/snacks/chocolatebar(location)
+ new /obj/item/food/snacks/chocolatebar(location)
/datum/chemical_reaction/soysauce
name = "Soy Sauce"
@@ -75,7 +75,7 @@
/datum/chemical_reaction/cheesewheel/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
- new /obj/item/reagent_containers/food/snacks/sliceable/cheesewheel(location)
+ new /obj/item/food/snacks/sliceable/cheesewheel(location)
/datum/chemical_reaction/syntiflesh
name = "Syntiflesh"
@@ -87,7 +87,7 @@
/datum/chemical_reaction/syntiflesh/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
- new /obj/item/reagent_containers/food/snacks/meat/syntiflesh(location)
+ new /obj/item/food/snacks/meat/syntiflesh(location)
/datum/chemical_reaction/hot_ramen
name = "Hot Ramen"
@@ -114,7 +114,7 @@
/datum/chemical_reaction/dough/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i in 1 to created_volume)
- new /obj/item/reagent_containers/food/snacks/dough(location)
+ new /obj/item/food/snacks/dough(location)
///Cookies by Ume
@@ -129,7 +129,7 @@
/datum/chemical_reaction/cookiedough/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i in 1 to created_volume)
- new /obj/item/reagent_containers/food/snacks/cookiedough(location)
+ new /obj/item/food/snacks/cookiedough(location)
/datum/chemical_reaction/corn_syrup
@@ -183,7 +183,7 @@
/datum/chemical_reaction/weird_cheese/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i in 1 to created_volume)
- new /obj/item/reagent_containers/food/snacks/weirdcheesewedge(location)
+ new /obj/item/food/snacks/weirdcheesewedge(location)
/datum/chemical_reaction/hydrogenated_soybeanoil
name = "Partially hydrogenated space-soybean oil"
diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm
index d0da4adc4c2..8409f4b15e4 100644
--- a/code/modules/reagents/chemistry/recipes/others.dm
+++ b/code/modules/reagents/chemistry/recipes/others.dm
@@ -263,7 +263,7 @@
/datum/chemical_reaction/meatification/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
- new /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct(location)
+ new /obj/item/food/snacks/meat/slab/meatproduct(location)
/datum/chemical_reaction/lye
name = "lye"
diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
index a25bbe0a714..10c8a080317 100644
--- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm
+++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
@@ -38,7 +38,7 @@
/datum/chemical_reaction/slimemonkey/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
for(var/i = 1, i <= 3, i++)
- var/obj/item/reagent_containers/food/snacks/monkeycube/M = new /obj/item/reagent_containers/food/snacks/monkeycube
+ var/obj/item/food/snacks/monkeycube/M = new /obj/item/food/snacks/monkeycube
M.forceMove(get_turf(holder.my_atom))
//Green
@@ -147,37 +147,39 @@
/datum/chemical_reaction/slimebork/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
- var/list/blocked = list(/obj/item/reagent_containers/food/snacks,
- /obj/item/reagent_containers/food/snacks/breadslice,
- /obj/item/reagent_containers/food/snacks/sliceable,
- /obj/item/reagent_containers/food/snacks/sliceable/pizza,
- /obj/item/reagent_containers/food/snacks/margheritapizzaslice,
- /obj/item/reagent_containers/food/snacks/meatpizzaslice,
- /obj/item/reagent_containers/food/snacks/mushroompizzaslice,
- /obj/item/reagent_containers/food/snacks/vegetablepizzaslice,
- /obj/item/reagent_containers/food/snacks/cheesepizzaslice,
- /obj/item/reagent_containers/food/snacks/garlicpizzaslice,
- /obj/item/reagent_containers/food/snacks/donkpocketpizzaslice,
- /obj/item/reagent_containers/food/snacks/dankpizzaslice,
- /obj/item/reagent_containers/food/snacks/macpizzaslice,
- /obj/item/reagent_containers/food/snacks/firecrackerpizzaslice,
- /obj/item/reagent_containers/food/snacks/pestopizzaslice,
- /obj/item/reagent_containers/food/snacks/pepperonipizzaslice,
- /obj/item/reagent_containers/food/snacks/meat,
- /obj/item/reagent_containers/food/snacks/meat/slab,
- /obj/item/reagent_containers/food/snacks/grown,
- /obj/item/reagent_containers/food/snacks/grown/shell,
- /obj/item/reagent_containers/food/snacks/grown/mushroom,
- /obj/item/reagent_containers/food/snacks/deepfryholder,
- /obj/item/reagent_containers/food/snacks/chinese,
- /obj/item/reagent_containers/food/snacks/human,
- /obj/item/reagent_containers/food/snacks/monstermeat,
- /obj/item/reagent_containers/food/snacks/meatsteak/stimulating,
- /obj/item/reagent_containers/food/snacks/egg/watcher
- )
- blocked |= typesof(/obj/item/reagent_containers/food/snacks/customizable)
- var/list/borks = typesof(/obj/item/reagent_containers/food/snacks) - blocked
+ var/list/blocked = list(
+ /obj/item/food/snacks,
+ /obj/item/food/snacks/breadslice,
+ /obj/item/food/snacks/sliceable,
+ /obj/item/food/snacks/sliceable/pizza,
+ /obj/item/food/snacks/margheritapizzaslice,
+ /obj/item/food/snacks/meatpizzaslice,
+ /obj/item/food/snacks/mushroompizzaslice,
+ /obj/item/food/snacks/vegetablepizzaslice,
+ /obj/item/food/snacks/cheesepizzaslice,
+ /obj/item/food/snacks/garlicpizzaslice,
+ /obj/item/food/snacks/donkpocketpizzaslice,
+ /obj/item/food/snacks/dankpizzaslice,
+ /obj/item/food/snacks/macpizzaslice,
+ /obj/item/food/snacks/firecrackerpizzaslice,
+ /obj/item/food/snacks/pestopizzaslice,
+ /obj/item/food/snacks/pepperonipizzaslice,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/meat/slab,
+ /obj/item/food/snacks/grown,
+ /obj/item/food/snacks/grown/shell,
+ /obj/item/food/snacks/grown/mushroom,
+ /obj/item/food/snacks/deepfryholder,
+ /obj/item/food/snacks/chinese,
+ /obj/item/food/snacks/human,
+ /obj/item/food/snacks/monstermeat,
+ /obj/item/food/snacks/meatsteak/stimulating,
+ /obj/item/food/snacks/egg/watcher
+ )
+ blocked |= typesof(/obj/item/food/snacks/customizable)
+
+ var/list/borks = typesof(/obj/item/food/snacks) - blocked
// BORK BORK BORK
playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
@@ -207,24 +209,24 @@
/datum/chemical_reaction/slimebork2/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
- var/list/borks = subtypesof(/obj/item/reagent_containers/food/drinks)
- var/list/blocked = list(/obj/item/reagent_containers/food/drinks/cans/adminbooze,
- /obj/item/reagent_containers/food/drinks/cans/madminmalt,
- /obj/item/reagent_containers/food/drinks/shaker,
- /obj/item/reagent_containers/food/drinks/britcup,
- /obj/item/reagent_containers/food/drinks/sillycup,
- /obj/item/reagent_containers/food/drinks/cans,
- /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
- /obj/item/reagent_containers/food/drinks/drinkingglass,
- /obj/item/reagent_containers/food/drinks/bottle,
- /obj/item/reagent_containers/food/drinks/everfull,
- /obj/item/reagent_containers/food/drinks/bottle/dragonsbreath,
- /obj/item/reagent_containers/food/drinks/bottle/immortality,
- /obj/item/reagent_containers/food/drinks/mushroom_bowl
+ var/list/borks = subtypesof(/obj/item/reagent_containers/drinks)
+ var/list/blocked = list(/obj/item/reagent_containers/drinks/cans/adminbooze,
+ /obj/item/reagent_containers/drinks/cans/madminmalt,
+ /obj/item/reagent_containers/drinks/shaker,
+ /obj/item/reagent_containers/drinks/britcup,
+ /obj/item/reagent_containers/drinks/sillycup,
+ /obj/item/reagent_containers/drinks/cans,
+ /obj/item/reagent_containers/drinks/drinkingglass/shotglass,
+ /obj/item/reagent_containers/drinks/drinkingglass,
+ /obj/item/reagent_containers/drinks/bottle,
+ /obj/item/reagent_containers/drinks/everfull,
+ /obj/item/reagent_containers/drinks/bottle/dragonsbreath,
+ /obj/item/reagent_containers/drinks/bottle/immortality,
+ /obj/item/reagent_containers/drinks/mushroom_bowl
)
- blocked += typesof(/obj/item/reagent_containers/food/drinks/flask)
- blocked += typesof(/obj/item/reagent_containers/food/drinks/trophy)
- blocked += typesof(/obj/item/reagent_containers/food/drinks/cans/bottler)
+ blocked += typesof(/obj/item/reagent_containers/drinks/flask)
+ blocked += typesof(/obj/item/reagent_containers/drinks/trophy)
+ blocked += typesof(/obj/item/reagent_containers/drinks/cans/bottler)
borks -= blocked
// BORK BORK BORK
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index 4f155bf54bf..a818d35f26a 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -57,7 +57,6 @@
if(!QDELETED(src))
..()
-
/obj/item/reagent_containers/proc/add_lid()
if(has_lid)
container_type ^= REFILLABLE | DRAINABLE
diff --git a/code/modules/reagents/reagent_containers/chemical_bottle.dm b/code/modules/reagents/reagent_containers/chemical_bottle.dm
index 4e8f9a1224e..b48d4fe3379 100644
--- a/code/modules/reagents/reagent_containers/chemical_bottle.dm
+++ b/code/modules/reagents/reagent_containers/chemical_bottle.dm
@@ -1,4 +1,4 @@
-//Not to be confused with /obj/item/reagent_containers/food/drinks/bottle
+//Not to be confused with /obj/item/reagent_containers/drinks/bottle
/obj/item/reagent_containers/glass/bottle
diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm
index 553a468b955..c8a02d8f797 100644
--- a/code/modules/reagents/reagent_containers/dropper.dm
+++ b/code/modules/reagents/reagent_containers/dropper.dm
@@ -72,7 +72,7 @@
return
if(reagents.total_volume)
- if(!target.is_open_container() && !(istype(target, /obj/item/reagent_containers/food) && !ispill(target)) && !istype(target, /obj/item/clothing/mask/cigarette))
+ if(!target.is_open_container() && !(isfood(target) && !ispill(target)) && !istype(target, /obj/item/clothing/mask/cigarette))
to_chat(user, "You cannot directly fill this object.")
return
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 47796f6e1a2..8ee8351283b 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -136,7 +136,7 @@
add_attack_logs(user, L, "Injected with [name] containing [contained], transfered [amount_per_transfer_from_this] units", reagents.harmless_helper() ? ATKLOG_ALMOSTALL : null)
- if(istype(target, /obj/item/reagent_containers/food))
+ if(isfood(target))
var/list/chemicals = list()
for(var/datum/reagent/chem in reagents.reagent_list)
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index 1f770bfa3bf..7216ee0177f 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -256,7 +256,7 @@
to_chat(user, "There aren't any cups left!")
return
user.visible_message("[user] takes a cup from [src].", "You take a paper cup from [src].")
- var/obj/item/reagent_containers/food/drinks/sillycup/S = new(get_turf(src))
+ var/obj/item/reagent_containers/drinks/sillycup/S = new(get_turf(src))
user.put_in_hands(S)
paper_cups--
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index 10c43eaf23d..3f85b550422 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -276,7 +276,7 @@
id = "drinking_glass"
build_type = AUTOLATHE
materials = list(MAT_GLASS = 100)
- build_path = /obj/item/reagent_containers/food/drinks/drinkingglass
+ build_path = /obj/item/reagent_containers/drinks/drinkingglass
category = list("initial","Dinnerware")
/datum/design/shot_glass
@@ -284,7 +284,7 @@
id = "shot_glass"
build_type = AUTOLATHE
materials = list(MAT_GLASS = 50)
- build_path = /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass
+ build_path = /obj/item/reagent_containers/drinks/drinkingglass/shotglass
category = list("initial","Dinnerware")
/datum/design/shaker
@@ -292,7 +292,7 @@
id = "shaker"
build_type = AUTOLATHE
materials = list(MAT_METAL = 1500)
- build_path = /obj/item/reagent_containers/food/drinks/shaker
+ build_path = /obj/item/reagent_containers/drinks/shaker
category = list("initial","Dinnerware")
/datum/design/cultivator
diff --git a/code/modules/research/designs/biogenerator_designs.dm b/code/modules/research/designs/biogenerator_designs.dm
index 10a73792f2f..e3d556355a9 100644
--- a/code/modules/research/designs/biogenerator_designs.dm
+++ b/code/modules/research/designs/biogenerator_designs.dm
@@ -23,7 +23,7 @@
id = "milk_carton"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 100)
- build_path = /obj/item/reagent_containers/food/condiment/milk
+ build_path = /obj/item/reagent_containers/condiment/milk
category = list("initial","Food")
/datum/design/cream_carton
@@ -31,7 +31,7 @@
id = "cream_carton"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 300)
- build_path = /obj/item/reagent_containers/food/drinks/bottle/cream
+ build_path = /obj/item/reagent_containers/drinks/bottle/cream
category = list("initial","Food")
/datum/design/black_pepper
@@ -47,7 +47,7 @@
id = "pepper_mill"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 50)
- build_path = /obj/item/reagent_containers/food/condiment/peppermill
+ build_path = /obj/item/reagent_containers/condiment/peppermill
make_reagents = list()
category = list("initial","Food")
@@ -56,7 +56,7 @@
id = "mcube"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 250)
- build_path = /obj/item/reagent_containers/food/snacks/monkeycube
+ build_path = /obj/item/food/snacks/monkeycube
category = list("initial", "Food")
/datum/design/farwa_cube
@@ -64,7 +64,7 @@
id = "fcube"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 250)
- build_path = /obj/item/reagent_containers/food/snacks/monkeycube/farwacube
+ build_path = /obj/item/food/snacks/monkeycube/farwacube
category = list("initial", "Food")
/datum/design/wolpin_cube
@@ -72,7 +72,7 @@
id = "wcube"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 250)
- build_path = /obj/item/reagent_containers/food/snacks/monkeycube/wolpincube
+ build_path = /obj/item/food/snacks/monkeycube/wolpincube
category = list("initial", "Food")
/datum/design/stok_cube
@@ -80,7 +80,7 @@
id = "scube"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 250)
- build_path = /obj/item/reagent_containers/food/snacks/monkeycube/stokcube
+ build_path = /obj/item/food/snacks/monkeycube/stokcube
category = list("initial", "Food")
/datum/design/neaera_cube
@@ -88,7 +88,7 @@
id = "ncube"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 250)
- build_path = /obj/item/reagent_containers/food/snacks/monkeycube/neaeracube
+ build_path = /obj/item/food/snacks/monkeycube/neaeracube
category = list("initial", "Food")
/datum/design/ez_nut
diff --git a/code/modules/research/designs/bluespace_designs.dm b/code/modules/research/designs/bluespace_designs.dm
index 8c94a2492ea..3ba6b9b610d 100644
--- a/code/modules/research/designs/bluespace_designs.dm
+++ b/code/modules/research/designs/bluespace_designs.dm
@@ -98,5 +98,5 @@
id = "bluespaceshotglass"
build_type = PROTOLATHE
materials = list(MAT_METAL = 1000, MAT_BLUESPACE = 500)
- build_path = /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/bluespace
+ build_path = /obj/item/reagent_containers/drinks/drinkingglass/shotglass/bluespace
category = list("Bluespace")
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index de1b4b0880b..6f039a583dc 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -30,8 +30,8 @@
var/list/item_reactions = list()
var/list/valid_items = list() //valid items for special reactions like transforming
var/list/critical_items = list() //items that can cause critical reactions
- var/list/blocked_items = list(/obj/item/reagent_containers/food/drinks/bottle/dragonsbreath,
- /obj/item/reagent_containers/food/drinks/bottle/immortality)
+ var/list/blocked_items = list(/obj/item/reagent_containers/drinks/bottle/dragonsbreath,
+ /obj/item/reagent_containers/drinks/bottle/immortality)
/// Used for linking with rnd consoles
var/range = 5
@@ -55,7 +55,7 @@
valid_items += I
probWeight++
- if(ispath(I,/obj/item/reagent_containers/food))
+ if(ispath(I,/obj/item/food))
var/obj/item/tempCheck = I
if(I in blocked_items)
continue
@@ -340,7 +340,7 @@
if(prob(EFFECT_PROB_LOW) && criticalReaction)
visible_message("[src]'s emergency coolant system gives off a small ding!")
playsound(loc, 'sound/machines/ding.ogg', 50, 1)
- var/obj/item/reagent_containers/food/drinks/coffee/C = new /obj/item/reagent_containers/food/drinks/coffee(get_turf(pick(oview(1,src))))
+ var/obj/item/reagent_containers/drinks/coffee/C = new /obj/item/reagent_containers/drinks/coffee(get_turf(pick(oview(1,src))))
chosenchem = pick("plasma","capsaicin","ethanol")
C.reagents.remove_any(25)
C.reagents.add_reagent(chosenchem , 50)
@@ -391,7 +391,7 @@
visible_message("[src] lowers [exp_on]'s temperature.")
if(prob(EFFECT_PROB_LOW) && criticalReaction)
visible_message("[src]'s emergency coolant system gives off a small ding!")
- var/obj/item/reagent_containers/food/drinks/coffee/C = new /obj/item/reagent_containers/food/drinks/coffee(get_turf(pick(oview(1,src))))
+ var/obj/item/reagent_containers/drinks/coffee/C = new /obj/item/reagent_containers/drinks/coffee(get_turf(pick(oview(1,src))))
playsound(loc, 'sound/machines/ding.ogg', 50, 1) //Ding! Your death coffee is ready!
chosenchem = pick("uranium","frostoil","ephedrine")
C.reagents.remove_any(25)
diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm
index 531dc923780..4225b79bc0e 100644
--- a/code/modules/research/xenobiology/xenobio_camera.dm
+++ b/code/modules/research/xenobiology/xenobio_camera.dm
@@ -177,7 +177,7 @@
return ..()
/obj/machinery/computer/camera_advanced/xenobio/attackby(obj/item/O, mob/user, params)
- if(istype(O, /obj/item/reagent_containers/food/snacks/monkeycube))
+ if(istype(O, /obj/item/food/snacks/monkeycube))
if(user.drop_item())
monkeys++
to_chat(user, "You feed [O] to [src]. It now has [monkeys] monkey cubes stored.")
@@ -192,7 +192,7 @@
else if(istype(O, /obj/item/storage/bag) || istype(O, /obj/item/storage/box))
var/obj/item/storage/P = O
var/loaded = 0
- for(var/obj/item/reagent_containers/food/snacks/monkeycube/MC in P.contents)
+ for(var/obj/item/food/snacks/monkeycube/MC in P.contents)
loaded = 1
monkeys++
P.remove_from_storage(MC)
diff --git a/code/modules/ruins/lavalandruin_code/puzzle.dm b/code/modules/ruins/lavalandruin_code/puzzle.dm
index 5320a16f12b..8a66c447192 100644
--- a/code/modules/ruins/lavalandruin_code/puzzle.dm
+++ b/code/modules/ruins/lavalandruin_code/puzzle.dm
@@ -7,7 +7,7 @@
var/list/elements
var/floor_type = /turf/simulated/floor/vault/lavaland_air
var/finished = FALSE
- var/reward_type = /obj/item/reagent_containers/food/snacks/cookie
+ var/reward_type = /obj/item/food/snacks/cookie
var/element_type = /obj/structure/puzzle_element
var/auto_setup = TRUE
var/empty_tile_id
diff --git a/code/modules/ruins/lavalandruin_code/seed_vault.dm b/code/modules/ruins/lavalandruin_code/seed_vault.dm
index 7c70935c9f3..54b7f64c2f5 100644
--- a/code/modules/ruins/lavalandruin_code/seed_vault.dm
+++ b/code/modules/ruins/lavalandruin_code/seed_vault.dm
@@ -2,7 +2,7 @@
name = "seed vault seeds"
lootcount = 1
- loot = list(/obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/glowcap = 10,
+ loot = list(/obj/item/food/snacks/grown/mushroom/glowshroom/glowcap = 10,
/obj/item/seeds/cherry/bomb = 10,
/obj/item/seeds/berry/glow = 10,
/obj/item/seeds/sunflower/moonflower = 8
diff --git a/code/modules/ruins/syndicate_space_base.dm b/code/modules/ruins/syndicate_space_base.dm
index b3e6044c21e..67d9fcc50df 100644
--- a/code/modules/ruins/syndicate_space_base.dm
+++ b/code/modules/ruins/syndicate_space_base.dm
@@ -16,7 +16,7 @@
/obj/item/grenade/chem_grenade/pyro = 5,
/obj/item/grenade/chem_grenade/cryo = 5,
/obj/item/grenade/chem_grenade/adv_release = 5,
- /obj/item/reagent_containers/food/drinks/bottle/holywater = 1)
+ /obj/item/reagent_containers/drinks/bottle/holywater = 1)
slogan_list = list("It's not pyromania if you're getting paid!","You smell that? Plasma, son. Nothing else in the world smells like that.","I love the smell of Plasma in the morning.")
resistance_flags = FIRE_PROOF
diff --git a/code/modules/station_goals/bluespace_tap.dm b/code/modules/station_goals/bluespace_tap.dm
index db367873898..a6c3d128f78 100644
--- a/code/modules/station_goals/bluespace_tap.dm
+++ b/code/modules/station_goals/bluespace_tap.dm
@@ -149,25 +149,25 @@
name = "fancy food"
lootcount = 3
loot = list(
- /obj/item/reagent_containers/food/snacks/wingfangchu,
- /obj/item/reagent_containers/food/snacks/hotdog,
- /obj/item/reagent_containers/food/snacks/sliceable/turkey,
- /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit,
- /obj/item/reagent_containers/food/snacks/appletart,
- /obj/item/reagent_containers/food/snacks/sliceable/cheesecake,
- /obj/item/reagent_containers/food/snacks/sliceable/bananacake,
- /obj/item/reagent_containers/food/snacks/sliceable/chocolatecake,
- /obj/item/reagent_containers/food/snacks/soup/meatballsoup,
- /obj/item/reagent_containers/food/snacks/soup/mysterysoup,
- /obj/item/reagent_containers/food/snacks/soup/stew,
- /obj/item/reagent_containers/food/snacks/soup/hotchili,
- /obj/item/reagent_containers/food/snacks/burrito,
- /obj/item/reagent_containers/food/snacks/fishburger,
- /obj/item/reagent_containers/food/snacks/cubancarp,
- /obj/item/reagent_containers/food/snacks/fishandchips,
- /obj/item/reagent_containers/food/snacks/meatpie,
+ /obj/item/food/snacks/wingfangchu,
+ /obj/item/food/snacks/hotdog,
+ /obj/item/food/snacks/sliceable/turkey,
+ /obj/item/food/snacks/plumphelmetbiscuit,
+ /obj/item/food/snacks/appletart,
+ /obj/item/food/snacks/sliceable/cheesecake,
+ /obj/item/food/snacks/sliceable/bananacake,
+ /obj/item/food/snacks/sliceable/chocolatecake,
+ /obj/item/food/snacks/soup/meatballsoup,
+ /obj/item/food/snacks/soup/mysterysoup,
+ /obj/item/food/snacks/soup/stew,
+ /obj/item/food/snacks/soup/hotchili,
+ /obj/item/food/snacks/burrito,
+ /obj/item/food/snacks/fishburger,
+ /obj/item/food/snacks/cubancarp,
+ /obj/item/food/snacks/fishandchips,
+ /obj/item/food/snacks/meatpie,
/obj/item/pizzabox/hawaiian, //it ONLY gives hawaiian. MUHAHAHA
- /obj/item/reagent_containers/food/snacks/sliceable/xenomeatbread //maybe add some dangerous/special food here, ie robobuger?
+ /obj/item/food/snacks/sliceable/xenomeatbread //maybe add some dangerous/special food here, ie robobuger?
)
#define kW *1000
diff --git a/code/modules/station_goals/shield.dm b/code/modules/station_goals/shield.dm
index 6b9d42f2794..f1c74b695fa 100644
--- a/code/modules/station_goals/shield.dm
+++ b/code/modules/station_goals/shield.dm
@@ -173,7 +173,7 @@
if(!emagged && space_los(M))
Beam(get_turf(M), icon_state = "sat_beam", time = 5, maxdistance = kill_range)
if(istype(M, /obj/effect/space_dust/meaty))
- new /obj/item/reagent_containers/food/snacks/meatsteak(get_turf(M))
+ new /obj/item/food/snacks/meatsteak(get_turf(M))
qdel(M)
/obj/machinery/satellite/meteor_shield/toggle(user)
diff --git a/code/modules/supply/supply_packs/pack_miscellaneous.dm b/code/modules/supply/supply_packs/pack_miscellaneous.dm
index dd906cfc71c..113ab3cbfa7 100644
--- a/code/modules/supply/supply_packs/pack_miscellaneous.dm
+++ b/code/modules/supply/supply_packs/pack_miscellaneous.dm
@@ -48,8 +48,8 @@
/datum/supply_packs/misc/religious_supplies
name = "Religious Supplies Crate"
- contains = list(/obj/item/reagent_containers/food/drinks/bottle/holywater,
- /obj/item/reagent_containers/food/drinks/bottle/holywater,
+ contains = list(/obj/item/reagent_containers/drinks/bottle/holywater,
+ /obj/item/reagent_containers/drinks/bottle/holywater,
/obj/item/storage/bible/booze,
/obj/item/storage/bible/booze,
/obj/item/clothing/suit/hooded/chaplain_hoodie,
@@ -240,8 +240,8 @@
/obj/item/clothing/mask/gas/mime,
/obj/item/clothing/head/beret,
/obj/item/clothing/suit/suspenders,
- /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing,
- /obj/item/reagent_containers/food/drinks/bottle/bottleofbanana
+ /obj/item/reagent_containers/drinks/bottle/bottleofnothing,
+ /obj/item/reagent_containers/drinks/bottle/bottleofbanana
)
cost = 250
containertype = /obj/structure/closet/crate/secure
diff --git a/code/modules/supply/supply_packs/pack_organic.dm b/code/modules/supply/supply_packs/pack_organic.dm
index e5812958dee..2f6158d207b 100644
--- a/code/modules/supply/supply_packs/pack_organic.dm
+++ b/code/modules/supply/supply_packs/pack_organic.dm
@@ -7,22 +7,22 @@
/datum/supply_packs/organic/food
name = "Food Crate"
- contains = list(/obj/item/reagent_containers/food/condiment/flour,
- /obj/item/reagent_containers/food/condiment/rice,
- /obj/item/reagent_containers/food/condiment/milk,
- /obj/item/reagent_containers/food/condiment/soymilk,
- /obj/item/reagent_containers/food/condiment/saltshaker,
- /obj/item/reagent_containers/food/condiment/peppermill,
+ contains = list(/obj/item/reagent_containers/condiment/flour,
+ /obj/item/reagent_containers/condiment/rice,
+ /obj/item/reagent_containers/condiment/milk,
+ /obj/item/reagent_containers/condiment/soymilk,
+ /obj/item/reagent_containers/condiment/saltshaker,
+ /obj/item/reagent_containers/condiment/peppermill,
/obj/item/kitchen/rollingpin,
/obj/item/storage/fancy/egg_box,
/obj/item/mixing_bowl,
/obj/item/mixing_bowl,
- /obj/item/reagent_containers/food/condiment/enzyme,
- /obj/item/reagent_containers/food/condiment/sugar,
- /obj/item/reagent_containers/food/snacks/meat/monkey,
- /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/enzyme,
+ /obj/item/reagent_containers/condiment/sugar,
+ /obj/item/food/snacks/meat/monkey,
+ /obj/item/food/snacks/grown/banana,
+ /obj/item/food/snacks/grown/banana,
+ /obj/item/food/snacks/grown/banana)
cost = 250
containername = "food crate"
announce_beacons = list("Kitchen" = list("Kitchen"))
@@ -39,18 +39,18 @@
/datum/supply_packs/misc/randomised/ingredients // its a bit hacky...
num_contained = 25
- contains = list(/obj/item/reagent_containers/food/snacks/grown/wheat,
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/grown/potato,
- /obj/item/reagent_containers/food/snacks/grown/carrot,
- /obj/item/reagent_containers/food/snacks/grown/pumpkin,
- /obj/item/reagent_containers/food/snacks/grown/chili,
- /obj/item/reagent_containers/food/snacks/grown/cocoapod,
- /obj/item/reagent_containers/food/snacks/grown/corn,
- /obj/item/reagent_containers/food/snacks/grown/eggplant,
- /obj/item/reagent_containers/food/snacks/grown/apple,
- /obj/item/reagent_containers/food/snacks/grown/banana,
- /obj/item/reagent_containers/food/snacks/grown/cherries)
+ contains = list(/obj/item/food/snacks/grown/wheat,
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/grown/potato,
+ /obj/item/food/snacks/grown/carrot,
+ /obj/item/food/snacks/grown/pumpkin,
+ /obj/item/food/snacks/grown/chili,
+ /obj/item/food/snacks/grown/cocoapod,
+ /obj/item/food/snacks/grown/corn,
+ /obj/item/food/snacks/grown/eggplant,
+ /obj/item/food/snacks/grown/apple,
+ /obj/item/food/snacks/grown/banana,
+ /obj/item/food/snacks/grown/cherries)
name = "Ingredient Crate"
cost = 300
containername = "ingredient crate"
@@ -60,18 +60,18 @@
/datum/supply_packs/organic/condiments
name = "Condiment Crate"
- contains = list(/obj/item/reagent_containers/food/condiment/ketchup,
- /obj/item/reagent_containers/food/condiment/bbqsauce,
- /obj/item/reagent_containers/food/condiment/soysauce,
- /obj/item/reagent_containers/food/condiment/mayonnaise,
- /obj/item/reagent_containers/food/condiment/cherryjelly,
- /obj/item/reagent_containers/food/condiment/peanutbutter,
- /obj/item/reagent_containers/food/condiment/honey,
- /obj/item/reagent_containers/food/condiment/oliveoil,
- /obj/item/reagent_containers/food/condiment/frostoil,
- /obj/item/reagent_containers/food/condiment/capsaicin,
- /obj/item/reagent_containers/food/condiment/wasabi,
- /obj/item/reagent_containers/food/condiment/vinegar)
+ contains = list(/obj/item/reagent_containers/condiment/ketchup,
+ /obj/item/reagent_containers/condiment/bbqsauce,
+ /obj/item/reagent_containers/condiment/soysauce,
+ /obj/item/reagent_containers/condiment/mayonnaise,
+ /obj/item/reagent_containers/condiment/cherryjelly,
+ /obj/item/reagent_containers/condiment/peanutbutter,
+ /obj/item/reagent_containers/condiment/honey,
+ /obj/item/reagent_containers/condiment/oliveoil,
+ /obj/item/reagent_containers/condiment/frostoil,
+ /obj/item/reagent_containers/condiment/capsaicin,
+ /obj/item/reagent_containers/condiment/wasabi,
+ /obj/item/reagent_containers/condiment/vinegar)
cost = 300
containername = "condiment crate"
@@ -115,15 +115,15 @@
/datum/supply_packs/organic/party
name = "Party Equipment Crate"
contains = list(/obj/item/storage/box/drinkingglasses,
- /obj/item/reagent_containers/food/drinks/shaker,
- /obj/item/reagent_containers/food/drinks/bottle/patron,
- /obj/item/reagent_containers/food/drinks/bottle/goldschlager,
- /obj/item/reagent_containers/food/drinks/cans/ale,
- /obj/item/reagent_containers/food/drinks/cans/ale,
- /obj/item/reagent_containers/food/drinks/cans/beer,
- /obj/item/reagent_containers/food/drinks/cans/beer,
- /obj/item/reagent_containers/food/drinks/cans/beer,
- /obj/item/reagent_containers/food/drinks/cans/beer,
+ /obj/item/reagent_containers/drinks/shaker,
+ /obj/item/reagent_containers/drinks/bottle/patron,
+ /obj/item/reagent_containers/drinks/bottle/goldschlager,
+ /obj/item/reagent_containers/drinks/cans/ale,
+ /obj/item/reagent_containers/drinks/cans/ale,
+ /obj/item/reagent_containers/drinks/cans/beer,
+ /obj/item/reagent_containers/drinks/cans/beer,
+ /obj/item/reagent_containers/drinks/cans/beer,
+ /obj/item/reagent_containers/drinks/cans/beer,
/obj/item/grenade/confetti,
/obj/item/grenade/confetti)
cost = 250
diff --git a/code/modules/supply/supply_packs/pack_science.dm b/code/modules/supply/supply_packs/pack_science.dm
index d70a663c7bf..51bc785d040 100644
--- a/code/modules/supply/supply_packs/pack_science.dm
+++ b/code/modules/supply/supply_packs/pack_science.dm
@@ -107,7 +107,7 @@
/datum/supply_packs/science/oil
name = "Oil Tank Crate"
contains = list(/obj/structure/reagent_dispensers/oil,
- /obj/item/reagent_containers/food/drinks/oilcan)
+ /obj/item/reagent_containers/drinks/oilcan)
cost = 150
containertype = /obj/structure/largecrate
containername = "oil tank crate"
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index 3cb1233bfea..2f3413a5157 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -106,7 +106,7 @@
/obj/item/organ/internal/proc/prepare_eat()
if(is_robotic())
return //no eating cybernetic implants!
- var/obj/item/reagent_containers/food/snacks/organ/S = new
+ var/obj/item/food/snacks/organ/S = new
S.name = name
S.desc = desc
S.icon = icon
@@ -126,19 +126,19 @@
/obj/item/organ/internal/proc/render()
return
-/obj/item/reagent_containers/food/snacks/organ
+/obj/item/food/snacks/organ
name = "appendix"
icon_state = "appendix"
icon = 'icons/obj/surgery.dmi'
-/obj/item/reagent_containers/food/snacks/organ/Initialize(mapload)
+/obj/item/food/snacks/organ/Initialize(mapload)
. = ..()
reagents.add_reagent("nutriment", 5)
/obj/item/organ/internal/attack(mob/living/carbon/M, mob/user)
if(M == user && ishuman(user))
var/mob/living/carbon/human/H = user
- var/obj/item/reagent_containers/food/snacks/S = prepare_eat()
+ var/obj/item/food/snacks/S = prepare_eat()
if(S)
H.drop_item()
H.put_in_active_hand(S)
diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm
index a0e8fc686dc..f2055557441 100644
--- a/code/modules/surgery/organs_internal.dm
+++ b/code/modules/surgery/organs_internal.dm
@@ -377,11 +377,11 @@
name = "implant an organ"
allowed_tools = list(
/obj/item/organ/internal = 100,
- /obj/item/reagent_containers/food/snacks/organ = 0 // there for the flavor text
+ /obj/item/food/snacks/organ = 0 // there for the flavor text
)
/datum/surgery_step/internal/manipulate_organs/implant/begin_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- if(istype(tool, /obj/item/reagent_containers/food/snacks/organ))
+ if(istype(tool, /obj/item/food/snacks/organ))
to_chat(user, "[tool] was bitten by someone! It's too damaged to use!")
return SURGERY_BEGINSTEP_SKIP
@@ -469,8 +469,8 @@
/obj/item/reagent_containers/dropper = 100,
/obj/item/reagent_containers/syringe = 100,
/obj/item/reagent_containers/glass/bottle = 90,
- /obj/item/reagent_containers/food/drinks/drinkingglass = 85,
- /obj/item/reagent_containers/food/drinks/bottle = 80,
+ /obj/item/reagent_containers/drinks/drinkingglass = 85,
+ /obj/item/reagent_containers/drinks/bottle = 80,
/obj/item/reagent_containers/glass/beaker = 75,
/obj/item/reagent_containers/spray = 60,
/obj/item/reagent_containers/glass/bucket = 50
diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm
index e3fdcf4667e..ecf8f7d3424 100644
--- a/code/modules/surgery/other.dm
+++ b/code/modules/surgery/other.dm
@@ -220,8 +220,8 @@
allowed_tools = list(
/obj/item/reagent_containers/dropper = 100,
/obj/item/reagent_containers/glass/bottle = 90,
- /obj/item/reagent_containers/food/drinks/drinkingglass = 85,
- /obj/item/reagent_containers/food/drinks/bottle = 80,
+ /obj/item/reagent_containers/drinks/drinkingglass = 85,
+ /obj/item/reagent_containers/drinks/bottle = 80,
/obj/item/reagent_containers/glass/beaker = 75,
/obj/item/reagent_containers/spray = 60,
/obj/item/reagent_containers/glass/bucket = 50
diff --git a/tools/UpdatePaths/Scripts/23379_food_containers.txt b/tools/UpdatePaths/Scripts/23379_food_containers.txt
new file mode 100644
index 00000000000..f5cde328911
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/23379_food_containers.txt
@@ -0,0 +1,2 @@
+/obj/item/reagent_containers/food/drinks/@SUBTYPES : /obj/item/reagent_containers/drinks/@SUBTYPES{OLD}
+/obj/item/reagent_containers/food/@SUBTYPES : /obj/item/food/@SUBTYPES{OLD}