diff --git a/.github/workflows/stale_prs.yml b/.github/workflows/stale_prs.yml
index 9dfeb7224292f..989409fcab174 100644
--- a/.github/workflows/stale_prs.yml
+++ b/.github/workflows/stale_prs.yml
@@ -14,7 +14,9 @@ jobs:
stale-pr-message: "This PR has been marked as stale due to being in an unmergable state for 7 days. Please resolve any conflicts and add testing evidence, then contact a project maintainer to have the stale label removed."
stale-pr-label: 'Stale'
any-of-pr-labels: 'Needs Testing Evidence,Merge Conflict'
- days-before-stale: 7
- days-before-close: 5
+ days-before-stale: -1
+ days-before-close: -1
+ days-before-pr-stale: 7
+ days-before-pr-close: 5
remove-pr-stale-when-updated: true
labels-to-remove-when-unstale: 'Stale'
diff --git a/_maps/Prefab/Departments.dmm b/_maps/Prefab/Departments.dmm
index ea0449e2d9a27..bf4f39c690325 100644
--- a/_maps/Prefab/Departments.dmm
+++ b/_maps/Prefab/Departments.dmm
@@ -362,7 +362,7 @@
/area/security/detectives_office)
"ir" = (
/obj/effect/turf_decal/tile/purple/fourcorners/contrasted,
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
pixel_x = 11;
pixel_y = -5
},
diff --git a/_maps/RandomRooms/10x10/rdm_dorms.dmm b/_maps/RandomRooms/10x10/rdm_dorms.dmm
index 91df1aebb4e33..a6ad57c148469 100644
--- a/_maps/RandomRooms/10x10/rdm_dorms.dmm
+++ b/_maps/RandomRooms/10x10/rdm_dorms.dmm
@@ -312,7 +312,7 @@
/area/template_noop)
"Vu" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/glass/waterbottle/empty{
+/obj/item/reagent_containers/cup/waterbottle/empty{
pixel_x = -6;
pixel_y = 7
},
diff --git a/_maps/RandomRooms/10x10/rdm_organ_harvesting.dmm b/_maps/RandomRooms/10x10/rdm_organ_harvesting.dmm
index 732ec6abcaf21..4bcb264df0c5b 100644
--- a/_maps/RandomRooms/10x10/rdm_organ_harvesting.dmm
+++ b/_maps/RandomRooms/10x10/rdm_organ_harvesting.dmm
@@ -19,13 +19,13 @@
/turf/open/floor/carpet/royalblack,
/area/template_noop)
"bq" = (
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
pixel_x = 5
},
/turf/open/floor/eighties,
/area/template_noop)
"dZ" = (
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
list_reagents = list(/datum/reagent/medicine/morphine = 5);
pixel_x = 4
},
@@ -196,7 +196,7 @@
/area/template_noop)
"Aa" = (
/obj/structure/bed/maint,
-/obj/item/reagent_containers/food/drinks/bottle/hcider{
+/obj/item/reagent_containers/cup/glass/bottle/hcider{
pixel_x = 12;
pixel_y = -5
},
@@ -243,11 +243,11 @@
/turf/open/floor/iron,
/area/template_noop)
"Ik" = (
-/obj/item/reagent_containers/food/drinks/bottle/molotov{
+/obj/item/reagent_containers/cup/glass/bottle/molotov{
pixel_x = 10;
pixel_y = -6
},
-/obj/item/reagent_containers/food/drinks/bottle/trappist{
+/obj/item/reagent_containers/cup/glass/bottle/trappist{
pixel_y = 2
},
/turf/open/floor/eighties,
@@ -261,9 +261,9 @@
/area/template_noop)
"Mx" = (
/obj/structure/closet/secure_closet/personal,
-/obj/item/reagent_containers/food/drinks/bottle/moonshine,
-/obj/item/reagent_containers/food/drinks/bottle/hooch,
-/obj/item/reagent_containers/food/drinks/bottle/ale,
+/obj/item/reagent_containers/cup/glass/bottle/moonshine,
+/obj/item/reagent_containers/cup/glass/bottle/hooch,
+/obj/item/reagent_containers/cup/glass/bottle/ale,
/obj/item/paper/monitorkey,
/turf/open/floor/eighties,
/area/template_noop)
@@ -288,12 +288,12 @@
/obj/item/gun/syringe{
pixel_y = 7
},
-/obj/item/reagent_containers/glass/rag{
+/obj/item/reagent_containers/cup/rag{
pixel_x = -7;
pixel_y = 13
},
-/obj/item/reagent_containers/glass/bottle/morphine,
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine{
list_reagents = list(/datum/reagent/medicine/morphine = 20);
pixel_x = 7;
pixel_y = 2
diff --git a/_maps/RandomRooms/10x10/sk_rdm060_snakefighter.dmm b/_maps/RandomRooms/10x10/sk_rdm060_snakefighter.dmm
index 6a5bfa67322de..7af9523a269de 100644
--- a/_maps/RandomRooms/10x10/sk_rdm060_snakefighter.dmm
+++ b/_maps/RandomRooms/10x10/sk_rdm060_snakefighter.dmm
@@ -116,7 +116,7 @@
/turf/open/floor/wood,
/area/template_noop)
"x" = (
-/obj/item/reagent_containers/food/drinks/bottle/vodka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka,
/obj/structure/disposalpipe/segment{
dir = 6
},
diff --git a/_maps/RandomRooms/10x10/sk_rdm070_pubbybar.dmm b/_maps/RandomRooms/10x10/sk_rdm070_pubbybar.dmm
index 801eb76b8cb96..2c2f58e3e131f 100644
--- a/_maps/RandomRooms/10x10/sk_rdm070_pubbybar.dmm
+++ b/_maps/RandomRooms/10x10/sk_rdm070_pubbybar.dmm
@@ -56,15 +56,15 @@
/area/template_noop)
"m" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{
pixel_x = 6;
pixel_y = 10
},
-/obj/item/reagent_containers/food/drinks/bottle/tequila{
+/obj/item/reagent_containers/cup/glass/bottle/tequila{
pixel_x = -6;
pixel_y = 4
},
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/turf/open/floor/plating,
/area/template_noop)
"n" = (
@@ -133,11 +133,11 @@
/area/template_noop)
"y" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = 4;
pixel_y = 7
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
/turf/open/floor/plating,
/area/template_noop)
"z" = (
@@ -148,7 +148,7 @@
/area/template_noop)
"A" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/gin{
+/obj/item/reagent_containers/cup/glass/bottle/gin{
pixel_y = 8
},
/obj/machinery/light/small{
@@ -277,7 +277,7 @@
/turf/open/floor/plating,
/area/template_noop)
"V" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/mop,
/obj/structure/sink{
dir = 4;
diff --git a/_maps/RandomRooms/10x10/sk_rdm083_bigtheatre.dmm b/_maps/RandomRooms/10x10/sk_rdm083_bigtheatre.dmm
index 2060e30f0642b..55db5b2d1ef9d 100644
--- a/_maps/RandomRooms/10x10/sk_rdm083_bigtheatre.dmm
+++ b/_maps/RandomRooms/10x10/sk_rdm083_bigtheatre.dmm
@@ -44,7 +44,7 @@
/turf/open/floor/wood,
/area/template_noop)
"l" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb,
/turf/open/floor/carpet/red,
/area/template_noop)
"m" = (
@@ -59,7 +59,7 @@
"o" = (
/obj/structure/chair/fancy/comfy,
/obj/item/food/popcorn,
-/obj/item/reagent_containers/food/drinks/soda_cans/shamblers,
+/obj/item/reagent_containers/cup/soda_cans/shamblers,
/turf/open/floor/wood,
/area/template_noop)
"p" = (
@@ -67,7 +67,7 @@
/turf/open/floor/carpet/red,
/area/template_noop)
"q" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/cola,
+/obj/item/reagent_containers/cup/soda_cans/cola,
/turf/open/floor/carpet/red,
/area/template_noop)
"r" = (
@@ -81,7 +81,7 @@
/area/template_noop)
"t" = (
/obj/structure/chair/fancy/comfy,
-/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind,
+/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind,
/turf/open/floor/wood,
/area/template_noop)
"u" = (
diff --git a/_maps/RandomRooms/10x10/sk_rdm098_graffitiroom.dmm b/_maps/RandomRooms/10x10/sk_rdm098_graffitiroom.dmm
index a07548908a39a..d31a0a10debfb 100644
--- a/_maps/RandomRooms/10x10/sk_rdm098_graffitiroom.dmm
+++ b/_maps/RandomRooms/10x10/sk_rdm098_graffitiroom.dmm
@@ -39,7 +39,7 @@
/area/template_noop)
"g" = (
/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/iron/dark,
/area/template_noop)
"l" = (
diff --git a/_maps/RandomRooms/10x10/sk_rdm106_sanitarium.dmm b/_maps/RandomRooms/10x10/sk_rdm106_sanitarium.dmm
index 821b36e7b9186..b3c4d4672b548 100644
--- a/_maps/RandomRooms/10x10/sk_rdm106_sanitarium.dmm
+++ b/_maps/RandomRooms/10x10/sk_rdm106_sanitarium.dmm
@@ -246,8 +246,8 @@
},
/obj/structure/closet,
/obj/item/storage/pill_bottle/mannitol,
-/obj/item/reagent_containers/glass/bottle/morphine,
-/obj/item/reagent_containers/glass/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine,
/obj/item/gun/syringe,
/obj/item/storage/box/syringes,
/obj/item/restraints/handcuffs,
@@ -368,17 +368,17 @@
/area/template_noop)
"KV" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/sillycup{
+/obj/item/reagent_containers/cup/glass/sillycup{
pixel_x = -4;
pixel_y = 6
},
-/obj/item/reagent_containers/food/drinks/sillycup{
+/obj/item/reagent_containers/cup/glass/sillycup{
pixel_x = 9;
pixel_y = -2
},
-/obj/item/reagent_containers/food/drinks/sillycup,
-/obj/item/reagent_containers/food/drinks/sillycup,
-/obj/item/reagent_containers/food/drinks/sillycup,
+/obj/item/reagent_containers/cup/glass/sillycup,
+/obj/item/reagent_containers/cup/glass/sillycup,
+/obj/item/reagent_containers/cup/glass/sillycup,
/turf/open/floor/iron/white,
/area/template_noop)
"Ls" = (
diff --git a/_maps/RandomRooms/10x10/sk_rdm129_beach.dmm b/_maps/RandomRooms/10x10/sk_rdm129_beach.dmm
index 14a137e58b4c5..a2de7497ebca4 100644
--- a/_maps/RandomRooms/10x10/sk_rdm129_beach.dmm
+++ b/_maps/RandomRooms/10x10/sk_rdm129_beach.dmm
@@ -104,16 +104,16 @@
/obj/structure/closet/crate/freezer{
name = "Beer Cooler"
},
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/turf/open/floor/plating/beach/sand,
/area/template_noop)
"L" = (
diff --git a/_maps/RandomRooms/10x10/sk_rdm141_6sectorsdown.dmm b/_maps/RandomRooms/10x10/sk_rdm141_6sectorsdown.dmm
index e2c83fb23553a..aa002135e93c6 100644
--- a/_maps/RandomRooms/10x10/sk_rdm141_6sectorsdown.dmm
+++ b/_maps/RandomRooms/10x10/sk_rdm141_6sectorsdown.dmm
@@ -129,7 +129,7 @@
/area/template_noop)
"qP" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind{
+/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{
pixel_x = 4;
pixel_y = 7
},
@@ -176,7 +176,7 @@
/area/template_noop)
"AU" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb{
pixel_x = -4;
pixel_y = 5
},
@@ -260,7 +260,7 @@
"Qx" = (
/obj/structure/closet,
/obj/structure/window/reinforced/tinted/frosted,
-/obj/item/reagent_containers/food/drinks/bottle/tequila{
+/obj/item/reagent_containers/cup/glass/bottle/tequila{
pixel_x = -6;
pixel_y = 4
},
diff --git a/_maps/RandomRooms/10x10/sk_rdm142_olddiner.dmm b/_maps/RandomRooms/10x10/sk_rdm142_olddiner.dmm
index d150aa47c9313..de41faf9920dc 100644
--- a/_maps/RandomRooms/10x10/sk_rdm142_olddiner.dmm
+++ b/_maps/RandomRooms/10x10/sk_rdm142_olddiner.dmm
@@ -295,7 +295,7 @@
/area/template_noop)
"ZH" = (
/obj/structure/table/wood/fancy/black,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb{
pixel_x = -2;
pixel_y = 12
},
diff --git a/_maps/RandomRooms/10x10/sk_rdm143_gamercave.dmm b/_maps/RandomRooms/10x10/sk_rdm143_gamercave.dmm
index 784fc5f25a9cf..305304a90d4e4 100644
--- a/_maps/RandomRooms/10x10/sk_rdm143_gamercave.dmm
+++ b/_maps/RandomRooms/10x10/sk_rdm143_gamercave.dmm
@@ -24,19 +24,19 @@
/area/template_noop)
"i" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind{
+/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{
pixel_x = -7;
pixel_y = 8
},
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
pixel_x = 12;
pixel_y = 12
},
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
+/obj/item/reagent_containers/cup/soda_cans/starkist{
pixel_x = 10;
pixel_y = 2
},
-/obj/item/reagent_containers/food/drinks/soda_cans/space_up,
+/obj/item/reagent_containers/cup/soda_cans/space_up,
/obj/structure/sign/poster/contraband/random{
pixel_y = 32
},
@@ -99,11 +99,11 @@
/area/template_noop)
"w" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/shamblers{
+/obj/item/reagent_containers/cup/soda_cans/shamblers{
pixel_x = 9;
pixel_y = 7
},
-/obj/item/reagent_containers/food/drinks/soda_cans/space_up,
+/obj/item/reagent_containers/cup/soda_cans/space_up,
/obj/structure/sign/poster/contraband/random{
pixel_x = 32
},
@@ -117,7 +117,7 @@
/turf/open/floor/plating,
/area/template_noop)
"A" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{
+/obj/item/reagent_containers/cup/soda_cans/pwr_game{
pixel_x = -7;
pixel_y = 10
},
@@ -136,7 +136,7 @@
/turf/open/floor/iron,
/area/template_noop)
"D" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind{
+/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{
pixel_x = 4
},
/turf/open/floor/plating,
diff --git a/_maps/RandomRooms/10x10/sk_rdm144_smallmagician.dmm b/_maps/RandomRooms/10x10/sk_rdm144_smallmagician.dmm
index 4473fa80c1585..cc7e03f86ec9d 100644
--- a/_maps/RandomRooms/10x10/sk_rdm144_smallmagician.dmm
+++ b/_maps/RandomRooms/10x10/sk_rdm144_smallmagician.dmm
@@ -28,11 +28,11 @@
/area/template_noop)
"g" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -8;
pixel_y = 9
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = 5;
pixel_y = 4
},
@@ -184,7 +184,7 @@
/area/template_noop)
"J" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = 4;
pixel_y = 4
},
diff --git a/_maps/RandomRooms/10x10/sk_rdm147_advbotany.dmm b/_maps/RandomRooms/10x10/sk_rdm147_advbotany.dmm
index b7f72482782ad..49bd54fa4b4f5 100644
--- a/_maps/RandomRooms/10x10/sk_rdm147_advbotany.dmm
+++ b/_maps/RandomRooms/10x10/sk_rdm147_advbotany.dmm
@@ -21,8 +21,8 @@
/area/template_noop)
"g" = (
/obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/machinery/light/small{
dir = 4
},
diff --git a/_maps/RandomRooms/10x10/sk_rdm148_botany_apiary.dmm b/_maps/RandomRooms/10x10/sk_rdm148_botany_apiary.dmm
index 06e10c8e996aa..9b7be400425e8 100644
--- a/_maps/RandomRooms/10x10/sk_rdm148_botany_apiary.dmm
+++ b/_maps/RandomRooms/10x10/sk_rdm148_botany_apiary.dmm
@@ -52,8 +52,8 @@
/obj/item/cultivator{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/grass,
/area/template_noop)
"k" = (
diff --git a/_maps/RandomRooms/10x10/sk_rdm157_chess.dmm b/_maps/RandomRooms/10x10/sk_rdm157_chess.dmm
index 1c0b8fe3e54d4..858f8a63bc9e4 100644
--- a/_maps/RandomRooms/10x10/sk_rdm157_chess.dmm
+++ b/_maps/RandomRooms/10x10/sk_rdm157_chess.dmm
@@ -132,15 +132,15 @@
/area/template_noop)
"F" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/soda_cans/tonic{
+/obj/item/reagent_containers/cup/soda_cans/tonic{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/soda_cans/tonic{
+/obj/item/reagent_containers/cup/soda_cans/tonic{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/soda_cans/tonic{
+/obj/item/reagent_containers/cup/soda_cans/tonic{
pixel_y = -3
},
/turf/open/floor/carpet/orange,
diff --git a/_maps/RandomRooms/10x10/sk_rdm167_library_ritual.dmm b/_maps/RandomRooms/10x10/sk_rdm167_library_ritual.dmm
index cab51223247e1..57797c4adeb41 100644
--- a/_maps/RandomRooms/10x10/sk_rdm167_library_ritual.dmm
+++ b/_maps/RandomRooms/10x10/sk_rdm167_library_ritual.dmm
@@ -527,7 +527,7 @@
pixel_x = -5;
pixel_y = 7
},
-/obj/item/reagent_containers/food/drinks/britcup,
+/obj/item/reagent_containers/cup/glass/britcup,
/turf/open/floor/carpet/green,
/area/template_noop)
"Ra" = (
diff --git a/_maps/RandomRooms/10x5/rdm_pirate_derelict.dmm b/_maps/RandomRooms/10x5/rdm_pirate_derelict.dmm
index 271274cf8cde1..e9eedc726cc00 100644
--- a/_maps/RandomRooms/10x5/rdm_pirate_derelict.dmm
+++ b/_maps/RandomRooms/10x5/rdm_pirate_derelict.dmm
@@ -5,7 +5,7 @@
/area/template_noop)
"c" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/food/drinks/bottle/rum{
+/obj/item/reagent_containers/cup/glass/bottle/rum{
name = "Captain Pete's Private Reserve Cuban Spaced Rum";
pixel_x = -6;
pixel_y = 8
@@ -91,7 +91,7 @@
/turf/open/floor/wood,
/area/template_noop)
"q" = (
-/obj/item/reagent_containers/food/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/lootdrop/glowstick/lit,
/turf/open/floor/plating,
diff --git a/_maps/RandomRooms/10x5/sk_rdm011_barbershop.dmm b/_maps/RandomRooms/10x5/sk_rdm011_barbershop.dmm
index 0494353f618ee..61ea44a02775a 100644
--- a/_maps/RandomRooms/10x5/sk_rdm011_barbershop.dmm
+++ b/_maps/RandomRooms/10x5/sk_rdm011_barbershop.dmm
@@ -76,8 +76,8 @@
/obj/item/storage/firstaid,
/obj/item/storage/firstaid/toxin,
/obj/item/storage/box/syringes,
-/obj/item/reagent_containers/glass/bottle/morphine,
-/obj/item/reagent_containers/glass/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine,
/obj/item/stack/sheet/mineral/silver{
amount = 2
},
@@ -185,22 +185,22 @@
/obj/effect/spawner/lootdrop/teratoma/minor,
/obj/effect/spawner/lootdrop/teratoma/minor,
/obj/effect/spawner/lootdrop/teratoma/minor,
-/obj/item/reagent_containers/food/drinks/beer/light,
-/obj/item/reagent_containers/food/drinks/soda_cans/sodawater,
-/obj/item/reagent_containers/food/drinks/soda_cans/shamblers,
-/obj/item/reagent_containers/food/drinks/soda_cans/shamblers,
-/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull,
-/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull,
-/obj/item/reagent_containers/food/drinks/soda_cans/air,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
-/obj/item/reagent_containers/food/drinks/soda_cans/cola,
-/obj/item/reagent_containers/food/drinks/soda_cans/cola,
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game,
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game,
-/obj/item/reagent_containers/food/drinks/soda_cans/space_up,
-/obj/item/reagent_containers/food/drinks/soda_cans/space_up,
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/soda_cans/sodawater,
+/obj/item/reagent_containers/cup/soda_cans/shamblers,
+/obj/item/reagent_containers/cup/soda_cans/shamblers,
+/obj/item/reagent_containers/cup/soda_cans/grey_bull,
+/obj/item/reagent_containers/cup/soda_cans/grey_bull,
+/obj/item/reagent_containers/cup/soda_cans/air,
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb,
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb,
+/obj/item/reagent_containers/cup/soda_cans/cola,
+/obj/item/reagent_containers/cup/soda_cans/cola,
+/obj/item/reagent_containers/cup/soda_cans/pwr_game,
+/obj/item/reagent_containers/cup/soda_cans/pwr_game,
+/obj/item/reagent_containers/cup/soda_cans/space_up,
+/obj/item/reagent_containers/cup/soda_cans/space_up,
+/obj/item/reagent_containers/cup/soda_cans/starkist,
/obj/item/storage/pill_bottle/happy,
/turf/open/floor/carpet{
icon_state = "carpetsymbol"
diff --git a/_maps/RandomRooms/10x5/sk_rdm031_deltarobotics.dmm b/_maps/RandomRooms/10x5/sk_rdm031_deltarobotics.dmm
index f73227dfd0a8f..7b69a241b0a61 100644
--- a/_maps/RandomRooms/10x5/sk_rdm031_deltarobotics.dmm
+++ b/_maps/RandomRooms/10x5/sk_rdm031_deltarobotics.dmm
@@ -39,7 +39,7 @@
/obj/structure/rack,
/obj/item/book/manual/wiki/robotics_cyborgs,
/obj/item/storage/belt/utility,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
diff --git a/_maps/RandomRooms/10x5/sk_rdm040_deltabotnis.dmm b/_maps/RandomRooms/10x5/sk_rdm040_deltabotnis.dmm
index e4c7ce33eac91..2f1c4580cc273 100644
--- a/_maps/RandomRooms/10x5/sk_rdm040_deltabotnis.dmm
+++ b/_maps/RandomRooms/10x5/sk_rdm040_deltabotnis.dmm
@@ -113,10 +113,10 @@
"p" = (
/obj/structure/table,
/obj/item/shovel/spade,
-/obj/item/reagent_containers/glass/bottle/nutrient/rh{
+/obj/item/reagent_containers/cup/bottle/nutrient/rh{
pixel_x = 5
},
-/obj/item/reagent_containers/glass/bottle/nutrient/ez{
+/obj/item/reagent_containers/cup/bottle/nutrient/ez{
pixel_x = -5
},
/obj/item/reagent_containers/syringe,
@@ -130,7 +130,7 @@
/obj/machinery/status_display/evac{
pixel_y = -32
},
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
/area/template_noop)
@@ -142,7 +142,7 @@
/obj/structure/table,
/obj/item/crowbar,
/obj/item/wrench,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/template_noop)
diff --git a/_maps/RandomRooms/10x5/sk_rdm045_deltacafeteria.dmm b/_maps/RandomRooms/10x5/sk_rdm045_deltacafeteria.dmm
index 04c8cd5a89474..091b60ee966ea 100644
--- a/_maps/RandomRooms/10x5/sk_rdm045_deltacafeteria.dmm
+++ b/_maps/RandomRooms/10x5/sk_rdm045_deltacafeteria.dmm
@@ -27,11 +27,11 @@
/area/template_noop)
"s" = (
/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/effect/turf_decal/delivery,
diff --git a/_maps/RandomRooms/10x5/sk_rdm082_maintmedical.dmm b/_maps/RandomRooms/10x5/sk_rdm082_maintmedical.dmm
index fb74ee00abeb6..b2678159eccdd 100644
--- a/_maps/RandomRooms/10x5/sk_rdm082_maintmedical.dmm
+++ b/_maps/RandomRooms/10x5/sk_rdm082_maintmedical.dmm
@@ -40,18 +40,18 @@
/area/template_noop)
"n" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/mercury{
+/obj/item/reagent_containers/cup/bottle/mercury{
pixel_x = 6;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/nitrogen{
+/obj/item/reagent_containers/cup/bottle/nitrogen{
pixel_x = -6;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/oxygen{
+/obj/item/reagent_containers/cup/bottle/oxygen{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/phosphorus{
+/obj/item/reagent_containers/cup/bottle/phosphorus{
pixel_x = -6
},
/obj/effect/decal/cleanable/dirt,
@@ -91,10 +91,10 @@
/area/template_noop)
"w" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/silver{
+/obj/item/reagent_containers/cup/bottle/silver{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/sodium{
+/obj/item/reagent_containers/cup/bottle/sodium{
pixel_x = -6
},
/obj/effect/decal/cleanable/dirt,
@@ -112,14 +112,14 @@
/area/template_noop)
"C" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/aluminium{
+/obj/item/reagent_containers/cup/bottle/aluminium{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/bromine{
+/obj/item/reagent_containers/cup/bottle/bromine{
pixel_x = -6
},
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
dir = 1
},
@@ -127,13 +127,13 @@
/area/template_noop)
"F" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/potassium{
+/obj/item/reagent_containers/cup/bottle/potassium{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/radium{
+/obj/item/reagent_containers/cup/bottle/radium{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/welding_fuel{
+/obj/item/reagent_containers/cup/bottle/welding_fuel{
pixel_y = 8
},
/obj/effect/decal/cleanable/dirt,
@@ -141,10 +141,10 @@
/turf/open/floor/iron,
/area/template_noop)
"I" = (
-/obj/item/reagent_containers/glass/bottle/carbon{
+/obj/item/reagent_containers/cup/bottle/carbon{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/chlorine{
+/obj/item/reagent_containers/cup/bottle/chlorine{
pixel_x = -6
},
/obj/effect/decal/cleanable/dirt,
@@ -157,10 +157,10 @@
/area/template_noop)
"N" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/copper{
+/obj/item/reagent_containers/cup/bottle/copper{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/ethanol{
+/obj/item/reagent_containers/cup/bottle/ethanol{
pixel_x = -6
},
/obj/effect/decal/cleanable/dirt,
@@ -171,10 +171,10 @@
/area/template_noop)
"Q" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/sacid{
+/obj/item/reagent_containers/cup/bottle/sacid{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/silicon{
+/obj/item/reagent_containers/cup/bottle/silicon{
pixel_x = -6
},
/obj/effect/decal/cleanable/dirt,
@@ -183,13 +183,13 @@
/area/template_noop)
"R" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/iodine{
+/obj/item/reagent_containers/cup/bottle/iodine{
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/iron{
+/obj/item/reagent_containers/cup/bottle/iron{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/lithium{
+/obj/item/reagent_containers/cup/bottle/lithium{
pixel_x = -6
},
/obj/effect/decal/cleanable/dirt,
@@ -201,13 +201,13 @@
/area/template_noop)
"X" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/fluorine{
+/obj/item/reagent_containers/cup/bottle/fluorine{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/hydrogen{
+/obj/item/reagent_containers/cup/bottle/hydrogen{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/water{
+/obj/item/reagent_containers/cup/bottle/water{
pixel_y = 8
},
/obj/effect/decal/cleanable/dirt,
@@ -219,10 +219,10 @@
/area/template_noop)
"Z" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/sugar{
+/obj/item/reagent_containers/cup/bottle/sugar{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/sulfur{
+/obj/item/reagent_containers/cup/bottle/sulfur{
pixel_x = -6
},
/obj/effect/decal/cleanable/dirt,
diff --git a/_maps/RandomRooms/10x5/sk_rdm091_skidrow.dmm b/_maps/RandomRooms/10x5/sk_rdm091_skidrow.dmm
index acca4e479dbbf..84d9ccd80a5a4 100644
--- a/_maps/RandomRooms/10x5/sk_rdm091_skidrow.dmm
+++ b/_maps/RandomRooms/10x5/sk_rdm091_skidrow.dmm
@@ -8,7 +8,7 @@
/obj/effect/decal/cleanable/shreds,
/obj/item/toy/cards/singlecard,
/obj/effect/spawner/lootdrop/maintenance/seven,
-/obj/item/reagent_containers/glass/waterbottle/relic,
+/obj/item/reagent_containers/cup/waterbottle/relic,
/obj/item/cigbutt,
/turf/open/floor/plating,
/area/template_noop)
@@ -168,7 +168,7 @@
/obj/structure/closet/cardboard,
/obj/item/storage/toolbox/emergency,
/obj/effect/spawner/lootdrop/maintenance/eight,
-/obj/item/reagent_containers/food/drinks/bottle/hooch,
+/obj/item/reagent_containers/cup/glass/bottle/hooch,
/turf/open/floor/plating,
/area/template_noop)
"L" = (
diff --git a/_maps/RandomRooms/10x5/sk_rdm100_meetingroom.dmm b/_maps/RandomRooms/10x5/sk_rdm100_meetingroom.dmm
index 0739616fbf7c3..b52939d9cec8c 100644
--- a/_maps/RandomRooms/10x5/sk_rdm100_meetingroom.dmm
+++ b/_maps/RandomRooms/10x5/sk_rdm100_meetingroom.dmm
@@ -75,7 +75,7 @@
/area/template_noop)
"v" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/mug,
+/obj/item/reagent_containers/cup/glass/mug,
/turf/open/floor/iron/dark,
/area/template_noop)
"A" = (
diff --git a/_maps/RandomRooms/10x5/sk_rdm151_ratburger.dmm b/_maps/RandomRooms/10x5/sk_rdm151_ratburger.dmm
index eb4c4306446f1..64248597f28fa 100644
--- a/_maps/RandomRooms/10x5/sk_rdm151_ratburger.dmm
+++ b/_maps/RandomRooms/10x5/sk_rdm151_ratburger.dmm
@@ -96,18 +96,18 @@
/obj/structure/window/reinforced/spawner/north,
/obj/structure/window/reinforced/spawner/east,
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -7;
pixel_y = 5
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 6;
pixel_y = 4
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_y = 6
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -1
},
/turf/open/floor/iron/cafeteria,
diff --git a/_maps/RandomRooms/10x5/sk_rdm153_hobowithpeter.dmm b/_maps/RandomRooms/10x5/sk_rdm153_hobowithpeter.dmm
index 6617e2dd2710c..9eba5ed746d0e 100644
--- a/_maps/RandomRooms/10x5/sk_rdm153_hobowithpeter.dmm
+++ b/_maps/RandomRooms/10x5/sk_rdm153_hobowithpeter.dmm
@@ -61,11 +61,11 @@
/area/template_noop)
"v" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = 4;
pixel_y = 4
},
-/obj/item/reagent_containers/food/drinks/soda_cans/space_up,
+/obj/item/reagent_containers/cup/soda_cans/space_up,
/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/plating,
/area/template_noop)
diff --git a/_maps/RandomRooms/3x3/rdm_workout.dmm b/_maps/RandomRooms/3x3/rdm_workout.dmm
index 0c011d4e8bf19..963ff0f701ee9 100644
--- a/_maps/RandomRooms/3x3/rdm_workout.dmm
+++ b/_maps/RandomRooms/3x3/rdm_workout.dmm
@@ -11,7 +11,7 @@
/obj/effect/turf_decal/stripes{
dir = 9
},
-/obj/item/reagent_containers/food/drinks/beer/almost_empty{
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{
pixel_x = 13;
pixel_y = -7
},
diff --git a/_maps/RandomRooms/3x3/sk_rdm020_boxclutter6.dmm b/_maps/RandomRooms/3x3/sk_rdm020_boxclutter6.dmm
index c587509c96aa8..6daed4f93509c 100644
--- a/_maps/RandomRooms/3x3/sk_rdm020_boxclutter6.dmm
+++ b/_maps/RandomRooms/3x3/sk_rdm020_boxclutter6.dmm
@@ -6,7 +6,7 @@
/area/template_noop)
"c" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/turf/open/floor/plating,
/area/template_noop)
"d" = (
diff --git a/_maps/RandomRooms/3x3/sk_rdm037_deltajanniecloset.dmm b/_maps/RandomRooms/3x3/sk_rdm037_deltajanniecloset.dmm
index 58d6b0c48cb28..ddcd0ac416599 100644
--- a/_maps/RandomRooms/3x3/sk_rdm037_deltajanniecloset.dmm
+++ b/_maps/RandomRooms/3x3/sk_rdm037_deltajanniecloset.dmm
@@ -15,7 +15,7 @@
name = "old sink";
pixel_y = 28
},
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/plating,
/area/template_noop)
"g" = (
diff --git a/_maps/RandomRooms/3x3/sk_rdm050_medicloset.dmm b/_maps/RandomRooms/3x3/sk_rdm050_medicloset.dmm
index 431420bcdb38b..1e9774eb79025 100644
--- a/_maps/RandomRooms/3x3/sk_rdm050_medicloset.dmm
+++ b/_maps/RandomRooms/3x3/sk_rdm050_medicloset.dmm
@@ -18,7 +18,7 @@
/obj/item/hemostat,
/obj/item/healthanalyzer,
/obj/item/clothing/glasses/eyepatch,
-/obj/item/reagent_containers/food/drinks/bottle/vodka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
pixel_x = 3;
pixel_y = 2
},
@@ -38,7 +38,7 @@
/area/template_noop)
"f" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 8;
pixel_y = 2
},
diff --git a/_maps/RandomRooms/3x3/sk_rdm077_kilolustymaid.dmm b/_maps/RandomRooms/3x3/sk_rdm077_kilolustymaid.dmm
index bc826c4b8fd55..f8d8fb1b02b66 100644
--- a/_maps/RandomRooms/3x3/sk_rdm077_kilolustymaid.dmm
+++ b/_maps/RandomRooms/3x3/sk_rdm077_kilolustymaid.dmm
@@ -20,7 +20,7 @@
pixel_x = -12;
pixel_y = 2
},
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/mop,
/turf/open/floor/plating{
broken = 1
@@ -29,7 +29,7 @@
"s" = (
/obj/structure/reagent_dispensers/watertank,
/obj/effect/turf_decal/delivery,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/structure/mirror{
diff --git a/_maps/RandomRooms/3x3/sk_rdm081_biohazard.dmm b/_maps/RandomRooms/3x3/sk_rdm081_biohazard.dmm
index 04f787182db82..79e89e56bf672 100644
--- a/_maps/RandomRooms/3x3/sk_rdm081_biohazard.dmm
+++ b/_maps/RandomRooms/3x3/sk_rdm081_biohazard.dmm
@@ -1,11 +1,11 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = 7;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = -2;
pixel_y = 6
},
@@ -40,23 +40,23 @@
"g" = (
/obj/structure/table/glass,
/obj/item/reagent_containers/syringe/antiviral,
-/obj/item/reagent_containers/glass/bottle/random_virus{
+/obj/item/reagent_containers/cup/bottle/random_virus{
pixel_x = -9;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter{
+/obj/item/reagent_containers/cup/soda_cans/canned_laughter{
pixel_x = -2;
pixel_y = 9
},
-/obj/item/reagent_containers/glass/bottle/mutagen,
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
+/obj/item/reagent_containers/cup/bottle/mutagen,
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
pixel_x = 6;
pixel_y = 4
},
/turf/open/floor/plating,
/area/template_noop)
"h" = (
-/obj/item/reagent_containers/glass/bottle/synaptizine,
+/obj/item/reagent_containers/cup/bottle/synaptizine,
/obj/structure/table/glass,
/obj/effect/spawner/lootdrop/teratoma/major,
/obj/effect/spawner/lootdrop/maintenance/three,
diff --git a/_maps/RandomRooms/3x3/sk_rdm092_hobohut.dmm b/_maps/RandomRooms/3x3/sk_rdm092_hobohut.dmm
index b170e37558df0..23b91e43ea937 100644
--- a/_maps/RandomRooms/3x3/sk_rdm092_hobohut.dmm
+++ b/_maps/RandomRooms/3x3/sk_rdm092_hobohut.dmm
@@ -2,7 +2,7 @@
"a" = (
/obj/structure/closet/cardboard,
/obj/item/storage/toolbox/emergency,
-/obj/item/reagent_containers/food/drinks/bottle/hooch,
+/obj/item/reagent_containers/cup/glass/bottle/hooch,
/turf/open/floor/plating,
/area/template_noop)
"b" = (
diff --git a/_maps/RandomRooms/3x5/sk_rdm013_boxkitchen.dmm b/_maps/RandomRooms/3x5/sk_rdm013_boxkitchen.dmm
index a2dfa26e39cb7..d18e242b1d83a 100644
--- a/_maps/RandomRooms/3x5/sk_rdm013_boxkitchen.dmm
+++ b/_maps/RandomRooms/3x5/sk_rdm013_boxkitchen.dmm
@@ -2,8 +2,8 @@
"a" = (
/obj/structure/table,
/obj/item/kitchen/rollingpin,
-/obj/item/reagent_containers/food/condiment/enzyme,
-/obj/item/reagent_containers/food/condiment/sugar,
+/obj/item/reagent_containers/condiment/enzyme,
+/obj/item/reagent_containers/condiment/sugar,
/turf/open/floor/plating,
/area/template_noop)
"b" = (
@@ -43,10 +43,10 @@
/area/template_noop)
"i" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_y = 2
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 2
},
/obj/item/food/mint{
diff --git a/_maps/RandomRooms/3x5/sk_rdm137_tinyshrink.dmm b/_maps/RandomRooms/3x5/sk_rdm137_tinyshrink.dmm
index 9380a05a52138..1891d23f815d3 100644
--- a/_maps/RandomRooms/3x5/sk_rdm137_tinyshrink.dmm
+++ b/_maps/RandomRooms/3x5/sk_rdm137_tinyshrink.dmm
@@ -57,8 +57,8 @@
},
/obj/structure/closet,
/obj/item/storage/pill_bottle/mannitol,
-/obj/item/reagent_containers/glass/bottle/morphine,
-/obj/item/reagent_containers/glass/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine,
/obj/item/gun/syringe,
/obj/item/storage/box/syringes,
/obj/item/restraints/handcuffs,
diff --git a/_maps/RandomRooms/3x5/sk_rdm160_kilomaintbar.dmm b/_maps/RandomRooms/3x5/sk_rdm160_kilomaintbar.dmm
index 268234dd5115c..03b47be28c30c 100644
--- a/_maps/RandomRooms/3x5/sk_rdm160_kilomaintbar.dmm
+++ b/_maps/RandomRooms/3x5/sk_rdm160_kilomaintbar.dmm
@@ -8,11 +8,11 @@
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/structure/table/wood,
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/food/drinks/bottle/vodka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
pixel_x = 4;
pixel_y = 6
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -5;
pixel_y = 6
},
diff --git a/_maps/RandomRooms/5x3/sk_rdm054_metaclutter3.dmm b/_maps/RandomRooms/5x3/sk_rdm054_metaclutter3.dmm
index 51be66a5609d5..9493dae1ba257 100644
--- a/_maps/RandomRooms/5x3/sk_rdm054_metaclutter3.dmm
+++ b/_maps/RandomRooms/5x3/sk_rdm054_metaclutter3.dmm
@@ -43,7 +43,7 @@
"e" = (
/obj/structure/closet,
/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
desc = "Takes you to a whole new level of thinking.";
name = "Meta-Cider"
},
diff --git a/_maps/RandomRooms/5x3/sk_rdm066_pubbybedroom.dmm b/_maps/RandomRooms/5x3/sk_rdm066_pubbybedroom.dmm
index 715857670f706..c1b5ad3c79732 100644
--- a/_maps/RandomRooms/5x3/sk_rdm066_pubbybedroom.dmm
+++ b/_maps/RandomRooms/5x3/sk_rdm066_pubbybedroom.dmm
@@ -16,7 +16,7 @@
/obj/structure/sink/kitchen{
pixel_y = 28
},
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
/turf/open/floor/plating,
/area/template_noop)
"e" = (
diff --git a/_maps/RandomRooms/5x3/sk_rdm071_pubbykitchen.dmm b/_maps/RandomRooms/5x3/sk_rdm071_pubbykitchen.dmm
index e9618c8efda05..00a9d3cbbf5ec 100644
--- a/_maps/RandomRooms/5x3/sk_rdm071_pubbykitchen.dmm
+++ b/_maps/RandomRooms/5x3/sk_rdm071_pubbykitchen.dmm
@@ -19,9 +19,9 @@
/area/template_noop)
"e" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/food/condiment/rice,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/condiment/rice,
/obj/machinery/light/small{
dir = 1
},
@@ -55,7 +55,7 @@
/obj/item/seeds/dionapod,
/obj/item/seeds/carrot,
/obj/item/seeds/tomato,
-/obj/item/reagent_containers/glass/bottle/nutrient/ez,
+/obj/item/reagent_containers/cup/bottle/nutrient/ez,
/turf/open/floor/plating,
/area/template_noop)
"j" = (
diff --git a/_maps/RandomRooms/5x3/sk_rdm080_cloner.dmm b/_maps/RandomRooms/5x3/sk_rdm080_cloner.dmm
index 625353e6c6ed1..8ed123ce80a1a 100644
--- a/_maps/RandomRooms/5x3/sk_rdm080_cloner.dmm
+++ b/_maps/RandomRooms/5x3/sk_rdm080_cloner.dmm
@@ -6,8 +6,8 @@
/turf/open/floor/iron/white,
/area/template_noop)
"i" = (
-/obj/item/reagent_containers/food/drinks/bottle/synthflesh,
-/obj/item/reagent_containers/food/drinks/bottle/synthflesh,
+/obj/item/reagent_containers/cup/glass/bottle/synthflesh,
+/obj/item/reagent_containers/cup/glass/bottle/synthflesh,
/obj/structure/closet,
/turf/open/floor/iron/white,
/area/template_noop)
diff --git a/_maps/RandomRooms/5x3/sk_rdm101_minibreakroom.dmm b/_maps/RandomRooms/5x3/sk_rdm101_minibreakroom.dmm
index 70162a872ce86..2b84b5f21a127 100644
--- a/_maps/RandomRooms/5x3/sk_rdm101_minibreakroom.dmm
+++ b/_maps/RandomRooms/5x3/sk_rdm101_minibreakroom.dmm
@@ -39,7 +39,7 @@
"i" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/mug,
+/obj/item/reagent_containers/cup/glass/mug,
/turf/open/floor/iron,
/area/template_noop)
"j" = (
diff --git a/_maps/RandomRooms/5x4/sk_rdm026_boxsurgery.dmm b/_maps/RandomRooms/5x4/sk_rdm026_boxsurgery.dmm
index d0ec60f199533..d155aa87f1f81 100644
--- a/_maps/RandomRooms/5x4/sk_rdm026_boxsurgery.dmm
+++ b/_maps/RandomRooms/5x4/sk_rdm026_boxsurgery.dmm
@@ -61,7 +61,7 @@
/obj/structure/closet/wardrobe/white,
/obj/item/clothing/shoes/jackboots,
/obj/item/reagent_containers/blood/random,
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka,
/turf/open/floor/plating,
/area/template_noop)
"m" = (
diff --git a/_maps/RandomRooms/5x4/sk_rdm029_deltabar.dmm b/_maps/RandomRooms/5x4/sk_rdm029_deltabar.dmm
index 684e99df77599..45708d0993c7c 100644
--- a/_maps/RandomRooms/5x4/sk_rdm029_deltabar.dmm
+++ b/_maps/RandomRooms/5x4/sk_rdm029_deltabar.dmm
@@ -14,11 +14,11 @@
/area/template_noop)
"b" = (
/obj/structure/table/wood/poker,
-/obj/item/reagent_containers/food/drinks/bottle/rum{
+/obj/item/reagent_containers/cup/glass/bottle/rum{
pixel_x = 6;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
pixel_y = 7
},
/obj/effect/decal/cleanable/dirt,
@@ -39,8 +39,8 @@
/area/template_noop)
"e" = (
/obj/structure/table/wood/poker,
-/obj/item/reagent_containers/food/drinks/shaker,
-/obj/item/reagent_containers/glass/beaker/cryoxadone,
+/obj/item/reagent_containers/cup/glass/shaker,
+/obj/item/reagent_containers/cup/beaker/cryoxadone,
/obj/item/reagent_containers/dropper,
/turf/open/floor/plating,
/area/template_noop)
diff --git a/_maps/RandomRooms/5x4/sk_rdm049_metakitchen.dmm b/_maps/RandomRooms/5x4/sk_rdm049_metakitchen.dmm
index 6e53fd6d8973c..911e2cbf7cafd 100644
--- a/_maps/RandomRooms/5x4/sk_rdm049_metakitchen.dmm
+++ b/_maps/RandomRooms/5x4/sk_rdm049_metakitchen.dmm
@@ -1,16 +1,16 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/enzyme,
-/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/condiment/enzyme,
+/obj/item/reagent_containers/condiment/flour,
/turf/open/floor/plating,
/area/template_noop)
"c" = (
/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/open/floor/plating,
@@ -31,7 +31,7 @@
"f" = (
/obj/structure/table,
/obj/item/kitchen/rollingpin,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
/turf/open/floor/plating{
broken = 1
},
diff --git a/_maps/RandomRooms/5x4/sk_rdm055_metamedical.dmm b/_maps/RandomRooms/5x4/sk_rdm055_metamedical.dmm
index d4c361d178aca..fe6b004116ebd 100644
--- a/_maps/RandomRooms/5x4/sk_rdm055_metamedical.dmm
+++ b/_maps/RandomRooms/5x4/sk_rdm055_metamedical.dmm
@@ -4,7 +4,7 @@
/obj/structure/sign/departments/medbay{
pixel_y = 32
},
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/turf/open/floor/plating,
/area/template_noop)
"b" = (
@@ -24,15 +24,15 @@
/area/template_noop)
"d" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = 4;
pixel_y = 5
},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = 6;
pixel_y = -1
},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = -4;
pixel_y = 6
},
@@ -43,7 +43,7 @@
/turf/open/floor/plating,
/area/template_noop)
"e" = (
-/obj/item/reagent_containers/glass/bottle/toxin{
+/obj/item/reagent_containers/cup/bottle/toxin{
pixel_x = 4;
pixel_y = 2
},
diff --git a/_maps/RandomRooms/5x4/sk_rdm067_pubbysurgery.dmm b/_maps/RandomRooms/5x4/sk_rdm067_pubbysurgery.dmm
index 0bdefdca57f09..bf336d9ac4188 100644
--- a/_maps/RandomRooms/5x4/sk_rdm067_pubbysurgery.dmm
+++ b/_maps/RandomRooms/5x4/sk_rdm067_pubbysurgery.dmm
@@ -60,7 +60,7 @@
/turf/open/floor/plating,
/area/template_noop)
"i" = (
-/obj/item/reagent_containers/food/drinks/bottle/vodka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka,
/turf/open/floor/plating{
broken = 1
},
diff --git a/_maps/RandomRooms/5x4/sk_rdm090_tinybarbershop.dmm b/_maps/RandomRooms/5x4/sk_rdm090_tinybarbershop.dmm
index b90724a57434f..155b44094f006 100644
--- a/_maps/RandomRooms/5x4/sk_rdm090_tinybarbershop.dmm
+++ b/_maps/RandomRooms/5x4/sk_rdm090_tinybarbershop.dmm
@@ -91,8 +91,8 @@
/obj/item/surgical_drapes,
/obj/item/storage/firstaid,
/obj/item/storage/box/syringes,
-/obj/item/reagent_containers/glass/bottle/morphine,
-/obj/item/reagent_containers/glass/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine,
/obj/item/stack/sheet/mineral/silver{
amount = 2
},
diff --git a/_maps/RandomRooms/5x4/sk_rdm124_oldcryoroom.dmm b/_maps/RandomRooms/5x4/sk_rdm124_oldcryoroom.dmm
index cc28a3652ee57..f1153b82c6430 100644
--- a/_maps/RandomRooms/5x4/sk_rdm124_oldcryoroom.dmm
+++ b/_maps/RandomRooms/5x4/sk_rdm124_oldcryoroom.dmm
@@ -1,7 +1,7 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/cryoxadone,
+/obj/item/reagent_containers/cup/beaker/cryoxadone,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/freezer,
/area/template_noop)
diff --git a/_maps/RandomRooms/fland/sk_rdm_fln_05_apiary.dmm b/_maps/RandomRooms/fland/sk_rdm_fln_05_apiary.dmm
index 339f4c479fa9f..13c28c0a646ee 100644
--- a/_maps/RandomRooms/fland/sk_rdm_fln_05_apiary.dmm
+++ b/_maps/RandomRooms/fland/sk_rdm_fln_05_apiary.dmm
@@ -35,7 +35,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron/dark,
/area/template_noop)
diff --git a/_maps/RandomRooms/fland/sk_rdm_fln_06_publicgarden.dmm b/_maps/RandomRooms/fland/sk_rdm_fln_06_publicgarden.dmm
index 3241234da08b7..3d4fcf9d4b06e 100644
--- a/_maps/RandomRooms/fland/sk_rdm_fln_06_publicgarden.dmm
+++ b/_maps/RandomRooms/fland/sk_rdm_fln_06_publicgarden.dmm
@@ -49,8 +49,8 @@
/area/template_noop)
"p" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/reagent_containers/cup/bucket{
pixel_x = -8
},
/obj/item/hatchet,
@@ -63,12 +63,12 @@
/obj/structure/table,
/obj/item/plant_analyzer,
/obj/item/plant_analyzer,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/reagent_containers/glass/bottle/nutrient/rh{
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/reagent_containers/cup/bottle/nutrient/rh{
pixel_x = 2;
pixel_y = 1
},
-/obj/item/reagent_containers/glass/bottle/nutrient/ez,
+/obj/item/reagent_containers/cup/bottle/nutrient/ez,
/obj/item/reagent_containers/spray/pestspray{
pixel_x = 3;
pixel_y = 4
diff --git a/_maps/RandomRooms/fland/sk_rdm_fln_08_zenroom.dmm b/_maps/RandomRooms/fland/sk_rdm_fln_08_zenroom.dmm
index fe7ad17d7f458..21f5e4fa175c9 100644
--- a/_maps/RandomRooms/fland/sk_rdm_fln_08_zenroom.dmm
+++ b/_maps/RandomRooms/fland/sk_rdm_fln_08_zenroom.dmm
@@ -31,7 +31,7 @@
/area/template_noop)
"k" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/sake{
+/obj/item/reagent_containers/cup/glass/bottle/sake{
pixel_x = 5;
pixel_y = 12
},
@@ -95,12 +95,12 @@
/area/template_noop)
"G" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -6;
pixel_y = 4
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -3;
pixel_y = 15
},
diff --git a/_maps/RandomRooms/fland/sk_rdm_fln_09_barbershop.dmm b/_maps/RandomRooms/fland/sk_rdm_fln_09_barbershop.dmm
index 9710dd92ae103..d7e47b8911db1 100644
--- a/_maps/RandomRooms/fland/sk_rdm_fln_09_barbershop.dmm
+++ b/_maps/RandomRooms/fland/sk_rdm_fln_09_barbershop.dmm
@@ -34,8 +34,8 @@
/obj/item/storage/firstaid,
/obj/item/storage/firstaid/toxin,
/obj/item/storage/box/syringes,
-/obj/item/reagent_containers/glass/bottle/morphine,
-/obj/item/reagent_containers/glass/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine,
/obj/item/stack/sheet/mineral/silver{
amount = 2
},
diff --git a/_maps/RandomRooms/fland/sk_rdm_fln_11_hobobox.dmm b/_maps/RandomRooms/fland/sk_rdm_fln_11_hobobox.dmm
index e6a09e7813810..3e57f73405176 100644
--- a/_maps/RandomRooms/fland/sk_rdm_fln_11_hobobox.dmm
+++ b/_maps/RandomRooms/fland/sk_rdm_fln_11_hobobox.dmm
@@ -177,7 +177,7 @@
"R" = (
/obj/structure/closet/cardboard,
/obj/item/storage/toolbox/emergency,
-/obj/item/reagent_containers/food/drinks/bottle/hooch,
+/obj/item/reagent_containers/cup/glass/bottle/hooch,
/turf/open/floor/plating,
/area/template_noop)
"S" = (
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
index e282e294b0e7e..e240edd2c4f9c 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
@@ -206,7 +206,7 @@
/area/ruin/powered/beach)
"aR" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/tequila,
+/obj/item/reagent_containers/cup/glass/bottle/tequila,
/turf/open/floor/wood,
/area/ruin/powered/beach)
"aS" = (
@@ -236,7 +236,7 @@
/area/ruin/powered/beach)
"aX" = (
/obj/structure/closet/secure_closet/freezer/meat/open,
-/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/item/reagent_containers/condiment/enzyme,
/turf/open/floor/wood,
/area/ruin/powered/beach)
"aY" = (
@@ -363,7 +363,7 @@
/turf/open/floor/plating/beach/sand,
/area/ruin/powered/beach)
"bP" = (
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/turf/open/floor/plating/beach/sand,
/area/ruin/powered/beach)
"bQ" = (
@@ -592,8 +592,8 @@
"NQ" = (
/obj/structure/table/wood,
/obj/item/book/manual/wiki/barman_recipes,
-/obj/item/reagent_containers/food/drinks/shaker,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/glass/shaker,
+/obj/item/reagent_containers/cup/rag,
/turf/open/floor/wood,
/area/ruin/powered/beach)
"QS" = (
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm
index 72a6698515e07..a9e48230deabc 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm
@@ -274,7 +274,7 @@
},
/area/ruin/powered/clownplanet)
"bL" = (
-/obj/item/reagent_containers/food/drinks/trophy/gold_cup,
+/obj/item/reagent_containers/cup/glass/trophy/gold_cup,
/obj/structure/table/glass,
/turf/open/floor/carpet,
/area/ruin/powered/clownplanet)
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm
index baba995eb3e92..344afa36d5b7e 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm
@@ -667,7 +667,7 @@
/turf/open/floor/iron/white,
/area/ruin/powered/animal_hospital)
"vL" = (
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
/obj/item/reagent_containers/spray/cleaner,
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 1
@@ -745,7 +745,7 @@
/obj/item/trash/cheesie,
/obj/item/reagent_containers/syringe/antiviral,
/obj/item/bodybag,
-/obj/item/reagent_containers/food/drinks/bottle/vodka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka,
/turf/open/floor/grass{
initial_gas_mix = "o2=14;n2=5;co2=13;TEMP=300"
},
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm
index adde229bb82d0..fd8cb555089ab 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm
@@ -290,7 +290,7 @@
dir = 8
},
/obj/machinery/iv_drip,
-/obj/item/reagent_containers/glass/waterbottle/large,
+/obj/item/reagent_containers/cup/waterbottle/large,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
"aR" = (
@@ -1305,7 +1305,7 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"dw" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/structure/stone_tile/block/cracked{
dir = 4
},
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm
index c4655da79ffb3..62a6df4aaf1e6 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm
@@ -32,7 +32,7 @@
/turf/open/floor/plating,
/area/ruin/powered/snow_biodome)
"ah" = (
-/obj/item/reagent_containers/food/drinks/mug,
+/obj/item/reagent_containers/cup/glass/mug,
/turf/open/floor/plating,
/area/ruin/powered/snow_biodome)
"ai" = (
@@ -136,7 +136,7 @@
/area/ruin/powered/snow_biodome)
"aF" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug/cocoa,
+/obj/item/reagent_containers/cup/glass/mug/cocoa,
/turf/open/floor/wood,
/area/ruin/powered/snow_biodome)
"aG" = (
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
index 56f5a21f4a3fe..e78618e875b3a 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
@@ -32,7 +32,7 @@
},
/area/ruin/powered)
"i" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/plating/asteroid{
name = "dirt"
},
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm
index d9bd0c6bfeed7..73e6ae270c375 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm
@@ -314,16 +314,16 @@
/area/ruin/powered/seedvault)
"nO" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
pixel_x = 7
},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
pixel_y = 6
},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
pixel_y = 6
},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
pixel_x = -6;
pixel_y = 2
},
@@ -645,10 +645,10 @@
/obj/machinery/reagentgrinder{
pixel_y = 5
},
-/obj/item/reagent_containers/glass/beaker/bluespace,
-/obj/item/reagent_containers/glass/beaker/bluespace,
-/obj/item/reagent_containers/glass/beaker/bluespace,
-/obj/item/reagent_containers/glass/beaker/bluespace,
+/obj/item/reagent_containers/cup/beaker/bluespace,
+/obj/item/reagent_containers/cup/beaker/bluespace,
+/obj/item/reagent_containers/cup/beaker/bluespace,
+/obj/item/reagent_containers/cup/beaker/bluespace,
/obj/machinery/button{
id = "lifebring";
pixel_y = 32
@@ -1290,7 +1290,7 @@
/area/ruin/powered/seedvault)
"Ud" = (
/obj/machinery/biogenerator,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/bot,
/turf/open/floor/pod,
/area/ruin/powered/seedvault)
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
index ccd5c580b5f42..3d9314923f0f5 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
@@ -93,14 +93,14 @@
icon_state = "0-2"
},
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/bottle/random_virus,
-/obj/item/reagent_containers/glass/bottle/random_virus,
-/obj/item/reagent_containers/glass/bottle/random_virus,
-/obj/item/reagent_containers/glass/bottle/random_virus,
-/obj/item/reagent_containers/glass/bottle/random_virus,
-/obj/item/reagent_containers/glass/bottle/random_virus,
-/obj/item/reagent_containers/glass/bottle/random_virus,
-/obj/item/reagent_containers/glass/bottle/random_virus,
+/obj/item/reagent_containers/cup/bottle/random_virus,
+/obj/item/reagent_containers/cup/bottle/random_virus,
+/obj/item/reagent_containers/cup/bottle/random_virus,
+/obj/item/reagent_containers/cup/bottle/random_virus,
+/obj/item/reagent_containers/cup/bottle/random_virus,
+/obj/item/reagent_containers/cup/bottle/random_virus,
+/obj/item/reagent_containers/cup/bottle/random_virus,
+/obj/item/reagent_containers/cup/bottle/random_virus,
/turf/open/floor/iron/white/side{
dir = 9
},
@@ -119,8 +119,8 @@
dir = 4;
pixel_x = 26
},
-/obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter,
-/obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter,
+/obj/item/reagent_containers/cup/soda_cans/canned_laughter,
+/obj/item/reagent_containers/cup/soda_cans/canned_laughter,
/obj/item/extrapolator,
/turf/open/floor/iron/white/side{
dir = 5
@@ -389,10 +389,10 @@
pixel_y = -2
},
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
/turf/open/floor/iron/white/corner{
dir = 4
},
@@ -414,7 +414,7 @@
/obj/machinery/reagentgrinder{
pixel_y = 5
},
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/turf/open/floor/iron/white/side{
dir = 5
},
@@ -566,10 +566,10 @@
},
/obj/structure/table/glass,
/obj/item/folder/white,
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_x = -3
},
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_x = -3
},
/obj/item/reagent_containers/dropper,
@@ -960,21 +960,21 @@
"ft" = (
/obj/effect/turf_decal/box/white/corners,
/obj/structure/closet/crate,
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/waterbottle/large,
-/obj/item/reagent_containers/glass/waterbottle/large,
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large,
+/obj/item/reagent_containers/cup/waterbottle/large,
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 3;
pixel_y = -3
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 3;
pixel_y = -3
},
@@ -2750,7 +2750,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/item/soap/syndie,
/obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/plating,
/area/ruin/unpowered/syndicate_lava_base/main)
"kQ" = (
@@ -2898,7 +2898,7 @@
pixel_y = 6
},
/obj/item/book/manual/wiki/barman_recipes,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/turf/open/floor/wood,
/area/ruin/unpowered/syndicate_lava_base/bar)
"ll" = (
@@ -3014,11 +3014,11 @@
/area/ruin/unpowered/syndicate_lava_base/bar)
"lz" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/glass/rag{
+/obj/item/reagent_containers/cup/rag{
pixel_x = -4;
pixel_y = 9
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 5;
pixel_y = -2
},
@@ -4103,7 +4103,7 @@
/area/ruin/unpowered/syndicate_lava_base/main)
"qa" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
@@ -4849,7 +4849,7 @@
/area/ruin/unpowered/syndicate_lava_base/arrivals)
"Fz" = (
/obj/structure/closet/secure_closet/freezer/fridge/open,
-/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/item/reagent_containers/condiment/enzyme,
/obj/item/food/chocolatebar,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
index 03e7de95c4eab..2f1b40c5b4bb0 100644
--- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
+++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
@@ -1019,7 +1019,7 @@
/turf/open/floor/iron,
/area/ruin/space/derelict/bridge/access)
"dq" = (
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/obj/structure/cable/yellow{
icon_state = "1-8"
},
@@ -1241,7 +1241,7 @@
/turf/open/floor/plating,
/area/ruin/space/derelict/bridge/access)
"dZ" = (
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/turf/open/floor/iron,
/area/ruin/space/derelict/bridge)
"ea" = (
@@ -1489,7 +1489,7 @@
/area/ruin/space/derelict/bridge)
"eU" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/obj/structure/window/reinforced{
dir = 4
},
@@ -2520,7 +2520,7 @@
dir = 8
},
/obj/structure/window/reinforced,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
/turf/open/floor/iron/white/airless,
/area/ruin/space/derelict/medical)
"iC" = (
@@ -2734,7 +2734,7 @@
},
/area/ruin/space/derelict/medical)
"jk" = (
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
/turf/open/floor/iron/airless{
icon_state = "damaged3"
},
@@ -3374,7 +3374,7 @@
/area/ruin/space/derelict/hallway/primary)
"lq" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
list_reagents = list(/datum/reagent/toxin/acid = 50)
},
/obj/item/paper/crumpled/bloody/ruins/thederelict/unfinished,
diff --git a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm
index 8a9ae9ac8c3e9..e24e01482c05a 100644
--- a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm
+++ b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm
@@ -243,7 +243,7 @@
/area/ruin/space/has_grav/abandonedzoo)
"aP" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/bottle/random_virus,
+/obj/item/reagent_containers/cup/bottle/random_virus,
/obj/item/reagent_containers/dropper,
/turf/open/floor/iron/dark/side,
/area/ruin/space/has_grav/abandonedzoo)
@@ -379,7 +379,7 @@
"bi" = (
/obj/structure/table/reinforced,
/obj/item/reagent_containers/hypospray/medipen/stimpack,
-/obj/item/reagent_containers/glass/bottle/mutagen,
+/obj/item/reagent_containers/cup/bottle/mutagen,
/turf/open/floor/iron/dark/side,
/area/ruin/space/has_grav/abandonedzoo)
"bj" = (
diff --git a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
index ab18c9e534dfc..e0c41cdc41d87 100644
--- a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
+++ b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
@@ -80,7 +80,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/iron,
/area/ruin/space/has_grav/derelictoutpost/cargobay)
"aq" = (
diff --git a/_maps/RandomRuins/SpaceRuins/bus.dmm b/_maps/RandomRuins/SpaceRuins/bus.dmm
index 5bae30eefbee6..fa317740e732f 100644
--- a/_maps/RandomRuins/SpaceRuins/bus.dmm
+++ b/_maps/RandomRuins/SpaceRuins/bus.dmm
@@ -50,7 +50,7 @@
/area/ruin/unpowered/no_grav)
"al" = (
/obj/effect/decal/cleanable/food/salt,
-/obj/item/reagent_containers/food/condiment/saltshaker,
+/obj/item/reagent_containers/condiment/saltshaker,
/turf/open/floor/plating/asteroid/airless,
/area/ruin/unpowered/no_grav)
"am" = (
@@ -125,7 +125,7 @@
/area/ruin/unpowered/no_grav)
"aC" = (
/obj/structure/fluff/bus/passable,
-/obj/item/reagent_containers/food/condiment/saltshaker,
+/obj/item/reagent_containers/condiment/saltshaker,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark/airless{
icon_state = "bus"
@@ -154,7 +154,7 @@
/area/ruin/unpowered/no_grav)
"aH" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/coffee,
+/obj/item/reagent_containers/cup/glass/coffee,
/turf/open/floor/plating/asteroid/airless,
/area/ruin/unpowered/no_grav)
"aI" = (
@@ -199,7 +199,7 @@
/turf/open/floor/plating/asteroid/airless,
/area/ruin/unpowered/no_grav)
"aQ" = (
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
/turf/open/floor/plating/asteroid/airless,
/area/ruin/unpowered/no_grav)
"aR" = (
diff --git a/_maps/RandomRuins/SpaceRuins/crashedship.dmm b/_maps/RandomRuins/SpaceRuins/crashedship.dmm
index c3f63abb553a1..176cc2ac6f00b 100644
--- a/_maps/RandomRuins/SpaceRuins/crashedship.dmm
+++ b/_maps/RandomRuins/SpaceRuins/crashedship.dmm
@@ -63,7 +63,7 @@
/area/awaymission/BMPship/Fore)
"cl" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/awaymission/BMPship/Midship)
@@ -485,7 +485,7 @@
/turf/open/floor/iron/white,
/area/awaymission/BMPship/Aft)
"oh" = (
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/turf/open/floor/plating,
/area/awaymission/BMPship/Aft)
"ol" = (
@@ -655,7 +655,7 @@
"rv" = (
/obj/structure/table,
/obj/item/pen/red,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/turf/open/floor/iron,
/area/awaymission/BMPship/Aft)
"rB" = (
@@ -1169,7 +1169,7 @@
/turf/open/floor/plating,
/area/awaymission/BMPship/Fore)
"Ds" = (
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/turf/open/floor/iron,
/area/awaymission/BMPship/Midship)
"Dz" = (
@@ -1195,8 +1195,8 @@
/area/awaymission/BMPship/Midship)
"Et" = (
/obj/structure/closet/crate/freezer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/turf/open/floor/plating,
/area/awaymission/BMPship/Aft)
"Ey" = (
@@ -1221,7 +1221,7 @@
/turf/template_noop,
/area/space/nearstation)
"Fd" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/awaymission/BMPship/Midship)
@@ -1360,7 +1360,7 @@
/area/awaymission/BMPship/Aft)
"HJ" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/turf/open/floor/carpet,
/area/awaymission/BMPship/Fore)
"HL" = (
@@ -1373,7 +1373,7 @@
/turf/closed/wall/mineral/titanium,
/area/awaymission/BMPship/Aft)
"HZ" = (
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/awaymission/BMPship/Midship)
@@ -1664,7 +1664,7 @@
/obj/structure/table/wood,
/obj/item/stack/spacecash/c500,
/obj/item/stack/spacecash/c100,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/turf/open/floor/wood,
/area/awaymission/BMPship/Fore)
"OE" = (
@@ -1711,7 +1711,7 @@
/turf/template_noop,
/area/space/nearstation)
"Pd" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/iron/showroomfloor,
/area/awaymission/BMPship/Aft)
"Pf" = (
@@ -1988,7 +1988,7 @@
"Vr" = (
/obj/structure/table,
/obj/item/knife/butcher,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/obj/item/food/meat,
/obj/effect/turf_decal/tile/blue/opposingcorners{
dir = 1
diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
index 05e2a42452989..a847cf5a5d9b4 100644
--- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
+++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
@@ -379,13 +379,13 @@
dir = 1
},
/obj/item/storage/box/cups,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
/turf/open/floor/iron/cafeteria,
/area/ruin/space/has_grav/deepstorage/kitchen)
"aY" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/enzyme,
-/obj/item/reagent_containers/food/condiment/soysauce{
+/obj/item/reagent_containers/condiment/enzyme,
+/obj/item/reagent_containers/condiment/soysauce{
pixel_x = 4
},
/obj/machinery/firealarm{
@@ -410,8 +410,8 @@
/area/ruin/space/has_grav/deepstorage/kitchen)
"ba" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/peppermill,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/peppermill,
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = 4;
pixel_y = 4
},
@@ -968,11 +968,11 @@
dir = 4
},
/obj/machinery/light,
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
pixel_x = 4;
pixel_y = 4
},
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/iron,
/area/ruin/space/has_grav/deepstorage/hydroponics)
"cx" = (
@@ -987,7 +987,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/turf/open/floor/iron,
/area/ruin/space/has_grav/deepstorage/hydroponics)
"cz" = (
@@ -1009,25 +1009,25 @@
/obj/structure/closet/crate{
name = "food crate"
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = -5;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 2;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = -2
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 5
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 1;
pixel_y = -3
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 8;
pixel_y = -3
},
diff --git a/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm b/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm
index 1b16fb6b5579b..8a8277243b798 100644
--- a/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm
+++ b/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm
@@ -254,20 +254,20 @@
/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
"I" = (
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
pixel_x = -4;
pixel_y = 1
},
-/obj/item/reagent_containers/glass/bottle/chloralhydrate,
-/obj/item/reagent_containers/glass/bottle/toxin{
+/obj/item/reagent_containers/cup/bottle/chloralhydrate,
+/obj/item/reagent_containers/cup/bottle/toxin{
pixel_x = 6;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
pixel_x = 5;
pixel_y = 1
},
-/obj/item/reagent_containers/glass/bottle/facid{
+/obj/item/reagent_containers/cup/bottle/facid{
name = "fluorosulfuric acid bottle";
pixel_x = -3;
pixel_y = 6
@@ -331,8 +331,8 @@
/obj/structure/table/reinforced,
/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/dropper,
-/obj/item/reagent_containers/glass/bottle/mutagen,
-/obj/item/reagent_containers/glass/bottle/mutagen,
+/obj/item/reagent_containers/cup/bottle/mutagen,
+/obj/item/reagent_containers/cup/bottle/mutagen,
/obj/item/razor,
/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/gasthelizard)
diff --git a/_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm b/_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm
index fd689a7b13664..fa8dacffc4eb9 100644
--- a/_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm
+++ b/_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm
@@ -91,7 +91,7 @@
/area/ruin/space/has_grav/hilbertresearchfacility)
"r" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/bluespace,
+/obj/item/reagent_containers/cup/beaker/bluespace,
/turf/open/floor/carpet/grimy{
icon_state = "engine"
},
diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
index a8432f71eae07..89618fd243b0a 100644
--- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
@@ -788,11 +788,11 @@
/obj/machinery/computer/security/telescreen/entertainment{
pixel_x = -30
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -4;
pixel_y = 14
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 3;
pixel_y = 11
},
diff --git a/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm b/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm
index fdbda4defe1ce..229243a548023 100644
--- a/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm
+++ b/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm
@@ -28,7 +28,7 @@
"ai" = (
/obj/structure/janitorialcart,
/obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/plating,
/area/ruin/space/has_grav/powered/cat_man)
@@ -170,13 +170,13 @@
/area/ruin/space/has_grav/powered/cat_man)
"aK" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
/turf/open/floor/plating,
/area/ruin/space/has_grav/powered/cat_man)
"aL" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
/turf/open/floor/plating,
/area/ruin/space/has_grav/powered/cat_man)
"aM" = (
@@ -691,7 +691,7 @@
"hz" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
/obj/item/food/meat/slab/synthmeat{
desc = "A slab of cat meat. Tastes like furball.";
name = "cat meat"
diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
index 67e086897491a..2a114fb99921f 100644
--- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
@@ -1027,8 +1027,8 @@
desc = "A highly-pressurized water tank, this one seems almost empty..";
tank_volume = 1000
},
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/ruin/space/has_grav/ancientstation/hydroponics)
@@ -2301,7 +2301,7 @@
"hb" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/cola,
+/obj/item/reagent_containers/cup/soda_cans/cola,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/ruin/space/has_grav/ancientstation/sec)
@@ -2597,14 +2597,14 @@
dir = 4
},
/obj/item/folder/white,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/ruin/space/has_grav/ancientstation/rnd)
"ip" = (
/obj/machinery/chem_master,
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -2634,18 +2634,18 @@
/area/ruin/space/has_grav/ancientstation/rnd)
"it" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/mercury{
+/obj/item/reagent_containers/cup/bottle/mercury{
pixel_x = 6;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/nitrogen{
+/obj/item/reagent_containers/cup/bottle/nitrogen{
pixel_x = -6;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/oxygen{
+/obj/item/reagent_containers/cup/bottle/oxygen{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/phosphorus{
+/obj/item/reagent_containers/cup/bottle/phosphorus{
pixel_x = -6
},
/obj/effect/decal/cleanable/dirt,
@@ -2714,11 +2714,11 @@
"iL" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 5;
pixel_y = -2
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -2;
pixel_y = 2
},
@@ -2744,10 +2744,10 @@
/area/ruin/space/has_grav/ancientstation/rnd)
"iR" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/silver{
+/obj/item/reagent_containers/cup/bottle/silver{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/sodium{
+/obj/item/reagent_containers/cup/bottle/sodium{
pixel_x = -6
},
/obj/effect/decal/cleanable/dirt,
@@ -3794,10 +3794,10 @@
/area/ruin/space/has_grav/ancientstation/kitchen)
"nT" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/sacid{
+/obj/item/reagent_containers/cup/bottle/sacid{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/silicon{
+/obj/item/reagent_containers/cup/bottle/silicon{
pixel_x = -6
},
/obj/effect/decal/cleanable/dirt,
@@ -3806,13 +3806,13 @@
/area/ruin/space/has_grav/ancientstation/rnd)
"ot" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/fluorine{
+/obj/item/reagent_containers/cup/bottle/fluorine{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/hydrogen{
+/obj/item/reagent_containers/cup/bottle/hydrogen{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/water{
+/obj/item/reagent_containers/cup/bottle/water{
pixel_y = 8
},
/obj/effect/decal/cleanable/dirt,
@@ -4136,10 +4136,10 @@
/area/ruin/space/has_grav/ancientstation/sec)
"AP" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/aluminium{
+/obj/item/reagent_containers/cup/bottle/aluminium{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/bromine{
+/obj/item/reagent_containers/cup/bottle/bromine{
pixel_x = -6
},
/obj/effect/decal/cleanable/dirt,
@@ -4201,7 +4201,7 @@
"CJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/item/reagent_containers/condiment/enzyme,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
@@ -4220,13 +4220,13 @@
/area/ruin/space/has_grav/ancientstation/rnd)
"En" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/iodine{
+/obj/item/reagent_containers/cup/bottle/iodine{
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/iron{
+/obj/item/reagent_containers/cup/bottle/iron{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/lithium{
+/obj/item/reagent_containers/cup/bottle/lithium{
pixel_x = -6
},
/obj/effect/decal/cleanable/dirt,
@@ -4307,13 +4307,13 @@
/area/ruin/space/has_grav/ancientstation/rnd)
"Fn" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/potassium{
+/obj/item/reagent_containers/cup/bottle/potassium{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/radium{
+/obj/item/reagent_containers/cup/bottle/radium{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/welding_fuel{
+/obj/item/reagent_containers/cup/bottle/welding_fuel{
pixel_y = 8
},
/obj/effect/decal/cleanable/dirt,
@@ -4747,10 +4747,10 @@
/area/ruin/space/has_grav/ancientstation)
"Qy" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/copper{
+/obj/item/reagent_containers/cup/bottle/copper{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/ethanol{
+/obj/item/reagent_containers/cup/bottle/ethanol{
pixel_x = -6
},
/obj/effect/decal/cleanable/dirt,
@@ -4761,10 +4761,10 @@
/area/ruin/space/has_grav/ancientstation/rnd)
"QS" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/sugar{
+/obj/item/reagent_containers/cup/bottle/sugar{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/sulfur{
+/obj/item/reagent_containers/cup/bottle/sulfur{
pixel_x = -6
},
/obj/effect/decal/cleanable/dirt,
@@ -4904,10 +4904,10 @@
/area/ruin/space/has_grav/ancientstation/sec)
"VX" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/carbon{
+/obj/item/reagent_containers/cup/bottle/carbon{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/chlorine{
+/obj/item/reagent_containers/cup/bottle/chlorine{
pixel_x = -6
},
/obj/effect/decal/cleanable/dirt,
diff --git a/_maps/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/RandomRuins/SpaceRuins/onehalf.dmm
index a61b507f17af5..38172723b326f 100644
--- a/_maps/RandomRuins/SpaceRuins/onehalf.dmm
+++ b/_maps/RandomRuins/SpaceRuins/onehalf.dmm
@@ -982,8 +982,8 @@
/obj/item/tank/internals/oxygen/red,
/obj/item/clothing/mask/gas/syndicate,
/obj/item/clothing/suit/space/hardsuit/syndi,
-/obj/item/reagent_containers/food/drinks/bottle/rum,
-/obj/item/reagent_containers/food/drinks/bottle/rum,
+/obj/item/reagent_containers/cup/glass/bottle/rum,
+/obj/item/reagent_containers/cup/glass/bottle/rum,
/obj/item/folder/syndicate/mining,
/turf/open/floor/plating,
/area/ruin/space/has_grav/onehalf/bridge)
diff --git a/_maps/RandomRuins/SpaceRuins/refference.dmm b/_maps/RandomRuins/SpaceRuins/refference.dmm
index d7bf8dfabbb83..dc599a1179bde 100644
--- a/_maps/RandomRuins/SpaceRuins/refference.dmm
+++ b/_maps/RandomRuins/SpaceRuins/refference.dmm
@@ -3,7 +3,7 @@
/turf/open/space/basic,
/area/space)
"ab" = (
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/turf/open/floor/plating/asteroid/airless,
/area/ruin/unpowered/no_grav)
"ad" = (
diff --git a/_maps/RandomRuins/SpaceRuins/sos6.dmm b/_maps/RandomRuins/SpaceRuins/sos6.dmm
index c8dd9f8414a1a..3e3887a518cb2 100644
--- a/_maps/RandomRuins/SpaceRuins/sos6.dmm
+++ b/_maps/RandomRuins/SpaceRuins/sos6.dmm
@@ -14,7 +14,7 @@
dir = 4
},
/obj/effect/mob_spawn/human/corpse/russian,
-/obj/item/reagent_containers/food/drinks/bottle/vodka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka,
/turf/open/floor/mineral/plastitanium/red,
/area/ruin/unpowered)
"e" = (
diff --git a/_maps/RandomRuins/SpaceRuins/spacearcade.dmm b/_maps/RandomRuins/SpaceRuins/spacearcade.dmm
index 565b7f40d1a59..a753d7cb49f4f 100644
--- a/_maps/RandomRuins/SpaceRuins/spacearcade.dmm
+++ b/_maps/RandomRuins/SpaceRuins/spacearcade.dmm
@@ -76,22 +76,22 @@
/obj/structure/closet/crate/freezer{
name = "refreshment cooler"
},
-/obj/item/reagent_containers/food/drinks/beer/light,
-/obj/item/reagent_containers/food/drinks/soda_cans/sodawater,
-/obj/item/reagent_containers/food/drinks/soda_cans/shamblers,
-/obj/item/reagent_containers/food/drinks/soda_cans/shamblers,
-/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull,
-/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull,
-/obj/item/reagent_containers/food/drinks/soda_cans/air,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
-/obj/item/reagent_containers/food/drinks/soda_cans/cola,
-/obj/item/reagent_containers/food/drinks/soda_cans/cola,
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game,
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game,
-/obj/item/reagent_containers/food/drinks/soda_cans/space_up,
-/obj/item/reagent_containers/food/drinks/soda_cans/space_up,
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/soda_cans/sodawater,
+/obj/item/reagent_containers/cup/soda_cans/shamblers,
+/obj/item/reagent_containers/cup/soda_cans/shamblers,
+/obj/item/reagent_containers/cup/soda_cans/grey_bull,
+/obj/item/reagent_containers/cup/soda_cans/grey_bull,
+/obj/item/reagent_containers/cup/soda_cans/air,
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb,
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb,
+/obj/item/reagent_containers/cup/soda_cans/cola,
+/obj/item/reagent_containers/cup/soda_cans/cola,
+/obj/item/reagent_containers/cup/soda_cans/pwr_game,
+/obj/item/reagent_containers/cup/soda_cans/pwr_game,
+/obj/item/reagent_containers/cup/soda_cans/space_up,
+/obj/item/reagent_containers/cup/soda_cans/space_up,
+/obj/item/reagent_containers/cup/soda_cans/starkist,
/turf/open/floor/carpet/purple,
/area/ruin/space/has_grav/powered)
"r" = (
diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
index a84a0ece122b4..adeeca1933aa7 100644
--- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
+++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
@@ -1853,14 +1853,14 @@
/area/ruin/space/has_grav/hotel/bar)
"gb" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/enzyme,
-/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/item/reagent_containers/condiment/enzyme,
+/obj/item/reagent_containers/condiment/enzyme,
/turf/open/floor/iron/cafeteria,
/area/ruin/space/has_grav/hotel/bar)
"gc" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/reagent_containers/food/condiment/sugar,
+/obj/item/reagent_containers/condiment/sugar,
+/obj/item/reagent_containers/condiment/sugar,
/turf/open/floor/iron/cafeteria,
/area/ruin/space/has_grav/hotel/bar)
"ge" = (
@@ -1990,11 +1990,11 @@
/area/ruin/space/has_grav/hotel/bar)
"gE" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/pack/hotsauce,
-/obj/item/reagent_containers/food/condiment/pack/hotsauce,
-/obj/item/reagent_containers/food/condiment/pack/ketchup,
-/obj/item/reagent_containers/food/condiment/pack/ketchup,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/condiment/pack/hotsauce,
+/obj/item/reagent_containers/condiment/pack/hotsauce,
+/obj/item/reagent_containers/condiment/pack/ketchup,
+/obj/item/reagent_containers/condiment/pack/ketchup,
+/obj/item/reagent_containers/cup/beaker,
/turf/open/floor/iron/cafeteria,
/area/ruin/space/has_grav/hotel/bar)
"gF" = (
@@ -2056,9 +2056,9 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
/obj/structure/closet/secure_closet/freezer/fridge{
req_access = null;
req_access_txt = "200"
@@ -2092,7 +2092,7 @@
/area/ruin/space/has_grav/hotel/workroom)
"hd" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug/tea,
+/obj/item/reagent_containers/cup/glass/mug/tea,
/turf/open/floor/carpet,
/area/ruin/space/has_grav/hotel/dock)
"he" = (
@@ -2152,10 +2152,10 @@
/turf/open/floor/iron/freezer,
/area/ruin/space/has_grav/hotel/bar)
"hm" = (
-/obj/item/reagent_containers/food/condiment/rice,
-/obj/item/reagent_containers/food/condiment/rice,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/condiment/rice,
+/obj/item/reagent_containers/condiment/rice,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
/obj/structure/closet/secure_closet/freezer/kitchen{
req_access = null;
req_access_txt = "200"
@@ -2240,10 +2240,10 @@
/turf/open/floor/iron/freezer,
/area/ruin/space/has_grav/hotel/bar)
"hx" = (
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = 4
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -4
},
/obj/structure/table,
@@ -2327,7 +2327,7 @@
/area/ruin/space/has_grav/hotel/bar)
"hJ" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/soysauce,
+/obj/item/reagent_containers/condiment/soysauce,
/turf/open/floor/iron/cafeteria,
/area/ruin/space/has_grav/hotel/bar)
"hK" = (
@@ -2994,7 +2994,7 @@
/area/ruin/space/has_grav/hotel/power)
"kL" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/coffee,
+/obj/item/reagent_containers/cup/glass/coffee,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/iron,
/area/ruin/space/has_grav/hotel/security)
@@ -3800,7 +3800,7 @@
/area/ruin/space/has_grav/hotel/dock)
"yJ" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/reagent_containers/spray/cleaner,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron,
@@ -3904,7 +3904,7 @@
/area/ruin/space/has_grav/hotel/workroom)
"Ci" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/ruin/space/has_grav/hotel/bar)
@@ -4191,7 +4191,7 @@
/area/ruin/space/has_grav/hotel/pool)
"KR" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/ruin/space/has_grav/hotel/bar)
@@ -4411,7 +4411,7 @@
"SQ" = (
/obj/structure/table,
/obj/item/book/manual/wiki/barman_recipes,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/ruin/space/has_grav/hotel/bar)
@@ -4437,10 +4437,10 @@
/area/ruin/space/has_grav/hotel/pool)
"TR" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = 4
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -4
},
/obj/effect/turf_decal/tile/bar/opposingcorners,
diff --git a/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm b/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm
index 167aed15b539a..0bab58df25677 100644
--- a/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm
+++ b/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm
@@ -172,11 +172,11 @@
/area/ruin/space/has_grav/turretedoutpost)
"aV" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/vodka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
pixel_x = -4;
pixel_y = 4
},
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{
pixel_x = 3
},
/turf/open/floor/iron,
diff --git a/_maps/RandomZLevels/SnowCabin.dmm b/_maps/RandomZLevels/SnowCabin.dmm
index 2794aa837cbdc..d6a544e723706 100644
--- a/_maps/RandomZLevels/SnowCabin.dmm
+++ b/_maps/RandomZLevels/SnowCabin.dmm
@@ -297,7 +297,7 @@
},
/obj/structure/janitorialcart,
/obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/caution,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
@@ -353,7 +353,7 @@
/area/awaymission/cabin)
"bc" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/britcup,
+/obj/item/reagent_containers/cup/glass/britcup,
/turf/open/floor/carpet,
/area/awaymission/cabin)
"bd" = (
@@ -604,7 +604,7 @@
/area/awaymission/cabin)
"bU" = (
/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/turf/open/floor/wood,
/area/awaymission/cabin)
"bV" = (
@@ -883,25 +883,25 @@
/area/awaymission/cabin)
"cJ" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 8;
pixel_y = 10
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 8
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -8;
pixel_y = 10
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -8
},
/turf/open/floor/iron/cafeteria,
/area/awaymission/cabin)
"cK" = (
/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/drinks/sillycup/smallcarton{
+/obj/item/reagent_containers/cup/glass/sillycup/smallcarton{
pixel_y = 4
},
/turf/open/floor/wood,
@@ -992,7 +992,7 @@
dir = 1
},
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{
desc = "A fancy bottle of vodka. The name isn't in Galactic Common though.";
name = "Porosha Vodka"
},
@@ -1099,7 +1099,7 @@
/area/awaymission/cabin)
"dt" = (
/obj/structure/closet/secure_closet/freezer/fridge/open,
-/obj/item/reagent_containers/food/condiment/mayonnaise,
+/obj/item/reagent_containers/condiment/mayonnaise,
/turf/open/floor/iron/freezer,
/area/awaymission/cabin)
"du" = (
@@ -1360,11 +1360,11 @@
/area/awaymission/cabin)
"eo" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug/cocoa{
+/obj/item/reagent_containers/cup/glass/mug/cocoa{
desc = "Still hot!";
pixel_y = -2
},
-/obj/item/reagent_containers/food/drinks/mug/cocoa{
+/obj/item/reagent_containers/cup/glass/mug/cocoa{
desc = "Still hot!";
pixel_x = 8;
pixel_y = 8
@@ -1410,7 +1410,7 @@
/area/awaymission/cabin)
"ev" = (
/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
/turf/open/floor/wood,
/area/awaymission/cabin)
"ew" = (
@@ -2341,7 +2341,7 @@
/area/awaymission/cabin)
"hF" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug/cocoa{
+/obj/item/reagent_containers/cup/glass/mug/cocoa{
desc = "Still hot!";
pixel_y = 2
},
@@ -2407,7 +2407,7 @@
/turf/open/floor/plating/snowed,
/area/awaymission/cabin/caves)
"hQ" = (
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/turf/open/floor/plating/snowed,
/area/awaymission/cabin/caves)
"hR" = (
@@ -2612,7 +2612,7 @@
/area/awaymission/cabin/caves/sovietcave)
"is" = (
/obj/structure/closet/secure_closet/freezer/kitchen,
-/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/item/reagent_containers/condiment/enzyme,
/turf/open/floor/iron/freezer,
/area/awaymission/cabin)
"it" = (
@@ -2710,7 +2710,7 @@
/area/awaymission/cabin/caves)
"iR" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug/cocoa{
+/obj/item/reagent_containers/cup/glass/mug/cocoa{
desc = "Still hot!";
pixel_x = -7;
pixel_y = -2
@@ -2719,7 +2719,7 @@
/area/awaymission/cabin)
"iS" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug/cocoa{
+/obj/item/reagent_containers/cup/glass/mug/cocoa{
desc = "Still hot!";
pixel_x = 7;
pixel_y = 2
@@ -2728,7 +2728,7 @@
/area/awaymission/cabin)
"iT" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug/cocoa{
+/obj/item/reagent_containers/cup/glass/mug/cocoa{
desc = "Still hot!";
pixel_x = -4;
pixel_y = 4
@@ -2737,12 +2737,12 @@
/area/awaymission/cabin)
"iU" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug/cocoa{
+/obj/item/reagent_containers/cup/glass/mug/cocoa{
desc = "Still hot!";
pixel_x = -5;
pixel_y = 2
},
-/obj/item/reagent_containers/food/drinks/mug/cocoa{
+/obj/item/reagent_containers/cup/glass/mug/cocoa{
desc = "Still hot!";
pixel_x = 7;
pixel_y = -2
@@ -3003,14 +3003,14 @@
/area/awaymission/cabin)
"jy" = (
/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/drinks/bottle/wine{
+/obj/item/reagent_containers/cup/glass/bottle/wine{
pixel_y = 4
},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = -7;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = 7;
pixel_y = 3
},
@@ -3468,7 +3468,7 @@
"kK" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/bottle/vodka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka,
/turf/open/floor/mineral/plastitanium/red{
name = "soviet floor"
},
diff --git a/_maps/RandomZLevels/TheBeach.dmm b/_maps/RandomZLevels/TheBeach.dmm
index c02738946b515..dfe81d0620b9f 100644
--- a/_maps/RandomZLevels/TheBeach.dmm
+++ b/_maps/RandomZLevels/TheBeach.dmm
@@ -197,7 +197,7 @@
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"aH" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind{
+/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{
pixel_x = -17;
pixel_y = 17
},
@@ -214,7 +214,7 @@
/turf/open/floor/plating/beach/water,
/area/awaymission/beach)
"aJ" = (
-/obj/item/reagent_containers/food/drinks/beer/light{
+/obj/item/reagent_containers/cup/glass/bottle/beer/light{
pixel_x = -14;
pixel_y = 15
},
@@ -284,7 +284,7 @@
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"aS" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime{
+/obj/item/reagent_containers/cup/soda_cans/lemon_lime{
pixel_x = -12;
pixel_y = 14
},
@@ -478,8 +478,8 @@
/turf/open/floor/wood,
/area/awaymission/beach)
"bu" = (
-/obj/item/reagent_containers/food/drinks/bottle/wine,
-/obj/item/reagent_containers/food/drinks/bottle/rum,
+/obj/item/reagent_containers/cup/glass/bottle/wine,
+/obj/item/reagent_containers/cup/glass/bottle/rum,
/obj/structure/table/wood,
/turf/open/floor/wood,
/area/awaymission/beach)
@@ -621,7 +621,7 @@
/area/awaymission/beach)
"bO" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/champagne,
+/obj/item/reagent_containers/cup/glass/bottle/champagne,
/turf/open/floor/wood,
/area/awaymission/beach)
"bP" = (
@@ -788,14 +788,14 @@
/area/awaymission/beach)
"cl" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/turf/open/floor/wood,
/area/awaymission/beach)
"cm" = (
/obj/structure/table/wood,
/obj/item/clothing/glasses/sunglasses,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/turf/open/floor/wood,
/area/awaymission/beach)
"cn" = (
@@ -827,14 +827,14 @@
req_access = list(25)
},
/obj/item/storage/fancy/egg_box,
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/mayonnaise,
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/mayonnaise,
+/obj/item/reagent_containers/condiment/sugar,
+/obj/item/reagent_containers/condiment/sugar,
+/obj/item/reagent_containers/condiment/enzyme,
/turf/open/floor/wood,
/area/awaymission/beach)
"cs" = (
@@ -888,7 +888,7 @@
/area/awaymission/beach)
"cB" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/ale,
+/obj/item/reagent_containers/cup/glass/bottle/ale,
/turf/open/floor/wood,
/area/awaymission/beach)
"cC" = (
@@ -897,19 +897,19 @@
/area/awaymission/beach)
"cD" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/glass/rag{
+/obj/item/reagent_containers/cup/rag{
pixel_y = 7
},
/turf/open/floor/wood,
/area/awaymission/beach)
"cE" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb,
/turf/open/floor/wood,
/area/awaymission/beach)
"cF" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime,
+/obj/item/reagent_containers/cup/soda_cans/lemon_lime,
/turf/open/floor/wood,
/area/awaymission/beach)
"cG" = (
@@ -937,12 +937,12 @@
/area/awaymission/beach)
"cK" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"cL" = (
@@ -961,12 +961,12 @@
/area/awaymission/beach)
"cN" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/sodawater,
-/obj/item/reagent_containers/food/drinks/soda_cans/shamblers,
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game,
-/obj/item/reagent_containers/food/drinks/soda_cans/air,
-/obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter,
-/obj/item/reagent_containers/food/drinks/soda_cans/tonic,
+/obj/item/reagent_containers/cup/soda_cans/sodawater,
+/obj/item/reagent_containers/cup/soda_cans/shamblers,
+/obj/item/reagent_containers/cup/soda_cans/pwr_game,
+/obj/item/reagent_containers/cup/soda_cans/air,
+/obj/item/reagent_containers/cup/soda_cans/canned_laughter,
+/obj/item/reagent_containers/cup/soda_cans/tonic,
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"cO" = (
@@ -974,45 +974,45 @@
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"cP" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime{
+/obj/item/reagent_containers/cup/soda_cans/lemon_lime{
pixel_x = -12
},
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb{
pixel_x = 13
},
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"cQ" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
+/obj/item/reagent_containers/cup/soda_cans/starkist{
pixel_x = -12;
pixel_y = 3
},
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"cR" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
pixel_x = -8;
pixel_y = -4
},
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"cS" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb{
pixel_x = -9;
pixel_y = -7
},
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"cT" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind,
+/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind,
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"cU" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
pixel_x = -8;
pixel_y = -4
},
-/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind{
+/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{
pixel_x = 15
},
/turf/open/floor/plating/beach/sand,
@@ -1025,19 +1025,19 @@
/turf/open/floor/plating/beach/coastline_t/sandwater_inner,
/area/awaymission/beach)
"cW" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime{
+/obj/item/reagent_containers/cup/soda_cans/lemon_lime{
pixel_x = -12
},
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"cX" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
pixel_x = -5
},
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"cY" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
+/obj/item/reagent_containers/cup/soda_cans/starkist{
pixel_x = -6
},
/turf/open/floor/plating/beach/sand,
diff --git a/_maps/RandomZLevels/caves.dmm b/_maps/RandomZLevels/caves.dmm
index c4b31d08c3fdb..ce6c0ab602e3c 100644
--- a/_maps/RandomZLevels/caves.dmm
+++ b/_maps/RandomZLevels/caves.dmm
@@ -1899,7 +1899,7 @@
/area/awaymission/caves/BMP_asteroid)
"gf" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/drinkingglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass,
/turf/open/floor/iron,
/area/awaymission/caves/BMP_asteroid)
"gg" = (
@@ -1989,7 +1989,7 @@
/turf/open/floor/iron,
/area/awaymission/caves/BMP_asteroid)
"gy" = (
-/obj/item/reagent_containers/food/drinks/drinkingglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass,
/turf/open/floor/iron,
/area/awaymission/caves/BMP_asteroid)
"gz" = (
diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm
index c7cd6fb0b6ac7..d7c863c10116b 100644
--- a/_maps/RandomZLevels/moonoutpost19.dmm
+++ b/_maps/RandomZLevels/moonoutpost19.dmm
@@ -904,7 +904,7 @@
/obj/item/book/manual/wiki/barman_recipes{
pixel_y = 5
},
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/turf/open/floor/iron/cafeteria{
dir = 5
},
@@ -1223,15 +1223,15 @@
/area/awaymission/moonoutpost19/arrivals)
"mE" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
pixel_x = -6;
pixel_y = 6
},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = 6;
pixel_y = 8
},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = 3
},
/turf/open/floor/iron/dark,
@@ -4289,7 +4289,7 @@
"Nv" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
-/obj/item/reagent_containers/glass/rag{
+/obj/item/reagent_containers/cup/rag{
pixel_y = 5
},
/obj/machinery/door/poddoor/shutters{
@@ -4329,10 +4329,10 @@
"NE" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 3
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -3
},
/obj/machinery/door/poddoor/shutters{
@@ -4347,9 +4347,9 @@
name = "refrigerator";
req_access_txt = "201"
},
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
/obj/item/storage/fancy/egg_box,
/turf/open/floor/iron/showroomfloor{
initial_temperature = 273.15
@@ -4851,9 +4851,9 @@
name = "kitchen Cabinet";
req_access_txt = "201"
},
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/sugar,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/sugar,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/showroomfloor{
initial_temperature = 273.15
@@ -4911,7 +4911,7 @@
/obj/item/reagent_containers/peppercloud_deployer,
/obj/item/grenade/flashbang,
/obj/item/storage/belt/security,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -3;
pixel_y = -2
},
diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm
index b47fee0ad7f33..9bcc9baa59930 100644
--- a/_maps/RandomZLevels/research.dmm
+++ b/_maps/RandomZLevels/research.dmm
@@ -982,11 +982,11 @@
/area/awaymission/research/interior/cryo)
"fd" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = -7;
pixel_y = 1
},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = -7;
pixel_y = 1
},
@@ -994,11 +994,11 @@
/area/awaymission/research/interior/cryo)
"fe" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = 7;
pixel_y = 1
},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = 7;
pixel_y = 1
},
diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm
index 492f8e203617e..f6c483d80b1fc 100644
--- a/_maps/RandomZLevels/snowdin.dmm
+++ b/_maps/RandomZLevels/snowdin.dmm
@@ -737,7 +737,7 @@
/area/awaymission/snowdin/post/kitchen)
"dv" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/turf/open/floor/iron,
/area/awaymission/snowdin/post/kitchen)
"dw" = (
@@ -861,7 +861,7 @@
/area/awaymission/snowdin/post/kitchen)
"dT" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/item/reagent_containers/condiment/enzyme,
/turf/open/floor/plating,
/area/awaymission/snowdin/post/kitchen)
"dU" = (
@@ -2883,7 +2883,7 @@
/area/awaymission/snowdin/post/hydro)
"nA" = (
/obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/plating,
/area/awaymission/snowdin/post/hydro)
"nB" = (
@@ -3218,7 +3218,7 @@
/obj/structure/closet/crate/hydroponics,
/obj/item/shovel/spade,
/obj/item/wrench,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/wirecutters,
/turf/open/floor/iron,
/area/awaymission/snowdin/post/hydro)
@@ -7625,7 +7625,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 5
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
list_reagents = null
},
/turf/open/floor/mineral/plastitanium/red,
@@ -7685,7 +7685,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
list_reagents = null
},
/turf/open/floor/mineral/plastitanium/red,
@@ -7895,7 +7895,7 @@
/turf/open/floor/iron/dark/snowdin,
/area/awaymission/snowdin/cave)
"Ea" = (
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
list_reagents = null
},
/turf/open/floor/iron/dark,
@@ -7981,7 +7981,7 @@
/area/awaymission/snowdin/cave)
"Eo" = (
/obj/effect/turf_decal/weather/snow,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
list_reagents = null
},
/turf/open/floor/iron/dark/snowdin,
@@ -8007,7 +8007,7 @@
/area/awaymission/snowdin/post/hydro)
"Eu" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
list_reagents = null
},
/turf/open/floor/iron/dark,
@@ -8017,7 +8017,7 @@
dir = 4
},
/obj/item/stack/rods,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
list_reagents = null
},
/turf/open/floor/mineral/plastitanium/red,
@@ -8050,7 +8050,7 @@
dir = 10
},
/obj/item/shard,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
list_reagents = null
},
/turf/open/floor/mineral/plastitanium/red,
@@ -8059,7 +8059,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 6
},
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
/turf/open/floor/mineral/plastitanium/red,
/area/awaymission/snowdin/cave)
"ED" = (
@@ -10056,7 +10056,7 @@
/turf/open/floor/iron,
/area/awaymission/snowdin/post/dorm)
"Lg" = (
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
list_reagents = null
},
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
@@ -10371,7 +10371,7 @@
/turf/open/floor/iron,
/area/awaymission/snowdin/post/messhall)
"Md" = (
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
list_reagents = null
},
/obj/effect/turf_decal/tile/neutral/half/contrasted,
@@ -11910,7 +11910,7 @@
/area/awaymission/snowdin/post/garage)
"RW" = (
/obj/item/stack/rods,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
list_reagents = null
},
/obj/effect/turf_decal/tile/neutral/half/contrasted,
diff --git a/_maps/RandomZLevels/spacebattle.dmm b/_maps/RandomZLevels/spacebattle.dmm
index d4dd647763d72..c0b26f639246c 100644
--- a/_maps/RandomZLevels/spacebattle.dmm
+++ b/_maps/RandomZLevels/spacebattle.dmm
@@ -541,7 +541,7 @@
/area/awaymission/spacebattle/cruiser)
"cD" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/item/reagent_containers/condiment/enzyme,
/turf/open/floor/iron/cafeteria,
/area/awaymission/spacebattle/cruiser)
"cE" = (
@@ -2355,7 +2355,7 @@
/area/awaymission/spacebattle/cruiser)
"oS" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/saltshaker,
+/obj/item/reagent_containers/condiment/saltshaker,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
@@ -2405,7 +2405,7 @@
/area/awaymission/spacebattle/syndicate5)
"vH" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/peppermill,
+/obj/item/reagent_containers/condiment/peppermill,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm
index 35f59016044c6..9f90e95d848f5 100644
--- a/_maps/RandomZLevels/undergroundoutpost45.dmm
+++ b/_maps/RandomZLevels/undergroundoutpost45.dmm
@@ -2754,7 +2754,7 @@
"zn" = (
/obj/structure/table,
/obj/item/stack/package_wrap,
-/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/item/reagent_containers/condiment/enzyme,
/turf/open/floor/iron/cafeteria{
dir = 5
},
@@ -2940,9 +2940,9 @@
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/crew_quarters)
"zU" = (
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
/obj/item/storage/fancy/egg_box,
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/secure_closet/freezer{
@@ -3242,10 +3242,10 @@
/area/awaymission/undergroundoutpost45/research)
"AW" = (
/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/open/floor/iron/cafeteria{
@@ -4242,7 +4242,7 @@
"Eh" = (
/obj/structure/table,
/obj/item/book/manual/wiki/barman_recipes,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/crew_quarters)
@@ -4604,7 +4604,7 @@
"FB" = (
/obj/structure/table,
/obj/item/stack/package_wrap,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/crew_quarters)
@@ -5471,11 +5471,11 @@
dir = 4
},
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 8;
pixel_y = 2
},
@@ -6118,7 +6118,7 @@
/area/awaymission/undergroundoutpost45/engineering)
"KM" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/crew_quarters)
@@ -6208,10 +6208,10 @@
/area/awaymission/undergroundoutpost45/crew_quarters)
"KZ" = (
/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
},
/obj/effect/turf_decal/tile/bar/opposingcorners,
@@ -6228,7 +6228,7 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/tile/green/half/contrasted{
dir = 4
},
@@ -6355,7 +6355,7 @@
/area/awaymission/undergroundoutpost45/engineering)
"Lu" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/drinkingglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/crew_quarters)
@@ -7279,7 +7279,7 @@
pixel_x = 3;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 5
},
/obj/effect/decal/cleanable/dirt,
@@ -7954,7 +7954,7 @@
/area/awaymission/undergroundoutpost45/gateway)
"QS" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/soda_cans/cola,
+/obj/item/reagent_containers/cup/soda_cans/cola,
/turf/open/floor/carpet/grimy,
/area/awaymission/undergroundoutpost45/central)
"QT" = (
@@ -8874,7 +8874,7 @@
/area/awaymission/undergroundoutpost45/caves)
"TW" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/central)
"TX" = (
@@ -8946,7 +8946,7 @@
/obj/item/shovel/spade,
/obj/item/wrench,
/obj/item/screwdriver,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/iron/dark,
/area/awaymission/undergroundoutpost45/central)
"Up" = (
@@ -9805,9 +9805,9 @@
name = "kitchen Cabinet";
req_access_txt = "201"
},
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/sugar,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/sugar,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/cafeteria{
dir = 5
diff --git a/_maps/RuinGeneration/13x13_cafe.dmm b/_maps/RuinGeneration/13x13_cafe.dmm
index 9d2f9359829c4..e3e17df7d2887 100644
--- a/_maps/RuinGeneration/13x13_cafe.dmm
+++ b/_maps/RuinGeneration/13x13_cafe.dmm
@@ -148,11 +148,11 @@
/obj/item/book/manual/wiki/barman_recipes{
pixel_y = 6
},
-/obj/item/reagent_containers/food/drinks/shaker{
+/obj/item/reagent_containers/cup/glass/shaker{
pixel_x = 6;
pixel_y = 2
},
-/obj/item/reagent_containers/glass/rag{
+/obj/item/reagent_containers/cup/rag{
pixel_x = -3;
pixel_y = 2
},
diff --git a/_maps/RuinGeneration/13x13_corgrobotics.dmm b/_maps/RuinGeneration/13x13_corgrobotics.dmm
index e093c426f171c..d5776a3b5fbe2 100644
--- a/_maps/RuinGeneration/13x13_corgrobotics.dmm
+++ b/_maps/RuinGeneration/13x13_corgrobotics.dmm
@@ -315,8 +315,8 @@
/obj/structure/table,
/obj/item/stack/package_wrap,
/obj/item/stack/package_wrap,
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
diff --git a/_maps/RuinGeneration/13x13_hilberttest.dmm b/_maps/RuinGeneration/13x13_hilberttest.dmm
index 4e1dec816fa19..43e6c52dc11ce 100644
--- a/_maps/RuinGeneration/13x13_hilberttest.dmm
+++ b/_maps/RuinGeneration/13x13_hilberttest.dmm
@@ -114,7 +114,7 @@
/area/ruin/unpowered)
"S" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/bluespace,
+/obj/item/reagent_containers/cup/beaker/bluespace,
/turf/open/floor/carpet/grimy{
icon_state = "engine"
},
diff --git a/_maps/RuinGeneration/13x13_listening_base.dmm b/_maps/RuinGeneration/13x13_listening_base.dmm
index 77b6075c3231d..1f1ae3eab42c3 100644
--- a/_maps/RuinGeneration/13x13_listening_base.dmm
+++ b/_maps/RuinGeneration/13x13_listening_base.dmm
@@ -119,11 +119,11 @@
/obj/machinery/computer/security/telescreen/entertainment{
pixel_x = -30
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -4;
pixel_y = 14
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 3;
pixel_y = 11
},
diff --git a/_maps/RuinGeneration/13x13_shotelroom.dmm b/_maps/RuinGeneration/13x13_shotelroom.dmm
index 9e11ccf71a09c..504683b88a164 100644
--- a/_maps/RuinGeneration/13x13_shotelroom.dmm
+++ b/_maps/RuinGeneration/13x13_shotelroom.dmm
@@ -19,7 +19,7 @@
/area/ruin/unpowered)
"d" = (
/obj/structure/table/wood/fancy/purple,
-/obj/item/reagent_containers/food/drinks/bottle/orangejuice{
+/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice{
pixel_x = 2;
pixel_y = 7
},
@@ -163,7 +163,7 @@
/area/ruin/unpowered)
"J" = (
/obj/structure/table/wood/fancy/purple,
-/obj/item/reagent_containers/food/drinks/drinkingglass/filled/soda{
+/obj/item/reagent_containers/cup/glass/drinkingglass/filled/soda{
pixel_x = -5;
pixel_y = 5
},
@@ -221,7 +221,7 @@
pixel_y = -1
},
/obj/structure/table/glass,
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
pixel_x = -8;
pixel_y = -1
},
@@ -259,7 +259,7 @@
/area/ruin/unpowered)
"Z" = (
/obj/structure/table/wood/fancy/purple,
-/obj/item/reagent_containers/food/drinks/bottle/applejack{
+/obj/item/reagent_containers/cup/glass/bottle/applejack{
pixel_y = 2
},
/turf/open/floor/carpet/orange,
diff --git a/_maps/RuinGeneration/13x17_permabrig.dmm b/_maps/RuinGeneration/13x17_permabrig.dmm
index c06af229e26eb..f74976dc55ce6 100644
--- a/_maps/RuinGeneration/13x17_permabrig.dmm
+++ b/_maps/RuinGeneration/13x17_permabrig.dmm
@@ -440,7 +440,7 @@
/turf/open/floor/iron,
/area/ruin/unpowered)
"SX" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/plating,
/area/ruin/unpowered)
"TT" = (
diff --git a/_maps/RuinGeneration/13x9_medical.dmm b/_maps/RuinGeneration/13x9_medical.dmm
index 94ba7360af311..8369045cc4862 100644
--- a/_maps/RuinGeneration/13x9_medical.dmm
+++ b/_maps/RuinGeneration/13x9_medical.dmm
@@ -138,11 +138,11 @@
/area/ruin/unpowered)
"aJ" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = 9;
pixel_y = 11
},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = 6;
pixel_y = 5
},
@@ -197,7 +197,7 @@
/area/ruin/unpowered)
"aR" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/charcoal,
+/obj/item/reagent_containers/cup/bottle/charcoal,
/obj/effect/spawner/lootdrop/ruinloot/medical,
/obj/effect/turf_decal/tile/blue/fourcorners/contrasted,
/turf/open/floor/iron/white,
diff --git a/_maps/RuinGeneration/17x17_charliecrew.dmm b/_maps/RuinGeneration/17x17_charliecrew.dmm
index 74b4216144d02..c51fd1c848505 100644
--- a/_maps/RuinGeneration/17x17_charliecrew.dmm
+++ b/_maps/RuinGeneration/17x17_charliecrew.dmm
@@ -67,7 +67,7 @@
pixel_x = 7;
pixel_y = -2
},
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
pixel_x = -7
},
/turf/open/floor/iron/white,
@@ -511,7 +511,7 @@
/turf/open/floor/iron/white,
/area/ruin/unpowered)
"SR" = (
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
/obj/structure/table,
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 8
diff --git a/_maps/RuinGeneration/5x5_4_room-janitor_closet.dmm b/_maps/RuinGeneration/5x5_4_room-janitor_closet.dmm
index 74e52f9c81eb1..2f8351b7603f0 100644
--- a/_maps/RuinGeneration/5x5_4_room-janitor_closet.dmm
+++ b/_maps/RuinGeneration/5x5_4_room-janitor_closet.dmm
@@ -49,7 +49,7 @@
/area/ruin/unpowered)
"S" = (
/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/tile/green/anticorner/contrasted{
dir = 8
},
diff --git a/_maps/RuinGeneration/9x13_kitchen.dmm b/_maps/RuinGeneration/9x13_kitchen.dmm
index 4e16f38b5494a..fe1c17c793242 100644
--- a/_maps/RuinGeneration/9x13_kitchen.dmm
+++ b/_maps/RuinGeneration/9x13_kitchen.dmm
@@ -1,7 +1,7 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"b" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/item/reagent_containers/condiment/enzyme,
/obj/item/stack/package_wrap,
/turf/open/floor/iron/cafeteria,
/area/ruin/unpowered)
@@ -11,7 +11,7 @@
pixel_x = 3;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 5
},
/turf/open/floor/iron/cafeteria,
@@ -41,10 +41,10 @@
/area/ruin/unpowered)
"m" = (
/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/open/floor/iron/cafeteria,
diff --git a/_maps/RuinGeneration/9x13_vault.dmm b/_maps/RuinGeneration/9x13_vault.dmm
index 1bb78b9a506c8..1b7a3c2ac5c48 100644
--- a/_maps/RuinGeneration/9x13_vault.dmm
+++ b/_maps/RuinGeneration/9x13_vault.dmm
@@ -104,7 +104,7 @@
/obj/item/paper{
default_raw_text = "IOU - One Very Cool Revolver (Thanks HOP)"
},
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark/airless,
/area/ruin/unpowered)
diff --git a/_maps/RuinGeneration/9x9_chemlab.dmm b/_maps/RuinGeneration/9x9_chemlab.dmm
index 413060bdf953f..f2b99cee7a3c9 100644
--- a/_maps/RuinGeneration/9x9_chemlab.dmm
+++ b/_maps/RuinGeneration/9x9_chemlab.dmm
@@ -250,11 +250,11 @@
/area/ruin)
"JC" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_x = -3;
pixel_y = 4
},
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_x = -6;
pixel_y = 2
},
@@ -277,11 +277,11 @@
/area/ruin)
"Rt" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -2;
pixel_y = 1
},
diff --git a/_maps/arenas/bar.dmm b/_maps/arenas/bar.dmm
index 18942cc5a4b78..d16e9c1c60cef 100644
--- a/_maps/arenas/bar.dmm
+++ b/_maps/arenas/bar.dmm
@@ -8,10 +8,10 @@
/area/tdome/arena)
"w" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 3
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -3
},
/obj/effect/turf_decal/tile/bar/opposingcorners,
@@ -76,8 +76,8 @@
/area/tdome/arena)
"L" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/shaker,
-/obj/item/reagent_containers/food/drinks/shaker{
+/obj/item/reagent_containers/cup/glass/shaker,
+/obj/item/reagent_containers/cup/glass/shaker{
pixel_x = -5
},
/obj/structure/sign/plaques/deempisi{
diff --git a/_maps/arenas/beach.dmm b/_maps/arenas/beach.dmm
index 5cca3a6b01b76..aa1a0a33ba94b 100644
--- a/_maps/arenas/beach.dmm
+++ b/_maps/arenas/beach.dmm
@@ -11,7 +11,7 @@
/turf/open/floor/plating/beach/sand,
/area/tdome/arena)
"c" = (
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
list_reagents = list(/datum/reagent/consumable/cooking_oil = 50)
},
/turf/open/floor/plating/beach/sand,
@@ -35,7 +35,7 @@
/turf/open/floor/wood,
/area/tdome/arena)
"h" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy,
+/obj/item/reagent_containers/cup/soda_cans/monkey_energy,
/turf/open/floor/plating/beach/sand,
/area/tdome/arena)
"i" = (
@@ -65,17 +65,17 @@
/area/tdome/arena)
"n" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/rum,
+/obj/item/reagent_containers/cup/glass/bottle/rum,
/turf/open/floor/wood,
/area/tdome/arena)
"o" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/absinthe/premium,
+/obj/item/reagent_containers/cup/glass/bottle/absinthe/premium,
/turf/open/floor/wood,
/area/tdome/arena)
"p" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/tequila,
+/obj/item/reagent_containers/cup/glass/bottle/tequila,
/turf/open/floor/wood,
/area/tdome/arena)
"q" = (
diff --git a/_maps/arenas/survival pod.dmm b/_maps/arenas/survival pod.dmm
index d41f152cf8017..8c1dbf965cc32 100644
--- a/_maps/arenas/survival pod.dmm
+++ b/_maps/arenas/survival pod.dmm
@@ -60,11 +60,11 @@
/area/tdome/arena)
"m" = (
/obj/structure/table/wood/fancy/black,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = 7;
pixel_y = 2
},
-/obj/item/reagent_containers/food/drinks/bottle/wine{
+/obj/item/reagent_containers/cup/glass/bottle/wine{
pixel_x = -6;
pixel_y = 10
},
@@ -126,7 +126,7 @@
/area/tdome/arena)
"v" = (
/obj/structure/table/wood/fancy/black,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = 7;
pixel_y = 2
},
diff --git a/_maps/holodeck/beach.dmm b/_maps/holodeck/beach.dmm
index 75a7272ee144d..5586e76354940 100644
--- a/_maps/holodeck/beach.dmm
+++ b/_maps/holodeck/beach.dmm
@@ -19,7 +19,7 @@
/turf/open/floor/holofloor/beach/coast_b,
/area/template_noop)
"q" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/holofloor/beach/coast_t,
/area/template_noop)
"t" = (
diff --git a/_maps/holodeck/lounge.dmm b/_maps/holodeck/lounge.dmm
index 6c1c58f31c284..4b649704e4cd2 100644
--- a/_maps/holodeck/lounge.dmm
+++ b/_maps/holodeck/lounge.dmm
@@ -1,7 +1,7 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/obj/structure/table/wood/bar,
-/obj/item/reagent_containers/glass/rag{
+/obj/item/reagent_containers/cup/rag{
pixel_x = 10;
pixel_y = 1
},
@@ -51,7 +51,7 @@
/area/template_noop)
"i" = (
/obj/structure/table/wood/bar,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/turf/open/floor/holofloor{
dir = 9;
icon_state = "wood"
diff --git a/_maps/holodeck/medicalsim.dmm b/_maps/holodeck/medicalsim.dmm
index 839b01f7cf3d7..2901a1e9491da 100644
--- a/_maps/holodeck/medicalsim.dmm
+++ b/_maps/holodeck/medicalsim.dmm
@@ -12,7 +12,7 @@
/area/template_noop)
"dl" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/obj/effect/turf_decal/tile/yellow/half/contrasted{
dir = 1
},
@@ -528,9 +528,9 @@
/area/template_noop)
"SF" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/beaker,
-/obj/item/reagent_containers/glass/beaker,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
+/obj/item/reagent_containers/cup/beaker,
+/obj/item/reagent_containers/cup/beaker,
/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
dir = 1
},
diff --git a/_maps/holodeck/petpark.dmm b/_maps/holodeck/petpark.dmm
index b6b940daa6038..2b530ce0c51ec 100644
--- a/_maps/holodeck/petpark.dmm
+++ b/_maps/holodeck/petpark.dmm
@@ -118,7 +118,7 @@
/turf/open/floor/holofloor/grass,
/area/template_noop)
"X" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/holofloor/grass,
/area/template_noop)
diff --git a/_maps/holodeck/small/beach.dmm b/_maps/holodeck/small/beach.dmm
index 6fec9185b3218..4a44f826bef65 100644
--- a/_maps/holodeck/small/beach.dmm
+++ b/_maps/holodeck/small/beach.dmm
@@ -9,7 +9,7 @@
/turf/open/floor/holofloor/carpet,
/area/template_noop)
"v" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/shovel/spade,
/turf/open/floor/holofloor/beach/coast_t,
/area/template_noop)
diff --git a/_maps/holodeck/small/kitchen.dmm b/_maps/holodeck/small/kitchen.dmm
index c1122e4f4101a..1e6058f1eb543 100644
--- a/_maps/holodeck/small/kitchen.dmm
+++ b/_maps/holodeck/small/kitchen.dmm
@@ -43,7 +43,7 @@
/area/template_noop)
"p" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -8;
pixel_y = 1
},
@@ -153,7 +153,7 @@
pixel_x = 5;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = -6;
pixel_y = 4
},
@@ -169,7 +169,7 @@
/area/template_noop)
"Q" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
pixel_x = -6;
pixel_y = 19
},
diff --git a/_maps/holodeck/small/lounge.dmm b/_maps/holodeck/small/lounge.dmm
index cb3c53c73486f..3f06ba54ff401 100644
--- a/_maps/holodeck/small/lounge.dmm
+++ b/_maps/holodeck/small/lounge.dmm
@@ -28,7 +28,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/item/reagent_containers/food/drinks/shaker{
+/obj/item/reagent_containers/cup/glass/shaker{
pixel_x = 4
},
/obj/item/book/manual/wiki/barman_recipes{
@@ -42,7 +42,7 @@
/area/template_noop)
"i" = (
/obj/structure/table/wood/bar,
-/obj/item/reagent_containers/glass/rag{
+/obj/item/reagent_containers/cup/rag{
pixel_x = 10;
pixel_y = 1
},
diff --git a/_maps/holodeck/small/medicalsim.dmm b/_maps/holodeck/small/medicalsim.dmm
index 6777e297407cf..d842508f4e86c 100644
--- a/_maps/holodeck/small/medicalsim.dmm
+++ b/_maps/holodeck/small/medicalsim.dmm
@@ -311,22 +311,22 @@
/area/template_noop)
"Ky" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 10;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 4;
pixel_y = 10
},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 5;
pixel_y = 11
},
/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
dir = 1
},
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_x = -7;
pixel_y = 3
},
diff --git a/_maps/holodeck/small/petpark.dmm b/_maps/holodeck/small/petpark.dmm
index 227532eb51acf..2371eb8400ba3 100644
--- a/_maps/holodeck/small/petpark.dmm
+++ b/_maps/holodeck/small/petpark.dmm
@@ -86,7 +86,7 @@
/area/template_noop)
"O" = (
/obj/machinery/hydroponics/soil,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/holofloor/grass,
/area/template_noop)
"R" = (
diff --git a/_maps/holodeck/small/teahouse.dmm b/_maps/holodeck/small/teahouse.dmm
index d74ce697bc0ad..fc4a94f202fe1 100644
--- a/_maps/holodeck/small/teahouse.dmm
+++ b/_maps/holodeck/small/teahouse.dmm
@@ -24,12 +24,12 @@
/area/template_noop)
"g" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
icon_state = "sakecup";
pixel_x = -8;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
icon_state = "sakecup";
pixel_x = 8;
pixel_y = 3
@@ -47,9 +47,9 @@
dir = 8
},
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug,
-/obj/item/reagent_containers/food/drinks/mug,
-/obj/item/reagent_containers/food/drinks/mug,
+/obj/item/reagent_containers/cup/glass/mug,
+/obj/item/reagent_containers/cup/glass/mug,
+/obj/item/reagent_containers/cup/glass/mug,
/turf/open/floor/holofloor{
dir = 9;
icon_state = "wood"
diff --git a/_maps/holodeck/workshop/donut.dmm b/_maps/holodeck/workshop/donut.dmm
index 16c4d478c545a..e8d69760d79e5 100644
--- a/_maps/holodeck/workshop/donut.dmm
+++ b/_maps/holodeck/workshop/donut.dmm
@@ -10,8 +10,8 @@
/obj/item/stack/package_wrap,
/obj/item/stack/package_wrap,
/obj/item/stack/package_wrap,
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/turf/open/floor/holofloor/monotile/steel,
/area/template_noop)
"f" = (
@@ -47,11 +47,11 @@
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/tile/dark_blue/fourcorners,
/obj/structure/closet/crate/freezer,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
/obj/effect/turf_decal/stripes/line{
dir = 9
},
@@ -126,20 +126,20 @@
/area/template_noop)
"I" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -8;
pixel_y = 11
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -9;
pixel_y = 5
},
/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/reagent_containers/food/condiment/sugar,
+/obj/item/reagent_containers/condiment/sugar,
+/obj/item/reagent_containers/condiment/sugar,
+/obj/item/reagent_containers/condiment/sugar,
+/obj/item/reagent_containers/condiment/sugar,
+/obj/item/reagent_containers/condiment/sugar,
/turf/open/floor/holofloor/monotile/steel,
/area/template_noop)
"J" = (
@@ -177,7 +177,7 @@
/obj/structure/table/reinforced,
/obj/effect/turf_decal/tile/dark_blue/fourcorners,
/obj/item/toy/figure/chef,
-/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/item/reagent_containers/condiment/enzyme,
/obj/effect/turf_decal/stripes/line{
dir = 6
},
@@ -225,12 +225,12 @@
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/tile/dark_blue/fourcorners,
/obj/structure/closet/crate/freezer,
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/soymilk,
-/obj/item/reagent_containers/food/condiment/soymilk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/soymilk,
+/obj/item/reagent_containers/condiment/soymilk,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/holofloor/monotile/steel,
/area/template_noop)
diff --git a/_maps/holodeck/workshop/plush.dmm b/_maps/holodeck/workshop/plush.dmm
index 4a7693aece527..1e1a1e7563a86 100644
--- a/_maps/holodeck/workshop/plush.dmm
+++ b/_maps/holodeck/workshop/plush.dmm
@@ -78,7 +78,7 @@
/area/template_noop)
"L" = (
/obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/tile/dark_green/fourcorners,
/turf/open/floor/holofloor/monotile/steel,
/area/template_noop)
@@ -121,9 +121,9 @@
"W" = (
/obj/structure/closet/crate,
/obj/effect/turf_decal/delivery,
-/obj/item/reagent_containers/glass/bottle/nutrient/ez,
-/obj/item/reagent_containers/glass/bottle/nutrient/ez,
-/obj/item/reagent_containers/glass/bottle/nutrient/ez,
+/obj/item/reagent_containers/cup/bottle/nutrient/ez,
+/obj/item/reagent_containers/cup/bottle/nutrient/ez,
+/obj/item/reagent_containers/cup/bottle/nutrient/ez,
/obj/effect/turf_decal/tile/dark_green/fourcorners,
/turf/open/floor/holofloor/monotile/steel,
/area/template_noop)
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 1fd3a2d0f0dae..1da44dc564995 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -1922,7 +1922,7 @@
/obj/structure/closet,
/obj/effect/landmark/blobstart,
/obj/effect/spawner/lootdrop/maintenance,
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"aAC" = (
@@ -3327,7 +3327,7 @@
"aQh" = (
/obj/structure/table/wood,
/obj/item/food/chips,
-/obj/item/reagent_containers/food/drinks/soda_cans/cola,
+/obj/item/reagent_containers/cup/soda_cans/cola,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 5
},
@@ -3962,7 +3962,7 @@
"aVW" = (
/obj/structure/table/wood,
/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -5;
pixel_y = 9
},
@@ -5065,7 +5065,7 @@
/area/medical/medbay/central)
"bhi" = (
/obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/stripes/end{
dir = 8
},
@@ -8658,11 +8658,11 @@
/obj/item/stack/sheet/mineral/plasma{
pixel_y = 4
},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 8;
pixel_y = 2
},
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_x = -3;
pixel_y = 3
},
@@ -10919,21 +10919,21 @@
/area/engine/atmos)
"ccO" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
pixel_x = -4;
pixel_y = 1
},
-/obj/item/reagent_containers/glass/bottle/chloralhydrate,
-/obj/item/reagent_containers/glass/bottle/toxin{
+/obj/item/reagent_containers/cup/bottle/chloralhydrate,
+/obj/item/reagent_containers/cup/bottle/toxin{
pixel_x = 6;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
pixel_x = 5;
pixel_y = 1
},
/obj/item/reagent_containers/syringe,
-/obj/item/reagent_containers/glass/bottle/facid{
+/obj/item/reagent_containers/cup/bottle/facid{
name = "fluorosulfuric acid bottle";
pixel_x = -3;
pixel_y = 6
@@ -13874,7 +13874,7 @@
/obj/item/storage/fancy/cigarettes/cigpack_robust{
pixel_x = -3
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 2;
pixel_y = 3
},
@@ -16069,7 +16069,7 @@
"daL" = (
/obj/structure/table/wood,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/obj/item/reagent_containers/food/drinks/bottle/holywater,
+/obj/item/reagent_containers/cup/glass/bottle/holywater,
/turf/open/floor/carpet/grimy,
/area/chapel/office)
"daM" = (
@@ -19002,7 +19002,7 @@
/obj/item/hatchet,
/obj/item/crowbar,
/obj/item/plant_analyzer,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/tile/green/half/contrasted,
/turf/open/floor/iron,
/area/hydroponics/garden)
@@ -20695,12 +20695,12 @@
/area/crew_quarters/kitchen)
"eSA" = (
/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{
pixel_x = 4
},
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/sugar,
+/obj/item/reagent_containers/condiment/enzyme{
pixel_y = 5
},
/turf/open/floor/prison,
@@ -24355,7 +24355,7 @@
/obj/structure/table/wood,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/siding/wood,
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
pixel_x = 7;
pixel_y = 10
},
@@ -24953,7 +24953,7 @@
dir = 8
},
/obj/structure/table,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/iron,
/area/hydroponics)
"gDE" = (
@@ -25210,7 +25210,7 @@
/obj/effect/turf_decal/siding/wideplating/dark{
dir = 6
},
-/obj/item/reagent_containers/food/drinks/bottle/lizardwine{
+/obj/item/reagent_containers/cup/glass/bottle/lizardwine{
pixel_x = 6;
pixel_y = 5
},
@@ -28282,7 +28282,7 @@
/area/maintenance/port/aft)
"hYo" = (
/obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/machinery/light_switch{
pixel_x = 28
},
@@ -29068,7 +29068,7 @@
pixel_x = -1;
pixel_y = 12
},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
pixel_x = 9;
pixel_y = 3
},
@@ -29627,11 +29627,11 @@
"iwV" = (
/obj/structure/safe,
/obj/item/clothing/head/costume/bearpelt,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
/obj/item/gun/ballistic/revolver/russian,
/obj/item/ammo_box/a357,
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka,
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
@@ -30490,11 +30490,11 @@
dir = 4
},
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 6;
pixel_y = -2
},
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/obj/item/toy/cards/deck{
pixel_x = -10;
pixel_y = 6
@@ -31464,7 +31464,7 @@
},
/obj/effect/turf_decal/bot,
/obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/structure/sign/poster/contraband/missing_gloves{
pixel_x = -32
},
@@ -32239,7 +32239,7 @@
/obj/structure/table/wood/fancy,
/obj/item/soulstone/anybody/chaplain,
/obj/item/organ/heart,
-/obj/item/reagent_containers/food/drinks/bottle/holywater,
+/obj/item/reagent_containers/cup/glass/bottle/holywater,
/obj/item/book/granter/spell/smoke/lesser,
/turf/open/floor/iron/dark,
/area/chapel/office)
@@ -35824,7 +35824,7 @@
/obj/item/pen/charcoal{
pixel_y = 8
},
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee{
pixel_x = -8;
pixel_y = 3
},
@@ -37108,15 +37108,15 @@
/turf/open/floor/carpet/royalblue,
/area/crew_quarters/bar/atrium)
"loD" = (
-/obj/item/reagent_containers/glass/beaker/cryoxadone,
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone,
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_y = 7
},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = 7;
pixel_y = 7
},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = 7;
pixel_y = 1
},
@@ -37129,7 +37129,7 @@
/obj/item/hatchet,
/obj/item/cultivator,
/obj/item/crowbar,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/plant_analyzer,
/obj/machinery/firealarm{
dir = 4;
@@ -37596,81 +37596,81 @@
/turf/open/floor/iron,
/area/hallway/primary/central)
"lAN" = (
-/obj/item/reagent_containers/glass/bottle/bromine{
+/obj/item/reagent_containers/cup/bottle/bromine{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/aluminium{
+/obj/item/reagent_containers/cup/bottle/aluminium{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/chlorine{
+/obj/item/reagent_containers/cup/bottle/chlorine{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/carbon{
+/obj/item/reagent_containers/cup/bottle/carbon{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/ethanol{
+/obj/item/reagent_containers/cup/bottle/ethanol{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/copper{
+/obj/item/reagent_containers/cup/bottle/copper{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/hydrogen{
+/obj/item/reagent_containers/cup/bottle/hydrogen{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/fluorine{
+/obj/item/reagent_containers/cup/bottle/fluorine{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/water{
+/obj/item/reagent_containers/cup/bottle/water{
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/lithium{
+/obj/item/reagent_containers/cup/bottle/lithium{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/iron{
+/obj/item/reagent_containers/cup/bottle/iron{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/iodine{
+/obj/item/reagent_containers/cup/bottle/iodine{
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/oxygen{
+/obj/item/reagent_containers/cup/bottle/oxygen{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/phosphorus{
+/obj/item/reagent_containers/cup/bottle/phosphorus{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/nitrogen{
+/obj/item/reagent_containers/cup/bottle/nitrogen{
pixel_x = -6;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/mercury{
+/obj/item/reagent_containers/cup/bottle/mercury{
pixel_x = 6;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/radium{
+/obj/item/reagent_containers/cup/bottle/radium{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/potassium{
+/obj/item/reagent_containers/cup/bottle/potassium{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/welding_fuel{
+/obj/item/reagent_containers/cup/bottle/welding_fuel{
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/sacid{
+/obj/item/reagent_containers/cup/bottle/sacid{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/silicon{
+/obj/item/reagent_containers/cup/bottle/silicon{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/silver{
+/obj/item/reagent_containers/cup/bottle/silver{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/sodium{
+/obj/item/reagent_containers/cup/bottle/sodium{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/sugar{
+/obj/item/reagent_containers/cup/bottle/sugar{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/sulfur{
+/obj/item/reagent_containers/cup/bottle/sulfur{
pixel_x = -6
},
/obj/structure/closet/crate/medical,
@@ -37732,7 +37732,7 @@
/turf/open/floor/iron,
/area/security/checkpoint/science)
"lBV" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/structure/reagent_dispensers/watertank/high,
/obj/effect/turf_decal/tile/dark_green/half/contrasted,
/turf/open/floor/iron,
@@ -38188,7 +38188,7 @@
/obj/item/knife,
/obj/item/paint/green,
/obj/item/pushbroom,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/iron,
/area/hallway/secondary/service)
"lMW" = (
@@ -41018,7 +41018,7 @@
pixel_y = 5
},
/obj/item/folder/blue,
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee{
pixel_x = -8;
pixel_y = 3
},
@@ -41883,11 +41883,11 @@
/area/bridge)
"nvZ" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 8;
pixel_y = 2
},
@@ -44412,7 +44412,7 @@
"owA" = (
/obj/structure/closet/crate/hydroponics,
/obj/item/shovel/spade,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/storage/toolbox/mechanical{
pixel_x = -4;
pixel_y = 4
@@ -46417,7 +46417,7 @@
dir = 1
},
/obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/machinery/light{
bulb_colour = "#22bfa2";
bulb_vacuum_colour = "#22bfa2";
@@ -51425,7 +51425,7 @@
pixel_y = 5
},
/obj/item/clothing/glasses/hud/security/sunglasses,
-/obj/item/reagent_containers/food/drinks/flask/det,
+/obj/item/reagent_containers/cup/glass/flask/det,
/turf/open/floor/carpet/green,
/area/security/detectives_office)
"rpN" = (
@@ -52282,7 +52282,7 @@
/turf/open/floor/plating,
/area/maintenance/port)
"rEo" = (
-/obj/item/reagent_containers/glass/bottle/salglu_solution{
+/obj/item/reagent_containers/cup/bottle/salglu_solution{
pixel_x = -8;
pixel_y = 10
},
@@ -52298,7 +52298,7 @@
pixel_y = 6;
pixel_x = 3
},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -8;
pixel_y = 3
},
@@ -53172,7 +53172,7 @@
pixel_x = -1;
pixel_y = 8
},
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
pixel_x = 13;
pixel_y = 17
},
@@ -53807,8 +53807,8 @@
pixel_x = 3;
pixel_y = 4
},
-/obj/item/reagent_containers/glass/bottle/nutrient/ez,
-/obj/item/reagent_containers/glass/bottle/nutrient/rh{
+/obj/item/reagent_containers/cup/bottle/nutrient/ez,
+/obj/item/reagent_containers/cup/bottle/nutrient/rh{
pixel_x = 2;
pixel_y = 1
},
@@ -54792,7 +54792,7 @@
/obj/item/stack/sheet/mineral/copper{
amount = 5
},
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/storage/toolbox/drone,
/obj/effect/turf_decal/tile/dark_green/half/contrasted{
dir = 4
@@ -55580,7 +55580,7 @@
pixel_x = 2;
pixel_y = 5
},
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/obj/item/stack/sheet/mineral/copper{
amount = 5
},
@@ -55889,10 +55889,10 @@
"sYk" = (
/obj/structure/table,
/obj/item/gps/mining/exploration,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -8
},
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
pixel_x = 9;
pixel_y = -3
},
@@ -61704,11 +61704,11 @@
/area/maintenance/starboard/fore)
"vpf" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -9;
pixel_y = 5
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -9
},
/obj/item/storage/box/papersack{
@@ -62046,7 +62046,7 @@
/area/maintenance/starboard/fore)
"vuz" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
/obj/item/kitchen/fork,
/turf/open/floor/prison,
/area/security/prison)
@@ -64196,11 +64196,11 @@
"wlD" = (
/obj/structure/table,
/obj/machinery/light,
-/obj/item/reagent_containers/food/drinks/beer/almost_empty{
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{
pixel_x = -6;
pixel_y = 2
},
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 8
},
/obj/structure/sign/poster/official/random{
@@ -64706,9 +64706,9 @@
/area/engine/atmos)
"wwq" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/obj/item/book/manual/wiki/barman_recipes,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
/obj/structure/noticeboard{
pixel_y = 29
},
@@ -65484,7 +65484,7 @@
/turf/open/floor/iron/dark,
/area/security/main)
"wMF" = (
-/obj/item/reagent_containers/food/drinks/mug{
+/obj/item/reagent_containers/cup/glass/mug{
pixel_x = 6;
pixel_y = -2
},
@@ -65699,7 +65699,7 @@
"wSz" = (
/obj/item/paper,
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
pixel_x = -5;
pixel_y = 1
},
@@ -65888,7 +65888,7 @@
dir = 1
},
/obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/iron,
/area/hydroponics)
"wWP" = (
@@ -66616,23 +66616,23 @@
/area/quartermaster/sorting)
"xnm" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
pixel_x = 2;
pixel_y = 12
},
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
pixel_x = -6;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
pixel_x = 9;
pixel_y = 12
},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
pixel_x = 5;
pixel_y = 5
},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
pixel_x = 2;
pixel_y = -1
},
diff --git a/_maps/map_files/CorgStation/CorgStation.dmm b/_maps/map_files/CorgStation/CorgStation.dmm
index 0535c2975972d..fd1bc73ee7e46 100644
--- a/_maps/map_files/CorgStation/CorgStation.dmm
+++ b/_maps/map_files/CorgStation/CorgStation.dmm
@@ -1329,7 +1329,7 @@
"anV" = (
/obj/structure/table/glass,
/obj/item/candle,
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
pixel_x = -7;
pixel_y = 10
},
@@ -1926,7 +1926,7 @@
/obj/machinery/requests_console{
pixel_x = 32
},
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
pixel_x = 4;
pixel_y = -1
},
@@ -6700,19 +6700,19 @@
"bSa" = (
/obj/structure/disposalpipe/segment,
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = 9;
pixel_y = 11
},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = -2;
pixel_y = 11
},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = 6;
pixel_y = 5
},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = -5;
pixel_y = 5
},
@@ -9644,7 +9644,7 @@
pixel_x = -1;
pixel_y = 1
},
-/obj/item/reagent_containers/glass/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine,
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 1
},
@@ -9792,7 +9792,7 @@
},
/obj/structure/table/wood,
/obj/item/clothing/glasses/hud/security/sunglasses,
-/obj/item/reagent_containers/food/drinks/flask/det,
+/obj/item/reagent_containers/cup/glass/flask/det,
/obj/effect/turf_decal/siding/wood{
dir = 8
},
@@ -10848,7 +10848,7 @@
pixel_y = -2
},
/obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/tile/green/anticorner/contrasted{
dir = 1
},
@@ -11990,9 +11990,9 @@
dir = 6
},
/obj/structure/rack,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/iron/dark,
/area/science/robotics/lab)
"dLE" = (
@@ -13453,7 +13453,7 @@
id = "medical_shutters";
name = "medical Shutters"
},
-/obj/item/reagent_containers/glass/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
/obj/machinery/door/window/northleft{
dir = 4;
name = "medbay Interior";
@@ -15129,7 +15129,7 @@
/area/engine/engine_room)
"eOo" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/obj/item/stack/spacecash/c10,
/obj/item/stack/spacecash/c100{
pixel_x = -1;
@@ -16924,10 +16924,10 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -8
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -3;
pixel_y = -1
},
@@ -18024,7 +18024,7 @@
/area/hydroponics)
"fLK" = (
/obj/structure/closet/crate,
-/obj/item/reagent_containers/food/condiment/sugar,
+/obj/item/reagent_containers/condiment/sugar,
/obj/item/storage/fancy/egg_box,
/obj/item/storage/fancy/egg_box,
/turf/open/floor/plating,
@@ -18332,11 +18332,11 @@
/area/security/checkpoint/supply)
"fQu" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/beer/light{
+/obj/item/reagent_containers/cup/glass/bottle/beer/light{
pixel_x = -5;
pixel_y = 7
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 5;
pixel_y = 10
},
@@ -19685,9 +19685,9 @@
/area/science/lab)
"goL" = (
/obj/structure/closet/crate,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/sugar,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/sugar,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"goM" = (
@@ -24887,7 +24887,7 @@
/turf/open/floor/iron,
/area/hallway/secondary/command)
"hVH" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/assembly/prox_sensor,
/obj/item/mop,
/obj/item/bodypart/r_arm/robot,
@@ -24918,7 +24918,7 @@
/area/medical/virology)
"hWu" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/holywater,
+/obj/item/reagent_containers/cup/glass/bottle/holywater,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
},
@@ -25688,8 +25688,8 @@
/obj/structure/table/glass,
/obj/item/storage/bag/plants/portaseeder,
/obj/item/storage/bag/plants/portaseeder,
-/obj/item/reagent_containers/glass/bottle/nutrient/ez,
-/obj/item/reagent_containers/glass/bottle/nutrient/ez,
+/obj/item/reagent_containers/cup/bottle/nutrient/ez,
+/obj/item/reagent_containers/cup/bottle/nutrient/ez,
/turf/open/floor/grass,
/area/hydroponics/garden)
"iiO" = (
@@ -26859,7 +26859,7 @@
/area/engine/atmos)
"izd" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = -4;
pixel_y = 2
},
@@ -27158,7 +27158,7 @@
/area/science/nanite)
"iEL" = (
/obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
/area/hydroponics)
@@ -28124,11 +28124,11 @@
/area/science/xenobiology)
"iXf" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = 3;
pixel_y = 4
},
@@ -30042,7 +30042,7 @@
/area/maintenance/fore)
"jDX" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
/turf/open/floor/prison/dark,
/area/security/prison)
"jEd" = (
@@ -30646,11 +30646,11 @@
"jOn" = (
/obj/structure/table/reinforced,
/obj/item/book/manual/wiki/cooking_to_serve_man,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
pixel_y = 5
},
-/obj/item/reagent_containers/food/condiment/saltshaker,
-/obj/item/reagent_containers/food/condiment/sugar,
+/obj/item/reagent_containers/condiment/saltshaker,
+/obj/item/reagent_containers/condiment/sugar,
/obj/effect/turf_decal/tile/red,
/turf/open/floor/iron/white,
/area/crew_quarters/kitchen)
@@ -32264,7 +32264,7 @@
dir = 1
},
/obj/machinery/airalarm/directional/north,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/tile/green/anticorner/contrasted{
dir = 1
},
@@ -32998,8 +32998,8 @@
/obj/structure/table,
/obj/item/stack/package_wrap,
/obj/item/stack/package_wrap,
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
@@ -33967,7 +33967,7 @@
/turf/open/floor/iron/white,
/area/medical/medbay/lobby)
"kTr" = (
-/obj/item/reagent_containers/food/drinks/mug/cocoa{
+/obj/item/reagent_containers/cup/glass/mug/cocoa{
pixel_x = 10
},
/obj/structure/table,
@@ -34531,7 +34531,7 @@
/area/teleporter)
"lcN" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
/obj/item/reagent_containers/syringe/epinephrine,
/obj/effect/turf_decal/tile/blue/fourcorners/contrasted,
/turf/open/floor/iron/white,
@@ -37875,11 +37875,11 @@
/area/maintenance/starboard/aft)
"mfc" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/food/drinks/bottle/synthflesh{
+/obj/item/reagent_containers/cup/glass/bottle/synthflesh{
pixel_x = 2;
pixel_y = 8
},
-/obj/item/reagent_containers/food/drinks/bottle/synthflesh{
+/obj/item/reagent_containers/cup/glass/bottle/synthflesh{
pixel_x = -3;
pixel_y = 4
},
@@ -39175,11 +39175,11 @@
/area/security/prison)
"mxF" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -8;
pixel_y = 9
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -8;
pixel_y = 4
},
@@ -41981,7 +41981,7 @@
/area/janitor)
"ntl" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_x = -8;
pixel_y = 8
},
@@ -43106,10 +43106,10 @@
dir = 4
},
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -8
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -3;
pixel_y = -1
},
@@ -43401,7 +43401,7 @@
/area/medical/surgery)
"nPW" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -1;
pixel_y = 4
},
@@ -44184,7 +44184,7 @@
/area/maintenance/starboard/aft)
"ods" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = 4;
pixel_y = 10
},
@@ -45437,15 +45437,15 @@
/area/science/shuttle)
"ozd" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/food/drinks/bottle/synthflesh{
+/obj/item/reagent_containers/cup/glass/bottle/synthflesh{
pixel_x = -1;
pixel_y = 14
},
-/obj/item/reagent_containers/food/drinks/bottle/synthflesh{
+/obj/item/reagent_containers/cup/glass/bottle/synthflesh{
pixel_x = -7;
pixel_y = 11
},
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee{
pixel_x = 6;
pixel_y = 4
},
@@ -46905,11 +46905,11 @@
/area/science/xenobiology)
"paH" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = -2;
pixel_y = 6
},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 2;
pixel_y = 4
},
@@ -50868,7 +50868,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
-/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
/obj/effect/turf_decal/tile/red/fourcorners/contrasted,
/turf/open/floor/iron/white,
/area/crew_quarters/kitchen)
@@ -53907,23 +53907,23 @@
/area/hallway/primary/aft)
"rup" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
pixel_x = 2;
pixel_y = 12
},
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
pixel_x = -6;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
pixel_x = 9;
pixel_y = 12
},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
pixel_x = 5;
pixel_y = 5
},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
pixel_x = 2;
pixel_y = -1
},
@@ -54641,11 +54641,11 @@
/area/hallway/primary/central)
"rGa" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -2;
pixel_y = 1
},
@@ -55409,7 +55409,7 @@
/area/crew_quarters/fitness/recreation)
"rUv" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -9;
pixel_y = 4
},
@@ -55767,15 +55767,15 @@
/area/engine/atmos)
"sac" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
pixel_x = 2;
pixel_y = 9
},
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
pixel_x = -5;
pixel_y = 1
},
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
pixel_x = 5;
pixel_y = 1
},
@@ -55997,11 +55997,11 @@
pixel_y = -1;
pixel_x = -7
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 8;
pixel_y = 1
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 3;
pixel_y = 1
},
@@ -56389,7 +56389,7 @@
/area/science/robotics/lab)
"skk" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour{
pixel_x = -2;
pixel_y = 13
},
@@ -56408,10 +56408,10 @@
/area/security/prison)
"sks" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -8
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -8;
pixel_y = 5
},
@@ -56641,81 +56641,81 @@
/turf/open/floor/iron/white/corner,
/area/science/research)
"sou" = (
-/obj/item/reagent_containers/glass/bottle/bromine{
+/obj/item/reagent_containers/cup/bottle/bromine{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/aluminium{
+/obj/item/reagent_containers/cup/bottle/aluminium{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/chlorine{
+/obj/item/reagent_containers/cup/bottle/chlorine{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/carbon{
+/obj/item/reagent_containers/cup/bottle/carbon{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/ethanol{
+/obj/item/reagent_containers/cup/bottle/ethanol{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/copper{
+/obj/item/reagent_containers/cup/bottle/copper{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/hydrogen{
+/obj/item/reagent_containers/cup/bottle/hydrogen{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/fluorine{
+/obj/item/reagent_containers/cup/bottle/fluorine{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/water{
+/obj/item/reagent_containers/cup/bottle/water{
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/lithium{
+/obj/item/reagent_containers/cup/bottle/lithium{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/iron{
+/obj/item/reagent_containers/cup/bottle/iron{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/iodine{
+/obj/item/reagent_containers/cup/bottle/iodine{
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/oxygen{
+/obj/item/reagent_containers/cup/bottle/oxygen{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/phosphorus{
+/obj/item/reagent_containers/cup/bottle/phosphorus{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/nitrogen{
+/obj/item/reagent_containers/cup/bottle/nitrogen{
pixel_x = -6;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/mercury{
+/obj/item/reagent_containers/cup/bottle/mercury{
pixel_x = 6;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/radium{
+/obj/item/reagent_containers/cup/bottle/radium{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/potassium{
+/obj/item/reagent_containers/cup/bottle/potassium{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/welding_fuel{
+/obj/item/reagent_containers/cup/bottle/welding_fuel{
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/sacid{
+/obj/item/reagent_containers/cup/bottle/sacid{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/silicon{
+/obj/item/reagent_containers/cup/bottle/silicon{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/silver{
+/obj/item/reagent_containers/cup/bottle/silver{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/sodium{
+/obj/item/reagent_containers/cup/bottle/sodium{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/sugar{
+/obj/item/reagent_containers/cup/bottle/sugar{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/sulfur{
+/obj/item/reagent_containers/cup/bottle/sulfur{
pixel_x = -6
},
/obj/structure/closet/crate/medical,
@@ -57596,7 +57596,7 @@
/area/crew_quarters/heads/chief)
"sDy" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee{
pixel_x = 6;
pixel_y = 6
},
@@ -57867,11 +57867,11 @@
name = "Hydroponics Desk";
req_access_txt = "35"
},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = -1;
pixel_y = 1
},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 3;
pixel_y = 3
},
@@ -59723,9 +59723,9 @@
dir = 8
},
/obj/structure/closet/crate,
-/obj/item/reagent_containers/glass/bottle/chloralhydrate,
-/obj/item/reagent_containers/glass/bottle/chloralhydrate,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/bottle/chloralhydrate,
+/obj/item/reagent_containers/cup/bottle/chloralhydrate,
+/obj/item/reagent_containers/cup/rag,
/obj/effect/turf_decal/tile/red/opposingcorners{
dir = 1
},
@@ -60331,16 +60331,16 @@
"tzW" = (
/obj/structure/table/reinforced,
/obj/item/book/manual/wiki/cooking_to_serve_man,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
pixel_y = 5
},
-/obj/item/reagent_containers/food/condiment/peppermill,
+/obj/item/reagent_containers/condiment/peppermill,
/obj/machinery/requests_console{
department = "Kitchen";
departmentType = 2;
pixel_y = -32
},
-/obj/item/reagent_containers/food/condiment/sugar,
+/obj/item/reagent_containers/condiment/sugar,
/obj/effect/turf_decal/tile/red,
/turf/open/floor/iron/white,
/area/crew_quarters/kitchen)
@@ -61203,15 +61203,15 @@
/area/engine/atmos)
"tNf" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing{
+/obj/item/reagent_containers/cup/glass/bottle/bottleofnothing{
pixel_x = 4;
pixel_y = 6
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -4;
pixel_y = 10
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -6;
pixel_y = 6
},
@@ -62044,7 +62044,7 @@
/area/hallway/primary/aft)
"ucp" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = -4;
pixel_y = 2
},
@@ -62431,11 +62431,11 @@
pixel_x = -8;
pixel_y = 7
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = 8;
pixel_y = 12
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 8;
pixel_y = 6
},
@@ -64243,11 +64243,11 @@
/area/quartermaster/warehouse)
"uLg" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -8;
pixel_y = 10
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -8;
pixel_y = 5
},
@@ -65592,7 +65592,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/item/reagent_containers/glass/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
/obj/item/reagent_containers/syringe/epinephrine{
pixel_x = -1;
pixel_y = -1
@@ -67376,7 +67376,7 @@
/obj/structure/desk_bell{
pixel_x = -8
},
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
pixel_x = 9;
pixel_y = -3
},
@@ -67701,7 +67701,7 @@
/area/crew_quarters/heads/chief)
"vOe" = (
/obj/structure/table/wood/fancy/royalblue,
-/obj/item/reagent_containers/food/drinks/flask/gold{
+/obj/item/reagent_containers/cup/glass/flask/gold{
pixel_x = -1;
pixel_y = 9
},
@@ -69485,10 +69485,10 @@
pixel_y = -30
},
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -8
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -3;
pixel_y = -1
},
@@ -70196,10 +70196,10 @@
dir = 4
},
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -8
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -3;
pixel_y = -1
},
@@ -70721,11 +70721,11 @@
pixel_y = 32
},
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_x = -3;
pixel_y = 4
},
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_x = -6;
pixel_y = 2
},
@@ -73632,9 +73632,9 @@
"xNY" = (
/obj/structure/table/wood,
/obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/obj/machinery/newscaster{
pixel_y = 32
},
@@ -74136,23 +74136,23 @@
/obj/effect/turf_decal/tile/neutral,
/obj/structure/table/reinforced,
/obj/effect/turf_decal/tile/red/anticorner/contrasted,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_y = 2;
pixel_x = 11
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_y = 2;
pixel_x = 3
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_y = 13;
pixel_x = 11
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_y = 13;
pixel_x = 3
},
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{
pixel_x = -8;
pixel_y = 7
},
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index cd50602ce6b8f..c07c8e95899c7 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -1229,11 +1229,11 @@
/area/maintenance/starboard/fore)
"ajQ" = (
/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/effect/turf_decal/delivery,
@@ -3654,7 +3654,7 @@
/area/engine/atmospherics_engine)
"axJ" = (
/obj/structure/rack,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/port/fore)
@@ -5273,7 +5273,7 @@
/obj/effect/turf_decal/bot,
/obj/item/plate/small,
/obj/item/food/mint,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
pixel_y = 5;
pixel_x = -4
},
@@ -7428,8 +7428,8 @@
dir = 8;
pixel_x = -12
},
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/decal/cleanable/dirt,
/obj/item/mop,
/obj/item/mop,
@@ -8046,7 +8046,7 @@
dir = 1;
pixel_y = 1
},
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/hydroponics)
@@ -8320,7 +8320,7 @@
"bdq" = (
/obj/structure/reagent_dispensers/watertank,
/obj/structure/window/reinforced,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/bot,
/obj/structure/sign/poster/official/nanotrasen_logo{
pixel_x = -32
@@ -8792,7 +8792,7 @@
/obj/structure/table/reinforced,
/obj/item/storage/bag/tray,
/obj/effect/turf_decal/bot,
-/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
/turf/open/floor/iron,
/area/crew_quarters/kitchen)
"bgt" = (
@@ -8952,7 +8952,7 @@
/area/engine/atmos)
"bhy" = (
/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/structure/window/reinforced{
dir = 8
},
@@ -8961,7 +8961,7 @@
/area/hydroponics)
"bhz" = (
/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/structure/window/reinforced{
dir = 4
},
@@ -9596,11 +9596,11 @@
/area/crew_quarters/kitchen)
"blA" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -8;
pixel_y = 5
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -8
},
/obj/item/knife/kitchen,
@@ -14365,8 +14365,8 @@
receive_ore_updates = 1
},
/obj/item/book/manual/wiki/barman_recipes,
-/obj/item/reagent_containers/food/drinks/shaker,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/glass/shaker,
+/obj/item/reagent_containers/cup/rag,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron/dark,
/area/crew_quarters/bar)
@@ -15888,7 +15888,7 @@
},
/obj/item/clothing/mask/cigarette/cigar,
/obj/item/clothing/glasses/hud/security/sunglasses,
-/obj/item/reagent_containers/food/drinks/flask/det,
+/obj/item/reagent_containers/cup/glass/flask/det,
/turf/open/floor/carpet/red,
/area/security/detectives_office)
"ceQ" = (
@@ -16117,7 +16117,7 @@
name = "Captain's Intercom";
pixel_x = -26
},
-/obj/item/reagent_containers/food/drinks/flask/gold,
+/obj/item/reagent_containers/cup/glass/flask/gold,
/obj/item/razor,
/turf/open/floor/carpet/royalblue,
/area/crew_quarters/heads/captain/private)
@@ -16502,7 +16502,7 @@
"ciH" = (
/obj/item/paper,
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
pixel_x = -5;
pixel_y = 1
},
@@ -19174,10 +19174,10 @@
/area/crew_quarters/locker)
"cxs" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
/obj/item/reagent_containers/syringe,
/turf/open/floor/iron,
/area/medical/medbay/lobby)
@@ -20333,7 +20333,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/item/reagent_containers/food/drinks/bottle/whiskey,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey,
/turf/open/floor/carpet/blue,
/area/bridge/showroom/corporate)
"cCZ" = (
@@ -21940,8 +21940,8 @@
"cKS" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker,
/obj/item/reagent_containers/dropper,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
@@ -23473,8 +23473,8 @@
/obj/item/stack/sheet/mineral/plasma{
amount = 5
},
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker,
/obj/item/reagent_containers/dropper,
/obj/machinery/light{
dir = 4
@@ -25329,8 +25329,8 @@
"dkc" = (
/obj/structure/table/reinforced,
/obj/item/folder/white,
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker,
/obj/item/reagent_containers/dropper,
/obj/structure/extinguisher_cabinet{
pixel_y = -32
@@ -32977,7 +32977,7 @@
"eFd" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/plating,
/area/maintenance/starboard)
"eFj" = (
@@ -34171,12 +34171,12 @@
/area/medical/chemistry)
"eZt" = (
/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{
pixel_x = 4
},
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/sugar,
+/obj/item/reagent_containers/condiment/enzyme{
pixel_y = 5
},
/obj/effect/turf_decal/tile/red/half/contrasted{
@@ -34827,10 +34827,10 @@
/obj/item/stack/sheet/mineral/plasma,
/obj/item/stack/sheet/mineral/plasma,
/obj/item/stack/sheet/mineral/plasma,
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
/obj/item/reagent_containers/dropper,
/obj/item/storage/box/beakers{
pixel_x = -5;
@@ -36162,81 +36162,81 @@
/turf/open/floor/catwalk_floor/flat_white,
/area/science/mixing)
"fHD" = (
-/obj/item/reagent_containers/glass/bottle/bromine{
+/obj/item/reagent_containers/cup/bottle/bromine{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/aluminium{
+/obj/item/reagent_containers/cup/bottle/aluminium{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/chlorine{
+/obj/item/reagent_containers/cup/bottle/chlorine{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/carbon{
+/obj/item/reagent_containers/cup/bottle/carbon{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/ethanol{
+/obj/item/reagent_containers/cup/bottle/ethanol{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/copper{
+/obj/item/reagent_containers/cup/bottle/copper{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/hydrogen{
+/obj/item/reagent_containers/cup/bottle/hydrogen{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/fluorine{
+/obj/item/reagent_containers/cup/bottle/fluorine{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/water{
+/obj/item/reagent_containers/cup/bottle/water{
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/lithium{
+/obj/item/reagent_containers/cup/bottle/lithium{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/iron{
+/obj/item/reagent_containers/cup/bottle/iron{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/iodine{
+/obj/item/reagent_containers/cup/bottle/iodine{
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/oxygen{
+/obj/item/reagent_containers/cup/bottle/oxygen{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/phosphorus{
+/obj/item/reagent_containers/cup/bottle/phosphorus{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/nitrogen{
+/obj/item/reagent_containers/cup/bottle/nitrogen{
pixel_x = -6;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/mercury{
+/obj/item/reagent_containers/cup/bottle/mercury{
pixel_x = 6;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/radium{
+/obj/item/reagent_containers/cup/bottle/radium{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/potassium{
+/obj/item/reagent_containers/cup/bottle/potassium{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/welding_fuel{
+/obj/item/reagent_containers/cup/bottle/welding_fuel{
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/sacid{
+/obj/item/reagent_containers/cup/bottle/sacid{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/silicon{
+/obj/item/reagent_containers/cup/bottle/silicon{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/silver{
+/obj/item/reagent_containers/cup/bottle/silver{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/sodium{
+/obj/item/reagent_containers/cup/bottle/sodium{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/sugar{
+/obj/item/reagent_containers/cup/bottle/sugar{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/sulfur{
+/obj/item/reagent_containers/cup/bottle/sulfur{
pixel_x = -6
},
/obj/structure/closet/crate/medical,
@@ -40083,20 +40083,20 @@
/area/crew_quarters/heads/captain)
"gOU" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = -6;
pixel_y = 6
},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = 6;
pixel_y = 6
},
/obj/item/storage/pill_bottle/mannitol,
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = -2;
pixel_y = 9
},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = 5;
pixel_y = 9
},
@@ -40363,7 +40363,7 @@
pixel_x = -1;
pixel_y = 12
},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
pixel_x = 9;
pixel_y = 3
},
@@ -41622,7 +41622,7 @@
/area/crew_quarters/locker)
"hlk" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/coffee,
+/obj/item/reagent_containers/cup/glass/coffee,
/obj/effect/turf_decal/tile/red/opposingcorners,
/obj/effect/turf_decal/tile/yellow/opposingcorners{
dir = 1
@@ -42796,7 +42796,7 @@
/area/medical/virology)
"hGh" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/orangejuice,
+/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice,
/obj/effect/turf_decal/tile/red/opposingcorners,
/obj/effect/turf_decal/tile/yellow/opposingcorners{
dir = 1
@@ -43880,7 +43880,7 @@
"hVg" = (
/obj/structure/table/wood/fancy,
/obj/item/organ/heart,
-/obj/item/reagent_containers/food/drinks/bottle/holywater,
+/obj/item/reagent_containers/cup/glass/bottle/holywater,
/obj/item/soulstone/anybody/chaplain,
/obj/item/book/granter/spell/smoke/lesser,
/turf/open/floor/carpet/grimy,
@@ -44010,8 +44010,8 @@
/obj/machinery/reagentgrinder{
pixel_y = 5
},
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable/yellow{
icon_state = "0-8"
@@ -45824,7 +45824,7 @@
/area/hallway/primary/central)
"iBx" = (
/obj/structure/bonfire,
-/obj/item/reagent_containers/food/drinks/bottle/orangejuice{
+/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice{
desc = "For the weary spacemen on their quest to rekindle the first plasma fire.";
name = "Carton of Estus"
},
@@ -46810,7 +46810,7 @@
/area/storage/primary)
"iVm" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko,
+/obj/item/reagent_containers/cup/soda_cans/thirteenloko,
/obj/machinery/firealarm{
dir = 4;
pixel_x = -24
@@ -49737,7 +49737,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 1
},
-/obj/item/reagent_containers/food/drinks/bottle/whiskey,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey,
/obj/effect/mapping_helpers/dead_body_placer,
/turf/open/floor/iron,
/area/medical/morgue)
@@ -59978,7 +59978,7 @@
/area/quartermaster/storage)
"nkq" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb,
/obj/machinery/camera/directional/east{
c_tag = "Science - Break Room";
name = "science camera"
@@ -60961,7 +60961,7 @@
/obj/effect/turf_decal/delivery,
/obj/structure/rack,
/obj/item/clothing/head/utility/chefhat,
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
/turf/open/floor/iron,
/area/crew_quarters/kitchen)
"nze" = (
@@ -63100,7 +63100,7 @@
/area/science/research)
"ohm" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/soda_cans/cola,
+/obj/item/reagent_containers/cup/soda_cans/cola,
/obj/effect/turf_decal/tile/red/opposingcorners,
/obj/effect/turf_decal/tile/yellow/opposingcorners{
dir = 1
@@ -69380,23 +69380,23 @@
/area/science/xenobiology)
"qnP" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
pixel_x = 2;
pixel_y = 12
},
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
pixel_x = -6;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
pixel_x = 9;
pixel_y = 12
},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
pixel_x = 5;
pixel_y = 5
},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
pixel_x = 2;
pixel_y = -1
},
@@ -70627,7 +70627,7 @@
/area/maintenance/starboard/aft)
"qHA" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
/obj/item/kitchen/fork,
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 1
@@ -72261,7 +72261,7 @@
/area/quartermaster/office)
"rhP" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/britcup,
+/obj/item/reagent_containers/cup/glass/britcup,
/obj/effect/turf_decal/tile/red/opposingcorners,
/obj/effect/turf_decal/tile/yellow/opposingcorners{
dir = 1
@@ -72624,12 +72624,12 @@
pixel_y = 2
},
/obj/machinery/vending/wallmed{
- contraband = list(/obj/item/reagent_containers/glass/bottle/chloralhydrate = 1, /obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/glass/bottle/random_virus = 1);
+ contraband = list(/obj/item/reagent_containers/cup/bottle/chloralhydrate = 1, /obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/cup/bottle/random_virus = 1);
name = "Upgraded NanoMed";
pixel_x = -1;
pixel_y = -32;
premium = list(/obj/item/storage/firstaid/regular = 3, /obj/item/storage/belt/medical = 3, /obj/item/sensor_device = 2, /obj/item/pinpointer/crew = 2, /obj/item/healthanalyzer = 2, /obj/item/wrench/medical = 1);
- products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/reagent_containers/medspray = 6, /obj/item/storage/pill_bottle = 6, /obj/item/reagent_containers/glass/bottle = 10, /obj/item/reagent_containers/spray/cleaner = 1, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/hypospray/medipen = 8, /obj/item/reagent_containers/hypospray/medipen/dexalin = 8, /obj/item/reagent_containers/glass/bottle/epinephrine = 4, /obj/item/reagent_containers/glass/bottle/charcoal = 4, /obj/item/reagent_containers/glass/bottle/salglu_solution = 4, /obj/item/reagent_containers/glass/bottle/tricordrazine = 1, /obj/item/reagent_containers/glass/bottle/spaceacillin = 1, /obj/item/reagent_containers/glass/bottle/morphine = 2, /obj/item/reagent_containers/glass/bottle/toxin = 4, /obj/item/reagent_containers/medspray/sterilizine = 4)
+ products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/reagent_containers/medspray = 6, /obj/item/storage/pill_bottle = 6, /obj/item/reagent_containers/cup/bottle = 10, /obj/item/reagent_containers/spray/cleaner = 1, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/hypospray/medipen = 8, /obj/item/reagent_containers/hypospray/medipen/dexalin = 8, /obj/item/reagent_containers/cup/bottle/epinephrine = 4, /obj/item/reagent_containers/cup/bottle/charcoal = 4, /obj/item/reagent_containers/cup/bottle/salglu_solution = 4, /obj/item/reagent_containers/cup/bottle/tricordrazine = 1, /obj/item/reagent_containers/cup/bottle/spaceacillin = 1, /obj/item/reagent_containers/cup/bottle/morphine = 2, /obj/item/reagent_containers/cup/bottle/toxin = 4, /obj/item/reagent_containers/medspray/sterilizine = 4)
},
/obj/item/reagent_containers/dropper{
pixel_x = 2;
@@ -74336,11 +74336,11 @@
/turf/open/floor/iron,
/area/science/research)
"rMB" = (
-/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/structure/table/wood,
@@ -76491,7 +76491,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/item/reagent_containers/glass/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine,
/turf/open/floor/iron/dark,
/area/ai_monitored/security/armory)
"stW" = (
@@ -77057,7 +77057,7 @@
/area/security/execution/transfer)
"sCM" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/effect/turf_decal/tile/red/opposingcorners,
/obj/effect/turf_decal/tile/yellow/opposingcorners{
@@ -79053,17 +79053,17 @@
pixel_x = 25
},
/obj/item/paper_bin,
-/obj/item/reagent_containers/food/drinks/britcup,
+/obj/item/reagent_containers/cup/glass/britcup,
/turf/open/floor/iron/white,
/area/medical/medbay/central)
"tku" = (
/obj/structure/table/reinforced,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
pixel_x = 7;
pixel_y = -1
},
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
pixel_x = -7;
pixel_y = 5
},
@@ -79737,14 +79737,14 @@
name = "Kitchen Counter Shutters"
},
/obj/effect/turf_decal/delivery,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -8
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -8;
pixel_y = 5
},
-/obj/item/reagent_containers/food/drinks/britcup,
+/obj/item/reagent_containers/cup/glass/britcup,
/obj/machinery/door/firedoor,
/turf/open/floor/iron,
/area/crew_quarters/kitchen)
@@ -80542,7 +80542,7 @@
"tHG" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/plating,
/area/maintenance/department/medical/central)
"tHM" = (
@@ -83610,7 +83610,7 @@
/obj/structure/sign/warning/nosmoking{
pixel_x = 32
},
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
@@ -84720,7 +84720,7 @@
"vbA" = (
/obj/structure/table/glass,
/obj/effect/turf_decal/tile/yellow/opposingcorners,
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_x = 7;
pixel_y = 17
},
@@ -84732,7 +84732,7 @@
pixel_x = -6;
pixel_y = 6
},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 9;
pixel_y = 7
},
@@ -85648,7 +85648,7 @@
/obj/item/folder/yellow,
/obj/item/pen,
/obj/effect/turf_decal/bot,
-/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko,
+/obj/item/reagent_containers/cup/soda_cans/thirteenloko,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -85988,7 +85988,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/janitorialcart,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/mop,
/turf/open/floor/iron/white,
/area/janitor/custodian)
@@ -86721,15 +86721,15 @@
/area/bridge)
"vHo" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -3;
pixel_y = 15
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -6;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
desc = "Whatever it is, it reeks of foul, putrid froth.";
list_reagents = list(/datum/reagent/consumable/ethanol/bacchus_blessing = 15);
name = "Delta-Down";
@@ -93279,10 +93279,10 @@
/area/medical/patients_rooms)
"xDQ" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
/obj/item/reagent_containers/syringe,
/obj/effect/turf_decal/delivery,
/obj/machinery/door/firedoor,
@@ -94892,21 +94892,21 @@
/area/crew_quarters/bar/atrium)
"ydf" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
pixel_x = -4;
pixel_y = 1
},
-/obj/item/reagent_containers/glass/bottle/chloralhydrate,
-/obj/item/reagent_containers/glass/bottle/toxin{
+/obj/item/reagent_containers/cup/bottle/chloralhydrate,
+/obj/item/reagent_containers/cup/bottle/toxin{
pixel_x = 6;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
pixel_x = 5;
pixel_y = 1
},
/obj/item/reagent_containers/syringe,
-/obj/item/reagent_containers/glass/bottle/facid{
+/obj/item/reagent_containers/cup/bottle/facid{
name = "fluorosulfuric acid bottle";
pixel_x = -3;
pixel_y = 6
diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm
index f83636d246099..1160b09d30732 100644
--- a/_maps/map_files/EchoStation/EchoStation.dmm
+++ b/_maps/map_files/EchoStation/EchoStation.dmm
@@ -3175,7 +3175,7 @@
pixel_x = -6;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
pixel_x = 4;
pixel_y = -5
},
@@ -3325,7 +3325,7 @@
pixel_x = -1;
pixel_y = 6
},
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
desc = "Kingston's personal cup.";
pixel_x = 16
},
@@ -4711,10 +4711,10 @@
/area/quartermaster/storage)
"cbu" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_y = 25
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_y = 21
},
/obj/effect/turf_decal/siding/wood,
@@ -6663,7 +6663,7 @@
/obj/machinery/status_display/evac{
pixel_y = -32
},
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
/area/maintenance/department/medical/morgue)
@@ -9973,7 +9973,7 @@
/area/engine/atmos)
"eNg" = (
/obj/effect/turf_decal/siding/wood,
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
pixel_x = 12;
pixel_y = 7
},
@@ -10366,7 +10366,7 @@
/area/science/robotics)
"eVT" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/obj/effect/turf_decal/stripes/corner{
dir = 4
},
@@ -11971,7 +11971,7 @@
/turf/open/openspace,
/area/engineering/hallway)
"fKS" = (
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
pixel_x = -13;
pixel_y = -11
},
@@ -12621,7 +12621,7 @@
/turf/closed/wall,
/area/maintenance/department/chapel)
"fZX" = (
-/obj/item/reagent_containers/food/drinks/shaker{
+/obj/item/reagent_containers/cup/glass/shaker{
pixel_x = -8;
pixel_y = 2
},
@@ -14634,10 +14634,10 @@
/turf/open/floor/iron/cafeteria_red,
/area/crew_quarters/cafeteria)
"haN" = (
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_y = 25
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_y = 21
},
/obj/structure/table/wood,
@@ -15069,7 +15069,7 @@
dir = 8
},
/obj/effect/turf_decal/tile/neutral/half/contrasted,
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
pixel_x = -5;
pixel_y = 14
},
@@ -15126,7 +15126,7 @@
icon_state = "0-2"
},
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
pixel_x = 5;
pixel_y = 8
},
@@ -15193,7 +15193,7 @@
pixel_x = -5;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 6;
pixel_y = 10
},
@@ -15201,7 +15201,7 @@
pixel_x = -3;
pixel_y = -4
},
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_x = 9;
pixel_y = 1
},
@@ -15351,7 +15351,7 @@
pixel_x = -4;
pixel_y = 5
},
-/obj/item/reagent_containers/food/drinks/bottle/holywater{
+/obj/item/reagent_containers/cup/glass/bottle/holywater{
pixel_x = 8;
pixel_y = 4
},
@@ -15725,7 +15725,7 @@
dir = 4
},
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/lizardwine{
+/obj/item/reagent_containers/cup/glass/bottle/lizardwine{
pixel_x = 11;
pixel_y = 23
},
@@ -17911,7 +17911,7 @@
pixel_x = 10;
pixel_y = 9
},
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee{
pixel_x = 4;
pixel_y = 12
},
@@ -18256,7 +18256,7 @@
/area/maintenance/department/medical/central)
"iYE" = (
/obj/effect/turf_decal/bot,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/structure/closet/secure_closet/hydroponics{
req_access = null;
req_one_access_txt = "28;25;35"
@@ -18821,11 +18821,11 @@
dir = 8
},
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -9;
pixel_y = 2
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -2;
pixel_y = 2
},
@@ -19772,11 +19772,11 @@
dir = 1
},
/obj/structure/table,
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = -2;
pixel_y = 12
},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = -6;
pixel_y = 9
},
@@ -22171,7 +22171,7 @@
/obj/structure/table,
/obj/item/crowbar,
/obj/item/wrench,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/maintenance/department/medical/morgue)
@@ -22241,15 +22241,15 @@
/area/maintenance/department/science/central)
"kUF" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/beer/light{
+/obj/item/reagent_containers/cup/glass/bottle/beer/light{
pixel_x = -8;
pixel_y = 11
},
-/obj/item/reagent_containers/food/drinks/beer/light{
+/obj/item/reagent_containers/cup/glass/bottle/beer/light{
pixel_x = 9;
pixel_y = 6
},
-/obj/item/reagent_containers/food/drinks/beer/light{
+/obj/item/reagent_containers/cup/glass/bottle/beer/light{
pixel_y = 3
},
/obj/effect/spawner/lootdrop/glowstick/lit,
@@ -22438,7 +22438,7 @@
/area/quartermaster/qm)
"lbc" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/tile/dark_green/anticorner/contrasted{
dir = 1
},
@@ -23093,7 +23093,7 @@
dir = 10
},
/obj/machinery/biogenerator,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/prison/dark,
/area/security/prison)
"lsH" = (
@@ -23913,7 +23913,7 @@
/obj/structure/table/wood,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/siding/wood,
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
pixel_x = 7;
pixel_y = 10
},
@@ -24043,7 +24043,7 @@
/area/asteroid/paradise)
"lRO" = (
/obj/machinery/biogenerator,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/bot,
/obj/machinery/door/window/eastright{
dir = 8;
@@ -24502,7 +24502,7 @@
/obj/effect/turf_decal/siding/wood/corner,
/obj/structure/closet/secure_closet/captains,
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/reagent_containers/food/drinks/flask/gold{
+/obj/item/reagent_containers/cup/glass/flask/gold{
pixel_x = 3;
pixel_y = 8
},
@@ -27560,7 +27560,7 @@
/turf/open/floor/iron/white,
/area/science/lab)
"nGn" = (
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = -7;
pixel_y = 6
},
@@ -27971,7 +27971,7 @@
pixel_x = 9;
pixel_y = 2
},
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
pixel_x = -5;
pixel_y = 9
},
@@ -32438,7 +32438,7 @@
/turf/open/floor/iron,
/area/maintenance/department/medical/morgue)
"pXT" = (
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 6;
pixel_y = 27
},
@@ -32848,7 +32848,7 @@
pixel_x = -8;
pixel_y = 15
},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 6;
pixel_y = 3
},
@@ -33673,7 +33673,7 @@
"qMj" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee{
pixel_x = 9;
pixel_y = 6
},
@@ -34860,7 +34860,7 @@
"rnq" = (
/obj/structure/closet/secure_closet/personal/cabinet,
/obj/item/clothing/under/suit/tan,
-/obj/item/reagent_containers/food/drinks/bottle/champagne{
+/obj/item/reagent_containers/cup/glass/bottle/champagne{
pixel_x = 6;
pixel_y = 10
},
@@ -35245,10 +35245,10 @@
"rxA" = (
/obj/structure/table,
/obj/item/shovel/spade,
-/obj/item/reagent_containers/glass/bottle/nutrient/rh{
+/obj/item/reagent_containers/cup/bottle/nutrient/rh{
pixel_x = 5
},
-/obj/item/reagent_containers/glass/bottle/nutrient/ez{
+/obj/item/reagent_containers/cup/bottle/nutrient/ez{
pixel_x = -5
},
/obj/item/reagent_containers/syringe,
@@ -36025,7 +36025,7 @@
pixel_y = -33
},
/obj/item/book/manual/hydroponics_pod_people,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/iron/grid/steel,
/area/hydroponics)
"rSK" = (
@@ -36458,15 +36458,15 @@
},
/obj/machinery/airalarm/directional/east,
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = 5;
pixel_y = 11
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = 9;
pixel_y = 5
},
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{
pixel_x = -7;
pixel_y = 17
},
@@ -38442,11 +38442,11 @@
/area/ai_monitored/security/armory)
"teS" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour{
pixel_x = -2;
pixel_y = 13
},
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
/obj/item/clothing/head/utility/chefhat{
pixel_x = 5;
pixel_y = 4
@@ -39854,11 +39854,11 @@
/area/hallway/primary/fore)
"tJw" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -8;
pixel_y = 5
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -8
},
/obj/machinery/door/poddoor/shutters{
@@ -41714,7 +41714,7 @@
},
/obj/item/vending_refill/cigarette,
/obj/effect/turf_decal/bot,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/turf/open/floor/iron,
/area/hallway/secondary/service)
"uIG" = (
@@ -41959,7 +41959,7 @@
"uNj" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = 4;
pixel_y = 9
},
@@ -43276,11 +43276,11 @@
/obj/structure/chair/fancy/plastic{
dir = 8
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -8;
pixel_y = 17
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -12;
pixel_y = 11
},
@@ -45499,7 +45499,7 @@
pixel_x = -1;
pixel_y = 12
},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
pixel_x = 9;
pixel_y = 3
},
@@ -46174,10 +46174,10 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/table/wood,
/obj/effect/turf_decal/siding/wood,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_y = 28
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_y = 23
},
/obj/item/paicard,
diff --git a/_maps/map_files/FlandStation/FlandStation.dmm b/_maps/map_files/FlandStation/FlandStation.dmm
index ad0160b0dc7e3..ee60b40a03894 100644
--- a/_maps/map_files/FlandStation/FlandStation.dmm
+++ b/_maps/map_files/FlandStation/FlandStation.dmm
@@ -1786,7 +1786,7 @@
pixel_x = -7;
pixel_y = 7
},
-/obj/item/reagent_containers/food/drinks/flask/det{
+/obj/item/reagent_containers/cup/glass/flask/det{
pixel_x = 4;
pixel_y = -1
},
@@ -2433,81 +2433,81 @@
/area/security/main)
"aGl" = (
/obj/structure/closet/crate/medical,
-/obj/item/reagent_containers/glass/bottle/bromine{
+/obj/item/reagent_containers/cup/bottle/bromine{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/aluminium{
+/obj/item/reagent_containers/cup/bottle/aluminium{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/chlorine{
+/obj/item/reagent_containers/cup/bottle/chlorine{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/carbon{
+/obj/item/reagent_containers/cup/bottle/carbon{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/ethanol{
+/obj/item/reagent_containers/cup/bottle/ethanol{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/copper{
+/obj/item/reagent_containers/cup/bottle/copper{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/hydrogen{
+/obj/item/reagent_containers/cup/bottle/hydrogen{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/fluorine{
+/obj/item/reagent_containers/cup/bottle/fluorine{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/water{
+/obj/item/reagent_containers/cup/bottle/water{
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/lithium{
+/obj/item/reagent_containers/cup/bottle/lithium{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/iron{
+/obj/item/reagent_containers/cup/bottle/iron{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/iodine{
+/obj/item/reagent_containers/cup/bottle/iodine{
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/oxygen{
+/obj/item/reagent_containers/cup/bottle/oxygen{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/phosphorus{
+/obj/item/reagent_containers/cup/bottle/phosphorus{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/nitrogen{
+/obj/item/reagent_containers/cup/bottle/nitrogen{
pixel_x = -6;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/mercury{
+/obj/item/reagent_containers/cup/bottle/mercury{
pixel_x = 6;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/radium{
+/obj/item/reagent_containers/cup/bottle/radium{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/potassium{
+/obj/item/reagent_containers/cup/bottle/potassium{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/welding_fuel{
+/obj/item/reagent_containers/cup/bottle/welding_fuel{
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/sacid{
+/obj/item/reagent_containers/cup/bottle/sacid{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/silicon{
+/obj/item/reagent_containers/cup/bottle/silicon{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/silver{
+/obj/item/reagent_containers/cup/bottle/silver{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/sodium{
+/obj/item/reagent_containers/cup/bottle/sodium{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/sugar{
+/obj/item/reagent_containers/cup/bottle/sugar{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/sulfur{
+/obj/item/reagent_containers/cup/bottle/sulfur{
pixel_x = -6
},
/obj/item/circuitboard/machine/chem_heater,
@@ -3111,7 +3111,7 @@
pixel_y = 1
},
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 7
},
/obj/item/reagent_containers/dropper,
@@ -4894,7 +4894,7 @@
pixel_x = -11
},
/obj/structure/mopbucket,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/mop,
/turf/open/floor/iron/dark,
/area/security/main)
@@ -8380,7 +8380,7 @@
/area/chapel/main)
"cgB" = (
/obj/structure/rack,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/port/fore)
@@ -10324,15 +10324,15 @@
/area/maintenance/department/science)
"cIH" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/holywater{
+/obj/item/reagent_containers/cup/glass/bottle/holywater{
pixel_x = 4;
pixel_y = 4
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -3;
pixel_y = 15
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -6;
pixel_y = 3
},
@@ -11196,19 +11196,19 @@
/turf/open/floor/iron/dark,
/area/bridge)
"cSw" = (
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = 5;
pixel_y = 9
},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = -2;
pixel_y = 9
},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = 6;
pixel_y = 2
},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = -3;
pixel_y = 1
},
@@ -11825,8 +11825,8 @@
/obj/effect/turf_decal/bot,
/obj/structure/table,
/obj/effect/turf_decal/tile/bar/opposingcorners,
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/sugar,
+/obj/item/reagent_containers/condiment/flour{
pixel_x = 4
},
/turf/open/floor/iron/cafeteria,
@@ -12998,7 +12998,7 @@
/area/quartermaster/sorting)
"dqI" = (
/obj/structure/rack,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/aft)
@@ -13662,8 +13662,8 @@
/obj/item/stack/sheet/mineral/plasma{
amount = 5
},
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker,
/obj/item/reagent_containers/dropper,
/obj/machinery/camera/directional/north{
c_tag = "Xenobiology - Research Area";
@@ -14568,7 +14568,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/obj/item/dest_tagger,
/obj/machinery/computer/security/telescreen/rd{
pixel_y = 30
@@ -16359,23 +16359,23 @@
/area/hallway/primary/aft)
"emH" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/patron{
+/obj/item/reagent_containers/cup/glass/bottle/patron{
pixel_x = -5;
pixel_y = 16
},
-/obj/item/reagent_containers/food/drinks/bottle/grappa{
+/obj/item/reagent_containers/cup/glass/bottle/grappa{
pixel_x = 10;
pixel_y = 15
},
-/obj/item/reagent_containers/food/drinks/bottle/absinthe{
+/obj/item/reagent_containers/cup/glass/bottle/absinthe{
pixel_x = -5;
pixel_y = 4
},
-/obj/item/reagent_containers/food/drinks/bottle/kahlua{
+/obj/item/reagent_containers/cup/glass/bottle/kahlua{
pixel_x = 9;
pixel_y = 7
},
-/obj/item/reagent_containers/food/drinks/bottle/vodka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
pixel_x = 2;
pixel_y = 4
},
@@ -17098,9 +17098,9 @@
/turf/open/floor/plating,
/area/crew_quarters/heads/chief)
"exT" = (
-/obj/item/reagent_containers/food/drinks/bottle/wine,
+/obj/item/reagent_containers/cup/glass/bottle/wine,
/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/drinks/trophy{
+/obj/item/reagent_containers/cup/glass/trophy{
pixel_x = 9;
pixel_y = 8
},
@@ -17503,7 +17503,7 @@
dir = 1
},
/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"eDN" = (
@@ -18606,7 +18606,7 @@
/turf/open/floor/plating,
/area/maintenance/department/security/brig)
"ePp" = (
-/obj/item/reagent_containers/food/drinks/bottle/vodka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
desc = "Aah, vodka. Prime choice of drink AND fuel by Russians worldwide. This one used to hold many secrets..."
},
/turf/open/floor/cult,
@@ -19328,34 +19328,34 @@
"eWR" = (
/obj/effect/turf_decal/bot,
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
pixel_x = 2;
pixel_y = 12
},
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
pixel_x = -6;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
pixel_x = 9;
pixel_y = 12
},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
pixel_x = 5;
pixel_y = 5
},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
pixel_x = 2;
pixel_y = -1
},
/obj/machinery/firealarm/directional/west,
/obj/machinery/vending/wallmed{
- contraband = list(/obj/item/reagent_containers/glass/bottle/chloralhydrate = 1, /obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/glass/bottle/random_virus = 1);
+ contraband = list(/obj/item/reagent_containers/cup/bottle/chloralhydrate = 1, /obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/cup/bottle/random_virus = 1);
name = "Upgraded NanoMed";
pixel_x = -1;
pixel_y = -32;
premium = list(/obj/item/storage/firstaid/regular = 3, /obj/item/storage/belt/medical = 3, /obj/item/sensor_device = 2, /obj/item/pinpointer/crew = 2, /obj/item/healthanalyzer = 2, /obj/item/wrench/medical = 1);
- products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/reagent_containers/medspray = 6, /obj/item/storage/pill_bottle = 6, /obj/item/reagent_containers/glass/bottle = 10, /obj/item/reagent_containers/spray/cleaner = 1, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/hypospray/medipen = 8, /obj/item/reagent_containers/hypospray/medipen/dexalin = 8, /obj/item/reagent_containers/glass/bottle/epinephrine = 4, /obj/item/reagent_containers/glass/bottle/charcoal = 4, /obj/item/reagent_containers/glass/bottle/salglu_solution = 4, /obj/item/reagent_containers/glass/bottle/tricordrazine = 1, /obj/item/reagent_containers/glass/bottle/spaceacillin = 1, /obj/item/reagent_containers/glass/bottle/morphine = 2, /obj/item/reagent_containers/glass/bottle/toxin = 4, /obj/item/reagent_containers/medspray/sterilizine = 4)
+ products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/reagent_containers/medspray = 6, /obj/item/storage/pill_bottle = 6, /obj/item/reagent_containers/cup/bottle = 10, /obj/item/reagent_containers/spray/cleaner = 1, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/hypospray/medipen = 8, /obj/item/reagent_containers/hypospray/medipen/dexalin = 8, /obj/item/reagent_containers/cup/bottle/epinephrine = 4, /obj/item/reagent_containers/cup/bottle/charcoal = 4, /obj/item/reagent_containers/cup/bottle/salglu_solution = 4, /obj/item/reagent_containers/cup/bottle/tricordrazine = 1, /obj/item/reagent_containers/cup/bottle/spaceacillin = 1, /obj/item/reagent_containers/cup/bottle/morphine = 2, /obj/item/reagent_containers/cup/bottle/toxin = 4, /obj/item/reagent_containers/medspray/sterilizine = 4)
},
/turf/open/floor/iron/grid/steel,
/area/medical/virology)
@@ -20215,7 +20215,7 @@
/obj/effect/turf_decal/tile/bar/opposingcorners,
/obj/structure/table,
/obj/item/food/dough,
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
/obj/item/food/grown/tomato,
/turf/open/floor/iron/cafeteria,
/area/crew_quarters/kitchen)
@@ -21053,7 +21053,7 @@
/area/crew_quarters/locker)
"ftA" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -1;
pixel_y = 9
},
@@ -25908,7 +25908,7 @@
/obj/structure/table,
/obj/item/storage/bag/plants/portaseeder,
/obj/item/plant_analyzer,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/seeds/wheat,
/obj/item/seeds/wheat,
/obj/item/seeds/wheat,
@@ -26408,7 +26408,7 @@
/turf/open/floor/iron,
/area/engine/atmos)
"gJI" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/structure/window/reinforced{
dir = 8
},
@@ -27867,25 +27867,25 @@
/obj/structure/closet/crate{
name = "food crate"
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = -5;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 2;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = -2
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 5
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 1;
pixel_y = -3
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 8;
pixel_y = -3
},
@@ -28818,7 +28818,7 @@
pixel_x = 6;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
pixel_x = -6;
pixel_y = 6
},
@@ -29031,7 +29031,7 @@
/area/maintenance/department/science)
"hus" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/obj/machinery/computer/security/telescreen/minisat{
dir = 1;
pixel_y = -29
@@ -30145,7 +30145,7 @@
pixel_x = 4;
pixel_y = -1
},
-/obj/item/reagent_containers/glass/waterbottle{
+/obj/item/reagent_containers/cup/waterbottle{
pixel_x = -8;
pixel_y = -5
},
@@ -31232,7 +31232,7 @@
pixel_y = 2
},
/obj/item/clothing/mask/cigarette/cigar,
-/obj/item/reagent_containers/food/drinks/flask/gold,
+/obj/item/reagent_containers/cup/glass/flask/gold,
/turf/open/floor/carpet/royalblue,
/area/crew_quarters/heads/captain/private)
"hYU" = (
@@ -31451,8 +31451,8 @@
pixel_y = 31
},
/obj/structure/janitorialcart,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/mop,
/obj/item/mop,
/turf/open/floor/iron/dark/side{
@@ -31880,7 +31880,7 @@
name = "Animal Pen"
},
/obj/item/cultivator,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/seeds/tower,
/turf/open/floor/plating,
/area/hydroponics/garden)
@@ -32093,10 +32093,10 @@
/area/quartermaster/sorting)
"iiZ" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
/obj/item/reagent_containers/dropper,
/obj/effect/turf_decal/tile/purple/opposingcorners,
/obj/effect/turf_decal/tile/green/opposingcorners{
@@ -32728,7 +32728,7 @@
dir = 1
},
/obj/structure/table,
-/obj/item/reagent_containers/glass/mortar,
+/obj/item/reagent_containers/cup/mortar,
/obj/item/pestle,
/obj/item/clothing/glasses/hud/health{
pixel_x = 4;
@@ -33790,7 +33790,7 @@
"iDU" = (
/obj/structure/table/wood,
/obj/item/storage/lockbox/medal,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/turf/open/floor/iron/dark,
/area/crew_quarters/heads/captain)
"iDW" = (
@@ -34891,7 +34891,7 @@
dir = 8
},
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee{
pixel_x = 10;
pixel_y = 9
},
@@ -36777,7 +36777,7 @@
/area/hallway/primary/port)
"jsw" = (
/obj/structure/bonfire,
-/obj/item/reagent_containers/food/drinks/bottle/orangejuice{
+/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice{
desc = "For the weary spacemen on their quest to rekindle the first plasma fire.";
name = "Carton of Estus"
},
@@ -36851,7 +36851,7 @@
pixel_y = 5
},
/obj/item/storage/belt/utility,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/obj/effect/turf_decal/delivery,
/obj/machinery/requests_console{
department = "Robotics Lab";
@@ -39737,7 +39737,7 @@
/area/security/main)
"keX" = (
/obj/structure/rack,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/central/secondary)
@@ -51210,7 +51210,7 @@
pixel_x = 8;
pixel_y = 7
},
-/obj/item/reagent_containers/food/drinks/bottle/holywater,
+/obj/item/reagent_containers/cup/glass/bottle/holywater,
/obj/item/book/granter/spell/smoke/lesser,
/turf/open/floor/cult,
/area/chapel/office)
@@ -51695,7 +51695,7 @@
/obj/effect/turf_decal/bot,
/obj/machinery/light,
/obj/machinery/reagentgrinder,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron/cafeteria,
/area/crew_quarters/kitchen)
@@ -52591,8 +52591,8 @@
/area/science/mixing)
"nwP" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/shaker,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/glass/shaker,
+/obj/item/reagent_containers/cup/rag,
/obj/structure/sign/plaques/deempisi{
pixel_y = 28
},
@@ -55809,7 +55809,7 @@
dir = 6
},
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb,
/obj/structure/railing,
/turf/open/floor/iron/techmaint,
/area/science/misc_lab)
@@ -60162,7 +60162,7 @@
/area/crew_quarters/heads/hor)
"pBN" = (
/obj/machinery/biogenerator,
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
pixel_x = 4
},
/obj/effect/turf_decal/stripes/line,
@@ -61859,7 +61859,7 @@
pixel_x = 1;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
pixel_x = 8;
pixel_y = -1
},
@@ -63107,7 +63107,7 @@
/area/security/brig)
"qpL" = (
/obj/structure/mopbucket,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/mop,
/turf/open/floor/iron/techmaint,
/area/science/research)
@@ -63489,19 +63489,19 @@
pixel_x = 6;
pixel_y = 12
},
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour{
pixel_x = 8;
pixel_y = 8
},
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour{
pixel_x = 8;
pixel_y = 5
},
-/obj/item/reagent_containers/food/condiment/sugar{
+/obj/item/reagent_containers/condiment/sugar{
pixel_x = 8;
pixel_y = 2
},
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
pixel_x = -4;
pixel_y = 17
},
@@ -63795,12 +63795,12 @@
"qxm" = (
/obj/structure/table,
/obj/item/food/spaghetti/raw,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = 4;
pixel_y = 4
},
-/obj/item/reagent_containers/food/condiment/peppermill,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/peppermill,
+/obj/item/reagent_containers/condiment/enzyme{
pixel_y = 6
},
/obj/effect/turf_decal/bot,
@@ -63972,7 +63972,7 @@
/obj/item/screwdriver,
/obj/item/wrench,
/obj/item/kitchen/rollingpin,
-/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/item/reagent_containers/condiment/enzyme,
/obj/item/knife/kitchen,
/obj/structure/extinguisher_cabinet{
pixel_y = -30
@@ -66663,7 +66663,7 @@
"rkq" = (
/obj/item/folder,
/obj/item/clipboard,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb,
/obj/structure/table/wood,
/obj/item/reagent_containers/spray/cleaner{
pixel_x = -3;
@@ -68403,7 +68403,7 @@
pixel_x = 1;
pixel_y = 1
},
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
pixel_x = -6;
pixel_y = 6
},
@@ -70952,7 +70952,7 @@
/area/science/xenobiology)
"smb" = (
/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/plating,
/area/maintenance/department/security/brig)
"sme" = (
@@ -71193,10 +71193,10 @@
"soC" = (
/obj/structure/table/wood,
/obj/effect/turf_decal/bot,
-/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko{
+/obj/item/reagent_containers/cup/soda_cans/thirteenloko{
pixel_x = -6
},
-/obj/item/reagent_containers/food/drinks/mug/cocoa{
+/obj/item/reagent_containers/cup/glass/mug/cocoa{
pixel_x = 6
},
/turf/open/floor/iron/sepia,
@@ -73868,7 +73868,7 @@
},
/obj/structure/table/reinforced,
/obj/item/food/popcorn,
-/obj/item/reagent_containers/food/drinks/bottle/vodka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
pixel_x = 4;
pixel_y = 6
},
@@ -75555,11 +75555,11 @@
"tvw" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
-/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
},
@@ -77016,10 +77016,10 @@
/obj/item/food/mint{
pixel_y = 9
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 2
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_y = 2
},
/obj/structure/noticeboard{
@@ -80944,11 +80944,11 @@
pixel_x = 28
},
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull{
+/obj/item/reagent_containers/cup/soda_cans/grey_bull{
pixel_x = -6;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
pixel_x = 4;
pixel_y = 4
},
@@ -81160,10 +81160,10 @@
},
/obj/item/clothing/glasses/science,
/obj/item/reagent_containers/dropper,
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 3
},
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_x = -3
},
/obj/effect/turf_decal/tile/purple/opposingcorners,
@@ -82341,7 +82341,7 @@
/turf/open/floor/iron/dark,
/area/chapel/main)
"vdJ" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/bot,
/obj/structure/reagent_dispensers/watertank/high,
/obj/effect/turf_decal/tile/green/opposingcorners,
@@ -84347,7 +84347,7 @@
dir = 8
},
/obj/structure/closet/secure_closet/freezer/kitchen/maintenance,
-/obj/item/reagent_containers/food/condiment/sugar,
+/obj/item/reagent_containers/condiment/sugar,
/obj/item/food/tofu/prison,
/turf/open/floor/iron/dark,
/area/vacant_room/commissary/commissaryFood)
@@ -87745,14 +87745,14 @@
/obj/structure/desk_bell/speed_demon{
pixel_x = -8
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_y = 2
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -6;
pixel_y = 14
},
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
desc = "A bottle of whiskey. There's a label that reads 'tears' taped to the front.";
name = "Bottle of Tears";
pixel_x = 8;
@@ -88358,20 +88358,20 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood/old,
/obj/structure/closet/secure_closet/injection,
-/obj/item/reagent_containers/glass/bottle/toxin{
+/obj/item/reagent_containers/cup/bottle/toxin{
pixel_x = 6;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/facid{
+/obj/item/reagent_containers/cup/bottle/facid{
name = "fluorosulfuric acid bottle";
pixel_x = -3;
pixel_y = 6
},
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
pixel_x = 5;
pixel_y = 1
},
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
pixel_x = -4;
pixel_y = 1
},
@@ -88380,7 +88380,7 @@
/obj/item/reagent_containers/syringe{
pixel_y = 5
},
-/obj/item/reagent_containers/glass/bottle/chloralhydrate,
+/obj/item/reagent_containers/cup/bottle/chloralhydrate,
/obj/effect/turf_decal/stripes/line{
dir = 5
},
@@ -89412,10 +89412,10 @@
pixel_x = 1;
pixel_y = 4
},
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_x = -3
},
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_x = -3;
pixel_y = 3
},
@@ -90010,7 +90010,7 @@
name = "Virology Desk Window";
req_access_txt = "20"
},
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
pixel_x = 2;
pixel_y = 12
},
@@ -90018,7 +90018,7 @@
pixel_x = -5;
pixel_y = -3
},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
pixel_x = 2;
pixel_y = -1
},
@@ -93419,7 +93419,7 @@
pixel_y = 2
},
/obj/item/pen,
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = -6;
pixel_y = 1
},
@@ -95098,8 +95098,8 @@
dir = 1
},
/obj/structure/table,
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 7
},
/obj/item/reagent_containers/dropper,
@@ -95512,7 +95512,7 @@
/area/crew_quarters/fitness/recreation)
"xTR" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb,
/turf/open/floor/carpet/grimy,
/area/hallway/primary/port)
"xUa" = (
@@ -95781,10 +95781,10 @@
/area/hallway/primary/starboard)
"xXA" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
/obj/item/reagent_containers/syringe,
/obj/effect/turf_decal/delivery,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -95793,7 +95793,7 @@
},
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/tile/green/fourcorners/contrasted,
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
pixel_x = 5;
pixel_y = 1
},
@@ -96012,12 +96012,12 @@
"yaa" = (
/obj/structure/table,
/obj/item/kitchen/fork,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
desc = "Salt. From space oceans, presumably. A staple of modern medicine.";
pixel_x = -8;
pixel_y = 12
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 5;
pixel_y = 6
},
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index 3bff9df74470a..75b57e07d584c 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -3354,19 +3354,19 @@
/turf/open/floor/iron,
/area/bridge)
"aqK" = (
-/obj/item/reagent_containers/food/drinks/flask/gold{
+/obj/item/reagent_containers/cup/glass/flask/gold{
pixel_x = 3;
pixel_y = 8
},
-/obj/item/reagent_containers/food/drinks/bottle/rum{
+/obj/item/reagent_containers/cup/glass/bottle/rum{
pixel_x = -4;
pixel_y = 4
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = 7;
pixel_y = 4
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
/obj/machinery/status_display/evac{
pixel_y = 32
},
@@ -10327,17 +10327,17 @@
/obj/item/storage/box/seccarts{
pixel_y = 5
},
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
desc = "A bottle of whiskey. There's a label that reads 'tears' taped to the front.";
name = "Bottle of Tears";
pixel_x = 3;
pixel_y = 5
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -6;
pixel_y = 4
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_y = 2
},
/obj/machinery/keycard_auth{
@@ -10664,12 +10664,12 @@
/obj/structure/table/reinforced,
/obj/effect/turf_decal/delivery,
/obj/machinery/door/firedoor,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
pixel_x = -8;
pixel_y = 2
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
desc = "Salt. From space oceans, presumably. A staple of modern medicine.";
pixel_x = -8;
pixel_y = 12
@@ -10863,12 +10863,12 @@
/obj/structure/table/reinforced,
/obj/effect/turf_decal/delivery,
/obj/machinery/door/firedoor,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
pixel_x = -8;
pixel_y = 2
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
desc = "Salt. From space oceans, presumably. A staple of modern medicine.";
pixel_x = -8;
pixel_y = 12
@@ -11095,7 +11095,7 @@
/area/crew_quarters/kitchen)
"boy" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
pixel_x = 4;
pixel_y = 4
},
@@ -11592,17 +11592,17 @@
dir = 4;
pixel_x = -27
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
pixel_x = -8;
pixel_y = 2
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
desc = "Salt. From space oceans, presumably. A staple of modern medicine.";
pixel_x = -8;
pixel_y = 12
},
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
pixel_x = 4;
pixel_y = 4
},
@@ -11799,7 +11799,7 @@
dir = 4
},
/obj/item/clothing/suit/hooded/chaplain_hoodie,
-/obj/item/reagent_containers/food/drinks/bottle/holywater,
+/obj/item/reagent_containers/cup/glass/bottle/holywater,
/obj/item/soulstone/anybody/chaplain,
/obj/item/organ/heart,
/obj/item/book/granter/spell/smoke/lesser,
@@ -11889,7 +11889,7 @@
pixel_x = -4;
pixel_y = 4
},
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
pixel_x = 8;
pixel_y = 6
},
@@ -15473,7 +15473,7 @@
/obj/effect/turf_decal/delivery,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"bNU" = (
@@ -26173,12 +26173,12 @@
"cYd" = (
/obj/structure/table,
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
pixel_x = -8;
pixel_y = 2
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
desc = "Salt. From space oceans, presumably. A staple of modern medicine.";
pixel_x = -8;
pixel_y = 12
@@ -27246,16 +27246,16 @@
},
/obj/structure/table/glass,
/obj/effect/turf_decal/bot,
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_x = -7
},
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_x = -7
},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 7
},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 7
},
/turf/open/floor/iron/showroomfloor,
@@ -27271,7 +27271,7 @@
pixel_x = -5;
pixel_y = -4
},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
pixel_x = 9;
pixel_y = 5
},
@@ -30197,7 +30197,7 @@
/area/science/mixing)
"eja" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour{
pixel_x = -2;
pixel_y = 6
},
@@ -32469,15 +32469,15 @@
/area/science/lab)
"eWx" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -3;
pixel_y = 15
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -6;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
desc = "A station exclusive. Consumption may result in seizures, blindness, drunkenness, or even death.";
list_reagents = list(/datum/reagent/consumable/ethanol/thirteenloko=30);
name = "Kilo-Kocktail";
@@ -36110,7 +36110,7 @@
/area/maintenance/central)
"giB" = (
/obj/structure/mopbucket,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/mop,
/obj/effect/turf_decal/tile/red/opposingcorners,
/obj/structure/sign/warning/securearea{
@@ -38505,7 +38505,7 @@
},
/obj/item/clothing/glasses/science,
/obj/effect/turf_decal/bot,
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -6
},
/turf/open/floor/iron/showroomfloor,
@@ -39509,7 +39509,7 @@
/area/bridge)
"htk" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb,
/turf/open/floor/plating{
burnt = 1
},
@@ -42883,12 +42883,12 @@
/area/science/aft)
"izu" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{
+/obj/item/reagent_containers/cup/soda_cans/pwr_game{
pixel_x = 6;
pixel_y = 7;
list_reagents = list(/datum/reagent/consumable/pwr_game = 5)
},
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
pixel_x = -5;
pixel_y = 1
},
@@ -42987,7 +42987,7 @@
"iAH" = (
/obj/structure/table/wood,
/obj/item/clipboard,
-/obj/item/reagent_containers/food/drinks/shaker{
+/obj/item/reagent_containers/cup/glass/shaker{
pixel_x = -2;
pixel_y = 2
},
@@ -42995,7 +42995,7 @@
pixel_x = 8;
pixel_y = 2
},
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -44735,7 +44735,7 @@
/turf/open/floor/iron,
/area/security/execution/transfer)
"jcF" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb,
/turf/open/floor/plating,
/area/quartermaster/warehouse)
"jcT" = (
@@ -46017,81 +46017,81 @@
pixel_y = 4
},
/obj/item/circuitboard/machine/chem_heater,
-/obj/item/reagent_containers/glass/bottle/sulfur{
+/obj/item/reagent_containers/cup/bottle/sulfur{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/sugar{
+/obj/item/reagent_containers/cup/bottle/sugar{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/sodium{
+/obj/item/reagent_containers/cup/bottle/sodium{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/silicon{
+/obj/item/reagent_containers/cup/bottle/silicon{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/radium{
+/obj/item/reagent_containers/cup/bottle/radium{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/phosphorus{
+/obj/item/reagent_containers/cup/bottle/phosphorus{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/silver{
+/obj/item/reagent_containers/cup/bottle/silver{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/welding_fuel{
+/obj/item/reagent_containers/cup/bottle/welding_fuel{
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/lithium{
+/obj/item/reagent_containers/cup/bottle/lithium{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/nitrogen{
+/obj/item/reagent_containers/cup/bottle/nitrogen{
pixel_x = -6;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/hydrogen{
+/obj/item/reagent_containers/cup/bottle/hydrogen{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/ethanol{
+/obj/item/reagent_containers/cup/bottle/ethanol{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/iodine{
+/obj/item/reagent_containers/cup/bottle/iodine{
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/sacid{
+/obj/item/reagent_containers/cup/bottle/sacid{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/water{
+/obj/item/reagent_containers/cup/bottle/water{
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/chlorine{
+/obj/item/reagent_containers/cup/bottle/chlorine{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/mercury{
+/obj/item/reagent_containers/cup/bottle/mercury{
pixel_x = 6;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/bromine{
+/obj/item/reagent_containers/cup/bottle/bromine{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/oxygen{
+/obj/item/reagent_containers/cup/bottle/oxygen{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/potassium{
+/obj/item/reagent_containers/cup/bottle/potassium{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/iron{
+/obj/item/reagent_containers/cup/bottle/iron{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/fluorine{
+/obj/item/reagent_containers/cup/bottle/fluorine{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/copper{
+/obj/item/reagent_containers/cup/bottle/copper{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/carbon{
+/obj/item/reagent_containers/cup/bottle/carbon{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/aluminium{
+/obj/item/reagent_containers/cup/bottle/aluminium{
pixel_x = 6
},
/obj/structure/closet/crate/secure/plasma{
@@ -47468,7 +47468,7 @@
dir = 4;
pixel_x = 11
},
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/mop,
/turf/open/floor/plating{
burnt = 1
@@ -50459,16 +50459,16 @@
pixel_y = 27
},
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/sillycup{
+/obj/item/reagent_containers/cup/glass/sillycup{
pixel_x = -5;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/sillycup{
+/obj/item/reagent_containers/cup/glass/sillycup{
pixel_x = 5;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/sillycup,
-/obj/item/reagent_containers/food/drinks/bottle/vodka{
+/obj/item/reagent_containers/cup/glass/sillycup,
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
pixel_x = -8;
pixel_y = 7
},
@@ -54123,7 +54123,7 @@
/obj/item/crowbar/red,
/obj/item/cultivator,
/obj/item/wirecutters,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/circuitboard/machine/biogenerator,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
@@ -54238,17 +54238,17 @@
/area/crew_quarters/bar)
"lZo" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
pixel_x = -8;
pixel_y = 2
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
desc = "Salt. From space oceans, presumably. A staple of modern medicine.";
pixel_x = -8;
pixel_y = 12
},
-/obj/item/reagent_containers/food/drinks/bottle/orangejuice{
+/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice{
desc = "An emerald flask, from the Keeper's soul. High in vitamins!";
name = "estus flask";
pixel_x = 4;
@@ -57584,7 +57584,7 @@
/obj/effect/turf_decal/delivery,
/obj/effect/turf_decal/stripes/corner,
/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/radio/intercom{
pixel_y = 22
},
@@ -59109,7 +59109,7 @@
/obj/item/crowbar/red,
/obj/item/cultivator,
/obj/item/wirecutters,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/circuitboard/machine/biogenerator,
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
dir = 1
@@ -59340,15 +59340,15 @@
"nPI" = (
/obj/structure/table,
/obj/item/food/mint,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
pixel_x = -2;
pixel_y = 6
},
-/obj/item/reagent_containers/food/condiment/sugar{
+/obj/item/reagent_containers/condiment/sugar{
pixel_x = 5;
pixel_y = 5
},
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -59950,12 +59950,12 @@
/area/security/main)
"nZh" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
pixel_x = -8;
pixel_y = 2
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
desc = "Salt. From space oceans, presumably. A staple of modern medicine.";
pixel_x = -8;
pixel_y = 12
@@ -62413,11 +62413,11 @@
dir = 4
},
/obj/item/storage/box/masks,
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
pixel_x = 2;
pixel_y = -1
},
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
pixel_x = -9;
pixel_y = 5
},
@@ -63966,7 +63966,7 @@
/area/security/execution/education)
"pmx" = (
/obj/structure/bonfire,
-/obj/item/reagent_containers/food/drinks/bottle/orangejuice{
+/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice{
desc = "For the weary spacemen on their quest to rekindle the first plasma fire.";
name = "Carton of Estus"
},
@@ -67401,17 +67401,17 @@
/area/quartermaster/warehouse)
"qti" = (
/obj/item/book/manual/wiki/medicine,
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = -6;
pixel_y = 10
},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = 6;
pixel_y = 10
},
@@ -67984,7 +67984,7 @@
/area/engine/atmos)
"qCD" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
/obj/item/book/manual/chef_recipes{
pixel_x = 2;
pixel_y = 6
@@ -69072,7 +69072,7 @@
"qVe" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/green{
@@ -69240,7 +69240,7 @@
name = "Trash Chute";
req_one_access_txt = "26"
},
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/mop,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/purple/half/contrasted,
@@ -70476,10 +70476,10 @@
/obj/item/stack/sheet/mineral/plasma,
/obj/item/stack/sheet/mineral/plasma,
/obj/item/stack/sheet/mineral/plasma,
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_x = -4
},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 4
},
/obj/item/reagent_containers/dropper,
@@ -74130,7 +74130,7 @@
/area/maintenance/aft)
"sHz" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
@@ -74416,15 +74416,15 @@
/area/security/prison)
"sMK" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -6;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -3;
pixel_y = 15
},
-/obj/item/reagent_containers/food/drinks/bottle/holywater{
+/obj/item/reagent_containers/cup/glass/bottle/holywater{
pixel_x = 4;
pixel_y = 4
},
@@ -76622,11 +76622,11 @@
pixel_x = 6;
pixel_y = 11
},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
pixel_x = 2;
pixel_y = -1
},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
pixel_x = 9;
pixel_y = -7
},
@@ -77835,7 +77835,7 @@
"tXJ" = (
/obj/structure/reagent_dispensers/watertank/high,
/obj/effect/turf_decal/delivery,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
},
@@ -77882,10 +77882,10 @@
"tZQ" = (
/obj/structure/table,
/obj/item/clipboard,
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 6
},
/obj/item/clothing/glasses/science,
@@ -79899,7 +79899,7 @@
/obj/structure/reagent_dispensers/watertank,
/obj/effect/turf_decal/delivery,
/obj/machinery/light/small,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 4
},
@@ -80466,7 +80466,7 @@
"uQT" = (
/obj/structure/flora/ausbushes/leafybush,
/obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/grass,
/area/security/prison)
"uRb" = (
@@ -83806,7 +83806,7 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
},
@@ -84445,7 +84445,7 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron/dark,
/area/chapel/main)
@@ -85096,11 +85096,11 @@
pixel_x = -3;
pixel_y = 2
},
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
pixel_x = -6;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
pixel_x = 2;
pixel_y = -1
},
@@ -85220,7 +85220,7 @@
/obj/item/multitool{
pixel_x = 4
},
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
@@ -89157,27 +89157,27 @@
icon_state = "4-8"
},
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
+/obj/item/reagent_containers/cup/soda_cans/starkist{
pixel_x = 10;
pixel_y = 2
},
-/obj/item/reagent_containers/food/drinks/soda_cans/shamblers{
+/obj/item/reagent_containers/cup/soda_cans/shamblers{
pixel_x = 2;
pixel_y = 2
},
-/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime{
+/obj/item/reagent_containers/cup/soda_cans/lemon_lime{
pixel_x = -7;
pixel_y = 2
},
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{
+/obj/item/reagent_containers/cup/soda_cans/pwr_game{
pixel_x = -4;
pixel_y = 11
},
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
pixel_x = 6;
pixel_y = 11
},
-/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko{
+/obj/item/reagent_containers/cup/soda_cans/thirteenloko{
pixel_y = 20
},
/obj/effect/turf_decal/tile/purple/half/contrasted{
@@ -91318,7 +91318,7 @@
dir = 4
},
/obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 57101584fa97f..177a054872cc8 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -4267,8 +4267,8 @@
pixel_x = 3;
pixel_y = 4
},
-/obj/item/reagent_containers/glass/bottle/nutrient/ez,
-/obj/item/reagent_containers/glass/bottle/nutrient/rh{
+/obj/item/reagent_containers/cup/bottle/nutrient/ez,
+/obj/item/reagent_containers/cup/bottle/nutrient/rh{
pixel_x = 2;
pixel_y = 1
},
@@ -4296,7 +4296,7 @@
dir = 1
},
/obj/item/plant_analyzer,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron,
/area/hydroponics/garden)
@@ -5819,7 +5819,7 @@
/obj/item/hatchet,
/obj/item/cultivator,
/obj/item/crowbar,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/plant_analyzer,
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -8256,7 +8256,7 @@
pixel_y = 2
},
/obj/item/clothing/mask/cigarette/cigar,
-/obj/item/reagent_containers/food/drinks/flask/gold,
+/obj/item/reagent_containers/cup/glass/flask/gold,
/turf/open/floor/carpet/royalblue,
/area/crew_quarters/heads/captain/private)
"bhv" = (
@@ -10669,7 +10669,7 @@
/area/crew_quarters/heads/captain/private)
"byr" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/turf/open/floor/carpet/royalblue,
/area/crew_quarters/heads/captain/private)
"byv" = (
@@ -12254,11 +12254,11 @@
dir = 1
},
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = 7;
pixel_y = -3
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = -4;
pixel_y = -3
},
@@ -12267,7 +12267,7 @@
pixel_y = -2
},
/obj/item/reagent_containers/dropper,
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 8;
pixel_y = 2
},
@@ -14598,7 +14598,7 @@
"bUn" = (
/obj/effect/turf_decal/stripes/line,
/obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/structure/window/reinforced{
dir = 8
},
@@ -14610,7 +14610,7 @@
dir = 4
},
/obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/iron,
/area/hydroponics)
"bUq" = (
@@ -15209,7 +15209,7 @@
/area/hydroponics)
"bYn" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
/obj/structure/railing{
dir = 1
},
@@ -16774,21 +16774,21 @@
/area/quartermaster/office)
"cmb" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
pixel_x = -4;
pixel_y = 1
},
-/obj/item/reagent_containers/glass/bottle/chloralhydrate,
-/obj/item/reagent_containers/glass/bottle/toxin{
+/obj/item/reagent_containers/cup/bottle/chloralhydrate,
+/obj/item/reagent_containers/cup/bottle/toxin{
pixel_x = 6;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
pixel_x = 5;
pixel_y = 1
},
/obj/item/reagent_containers/syringe,
-/obj/item/reagent_containers/glass/bottle/facid{
+/obj/item/reagent_containers/cup/bottle/facid{
name = "fluorosulfuric acid bottle";
pixel_x = -3;
pixel_y = 6
@@ -17004,7 +17004,7 @@
/turf/open/floor/iron/freezer,
/area/crew_quarters/toilet/restrooms)
"cou" = (
-/obj/item/reagent_containers/food/drinks/beer/almost_empty{
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{
pixel_x = 8;
pixel_y = 12
},
@@ -18004,7 +18004,7 @@
pixel_x = -13;
pixel_y = -10
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -8;
pixel_y = 8
},
@@ -18141,11 +18141,11 @@
amount = 4;
pixel_y = 4
},
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 8;
pixel_y = 2
},
@@ -18556,7 +18556,7 @@
pixel_y = 5
},
/obj/item/storage/belt/utility,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
/area/science/robotics/lab)
@@ -21655,7 +21655,7 @@
/obj/structure/closet/crate/hydroponics,
/obj/item/shovel/spade,
/obj/item/wrench,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/cultivator,
/obj/item/wirecutters,
/turf/open/floor/iron,
@@ -23354,7 +23354,7 @@
"dJG" = (
/obj/structure/table/reinforced,
/obj/item/kitchen/rollingpin,
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour{
pixel_x = -2;
pixel_y = 13
},
@@ -28529,10 +28529,10 @@
id = "kitchen";
name = "Serving Hatch"
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -3
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 3
},
/obj/machinery/door/firedoor,
@@ -29993,7 +29993,7 @@
/area/security/main)
"glg" = (
/obj/structure/table/wood/poker,
-/obj/item/reagent_containers/food/drinks/bottle/wine{
+/obj/item/reagent_containers/cup/glass/bottle/wine{
pixel_x = -9;
pixel_y = 6
},
@@ -30759,81 +30759,81 @@
/turf/open/floor/iron,
/area/hallway/secondary/service)
"gEW" = (
-/obj/item/reagent_containers/glass/bottle/bromine{
+/obj/item/reagent_containers/cup/bottle/bromine{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/aluminium{
+/obj/item/reagent_containers/cup/bottle/aluminium{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/chlorine{
+/obj/item/reagent_containers/cup/bottle/chlorine{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/carbon{
+/obj/item/reagent_containers/cup/bottle/carbon{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/ethanol{
+/obj/item/reagent_containers/cup/bottle/ethanol{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/copper{
+/obj/item/reagent_containers/cup/bottle/copper{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/hydrogen{
+/obj/item/reagent_containers/cup/bottle/hydrogen{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/fluorine{
+/obj/item/reagent_containers/cup/bottle/fluorine{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/water{
+/obj/item/reagent_containers/cup/bottle/water{
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/lithium{
+/obj/item/reagent_containers/cup/bottle/lithium{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/iron{
+/obj/item/reagent_containers/cup/bottle/iron{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/iodine{
+/obj/item/reagent_containers/cup/bottle/iodine{
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/oxygen{
+/obj/item/reagent_containers/cup/bottle/oxygen{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/phosphorus{
+/obj/item/reagent_containers/cup/bottle/phosphorus{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/nitrogen{
+/obj/item/reagent_containers/cup/bottle/nitrogen{
pixel_x = -6;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/mercury{
+/obj/item/reagent_containers/cup/bottle/mercury{
pixel_x = 6;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/radium{
+/obj/item/reagent_containers/cup/bottle/radium{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/potassium{
+/obj/item/reagent_containers/cup/bottle/potassium{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/welding_fuel{
+/obj/item/reagent_containers/cup/bottle/welding_fuel{
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/sacid{
+/obj/item/reagent_containers/cup/bottle/sacid{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/silicon{
+/obj/item/reagent_containers/cup/bottle/silicon{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/silver{
+/obj/item/reagent_containers/cup/bottle/silver{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/sodium{
+/obj/item/reagent_containers/cup/bottle/sodium{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/sugar{
+/obj/item/reagent_containers/cup/bottle/sugar{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/sulfur{
+/obj/item/reagent_containers/cup/bottle/sulfur{
pixel_x = -6
},
/obj/structure/closet/crate/medical,
@@ -34597,7 +34597,7 @@
"hVW" = (
/obj/structure/table/glass,
/obj/item/storage/box/donkpockets,
-/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko{
+/obj/item/reagent_containers/cup/soda_cans/thirteenloko{
pixel_x = -6;
pixel_y = 6
},
@@ -36224,10 +36224,10 @@
/obj/item/stack/sheet/mineral/plasma{
pixel_x = 9
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
/obj/item/reagent_containers/dropper,
/obj/item/storage/box/beakers{
pixel_x = -6;
@@ -37242,12 +37242,12 @@
pixel_y = 2
},
/obj/machinery/vending/wallmed{
- contraband = list(/obj/item/reagent_containers/glass/bottle/chloralhydrate = 1, /obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/glass/bottle/random_virus = 1);
+ contraband = list(/obj/item/reagent_containers/cup/bottle/chloralhydrate = 1, /obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/cup/bottle/random_virus = 1);
name = "Upgraded NanoMed";
pixel_x = -1;
pixel_y = -32;
premium = list(/obj/item/storage/firstaid/regular = 3, /obj/item/storage/belt/medical = 3, /obj/item/sensor_device = 2, /obj/item/pinpointer/crew = 2, /obj/item/healthanalyzer = 2, /obj/item/wrench/medical = 1);
- products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/reagent_containers/medspray = 6, /obj/item/storage/pill_bottle = 6, /obj/item/reagent_containers/glass/bottle = 10, /obj/item/reagent_containers/spray/cleaner = 1, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/hypospray/medipen = 8, /obj/item/reagent_containers/hypospray/medipen/dexalin = 8, /obj/item/reagent_containers/glass/bottle/epinephrine = 4, /obj/item/reagent_containers/glass/bottle/charcoal = 4, /obj/item/reagent_containers/glass/bottle/salglu_solution = 4, /obj/item/reagent_containers/glass/bottle/tricordrazine = 1, /obj/item/reagent_containers/glass/bottle/spaceacillin = 1, /obj/item/reagent_containers/glass/bottle/morphine = 2, /obj/item/reagent_containers/glass/bottle/toxin = 4, /obj/item/reagent_containers/medspray/sterilizine = 4)
+ products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/reagent_containers/medspray = 6, /obj/item/storage/pill_bottle = 6, /obj/item/reagent_containers/cup/bottle = 10, /obj/item/reagent_containers/spray/cleaner = 1, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/hypospray/medipen = 8, /obj/item/reagent_containers/hypospray/medipen/dexalin = 8, /obj/item/reagent_containers/cup/bottle/epinephrine = 4, /obj/item/reagent_containers/cup/bottle/charcoal = 4, /obj/item/reagent_containers/cup/bottle/salglu_solution = 4, /obj/item/reagent_containers/cup/bottle/tricordrazine = 1, /obj/item/reagent_containers/cup/bottle/spaceacillin = 1, /obj/item/reagent_containers/cup/bottle/morphine = 2, /obj/item/reagent_containers/cup/bottle/toxin = 4, /obj/item/reagent_containers/medspray/sterilizine = 4)
},
/obj/item/reagent_containers/dropper{
pixel_x = 2;
@@ -40436,8 +40436,8 @@
/obj/machinery/reagentgrinder{
pixel_y = 5
},
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/turf/open/floor/iron,
/area/medical/chemistry)
"kiA" = (
@@ -43835,7 +43835,7 @@
/area/crew_quarters/fitness/recreation)
"lyj" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/holywater{
+/obj/item/reagent_containers/cup/glass/bottle/holywater{
pixel_x = -2;
pixel_y = 2
},
@@ -45238,11 +45238,11 @@
pixel_x = 6;
pixel_y = 12
},
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_x = -7;
pixel_y = 6
},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 6;
pixel_y = 4
},
@@ -49838,23 +49838,23 @@
"nIt" = (
/obj/structure/rack,
/obj/item/storage/firstaid/regular,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 6
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 6
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -5
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -5
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -8;
pixel_y = -2
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -8;
pixel_y = -2
},
@@ -50182,7 +50182,7 @@
},
/obj/item/storage/box/trackimp,
/obj/item/storage/lockbox/loyalty,
-/obj/item/reagent_containers/glass/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine,
/obj/machinery/light/small,
/obj/machinery/firealarm{
dir = 4;
@@ -50524,20 +50524,20 @@
/area/medical/medbay/aft)
"nSE" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/sillycup{
+/obj/item/reagent_containers/cup/glass/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/cup/glass/sillycup,
+/obj/item/reagent_containers/cup/glass/sillycup{
pixel_x = 5;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/sillycup{
+/obj/item/reagent_containers/cup/glass/sillycup{
pixel_x = 5;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/sillycup{
+/obj/item/reagent_containers/cup/glass/sillycup{
pixel_x = 5;
pixel_y = 3
},
@@ -54525,7 +54525,7 @@
pixel_x = -6;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/beer/almost_empty{
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{
pixel_x = 8;
pixel_y = 12
},
@@ -60264,10 +60264,10 @@
"rwt" = (
/obj/structure/table,
/obj/item/kitchen/rollingpin,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 3
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -3
},
/turf/open/floor/iron/checker,
@@ -61010,20 +61010,20 @@
/area/crew_quarters/locker)
"rMj" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = -6;
pixel_y = 6
},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = 6;
pixel_y = 6
},
/obj/item/storage/pill_bottle/mannitol,
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = -2;
pixel_y = 9
},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = 5;
pixel_y = 9
},
@@ -63532,7 +63532,7 @@
/obj/item/cultivator,
/obj/item/crowbar,
/obj/item/plant_analyzer,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/structure/table/glass,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 8
@@ -66329,23 +66329,23 @@
/area/bridge)
"tGk" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
pixel_x = 2;
pixel_y = 12
},
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
pixel_x = -6;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
pixel_x = 9;
pixel_y = 12
},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
pixel_x = 5;
pixel_y = 5
},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
pixel_x = 2;
pixel_y = -1
},
@@ -66597,10 +66597,10 @@
/area/security/brig)
"tLJ" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -3
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 3
},
/obj/effect/turf_decal/siding/wood{
@@ -68844,7 +68844,7 @@
/obj/structure/desk_bell{
pixel_x = 8
},
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
pixel_x = -5;
pixel_y = 1
},
@@ -70483,7 +70483,7 @@
/turf/open/floor/plating,
/area/maintenance/starboard)
"vfv" = (
-/obj/item/reagent_containers/food/drinks/beer/almost_empty{
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{
pixel_x = -4;
pixel_y = -7
},
@@ -72091,10 +72091,10 @@
/area/maintenance/central)
"vJj" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 5
},
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
pixel_y = 6
},
/obj/item/food/mint,
@@ -73148,7 +73148,7 @@
/obj/structure/disposalpipe/segment,
/obj/structure/table,
/obj/item/storage/bag/plants,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/machinery/light{
dir = 1
},
@@ -73476,8 +73476,8 @@
/area/quartermaster/sorting)
"wld" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/shaker,
-/obj/item/reagent_containers/glass/rag{
+/obj/item/reagent_containers/cup/glass/shaker,
+/obj/item/reagent_containers/cup/rag{
pixel_y = 5
},
/obj/effect/turf_decal/siding/wood{
@@ -76541,7 +76541,7 @@
dir = 4;
pixel_x = 11
},
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/mop,
/obj/structure/sign/poster/random{
pixel_x = 32
diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm
index 1c764bbb8191c..0de007f2cb0f9 100644
--- a/_maps/map_files/Mining/Lavaland.dmm
+++ b/_maps/map_files/Mining/Lavaland.dmm
@@ -943,10 +943,10 @@
/area/mine/living_quarters)
"gD" = (
/obj/structure/closet/secure_closet/freezer/kitchen/maintenance,
-/obj/item/reagent_containers/food/condiment/sugar,
+/obj/item/reagent_containers/condiment/sugar,
/obj/item/food/tofu/prison,
/obj/item/knife/kitchen,
-/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/item/reagent_containers/condiment/enzyme,
/obj/item/kitchen/rollingpin,
/obj/item/wrench,
/obj/effect/turf_decal/tile/bar/opposingcorners,
@@ -2751,7 +2751,7 @@
"tM" = (
/obj/structure/table,
/obj/effect/landmark/event_spawn,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
/obj/item/shovel/spade,
/obj/item/cultivator,
/turf/open/floor/iron/grid/steel,
@@ -2907,7 +2907,7 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"uL" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/bot,
/obj/structure/reagent_dispensers/watertank/high,
/turf/open/floor/iron/grid/steel,
@@ -3661,15 +3661,15 @@
/area/mine/laborcamp)
"Bd" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 7;
pixel_y = 5
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -1;
pixel_y = 9
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -8
},
/obj/effect/turf_decal/tile/bar/opposingcorners,
@@ -4693,10 +4693,10 @@
/area/mine/laborcamp/security)
"IX" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_y = 2
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 2
},
/obj/effect/turf_decal/tile/bar/opposingcorners,
@@ -5295,7 +5295,7 @@
/obj/structure/table,
/obj/item/plate,
/obj/item/kitchen/fork,
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
pixel_x = -5;
pixel_y = 1
},
@@ -5549,10 +5549,10 @@
"Pp" = (
/obj/structure/table,
/obj/item/storage/bag/tray,
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour{
pixel_x = 3
},
-/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
/turf/open/floor/iron/grid/steel,
/area/mine/laborcamp)
"Pz" = (
@@ -5646,8 +5646,8 @@
/area/lavaland/surface/outdoors)
"Qc" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/coffee,
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee,
+/obj/item/reagent_containers/cup/glass/coffee{
pixel_x = 8;
pixel_y = 6
},
@@ -6726,19 +6726,19 @@
/area/lavaland/surface/outdoors)
"XP" = (
/obj/structure/closet/secure_closet/freezer/fridge/open,
-/obj/item/reagent_containers/food/drinks/drinkingglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/drinkingglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass,
+/obj/item/reagent_containers/cup/glass/bottle/beer{
desc = "Whatever it is, it reeks of foul, putrid froth.";
list_reagents = list(/datum/reagent/consumable/ethanol/bacchus_blessing=15);
name = "Delta-Down";
pixel_x = 5;
pixel_y = 5
},
-/obj/item/reagent_containers/food/drinks/bottle/champagne,
-/obj/item/reagent_containers/food/drinks/bottle/cognac,
-/obj/item/reagent_containers/food/drinks/bottle/lizardwine,
+/obj/item/reagent_containers/cup/glass/bottle/champagne,
+/obj/item/reagent_containers/cup/glass/bottle/cognac,
+/obj/item/reagent_containers/cup/glass/bottle/lizardwine,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/vomit/old,
/turf/open/floor/carpet/black,
diff --git a/_maps/map_files/RadStation/RadStation.dmm b/_maps/map_files/RadStation/RadStation.dmm
index bd21c8bfee2a3..be198657ac933 100644
--- a/_maps/map_files/RadStation/RadStation.dmm
+++ b/_maps/map_files/RadStation/RadStation.dmm
@@ -19,7 +19,7 @@
},
/obj/structure/closet/secure_closet/captains,
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/reagent_containers/food/drinks/flask/gold{
+/obj/item/reagent_containers/cup/glass/flask/gold{
pixel_x = 3;
pixel_y = 8
},
@@ -2604,15 +2604,15 @@
pixel_x = -6;
pixel_y = 4
},
-/obj/item/reagent_containers/food/drinks/bottle/absinthe{
+/obj/item/reagent_containers/cup/glass/bottle/absinthe{
pixel_x = -10;
pixel_y = 15
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = 3;
pixel_y = 15
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = 9;
pixel_y = 10
},
@@ -3095,10 +3095,10 @@
/obj/machinery/light{
light_color = "#7AC3FF"
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_y = 25
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_y = 21
},
/obj/machinery/computer/security/telescreen/entertainment{
@@ -4391,7 +4391,7 @@
dir = 4
},
/obj/structure/table,
-/obj/item/reagent_containers/glass/mortar,
+/obj/item/reagent_containers/cup/mortar,
/obj/item/pestle,
/obj/structure/cable/yellow{
icon_state = "1-4"
@@ -5800,7 +5800,7 @@
pixel_x = -1;
pixel_y = 8
},
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
pixel_x = 13;
pixel_y = 17
},
@@ -7297,7 +7297,7 @@
"coF" = (
/obj/machinery/reagentgrinder,
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/shaker{
+/obj/item/reagent_containers/cup/glass/shaker{
pixel_x = -9;
pixel_y = 1
},
@@ -7878,81 +7878,81 @@
dir = 1
},
/obj/structure/closet/crate/medical,
-/obj/item/reagent_containers/glass/bottle/bromine{
+/obj/item/reagent_containers/cup/bottle/bromine{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/aluminium{
+/obj/item/reagent_containers/cup/bottle/aluminium{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/chlorine{
+/obj/item/reagent_containers/cup/bottle/chlorine{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/carbon{
+/obj/item/reagent_containers/cup/bottle/carbon{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/ethanol{
+/obj/item/reagent_containers/cup/bottle/ethanol{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/copper{
+/obj/item/reagent_containers/cup/bottle/copper{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/hydrogen{
+/obj/item/reagent_containers/cup/bottle/hydrogen{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/fluorine{
+/obj/item/reagent_containers/cup/bottle/fluorine{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/water{
+/obj/item/reagent_containers/cup/bottle/water{
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/lithium{
+/obj/item/reagent_containers/cup/bottle/lithium{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/iron{
+/obj/item/reagent_containers/cup/bottle/iron{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/iodine{
+/obj/item/reagent_containers/cup/bottle/iodine{
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/oxygen{
+/obj/item/reagent_containers/cup/bottle/oxygen{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/phosphorus{
+/obj/item/reagent_containers/cup/bottle/phosphorus{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/nitrogen{
+/obj/item/reagent_containers/cup/bottle/nitrogen{
pixel_x = -6;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/mercury{
+/obj/item/reagent_containers/cup/bottle/mercury{
pixel_x = 6;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/radium{
+/obj/item/reagent_containers/cup/bottle/radium{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/potassium{
+/obj/item/reagent_containers/cup/bottle/potassium{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/welding_fuel{
+/obj/item/reagent_containers/cup/bottle/welding_fuel{
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/sacid{
+/obj/item/reagent_containers/cup/bottle/sacid{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/silicon{
+/obj/item/reagent_containers/cup/bottle/silicon{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/silver{
+/obj/item/reagent_containers/cup/bottle/silver{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/sodium{
+/obj/item/reagent_containers/cup/bottle/sodium{
pixel_x = -6
},
-/obj/item/reagent_containers/glass/bottle/sugar{
+/obj/item/reagent_containers/cup/bottle/sugar{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/sulfur{
+/obj/item/reagent_containers/cup/bottle/sulfur{
pixel_x = -6
},
/obj/item/circuitboard/machine/chem_heater,
@@ -11149,19 +11149,19 @@
/turf/open/floor/wood,
/area/crew_quarters/theatre/backstage)
"dBb" = (
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = -1;
pixel_y = 1
},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = -2;
pixel_y = 11
},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = 8;
pixel_y = 10
},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = 9
},
/obj/item/storage/pill_bottle/mannitol{
@@ -12542,10 +12542,10 @@
/obj/machinery/light{
light_color = "#7AC3FF"
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_y = 28
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_y = 23
},
/obj/effect/decal/cleanable/dirt,
@@ -15712,7 +15712,7 @@
},
/obj/machinery/vending/wallmed{
pixel_y = -32;
- products = list(/obj/item/stack/medical/gauze = 4, /obj/item/reagent_containers/hypospray/medipen = 3, /obj/item/reagent_containers/hypospray/medipen/dexalin = 3, /obj/item/reagent_containers/glass/bottle/epinephrine = 2, /obj/item/reagent_containers/glass/bottle/charcoal = 2)
+ products = list(/obj/item/stack/medical/gauze = 4, /obj/item/reagent_containers/hypospray/medipen = 3, /obj/item/reagent_containers/hypospray/medipen/dexalin = 3, /obj/item/reagent_containers/cup/bottle/epinephrine = 2, /obj/item/reagent_containers/cup/bottle/charcoal = 2)
},
/obj/machinery/newscaster{
pixel_x = -32;
@@ -16110,7 +16110,7 @@
dir = 1
},
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/carbon,
+/obj/item/reagent_containers/cup/bottle/carbon,
/turf/open/floor/plating/rust,
/area/maintenance/starboard/aft)
"fbi" = (
@@ -16822,7 +16822,7 @@
pixel_x = -3;
pixel_y = 2
},
-/obj/item/reagent_containers/glass/rag{
+/obj/item/reagent_containers/cup/rag{
pixel_x = 4;
pixel_y = 3
},
@@ -17621,7 +17621,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/siding/wood,
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
pixel_x = 7;
pixel_y = 1
},
@@ -18696,7 +18696,7 @@
/obj/item/food/donut/apple{
name = "forbidden toilet donut"
},
-/obj/item/reagent_containers/food/drinks/beer/almost_empty{
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{
pixel_x = -10;
pixel_y = 17
},
@@ -19133,7 +19133,7 @@
"fWj" = (
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable/yellow,
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
pixel_x = -2;
pixel_y = 10
},
@@ -19339,7 +19339,7 @@
departmentType = 2;
pixel_y = 30
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -9;
pixel_y = 5
},
@@ -20330,7 +20330,7 @@
/obj/item/clothing/suit/jacket/det_suit{
icon_state = "curator"
},
-/obj/item/reagent_containers/food/drinks/flask/det,
+/obj/item/reagent_containers/cup/glass/flask/det,
/obj/effect/turf_decal/siding/wood{
dir = 9
},
@@ -26098,7 +26098,7 @@
"ijU" = (
/obj/structure/table/wood,
/obj/item/toy/foamblade,
-/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull{
+/obj/item/reagent_containers/cup/soda_cans/grey_bull{
pixel_x = 7;
pixel_y = 15
},
@@ -26685,7 +26685,7 @@
/turf/open/floor/engine/air,
/area/engine/atmos)
"ivW" = (
-/obj/item/reagent_containers/glass/waterbottle/empty{
+/obj/item/reagent_containers/cup/waterbottle/empty{
pixel_x = -10
},
/obj/item/storage/belt/utility,
@@ -29128,7 +29128,7 @@
/turf/open/floor/iron/white,
/area/medical/office)
"jmw" = (
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = -7;
pixel_y = 6
},
@@ -29214,11 +29214,11 @@
/area/hallway/primary/central)
"joH" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = 4;
pixel_y = 13
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -2;
pixel_y = 14
},
@@ -32100,7 +32100,7 @@
icon_state = "0-2"
},
/obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/iron/grid/steel,
/area/hydroponics)
"kkV" = (
@@ -33916,7 +33916,7 @@
pixel_x = -6;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 9;
pixel_y = 10
},
@@ -33924,7 +33924,7 @@
pixel_x = -3;
pixel_y = -4
},
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_x = 8;
pixel_y = 1
},
@@ -35311,7 +35311,7 @@
},
/obj/structure/table/wood/fancy/purple,
/obj/item/book/granter/spell/smoke/lesser,
-/obj/item/reagent_containers/food/drinks/bottle/holywater,
+/obj/item/reagent_containers/cup/glass/bottle/holywater,
/obj/item/soulstone/anybody/chaplain,
/obj/item/organ/heart,
/turf/open/floor/carpet/grimy,
@@ -37294,7 +37294,7 @@
/area/science/research)
"lYd" = (
/obj/effect/decal/cleanable/food/flour,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -9;
pixel_y = 44
},
@@ -37315,7 +37315,7 @@
/area/hallway/primary/central)
"lYy" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/champagne{
+/obj/item/reagent_containers/cup/glass/bottle/champagne{
pixel_x = 6;
pixel_y = 10
},
@@ -38634,7 +38634,7 @@
/turf/open/floor/iron,
/area/hallway/primary/port)
"mrr" = (
-/obj/item/reagent_containers/glass/bottle/iodine,
+/obj/item/reagent_containers/cup/bottle/iodine,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"mrF" = (
@@ -40073,7 +40073,7 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{
+/obj/item/reagent_containers/cup/soda_cans/pwr_game{
pixel_x = -7;
pixel_y = 10
},
@@ -42974,7 +42974,7 @@
pixel_x = -3;
pixel_y = 8
},
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
pixel_x = -8
},
/obj/effect/turf_decal/tile/neutral/half/contrasted,
@@ -43651,7 +43651,7 @@
"nQW" = (
/obj/structure/flora/ausbushes/fullgrass,
/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/grass,
/area/hallway/primary/central)
"nQZ" = (
@@ -44795,7 +44795,7 @@
/area/hallway/secondary/exit/departure_lounge)
"okF" = (
/obj/machinery/chem_master,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/turf/open/floor/iron,
/area/medical/apothecary)
"okN" = (
@@ -46047,7 +46047,7 @@
/area/hallway/primary/port)
"oHE" = (
/obj/structure/lattice/catwalk,
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 9;
pixel_y = 6
},
@@ -46055,7 +46055,7 @@
pixel_x = -3;
pixel_y = 4
},
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 2;
pixel_y = 1
},
@@ -46659,19 +46659,19 @@
/area/security/checkpoint/escape)
"oPl" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind{
+/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{
pixel_x = -7;
pixel_y = 8
},
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
pixel_x = 12;
pixel_y = 12
},
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
+/obj/item/reagent_containers/cup/soda_cans/starkist{
pixel_x = 10;
pixel_y = 2
},
-/obj/item/reagent_containers/food/drinks/soda_cans/space_up,
+/obj/item/reagent_containers/cup/soda_cans/space_up,
/turf/open/floor/iron,
/area/maintenance/port/aft)
"oPx" = (
@@ -48046,7 +48046,7 @@
/area/crew_quarters/heads/captain/private)
"piH" = (
/obj/structure/janitorialcart,
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
pixel_x = 11;
pixel_y = -5
},
@@ -49287,7 +49287,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/turf/open/floor/iron,
/area/medical/apothecary)
"pEF" = (
@@ -55299,15 +55299,15 @@
pixel_x = -22
},
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = 5;
pixel_y = 11
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = 9;
pixel_y = 5
},
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{
pixel_x = -7;
pixel_y = 17
},
@@ -56088,7 +56088,7 @@
/obj/structure/closet/cardboard,
/obj/item/storage/toolbox/emergency,
/obj/effect/spawner/lootdrop/maintenance/eight,
-/obj/item/reagent_containers/food/drinks/bottle/hooch,
+/obj/item/reagent_containers/cup/glass/bottle/hooch,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"rJX" = (
@@ -57235,7 +57235,7 @@
pixel_x = 5;
pixel_y = 14
},
-/obj/item/reagent_containers/food/drinks/shaker{
+/obj/item/reagent_containers/cup/glass/shaker{
pixel_x = -8;
pixel_y = 3
},
@@ -60357,7 +60357,7 @@
/obj/structure/railing{
dir = 1
},
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
/obj/item/food/grown/carrot{
pixel_x = 4;
pixel_y = 4
@@ -61216,14 +61216,14 @@
pixel_x = -1;
pixel_y = 12
},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
pixel_x = -8
},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
pixel_x = -4
},
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/reagent_containers/cup/bucket{
pixel_x = 4
},
/obj/item/shovel/spade{
@@ -63750,7 +63750,7 @@
id = "cell";
pixel_x = -25
},
-/obj/item/reagent_containers/food/drinks/beer/almost_empty{
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{
pixel_x = 11;
pixel_y = 15
},
@@ -63927,7 +63927,7 @@
pixel_x = -4;
pixel_y = 2
},
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
pixel_x = 2;
pixel_y = 9
},
@@ -65517,14 +65517,14 @@
/turf/open/floor/iron/dark,
/area/security/nuke_storage)
"uLH" = (
-/obj/item/reagent_containers/food/drinks/beer/light{
+/obj/item/reagent_containers/cup/glass/bottle/beer/light{
pixel_x = 9;
pixel_y = 6
},
-/obj/item/reagent_containers/food/drinks/beer/light{
+/obj/item/reagent_containers/cup/glass/bottle/beer/light{
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/beer/light{
+/obj/item/reagent_containers/cup/glass/bottle/beer/light{
pixel_x = -8;
pixel_y = 11
},
@@ -66283,7 +66283,7 @@
/area/maintenance/department/science)
"uZg" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
pixel_x = -5;
pixel_y = 1
},
@@ -66339,15 +66339,15 @@
"vam" = (
/obj/machinery/recharger,
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/wine{
+/obj/item/reagent_containers/cup/glass/bottle/wine{
pixel_x = -9;
pixel_y = 6
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = 10;
pixel_y = 13
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = 10;
pixel_y = 5
},
@@ -66710,7 +66710,7 @@
/area/hallway/secondary/entry)
"viS" = (
/obj/structure/table/wood/fancy/black,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb{
pixel_x = -2;
pixel_y = 12
},
@@ -66834,7 +66834,7 @@
/area/chapel/main)
"vkC" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/glass/bottle/nutrient/ez{
+/obj/item/reagent_containers/cup/bottle/nutrient/ez{
pixel_x = 9;
pixel_y = 4
},
@@ -67726,11 +67726,11 @@
/area/crew_quarters/heads/hor)
"vAV" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -7;
pixel_y = 2
},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = 7;
pixel_y = -3
},
@@ -67739,17 +67739,17 @@
pixel_x = -3;
pixel_y = 2
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = -4;
pixel_y = -3
},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = 8;
pixel_y = 6
},
/obj/item/reagent_containers/syringe/antiviral,
/obj/item/reagent_containers/syringe/antiviral,
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = -4;
pixel_y = -3
},
@@ -68541,7 +68541,7 @@
/area/solar/starboard/fore)
"vPl" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -5;
pixel_y = 16
},
@@ -69700,7 +69700,7 @@
dir = 4
},
/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
pixel_x = -6;
pixel_y = 3
},
@@ -71592,7 +71592,7 @@
pixel_x = 2;
pixel_y = 6
},
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour{
pixel_x = -5;
pixel_y = 5
},
@@ -71785,23 +71785,23 @@
/area/hydroponics)
"wUw" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
pixel_x = 2;
pixel_y = 12
},
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
pixel_x = -6;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
pixel_x = 9;
pixel_y = 12
},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
pixel_x = 5;
pixel_y = 5
},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
pixel_x = 2;
pixel_y = -1
},
@@ -72571,7 +72571,7 @@
/turf/open/floor/iron/dark,
/area/security/brig/dock)
"xjA" = (
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
pixel_x = 3;
pixel_y = 12
},
@@ -72700,7 +72700,7 @@
pixel_x = -7;
pixel_y = 2
},
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
pixel_x = -8;
pixel_y = 10
},
@@ -74222,11 +74222,11 @@
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/siding/wideplating/dark,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = -6;
pixel_y = 9
},
-/obj/item/reagent_containers/glass/rag{
+/obj/item/reagent_containers/cup/rag{
pixel_x = 6;
pixel_y = 8
},
@@ -75321,7 +75321,7 @@
/area/security/execution/education)
"yaV" = (
/obj/machinery/biogenerator,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/bot,
/obj/machinery/door/window/eastleft{
name = "Hydroponics Desk";
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index b7bddd9b25c04..ada8a8d8a658f 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -190,7 +190,7 @@
"aH" = (
/obj/structure/table,
/obj/machinery/reagentgrinder,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/obj/effect/turf_decal/tile/green/fourcorners/contrasted,
/turf/open/floor/iron/white,
/area/centcom/holding)
@@ -492,7 +492,7 @@
"bK" = (
/obj/structure/table/reinforced,
/obj/item/food/mint,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
pixel_y = 5
},
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
@@ -953,7 +953,7 @@
/obj/structure/sign/poster/official/cohiba_robusto_ad{
pixel_x = 32
},
-/obj/item/reagent_containers/food/drinks/shaker{
+/obj/item/reagent_containers/cup/glass/shaker{
pixel_x = -10;
pixel_y = 1
},
@@ -987,7 +987,7 @@
"dH" = (
/obj/structure/table/wood,
/obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
pixel_y = 5
},
/obj/machinery/light,
@@ -1075,17 +1075,17 @@
/turf/open/floor/iron/dark,
/area/centcom/ferry)
"ef" = (
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = -3
},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -3;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = 6;
pixel_y = 8
},
@@ -1208,7 +1208,7 @@
pixel_y = 7;
pixel_x = -4
},
-/obj/item/reagent_containers/food/drinks/mug/tea{
+/obj/item/reagent_containers/cup/glass/mug/tea{
pixel_x = 9
},
/turf/open/floor/iron/dark,
@@ -1357,8 +1357,8 @@
"eQ" = (
/obj/structure/table/wood,
/obj/item/book/manual/wiki/barman_recipes,
-/obj/item/reagent_containers/food/drinks/shaker,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/glass/shaker,
+/obj/item/reagent_containers/cup/rag,
/obj/machinery/newscaster{
pixel_y = -32
},
@@ -2075,7 +2075,7 @@
/area/tdome/tdomeobserve)
"hT" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 5;
pixel_y = -2
},
@@ -4195,7 +4195,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 8
},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = 4;
pixel_y = 7
},
@@ -4798,7 +4798,7 @@
/area/centcom/evac)
"si" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/turf/open/floor/wood,
/area/syndicate_mothership/control)
"sj" = (
@@ -5765,7 +5765,7 @@
/area/centcom/holding)
"vu" = (
/obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/bottle/rum,
+/obj/item/reagent_containers/cup/glass/bottle/rum,
/obj/structure/table/wood,
/turf/open/floor/wood,
/area/syndicate_mothership/control)
@@ -6226,7 +6226,7 @@
/area/wizard_station)
"wR" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/trophy/gold_cup,
+/obj/item/reagent_containers/cup/glass/trophy/gold_cup,
/turf/open/floor/carpet/grimy,
/area/tdome/tdomeobserve)
"wS" = (
@@ -7104,7 +7104,7 @@
pixel_x = 6;
pixel_y = 1
},
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
pixel_x = -7;
pixel_y = -1
},
@@ -8030,7 +8030,7 @@
"Du" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
-/obj/item/reagent_containers/food/drinks/britcup,
+/obj/item/reagent_containers/cup/glass/britcup,
/obj/structure/window/reinforced{
dir = 8
},
@@ -9230,14 +9230,14 @@
"HK" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -8;
pixel_y = 5
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -8
},
-/obj/item/reagent_containers/food/drinks/britcup,
+/obj/item/reagent_containers/cup/glass/britcup,
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/tdome/tdomeobserve)
@@ -9389,7 +9389,7 @@
/obj/item/trash/candy{
pixel_x = 5
},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = -4;
pixel_y = 11
},
@@ -9501,7 +9501,7 @@
/area/tdome/arena)
"IG" = (
/obj/structure/bookcase/manuals,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/closed/indestructible/riveted,
/area/ctf)
"IJ" = (
@@ -9910,18 +9910,18 @@
/obj/effect/turf_decal/siding/wood{
dir = 9
},
-/obj/item/reagent_containers/food/drinks/mug{
+/obj/item/reagent_containers/cup/glass/mug{
pixel_x = 11;
pixel_y = -2
},
/obj/structure/sign/barsign{
pixel_y = 32
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = 12;
pixel_y = 15
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 8;
pixel_y = 13
},
@@ -10309,12 +10309,12 @@
"LJ" = (
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 5;
pixel_y = -2
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -5
},
/turf/open/floor/iron/dark,
@@ -10719,7 +10719,7 @@
"Nh" = (
/obj/structure/table/wood,
/obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/turf/open/floor/iron/dark,
/area/centcom/supplypod)
"Nk" = (
@@ -11478,14 +11478,14 @@
"PO" = (
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -8;
pixel_y = -2
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -5
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 6
},
/turf/open/floor/iron/dark,
@@ -11569,7 +11569,7 @@
"Qf" = (
/obj/structure/table/wood,
/obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
pixel_y = 5
},
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
@@ -11591,7 +11591,7 @@
/area/centcom/holding)
"Qj" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/sake,
+/obj/item/reagent_containers/cup/glass/bottle/sake,
/turf/open/floor/wood,
/area/centcom/holding)
"Qk" = (
@@ -11993,10 +11993,10 @@
/area/ctf)
"RK" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -4
},
/obj/item/reagent_containers/hypospray/medipen,
@@ -12201,7 +12201,7 @@
"Sn" = (
/obj/structure/table/wood,
/obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
pixel_y = 5
},
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
@@ -12473,11 +12473,11 @@
/area/tdome/tdomeobserve)
"Ti" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -8;
pixel_y = 5
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -8
},
/obj/item/knife/kitchen,
@@ -12489,7 +12489,7 @@
/area/tdome/tdomeobserve)
"Tj" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
pixel_y = 5
},
/obj/item/clothing/mask/cigarette/cigar/havana{
@@ -13492,8 +13492,8 @@
/obj/item/wrench,
/obj/item/watertank,
/obj/item/cultivator,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/tile/green/fourcorners/contrasted,
/turf/open/floor/iron/white,
/area/centcom/holding)
@@ -13894,8 +13894,8 @@
/turf/open/floor/iron,
/area/centcom/control)
"YJ" = (
-/obj/item/reagent_containers/food/condiment/enzyme,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/condiment/enzyme,
+/obj/item/reagent_containers/cup/glass/shaker,
/obj/item/book/manual/wiki/barman_recipes,
/obj/structure/closet/crate,
/turf/open/floor/iron/cafeteria,
@@ -13925,7 +13925,7 @@
/area/centcom/supplypod/loading/four)
"YQ" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
/turf/open/floor/iron/cafeteria,
/area/centcom/holding)
"YS" = (
diff --git a/_maps/shuttles/emergency/emergency_bar.dmm b/_maps/shuttles/emergency/emergency_bar.dmm
index b1720b49d0f1c..e6d1845ee49e6 100644
--- a/_maps/shuttles/emergency/emergency_bar.dmm
+++ b/_maps/shuttles/emergency/emergency_bar.dmm
@@ -115,7 +115,7 @@
"at" = (
/obj/structure/table/wood/poker,
/obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey,
/obj/machinery/light,
/obj/effect/turf_decal/siding/dark,
/turf/open/floor/carpet/royalblue,
@@ -441,7 +441,7 @@
"hS" = (
/obj/structure/table,
/obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/obj/item/storage/fancy/cigarettes/cigars/havana,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
@@ -726,7 +726,7 @@
},
/obj/structure/table,
/obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/bottle/lizardwine,
+/obj/item/reagent_containers/cup/glass/bottle/lizardwine,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/shuttle/escape)
diff --git a/_maps/shuttles/emergency/emergency_cere.dmm b/_maps/shuttles/emergency/emergency_cere.dmm
index 7dc14e723c105..ebbabaa23f450 100644
--- a/_maps/shuttles/emergency/emergency_cere.dmm
+++ b/_maps/shuttles/emergency/emergency_cere.dmm
@@ -458,7 +458,7 @@
/area/shuttle/escape)
"gd" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/beaker/cryoxadone,
+/obj/item/reagent_containers/cup/beaker/cryoxadone,
/obj/item/wrench,
/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
dir = 4
diff --git a/_maps/shuttles/emergency/emergency_corg.dmm b/_maps/shuttles/emergency/emergency_corg.dmm
index b1d5de11fe706..4f2bb9b67a7d9 100644
--- a/_maps/shuttles/emergency/emergency_corg.dmm
+++ b/_maps/shuttles/emergency/emergency_corg.dmm
@@ -293,7 +293,7 @@
/area/shuttle/escape)
"kD" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
/obj/item/reagent_containers/syringe/epinephrine,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
@@ -482,10 +482,10 @@
/area/shuttle/escape)
"rX" = (
/obj/structure/closet/secure_closet/freezer/kitchen,
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/condiment/sugar,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
/obj/item/food/meat/rawbacon,
/obj/item/food/meat/rawbacon,
/obj/item/food/meat/rawbacon,
@@ -1028,7 +1028,7 @@
dir = 4
},
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
pixel_y = 5
},
/obj/item/food/chocolatebar,
diff --git a/_maps/shuttles/emergency/emergency_delta.dmm b/_maps/shuttles/emergency/emergency_delta.dmm
index de3aa740a6542..cd967380d5889 100644
--- a/_maps/shuttles/emergency/emergency_delta.dmm
+++ b/_maps/shuttles/emergency/emergency_delta.dmm
@@ -1268,17 +1268,17 @@
/turf/open/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"Gd" = (
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = -3
},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -3;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = 6;
pixel_y = 8
},
diff --git a/_maps/shuttles/emergency/emergency_discoinferno.dmm b/_maps/shuttles/emergency/emergency_discoinferno.dmm
index 2629b06e99961..d6980dcd1f23e 100644
--- a/_maps/shuttles/emergency/emergency_discoinferno.dmm
+++ b/_maps/shuttles/emergency/emergency_discoinferno.dmm
@@ -70,7 +70,7 @@
"n" = (
/obj/structure/table/wood/poker,
/obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey,
/obj/machinery/light,
/turf/open/floor/mineral/gold,
/area/shuttle/escape)
@@ -112,12 +112,12 @@
/area/shuttle/escape)
"A" = (
/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/drinks/bottle/cognac,
+/obj/item/reagent_containers/cup/glass/bottle/cognac,
/turf/open/floor/wood,
/area/shuttle/escape)
"B" = (
/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka,
/turf/open/floor/wood,
/area/shuttle/escape)
"C" = (
@@ -152,9 +152,9 @@
/area/shuttle/escape)
"H" = (
/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
/obj/machinery/light{
dir = 4
},
@@ -176,12 +176,12 @@
/area/shuttle/escape)
"K" = (
/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/drinks/bottle/absinthe,
+/obj/item/reagent_containers/cup/glass/bottle/absinthe,
/turf/open/floor/wood,
/area/shuttle/escape)
"L" = (
/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/drinks/bottle/lizardwine,
+/obj/item/reagent_containers/cup/glass/bottle/lizardwine,
/turf/open/floor/wood,
/area/shuttle/escape)
"M" = (
diff --git a/_maps/shuttles/emergency/emergency_donut.dmm b/_maps/shuttles/emergency/emergency_donut.dmm
index 9a74f82daa4b4..5b62cf55e6e95 100644
--- a/_maps/shuttles/emergency/emergency_donut.dmm
+++ b/_maps/shuttles/emergency/emergency_donut.dmm
@@ -359,17 +359,17 @@
/area/shuttle/escape)
"bn" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = -3
},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -3;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = 6;
pixel_y = 8
},
diff --git a/_maps/shuttles/emergency/emergency_fland.dmm b/_maps/shuttles/emergency/emergency_fland.dmm
index 65b2116ce2033..a60fbc50f6c29 100644
--- a/_maps/shuttles/emergency/emergency_fland.dmm
+++ b/_maps/shuttles/emergency/emergency_fland.dmm
@@ -339,17 +339,17 @@
/turf/open/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"pF" = (
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = -3
},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -3;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = 6;
pixel_y = 8
},
@@ -658,17 +658,17 @@
/area/shuttle/escape)
"zB" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = -3
},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -3;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = 6;
pixel_y = 8
},
@@ -905,7 +905,7 @@
/obj/item/reagent_containers/hypospray/medipen{
pixel_y = -6
},
-/obj/item/reagent_containers/glass/bottle/charcoal,
+/obj/item/reagent_containers/cup/bottle/charcoal,
/obj/item/defibrillator/compact/loaded,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
diff --git a/_maps/shuttles/emergency/emergency_imfedupwiththisworld.dmm b/_maps/shuttles/emergency/emergency_imfedupwiththisworld.dmm
index c6c506d1210bf..f25f156c2401f 100644
--- a/_maps/shuttles/emergency/emergency_imfedupwiththisworld.dmm
+++ b/_maps/shuttles/emergency/emergency_imfedupwiththisworld.dmm
@@ -155,16 +155,16 @@
/area/shuttle/escape)
"U" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/shuttle/escape)
"V" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/shuttle/escape)
diff --git a/_maps/shuttles/emergency/emergency_kilo.dmm b/_maps/shuttles/emergency/emergency_kilo.dmm
index 61c5969117929..974cb677e70fe 100644
--- a/_maps/shuttles/emergency/emergency_kilo.dmm
+++ b/_maps/shuttles/emergency/emergency_kilo.dmm
@@ -463,7 +463,7 @@
/obj/item/reagent_containers/hypospray/medipen{
pixel_y = -6
},
-/obj/item/reagent_containers/glass/bottle/charcoal,
+/obj/item/reagent_containers/cup/bottle/charcoal,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/escape)
"cY" = (
diff --git a/_maps/shuttles/emergency/emergency_meta.dmm b/_maps/shuttles/emergency/emergency_meta.dmm
index 43daa06db9753..8b1be9081bdbb 100644
--- a/_maps/shuttles/emergency/emergency_meta.dmm
+++ b/_maps/shuttles/emergency/emergency_meta.dmm
@@ -436,17 +436,17 @@
/area/shuttle/escape)
"bJ" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = -3
},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -3;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = 6;
pixel_y = 8
},
diff --git a/_maps/shuttles/emergency/emergency_pubby.dmm b/_maps/shuttles/emergency/emergency_pubby.dmm
index 638c0e726d90d..f0f93bc16b853 100644
--- a/_maps/shuttles/emergency/emergency_pubby.dmm
+++ b/_maps/shuttles/emergency/emergency_pubby.dmm
@@ -374,7 +374,7 @@
/area/shuttle/escape)
"vo" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/food/drinks/bottle/wine,
+/obj/item/reagent_containers/cup/glass/bottle/wine,
/obj/effect/turf_decal/tile/green/half/contrasted{
dir = 1
},
diff --git a/_maps/shuttles/emergency/emergency_raven.dmm b/_maps/shuttles/emergency/emergency_raven.dmm
index fe28a505f0961..9a2f8ab6f9f51 100644
--- a/_maps/shuttles/emergency/emergency_raven.dmm
+++ b/_maps/shuttles/emergency/emergency_raven.dmm
@@ -447,17 +447,17 @@
/turf/open/floor/iron/white/side,
/area/shuttle/escape)
"bL" = (
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = -3
},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -3;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = 6;
pixel_y = 8
},
diff --git a/_maps/shuttles/emergency/emergency_russiafightpit.dmm b/_maps/shuttles/emergency/emergency_russiafightpit.dmm
index be30341adae41..a9f91777a46a4 100644
--- a/_maps/shuttles/emergency/emergency_russiafightpit.dmm
+++ b/_maps/shuttles/emergency/emergency_russiafightpit.dmm
@@ -58,7 +58,7 @@
"am" = (
/obj/structure/table,
/obj/item/storage/fancy/cigarettes/cigars/cohiba,
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{
pixel_x = 5;
pixel_y = 18
},
@@ -303,7 +303,7 @@
/area/shuttle/escape)
"be" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/vodka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/escape)
"bf" = (
@@ -396,7 +396,7 @@
pixel_x = 27
},
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/vodka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/escape)
"bv" = (
@@ -459,12 +459,12 @@
/area/shuttle/escape)
"bH" = (
/obj/structure/closet,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/turf/open/floor/plating,
/area/shuttle/escape)
"bI" = (
diff --git a/_maps/shuttles/emergency/emergency_theatre.dmm b/_maps/shuttles/emergency/emergency_theatre.dmm
index 445a67b1940c0..c0bdc1ab2577e 100644
--- a/_maps/shuttles/emergency/emergency_theatre.dmm
+++ b/_maps/shuttles/emergency/emergency_theatre.dmm
@@ -10,17 +10,17 @@
/turf/open/floor/carpet/black,
/area/shuttle/escape)
"eX" = (
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = -3
},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -3;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = 6;
pixel_y = 8
},
@@ -425,22 +425,22 @@
/area/shuttle/escape)
"JO" = (
/obj/structure/table/wood/fancy/royalblue,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_y = 9;
pixel_x = -6
},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_y = 9;
pixel_x = 6
},
-/obj/item/reagent_containers/food/drinks/bottle/champagne{
+/obj/item/reagent_containers/cup/glass/bottle/champagne{
pixel_y = 11
},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_y = 4;
pixel_x = 6
},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_y = 4;
pixel_x = -6
},
diff --git a/_maps/shuttles/emergency/emergency_tiny.dmm b/_maps/shuttles/emergency/emergency_tiny.dmm
index 9bdc48160d4e6..a325822887e5f 100644
--- a/_maps/shuttles/emergency/emergency_tiny.dmm
+++ b/_maps/shuttles/emergency/emergency_tiny.dmm
@@ -323,7 +323,7 @@
/obj/machinery/vending/wallmed{
pixel_x = -32;
pixel_y = 1;
- products = list(/obj/item/stack/medical/gauze = 4, /obj/item/reagent_containers/hypospray/medipen = 6, /obj/item/reagent_containers/hypospray/medipen/dexalin = 3, /obj/item/reagent_containers/glass/bottle/epinephrine = 2, /obj/item/reagent_containers/glass/bottle/charcoal = 2)
+ products = list(/obj/item/stack/medical/gauze = 4, /obj/item/reagent_containers/hypospray/medipen = 6, /obj/item/reagent_containers/hypospray/medipen/dexalin = 3, /obj/item/reagent_containers/cup/bottle/epinephrine = 2, /obj/item/reagent_containers/cup/bottle/charcoal = 2)
},
/turf/open/floor/iron/white,
/area/shuttle/escape)
diff --git a/_maps/shuttles/emergency/emergency_wabbajack.dmm b/_maps/shuttles/emergency/emergency_wabbajack.dmm
index 3d71a8948f4e4..cda35866266b3 100644
--- a/_maps/shuttles/emergency/emergency_wabbajack.dmm
+++ b/_maps/shuttles/emergency/emergency_wabbajack.dmm
@@ -186,11 +186,11 @@
/area/shuttle/escape)
"aT" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = 2;
pixel_y = 2
},
-/obj/item/reagent_containers/glass/bottle/charcoal,
+/obj/item/reagent_containers/cup/bottle/charcoal,
/turf/open/floor/mineral/titanium/white,
/area/shuttle/escape)
"be" = (
diff --git a/_maps/shuttles/exploration/exploration_fland.dmm b/_maps/shuttles/exploration/exploration_fland.dmm
index 6a75042c81328..8c61415c2cb5c 100644
--- a/_maps/shuttles/exploration/exploration_fland.dmm
+++ b/_maps/shuttles/exploration/exploration_fland.dmm
@@ -39,7 +39,7 @@
pixel_x = 6;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/syndicatebeer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -8;
pixel_y = 2
},
@@ -645,10 +645,10 @@
/area/shuttle/exploration)
"JR" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/rag{
+/obj/item/reagent_containers/cup/rag{
pixel_y = 5
},
-/obj/item/reagent_containers/food/drinks/shaker{
+/obj/item/reagent_containers/cup/glass/shaker{
pixel_x = 4;
pixel_y = 1
},
@@ -783,7 +783,7 @@
dir = 8
},
/obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/reagent_containers/spray/cleaner,
/obj/effect/turf_decal/box,
/turf/open/floor/iron/grid/steel,
@@ -870,7 +870,7 @@
/area/shuttle/exploration)
"UN" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
pixel_x = 9;
pixel_y = -3
},
@@ -879,7 +879,7 @@
pixel_x = -3;
pixel_y = 5
},
-/obj/item/reagent_containers/food/drinks/beer/light{
+/obj/item/reagent_containers/cup/glass/bottle/beer/light{
pixel_x = 4;
pixel_y = 7
},
@@ -895,7 +895,7 @@
pixel_y = 1
},
/obj/item/trash/pistachios,
-/obj/item/reagent_containers/food/drinks/beer/almost_empty{
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{
pixel_x = -8
},
/obj/machinery/light,
diff --git a/_maps/shuttles/hunter/hunter_bounty.dmm b/_maps/shuttles/hunter/hunter_bounty.dmm
index 9bc7ba09d5318..ec8b4afb4c495 100644
--- a/_maps/shuttles/hunter/hunter_bounty.dmm
+++ b/_maps/shuttles/hunter/hunter_bounty.dmm
@@ -29,7 +29,7 @@
},
/obj/effect/turf_decal/delivery,
/obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/machinery/airalarm/directional/east{
req_access = null;
req_access_txt = "181"
diff --git a/_maps/shuttles/hunter/hunter_russian.dmm b/_maps/shuttles/hunter/hunter_russian.dmm
index ebde43f81b867..3ee9fa8e724bc 100644
--- a/_maps/shuttles/hunter/hunter_russian.dmm
+++ b/_maps/shuttles/hunter/hunter_russian.dmm
@@ -108,9 +108,9 @@
/obj/item/food/rationpack,
/obj/item/food/rationpack,
/obj/item/food/rationpack,
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka,
-/obj/item/reagent_containers/food/drinks/bottle/vodka,
-/obj/item/reagent_containers/food/drinks/bottle/vodka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka,
/turf/open/floor/iron/techmaint,
/area/shuttle/hunter)
"jP" = (
@@ -157,7 +157,7 @@
/area/shuttle/hunter)
"my" = (
/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/storage/bag/trash{
pixel_x = 6
},
@@ -689,7 +689,7 @@
/area/shuttle/hunter)
"Jx" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/vodka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
pixel_x = 8;
pixel_y = 6
},
@@ -988,7 +988,7 @@
/turf/open/floor/iron/dark,
/area/shuttle/hunter)
"Ul" = (
-/obj/item/reagent_containers/food/drinks/flask/gold{
+/obj/item/reagent_containers/cup/glass/flask/gold{
list_reagents = list(/datum/reagent/consumable/ethanol/sbiten=30);
pixel_y = 8;
pixel_x = 4
@@ -1030,7 +1030,7 @@
pixel_y = 8;
pixel_x = 2
},
-/obj/item/reagent_containers/food/drinks/bottle/vodka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
pixel_x = -8;
pixel_y = 11
},
diff --git a/_maps/shuttles/hunter/hunter_space_cop.dmm b/_maps/shuttles/hunter/hunter_space_cop.dmm
index d79dd2d7bba92..8884b78dc8304 100644
--- a/_maps/shuttles/hunter/hunter_space_cop.dmm
+++ b/_maps/shuttles/hunter/hunter_space_cop.dmm
@@ -232,7 +232,7 @@
pixel_x = 8;
pixel_y = 8
},
-/obj/item/reagent_containers/food/drinks/mug{
+/obj/item/reagent_containers/cup/glass/mug{
pixel_x = 9;
pixel_y = -2
},
@@ -389,7 +389,7 @@
pixel_x = -7;
pixel_y = -7
},
-/obj/item/reagent_containers/food/drinks/mug{
+/obj/item/reagent_containers/cup/glass/mug{
pixel_x = -7;
pixel_y = 4
},
@@ -1220,7 +1220,7 @@
/obj/effect/decal/cleanable/oil{
pixel_y = 11
},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
pixel_x = -8;
pixel_y = 2
},
diff --git a/_maps/shuttles/infiltrator/infiltrator_advanced.dmm b/_maps/shuttles/infiltrator/infiltrator_advanced.dmm
index c20ea1aae749d..b8e9370fbe87b 100644
--- a/_maps/shuttles/infiltrator/infiltrator_advanced.dmm
+++ b/_maps/shuttles/infiltrator/infiltrator_advanced.dmm
@@ -34,17 +34,17 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
desc = "A bottle of whiskey. There's a label that reads 'tears' taped to the front.";
name = "Bottle of Tears";
pixel_x = 3;
pixel_y = 5
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -7;
pixel_y = 10
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -7;
pixel_y = 4
},
@@ -665,7 +665,7 @@
/obj/item/reagent_containers/hypospray/medipen{
pixel_y = -6
},
-/obj/item/reagent_containers/glass/bottle/charcoal,
+/obj/item/reagent_containers/cup/bottle/charcoal,
/obj/structure/table/reinforced,
/obj/machinery/light{
dir = 1
diff --git a/_maps/shuttles/infiltrator/infiltrator_basic.dmm b/_maps/shuttles/infiltrator/infiltrator_basic.dmm
index df51e6e24bafb..7f4b5c79544ef 100644
--- a/_maps/shuttles/infiltrator/infiltrator_basic.dmm
+++ b/_maps/shuttles/infiltrator/infiltrator_basic.dmm
@@ -283,17 +283,17 @@
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/medical)
"bt" = (
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = -3
},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -3;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = 6;
pixel_y = 8
},
@@ -851,8 +851,8 @@
/area/shuttle/syndicate/medical)
"Hs" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker,
/obj/item/reagent_containers/dropper,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
diff --git a/_maps/shuttles/pirate/pirate_default.dmm b/_maps/shuttles/pirate/pirate_default.dmm
index a7205fb084fdc..9a11216e64085 100644
--- a/_maps/shuttles/pirate/pirate_default.dmm
+++ b/_maps/shuttles/pirate/pirate_default.dmm
@@ -229,7 +229,7 @@
dir = 8;
pixel_y = 10
},
-/obj/item/reagent_containers/food/drinks/bottle/hooch{
+/obj/item/reagent_containers/cup/glass/bottle/hooch{
pixel_x = 8;
pixel_y = 4
},
@@ -402,7 +402,7 @@
pixel_x = 8;
pixel_y = -4
},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
pixel_x = -9;
pixel_y = -7
},
@@ -594,7 +594,7 @@
pixel_x = -8;
pixel_y = 14
},
-/obj/item/reagent_containers/food/drinks/mug{
+/obj/item/reagent_containers/cup/glass/mug{
pixel_x = -14;
pixel_y = 1
},
@@ -870,7 +870,7 @@
pixel_y = 10;
pixel_x = -5
},
-/obj/item/reagent_containers/food/condiment/milk{
+/obj/item/reagent_containers/condiment/milk{
pixel_y = 2;
pixel_x = -7
},
@@ -929,7 +929,7 @@
pixel_x = 6;
pixel_y = -2
},
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee{
pixel_x = 10;
pixel_y = 19
},
@@ -2004,7 +2004,7 @@
/obj/effect/turf_decal/weather/dirt/corner{
dir = 4
},
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/mop,
/obj/item/storage/bag/trash{
pixel_x = 4;
@@ -2098,40 +2098,40 @@
/area/shuttle/pirate)
"Wx" = (
/obj/effect/turf_decal/bot,
-/obj/item/reagent_containers/food/drinks/bottle/moonshine{
+/obj/item/reagent_containers/cup/glass/bottle/moonshine{
pixel_x = 7;
pixel_y = -5
},
-/obj/item/reagent_containers/food/condiment/milk{
+/obj/item/reagent_containers/condiment/milk{
pixel_y = -6;
pixel_x = 5
},
-/obj/item/reagent_containers/food/condiment/milk{
+/obj/item/reagent_containers/condiment/milk{
pixel_y = -6;
pixel_x = 1
},
-/obj/item/reagent_containers/food/condiment/milk{
+/obj/item/reagent_containers/condiment/milk{
pixel_y = -6;
pixel_x = -5
},
-/obj/item/reagent_containers/food/condiment/milk{
+/obj/item/reagent_containers/condiment/milk{
pixel_y = -6;
pixel_x = 5
},
-/obj/item/reagent_containers/food/condiment/milk{
+/obj/item/reagent_containers/condiment/milk{
pixel_y = -6;
pixel_x = 1
},
-/obj/item/reagent_containers/food/condiment/milk{
+/obj/item/reagent_containers/condiment/milk{
pixel_y = -8;
pixel_x = 8
},
-/obj/item/reagent_containers/food/condiment/milk{
+/obj/item/reagent_containers/condiment/milk{
pixel_y = -10;
pixel_x = -3
},
/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/item/reagent_containers/food/condiment/milk{
+/obj/item/reagent_containers/condiment/milk{
pixel_y = -8;
pixel_x = 8
},
diff --git a/_maps/shuttles/ruin/ruin_caravan_victim.dmm b/_maps/shuttles/ruin/ruin_caravan_victim.dmm
index bc43d0d012d66..851f1bd4af8f8 100644
--- a/_maps/shuttles/ruin/ruin_caravan_victim.dmm
+++ b/_maps/shuttles/ruin/ruin_caravan_victim.dmm
@@ -415,21 +415,21 @@
locked = 0;
name = "fridge"
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 3;
pixel_y = -3
},
-/obj/item/reagent_containers/glass/waterbottle{
+/obj/item/reagent_containers/cup/waterbottle{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/waterbottle,
-/obj/item/reagent_containers/glass/waterbottle{
+/obj/item/reagent_containers/cup/waterbottle,
+/obj/item/reagent_containers/cup/waterbottle{
pixel_x = 3;
pixel_y = -3
},
diff --git a/_maps/shuttles/ruin/ruin_pirate_cutter.dmm b/_maps/shuttles/ruin/ruin_pirate_cutter.dmm
index 929f9306ab4d2..cddb5cd3f86d1 100644
--- a/_maps/shuttles/ruin/ruin_pirate_cutter.dmm
+++ b/_maps/shuttles/ruin/ruin_pirate_cutter.dmm
@@ -357,7 +357,7 @@
/obj/item/storage/box/donkpockets{
pixel_x = -6
},
-/obj/item/reagent_containers/food/drinks/bottle/rum{
+/obj/item/reagent_containers/cup/glass/bottle/rum{
pixel_x = 8;
pixel_y = 3
},
@@ -368,7 +368,7 @@
/area/shuttle/caravan/pirate)
"qX" = (
/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/mop,
/obj/effect/turf_decal/stripes/line{
dir = 5
@@ -396,11 +396,11 @@
/area/shuttle/caravan/pirate)
"to" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/rum{
+/obj/item/reagent_containers/cup/glass/bottle/rum{
pixel_x = 3;
pixel_y = 6
},
-/obj/item/reagent_containers/food/drinks/bottle/rum,
+/obj/item/reagent_containers/cup/glass/bottle/rum,
/turf/open/floor/iron/dark,
/area/shuttle/caravan/pirate)
"tM" = (
diff --git a/_maps/shuttles/whiteship/whiteship_box.dmm b/_maps/shuttles/whiteship/whiteship_box.dmm
index 3978cda03d1e8..2276abbd60287 100644
--- a/_maps/shuttles/whiteship/whiteship_box.dmm
+++ b/_maps/shuttles/whiteship/whiteship_box.dmm
@@ -45,7 +45,7 @@
"am" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/crate/freezer/surplus_limbs,
-/obj/item/reagent_containers/glass/beaker/synthflesh,
+/obj/item/reagent_containers/cup/beaker/synthflesh,
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/shuttle/abandoned/medbay)
@@ -250,7 +250,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/reagent_dispensers/watertank,
/obj/effect/turf_decal/bot,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/mop,
/obj/item/storage/bag/trash{
pixel_x = 6
@@ -1170,11 +1170,11 @@
pixel_x = -6;
pixel_y = 6
},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = 7;
pixel_y = -3
},
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
pixel_x = -2;
pixel_y = -3
},
@@ -1407,7 +1407,7 @@
pixel_x = -5;
pixel_y = 5
},
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
pixel_x = 8;
pixel_y = 4
},
@@ -1545,25 +1545,25 @@
/obj/structure/closet/crate{
name = "food crate"
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = -5;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 2;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = -2
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 5
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 1;
pixel_y = -3
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 8;
pixel_y = -3
},
@@ -1718,11 +1718,11 @@
"sz" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = 7;
pixel_y = 1
},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = -6;
pixel_y = 6
},
@@ -1818,7 +1818,7 @@
pixel_x = 6;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
pixel_x = -6;
pixel_y = 4
},
@@ -1995,12 +1995,12 @@
locked = 0;
name = "fridge"
},
-/obj/item/reagent_containers/glass/waterbottle{
+/obj/item/reagent_containers/cup/waterbottle{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/waterbottle,
-/obj/item/reagent_containers/glass/waterbottle{
+/obj/item/reagent_containers/cup/waterbottle,
+/obj/item/reagent_containers/cup/waterbottle{
pixel_x = 3;
pixel_y = -3
},
diff --git a/_maps/shuttles/whiteship/whiteship_delta.dmm b/_maps/shuttles/whiteship/whiteship_delta.dmm
index e9d63fdf6ca78..8525e6de4d581 100644
--- a/_maps/shuttles/whiteship/whiteship_delta.dmm
+++ b/_maps/shuttles/whiteship/whiteship_delta.dmm
@@ -85,21 +85,21 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/bot_white,
/obj/structure/closet/crate,
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/waterbottle/large,
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large,
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 3;
pixel_y = -3
},
-/obj/item/reagent_containers/glass/waterbottle{
+/obj/item/reagent_containers/cup/waterbottle{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/waterbottle,
-/obj/item/reagent_containers/glass/waterbottle{
+/obj/item/reagent_containers/cup/waterbottle,
+/obj/item/reagent_containers/cup/waterbottle{
pixel_x = 3;
pixel_y = -3
},
@@ -129,7 +129,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/mop,
/obj/item/storage/bag/trash{
pixel_x = 6
@@ -1247,10 +1247,10 @@
"dN" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
pixel_x = -3
},
/obj/item/reagent_containers/syringe,
@@ -2120,11 +2120,11 @@
name = "fridge"
},
/obj/item/food/sausage,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/obj/item/food/sandwich,
/obj/structure/spider/stickyweb,
/obj/effect/turf_decal/tile/bar/opposingcorners,
@@ -2225,7 +2225,7 @@
currenthand = list("2 of Diamonds","3 of Clubs");
pixel_x = -5
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 7;
pixel_y = 4
},
diff --git a/_maps/shuttles/whiteship/whiteship_fland.dmm b/_maps/shuttles/whiteship/whiteship_fland.dmm
index 95ab48b5e2b7c..29cee5609ea4c 100644
--- a/_maps/shuttles/whiteship/whiteship_fland.dmm
+++ b/_maps/shuttles/whiteship/whiteship_fland.dmm
@@ -33,25 +33,25 @@
/obj/structure/closet/crate{
name = "food crate"
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = -5;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 2;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = -2
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 5
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 1;
pixel_y = -3
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 8;
pixel_y = -3
},
@@ -328,10 +328,10 @@
"qb" = (
/obj/effect/turf_decal/bot,
/obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
pixel_x = -4
},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
pixel_x = 4
},
/turf/open/floor/wood,
diff --git a/_maps/shuttles/whiteship/whiteship_meta.dmm b/_maps/shuttles/whiteship/whiteship_meta.dmm
index 8b72bbc6a3d41..464a28f46c281 100644
--- a/_maps/shuttles/whiteship/whiteship_meta.dmm
+++ b/_maps/shuttles/whiteship/whiteship_meta.dmm
@@ -218,25 +218,25 @@
/obj/structure/closet/crate{
name = "food crate"
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = -5;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 2;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = -2
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 5
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 1;
pixel_y = -3
},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
pixel_x = 8;
pixel_y = -3
},
@@ -1207,11 +1207,11 @@
"dQ" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -8;
pixel_y = 10
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -8;
pixel_y = 4
},
@@ -1293,7 +1293,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/crate/medical,
/obj/item/storage/firstaid/fire,
-/obj/item/reagent_containers/glass/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine,
/obj/item/reagent_containers/syringe,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/cargo)
@@ -1345,11 +1345,11 @@
/obj/item/knife/kitchen{
pixel_x = 16
},
-/obj/item/reagent_containers/food/condiment/sugar{
+/obj/item/reagent_containers/condiment/sugar{
pixel_x = -9;
pixel_y = 14
},
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
pixel_x = -5;
pixel_y = 6
},
@@ -1723,11 +1723,11 @@
"qi" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/secure_closet/freezer/fridge/open,
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
/obj/item/food/meat/slab/synthmeat{
pixel_x = -3;
pixel_y = 3
@@ -2158,18 +2158,18 @@
/obj/machinery/light/small{
dir = 8
},
-/obj/item/reagent_containers/food/drinks/bottle/vodka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
pixel_y = 12
},
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
pixel_x = 16;
pixel_y = 12
},
-/obj/item/reagent_containers/food/drinks/bottle/gin{
+/obj/item/reagent_containers/cup/glass/bottle/gin{
pixel_x = -8;
pixel_y = 4
},
-/obj/item/reagent_containers/food/drinks/bottle/cognac{
+/obj/item/reagent_containers/cup/glass/bottle/cognac{
pixel_x = 8;
pixel_y = 4
},
@@ -2206,7 +2206,7 @@
/obj/item/shovel/spade,
/obj/item/cultivator,
/obj/item/plant_analyzer,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/tile/green/half/contrasted{
dir = 1
@@ -2239,19 +2239,19 @@
"Gj" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -8;
pixel_y = 10
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -8;
pixel_y = 4
},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = 1;
pixel_y = 8
},
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
pixel_x = 6
},
/obj/effect/decal/cleanable/dirt/dust,
@@ -2265,7 +2265,7 @@
pixel_x = -11;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 6;
pixel_y = 14
},
@@ -2491,14 +2491,14 @@
"Pb" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/wine{
+/obj/item/reagent_containers/cup/glass/bottle/wine{
pixel_y = 12
},
-/obj/item/reagent_containers/food/drinks/bottle/vermouth{
+/obj/item/reagent_containers/cup/glass/bottle/vermouth{
pixel_x = -8;
pixel_y = 4
},
-/obj/item/reagent_containers/food/drinks/bottle/tequila{
+/obj/item/reagent_containers/cup/glass/bottle/tequila{
pixel_x = 8;
pixel_y = 4
},
@@ -2582,7 +2582,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/rack,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/mop,
/obj/item/storage/bag/trash{
pixel_x = 6
diff --git a/_maps/templates/hilbertshotel.dmm b/_maps/templates/hilbertshotel.dmm
index 09452a387d909..9c372f8188786 100644
--- a/_maps/templates/hilbertshotel.dmm
+++ b/_maps/templates/hilbertshotel.dmm
@@ -64,7 +64,7 @@
pixel_x = -5;
pixel_y = 5
},
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee{
pixel_x = 9;
pixel_y = 2
},
@@ -291,7 +291,7 @@
/area/hilbertshotel)
"Z" = (
/obj/structure/table/wood/poker,
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee{
pixel_x = -6;
pixel_y = 2
},
diff --git a/_maps/templates/holodeck_asylum.dmm b/_maps/templates/holodeck_asylum.dmm
index 1168e24f0d6b5..01111577d8445 100644
--- a/_maps/templates/holodeck_asylum.dmm
+++ b/_maps/templates/holodeck_asylum.dmm
@@ -127,7 +127,7 @@
/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/syringe,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/holofloor/white,
/area/template_noop)
diff --git a/_maps/templates/holodeck_kitchen.dmm b/_maps/templates/holodeck_kitchen.dmm
index 8a37b15c0d56a..a5a53108b74a6 100644
--- a/_maps/templates/holodeck_kitchen.dmm
+++ b/_maps/templates/holodeck_kitchen.dmm
@@ -23,7 +23,7 @@
/obj/structure/window{
dir = 1
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
list_reagents = list()
},
/turf/open/floor/holofloor/white,
diff --git a/_maps/templates/holodeck_teahouse.dmm b/_maps/templates/holodeck_teahouse.dmm
index 440e69bd907e7..2502855cc318e 100644
--- a/_maps/templates/holodeck_teahouse.dmm
+++ b/_maps/templates/holodeck_teahouse.dmm
@@ -36,12 +36,12 @@
/area/template_noop)
"g" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
icon_state = "sakecup";
pixel_x = -8;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
icon_state = "sakecup";
pixel_x = 8;
pixel_y = 3
@@ -97,9 +97,9 @@
/area/template_noop)
"p" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug,
-/obj/item/reagent_containers/food/drinks/mug,
-/obj/item/reagent_containers/food/drinks/mug,
+/obj/item/reagent_containers/cup/glass/mug,
+/obj/item/reagent_containers/cup/glass/mug,
+/obj/item/reagent_containers/cup/glass/mug,
/turf/open/floor/holofloor{
dir = 9;
icon_state = "wood"
diff --git a/_maps/templates/shelter_2.dmm b/_maps/templates/shelter_2.dmm
index e7436bfc7c1be..fbbb2fbd82f26 100644
--- a/_maps/templates/shelter_2.dmm
+++ b/_maps/templates/shelter_2.dmm
@@ -112,11 +112,11 @@
light_color = "#DDFFD3"
},
/obj/structure/table/wood/fancy/black,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = 7;
pixel_y = 2
},
-/obj/item/reagent_containers/food/drinks/bottle/wine{
+/obj/item/reagent_containers/cup/glass/bottle/wine{
pixel_x = -6;
pixel_y = 10
},
@@ -162,7 +162,7 @@
/area/survivalpod)
"x" = (
/obj/structure/table/wood/fancy/black,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = 7;
pixel_y = 2
},
diff --git a/_maps/templates/shelter_3.dmm b/_maps/templates/shelter_3.dmm
index ac53b420e236c..f41c514c9fbe6 100644
--- a/_maps/templates/shelter_3.dmm
+++ b/_maps/templates/shelter_3.dmm
@@ -42,8 +42,8 @@
/area/survivalpod)
"i" = (
/obj/item/book/manual/wiki/barman_recipes,
-/obj/item/reagent_containers/food/drinks/shaker,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/glass/shaker,
+/obj/item/reagent_containers/cup/rag,
/obj/structure/table/wood/fancy/black,
/turf/open/floor/pod/dark,
/area/survivalpod)
@@ -193,11 +193,11 @@
/area/survivalpod)
"F" = (
/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -4;
pixel_y = 12
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = 4;
pixel_y = 4
},
diff --git a/_maps/templates/shelter_4.dmm b/_maps/templates/shelter_4.dmm
index 6c4bf512cbc07..5ac8f7bb92da1 100644
--- a/_maps/templates/shelter_4.dmm
+++ b/_maps/templates/shelter_4.dmm
@@ -112,7 +112,7 @@
"aB" = (
/obj/structure/rack,
/obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/machinery/light/small,
/obj/item/paper/fluff/itemnotice,
/turf/open/floor/pod/dark,
@@ -202,7 +202,7 @@
/obj/structure/closet,
/obj/item/clothing/shoes/workboots/mining,
/obj/item/clothing/gloves/fingerless,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/obj/machinery/light{
dir = 8
},
@@ -229,7 +229,7 @@
/obj/structure/closet,
/obj/item/clothing/shoes/workboots/mining,
/obj/item/clothing/gloves/fingerless,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/obj/item/pickaxe/mini,
/obj/item/clothing/under/rank/cargo/miner/lavaland,
/turf/open/floor/pod/light,
diff --git a/_maps/templates/warped_room.dmm b/_maps/templates/warped_room.dmm
index c8c87db0e8828..db521f2c32239 100644
--- a/_maps/templates/warped_room.dmm
+++ b/_maps/templates/warped_room.dmm
@@ -84,7 +84,7 @@
/area/warped_room)
"r" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle,
+/obj/item/reagent_containers/cup/glass/bottle,
/turf/open/indestructible/hotelwood,
/area/warped_room)
"s" = (
@@ -100,7 +100,7 @@
/area/warped_room)
"u" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/soda_cans/cola,
+/obj/item/reagent_containers/cup/soda_cans/cola,
/obj/item/knife/kitchen,
/obj/item/kitchen/rollingpin,
/turf/open/indestructible/hotelwood,
diff --git a/beestation.dme b/beestation.dme
index 7dfdb02f42dbc..5d3f060865b1f 100644
--- a/beestation.dme
+++ b/beestation.dme
@@ -2675,13 +2675,8 @@
#include "code\modules\fields\timestop.dm"
#include "code\modules\fields\turf_objects.dm"
#include "code\modules\flufftext\Dreaming.dm"
-#include "code\modules\food_and_drinks\food.dm"
#include "code\modules\food_and_drinks\pizzabox.dm"
#include "code\modules\food_and_drinks\plate.dm"
-#include "code\modules\food_and_drinks\drinks\drinks.dm"
-#include "code\modules\food_and_drinks\drinks\drinks\bottle.dm"
-#include "code\modules\food_and_drinks\drinks\drinks\drinkingglass.dm"
-#include "code\modules\food_and_drinks\food\condiment.dm"
#include "code\modules\food_and_drinks\kitchen_machinery\deep_fryer.dm"
#include "code\modules\food_and_drinks\kitchen_machinery\food_cart.dm"
#include "code\modules\food_and_drinks\kitchen_machinery\gibber.dm"
@@ -3718,17 +3713,22 @@
#include "code\modules\reagents\chemistry\recipes\toxins.dm"
#include "code\modules\reagents\reagent_containers\blood_pack.dm"
#include "code\modules\reagents\reagent_containers\borghydro.dm"
-#include "code\modules\reagents\reagent_containers\bottle.dm"
#include "code\modules\reagents\reagent_containers\chem_bag.dm"
#include "code\modules\reagents\reagent_containers\chem_heirloom.dm"
+#include "code\modules\reagents\reagent_containers\condiment.dm"
#include "code\modules\reagents\reagent_containers\dropper.dm"
-#include "code\modules\reagents\reagent_containers\glass.dm"
#include "code\modules\reagents\reagent_containers\hypospray.dm"
#include "code\modules\reagents\reagent_containers\medspray.dm"
#include "code\modules\reagents\reagent_containers\patch.dm"
#include "code\modules\reagents\reagent_containers\pill.dm"
#include "code\modules\reagents\reagent_containers\spray.dm"
#include "code\modules\reagents\reagent_containers\syringes.dm"
+#include "code\modules\reagents\reagent_containers\cups\_cup.dm"
+#include "code\modules\reagents\reagent_containers\cups\bottle.dm"
+#include "code\modules\reagents\reagent_containers\cups\drinkingglass.dm"
+#include "code\modules\reagents\reagent_containers\cups\drinks.dm"
+#include "code\modules\reagents\reagent_containers\cups\glassbottle.dm"
+#include "code\modules\reagents\reagent_containers\cups\soda.dm"
#include "code\modules\recycling\conveyor.dm"
#include "code\modules\recycling\sortingmachinery.dm"
#include "code\modules\recycling\disposal\bin.dm"
diff --git a/code/__DEFINES/dcs/signals/signals_atom/signals_atom.dm b/code/__DEFINES/dcs/signals/signals_atom/signals_atom.dm
index 1212051c2932a..2b5b5eae98d90 100644
--- a/code/__DEFINES/dcs/signals/signals_atom/signals_atom.dm
+++ b/code/__DEFINES/dcs/signals/signals_atom/signals_atom.dm
@@ -9,6 +9,8 @@
#define COMSIG_PARENT_EXAMINE "atom_examine"
/// from base of atom/get_examine_name(): (/mob, list/overrides)
#define COMSIG_ATOM_GET_EXAMINE_NAME "atom_examine_name"
+///from base of atom/examine_more(): (/mob)
+#define COMSIG_PARENT_EXAMINE_MORE "atom_examine_more"
//Positions for overrides list
#define EXAMINE_POSITION_ARTICLE (1<<0)
#define EXAMINE_POSITION_BEFORE (1<<1)
diff --git a/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_food.dm b/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_food.dm
index 249a243988c37..14b083cfc3929 100644
--- a/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_food.dm
+++ b/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_food.dm
@@ -57,3 +57,7 @@
///Called when we try to feed food to an object
#define COMSIG_FOOD_FEED_ITEM "feed_item"
+
+//Drink
+///from base of obj/item/reagent_containers/cup/attack(): (mob/M, mob/user)
+#define COMSIG_GLASS_DRANK "glass_drank"
diff --git a/code/__DEFINES/economy.dm b/code/__DEFINES/economy.dm
index 84573363b15d6..52ab065c5ae86 100644
--- a/code/__DEFINES/economy.dm
+++ b/code/__DEFINES/economy.dm
@@ -5,8 +5,12 @@
#define PAYCHECK_EASY 15
#define PAYCHECK_MEDIUM 40
#define PAYCHECK_HARD 70
-#define PAYCHECK_COMMAND_NT 20 // given from nanotrasen to heads
-#define PAYCHECK_COMMAND_DEPT 80 // given from department budget
+// given from nanotrasen to heads
+#define PAYCHECK_COMMAND_NT 20
+// given from department budget
+#define PAYCHECK_COMMAND_DEPT 80
+// Command Total
+#define PAYCHECK_COMMAND 100
#define PAYCHECK_VIP 2000
/* Note: The current intention for crazy amount of money to VIP is that they can be a rich shitter
or be targeted by antags for their money - oh, my, being rich isn't always good.
diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
index 71ab790799e09..2831abed7a3b2 100644
--- a/code/__DEFINES/is_helpers.dm
+++ b/code/__DEFINES/is_helpers.dm
@@ -234,6 +234,8 @@ GLOBAL_LIST_INIT(pointed_types, typecacheof(list(
#define isgun(A) (istype(A, /obj/item/gun))
+#define is_reagent_container(O) (istype(O, /obj/item/reagent_containers))
+
//Assemblies
#define isassembly(O) (istype(O, /obj/item/assembly))
diff --git a/code/__HELPERS/randoms.dm b/code/__HELPERS/randoms.dm
index ca2e265b1309a..897745ec8ac95 100644
--- a/code/__HELPERS/randoms.dm
+++ b/code/__HELPERS/randoms.dm
@@ -37,10 +37,11 @@
///Gets a random drink excluding the blocked type
/proc/get_random_drink()
- var/list/blocked = list(/obj/item/reagent_containers/food/drinks/soda_cans,
- /obj/item/reagent_containers/food/drinks/bottle
+ var/list/blocked = list(
+ /obj/item/reagent_containers/cup/soda_cans,
+ /obj/item/reagent_containers/cup/glass/bottle
)
- return pick(subtypesof(/obj/item/reagent_containers/food/drinks) - blocked)
+ return pick(subtypesof(/obj/item/reagent_containers/cup/glass) - blocked)
/// Picks a string of symbols to display as the law number for hacked or ion laws
/proc/ion_num()
diff --git a/code/__HELPERS/type_processing.dm b/code/__HELPERS/type_processing.dm
index af65c582983ef..a5d006113a368 100644
--- a/code/__HELPERS/type_processing.dm
+++ b/code/__HELPERS/type_processing.dm
@@ -10,7 +10,7 @@
/obj/item/clothing/head/helmet/space = "SPESSHELMET",
/obj/item/bodypart = "BODYPART",
/obj/item/book/manual = "MANUAL",
- /obj/item/reagent_containers/food/drinks = "DRINK", //longest paths comes first
+ /obj/item/reagent_containers/cup/glass = "DRINK", //longest paths comes first
/obj/item/food = "FOOD",
/obj/item/reagent_containers = "REAGENT_CONTAINERS",
/obj/machinery/atmospherics = "ATMOS_MECH",
diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm
index 6d91a65083d92..3c7a948fdfa5b 100644
--- a/code/_globalvars/lists/flavor_misc.dm
+++ b/code/_globalvars/lists/flavor_misc.dm
@@ -341,13 +341,13 @@ GLOBAL_LIST_INIT(smoker_cigarettes, list(
))
GLOBAL_LIST_INIT(alcoholic_bottles, list(
- /obj/item/reagent_containers/food/drinks/bottle/ale,
- /obj/item/reagent_containers/food/drinks/bottle/beer,
- /obj/item/reagent_containers/food/drinks/bottle/gin,
- /obj/item/reagent_containers/food/drinks/bottle/whiskey,
- /obj/item/reagent_containers/food/drinks/bottle/vodka,
- /obj/item/reagent_containers/food/drinks/bottle/rum,
- /obj/item/reagent_containers/food/drinks/bottle/applejack
+ /obj/item/reagent_containers/cup/glass/bottle/ale,
+ /obj/item/reagent_containers/cup/glass/bottle/beer,
+ /obj/item/reagent_containers/cup/glass/bottle/gin,
+ /obj/item/reagent_containers/cup/glass/bottle/whiskey,
+ /obj/item/reagent_containers/cup/glass/bottle/vodka,
+ /obj/item/reagent_containers/cup/glass/bottle/rum,
+ /obj/item/reagent_containers/cup/glass/bottle/applejack
))
GLOBAL_LIST_INIT(junkie_drugs, list(
diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm
index a70cf8e873378..747d425ee34f2 100644
--- a/code/_globalvars/lists/maintenance_loot.dm
+++ b/code/_globalvars/lists/maintenance_loot.dm
@@ -72,11 +72,11 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
/obj/item/poster/random_official = 1,
/obj/item/radio/headset = 1,
/obj/item/radio/off = 2,
- /obj/item/reagent_containers/food/drinks/bottle/homemaderum = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/homemaderum = 1,
/obj/item/food/canned/peaches/maint = 1,
/obj/item/food/grown/citrus/orange = 1,
/obj/item/food/grown/flower/poppy = 10,
- /obj/item/reagent_containers/glass/rag = 3,
+ /obj/item/reagent_containers/cup/rag = 3,
/obj/item/reagent_containers/pill/floorpill = 4,
/obj/item/reagent_containers/spray/pestspray = 1,
/obj/item/reagent_containers/syringe/used = 4,
@@ -112,7 +112,7 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
/obj/item/weldingtool = 3,
/obj/item/wirecutters = 1,
/obj/item/wrench = 4,
- /obj/item/reagent_containers/food/drinks/bottle/homemaderum = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/homemaderum = 1,
/obj/item/xenoartifact/maint = 1,
/obj/item/paper_reader = 1,
))
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index 39b5f2570be59..28e6409f2435a 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -88,21 +88,21 @@
* * mob/living/user - The mob hitting with this item
* * params - Click params of this attack
*/
-/obj/item/proc/attack(mob/living/M, mob/living/user, params)
- var/signal_return = SEND_SIGNAL(src, COMSIG_ITEM_ATTACK, M, user, params)
+/obj/item/proc/attack(mob/living/target_mob, mob/living/user, params)
+ var/signal_return = SEND_SIGNAL(src, COMSIG_ITEM_ATTACK, target_mob, user, params)
if(signal_return & COMPONENT_CANCEL_ATTACK_CHAIN)
return TRUE
if(signal_return & COMPONENT_SKIP_ATTACK)
return
- SEND_SIGNAL(user, COMSIG_MOB_ITEM_ATTACK, M, user, params)
- SEND_SIGNAL(M, COMSIG_MOB_ITEM_ATTACKBY, user, src)
+ SEND_SIGNAL(user, COMSIG_MOB_ITEM_ATTACK, target_mob, user, params)
+ SEND_SIGNAL(target_mob, COMSIG_MOB_ITEM_ATTACKBY, user, src)
var/nonharmfulhit = FALSE
if(user.a_intent == INTENT_HELP && !(item_flags & ISWEAPON))
nonharmfulhit = TRUE
- for(var/datum/surgery/S in M.surgeries)
+ for(var/datum/surgery/S in target_mob.surgeries)
if(S.failed_step)
nonharmfulhit = FALSE //No freebies, if you fail a surgery step you should hit your patient
S.failed_step = FALSE //In theory the hit should only happen once, upon failing the step
@@ -120,22 +120,22 @@
else if(hitsound)
playsound(loc, hitsound, get_clamped_volume(), TRUE, extrarange = stealthy_audio ? SILENCED_SOUND_EXTRARANGE : -1, falloff_distance = 0)
- M.lastattacker = user.real_name
- M.lastattackerckey = user.ckey
+ target_mob.lastattacker = user.real_name
+ target_mob.lastattackerckey = user.ckey
- user.do_attack_animation(M)
+ user.do_attack_animation(target_mob)
var/time = world.time
if(nonharmfulhit)
- M.send_item_poke_message(src, user)
+ target_mob.send_item_poke_message(src, user)
user.time_of_last_poke = time
else
user.record_accidental_poking()
- M.attacked_by(src, user)
- M.time_of_last_attack_received = time
+ target_mob.attacked_by(src, user)
+ target_mob.time_of_last_attack_received = time
user.time_of_last_attack_dealt = time
user.check_for_accidental_attack()
- log_combat(user, M, "[nonharmfulhit ? "poked" : "attacked"]", src, "(INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])", important = !nonharmfulhit)
+ log_combat(user, target_mob, "[nonharmfulhit ? "poked" : "attacked"]", src, "(INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])", important = !nonharmfulhit)
add_fingerprint(user)
diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm
index 08cef4d647255..62d52b69f8606 100644
--- a/code/controllers/subsystem/traumas.dm
+++ b/code/controllers/subsystem/traumas.dm
@@ -115,7 +115,7 @@ SUBSYSTEM_DEF(traumas)
"lizards" = typecacheof(list(
/obj/item/toy/plush/lizard_plushie, /obj/item/food/kebab/tail,
- /obj/item/organ/tail/lizard, /obj/item/reagent_containers/food/drinks/bottle/lizardwine)),
+ /obj/item/organ/tail/lizard, /obj/item/reagent_containers/cup/glass/bottle/lizardwine)),
"skeletons" = typecacheof(list(
/obj/item/organ/tongue/bone, /obj/item/clothing/suit/armor/bone, /obj/item/stack/sheet/bone,
@@ -205,7 +205,7 @@ SUBSYSTEM_DEF(traumas)
/obj/item/katana,
/obj/item/food/sashimi,
/obj/item/food/chawanmushi,
- /obj/item/reagent_containers/food/drinks/bottle/sake,
+ /obj/item/reagent_containers/cup/glass/bottle/sake,
/obj/item/throwing_star,
/obj/item/clothing/head/costume/kitty/genuine,
/obj/item/clothing/suit/space/space_ninja,
diff --git a/code/datums/ai/monkey/monkey_controller.dm b/code/datums/ai/monkey/monkey_controller.dm
index 26d53369ea247..8195daac3be6b 100644
--- a/code/datums/ai/monkey/monkey_controller.dm
+++ b/code/datums/ai/monkey/monkey_controller.dm
@@ -151,10 +151,10 @@ have ways of interacting with a specific mob and control it.
return top_force_item
/datum/ai_controller/monkey/proc/IsEdible(obj/item/thing)
- if(istype(thing, /obj/item/food))
+ if(IS_EDIBLE(thing))
return TRUE
- if(istype(thing, /obj/item/reagent_containers/food/drinks/drinkingglass))
- var/obj/item/reagent_containers/food/drinks/drinkingglass/glass = thing
+ if(istype(thing, /obj/item/reagent_containers/cup/glass/drinkingglass))
+ var/obj/item/reagent_containers/cup/glass/drinkingglass/glass = thing
if(glass.reagents.total_volume) // The glass has something in it, time to drink the mystery liquid!
return TRUE
return FALSE
diff --git a/code/datums/components/crafting/crafting_lists/drinks.dm b/code/datums/components/crafting/crafting_lists/drinks.dm
index 4749a97cdaff7..2b9aa8963ed3f 100644
--- a/code/datums/components/crafting/crafting_lists/drinks.dm
+++ b/code/datums/components/crafting/crafting_lists/drinks.dm
@@ -4,7 +4,7 @@
/datum/crafting_recipe/lizardwine
name = "Lizard Wine"
- result = /obj/item/reagent_containers/food/drinks/bottle/lizardwine
+ result = /obj/item/reagent_containers/cup/glass/bottle/lizardwine
time = 4 SECONDS
reqs = list(
/obj/item/organ/tail/lizard = 1,
@@ -14,20 +14,20 @@
/datum/crafting_recipe/moonshinejug
name = "Moonshine Jug"
- result = /obj/item/reagent_containers/food/drinks/bottle/moonshine
+ result = /obj/item/reagent_containers/cup/glass/bottle/moonshine
time = 3 SECONDS
reqs = list(
- /obj/item/reagent_containers/food/drinks/bottle/blank = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/blank = 1,
/datum/reagent/consumable/ethanol/moonshine = 100
)
category = CAT_DRINK
/datum/crafting_recipe/hoochbottle
name = "Hooch Bottle"
- result = /obj/item/reagent_containers/food/drinks/bottle/hooch
+ result = /obj/item/reagent_containers/cup/glass/bottle/hooch
time = 3 SECONDS
reqs = list(
- /obj/item/reagent_containers/food/drinks/bottle/blank = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/blank = 1,
/obj/item/storage/box/papersack = 1,
/datum/reagent/consumable/ethanol/hooch = 100
)
@@ -35,50 +35,50 @@
/datum/crafting_recipe/blazaambottle
name = "Blazaam Bottle"
- result = /obj/item/reagent_containers/food/drinks/bottle/blazaam
+ result = /obj/item/reagent_containers/cup/glass/bottle/blazaam
time = 2 SECONDS
reqs = list(
- /obj/item/reagent_containers/food/drinks/bottle/blank = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/blank = 1,
/datum/reagent/consumable/ethanol/blazaam = 100
)
category = CAT_DRINK
/datum/crafting_recipe/champagnebottle
name = "Champagne Bottle"
- result = /obj/item/reagent_containers/food/drinks/bottle/champagne
+ result = /obj/item/reagent_containers/cup/glass/bottle/champagne
time = 3 SECONDS
reqs = list(
- /obj/item/reagent_containers/food/drinks/bottle/blank = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/blank = 1,
/datum/reagent/consumable/ethanol/champagne = 100
)
category = CAT_DRINK
/datum/crafting_recipe/trappistbottle
name = "Trappist Bottle"
- result = /obj/item/reagent_containers/food/drinks/bottle/trappist
+ result = /obj/item/reagent_containers/cup/glass/bottle/trappist
time = 1.5 SECONDS
reqs = list(
- /obj/item/reagent_containers/food/drinks/bottle/blank/small = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/blank/small = 1,
/datum/reagent/consumable/ethanol/trappist = 50
)
category = CAT_DRINK
/datum/crafting_recipe/goldschlagerbottle
name = "Goldschlager Bottle"
- result = /obj/item/reagent_containers/food/drinks/bottle/goldschlager
+ result = /obj/item/reagent_containers/cup/glass/bottle/goldschlager
time = 3 SECONDS
reqs = list(
- /obj/item/reagent_containers/food/drinks/bottle/blank = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/blank = 1,
/datum/reagent/consumable/ethanol/goldschlager = 100
)
category = CAT_DRINK
/datum/crafting_recipe/patronbottle
name = "Patron Bottle"
- result = /obj/item/reagent_containers/food/drinks/bottle/patron
+ result = /obj/item/reagent_containers/cup/glass/bottle/patron
time = 3 SECONDS
reqs = list(
- /obj/item/reagent_containers/food/drinks/bottle/blank = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/blank = 1,
/datum/reagent/consumable/ethanol/patron = 100
)
category = CAT_DRINK
@@ -87,44 +87,44 @@
/datum/crafting_recipe/holybottle
name = "Holy Water Flask"
- result = /obj/item/reagent_containers/food/drinks/bottle/holywater
+ result = /obj/item/reagent_containers/cup/glass/bottle/holywater
time = 3 SECONDS
reqs = list(
- /obj/item/reagent_containers/food/drinks/bottle/blank = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/blank = 1,
/datum/reagent/water/holywater = 100
)
category = CAT_DRINK
/datum/crafting_recipe/unholybottle
name = "Unholy Water Flask"
- result = /obj/item/reagent_containers/food/drinks/bottle/unholywater
+ result = /obj/item/reagent_containers/cup/glass/bottle/unholywater
time = 3 SECONDS
reqs = list(
- /obj/item/reagent_containers/food/drinks/bottle/blank = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/blank = 1,
/datum/reagent/fuel/unholywater = 100
)
category = CAT_DRINK
/datum/crafting_recipe/nothingbottle
name = "Nothing Bottle"
- result = /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing
+ result = /obj/item/reagent_containers/cup/glass/bottle/bottleofnothing
time = 3 SECONDS
reqs = list(
- /obj/item/reagent_containers/food/drinks/bottle/blank = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/blank = 1,
/datum/reagent/consumable/nothing = 100
)
category = CAT_DRINK
/datum/crafting_recipe/smallcarton
name = "Small Carton"
- result = /obj/item/reagent_containers/food/drinks/sillycup/smallcarton
+ result = /obj/item/reagent_containers/cup/glass/sillycup/smallcarton
time = 1 SECONDS
reqs = list(/obj/item/stack/sheet/cardboard = 1)
category = CAT_DRINK
/datum/crafting_recipe/honeycomb
name = "Honeycomb"
- result = /obj/item/reagent_containers/food/drinks/honeycomb
+ result = /obj/item/reagent_containers/cup/glass/honeycomb
always_available = FALSE
time = 3 SECONDS
reqs = list(/datum/reagent/consumable/sugar = 50)
diff --git a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_egg.dm b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_egg.dm
index 08a504aad342f..ffeccbf18c8b6 100644
--- a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_egg.dm
+++ b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_egg.dm
@@ -43,7 +43,7 @@
name = "Egg bowl"
result = /obj/item/food/salad/eggbowl
reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/boiledrice = 1,
/obj/item/food/boiledegg = 1,
/obj/item/food/grown/carrot = 1,
diff --git a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_frozen.dm b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_frozen.dm
index 1d79c9f3e02e3..9f2a00e44f707 100644
--- a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_frozen.dm
+++ b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_frozen.dm
@@ -60,7 +60,7 @@
name = "Flavorless snowcone"
result = /obj/item/food/snowcones
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/consumable/ice = 15
)
subcategory = CAT_ICE
@@ -69,7 +69,7 @@
name = "Pineapple snowcone"
result = /obj/item/food/snowcones/pineapple
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/consumable/ice = 15,
/datum/reagent/consumable/pineapplejuice = 5
)
@@ -79,7 +79,7 @@
name = "Lime snowcone"
result = /obj/item/food/snowcones/lime
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/consumable/ice = 15,
/datum/reagent/consumable/limejuice = 5
)
@@ -89,7 +89,7 @@
name = "Lemon snowcone"
result = /obj/item/food/snowcones/lemon
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/consumable/ice = 15,
/datum/reagent/consumable/lemonjuice = 5
)
@@ -99,7 +99,7 @@
name = "Apple snowcone"
result = /obj/item/food/snowcones/apple
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/consumable/ice = 15,
/datum/reagent/consumable/applejuice = 5
)
@@ -109,7 +109,7 @@
name = "Grape snowcone"
result = /obj/item/food/snowcones/grape
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/consumable/ice = 15,
/datum/reagent/consumable/berryjuice = 5
)
@@ -119,7 +119,7 @@
name = "Orange snowcone"
result = /obj/item/food/snowcones/orange
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/consumable/ice = 15,
/datum/reagent/consumable/orangejuice = 5
)
@@ -129,7 +129,7 @@
name = "Bluecherry snowcone"
result = /obj/item/food/snowcones/blue
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/consumable/ice = 15,
/datum/reagent/consumable/bluecherryjelly= 5
)
@@ -139,7 +139,7 @@
name = "Cherry snowcone"
result = /obj/item/food/snowcones/red
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/consumable/ice = 15,
/datum/reagent/consumable/cherryjelly= 5
)
@@ -149,7 +149,7 @@
name = "Berry snowcone"
result = /obj/item/food/snowcones/berry
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/consumable/ice = 15,
/datum/reagent/consumable/berryjuice = 5
)
@@ -159,7 +159,7 @@
name = "Fruit Salad snowcone"
result = /obj/item/food/snowcones/fruitsalad
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/water = 5,
/datum/reagent/consumable/ice = 15,
/datum/reagent/consumable/orangejuice = 5,
@@ -172,7 +172,7 @@
name = "Mime snowcone"
result = /obj/item/food/snowcones/mime
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/consumable/ice = 15,
/datum/reagent/consumable/nothing = 5
)
@@ -182,7 +182,7 @@
name = "Clown snowcone"
result = /obj/item/food/snowcones/clown
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/consumable/ice = 15,
/datum/reagent/consumable/laughter = 5
)
@@ -192,7 +192,7 @@
name = "Space Cola snowcone"
result = /obj/item/food/snowcones/soda
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/consumable/ice = 15,
/datum/reagent/consumable/space_cola = 5
)
@@ -202,7 +202,7 @@
name = "Space Mountain Wind snowcone"
result = /obj/item/food/snowcones/spacemountainwind
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/consumable/ice = 15,
/datum/reagent/consumable/spacemountainwind = 5
)
@@ -212,7 +212,7 @@
name = "Pwrgame snowcone"
result = /obj/item/food/snowcones/pwrgame
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/consumable/ice = 15,
/datum/reagent/consumable/pwr_game = 15
)
@@ -222,7 +222,7 @@
name = "Honey snowcone"
result = /obj/item/food/snowcones/honey
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/consumable/ice = 15,
/datum/reagent/consumable/honey = 5
)
@@ -232,7 +232,7 @@
name = "Rainbow snowcone"
result = /obj/item/food/snowcones/rainbow
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/consumable/ice = 15,
/datum/reagent/colorful_reagent = 1 //Harder to make
)
diff --git a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_meat.dm b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_meat.dm
index 0af7711c7cb0f..12113261ce161 100644
--- a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_meat.dm
+++ b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_meat.dm
@@ -174,7 +174,7 @@
name = "Rice and Pork"
result = /obj/item/food/salad/ricepork
reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/boiledrice = 1,
/obj/item/food/meat/cutlet = 2
)
diff --git a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_misc.dm b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_misc.dm
index 5953785747886..22bb4f42eafc0 100644
--- a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_misc.dm
+++ b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_misc.dm
@@ -91,9 +91,9 @@
reqs = list(
/datum/reagent/consumable/ethanol/vodka = 25,
/obj/item/food/grown/holymelon = 1,
- /obj/item/reagent_containers/food/drinks/bottle/vodka = 1
+ /obj/item/reagent_containers/cup/glass/bottle/vodka = 1
)
- parts = list(/obj/item/reagent_containers/food/drinks/bottle/vodka = 1)
+ parts = list(/obj/item/reagent_containers/cup/glass/bottle/vodka = 1)
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/honeybar
@@ -131,7 +131,7 @@
name = "Rice pudding"
result = /obj/item/food/salad/ricepudding
reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/datum/reagent/consumable/milk = 5,
/datum/reagent/consumable/sugar = 5,
/obj/item/food/boiledrice = 1
diff --git a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_salad.dm b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_salad.dm
index ab12f7d7725ae..40cc955bc89b3 100644
--- a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_salad.dm
+++ b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_salad.dm
@@ -5,7 +5,7 @@
name = "Herb salad"
result = /obj/item/food/salad/herbsalad
reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/ambrosia/vulgaris = 3,
/obj/item/food/grown/apple = 1
)
@@ -15,7 +15,7 @@
name = "Aesir salad"
result = /obj/item/food/salad/aesirsalad
reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/ambrosia/deus = 3,
/obj/item/food/grown/apple/gold = 1
)
@@ -25,7 +25,7 @@
name = "Valid salad"
result = /obj/item/food/salad/validsalad
reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/ambrosia/vulgaris = 3,
/obj/item/food/grown/potato = 1,
/obj/item/food/meatball = 1
@@ -39,7 +39,7 @@
/datum/reagent/consumable/flour = 5,
/datum/reagent/consumable/sodiumchloride = 1,
/datum/reagent/consumable/blackpepper = 1,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/monkeycube = 1,
/obj/item/food/grown/banana = 1
)
@@ -62,7 +62,7 @@
name = "Fruit salad"
result = /obj/item/food/salad/fruit
reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/apple = 1,
/obj/item/food/grown/grapes = 1,
/obj/item/food/grown/citrus/orange = 1,
@@ -75,7 +75,7 @@
name = "Jungle salad"
result = /obj/item/food/salad/jungle
reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/apple = 1,
/obj/item/food/grown/grapes = 1,
/obj/item/food/grown/banana = 2,
@@ -87,7 +87,7 @@
name = "Citrus delight"
result = /obj/item/food/salad/citrusdelight
reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/citrus/lime = 1,
/obj/item/food/grown/citrus/lemon = 1,
/obj/item/food/grown/citrus/orange = 1
diff --git a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_soup.dm b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_soup.dm
index b3007f054d364..09e661f555543 100644
--- a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_soup.dm
+++ b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_soup.dm
@@ -6,7 +6,7 @@
result = /obj/item/food/soup/oatmeal
reqs = list(
/datum/reagent/consumable/milk = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/oat = 1
)
subcategory = CAT_SOUP
@@ -16,7 +16,7 @@
result = /obj/item/food/soup/meatball
reqs = list(
/datum/reagent/water = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/meatball = 1,
/obj/item/food/grown/carrot = 1,
/obj/item/food/grown/potato = 1
@@ -28,7 +28,7 @@
result = /obj/item/food/soup/vegetable
reqs = list(
/datum/reagent/water = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/carrot = 1,
/obj/item/food/grown/corn = 1,
/obj/item/food/grown/eggplant = 1,
@@ -41,7 +41,7 @@
result = /obj/item/food/soup/nettle
reqs = list(
/datum/reagent/water = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/nettle = 1,
/obj/item/food/grown/potato = 1,
/obj/item/food/boiledegg = 1
@@ -52,7 +52,7 @@
name = "Wingfangchu"
result = /obj/item/food/soup/wingfangchu
reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/datum/reagent/consumable/soysauce = 5,
/obj/item/food/meat/cutlet/xeno = 2
)
@@ -63,7 +63,7 @@
result= /obj/item/food/soup/wish
reqs = list(
/datum/reagent/water = 20,
- /obj/item/reagent_containers/glass/bowl = 1
+ /obj/item/reagent_containers/cup/bowl = 1
)
subcategory = CAT_SOUP
@@ -71,7 +71,7 @@
name = "Hot chili"
result = /obj/item/food/soup/hotchili
reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/meat/cutlet = 2,
/obj/item/food/grown/chili = 1,
/obj/item/food/grown/tomato = 1
@@ -82,7 +82,7 @@
name = "Cold chili"
result = /obj/item/food/soup/coldchili
reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/meat/cutlet = 2,
/obj/item/food/grown/icepepper = 1,
/obj/item/food/grown/tomato = 1
@@ -94,7 +94,7 @@
result = /obj/item/food/soup/tomato
reqs = list(
/datum/reagent/water = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/tomato = 2
)
subcategory = CAT_SOUP
@@ -104,7 +104,7 @@
result = /obj/item/food/soup/tomato/eyeball
reqs = list(
/datum/reagent/water = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/tomato = 2,
/obj/item/organ/eyes = 1
)
@@ -115,7 +115,7 @@
result = /obj/item/food/soup/miso
reqs = list(
/datum/reagent/water = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/soydope = 2,
/obj/item/food/tofu = 2
)
@@ -126,7 +126,7 @@
result = /obj/item/food/soup/blood
reqs = list(
/datum/reagent/blood = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/tomato/blood = 2
)
subcategory = CAT_SOUP
@@ -137,7 +137,7 @@
reqs = list(
/datum/reagent/water = 10,
/datum/reagent/toxin/slimejelly = 5,
- /obj/item/reagent_containers/glass/bowl = 1
+ /obj/item/reagent_containers/cup/bowl = 1
)
subcategory = CAT_SOUP
@@ -146,7 +146,7 @@
result = /obj/item/food/soup/clownstears
reqs = list(
/datum/reagent/water = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/banana = 1,
/obj/item/stack/sheet/mineral/bananium = 1
)
@@ -157,7 +157,7 @@
result = /obj/item/food/soup/mystery
reqs = list(
/datum/reagent/water = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/badrecipe = 1,
/obj/item/food/tofu = 1,
/obj/item/food/boiledegg = 1,
@@ -171,7 +171,7 @@
reqs = list(
/datum/reagent/consumable/milk = 5,
/datum/reagent/water = 5,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/mushroom/chanterelle = 1
)
subcategory = CAT_SOUP
@@ -181,7 +181,7 @@
result = /obj/item/food/soup/beet
reqs = list(
/datum/reagent/water = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/whitebeet = 1,
/obj/item/food/grown/cabbage = 1,
)
@@ -192,7 +192,7 @@
result = /obj/item/food/soup/stew
reqs = list(
/datum/reagent/water = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/tomato = 1,
/obj/item/food/meat/cutlet = 3,
/obj/item/food/grown/potato = 1,
@@ -207,7 +207,7 @@
result = /obj/item/food/soup/spacylibertyduff
reqs = list(
/datum/reagent/consumable/ethanol/vodka = 5,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/mushroom/libertycap = 3
)
subcategory = CAT_SOUP
@@ -217,7 +217,7 @@
result = /obj/item/food/soup/amanitajelly
reqs = list(
/datum/reagent/consumable/ethanol/vodka = 5,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/mushroom/amanita = 3
)
subcategory = CAT_SOUP
@@ -228,7 +228,7 @@
reqs = list(
/datum/reagent/water = 10,
/datum/reagent/consumable/sugar = 5,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/potato/sweet = 2
)
subcategory = CAT_SOUP
@@ -238,7 +238,7 @@
result = /obj/item/food/soup/beet/red
reqs = list(
/datum/reagent/water = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/redbeet = 1,
/obj/item/food/grown/cabbage = 1
)
@@ -248,9 +248,9 @@
name = "Bisque"
result = /obj/item/food/soup/bisque
reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/datum/reagent/water = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/meat/crab = 1,
/obj/item/food/boiledrice = 1
)
@@ -262,7 +262,7 @@
reqs = list(
/datum/reagent/water = 5,
/datum/reagent/consumable/cream = 5,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/chili = 1,
/obj/item/food/grown/bungofruit = 1
)
@@ -274,7 +274,7 @@
reqs = list(
/datum/reagent/water = 10,
/datum/reagent/consumable/sodiumchloride = 5,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/mushroom/jupitercup = 1
)
subcategory = CAT_SOUP
diff --git a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_spaghetti.dm b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_spaghetti.dm
index 60f0c1f093b85..d21436fc59c67 100644
--- a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_spaghetti.dm
+++ b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_spaghetti.dm
@@ -40,7 +40,7 @@
name = "Beef noodle"
result = /obj/item/food/spaghetti/beefnoodle
reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/spaghetti/boiledspaghetti = 1,
/obj/item/food/meat/cutlet = 2,
/obj/item/food/grown/cabbage = 1
diff --git a/code/datums/components/crafting/crafting_lists/misc.dm b/code/datums/components/crafting/crafting_lists/misc.dm
index 44c524db78190..1fde5d3a2cbbe 100644
--- a/code/datums/components/crafting/crafting_lists/misc.dm
+++ b/code/datums/components/crafting/crafting_lists/misc.dm
@@ -311,7 +311,7 @@
/datum/crafting_recipe/paper_cup
name= "Paper Cup"
- result = /obj/item/reagent_containers/food/drinks/sillycup
+ result = /obj/item/reagent_containers/cup/glass/sillycup
time = 1 SECONDS
tools = list(TOOL_WIRECUTTER)
reqs = list(/obj/item/paper = 1)
diff --git a/code/datums/components/crafting/crafting_lists/primal.dm b/code/datums/components/crafting/crafting_lists/primal.dm
index 5bbb930118f4d..8aecf2931c108 100644
--- a/code/datums/components/crafting/crafting_lists/primal.dm
+++ b/code/datums/components/crafting/crafting_lists/primal.dm
@@ -268,7 +268,7 @@
/datum/crafting_recipe/mushroom_bowl
name = "Mushroom Bowl"
- result = /obj/item/reagent_containers/glass/bowl/mushroom_bowl
+ result = /obj/item/reagent_containers/cup/bowl/mushroom_bowl
time = 3 SECONDS
reqs = list(/obj/item/food/grown/ash_flora/shavings = 5)
category = CAT_PRIMAL
diff --git a/code/datums/components/crafting/crafting_lists/robots.dm b/code/datums/components/crafting/crafting_lists/robots.dm
index 11fc03c3490ab..32d87f82c6c73 100644
--- a/code/datums/components/crafting/crafting_lists/robots.dm
+++ b/code/datums/components/crafting/crafting_lists/robots.dm
@@ -39,7 +39,7 @@
result = /mob/living/simple_animal/bot/cleanbot
time = 4 SECONDS
reqs = list(
- /obj/item/reagent_containers/glass/bucket = 1,
+ /obj/item/reagent_containers/cup/bucket = 1,
/obj/item/assembly/prox_sensor = 1,
/obj/item/bodypart/r_arm/robot = 1
)
diff --git a/code/datums/components/crafting/crafting_lists/weaponry/weapons.dm b/code/datums/components/crafting/crafting_lists/weaponry/weapons.dm
index 59d66457b5433..af1eefd2cd594 100644
--- a/code/datums/components/crafting/crafting_lists/weaponry/weapons.dm
+++ b/code/datums/components/crafting/crafting_lists/weaponry/weapons.dm
@@ -9,9 +9,9 @@
/datum/reagent/fuel = 50,
/obj/item/stack/cable_coil = 1,
/obj/item/assembly/igniter = 1,
- /obj/item/reagent_containers/food/drinks/soda_cans = 1
+ /obj/item/reagent_containers/cup/soda_cans = 1
)
- parts = list(/obj/item/reagent_containers/food/drinks/soda_cans = 1)
+ parts = list(/obj/item/reagent_containers/cup/soda_cans = 1)
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
dangerous_craft = TRUE
@@ -47,13 +47,13 @@
/datum/crafting_recipe/molotov
name = "Molotov"
- result = /obj/item/reagent_containers/food/drinks/bottle/molotov
+ result = /obj/item/reagent_containers/cup/glass/bottle/molotov
time = 4 SECONDS
reqs = list(
- /obj/item/reagent_containers/glass/rag = 1,
- /obj/item/reagent_containers/food/drinks/bottle = 1
+ /obj/item/reagent_containers/cup/rag = 1,
+ /obj/item/reagent_containers/cup/glass/bottle = 1
)
- parts = list(/obj/item/reagent_containers/food/drinks/bottle = 1)
+ parts = list(/obj/item/reagent_containers/cup/glass/bottle = 1)
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
dangerous_craft = TRUE
diff --git a/code/datums/components/food/edible.dm b/code/datums/components/food/edible.dm
index a8139ca993f2a..77239e091ae8d 100644
--- a/code/datums/components/food/edible.dm
+++ b/code/datums/components/food/edible.dm
@@ -325,11 +325,7 @@ Behavior that's still missing from this component that original food items had t
else if(fullness > (600 * (1 + eater.overeatduration / 2000))) // The more you eat - the more you can eat
eater.visible_message("[eater] cannot force any more of \the [parent] to go down [eater.p_their()] throat!", "You cannot force any more of \the [parent] to go down your throat!")
return
-
-
-
-
-
+
else //If you're feeding it to someone else.
if(isbrain(eater))
to_chat(feeder, "[eater] doesn't seem to have a mouth!")
diff --git a/code/datums/components/infective.dm b/code/datums/components/infective.dm
index c839dc18d2dfb..9d809165a1d91 100644
--- a/code/datums/components/infective.dm
+++ b/code/datums/components/infective.dm
@@ -33,6 +33,8 @@
RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(try_infect_attack))
RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(try_infect_equipped))
RegisterSignal(parent, COMSIG_FOOD_EATEN, PROC_REF(try_infect_eat))
+ if(istype(parent, /obj/item/reagent_containers/cup))
+ RegisterSignal(parent, COMSIG_GLASS_DRANK, PROC_REF(try_infect_drink))
else if(istype(parent, /obj/effect/decal/cleanable/blood/gibs))
RegisterSignal(parent, COMSIG_GIBS_STREAK, PROC_REF(try_infect_streak))
@@ -43,7 +45,18 @@
eater.ForceContractDisease(V)
try_infect(feeder, BODY_ZONE_L_ARM)
+/datum/component/infective/proc/try_infect_drink(datum/source, mob/living/drinker, mob/living/feeder)
+ SIGNAL_HANDLER
+
+ for(var/disease in diseases)
+ drinker.ForceContractDisease(disease)
+ var/appendage_zone = feeder.held_items.Find(source)
+ appendage_zone = appendage_zone == 0 ? BODY_ZONE_CHEST : appendage_zone % 2 ? BODY_ZONE_R_ARM : BODY_ZONE_L_ARM
+ try_infect(feeder, appendage_zone)
+
/datum/component/infective/proc/clean(datum/source, clean_types)
+ SIGNAL_HANDLER
+
if(clean_types & required_clean_types)
qdel(src)
return TRUE
diff --git a/code/datums/components/storage/concrete/pockets.dm b/code/datums/components/storage/concrete/pockets.dm
index aeae6ab3eced1..0b100b4000541 100644
--- a/code/datums/components/storage/concrete/pockets.dm
+++ b/code/datums/components/storage/concrete/pockets.dm
@@ -107,9 +107,9 @@
/datum/component/storage/concrete/pockets/helmet/Initialize()
. = ..()
- can_hold = typecacheof(list(/obj/item/reagent_containers/food/drinks/bottle/vodka,
- /obj/item/reagent_containers/food/drinks/bottle/molotov,
- /obj/item/reagent_containers/food/drinks/drinkingglass,
+ can_hold = typecacheof(list(/obj/item/reagent_containers/cup/glass/bottle/vodka,
+ /obj/item/reagent_containers/cup/glass/bottle/molotov,
+ /obj/item/reagent_containers/cup/glass/drinkingglass,
/obj/item/ammo_box/a762))
/datum/component/storage/concrete/pockets/void_cloak
diff --git a/code/datums/components/udder.dm b/code/datums/components/udder.dm
index cbb1f5ea64ca9..30a4fb400191b 100644
--- a/code/datums/components/udder.dm
+++ b/code/datums/components/udder.dm
@@ -48,7 +48,7 @@
SIGNAL_HANDLER
var/mob/living/milked = parent
- if(milked.stat == CONSCIOUS && istype(milking_tool, /obj/item/reagent_containers/glass))
+ if(milked.stat == CONSCIOUS && istype(milking_tool, /obj/item/reagent_containers/cup))
udder.milk(milking_tool, user)
if(on_milk_callback)
on_milk_callback.Invoke(udder.reagents.total_volume, udder.reagents.maximum_volume)
@@ -112,10 +112,10 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/udder)
* Proc called from attacking the component parent with the correct item, moves reagents into the glass basically.
*
* Arguments:
- * * obj/item/reagent_containers/glass/milk_holder - what we are trying to transfer the reagents to
+ * * obj/item/reagent_containers/cup/milk_holder - what we are trying to transfer the reagents to
* * mob/user - who is trying to do this
*/
-/obj/item/udder/proc/milk(obj/item/reagent_containers/glass/milk_holder, mob/user)
+/obj/item/udder/proc/milk(obj/item/reagent_containers/cup/milk_holder, mob/user)
if(milk_holder.reagents.total_volume >= milk_holder.volume)
to_chat(user, "[milk_holder] is full.")
return
diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm
index f50c971df5574..984492979b8e2 100644
--- a/code/datums/diseases/transformation.dm
+++ b/code/datums/diseases/transformation.dm
@@ -273,7 +273,7 @@
cure_text = "Something that would kill off the tiny cats."
spread_text = "Acute"
disease_flags = CURABLE|CAN_CARRY|CAN_RESIST
- cures = list(/datum/reagent/consumable/cocoa, /datum/reagent/consumable/cocoa/hot_cocoa) //kills all the tiny cats that infected your organism
+ cures = list(/datum/reagent/consumable/cocoa, /datum/reagent/consumable/hot_cocoa) //kills all the tiny cats that infected your organism
cure_chance = 25
stage_prob = 3
agent = "Nano-feline Toxoplasmosis"
diff --git a/code/datums/mood_events/generic_negative_events.dm b/code/datums/mood_events/generic_negative_events.dm
index 9d629931bd06d..6d83539f7fc31 100644
--- a/code/datums/mood_events/generic_negative_events.dm
+++ b/code/datums/mood_events/generic_negative_events.dm
@@ -165,11 +165,28 @@
/datum/mood_event/sec_insulated_gloves
description = "I look like an Assistant..."
mood_change = -1
+
/datum/mood_event/burnt_wings
description = "MY PRECIOUS WINGS!!!"
mood_change = -10
timeout = 10 MINUTES
+/datum/mood_event/soda_spill
+ description = "Cool! That's fine, I wanted to wear that soda, not drink it..."
+ mood_change = -2
+ timeout = 1 MINUTES
+
+/datum/mood_event/observed_soda_spill
+ description = "Ahaha! It's always funny to see someone get sprayed by a can of soda."
+ mood_change = 2
+ timeout = 30 SECONDS
+
+/datum/mood_event/observed_soda_spill/add_effects(mob/spilled_mob, atom/soda_can)
+ if(!spilled_mob)
+ return
+
+ description = "Ahaha! [spilled_mob] spilled [spilled_mob.p_their()] [soda_can ? soda_can.name : "soda"] all over [spilled_mob.p_them()]self! Classic."
+
/datum/mood_event/feline_dysmorphia
description = "I'm so ugly. I wish I was cuter!"
mood_change = -10
diff --git a/code/datums/station_traits/positive_traits.dm b/code/datums/station_traits/positive_traits.dm
index 8151b8b548ba3..8f756088a0bd0 100644
--- a/code/datums/station_traits/positive_traits.dm
+++ b/code/datums/station_traits/positive_traits.dm
@@ -28,7 +28,7 @@
var/obj/item/pizzabox/pizza_to_spawn = pick(list(/obj/item/pizzabox/margherita, /obj/item/pizzabox/mushroom, /obj/item/pizzabox/meat, /obj/item/pizzabox/vegetable)) //no pineapple pizza you monster
new pizza_to_spawn(toLaunch)
for(var/i in 1 to 6)
- new /obj/item/reagent_containers/food/drinks/beer(toLaunch)
+ new /obj/item/reagent_containers/cup/glass/bottle/beer(toLaunch)
new /obj/effect/pod_landingzone(T, toLaunch)
/datum/station_trait/galactic_grant
diff --git a/code/datums/traits/negative_quirk.dm b/code/datums/traits/negative_quirk.dm
index d915ed9d07681..52c9026563411 100644
--- a/code/datums/traits/negative_quirk.dm
+++ b/code/datums/traits/negative_quirk.dm
@@ -151,17 +151,17 @@
if(JOB_NAME_MIME)
heirloom_type = /obj/item/food/baguette/mime
if(JOB_NAME_JANITOR)
- heirloom_type = pick(/obj/item/mop, /obj/item/clothing/suit/caution, /obj/item/reagent_containers/glass/bucket)
+ heirloom_type = pick(/obj/item/mop, /obj/item/clothing/suit/caution, /obj/item/reagent_containers/cup/bucket)
if(JOB_NAME_COOK)
- heirloom_type = pick(/obj/item/reagent_containers/food/condiment/saltshaker, /obj/item/kitchen/rollingpin, /obj/item/clothing/head/utility/chefhat)
+ heirloom_type = pick(/obj/item/reagent_containers/condiment/saltshaker, /obj/item/kitchen/rollingpin, /obj/item/clothing/head/utility/chefhat)
if(JOB_NAME_BOTANIST)
- heirloom_type = pick(/obj/item/cultivator, /obj/item/reagent_containers/glass/bucket, /obj/item/storage/bag/plants, /obj/item/toy/plush/beeplushie)
+ heirloom_type = pick(/obj/item/cultivator, /obj/item/reagent_containers/cup/bucket, /obj/item/storage/bag/plants, /obj/item/toy/plush/beeplushie)
if(JOB_NAME_BARTENDER)
- heirloom_type = pick(/obj/item/reagent_containers/glass/rag, /obj/item/clothing/head/hats/tophat, /obj/item/reagent_containers/food/drinks/shaker)
+ heirloom_type = pick(/obj/item/reagent_containers/cup/rag, /obj/item/clothing/head/hats/tophat, /obj/item/reagent_containers/cup/glass/shaker)
if(JOB_NAME_CURATOR)
heirloom_type = pick(/obj/item/pen/fountain, /obj/item/storage/pill_bottle/dice)
if(JOB_NAME_CHAPLAIN)
- heirloom_type = pick(/obj/item/toy/windupToolbox, /obj/item/reagent_containers/food/drinks/bottle/holywater)
+ heirloom_type = pick(/obj/item/toy/windupToolbox, /obj/item/reagent_containers/cup/glass/bottle/holywater)
if(JOB_NAME_ASSISTANT)
heirloom_type = pick(/obj/item/heirloomtoolbox, /obj/item/clothing/gloves/cut/heirloom)
if(JOB_NAME_BARBER)
@@ -170,7 +170,7 @@
heirloom_type = /obj/item/gun/magic/wand
//Security/Command
if(JOB_NAME_CAPTAIN)
- heirloom_type = /obj/item/reagent_containers/food/drinks/flask/gold
+ heirloom_type = /obj/item/reagent_containers/cup/glass/flask/gold
if(JOB_NAME_HEADOFSECURITY)
heirloom_type = /obj/item/book/manual/wiki/security_space_law
if(JOB_NAME_WARDEN)
@@ -178,7 +178,7 @@
if(JOB_NAME_SECURITYOFFICER)
heirloom_type = pick(/obj/item/book/manual/wiki/security_space_law, /obj/item/clothing/head/beret/sec)
if(JOB_NAME_DETECTIVE)
- heirloom_type = /obj/item/reagent_containers/food/drinks/bottle/whiskey
+ heirloom_type = /obj/item/reagent_containers/cup/glass/bottle/whiskey
if(JOB_NAME_LAWYER)
heirloom_type = pick(/obj/item/gavelhammer, /obj/item/book/manual/wiki/security_space_law)
if(JOB_NAME_BRIGPHYSICIAN)
@@ -198,7 +198,7 @@
if(JOB_NAME_PARAMEDIC)
heirloom_type = pick(/obj/item/flashlight/pen, /obj/item/sensor_device)
if(JOB_NAME_CHEMIST)
- heirloom_type = /obj/item/reagent_containers/glass/chem_heirloom
+ heirloom_type = /obj/item/reagent_containers/cup/chem_heirloom
if(JOB_NAME_VIROLOGIST)
heirloom_type = /obj/item/reagent_containers/dropper
if(JOB_NAME_GENETICIST)
@@ -242,8 +242,8 @@
var/family_name = names[names.len]
heirloom.AddComponent(/datum/component/heirloom, quirk_holder, family_name)
- if(istype(heirloom, /obj/item/reagent_containers/glass/chem_heirloom)) //Edge case for chem_heirloom. Solution to component not being present on init.
- var/obj/item/reagent_containers/glass/chem_heirloom/H = heirloom
+ if(istype(heirloom, /obj/item/reagent_containers/cup/chem_heirloom)) //Edge case for chem_heirloom. Solution to component not being present on init.
+ var/obj/item/reagent_containers/cup/chem_heirloom/H = heirloom
H.update_name()
/datum/quirk/family_heirloom/on_process()
@@ -623,16 +623,16 @@
medical_record_text = "Patient is an alcohol abuser."
process = TRUE
var/where_drink //Where the bottle spawned
- var/drink_types = list(/obj/item/reagent_containers/food/drinks/bottle/ale,
- /obj/item/reagent_containers/food/drinks/bottle/beer,
- /obj/item/reagent_containers/food/drinks/bottle/gin,
- /obj/item/reagent_containers/food/drinks/bottle/whiskey,
- /obj/item/reagent_containers/food/drinks/bottle/vodka,
- /obj/item/reagent_containers/food/drinks/bottle/rum,
- /obj/item/reagent_containers/food/drinks/bottle/applejack)
+ var/drink_types = list(/obj/item/reagent_containers/cup/glass/bottle/ale,
+ /obj/item/reagent_containers/cup/glass/bottle/beer,
+ /obj/item/reagent_containers/cup/glass/bottle/gin,
+ /obj/item/reagent_containers/cup/glass/bottle/whiskey,
+ /obj/item/reagent_containers/cup/glass/bottle/vodka,
+ /obj/item/reagent_containers/cup/glass/bottle/rum,
+ /obj/item/reagent_containers/cup/glass/bottle/applejack)
var/need = 0 // How much they crave alcohol at the moment
var/tick_number = 0 // Keeping track of how many ticks have passed between a check
- var/obj/item/reagent_containers/food/drinks/bottle/drink_instance
+ var/obj/item/reagent_containers/cup/glass/bottle/drink_instance
/datum/quirk/alcoholic/on_spawn()
drink_instance = read_choice_preference(/datum/preference/choiced/quirk/alcohol_type)
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index f7ed53101fde0..3e597f42e9fd4 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -677,6 +677,21 @@ CREATION_TEST_IGNORE_SUBTYPES(/atom)
SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, .)
+/**
+ * Called when a mob examines (shift click or verb) this atom twice (or more) within EXAMINE_MORE_WINDOW (default 1 second)
+ *
+ * This is where you can put extra information on something that may be superfluous or not important in critical gameplay
+ * moments, while allowing people to manually double-examine to take a closer look
+ *
+ * Produces a signal [COMSIG_PARENT_EXAMINE_MORE]
+ */
+/atom/proc/examine_more(mob/user)
+ SHOULD_CALL_PARENT(TRUE)
+ RETURN_TYPE(/list)
+
+ . = list()
+ SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE_MORE, user, .)
+
/**
* Updates the appearance of the icon
*
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index 3ba465848e8c6..a61e6ce240743 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -76,7 +76,7 @@
efficiency = 0
reagents.maximum_volume = 0
fleshamnt = 1
- for(var/obj/item/reagent_containers/glass/G in component_parts)
+ for(var/obj/item/reagent_containers/cup/G in component_parts)
reagents.maximum_volume += G.volume
G.reagents.trans_to(src, G.reagents.total_volume)
for(var/obj/item/stock_parts/scanning_module/S in component_parts)
@@ -584,7 +584,7 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/clonepod)
playsound(src,'sound/hallucinations/wail.ogg', 100, TRUE)
/obj/machinery/clonepod/deconstruct(disassembled = TRUE)
- for(var/obj/item/reagent_containers/glass/G in component_parts)
+ for(var/obj/item/reagent_containers/cup/G in component_parts)
reagents.trans_to(G, G.reagents.maximum_volume)
if(occupant)
var/mob/living/mob_occupant = occupant
diff --git a/code/game/machinery/computer/arena.dm b/code/game/machinery/computer/arena.dm
index d13be687a01b4..6038e1d014769 100644
--- a/code/game/machinery/computer/arena.dm
+++ b/code/game/machinery/computer/arena.dm
@@ -330,7 +330,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/computer/arena)
var/arena_turfs = get_arena_turfs()
for(var/mob/living/L in GLOB.mob_living_list)
if(L.stat != DEAD && (get_turf(L) in arena_turfs))
- var/obj/item/reagent_containers/food/drinks/trophy/gold_cup/G = new(get_turf(L))
+ var/obj/item/reagent_containers/cup/glass/trophy/gold_cup/G = new(get_turf(L))
G.name = "[L.real_name]'s Trophy"
/obj/machinery/computer/arena/ui_interact(mob/user, ui_key, datum/tgui/ui, force_open, datum/tgui/master_ui, datum/ui_state/state)
diff --git a/code/game/machinery/dish_drive.dm b/code/game/machinery/dish_drive.dm
index bdbea0b866264..3a79d2ba755aa 100644
--- a/code/game/machinery/dish_drive.dm
+++ b/code/game/machinery/dish_drive.dm
@@ -13,8 +13,8 @@
var/static/list/collectable_items = list(
/obj/item/trash/waffles,
/obj/item/trash/tray,
- /obj/item/reagent_containers/glass/bowl,
- /obj/item/reagent_containers/food/drinks/drinkingglass,
+ /obj/item/reagent_containers/cup/bowl,
+ /obj/item/reagent_containers/cup/glass/drinkingglass,
/obj/item/kitchen/fork,
/obj/item/shard,
/obj/item/broken_bottle
diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm
index a0223969a3e88..5ee9958d26fb2 100644
--- a/code/game/machinery/doors/brigdoors.dm
+++ b/code/game/machinery/doors/brigdoors.dm
@@ -32,6 +32,7 @@
sec_radio = new/obj/item/radio(src)
sec_radio.set_listening(FALSE)
+ sec_radio.set_frequency(FREQ_SECURITY)
if(id != null)
for(var/obj/machinery/door/window/brigdoor/M in urange(20, src))
@@ -123,8 +124,7 @@
return 0
if(!forced)
- sec_radio.set_frequency(FREQ_SECURITY)
- sec_radio.talk_into(src, "Timer has expired. Releasing prisoner.", FREQ_SECURITY)
+ sec_radio.talk_into(src, "Timer has expired. Releasing prisoner.")
timing = FALSE
activation_time = null
diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm
index db82e63c621f9..4bf206dfc2fdf 100644
--- a/code/game/machinery/iv_drip.dm
+++ b/code/game/machinery/iv_drip.dm
@@ -14,9 +14,9 @@
var/static/list/drip_containers = typecacheof(list(
/obj/item/reagent_containers/blood,
/obj/item/reagent_containers/chem_bag,
- /obj/item/reagent_containers/food/drinks,
+ /obj/item/reagent_containers/cup,
/obj/item/food, //Fuck it. You want to stab an IV into that 100u blood tomato? Be my guest.
- /obj/item/reagent_containers/glass
+ /obj/item/reagent_containers/cup
)
)
var/can_convert = TRUE // If it can be made into an anesthetic machine or not
@@ -264,7 +264,7 @@
/obj/machinery/iv_drip/saline/Initialize(mapload)
. = ..()
- beaker = new /obj/item/reagent_containers/glass/saline(src)
+ beaker = new /obj/item/reagent_containers/cup/saline(src)
/obj/machinery/iv_drip/saline/ComponentInitialize()
. = ..()
diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm
index 2122eede48407..15afdf7e788e3 100644
--- a/code/game/machinery/limbgrower.dm
+++ b/code/game/machinery/limbgrower.dm
@@ -57,8 +57,8 @@
popup.open()
/obj/machinery/limbgrower/on_deconstruction()
- for(var/obj/item/reagent_containers/glass/G in component_parts)
- reagents.trans_to(G, G.reagents.maximum_volume)
+ for(var/obj/item/reagent_containers/cup/our_beaker in component_parts)
+ reagents.trans_to(our_beaker, our_beaker.reagents.maximum_volume)
..()
/obj/machinery/limbgrower/attackby(obj/item/O, mob/user, params)
@@ -155,9 +155,9 @@
/obj/machinery/limbgrower/RefreshParts()
reagents.maximum_volume = 0
- for(var/obj/item/reagent_containers/glass/G in component_parts)
- reagents.maximum_volume += G.volume
- G.reagents.trans_to(src, G.reagents.total_volume)
+ for(var/obj/item/reagent_containers/cup/our_beaker in component_parts)
+ reagents.maximum_volume += our_beaker.volume
+ our_beaker.reagents.trans_to(src, our_beaker.reagents.total_volume)
var/T=1.2
for(var/obj/item/stock_parts/manipulator/M in component_parts)
T -= M.rating*0.2
diff --git a/code/game/machinery/newscaster/newspaper.dm b/code/game/machinery/newscaster/newspaper.dm
index 54a919f2bcdd5..4c7981427cfb5 100644
--- a/code/game/machinery/newscaster/newspaper.dm
+++ b/code/game/machinery/newscaster/newspaper.dm
@@ -29,7 +29,7 @@ I am begging someone to remake this to be more like the paper UI, it's so bad.
user.visible_message("[user] is focusing intently on [src]! It looks like [user.p_theyre()] trying to commit sudoku... until [user.p_their()] eyes light up with realization!")
user.say(";JOURNALISM IS MY CALLING! EVERYBODY APPRECIATES UNBIASED REPORTI-GLORF", forced="newspaper suicide")
var/mob/living/carbon/human/H = user
- var/obj/W = new /obj/item/reagent_containers/food/drinks/bottle/whiskey(H.loc)
+ var/obj/W = new /obj/item/reagent_containers/cup/glass/bottle/whiskey(H.loc)
playsound(H.loc, 'sound/items/drink.ogg', rand(10,50), TRUE)
W.reagents.trans_to(H, W.reagents.total_volume, transfered_by = user)
user.visible_message("[user] downs the contents of [W.name] in one gulp! Shoulda stuck to sudoku!")
diff --git a/code/game/machinery/sleeper.dm b/code/game/machinery/sleeper.dm
index aad043793efa0..bab45ce63be5b 100644
--- a/code/game/machinery/sleeper.dm
+++ b/code/game/machinery/sleeper.dm
@@ -100,7 +100,7 @@
icon_state = "[initial(icon_state)][state_open ? "-open" : ""]"
/obj/machinery/sleeper/attackby(obj/item/I, mob/living/user, params)
- if ((istype(I, /obj/item/reagent_containers/glass) \
+ if ((istype(I, /obj/item/reagent_containers/cup) \
|| istype(I, /obj/item/reagent_containers/chem_bag)) \
&& user.a_intent != INTENT_HARM)
if (length(inserted_vials) >= max_vials)
diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm
index fb24f329629fb..4683a8e6e0add 100644
--- a/code/game/machinery/syndicatebomb.dm
+++ b/code/game/machinery/syndicatebomb.dm
@@ -444,12 +444,12 @@
var/list/reactants = list()
- for(var/obj/item/reagent_containers/glass/G in beakers)
+ for(var/obj/item/reagent_containers/cup/G in beakers)
reactants += G.reagents
for(var/obj/item/slime_extract/S in beakers)
if(S.Uses)
- for(var/obj/item/reagent_containers/glass/G in beakers)
+ for(var/obj/item/reagent_containers/cup/G in beakers)
G.reagents.trans_to(S, G.reagents.total_volume)
if(S?.reagents?.total_volume)
@@ -476,7 +476,7 @@
B.forceMove(drop_location())
beakers -= B
return
- else if(istype(I, /obj/item/reagent_containers/glass/beaker) || istype(I, /obj/item/reagent_containers/glass/bottle))
+ else if(istype(I, /obj/item/reagent_containers/cup/beaker) || istype(I, /obj/item/reagent_containers/cup/bottle))
if(beakers.len < max_beakers)
if(!user.transferItemToLoc(I, src))
return
@@ -506,7 +506,7 @@
if(istype(G, /obj/item/grenade/chem_grenade/adv_release))
time_release += 50 // A typical bomb, using basic beakers, will explode over 2-4 seconds. Using two will make the reaction last for less time, but it will be more dangerous overall.
- for(var/obj/item/reagent_containers/glass/B in G)
+ for(var/obj/item/reagent_containers/cup/B in G)
if(beakers.len < max_beakers)
beakers += B
B.forceMove(src)
diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm
index d7e77c26c4fd7..2aa9564b3f17f 100644
--- a/code/game/machinery/washing_machine.dm
+++ b/code/game/machinery/washing_machine.dm
@@ -413,7 +413,7 @@ GLOBAL_LIST_INIT(dye_registry, list(
to_chat(user, "You need more space cleaner!")
return TRUE
- else if(istype(W, /obj/item/soap) || istype(W, /obj/item/reagent_containers/glass/rag))
+ else if(istype(W, /obj/item/soap) || istype(W, /obj/item/reagent_containers/cup/rag))
var/cleanspeed = 50
if(istype(W, /obj/item/soap))
var/obj/item/soap/used_soap = W
diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm
index 59d70bfce96d8..ec726df449cc9 100644
--- a/code/game/objects/effects/decals/cleanable.dm
+++ b/code/game/objects/effects/decals/cleanable.dm
@@ -41,7 +41,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/decal/cleanable)
return TRUE
/obj/effect/decal/cleanable/attackby(obj/item/W, mob/user, params)
- if((istype(W, /obj/item/reagent_containers/glass) && !istype(W, /obj/item/reagent_containers/glass/rag)) || istype(W, /obj/item/reagent_containers/food/drinks))
+ if((istype(W, /obj/item/reagent_containers/cup) && !istype(W, /obj/item/reagent_containers/cup/rag)) || istype(W, /obj/item/reagent_containers/cup/glass))
if(src.reagents && W.reagents)
. = 1 //so the containers don't splash their content on the src while scooping.
if(!src.reagents.total_volume)
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index ccdb8b598f528..7ab8ade9e96fc 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -521,7 +521,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/landmark/ruin)
if(prob(70))
var/bottle_count = pick(10;1, 5;2, 2;3)
for(var/index in 1 to bottle_count)
- var/obj/item/reagent_containers/food/drinks/beer/almost_empty/B = new(get_turf(src))
+ var/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty/B = new(get_turf(src))
B.pixel_x += rand(-6, 6)
B.pixel_y += rand(-6, 6)
return INITIALIZE_HINT_QDEL
diff --git a/code/game/objects/items/RSF.dm b/code/game/objects/items/RSF.dm
index b29a67d9a7b2b..d1d3f705241e2 100644
--- a/code/game/objects/items/RSF.dm
+++ b/code/game/objects/items/RSF.dm
@@ -89,7 +89,7 @@ RSF
switch(mode)
if(1)
to_chat(user, "Dispensing Drinking Glass...")
- new /obj/item/reagent_containers/food/drinks/drinkingglass(T)
+ new /obj/item/reagent_containers/cup/glass/drinkingglass(T)
use_matter(20, user)
if(2)
to_chat(user, "Dispensing Paper Sheet...")
diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm
index b5fde44df77be..9826d0a85276c 100644
--- a/code/game/objects/items/cigs_lighters.dm
+++ b/code/game/objects/items/cigs_lighters.dm
@@ -177,7 +177,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
else
return ..()
-/obj/item/clothing/mask/cigarette/proc/dip(obj/item/reagent_containers/glass/glass, mob/user, proximity)
+/obj/item/clothing/mask/cigarette/proc/dip(obj/item/reagent_containers/cup/glass, mob/user, proximity)
if(!proximity || lit) //can't dip if cigarette is lit (it will heat the reagents in the glass instead)
return
if(istype(glass)) //you can dip cigarettes into beakers
diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm
index 7dd6f4283e877..f6149dafa8299 100644
--- a/code/game/objects/items/circuitboards/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm
@@ -416,7 +416,7 @@
req_components = list(
/obj/item/stock_parts/matter_bin = 1,
/obj/item/stock_parts/manipulator = 1,
- /obj/item/reagent_containers/glass/beaker = 2)
+ /obj/item/reagent_containers/cup/beaker = 2)
/obj/item/circuitboard/machine/circuit_imprinter/department
name = "departmental circuit imprinter (Machine Board)"
@@ -451,7 +451,7 @@
req_components = list(
/obj/item/stock_parts/matter_bin = 2,
/obj/item/stock_parts/manipulator = 2,
- /obj/item/reagent_containers/glass/beaker = 2)
+ /obj/item/reagent_containers/cup/beaker = 2)
/obj/item/circuitboard/machine/protolathe/department
name = "departmental protolathe (Machine Board)"
@@ -519,7 +519,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/circuitboard/machine/smartfridge)
req_components = list(
/obj/item/stock_parts/matter_bin = 2,
/obj/item/stock_parts/manipulator = 2,
- /obj/item/reagent_containers/glass/beaker = 2)
+ /obj/item/reagent_containers/cup/beaker = 2)
/obj/item/circuitboard/machine/techfab/department
name = "departmental techfab (Machine Board)"
@@ -704,11 +704,11 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/circuitboard/machine/smartfridge)
build_path = /obj/machinery/chem_master
desc = "You can turn the \"mode selection\" dial using a screwdriver."
req_components = list(
- /obj/item/reagent_containers/glass/beaker = 2,
+ /obj/item/reagent_containers/cup/beaker = 2,
/obj/item/stock_parts/manipulator = 1,
/obj/item/stack/sheet/glass = 1)
def_components = list(
- /obj/item/reagent_containers/glass/beaker = /obj/item/reagent_containers/glass/beaker/large)
+ /obj/item/reagent_containers/cup/beaker = /obj/item/reagent_containers/cup/beaker/large)
needs_anchored = FALSE
/obj/item/circuitboard/machine/chem_master/attackby(obj/item/I, mob/user, params)
@@ -735,7 +735,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/circuitboard/machine/smartfridge)
/obj/item/stock_parts/scanning_module = 2,
/obj/item/stock_parts/manipulator = 2,
/obj/item/stack/sheet/glass = 1,
- /obj/item/reagent_containers/glass/beaker = 2)
+ /obj/item/reagent_containers/cup/beaker = 2)
/obj/item/circuitboard/machine/clonepod/experimental
name = "experimental clone pod (Machine Board)"
@@ -782,7 +782,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/circuitboard/machine/smartfridge)
build_path = /obj/machinery/limbgrower
req_components = list(
/obj/item/stock_parts/manipulator = 1,
- /obj/item/reagent_containers/glass/beaker = 2,
+ /obj/item/reagent_containers/cup/beaker = 2,
/obj/item/stack/sheet/glass = 1)
/obj/item/circuitboard/machine/protolathe/department/medical
diff --git a/code/game/objects/items/clown_items.dm b/code/game/objects/items/clown_items.dm
index fccd2d2a0d98f..24a721c1345ee 100644
--- a/code/game/objects/items/clown_items.dm
+++ b/code/game/objects/items/clown_items.dm
@@ -210,7 +210,7 @@
flip_cooldown = world.time + 7
//canned laughter
-/obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter
+/obj/item/reagent_containers/cup/soda_cans/canned_laughter
name = "Canned Laughter"
desc = "Just looking at this makes you want to giggle."
icon_state = "laughter"
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index 75ca46dabf00f..b2deba79e7b60 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -284,8 +284,8 @@
// From the channel, determine the frequency and get a reference to it.
var/freq
- if(channel && channels && channels.len > 0)
- if(channel == MODE_DEPARTMENT)
+ if(channel && channels)
+ if(channel == MODE_DEPARTMENT && channels.len > 0)
channel = channels[1]
freq = secure_radio_connections[channel]
if(istype(talking_movable, /mob) && !freq && channel != RADIO_CHANNEL_UPLINK)
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index fe483c15e7822..c108bb13bf0c3 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -1267,7 +1267,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/extrapolator)
if(user.get_active_held_item() != src)
to_chat(user, "The extrapolator must be held in your active hand to work!")
return
- var/obj/item/reagent_containers/glass/bottle/culture_bottle = new(user.drop_location())
+ var/obj/item/reagent_containers/cup/bottle/culture_bottle = new(user.drop_location())
culture_bottle.name = "[disease.name] culture bottle"
culture_bottle.desc = "A small bottle. Contains [disease.agent] culture in synthblood medium."
culture_bottle.reagents.add_reagent(/datum/reagent/blood, 20, data)
diff --git a/code/game/objects/items/food/donuts.dm b/code/game/objects/items/food/donuts.dm
index cf5c9231a313c..8a454957b507c 100644
--- a/code/game/objects/items/food/donuts.dm
+++ b/code/game/objects/items/food/donuts.dm
@@ -164,7 +164,7 @@
food_reagents = list(
/datum/reagent/consumable/nutriment = 3,
/datum/reagent/consumable/sugar = 3,
- /datum/reagent/consumable/cocoa/hot_cocoa = 3,
+ /datum/reagent/consumable/hot_cocoa = 3,
/datum/reagent/consumable/sprinkles = 1
) //the cocoa reagent is just bitter.
tastes = list("donut" = 4, "bitterness" = 1)
@@ -293,7 +293,7 @@
food_reagents = list(
/datum/reagent/consumable/nutriment = 3,
/datum/reagent/consumable/sugar = 3,
- /datum/reagent/consumable/cocoa/hot_cocoa = 3,
+ /datum/reagent/consumable/hot_cocoa = 3,
/datum/reagent/consumable/sprinkles = 1,
/datum/reagent/consumable/nutriment/vitamin = 1
) //the coco reagent is just bitter.
@@ -413,7 +413,7 @@
food_reagents = list(
/datum/reagent/consumable/nutriment = 3,
/datum/reagent/consumable/sugar = 3,
- /datum/reagent/consumable/cocoa/hot_cocoa = 3,
+ /datum/reagent/consumable/hot_cocoa = 3,
/datum/reagent/consumable/sprinkles = 1,
/datum/reagent/consumable/nutriment/vitamin = 1
) //the cocoa reagent is just bitter.
diff --git a/code/game/objects/items/food/frozen.dm b/code/game/objects/items/food/frozen.dm
index fd0f23c9853bc..ccec83065a083 100644
--- a/code/game/objects/items/food/frozen.dm
+++ b/code/game/objects/items/food/frozen.dm
@@ -79,7 +79,7 @@
icon = 'icons/obj/food/frozen_treats.dmi'
icon_state = "flavorless_sc"
w_class = WEIGHT_CLASS_SMALL
- trash_type = /obj/item/reagent_containers/food/drinks/sillycup //We dont eat paper cups
+ trash_type = /obj/item/reagent_containers/cup/glass/sillycup //We dont eat paper cups
food_reagents = list(
/datum/reagent/water = 11 // We dont get food for water/juices
)
diff --git a/code/game/objects/items/food/salad.dm b/code/game/objects/items/food/salad.dm
index 096ab53d80e56..43f364a22fe7c 100644
--- a/code/game/objects/items/food/salad.dm
+++ b/code/game/objects/items/food/salad.dm
@@ -2,7 +2,7 @@
////////////////////////////////////////////SALAD////////////////////////////////////////////
/obj/item/food/salad
icon = 'icons/obj/food/soupsalad.dmi'
- trash_type = /obj/item/reagent_containers/glass/bowl
+ trash_type = /obj/item/reagent_containers/cup/bowl
bite_consumption = 3
w_class = WEIGHT_CLASS_NORMAL
food_reagents = list(
@@ -144,7 +144,7 @@
foodtypes = GRAIN | MEAT //EGG = MEAT -NinjaNomNom 2017
-/obj/item/reagent_containers/glass/bowl
+/obj/item/reagent_containers/cup/bowl
name = "bowl"
desc = "A simple bowl, used for soups and salads."
icon = 'icons/obj/food/soupsalad.dmi'
@@ -154,7 +154,7 @@
w_class = WEIGHT_CLASS_NORMAL
custom_price = PAYCHECK_EASY * 0.6
-/obj/item/reagent_containers/glass/bowl/Initialize(mapload)
+/obj/item/reagent_containers/cup/bowl/Initialize(mapload)
. = ..()
AddComponent(/datum/component/customizable_reagent_holder, /obj/item/food/salad/empty, CUSTOM_INGREDIENT_ICON_FILL, max_ingredients = 6)
diff --git a/code/game/objects/items/food/soup.dm b/code/game/objects/items/food/soup.dm
index 7566017be65c0..e673e53bfbb8a 100644
--- a/code/game/objects/items/food/soup.dm
+++ b/code/game/objects/items/food/soup.dm
@@ -1,7 +1,7 @@
/obj/item/food/soup
w_class = WEIGHT_CLASS_NORMAL
icon = 'icons/obj/food/soupsalad.dmi'
- trash_type = /obj/item/reagent_containers/glass/bowl
+ trash_type = /obj/item/reagent_containers/cup/bowl
bite_consumption = 5
max_volume = 80
food_reagents = list(
@@ -73,7 +73,7 @@
name = "wing fang chu"
desc = "A savory dish of alien wing wang in soy."
icon_state = "wingfangchu"
- trash_type = /obj/item/reagent_containers/glass/bowl
+ trash_type = /obj/item/reagent_containers/cup/bowl
food_reagents = list(
/datum/reagent/consumable/nutriment/protein = 9,
/datum/reagent/consumable/soysauce = 10,
diff --git a/code/game/objects/items/food/spaghetti.dm b/code/game/objects/items/food/spaghetti.dm
index 57873a6675487..3ad8b59a3eec4 100644
--- a/code/game/objects/items/food/spaghetti.dm
+++ b/code/game/objects/items/food/spaghetti.dm
@@ -74,7 +74,7 @@
name = "beef noodle"
desc = "Nutritious, beefy and noodly."
icon_state = "beefnoodle"
- trash_type = /obj/item/reagent_containers/glass/bowl
+ trash_type = /obj/item/reagent_containers/cup/bowl
food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/liquidgibs = 3)
tastes = list("noodle" = 1, "meat" = 1)
foodtypes = GRAIN | MEAT
diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm
index 114822d13d90d..c5cbc97a890c6 100644
--- a/code/game/objects/items/grenades/chem_grenade.dm
+++ b/code/game/objects/items/grenades/chem_grenade.dm
@@ -6,9 +6,16 @@
w_class = WEIGHT_CLASS_SMALL
force = 2
var/stage = GRENADE_EMPTY
- var/list/obj/item/reagent_containers/glass/beakers = list()
- var/list/allowed_containers = list(/obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/waterbottle)
- var/list/banned_containers = list(/obj/item/reagent_containers/glass/beaker/bluespace) //Containers to exclude from specific grenade subtypes
+ /// The set of reagent containers that have been added to this grenade casing.
+ var/list/obj/item/reagent_containers/cup/beakers = list()
+ /// The types of reagent containers that can be added to this grenade casing.
+ var/list/allowed_containers = list(
+ /obj/item/reagent_containers/cup/beaker,
+ /obj/item/reagent_containers/cup/bottle,
+ /obj/item/reagent_containers/cup/waterbottle
+ )
+ /// The types of reagent containers that can't be added to this grenade casing.
+ var/list/banned_containers = list(/obj/item/reagent_containers/cup/beaker/bluespace)
var/affected_area = 3
var/ignition_temp = 10 // The amount of heat added to the reagents when this grenade goes off.
var/threatscale = 1 // Used by advanced grenades to make them slightly more worthy.
@@ -37,7 +44,7 @@
if(user.can_see_reagents())
if(beakers.len)
. += "You scan the grenade and detect the following reagents:"
- for(var/obj/item/reagent_containers/glass/G in beakers)
+ for(var/obj/item/reagent_containers/cup/G in beakers)
for(var/datum/reagent/R in G.reagents.reagent_list)
. += "[R.volume] units of [R.name] in the [G.name]."
if(beakers.len == 1)
@@ -48,7 +55,7 @@
if(beakers.len == 2 && beakers[1].name == beakers[2].name)
. += "You see two [beakers[1].name]s inside the grenade."
else
- for(var/obj/item/reagent_containers/glass/G in beakers)
+ for(var/obj/item/reagent_containers/cup/G in beakers)
. += "You see a [G.name] inside the grenade."
/obj/item/grenade/chem_grenade/attack_self(mob/user)
@@ -194,7 +201,7 @@
return
var/list/datum/reagents/reactants = list()
- for(var/obj/item/reagent_containers/glass/G in beakers)
+ for(var/obj/item/reagent_containers/cup/G in beakers)
reactants += G.reagents
var/turf/detonation_turf = get_turf(src)
@@ -221,7 +228,11 @@
desc = "A custom made large grenade. Larger splash range and increased ignition temperature compared to basic grenades. Fits exotic and bluespace based containers."
casedesc = "This casing affects a larger area than the basic model and can fit exotic containers, including slime cores and bluespace beakers. Heats contents by 25 K upon ignition."
icon_state = "large_grenade"
- 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/cup,
+ /obj/item/reagent_containers/condiment,
+ /obj/item/reagent_containers/cup/glass,
+ )
banned_containers = list()
affected_area = 5
ignition_temp = 25 // Large grenades are slightly more effective at setting off heat-sensitive mixtures than smaller grenades.
@@ -235,7 +246,7 @@
for(var/obj/item/slime_extract/S in beakers)
if(S.Uses)
- for(var/obj/item/reagent_containers/glass/G in beakers)
+ for(var/obj/item/reagent_containers/cup/G in beakers)
G.reagents.trans_to(S, G.reagents.total_volume)
//If there is still a core (sometimes it's used up)
@@ -244,7 +255,7 @@
if(S)
if(S.reagents?.total_volume)
- for(var/obj/item/reagent_containers/glass/G in beakers)
+ for(var/obj/item/reagent_containers/cup/G in beakers)
S.reagents.trans_to(G, S.reagents.total_volume)
else
S.forceMove(get_turf(src))
@@ -335,15 +346,15 @@
/obj/item/grenade/chem_grenade/metalfoam/Initialize(mapload)
. = ..()
- var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
- var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
+ var/obj/item/reagent_containers/cup/beaker/beaker_one = new(src)
+ var/obj/item/reagent_containers/cup/beaker/beaker_two = new(src)
- B1.reagents.add_reagent(/datum/reagent/aluminium, 30)
- B2.reagents.add_reagent(/datum/reagent/foaming_agent, 10)
- B2.reagents.add_reagent(/datum/reagent/toxin/acid/fluacid, 10)
+ beaker_one.reagents.add_reagent(/datum/reagent/aluminium, 30)
+ beaker_two.reagents.add_reagent(/datum/reagent/foaming_agent, 10)
+ beaker_two.reagents.add_reagent(/datum/reagent/toxin/acid/fluacid, 10)
- beakers += B1
- beakers += B2
+ beakers += beaker_one
+ beakers += beaker_two
/obj/item/grenade/chem_grenade/smart_metal_foam
@@ -351,17 +362,18 @@
desc = "Used for emergency sealing of hull breaches, while keeping areas accessible."
stage = GRENADE_READY
+
/obj/item/grenade/chem_grenade/smart_metal_foam/Initialize(mapload)
. = ..()
- var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src)
- var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
+ var/obj/item/reagent_containers/cup/beaker/large/beaker_one = new(src)
+ var/obj/item/reagent_containers/cup/beaker/beaker_two = new(src)
- B1.reagents.add_reagent(/datum/reagent/aluminium, 75)
- B2.reagents.add_reagent(/datum/reagent/smart_foaming_agent, 25)
- B2.reagents.add_reagent(/datum/reagent/toxin/acid/fluacid, 25)
+ beaker_one.reagents.add_reagent(/datum/reagent/aluminium, 75)
+ beaker_two.reagents.add_reagent(/datum/reagent/smart_foaming_agent, 25)
+ beaker_two.reagents.add_reagent(/datum/reagent/toxin/acid/fluacid, 25)
- beakers += B1
- beakers += B2
+ beakers += beaker_one
+ beakers += beaker_two
/obj/item/grenade/chem_grenade/incendiary
@@ -371,15 +383,15 @@
/obj/item/grenade/chem_grenade/incendiary/Initialize(mapload)
. = ..()
- var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
- var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
+ var/obj/item/reagent_containers/cup/beaker/beaker_one = new(src)
+ var/obj/item/reagent_containers/cup/beaker/beaker_two = new(src)
- B1.reagents.add_reagent(/datum/reagent/phosphorus, 25)
- B2.reagents.add_reagent(/datum/reagent/stable_plasma, 25)
- B2.reagents.add_reagent(/datum/reagent/toxin/acid, 25)
+ beaker_one.reagents.add_reagent(/datum/reagent/phosphorus, 25)
+ beaker_two.reagents.add_reagent(/datum/reagent/stable_plasma, 25)
+ beaker_two.reagents.add_reagent(/datum/reagent/toxin/acid, 25)
- beakers += B1
- beakers += B2
+ beakers += beaker_one
+ beakers += beaker_two
/obj/item/grenade/chem_grenade/antiweed
@@ -389,16 +401,16 @@
/obj/item/grenade/chem_grenade/antiweed/Initialize(mapload)
. = ..()
- var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
- var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
+ var/obj/item/reagent_containers/cup/beaker/beaker_one = new(src)
+ var/obj/item/reagent_containers/cup/beaker/beaker_two = new(src)
- B1.reagents.add_reagent(/datum/reagent/toxin/plantbgone, 25)
- B1.reagents.add_reagent(/datum/reagent/potassium, 25)
- B2.reagents.add_reagent(/datum/reagent/phosphorus, 25)
- B2.reagents.add_reagent(/datum/reagent/consumable/sugar, 25)
+ beaker_one.reagents.add_reagent(/datum/reagent/toxin/plantbgone, 25)
+ beaker_one.reagents.add_reagent(/datum/reagent/potassium, 25)
+ beaker_two.reagents.add_reagent(/datum/reagent/phosphorus, 25)
+ beaker_two.reagents.add_reagent(/datum/reagent/consumable/sugar, 25)
- beakers += B1
- beakers += B2
+ beakers += beaker_one
+ beakers += beaker_two
/obj/item/grenade/chem_grenade/cleaner
@@ -408,15 +420,15 @@
/obj/item/grenade/chem_grenade/cleaner/Initialize(mapload)
. = ..()
- var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
- var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
+ var/obj/item/reagent_containers/cup/beaker/beaker_one = new(src)
+ var/obj/item/reagent_containers/cup/beaker/beaker_two = new(src)
- B1.reagents.add_reagent(/datum/reagent/fluorosurfactant, 40)
- B2.reagents.add_reagent(/datum/reagent/water, 40)
- B2.reagents.add_reagent(/datum/reagent/space_cleaner, 10)
+ beaker_one.reagents.add_reagent(/datum/reagent/fluorosurfactant, 40)
+ beaker_two.reagents.add_reagent(/datum/reagent/water, 40)
+ beaker_two.reagents.add_reagent(/datum/reagent/space_cleaner, 10)
- beakers += B1
- beakers += B2
+ beakers += beaker_one
+ beakers += beaker_two
/obj/item/grenade/chem_grenade/ez_clean
@@ -426,15 +438,15 @@
/obj/item/grenade/chem_grenade/ez_clean/Initialize(mapload)
. = ..()
- var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src)
- var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src)
+ var/obj/item/reagent_containers/cup/beaker/large/beaker_one = new(src)
+ var/obj/item/reagent_containers/cup/beaker/large/beaker_two = new(src)
- B1.reagents.add_reagent(/datum/reagent/fluorosurfactant, 40)
- B2.reagents.add_reagent(/datum/reagent/water, 40)
- B2.reagents.add_reagent(/datum/reagent/space_cleaner/ez_clean, 60) //ensures a t h i c c distribution
+ beaker_one.reagents.add_reagent(/datum/reagent/fluorosurfactant, 40)
+ beaker_two.reagents.add_reagent(/datum/reagent/water, 40)
+ beaker_two.reagents.add_reagent(/datum/reagent/space_cleaner/ez_clean, 60) //ensures a t h i c c distribution
- beakers += B1
- beakers += B2
+ beakers += beaker_one
+ beakers += beaker_two
@@ -445,8 +457,8 @@
/obj/item/grenade/chem_grenade/teargas/Initialize(mapload)
. = ..()
- var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src)
- var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src)
+ var/obj/item/reagent_containers/cup/beaker/large/B1 = new(src)
+ var/obj/item/reagent_containers/cup/beaker/large/B2 = new(src)
B1.reagents.add_reagent(/datum/reagent/consumable/condensedcapsaicin, 60)
B1.reagents.add_reagent(/datum/reagent/potassium, 40)
@@ -464,8 +476,8 @@
/obj/item/grenade/chem_grenade/facid/Initialize(mapload)
. = ..()
- var/obj/item/reagent_containers/glass/beaker/bluespace/B1 = new(src)
- var/obj/item/reagent_containers/glass/beaker/bluespace/B2 = new(src)
+ var/obj/item/reagent_containers/cup/beaker/bluespace/B1 = new(src)
+ var/obj/item/reagent_containers/cup/beaker/bluespace/B2 = new(src)
B1.reagents.add_reagent(/datum/reagent/toxin/acid/fluacid, 290)
B1.reagents.add_reagent(/datum/reagent/potassium, 10)
@@ -484,8 +496,8 @@
/obj/item/grenade/chem_grenade/colorful/Initialize(mapload)
. = ..()
- var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
- var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
+ var/obj/item/reagent_containers/cup/beaker/B1 = new(src)
+ var/obj/item/reagent_containers/cup/beaker/B2 = new(src)
B1.reagents.add_reagent(/datum/reagent/colorful_reagent, 25)
B1.reagents.add_reagent(/datum/reagent/potassium, 25)
@@ -503,8 +515,8 @@
/obj/item/grenade/chem_grenade/glitter/Initialize(mapload)
. = ..()
- var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
- var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
+ var/obj/item/reagent_containers/cup/beaker/B1 = new(src)
+ var/obj/item/reagent_containers/cup/beaker/B2 = new(src)
B1.reagents.add_reagent(glitter_type, 25)
B1.reagents.add_reagent(/datum/reagent/potassium, 25)
@@ -536,8 +548,8 @@
/obj/item/grenade/chem_grenade/clf3/Initialize(mapload)
. = ..()
- var/obj/item/reagent_containers/glass/beaker/bluespace/B1 = new(src)
- var/obj/item/reagent_containers/glass/beaker/bluespace/B2 = new(src)
+ var/obj/item/reagent_containers/cup/beaker/bluespace/B1 = new(src)
+ var/obj/item/reagent_containers/cup/beaker/bluespace/B2 = new(src)
B1.reagents.add_reagent(/datum/reagent/fluorosurfactant, 250)
B1.reagents.add_reagent(/datum/reagent/clf3, 50)
@@ -554,8 +566,8 @@
/obj/item/grenade/chem_grenade/bioterrorfoam/Initialize(mapload)
. = ..()
- var/obj/item/reagent_containers/glass/beaker/bluespace/B1 = new(src)
- var/obj/item/reagent_containers/glass/beaker/bluespace/B2 = new(src)
+ var/obj/item/reagent_containers/cup/beaker/bluespace/B1 = new(src)
+ var/obj/item/reagent_containers/cup/beaker/bluespace/B2 = new(src)
B1.reagents.add_reagent(/datum/reagent/cryptobiolin, 75)
B1.reagents.add_reagent(/datum/reagent/water, 50)
@@ -574,8 +586,8 @@
/obj/item/grenade/chem_grenade/tuberculosis/Initialize(mapload)
. = ..()
- var/obj/item/reagent_containers/glass/beaker/bluespace/B1 = new(src)
- var/obj/item/reagent_containers/glass/beaker/bluespace/B2 = new(src)
+ var/obj/item/reagent_containers/cup/beaker/bluespace/B1 = new(src)
+ var/obj/item/reagent_containers/cup/beaker/bluespace/B2 = new(src)
B1.reagents.add_reagent(/datum/reagent/potassium, 50)
B1.reagents.add_reagent(/datum/reagent/phosphorus, 50)
@@ -594,8 +606,8 @@
/obj/item/grenade/chem_grenade/holy/Initialize(mapload)
. = ..()
- var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src)
- var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src)
+ var/obj/item/reagent_containers/cup/beaker/large/B1 = new(src)
+ var/obj/item/reagent_containers/cup/beaker/large/B2 = new(src)
B1.reagents.add_reagent(/datum/reagent/potassium, 100)
B2.reagents.add_reagent(/datum/reagent/water/holywater, 100)
@@ -610,8 +622,8 @@
/obj/item/grenade/chem_grenade/ghostbuster/Initialize(mapload)
. = ..()
- var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src)
- var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src)
+ var/obj/item/reagent_containers/cup/beaker/large/B1 = new(src)
+ var/obj/item/reagent_containers/cup/beaker/large/B2 = new(src)
B1.reagents.add_reagent(/datum/reagent/fluorosurfactant, 50)
B1.reagents.add_reagent(/datum/reagent/water/holywater, 50)
diff --git a/code/game/objects/items/grenades/ghettobomb.dm b/code/game/objects/items/grenades/ghettobomb.dm
index 5d13e9cc741e6..ae5fc7ee8189e 100644
--- a/code/game/objects/items/grenades/ghettobomb.dm
+++ b/code/game/objects/items/grenades/ghettobomb.dm
@@ -34,7 +34,7 @@
/obj/item/grenade/iedcasing/CheckParts(list/parts_list)
..()
- var/obj/item/reagent_containers/food/drinks/soda_cans/can = locate() in contents
+ var/obj/item/reagent_containers/cup/soda_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/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm
index 5f94dc3f0f89d..718e93d430268 100644
--- a/code/game/objects/items/holy_weapons.dm
+++ b/code/game/objects/items/holy_weapons.dm
@@ -84,7 +84,7 @@
icon_state = "studentuni"
item_state = "studentuni"
body_parts_covered = ARMS|CHEST
- allowed = list(/obj/item/storage/book/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, /obj/item/tank/internals/plasmaman)
+ allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
/obj/item/storage/box/holy/sentinel
name = "Stone Sentinel Kit"
diff --git a/code/game/objects/items/mail.dm b/code/game/objects/items/mail.dm
index c5e7248c6dd7d..7689e50de68dc 100644
--- a/code/game/objects/items/mail.dm
+++ b/code/game/objects/items/mail.dm
@@ -25,8 +25,8 @@
var/static/list/generic_goodies = list(
/obj/item/stack/spacecash/c10 = 22, //the lamest chance to get item, what do you expect really?
- /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 10,
- /obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy = 10,
+ /obj/item/reagent_containers/cup/soda_cans/pwr_game = 10,
+ /obj/item/reagent_containers/cup/soda_cans/monkey_energy = 10,
/obj/item/food/cheesiehonkers = 10,
/obj/item/food/candy = 10,
/obj/item/food/chips = 10,
@@ -51,8 +51,8 @@
/obj/item/book/granter/spell/mimery_blockade,
/obj/item/gun/ballistic/rifle/boltaction/enchanted,
/obj/item/melee/classic_baton/police/telescopic,
- /obj/item/reagent_containers/glass/bottle/random_virus/minor,
- /obj/item/reagent_containers/glass/bottle/random_virus,
+ /obj/item/reagent_containers/cup/bottle/random_virus/minor,
+ /obj/item/reagent_containers/cup/bottle/random_virus,
/obj/item/gun/ballistic/revolver/nagant
)
diff --git a/code/game/objects/items/mop.dm b/code/game/objects/items/mop.dm
index aa87ec7cd0bb2..25dc5d1e95467 100644
--- a/code/game/objects/items/mop.dm
+++ b/code/game/objects/items/mop.dm
@@ -48,7 +48,7 @@
var/turf/T = get_turf(A)
- if(istype(A, /obj/item/reagent_containers/glass/bucket) || istype(A, /obj/structure/janitorialcart))
+ if(istype(A, /obj/item/reagent_containers/cup/bucket) || istype(A, /obj/structure/janitorialcart))
return
if(T)
diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm
index 2d53fad04d176..8026df29df82a 100644
--- a/code/game/objects/items/robot/robot_items.dm
+++ b/code/game/objects/items/robot/robot_items.dm
@@ -931,8 +931,8 @@
name = "container storage apparatus"
desc = "A special apparatus for carrying containers without spilling the contents. It can also synthesize new beakers!"
icon_state = "borg_beaker_apparatus"
- storable = list(/obj/item/reagent_containers/glass)
- var/defaultcontainer = /obj/item/reagent_containers/glass/beaker
+ storable = list(/obj/item/reagent_containers/cup)
+ var/defaultcontainer = /obj/item/reagent_containers/cup/beaker
/obj/item/borg/apparatus/container/Destroy()
if(stored)
@@ -944,7 +944,7 @@
/obj/item/borg/apparatus/container/examine()
. = ..()
//apparatus/container/service means this will not always be true.
- if(istype(stored, /obj/item/reagent_containers/glass))
+ if(istype(stored, /obj/item/reagent_containers/cup))
var/obj/item/reagent_containers/C = stored
. += "The apparatus currently has [C] secured, which contains:"
if(length(C.reagents.reagent_list))
@@ -962,7 +962,7 @@
stored.pixel_x = 0
stored.pixel_y = 0
var/mutable_appearance/stored_copy = new /mutable_appearance(stored)
- if(istype(stored, /obj/item/reagent_containers/glass/beaker))
+ if(istype(stored, /obj/item/reagent_containers/cup/beaker))
arm.pixel_y = arm.pixel_y - 3
stored_copy.layer = FLOAT_LAYER
stored_copy.plane = FLOAT_PLANE
@@ -1038,24 +1038,26 @@
/obj/item/borg/apparatus/container/service
name = "versatile service grasper"
desc = "Specially designed for carrying glasses, food and seeds. It can also synthesize glasses for drinks!"
- storable = list(/obj/item/reagent_containers/food,
- /obj/item/reagent_containers/glass,
+ storable = list(
+ /obj/item/food,
+ /obj/item/reagent_containers/condiment,
+ /obj/item/reagent_containers/cup,
/obj/item/seeds,
/obj/item/storage/fancy/donut_box,
/obj/item/storage/fancy/egg_box,
/obj/item/clothing/mask/cigarette,
/obj/item/storage/fancy/cigarettes,
- /obj/item/reagent_containers/glass/beaker,
- /obj/item/reagent_containers/glass/bottle,
- /obj/item/reagent_containers/glass/bucket
+ /obj/item/reagent_containers/cup/beaker,
+ /obj/item/reagent_containers/cup/bottle,
+ /obj/item/reagent_containers/cup/bucket
)
- defaultcontainer = /obj/item/reagent_containers/food/drinks/drinkingglass
+ defaultcontainer = /obj/item/reagent_containers/cup/glass/drinkingglass
/obj/item/borg/apparatus/container/service/examine()
. = ..()
//Parent type handles this type. All other objects held are handled here.
- if(!istype(stored, /obj/item/reagent_containers/glass))
+ if(!istype(stored, /obj/item/reagent_containers/cup))
. += "You are currently holding [stored]."
. += "Alt-click will drop the currently stored [stored]."
diff --git a/code/game/objects/items/stacks/sheets/miscellaneous/miscellaneous_mats_recipes.dm b/code/game/objects/items/stacks/sheets/miscellaneous/miscellaneous_mats_recipes.dm
index fcbc2b8c20551..3750b2d00d725 100644
--- a/code/game/objects/items/stacks/sheets/miscellaneous/miscellaneous_mats_recipes.dm
+++ b/code/game/objects/items/stacks/sheets/miscellaneous/miscellaneous_mats_recipes.dm
@@ -23,8 +23,8 @@ STACKSIZE_MACRO(/obj/item/stack/sheet/snow)
GLOBAL_LIST_INIT(plastic_recipes, list(
new /datum/stack_recipe("plastic flaps", /obj/structure/plasticflaps, 5, one_per_turf = TRUE, on_floor = TRUE, time = 4 SECONDS), \
- new /datum/stack_recipe("water bottle", /obj/item/reagent_containers/glass/waterbottle/empty), \
- new /datum/stack_recipe("large water bottle", /obj/item/reagent_containers/glass/waterbottle/large/empty,3), \
+ new /datum/stack_recipe("water bottle", /obj/item/reagent_containers/cup/glass/waterbottle/empty), \
+ new /datum/stack_recipe("large water bottle", /obj/item/reagent_containers/cup/glass/waterbottle/large/empty,3), \
new /datum/stack_recipe("wet floor sign", /obj/item/clothing/suit/caution, 2), \
new /datum/stack_recipe("plastic chair", /obj/structure/chair/fancy/plastic, one_per_turf = TRUE, on_floor = TRUE, time = 2 SECONDS), \
))
diff --git a/code/game/objects/items/stacks/sheets/organic/cloths_recipes.dm b/code/game/objects/items/stacks/sheets/organic/cloths_recipes.dm
index 05f8ef3588094..1987c3979daae 100644
--- a/code/game/objects/items/stacks/sheets/organic/cloths_recipes.dm
+++ b/code/game/objects/items/stacks/sheets/organic/cloths_recipes.dm
@@ -20,7 +20,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
new/datum/stack_recipe("sheet snatcher", /obj/item/storage/bag/sheetsnatcher, 6, time = 4 SECONDS), \
null, \
new/datum/stack_recipe("improvised gauze", /obj/item/stack/medical/gauze/improvised, 1, 2, 6), \
- new/datum/stack_recipe("rag", /obj/item/reagent_containers/glass/rag, 1, time = 1 SECONDS), \
+ new/datum/stack_recipe("rag", /obj/item/reagent_containers/cup/rag, 1, time = 1 SECONDS), \
new/datum/stack_recipe("bedsheet", /obj/item/bedsheet, 3, time = 4 SECONDS), \
new/datum/stack_recipe("double bedsheet", /obj/item/bedsheet/double, 6, time = 8 SECONDS), \
new/datum/stack_recipe("empty sandbag", /obj/item/emptysandbag, 4, time = 2 SECONDS), \
diff --git a/code/game/objects/items/stacks/sheets/organic/wood_recipes.dm b/code/game/objects/items/stacks/sheets/organic/wood_recipes.dm
index 63d119485eef0..66f69f46b99b6 100644
--- a/code/game/objects/items/stacks/sheets/organic/wood_recipes.dm
+++ b/code/game/objects/items/stacks/sheets/organic/wood_recipes.dm
@@ -27,7 +27,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
new/datum/stack_recipe("wooden crate", /obj/structure/closet/crate/wooden, 6, one_per_turf = TRUE, on_floor = TRUE, time = 5 SECONDS),\
new/datum/stack_recipe("baseball bat", /obj/item/melee/baseball_bat, 5, time = 1.5 SECONDS),\
new/datum/stack_recipe("loom", /obj/structure/loom, 10, one_per_turf = TRUE, on_floor = TRUE, time = 1.5 SECONDS), \
- new/datum/stack_recipe("mortar", /obj/item/reagent_containers/glass/mortar, 3), \
+ new/datum/stack_recipe("mortar", /obj/item/reagent_containers/cup/mortar, 3), \
new/datum/stack_recipe("firebrand", /obj/item/match/firebrand, 2, time = 10 SECONDS), \
null, \
new/datum/stack_recipe_list("pews", list(
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
index 26c96ec713fe9..2fb6538c07ca5 100644
--- a/code/game/objects/items/storage/backpack.dm
+++ b/code/game/objects/items/storage/backpack.dm
@@ -420,7 +420,7 @@
/obj/item/mail,
/obj/item/small_delivery,
/obj/item/paper,
- /obj/item/reagent_containers/food/condiment/milk,
+ /obj/item/reagent_containers/condiment/milk,
/obj/item/food/bread/plain
)
)
@@ -731,7 +731,7 @@
new /obj/item/gun/ballistic/automatic/pistol/APS(src)
new /obj/item/ammo_box/magazine/pistolm9mm(src)
new /obj/item/ammo_box/magazine/pistolm9mm(src)
- new /obj/item/reagent_containers/food/drinks/bottle/vodka/badminka(src)
+ new /obj/item/reagent_containers/cup/glass/bottle/vodka/badminka(src)
new /obj/item/reagent_containers/hypospray/medipen/stimulants(src)
new /obj/item/storage/firstaid/tactical(src)
diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm
index 6a9c803c2cc88..279618bf75776 100644
--- a/code/game/objects/items/storage/bags.dm
+++ b/code/game/objects/items/storage/bags.dm
@@ -251,7 +251,7 @@
STR.max_w_class = WEIGHT_CLASS_NORMAL
STR.max_combined_w_class = 100
STR.max_items = 100
- STR.can_hold = typecacheof(list(/obj/item/food/grown, /obj/item/seeds, /obj/item/grown, /obj/item/reagent_containers/honeycomb, /obj/item/disk/plantgene, /obj/item/food/seaweed_sheet))
+ STR.can_hold = typecacheof(list(/obj/item/food/grown, /obj/item/seeds, /obj/item/grown, /obj/item/reagent_containers/cup/glass/honeycomb, /obj/item/disk/plantgene, /obj/item/food/seaweed_sheet))
////////
@@ -429,7 +429,7 @@
STR.max_combined_w_class = 200
STR.max_items = 50
STR.insert_preposition = "in"
- STR.can_hold = typecacheof(list(/obj/item/reagent_containers/pill, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/medspray, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/glass/waterbottle))
+ STR.can_hold = typecacheof(list(/obj/item/reagent_containers/pill, /obj/item/reagent_containers/cup/beaker, /obj/item/reagent_containers/cup/bottle, /obj/item/reagent_containers/medspray, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/cup/glass/waterbottle))
/*
* Biowaste bag (mostly for xenobiologists)
@@ -450,7 +450,7 @@
STR.max_combined_w_class = 200
STR.max_items = 25
STR.insert_preposition = "in"
- STR.can_hold = typecacheof(list(/obj/item/slime_extract, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/blood, /obj/item/reagent_containers/hypospray/medipen, /obj/item/food/deadmouse, /obj/item/food/monkeycube, /obj/item/organ, /obj/item/bodypart))
+ STR.can_hold = typecacheof(list(/obj/item/slime_extract, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/cup/beaker, /obj/item/reagent_containers/cup/bottle, /obj/item/reagent_containers/blood, /obj/item/reagent_containers/hypospray/medipen, /obj/item/food/deadmouse, /obj/item/food/monkeycube, /obj/item/organ, /obj/item/bodypart))
/obj/item/storage/bag/bio/pre_attack(atom/A, mob/living/user, params)
if(istype(A, /obj/item/slimecross/reproductive))
@@ -473,4 +473,4 @@
STR.max_items = 50
STR.max_w_class = WEIGHT_CLASS_SMALL
STR.insert_preposition = "in"
- STR.can_hold = typecacheof(list(/obj/item/stack/ore/bluespace_crystal, /obj/item/assembly, /obj/item/stock_parts, /obj/item/reagent_containers/glass/beaker, /obj/item/stack/cable_coil, /obj/item/circuitboard, /obj/item/electronics, /obj/item/rcd_ammo))
+ STR.can_hold = typecacheof(list(/obj/item/stack/ore/bluespace_crystal, /obj/item/assembly, /obj/item/stock_parts, /obj/item/reagent_containers/cup/beaker, /obj/item/stack/cable_coil, /obj/item/circuitboard, /obj/item/electronics, /obj/item/rcd_ammo))
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index e247252257742..89c5987d00d45 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -92,8 +92,8 @@
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
var/static/list/can_hold = typecacheof(list(
/obj/item/reagent_containers/spray,
- /obj/item/reagent_containers/glass/beaker,//those will usually be used for fertilizer
- /obj/item/reagent_containers/glass/bottle,//fertilizer bottles
+ /obj/item/reagent_containers/cup/beaker,//those will usually be used for fertilizer
+ /obj/item/reagent_containers/cup/bottle,//fertilizer bottles
/obj/item/reagent_containers/syringe,//blood samples for pod cloning
/obj/item/reagent_containers/dropper,//on request by forums users
/obj/item/plant_analyzer,
@@ -228,8 +228,8 @@
/obj/item/healthanalyzer,
/obj/item/dnainjector,
/obj/item/reagent_containers/dropper,
- /obj/item/reagent_containers/glass/beaker,
- /obj/item/reagent_containers/glass/bottle,
+ /obj/item/reagent_containers/cup/beaker,
+ /obj/item/reagent_containers/cup/bottle,
/obj/item/reagent_containers/pill,
/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/medspray,
@@ -392,7 +392,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/cup/glass/bottle,
/obj/item/stack/medical,
/obj/item/knife/combat/survival,
/obj/item/tank/internals/emergency_oxygen,
@@ -404,7 +404,8 @@
/obj/item/reagent_containers/pill,
/obj/item/storage/pill_bottle,
/obj/item/stack/ore,
- /obj/item/reagent_containers/food/drinks,
+ /obj/item/reagent_containers/cup/glass,
+ /obj/item/reagent_containers/cup/glass/bottle,
/obj/item/organ/regenerative_core,
/obj/item/wormhole_jaunter,
/obj/item/storage/bag/plants,
@@ -516,7 +517,7 @@
STR.max_w_class = WEIGHT_CLASS_SMALL
var/static/list/can_hold = typecacheof(list(
/obj/item/food,
- /obj/item/reagent_containers/food/drinks
+ /obj/item/reagent_containers/cup/glass
))
STR.can_hold = can_hold
var/amount = 5
@@ -524,27 +525,27 @@
while(contents.len <= amount)
rig_snacks = pick(list(
/obj/item/food/candy,
- /obj/item/reagent_containers/food/drinks/dry_ramen,
+ /obj/item/food/cheesiehonkers,
+ /obj/item/food/cheesynachos,
+ /obj/item/food/cubannachos,
/obj/item/food/chips,
+ /obj/item/food/donkpocket,
/obj/item/food/sosjerky,
/obj/item/food/syndicake,
/obj/item/food/spacetwinkie,
- /obj/item/food/cheesiehonkers,
/obj/item/food/nachos,
- /obj/item/food/cheesynachos,
- /obj/item/food/cubannachos,
/obj/item/food/nugget,
/obj/item/food/spaghetti/pastatomato,
/obj/item/food/rofflewaffles,
- /obj/item/food/donkpocket,
- /obj/item/reagent_containers/food/drinks/soda_cans/cola,
- /obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind,
- /obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
- /obj/item/reagent_containers/food/drinks/soda_cans/starkist,
- /obj/item/reagent_containers/food/drinks/soda_cans/space_up,
- /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game,
- /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime,
- /obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola
+ /obj/item/reagent_containers/cup/glass/drinkingglass/filled/nuka_cola,
+ /obj/item/reagent_containers/cup/glass/dry_ramen,
+ /obj/item/reagent_containers/cup/soda_cans/cola,
+ /obj/item/reagent_containers/cup/soda_cans/dr_gibb,
+ /obj/item/reagent_containers/cup/soda_cans/lemon_lime,
+ /obj/item/reagent_containers/cup/soda_cans/pwr_game,
+ /obj/item/reagent_containers/cup/soda_cans/space_mountain_wind,
+ /obj/item/reagent_containers/cup/soda_cans/space_up,
+ /obj/item/reagent_containers/cup/soda_cans/starkist,
))
new rig_snacks(src)
@@ -600,7 +601,7 @@
/obj/item/screwdriver,
/obj/item/lighter,
/obj/item/multitool,
- /obj/item/reagent_containers/food/drinks/bottle/molotov,
+ /obj/item/reagent_containers/cup/glass/bottle/molotov,
/obj/item/grenade/plastic/c4,
/obj/item/food/grown/cherry_bomb,
/obj/item/food/grown/firelemon
diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm
index d18fcc98415a5..1a60b72761a23 100644
--- a/code/game/objects/items/storage/book.dm
+++ b/code/game/objects/items/storage/book.dm
@@ -250,7 +250,7 @@
desc = "To be applied to the head repeatedly."
/obj/item/storage/book/bible/booze/PopulateContents()
- new /obj/item/reagent_containers/food/drinks/bottle/whiskey(src)
+ new /obj/item/reagent_containers/cup/glass/bottle/whiskey(src)
/obj/item/storage/book/bible/syndicate
icon_state ="ebook"
diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index 738f84b630de7..a9a5c923f2314 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -316,7 +316,7 @@
/obj/item/storage/box/beakers/PopulateContents()
for(var/i in 1 to 7)
- new /obj/item/reagent_containers/glass/beaker( src )
+ new /obj/item/reagent_containers/cup/beaker( src )
/obj/item/storage/box/beakers/bluespace
name = "box of bluespace beakers"
@@ -324,18 +324,18 @@
/obj/item/storage/box/beakers/bluespace/PopulateContents()
for(var/i in 1 to 7)
- new /obj/item/reagent_containers/glass/beaker/bluespace(src)
+ new /obj/item/reagent_containers/cup/beaker/bluespace(src)
/obj/item/storage/box/beakers/variety
name = "beaker variety box"
/obj/item/storage/box/beakers/variety/PopulateContents()
- new /obj/item/reagent_containers/glass/beaker(src)
- new /obj/item/reagent_containers/glass/beaker/large(src)
- new /obj/item/reagent_containers/glass/beaker/plastic(src)
- new /obj/item/reagent_containers/glass/beaker/meta(src)
- new /obj/item/reagent_containers/glass/beaker/noreact(src)
- new /obj/item/reagent_containers/glass/beaker/bluespace(src)
+ new /obj/item/reagent_containers/cup/beaker(src)
+ new /obj/item/reagent_containers/cup/beaker/large(src)
+ new /obj/item/reagent_containers/cup/beaker/plastic(src)
+ new /obj/item/reagent_containers/cup/beaker/meta(src)
+ new /obj/item/reagent_containers/cup/beaker/noreact(src)
+ new /obj/item/reagent_containers/cup/beaker/bluespace(src)
/obj/item/storage/box/medsprays
name = "box of medical sprayers"
@@ -503,7 +503,7 @@
/obj/item/storage/box/drinkingglasses/PopulateContents()
for(var/i in 1 to 6)
- new /obj/item/reagent_containers/food/drinks/drinkingglass(src)
+ new /obj/item/reagent_containers/cup/glass/drinkingglass(src)
/obj/item/storage/box/condimentbottles
name = "box of condiment bottles"
@@ -512,7 +512,7 @@
/obj/item/storage/box/condimentbottles/PopulateContents()
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/cups
name = "box of paper cups"
@@ -521,7 +521,7 @@
/obj/item/storage/box/cups/PopulateContents()
for(var/i in 1 to 7)
- new /obj/item/reagent_containers/food/drinks/sillycup( src )
+ new /obj/item/reagent_containers/cup/glass/sillycup( src )
/obj/item/storage/box/donkpockets
@@ -1018,7 +1018,7 @@
for(var/i in 1 to 3)
new /obj/item/food/grown/tomato(src)
new /obj/item/food/meatball(src)
- new /obj/item/reagent_containers/food/drinks/bottle/wine(src)
+ new /obj/item/reagent_containers/cup/glass/bottle/wine(src)
/obj/item/storage/box/ingredients/vegetarian
theme_name = "vegetarian"
@@ -1083,7 +1083,7 @@
new /obj/item/food/grown/oat(src)
new /obj/item/food/grown/wheat(src)
new /obj/item/food/grown/cocoapod(src)
- new /obj/item/reagent_containers/honeycomb(src)
+ new /obj/item/reagent_containers/cup/glass/honeycomb(src)
new /obj/item/seeds/flower/poppy(src)
/obj/item/storage/box/ingredients/carnivore
diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm
index 89757d2ccb506..879422c37cfcd 100644
--- a/code/game/objects/items/storage/firstaid.dm
+++ b/code/game/objects/items/storage/firstaid.dm
@@ -75,8 +75,8 @@
/obj/item/healthanalyzer,
/obj/item/dnainjector,
/obj/item/reagent_containers/dropper,
- /obj/item/reagent_containers/glass/beaker,
- /obj/item/reagent_containers/glass/bottle,
+ /obj/item/reagent_containers/cup/beaker,
+ /obj/item/reagent_containers/cup/bottle,
/obj/item/reagent_containers/pill,
/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/medspray,
@@ -374,8 +374,8 @@
/obj/item/healthanalyzer,
/obj/item/dnainjector,
/obj/item/reagent_containers/dropper,
- /obj/item/reagent_containers/glass/beaker,
- /obj/item/reagent_containers/glass/bottle,
+ /obj/item/reagent_containers/cup/beaker,
+ /obj/item/reagent_containers/cup/bottle,
/obj/item/reagent_containers/pill,
/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/medspray,
diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm
index feb0e77a45678..c136caa9b76d8 100644
--- a/code/game/objects/items/storage/uplink_kits.dm
+++ b/code/game/objects/items/storage/uplink_kits.dm
@@ -137,7 +137,7 @@
new /obj/item/clothing/under/chameleon(src)
new /obj/item/card/id/syndicate(src)
new /obj/item/reagent_containers/hypospray/medipen/stimulants(src)
- new /obj/item/reagent_containers/glass/rag(src)
+ new /obj/item/reagent_containers/cup/rag(src)
new /obj/item/encryptionkey/syndicate(src)
if("ninja")
@@ -188,7 +188,7 @@
new /obj/item/clothing/mask/rat/bee(src) // 0 tc
new /obj/item/storage/belt/fannypack/yellow(src) // 0 tc
new /obj/item/storage/box/syndie_kit/bee_grenades(src) // 15 tc
- new /obj/item/reagent_containers/glass/bottle/beesease(src) // 10 tc?
+ new /obj/item/reagent_containers/cup/bottle/beesease(src) // 10 tc?
new /obj/item/gun/chem/bee(src) //priceless
if("mr_freeze")
@@ -407,19 +407,19 @@
STR.max_items = 14
/obj/item/storage/box/syndie_kit/chemical/PopulateContents()
- new /obj/item/reagent_containers/glass/bottle/polonium(src)
- new /obj/item/reagent_containers/glass/bottle/venom(src)
- new /obj/item/reagent_containers/glass/bottle/fentanyl(src)
- new /obj/item/reagent_containers/glass/bottle/formaldehyde(src)
- new /obj/item/reagent_containers/glass/bottle/spewium(src)
- new /obj/item/reagent_containers/glass/bottle/cyanide(src)
- new /obj/item/reagent_containers/glass/bottle/histamine(src)
- new /obj/item/reagent_containers/glass/bottle/initropidril(src)
- new /obj/item/reagent_containers/glass/bottle/pancuronium(src)
- new /obj/item/reagent_containers/glass/bottle/sodium_thiopental(src)
- new /obj/item/reagent_containers/glass/bottle/coniine(src)
- new /obj/item/reagent_containers/glass/bottle/curare(src)
- new /obj/item/reagent_containers/glass/bottle/amanitin(src)
+ new /obj/item/reagent_containers/cup/bottle/polonium(src)
+ new /obj/item/reagent_containers/cup/bottle/venom(src)
+ new /obj/item/reagent_containers/cup/bottle/fentanyl(src)
+ new /obj/item/reagent_containers/cup/bottle/formaldehyde(src)
+ new /obj/item/reagent_containers/cup/bottle/spewium(src)
+ new /obj/item/reagent_containers/cup/bottle/cyanide(src)
+ new /obj/item/reagent_containers/cup/bottle/histamine(src)
+ new /obj/item/reagent_containers/cup/bottle/initropidril(src)
+ new /obj/item/reagent_containers/cup/bottle/pancuronium(src)
+ new /obj/item/reagent_containers/cup/bottle/sodium_thiopental(src)
+ new /obj/item/reagent_containers/cup/bottle/coniine(src)
+ new /obj/item/reagent_containers/cup/bottle/curare(src)
+ new /obj/item/reagent_containers/cup/bottle/amanitin(src)
new /obj/item/reagent_containers/syringe(src)
/obj/item/storage/box/syndie_kit/nuke
@@ -447,7 +447,7 @@
for(var/i in 1 to 5)
new /obj/item/reagent_containers/hypospray/medipen/tuberculosiscure(src)
new /obj/item/reagent_containers/syringe(src)
- new /obj/item/reagent_containers/glass/bottle/tuberculosiscure(src)
+ new /obj/item/reagent_containers/cup/bottle/tuberculosiscure(src)
/obj/item/storage/box/syndie_kit/chameleon
name = "chameleon kit"
@@ -502,7 +502,7 @@
new/obj/item/toy/crayon/rainbow(src)
/obj/item/storage/box/syndie_kit/romerol/PopulateContents()
- new /obj/item/reagent_containers/glass/bottle/romerol(src)
+ new /obj/item/reagent_containers/cup/bottle/romerol(src)
new /obj/item/reagent_containers/syringe(src)
new /obj/item/reagent_containers/dropper(src)
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index e9ee80ab26f54..0056cc7f57dd4 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -95,7 +95,7 @@
update_icon()
/obj/item/toy/balloon/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/reagent_containers/glass))
+ if(istype(I, /obj/item/reagent_containers/cup))
if(I.reagents)
if(I.reagents.total_volume <= 0)
to_chat(user, "[I] is empty.")
diff --git a/code/game/objects/structures/artstuff.dm b/code/game/objects/structures/artstuff.dm
index e7f1c86086950..319bb402e1890 100644
--- a/code/game/objects/structures/artstuff.dm
+++ b/code/game/objects/structures/artstuff.dm
@@ -184,7 +184,7 @@
if("red")
return "#ff0000"
return P.colour
- else if(istype(I, /obj/item/soap) || istype(I, /obj/item/reagent_containers/glass/rag))
+ else if(istype(I, /obj/item/soap) || istype(I, /obj/item/reagent_containers/cup/rag))
return canvas_color
/obj/item/canvas/proc/try_rename(mob/user)
diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
index 5fa3965f476c8..0fdd01228f0de 100644
--- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
@@ -15,7 +15,7 @@
/obj/item/clothing/accessory/waistcoat = 2,
/obj/item/clothing/head/soft/black = 2,
/obj/item/clothing/shoes/sneakers/black = 2,
- /obj/item/reagent_containers/glass/rag = 2,
+ /obj/item/reagent_containers/cup/rag = 2,
/obj/item/storage/box/beanbag = 1,
/obj/item/clothing/suit/armor/vest/alt = 1,
/obj/item/circuitboard/machine/dish_drive = 1,
@@ -42,7 +42,7 @@
/obj/item/clothing/suit/toggle/chef = 1,
/obj/item/clothing/under/rank/civilian/chef = 1,
/obj/item/clothing/head/utility/chefhat = 1,
- /obj/item/reagent_containers/glass/rag = 1)
+ /obj/item/reagent_containers/cup/rag = 1)
generate_items_inside(items_inside,src)
/obj/structure/closet/jcloset
diff --git a/code/game/objects/structures/crates_lockers/closets/l3closet.dm b/code/game/objects/structures/crates_lockers/closets/l3closet.dm
index 15e1d8882fbae..5398d2b0d063f 100644
--- a/code/game/objects/structures/crates_lockers/closets/l3closet.dm
+++ b/code/game/objects/structures/crates_lockers/closets/l3closet.dm
@@ -32,8 +32,8 @@
new /obj/item/extrapolator(src)
new /obj/item/book/manual/wiki/infections(src)
new /obj/item/stack/sheet/mineral/plasma(src)
- new /obj/item/reagent_containers/food/drinks/bottle/virusfood (src)
- new /obj/item/reagent_containers/food/drinks/bottle/virusfood (src)
+ new /obj/item/reagent_containers/cup/glass/bottle/virusfood (src)
+ new /obj/item/reagent_containers/cup/glass/bottle/virusfood (src)
else
new /obj/item/gun/syringe (src)
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 13c1346ed278e..404a24857a6ac 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
@@ -14,5 +14,5 @@
/obj/structure/closet/secure_closet/bar/PopulateContents()
..()
for(var/i in 1 to 10)
- new /obj/item/reagent_containers/food/drinks/beer( src )
+ new /obj/item/reagent_containers/cup/glass/bottle/beer( src )
new /obj/item/etherealballdeployer(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 f7d729ba14821..f7bb92fa5d087 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
@@ -39,9 +39,9 @@
/obj/structure/closet/secure_closet/freezer/kitchen/PopulateContents()
..()
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/maintenance
name = "maintenance refrigerator"
@@ -51,9 +51,9 @@
/obj/structure/closet/secure_closet/freezer/kitchen/maintenance/PopulateContents()
..()
for(var/i in 1 to 5)
- new /obj/item/reagent_containers/food/condiment/milk(src)
+ new /obj/item/reagent_containers/condiment/milk(src)
for(var/i in 1 to 5)
- new /obj/item/reagent_containers/food/condiment/soymilk(src)
+ new /obj/item/reagent_containers/condiment/soymilk(src)
for(var/i in 1 to 2)
new /obj/item/storage/fancy/egg_box(src)
@@ -81,9 +81,9 @@
/obj/structure/closet/secure_closet/freezer/fridge/PopulateContents()
..()
for(var/i in 1 to 5)
- new /obj/item/reagent_containers/food/condiment/milk(src)
+ new /obj/item/reagent_containers/condiment/milk(src)
for(var/i in 1 to 5)
- new /obj/item/reagent_containers/food/condiment/soymilk(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.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
index e89ee18d1c0f6..e453101e6ee66 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -7,14 +7,14 @@
/obj/structure/closet/secure_closet/medical1/PopulateContents()
..()
var/static/items_inside = list(
- /obj/item/reagent_containers/glass/beaker = 2,
+ /obj/item/reagent_containers/cup/beaker = 2,
/obj/item/reagent_containers/dropper = 2,
/obj/item/storage/belt/medical = 1,
/obj/item/storage/box/syringes = 1,
- /obj/item/reagent_containers/glass/bottle/toxin = 1,
- /obj/item/reagent_containers/glass/bottle/morphine = 2,
- /obj/item/reagent_containers/glass/bottle/epinephrine= 3,
- /obj/item/reagent_containers/glass/bottle/charcoal = 3,
+ /obj/item/reagent_containers/cup/bottle/toxin = 1,
+ /obj/item/reagent_containers/cup/bottle/morphine = 2,
+ /obj/item/reagent_containers/cup/bottle/epinephrine= 3,
+ /obj/item/reagent_containers/cup/bottle/charcoal = 3,
/obj/item/storage/box/rxglasses = 1,
/obj/item/stack/ducts/fifty = 4,
/obj/item/construction/plumbing = 2,
@@ -59,12 +59,12 @@
/obj/structure/closet/secure_closet/medicaldanger/PopulateContents()
..()
- new /obj/item/reagent_containers/glass/bottle/formaldehyde(src)
- new /obj/item/reagent_containers/glass/bottle/formaldehyde(src)
- new /obj/item/reagent_containers/glass/bottle/charcoal(src)
- new /obj/item/reagent_containers/glass/bottle/chloralhydrate(src)
- new /obj/item/reagent_containers/glass/bottle/morphine(src)
- new /obj/item/reagent_containers/glass/bottle/sodium_thiopental(src)
+ new /obj/item/reagent_containers/cup/bottle/formaldehyde(src)
+ new /obj/item/reagent_containers/cup/bottle/formaldehyde(src)
+ new /obj/item/reagent_containers/cup/bottle/charcoal(src)
+ new /obj/item/reagent_containers/cup/bottle/chloralhydrate(src)
+ new /obj/item/reagent_containers/cup/bottle/morphine(src)
+ new /obj/item/reagent_containers/cup/bottle/sodium_thiopental(src)
new /obj/item/storage/pill_bottle/epinephrine(src)
new /obj/item/storage/pill_bottle/charcoal(src)
new /obj/item/reagent_containers/syringe/calomel(src)
@@ -104,7 +104,7 @@
new /obj/item/storage/lockbox/medal/med(src)
new /obj/item/circuitboard/machine/techfab/department/medical(src)
- new /obj/item/reagent_containers/food/drinks/bottle/synthflesh(src)
+ new /obj/item/reagent_containers/cup/glass/bottle/synthflesh(src)
// prioritized items
new /obj/item/door_remote/chief_medical_officer(src)
diff --git a/code/game/objects/structures/crates_lockers/crates/wooden.dm b/code/game/objects/structures/crates_lockers/crates/wooden.dm
index cb6ade5af2147..6663c480ded01 100644
--- a/code/game/objects/structures/crates_lockers/crates/wooden.dm
+++ b/code/game/objects/structures/crates_lockers/crates/wooden.dm
@@ -16,7 +16,7 @@
/obj/structure/closet/crate/wooden/toy/PopulateContents()
. = ..()
new /obj/item/megaphone/clown(src)
- new /obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter(src)
+ new /obj/item/reagent_containers/cup/soda_cans/canned_laughter(src)
new /obj/item/pneumatic_cannon/pie(src)
new /obj/item/food/pie/cream(src)
new /obj/item/storage/crayons(src)
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index 23cdc4cc5c25e..b9326d3200972 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -288,7 +288,7 @@
rods_amount = 1
rods_broken = FALSE
var/drop_loc = drop_location()
- var/obj/R = new rods_type(drop_loc, rods_broken)
+ var/obj/R = new rods_type(drop_loc, rods_amount)
if(QDELETED(R)) // the rods merged with something on the tile
R = locate(rods_type) in drop_loc
if(R)
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index 244ba8faed02a..a05ddcf0f72f6 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -325,7 +325,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/urinal, 32)
if(istype(O, /obj/item/stack/medical/gauze))
var/obj/item/stack/medical/gauze/G = O
- new /obj/item/reagent_containers/glass/rag(src.loc)
+ new /obj/item/reagent_containers/cup/rag(src.loc)
to_chat(user, "You tear off a strip of gauze and make a rag.")
G.use(1)
return
diff --git a/code/modules/antagonists/cult/cult_structures.dm b/code/modules/antagonists/cult/cult_structures.dm
index e7d93aeacb02c..24bc9b2e21f66 100644
--- a/code/modules/antagonists/cult/cult_structures.dm
+++ b/code/modules/antagonists/cult/cult_structures.dm
@@ -97,7 +97,7 @@
if("Construct Shell")
pickedtype += /obj/structure/constructshell
if("Flask of Unholy Water")
- pickedtype += /obj/item/reagent_containers/food/drinks/bottle/unholywater
+ pickedtype += /obj/item/reagent_containers/cup/glass/bottle/unholywater
else
return
if(src && !QDELETED(src) && anchored && pickedtype && Adjacent(user) && !user.incapacitated() && iscultist(user) && cooldowntime <= world.time)
diff --git a/code/modules/antagonists/heretic/items/eldritch_flask.dm b/code/modules/antagonists/heretic/items/eldritch_flask.dm
index fb20d5e7a8620..1f601e6b76266 100644
--- a/code/modules/antagonists/heretic/items/eldritch_flask.dm
+++ b/code/modules/antagonists/heretic/items/eldritch_flask.dm
@@ -1,6 +1,6 @@
// An unholy water flask, but for heretics.
// Heals heretics, harms non-heretics. Pretty much identical.
-/obj/item/reagent_containers/glass/beaker/eldritch
+/obj/item/reagent_containers/cup/beaker/eldritch
name = "flask of eldritch essence"
desc = "Toxic to the closed minded, yet refreshing to those with knowledge of the beyond."
icon = 'icons/obj/heretic.dmi'
diff --git a/code/modules/antagonists/heretic/knowledge/side_rust_ash.dm b/code/modules/antagonists/heretic/knowledge/side_rust_ash.dm
index 196e3c71f98aa..9d674ee44082c 100644
--- a/code/modules/antagonists/heretic/knowledge/side_rust_ash.dm
+++ b/code/modules/antagonists/heretic/knowledge/side_rust_ash.dm
@@ -14,7 +14,7 @@
/obj/structure/reagent_dispensers/watertank = 1,
/obj/item/shard = 1,
)
- result_atoms = list(/obj/item/reagent_containers/glass/beaker/eldritch)
+ result_atoms = list(/obj/item/reagent_containers/cup/beaker/eldritch)
cost = 1
route = HERETIC_PATH_SIDE
diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm
index 3718dc60e7876..4e3fdb50ea5cb 100644
--- a/code/modules/asset_cache/asset_list_items.dm
+++ b/code/modules/asset_cache/asset_list_items.dm
@@ -361,7 +361,7 @@
if (!ispath(item, /atom))
// biogenerator outputs to beakers by default
if (initial(D.build_type) & BIOGENERATOR)
- item = /obj/item/reagent_containers/glass/beaker/large
+ item = /obj/item/reagent_containers/cup/beaker/large
else
continue // shouldn't happen, but just in case
// hint^ it does fucking happen. this was giving me so much trouble
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
index 83a01fa87a19c..2c46790844080 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
@@ -26,7 +26,7 @@
var/heat_capacity = 20000
var/conduction_coefficient = 0.3
- var/obj/item/reagent_containers/glass/beaker = null
+ var/obj/item/reagent_containers/cup/beaker = null
var/obj/item/radio/radio
var/radio_key = /obj/item/encryptionkey/headset_med
@@ -317,7 +317,7 @@
close_machine(target)
/obj/machinery/atmospherics/components/unary/cryo_cell/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/reagent_containers/glass))
+ if(istype(I, /obj/item/reagent_containers/cup))
. = 1 //no afterattack
if(beaker)
to_chat(user, "A beaker is already loaded into [src]!")
diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm
index 07f9fb9f889e9..c9a942f1f5b38 100644
--- a/code/modules/awaymissions/mission_code/snowdin.dm
+++ b/code/modules/awaymissions/mission_code/snowdin.dm
@@ -157,7 +157,7 @@
light_color = LIGHT_COLOR_PURPLE
/turf/open/lava/plasma/attackby(obj/item/I, mob/user, params)
- var/obj/item/reagent_containers/glass/C = I
+ var/obj/item/reagent_containers/cup/C = I
if(C.reagents.total_volume >= C.volume)
to_chat(user, "[C] is full.")
return
diff --git a/code/modules/awaymissions/super_secret_room.dm b/code/modules/awaymissions/super_secret_room.dm
index 5b7445ce56b86..1b7f46ae791f0 100644
--- a/code/modules/awaymissions/super_secret_room.dm
+++ b/code/modules/awaymissions/super_secret_room.dm
@@ -70,7 +70,7 @@
SpeakPeace(list("Congratulations.", "By my very loose calculations you've now wasted a decent chunk of the round doing this.", "But you've seen this meme to its conclusion, and that's an experience in itself, right?"))
if(251)
SpeakPeace(list("Anyway, here.", "I can't give you anything that would impact the progression of the round.","But you've earned this at least."))
- var/obj/item/reagent_containers/food/drinks/trophy/silver_cup/the_ride = new(get_turf(user))
+ var/obj/item/reagent_containers/cup/glass/trophy/silver_cup/the_ride = new(get_turf(user))
the_ride.name = "Overextending The Joke: Second Place"
the_ride.desc = "There's a point where this needed to stop, and we've clearly passed it."
if(252)
@@ -81,7 +81,7 @@
SpeakPeace(list("The ends exists somewhere beyond meaningful milestones.", "There will be no more messages until then.", "You disgust me."))
if(5643)
user.client.give_award(/datum/award/achievement/misc/time_waste, user)
- var/obj/item/reagent_containers/food/drinks/trophy/gold_cup/never_ends = new(get_turf(user))
+ var/obj/item/reagent_containers/cup/glass/trophy/gold_cup/never_ends = new(get_turf(user))
never_ends.name = "Overextending The Joke: First Place"
never_ends.desc = "And so we are left alone with our regrets."
else
diff --git a/code/modules/cargo/bounties/mining.dm b/code/modules/cargo/bounties/mining.dm
index 5df4c2808ee77..b9b051d8b55d8 100644
--- a/code/modules/cargo/bounties/mining.dm
+++ b/code/modules/cargo/bounties/mining.dm
@@ -60,7 +60,7 @@
name = "Mushroom Bowl"
description = "Lieutenant Jeb dropped his favorite mushroom bowl. Cheer him up by shipping a new one, will you?"
reward = 7500 //5x mushroom shavings
- wanted_types = list(/obj/item/reagent_containers/glass/bowl/mushroom_bowl)
+ wanted_types = list(/obj/item/reagent_containers/cup/bowl/mushroom_bowl)
/datum/bounty/item/mining/inocybe_mushroom
name = "Mushroom Caps"
diff --git a/code/modules/cargo/bounties/science.dm b/code/modules/cargo/bounties/science.dm
index ff121a6f59e00..5c967fe71fe70 100644
--- a/code/modules/cargo/bounties/science.dm
+++ b/code/modules/cargo/bounties/science.dm
@@ -39,7 +39,7 @@
name = "Cryostasis Beaker"
description = "Chemists at Central Command have discovered a new chemical that can only be held in cryostasis beakers. The only problem is they don't have any! Rectify this to receive payment."
reward = 10000
- wanted_types = list(/obj/item/reagent_containers/glass/beaker/noreact)
+ wanted_types = list(/obj/item/reagent_containers/cup/beaker/noreact)
/datum/bounty/item/science/diamond_drill
name = "Diamond Mining Drill"
diff --git a/code/modules/cargo/exports/lavaland.dm b/code/modules/cargo/exports/lavaland.dm
index f08aa45471a19..39a8e395c696f 100644
--- a/code/modules/cargo/exports/lavaland.dm
+++ b/code/modules/cargo/exports/lavaland.dm
@@ -8,7 +8,7 @@
/obj/item/book_of_babel,
/obj/item/gun/magic/hook,
/obj/item/wisp_lantern,
- /obj/item/reagent_containers/glass/bottle/potion/flight,
+ /obj/item/reagent_containers/cup/bottle/potion/flight,
/obj/item/katana/cursed,
/obj/item/clothing/glasses/godeye,
/obj/item/melee/ghost_sword,
diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm
index 1e4f60390cc49..bb029be5121f0 100644
--- a/code/modules/cargo/packs.dm
+++ b/code/modules/cargo/packs.dm
@@ -253,9 +253,9 @@
/obj/item/clothing/suit/utility/radiation,
/obj/item/geiger_counter,
/obj/item/geiger_counter,
- /obj/item/reagent_containers/food/drinks/bottle/vodka,
- /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
- /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass)
+ /obj/item/reagent_containers/cup/glass/bottle/vodka,
+ /obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
+ /obj/item/reagent_containers/cup/glass/drinkingglass/shotglass)
crate_name = "radiation protection crate"
crate_type = /obj/structure/closet/crate/radiation
@@ -1662,10 +1662,10 @@
desc = "Contains four 100u cartons of synthflesh in case the cloner ran out of it."
cost = 1400
max_supply = 3
- contains = list(/obj/item/reagent_containers/food/drinks/bottle/synthflesh,
- /obj/item/reagent_containers/food/drinks/bottle/synthflesh,
- /obj/item/reagent_containers/food/drinks/bottle/synthflesh,
- /obj/item/reagent_containers/food/drinks/bottle/synthflesh)
+ contains = list(/obj/item/reagent_containers/cup/glass/bottle/synthflesh,
+ /obj/item/reagent_containers/cup/glass/bottle/synthflesh,
+ /obj/item/reagent_containers/cup/glass/bottle/synthflesh,
+ /obj/item/reagent_containers/cup/glass/bottle/synthflesh)
crate_name = "rusty freezer"
crate_type = /obj/structure/closet/crate/freezer
@@ -1729,19 +1729,19 @@
desc = "Contains thirteen different chemicals, for all the fun experiments you can make."
cost = 1000
max_supply = 4
- contains = list(/obj/item/reagent_containers/glass/bottle/hydrogen,
- /obj/item/reagent_containers/glass/bottle/carbon,
- /obj/item/reagent_containers/glass/bottle/nitrogen,
- /obj/item/reagent_containers/glass/bottle/oxygen,
- /obj/item/reagent_containers/glass/bottle/fluorine,
- /obj/item/reagent_containers/glass/bottle/phosphorus,
- /obj/item/reagent_containers/glass/bottle/silicon,
- /obj/item/reagent_containers/glass/bottle/chlorine,
- /obj/item/reagent_containers/glass/bottle/radium,
- /obj/item/reagent_containers/glass/bottle/sacid,
- /obj/item/reagent_containers/glass/bottle/ethanol,
- /obj/item/reagent_containers/glass/bottle/potassium,
- /obj/item/reagent_containers/glass/bottle/sugar,
+ contains = list(/obj/item/reagent_containers/cup/bottle/hydrogen,
+ /obj/item/reagent_containers/cup/bottle/carbon,
+ /obj/item/reagent_containers/cup/bottle/nitrogen,
+ /obj/item/reagent_containers/cup/bottle/oxygen,
+ /obj/item/reagent_containers/cup/bottle/fluorine,
+ /obj/item/reagent_containers/cup/bottle/phosphorus,
+ /obj/item/reagent_containers/cup/bottle/silicon,
+ /obj/item/reagent_containers/cup/bottle/chlorine,
+ /obj/item/reagent_containers/cup/bottle/radium,
+ /obj/item/reagent_containers/cup/bottle/sacid,
+ /obj/item/reagent_containers/cup/bottle/ethanol,
+ /obj/item/reagent_containers/cup/bottle/potassium,
+ /obj/item/reagent_containers/cup/bottle/sugar,
/obj/item/clothing/glasses/science,
/obj/item/reagent_containers/dropper,
/obj/item/storage/box/beakers)
@@ -1771,11 +1771,11 @@
desc = "Contains a little bit of everything needed to stock a medbay or to form your own."
cost = 2000
max_supply = 3
- contains = list(/obj/item/reagent_containers/glass/bottle/charcoal,
- /obj/item/reagent_containers/glass/bottle/epinephrine,
- /obj/item/reagent_containers/glass/bottle/morphine,
- /obj/item/reagent_containers/glass/bottle/toxin,
- /obj/item/reagent_containers/glass/beaker/large,
+ contains = list(/obj/item/reagent_containers/cup/bottle/charcoal,
+ /obj/item/reagent_containers/cup/bottle/epinephrine,
+ /obj/item/reagent_containers/cup/bottle/morphine,
+ /obj/item/reagent_containers/cup/bottle/toxin,
+ /obj/item/reagent_containers/cup/beaker/large,
/obj/item/reagent_containers/pill/insulin,
/obj/item/stack/medical/gauze,
/obj/item/storage/box/beakers,
@@ -1832,11 +1832,11 @@
max_supply = 3
access = ACCESS_VIROLOGY
access_budget = ACCESS_VIROLOGY
- contains = list(/obj/item/reagent_containers/glass/bottle/inorganic_virion,
- /obj/item/reagent_containers/glass/bottle/necrotic_virion,
- /obj/item/reagent_containers/glass/bottle/evolution_virion,
- /obj/item/reagent_containers/glass/bottle/adaptation_virion,
- /obj/item/reagent_containers/glass/bottle/aggression_virion)
+ contains = list(/obj/item/reagent_containers/cup/bottle/inorganic_virion,
+ /obj/item/reagent_containers/cup/bottle/necrotic_virion,
+ /obj/item/reagent_containers/cup/bottle/evolution_virion,
+ /obj/item/reagent_containers/cup/bottle/adaptation_virion,
+ /obj/item/reagent_containers/cup/bottle/aggression_virion)
crate_name = "virus sample crate"
crate_type = /obj/structure/closet/crate/secure/plasma
dangerous = TRUE
@@ -1844,7 +1844,7 @@
/datum/supply_pack/medical/randomvirus/fill(obj/structure/closet/crate/C)
for(var/item in contains)
if(CONFIG_GET(flag/chemviro_allowed))
- new /obj/item/reagent_containers/glass/bottle/random_virus(C)
+ new /obj/item/reagent_containers/cup/bottle/random_virus(C)
else
new item(C)
@@ -1856,10 +1856,10 @@
max_supply = 4
access = ACCESS_VIROLOGY
contains = list(/obj/item/food/monkeycube,
- /obj/item/reagent_containers/food/drinks/bottle/virusfood,
- /obj/item/reagent_containers/glass/bottle/mutagen,
- /obj/item/reagent_containers/glass/bottle/formaldehyde,
- /obj/item/reagent_containers/glass/bottle/synaptizine,
+ /obj/item/reagent_containers/cup/glass/bottle/virusfood,
+ /obj/item/reagent_containers/cup/bottle/mutagen,
+ /obj/item/reagent_containers/cup/bottle/formaldehyde,
+ /obj/item/reagent_containers/cup/bottle/synaptizine,
/obj/item/storage/box/beakers,
/obj/item/toy/figure/virologist)
crate_name = "Junior Epidemiology Kit"
@@ -1882,12 +1882,12 @@
access = ACCESS_CMO
access_budget = ACCESS_VIROLOGY
contraband = TRUE
- contains = list(/obj/item/reagent_containers/glass/bottle/fake_gbs,
- /obj/item/reagent_containers/glass/bottle/magnitis,
- /obj/item/reagent_containers/glass/bottle/pierrot_throat,
- /obj/item/reagent_containers/glass/bottle/brainrot,
- /obj/item/reagent_containers/glass/bottle/anxiety,
- /obj/item/reagent_containers/glass/bottle/beesease)
+ contains = list(/obj/item/reagent_containers/cup/bottle/fake_gbs,
+ /obj/item/reagent_containers/cup/bottle/magnitis,
+ /obj/item/reagent_containers/cup/bottle/pierrot_throat,
+ /obj/item/reagent_containers/cup/bottle/brainrot,
+ /obj/item/reagent_containers/cup/bottle/anxiety,
+ /obj/item/reagent_containers/cup/bottle/beesease)
crate_name = "virus crate"
crate_type = /obj/structure/closet/crate/secure/plasma
dangerous = TRUE
@@ -2105,9 +2105,9 @@
cost = 800
max_supply = 4
access_budget = ACCESS_JANITOR
- contains = list(/obj/item/reagent_containers/glass/bucket,
- /obj/item/reagent_containers/glass/bucket,
- /obj/item/reagent_containers/glass/bucket,
+ contains = list(/obj/item/reagent_containers/cup/bucket,
+ /obj/item/reagent_containers/cup/bucket,
+ /obj/item/reagent_containers/cup/bucket,
/obj/item/mop,
/obj/item/pushbroom,
/obj/item/clothing/suit/caution,
@@ -2115,7 +2115,7 @@
/obj/item/clothing/suit/caution,
/obj/item/storage/bag/trash,
/obj/item/reagent_containers/spray/cleaner,
- /obj/item/reagent_containers/glass/rag,
+ /obj/item/reagent_containers/cup/rag,
/obj/item/grenade/chem_grenade/cleaner,
/obj/item/grenade/chem_grenade/cleaner,
/obj/item/grenade/chem_grenade/cleaner)
@@ -2158,15 +2158,15 @@
cost = 1500
max_supply = 5
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/ale,
- /obj/item/reagent_containers/food/drinks/ale,
- /obj/item/reagent_containers/food/drinks/beer,
- /obj/item/reagent_containers/food/drinks/beer,
- /obj/item/reagent_containers/food/drinks/beer,
- /obj/item/reagent_containers/food/drinks/beer,
+ /obj/item/reagent_containers/cup/glass/shaker,
+ /obj/item/reagent_containers/cup/glass/bottle/patron,
+ /obj/item/reagent_containers/cup/glass/bottle/goldschlager,
+ /obj/item/reagent_containers/cup/glass/bottle/ale,
+ /obj/item/reagent_containers/cup/glass/bottle/ale,
+ /obj/item/reagent_containers/cup/glass/bottle/beer,
+ /obj/item/reagent_containers/cup/glass/bottle/beer,
+ /obj/item/reagent_containers/cup/glass/bottle/beer,
+ /obj/item/reagent_containers/cup/glass/bottle/beer,
/obj/item/flashlight/glowstick,
/obj/item/flashlight/glowstick/red,
/obj/item/flashlight/glowstick/blue,
@@ -2417,15 +2417,15 @@
cost = 1000
max_supply = 4
access_budget = ACCESS_KITCHEN
- 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/storage/fancy/egg_box,
- /obj/item/reagent_containers/food/condiment/enzyme,
- /obj/item/reagent_containers/food/condiment/sugar,
+ /obj/item/reagent_containers/condiment/enzyme,
+ /obj/item/reagent_containers/condiment/sugar,
/obj/item/food/meat/slab/monkey,
/obj/item/food/grown/banana,
/obj/item/food/grown/banana,
@@ -2466,8 +2466,8 @@
access_budget = ACCESS_HYDROPONICS
contains = list(/obj/item/reagent_containers/spray/plantbgone,
/obj/item/reagent_containers/spray/plantbgone,
- /obj/item/reagent_containers/glass/bottle/ammonia,
- /obj/item/reagent_containers/glass/bottle/ammonia,
+ /obj/item/reagent_containers/cup/bottle/ammonia,
+ /obj/item/reagent_containers/cup/bottle/ammonia,
/obj/item/hatchet,
/obj/item/cultivator,
/obj/item/plant_analyzer,
@@ -2641,7 +2641,7 @@
crate_type = /obj/structure/closet/crate
contains = list(/obj/item/stack/sheet/mineral/coal/five,
/obj/machinery/grill/unwrenched,
- /obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy
+ /obj/item/reagent_containers/cup/soda_cans/monkey_energy
)
crate_name = "grilling starter kit crate"
@@ -2652,7 +2652,7 @@
max_supply = 5
crate_type = /obj/structure/closet/crate
contains = list(/obj/item/stack/sheet/mineral/coal/ten,
- /obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy
+ /obj/item/reagent_containers/cup/soda_cans/monkey_energy
)
crate_name = "grilling fuel kit crate"
@@ -2920,7 +2920,7 @@
/obj/item/storage/pill_bottle/aranesp,
/obj/item/storage/pill_bottle/stimulant,
/obj/item/toy/cards/deck/syndicate,
- /obj/item/reagent_containers/food/drinks/bottle/absinthe,
+ /obj/item/reagent_containers/cup/glass/bottle/absinthe,
/obj/item/clothing/under/syndicate/tacticool,
/obj/item/storage/fancy/cigarettes/cigpack_syndicate,
/obj/item/storage/fancy/cigarettes/cigpack_shadyjims,
@@ -3072,7 +3072,7 @@
/obj/item/clothing/mask/gas/mime,
/obj/item/clothing/head/frenchberet,
/obj/item/clothing/suit/suspenders,
- /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing,
+ /obj/item/reagent_containers/cup/glass/bottle/bottleofnothing,
/obj/item/storage/backpack/mime)
crate_name = "standard costume crate"
crate_type = /obj/structure/closet/crate/wooden
@@ -3466,8 +3466,8 @@
cost = 4000
max_supply = 3
access_budget = ACCESS_CHAPEL_OFFICE
- contains = list(/obj/item/reagent_containers/food/drinks/bottle/holywater,
- /obj/item/reagent_containers/food/drinks/bottle/holywater,
+ contains = list(/obj/item/reagent_containers/cup/glass/bottle/holywater,
+ /obj/item/reagent_containers/cup/glass/bottle/holywater,
/obj/item/storage/book/bible/booze,
/obj/item/storage/book/bible/booze,
/obj/item/clothing/neck/crucifix/rosary,
diff --git a/code/modules/client/preferences/entries/character/quirks/alcoholic.dm b/code/modules/client/preferences/entries/character/quirks/alcoholic.dm
index 849a1e15e4096..bbaa970e6bb35 100644
--- a/code/modules/client/preferences/entries/character/quirks/alcoholic.dm
+++ b/code/modules/client/preferences/entries/character/quirks/alcoholic.dm
@@ -8,7 +8,7 @@
/datum/preference/choiced/quirk/alcohol_type/compile_constant_data()
var/list/data = ..()
var/list/clean_names = list("Random" = "Random")
- for(var/obj/item/reagent_containers/food/drinks/bottle/S as() in GLOB.alcoholic_bottles)
+ for(var/obj/item/reagent_containers/cup/glass/bottle/S as() in GLOB.alcoholic_bottles)
clean_names[S] = initial(S.name)
data[CHOICED_PREFERENCE_DISPLAY_NAMES] = clean_names
return data
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index 9a98ad4a3d06f..7c7d7e996ff89 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -83,7 +83,7 @@
/obj/item/clothing/head/fedora/det_hat/Initialize(mapload)
. = ..()
- new /obj/item/reagent_containers/food/drinks/flask/det(src)
+ new /obj/item/reagent_containers/cup/glass/flask/det(src)
/obj/item/clothing/head/fedora/det_hat/examine(mob/user)
. = ..()
diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm
index bcf67ded1cdc1..7c329aa4296a0 100644
--- a/code/modules/clothing/outfits/ert.dm
+++ b/code/modules/clothing/outfits/ert.dm
@@ -275,7 +275,7 @@
/obj/item/storage/box/lights/mixed=1,
/obj/item/melee/baton/loaded=1,
/obj/item/mop/advanced=1,
- /obj/item/reagent_containers/glass/bucket=1,
+ /obj/item/reagent_containers/cup/bucket=1,
/obj/item/grenade/clusterbuster/cleaner=1,
/obj/item/choice_beacon/janicart)
diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm
index a1a6699f590fa..9714a9d176e9d 100644
--- a/code/modules/clothing/outfits/standard.dm
+++ b/code/modules/clothing/outfits/standard.dm
@@ -79,7 +79,7 @@
suit = null
head = null
r_hand = /obj/item/mop
- l_hand = /obj/item/reagent_containers/glass/bucket
+ l_hand = /obj/item/reagent_containers/cup/bucket
r_pocket = /obj/item/grenade/chem_grenade/cleaner
l_pocket = /obj/item/grenade/chem_grenade/cleaner
backpack_contents = list(/obj/item/stack/tile/iron=6)
@@ -88,7 +88,7 @@
if(visualsOnly)
return
- var/obj/item/reagent_containers/glass/bucket/bucket = H.get_item_for_held_index(1)
+ var/obj/item/reagent_containers/cup/bucket/bucket = H.get_item_for_held_index(1)
bucket.reagents.add_reagent(/datum/reagent/water,70)
/datum/outfit/laser_tag
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index 2d712c3fbc15c..e98d310c06585 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -135,7 +135,7 @@ Contains:
icon_state = "pirate"
item_state = "pirate"
w_class = WEIGHT_CLASS_NORMAL
- allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/melee/transforming/energy/sword/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/reagent_containers/food/drinks/bottle/rum)
+ allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/melee/transforming/energy/sword/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/reagent_containers/cup/glass/bottle/rum)
slowdown = 0
armor = list(MELEE = 30, BULLET = 50, LASER = 30, ENERGY = 15, BOMB = 30, BIO = 30, RAD = 30, FIRE = 60, ACID = 75, STAMINA = 20, BLEED = 20)
strip_delay = 40
@@ -277,7 +277,7 @@ Contains:
icon_state = "ert_janitor"
item_state = "ert_janitor"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/jani
- allowed = list(/obj/item/storage/bag/trash, /obj/item/melee/flyswatter, /obj/item/mop, /obj/item/holosign_creator/janibarrier, /obj/item/reagent_containers/glass/bucket, /obj/item/reagent_containers/spray/chemsprayer/janitor)
+ allowed = list(/obj/item/storage/bag/trash, /obj/item/melee/flyswatter, /obj/item/mop, /obj/item/holosign_creator/janibarrier, /obj/item/reagent_containers/cup/bucket, /obj/item/reagent_containers/spray/chemsprayer/janitor)
/obj/item/clothing/suit/space/eva
name = "EVA suit"
diff --git a/code/modules/clothing/suits/chaplainsuits.dm b/code/modules/clothing/suits/chaplainsuits.dm
index 5ba05f80d4d4f..746af2c1799d4 100644
--- a/code/modules/clothing/suits/chaplainsuits.dm
+++ b/code/modules/clothing/suits/chaplainsuits.dm
@@ -1,7 +1,7 @@
//Chaplain Suit Subtypes
//If any new staple chaplain items get added, put them in these lists
/obj/item/clothing/suit/chaplainsuit
- allowed = list(/obj/item/storage/book/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, /obj/item/tank/internals/plasmaman)
+ allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
icon = 'icons/obj/clothing/suits/chaplain.dmi'
worn_icon = 'icons/mob/clothing/suits/chaplain.dmi'
@@ -14,7 +14,7 @@
equip_delay_other = 60
/obj/item/clothing/suit/hooded/chaplainsuit
- allowed = list(/obj/item/storage/book/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, /obj/item/tank/internals/plasmaman)
+ allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
//Suits
/obj/item/clothing/suit/chaplainsuit/holidaypriest
@@ -104,7 +104,7 @@
item_state = "clownpriest"
body_parts_covered = CHEST|GROIN|LEGS|ARMS
flags_inv = HIDEJUMPSUIT
- allowed = list(/obj/item/megaphone/clown, /obj/item/soap, /obj/item/food/pie/cream, /obj/item/bikehorn, /obj/item/bikehorn/golden, /obj/item/bikehorn/airhorn, /obj/item/instrument/bikehorn, /obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter, /obj/item/toy/crayon, /obj/item/toy/crayon/spraycan, /obj/item/toy/crayon/spraycan/lubecan, /obj/item/grown/bananapeel, /obj/item/food/grown/banana)
+ allowed = list(/obj/item/megaphone/clown, /obj/item/soap, /obj/item/food/pie/cream, /obj/item/bikehorn, /obj/item/bikehorn/golden, /obj/item/bikehorn/airhorn, /obj/item/instrument/bikehorn, /obj/item/reagent_containers/cup/soda_cans/canned_laughter, /obj/item/toy/crayon, /obj/item/toy/crayon/spraycan, /obj/item/toy/crayon/spraycan/lubecan, /obj/item/grown/bananapeel, /obj/item/food/grown/banana)
//The good stuff below
@@ -126,7 +126,7 @@
desc = "God wills it!"
icon_state = "knight_templar"
item_state = null
- allowed = list(/obj/item/storage/book/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, /obj/item/tank/internals/plasmaman)
+ allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
slowdown = 0
move_sound = null
@@ -236,7 +236,7 @@
worn_icon = 'icons/mob/clothing/suits/chaplain.dmi'
item_state = null
body_parts_covered = CHEST|GROIN|LEGS|ARMS
- allowed = list(/obj/item/storage/book/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, /obj/item/tank/internals/plasmaman)
+ allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
hoodtype = /obj/item/clothing/head/hooded/chaplain_hood
/obj/item/clothing/head/hooded/chaplain_hood
diff --git a/code/modules/clothing/suits/costume.dm b/code/modules/clothing/suits/costume.dm
index 3df266b753631..ad6e2eb08d999 100644
--- a/code/modules/clothing/suits/costume.dm
+++ b/code/modules/clothing/suits/costume.dm
@@ -18,7 +18,7 @@
icon_state = "pirate"
item_state = null
body_parts_covered = CHEST|GROIN|ARMS
- allowed = list(/obj/item/melee/transforming/energy/sword/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/reagent_containers/food/drinks/bottle/rum)
+ allowed = list(/obj/item/melee/transforming/energy/sword/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/reagent_containers/cup/glass/bottle/rum)
/obj/item/clothing/suit/costume/pirate/captain
name = "pirate captain coat"
@@ -109,7 +109,7 @@
item_state = "imperium_monk"
body_parts_covered = CHEST|GROIN|LEGS|ARMS
flags_inv = HIDESHOES|HIDEJUMPSUIT
- allowed = list(/obj/item/storage/book/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/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
/obj/item/clothing/suit/costume/chickensuit
name = "chicken suit"
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index 28356c7d1a6c8..176f65d639c5e 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -16,8 +16,8 @@
/obj/item/reagent_containers/spray/plantbgone,
/obj/item/plant_analyzer,
/obj/item/seeds,
- /obj/item/reagent_containers/glass/bottle,
- /obj/item/reagent_containers/glass/beaker,
+ /obj/item/reagent_containers/cup/bottle,
+ /obj/item/reagent_containers/cup/beaker,
/obj/item/cultivator,
/obj/item/reagent_containers/spray/pestspray,
/obj/item/hatchet,
@@ -35,7 +35,7 @@
item_state = "bio_suit"
body_parts_covered = CHEST|GROIN|LEGS|ARMS
flags_inv = HIDEJUMPSUIT
- 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/assembly/flash/handheld, /obj/item/storage/box/matches, /obj/item/lighter, /obj/item/clothing/mask/cigarette, /obj/item/storage/fancy/cigarettes, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
+ allowed = list(/obj/item/disk, /obj/item/stamp, /obj/item/reagent_containers/cup/glass/flask, /obj/item/melee, /obj/item/storage/lockbox/medal, /obj/item/assembly/flash/handheld, /obj/item/storage/box/matches, /obj/item/lighter, /obj/item/clothing/mask/cigarette, /obj/item/storage/fancy/cigarettes, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
//Chef
/obj/item/clothing/suit/toggle/chef
@@ -109,7 +109,7 @@
worn_icon = 'icons/mob/clothing/suits/armor.dmi'
icon_state = "brig_phys_vest"
item_state = "sec_helm"//looks kinda similar, I guess
- allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/storage/firstaid, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/police/telescopic, /obj/item/soap, /obj/item/sensor_device, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
+ allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/storage/firstaid, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/cup/bottle, /obj/item/reagent_containers/cup/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/police/telescopic, /obj/item/soap, /obj/item/sensor_device, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 10, RAD = 0, FIRE = 50, ACID = 50, STAMINA = 30, BLEED = 20)
//Engineering
diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm
index 38daa6ea23bad..568d914a6dc66 100644
--- a/code/modules/clothing/suits/labcoat.dm
+++ b/code/modules/clothing/suits/labcoat.dm
@@ -17,8 +17,8 @@
/obj/item/reagent_containers/hypospray,
/obj/item/healthanalyzer,
/obj/item/flashlight/pen,
- /obj/item/reagent_containers/glass/bottle,
- /obj/item/reagent_containers/glass/beaker,
+ /obj/item/reagent_containers/cup/bottle,
+ /obj/item/reagent_containers/cup/beaker,
/obj/item/reagent_containers/pill,
/obj/item/storage/pill_bottle,
/obj/item/paper,
diff --git a/code/modules/clothing/suits/wintercoats.dm b/code/modules/clothing/suits/wintercoats.dm
index 1a84fe2a29d0d..7a65f42337de7 100644
--- a/code/modules/clothing/suits/wintercoats.dm
+++ b/code/modules/clothing/suits/wintercoats.dm
@@ -110,8 +110,8 @@
/obj/item/healthanalyzer,
/obj/item/paper,
/obj/item/reagent_containers/dropper,
- /obj/item/reagent_containers/glass/beaker,
- /obj/item/reagent_containers/glass/bottle,
+ /obj/item/reagent_containers/cup/beaker,
+ /obj/item/reagent_containers/cup/bottle,
/obj/item/reagent_containers/hypospray,
/obj/item/reagent_containers/pill,
/obj/item/reagent_containers/syringe,
@@ -146,8 +146,8 @@
/obj/item/melee/classic_baton/police/telescopic,
/obj/item/paper,
/obj/item/reagent_containers/dropper,
- /obj/item/reagent_containers/glass/beaker,
- /obj/item/reagent_containers/glass/bottle,
+ /obj/item/reagent_containers/cup/beaker,
+ /obj/item/reagent_containers/cup/bottle,
/obj/item/reagent_containers/hypospray,
/obj/item/reagent_containers/pill,
/obj/item/reagent_containers/syringe,
@@ -181,8 +181,8 @@
/obj/item/melee/classic_baton/police/telescopic,
/obj/item/paper,
/obj/item/reagent_containers/dropper,
- /obj/item/reagent_containers/glass/beaker,
- /obj/item/reagent_containers/glass/bottle,
+ /obj/item/reagent_containers/cup/beaker,
+ /obj/item/reagent_containers/cup/bottle,
/obj/item/reagent_containers/hypospray,
/obj/item/reagent_containers/pill,
/obj/item/reagent_containers/syringe,
@@ -218,8 +218,8 @@
/obj/item/melee/classic_baton/police/telescopic,
/obj/item/paper,
/obj/item/reagent_containers/dropper,
- /obj/item/reagent_containers/glass/beaker,
- /obj/item/reagent_containers/glass/bottle,
+ /obj/item/reagent_containers/cup/beaker,
+ /obj/item/reagent_containers/cup/bottle,
/obj/item/reagent_containers/hypospray,
/obj/item/reagent_containers/pill,
/obj/item/reagent_containers/syringe,
@@ -259,8 +259,8 @@
/obj/item/melee/classic_baton/police/telescopic,
/obj/item/paper,
/obj/item/reagent_containers/dropper,
- /obj/item/reagent_containers/glass/beaker,
- /obj/item/reagent_containers/glass/bottle,
+ /obj/item/reagent_containers/cup/beaker,
+ /obj/item/reagent_containers/cup/bottle,
/obj/item/reagent_containers/hypospray,
/obj/item/reagent_containers/pill,
/obj/item/reagent_containers/syringe,
@@ -286,7 +286,7 @@
name = "science winter coat"
icon_state = "coatscience"
item_state = "coatscience"
- allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/police/telescopic, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
+ allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/cup/bottle, /obj/item/reagent_containers/cup/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/police/telescopic, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 10, BIO = 0, RAD = 0, FIRE = 0, ACID = 0, STAMINA = 0)
hoodtype = /obj/item/clothing/head/hooded/winterhood/science
@@ -317,7 +317,7 @@
name = "hydroponics winter coat"
icon_state = "coathydro"
item_state = "coathydro"
- allowed = list(/obj/item/reagent_containers/spray/plantbgone, /obj/item/plant_analyzer, /obj/item/seeds, /obj/item/reagent_containers/glass/bottle, /obj/item/cultivator, /obj/item/reagent_containers/spray/pestspray, /obj/item/hatchet, /obj/item/storage/bag/plants, /obj/item/toy, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
+ allowed = list(/obj/item/reagent_containers/spray/plantbgone, /obj/item/plant_analyzer, /obj/item/seeds, /obj/item/reagent_containers/cup/bottle, /obj/item/cultivator, /obj/item/reagent_containers/spray/pestspray, /obj/item/hatchet, /obj/item/storage/bag/plants, /obj/item/toy, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
hoodtype = /obj/item/clothing/head/hooded/winterhood/hydro
/obj/item/clothing/head/hooded/winterhood/hydro
@@ -336,7 +336,7 @@
/obj/item/clipboard,
/obj/item/stamp,
/obj/item/export_scanner,
- /obj/item/reagent_containers/food/drinks/bottle,
+ /obj/item/reagent_containers/cup/glass/bottle,
/obj/item/flashlight,
/obj/item/tank/internals/emergency_oxygen,
/obj/item/tank/internals/plasmaman,
@@ -363,7 +363,7 @@
/obj/item/mining_scanner,
/obj/item/t_scanner/adv_mining_scanner,
/obj/item/gun/energy/kinetic_accelerator,
- /obj/item/reagent_containers/food/drinks/bottle,
+ /obj/item/reagent_containers/cup/glass/bottle,
/obj/item/flashlight,
/obj/item/tank/internals/emergency_oxygen,
/obj/item/tank/internals/plasmaman,
diff --git a/code/modules/crew_objectives/civilian_objectives.dm b/code/modules/crew_objectives/civilian_objectives.dm
index f1f83c0eec1e1..8dca445ea8442 100644
--- a/code/modules/crew_objectives/civilian_objectives.dm
+++ b/code/modules/crew_objectives/civilian_objectives.dm
@@ -233,7 +233,7 @@
jobs = JOB_NAME_MIME
/datum/objective/crew/nothingreallymatterstome/check_completion()
- return ..() || owner?.current?.check_contents_for(/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing)
+ return ..() || owner?.current?.check_contents_for(/obj/item/reagent_containers/cup/glass/bottle/bottleofnothing)
/datum/objective/crew/nullrod
explanation_text = "Don't lose your nullrod. You can still transform it into another item."
diff --git a/code/modules/detectivework/footprints_and_rag.dm b/code/modules/detectivework/footprints_and_rag.dm
index af4c592983fc5..3128b19658fc6 100644
--- a/code/modules/detectivework/footprints_and_rag.dm
+++ b/code/modules/detectivework/footprints_and_rag.dm
@@ -3,7 +3,7 @@
var/transfer_blood = 0
-/obj/item/reagent_containers/glass/rag
+/obj/item/reagent_containers/cup/rag
name = "damp rag"
desc = "For cleaning up messes, you suppose."
w_class = WEIGHT_CLASS_TINY
@@ -16,11 +16,11 @@
volume = 5
spillable = FALSE
-/obj/item/reagent_containers/glass/rag/suicide_act(mob/living/user)
+/obj/item/reagent_containers/cup/rag/suicide_act(mob/living/user)
user.visible_message("[user] is smothering [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!")
return OXYLOSS
-/obj/item/reagent_containers/glass/rag/afterattack(atom/A as obj|turf|area, mob/user,proximity)
+/obj/item/reagent_containers/cup/rag/afterattack(atom/A as obj|turf|area, mob/user,proximity)
. = ..()
if(!proximity)
return
diff --git a/code/modules/events/shuttle_loan.dm b/code/modules/events/shuttle_loan.dm
index d0572e5cdd9d1..9794866998a40 100644
--- a/code/modules/events/shuttle_loan.dm
+++ b/code/modules/events/shuttle_loan.dm
@@ -156,7 +156,7 @@
var/turf/T
for(var/i in 1 to 10)
if(prob(15))
- shuttle_spawns.Add(/obj/item/reagent_containers/glass/bottle)
+ shuttle_spawns.Add(/obj/item/reagent_containers/cup/bottle)
else if(prob(15))
shuttle_spawns.Add(/obj/item/reagent_containers/syringe)
else if(prob(25))
@@ -164,8 +164,8 @@
T = pick_n_take(empty_shuttle_turfs)
new infected_assistant(T)
shuttle_spawns.Add(/obj/structure/closet/crate)
- shuttle_spawns.Add(/obj/item/reagent_containers/glass/bottle/pierrot_throat)
- shuttle_spawns.Add(/obj/item/reagent_containers/glass/bottle/magnitis)
+ shuttle_spawns.Add(/obj/item/reagent_containers/cup/bottle/pierrot_throat)
+ shuttle_spawns.Add(/obj/item/reagent_containers/cup/bottle/magnitis)
if(DEPARTMENT_RESUPPLY)
var/list/crate_types = list(
diff --git a/code/modules/exploration_crew/exploration_vendor.dm b/code/modules/exploration_crew/exploration_vendor.dm
index 53a3d7c3b9779..117ab4adfae4a 100644
--- a/code/modules/exploration_crew/exploration_vendor.dm
+++ b/code/modules/exploration_crew/exploration_vendor.dm
@@ -25,8 +25,8 @@
new /datum/data/vendor_equipment("Expanded E. Oxygen Tank", /obj/item/tank/internals/emergency_oxygen/engi, 1000),
new /datum/data/vendor_equipment("Survival Knife", /obj/item/knife/combat/survival, 1000),
new /datum/data/vendor_equipment("Pizza", /obj/item/pizzabox/margherita, 200),
- new /datum/data/vendor_equipment("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 1000),
- new /datum/data/vendor_equipment("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe/premium, 1000),
+ new /datum/data/vendor_equipment("Whiskey", /obj/item/reagent_containers/cup/glass/bottle/whiskey, 1000),
+ new /datum/data/vendor_equipment("Absinthe", /obj/item/reagent_containers/cup/glass/bottle/absinthe/premium, 1000),
new /datum/data/vendor_equipment("Cigar", /obj/item/clothing/mask/cigarette/cigar/havana, 1500),
new /datum/data/vendor_equipment("Soap", /obj/item/soap/nanotrasen, 2000),
new /datum/data/vendor_equipment("Laser Pointer", /obj/item/laser_pointer, 3000),
diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
deleted file mode 100644
index 1cf34945a959a..0000000000000
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ /dev/null
@@ -1,629 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-/// Drinks.
-////////////////////////////////////////////////////////////////////////////////
-/obj/item/reagent_containers/food/drinks
- name = "drink"
- desc = "yummy"
- icon = 'icons/obj/drinks.dmi'
- icon_state = null
- lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi'
- reagent_flags = OPENCONTAINER | DUNKABLE
- var/gulp_size = 5 //This is now officially broken ... need to think of a nice way to fix it.
- possible_transfer_amounts = list(5,10,15,20,25,30,50)
- volume = 50
- resistance_flags = NONE
- var/isGlass = TRUE //Whether the 'bottle' is made of glass or not so that milk cartons dont shatter when someone gets hit by it
- var/beingChugged = FALSE //We don't want people downing 100u super fast with drinking glasses
-
-/obj/item/reagent_containers/food/drinks/on_reagent_change(changetype)
- . = ..()
- gulp_size = max(round(reagents.total_volume / 5), 5)
-
-/obj/item/reagent_containers/food/drinks/attack(mob/living/M, mob/user, def_zone)
-
- if(!reagents || !reagents.total_volume)
- to_chat(user, "[src] is empty!")
- return 0
-
- if(!canconsume(M, user))
- return 0
-
- if (!is_drainable())
- to_chat(user, "[src]'s lid hasn't been opened!")
- return 0
- var/gulp_amount = gulp_size
- if(M == user)
- if(user.is_zone_selected(BODY_ZONE_PRECISE_MOUTH, precise_only = TRUE) && !beingChugged)
- beingChugged = TRUE
- user.visible_message("[user] starts chugging [src].", \
- "You start chugging [src].")
- if(!do_after(user, 3 SECONDS, target = M))
- return
- if(!reagents || !reagents.total_volume)
- return
- gulp_amount = 50
- user.visible_message("[user] chugs [src].", \
- "You chug [src].")
- beingChugged = FALSE
- else
- user.visible_message("[user] swallows a gulp of [src].", \
- "You swallow a gulp of [src].")
- if(HAS_TRAIT(M, TRAIT_VORACIOUS))
- M.changeNext_move(CLICK_CD_MELEE * 0.5) //chug! chug! chug!
-
- else
- M.visible_message("[user] attempts to feed [M] the contents of [src].", \
- "[user] attempts to feed you the contents of [src].")
- if(!do_after(user, 3 SECONDS, target = M))
- return
- if(!reagents || !reagents.total_volume)
- return // The drink might be empty after the delay, such as by spam-feeding
- M.visible_message("[user] fed [M] the contents of [src].", \
- "[user] fed you the contents of [src].")
- log_combat(user, M, "fed", reagents.log_list())
-
- var/fraction = min(gulp_amount/reagents.total_volume, 1)
- checkLiked(fraction, M)
- reagents.reaction(M, INGEST, fraction)
- reagents.trans_to(M, gulp_amount, transfered_by = user)
- playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
- return 1
-
-/obj/item/reagent_containers/food/drinks/afterattack(obj/target, mob/user , proximity)
- . = ..()
- if(!proximity)
- return
-
- if(target.is_refillable() && is_drainable()) //Something like a glass. Player probably wants to transfer TO it.
- if(!reagents.total_volume)
- to_chat(user, "[src] is empty.")
- return
-
- if(target.reagents.holder_full())
- to_chat(user, "[target] is full.")
- return
-
- var/refill = reagents.get_master_reagent_id()
- var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this, transfered_by = user)
- to_chat(user, "You transfer [trans] units of the solution to [target].")
-
- if(iscyborg(user)) //Cyborg modules that include drinks automatically refill themselves, but drain the borg's cell
- var/mob/living/silicon/robot/bro = user
- bro.cell.use(30)
- addtimer(CALLBACK(reagents, TYPE_PROC_REF(/datum/reagents, add_reagent), refill, trans), 600)
-
- else if(target.is_drainable()) //A dispenser. Transfer FROM it TO us.
- if (!is_refillable())
- to_chat(user, "[src]'s tab isn't open!")
- return
-
- if(!target.reagents.total_volume)
- to_chat(user, "[target] is empty.")
- return
-
- if(reagents.holder_full())
- to_chat(user, "[src] is full.")
- return
-
- var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this, transfered_by = user)
- to_chat(user, "You fill [src] with [trans] units of the contents of [target].")
-
-/obj/item/reagent_containers/food/drinks/attackby(obj/item/I, mob/user, params)
- var/hotness = I.is_hot()
- if(hotness && reagents)
- reagents.expose_temperature(hotness)
- to_chat(user, "You heat [name] with [I]!")
- ..()
-
-/obj/item/reagent_containers/food/drinks/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
- . = ..()
- if(!.) //if the bottle wasn't caught
- smash(hit_atom, throwingdatum?.thrower, TRUE)
-
-/obj/item/reagent_containers/food/drinks/proc/smash(atom/target, mob/thrower, ranged = FALSE)
- if(!isGlass)
- return
- if(QDELING(src) || !target) //Invalid loc
- return
- if(bartender_check(target) && ranged)
- return
- var/obj/item/broken_bottle/B = new (loc)
- B.icon_state = icon_state
- var/icon/I = new('icons/obj/drinks.dmi', src.icon_state)
- I.Blend(B.broken_outline, ICON_OVERLAY, rand(5), 1)
- I.SwapColor(rgb(255, 0, 220, 255), rgb(0, 0, 0, 0))
- B.icon = I
- B.name = "broken [name]"
- if(prob(33))
- var/obj/item/shard/S = new(drop_location())
- target.Bumped(S)
- playsound(src, "shatter", 70, 1)
- transfer_fingerprints_to(B)
- qdel(src)
- target.Bumped(B)
-
-/obj/item/reagent_containers/food/drinks/bullet_act(obj/projectile/P)
- . = ..()
- if(!(P.nodamage) && P.damage_type == BRUTE && !QDELETED(src))
- var/atom/T = get_turf(src)
- smash(T)
- return
-
-
-
-////////////////////////////////////////////////////////////////////////////////
-/// Drinks. END
-////////////////////////////////////////////////////////////////////////////////
-
-
-/obj/item/reagent_containers/food/drinks/trophy
- name = "pewter cup"
- desc = "Everyone gets a trophy."
- icon_state = "pewter_cup"
- w_class = WEIGHT_CLASS_TINY
- force = 1
- throwforce = 1
- amount_per_transfer_from_this = 5
- custom_materials = list(/datum/material/iron=100)
- possible_transfer_amounts = list()
- volume = 5
- flags_1 = CONDUCT_1
- spillable = TRUE
- resistance_flags = FIRE_PROOF
- isGlass = FALSE
-
-/obj/item/reagent_containers/food/drinks/trophy/gold_cup
- name = "gold cup"
- desc = "You're winner!"
- icon_state = "golden_cup"
- w_class = WEIGHT_CLASS_BULKY
- force = 14
- throwforce = 10
- amount_per_transfer_from_this = 20
- custom_materials = list(/datum/material/gold=1000)
- volume = 150
-
-/obj/item/reagent_containers/food/drinks/trophy/silver_cup
- name = "silver cup"
- desc = "Best loser!"
- icon_state = "silver_cup"
- w_class = WEIGHT_CLASS_NORMAL
- force = 10
- throwforce = 8
- amount_per_transfer_from_this = 15
- custom_materials = list(/datum/material/silver=800)
- volume = 100
-
-
-/obj/item/reagent_containers/food/drinks/trophy/bronze_cup
- name = "bronze cup"
- desc = "At least you ranked!"
- icon_state = "bronze_cup"
- w_class = WEIGHT_CLASS_SMALL
- force = 5
- throwforce = 4
- amount_per_transfer_from_this = 10
- custom_materials = list(/datum/material/iron=400)
- volume = 25
-
-///////////////////////////////////////////////Drinks
-//Notes by Darem: Drinks are simply containers that start preloaded. Unlike condiments, the contents can be ingested directly
-// rather then having to add it to something else first. They should only contain liquids. They have a default container size of 50.
-// Formatting is the same as food.
-
-/obj/item/reagent_containers/food/drinks/coffee
- name = "Robust coffee"
- desc = "Careful, the beverage you're about to enjoy is extremely hot."
- icon_state = "coffee"
- list_reagents = list(/datum/reagent/consumable/coffee = 30)
- spillable = TRUE
- resistance_flags = FREEZE_PROOF
- isGlass = FALSE
- foodtype = BREAKFAST
-
-/obj/item/reagent_containers/food/drinks/bubble_tea
- name = "Bubble tea"
- desc = "Refreshing! You aren't sure what those things in the bottom are."
- icon_state = "bubble_tea"
- list_reagents = list(/datum/reagent/consumable/bubble_tea = 50)
- foodtype = SUGAR
- spillable = TRUE
- isGlass = FALSE
-
-/obj/item/reagent_containers/food/drinks/ice
- name = "ice cup"
- desc = "Careful, cold ice, do not chew."
- custom_price = 5
- icon_state = "coffee"
- list_reagents = list(/datum/reagent/consumable/ice = 30)
- spillable = TRUE
- isGlass = FALSE
-
-/obj/item/reagent_containers/food/drinks/ice/prison
- name = "dirty ice cup"
- desc = "Either Nanotrasen's water supply is contaminated, or this machine actually vends lemon, chocolate, and cherry snow cones."
- list_reagents = list(/datum/reagent/consumable/ice = 25, /datum/reagent/liquidgibs = 5)
-
-/obj/item/reagent_containers/food/drinks/mug/ // parent type is literally just so empty mug sprites are a thing
- name = "mug"
- desc = "A drink served in a classy mug."
- icon_state = "tea"
- item_state = "coffee"
- spillable = TRUE
-
-/obj/item/reagent_containers/food/drinks/mug/on_reagent_change(changetype)
- if(reagents.total_volume)
- icon_state = "tea"
- else
- icon_state = "tea_empty"
-
-/obj/item/reagent_containers/food/drinks/mug/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."
- list_reagents = list(/datum/reagent/consumable/tea = 30)
-
-/obj/item/reagent_containers/food/drinks/mug/cocoa
- name = "Dutch hot cocoa"
- desc = "Made in Space South America."
- list_reagents = list(/datum/reagent/consumable/cocoa/hot_cocoa = 15, /datum/reagent/consumable/sugar = 5)
- foodtype = SUGAR
- resistance_flags = FREEZE_PROOF
- custom_price = 42
-
-/obj/item/reagent_containers/food/drinks/dry_ramen
- name = "cup ramen"
- desc = "Just add 5ml of water, self heats! A taste that reminds you of your school years. Now new with salty flavour!"
- icon_state = "ramen"
- list_reagents = list(
- /datum/reagent/consumable/dry_ramen = 15,
- /datum/reagent/consumable/sodiumchloride = 3,
- /datum/reagent/consumable/maltodextrin = 5
- )
- foodtype = GRAIN
- isGlass = FALSE
- custom_price = 38
-
-/obj/item/reagent_containers/food/drinks/beer
- name = "space beer"
- desc = "Beer. In space."
- icon_state = "beer"
- list_reagents = list(/datum/reagent/consumable/ethanol/beer = 30)
- foodtype = GRAIN | ALCOHOL
-
-/obj/item/reagent_containers/food/drinks/beer/almost_empty
- var/amount
- list_reagents = null
-
-/obj/item/reagent_containers/food/drinks/beer/almost_empty/Initialize(mapload)
- . = ..()
- amount = rand(1,4)
- reagents.add_reagent(/datum/reagent/consumable/ethanol/beer, amount)
-
-/obj/item/reagent_containers/food/drinks/syndicatebeer
- name = "syndicate beer"
- desc = "Consumed only by the finest syndicate agents. There is a round warning label stating 'Don't drink more than one in quick succession!'"
- icon_state = "syndicatebeer"
- list_reagents = list(/datum/reagent/consumable/ethanol/beer = 10, /datum/reagent/medicine/antitoxin = 20)
- foodtype = GRAIN | ALCOHOL
-
-/obj/item/reagent_containers/food/drinks/ftliver
- name = "Faster-Than-Liver"
- desc = "They've gone into plaid!"
- icon_state = "ftliver"
- list_reagents = list(/datum/reagent/consumable/ethanol/ftliver = 30)
- foodtype = ALCOHOL
-
-/obj/item/reagent_containers/food/drinks/beer/light
- name = "Carp Lite"
- desc = "Brewed with \"Pure Ice Asteroid Spring Water\"."
- list_reagents = list(/datum/reagent/consumable/ethanol/beer/light = 30)
-
-/obj/item/reagent_containers/food/drinks/ale
- name = "Magm-Ale"
- desc = "A true dorf's drink of choice."
- icon_state = "alebottle"
- item_state = "beer"
- list_reagents = list(/datum/reagent/consumable/ethanol/ale = 30)
- foodtype = GRAIN | ALCOHOL
-
-/obj/item/reagent_containers/food/drinks/sillycup
- name = "paper cup"
- desc = "A paper water cup."
- icon_state = "water_cup_e"
- possible_transfer_amounts = list()
- volume = 10
- spillable = TRUE
- isGlass = FALSE
-
-/obj/item/reagent_containers/food/drinks/sillycup/on_reagent_change(changetype)
- if(reagents.total_volume)
- icon_state = "water_cup"
- else
- icon_state = "water_cup_e"
-
-/obj/item/reagent_containers/food/drinks/sillycup/smallcarton
- name = "small carton"
- desc = "A small carton, intended for holding drinks."
- icon_state = "juicebox"
- volume = 15 //I figure if you have to craft these it should at least be slightly better than something you can get for free from a watercooler
-
-/obj/item/reagent_containers/food/drinks/sillycup/smallcarton/smash(atom/target, mob/thrower, ranged = FALSE)
- if(bartender_check(target) && ranged)
- return
- var/obj/item/broken_bottle/B = new (loc)
- B.icon_state = icon_state
- var/icon/I = new('icons/obj/drinks.dmi', src.icon_state)
- I.Blend(B.broken_outline, ICON_OVERLAY, rand(5), 1)
- I.SwapColor(rgb(255, 0, 220, 255), rgb(0, 0, 0, 0))
- B.icon = I
- B.name = "broken [name]"
- B.force = 0
- B.throwforce = 0
- B.desc = "A carton with the bottom half burst open. Might give you a papercut."
- transfer_fingerprints_to(B)
- qdel(src)
- target.Bumped(B)
-
-/obj/item/reagent_containers/food/drinks/sillycup/smallcarton/on_reagent_change(changetype)
- if (reagents.reagent_list.len)
- switch(reagents.get_master_reagent_id())
- if(/datum/reagent/consumable/orangejuice)
- icon_state = "orangebox"
- name = "orange juice box"
- desc = "A great source of vitamins. Stay healthy!"
- foodtype = FRUIT | BREAKFAST
- if(/datum/reagent/consumable/milk)
- icon_state = "milkbox"
- name = "carton of milk"
- desc = "An excellent source of calcium for growing space explorers."
- foodtype = DAIRY | BREAKFAST
- if(/datum/reagent/consumable/applejuice)
- icon_state = "juicebox"
- name = "apple juice box"
- desc = "Sweet apple juice. Don't be late for school!"
- foodtype = FRUIT
- if(/datum/reagent/consumable/grapejuice)
- icon_state = "grapebox"
- name = "grape juice box"
- desc = "Tasty grape juice in a fun little container. Non-alcoholic!"
- foodtype = FRUIT
- if(/datum/reagent/consumable/pineapplejuice)
- icon_state = "pineapplebox"
- name = "pineapple juice box"
- desc = "Why would you even want this?"
- if(/datum/reagent/consumable/milk/chocolate_milk)
- icon_state = "chocolatebox"
- name = "carton of chocolate milk"
- desc = "Milk for cool kids!"
- foodtype = SUGAR
- if(/datum/reagent/consumable/ethanol/eggnog)
- icon_state = "nog2"
- name = "carton of eggnog"
- desc = "For enjoying the most wonderful time of the year."
- foodtype = MEAT
- else
- icon_state = "juicebox"
- name = "small carton"
- desc = "A small carton, intended for holding drinks."
-
-/obj/item/reagent_containers/food/drinks/honeycomb
- name = "Honeycomb"
- desc = "A honeycomb made by an apid. It seems to be made out of beeswax and fairly weak."
- icon = 'icons/obj/hydroponics/harvest.dmi'
- icon_state = "honeycomb"
- list_reagents = list(/datum/reagent/consumable/honey = 25)
-
-/obj/item/reagent_containers/food/drinks/honeycomb/attack_self(mob/user)
- if(!reagents.total_volume)
- user.visible_message("[user] snaps the [src] into 2 pieces!",
- "You snap [src] in half.")
- new /obj/item/stack/sheet/wax(user.loc, 2)
- qdel(src)
- return
- return ..()
-
-//////////////////////////drinkingglass and shaker//
-//Note by Darem: This code handles the mixing of drinks. New drinks go in three places: In Chemistry-Reagents.dm (for the drink
-// 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
- name = "shaker"
- desc = "A metal shaker to mix drinks in."
- icon_state = "shaker"
- custom_materials = list(/datum/material/iron=1500)
- amount_per_transfer_from_this = 10
- volume = 100
- isGlass = FALSE
-
-/obj/item/reagent_containers/food/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."
- custom_price = 30
- icon_state = "flask"
- custom_materials = list(/datum/material/iron=250)
- volume = 60
- isGlass = FALSE
-
-/obj/item/reagent_containers/food/drinks/flask/gold
- name = "captain's flask"
- desc = "A gold flask belonging to the captain."
- icon_state = "flask_gold"
- custom_materials = list(/datum/material/gold=500)
-
-/obj/item/reagent_containers/food/drinks/flask/det
- name = "detective's flask"
- desc = "The detective's only true friend."
- icon_state = "detflask"
- list_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 30)
-
-/obj/item/reagent_containers/food/drinks/britcup
- name = "cup"
- desc = "A cup with the british flag emblazoned on it."
- icon_state = "britcup"
- volume = 30
- spillable = TRUE
-
-
-//////////////////////////soda_cans//
-//These are in their own group to be used as IED's in /obj/item/grenade/ghettobomb.dm
-
-/obj/item/reagent_containers/food/drinks/soda_cans
- name = "soda can"
- lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi'
- reagent_flags = NONE
- spillable = FALSE
- isGlass = FALSE
- custom_price = 10
-
-/obj/item/reagent_containers/food/drinks/soda_cans/suicide_act(mob/living/carbon/human/H)
- if(!reagents.total_volume)
- H.visible_message("[H] is trying to take a big sip from [src]... The can is empty!")
- return SHAME
- if(!is_drainable())
- open_soda()
- sleep(10)
- H.visible_message("[H] takes a big sip from [src]! It looks like [H.p_theyre()] trying to commit suicide!")
- playsound(H,'sound/items/drink.ogg', 80, 1)
- reagents.trans_to(H, src.reagents.total_volume, transfered_by = H) //a big sip
- sleep(5)
- H.say(pick("Now, Outbomb Cuban Pete, THAT was a game.", "All these new fangled arcade games are too slow. I prefer the classics.", "They don't make 'em like Orion Trail anymore.", "You know what they say. Worst day of spess carp fishing is better than the best day at work.", "They don't make 'em like good old-fashioned singularity engines anymore."))
- if(H.age >= 30)
- H.Stun(50)
- sleep(50)
- playsound(H,'sound/items/drink.ogg', 80, 1)
- H.say(pick("Another day, another dollar.", "I wonder if I should hold?", "Diversifying is for young'ns.", "Yeap, times were good back then."))
- return MANUAL_SUICIDE_NONLETHAL
- sleep(20) //dramatic pause
- return TOXLOSS
-
-/obj/item/reagent_containers/food/drinks/soda_cans/attack(mob/M, mob/user)
- if(M == user && !src.reagents.total_volume && user.a_intent == INTENT_HARM && user.is_zone_selected(BODY_ZONE_HEAD))
- user.visible_message("[user] crushes the can of [src] on [user.p_their()] forehead!", "You crush the can of [src] on your forehead.")
- playsound(user.loc,'sound/weapons/pierce.ogg', rand(10,50), 1)
- var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(user.loc)
- crushed_can.icon_state = icon_state
- qdel(src)
- ..()
-
-/obj/item/reagent_containers/food/drinks/soda_cans/bullet_act(obj/projectile/P)
- . = ..()
- if(!(P.nodamage) && P.damage_type == BRUTE && !QDELETED(src))
- var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(src.loc)
- crushed_can.icon_state = icon_state
- var/atom/throw_target = get_edge_target_turf(crushed_can, pick(GLOB.alldirs))
- crushed_can.throw_at(throw_target, rand(1,2), 7)
- qdel(src)
- return
-
-/obj/item/reagent_containers/food/drinks/soda_cans/proc/open_soda(mob/user)
- to_chat(user, "You pull back the tab of \the [src] with a satisfying pop.") //Ahhhhhhhh
- ENABLE_BITFIELD(reagents.flags, OPENCONTAINER)
- playsound(src, "can_open", 50, 1)
- spillable = TRUE
-
-/obj/item/reagent_containers/food/drinks/soda_cans/attack_self(mob/user)
- if(!is_drainable())
- open_soda(user)
- return ..()
-
-/obj/item/reagent_containers/food/drinks/soda_cans/cola
- name = "Space Cola"
- desc = "Cola. in space."
- icon_state = "cola"
- list_reagents = list(/datum/reagent/consumable/space_cola = 30)
- foodtype = SUGAR
-
-/obj/item/reagent_containers/food/drinks/soda_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(/datum/reagent/consumable/tonic = 50)
- foodtype = ALCOHOL
-
-/obj/item/reagent_containers/food/drinks/soda_cans/sodawater
- name = "soda water"
- desc = "A can of soda water. Why not make a scotch and soda?"
- icon_state = "sodawater"
- list_reagents = list(/datum/reagent/consumable/sodawater = 50)
-
-/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime
- name = "orange soda"
- desc = "You wanted ORANGE. It gave you Lemon Lime."
- icon_state = "lemon-lime"
- list_reagents = list(/datum/reagent/consumable/lemon_lime = 30)
- foodtype = FRUIT
-
-/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime/Initialize(mapload)
- . = ..()
- name = "lemon-lime soda"
-
-/obj/item/reagent_containers/food/drinks/soda_cans/space_up
- name = "Space-Up!"
- desc = "Tastes like a hull breach in your mouth."
- icon_state = "space-up"
- list_reagents = list(/datum/reagent/consumable/space_up = 30)
- foodtype = SUGAR | JUNKFOOD
-
-/obj/item/reagent_containers/food/drinks/soda_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(/datum/reagent/consumable/space_cola = 15, /datum/reagent/consumable/orangejuice = 15)
- foodtype = SUGAR | FRUIT | JUNKFOOD
-
-/obj/item/reagent_containers/food/drinks/soda_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(/datum/reagent/consumable/spacemountainwind = 30)
- foodtype = SUGAR | JUNKFOOD
-
-/obj/item/reagent_containers/food/drinks/soda_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(/datum/reagent/consumable/ethanol/thirteenloko = 30)
- foodtype = SUGAR | JUNKFOOD
-
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb
- name = "Dr. Gibb"
- desc = "A delicious mixture of 42 different flavors."
- icon_state = "dr_gibb"
- list_reagents = list(/datum/reagent/consumable/dr_gibb = 30)
- foodtype = SUGAR | JUNKFOOD
-
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game
- name = "Pwr Game"
- desc = "The only drink with the PWR that true gamers crave."
- icon_state = "purple_can"
- list_reagents = list(/datum/reagent/consumable/pwr_game = 30)
-
-/obj/item/reagent_containers/food/drinks/soda_cans/shamblers
- name = "Shambler's juice"
- desc = "~Shake me up some of that Shambler's Juice!~"
- icon_state = "shamblers"
- list_reagents = list(/datum/reagent/consumable/shamblers = 30)
- foodtype = SUGAR | JUNKFOOD
-
-/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull
- name = "Grey Bull"
- desc = "Grey Bull, it gives you gloves!"
- icon_state = "energy_drink"
- list_reagents = list(/datum/reagent/consumable/grey_bull = 20)
- foodtype = SUGAR | JUNKFOOD
-
-/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy
- name = "Monkey Energy"
- desc = "Unleash the ape!"
- icon_state = "monkey_energy"
- list_reagents = list(/datum/reagent/consumable/monkey_energy = 50)
- foodtype = SUGAR | JUNKFOOD
-
-/obj/item/reagent_containers/food/drinks/soda_cans/air
- name = "canned air"
- desc = "There is no air shortage. Do not drink."
- icon_state = "air"
- list_reagents = list(/datum/reagent/nitrogen = 24, /datum/reagent/oxygen = 6)
diff --git a/code/modules/food_and_drinks/food.dm b/code/modules/food_and_drinks/food.dm
deleted file mode 100644
index c56380494a4b3..0000000000000
--- a/code/modules/food_and_drinks/food.dm
+++ /dev/null
@@ -1,53 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-/// Food.
-////////////////////////////////////////////////////////////////////////////////
-/// Note: When adding food items with dummy parents, make sure to add
-/// the parent to the exclusion list in code/__HELPERS/unsorted.dm's
-/// get_random_food proc.
-////////////////////////////////////////////////////////////////////////////////
-
-/obj/item/reagent_containers/food
- possible_transfer_amounts = list()
- volume = 50 //Sets the default container amount for all food items.
- reagent_flags = INJECTABLE
- resistance_flags = FLAMMABLE
- var/foodtype = NONE
- var/last_check_time
- var/in_container = FALSE //currently just stops "was bitten X times!" messages on canned food
-
-/obj/item/reagent_containers/food/Initialize(mapload)
- . = ..()
- if(!mapload)
- pixel_x = rand(-5, 5)
- pixel_y = rand(-5, 5)
-
-/obj/item/reagent_containers/food/proc/checkLiked(var/fraction, mob/M)
- if(last_check_time + 50 < world.time)
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
- var/obj/item/organ/tongue/T = H.getorganslot(ORGAN_SLOT_TONGUE)
-
- if((foodtype & BREAKFAST) && world.time - SSticker.round_start_time < STOP_SERVING_BREAKFAST)
- SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "breakfast", /datum/mood_event/breakfast)
- last_check_time = world.time
-
- if(!T) //if you don't have a tongue you don't taste..
- return
-
- if(!HAS_TRAIT(H, TRAIT_AGEUSIA))
- if(foodtype & T.toxic_food)
- to_chat(H,"What the hell was that thing?!")
- H.adjust_disgust(25 + 30 * fraction)
- SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "toxic_food", /datum/mood_event/disgusting_food)
- else if(foodtype & T.disliked_food)
- to_chat(H,"That didn't taste very good...")
- H.adjust_disgust(11 + 15 * fraction)
- SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "gross_food", /datum/mood_event/gross_food)
- else if(foodtype & T.liked_food)
- to_chat(H,"I love this taste!")
- H.adjust_disgust(-5 + -2.5 * fraction)
- SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "fav_food", /datum/mood_event/favorite_food)
- else
- if(foodtype & T.toxic_food)
- to_chat(H, "You don't feel so good...")
- H.adjust_disgust(25 + 30 * fraction)
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 84bcfb5270c74..4ed9d8d7ee6a7 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
@@ -10,9 +10,9 @@ God bless America.
/// Global typecache of things which should never be fried.
GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list(
- /obj/item/reagent_containers/glass,
+ /obj/item/reagent_containers/cup,
/obj/item/reagent_containers/syringe,
- /obj/item/reagent_containers/food/condiment,
+ /obj/item/reagent_containers/condiment,
/obj/item/small_delivery,
/obj/item/his_grace,
)))
diff --git a/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm b/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm
index a5186e45ddc8a..95e8c8d7df5b3 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm
@@ -34,8 +34,8 @@
if(O.tool_behaviour == TOOL_WRENCH)
default_unfasten_wrench(user, O, 0)
return TRUE
- if(istype(O, /obj/item/reagent_containers/food/drinks/drinkingglass))
- var/obj/item/reagent_containers/food/drinks/drinkingglass/DG = O
+ if(istype(O, /obj/item/reagent_containers/cup/glass/drinkingglass))
+ var/obj/item/reagent_containers/cup/glass/drinkingglass/DG = O
if(!DG.reagents.total_volume) //glass is empty
qdel(DG)
glasses++
@@ -132,7 +132,7 @@
to_chat(usr, "There are no glasses left!")
glasses = 0
else
- var/obj/item/reagent_containers/food/drinks/drinkingglass/DG = new(loc)
+ var/obj/item/reagent_containers/cup/glass/drinkingglass/DG = new(loc)
if(href_list["pour"])
reagents.trans_id_to(DG, reagents.reagent_list[text2num(href_list["pour"])]?.type, portion)
if(href_list["m_pour"])
diff --git a/code/modules/food_and_drinks/kitchen_machinery/grill.dm b/code/modules/food_and_drinks/kitchen_machinery/grill.dm
index b4a43d9308d0f..4ecb27d42b8e6 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/grill.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/grill.dm
@@ -51,7 +51,7 @@
if(I.resistance_flags & INDESTRUCTIBLE)
to_chat(user, "You don't feel it would be wise to grill [I]...")
return ..()
- if(istype(I, /obj/item/reagent_containers/glass))
+ if(istype(I, /obj/item/reagent_containers/cup))
if(I.reagents.has_reagent(/datum/reagent/consumable/monkey_energy))
grill_fuel += (20 * (I.reagents.get_reagent_amount(/datum/reagent/consumable/monkey_energy)))
to_chat(user, "You pour the Monkey Energy in [src].")
diff --git a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
index ac38d414529c7..1713d03236f04 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
@@ -225,7 +225,7 @@
to_chat(user, "You need more space cleaner!")
return TRUE
- if(istype(O, /obj/item/soap) || istype(O, /obj/item/reagent_containers/glass/rag))
+ if(istype(O, /obj/item/soap) || istype(O, /obj/item/reagent_containers/cup/rag))
var/cleanspeed = 50
if(istype(O, /obj/item/soap))
var/obj/item/soap/used_soap = O
@@ -331,7 +331,7 @@
muck()
return
for(var/obj/O in ingredients)
- if(istype(O, /obj/item/reagent_containers/food) || istype(O, /obj/item/grown))
+ if(istype(O, /obj/item/food) || istype(O, /obj/item/grown))
continue
if(prob(min(dirty * 5, 100)))
start_can_fail()
diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
index 878c905287fbc..08310ad408ac1 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
@@ -398,9 +398,9 @@
desc = "A refrigerated storage unit for tasty tasty alcohol."
/obj/machinery/smartfridge/drinks/accept_check(obj/item/O)
- if(!istype(O, /obj/item/reagent_containers) || (O.item_flags & ABSTRACT) || !O.reagents || !O.reagents.reagent_list.len)
+ if(!is_reagent_container(O) || (O.item_flags & ABSTRACT) || !O.reagents || !O.reagents.reagent_list.len)
return FALSE
- if(istype(O, /obj/item/reagent_containers/glass) || istype(O, /obj/item/reagent_containers/food/drinks) || istype(O, /obj/item/reagent_containers/food/condiment))
+ if(istype(O, /obj/item/reagent_containers/cup) || istype(O, /obj/item/reagent_containers/cup/glass) || istype(O, /obj/item/reagent_containers/condiment))
return TRUE
// ----------------------------
@@ -491,7 +491,7 @@
return TRUE
if(!O.reagents || !O.reagents.reagent_list.len) // other empty containers not accepted
return FALSE
- if(istype(O, /obj/item/reagent_containers/syringe) || istype(O, /obj/item/reagent_containers/glass/bottle) || istype(O, /obj/item/reagent_containers/glass/beaker) \
+ if(istype(O, /obj/item/reagent_containers/syringe) || istype(O, /obj/item/reagent_containers/cup/bottle) || istype(O, /obj/item/reagent_containers/cup/beaker) \
|| istype(O, /obj/item/reagent_containers/spray) || istype(O, /obj/item/reagent_containers/medspray) || istype(O, /obj/item/reagent_containers/chem_bag))
return TRUE
return FALSE
@@ -500,8 +500,8 @@
initial_contents = list(
/obj/item/reagent_containers/pill/epinephrine = 12,
/obj/item/reagent_containers/pill/charcoal = 5,
- /obj/item/reagent_containers/glass/bottle/epinephrine = 1,
- /obj/item/reagent_containers/glass/bottle/charcoal = 1)
+ /obj/item/reagent_containers/cup/bottle/epinephrine = 1,
+ /obj/item/reagent_containers/cup/bottle/charcoal = 1)
// ----------------------------
// Virology Medical Smartfridge
@@ -513,17 +513,17 @@
/obj/machinery/smartfridge/chemistry/virology/preloaded
initial_contents = list(
/obj/item/reagent_containers/syringe/antiviral = 4,
- /obj/item/reagent_containers/glass/bottle/synaptizine = 1,
- /obj/item/reagent_containers/glass/bottle/formaldehyde = 1,
- /obj/item/reagent_containers/glass/bottle/cryostylane = 1)
+ /obj/item/reagent_containers/cup/bottle/synaptizine = 1,
+ /obj/item/reagent_containers/cup/bottle/formaldehyde = 1,
+ /obj/item/reagent_containers/cup/bottle/cryostylane = 1)
/obj/machinery/smartfridge/chemistry/virology/preloaded/Initialize(mapload)
.=..()
if(CONFIG_GET(flag/allow_virologist))
- new /obj/item/reagent_containers/glass/bottle/cold(src)
- new /obj/item/reagent_containers/glass/bottle/flu_virion(src)
- new /obj/item/reagent_containers/glass/bottle/mutagen(src)
- new /obj/item/reagent_containers/glass/bottle/plasma(src)
+ new /obj/item/reagent_containers/cup/bottle/cold(src)
+ new /obj/item/reagent_containers/cup/bottle/flu_virion(src)
+ new /obj/item/reagent_containers/cup/bottle/mutagen(src)
+ new /obj/item/reagent_containers/cup/bottle/plasma(src)
else
desc = "A refrigerated storage unit for volatile sample storage."
@@ -541,7 +541,7 @@
symptomholder.Finalize()
symptomholder.Refresh()
var/list/data = list("viruses" = list(symptomholder))
- var/obj/item/reagent_containers/glass/bottle/B = new
+ var/obj/item/reagent_containers/cup/bottle/B = new
B.name = "[symptomholder.name] culture bottle"
B.desc = "A small bottle. Contains [symptomholder.agent] culture in synthblood medium."
B.reagents.add_reagent(/datum/reagent/blood, 20, data)
@@ -550,7 +550,7 @@
if(!istype(disease, /datum/disease/advance))
var/datum/disease/target = new disease
var/list/data = list("viruses" = list(target))
- var/obj/item/reagent_containers/glass/bottle/B = new
+ var/obj/item/reagent_containers/cup/bottle/B = new
B.name = "[target.name] culture bottle"
B.desc = "A small bottle. Contains [target.agent] culture in synthblood medium."
B.reagents.add_reagent(/datum/reagent/blood, 20, data)
diff --git a/code/modules/food_and_drinks/pizzabox.dm b/code/modules/food_and_drinks/pizzabox.dm
index 7978435972b18..b6dcfe91218d9 100644
--- a/code/modules/food_and_drinks/pizzabox.dm
+++ b/code/modules/food_and_drinks/pizzabox.dm
@@ -221,7 +221,7 @@
else if(is_wire_tool(I))
if(wires && bomb)
wires.interact(user)
- else if(istype(I, /obj/item/reagent_containers/food))
+ else if(istype(I, /obj/item/reagent_containers/cup))
to_chat(user, "That's not a pizza!")
..()
diff --git a/code/modules/food_and_drinks/plate.dm b/code/modules/food_and_drinks/plate.dm
index 0d85c78f7db5c..d7a68c3567884 100644
--- a/code/modules/food_and_drinks/plate.dm
+++ b/code/modules/food_and_drinks/plate.dm
@@ -98,6 +98,6 @@
/obj/item/plate_shard/Initialize(mapload)
. = ..()
- AddComponent(/datum/component/caltrop, min_damage = force)
+ AddComponent(/datum/component/caltrop, _min_damage = force)
icon_state = "[base_icon_state][pick(1,variants)]"
diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
index 1d6193b28a5b4..d91255e04de1d 100644
--- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm
+++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
@@ -598,6 +598,22 @@
required_reagents = list(/datum/reagent/consumable/milk = 1, /datum/reagent/consumable/cocoa = 1)
mix_message = "The color changes as the mixture blends smoothly."
+/datum/chemical_reaction/hot_cocoa
+ name = "Hot Coco"
+ results = list(/datum/reagent/consumable/hot_cocoa = 6)
+ required_reagents = list(/datum/reagent/consumable/milk = 5, /datum/reagent/consumable/cocoa = 1)
+ required_temp = 320
+
+/datum/chemical_reaction/coffee
+ name = "Coffee"
+ results = list(/datum/reagent/consumable/coffee = 5)
+ required_reagents = list(/datum/reagent/toxin/coffeepowder = 1, /datum/reagent/water = 5)
+
+/datum/chemical_reaction/tea
+ name = "Tea"
+ results = list(/datum/reagent/consumable/tea = 5)
+ required_reagents = list(/datum/reagent/toxin/teapowder = 1, /datum/reagent/water = 5)
+
/datum/chemical_reaction/eggnog
name = /datum/reagent/consumable/ethanol/eggnog
id = /datum/reagent/consumable/ethanol/eggnog
@@ -688,7 +704,7 @@
name = "Peppermint Patty"
id = /datum/reagent/consumable/ethanol/peppermint_patty
results = list(/datum/reagent/consumable/ethanol/peppermint_patty = 10)
- required_reagents = list(/datum/reagent/consumable/cocoa/hot_cocoa = 6, /datum/reagent/consumable/ethanol/creme_de_cacao = 1, /datum/reagent/consumable/ethanol/creme_de_menthe = 1, /datum/reagent/consumable/ethanol/vodka = 1, /datum/reagent/consumable/menthol = 1)
+ required_reagents = list(/datum/reagent/consumable/hot_cocoa = 6, /datum/reagent/consumable/ethanol/creme_de_cacao = 1, /datum/reagent/consumable/ethanol/creme_de_menthe = 1, /datum/reagent/consumable/ethanol/vodka = 1, /datum/reagent/consumable/menthol = 1)
mix_message = "The cocoa turns mint green just as the strong scent hits your nose."
/datum/chemical_reaction/alexander
diff --git a/code/modules/food_and_drinks/recipes/food_mixtures.dm b/code/modules/food_and_drinks/recipes/food_mixtures.dm
index 06a36ca2fbc73..18b1c6b0c3aed 100644
--- a/code/modules/food_and_drinks/recipes/food_mixtures.dm
+++ b/code/modules/food_and_drinks/recipes/food_mixtures.dm
@@ -37,24 +37,6 @@
for(var/i in 1 to created_volume)
new /obj/item/food/chocolatebar(location)
-/datum/chemical_reaction/food/hot_cocoa
- name = "Hot Cocoa"
- id = /datum/reagent/consumable/cocoa/hot_cocoa
- results = list(/datum/reagent/consumable/cocoa/hot_cocoa = 5)
- required_reagents = list(/datum/reagent/water = 5, /datum/reagent/consumable/cocoa = 1)
-
-/datum/chemical_reaction/food/coffee
- name = "Coffee"
- id = /datum/reagent/consumable/coffee
- results = list(/datum/reagent/consumable/coffee = 5)
- required_reagents = list(/datum/reagent/toxin/coffeepowder = 1, /datum/reagent/water = 5)
-
-/datum/chemical_reaction/food/tea
- name = "Tea"
- id = /datum/reagent/consumable/tea
- results = list(/datum/reagent/consumable/tea = 5)
- required_reagents = list(/datum/reagent/toxin/teapowder = 1, /datum/reagent/water = 5)
-
/datum/chemical_reaction/food/soysauce
name = "Soy Sauce"
id = /datum/reagent/consumable/soysauce
diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm
index d106fd06f2c46..ddd6aee296999 100644
--- a/code/modules/hydroponics/beekeeping/beebox.dm
+++ b/code/modules/hydroponics/beekeeping/beebox.dm
@@ -93,7 +93,7 @@
if(bee_resources >= BEE_RESOURCE_HONEYCOMB_COST)
if(honeycombs.len < get_max_honeycomb())
bee_resources = max(bee_resources-BEE_RESOURCE_HONEYCOMB_COST, 0)
- var/obj/item/reagent_containers/honeycomb/HC = new(src)
+ var/obj/item/reagent_containers/cup/glass/honeycomb/HC = new(src)
if(queen_bee.beegent)
HC.set_reagent(queen_bee.beegent.type)
honeycombs += HC
@@ -231,7 +231,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/honeycomb/HC = pick_n_take(honeycombs)
+ var/obj/item/reagent_containers/cup/glass/honeycomb/HC = pick_n_take(honeycombs)
if(HC)
HC.forceMove(drop_location())
amtH--
diff --git a/code/modules/hydroponics/beekeeping/beekeeper_suit.dm b/code/modules/hydroponics/beekeeping/beekeeper_suit.dm
index a2e2005f31d2f..cfb74ccecebf8 100644
--- a/code/modules/hydroponics/beekeeping/beekeeper_suit.dm
+++ b/code/modules/hydroponics/beekeeping/beekeeper_suit.dm
@@ -14,4 +14,4 @@
item_state = null
body_parts_covered = CHEST|GROIN|LEGS|ARMS
clothing_flags = THICKMATERIAL
- allowed = list(/obj/item/melee/flyswatter, /obj/item/reagent_containers/spray/plantbgone, /obj/item/plant_analyzer, /obj/item/seeds, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/cultivator, /obj/item/reagent_containers/spray/pestspray, /obj/item/hatchet, /obj/item/storage/bag/plants)
+ allowed = list(/obj/item/melee/flyswatter, /obj/item/reagent_containers/spray/plantbgone, /obj/item/plant_analyzer, /obj/item/seeds, /obj/item/reagent_containers/cup/bottle, /obj/item/reagent_containers/cup/beaker, /obj/item/cultivator, /obj/item/reagent_containers/spray/pestspray, /obj/item/hatchet, /obj/item/storage/bag/plants)
diff --git a/code/modules/hydroponics/beekeeping/honeycomb.dm b/code/modules/hydroponics/beekeeping/honeycomb.dm
index 0256ec010822b..7986828e2cfad 100644
--- a/code/modules/hydroponics/beekeeping/honeycomb.dm
+++ b/code/modules/hydroponics/beekeeping/honeycomb.dm
@@ -1,5 +1,5 @@
-/obj/item/reagent_containers/honeycomb
+/obj/item/reagent_containers/cup/glass/honeycomb
name = "honeycomb"
desc = "A hexagonal mesh of honeycomb."
icon = 'icons/obj/hydroponics/harvest.dmi'
@@ -13,14 +13,14 @@
grind_results = list()
var/honey_color = ""
-/obj/item/reagent_containers/honeycomb/Initialize(mapload)
+/obj/item/reagent_containers/cup/glass/honeycomb/Initialize(mapload)
. = ..()
pixel_x = rand(8,-8)
pixel_y = rand(8,-8)
update_icon()
-/obj/item/reagent_containers/honeycomb/update_icon()
+/obj/item/reagent_containers/cup/glass/honeycomb/update_icon()
cut_overlays()
var/mutable_appearance/honey_overlay = mutable_appearance(icon, /datum/reagent/consumable/honey)
if(honey_color)
@@ -29,7 +29,7 @@
add_overlay(honey_overlay)
-/obj/item/reagent_containers/honeycomb/proc/set_reagent(reagent)
+/obj/item/reagent_containers/cup/glass/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 ddf667764ba58..e96bd8f4110c6 100644
--- a/code/modules/hydroponics/biogenerator.dm
+++ b/code/modules/hydroponics/biogenerator.dm
@@ -10,7 +10,7 @@
var/processing = FALSE
- var/obj/item/reagent_containers/glass/beaker = null
+ var/obj/item/reagent_containers/cup/beaker = null
var/points = 0
var/efficiency = 0
var/productivity = 0
@@ -91,7 +91,7 @@
if(default_deconstruction_screwdriver(user, "biogen-empty-o", "biogen-empty", O))
if(beaker)
- var/obj/item/reagent_containers/glass/B = beaker
+ var/obj/item/reagent_containers/cup/B = beaker
B.forceMove(drop_location())
beaker = null
ui_update()
@@ -101,7 +101,7 @@
if(default_deconstruction_crowbar(O))
return
- if(istype(O, /obj/item/reagent_containers/glass))
+ if(istype(O, /obj/item/reagent_containers/cup))
. = 1 //no afterattack
if(!panel_open)
if(beaker)
diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm
index e23f4ed6ee784..8b995fb82dafe 100644
--- a/code/modules/hydroponics/hydroitemdefines.dm
+++ b/code/modules/hydroponics/hydroitemdefines.dm
@@ -153,50 +153,50 @@
// *************************************
-/obj/item/reagent_containers/glass/bottle/nutrient
+/obj/item/reagent_containers/cup/bottle/nutrient
name = "bottle of nutrient"
volume = 50
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(1,2,5,10,15,25,50)
-/obj/item/reagent_containers/glass/bottle/nutrient/Initialize(mapload)
+/obj/item/reagent_containers/cup/bottle/nutrient/Initialize(mapload)
. = ..()
pixel_x = base_pixel_x + rand(-5, 5)
pixel_y = base_pixel_y + rand(-5, 5)
-/obj/item/reagent_containers/glass/bottle/nutrient/ez
+/obj/item/reagent_containers/cup/bottle/nutrient/ez
name = "bottle of E-Z-Nutrient"
desc = "Contains a fertilizer that causes mild mutations with each harvest."
list_reagents = list(/datum/reagent/plantnutriment/eznutriment = 50)
icon_state_preview = "bottle_eznutrient"
-/obj/item/reagent_containers/glass/bottle/nutrient/l4z
+/obj/item/reagent_containers/cup/bottle/nutrient/l4z
name = "bottle of Left 4 Zed"
desc = "Contains a fertilizer that limits plant yields to no more than one and causes significant mutations in plants."
list_reagents = list(/datum/reagent/plantnutriment/left4zednutriment = 50)
icon_state_preview = "bottle_left4zed"
-/obj/item/reagent_containers/glass/bottle/nutrient/rh
+/obj/item/reagent_containers/cup/bottle/nutrient/rh
name = "bottle of Robust Harvest"
desc = "Contains a fertilizer that increases the yield of a plant by 30% while causing no mutations."
list_reagents = list(/datum/reagent/plantnutriment/robustharvestnutriment = 50)
icon_state_preview = "bottle_robustharvest"
-/obj/item/reagent_containers/glass/bottle/nutrient/empty
+/obj/item/reagent_containers/cup/bottle/nutrient/empty
name = "bottle"
-/obj/item/reagent_containers/glass/bottle/killer
+/obj/item/reagent_containers/cup/bottle/killer
volume = 50
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(1,2,5,10,15,25,50)
-/obj/item/reagent_containers/glass/bottle/killer/weedkiller
+/obj/item/reagent_containers/cup/bottle/killer/weedkiller
name = "bottle of weed killer"
desc = "Contains a herbicide."
list_reagents = list(/datum/reagent/toxin/plantbgone/weedkiller = 50)
-/obj/item/reagent_containers/glass/bottle/killer/pestkiller
+/obj/item/reagent_containers/cup/bottle/killer/pestkiller
name = "bottle of pest spray"
desc = "Contains a pesticide."
list_reagents = list(/datum/reagent/toxin/pestkiller = 50)
diff --git a/code/modules/jobs/job_mail.dm b/code/modules/jobs/job_mail.dm
index 3e2e6525e4a18..9a5d816947ad4 100644
--- a/code/modules/jobs/job_mail.dm
+++ b/code/modules/jobs/job_mail.dm
@@ -27,20 +27,20 @@
/datum/job/bartender
mail_goodies = list(
/obj/item/storage/box/rubbershot = 30,
- /obj/item/reagent_containers/glass/bottle/clownstears = 10,
+ /obj/item/reagent_containers/cup/bottle/clownstears = 10,
/obj/item/stack/sheet/mineral/plasma = 5,
/obj/item/stack/sheet/mineral/uranium = 5,
- /obj/item/reagent_containers/food/drinks/bottle/fernet = 3,
- /obj/item/reagent_containers/food/drinks/bottle/champagne = 3,
- /obj/item/reagent_containers/food/drinks/bottle/trappist = 3,
+ /obj/item/reagent_containers/cup/glass/bottle/fernet = 3,
+ /obj/item/reagent_containers/cup/glass/bottle/champagne = 3,
+ /obj/item/reagent_containers/cup/glass/bottle/trappist = 3,
)
//BOTANIST
/datum/job/botanist
mail_goodies = list(
- /obj/item/reagent_containers/glass/bottle/saltpetre = 15,
- /obj/item/reagent_containers/glass/bottle/diethylamine = 15,
- /obj/item/reagent_containers/glass/bottle/toxin/mutagen = 12,
+ /obj/item/reagent_containers/cup/bottle/saltpetre = 15,
+ /obj/item/reagent_containers/cup/bottle/diethylamine = 15,
+ /obj/item/reagent_containers/cup/bottle/toxin/mutagen = 12,
/obj/item/grenade/chem_grenade/antiweed = 10,
/obj/item/gun/energy/floragun = 5,
// These are strong, rare seeds, so use sparingly.
@@ -66,7 +66,7 @@
/obj/item/pen/fountain/captain = 10,
/obj/item/coin/plasma = 7,
/obj/item/storage/fancy/cigarettes/cigars/havana = 5,
- /obj/item/reagent_containers/food/drinks/bottle/champagne = 5,
+ /obj/item/reagent_containers/cup/glass/bottle/champagne = 5,
/obj/item/ammo_box/n762 = 2,
/obj/item/gun/ballistic/revolver/nagant = 1,
)
@@ -84,7 +84,7 @@
//CHAPLAIN
/datum/job/chaplain
mail_goodies = list(
- /obj/item/reagent_containers/food/drinks/bottle/holywater = 15,
+ /obj/item/reagent_containers/cup/glass/bottle/holywater = 15,
/obj/item/storage/book/bible = 10,
/obj/item/grenade/chem_grenade/holy = 5,
/obj/item/toy/plush/awakenedplushie = 3,
@@ -95,11 +95,11 @@
//CHEMIST
/datum/job/chemist
mail_goodies = list(
- /obj/item/reagent_containers/glass/bottle/flash_powder = 15,
+ /obj/item/reagent_containers/cup/bottle/flash_powder = 15,
/obj/item/reagent_containers/dropper = 10,
- /obj/item/reagent_containers/glass/beaker/large = 10,
- /obj/item/reagent_containers/glass/beaker/plastic = 10,
- /obj/item/reagent_containers/glass/bottle/ketamine = 5,
+ /obj/item/reagent_containers/cup/beaker/large = 10,
+ /obj/item/reagent_containers/cup/beaker/plastic = 10,
+ /obj/item/reagent_containers/cup/bottle/ketamine = 5,
)
//CHIEF ENGINEER
@@ -107,7 +107,7 @@
mail_goodies = list(
//you know. for poly
/obj/item/food/cracker = 15,
- /obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 15,
+ /obj/item/reagent_containers/cup/soda_cans/thirteenloko = 15,
/obj/item/rcd_ammo = 10,
/obj/item/wrench/caravan = 3,
/obj/item/wirecutters/caravan = 3,
@@ -146,12 +146,12 @@
//COOK
/datum/job/cook
mail_goodies = list(
- /obj/item/reagent_containers/glass/bottle/caramel = 20,
- /obj/item/reagent_containers/food/condiment/flour = 20,
- /obj/item/reagent_containers/food/condiment/rice = 20,
- /obj/item/reagent_containers/food/condiment/enzyme = 15,
- /obj/item/reagent_containers/food/condiment/soymilk = 15,
- /obj/item/reagent_containers/food/condiment/milk = 15,
+ /obj/item/reagent_containers/cup/bottle/caramel = 20,
+ /obj/item/reagent_containers/condiment/flour = 20,
+ /obj/item/reagent_containers/condiment/rice = 20,
+ /obj/item/reagent_containers/condiment/enzyme = 15,
+ /obj/item/reagent_containers/condiment/soymilk = 15,
+ /obj/item/reagent_containers/condiment/milk = 15,
//UR SO FAT!
/obj/item/food/mint = 12,
/obj/item/storage/box/ingredients/wildcard = 10,
@@ -194,7 +194,7 @@
mail_goodies = list(
/obj/item/storage/fancy/cigarettes = 15,
/obj/item/ammo_box/c38 = 10,
- /obj/item/reagent_containers/food/drinks/bottle/rum = 10,
+ /obj/item/reagent_containers/cup/glass/bottle/rum = 10,
/obj/item/ammo_box/c38/dumdum = 5,
/obj/item/ammo_box/c38/hotshot = 5,
/obj/item/ammo_box/c38/iceblox = 5,
@@ -306,7 +306,7 @@
mail_goodies = list(
/obj/item/healthanalyzer/advanced = 10,
/obj/item/storage/pill_bottle/epinephrine = 8,
- /obj/item/reagent_containers/glass/bottle/formaldehyde = 6,
+ /obj/item/reagent_containers/cup/bottle/formaldehyde = 6,
/obj/effect/spawner/mail/advmedtool = 4,
/obj/effect/spawner/mail/organminor = 5,
/obj/effect/spawner/mail/organmajor = 1,
@@ -317,7 +317,7 @@
mail_goodies = list(
/obj/item/food/baguette/mime = 15,
/obj/item/food/cheese/wheel = 10,
- /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing = 10,
+ /obj/item/reagent_containers/cup/glass/bottle/bottleofnothing = 10,
/obj/item/book/mimery = 2,
//when you thought it could get worse...
/obj/item/book/granter/spell/mimery_blockade = 1,
@@ -406,7 +406,7 @@
/datum/job/station_engineer
mail_goodies = list(
/obj/item/storage/box/lights/mixed = 15,
- /obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 15,
+ /obj/item/reagent_containers/cup/soda_cans/thirteenloko = 15,
/obj/item/lightreplacer = 10,
/obj/item/holosign_creator/engineering = 8,
//An assistant can only dream of those...
@@ -420,9 +420,9 @@
//keep your workplace clean, please.
/obj/item/reagent_containers/spray/cleaner = 15,
/obj/item/food/monkeycube = 10,
- /obj/item/reagent_containers/glass/bottle/formaldehyde = 10,
- /obj/item/reagent_containers/glass/bottle/random_virus/minor = 10,
- /obj/item/reagent_containers/glass/bottle/random_virus = 5,
+ /obj/item/reagent_containers/cup/bottle/formaldehyde = 10,
+ /obj/item/reagent_containers/cup/bottle/random_virus/minor = 10,
+ /obj/item/reagent_containers/cup/bottle/random_virus = 5,
/obj/item/stock_parts/scanning_module/phasic = 5,
//hampter.
/obj/item/choice_beacon/pet/hamster = 5,
@@ -436,7 +436,7 @@
/obj/item/clothing/ears/headphones = 10,
//Only on the iScream 12
/obj/item/clothing/under/syndicate/tacticool = 10,
- /obj/item/reagent_containers/food/drinks/flask/gold = 10,
+ /obj/item/reagent_containers/cup/glass/flask/gold = 10,
/obj/item/choice_beacon/pet = 5,
/obj/item/storage/bag/money = 5,
/obj/item/coin/gold = 5,
diff --git a/code/modules/jobs/job_types/mime.dm b/code/modules/jobs/job_types/mime.dm
index a6a74bc713df7..4f9a5c62911a7 100644
--- a/code/modules/jobs/job_types/mime.dm
+++ b/code/modules/jobs/job_types/mime.dm
@@ -50,7 +50,7 @@
suit = /obj/item/clothing/suit/suspenders
backpack_contents = list(
/obj/item/book/mimery=1,
- /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing=1,
+ /obj/item/reagent_containers/cup/glass/bottle/bottleofnothing=1,
/obj/item/stamp/mime=1
)
diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm
index f62fc62f87519..b29d72a80de34 100644
--- a/code/modules/mining/abandoned_crates.dm
+++ b/code/modules/mining/abandoned_crates.dm
@@ -123,9 +123,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/cup/glass/bottle/rum(src)
new /obj/item/food/grown/ambrosia/deus(src)
- new /obj/item/reagent_containers/food/drinks/bottle/whiskey(src)
+ new /obj/item/reagent_containers/cup/glass/bottle/whiskey(src)
new /obj/item/lighter(src)
if(6 to 10)
new /obj/item/bedsheet(src)
@@ -136,7 +136,7 @@
new /obj/item/hatchet(src)
new /obj/item/crowbar(src)
if(11 to 15)
- new /obj/item/reagent_containers/glass/beaker/bluespace(src)
+ new /obj/item/reagent_containers/cup/beaker/bluespace(src)
if(16 to 20)
new /obj/item/stack/ore/diamond(src, 10)
if(21 to 25)
@@ -144,7 +144,7 @@
new /obj/item/poster/random_contraband(src)
if(26 to 30)
for(var/i in 1 to 3)
- new /obj/item/reagent_containers/glass/beaker/noreact(src)
+ new /obj/item/reagent_containers/cup/beaker/noreact(src)
if(31 to 35)
new /obj/item/seeds/firelemon(src)
if(36 to 40)
@@ -235,7 +235,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/cup/glass/bottle/bottleofnothing(src)
if(96)
new /obj/item/hand_tele(src)
if(97)
diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm
index 1414d9a7abee0..a060e75ef0b1f 100644
--- a/code/modules/mining/lavaland/ash_flora.dm
+++ b/code/modules/mining/lavaland/ash_flora.dm
@@ -292,13 +292,13 @@
//CRAFTING
-/obj/item/reagent_containers/glass/bowl/mushroom_bowl
+/obj/item/reagent_containers/cup/bowl/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'
icon_state = "mushroom_bowl"
-/obj/item/reagent_containers/glass/bowl/mushroom_bowl/update_icon()
+/obj/item/reagent_containers/cup/bowl/mushroom_bowl/update_icon()
cut_overlays()
if(reagents?.total_volume)
var/mutable_appearance/filling = mutable_appearance('icons/obj/lavaland/ash_flora.dmi', "fullbowl")
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index a60c049535526..88aa17293bc9a 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -45,8 +45,8 @@
/obj/item/gun/magic/hook = 5,
/obj/item/book_of_babel = 5,
/obj/item/clothing/neck/necklace/memento_mori = 5,
- /obj/item/reagent_containers/glass/waterbottle/relic = 5,
- /obj/item/reagent_containers/glass/bottle/necropolis_seed = 5,
+ /obj/item/reagent_containers/cup/glass/waterbottle/relic = 5,
+ /obj/item/reagent_containers/cup/bottle/necropolis_seed = 5,
/obj/item/borg/upgrade/modkit/lifesteal = 5,
/obj/item/shared_storage/red = 5,
/obj/item/staff/storm = 5
@@ -302,13 +302,13 @@
qdel(src)
// Relic water bottle
-/obj/item/reagent_containers/glass/waterbottle/relic
+/obj/item/reagent_containers/cup/glass/waterbottle/relic
name = "ancient bottle of unknown reagent"
desc = "A bottle of water filled with unknown liquids. It seems to be radiating some kind of energy."
flip_chance = 100 // FLIPP
list_reagents = list()
-/obj/item/reagent_containers/glass/waterbottle/relic/Initialize(mapload)
+/obj/item/reagent_containers/cup/glass/waterbottle/relic/Initialize(mapload)
var/reagents = volume
while(reagents)
var/newreagent = rand(1, min(reagents, 30))
@@ -588,16 +588,16 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/shared_storage/blue)
//Potion of Flight
-/obj/item/reagent_containers/glass/bottle/potion
+/obj/item/reagent_containers/cup/bottle/potion
icon = 'icons/obj/lavaland/artefacts.dmi'
icon_state = "potionflask"
-/obj/item/reagent_containers/glass/bottle/potion/flight
+/obj/item/reagent_containers/cup/bottle/potion/flight
name = "strange elixir"
desc = "A flask with an almost-holy aura emitting from it. The label on the bottle says: 'erqo'hyy tvi'rf lbh jv'atf'."
list_reagents = list(/datum/reagent/flightpotion = 5)
-/obj/item/reagent_containers/glass/bottle/potion/update_icon()
+/obj/item/reagent_containers/cup/bottle/potion/update_icon()
if(reagents.total_volume)
icon_state = "potionflask"
else
diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm
index 976f4a1babf2b..f6fdc63876da6 100644
--- a/code/modules/mining/machine_vending.dm
+++ b/code/modules/mining/machine_vending.dm
@@ -210,8 +210,8 @@
new /datum/data/vendor_equipment("Point Transfer Card", /obj/item/card/mining_point_card, 500),
new /datum/data/vendor_equipment("GAR Mesons", /obj/item/clothing/glasses/meson/gar, 500),
new /datum/data/vendor_equipment("Pizza", /obj/item/pizzabox/margherita, 200),
- new /datum/data/vendor_equipment("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 100),
- new /datum/data/vendor_equipment("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe/premium, 100),
+ new /datum/data/vendor_equipment("Whiskey", /obj/item/reagent_containers/cup/glass/bottle/whiskey, 100),
+ new /datum/data/vendor_equipment("Absinthe", /obj/item/reagent_containers/cup/glass/bottle/absinthe/premium, 100),
new /datum/data/vendor_equipment("Cigar", /obj/item/clothing/mask/cigarette/cigar/havana, 150),
new /datum/data/vendor_equipment("Soap", /obj/item/soap/nanotrasen, 200),
new /datum/data/vendor_equipment("Laser Pointer", /obj/item/laser_pointer, 300),
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 4135e320427ed..3a3cd3f151ba2 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -444,7 +444,7 @@
/obj/item/melee/flyswatter,
/obj/item/extinguisher/mini,
/obj/item/mop/cyborg,
- /obj/item/reagent_containers/glass/bucket,
+ /obj/item/reagent_containers/cup/bucket,
/obj/item/paint/paint_remover,
/obj/item/lightreplacer/cyborg,
/obj/item/holosign_creator/janibarrier,
@@ -537,7 +537,7 @@
/obj/item/robot_module/butler/respawn_consumable(mob/living/silicon/robot/R, coeff = 1)
..()
- var/obj/item/reagent_containers/O = locate(/obj/item/reagent_containers/food/condiment/enzyme) in basic_modules
+ var/obj/item/reagent_containers/O = locate(/obj/item/reagent_containers/condiment/enzyme) in basic_modules
if(O)
O.reagents.add_reagent(/datum/reagent/consumable/enzyme, 2 * coeff)
diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
index 9d3538e7f328f..de563e52cd4fa 100644
--- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
@@ -281,7 +281,7 @@
visible_message("[src] blows apart!")
var/atom/Tsec = drop_location()
- new /obj/item/reagent_containers/glass/bucket(Tsec)
+ new /obj/item/reagent_containers/cup/bucket(Tsec)
new /obj/item/assembly/prox_sensor(Tsec)
diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm
index 5ed4af3b31cee..3591e458aeb59 100644
--- a/code/modules/mob/living/simple_animal/bot/medbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/medbot.dm
@@ -83,7 +83,7 @@ GLOBAL_VAR(medibot_unique_id_gen)
skin = MEDBOT_SKIN_ADVANCED
heal_threshold = 30
declare_crit = TRUE
- reagent_glass = new /obj/item/reagent_containers/glass/beaker/large/kelobic
+ reagent_glass = new /obj/item/reagent_containers/cup/beaker/large/kelobic
/mob/living/simple_animal/bot/medbot/update_icon()
cut_overlays()
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index 1b3270e5893a9..b7bd499d3fd2f 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -55,7 +55,7 @@
/mob/living/simple_animal/bot/secbot/beepsky/explode()
var/atom/Tsec = drop_location()
new /obj/item/stock_parts/cell/potato(Tsec)
- var/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/S = new(Tsec)
+ var/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass/S = new(Tsec)
S.reagents.add_reagent(/datum/reagent/consumable/ethanol/whiskey, 15)
S.on_reagent_change(ADD_REAGENT)
..()
diff --git a/code/modules/mob/living/simple_animal/hostile/goose.dm b/code/modules/mob/living/simple_animal/hostile/goose.dm
index c44136d588143..5701f4712fb73 100644
--- a/code/modules/mob/living/simple_animal/hostile/goose.dm
+++ b/code/modules/mob/living/simple_animal/hostile/goose.dm
@@ -111,10 +111,10 @@
/mob/living/simple_animal/hostile/retaliate/goose/vomit/proc/barf_food(atom/A, hard = FALSE)
if (stat == DEAD)
return
- if(!istype(A, /obj/item/reagent_containers/food))
+ if(!istype(A, /obj/item/food))
return
var/turf/currentTurf = get_turf(src)
- var/obj/item/reagent_containers/food/consumed = A
+ var/obj/item/food/consumed = A
consumed.forceMove(currentTurf)
var/destination = get_edge_target_turf(currentTurf, pick(GLOB.alldirs)) //Pick a random direction to toss them in
var/throwRange = hard ? rand(2,8) : 1
@@ -174,7 +174,7 @@
"vomit" = CALLBACK(src, PROC_REF(vomit_prestart), 25)), 20)
/mob/living/simple_animal/hostile/retaliate/goose/vomit/proc/eat()
- var/obj/item/reagent_containers/food/tasty = locate() in get_turf(src)
+ var/obj/item/food/tasty = locate() in get_turf(src)
if (tasty)
feed(tasty)
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
index 55816114f20c1..55c9e72cdff48 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
@@ -328,7 +328,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/food/grown/banana = 1, /obj/item/megaphone/clown = 1, /obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter = 1, /obj/item/pneumatic_cannon/pie = 1))
+ backpack_contents += pick(list(/obj/item/stamp/clown = 1, /obj/item/reagent_containers/spray/waterflower = 1, /obj/item/food/grown/banana = 1, /obj/item/megaphone/clown = 1, /obj/item/reagent_containers/cup/soda_cans/canned_laughter = 1, /obj/item/pneumatic_cannon/pie = 1))
if(prob(30))
backpack_contents += list(/obj/item/stack/sheet/mineral/bananium = pick_weight(list( 1 = 3, 2 = 2, 3 = 1)))
if(prob(10))
@@ -377,5 +377,5 @@
r_pocket = /obj/item/restraints/legcuffs/bola/cult
l_pocket = /obj/item/melee/cultblade/dagger
glasses = /obj/item/clothing/glasses/hud/health/night/cultblind
- backpack_contents = list(/obj/item/reagent_containers/food/drinks/bottle/unholywater = 1, /obj/item/cult_shift = 1, /obj/item/flashlight/flare/culttorch = 1, /obj/item/stack/sheet/runed_metal = 15)
+ backpack_contents = list(/obj/item/reagent_containers/cup/glass/bottle/unholywater = 1, /obj/item/cult_shift = 1, /obj/item/flashlight/flare/culttorch = 1, /obj/item/stack/sheet/runed_metal = 15)
. = ..()
diff --git a/code/modules/modular_computers/file_system/programs/phys_scanner.dm b/code/modules/modular_computers/file_system/programs/phys_scanner.dm
index d98c8d71917f8..6a81c41c8b27f 100644
--- a/code/modules/modular_computers/file_system/programs/phys_scanner.dm
+++ b/code/modules/modular_computers/file_system/programs/phys_scanner.dm
@@ -46,7 +46,7 @@
user.visible_message("[user] analyzes [carbon]'s vitals.", "You analyze [carbon]'s vitals.")
last_record = chemscan(user, carbon, to_chat = FALSE)
return FALSE
- else if(!istype(target, /obj/item/reagent_containers/pill/floorpill) && !istype(target, /obj/item/reagent_containers/glass/chem_heirloom))
+ else if(!istype(target, /obj/item/reagent_containers/pill/floorpill) && !istype(target, /obj/item/reagent_containers/cup/chem_heirloom))
if(!isnull(target.reagents))
if(target.reagents.reagent_list.len > 0)
var/reagents_length = target.reagents.reagent_list.len
diff --git a/code/modules/ninja/suit/suit_attackby.dm b/code/modules/ninja/suit/suit_attackby.dm
index 0e70569dc52e2..a517c67c4d8b3 100644
--- a/code/modules/ninja/suit/suit_attackby.dm
+++ b/code/modules/ninja/suit/suit_attackby.dm
@@ -4,7 +4,7 @@
if(U!=affecting)//Safety, in case you try doing this without wearing the suit/being the person with the suit.
return ..()
- if(istype(I, /obj/item/reagent_containers/glass))//If it's a glass beaker.
+ if(istype(I, /obj/item/reagent_containers/cup))//If it's a glass beaker.
if(I.reagents.has_reagent(/datum/reagent/uranium/radium, a_transfer) && a_boost < a_maxamount)
I.reagents.remove_reagent(/datum/reagent/uranium/radium, a_transfer)
a_boost++;
diff --git a/code/modules/paperwork/fax.dm b/code/modules/paperwork/fax.dm
index c23cb96a3e0f9..a7e8f654cd2e4 100644
--- a/code/modules/paperwork/fax.dm
+++ b/code/modules/paperwork/fax.dm
@@ -205,7 +205,7 @@
user.visible_message("[user] cleans \the [src].", "You clean \the [src].")
jammed = FALSE
return TRUE
- if(istype(item, /obj/item/soap) || istype(item, /obj/item/reagent_containers/glass/rag))
+ if(istype(item, /obj/item/soap) || istype(item, /obj/item/reagent_containers/cup/rag))
var/cleanspeed = 50
if(istype(item, /obj/item/soap))
var/obj/item/soap/used_soap = item
@@ -434,7 +434,7 @@
return "[state_prefix]_cash"
if(istype(item, /obj/item/card))
return "[state_prefix]_id"
- if(istype(item, /obj/item/reagent_containers/food))
+ if (istype(item, /obj/item/food))
return "[state_prefix]_food"
if(istype(item, /obj/item/throwing_star))
return "[state_prefix]_star"
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index 23505e0d756c8..901dae2967aa7 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -78,7 +78,7 @@
/obj/machinery/chem_master/RefreshParts()
reagents.maximum_volume = 0
- for(var/obj/item/reagent_containers/glass/beaker/B in component_parts)
+ for(var/obj/item/reagent_containers/cup/beaker/B in component_parts)
reagents.maximum_volume += B.reagents.maximum_volume
/obj/machinery/chem_master/ex_act(severity, target)
@@ -445,9 +445,9 @@
reagents.trans_to(P, vol_each, transfered_by = usr)
. = TRUE
if("bottle")
- var/obj/item/reagent_containers/glass/bottle/P
+ var/obj/item/reagent_containers/cup/bottle/P
for(var/i in 1 to amount)
- P = new/obj/item/reagent_containers/glass/bottle(drop_location())
+ P = new/obj/item/reagent_containers/cup/bottle(drop_location())
P.name = trim("[name] bottle")
P.label_name = trim(name)
adjust_item_drop_location(P)
@@ -463,9 +463,9 @@
reagents.trans_to(P, vol_each, transfered_by = usr)
. = TRUE
if("condimentPack")
- var/obj/item/reagent_containers/food/condiment/pack/P
+ var/obj/item/reagent_containers/condiment/pack/P
for(var/i in 1 to amount)
- P = new/obj/item/reagent_containers/food/condiment/pack(drop_location())
+ P = new/obj/item/reagent_containers/condiment/pack(drop_location())
P.originalname = name
P.name = trim("[name] pack")
P.label_name = trim(name)
@@ -473,9 +473,9 @@
reagents.trans_to(P, vol_each, transfered_by = usr)
. = TRUE
if("condimentBottle")
- var/obj/item/reagent_containers/food/condiment/P
+ var/obj/item/reagent_containers/condiment/P
for(var/i in 1 to amount)
- P = new/obj/item/reagent_containers/food/condiment(drop_location())
+ P = new/obj/item/reagent_containers/condiment(drop_location())
if (style)
apply_condi_style(P, style)
P.renamedByPlayer = TRUE
@@ -579,11 +579,11 @@
"frostoil" = list("icon_state" = "coldsauce", "icon_empty" = "", "name" = "coldsauce bottle", "desc" = "Leaves the tongue numb from its passage."),
"mayonnaise" = list("icon_state" = "mayonnaise", "icon_empty" = "", "name" = "mayonnaise bottle", "desc" = "An oily condiment made from egg yolks."),
"ketchup" = list("icon_state" = "ketchup", "icon_empty" = "", "name" = "ketchup bottle", "desc" = "A tomato slurry in a tall plastic bottle. Somehow still vaguely American."),
- "blackpepper" = list("icon_state" = "peppermillsmall", "inhand_icon_state" = "", "icon_empty" = "emptyshaker", "name" = "pepper mill", "desc" = "Often used to flavor food or make people sneeze."),
- "sodiumchloride" = list("icon_state" = "saltshakersmall", "inhand_icon_state" = "", "icon_empty" = "emptyshaker", "name" = "salt shaker", "desc" = "Salt. From dead crew, presumably."),
+ "blackpepper" = list("icon_state" = "peppermillsmall", "item_state" = "", "icon_empty" = "emptyshaker", "name" = "pepper mill", "desc" = "Often used to flavor food or make people sneeze."),
+ "sodiumchloride" = list("icon_state" = "saltshakersmall", "item_state" = "", "icon_empty" = "emptyshaker", "name" = "salt shaker", "desc" = "Salt. From dead crew, presumably."),
"milk" = list("icon_state" = "milk", "icon_empty" = "", "name" = "space milk", "desc" = "It's milk. White and nutritious goodness!"),
"soymilk" = list("icon_state" = "soymilk", "icon_empty" = "", "name" = "soy milk", "desc" = "It's soy milk. White and nutritious goodness!"),
- "soysauce" = list("icon_state" = "soysauce", "inhand_icon_state" = "", "icon_empty" = "", "name" = "soy sauce bottle", "desc" = "A salty soy-based flavoring."),
+ "soysauce" = list("icon_state" = "soysauce", "item_state" = "", "icon_empty" = "", "name" = "soy sauce bottle", "desc" = "A salty soy-based flavoring."),
"bbqsauce" = list("icon_state" = "bbqsauce", "icon_empty" = "", "name" = "bbq sauce bottle", "desc" = "Hand wipes not included."),
"oliveoil" = list("icon_state" = "oliveoil", "icon_empty" = "", "name" = "olive oil bottle", "desc" = "A delicious oil made from olives."),
"cooking_oil" = list("icon_state" = "cooking_oil", "icon_empty" = "", "name" = "cooking oil bottle", "desc" = "A cooking oil for deep frying."),
@@ -633,7 +633,7 @@
* * container - condiment bottle that gets style applied to it
* * style - assoc list, must probably one from [/obj/machinery/chem_master/proc/get_condi_styles]
*/
-/obj/machinery/chem_master/proc/apply_condi_style(obj/item/reagent_containers/food/condiment/container, list/style)
+/obj/machinery/chem_master/proc/apply_condi_style(obj/item/reagent_containers/condiment/container, list/style)
container.name = style["name"]
container.desc = style["desc"]
container.icon_state = style["icon_state"]
diff --git a/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm b/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm
index 88a2060870adf..f0a6b97a0a6fa 100644
--- a/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm
@@ -58,7 +58,7 @@
if("makecup")
if(beaker)
return
- beaker = new /obj/item/reagent_containers/glass/beaker/bluespace(src)
+ beaker = new /obj/item/reagent_containers/cup/beaker/bluespace(src)
visible_message("[src] dispenses a bluespace beaker.")
. = TRUE
if("amount")
diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm
index 504a8c0f002fa..a526058e5270a 100644
--- a/code/modules/reagents/chemistry/machinery/pandemic.dm
+++ b/code/modules/reagents/chemistry/machinery/pandemic.dm
@@ -222,7 +222,7 @@
new_disease.dormant = FALSE
new_disease.Refresh()
var/list/data = list("viruses" = list(new_disease))
- var/obj/item/reagent_containers/glass/bottle/culture_bottle = new(drop_location())
+ var/obj/item/reagent_containers/cup/bottle/culture_bottle = new(drop_location())
culture_bottle.name = "[new_disease.name] culture bottle"
culture_bottle.desc = "A small bottle. Contains [new_disease.agent] culture in synthblood medium."
culture_bottle.reagents.add_reagent(/datum/reagent/blood, 20, data)
@@ -237,7 +237,7 @@
return
var/id = params["index"]
var/datum/disease/disease = SSdisease.archive_diseases[id]
- var/obj/item/reagent_containers/glass/bottle/vaccine_bottle = new(drop_location())
+ var/obj/item/reagent_containers/cup/bottle/vaccine_bottle = new(drop_location())
vaccine_bottle.name = "[disease.name] vaccine bottle"
vaccine_bottle.reagents.add_reagent(/datum/reagent/vaccine, 15, list(id))
var/turf/source_turf = get_turf(src)
diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
index fd8c83a09d5ea..e954d56382520 100644
--- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
@@ -31,7 +31,7 @@
if(!typecache_to_take)
typecache_to_take = typecacheof(/obj/item/food/grown)
holdingitems = list()
- beaker = new /obj/item/reagent_containers/glass/beaker/large(src)
+ beaker = new /obj/item/reagent_containers/cup/beaker/large(src)
beaker.desc += " May contain blended dust. Don't breathe this in!"
/obj/machinery/reagentgrinder/constructed/Initialize(mapload)
diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
index 0e8b74875a4bc..1adcace891a97 100644
--- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
@@ -901,6 +901,26 @@
glass_name = "glass of chocolate milk"
glass_desc = "Brown and delicious goodness!"
+/datum/reagent/consumable/hot_cocoa
+ name = "Hot Coco"
+ description = "Made with love! And coco beans."
+ nutriment_factor = 4 * REAGENTS_METABOLISM
+ color = "#403010" // rgb: 64, 48, 16
+ taste_description = "creamy chocolate"
+ glass_icon_state = "chocolateglass"
+ glass_name = "glass of hot coco"
+ glass_desc = "A favorite winter drink to warm you up."
+ chem_flags = CHEMICAL_RNG_BOTANY
+
+/datum/reagent/consumable/hot_cocoa/on_mob_life(mob/living/carbon/M)
+ M.adjust_bodytemperature(5 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal())
+ if(M.getBruteLoss() && prob(20))
+ M.heal_bodypart_damage(1,0, 0)
+ . = 1
+ if(holder.has_reagent(/datum/reagent/consumable/capsaicin))
+ holder.remove_reagent(/datum/reagent/consumable/capsaicin, 2)
+ ..()
+
/datum/reagent/consumable/menthol
name = "Menthol"
description = "Alleviates coughing symptoms one might have."
@@ -964,6 +984,21 @@
M.adjust_bodytemperature(10 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal())
..()
+/datum/reagent/consumable/sol_dry
+ name = "Sol Dry"
+ description = "A soothing, mellow drink made from ginger."
+ color = "#f7d26a"
+ quality = DRINK_NICE
+ taste_description = "sweet ginger spice"
+ glass_icon_state = "soldry"
+ glass_name = "Sol Dry"
+ glass_desc = "A soothing, mellow drink made from ginger."
+ chem_flags = CHEMICAL_RNG_BOTANY | CHEMICAL_GOAL_BARTENDER_SERVING
+
+/datum/reagent/consumable/sol_dry/on_mob_life(mob/living/carbon/M)
+ M.adjust_disgust(-5)
+ ..()
+
/datum/reagent/consumable/red_queen
name = "Red Queen"
description = "DRINK ME."
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index 2451329f80abe..345901695efff 100755
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -372,24 +372,6 @@
to_chat(M, "Your insides revolt at the presence of lethal chocolate!")
M.vomit(20)
-
-
-/datum/reagent/consumable/cocoa/hot_cocoa
- name = "Hot Chocolate"
- description = "Made with love! And cocoa beans."
- reagent_state = LIQUID
- nutriment_factor = 3 * REAGENTS_METABOLISM
- color = "#403010" // rgb: 64, 48, 16
- chem_flags = CHEMICAL_RNG_GENERAL | CHEMICAL_RNG_FUN | CHEMICAL_RNG_BOTANY
- taste_description = "creamy chocolate"
- glass_icon_state = "chocolateglass"
- glass_name = "glass of chocolate"
- glass_desc = "Tasty."
-
-/datum/reagent/consumable/cocoa/hot_cocoa/on_mob_life(mob/living/carbon/M)
- M.adjust_bodytemperature(5 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL)
- ..()
-
/datum/reagent/drug/mushroomhallucinogen
name = "Mushroom Hallucinogen"
description = "A strong hallucinogenic drug derived from certain species of mushroom."
diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
index 7a29f2621d69f..6fca3dfe74e6f 100644
--- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm
+++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
@@ -673,5 +673,5 @@
required_container = /obj/item/slime_extract/rainbow
/datum/chemical_reaction/slime/flight_potion/on_reaction(datum/reagents/holder)
- new /obj/item/reagent_containers/glass/bottle/potion/flight(get_turf(holder.my_atom))
+ new /obj/item/reagent_containers/cup/bottle/potion/flight(get_turf(holder.my_atom))
..()
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index 97516887556a5..f2998e7f8de6b 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -64,10 +64,49 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/reagent_containers)
balloon_alert(user, "Transferring [amount_per_transfer_from_this]u.")
return
-/obj/item/reagent_containers/attack(mob/M, mob/user, def_zone)
+/obj/item/reagent_containers/attack(mob/living/target_mob, mob/living/user, params)
if(user.a_intent == INTENT_HARM)
return ..()
+/// Tries to splash the target. Used on both right-click and normal click when in combat mode.
+/obj/item/reagent_containers/proc/try_splash(mob/user, atom/target)
+ if (!spillable)
+ return FALSE
+
+ if (!reagents?.total_volume)
+ return FALSE
+
+ var/punctuation = ismob(target) ? "!" : "."
+
+ var/reagent_text
+ user.visible_message(
+ "[user] splashes the contents of [src] onto [target][punctuation]",
+ "You splash the contents of [src] onto [target][punctuation]",
+ ignored_mobs = target,
+ )
+
+ if (ismob(target))
+ var/mob/target_mob = target
+ target_mob.show_message(
+ "[user] splash the contents of [src] onto you!",
+ MSG_VISUAL,
+ "You feel drenched!",
+ )
+
+ for(var/datum/reagent/reagent as anything in reagents.reagent_list)
+ reagent_text += "[reagent] ([num2text(reagent.volume)]),"
+
+ var/mob/thrown_by = thrownby?.resolve()
+ if(isturf(target) && reagents.reagent_list.len && thrown_by)
+ log_combat(thrown_by, target, "splashed (thrown) [english_list(reagents.reagent_list)]")
+ message_admins("[ADMIN_LOOKUPFLW(thrown_by)] splashed (thrown) [english_list(reagents.reagent_list)] on [target] at [ADMIN_VERBOSEJMP(target)].")
+
+ reagents.reaction(target, TOUCH)
+ log_combat(user, target, "splashed", reagent_text)
+ reagents.clear_reagents()
+
+ return TRUE
+
/obj/item/reagent_containers/proc/canconsume(mob/eater, mob/user)
if(!iscarbon(eater))
return FALSE
@@ -103,8 +142,8 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/reagent_containers)
if(target.CanPass(src, get_dir(target, src)) && thrown_by && HAS_TRAIT(thrown_by, TRAIT_BOOZE_SLIDER))
. = TRUE
-/obj/item/reagent_containers/proc/SplashReagents(atom/target, thrown = FALSE)
- if(!reagents || !reagents.total_volume || !spillable)
+/obj/item/reagent_containers/proc/SplashReagents(atom/target, thrown = FALSE, override_spillable = FALSE)
+ if(!reagents || !reagents.total_volume || (!spillable && !override_spillable))
return
var/mob/thrown_by = thrownby?.resolve()
diff --git a/code/modules/reagents/reagent_containers/chem_heirloom.dm b/code/modules/reagents/reagent_containers/chem_heirloom.dm
index 74ee6f208ab60..d016764561812 100644
--- a/code/modules/reagents/reagent_containers/chem_heirloom.dm
+++ b/code/modules/reagents/reagent_containers/chem_heirloom.dm
@@ -1,7 +1,7 @@
//Chemist's heirloom
#define CHEM_H_VOL 100
-/obj/item/reagent_containers/glass/chem_heirloom
+/obj/item/reagent_containers/cup/chem_heirloom
volume = CHEM_H_VOL //Set this to 0 in init. Doing otherwise breaks add_reagent
spillable = FALSE
reagent_flags = NONE
@@ -12,9 +12,9 @@
var/datum/reagent/rand_cont //Reagent of choice
var/datum/callback/roundend_callback
-CREATION_TEST_IGNORE_SUBTYPES(/obj/item/reagent_containers/glass/chem_heirloom)
+CREATION_TEST_IGNORE_SUBTYPES(/obj/item/reagent_containers/cup/chem_heirloom)
-/obj/item/reagent_containers/glass/chem_heirloom/Initialize(mapload, vol)
+/obj/item/reagent_containers/cup/chem_heirloom/Initialize(mapload, vol)
..()
volume = 0
update_icon()
@@ -22,7 +22,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/reagent_containers/glass/chem_heirloom)
SSticker.OnRoundend(roundend_callback)
update_name() //Negative.dm will call this again if it adds the heirloom component.
-/obj/item/reagent_containers/glass/chem_heirloom/examine(mob/living/carbon/user)
+/obj/item/reagent_containers/cup/chem_heirloom/examine(mob/living/carbon/user)
//Add, then remove, reagent contents for examine.
. = ..() //This makes the text out of order, but it's hardly noticeable
if(!locked)
@@ -32,14 +32,14 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/reagent_containers/glass/chem_heirloom)
smartguy = TRUE
. += "It contains:\n100 units of [smartguy ? initial(rand_cont.name) : "various reagents"]" //Luckily science goggles say nothing if there's no reagents
-/obj/item/reagent_containers/glass/chem_heirloom/update_name() //This has to be done after init, since the heirloom component is added after.
+/obj/item/reagent_containers/cup/chem_heirloom/update_name() //This has to be done after init, since the heirloom component is added after.
. = ..()
rand_cont = get_random_reagent_id(CHEMICAL_RNG_FUN)
name ="hard locked bottle of [initial(rand_cont.name)]"
var/datum/component/heirloom/H = GetComponent(/datum/component/heirloom)
desc = H ? "[ishuman(H.owner) ? "The [H.family_name]" : "[H.owner.name]'s"] family's long-cherished wish is to open this bottle and get its chemical outside. Can you make that wish come true?" : "A hard locked bottle of [initial(rand_cont.name)]."
-/obj/item/reagent_containers/glass/chem_heirloom/proc/unlock()
+/obj/item/reagent_containers/cup/chem_heirloom/proc/unlock()
if(!locked) //A little bird said this would be an issue if a goober-min tried to call this twice.
return
if(isliving(loc))
@@ -55,7 +55,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/reagent_containers/glass/chem_heirloom)
reagent_flags = OPENCONTAINER
reagents.add_reagent(rand_cont, volume) //Add reagents
-/obj/item/reagent_containers/glass/chem_heirloom/Destroy()
+/obj/item/reagent_containers/cup/chem_heirloom/Destroy()
. = ..()
LAZYREMOVE(SSticker.round_end_events, roundend_callback)
roundend_callback = null
diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/reagents/reagent_containers/condiment.dm
similarity index 86%
rename from code/modules/food_and_drinks/food/condiment.dm
rename to code/modules/reagents/reagent_containers/condiment.dm
index 5fcad32579aad..b9f22c89e4e8f 100644
--- a/code/modules/food_and_drinks/food/condiment.dm
+++ b/code/modules/reagents/reagent_containers/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 bottle"
desc = "Just your average condiment bottle."
icon = 'icons/obj/food/containers.dmi'
@@ -23,7 +23,7 @@
/// Holder for original icon_state value if it was overwritten by icon_emty to change back to
var/icon_preempty
-/obj/item/reagent_containers/food/condiment/update_icon_state()
+/obj/item/reagent_containers/condiment/update_icon_state()
. = ..()
if (reagents.reagent_list.len)
if (icon_preempty)
@@ -34,11 +34,11 @@
icon_preempty = icon_state
icon_state = icon_empty
-/obj/item/reagent_containers/food/condiment/suicide_act(mob/living/carbon/user)
+/obj/item/reagent_containers/condiment/suicide_act(mob/living/carbon/user)
user.visible_message("[user] is trying to eat the entire [src]! It looks like [user.p_they()] forgot how food works!")
return OXYLOSS
-/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!")
@@ -67,7 +67,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
@@ -95,14 +95,14 @@
var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this, transfered_by = user)
to_chat(user, "You transfer [trans] units of the condiment to [target].")
-/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(/datum/reagent/consumable/enzyme = 50)
fill_icon_thresholds = null
-/obj/item/reagent_containers/food/condiment/enzyme/examine(mob/user)
+/obj/item/reagent_containers/condiment/enzyme/examine(mob/user)
. = ..()
var/datum/chemical_reaction/recipe = GLOB.chemical_reactions_list[/datum/chemical_reaction/food/cheesewheel]
var/milk_required = recipe.required_reagents[/datum/reagent/consumable/milk]
@@ -110,7 +110,7 @@
. += "[milk_required] milk, [enzyme_required] enzyme and you got cheese."
. += "Remember, the enzyme isn't used up, so return it to the bottle, dingus!"
-/obj/item/reagent_containers/food/condiment/sugar
+/obj/item/reagent_containers/condiment/sugar
name = "sugar sack"
desc = "Tasty spacey sugar!"
icon_state = "sugar"
@@ -120,7 +120,7 @@
list_reagents = list(/datum/reagent/consumable/sugar = 50)
fill_icon_thresholds = null
-/obj/item/reagent_containers/food/condiment/sugar/examine(mob/user)
+/obj/item/reagent_containers/condiment/sugar/examine(mob/user)
. = ..()
var/datum/chemical_reaction/recipe = GLOB.chemical_reactions_list[/datum/chemical_reaction/food/cakebatter]
var/flour_required = recipe.required_reagents[/datum/reagent/consumable/flour]
@@ -128,7 +128,7 @@
var/sugar_required = recipe.required_reagents[/datum/reagent/consumable/sugar]
. += "[flour_required] flour, [eggyolk_required] egg yolk (or soy milk), [sugar_required] sugar makes cake dough. You can make pie dough from it."
-/obj/item/reagent_containers/food/condiment/saltshaker //Separate from above since it's a small shaker rather then
+/obj/item/reagent_containers/condiment/saltshaker //Separate 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"
@@ -140,7 +140,7 @@
list_reagents = list(/datum/reagent/consumable/sodiumchloride = 20)
fill_icon_thresholds = null
-/obj/item/reagent_containers/food/condiment/saltshaker/suicide_act(mob/living/user)
+/obj/item/reagent_containers/condiment/saltshaker/suicide_act(mob/living/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]"
@@ -149,7 +149,7 @@
desc = "Salt. From dead crew, presumably."
return (TOXLOSS)
-/obj/item/reagent_containers/food/condiment/saltshaker/afterattack(obj/target, mob/living/user, proximity)
+/obj/item/reagent_containers/condiment/saltshaker/afterattack(obj/target, mob/living/user, proximity)
. = ..()
if(!proximity)
return
@@ -162,7 +162,7 @@
new/obj/effect/decal/cleanable/food/salt(target)
return
-/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"
@@ -174,7 +174,7 @@
list_reagents = list(/datum/reagent/consumable/blackpepper = 20)
fill_icon_thresholds = null
-/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"
@@ -184,7 +184,7 @@
list_reagents = list(/datum/reagent/consumable/milk = 50)
fill_icon_thresholds = null
-/obj/item/reagent_containers/food/condiment/milk/examine(mob/user)
+/obj/item/reagent_containers/condiment/milk/examine(mob/user)
. = ..()
var/datum/chemical_reaction/recipe = GLOB.chemical_reactions_list[/datum/chemical_reaction/food/cheesewheel]
var/milk_required = recipe.required_reagents[/datum/reagent/consumable/milk]
@@ -192,7 +192,7 @@
. += "[milk_required] milk, [enzyme_required] enzyme and you got cheese."
. += "Remember, the enzyme isn't used up, so return it to the bottle, dingus!"
-/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"
@@ -202,7 +202,7 @@
list_reagents = list(/datum/reagent/consumable/flour = 50)
fill_icon_thresholds = null
-/obj/item/reagent_containers/food/condiment/flour/examine(mob/user)
+/obj/item/reagent_containers/condiment/flour/examine(mob/user)
. = ..()
var/datum/chemical_reaction/recipe_dough = GLOB.chemical_reactions_list[/datum/chemical_reaction/food/dough]
var/datum/chemical_reaction/recipe_cakebatter = GLOB.chemical_reactions_list[/datum/chemical_reaction/food/cakebatter]
@@ -215,7 +215,7 @@
. += "[dough_flour_required] flour, [dough_water_required] water makes normal dough. You can make flat dough from it."
. += "[cakebatter_flour_required] flour, [cakebatter_eggyolk_required] egg yolk (or soy milk), [cakebatter_sugar_required] sugar makes cake dough. You can make pie dough from it."
-/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"
@@ -225,7 +225,7 @@
list_reagents = list(/datum/reagent/consumable/soymilk = 50)
fill_icon_thresholds = null
-/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"
@@ -240,27 +240,27 @@
name = "cornmeal box"
desc = "A big box of cornmeal. Great for southern style cooking."
icon_state = "cornmeal"
- inhand_icon_state = "carton"
- lefthand_file = 'icons/mob/inhands/items/drinks_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/items/drinks_righthand.dmi'
+ item_state = "carton"
+ lefthand_file = 'icons/mob/inhands/misc/drinks_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/misc/drinks_righthand.dmi'
list_reagents = list(/datum/reagent/consumable/cornmeal = 30)
fill_icon_thresholds = null
*/
-/obj/item/reagent_containers/food/condiment/bbqsauce
+/obj/item/reagent_containers/condiment/bbqsauce
name = "bbq sauce"
desc = "Hand wipes not included."
icon_state = "bbqsauce"
list_reagents = list(/datum/reagent/consumable/bbqsauce = 50)
-/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(/datum/reagent/consumable/soysauce = 50)
fill_icon_thresholds = null
-/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"
@@ -276,7 +276,7 @@
fill_icon_thresholds = null
*/
-/obj/item/reagent_containers/food/condiment/cooking_oil
+/obj/item/reagent_containers/condiment/cooking_oil
name = "cooking oil"
desc = "For all your deep-frying needs."
icon_state = "cooking_oil"
@@ -306,21 +306,21 @@
fill_icon_thresholds = null
*/
-/obj/item/reagent_containers/food/condiment/cherryjelly
+/obj/item/reagent_containers/condiment/cherryjelly
name = "cherry jelly"
desc = "A jar of super-sweet cherry jelly."
icon_state = "cherryjelly"
list_reagents = list(/datum/reagent/consumable/cherryjelly = 50)
fill_icon_thresholds = null
-/obj/item/reagent_containers/food/condiment/honey
+/obj/item/reagent_containers/condiment/honey
name = "honey"
desc = "A jar of sweet and viscous honey."
icon_state = "honey"
list_reagents = list(/datum/reagent/consumable/honey = 50)
fill_icon_thresholds = null
-/obj/item/reagent_containers/food/condiment/ketchup
+/obj/item/reagent_containers/condiment/ketchup
name = "ketchup"
// At time of writing, "ketchup" mechanically, is just ground tomatoes,
// rather than // tomatoes plus vinegar plus sugar.
@@ -329,13 +329,13 @@
list_reagents = list(/datum/reagent/consumable/ketchup = 50)
fill_icon_thresholds = null
-/obj/item/reagent_containers/food/condiment/hotsauce
+/obj/item/reagent_containers/condiment/hotsauce
name = "hotsauce bottle"
desc= "You can almost TASTE the stomach ulcers!"
icon_state = "hotsauce"
list_reagents = list(/datum/reagent/consumable/capsaicin = 50)
-/obj/item/reagent_containers/food/condiment/coldsauce
+/obj/item/reagent_containers/condiment/coldsauce
name = "coldsauce bottle"
desc= "Leaves the tongue numb from its passage."
icon_state = "coldsauce"
@@ -343,7 +343,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"
@@ -372,13 +372,13 @@
/// Can't use initial(name) for this. This stores the name set by condimasters.
var/originalname = "condiment"
-/obj/item/reagent_containers/food/condiment/pack/update_icon()
+/obj/item/reagent_containers/condiment/pack/update_icon()
return
-/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
@@ -399,7 +399,7 @@
return
. = ..()
-/obj/item/reagent_containers/food/condiment/pack/on_reagent_change(changetype)
+/obj/item/reagent_containers/condiment/pack/on_reagent_change(changetype)
if(reagents.reagent_list.len > 0)
var/main_reagent = reagents.get_master_reagent_id()
if(main_reagent in possible_states)
@@ -414,23 +414,23 @@
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(/datum/reagent/consumable/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(/datum/reagent/consumable/capsaicin = 10)
-/obj/item/reagent_containers/food/condiment/pack/astrotame
+/obj/item/reagent_containers/condiment/pack/astrotame
name = "astrotame pack"
originalname = "astrotame"
list_reagents = list(/datum/reagent/consumable/astrotame = 5)
-/obj/item/reagent_containers/food/condiment/pack/bbqsauce
+/obj/item/reagent_containers/condiment/pack/bbqsauce
name = "bbq sauce pack"
originalname = "bbq sauce"
list_reagents = list(/datum/reagent/consumable/bbqsauce = 10)
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/cups/_cup.dm
old mode 100755
new mode 100644
similarity index 64%
rename from code/modules/reagents/reagent_containers/glass.dm
rename to code/modules/reagents/reagent_containers/cups/_cup.dm
index b55cbae95bfa5..dbfcb2515d70a
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/cups/_cup.dm
@@ -1,5 +1,4 @@
-
-/obj/item/reagent_containers/glass
+/obj/item/reagent_containers/cup
name = "glass"
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5, 10, 15, 20, 25, 30, 50)
@@ -9,8 +8,59 @@
spillable = TRUE
resistance_flags = ACID_PROOF
-/obj/item/reagent_containers/glass/attack(mob/M, mob/user, obj/target)
- if(!canconsume(M, user))
+ lefthand_file = 'icons/mob/inhands/misc/drinks_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/misc/drinks_righthand.dmi'
+
+ ///Like Edible's food type, what kind of drink is this?
+ var/drink_type = NONE
+ ///The last time we have checked for taste.
+ var/last_check_time
+ ///How much we drink at once, shot glasses drink more.
+ var/gulp_size = 5
+ ///Whether the 'bottle' is made of glass or not so that milk cartons dont shatter when someone gets hit by it.
+ var/isGlass = FALSE
+
+/obj/item/reagent_containers/cup/examine(mob/user)
+ . = ..()
+ if(drink_type)
+ var/list/types = bitfield_to_list(drink_type, FOOD_FLAGS)
+ . += "It is [LOWER_TEXT(english_list(types))]."
+
+/obj/item/reagent_containers/cup/proc/checkLiked(fraction, mob/M)
+ if(last_check_time + 50 >= world.time)
+ return
+ if(!ishuman(M))
+ return
+ var/mob/living/carbon/human/H = M
+ var/obj/item/organ/tongue/T = H.getorganslot(ORGAN_SLOT_TONGUE)
+
+ if((drink_type & BREAKFAST) && world.time - SSticker.round_start_time < STOP_SERVING_BREAKFAST)
+ SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "breakfast", /datum/mood_event/breakfast)
+ last_check_time = world.time
+
+ if(!T) //if you don't have a tongue you don't taste..
+ return
+
+ if(HAS_TRAIT(H, TRAIT_AGEUSIA))
+ if(drink_type & T.toxic_food)
+ to_chat(H, "You don't feel so good...")
+ H.adjust_disgust(25 + 30 * fraction)
+ else
+ if(drink_type & T.toxic_food)
+ to_chat(H, "What the hell was that thing?!")
+ H.adjust_disgust(25 + 30 * fraction)
+ SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "toxic_food", /datum/mood_event/disgusting_food)
+ else if(drink_type & T.disliked_food)
+ to_chat(H, "That didn't taste very good...")
+ H.adjust_disgust(11 + 15 * fraction)
+ SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "gross_food", /datum/mood_event/gross_food)
+ else if(drink_type & T.liked_food)
+ to_chat(H, "I love this taste!")
+ H.adjust_disgust(-5 + -2.5 * fraction)
+ SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "fav_food", /datum/mood_event/favorite_food)
+
+/obj/item/reagent_containers/cup/attack(mob/living/target_mob, mob/living/user, obj/target)
+ if(!canconsume(target_mob, user))
return
if(!spillable)
@@ -20,40 +70,45 @@
to_chat(user, "[src] is empty!")
return
- if(istype(M))
- if(user.a_intent == INTENT_HARM)
- var/R
- M.visible_message("[user] splashes the contents of [src] onto [M]!", \
- "[user] splashes the contents of [src] onto you!")
- if(reagents)
- for(var/datum/reagent/A in reagents.reagent_list)
- R += "[A] ([num2text(A.volume)]),"
-
- if(isturf(target) && reagents.reagent_list.len && thrownby)
- log_combat(thrownby, target, "splashed (thrown) [english_list(reagents.reagent_list)]")
- message_admins("[ADMIN_LOOKUPFLW(thrownby)] splashed (thrown) [english_list(reagents.reagent_list)] on [target] at [ADMIN_VERBOSEJMP(target)].")
- reagents.reaction(M, TOUCH)
- log_combat(user, M, "splashed", R)
- reagents.clear_reagents()
- else
- if(M != user)
- M.visible_message("[user] attempts to feed [M] something from [src].", \
- "[user] attempts to feed you something from [src].")
- if(!do_after(user, 3 SECONDS, target = M))
- return
- if(!reagents || !reagents.total_volume)
- return // The drink might be empty after the delay, such as by spam-feeding
- M.visible_message("[user] feeds [M] something from [src].", \
- "[user] feeds you something from [src].")
- log_combat(user, M, "fed", reagents.log_list())
- else
- to_chat(user, "You swallow a gulp of [src].")
- var/fraction = min(5/reagents.total_volume, 1)
- reagents.reaction(M, INGEST, fraction)
- addtimer(CALLBACK(reagents, TYPE_PROC_REF(/datum/reagents, trans_to), M, 5), 5)
- playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
-
-/obj/item/reagent_containers/glass/afterattack(obj/target, mob/user, proximity)
+ if(!istype(target_mob))
+ return
+
+ if(user.a_intent == INTENT_HARM)
+ //Early terminate, move to afterattack where we splash
+ return
+
+ if(target_mob != user)
+ target_mob.visible_message("[user] attempts to feed [target_mob] something from [src].", \
+ "[user] attempts to feed you something from [src].")
+ if(!do_after(user, 3 SECONDS, target = target_mob))
+ return
+ if(!reagents || !reagents.total_volume)
+ return // The drink might be empty after the delay, such as by spam-feeding
+ target_mob.visible_message("[user] feeds [target_mob] something from [src].", \
+ "[user] feeds you something from [src].")
+ log_combat(user, target_mob, "fed", reagents.log_list())
+ else
+ to_chat(user, "You swallow a gulp of [src].")
+
+ SEND_SIGNAL(src, COMSIG_GLASS_DRANK, target_mob, user)
+ var/fraction = min(gulp_size/reagents.total_volume, 1)
+ reagents.trans_to(target_mob, gulp_size, transfered_by = user, method = INGEST)
+ checkLiked(fraction, target_mob)
+ playsound(target_mob.loc,'sound/items/drink.ogg', rand(10,50), TRUE)
+ if(!iscarbon(target_mob))
+ return
+ var/mob/living/carbon/carbon_drinker = target_mob
+ var/list/diseases = carbon_drinker.get_static_viruses()
+ if(!LAZYLEN(diseases))
+ return
+ var/list/datum/disease/diseases_to_add = list()
+ for(var/datum/disease/malady as anything in diseases)
+ if(malady.spread_flags & DISEASE_SPREAD_CONTACT_FLUIDS)
+ diseases_to_add += malady
+ if(LAZYLEN(diseases_to_add))
+ AddComponent(/datum/component/infective, diseases_to_add)
+
+/obj/item/reagent_containers/cup/afterattack(obj/target, mob/living/user, proximity)
. = ..()
if((!proximity) || !check_allowed_items(target,target_self=1))
return
@@ -92,44 +147,47 @@
reagents.reaction(target, TOUCH)
reagents.clear_reagents()
-/obj/item/reagent_containers/glass/attackby(obj/item/I, mob/user, params)
- var/hotness = I.is_hot()
+/obj/item/reagent_containers/cup/attackby(obj/item/attacking_item, mob/user, params)
+ var/hotness = attacking_item.is_hot()
if(hotness && reagents)
reagents.expose_temperature(hotness)
- to_chat(user, "You heat [name] with [I]!")
-
- if(istype(I, /obj/item/food/egg)) //breaking eggs
- var/obj/item/food/egg/E = I
- if(reagents)
- if(reagents.total_volume >= reagents.maximum_volume)
- to_chat(user, "[src] is full.")
- else
- to_chat(user, "You break [E] in [src].")
- E.reagents.trans_to(src, E.reagents.total_volume, transfered_by = user)
- qdel(E)
+ to_chat(user, "You heat [name] with [attacking_item]!")
+ return
+
+ if(istype(attacking_item, /obj/item/food/egg)) //breaking eggs
+ var/obj/item/food/egg/attacking_egg = attacking_item
+ if(!reagents)
return
- ..()
+ if(reagents.total_volume >= reagents.maximum_volume)
+ to_chat(user, "[src] is full.")
+ else
+ to_chat(user, "You break [attacking_egg] in [src].")
+ attacking_egg.reagents.trans_to(src, attacking_egg.reagents.total_volume, transfered_by = user)
+ qdel(attacking_egg)
+ return
+
+ return ..()
-/obj/item/reagent_containers/glass/beaker
+/obj/item/reagent_containers/cup/beaker
name = "beaker"
desc = "A beaker. It can hold up to 50 units."
icon = 'icons/obj/chemical.dmi'
icon_state = "beaker"
item_state = "beaker"
+ worn_icon_state = "beaker"
custom_materials = list(/datum/material/glass=500)
fill_icon_thresholds = list(1, 10, 20, 40, 60, 80, 100)
label_icon = "label_beaker"
-/obj/item/reagent_containers/glass/beaker/Initialize(mapload)
+/obj/item/reagent_containers/cup/beaker/Initialize(mapload)
. = ..()
- update_icon()
-
+ update_appearance()
-/obj/item/reagent_containers/glass/beaker/get_part_rating()
+/obj/item/reagent_containers/cup/beaker/get_part_rating()
return reagents.maximum_volume
-/obj/item/reagent_containers/glass/beaker/jar
+/obj/item/reagent_containers/cup/beaker/jar
name = "honey jar"
desc = "A jar for honey. It can hold up to 50 units of sweet delight."
icon = 'icons/obj/chemical.dmi'
@@ -138,7 +196,7 @@
fill_icon_thresholds = null
label_icon = null
-/obj/item/reagent_containers/glass/beaker/large
+/obj/item/reagent_containers/cup/beaker/large
name = "large beaker"
desc = "A large beaker. Can hold up to 100 units."
icon_state = "beakerlarge"
@@ -148,7 +206,7 @@
possible_transfer_amounts = list(5,10,15,20,25,30,50,100)
label_icon = "label_beakerlarge"
-/obj/item/reagent_containers/glass/beaker/plastic
+/obj/item/reagent_containers/cup/beaker/plastic
name = "x-large beaker"
desc = "An extra-large beaker. Can hold up to 120 units."
icon_state = "beakerwhite"
@@ -158,7 +216,7 @@
possible_transfer_amounts = list(5,10,15,20,25,30,60,120)
label_icon = "label_beakerlarge"
-/obj/item/reagent_containers/glass/beaker/meta
+/obj/item/reagent_containers/cup/beaker/meta
name = "metamaterial beaker"
desc = "A large beaker. Can hold up to 180 units."
icon_state = "beakergold"
@@ -169,7 +227,7 @@
fill_icon_thresholds = list(1, 10, 25, 35, 50, 60, 80, 100)
label_icon = "label_beakerlarge"
-/obj/item/reagent_containers/glass/beaker/noreact
+/obj/item/reagent_containers/cup/beaker/noreact
name = "cryostasis beaker"
desc = "A cryostasis beaker that allows for chemical storage without \
reactions. Can hold up to 50 units."
@@ -182,7 +240,7 @@
fill_icon_thresholds = null
label_icon = null
-/obj/item/reagent_containers/glass/beaker/bluespace
+/obj/item/reagent_containers/cup/beaker/bluespace
name = "bluespace beaker"
desc = "A bluespace beaker, powered by experimental bluespace technology \
and Element Cuban combined with the Compound Pete. Can hold up to \
@@ -196,39 +254,39 @@
fill_icon_thresholds = null
label_icon = "label_beakerlarge"
-/obj/item/reagent_containers/glass/beaker/cryoxadone
+/obj/item/reagent_containers/cup/beaker/cryoxadone
list_reagents = list(/datum/reagent/medicine/cryoxadone = 30)
-/obj/item/reagent_containers/glass/beaker/sulfuric
+/obj/item/reagent_containers/cup/beaker/sulfuric
list_reagents = list(/datum/reagent/toxin/acid = 50)
-/obj/item/reagent_containers/glass/beaker/slime
+/obj/item/reagent_containers/cup/beaker/slime
list_reagents = list(/datum/reagent/toxin/slimejelly = 50)
-/obj/item/reagent_containers/glass/beaker/large/styptic
+/obj/item/reagent_containers/cup/beaker/large/styptic
name = "styptic reserve tank"
list_reagents = list(/datum/reagent/medicine/styptic_powder = 50)
-/obj/item/reagent_containers/glass/beaker/large/silver_sulfadiazine
+/obj/item/reagent_containers/cup/beaker/large/silver_sulfadiazine
name = "silver sulfadiazine reserve tank"
list_reagents = list(/datum/reagent/medicine/silver_sulfadiazine = 50)
-/obj/item/reagent_containers/glass/beaker/large/charcoal
+/obj/item/reagent_containers/cup/beaker/large/charcoal
name = "charcoal reserve tank"
list_reagents = list(/datum/reagent/medicine/charcoal = 50)
-/obj/item/reagent_containers/glass/beaker/large/epinephrine
+/obj/item/reagent_containers/cup/beaker/large/epinephrine
name = "epinephrine reserve tank"
list_reagents = list(/datum/reagent/medicine/epinephrine = 50)
-/obj/item/reagent_containers/glass/beaker/large/kelobic
+/obj/item/reagent_containers/cup/beaker/large/kelobic
name = "kelotane-bicaridine reserve tank"
list_reagents = list(/datum/reagent/medicine/kelotane = 50, /datum/reagent/medicine/bicaridine = 50)
-/obj/item/reagent_containers/glass/beaker/synthflesh
+/obj/item/reagent_containers/cup/beaker/synthflesh
list_reagents = list(/datum/reagent/medicine/synthflesh = 50)
-/obj/item/reagent_containers/glass/bucket
+/obj/item/reagent_containers/cup/bucket
name = "bucket"
desc = "It's a bucket."
icon = 'icons/obj/janitor.dmi'
@@ -257,7 +315,7 @@
ITEM_SLOT_DEX_STORAGE
)
-/obj/item/reagent_containers/glass/bucket/attackby(obj/O, mob/user, params)
+/obj/item/reagent_containers/cup/bucket/attackby(obj/O, mob/user, params)
if(istype(O, /obj/item/mop))
if(reagents.total_volume < 1)
to_chat(user, "[src] is out of water!")
@@ -265,16 +323,18 @@
reagents.trans_to(O, 5, transfered_by = user)
to_chat(user, "You wet [O] in [src].")
playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
+ return
else if(isprox(O))
to_chat(user, "You add [O] to [src].")
qdel(O)
qdel(src)
user.put_in_hands(new /obj/item/bot_assembly/cleanbot)
- else
- ..()
+ return
-/obj/item/reagent_containers/glass/bucket/equipped(mob/user, slot)
- ..()
+ return ..()
+
+/obj/item/reagent_containers/cup/bucket/equipped(mob/user, slot)
+ . = ..()
if (slot == ITEM_SLOT_HEAD)
if(reagents.total_volume)
to_chat(user, "[src]'s contents spill all over you!")
@@ -282,11 +342,11 @@
reagents.clear_reagents()
reagents.flags = NONE
-/obj/item/reagent_containers/glass/bucket/dropped(mob/user)
+/obj/item/reagent_containers/cup/bucket/dropped(mob/user)
..()
reagents.flags = initial(reagent_flags)
-/obj/item/reagent_containers/glass/bucket/equip_to_best_slot(var/mob/M)
+/obj/item/reagent_containers/cup/bucket/equip_to_best_slot(mob/M)
if(reagents.total_volume) //If there is water in a bucket, don't quick equip it to the head
var/index = slot_equipment_priority.Find(ITEM_SLOT_HEAD)
slot_equipment_priority.Remove(ITEM_SLOT_HEAD)
@@ -295,7 +355,7 @@
return
return ..()
-/obj/item/reagent_containers/glass/waterbottle
+/obj/item/reagent_containers/cup/waterbottle
name = "bottle of water"
desc = "A bottle of water filled at an old Earth bottling facility."
icon = 'icons/obj/drinks.dmi'
@@ -314,19 +374,19 @@
var/mutable_appearance/cap_overlay
var/flip_chance = 10
-/obj/item/reagent_containers/glass/waterbottle/Initialize(mapload)
+/obj/item/reagent_containers/cup/waterbottle/Initialize(mapload)
. = ..()
cap_overlay = mutable_appearance(icon, cap_icon_state)
if(cap_on)
spillable = FALSE
update_icon()
-/obj/item/reagent_containers/glass/waterbottle/update_overlays()
+/obj/item/reagent_containers/cup/waterbottle/update_overlays()
. = ..()
if(cap_on)
. += cap_overlay
-/obj/item/reagent_containers/glass/waterbottle/examine(mob/user)
+/obj/item/reagent_containers/cup/waterbottle/examine(mob/user)
. = ..()
if(cap_lost)
. += "The cap seems to be missing."
@@ -335,7 +395,7 @@
else
. += "The cap has been taken off. Alt-click to put a cap on."
-/obj/item/reagent_containers/glass/waterbottle/AltClick(mob/user)
+/obj/item/reagent_containers/cup/waterbottle/AltClick(mob/user)
if(!user.canUseTopic(src, BE_CLOSE))
return
if(cap_lost)
@@ -358,35 +418,35 @@
to_chat(user, "You put the cap on [src].")
update_icon()
-/obj/item/reagent_containers/glass/waterbottle/is_refillable()
+/obj/item/reagent_containers/cup/waterbottle/is_refillable()
if(cap_on)
return FALSE
. = ..()
-/obj/item/reagent_containers/glass/waterbottle/is_drainable()
+/obj/item/reagent_containers/cup/waterbottle/is_drainable()
if(cap_on)
return FALSE
. = ..()
-/obj/item/reagent_containers/glass/waterbottle/attack(mob/M, mob/user, obj/target)
+/obj/item/reagent_containers/cup/waterbottle/attack(mob/M, mob/user, obj/target)
if(cap_on && reagents.total_volume && istype(M))
to_chat(user, "You must remove the cap before you can do that!")
return
. = ..()
-/obj/item/reagent_containers/glass/waterbottle/afterattack(obj/target, mob/user, proximity)
+/obj/item/reagent_containers/cup/waterbottle/afterattack(obj/target, mob/user, proximity)
if(cap_on && (target.is_refillable() || target.is_drainable() || (reagents.total_volume && user.a_intent == INTENT_HARM)))
to_chat(user, "You must remove the cap before you can do that!")
return
- else if(istype(target, /obj/item/reagent_containers/glass/waterbottle))
- var/obj/item/reagent_containers/glass/waterbottle/WB = target
+ else if(istype(target, /obj/item/reagent_containers/cup/waterbottle))
+ var/obj/item/reagent_containers/cup/waterbottle/WB = target
if(WB.cap_on)
to_chat(user, "[WB] has a cap firmly twisted on!")
. = ..()
// heehoo bottle flipping
-/obj/item/reagent_containers/glass/waterbottle/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
+/obj/item/reagent_containers/cup/waterbottle/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
. = ..()
if(cap_on && reagents.total_volume)
if(prob(flip_chance)) // landed upright
@@ -396,15 +456,15 @@
else // landed on it's side
animate(src, transform = matrix(prob(50)? 90 : -90, MATRIX_ROTATE), time = 3, loop = 0)
-/obj/item/reagent_containers/glass/waterbottle/pickup(mob/user)
+/obj/item/reagent_containers/cup/waterbottle/pickup(mob/user)
..()
animate(src, transform = null, time = 1, loop = 0)
-/obj/item/reagent_containers/glass/waterbottle/empty
+/obj/item/reagent_containers/cup/waterbottle/empty
list_reagents = list()
cap_on = FALSE
-/obj/item/reagent_containers/glass/waterbottle/large
+/obj/item/reagent_containers/cup/waterbottle/large
desc = "A fresh commercial-sized bottle of water."
icon_state = "largebottle"
custom_materials = list(/datum/material/glass=0)
@@ -414,7 +474,7 @@
cap_icon_state = "bottle_cap"
icon_state_preview = "waterbottle_large"
-/obj/item/reagent_containers/glass/waterbottle/large/empty
+/obj/item/reagent_containers/cup/waterbottle/large/empty
list_reagents = list()
cap_on = FALSE
@@ -425,7 +485,7 @@
icon_state = "pestle"
force = 7
-/obj/item/reagent_containers/glass/mortar
+/obj/item/reagent_containers/cup/mortar
name = "mortar"
desc = "A specially formed bowl of ancient design. It is possible to crush or juice items placed in it using a pestle; however the process, unlike modern methods, is slow and physically exhausting. Alt click to eject the item."
icon_state = "mortar"
@@ -437,7 +497,7 @@
spillable = TRUE
var/obj/item/grinded
-/obj/item/reagent_containers/glass/mortar/AltClick(mob/user)
+/obj/item/reagent_containers/cup/mortar/AltClick(mob/user)
if(!user.canUseTopic(src, BE_CLOSE))
return
if(grinded)
@@ -445,7 +505,7 @@
grinded = null
to_chat(user, "You eject the item inside.")
-/obj/item/reagent_containers/glass/mortar/attackby(obj/item/I, mob/living/carbon/human/user)
+/obj/item/reagent_containers/cup/mortar/attackby(obj/item/I, mob/living/carbon/human/user)
..()
if(istype(I,/obj/item/pestle))
if(grinded)
@@ -487,12 +547,12 @@
return
to_chat(user, "You can't grind this!")
-/obj/item/reagent_containers/glass/saline
+/obj/item/reagent_containers/cup/saline
name = "saline canister"
volume = 5000
list_reagents = list(/datum/reagent/medicine/salglu_solution = 5000)
-/obj/item/reagent_containers/glass/saline/Moved(atom/OldLoc, Dir)
+/obj/item/reagent_containers/cup/saline/Moved(atom/OldLoc, Dir)
if (loc && !istype(loc, /obj/machinery/iv_drip/saline))
qdel(src)
return
diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/cups/bottle.dm
similarity index 76%
rename from code/modules/reagents/reagent_containers/bottle.dm
rename to code/modules/reagents/reagent_containers/cups/bottle.dm
index b472573497d63..e63aba15744f2 100644
--- a/code/modules/reagents/reagent_containers/bottle.dm
+++ b/code/modules/reagents/reagent_containers/cups/bottle.dm
@@ -1,75 +1,76 @@
-//Not to be confused with /obj/item/reagent_containers/food/drinks/bottle
+//Not to be confused with /obj/item/reagent_containers/cup/glass/bottle
-/obj/item/reagent_containers/glass/bottle
+/obj/item/reagent_containers/cup/bottle
name = "bottle"
desc = "A small bottle."
icon_state = "bottle"
+ fill_icon_state = "bottle"
item_state = "atoxinbottle"
possible_transfer_amounts = list(5,10,15,25,30)
volume = 30
fill_icon_thresholds = list(1, 10, 20, 40, 60, 80, 100)
label_icon = "label_bottle"
-/obj/item/reagent_containers/glass/bottle/Initialize(mapload)
+/obj/item/reagent_containers/cup/bottle/Initialize(mapload)
. = ..()
if(!icon_state)
icon_state = "bottle"
- update_icon()
+ update_appearance()
-/obj/item/reagent_containers/glass/bottle/epinephrine
+/obj/item/reagent_containers/cup/bottle/epinephrine
name = "epinephrine bottle"
label_name = "epinephrine"
desc = "A small bottle. Contains epinephrine - used to stabilize patients."
list_reagents = list(/datum/reagent/medicine/epinephrine = 30)
icon_state_preview = "bottle_epinephrine"
-/obj/item/reagent_containers/glass/bottle/tricordrazine
+/obj/item/reagent_containers/cup/bottle/tricordrazine
name = "tricordrazine bottle"
label_name = "tricordrazine"
desc = "A small bottle of tricordrazine. Used to aid in patient recovery."
list_reagents = list(/datum/reagent/medicine/tricordrazine = 30)
icon_state_preview = "bottle_tricordrazine"
-/obj/item/reagent_containers/glass/bottle/spaceacillin
+/obj/item/reagent_containers/cup/bottle/spaceacillin
name = "spaceacillin bottle"
label_name = "spaceacillin"
desc = "A small bottle of spaceacillin. Used to cure some diseases."
list_reagents = list(/datum/reagent/medicine/spaceacillin = 30)
icon_state_preview = "bottle_spaceacillin"
-/obj/item/reagent_containers/glass/bottle/antitoxin
+/obj/item/reagent_containers/cup/bottle/antitoxin
name = "antitoxin bottle"
label_name = "antitoxin"
desc = "A small bottle of anti-toxin. Used to treat toxin damage."
list_reagents = list(/datum/reagent/medicine/antitoxin = 30)
-/obj/item/reagent_containers/glass/bottle/toxin/mutagen
+/obj/item/reagent_containers/cup/bottle/toxin/mutagen
name = "mutagen toxin bottle"
label_name = "mutagen toxin"
desc = "A small bottle of mutagen toxins. Do not drink, Might cause unpredictable mutations."
list_reagents = list(/datum/reagent/toxin/mutagen = 30)
icon_state_preview = "bottle_mutagen"
-/obj/item/reagent_containers/glass/bottle/toxin
+/obj/item/reagent_containers/cup/bottle/toxin
name = "toxin bottle"
label_name = "toxin"
desc = "A small bottle of toxins. Do not drink, it is poisonous."
list_reagents = list(/datum/reagent/toxin = 30)
icon_state_preview = "bottle_toxin"
-/obj/item/reagent_containers/glass/bottle/cyanide
+/obj/item/reagent_containers/cup/bottle/cyanide
name = "cyanide bottle"
label_name = "cyanide"
desc = "A small bottle of cyanide. Bitter almonds?"
list_reagents = list(/datum/reagent/toxin/cyanide = 30)
-/obj/item/reagent_containers/glass/bottle/spewium
+/obj/item/reagent_containers/cup/bottle/spewium
name = "spewium bottle"
label_name = "spewium"
desc = "A small bottle of spewium."
list_reagents = list(/datum/reagent/toxin/spewium = 30)
-/obj/item/reagent_containers/glass/bottle/morphine
+/obj/item/reagent_containers/cup/bottle/morphine
name = "morphine bottle"
label_name = "morphine"
desc = "A small bottle of morphine."
@@ -77,76 +78,87 @@
list_reagents = list(/datum/reagent/medicine/morphine = 30)
icon_state_preview = "bottle_morphine"
-/obj/item/reagent_containers/glass/bottle/chloralhydrate
+/obj/item/reagent_containers/cup/bottle/chloralhydrate
name = "chloral hydrate bottle"
label_name = "chloral hydrate"
desc = "A small bottle of Choral Hydrate. Mickey's Favorite!"
list_reagents = list(/datum/reagent/toxin/chloralhydrate = 30)
icon_state_preview = "bottle_chloralhydrate"
-/obj/item/reagent_containers/glass/bottle/mannitol
+/obj/item/reagent_containers/cup/bottle/mannitol
name = "mannitol bottle"
label_name = "mannitol"
desc = "A small bottle of Mannitol. Useful for healing brain damage."
list_reagents = list(/datum/reagent/medicine/mannitol = 30)
-/obj/item/reagent_containers/glass/bottle/charcoal
+/obj/item/reagent_containers/cup/bottle/charcoal
name = "charcoal bottle"
label_name = "charcoal"
desc = "A small bottle of charcoal, which removes toxins and other chemicals from the bloodstream."
list_reagents = list(/datum/reagent/medicine/charcoal = 30)
icon_state_preview = "bottle_charcoal"
-/obj/item/reagent_containers/glass/bottle/mutagen
+/obj/item/reagent_containers/cup/bottle/phlogiston
+ name = "Phlogiston bottle"
+ desc = "A small bottle of Phlogiston, that will set you on fire if used."
+ volume = 50
+ list_reagents = list(/datum/reagent/phlogiston = 30)
+
+/obj/item/reagent_containers/cup/bottle/calomel
+ name = "calomel bottle"
+ desc = "A small bottle of calomel, which quickly purges all chemicals from the patient. Causes toxin damage if the patient is not heavily injured."
+ list_reagents = list(/datum/reagent/medicine/calomel = 30)
+
+/obj/item/reagent_containers/cup/bottle/mutagen
name = "unstable mutagen bottle"
label_name = "unstable mutagen"
desc = "A small bottle of unstable mutagen. Randomly changes the DNA structure of whoever comes in contact."
list_reagents = list(/datum/reagent/toxin/mutagen = 30)
-/obj/item/reagent_containers/glass/bottle/plasma
+/obj/item/reagent_containers/cup/bottle/plasma
name = "liquid plasma bottle"
label_name = "liquid plasma"
desc = "A small bottle of liquid plasma. Extremely toxic and reacts with micro-organisms inside blood."
list_reagents = list(/datum/reagent/toxin/plasma = 30)
-/obj/item/reagent_containers/glass/bottle/synaptizine
+/obj/item/reagent_containers/cup/bottle/synaptizine
name = "synaptizine bottle"
label_name = "synaptizine"
desc = "A small bottle of synaptizine."
list_reagents = list(/datum/reagent/medicine/synaptizine = 30)
-/obj/item/reagent_containers/glass/bottle/formaldehyde
+/obj/item/reagent_containers/cup/bottle/formaldehyde
name = "formaldehyde bottle"
label_name = "formaldehyde"
desc = "A small bottle of formaldehyde."
list_reagents = list(/datum/reagent/toxin/formaldehyde = 30)
-/obj/item/reagent_containers/glass/bottle/cryostylane
+/obj/item/reagent_containers/cup/bottle/cryostylane
name = "cryostylane bottle"
label_name = "cryostylane"
desc = "A small bottle of cryostylane. It feels cold to the touch."
list_reagents = list(/datum/reagent/cryostylane = 30)
-/obj/item/reagent_containers/glass/bottle/ammonia
+/obj/item/reagent_containers/cup/bottle/ammonia
name = "ammonia bottle"
label_name = "ammonia"
desc = "A small bottle of ammonia."
list_reagents = list(/datum/reagent/ammonia = 30)
icon_state_preview = "bottle_ammonia"
-/obj/item/reagent_containers/glass/bottle/diethylamine
+/obj/item/reagent_containers/cup/bottle/diethylamine
name = "diethylamine bottle"
label_name = "diethylamine"
desc = "A small bottle of diethylamine."
list_reagents = list(/datum/reagent/diethylamine = 30)
-/obj/item/reagent_containers/glass/bottle/facid
+/obj/item/reagent_containers/cup/bottle/facid
name = "Fluorosulfuric Acid bottle"
label_name = "Fluorosulfuric Acid"
desc = "A small bottle. Contains a small amount of fluorosulfuric acid."
list_reagents = list(/datum/reagent/toxin/acid/fluacid = 30)
-/obj/item/reagent_containers/glass/bottle/adminordrazine
+/obj/item/reagent_containers/cup/bottle/adminordrazine
name = "Adminordrazine bottle"
label_name = "Adminordrazine"
desc = "A small bottle. Contains the liquid essence of the gods."
@@ -155,221 +167,221 @@
list_reagents = list(/datum/reagent/medicine/adminordrazine = 30)
label_icon = null
-/obj/item/reagent_containers/glass/bottle/viralbase
+/obj/item/reagent_containers/cup/bottle/viralbase
name = "Highly potent Viral Base bottle"
label_name = "Highly potent Viral Base"
desc = "A small bottle. Contains a trace amount of a substance found by scientists that can be used to create extremely advanced diseases once exposed to uranium."
list_reagents = list(/datum/reagent/consumable/virus_food/viralbase = 1)
-/obj/item/reagent_containers/glass/bottle/capsaicin
+/obj/item/reagent_containers/cup/bottle/capsaicin
name = "Capsaicin bottle"
label_name = "Capsaicin"
desc = "A small bottle. Contains hot sauce."
list_reagents = list(/datum/reagent/consumable/capsaicin = 30)
-/obj/item/reagent_containers/glass/bottle/frostoil
+/obj/item/reagent_containers/cup/bottle/frostoil
name = "Frost Oil bottle"
label_name = "Frost Oil"
desc = "A small bottle. Contains cold sauce."
list_reagents = list(/datum/reagent/consumable/frostoil = 30)
-/obj/item/reagent_containers/glass/bottle/traitor
+/obj/item/reagent_containers/cup/bottle/traitor
name = "syndicate bottle"
label_name = "syndicate"
desc = "A small bottle. Contains a random nasty chemical."
icon = 'icons/obj/chemical.dmi'
var/extra_reagent = null
-/obj/item/reagent_containers/glass/bottle/traitor/Initialize(mapload)
+/obj/item/reagent_containers/cup/bottle/traitor/Initialize(mapload)
. = ..()
extra_reagent = pick(/datum/reagent/toxin/polonium, /datum/reagent/toxin/histamine, /datum/reagent/toxin/formaldehyde, /datum/reagent/toxin/venom, /datum/reagent/toxin/fentanyl, /datum/reagent/toxin/cyanide)
reagents.add_reagent(extra_reagent, 3)
-/obj/item/reagent_containers/glass/bottle/polonium
+/obj/item/reagent_containers/cup/bottle/polonium
name = "polonium bottle"
label_name = "polonium"
desc = "A small bottle. Contains Polonium."
list_reagents = list(/datum/reagent/toxin/polonium = 30)
-/obj/item/reagent_containers/glass/bottle/magillitis
+/obj/item/reagent_containers/cup/bottle/magillitis
name = "magillitis bottle"
label_name = "magillitis"
desc = "A small bottle. Contains a serum known only as 'magillitis'."
list_reagents = list(/datum/reagent/magillitis = 5)
-/obj/item/reagent_containers/glass/bottle/venom
+/obj/item/reagent_containers/cup/bottle/venom
name = "venom bottle"
label_name = "venom"
desc = "A small bottle. Contains Venom."
list_reagents = list(/datum/reagent/toxin/venom = 30)
-/obj/item/reagent_containers/glass/bottle/fentanyl
+/obj/item/reagent_containers/cup/bottle/fentanyl
name = "fentanyl bottle"
label_name = "fentanyl"
desc = "A small bottle. Contains Fentanyl."
list_reagents = list(/datum/reagent/toxin/fentanyl = 30)
-/obj/item/reagent_containers/glass/bottle/formaldehyde
+/obj/item/reagent_containers/cup/bottle/formaldehyde
name = "formaldehyde bottle"
label_name = "formaldehyde"
desc = "A small bottle. Contains Formaldehyde."
list_reagents = list(/datum/reagent/toxin/formaldehyde = 30)
icon_state_preview = "bottle_formaldehyde"
-/obj/item/reagent_containers/glass/bottle/initropidril
+/obj/item/reagent_containers/cup/bottle/initropidril
name = "initropidril bottle"
label_name = "initropidril"
desc = "A small bottle. Contains initropidril."
list_reagents = list(/datum/reagent/toxin/initropidril = 30)
-/obj/item/reagent_containers/glass/bottle/pancuronium
+/obj/item/reagent_containers/cup/bottle/pancuronium
name = "pancuronium bottle"
label_name = "pancuronium"
desc = "A small bottle. Contains pancuronium."
list_reagents = list(/datum/reagent/toxin/pancuronium = 30)
-/obj/item/reagent_containers/glass/bottle/sodium_thiopental
+/obj/item/reagent_containers/cup/bottle/sodium_thiopental
name = "sodium thiopental bottle"
label_name = "sodium thiopental"
desc = "A small bottle. Contains sodium thiopental."
list_reagents = list(/datum/reagent/toxin/sodium_thiopental = 30)
-/obj/item/reagent_containers/glass/bottle/coniine
+/obj/item/reagent_containers/cup/bottle/coniine
name = "coniine bottle"
label_name = "coniine"
desc = "A small bottle. Contains coniine."
list_reagents = list(/datum/reagent/toxin/coniine = 30)
-/obj/item/reagent_containers/glass/bottle/curare
+/obj/item/reagent_containers/cup/bottle/curare
name = "curare bottle"
label_name = "curare"
desc = "A small bottle. Contains curare."
list_reagents = list(/datum/reagent/toxin/curare = 30)
-/obj/item/reagent_containers/glass/bottle/amanitin
+/obj/item/reagent_containers/cup/bottle/amanitin
name = "amanitin bottle"
label_name = "amanitin"
desc = "A small bottle. Contains amanitin."
list_reagents = list(/datum/reagent/toxin/amanitin = 30)
-/obj/item/reagent_containers/glass/bottle/histamine
+/obj/item/reagent_containers/cup/bottle/histamine
name = "histamine bottle"
label_name = "histamine"
desc = "A small bottle. Contains Histamine."
list_reagents = list(/datum/reagent/toxin/histamine = 30)
-/obj/item/reagent_containers/glass/bottle/diphenhydramine
+/obj/item/reagent_containers/cup/bottle/diphenhydramine
name = "antihistamine bottle"
label_name = "antihistamine"
desc = "A small bottle of diphenhydramine."
list_reagents = list(/datum/reagent/medicine/diphenhydramine = 30)
-/obj/item/reagent_containers/glass/bottle/potass_iodide
+/obj/item/reagent_containers/cup/bottle/potass_iodide
name = "anti-radiation bottle"
label_name = "anti-radiation"
desc = "A small bottle of potassium iodide."
list_reagents = list(/datum/reagent/medicine/potass_iodide = 30)
-/obj/item/reagent_containers/glass/bottle/salglu_solution
+/obj/item/reagent_containers/cup/bottle/salglu_solution
name = "saline-glucose bottle"
label_name = "saline-glucose"
desc = "A small bottle of saline-glucose solution. Useful for patients lacking in blood volume."
list_reagents = list(/datum/reagent/medicine/salglu_solution = 30)
icon_state_preview = "bottle_salineglucose"
-/obj/item/reagent_containers/glass/bottle/atropine
+/obj/item/reagent_containers/cup/bottle/atropine
name = "atropine bottle"
label_name = "atropine"
desc = "A small bottle of atropine."
list_reagents = list(/datum/reagent/medicine/atropine = 30)
-/obj/item/reagent_containers/glass/bottle/romerol
+/obj/item/reagent_containers/cup/bottle/romerol
name = "romerol bottle"
label_name = "romerol"
desc = "A small bottle of Romerol. The REAL zombie powder."
list_reagents = list(/datum/reagent/romerol = 30)
-/obj/item/reagent_containers/glass/bottle/random_virus/minor //for mail only...yet
+/obj/item/reagent_containers/cup/bottle/random_virus/minor //for mail only...yet
name = "Minor experimental disease culture bottle"
label_name = "Minor experimental disease culture"
desc = "A small bottle. Contains a weak version of an untested viral culture in synthblood medium."
spawned_disease = /datum/disease/advance/random/minor
-/obj/item/reagent_containers/glass/bottle/random_virus
+/obj/item/reagent_containers/cup/bottle/random_virus
name = "Experimental disease culture bottle"
label_name = "Experimental disease culture"
desc = "A small bottle. Contains an untested viral culture in synthblood medium."
spawned_disease = /datum/disease/advance/random
icon_state_preview = "bottle_virusblood"
-/obj/item/reagent_containers/glass/bottle/pierrot_throat
+/obj/item/reagent_containers/cup/bottle/pierrot_throat
name = "Pierrot's Throat culture bottle"
label_name = "Pierrot's Throat culture"
desc = "A small bottle. Contains H0NI<42 virion culture in synthblood medium."
spawned_disease = /datum/disease/pierrot_throat
-/obj/item/reagent_containers/glass/bottle/cold
+/obj/item/reagent_containers/cup/bottle/cold
name = "Rhinovirus culture bottle"
label_name = "Rhinovirus culture"
desc = "A small bottle. Contains XY-rhinovirus culture in synthblood medium."
spawned_disease = /datum/disease/advance/cold
-/obj/item/reagent_containers/glass/bottle/flu_virion
+/obj/item/reagent_containers/cup/bottle/flu_virion
name = "Flu virion culture bottle"
label_name = "Flu virion culture"
desc = "A small bottle. Contains H13N1 flu virion culture in synthblood medium."
spawned_disease = /datum/disease/advance/flu
-/obj/item/reagent_containers/glass/bottle/inorganic_virion
+/obj/item/reagent_containers/cup/bottle/inorganic_virion
name = "Inorganic Biology virion culture bottle"
label_name = "Inorganic Biology virion culture"
desc = "A small bottle. Contains a benign virion culture capable of infecting inorganic organisms in synthblood medium."
spawned_disease = /datum/disease/advance/inorganic
-/obj/item/reagent_containers/glass/bottle/necrotic_virion
+/obj/item/reagent_containers/cup/bottle/necrotic_virion
name = "Necrotic Adaptation culture bottle"
label_name = "Necrotic Adaptation virion culture"
desc = "A small bottle. Contains a benign virion culture capable of metabolizing in deceased organisms in synthblood medium."
spawned_disease = /datum/disease/advance/necrotic
-/obj/item/reagent_containers/glass/bottle/evolution_virion
+/obj/item/reagent_containers/cup/bottle/evolution_virion
name = "Viral Evolutionary Acceleration virion culture bottle"
label_name = "Viral Evolutionary Acceleration virion culture"
desc = "A small bottle. Contains a benign, mutative virion culture in synthblood medium."
spawned_disease = /datum/disease/advance/evolution
-/obj/item/reagent_containers/glass/bottle/adaptation_virion
+/obj/item/reagent_containers/cup/bottle/adaptation_virion
name = "Viral Evolutionary Adaptation virion culture bottle"
label_name = "Viral Evolutionary Adaptation virion culture"
desc = "A small bottle. Contains a benign, resilient virion culture in synthblood medium."
spawned_disease = /datum/disease/advance/adaptation
-/obj/item/reagent_containers/glass/bottle/aggression_virion
+/obj/item/reagent_containers/cup/bottle/aggression_virion
name = "Viral Aggressive Metabolism virion culture bottle"
label_name = "Viral Aggressive Metabolism virion culture"
desc = "A small bottle. Contains a benign, aggressive virion culture in synthblood medium."
spawned_disease = /datum/disease/advance/aggression
-/obj/item/reagent_containers/glass/bottle/retrovirus
+/obj/item/reagent_containers/cup/bottle/retrovirus
name = "Retrovirus culture bottle"
label_name = "Retrovirus culture"
desc = "A small bottle. Contains a retrovirus culture in a synthblood medium."
spawned_disease = /datum/disease/dna_retrovirus
-/obj/item/reagent_containers/glass/bottle/gbs
+/obj/item/reagent_containers/cup/bottle/gbs
name = "GBS culture bottle"
label_name = "GBS culture"
desc = "A small bottle. Contains Gravitokinetic Bipotential SADS+ culture in synthblood medium."//Or simply - General BullShit
amount_per_transfer_from_this = 5
spawned_disease = /datum/disease/gbs
-/obj/item/reagent_containers/glass/bottle/fake_gbs
+/obj/item/reagent_containers/cup/bottle/fake_gbs
name = "GBS culture bottle"
label_name = "GBS culture"
desc = "A small bottle. Contains Gravitokinetic Bipotential SADS- culture in synthblood medium."//Or simply - General BullShit
spawned_disease = /datum/disease/fake_gbs
-/obj/item/reagent_containers/glass/bottle/brainrot
+/obj/item/reagent_containers/cup/bottle/brainrot
name = "Brainrot culture bottle"
label_name = "Brainrot culture"
desc = "A small bottle. Contains Cryptococcus Cosmosis culture in synthblood medium."
@@ -377,49 +389,49 @@
spawned_disease = /datum/disease/brainrot
label_icon = null
-/obj/item/reagent_containers/glass/bottle/magnitis
+/obj/item/reagent_containers/cup/bottle/magnitis
name = "Magnitis culture bottle"
label_name = "Magnitis culture"
desc = "A small bottle. Contains a small dosage of Fukkos Miracos."
spawned_disease = /datum/disease/magnitis
-/obj/item/reagent_containers/glass/bottle/wizarditis
+/obj/item/reagent_containers/cup/bottle/wizarditis
name = "Wizarditis culture bottle"
label_name = "Wizarditis culture"
desc = "A small bottle. Contains a sample of Rincewindus Vulgaris."
spawned_disease = /datum/disease/wizarditis
-/obj/item/reagent_containers/glass/bottle/anxiety
+/obj/item/reagent_containers/cup/bottle/anxiety
name = "Severe Anxiety culture bottle"
label_name = "Severe Anxiety culture"
desc = "A small bottle. Contains a sample of Lepidopticides."
spawned_disease = /datum/disease/anxiety
-/obj/item/reagent_containers/glass/bottle/beesease
+/obj/item/reagent_containers/cup/bottle/beesease
name = "Beesease culture bottle"
label_name = "Beesease culture"
desc = "A small bottle. Contains a sample of invasive Apidae."
spawned_disease = /datum/disease/beesease
-/obj/item/reagent_containers/glass/bottle/fluspanish
+/obj/item/reagent_containers/cup/bottle/fluspanish
name = "Spanish flu culture bottle"
label_name = "Spanish flu culture"
desc = "A small bottle. Contains a sample of Inquisitius."
spawned_disease = /datum/disease/fluspanish
-/obj/item/reagent_containers/glass/bottle/tuberculosis
+/obj/item/reagent_containers/cup/bottle/tuberculosis
name = "Fungal Tuberculosis culture bottle"
label_name = "Fungal Tuberculosis culture"
desc = "A small bottle. Contains a sample of Fungal Tubercle bacillus."
spawned_disease = /datum/disease/tuberculosis
-/obj/item/reagent_containers/glass/bottle/tuberculosiscure
+/obj/item/reagent_containers/cup/bottle/tuberculosiscure
name = "BVAK bottle"
label_name = "BVAK"
desc = "A small bottle containing Bio Virus Antidote Kit."
list_reagents = list(/datum/reagent/medicine/atropine = 5, /datum/reagent/medicine/epinephrine = 5, /datum/reagent/medicine/salbutamol = 10, /datum/reagent/medicine/spaceacillin = 10)
-/obj/item/reagent_containers/glass/bottle/necropolis_seed
+/obj/item/reagent_containers/cup/bottle/necropolis_seed
name = "bowl of blood"
label_name = "blood"
desc = "A clay bowl containing a fledgling Necropolis, preserved in blood. A robust virologist may be able to unlock its full potential..."
@@ -427,19 +439,19 @@
spawned_disease = /datum/disease/advance/random/necropolis
label_icon = null
-/obj/item/reagent_containers/glass/bottle/felinid
+/obj/item/reagent_containers/cup/bottle/felinid
name = "Nano-Feline Assimilative Toxoplasmosis culture bottle"
label_name = "Nano-Feline Assimilative Toxoplasmosis culture"
desc = "A small bottle. Contains a sample of nano-feline toxoplasma in synthblood medium."
spawned_disease = /datum/disease/transformation/felinid/contagious
-/obj/item/reagent_containers/glass/bottle/advanced_felinid
+/obj/item/reagent_containers/cup/bottle/advanced_felinid
name = "Feline Hysteria culture bottle"
label_name = "Feline Hysteria culture"
desc = "A small bottle. Contains a sample of a dangerous A.R.C. experimental disease"
spawned_disease = /datum/disease/advance/feline_hysteria
-/obj/item/reagent_containers/glass/bottle/psyphoza
+/obj/item/reagent_containers/cup/bottle/psyphoza
name = "Acute Fungal Infection culture bottle"
label_name = "Acute Fungal Infection culture"
desc = "A small bottle. Contains a sample of an agressive fungal species in synthblood medium."
@@ -447,159 +459,159 @@
//Oldstation.dmm chemical storage bottles
-/obj/item/reagent_containers/glass/bottle/hydrogen
+/obj/item/reagent_containers/cup/bottle/hydrogen
name = "hydrogen bottle"
label_name = "hydrogen"
list_reagents = list(/datum/reagent/hydrogen = 30)
-/obj/item/reagent_containers/glass/bottle/lithium
+/obj/item/reagent_containers/cup/bottle/lithium
name = "lithium bottle"
label_name = "lithium"
list_reagents = list(/datum/reagent/lithium = 30)
-/obj/item/reagent_containers/glass/bottle/carbon
+/obj/item/reagent_containers/cup/bottle/carbon
name = "carbon bottle"
label_name = "carbon"
list_reagents = list(/datum/reagent/carbon = 30)
-/obj/item/reagent_containers/glass/bottle/nitrogen
+/obj/item/reagent_containers/cup/bottle/nitrogen
name = "nitrogen bottle"
label_name = "nitrogen"
list_reagents = list(/datum/reagent/nitrogen = 30)
-/obj/item/reagent_containers/glass/bottle/oxygen
+/obj/item/reagent_containers/cup/bottle/oxygen
name = "oxygen bottle"
label_name = "oxygen"
list_reagents = list(/datum/reagent/oxygen = 30)
-/obj/item/reagent_containers/glass/bottle/fluorine
+/obj/item/reagent_containers/cup/bottle/fluorine
name = "fluorine bottle"
label_name = "fluorine"
list_reagents = list(/datum/reagent/fluorine = 30)
-/obj/item/reagent_containers/glass/bottle/sodium
+/obj/item/reagent_containers/cup/bottle/sodium
name = "sodium bottle"
label_name = "sodium"
list_reagents = list(/datum/reagent/sodium = 30)
-/obj/item/reagent_containers/glass/bottle/aluminium
+/obj/item/reagent_containers/cup/bottle/aluminium
name = "aluminium bottle"
label_name = "aluminium"
list_reagents = list(/datum/reagent/aluminium = 30)
-/obj/item/reagent_containers/glass/bottle/silicon
+/obj/item/reagent_containers/cup/bottle/silicon
name = "silicon bottle"
label_name = "silicon"
list_reagents = list(/datum/reagent/silicon = 30)
-/obj/item/reagent_containers/glass/bottle/phosphorus
+/obj/item/reagent_containers/cup/bottle/phosphorus
name = "phosphorus bottle"
label_name = "phosphorus"
list_reagents = list(/datum/reagent/phosphorus = 30)
-/obj/item/reagent_containers/glass/bottle/sulfur
+/obj/item/reagent_containers/cup/bottle/sulfur
name = "sulfur bottle"
label_name = "sulfur"
list_reagents = list(/datum/reagent/sulfur = 30)
-/obj/item/reagent_containers/glass/bottle/chlorine
+/obj/item/reagent_containers/cup/bottle/chlorine
name = "chlorine bottle"
label_name = "chlorine"
list_reagents = list(/datum/reagent/chlorine = 30)
-/obj/item/reagent_containers/glass/bottle/potassium
+/obj/item/reagent_containers/cup/bottle/potassium
name = "potassium bottle"
label_name = "potassium"
list_reagents = list(/datum/reagent/potassium = 30)
-/obj/item/reagent_containers/glass/bottle/iron
+/obj/item/reagent_containers/cup/bottle/iron
name = "iron bottle"
label_name = "iron"
list_reagents = list(/datum/reagent/iron = 30)
-/obj/item/reagent_containers/glass/bottle/copper
+/obj/item/reagent_containers/cup/bottle/copper
name = "copper bottle"
label_name = "copper"
list_reagents = list(/datum/reagent/copper = 30)
-/obj/item/reagent_containers/glass/bottle/mercury
+/obj/item/reagent_containers/cup/bottle/mercury
name = "mercury bottle"
label_name = "mercury"
list_reagents = list(/datum/reagent/mercury = 30)
-/obj/item/reagent_containers/glass/bottle/radium
+/obj/item/reagent_containers/cup/bottle/radium
name = "radium bottle"
label_name = "radium"
list_reagents = list(/datum/reagent/uranium/radium = 30)
-/obj/item/reagent_containers/glass/bottle/water
+/obj/item/reagent_containers/cup/bottle/water
name = "water bottle"
label_name = "water"
list_reagents = list(/datum/reagent/water = 30)
-/obj/item/reagent_containers/glass/bottle/ethanol
+/obj/item/reagent_containers/cup/bottle/ethanol
name = "ethanol bottle"
label_name = "ethanol"
list_reagents = list(/datum/reagent/consumable/ethanol = 30)
icon_state_preview = "bottle_ethanol"
-/obj/item/reagent_containers/glass/bottle/sugar
+/obj/item/reagent_containers/cup/bottle/sugar
name = "sugar bottle"
label_name = "sugar"
list_reagents = list(/datum/reagent/consumable/sugar = 30)
-/obj/item/reagent_containers/glass/bottle/sacid
+/obj/item/reagent_containers/cup/bottle/sacid
name = "sulfuric acid bottle"
label_name = "sulfuric acid"
list_reagents = list(/datum/reagent/toxin/acid = 30)
-/obj/item/reagent_containers/glass/bottle/welding_fuel
+/obj/item/reagent_containers/cup/bottle/welding_fuel
name = "welding fuel bottle"
label_name = "welding fuel"
list_reagents = list(/datum/reagent/fuel = 30)
-/obj/item/reagent_containers/glass/bottle/silver
+/obj/item/reagent_containers/cup/bottle/silver
name = "silver bottle"
label_name = "silver"
list_reagents = list(/datum/reagent/silver = 30)
-/obj/item/reagent_containers/glass/bottle/iodine
+/obj/item/reagent_containers/cup/bottle/iodine
name = "iodine bottle"
label_name = "iodine"
list_reagents = list(/datum/reagent/iodine = 30)
-/obj/item/reagent_containers/glass/bottle/bromine
+/obj/item/reagent_containers/cup/bottle/bromine
name = "bromine bottle"
label_name = "bromine"
list_reagents = list(/datum/reagent/bromine = 30)
// Bottles for mail goodies.
-/obj/item/reagent_containers/glass/bottle/clownstears
+/obj/item/reagent_containers/cup/bottle/clownstears
name = "bottle of distilled clown misery"
label_name = "distilled clown misery"
desc = "A small bottle. Contains a mythical liquid used by sublime bartenders; made from the unhappiness of clowns."
list_reagents = list(/datum/reagent/consumable/clownstears = 30)
-/obj/item/reagent_containers/glass/bottle/saltpetre
+/obj/item/reagent_containers/cup/bottle/saltpetre
name = "saltpetre bottle"
label_name = "saltpetre"
desc = "A small bottle. Contains saltpetre."
list_reagents = list(/datum/reagent/saltpetre = 30)
-/obj/item/reagent_containers/glass/bottle/flash_powder
+/obj/item/reagent_containers/cup/bottle/flash_powder
name = "flash powder bottle"
label_name = "flash powder"
desc = "A small bottle. Contains flash powder."
list_reagents = list(/datum/reagent/flash_powder = 30)
-/obj/item/reagent_containers/glass/bottle/caramel
+/obj/item/reagent_containers/cup/bottle/caramel
name = "bottle of caramel"
label_name = "caramel"
desc = "A bottle containing caramalized sugar, also known as caramel. Do not lick."
list_reagents = list(/datum/reagent/consumable/caramel = 30)
-/obj/item/reagent_containers/glass/bottle/ketamine
+/obj/item/reagent_containers/cup/bottle/ketamine
name = "ketamine bottle"
label_name = "ketamine"
desc = "A small bottle. Contains ketamine, why?"
diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/reagents/reagent_containers/cups/drinkingglass.dm
similarity index 58%
rename from code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
rename to code/modules/reagents/reagent_containers/cups/drinkingglass.dm
index c14efb097464b..692bef27ff80d 100644
--- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
+++ b/code/modules/reagents/reagent_containers/cups/drinkingglass.dm
@@ -1,6 +1,4 @@
-
-
-/obj/item/reagent_containers/food/drinks/drinkingglass
+/obj/item/reagent_containers/cup/glass/drinkingglass
name = "drinking glass"
desc = "Your standard drinking glass."
custom_price = 5
@@ -15,7 +13,7 @@
drop_sound = 'sound/items/handling/drinkglass_drop.ogg'
pickup_sound = 'sound/items/handling/drinkglass_pickup.ogg'
-/obj/item/reagent_containers/food/drinks/drinkingglass/on_reagent_change(changetype)
+/obj/item/reagent_containers/cup/glass/drinkingglass/on_reagent_change(changetype)
cut_overlays()
if(reagents.reagent_list.len)
var/datum/reagent/R = reagents.get_master_reagent()
@@ -39,7 +37,7 @@
// You can only mix the ported-over drinks in shot glasses for now (they'll mix in a shaker, but the sprite won't change for glasses). //
// This is on a case-by-case basis, and you can even make a separate sprite for shot glasses if you want. //
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass
name = "shot glass"
desc = "A shot glass - the universal symbol for bad decisions."
custom_price = 5
@@ -50,7 +48,7 @@
volume = 15
custom_materials = list(/datum/material/glass=100)
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/on_reagent_change(changetype)
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass/on_reagent_change(changetype)
cut_overlays()
gulp_size = max(round(reagents.total_volume / 15), 15)
@@ -75,57 +73,21 @@
desc = "A shot glass - the universal symbol for bad decisions."
return
-/obj/item/reagent_containers/food/drinks/drinkingglass/filled/Initialize(mapload)
+/obj/item/reagent_containers/cup/glass/drinkingglass/filled/Initialize(mapload)
. = ..()
on_reagent_change(ADD_REAGENT)
-/obj/item/reagent_containers/food/drinks/drinkingglass/filled/soda
+/obj/item/reagent_containers/cup/glass/drinkingglass/filled/soda
name = "Soda Water"
list_reagents = list(/datum/reagent/consumable/sodawater = 50)
icon_state_preview = "glass_clear"
-/obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola
+/obj/item/reagent_containers/cup/glass/drinkingglass/filled/cola
name = "Space Cola"
list_reagents = list(/datum/reagent/consumable/space_cola = 50)
icon_state_preview = "glass_brown"
-/obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola
+/obj/item/reagent_containers/cup/glass/drinkingglass/filled/nuka_cola
name = "Nuka Cola"
list_reagents = list(/datum/reagent/consumable/nuka_cola = 50)
icon_state_preview = "nuka_colaglass"
-
-/obj/item/reagent_containers/food/drinks/drinkingglass/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/food/egg)) //breaking eggs
- var/obj/item/food/egg/E = I
- if(reagents)
- if(reagents.total_volume >= reagents.maximum_volume)
- to_chat(user, "[src] is full.")
- else
- to_chat(user, "You break [E] in [src].")
- reagents.add_reagent(/datum/reagent/consumable/eggyolk, 5)
- qdel(E)
- return
- else
- ..()
-
-/obj/item/reagent_containers/food/drinks/drinkingglass/attack(obj/target, mob/user)
- if(user.a_intent == INTENT_HARM && ismob(target) && target.reagents && reagents.total_volume)
- target.visible_message("[user] splashes the contents of [src] onto [target]!", \
- "[user] splashes the contents of [src] onto you!")
- log_combat(user, target, "splashed", src)
- reagents.reaction(target, TOUCH)
- reagents.clear_reagents()
- return
- ..()
-
-/obj/item/reagent_containers/food/drinks/drinkingglass/afterattack(obj/target, mob/user, proximity)
- . = ..()
- if((!proximity) || !check_allowed_items(target,target_self=1))
- return
-
- else if(reagents.total_volume && user.a_intent == INTENT_HARM)
- user.visible_message("[user] splashes the contents of [src] onto [target]!", \
- "You splash the contents of [src] onto [target].")
- reagents.reaction(target, TOUCH)
- reagents.clear_reagents()
- return
diff --git a/code/modules/reagents/reagent_containers/cups/drinks.dm b/code/modules/reagents/reagent_containers/cups/drinks.dm
new file mode 100644
index 0000000000000..f5b50d8473a31
--- /dev/null
+++ b/code/modules/reagents/reagent_containers/cups/drinks.dm
@@ -0,0 +1,501 @@
+////////////////////////////////////////////////////////////////////////////////
+/// Drinks.
+////////////////////////////////////////////////////////////////////////////////
+/obj/item/reagent_containers/cup/glass
+ name = "drink"
+ desc = "yummy"
+ icon = 'icons/obj/drinks.dmi'
+ icon_state = null
+ possible_transfer_amounts = list(5,10,15,20,25,30,50)
+ resistance_flags = NONE
+
+ isGlass = TRUE
+
+
+/obj/item/reagent_containers/cup/glass/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
+ . = ..()
+ if(!.) //if the bottle wasn't caught
+ smash(hit_atom, throwingdatum?.thrower, TRUE)
+
+/obj/item/reagent_containers/cup/glass/proc/smash(atom/target, mob/thrower, ranged = FALSE)
+ if(!isGlass)
+ return
+ if(QDELING(src) || !target) //Invalid loc
+ return
+ if(bartender_check(target) && ranged)
+ return
+ SplashReagents(target, ranged, override_spillable = TRUE)
+ var/obj/item/broken_bottle/B = new (loc)
+ B.mimic_broken(src, target)
+ qdel(src)
+ target.Bumped(B)
+
+/obj/item/reagent_containers/cup/glass/bullet_act(obj/projectile/P)
+ . = ..()
+ if(!(P.nodamage) && P.damage_type == BRUTE && !QDELETED(src))
+ var/atom/T = get_turf(src)
+ smash(T)
+
+
+/obj/item/reagent_containers/cup/glass/trophy
+ name = "pewter cup"
+ desc = "Everyone gets a trophy."
+ icon_state = "pewter_cup"
+ w_class = WEIGHT_CLASS_TINY
+ force = 1
+ throwforce = 1
+ amount_per_transfer_from_this = 5
+ custom_materials = list(/datum/material/iron=100)
+ possible_transfer_amounts = list(5)
+ volume = 5
+ flags_1 = CONDUCT_1
+ spillable = TRUE
+ resistance_flags = FIRE_PROOF
+ isGlass = FALSE
+
+/obj/item/reagent_containers/cup/glass/trophy/gold_cup
+ name = "gold cup"
+ desc = "You're winner!"
+ icon_state = "golden_cup"
+ w_class = WEIGHT_CLASS_BULKY
+ force = 14
+ throwforce = 10
+ amount_per_transfer_from_this = 20
+ custom_materials = list(/datum/material/gold=1000)
+ volume = 150
+
+/obj/item/reagent_containers/cup/glass/trophy/silver_cup
+ name = "silver cup"
+ desc = "Best loser!"
+ icon_state = "silver_cup"
+ w_class = WEIGHT_CLASS_NORMAL
+ force = 10
+ throwforce = 8
+ amount_per_transfer_from_this = 15
+ custom_materials = list(/datum/material/silver=800)
+ volume = 100
+
+
+/obj/item/reagent_containers/cup/glass/trophy/bronze_cup
+ name = "bronze cup"
+ desc = "At least you ranked!"
+ icon_state = "bronze_cup"
+ w_class = WEIGHT_CLASS_SMALL
+ force = 5
+ throwforce = 4
+ amount_per_transfer_from_this = 10
+ custom_materials = list(/datum/material/iron=400)
+ volume = 25
+
+///////////////////////////////////////////////Drinks
+//Notes by Darem: Drinks are simply containers that start preloaded. Unlike condiments, the contents can be ingested directly
+// rather then having to add it to something else first. They should only contain liquids. They have a default container size of 50.
+// Formatting is the same as food.
+
+/obj/item/reagent_containers/cup/glass/coffee
+ name = "robust coffee"
+ desc = "Careful, the beverage you're about to enjoy is extremely hot."
+ icon_state = "coffee"
+ list_reagents = list(/datum/reagent/consumable/coffee = 30)
+ spillable = TRUE
+ resistance_flags = FREEZE_PROOF
+ isGlass = FALSE
+ drink_type = BREAKFAST
+
+/obj/item/reagent_containers/cup/glass/bubble_tea
+ name = "Bubble tea"
+ desc = "Refreshing! You aren't sure what those things in the bottom are."
+ icon_state = "bubble_tea"
+ list_reagents = list(/datum/reagent/consumable/bubble_tea = 50)
+ drink_type = SUGAR
+ spillable = TRUE
+ isGlass = FALSE
+
+/obj/item/reagent_containers/cup/glass/ice
+ name = "ice cup"
+ desc = "Careful, cold ice, do not chew."
+ custom_price = PAYCHECK_EASY * 0.6
+ icon_state = "icecup"
+ list_reagents = list(/datum/reagent/consumable/ice = 30)
+ spillable = TRUE
+ isGlass = FALSE
+
+/obj/item/reagent_containers/cup/glass/ice/prison
+ name = "dirty ice cup"
+ desc = "Either Nanotrasen's water supply is contaminated, or this machine actually vends lemon, chocolate, and cherry snow cones."
+ list_reagents = list(/datum/reagent/consumable/ice = 25, /datum/reagent/liquidgibs = 5)
+
+/obj/item/reagent_containers/cup/glass/mug // parent type is literally just so empty mug sprites are a thing
+ name = "mug"
+ desc = "A drink served in a classy mug."
+ icon_state = "tea"
+ item_state = "coffee"
+ spillable = TRUE
+
+/obj/item/reagent_containers/cup/glass/mug/update_icon_state()
+ icon_state = reagents.total_volume ? "tea" : "tea_empty"
+ return ..()
+
+/obj/item/reagent_containers/cup/glass/mug/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."
+ list_reagents = list(/datum/reagent/consumable/tea = 30)
+
+/obj/item/reagent_containers/cup/glass/mug/cocoa
+ name = "Dutch hot coco"
+ desc = "Made in Space South America."
+ list_reagents = list(/datum/reagent/consumable/hot_cocoa = 15, /datum/reagent/consumable/sugar = 5)
+ drink_type = SUGAR
+ resistance_flags = FREEZE_PROOF
+ custom_price = PAYCHECK_MEDIUM * 1.2
+
+
+/obj/item/reagent_containers/cup/glass/dry_ramen
+ name = "cup ramen"
+ desc = "Just add 5ml of water, self heats! A taste that reminds you of your school years. Now new with salty flavour!"
+ icon_state = "ramen"
+ list_reagents = list(/datum/reagent/consumable/dry_ramen = 15, /datum/reagent/consumable/sodiumchloride = 3)
+ drink_type = GRAIN
+ isGlass = FALSE
+ custom_price = PAYCHECK_MEDIUM * 0.9
+
+/obj/item/reagent_containers/cup/glass/waterbottle
+ name = "bottle of water"
+ desc = "A bottle of water filled at an old Earth bottling facility."
+ icon = 'icons/obj/drinks.dmi'
+ icon_state = "smallbottle"
+ item_state = "bottle"
+ list_reagents = list(/datum/reagent/water = 49.5, /datum/reagent/fluorine = 0.5)//see desc, don't think about it too hard
+ custom_materials = list(/datum/material/plastic=1000)
+ volume = 50
+ amount_per_transfer_from_this = 10
+ fill_icon_thresholds = list(0, 10, 25, 50, 75, 80, 90)
+ isGlass = FALSE
+ // The 2 bottles have separate cap overlay icons because if the bottle falls over while bottle flipping the cap stays fucked on the moved overlay
+ var/cap_icon_state = "bottle_cap_small"
+ var/cap_on = TRUE
+ var/cap_lost = FALSE
+ var/mutable_appearance/cap_overlay
+ var/flip_chance = 10
+ custom_price = PAYCHECK_EASY * 0.8
+
+/obj/item/reagent_containers/cup/glass/waterbottle/Initialize(mapload)
+ . = ..()
+ cap_overlay = mutable_appearance(icon, cap_icon_state)
+ if(cap_on)
+ spillable = FALSE
+ update_appearance()
+
+/obj/item/reagent_containers/cup/glass/waterbottle/update_overlays()
+ . = ..()
+ if(cap_on)
+ . += cap_overlay
+
+/obj/item/reagent_containers/cup/glass/waterbottle/examine(mob/user)
+ . = ..()
+ if(cap_lost)
+ . += "The cap seems to be missing."
+ else if(cap_on)
+ . += "The cap is firmly on to prevent spilling. Alt-click to remove the cap."
+ else
+ . += "The cap has been taken off. Alt-click to put a cap on."
+
+/obj/item/reagent_containers/cup/glass/waterbottle/AltClick(mob/user)
+ . = ..()
+ if(cap_lost)
+ to_chat(user, "The cap seems to be missing! Where did it go?")
+ return
+
+ var/fumbled = HAS_TRAIT(user, TRAIT_CLUMSY) && prob(5)
+ if(cap_on || fumbled)
+ cap_on = FALSE
+ spillable = TRUE
+ animate(src, transform = null, time = 2, loop = 0)
+ if(fumbled)
+ to_chat(user, "You fumble with [src]'s cap! The cap falls onto the ground and simply vanishes. Where the hell did it go?")
+ cap_lost = TRUE
+ else
+ to_chat(user, "You remove the cap from [src].")
+ else
+ cap_on = TRUE
+ spillable = FALSE
+ to_chat(user, "You put the cap on [src].")
+ update_appearance()
+
+/obj/item/reagent_containers/cup/glass/waterbottle/is_refillable()
+ if(cap_on)
+ return FALSE
+ return ..()
+
+/obj/item/reagent_containers/cup/glass/waterbottle/is_drainable()
+ if(cap_on)
+ return FALSE
+ return ..()
+
+/obj/item/reagent_containers/cup/glass/waterbottle/attack(mob/target, mob/living/user, def_zone)
+ if(!target)
+ return
+
+ if(cap_on && reagents.total_volume && istype(target))
+ to_chat(user, "You must remove the cap before you can do that!")
+ return
+
+ return ..()
+
+/obj/item/reagent_containers/cup/glass/waterbottle/afterattack(obj/target, mob/living/user, proximity)
+ if(cap_on && (target.is_refillable() || target.is_drainable() || (reagents.total_volume && !user.a_intent == INTENT_HARM)))
+ to_chat(user, "You must remove the cap before you can do that!")
+ return
+
+ else if(istype(target, /obj/item/reagent_containers/cup/glass/waterbottle))
+ var/obj/item/reagent_containers/cup/glass/waterbottle/other_bottle = target
+ if(other_bottle.cap_on)
+ to_chat(user, "[other_bottle] has a cap firmly twisted on!")
+ return
+
+ return ..()
+
+// heehoo bottle flipping
+/obj/item/reagent_containers/cup/glass/waterbottle/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
+ . = ..()
+ if(QDELETED(src))
+ return
+ if(!cap_on || !reagents.total_volume)
+ return
+ if(prob(flip_chance)) // landed upright
+ src.visible_message("[src] lands upright!")
+ if(throwingdatum.thrower)
+ var/mob/living/living_thrower = throwingdatum.thrower
+ SEND_SIGNAL(living_thrower, COMSIG_ADD_MOOD_EVENT, "bottle_flip", /datum/mood_event/bottle_flip)
+ else // landed on it's side
+ animate(src, transform = matrix(prob(50)? 90 : -90, MATRIX_ROTATE), time = 3, loop = 0)
+
+/obj/item/reagent_containers/cup/glass/waterbottle/pickup(mob/user)
+ . = ..()
+ animate(src, transform = null, time = 1, loop = 0)
+
+/obj/item/reagent_containers/cup/glass/waterbottle/empty
+ list_reagents = list()
+ cap_on = FALSE
+
+/obj/item/reagent_containers/cup/glass/waterbottle/large
+ desc = "A fresh commercial-sized bottle of water."
+ icon_state = "largebottle"
+ custom_materials = list(/datum/material/plastic=3000)
+ list_reagents = list(/datum/reagent/water = 100)
+ volume = 100
+ amount_per_transfer_from_this = 10
+ possible_transfer_amounts = list(5,10,15,20,25,30,50,100)
+ cap_icon_state = "bottle_cap"
+
+/obj/item/reagent_containers/cup/glass/waterbottle/large/empty
+ list_reagents = list()
+ cap_on = FALSE
+
+// Admin spawn
+/obj/item/reagent_containers/cup/glass/waterbottle/relic
+ name = "mysterious bottle"
+ desc = "A bottle quite similar to a water bottle, but with some words scribbled on with a marker. It seems to be radiating some kind of energy."
+ flip_chance = 100 // FLIPP
+
+/obj/item/reagent_containers/cup/glass/waterbottle/relic/Initialize(mapload)
+ var/reagent_id = get_random_reagent_id()
+ var/datum/reagent/random_reagent = new reagent_id
+ list_reagents = list(random_reagent.type = 50)
+ . = ..()
+ desc += "The writing reads '[random_reagent.name]'."
+ update_appearance()
+
+
+/obj/item/reagent_containers/cup/glass/sillycup
+ name = "paper cup"
+ desc = "A paper water cup."
+ icon_state = "water_cup_e"
+ possible_transfer_amounts = list(10)
+ volume = 10
+ spillable = TRUE
+ isGlass = FALSE
+
+/obj/item/reagent_containers/cup/glass/sillycup/update_icon_state()
+ icon_state = reagents.total_volume ? "water_cup" : "water_cup_e"
+ return ..()
+
+/obj/item/reagent_containers/cup/glass/sillycup/smallcarton
+ name = "small carton"
+ desc = "A small carton, intended for holding drinks."
+ icon_state = "juicebox"
+ volume = 15 //I figure if you have to craft these it should at least be slightly better than something you can get for free from a watercooler
+
+/// Reagent container icon updates, especially this one, are complete jank. I will need to rework them after this is merged.
+/obj/item/reagent_containers/cup/glass/sillycup/smallcarton/on_reagent_change(datum/reagents/holder, ...)
+ . = ..()
+ if(!length(reagents.reagent_list))
+ drink_type = NONE /// Why are drink types on the _container_? TODO: move these to the reagents //im waiting
+ return
+
+ switch(reagents.get_master_reagent_id())
+ if(/datum/reagent/consumable/orangejuice)
+ drink_type = FRUIT | BREAKFAST
+ if(/datum/reagent/consumable/milk)
+ drink_type = DAIRY | BREAKFAST
+ if(/datum/reagent/consumable/applejuice)
+ drink_type = FRUIT
+ if(/datum/reagent/consumable/grapejuice)
+ drink_type = FRUIT
+ if(/datum/reagent/consumable/pineapplejuice)
+ drink_type = FRUIT | PINEAPPLE
+ if(/datum/reagent/consumable/milk/chocolate_milk)
+ drink_type = SUGAR
+ if(/datum/reagent/consumable/ethanol/eggnog)
+ drink_type = MEAT
+
+/obj/item/reagent_containers/cup/glass/sillycup/smallcarton/update_name(updates)
+ . = ..()
+ if(!length(reagents.reagent_list))
+ name = "small carton"
+ return
+
+ switch(reagents.get_master_reagent_id())
+ if(/datum/reagent/consumable/orangejuice)
+ name = "orange juice box"
+ if(/datum/reagent/consumable/milk)
+ name = "carton of milk"
+ if(/datum/reagent/consumable/applejuice)
+ name = "apple juice box"
+ if(/datum/reagent/consumable/grapejuice)
+ name = "grape juice box"
+ if(/datum/reagent/consumable/pineapplejuice)
+ name = "pineapple juice box"
+ if(/datum/reagent/consumable/milk/chocolate_milk)
+ name = "carton of chocolate milk"
+ if(/datum/reagent/consumable/ethanol/eggnog)
+ name = "carton of eggnog"
+
+/obj/item/reagent_containers/cup/glass/sillycup/smallcarton/update_desc(updates)
+ . = ..()
+ if(!length(reagents.reagent_list))
+ desc = "A small carton, intended for holding drinks."
+ return
+
+ switch(reagents.get_master_reagent_id())
+ if(/datum/reagent/consumable/orangejuice)
+ desc = "A great source of vitamins. Stay healthy!"
+ if(/datum/reagent/consumable/milk)
+ desc = "An excellent source of calcium for growing space explorers."
+ if(/datum/reagent/consumable/applejuice)
+ desc = "Sweet apple juice. Don't be late for school!"
+ if(/datum/reagent/consumable/grapejuice)
+ desc = "Tasty grape juice in a fun little container. Non-alcoholic!"
+ if(/datum/reagent/consumable/pineapplejuice)
+ desc = "Why would you even want this?"
+ if(/datum/reagent/consumable/milk/chocolate_milk)
+ desc = "Milk for cool kids!"
+ if(/datum/reagent/consumable/ethanol/eggnog)
+ desc = "For enjoying the most wonderful time of the year."
+
+
+/obj/item/reagent_containers/cup/glass/sillycup/smallcarton/update_icon_state()
+ . = ..()
+ if(!length(reagents.reagent_list))
+ icon_state = "juicebox"
+ return
+
+ switch(reagents.get_master_reagent_id()) // Thanks to update_name not existing we need to do this whole switch twice
+ if(/datum/reagent/consumable/orangejuice)
+ icon_state = "orangebox"
+ if(/datum/reagent/consumable/milk)
+ icon_state = "milkbox"
+ if(/datum/reagent/consumable/applejuice)
+ icon_state = "juicebox"
+ if(/datum/reagent/consumable/grapejuice)
+ icon_state = "grapebox"
+ if(/datum/reagent/consumable/pineapplejuice)
+ icon_state = "pineapplebox"
+ if(/datum/reagent/consumable/milk/chocolate_milk)
+ icon_state = "chocolatebox"
+ if(/datum/reagent/consumable/ethanol/eggnog)
+ icon_state = "nog2"
+ else
+ icon_state = "juicebox"
+
+/obj/item/reagent_containers/cup/glass/sillycup/smallcarton/smash(atom/target, mob/thrower, ranged = FALSE)
+ if(bartender_check(target) && ranged)
+ return
+ SplashReagents(target, ranged, override_spillable = TRUE)
+ var/obj/item/broken_bottle/bottle_shard = new (loc)
+ bottle_shard.mimic_broken(src, target)
+ qdel(src)
+ target.Bumped(bottle_shard)
+
+/obj/item/reagent_containers/cup/glass/colocup
+ name = "colo cup"
+ desc = "A cheap, mass produced style of cup, typically used at parties. They never seem to come out red, for some reason..."
+ icon = 'icons/obj/drinks.dmi'
+ icon_state = "colocup"
+ item_state = "colocup"
+ custom_materials = list(/datum/material/plastic = 1000)
+ possible_transfer_amounts = list(5, 10, 15, 20)
+ volume = 20
+ amount_per_transfer_from_this = 5
+ isGlass = FALSE
+ /// Allows the lean sprite to display upon crafting
+ var/random_sprite = TRUE
+
+/obj/item/reagent_containers/cup/glass/colocup/Initialize(mapload)
+ . = ..()
+ pixel_x = rand(-4,4)
+ pixel_y = rand(-4,4)
+ if(!random_sprite)
+ return
+ icon_state = "colocup[rand(0, 6)]"
+ if(icon_state == "colocup6")
+ desc = "A cheap, mass produced style of cup, typically used at parties. Woah, this one is in red! What the hell?"
+
+//////////////////////////drinkingglass and shaker//
+//Note by Darem: This code handles the mixing of drinks. New drinks go in three places: In Chemistry-Reagents.dm (for the drink
+// 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/cup/glass/shaker
+ name = "shaker"
+ desc = "A metal shaker to mix drinks in."
+ icon_state = "shaker"
+ custom_materials = list(/datum/material/iron=1500)
+ amount_per_transfer_from_this = 10
+ volume = 100
+ isGlass = FALSE
+
+/obj/item/reagent_containers/cup/glass/shaker/Initialize(mapload)
+ . = ..()
+ if(prob(10))
+ name = "\improper Nanotrasen 20th Anniversary Shaker"
+ desc += " It has an emblazoned Nanotrasen logo on it."
+ icon_state = "shaker_n"
+
+/obj/item/reagent_containers/cup/glass/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."
+ custom_price = PAYCHECK_COMMAND * 2
+ icon_state = "flask"
+ custom_materials = list(/datum/material/iron=250)
+ volume = 60
+ isGlass = FALSE
+
+/obj/item/reagent_containers/cup/glass/flask/gold
+ name = "captain's flask"
+ desc = "A gold flask belonging to the captain."
+ icon_state = "flask_gold"
+ custom_materials = list(/datum/material/gold=500)
+
+/obj/item/reagent_containers/cup/glass/flask/det
+ name = "detective's flask"
+ desc = "The detective's only true friend."
+ icon_state = "detflask"
+ list_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 30)
+
+/obj/item/reagent_containers/cup/glass/britcup
+ name = "cup"
+ desc = "A cup with the british flag emblazoned on it."
+ icon_state = "britcup"
+ volume = 30
+ spillable = TRUE
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/reagents/reagent_containers/cups/glassbottle.dm
similarity index 60%
rename from code/modules/food_and_drinks/drinks/drinks/bottle.dm
rename to code/modules/reagents/reagent_containers/cups/glassbottle.dm
index 7da7d67eaa45c..f8f00ac416a61 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/reagents/reagent_containers/cups/glassbottle.dm
@@ -1,64 +1,61 @@
-
+#define BOTTLE_KNOCKDOWN_DEFAULT_DURATION (1.3 SECONDS)
///////////////////////////////////////////////Alchohol bottles! -Agouri //////////////////////////
//Functionally identical to regular drinks. The only difference is that the default bottle size is 100. - Darem
//Bottles now knockdown and break when smashed on people's heads. - Giacom
-/obj/item/reagent_containers/food/drinks/bottle
+/obj/item/reagent_containers/cup/glass/bottle
+ name = "glass bottle"
+ desc = "This blank bottle is unyieldingly anonymous, offering no clues to its contents."
+ icon_state = "glassbottle"
+ worn_icon_state = "bottle"
+ fill_icon_thresholds = list(0, 10, 20, 30, 40, 50, 60, 70, 80, 90)
+ custom_price = PAYCHECK_MEDIUM * 1.1
amount_per_transfer_from_this = 10
volume = 100
+ force = 15 //Smashing bottles over someone's head hurts.
throwforce = 15
item_state = "broken_beer" //Generic held-item sprite until unique ones are made.
- lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi'
- isGlass = TRUE
- foodtype = ALCOHOL
+ var/broken_item_state = "broken_beer"
+ lefthand_file = 'icons/mob/inhands/misc/drinks_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/misc/drinks_righthand.dmi'
+ drink_type = ALCOHOL
item_flags = ISWEAPON
///Directly relates to the 'knockdown' duration. Lowered by armor (i.e. helmets)
- var/bottle_knockdown_duration = 1.3 SECONDS
+ var/bottle_knockdown_duration = BOTTLE_KNOCKDOWN_DEFAULT_DURATION
+
+/obj/item/reagent_containers/cup/glass/bottle/small
+ name = "small glass bottle"
+ desc = "This blank bottle is unyieldingly anonymous, offering no clues to its contents."
+ icon_state = "glassbottlesmall"
+ volume = 50
+ custom_price = PAYCHECK_MEDIUM * 0.9
-/obj/item/reagent_containers/food/drinks/bottle/smash(mob/living/target, mob/thrower, ranged = FALSE)
- //Creates a shattering noise and replaces the bottle with a broken_bottle
+/obj/item/reagent_containers/cup/glass/bottle/smash(mob/living/target, mob/thrower, ranged = FALSE)
if(bartender_check(target) && ranged)
return
- var/obj/item/broken_bottle/B = new (loc)
+ SplashReagents(target, ranged, override_spillable = TRUE)
+ var/obj/item/broken_bottle/B = new(loc)
if(!ranged && thrower)
thrower.put_in_hands(B)
- B.icon_state = icon_state
-
- var/icon/I = new('icons/obj/drinks.dmi', src.icon_state)
- I.Blend(B.broken_outline, ICON_OVERLAY, rand(5), 1)
- I.SwapColor(rgb(255, 0, 220, 255), rgb(0, 0, 0, 0))
- B.icon = I
-
- if(isGlass)
- if(prob(33))
- var/obj/item/shard/S = new(drop_location())
- target.Bumped(S)
- playsound(src, "shatter", 70, 1)
- else
- B.force = 0
- B.throwforce = 0
- B.desc = "A carton with the bottom half burst open. Might give you a papercut."
- B.name = "broken [name]"
- transfer_fingerprints_to(B)
+ B.mimic_broken(src, target)
qdel(src)
target.Bumped(B)
-/obj/item/reagent_containers/food/drinks/bottle/attack(mob/living/target, mob/living/user)
+/obj/item/reagent_containers/cup/glass/bottle/try_splash(mob/living/user, atom/target)
- if(!target)
- return
+ if(!target || !isliving(target))
+ return ..()
- if(user.a_intent != INTENT_HARM || !isGlass)
+ if(!isGlass)
return ..()
if(HAS_TRAIT(user, TRAIT_PACIFISM))
to_chat(user, "You don't want to harm [target]!")
- return
+ return FALSE
- force = 15 //Smashing bottles over someoen's head hurts.
+ var/mob/living/living_target = target
var/armor_block = 0 //Get the target's armor values for normal attack damage.
var/armor_duration = 0 //The more force the bottle has, the longer the duration.
@@ -71,34 +68,29 @@
var/mob/living/carbon/human/H = target
var/headarmor = 0 // Target's head armor
- armor_block = H.run_armor_check(target_zone, MELEE,"","",armour_penetration) // For normal attack damage
+ armor_block = H.run_armor_check(target_zone, MELEE, "", "", armour_penetration) // For normal attack damage
//If they have a hat/helmet and the user is targeting their head.
if(istype(H.head, /obj/item/clothing/head) && target_zone == BODY_ZONE_HEAD)
- headarmor = H.head.armor.melee
- else
- headarmor = 0
-
+ headarmor = H.head.get_armor_rating(MELEE)
//Calculate the knockdown duration for the target.
armor_duration = (bottle_knockdown_duration - headarmor) + force
else
//Only humans can have armor, right?
- armor_block = target.run_armor_check(target_zone, MELEE)
+ armor_block = living_target.run_armor_check(target_zone, MELEE)
if(target_zone == BODY_ZONE_HEAD)
armor_duration = bottle_knockdown_duration + force
-
//Apply the damage!
armor_block = min(90,armor_block)
- target.apply_damage(force, BRUTE, target_zone, armor_block)
+ living_target.apply_damage(force, BRUTE, target_zone, armor_block)
// You are going to knock someone down for longer if they are not wearing a helmet.
var/head_attack_message = ""
- if(target_zone == BODY_ZONE_HEAD && istype(target, /mob/living/carbon/))
+ if(target_zone == BODY_ZONE_HEAD && iscarbon(target))
head_attack_message = " on the head"
- //Knock down the target for the duration that we calculated and divide it by 5.
if(armor_duration)
- target.apply_effect(min(armor_duration, 200) , EFFECT_KNOCKDOWN)
+ living_target.apply_effect(min(armor_duration, 200) , EFFECT_KNOCKDOWN)
//Display an attack message.
if(target != user)
@@ -111,13 +103,10 @@
//Attack logs
log_combat(user, target, "attacked", src)
- //The reagents in the bottle splash all over the target, thanks for the idea Nodrak
- SplashReagents(target)
-
//Finally, smash the bottle. This kills (del) the bottle.
smash(target, user)
- return
+ return TRUE
//Keeping this here for now, I'll ask if I should keep it here.
/obj/item/broken_bottle
@@ -130,7 +119,9 @@
throw_speed = 3
throw_range = 5
w_class = WEIGHT_CLASS_TINY
- item_state = "beer"
+ item_state = "broken_beer"
+ lefthand_file = 'icons/mob/inhands/misc/drinks_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/misc/drinks_righthand.dmi'
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb_continuous = list("stabs", "slashes", "attacks")
attack_verb_simple = list("stab", "slash", "attack")
@@ -140,121 +131,175 @@
/obj/item/broken_bottle/Initialize(mapload)
. = ..()
+ AddComponent(/datum/component/caltrop, _min_damage = force)
AddComponent(/datum/component/butchering, 200, 55)
-/obj/item/reagent_containers/food/drinks/bottle/gin
+/// Mimics the appearance and properties of the passed in bottle.
+/// Takes the broken bottle to mimic, and the thing the bottle was broken agaisnt as args
+/obj/item/broken_bottle/proc/mimic_broken(obj/item/reagent_containers/cup/glass/to_mimic, atom/target)
+ icon_state = to_mimic.icon_state
+ var/icon/drink_icon = new('icons/obj/drinks.dmi', icon_state)
+ drink_icon.Blend(broken_outline, ICON_OVERLAY, rand(5), 1)
+ drink_icon.SwapColor(rgb(255, 0, 220, 255), rgb(0, 0, 0, 0))
+ icon = drink_icon
+
+ if(istype(to_mimic, /obj/item/reagent_containers/cup/glass/bottle/juice))
+ force = 0
+ throwforce = 0
+ desc = "A carton with the bottom half burst open. Might give you a papercut."
+ else
+ if(prob(33))
+ var/obj/item/shard/stab_with = new(to_mimic.drop_location())
+ target.Bumped(stab_with)
+ playsound(src, "shatter", 70, TRUE)
+ name = "broken [to_mimic.name]"
+ to_mimic.transfer_fingerprints_to(src)
+
+/obj/item/reagent_containers/cup/glass/bottle/beer
+ name = "space beer"
+ desc = "Beer. In space."
+ icon_state = "beer"
+ volume = 30
+ list_reagents = list(/datum/reagent/consumable/ethanol/beer = 30)
+ drink_type = GRAIN | ALCOHOL
+ custom_price = PAYCHECK_MEDIUM
+
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty
+ list_reagents = list(/datum/reagent/consumable/ethanol/beer = 1)
+
+/obj/item/reagent_containers/cup/glass/bottle/beer/syndicate
+ name = "syndicate beer"
+ desc = "Consumed only by the finest syndicate agents. There is a round warning label stating 'Don't drink more than one in quick succession!'"
+ icon_state = "syndicatebeer"
+ list_reagents = list(/datum/reagent/consumable/ethanol/beer = 10, /datum/reagent/medicine/antitoxin = 20)
+
+/obj/item/reagent_containers/cup/glass/bottle/beer/light
+ name = "Carp Lite"
+ desc = "Brewed with \"Pure Ice Asteroid Spring Water\"."
+ list_reagents = list(/datum/reagent/consumable/ethanol/beer/light = 30)
+
+/obj/item/reagent_containers/cup/glass/bottle/ale
+ name = "Magm-Ale"
+ desc = "A true dorf's drink of choice."
+ icon_state = "alebottle"
+ volume = 30
+ list_reagents = list(/datum/reagent/consumable/ethanol/ale = 30)
+ drink_type = GRAIN | ALCOHOL
+ custom_price = PAYCHECK_MEDIUM
+
+/obj/item/reagent_containers/cup/glass/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(/datum/reagent/consumable/ethanol/gin = 100)
-/obj/item/reagent_containers/food/drinks/bottle/whiskey
+/obj/item/reagent_containers/cup/glass/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(/datum/reagent/consumable/ethanol/whiskey = 100)
-/obj/item/reagent_containers/food/drinks/bottle/vodka
+/obj/item/reagent_containers/cup/glass/bottle/vodka
name = "Tunguska triple distilled"
desc = "Aah, vodka. Prime choice of drink AND fuel by Russians worldwide."
icon_state = "vodkabottle"
list_reagents = list(/datum/reagent/consumable/ethanol/vodka = 100)
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka
+/obj/item/reagent_containers/cup/glass/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(/datum/reagent/consumable/ethanol/vodka = 100)
-/obj/item/reagent_containers/food/drinks/bottle/tequila
+/obj/item/reagent_containers/cup/glass/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(/datum/reagent/consumable/ethanol/tequila = 100)
-/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing
+/obj/item/reagent_containers/cup/glass/bottle/bottleofnothing
name = "bottle of nothing"
desc = "A bottle filled with nothing."
icon_state = "bottleofnothing"
list_reagents = list(/datum/reagent/consumable/nothing = 100)
- foodtype = NONE
+ drink_type = NONE
-/obj/item/reagent_containers/food/drinks/bottle/patron
+/obj/item/reagent_containers/cup/glass/bottle/patron
name = "Wrapp Artiste Patron"
desc = "Silver laced tequila, served in space night clubs across the galaxy."
icon_state = "patronbottle"
list_reagents = list(/datum/reagent/consumable/ethanol/patron = 100)
-/obj/item/reagent_containers/food/drinks/bottle/rum
+/obj/item/reagent_containers/cup/glass/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(/datum/reagent/consumable/ethanol/rum = 100)
-/obj/item/reagent_containers/food/drinks/bottle/holywater
+/obj/item/reagent_containers/cup/glass/bottle/holywater
name = "flask of holy water"
desc = "A flask of the chaplain's holy water."
icon_state = "holyflask"
list_reagents = list(/datum/reagent/water/holywater = 100)
- foodtype = NONE
+ drink_type = NONE
-/obj/item/reagent_containers/food/drinks/bottle/unholywater
+/obj/item/reagent_containers/cup/glass/bottle/unholywater
name = "flask of unholy water"
desc = "Toxic to nonbelievers, reinvigorating to the faithful."
icon_state = "holyflask"
list_reagents = list(/datum/reagent/fuel/unholywater = 100)
- foodtype = NONE
+ drink_type = NONE
-/obj/item/reagent_containers/food/drinks/bottle/hellwater
+/obj/item/reagent_containers/cup/glass/bottle/hellwater
name = "flask of holy water?"
desc = "A flask of holy water...it's been sitting in the Necropolis a while though."
- icon_state = "holyflask"
list_reagents = list(/datum/reagent/hellwater = 100)
- foodtype = NONE
-/obj/item/reagent_containers/food/drinks/bottle/vermouth
+/obj/item/reagent_containers/cup/glass/bottle/vermouth
name = "Goldeneye vermouth"
desc = "Sweet, sweet dryness~"
icon_state = "vermouthbottle"
list_reagents = list(/datum/reagent/consumable/ethanol/vermouth = 100)
-/obj/item/reagent_containers/food/drinks/bottle/kahlua
+/obj/item/reagent_containers/cup/glass/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(/datum/reagent/consumable/ethanol/kahlua = 100)
- foodtype = VEGETABLES
+ drink_type = VEGETABLES
-/obj/item/reagent_containers/food/drinks/bottle/goldschlager
+/obj/item/reagent_containers/cup/glass/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(/datum/reagent/consumable/ethanol/goldschlager = 100)
-/obj/item/reagent_containers/food/drinks/bottle/cognac
+/obj/item/reagent_containers/cup/glass/bottle/cognac
name = "Chateau de Baton premium cognac"
desc = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time."
icon_state = "cognacbottle"
list_reagents = list(/datum/reagent/consumable/ethanol/cognac = 100)
-/obj/item/reagent_containers/food/drinks/bottle/wine
+/obj/item/reagent_containers/cup/glass/bottle/wine
name = "Doublebeard's bearded special wine"
desc = "A faint aura of unease and asspainery surrounds the bottle."
icon_state = "winebottle"
list_reagents = list(/datum/reagent/consumable/ethanol/wine = 100)
- foodtype = FRUIT | ALCOHOL
+ drink_type = FRUIT | ALCOHOL
+
+//Vintage wine code goes here
-/obj/item/reagent_containers/food/drinks/bottle/absinthe
+/obj/item/reagent_containers/cup/glass/bottle/absinthe
name = "extra-strong absinthe"
- desc = "An strong alcoholic drink brewed and distributed by"
+ desc = "A strong alcoholic drink brewed and distributed by"
icon_state = "absinthebottle"
list_reagents = list(/datum/reagent/consumable/ethanol/absinthe = 100)
-/obj/item/reagent_containers/food/drinks/bottle/absinthe/Initialize(mapload)
+/obj/item/reagent_containers/cup/glass/bottle/absinthe/Initialize(mapload)
. = ..()
redact()
-/obj/item/reagent_containers/food/drinks/bottle/absinthe/proc/redact()
+/obj/item/reagent_containers/cup/glass/bottle/absinthe/proc/redact()
// There was a large fight in the coderbus about a player reference
// in absinthe. Ergo, this is why the name generation is now so
// complicated. Judge us kindly.
@@ -268,9 +313,14 @@
fullname = "Ash and Asher"
if("Generic")
fullname = "Nanotrasen Cheap Imitations"
- var/removals = list("\[REDACTED\]", "\[EXPLETIVE DELETED\]",
- "\[EXPUNGED\]", "\[INFORMATION ABOVE YOUR SECURITY CLEARANCE\]",
- "\[MOVE ALONG CITIZEN\]", "\[NOTHING TO SEE HERE\]")
+ var/removals = list(
+ "\[REDACTED\]",
+ "\[EXPLETIVE DELETED\]",
+ "\[EXPUNGED\]",
+ "\[INFORMATION ABOVE YOUR SECURITY CLEARANCE\]",
+ "\[MOVE ALONG CITIZEN\]",
+ "\[NOTHING TO SEE HERE\]",
+ )
var/chance = 50
if(prob(chance))
@@ -289,41 +339,41 @@
desc = "[desc] [fullname] Inc."
-/obj/item/reagent_containers/food/drinks/bottle/absinthe/premium
+/obj/item/reagent_containers/cup/glass/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/absinthe/premium/redact()
+/obj/item/reagent_containers/cup/glass/bottle/absinthe/premium/redact()
return
-/obj/item/reagent_containers/food/drinks/bottle/lizardwine
+/obj/item/reagent_containers/cup/glass/bottle/lizardwine
name = "bottle of lizard wine"
desc = "An alcoholic beverage from Space China, made by infusing lizard tails in ethanol. Inexplicably popular among command staff."
icon_state = "lizardwine"
list_reagents = list(/datum/reagent/consumable/ethanol/lizardwine = 100)
- foodtype = FRUIT | ALCOHOL
+ drink_type = FRUIT | ALCOHOL
-/obj/item/reagent_containers/food/drinks/bottle/hcider
+/obj/item/reagent_containers/cup/glass/bottle/hcider
name = "Jian Hard Cider"
desc = "Apple juice for adults."
icon_state = "hcider"
volume = 50
list_reagents = list(/datum/reagent/consumable/ethanol/hcider = 50)
-/obj/item/reagent_containers/food/drinks/bottle/grappa
- name = "Phillipes well-aged Grappa"
+/obj/item/reagent_containers/cup/glass/bottle/grappa
+ name = "Phillipe's well-aged Grappa"
desc = "Bottle of Grappa."
icon_state = "grappabottle"
list_reagents = list(/datum/reagent/consumable/ethanol/grappa = 100)
-/obj/item/reagent_containers/food/drinks/bottle/sake
+/obj/item/reagent_containers/cup/glass/bottle/sake
name = "Ryo's traditional sake"
desc = "Sweet as can be, and burns like fire going down."
icon_state = "sakebottle"
list_reagents = list(/datum/reagent/consumable/ethanol/sake = 100)
-/obj/item/reagent_containers/food/drinks/bottle/sake/Initialize(mapload)
+/obj/item/reagent_containers/cup/glass/bottle/sake/Initialize(mapload)
. = ..()
if(prob(10))
name = "Fluffy Tail Sake"
@@ -334,227 +384,142 @@
desc += " Awoo."
icon_state = "sakebottle_i"
-/obj/item/reagent_containers/food/drinks/bottle/fernet
+/obj/item/reagent_containers/cup/glass/bottle/fernet
name = "Fernet Bronca"
desc = "A bottle of pure Fernet Bronca, produced in Cordoba Space Station"
icon_state = "fernetbottle"
list_reagents = list(/datum/reagent/consumable/ethanol/fernet = 100)
-/obj/item/reagent_containers/food/drinks/bottle/beer
- name = "Space Beer"
- desc = "Beer. In space. In a bigger bottle."
- icon_state = "beer"
- list_reagents = list(/datum/reagent/consumable/ethanol/beer = 100)
-
-/obj/item/reagent_containers/food/drinks/bottle/ale
- name = "Magm-Ale"
- desc = "A true dorf's drink of choice, now in a MANLY bottle."
- icon_state = "alebottle"
- list_reagents = list(/datum/reagent/consumable/ethanol/ale = 100)
-
-/obj/item/reagent_containers/food/drinks/bottle/homemaderum
+/obj/item/reagent_containers/cup/glass/bottle/homemaderum
name = "Cookie's Homemade Rum"
desc = "Brewed all the way back on Space Station 3. Might tell you where those basket-hats of fruit keep coming from."
icon_state = "moonshinebottle"
list_reagents = list(/datum/reagent/consumable/ethanol/rum = 95, /datum/reagent/drug/mushroomhallucinogen = 5)
-//////////////////////////JUICES AND STUFF ///////////////////////
-
-/obj/item/reagent_containers/food/drinks/bottle/orangejuice
- name = "orange juice"
- desc = "Full of vitamins and deliciousness!"
- custom_price = 10
- icon_state = "orangejuice"
- item_state = "carton"
- lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
- isGlass = FALSE
- list_reagents = list(/datum/reagent/consumable/orangejuice = 100)
- foodtype = FRUIT | BREAKFAST
-
-/obj/item/reagent_containers/food/drinks/bottle/cream
- name = "milk cream"
- desc = "It's cream. Made from milk. What else did you think you'd find in there?"
- custom_price = 10
- icon_state = "cream"
- item_state = "carton"
- lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
- isGlass = FALSE
- list_reagents = list(/datum/reagent/consumable/cream = 100)
- foodtype = DAIRY
-
-/obj/item/reagent_containers/food/drinks/bottle/tomatojuice
- name = "tomato juice"
- desc = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness."
- custom_price = 10
- icon_state = "tomatojuice"
- item_state = "carton"
- lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
- isGlass = FALSE
- list_reagents = list(/datum/reagent/consumable/tomatojuice = 100)
- foodtype = VEGETABLES
-
-/obj/item/reagent_containers/food/drinks/bottle/limejuice
- name = "lime juice"
- desc = "Sweet-sour goodness."
- custom_price = 10
- icon_state = "limejuice"
- item_state = "carton"
- lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
- isGlass = FALSE
- list_reagents = list(/datum/reagent/consumable/limejuice = 100)
- foodtype = FRUIT
-
-/obj/item/reagent_containers/food/drinks/bottle/pineapplejuice
- name = "pineapple juice"
- desc = "Extremely tart, yellow juice."
- custom_price = 10
- icon_state = "pineapplejuice"
- item_state = "carton"
- lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
- isGlass = FALSE
- list_reagents = list(/datum/reagent/consumable/pineapplejuice = 100)
- foodtype = FRUIT | PINEAPPLE
-
-/obj/item/reagent_containers/food/drinks/bottle/menthol
- name = "menthol"
- desc = "Tastes naturally minty, and imparts a very mild numbing sensation."
- custom_price = 10
- icon_state = "mentholbox"
- item_state = "carton"
- lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
- isGlass = FALSE
- list_reagents = list(/datum/reagent/consumable/menthol = 100)
-
-/obj/item/reagent_containers/food/drinks/bottle/grenadine
+/obj/item/reagent_containers/cup/glass/bottle/grenadine
name = "Jester Grenadine"
desc = "Contains 0% real cherries!"
- custom_price = 10
+ custom_price = PAYCHECK_MEDIUM
icon_state = "grenadine"
- isGlass = TRUE
list_reagents = list(/datum/reagent/consumable/grenadine = 100)
- foodtype = FRUIT
+ drink_type = FRUIT
-/obj/item/reagent_containers/food/drinks/bottle/synthflesh
+/obj/item/reagent_containers/cup/glass/bottle/synthflesh
name = "carton of synthflesh"
desc = "A No-Name carton of synthflesh. It seems moldy. And it seems that YOUR INCOMPETENT ASS IS THE ONLY FUCKING REASON THIS THING EVEN EXISTS!!!!"
- custom_price = 10
icon_state = "synthflesh"
item_state = "carton"
- lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
isGlass = FALSE
list_reagents = list(/datum/reagent/medicine/synthflesh = 100)
-/obj/item/reagent_containers/food/drinks/bottle/virusfood
+/obj/item/reagent_containers/cup/glass/bottle/virusfood
name = "carton of virus food"
desc = "A carton of ready-mixed virus food. Do not drink."
- custom_price = 10
icon_state = "virusfood"
item_state = "carton"
- lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
isGlass = FALSE
list_reagents = list(/datum/reagent/consumable/virus_food = 100)
-/obj/item/reagent_containers/food/drinks/bottle/applejack
+/obj/item/reagent_containers/cup/glass/bottle/applejack
name = "Buckin' Bronco's Applejack"
desc = "Kicks like a horse, tastes like an apple!"
- custom_price = 10
+ custom_price = PAYCHECK_MEDIUM
icon_state = "applejack_bottle"
- isGlass = TRUE
list_reagents = list(/datum/reagent/consumable/ethanol/applejack = 100)
- foodtype = FRUIT
+ drink_type = FRUIT
-/obj/item/reagent_containers/food/drinks/bottle/champagne
+/obj/item/reagent_containers/cup/glass/bottle/champagne
name = "Eau d' Dandy Brut Champagne"
desc = "Finely sourced from only the most pretentious French vineyards."
- custom_premium_price = 200
icon_state = "champagne_bottle"
- isGlass = TRUE
+ base_icon_state = "champagne_bottle"
+ reagent_flags = TRANSPARENT
+ spillable = FALSE
list_reagents = list(/datum/reagent/consumable/ethanol/champagne = 100)
-/obj/item/reagent_containers/food/drinks/bottle/blazaam
+/obj/item/reagent_containers/cup/glass/bottle/blazaam
name = "Ginbad's Blazaam"
desc = "You feel like you should give the bottle a good rub before opening."
icon_state = "blazaambottle"
list_reagents = list(/datum/reagent/consumable/ethanol/blazaam = 100)
-/obj/item/reagent_containers/food/drinks/bottle/trappist
+/obj/item/reagent_containers/cup/glass/bottle/trappist
name = "Mont de Requin Trappistes Bleu"
desc = "Brewed in space-Belgium. Fancy!"
- custom_premium_price = 50
icon_state = "trappistbottle"
volume = 50
list_reagents = list(/datum/reagent/consumable/ethanol/trappist = 50)
-/obj/item/reagent_containers/food/drinks/bottle/hooch
+/obj/item/reagent_containers/cup/glass/bottle/hooch
name = "hooch bottle"
desc = "A bottle of rotgut. Its owner has applied some street wisdom to cleverly disguise it as a brown paper bag."
icon_state = "hoochbottle"
list_reagents = list(/datum/reagent/consumable/ethanol/hooch = 100)
-/obj/item/reagent_containers/food/drinks/bottle/moonshine
+/obj/item/reagent_containers/cup/glass/bottle/moonshine
name = "moonshine jug"
- desc = "It is said that the ancient Applalacians used these stoneware jugs to capture lightning in a bottle."
+ desc = "It is said that the ancient Appalachians used these stoneware jugs to capture lightning in a bottle."
icon_state = "moonshinebottle"
list_reagents = list(/datum/reagent/consumable/ethanol/moonshine = 100)
-/obj/item/reagent_containers/food/drinks/bottle/blank //Don't let players print these from a lathe, bottles should be obtained in mass from the bar only.
+/obj/item/reagent_containers/cup/glass/bottle/blank //Don't let players print these from a lathe, bottles should be obtained in mass from the bar only.
name = "glass bottle"
desc = "This blank bottle is unyieldingly anonymous, offering no clues to it's contents."
icon_state = "glassbottle"
fill_icon_thresholds = list(0, 10, 20, 30, 40, 50, 60, 70, 80, 90)
-/obj/item/reagent_containers/food/drinks/bottle/blank/update_icon()
+/obj/item/reagent_containers/cup/glass/bottle/blank/update_icon()
..()
add_overlay("[initial(icon_state)]shine")
-/obj/item/reagent_containers/food/drinks/bottle/blank/small
+/obj/item/reagent_containers/cup/glass/bottle/blank/small
name = "small glass bottle"
desc = "This small bottle is unyieldingly anonymous, offering no clues to it's contents."
icon_state = "glassbottlesmall"
volume = 50
////////////////////////// MOLOTOV ///////////////////////
-/obj/item/reagent_containers/food/drinks/bottle/molotov
+/obj/item/reagent_containers/cup/glass/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"
list_reagents = list()
- var/list/accelerants = list( /datum/reagent/consumable/ethanol, /datum/reagent/fuel, /datum/reagent/clf3, /datum/reagent/phlogiston,
- /datum/reagent/napalm, /datum/reagent/hellwater, /datum/reagent/toxin/plasma, /datum/reagent/toxin/spore_burning)
- var/active = 0
-
-/obj/item/reagent_containers/food/drinks/bottle/molotov/CheckParts(list/parts_list)
+ var/active = FALSE
+ var/list/accelerants = list(
+ /datum/reagent/consumable/ethanol,
+ /datum/reagent/fuel,
+ /datum/reagent/clf3,
+ /datum/reagent/phlogiston,
+ /datum/reagent/napalm,
+ /datum/reagent/hellwater,
+ /datum/reagent/toxin/plasma,
+ /datum/reagent/toxin/spore_burning
+ )
+
+/obj/item/reagent_containers/cup/glass/bottle/molotov/CheckParts(list/parts_list)
..()
- var/obj/item/reagent_containers/food/drinks/bottle/B = locate() in contents
+ var/obj/item/reagent_containers/cup/glass/bottle/B = locate() in contents
if(B)
icon_state = B.icon_state
- B.reagents.copy_to(src,100)
- if(!B.isGlass)
+ B.reagents.copy_to(src, 100)
+ if(istype(B, /obj/item/reagent_containers/cup/glass/bottle/juice))
desc += " You're not sure if making this out of a carton was the brightest idea."
isGlass = FALSE
return
-/obj/item/reagent_containers/food/drinks/bottle/molotov/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
+/obj/item/reagent_containers/cup/glass/bottle/molotov/smash(atom/target, mob/thrower, ranged = FALSE)
var/firestarter = 0
- for(var/datum/reagent/R in reagents.reagent_list)
- for(var/A in accelerants)
- if(istype(R,A))
+ for(var/datum/reagent/contained_reagent in reagents.reagent_list)
+ for(var/accelerant_type in accelerants)
+ if(istype(contained_reagent, accelerant_type))
firestarter = 1
break
if(firestarter && active)
- hit_atom.fire_act()
- new /obj/effect/hotspot(get_turf(hit_atom))
+ 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/cup/glass/bottle/molotov/attackby(obj/item/I, mob/user, params)
if(I.is_hot() && !active)
active = TRUE
log_bomber(user, "has primed a", src, "for detonation")
@@ -562,25 +527,79 @@
to_chat(user, "You light [src] on fire.")
add_overlay(custom_fire_overlay ? custom_fire_overlay : GLOB.fire_overlay)
if(!isGlass)
- spawn(50)
- if(active)
- var/counter
- var/target = src.loc
- for(counter = 0, counter<2, counter++)
- if(istype(target, /obj/item/storage))
- var/obj/item/storage/S = target
- target = S.loc
- if(istype(target, /atom))
- var/atom/A = target
- SplashReagents(A)
- A.fire_act()
- qdel(src)
-
-/obj/item/reagent_containers/food/drinks/bottle/molotov/attack_self(mob/user)
+ addtimer(CALLBACK(src, PROC_REF(explode)), 5 SECONDS)
+
+/obj/item/reagent_containers/cup/glass/bottle/molotov/proc/explode()
+ if(!active)
+ return
+ if(get_turf(src))
+ var/atom/target = loc
+ for(var/i in 1 to 2)
+ if(istype(target, /obj/item/storage))
+ target = target.loc
+ SplashReagents(target, override_spillable = TRUE)
+ target.fire_act()
+ qdel(src)
+
+/obj/item/reagent_containers/cup/glass/bottle/molotov/attack_self(mob/user)
if(active)
if(!isGlass)
to_chat(user, "The flame's spread too far on it!")
return
to_chat(user, "You snuff out the flame on [src].")
cut_overlay(custom_fire_overlay ? custom_fire_overlay : GLOB.fire_overlay)
- active = 0
+ active = FALSE
+ return
+ return ..()
+
+/**
+ * Cartons
+ * Subtype of glass that don't break, and share a common carton hand state.
+ * Meant to be a subtype for use in Molotovs
+ */
+/obj/item/reagent_containers/cup/glass/bottle/juice
+ custom_price = PAYCHECK_MEDIUM
+ item_state = "carton"
+ isGlass = FALSE
+
+/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice
+ name = "orange juice"
+ desc = "Full of vitamins and deliciousness!"
+ icon_state = "orangejuice"
+ list_reagents = list(/datum/reagent/consumable/orangejuice = 100)
+ drink_type = FRUIT | BREAKFAST
+
+/obj/item/reagent_containers/cup/glass/bottle/juice/cream
+ name = "milk cream"
+ desc = "It's cream. Made from milk. What else did you think you'd find in there?"
+ icon_state = "cream"
+ list_reagents = list(/datum/reagent/consumable/cream = 100)
+ drink_type = DAIRY
+
+/obj/item/reagent_containers/cup/glass/bottle/juice/tomatojuice
+ name = "tomato juice"
+ desc = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness."
+ icon_state = "tomatojuice"
+ list_reagents = list(/datum/reagent/consumable/tomatojuice = 100)
+ drink_type = VEGETABLES
+
+/obj/item/reagent_containers/cup/glass/bottle/juice/limejuice
+ name = "lime juice"
+ desc = "Sweet-sour goodness."
+ icon_state = "limejuice"
+ list_reagents = list(/datum/reagent/consumable/limejuice = 100)
+ drink_type = FRUIT
+
+/obj/item/reagent_containers/cup/glass/bottle/juice/pineapplejuice
+ name = "pineapple juice"
+ desc = "Extremely tart, yellow juice."
+ icon_state = "pineapplejuice"
+ list_reagents = list(/datum/reagent/consumable/pineapplejuice = 100)
+ drink_type = FRUIT | PINEAPPLE
+
+/obj/item/reagent_containers/cup/glass/bottle/juice/menthol
+ name = "menthol"
+ desc = "Tastes naturally minty, and imparts a very mild numbing sensation."
+ list_reagents = list(/datum/reagent/consumable/menthol = 100)
+
+#undef BOTTLE_KNOCKDOWN_DEFAULT_DURATION
diff --git a/code/modules/reagents/reagent_containers/cups/soda.dm b/code/modules/reagents/reagent_containers/cups/soda.dm
new file mode 100644
index 0000000000000..d70f97dd16eb4
--- /dev/null
+++ b/code/modules/reagents/reagent_containers/cups/soda.dm
@@ -0,0 +1,248 @@
+
+//////////////////////////soda_cans//
+//These are in their own group to be used as IED's in /obj/item/grenade/ghettobomb.dm
+/// How much fizziness is added to the can of soda by throwing it, in percentage points
+#define SODA_FIZZINESS_THROWN 15
+/// How much fizziness is added to the can of soda by shaking it, in percentage points
+#define SODA_FIZZINESS_SHAKE 5
+
+/obj/item/reagent_containers/cup/soda_cans
+ name = "soda can"
+ icon = 'icons/obj/drinks.dmi'
+ reagent_flags = NONE
+ spillable = FALSE
+ custom_price = PAYCHECK_MEDIUM * 0.9
+ obj_flags = CAN_BE_HIT
+ possible_transfer_amounts = list(5, 10, 15, 25, 30)
+ volume = 30
+ throwforce = 12 // set to 0 upon being opened. Have you ever been domed by a soda can? Those things fucking hurt
+ /// If the can hasn't been opened yet, this is the measure of how fizzed up it is from being shaken or thrown around. When opened, this is rolled as a percentage chance to burst
+ var/fizziness = 0
+
+/obj/item/reagent_containers/cup/soda_cans/random/Initialize(mapload)
+ ..()
+ var/T = pick(subtypesof(/obj/item/reagent_containers/cup/soda_cans) - /obj/item/reagent_containers/cup/soda_cans/random)
+ new T(loc)
+ return INITIALIZE_HINT_QDEL
+
+/obj/item/reagent_containers/cup/soda_cans/suicide_act(mob/living/carbon/human/H)
+ if(!reagents.total_volume)
+ H.visible_message("[H] is trying to take a big sip from [src]... The can is empty!")
+ return SHAME
+ if(!is_drainable())
+ open_soda()
+ sleep(10)
+ H.visible_message("[H] takes a big sip from [src]! It looks like [H.p_theyre()] trying to commit suicide!")
+ playsound(H,'sound/items/drink.ogg', 80, TRUE)
+ reagents.trans_to(H, src.reagents.total_volume, transfered_by = H) //a big sip
+ sleep(5)
+ H.say(pick("Now, Outbomb Cuban Pete, THAT was a game.", "All these new fangled arcade games are too slow. I prefer the classics.", "They don't make 'em like Orion Trail anymore.", "You know what they say. Worst day of spess carp fishing is better than the best day at work.", "They don't make 'em like good old-fashioned singularity engines anymore."))
+ if(H.age >= 30)
+ H.Stun(50)
+ sleep(50)
+ playsound(H,'sound/items/drink.ogg', 80, TRUE)
+ H.say(pick("Another day, another dollar.", "I wonder if I should hold?", "Diversifying is for young'ns.", "Yeap, times were good back then."))
+ return MANUAL_SUICIDE_NONLETHAL
+ sleep(20) //dramatic pause
+ return TOXLOSS
+
+/obj/item/reagent_containers/cup/soda_cans/attack(mob/M, mob/user)
+ if(iscarbon(M) && !reagents.total_volume && user.a_intent == INTENT_HARM && user.is_zone_selected(BODY_ZONE_HEAD))
+ if(M == user)
+ user.visible_message("[user] crushes the can of [src] on [user.p_their()] forehead!", "You crush the can of [src] on your forehead.")
+ else
+ user.visible_message("[user] crushes the can of [src] on [M]'s forehead!", "You crush the can of [src] on [M]'s forehead.")
+ playsound(M,'sound/weapons/pierce.ogg', rand(10,50), TRUE)
+ var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(M.loc)
+ crushed_can.icon_state = icon_state
+ qdel(src)
+ return TRUE
+ return ..()
+
+/obj/item/reagent_containers/cup/soda_cans/bullet_act(obj/projectile/P)
+ . = ..()
+ if(!(P.nodamage) && P.damage_type == BRUTE && !QDELETED(src))
+ var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(src.loc)
+ crushed_can.icon_state = icon_state
+ var/atom/throw_target = get_edge_target_turf(crushed_can, pick(GLOB.alldirs))
+ crushed_can.throw_at(throw_target, rand(1,2), 7)
+ qdel(src)
+ return
+
+/obj/item/reagent_containers/cup/soda_cans/proc/open_soda(mob/user)
+ if(prob(fizziness))
+ user.visible_message("[user] opens [src], and is suddenly sprayed by the fizzing contents!", "You pull back the tab of [src], and are suddenly sprayed with a torrent of liquid! Ahhh!!")
+ burst_soda(user)
+ return
+ to_chat(user, "You pull back the tab of \the [src] with a satisfying pop.") //Ahhhhhhhh
+ reagents.flags |= OPENCONTAINER
+ playsound(src, "can_open", 50, TRUE)
+ spillable = TRUE
+ throwforce = 0
+
+/**
+ * Burst the soda open on someone. Fun! Opens and empties the soda can, but does not crush it.
+ *
+ * Arguments:
+ * * target - Who's getting covered in soda
+ * * hide_message - Stops the generic fizzing message, so you can do your own
+ */
+/obj/item/reagent_containers/cup/soda_cans/proc/burst_soda(atom/target, hide_message = FALSE)
+ if(!target)
+ return
+
+ if(ismob(target))
+ var/mob/living/target_mob = target
+ SEND_SIGNAL(target_mob, COMSIG_ADD_MOOD_EVENT, "soda_spill", /datum/mood_event/soda_spill, src)
+ for(var/mob/living/iter_mob in view(src, 7))
+ if(iter_mob != target)
+ SEND_SIGNAL(iter_mob, COMSIG_ADD_MOOD_EVENT, "observed_soda_spill", /datum/mood_event/observed_soda_spill, target, src)
+
+ playsound(src, 'sound/effects/can_pop.ogg', 80, TRUE)
+ if(!hide_message)
+ visible_message("[src] spills over, fizzing its contents all over [target]!")
+ spillable = TRUE
+ reagents.flags |= OPENCONTAINER
+ reagents.reaction(target, TOUCH)
+ reagents.clear_reagents()
+ throwforce = 0
+
+/obj/item/reagent_containers/cup/soda_cans/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
+ . = ..()
+ if(. || spillable || !reagents.total_volume) // if it was caught, already opened, or has nothing in it
+ return
+
+ fizziness += SODA_FIZZINESS_THROWN
+ if(!prob(fizziness))
+ return
+
+ burst_soda(hit_atom, hide_message = TRUE)
+ visible_message("[src]'s impact with [hit_atom] causes it to rupture, spilling everywhere!")
+ var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(src.loc)
+ crushed_can.icon_state = icon_state
+ moveToNullspace()
+ QDEL_IN(src, 1 SECONDS) // give it a second so it can still be logged for the throw impact
+
+/obj/item/reagent_containers/cup/soda_cans/attack_self(mob/user)
+ if(!is_drainable())
+ open_soda(user)
+ return
+ return ..()
+
+/obj/item/reagent_containers/cup/soda_cans/examine_more(mob/user)
+ . = ..()
+ if(!in_range(user, src))
+ return
+ if(fizziness > 30 && prob(fizziness * 2))
+ . += "You examine [src] closer, and note the following..."
+ . += "\t["You get a menacing aura of fizziness from it..."]"
+
+#undef SODA_FIZZINESS_THROWN
+#undef SODA_FIZZINESS_SHAKE
+
+/obj/item/reagent_containers/cup/soda_cans/cola
+ name = "Space Cola"
+ desc = "Cola. in space."
+ icon_state = "cola"
+ list_reagents = list(/datum/reagent/consumable/space_cola = 30)
+ drink_type = SUGAR
+
+/obj/item/reagent_containers/cup/soda_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(/datum/reagent/consumable/tonic = 50)
+ drink_type = ALCOHOL
+
+/obj/item/reagent_containers/cup/soda_cans/sodawater
+ name = "soda water"
+ desc = "A can of soda water. Why not make a scotch and soda?"
+ icon_state = "sodawater"
+ list_reagents = list(/datum/reagent/consumable/sodawater = 50)
+
+/obj/item/reagent_containers/cup/soda_cans/lemon_lime
+ name = "orange soda"
+ desc = "You wanted ORANGE. It gave you Lemon Lime."
+ icon_state = "lemon-lime"
+ list_reagents = list(/datum/reagent/consumable/lemon_lime = 30)
+ drink_type = FRUIT
+
+/obj/item/reagent_containers/cup/soda_cans/lemon_lime/Initialize(mapload)
+ . = ..()
+ name = "lemon-lime soda"
+
+/obj/item/reagent_containers/cup/soda_cans/sol_dry
+ name = "Sol Dry"
+ desc = "Maybe this will help your tummy feel better. Maybe not."
+ icon_state = "sol_dry"
+ list_reagents = list(/datum/reagent/consumable/sol_dry = 30)
+ drink_type = SUGAR
+
+/obj/item/reagent_containers/cup/soda_cans/space_up
+ name = "Space-Up!"
+ desc = "Tastes like a hull breach in your mouth."
+ icon_state = "space-up"
+ list_reagents = list(/datum/reagent/consumable/space_up = 30)
+ drink_type = SUGAR | JUNKFOOD
+
+/obj/item/reagent_containers/cup/soda_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(/datum/reagent/consumable/space_cola = 15, /datum/reagent/consumable/orangejuice = 15)
+ drink_type = SUGAR | FRUIT | JUNKFOOD
+
+/obj/item/reagent_containers/cup/soda_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(/datum/reagent/consumable/spacemountainwind = 30)
+ drink_type = SUGAR | JUNKFOOD
+
+/obj/item/reagent_containers/cup/soda_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(/datum/reagent/consumable/ethanol/thirteenloko = 30)
+ drink_type = SUGAR | JUNKFOOD
+
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb
+ name = "Dr. Gibb"
+ desc = "A delicious mixture of 42 different flavors."
+ icon_state = "dr_gibb"
+ list_reagents = list(/datum/reagent/consumable/dr_gibb = 30)
+ drink_type = SUGAR | JUNKFOOD
+
+/obj/item/reagent_containers/cup/soda_cans/pwr_game
+ name = "Pwr Game"
+ desc = "The only drink with the PWR that true gamers crave. When a gamer talks about gamerfuel, this is what they're literally referring to."
+ icon_state = "purple_can"
+ list_reagents = list(/datum/reagent/consumable/pwr_game = 30)
+
+/obj/item/reagent_containers/cup/soda_cans/shamblers
+ name = "Shambler's juice"
+ desc = "~Shake me up some of that Shambler's Juice!~"
+ icon_state = "shamblers"
+ list_reagents = list(/datum/reagent/consumable/shamblers = 30)
+ drink_type = SUGAR | JUNKFOOD
+
+/obj/item/reagent_containers/cup/soda_cans/grey_bull
+ name = "Grey Bull"
+ desc = "Grey Bull, it gives you gloves!"
+ icon_state = "energy_drink"
+ list_reagents = list(/datum/reagent/consumable/grey_bull = 20)
+ drink_type = SUGAR | JUNKFOOD
+
+/obj/item/reagent_containers/cup/soda_cans/monkey_energy
+ name = "Monkey Energy"
+ desc = "Unleash the ape!"
+ icon_state = "monkey_energy"
+ item_state = "monkey_energy"
+ list_reagents = list(/datum/reagent/consumable/monkey_energy = 50)
+ drink_type = SUGAR | JUNKFOOD
+
+/obj/item/reagent_containers/cup/soda_cans/air
+ name = "canned air"
+ desc = "There is no air shortage. Do not drink."
+ icon_state = "air"
+ list_reagents = list(/datum/reagent/nitrogen = 24, /datum/reagent/oxygen = 6)
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index 0221fce1e147f..fd1e798805540 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -268,7 +268,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/reagent_dispensers/peppertank, 30)
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/cup/glass/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 2243e49db7577..fed0d9be41574 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -7,7 +7,7 @@
id = "bucket"
build_type = AUTOLATHE | PROTOLATHE
materials = list(/datum/material/iron = 200)
- build_path = /obj/item/reagent_containers/glass/bucket
+ build_path = /obj/item/reagent_containers/cup/bucket
category = list("initial","Tools","Tool Designs")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
@@ -390,7 +390,7 @@
id = "bowl"
build_type = AUTOLATHE
materials = list(/datum/material/glass = 500)
- build_path = /obj/item/reagent_containers/glass/bowl
+ build_path = /obj/item/reagent_containers/cup/bowl
category = list("initial","Dinnerware")
/datum/design/drinking_glass
@@ -398,7 +398,7 @@
id = "drinking_glass"
build_type = AUTOLATHE
materials = list(/datum/material/glass = 500)
- build_path = /obj/item/reagent_containers/food/drinks/drinkingglass
+ build_path = /obj/item/reagent_containers/cup/glass/drinkingglass
category = list("initial","Dinnerware")
/datum/design/shot_glass
@@ -406,7 +406,7 @@
id = "shot_glass"
build_type = AUTOLATHE
materials = list(/datum/material/glass = 100)
- build_path = /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass
+ build_path = /obj/item/reagent_containers/cup/glass/drinkingglass/shotglass
category = list("initial","Dinnerware")
/datum/design/shaker
@@ -414,7 +414,7 @@
id = "shaker"
build_type = AUTOLATHE
materials = list(/datum/material/iron = 1500)
- build_path = /obj/item/reagent_containers/food/drinks/shaker
+ build_path = /obj/item/reagent_containers/cup/glass/shaker
category = list("initial","Dinnerware")
/datum/design/cultivator
@@ -538,7 +538,7 @@
id = "beaker"
build_type = AUTOLATHE | PROTOLATHE
materials = list(/datum/material/glass = 500)
- build_path = /obj/item/reagent_containers/glass/beaker
+ build_path = /obj/item/reagent_containers/cup/beaker
category = list("initial", "Medical", "Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SERVICE
@@ -547,7 +547,7 @@
id = "large_beaker"
build_type = AUTOLATHE | PROTOLATHE
materials = list(/datum/material/glass = 2500)
- build_path = /obj/item/reagent_containers/glass/beaker/large
+ build_path = /obj/item/reagent_containers/cup/beaker/large
category = list("initial", "Medical", "Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SERVICE
diff --git a/code/modules/research/designs/biogenerator_designs.dm b/code/modules/research/designs/biogenerator_designs.dm
index f41cad1fba302..c2afe25e57c91 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(/datum/material/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(/datum/material/biomass= 300)
- build_path = /obj/item/reagent_containers/food/drinks/bottle/cream
+ build_path = /obj/item/reagent_containers/cup/glass/bottle/juice/cream
category = list("initial","Food")
/datum/design/black_pepper
@@ -47,7 +47,7 @@
id = "pepper_mill"
build_type = BIOGENERATOR
materials = list(/datum/material/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")
@@ -65,14 +65,14 @@
id = "flour_sack"
build_type = BIOGENERATOR
materials = list(/datum/material/biomass= 150)
- build_path = /obj/item/reagent_containers/food/condiment/flour
+ build_path = /obj/item/reagent_containers/condiment/flour
category = list("initial","Food")
/datum/design/sugar_sack
name = "Sugar Sack"
id = "sugar_sack"
build_type = BIOGENERATOR
materials = list(/datum/material/biomass= 200)
- build_path = /obj/item/reagent_containers/food/condiment/sugar
+ build_path = /obj/item/reagent_containers/condiment/sugar
category = list("initial","Food")
/datum/design/monkey_cube
@@ -88,7 +88,7 @@
id = "ez_nut"
build_type = BIOGENERATOR
materials = list(/datum/material/biomass= 10)
- build_path = /obj/item/reagent_containers/glass/bottle/nutrient/ez
+ build_path = /obj/item/reagent_containers/cup/bottle/nutrient/ez
category = list("initial","Botany Chemicals")
/datum/design/l4z_nut
@@ -96,7 +96,7 @@
id = "l4z_nut"
build_type = BIOGENERATOR
materials = list(/datum/material/biomass= 20)
- build_path = /obj/item/reagent_containers/glass/bottle/nutrient/l4z
+ build_path = /obj/item/reagent_containers/cup/bottle/nutrient/l4z
category = list("initial","Botany Chemicals")
/datum/design/rh_nut
@@ -104,7 +104,7 @@
id = "rh_nut"
build_type = BIOGENERATOR
materials = list(/datum/material/biomass= 25)
- build_path = /obj/item/reagent_containers/glass/bottle/nutrient/rh
+ build_path = /obj/item/reagent_containers/cup/bottle/nutrient/rh
category = list("initial","Botany Chemicals")
/datum/design/weed_killer
@@ -112,7 +112,7 @@
id = "weed_killer"
build_type = BIOGENERATOR
materials = list(/datum/material/biomass= 50)
- build_path = /obj/item/reagent_containers/glass/bottle/killer/weedkiller
+ build_path = /obj/item/reagent_containers/cup/bottle/killer/weedkiller
category = list("initial","Botany Chemicals")
/datum/design/pest_spray
@@ -120,7 +120,7 @@
id = "pest_spray"
build_type = BIOGENERATOR
materials = list(/datum/material/biomass= 50)
- build_path = /obj/item/reagent_containers/glass/bottle/killer/pestkiller
+ build_path = /obj/item/reagent_containers/cup/bottle/killer/pestkiller
category = list("initial","Botany Chemicals")
/datum/design/botany_bottle
@@ -128,7 +128,7 @@
id = "botany_bottle"
build_type = BIOGENERATOR
materials = list(/datum/material/biomass= 5)
- build_path = /obj/item/reagent_containers/glass/bottle/nutrient/empty
+ build_path = /obj/item/reagent_containers/cup/bottle/nutrient/empty
category = list("initial", "Botany Chemicals")
/datum/design/cloth
@@ -216,7 +216,7 @@
id = "soy_milk_carton"
build_type = BIOGENERATOR
materials = list(/datum/material/biomass = 100)
- build_path = /obj/item/reagent_containers/food/condiment/soymilk
+ build_path = /obj/item/reagent_containers/condiment/soymilk
category = list("initial","Food")
/datum/design/seaweed_sheet
diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index fb92bc2cbda16..b204d1c7e712d 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -30,7 +30,7 @@
id = "bluespacebeaker"
build_type = PROTOLATHE
materials = list(/datum/material/glass = 5000, /datum/material/plasma = 3000, /datum/material/diamond = 1000, /datum/material/bluespace = 1000)
- build_path = /obj/item/reagent_containers/glass/beaker/bluespace
+ build_path = /obj/item/reagent_containers/cup/beaker/bluespace
category = list("Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE
@@ -40,7 +40,7 @@
id = "splitbeaker"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 3000)
- build_path = /obj/item/reagent_containers/glass/beaker/noreact
+ build_path = /obj/item/reagent_containers/cup/beaker/noreact
category = list("Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
@@ -50,7 +50,7 @@
build_type = PROTOLATHE
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
materials = list(/datum/material/glass = 2500, /datum/material/plastic = 3000)
- build_path = /obj/item/reagent_containers/glass/beaker/plastic
+ build_path = /obj/item/reagent_containers/cup/beaker/plastic
category = list("Medical Designs")
/datum/design/meta_beaker
@@ -59,7 +59,7 @@
build_type = PROTOLATHE
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
materials = list(/datum/material/glass = 2500, /datum/material/plastic = 3000, /datum/material/gold = 1000, /datum/material/titanium = 1000)
- build_path = /obj/item/reagent_containers/glass/beaker/meta
+ build_path = /obj/item/reagent_containers/cup/beaker/meta
category = list("Medical Designs")
/datum/design/blood_pack
diff --git a/code/modules/research/machinery/_production.dm b/code/modules/research/machinery/_production.dm
index 29346083d02dc..a462f5d0cdb6f 100644
--- a/code/modules/research/machinery/_production.dm
+++ b/code/modules/research/machinery/_production.dm
@@ -275,7 +275,7 @@
efficiency_coeff = 1
if(reagents) //If reagents/materials aren't initialized, don't bother, we'll be doing this again after reagents init anyways.
reagents.maximum_volume = 0
- for(var/obj/item/reagent_containers/glass/G in component_parts)
+ for(var/obj/item/reagent_containers/cup/G in component_parts)
reagents.maximum_volume += G.volume
G.reagents.trans_to(src, G.reagents.total_volume)
if(materials)
@@ -294,7 +294,7 @@
//we eject the materials upon deconstruction.
/obj/machinery/rnd/production/on_deconstruction()
- for(var/obj/item/reagent_containers/glass/G in component_parts)
+ for(var/obj/item/reagent_containers/cup/G in component_parts)
reagents.trans_to(G, G.reagents.maximum_volume)
return ..()
diff --git a/code/modules/research/xenobiology/crossbreeding/_structures.dm b/code/modules/research/xenobiology/crossbreeding/_structures.dm
index ab787839b0cb7..2eb76203360ba 100644
--- a/code/modules/research/xenobiology/crossbreeding/_structures.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_structures.dm
@@ -476,10 +476,10 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/cerulean_slime_crystal)
if(blood_amt < 10)
return ..()
- if(!istype(I, /obj/item/reagent_containers/glass/beaker))
+ if(!istype(I, /obj/item/reagent_containers/cup/beaker))
return ..()
- var/obj/item/reagent_containers/glass/beaker/item_beaker = I
+ var/obj/item/reagent_containers/cup/beaker/item_beaker = I
if(!item_beaker.is_refillable() || (item_beaker.reagents.total_volume + 10 > item_beaker.reagents.maximum_volume))
return ..()
diff --git a/code/modules/ruins/lavalandruin_code/syndicate_base.dm b/code/modules/ruins/lavalandruin_code/syndicate_base.dm
index df939dd57e34c..0ba4f2b5d30fa 100644
--- a/code/modules/ruins/lavalandruin_code/syndicate_base.dm
+++ b/code/modules/ruins/lavalandruin_code/syndicate_base.dm
@@ -17,7 +17,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/cup/glass/bottle/holywater = 1)
product_slogans = "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/shuttle/super_cruise/orbital_poi_generator/ruin_generator/mapping.dm b/code/modules/shuttle/super_cruise/orbital_poi_generator/ruin_generator/mapping.dm
index b8c38d6b2d013..23a5c3ead129d 100644
--- a/code/modules/shuttle/super_cruise/orbital_poi_generator/ruin_generator/mapping.dm
+++ b/code/modules/shuttle/super_cruise/orbital_poi_generator/ruin_generator/mapping.dm
@@ -52,14 +52,14 @@
/obj/item/reagent_containers/medspray/sterilizine = 1,
/obj/item/reagent_containers/medspray/silver_sulf = 1,
/obj/item/reagent_containers/medspray/styptic = 1,
- /obj/item/reagent_containers/food/drinks/bottle/synthflesh = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/synthflesh = 1,
/obj/item/clothing/glasses/hud/health/sunglasses = 1,
/obj/item/surgical_drapes = 1,
/obj/item/stack/medical/bruise_pack = 1,
/obj/item/stack/medical/ointment = 1,
/obj/item/stack/medical/gauze = 1,
- /obj/item/reagent_containers/glass/bottle/epinephrine = 1,
- /obj/item/reagent_containers/glass/bottle/charcoal = 1,
+ /obj/item/reagent_containers/cup/bottle/epinephrine = 1,
+ /obj/item/reagent_containers/cup/bottle/charcoal = 1,
/obj/item/storage/pill_bottle/floorpill/full = 1,
/obj/item/storage/pill_bottle/antirad = 1,
/obj/item/clothing/neck/stethoscope = 1,
@@ -139,8 +139,8 @@
/obj/item/clothing/suit/armor/vest = 2,
/obj/item/clothing/suit/armor/bulletproof = 1,
/obj/item/storage/secure/briefcase = 1,
- /obj/item/reagent_containers/glass/rag = 1,
- /obj/item/reagent_containers/glass/bottle/chloralhydrate = 1,
+ /obj/item/reagent_containers/cup/rag = 1,
+ /obj/item/reagent_containers/cup/bottle/chloralhydrate = 1,
/obj/item/grenade/flashbang = 2,
/obj/item/grenade/chem_grenade/teargas = 1,
/obj/item/reagent_containers/peppercloud_deployer = 1,
diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm
index e7eb5897f2d0e..1706046bbeed9 100644
--- a/code/modules/uplink/uplink_items.dm
+++ b/code/modules/uplink/uplink_items.dm
@@ -2379,7 +2379,7 @@ GLOBAL_LIST_INIT(illegal_tech_blacklist, typecacheof(list(
name = "Spanish Flu Culture"
desc = "A bottle of cursed blood, full of angry spirits which will burn all the heretics with the fires of hell. \
At least, that's what the label says"
- item = /obj/item/reagent_containers/glass/bottle/fluspanish
+ item = /obj/item/reagent_containers/cup/bottle/fluspanish
cost = 12
restricted_roles = list(JOB_NAME_CHAPLAIN, JOB_NAME_VIROLOGIST)
@@ -2387,7 +2387,7 @@ GLOBAL_LIST_INIT(illegal_tech_blacklist, typecacheof(list(
name = "Retrovirus Culture Bottle"
desc = "A bottle of contagious DNA bugs, which will manually rearrange the DNA of hosts. \
At least, that's what the label says."
- item = /obj/item/reagent_containers/glass/bottle/retrovirus
+ item = /obj/item/reagent_containers/cup/bottle/retrovirus
cost = 12
restricted_roles = list(JOB_NAME_VIROLOGIST, JOB_NAME_GENETICIST)
@@ -2395,7 +2395,7 @@ GLOBAL_LIST_INIT(illegal_tech_blacklist, typecacheof(list(
name = "Anxiety Culture Bottle"
desc = "A bottle of contagious anxiety-inducing virus. \
At least, that's what the label says"
- item = /obj/item/reagent_containers/glass/bottle/anxiety
+ item = /obj/item/reagent_containers/cup/bottle/anxiety
cost = 4
restricted_roles = list(JOB_NAME_VIROLOGIST)
@@ -2576,7 +2576,7 @@ GLOBAL_LIST_INIT(illegal_tech_blacklist, typecacheof(list(
name = "Syndicate Beer"
desc = "Syndicate brand 'beer' designed to flush toxins out of your system. \
Warning: Do not consume more than one!"
- item = /obj/item/reagent_containers/food/drinks/syndicatebeer
+ item = /obj/item/reagent_containers/cup/glass/bottle/beer/syndicate
cost = 4
illegal_tech = FALSE
diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm
index 0016925aeb80c..2238d3280d9d2 100644
--- a/code/modules/vending/boozeomat.dm
+++ b/code/modules/vending/boozeomat.dm
@@ -3,43 +3,43 @@
desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one."
icon_state = "boozeomat"
icon_deny = "boozeomat-deny"
- products = list(/obj/item/reagent_containers/food/drinks/drinkingglass = 30,
- /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 12,
- /obj/item/reagent_containers/food/drinks/flask = 3,
- /obj/item/reagent_containers/food/drinks/ice = 10,
- /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/soda_cans/cola = 8,
- /obj/item/reagent_containers/food/drinks/soda_cans/tonic = 8,
- /obj/item/reagent_containers/food/drinks/soda_cans/sodawater = 15,
- /obj/item/reagent_containers/food/drinks/bottle/grenadine = 4,
- /obj/item/reagent_containers/food/drinks/bottle/menthol = 4,
- /obj/item/reagent_containers/food/drinks/ale = 6,
- /obj/item/reagent_containers/food/drinks/beer = 6,
- /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/bottle/cognac = 5,
- /obj/item/reagent_containers/food/drinks/bottle/kahlua = 5,
- /obj/item/reagent_containers/food/drinks/bottle/hcider = 5,
- /obj/item/reagent_containers/food/drinks/bottle/absinthe = 5,
- /obj/item/reagent_containers/food/drinks/bottle/grappa = 5,
- /obj/item/reagent_containers/food/drinks/bottle/sake = 5,
- /obj/item/reagent_containers/food/drinks/bottle/applejack = 5,
- /obj/item/reagent_containers/food/drinks/bottle/blank = 15,
- /obj/item/reagent_containers/food/drinks/bottle/blank/small = 15
+ products = list(/obj/item/reagent_containers/cup/glass/drinkingglass = 30,
+ /obj/item/reagent_containers/cup/glass/drinkingglass/shotglass = 12,
+ /obj/item/reagent_containers/cup/glass/flask = 3,
+ /obj/item/reagent_containers/cup/glass/ice = 10,
+ /obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice = 4,
+ /obj/item/reagent_containers/cup/glass/bottle/juice/tomatojuice = 4,
+ /obj/item/reagent_containers/cup/glass/bottle/juice/limejuice = 4,
+ /obj/item/reagent_containers/cup/glass/bottle/juice/cream = 4,
+ /obj/item/reagent_containers/cup/soda_cans/cola = 8,
+ /obj/item/reagent_containers/cup/soda_cans/tonic = 8,
+ /obj/item/reagent_containers/cup/soda_cans/sodawater = 15,
+ /obj/item/reagent_containers/cup/glass/bottle/grenadine = 4,
+ /obj/item/reagent_containers/cup/glass/bottle/juice/menthol = 4,
+ /obj/item/reagent_containers/cup/glass/bottle/ale = 6,
+ /obj/item/reagent_containers/cup/glass/bottle/beer = 6,
+ /obj/item/reagent_containers/cup/glass/bottle/gin = 5,
+ /obj/item/reagent_containers/cup/glass/bottle/whiskey = 5,
+ /obj/item/reagent_containers/cup/glass/bottle/tequila = 5,
+ /obj/item/reagent_containers/cup/glass/bottle/vodka = 5,
+ /obj/item/reagent_containers/cup/glass/bottle/vermouth = 5,
+ /obj/item/reagent_containers/cup/glass/bottle/rum = 5,
+ /obj/item/reagent_containers/cup/glass/bottle/wine = 5,
+ /obj/item/reagent_containers/cup/glass/bottle/cognac = 5,
+ /obj/item/reagent_containers/cup/glass/bottle/kahlua = 5,
+ /obj/item/reagent_containers/cup/glass/bottle/hcider = 5,
+ /obj/item/reagent_containers/cup/glass/bottle/absinthe = 5,
+ /obj/item/reagent_containers/cup/glass/bottle/grappa = 5,
+ /obj/item/reagent_containers/cup/glass/bottle/sake = 5,
+ /obj/item/reagent_containers/cup/glass/bottle/applejack = 5,
+ /obj/item/reagent_containers/cup/glass/bottle/blank = 15,
+ /obj/item/reagent_containers/cup/glass/bottle/blank/small = 15
)
- contraband = list(/obj/item/reagent_containers/food/drinks/mug/tea = 12,
- /obj/item/reagent_containers/food/drinks/bottle/fernet = 5)
- premium = list(/obj/item/reagent_containers/glass/bottle/ethanol = 4,
- /obj/item/reagent_containers/food/drinks/bottle/champagne = 5,
- /obj/item/reagent_containers/food/drinks/bottle/trappist = 5)
+ contraband = list(/obj/item/reagent_containers/cup/glass/mug/tea = 12,
+ /obj/item/reagent_containers/cup/glass/bottle/fernet = 5)
+ premium = list(/obj/item/reagent_containers/cup/bottle/ethanol = 4,
+ /obj/item/reagent_containers/cup/glass/bottle/champagne = 5,
+ /obj/item/reagent_containers/cup/glass/bottle/trappist = 5)
product_slogans = "I hope nobody asks me for a bloody cup o' tea...;Alcohol is humanity's friend. Would you abandon a friend?;Quite delighted to serve you!;Is nobody thirsty on this station?"
product_ads = "Drink up!;Booze is good for you!;Alcohol is humanity's best friend.;Quite delighted to serve you!;Care for a nice, cold beer?;Nothing cures you like booze!;Have a sip!;Have a drink!;Have a beer!;Beer is good for you!;Only the finest alcohol!;Best quality booze since 2053!;Award-winning wine!;Maximum alcohol!;Man loves beer.;A toast for progress!"
@@ -63,24 +63,24 @@
/obj/machinery/vending/boozeomat/maint //abandoned bar on randomaints usually
desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one. This one is kinda run down, almost forgotten down here..."
- products = list(/obj/item/reagent_containers/food/drinks/bottle/whiskey = 1,
- /obj/item/reagent_containers/food/drinks/bottle/absinthe = 1,
- /obj/item/reagent_containers/food/drinks/bottle/limejuice = 1,
- /obj/item/reagent_containers/food/drinks/bottle/cream = 1,
- /obj/item/reagent_containers/food/drinks/soda_cans/tonic = 1,
- /obj/item/reagent_containers/food/drinks/drinkingglass = 10,
- /obj/item/reagent_containers/food/drinks/ice = 3,
- /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 6,
- /obj/item/reagent_containers/food/drinks/flask = 1)
+ products = list(/obj/item/reagent_containers/cup/glass/bottle/whiskey = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/absinthe = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/juice/limejuice = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/juice/cream = 1,
+ /obj/item/reagent_containers/cup/soda_cans/tonic = 1,
+ /obj/item/reagent_containers/cup/glass/drinkingglass = 10,
+ /obj/item/reagent_containers/cup/glass/ice = 3,
+ /obj/item/reagent_containers/cup/glass/drinkingglass/shotglass = 6,
+ /obj/item/reagent_containers/cup/glass/flask = 1)
req_access = null
/obj/machinery/vending/boozeomat/captain//Captain's quarters variant
desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one. This one has less items, yet more fit for a captain."
- products = list(/obj/item/reagent_containers/food/drinks/bottle/rum = 1,
- /obj/item/reagent_containers/food/drinks/bottle/wine = 1,
- /obj/item/reagent_containers/food/drinks/ale = 1,
- /obj/item/reagent_containers/food/drinks/drinkingglass = 6,
- /obj/item/reagent_containers/food/drinks/ice = 1,
- /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 4);
+ products = list(/obj/item/reagent_containers/cup/glass/bottle/rum = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/wine = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/ale = 1,
+ /obj/item/reagent_containers/cup/glass/drinkingglass = 6,
+ /obj/item/reagent_containers/cup/glass/ice = 1,
+ /obj/item/reagent_containers/cup/glass/drinkingglass/shotglass = 4);
req_access = list(ACCESS_CAPTAIN)
diff --git a/code/modules/vending/coffee.dm b/code/modules/vending/coffee.dm
index b02d84427ae75..6020237fba089 100644
--- a/code/modules/vending/coffee.dm
+++ b/code/modules/vending/coffee.dm
@@ -4,11 +4,11 @@
product_ads = "Have a drink!;Drink up!;It's good for you!;Would you like a hot joe?;I'd kill for some coffee!;The best beans in the galaxy.;Only the finest brew for you.;Mmmm. Nothing like a coffee.;I like coffee, don't you?;Coffee helps you work!;Try some tea.;We hope you like the best!;Try our new chocolate!;Admin conspiracies"
icon_state = "coffee"
icon_vend = "coffee-vend"
- products = list(/obj/item/reagent_containers/food/drinks/coffee = 6,
- /obj/item/reagent_containers/food/drinks/mug/tea = 6,
- /obj/item/reagent_containers/food/drinks/mug/cocoa = 3,
- /obj/item/reagent_containers/food/drinks/bubble_tea = 4)
- contraband = list(/obj/item/reagent_containers/food/drinks/ice = 12)
+ products = list(/obj/item/reagent_containers/cup/glass/coffee = 6,
+ /obj/item/reagent_containers/cup/glass/mug/tea = 6,
+ /obj/item/reagent_containers/cup/glass/mug/cocoa = 3,
+ /obj/item/reagent_containers/cup/glass/bubble_tea = 4)
+ contraband = list(/obj/item/reagent_containers/cup/glass/ice = 12)
refill_canister = /obj/item/vending_refill/coffee
default_price = 10
extra_price = 25
diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm
index 46b0afdf71c31..b1957e387f4c1 100644
--- a/code/modules/vending/cola.dm
+++ b/code/modules/vending/cola.dm
@@ -5,20 +5,20 @@
icon_state = "Cola_Machine"
product_slogans = "Robust Softdrinks: More robust than a toolbox to the head!"
product_ads = "Refreshing!;Hope you're thirsty!;Over 1 million drinks sold!;Thirsty? Why not cola?;Please, have a drink!;Drink up!;The best drinks in space."
- products = list(/obj/item/reagent_containers/food/drinks/soda_cans/cola = 10,
- /obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind = 10,
- /obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb = 10,
- /obj/item/reagent_containers/food/drinks/soda_cans/starkist = 10,
- /obj/item/reagent_containers/food/drinks/soda_cans/space_up = 10,
- /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 10,
- /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 10,
- /obj/item/reagent_containers/glass/waterbottle = 10)
- contraband = list(/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 6,
- /obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 6)
- premium = list(/obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola = 1,
- /obj/item/reagent_containers/food/drinks/soda_cans/air = 1,
- /obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy = 1,
- /obj/item/reagent_containers/food/drinks/soda_cans/grey_bull = 1)
+ products = list(/obj/item/reagent_containers/cup/soda_cans/cola = 10,
+ /obj/item/reagent_containers/cup/soda_cans/space_mountain_wind = 10,
+ /obj/item/reagent_containers/cup/soda_cans/dr_gibb = 10,
+ /obj/item/reagent_containers/cup/soda_cans/starkist = 10,
+ /obj/item/reagent_containers/cup/soda_cans/space_up = 10,
+ /obj/item/reagent_containers/cup/soda_cans/pwr_game = 10,
+ /obj/item/reagent_containers/cup/soda_cans/lemon_lime = 10,
+ /obj/item/reagent_containers/cup/glass/waterbottle = 10)
+ contraband = list(/obj/item/reagent_containers/cup/soda_cans/thirteenloko = 6,
+ /obj/item/reagent_containers/cup/soda_cans/shamblers = 6)
+ premium = list(/obj/item/reagent_containers/cup/glass/drinkingglass/filled/nuka_cola = 1,
+ /obj/item/reagent_containers/cup/soda_cans/air = 1,
+ /obj/item/reagent_containers/cup/soda_cans/monkey_energy = 1,
+ /obj/item/reagent_containers/cup/soda_cans/grey_bull = 1)
refill_canister = /obj/item/vending_refill/cola
default_price = 5
extra_price = 60
@@ -80,14 +80,14 @@
desc = "~Shake me up some of that Shambler's Juice!~"
icon_state = "shamblers_juice"
products = list(
- /obj/item/reagent_containers/food/drinks/soda_cans/cola = 10,
- /obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind = 10,
- /obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb = 10,
- /obj/item/reagent_containers/food/drinks/soda_cans/starkist = 10,
- /obj/item/reagent_containers/food/drinks/soda_cans/space_up = 10,
- /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 10,
- /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 10,
- /obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 10
+ /obj/item/reagent_containers/cup/soda_cans/cola = 10,
+ /obj/item/reagent_containers/cup/soda_cans/space_mountain_wind = 10,
+ /obj/item/reagent_containers/cup/soda_cans/dr_gibb = 10,
+ /obj/item/reagent_containers/cup/soda_cans/starkist = 10,
+ /obj/item/reagent_containers/cup/soda_cans/space_up = 10,
+ /obj/item/reagent_containers/cup/soda_cans/pwr_game = 10,
+ /obj/item/reagent_containers/cup/soda_cans/lemon_lime = 10,
+ /obj/item/reagent_containers/cup/soda_cans/shamblers = 10
)
product_slogans = "~Shake me up some of that Shambler's Juice!~"
product_ads = "Refreshing!;Jyrbv dv lg jfdv fw kyrk Jyrdscvi'j Alztv!;Over 1 trillion souls drank!;Thirsty? Nyp efk uizeb kyv uribevjj?;Kyv Jyrdscvi uizebj kyv ezxyk!;Drink up!;Krjkp."
diff --git a/code/modules/vending/drinnerware.dm b/code/modules/vending/drinnerware.dm
index 287b36fd3e716..f534dbc99f6ed 100644
--- a/code/modules/vending/drinnerware.dm
+++ b/code/modules/vending/drinnerware.dm
@@ -5,14 +5,14 @@
icon_state = "dinnerware"
products = list(
/obj/item/storage/bag/tray = 8,
- /obj/item/reagent_containers/glass/bowl = 20,
+ /obj/item/reagent_containers/cup/bowl = 20,
/obj/item/kitchen/fork = 6,
- /obj/item/reagent_containers/food/drinks/drinkingglass = 8,
- /obj/item/reagent_containers/food/condiment/pack/ketchup = 5,
- /obj/item/reagent_containers/food/condiment/pack/hotsauce = 5,
- /obj/item/reagent_containers/food/condiment/pack/astrotame = 5,
- /obj/item/reagent_containers/food/condiment/saltshaker = 5,
- /obj/item/reagent_containers/food/condiment/peppermill = 5,
+ /obj/item/reagent_containers/cup/glass/drinkingglass = 8,
+ /obj/item/reagent_containers/condiment/pack/ketchup = 5,
+ /obj/item/reagent_containers/condiment/pack/hotsauce = 5,
+ /obj/item/reagent_containers/condiment/pack/astrotame = 5,
+ /obj/item/reagent_containers/condiment/saltshaker = 5,
+ /obj/item/reagent_containers/condiment/peppermill = 5,
/obj/item/clothing/suit/apron/chef = 2,
/obj/item/kitchen/rollingpin = 2,
/obj/item/knife/kitchen = 2,
diff --git a/code/modules/vending/liberation.dm b/code/modules/vending/liberation.dm
index 9175f244939b7..fe317ec612061 100644
--- a/code/modules/vending/liberation.dm
+++ b/code/modules/vending/liberation.dm
@@ -8,7 +8,7 @@
products = list(/obj/item/food/burger/plain = 5, //O say can you see, by the dawn's early light
/obj/item/food/burger/baseball = 3, //What so proudly we hailed at the twilight's last gleaming
/obj/item/food/fries = 5, //Whose broad stripes and bright stars through the perilous fight
- /obj/item/reagent_containers/food/drinks/beer/light = 10, //O'er the ramparts we watched, were so gallantly streaming?
+ /obj/item/reagent_containers/cup/glass/bottle/beer/light = 10, //O'er the ramparts we watched, were so gallantly streaming?
/obj/item/gun/ballistic/automatic/pistol/deagle/gold = 2,
/obj/item/gun/ballistic/automatic/pistol/deagle/camo = 2,
/obj/item/gun/ballistic/automatic/pistol/m1911 = 2,
diff --git a/code/modules/vending/magivend.dm b/code/modules/vending/magivend.dm
index 8cc38fc040920..7392cebfe599b 100644
--- a/code/modules/vending/magivend.dm
+++ b/code/modules/vending/magivend.dm
@@ -13,7 +13,7 @@
/obj/item/clothing/suit/wizrobe/yellow = 1,
/obj/item/clothing/shoes/sandal/magic = 1,
/obj/item/staff = 2)
- contraband = list(/obj/item/reagent_containers/glass/bottle/wizarditis = 1) //No one can get to the machine to hack it anyways; for the lulz - Microwave
+ contraband = list(/obj/item/reagent_containers/cup/bottle/wizarditis = 1) //No one can get to the machine to hack it anyways; for the lulz - Microwave
armor = list(MELEE = 100, BULLET = 100, LASER = 100, ENERGY = 100, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 50, STAMINA = 0, BLEED = 0)
resistance_flags = FIRE_PROOF
default_price = 25
diff --git a/code/modules/vending/medical.dm b/code/modules/vending/medical.dm
index 4931af82685c1..f8ba4d5332202 100644
--- a/code/modules/vending/medical.dm
+++ b/code/modules/vending/medical.dm
@@ -9,22 +9,22 @@
/obj/item/reagent_containers/dropper = 3,
/obj/item/reagent_containers/medspray = 6,
/obj/item/storage/pill_bottle = 6,
- /obj/item/reagent_containers/glass/bottle = 10,
+ /obj/item/reagent_containers/cup/bottle = 10,
/obj/item/reagent_containers/spray/cleaner = 1,
/obj/item/stack/medical/gauze = 8,
/obj/item/reagent_containers/hypospray/medipen = 8,
/obj/item/reagent_containers/hypospray/medipen/dexalin = 8,
- /obj/item/reagent_containers/glass/bottle/epinephrine = 4,
- /obj/item/reagent_containers/glass/bottle/charcoal = 4,
- /obj/item/reagent_containers/glass/bottle/salglu_solution = 4,
- /obj/item/reagent_containers/glass/bottle/tricordrazine = 1,
- /obj/item/reagent_containers/glass/bottle/spaceacillin = 1,
- /obj/item/reagent_containers/glass/bottle/morphine = 2,
- /obj/item/reagent_containers/glass/bottle/toxin = 4,
+ /obj/item/reagent_containers/cup/bottle/epinephrine = 4,
+ /obj/item/reagent_containers/cup/bottle/charcoal = 4,
+ /obj/item/reagent_containers/cup/bottle/salglu_solution = 4,
+ /obj/item/reagent_containers/cup/bottle/tricordrazine = 1,
+ /obj/item/reagent_containers/cup/bottle/spaceacillin = 1,
+ /obj/item/reagent_containers/cup/bottle/morphine = 2,
+ /obj/item/reagent_containers/cup/bottle/toxin = 4,
/obj/item/reagent_containers/medspray/sterilizine = 4)
- contraband = list(/obj/item/reagent_containers/glass/bottle/chloralhydrate = 1,
+ contraband = list(/obj/item/reagent_containers/cup/bottle/chloralhydrate = 1,
/obj/item/storage/box/hug/medical = 1,
- /obj/item/reagent_containers/glass/bottle/random_virus = 1)
+ /obj/item/reagent_containers/cup/bottle/random_virus = 1)
premium = list(/obj/item/storage/firstaid/regular = 3,
/obj/item/storage/belt/medical = 3,
/obj/item/sensor_device = 2,
diff --git a/code/modules/vending/medical_wall.dm b/code/modules/vending/medical_wall.dm
index 45d13c763715e..aaa9597a4b248 100644
--- a/code/modules/vending/medical_wall.dm
+++ b/code/modules/vending/medical_wall.dm
@@ -8,11 +8,11 @@
/obj/item/stack/medical/gauze = 4,
/obj/item/reagent_containers/hypospray/medipen = 3,
/obj/item/reagent_containers/hypospray/medipen/dexalin = 3,
- /obj/item/reagent_containers/glass/bottle/epinephrine = 2,
- /obj/item/reagent_containers/glass/bottle/charcoal = 2,
+ /obj/item/reagent_containers/cup/bottle/epinephrine = 2,
+ /obj/item/reagent_containers/cup/bottle/charcoal = 2,
/obj/item/reagent_containers/medspray/sterilizine = 3)
- contraband = list(/obj/item/reagent_containers/glass/bottle/toxin = 1,
- /obj/item/reagent_containers/glass/bottle/morphine = 1)
+ contraband = list(/obj/item/reagent_containers/cup/bottle/toxin = 1,
+ /obj/item/reagent_containers/cup/bottle/morphine = 1)
armor = list(MELEE = 100, BULLET = 100, LASER = 100, ENERGY = 100, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 50, STAMINA = 0, BLEED = 0)
resistance_flags = FIRE_PROOF
refill_canister = /obj/item/vending_refill/wallmed
diff --git a/code/modules/vending/mining.dm b/code/modules/vending/mining.dm
index 34f54180393da..80ae04361ab79 100644
--- a/code/modules/vending/mining.dm
+++ b/code/modules/vending/mining.dm
@@ -7,8 +7,8 @@
products = list(/obj/item/food/donkpocket/warm = 8,
/obj/item/food/salad/herbsalad = 6,
/obj/item/food/canned/beans = 4,
- /obj/item/reagent_containers/glass/waterbottle/large = 10)
- contraband = list(/obj/item/reagent_containers/food/drinks/coffee = 10,
+ /obj/item/reagent_containers/cup/glass/waterbottle/large = 10)
+ contraband = list(/obj/item/reagent_containers/cup/glass/coffee = 10,
/obj/item/food/chips = 6,
/obj/item/food/icecreamsandwich = 6)
refill_canister = /obj/item/vending_refill/mining
diff --git a/code/modules/vending/nutrimax.dm b/code/modules/vending/nutrimax.dm
index 2c4ab4845f433..9856eb5036c4a 100644
--- a/code/modules/vending/nutrimax.dm
+++ b/code/modules/vending/nutrimax.dm
@@ -6,17 +6,17 @@
icon_state = "nutri"
icon_deny = "nutri-deny"
light_mask = "nutri-light-mask"
- products = list(/obj/item/reagent_containers/glass/bottle/nutrient/ez = 30,
- /obj/item/reagent_containers/glass/bottle/nutrient/l4z = 20,
- /obj/item/reagent_containers/glass/bottle/nutrient/rh = 10,
+ products = list(/obj/item/reagent_containers/cup/bottle/nutrient/ez = 30,
+ /obj/item/reagent_containers/cup/bottle/nutrient/l4z = 20,
+ /obj/item/reagent_containers/cup/bottle/nutrient/rh = 10,
/obj/item/reagent_containers/spray/pestspray = 20,
/obj/item/reagent_containers/syringe = 5,
/obj/item/storage/bag/plants = 5,
/obj/item/cultivator = 3,
/obj/item/shovel/spade = 3,
/obj/item/plant_analyzer = 4)
- contraband = list(/obj/item/reagent_containers/glass/bottle/ammonia = 10,
- /obj/item/reagent_containers/glass/bottle/diethylamine = 5)
+ contraband = list(/obj/item/reagent_containers/cup/bottle/ammonia = 10,
+ /obj/item/reagent_containers/cup/bottle/diethylamine = 5)
refill_canister = /obj/item/vending_refill/hydronutrients
default_price = 10
extra_price = 50
diff --git a/code/modules/vending/snack.dm b/code/modules/vending/snack.dm
index 319dccb0ec710..d34c56945c970 100644
--- a/code/modules/vending/snack.dm
+++ b/code/modules/vending/snack.dm
@@ -11,7 +11,7 @@
/obj/item/food/chips = 6,
/obj/item/food/sosjerky = 6,
/obj/item/food/no_raisin = 6,
- /obj/item/reagent_containers/food/drinks/dry_ramen = 3,
+ /obj/item/reagent_containers/cup/glass/dry_ramen = 3,
/obj/item/food/energybar = 6)
contraband = list(/obj/item/food/syndicake = 6,
/obj/item/food/swirl_lollipop = 2)
diff --git a/code/modules/vending/sovietsoda.dm b/code/modules/vending/sovietsoda.dm
index 92c59260c1184..f38b9eba0fc88 100644
--- a/code/modules/vending/sovietsoda.dm
+++ b/code/modules/vending/sovietsoda.dm
@@ -4,8 +4,8 @@
icon_state = "sovietsoda"
light_mask = "soviet-light-mask"
product_ads = "For Tsar and Country.;Have you fulfilled your nutrition quota today?;Very nice!;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/drinkingglass/filled/soda = 30)
- contraband = list(/obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola = 20)
+ products = list(/obj/item/reagent_containers/cup/glass/drinkingglass/filled/soda = 30)
+ contraband = list(/obj/item/reagent_containers/cup/glass/drinkingglass/filled/cola = 20)
refill_canister = /obj/item/vending_refill/sovietsoda
resistance_flags = FIRE_PROOF
default_price = 1
diff --git a/code/modules/vending/sustenance.dm b/code/modules/vending/sustenance.dm
index 8bbc0b17b5f47..b66068ab0d050 100644
--- a/code/modules/vending/sustenance.dm
+++ b/code/modules/vending/sustenance.dm
@@ -6,10 +6,10 @@
icon_state = "sustenance"
light_mask = "snack-light-mask"
products = list(/obj/item/food/tofu/prison = 24,
- /obj/item/reagent_containers/food/drinks/ice/prison = 12,
+ /obj/item/reagent_containers/cup/glass/ice/prison = 12,
/obj/item/food/candy_corn/prison = 6)
contraband = list(/obj/item/knife/kitchen = 6,
- /obj/item/reagent_containers/food/drinks/coffee = 12,
+ /obj/item/reagent_containers/cup/glass/coffee = 12,
/obj/item/tank/internals/emergency_oxygen = 6,
/obj/item/clothing/mask/breath = 6)
refill_canister = /obj/item/vending_refill/sustenance
diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
index 1e810e04b5928..c1cfd17d79391 100644
--- a/code/modules/vending/wardrobes.dm
+++ b/code/modules/vending/wardrobes.dm
@@ -310,7 +310,7 @@
/obj/item/clothing/suit/apron/purple_bartender = 2,
/obj/item/clothing/head/soft/black = 2,
/obj/item/clothing/shoes/sneakers/black = 2,
- /obj/item/reagent_containers/glass/rag = 2,
+ /obj/item/reagent_containers/cup/rag = 2,
/obj/item/storage/box/beanbag = 1,
/obj/item/clothing/suit/armor/vest/alt = 1,
/obj/item/circuitboard/machine/dish_drive = 1,
@@ -348,7 +348,7 @@
/obj/item/clothing/under/rank/civilian/chef/skirt = 2,
/obj/item/clothing/under/rank/civilian/altchef = 1,
/obj/item/clothing/head/utility/chefhat = 3,
- /obj/item/reagent_containers/glass/rag = 1,
+ /obj/item/reagent_containers/cup/rag = 1,
/obj/item/clothing/suit/hooded/wintercoat = 2)
refill_canister = /obj/item/vending_refill/wardrobe/chef_wardrobe
dept_req_for_free = ACCOUNT_SRV_BITFLAG
@@ -547,23 +547,25 @@
icon_state = "detdrobe"
product_ads = "Apply your brilliant deductive methods in style!"
vend_reply = "Thank you for using the DetDrobe!"
- products = list(/obj/item/clothing/under/rank/security/detective = 2,
- /obj/item/clothing/under/rank/security/detective/skirt = 2,
- /obj/item/clothing/shoes/sneakers/brown = 2,
- /obj/item/clothing/suit/jacket/det_suit = 2,
- /obj/item/clothing/suit/hooded/wintercoat/detective = 2,
- /obj/item/clothing/head/fedora/det_hat = 2,
- /obj/item/clothing/under/rank/security/detective/grey = 2,
- /obj/item/clothing/under/rank/security/detective/grey/skirt = 2,
- /obj/item/clothing/accessory/waistcoat = 2,
- /obj/item/clothing/shoes/laceup = 2,
- /obj/item/clothing/suit/jacket/det_suit/dark = 1,
- /obj/item/clothing/suit/jacket/det_suit/noir = 1,
- /obj/item/clothing/head/fedora/det_hat/noir = 2,
- /obj/item/clothing/gloves/color/black = 2,
- /obj/item/clothing/gloves/color/latex = 2,
- /obj/item/reagent_containers/food/drinks/flask/det = 2,
- /obj/item/storage/fancy/cigarettes = 5)
+ products = list(
+ /obj/item/clothing/under/rank/security/detective = 2,
+ /obj/item/clothing/under/rank/security/detective/skirt = 2,
+ /obj/item/clothing/shoes/sneakers/brown = 2,
+ /obj/item/clothing/suit/jacket/det_suit = 2,
+ /obj/item/clothing/suit/hooded/wintercoat/detective = 2,
+ /obj/item/clothing/head/fedora/det_hat = 2,
+ /obj/item/clothing/under/rank/security/detective/grey = 2,
+ /obj/item/clothing/under/rank/security/detective/grey/skirt = 2,
+ /obj/item/clothing/accessory/waistcoat = 2,
+ /obj/item/clothing/shoes/laceup = 2,
+ /obj/item/clothing/suit/jacket/det_suit/dark = 1,
+ /obj/item/clothing/suit/jacket/det_suit/noir = 1,
+ /obj/item/clothing/head/fedora/det_hat/noir = 2,
+ /obj/item/clothing/gloves/color/black = 2,
+ /obj/item/clothing/gloves/color/latex = 2,
+ /obj/item/reagent_containers/cup/glass/flask/det = 2,
+ /obj/item/storage/fancy/cigarettes = 5
+ )
premium = list(/obj/item/clothing/head/flatcap = 1, /obj/item/clothing/suit/armor/vest/det_suit = 1)
refill_canister = /obj/item/vending_refill/wardrobe/det_wardrobe
extra_price = 350
diff --git a/code/modules/wiremod/core/component_printer.dm b/code/modules/wiremod/core/component_printer.dm
index 3495bb2a7b839..9d40bb6204c60 100644
--- a/code/modules/wiremod/core/component_printer.dm
+++ b/code/modules/wiremod/core/component_printer.dm
@@ -45,7 +45,7 @@
req_components = list(
/obj/item/stock_parts/matter_bin = 2,
/obj/item/stock_parts/manipulator = 2,
- /obj/item/reagent_containers/glass/beaker = 2, //this doesn't make any sense, yet i wasn't allowed to fix it.
+ /obj/item/reagent_containers/cup/beaker = 2, //this doesn't make any sense, yet i wasn't allowed to fix it.
)
/// Module duplicator, allows you to save and recreate module components.
@@ -268,5 +268,5 @@
req_components = list(
/obj/item/stock_parts/matter_bin = 2,
/obj/item/stock_parts/manipulator = 2,
- /obj/item/reagent_containers/glass/beaker = 2,
+ /obj/item/reagent_containers/cup/beaker = 2,
)
diff --git a/html/changelog.html b/html/changelog.html
index 24fce097de092..4c1b8089ef563 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,37 @@
-->
+
18 October 2024
+
ktlwjec updated:
+
+ - Breaking grilles no longer drop invisible rods.
+
+
rkz, Ryll/Shaps, LemonInTheDark, Couls, JohnFulpWillard, OnlineGirlfriend updated:
+
+ - repaths drinks and reagent containers to a centralized file. Food reagent_containers no longer exist.
+ - fixed a few outlying food checks that still expected reagent_containers
+ - fixed caltrop bug with plates
+ - hot chocolate no longer spontaneously becomes chocolate milk when put in a different container
+ - moves hot chocolate, tea, coffee "food" recipes to drink recipes
+ - hot chocolate now inherits milk's healing (its made from milk, get it?)
+ - caltrop now applies to broken bottles
+ - drinking from used glasses can now pass diseases, same as food. Bartenders! Clean your glasses!
+ - adds soda shaking. Shaking/throwing a soda around before opening may make it erupt when opened.
+ - soda shaking noises
+
+
+
16 October 2024
+
BeeLover66 updated:
+
+ - Radio channels no longer always default to common when no encryption key is installed
+
+
+
14 October 2024
+
PowerfulBacon updated:
+
+ - Github issues will correctly be marked as stale after 30 days instead of 7
+
+
13 October 2024
Absolucy, LT3, san7890, Melbert, Aylong updated:
@@ -944,62 +975,6 @@ ro5490 updated:
- Added a new Floor Cluwne Smite, and interaction
- fixed the stalker smite from killing people
-
-
16 August 2024
-
Dejaku51 updated:
-
- - BSA now has a windup with sparks on target location
- - BSA now has integrated battery and is powered with a cable attached to the end of BSA
- - BSA shows amount of charge in quarters on the capacitor part of the BSA
- - BSA requires 5MW to shoot
- - BSA now makes a sound when winding up and shooting
- - BSA makes a sound on quarters charged with unique one on full charge
-
-
Sarchutar updated:
-
- - ability to close morgues when adjacent without having to click on the tray
- - cyborgs can now close morgues by clicking on the tray
-
-
Spockye updated:
-
- - Remakes the escape pod shuttle
- - Ports Capybaras from Shiptest
-
-
rkz, Kylerace, LemonInTheDark, Tastyfish, Mat05usz updated:
-
- - Adds new subsystem to optimize radio and searching areas
-
-
-
15 August 2024
-
Tsar-Salat updated:
-
- - you can buckle to stuff from adjacent turfs again
- - adds missing step() hook in cardboard box relaymove. Boxes (and traitor stealth implant boxes) will now move when the player moves.
-
-
XeonMations updated:
-
- - Examining a syndicate bomb now shows a balloon popup with the time remaining
- - Gave fire alarms a toggleable lock. (Requires atmospherics access)
- - Fire alarms now lock themselves when they detect a fire.
-
-
rkz updated:
-
- - possibly fixes stamina healing
-
-
-
14 August 2024
-
PowerfulBacon updated:
-
- - Billy clubs will now deal bonus to damage all structures and machines.
- - Billy clubs no longer conduct electricity.
- - Breaching rounds will now deal bonus damage all structures and machines. Increases damage against turfs.
- - Added a maximum damage to prevent important structures in defense gamemodes from being killed in a single shot (Space dragons & Clock Cult).
- - Airlocks will no longer shock the target upon being broken due to an unintentional side-effect of using usr.
-
-
ro5490 updated:
-
- - sorted out keypress log clutter
-