diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_lust.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_lust.dmm
index 51cc44d4d8d..9284f2c612a 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_surface_lust.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_surface_lust.dmm
@@ -10,7 +10,7 @@
/turf/open/floor/mineral/diamond,
/area/icemoon/surface/outdoors)
"d" = (
-/obj/item/reagent_containers/food/drinks/trophy/gold_cup,
+/obj/item/reagent_containers/cup/glass/trophy/gold_cup,
/turf/open/floor/mineral/diamond,
/area/icemoon/surface/outdoors)
"e" = (
diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm
index 66a11d80937..9b2a6c2920b 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm
@@ -57,7 +57,7 @@
/turf/open/floor/wood,
/area/ruin/unpowered)
"o" = (
-/obj/item/reagent_containers/food/drinks/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/turf/open/floor/wood,
/area/ruin/unpowered)
"p" = (
diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_pizza.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_pizza.dmm
index 0186331573d..bfd69e810fc 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_surface_pizza.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_surface_pizza.dmm
@@ -39,7 +39,7 @@
/obj/structure/sign/poster/official/moth_meth{
pixel_y = 32
},
-/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/item/reagent_containers/condiment/enzyme,
/turf/open/floor/iron/cafeteria,
/area/ruin/pizzeria/kitchen)
"bV" = (
@@ -174,7 +174,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
-/obj/item/reagent_containers/food/drinks/colocup,
+/obj/item/reagent_containers/cup/glass/colocup,
/turf/open/floor/iron/dark/side{
dir = 5
},
@@ -549,9 +549,9 @@
/area/ruin/pizzeria/kitchen)
"rY" = (
/obj/structure/closet/secure_closet/freezer/kitchen,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/milk{
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk{
pixel_x = 2;
pixel_y = 2
},
@@ -698,7 +698,7 @@
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
-/obj/item/reagent_containers/food/drinks/colocup{
+/obj/item/reagent_containers/cup/glass/colocup{
pixel_x = 5
},
/turf/open/floor/iron/dark/side{
@@ -1096,7 +1096,7 @@
/area/ruin/pizzeria)
"JM" = (
/obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/storage/bag/trash,
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/plating,
@@ -1135,11 +1135,11 @@
/area/ruin/pizzeria)
"Lg" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = 2;
pixel_y = 2
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -5;
pixel_y = 2
},
@@ -1290,11 +1290,11 @@
/area/ruin/pizzeria/kitchen)
"PA" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = 2;
pixel_y = 2
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -5;
pixel_y = 2
},
@@ -1331,7 +1331,7 @@
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
-/obj/item/reagent_containers/food/drinks/colocup{
+/obj/item/reagent_containers/cup/glass/colocup{
pixel_y = 11
},
/turf/open/floor/iron/checker,
@@ -1524,11 +1524,11 @@
/area/icemoon/surface/outdoors/nospawn)
"Vs" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = 2;
pixel_y = 2
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -5;
pixel_y = 2
},
@@ -1650,7 +1650,7 @@
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
-/obj/item/reagent_containers/food/drinks/colocup{
+/obj/item/reagent_containers/cup/glass/colocup{
pixel_x = 5
},
/turf/open/floor/iron/checker,
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_homestead.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_homestead.dmm
index 4e1b1369198..7b89602d677 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_homestead.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_homestead.dmm
@@ -88,7 +88,7 @@
color = "#666666"
},
/obj/item/knife/hunting,
-/obj/item/reagent_containers/food/drinks/mug/coco{
+/obj/item/reagent_containers/cup/glass/mug/coco{
desc = "Still hot!";
pixel_x = 6;
pixel_y = 11
@@ -309,7 +309,7 @@
color = "#8a7453";
dir = 1
},
-/obj/item/reagent_containers/glass/bucket/wooden,
+/obj/item/reagent_containers/cup/bucket/wooden,
/turf/open/misc/asteroid/snow/icemoon,
/area/icemoon/underground/explored)
"RO" = (
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm
index ac4bff8c673..f6fa3e7593f 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm
@@ -1496,11 +1496,11 @@
/area/ruin/plasma_facility/commons)
"wQ" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = 9;
pixel_y = 8
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 9;
pixel_y = 3
},
@@ -1882,7 +1882,7 @@
"EZ" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/sink/directional/south,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/mop/advanced,
/turf/open/floor/plating/icemoon,
/area/ruin/plasma_facility/operations)
@@ -2118,7 +2118,7 @@
/area/ruin/plasma_facility/operations)
"Jv" = (
/obj/structure/bed/maint,
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -5;
pixel_y = 12
},
@@ -2803,7 +2803,7 @@
"TD" = (
/obj/structure/table/reinforced,
/obj/structure/sink/kitchen/directional/west,
-/obj/item/reagent_containers/food/condiment/rice{
+/obj/item/reagent_containers/condiment/rice{
pixel_x = -6;
pixel_y = 11
},
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
index 5b60d0ab42f..d7127ca9294 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
@@ -48,10 +48,10 @@
/obj/item/food/sashimi{
pixel_y = 10
},
-/obj/item/reagent_containers/food/drinks/mug/coco{
+/obj/item/reagent_containers/cup/glass/mug/coco{
pixel_x = -10
},
-/obj/item/reagent_containers/food/drinks/mug/coco{
+/obj/item/reagent_containers/cup/glass/mug/coco{
pixel_x = 10;
pixel_y = -4
},
@@ -79,10 +79,10 @@
/obj/item/clothing/head/bearpelt,
/obj/structure/table/wood,
/obj/item/food/burger/fish,
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -4
},
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 10;
pixel_y = 6
},
@@ -196,9 +196,9 @@
/obj/item/food/fishmeat/carp,
/obj/item/food/fishmeat/carp,
/obj/item/food/fishmeat/carp,
-/obj/item/reagent_containers/food/condiment/pack/ketchup,
-/obj/item/reagent_containers/food/condiment/pack/ketchup,
-/obj/item/reagent_containers/food/condiment/pack/ketchup,
+/obj/item/reagent_containers/condiment/pack/ketchup,
+/obj/item/reagent_containers/condiment/pack/ketchup,
+/obj/item/reagent_containers/condiment/pack/ketchup,
/turf/open/floor/iron/checker,
/area/ruin/powered)
"sG" = (
@@ -306,8 +306,8 @@
/obj/structure/closet/cabinet,
/obj/item/restraints/legcuffs/beartrap,
/obj/item/restraints/legcuffs/beartrap,
-/obj/item/reagent_containers/glass/bottle/venom,
-/obj/item/reagent_containers/glass/bottle/curare,
+/obj/item/reagent_containers/cup/bottle/venom,
+/obj/item/reagent_containers/cup/bottle/curare,
/obj/item/knife/combat/survival,
/obj/effect/decal/cleanable/dirt,
/obj/item/food/meat/slab/human,
@@ -540,7 +540,7 @@
/turf/closed/wall,
/area/icemoon/underground/explored)
"Zw" = (
-/obj/item/reagent_containers/food/drinks/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/turf/open/misc/ice/icemoon,
/area/icemoon/underground/explored)
"Zx" = (
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_hermit.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_hermit.dmm
index bbda48726b2..02dae10783b 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_hermit.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_hermit.dmm
@@ -7,7 +7,7 @@
/turf/open/floor/grass/fairy,
/area/ruin/powered/shuttle)
"bW" = (
-/obj/item/reagent_containers/glass/bucket/wooden,
+/obj/item/reagent_containers/cup/bucket/wooden,
/turf/open/floor/plating,
/area/ruin/powered/shuttle)
"cI" = (
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_mailroom.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_mailroom.dmm
index 687d65cfff9..da647301837 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_mailroom.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_mailroom.dmm
@@ -80,7 +80,7 @@
/turf/open/floor/carpet/royalblack,
/area/ruin/powered/mailroom)
"hN" = (
-/obj/item/reagent_containers/food/drinks/coffee,
+/obj/item/reagent_containers/cup/glass/coffee,
/turf/open/floor/iron/smooth_large,
/area/ruin/powered/mailroom)
"iO" = (
@@ -489,7 +489,7 @@
/obj/structure/chair/plastic{
dir = 4
},
-/obj/item/reagent_containers/food/drinks/ice{
+/obj/item/reagent_containers/cup/glass/ice{
pixel_x = 4;
pixel_y = 3
},
diff --git a/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_ash_walker1_skyrat.dmm b/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_ash_walker1_skyrat.dmm
index 9ce5fbe92f2..75336a944be 100644
--- a/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_ash_walker1_skyrat.dmm
+++ b/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_ash_walker1_skyrat.dmm
@@ -42,26 +42,26 @@
/area/ruin/unpowered/ash_walkers)
"bt" = (
/obj/structure/decorative/shelf,
-/obj/item/reagent_containers/glass/bottle/nutrient/rh{
+/obj/item/reagent_containers/cup/bottle/nutrient/rh{
pixel_x = -6;
pixel_y = 6
},
-/obj/item/reagent_containers/glass/bottle/nutrient/rh{
+/obj/item/reagent_containers/cup/bottle/nutrient/rh{
pixel_x = -6;
pixel_y = 2
},
-/obj/item/reagent_containers/glass/bottle/nutrient/l4z{
+/obj/item/reagent_containers/cup/bottle/nutrient/l4z{
pixel_x = 6;
pixel_y = 6
},
-/obj/item/reagent_containers/glass/bottle/nutrient/l4z{
+/obj/item/reagent_containers/cup/bottle/nutrient/l4z{
pixel_x = 6;
pixel_y = 2
},
-/obj/item/reagent_containers/glass/bottle/nutrient/ez{
+/obj/item/reagent_containers/cup/bottle/nutrient/ez{
pixel_y = 4
},
-/obj/item/reagent_containers/glass/bottle/nutrient/ez,
+/obj/item/reagent_containers/cup/bottle/nutrient/ez,
/obj/effect/turf_decal/siding/wideplating/dark,
/turf/open/floor/stone/icemoon{
color = "#878787"
@@ -265,9 +265,9 @@
/area/ruin/unpowered/ash_walkers)
"hh" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/glass/mortar,
+/obj/item/reagent_containers/cup/mortar,
/obj/item/pestle,
-/obj/item/reagent_containers/glass/primitive_centrifuge{
+/obj/item/reagent_containers/cup/primitive_centrifuge{
pixel_x = 5;
pixel_y = 13
},
@@ -290,13 +290,13 @@
/area/ruin/unpowered/ash_walkers)
"hu" = (
/obj/structure/decorative/shelf,
-/obj/item/reagent_containers/food/drinks/bottle/small{
+/obj/item/reagent_containers/cup/glass/bottle/small{
pixel_x = 5
},
-/obj/item/reagent_containers/food/drinks/bottle/small{
+/obj/item/reagent_containers/cup/glass/bottle/small{
pixel_x = -5
},
-/obj/item/reagent_containers/food/drinks/bottle/wine/unlabeled,
+/obj/item/reagent_containers/cup/glass/bottle/wine/unlabeled,
/obj/effect/turf_decal/siding/wideplating/dark{
dir = 1
},
@@ -540,7 +540,7 @@
dir = 1;
pixel_y = 23
},
-/obj/item/reagent_containers/glass/bucket/wooden{
+/obj/item/reagent_containers/cup/bucket/wooden{
desc = "DO NOT MIX WITH THE SHOWER BUCKET, FOR THE LOVE OF THE NECROPOLIS.";
name = "fuel bucket"
},
@@ -598,11 +598,11 @@
/area/ruin/unpowered/ash_walkers)
"oU" = (
/obj/structure/decorative/shelf,
-/obj/item/reagent_containers/food/drinks/bottle/lizardwine,
-/obj/item/reagent_containers/food/drinks/trophy/bronze_cup{
+/obj/item/reagent_containers/cup/glass/bottle/lizardwine,
+/obj/item/reagent_containers/cup/glass/trophy/bronze_cup{
pixel_x = -7
},
-/obj/item/reagent_containers/food/drinks/bottle{
+/obj/item/reagent_containers/cup/glass/bottle{
pixel_x = 6;
pixel_y = -2
},
@@ -673,7 +673,7 @@
/area/ruin/unpowered/ash_walkers)
"qa" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/glass/mortar,
+/obj/item/reagent_containers/cup/mortar,
/obj/item/pestle,
/obj/effect/turf_decal/siding/wood,
/turf/open/floor/wood/icemoon,
@@ -816,11 +816,11 @@
/area/ruin/unpowered/ash_walkers)
"ul" = (
/obj/structure/decorative/shelf,
-/obj/item/reagent_containers/glass/bowl/mushroom_bowl,
-/obj/item/reagent_containers/glass/bowl/mushroom_bowl{
+/obj/item/reagent_containers/cup/bowl/mushroom_bowl,
+/obj/item/reagent_containers/cup/bowl/mushroom_bowl{
pixel_y = 4
},
-/obj/item/reagent_containers/glass/bowl/mushroom_bowl{
+/obj/item/reagent_containers/cup/bowl/mushroom_bowl{
pixel_y = 8
},
/obj/effect/turf_decal/siding/wideplating/dark{
@@ -953,7 +953,7 @@
pixel_x = 4;
pixel_y = 6
},
-/obj/item/reagent_containers/food/drinks/bottle/moonshine{
+/obj/item/reagent_containers/cup/glass/bottle/moonshine{
pixel_x = -5;
pixel_y = -10
},
@@ -1015,15 +1015,15 @@
/area/ruin/unpowered/ash_walkers)
"AL" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/small{
+/obj/item/reagent_containers/cup/glass/bottle/small{
pixel_x = -6;
pixel_y = 12
},
-/obj/item/reagent_containers/glass/bowl/mushroom_bowl{
+/obj/item/reagent_containers/cup/bowl/mushroom_bowl{
pixel_x = 11;
pixel_y = 8
},
-/obj/item/reagent_containers/food/drinks/bottle/small{
+/obj/item/reagent_containers/cup/glass/bottle/small{
pixel_x = 3;
pixel_y = 4
},
@@ -1190,7 +1190,7 @@
/obj/item/candle/infinite{
pixel_x = -7
},
-/obj/item/reagent_containers/food/drinks/bottle/hooch{
+/obj/item/reagent_containers/cup/glass/bottle/hooch{
pixel_x = 4;
pixel_y = 5
},
@@ -1252,11 +1252,11 @@
/area/ruin/unpowered/ash_walkers)
"GA" = (
/obj/structure/decorative/shelf,
-/obj/item/reagent_containers/glass/bowl/mushroom_bowl,
-/obj/item/reagent_containers/glass/bowl/mushroom_bowl{
+/obj/item/reagent_containers/cup/bowl/mushroom_bowl,
+/obj/item/reagent_containers/cup/bowl/mushroom_bowl{
pixel_y = 4
},
-/obj/item/reagent_containers/glass/bowl/mushroom_bowl{
+/obj/item/reagent_containers/cup/bowl/mushroom_bowl{
pixel_y = 8
},
/obj/effect/turf_decal/siding/wideplating/dark{
@@ -1578,7 +1578,7 @@
},
/area/ruin/unpowered/ash_walkers)
"QM" = (
-/obj/item/reagent_containers/glass/bucket/wooden,
+/obj/item/reagent_containers/cup/bucket/wooden,
/obj/effect/turf_decal/siding/wood,
/turf/open/misc/sandy_dirt/icemoon,
/area/ruin/unpowered/ash_walkers)
@@ -1596,7 +1596,7 @@
/area/ruin/unpowered/ash_walkers)
"Rd" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/glass/bucket/wooden{
+/obj/item/reagent_containers/cup/bucket/wooden{
pixel_x = 6;
pixel_y = 15
},
@@ -1772,11 +1772,11 @@
/area/ruin/unpowered/ash_walkers)
"UB" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/glass/beaker/large/ceramic{
+/obj/item/reagent_containers/cup/beaker/large/ceramic{
pixel_x = 9;
pixel_y = 11
},
-/obj/item/reagent_containers/glass/bowl/mushroom_bowl{
+/obj/item/reagent_containers/cup/bowl/mushroom_bowl{
pixel_x = -3;
pixel_y = -1
},
diff --git a/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_syndicate_base1_skyrat.dmm b/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_syndicate_base1_skyrat.dmm
index 80583aad606..112f3fe5478 100644
--- a/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_syndicate_base1_skyrat.dmm
+++ b/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_syndicate_base1_skyrat.dmm
@@ -1020,11 +1020,11 @@
"ih" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
-/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 = -4;
pixel_y = 3
},
@@ -1100,7 +1100,7 @@
"iX" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_y = 8
},
/turf/open/floor/iron/dark/side{
@@ -2240,8 +2240,8 @@
/obj/structure/closet/secure_closet/freezer/kitchen{
req_access = list("syndicate")
},
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/soymilk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/soymilk,
/obj/structure/window/reinforced/survival_pod,
/turf/open/floor/iron/dark/smooth_large,
/area/ruin/syndicate_lava_base/bar)
@@ -3181,7 +3181,7 @@
/obj/structure/closet/crate,
/obj/item/storage/bag/trash,
/obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -3665,11 +3665,11 @@
"IP" = (
/obj/structure/table/reinforced,
/obj/item/kitchen/rollingpin,
-/obj/item/reagent_containers/food/condiment/saltshaker,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/saltshaker,
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 6
},
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
pixel_y = 8
},
/turf/open/floor/iron/kitchen,
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
index 8f94726e2bf..8d9f2c13f0b 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
@@ -87,15 +87,15 @@
/turf/open/misc/beach/sand,
/area/ruin/powered/beach)
"bC" = (
-/obj/item/reagent_containers/food/drinks/colocup{
+/obj/item/reagent_containers/cup/glass/colocup{
pixel_x = -7;
pixel_y = -2
},
-/obj/item/reagent_containers/food/drinks/colocup{
+/obj/item/reagent_containers/cup/glass/colocup{
pixel_x = 5;
pixel_y = 6
},
-/obj/item/reagent_containers/food/drinks/bottle/rum{
+/obj/item/reagent_containers/cup/glass/bottle/rum{
pixel_x = 4;
pixel_y = -3
},
@@ -355,7 +355,7 @@
"kd" = (
/obj/structure/table/wood,
/obj/item/storage/bag/tray,
-/obj/item/reagent_containers/food/drinks/colocup,
+/obj/item/reagent_containers/cup/glass/colocup,
/turf/open/floor/wood,
/area/ruin/powered/beach)
"kg" = (
@@ -428,10 +428,10 @@
/obj/structure/closet/secure_closet/freezer/kitchen{
req_access = null
},
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/mayonnaise,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/mayonnaise,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
/turf/open/floor/wood,
/area/ruin/powered/beach)
"og" = (
@@ -541,10 +541,10 @@
/turf/open/misc/beach/sand,
/area/ruin/powered/beach)
"rU" = (
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
layer = 5
},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 5
},
/obj/structure/table,
@@ -639,7 +639,7 @@
/turf/open/floor/wood,
/area/ruin/powered/beach)
"wc" = (
-/obj/item/reagent_containers/food/drinks/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/turf/open/misc/beach/sand,
/area/ruin/powered/beach)
"wt" = (
@@ -791,7 +791,7 @@
"AY" = (
/obj/structure/closet/crate/hydroponics,
/obj/item/shovel/spade,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/cultivator,
/turf/open/floor/iron/grimy,
/area/ruin/powered/beach)
@@ -899,7 +899,7 @@
"EN" = (
/obj/structure/table/reinforced,
/obj/item/secateurs,
-/obj/item/reagent_containers/glass/bottle/nutrient/ez,
+/obj/item/reagent_containers/cup/bottle/nutrient/ez,
/turf/open/floor/pod/light,
/area/ruin/powered/beach)
"Fa" = (
@@ -931,8 +931,8 @@
"FF" = (
/obj/structure/table,
/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)
"FO" = (
@@ -978,8 +978,8 @@
/area/ruin/powered/beach)
"GB" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/condiment/peppermill,
-/obj/item/reagent_containers/food/condiment/soysauce,
+/obj/item/reagent_containers/condiment/peppermill,
+/obj/item/reagent_containers/condiment/soysauce,
/turf/open/floor/wood,
/area/ruin/powered/beach)
"GR" = (
@@ -1000,10 +1000,10 @@
/turf/open/floor/iron/stairs/left,
/area/ruin/powered/beach)
"HW" = (
-/obj/item/reagent_containers/food/drinks/bottle/beer/light,
-/obj/item/reagent_containers/food/drinks/bottle/beer/light,
-/obj/item/reagent_containers/food/drinks/bottle/beer/light,
-/obj/item/reagent_containers/food/drinks/bottle/beer/light,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
/obj/item/vending_refill/cigarette,
/obj/item/vending_refill/boozeomat,
/obj/structure/closet/secure_closet{
@@ -1013,26 +1013,26 @@
},
/obj/item/storage/backpack/duffelbag,
/obj/item/etherealballdeployer,
-/obj/item/reagent_containers/food/drinks/bottle/beer/light,
-/obj/item/reagent_containers/food/drinks/bottle/beer/light,
-/obj/item/reagent_containers/food/drinks/bottle/beer/light,
-/obj/item/reagent_containers/food/drinks/bottle/beer/light,
-/obj/item/reagent_containers/food/drinks/bottle/beer/light,
-/obj/item/reagent_containers/food/drinks/bottle/beer/light,
-/obj/item/reagent_containers/food/drinks/bottle/beer/light,
-/obj/item/reagent_containers/food/drinks/bottle/beer/light,
-/obj/item/reagent_containers/food/drinks/bottle/beer/light,
-/obj/item/reagent_containers/food/drinks/bottle/beer/light,
-/obj/item/reagent_containers/food/drinks/colocup,
-/obj/item/reagent_containers/food/drinks/colocup,
-/obj/item/reagent_containers/food/drinks/colocup,
-/obj/item/reagent_containers/food/drinks/colocup,
-/obj/item/reagent_containers/food/drinks/colocup,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/glass/colocup,
+/obj/item/reagent_containers/cup/glass/colocup,
+/obj/item/reagent_containers/cup/glass/colocup,
+/obj/item/reagent_containers/cup/glass/colocup,
+/obj/item/reagent_containers/cup/glass/colocup,
/turf/open/floor/wood,
/area/ruin/powered/beach)
"Il" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/condiment/saltshaker,
+/obj/item/reagent_containers/condiment/saltshaker,
/turf/open/floor/wood,
/area/ruin/powered/beach)
"Iq" = (
@@ -1288,24 +1288,24 @@
/obj/structure/closet/crate/freezer{
name = "Cooler"
},
-/obj/item/reagent_containers/food/drinks/ice,
-/obj/item/reagent_containers/food/drinks/colocup,
-/obj/item/reagent_containers/food/drinks/colocup,
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/ice,
+/obj/item/reagent_containers/cup/glass/colocup,
+/obj/item/reagent_containers/cup/glass/colocup,
+/obj/item/reagent_containers/cup/glass/bottle/beer{
desc = "Beer advertised to be the best in space.";
name = "Masterbrand Beer"
},
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
desc = "Beer advertised to be the best in space.";
name = "Masterbrand Beer"
},
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
desc = "Beer advertised to be the best in space.";
name = "Masterbrand Beer"
},
-/obj/item/reagent_containers/food/drinks/bottle/beer/light,
-/obj/item/reagent_containers/food/drinks/bottle/beer/light,
-/obj/item/reagent_containers/food/drinks/bottle/beer/light,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
/turf/open/misc/beach/sand,
/area/ruin/powered/beach)
"SK" = (
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm
index 19dae9592bf..d64faee8611 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm
@@ -313,7 +313,7 @@
/turf/open/indestructible/permalube,
/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_ash_walker1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm
index c2754159e13..93029a13cce 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm
@@ -1277,7 +1277,7 @@
/obj/structure/stone_tile/block/cracked{
dir = 4
},
-/obj/item/reagent_containers/glass/bucket/wooden,
+/obj/item/reagent_containers/cup/bucket/wooden,
/obj/effect/mapping_helpers/no_lava,
/turf/open/misc/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
@@ -1355,7 +1355,7 @@
dir = 8
},
/obj/machinery/iv_drip,
-/obj/item/reagent_containers/food/drinks/waterbottle/large,
+/obj/item/reagent_containers/cup/glass/waterbottle/large,
/turf/open/misc/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
"UL" = (
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm
index 9d930a5dc7a..39c8ec119b3 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm
@@ -50,7 +50,7 @@
/turf/open/floor/plating,
/area/ruin/powered/snow_biodome)
"am" = (
-/obj/item/reagent_containers/food/drinks/mug,
+/obj/item/reagent_containers/cup/glass/mug,
/turf/open/floor/plating,
/area/ruin/powered/snow_biodome)
"an" = (
@@ -138,7 +138,7 @@
/area/ruin/powered/snow_biodome)
"aF" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug/coco,
+/obj/item/reagent_containers/cup/glass/mug/coco,
/turf/open/floor/wood,
/area/ruin/powered/snow_biodome)
"aG" = (
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm
index 1dbd60e75f4..754c5e754fe 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm
@@ -123,7 +123,7 @@
"cm" = (
/obj/structure/table/optable,
/obj/item/storage/backpack/explorer,
-/obj/item/reagent_containers/food/drinks/soda_cans/cola,
+/obj/item/reagent_containers/cup/soda_cans/cola,
/obj/item/restraints/handcuffs/cable/zipties/used,
/turf/open/floor/mineral/titanium/white,
/area/ruin/powered/graveyard_shuttle)
@@ -227,7 +227,7 @@
/area/ruin/unpowered/elephant_graveyard)
"lK" = (
/obj/structure/cable,
-/obj/item/reagent_containers/glass/bottle/frostoil{
+/obj/item/reagent_containers/cup/bottle/frostoil{
desc = "A small bottle. Contains cold sauce. There's a label on here: APPLY ON SEVERE BURNS.";
volume = 10
},
@@ -620,7 +620,7 @@
"XY" = (
/obj/structure/table,
/obj/structure/cable,
-/obj/item/reagent_containers/glass/bottle/plasma{
+/obj/item/reagent_containers/cup/bottle/plasma{
volume = 25
},
/turf/open/misc/asteroid/basalt/wasteland,
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
index 8ce56831f6b..ffa2adc9686 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
@@ -27,7 +27,7 @@
},
/area/ruin/powered)
"i" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/misc/asteroid{
name = "dirt"
},
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm
index ed086216aa5..7f66d1c6a86 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm
@@ -36,10 +36,10 @@
/turf/open/floor/iron/freezer,
/area/ruin/powered/seedvault)
"ai" = (
-/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/structure/table/wood,
/obj/effect/turf_decal/trimline/green/filled/line,
/turf/open/floor/iron/dark,
@@ -304,11 +304,11 @@
/turf/open/floor/iron/dark,
/area/ruin/powered/seedvault)
"aT" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/structure/table/wood,
-/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,
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 5
},
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
index 3d3774daf85..0022970008e 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
@@ -196,21 +196,21 @@
"cc" = (
/obj/effect/turf_decal/box/white/corners,
/obj/structure/closet/crate,
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/waterbottle/large,
-/obj/item/reagent_containers/food/drinks/waterbottle/large,
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large,
+/obj/item/reagent_containers/cup/glass/waterbottle/large,
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = 3;
pixel_y = -3
},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = 3;
pixel_y = -3
},
@@ -378,10 +378,10 @@
pixel_y = -2
},
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/bottle/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
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
},
@@ -395,7 +395,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
},
@@ -472,10 +472,10 @@
/obj/machinery/light/small/directional/east,
/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,
@@ -1854,7 +1854,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/syndicate_lava_base/main)
"kQ" = (
@@ -1958,7 +1958,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/syndicate_lava_base/bar)
"lm" = (
@@ -2196,7 +2196,7 @@
/area/ruin/syndicate_lava_base/bar)
"my" = (
/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,
@@ -3451,11 +3451,11 @@
/area/ruin/syndicate_lava_base/main)
"Ev" = (
/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/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 5;
pixel_y = -2
},
@@ -3680,7 +3680,7 @@
/area/ruin/syndicate_lava_base/engineering)
"IQ" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
diff --git a/_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_ash_walker1_skyrat.dmm b/_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_ash_walker1_skyrat.dmm
index 6d77606dd2f..3d5c9d9ad12 100644
--- a/_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_ash_walker1_skyrat.dmm
+++ b/_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_ash_walker1_skyrat.dmm
@@ -130,7 +130,7 @@
/turf/open/lava/smooth/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
"hL" = (
-/obj/item/reagent_containers/glass/bucket/wooden{
+/obj/item/reagent_containers/cup/bucket/wooden{
desc = "If this bucket is used for anything other than clean water, the user is to hunt the tribes dinner, and make a new bucket.";
name = "the shower bucket"
},
@@ -239,7 +239,7 @@
"mc" = (
/obj/structure/table/bronze,
/obj/structure/stone_tile/slab/cracked,
-/obj/item/reagent_containers/food/drinks/trophy/bronze_cup{
+/obj/item/reagent_containers/cup/glass/trophy/bronze_cup{
desc = "It is said that whoever drinks from this will be gived the strength of the most fearsome beasts of this planet. Sadly, you've yet to learn WHAT you're meant to fill it with.";
name = "the necropolis's chalice"
},
@@ -374,7 +374,7 @@
/area/ruin/unpowered/ash_walkers)
"ok" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/glass/mortar,
+/obj/item/reagent_containers/cup/mortar,
/obj/item/pestle,
/turf/open/misc/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
@@ -524,12 +524,12 @@
/obj/item/shovel,
/obj/item/cultivator/rake,
/obj/item/plant_analyzer,
-/obj/item/reagent_containers/glass/bottle/nutrient/ez,
-/obj/item/reagent_containers/glass/bottle/nutrient/ez,
-/obj/item/reagent_containers/glass/bottle/nutrient/l4z,
-/obj/item/reagent_containers/glass/bottle/nutrient/l4z,
-/obj/item/reagent_containers/glass/bottle/nutrient/rh,
-/obj/item/reagent_containers/glass/bottle/nutrient/rh,
+/obj/item/reagent_containers/cup/bottle/nutrient/ez,
+/obj/item/reagent_containers/cup/bottle/nutrient/ez,
+/obj/item/reagent_containers/cup/bottle/nutrient/l4z,
+/obj/item/reagent_containers/cup/bottle/nutrient/l4z,
+/obj/item/reagent_containers/cup/bottle/nutrient/rh,
+/obj/item/reagent_containers/cup/bottle/nutrient/rh,
/obj/item/storage/bag/plants/portaseeder,
/obj/item/storage/bag/plants/portaseeder,
/obj/item/storage/bag/plants,
@@ -547,16 +547,16 @@
dir = 4
},
/obj/machinery/iv_drip,
-/obj/item/reagent_containers/food/drinks/waterbottle/large,
+/obj/item/reagent_containers/cup/glass/waterbottle/large,
/turf/open/misc/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
"sS" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/glass/bowl/mushroom_bowl{
+/obj/item/reagent_containers/cup/bowl/mushroom_bowl{
pixel_x = -3;
pixel_y = -1
},
-/obj/item/reagent_containers/glass/beaker/large/ceramic{
+/obj/item/reagent_containers/cup/beaker/large/ceramic{
pixel_x = 9;
pixel_y = 11
},
@@ -804,7 +804,7 @@
/turf/open/indestructible/boss,
/area/ruin/unpowered/ash_walkers)
"AZ" = (
-/obj/item/reagent_containers/glass/bucket/wooden,
+/obj/item/reagent_containers/cup/bucket/wooden,
/turf/open/misc/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
"Bc" = (
@@ -814,13 +814,13 @@
/area/ruin/unpowered/ash_walkers)
"Bs" = (
/obj/structure/decorative/shelf,
-/obj/item/reagent_containers/food/drinks/bottle/small{
+/obj/item/reagent_containers/cup/glass/bottle/small{
pixel_x = 5
},
-/obj/item/reagent_containers/food/drinks/bottle/small{
+/obj/item/reagent_containers/cup/glass/bottle/small{
pixel_x = -5
},
-/obj/item/reagent_containers/food/drinks/bottle/small,
+/obj/item/reagent_containers/cup/glass/bottle/small,
/turf/open/misc/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
"BJ" = (
@@ -903,7 +903,7 @@
/area/ruin/unpowered/ash_walkers)
"EQ" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/hooch{
+/obj/item/reagent_containers/cup/glass/bottle/hooch{
pixel_x = 4;
pixel_y = 5
},
@@ -917,7 +917,7 @@
dir = 8
},
/obj/machinery/iv_drip,
-/obj/item/reagent_containers/food/drinks/waterbottle/large,
+/obj/item/reagent_containers/cup/glass/waterbottle/large,
/turf/open/misc/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
"FA" = (
@@ -949,11 +949,11 @@
/area/ruin/unpowered/ash_walkers)
"Gx" = (
/obj/structure/decorative/shelf,
-/obj/item/reagent_containers/glass/bowl/mushroom_bowl{
+/obj/item/reagent_containers/cup/bowl/mushroom_bowl{
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bowl/mushroom_bowl,
-/obj/item/reagent_containers/glass/bowl/mushroom_bowl{
+/obj/item/reagent_containers/cup/bowl/mushroom_bowl,
+/obj/item/reagent_containers/cup/bowl/mushroom_bowl{
pixel_y = 4
},
/turf/open/misc/asteroid/basalt/lava_land_surface,
@@ -1197,7 +1197,7 @@
/area/ruin/unpowered/ash_walkers)
"Ne" = (
/obj/item/candle/infinite,
-/obj/item/reagent_containers/food/drinks/bottle/lizardwine{
+/obj/item/reagent_containers/cup/glass/bottle/lizardwine{
pixel_x = 4;
pixel_y = 15
},
@@ -1558,7 +1558,7 @@
/turf/open/indestructible/boss,
/area/ruin/unpowered/ash_walkers)
"WB" = (
-/obj/item/reagent_containers/glass/bucket/wooden{
+/obj/item/reagent_containers/cup/bucket/wooden{
desc = "DO NOT MIX WITH THE SHOWER BUCKET, FOR THE LOVE OF THE NECROPOLIS.";
name = "fuel bucket"
},
diff --git a/_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_syndicate_base1_skyrat.dmm b/_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_syndicate_base1_skyrat.dmm
index 4bf541ed539..2854314c69b 100644
--- a/_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_syndicate_base1_skyrat.dmm
+++ b/_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_syndicate_base1_skyrat.dmm
@@ -213,7 +213,7 @@
"bS" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_y = 8
},
/turf/open/floor/iron/dark/side{
@@ -413,8 +413,8 @@
/obj/structure/closet/secure_closet/freezer/kitchen{
req_access = list("syndicate")
},
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/soymilk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/soymilk,
/obj/structure/window/reinforced/survival_pod,
/turf/open/floor/iron/dark/smooth_large,
/area/ruin/syndicate_lava_base/bar)
@@ -1157,11 +1157,11 @@
"lE" = (
/obj/structure/table/reinforced,
/obj/item/kitchen/rollingpin,
-/obj/item/reagent_containers/food/condiment/saltshaker,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/saltshaker,
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 6
},
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
pixel_y = 8
},
/turf/open/floor/iron/kitchen,
@@ -2521,11 +2521,11 @@
"Ai" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
-/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 = -4;
pixel_y = 3
},
@@ -5015,7 +5015,7 @@
/obj/structure/closet/crate,
/obj/item/storage/bag/trash,
/obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/structure/disposalpipe/segment{
dir = 4
},
diff --git a/_maps/RandomRuins/SpaceRuins/DJstation/kitchen_4.dmm b/_maps/RandomRuins/SpaceRuins/DJstation/kitchen_4.dmm
index 347b878a430..597111c9c76 100644
--- a/_maps/RandomRuins/SpaceRuins/DJstation/kitchen_4.dmm
+++ b/_maps/RandomRuins/SpaceRuins/DJstation/kitchen_4.dmm
@@ -23,11 +23,11 @@
/area/ruin/space/djstation)
"g" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour{
pixel_x = -2;
pixel_y = -2
},
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour{
pixel_x = 4;
pixel_y = 4
},
@@ -105,7 +105,7 @@
/area/ruin/space/djstation)
"R" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
pixel_x = 9;
pixel_y = 3
},
diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
index cde851b72a8..4b10765fc84 100644
--- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
+++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
@@ -113,15 +113,6 @@
/obj/structure/lattice,
/turf/template_noop,
/area/space/nearstation)
-"aV" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/beer/almost_empty{
- pixel_x = -7;
- pixel_y = 6
- },
-/obj/item/reagent_containers/food/drinks/bottle/beer/almost_empty,
-/turf/open/floor/plating,
-/area/ruin/space/ks13/command/bridge)
"bd" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/directional/east,
@@ -131,25 +122,6 @@
/obj/item/stack/rods,
/turf/open/floor/plating/airless,
/area/ruin/space/ks13/engineering/singulo)
-"bz" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
- pixel_x = 8;
- pixel_y = 9
- },
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
- pixel_x = 8
- },
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
- pixel_x = -7;
- pixel_y = 9
- },
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
- pixel_x = -7
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
"bE" = (
/obj/structure/table_frame,
/obj/item/circuitboard/machine/thermomachine,
@@ -193,20 +165,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating/airless,
/area/ruin/space/ks13/medical/medbay)
-"ce" = (
-/obj/structure/table,
-/obj/item/reagent_containers/glass/beaker{
- pixel_x = -8
- },
-/obj/item/reagent_containers/glass/beaker/large{
- pixel_x = 5
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/apc/auto_name/directional/north{
- start_charge = 0
- },
-/turf/open/floor/iron/airless,
-/area/ruin/space/ks13/science/rnd)
"cf" = (
/obj/structure/sign/departments/court/directional/east,
/obj/effect/mapping_helpers/broken_floor,
@@ -271,6 +229,12 @@
},
/turf/open/floor/plating/airless,
/area/ruin/space/ks13/security/sec)
+"cH" = (
+/obj/effect/spawner/structure/window/hollow/reinforced/end{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/ruin/space/ks13/engineering/sb_bow_solars_control)
"cI" = (
/obj/structure/table_frame,
/turf/open/floor/plating/airless,
@@ -351,19 +315,6 @@
/obj/item/paper/fluff/ruins/thederelict/syndie_mission,
/turf/open/floor/iron/airless,
/area/ruin/space/ks13/engineering/aft_solars_control)
-"ej" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/vodka{
- pixel_x = 6;
- pixel_y = 10
- },
-/obj/item/reagent_containers/food/drinks/bottle/vodka{
- pixel_x = -7;
- pixel_y = 13
- },
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
"eu" = (
/obj/structure/rack,
/obj/effect/spawner/random/engineering/vending_restock,
@@ -526,6 +477,29 @@
/obj/structure/lattice,
/turf/template_noop,
/area/space/nearstation)
+"gW" = (
+/obj/structure/table,
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{
+ pixel_x = -6;
+ pixel_y = 12
+ },
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty,
+/turf/open/floor/iron,
+/area/ruin/space/ks13/command/bridge)
+"hb" = (
+/obj/structure/table,
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = -8
+ },
+/obj/item/reagent_containers/cup/beaker/large{
+ pixel_x = 5
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/power/apc/auto_name/directional/north{
+ start_charge = 0
+ },
+/turf/open/floor/iron/airless,
+/area/ruin/space/ks13/science/rnd)
"hm" = (
/obj/machinery/vending/hydroseeds,
/obj/effect/mapping_helpers/broken_floor,
@@ -837,6 +811,15 @@
},
/turf/open/floor/plating/airless,
/area/ruin/space/ks13/engineering/aux_storage)
+"ma" = (
+/obj/structure/table,
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{
+ pixel_x = -7;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty,
+/turf/open/floor/plating,
+/area/ruin/space/ks13/command/bridge)
"mb" = (
/turf/open/floor/engine/airless,
/area/ruin/space/ks13/engineering/atmos)
@@ -850,6 +833,17 @@
/obj/machinery/light/small/directional/north,
/turf/template_noop,
/area/space/nearstation)
+"ml" = (
+/obj/structure/table,
+/obj/item/reagent_containers/cup/beaker{
+ list_reagents = list(/datum/reagent/toxin/acid=50)
+ },
+/obj/item/paper/crumpled/bloody/ruins/thederelict/unfinished,
+/obj/item/pen,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/airless,
+/area/ruin/space/ks13/service/cafe)
"mp" = (
/obj/structure/sign/departments/medbay/alt/directional/west,
/obj/item/kirbyplants/dead,
@@ -945,15 +939,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/white/airless,
/area/ruin/space/ks13/medical/medbay)
-"nN" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/beer/almost_empty{
- pixel_x = -6;
- pixel_y = 12
- },
-/obj/item/reagent_containers/food/drinks/bottle/beer/almost_empty,
-/turf/open/floor/iron,
-/area/ruin/space/ks13/command/bridge)
"nQ" = (
/turf/template_noop,
/area/space/nearstation)
@@ -1996,12 +1981,6 @@
/obj/structure/cable,
/turf/open/floor/plating/airless,
/area/ruin/space/ks13/engineering/grav_gen)
-"tv" = (
-/obj/effect/spawner/structure/window/hollow/reinforced/end{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/ruin/space/ks13/engineering/sb_bow_solars_control)
"tw" = (
/obj/machinery/computer/vaultcontroller{
dir = 8
@@ -2299,6 +2278,25 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/iron/airless,
/area/ruin/space/ks13/engineering/atmos)
+"vt" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = 8;
+ pixel_y = 9
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = 8
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = -7;
+ pixel_y = 9
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = -7
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
"vv" = (
/obj/structure/table,
/obj/effect/decal/cleanable/dirt,
@@ -2453,6 +2451,19 @@
"wv" = (
/turf/closed/wall,
/area/ruin/space/ks13/hallway/central)
+"wx" = (
+/obj/structure/table/glass,
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = 9;
+ pixel_y = 7
+ },
+/obj/item/reagent_containers/cup/beaker/large{
+ pixel_x = -4;
+ pixel_y = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/white/airless,
+/area/ruin/space/ks13/medical/medbay)
"wy" = (
/obj/structure/closet,
/obj/item/clothing/shoes/laceup,
@@ -3660,6 +3671,20 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating/airless,
/area/ruin/space/ks13/engineering/atmos)
+"CD" = (
+/obj/structure/table,
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = -8
+ },
+/obj/item/reagent_containers/cup/beaker/large{
+ pixel_x = 5
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/power/apc/auto_name/directional/north{
+ start_charge = 0
+ },
+/turf/open/floor/iron/airless,
+/area/ruin/space/ks13/science/rnd)
"CH" = (
/obj/machinery/door/airlock/external/ruin{
name = "External Engineering"
@@ -3779,6 +3804,19 @@
/obj/machinery/light/small/directional/west,
/turf/open/floor/plating/airless,
/area/ruin/space/ks13/security/sec)
+"Do" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
+ pixel_x = 6;
+ pixel_y = 10
+ },
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
+ pixel_x = -7;
+ pixel_y = 13
+ },
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
"Dq" = (
/obj/structure/lattice,
/obj/structure/door_assembly/door_assembly_public,
@@ -4157,6 +4195,15 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/airless,
/area/ruin/space/ks13/hallway/aft)
+"Fl" = (
+/obj/structure/table,
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{
+ pixel_x = -7;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty,
+/turf/open/floor/plating,
+/area/ruin/space/ks13/command/bridge)
"Fn" = (
/obj/machinery/light/small/directional/north,
/obj/effect/decal/cleanable/dirt,
@@ -4724,6 +4771,17 @@
},
/turf/open/floor/plating/airless,
/area/ruin/space/ks13/engineering/atmos)
+"Ix" = (
+/obj/structure/table,
+/obj/item/reagent_containers/cup/beaker{
+ list_reagents = list(/datum/reagent/toxin/acid=50)
+ },
+/obj/item/paper/crumpled/bloody/ruins/thederelict/unfinished,
+/obj/item/pen,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/airless,
+/area/ruin/space/ks13/service/cafe)
"Iy" = (
/obj/effect/spawner/structure/window/hollow/reinforced/middle,
/turf/open/floor/plating/airless,
@@ -4769,6 +4827,12 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood/airless,
/area/space/nearstation)
+"IM" = (
+/obj/effect/spawner/structure/window/hollow/reinforced/end{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/ruin/space/ks13/engineering/sb_bow_solars_control)
"IN" = (
/obj/effect/decal/cleanable/glass,
/turf/open/floor/iron/airless,
@@ -5581,6 +5645,15 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating/airless,
/area/ruin/space/ks13/engineering/aux_storage)
+"MZ" = (
+/obj/structure/table,
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{
+ pixel_x = -6;
+ pixel_y = 12
+ },
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty,
+/turf/open/floor/iron,
+/area/ruin/space/ks13/command/bridge)
"Na" = (
/obj/effect/spawner/structure/window/hollow/reinforced/end{
dir = 8
@@ -5674,6 +5747,25 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/ruin/space/ks13/security/court)
+"Nx" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = 8;
+ pixel_y = 9
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = 8
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = -7;
+ pixel_y = 9
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = -7
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
"NB" = (
/obj/effect/decal/cleanable/glass,
/obj/effect/mapping_helpers/burnt_floor,
@@ -6426,19 +6518,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating/airless,
/area/ruin/space/ks13/security/sec)
-"Ry" = (
-/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker{
- pixel_x = 9;
- pixel_y = 7
- },
-/obj/item/reagent_containers/glass/beaker/large{
- pixel_x = -4;
- pixel_y = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/white/airless,
-/area/ruin/space/ks13/medical/medbay)
"RC" = (
/obj/machinery/light/small/directional/east,
/obj/effect/decal/cleanable/dirt,
@@ -7901,6 +7980,19 @@
/obj/item/stack/cable_coil/cut,
/turf/open/floor/plating/airless,
/area/ruin/space/ks13/engineering/singulo)
+"YN" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
+ pixel_x = 6;
+ pixel_y = 10
+ },
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
+ pixel_x = -7;
+ pixel_y = 13
+ },
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
"YP" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating/airless,
@@ -7999,6 +8091,19 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/iron/airless,
/area/ruin/space/ks13/service/kitchen)
+"Zl" = (
+/obj/structure/table/glass,
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = 9;
+ pixel_y = 7
+ },
+/obj/item/reagent_containers/cup/beaker/large{
+ pixel_x = -4;
+ pixel_y = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/white/airless,
+/area/ruin/space/ks13/medical/medbay)
"Zm" = (
/obj/effect/decal/remains/human{
desc = "They look like human remains. The bones are charred and burned.";
@@ -8045,17 +8150,6 @@
/obj/item/grenade/empgrenade,
/turf/open/floor/iron,
/area/ruin/space/ks13/command/eva)
-"Zv" = (
-/obj/structure/table,
-/obj/item/reagent_containers/glass/beaker{
- list_reagents = list(/datum/reagent/toxin/acid=50)
- },
-/obj/item/paper/crumpled/bloody/ruins/thederelict/unfinished,
-/obj/item/pen,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/airless,
-/area/ruin/space/ks13/service/cafe)
"Zw" = (
/obj/item/stack/cable_coil/cut,
/obj/effect/mapping_helpers/broken_floor,
@@ -11190,7 +11284,7 @@ VX
tN
oQ
xn
-Ry
+wx
xx
mp
yl
@@ -11538,7 +11632,7 @@ pT
Tn
NM
pc
-Zv
+ml
HE
tG
Ax
@@ -14350,7 +14444,7 @@ pT
sF
vn
Cy
-ce
+hb
Xm
ZL
Mt
@@ -15909,7 +16003,7 @@ xp
Lw
rl
Tj
-aV
+Fl
gO
Gs
Dz
@@ -16023,13 +16117,13 @@ wg
rl
Ra
AJ
-nN
+gW
ag
Pk
SA
Am
rl
-bz
+vt
sa
Hu
IL
@@ -16108,7 +16202,7 @@ aa
xS
sO
IK
-tv
+IM
IK
PM
DU
@@ -16142,7 +16236,7 @@ aJ
aJ
Wi
rl
-ej
+Do
Bg
Wm
Ol
diff --git a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm
index 75e0a4b6283..c8179a4468f 100644
--- a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm
+++ b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm
@@ -100,7 +100,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)
@@ -161,7 +161,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)
"bk" = (
diff --git a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
index 74f318cdab9..9227ba5fc15 100644
--- a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
+++ b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
@@ -64,7 +64,7 @@
"ap" = (
/obj/structure/table,
/obj/machinery/light/directional/west,
-/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 ae86e775dc7..6307f786bcb 100644
--- a/_maps/RandomRuins/SpaceRuins/bus.dmm
+++ b/_maps/RandomRuins/SpaceRuins/bus.dmm
@@ -92,7 +92,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"
@@ -186,12 +186,12 @@
/turf/open/misc/asteroid/airless,
/area/ruin/unpowered/no_grav)
"uO" = (
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
/turf/open/misc/asteroid/airless,
/area/ruin/unpowered/no_grav)
"wc" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/coffee,
+/obj/item/reagent_containers/cup/glass/coffee,
/turf/open/misc/asteroid/airless,
/area/ruin/unpowered/no_grav)
"wD" = (
@@ -272,7 +272,7 @@
/area/ruin/unpowered/no_grav)
"Nm" = (
/obj/effect/decal/cleanable/food/salt,
-/obj/item/reagent_containers/food/condiment/saltshaker,
+/obj/item/reagent_containers/condiment/saltshaker,
/turf/open/misc/asteroid/airless,
/area/ruin/unpowered/no_grav)
"Qd" = (
diff --git a/_maps/RandomRuins/SpaceRuins/clericden.dmm b/_maps/RandomRuins/SpaceRuins/clericden.dmm
index 25fc0460c2c..9dd18cf73e7 100644
--- a/_maps/RandomRuins/SpaceRuins/clericden.dmm
+++ b/_maps/RandomRuins/SpaceRuins/clericden.dmm
@@ -57,7 +57,7 @@
/area/ruin/unpowered/no_grav)
"o" = (
/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/drinks/bottle/holywater,
+/obj/item/reagent_containers/cup/glass/bottle/holywater,
/turf/open/floor/carpet/airless,
/area/ruin/unpowered/no_grav)
"p" = (
diff --git a/_maps/RandomRuins/SpaceRuins/crashedship.dmm b/_maps/RandomRuins/SpaceRuins/crashedship.dmm
index 959d81bfbdb..301a3f63a8f 100644
--- a/_maps/RandomRuins/SpaceRuins/crashedship.dmm
+++ b/_maps/RandomRuins/SpaceRuins/crashedship.dmm
@@ -144,7 +144,7 @@
/turf/open/floor/pod/dark,
/area/awaymission/bmpship/aft)
"gC" = (
-/obj/item/reagent_containers/food/drinks/bottle/beer/almost_empty{
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{
pixel_x = 11;
pixel_y = 12
},
@@ -550,7 +550,7 @@
/obj/structure/chair/office/light{
dir = 8
},
-/obj/item/reagent_containers/food/drinks/bottle/beer/almost_empty{
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{
pixel_x = -13;
pixel_y = 9
},
diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
index c0d1637a950..b68f4ea0c35 100644
--- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
+++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
@@ -9,7 +9,7 @@
/obj/structure/table/reinforced,
/obj/machinery/reagentgrinder,
/obj/machinery/light/directional/south,
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_y = -1;
pixel_x = -15
},
@@ -353,13 +353,13 @@
/obj/structure/table,
/obj/machinery/light/directional/north,
/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/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -382,8 +382,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
},
@@ -922,11 +922,11 @@
dir = 4
},
/obj/machinery/light/directional/south,
-/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" = (
@@ -941,7 +941,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
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" = (
@@ -963,25 +963,25 @@
/obj/structure/closet/crate{
name = "food crate"
},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = -5;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = 2;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = -2
},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = 5
},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = 1;
pixel_y = -3
},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = 8;
pixel_y = -3
},
@@ -2819,10 +2819,10 @@
/obj/item/reagent_containers/dropper{
pixel_y = 7
},
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_y = -1
},
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_y = -1;
pixel_x = -4
},
@@ -2877,7 +2877,7 @@
/turf/open/misc/asteroid/airless,
/area/ruin/unpowered/no_grav)
"JV" = (
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/turf/open/floor/engine,
/area/ruin/space/has_grav/deepstorage/pharmacy)
"Mp" = (
diff --git a/_maps/RandomRuins/SpaceRuins/hellfactory.dmm b/_maps/RandomRuins/SpaceRuins/hellfactory.dmm
index 002fafc87c6..fa94bfc4973 100644
--- a/_maps/RandomRuins/SpaceRuins/hellfactory.dmm
+++ b/_maps/RandomRuins/SpaceRuins/hellfactory.dmm
@@ -106,8 +106,8 @@
/obj/structure/closet/crate{
icon_state = "crateopen"
},
-/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/plating,
/area/ruin/space/has_grav/hellfactory)
"au" = (
@@ -507,7 +507,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/obj/item/reagent_containers/food/drinks/flask,
+/obj/item/reagent_containers/cup/glass/flask,
/obj/item/stack/sheet/glass,
/turf/open/floor/plating,
/area/ruin/space/has_grav/hellfactory)
@@ -595,7 +595,7 @@
dir = 4
},
/obj/structure/window/reinforced,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/obj/item/stack/sheet/cardboard,
/turf/open/floor/plating,
/area/ruin/space/has_grav/hellfactory)
diff --git a/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm b/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm
index 744ff80b7b9..f1d9dae8ce3 100644
--- a/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm
+++ b/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm
@@ -438,7 +438,7 @@
/turf/template_noop,
/area/ruin/unpowered/no_grav)
"jJ" = (
-/obj/item/reagent_containers/glass/beaker/bluespace{
+/obj/item/reagent_containers/cup/beaker/bluespace{
pixel_y = 5
},
/obj/structure/table/reinforced/rglass,
@@ -703,11 +703,11 @@
"qU" = (
/obj/machinery/light/cold/directional/north,
/obj/structure/table/reinforced/rglass,
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -5;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/bottle/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = 6;
pixel_y = 3
},
@@ -1875,15 +1875,15 @@
},
/obj/effect/turf_decal/siding/wood/corner,
/obj/structure/table/reinforced/rglass,
-/obj/item/reagent_containers/glass/bottle/nutrient/l4z{
+/obj/item/reagent_containers/cup/bottle/nutrient/l4z{
pixel_x = 4;
pixel_y = 6
},
-/obj/item/reagent_containers/glass/bottle/nutrient/rh{
+/obj/item/reagent_containers/cup/bottle/nutrient/rh{
pixel_x = -4;
pixel_y = 6
},
-/obj/item/reagent_containers/glass/bottle/mutagen,
+/obj/item/reagent_containers/cup/bottle/mutagen,
/turf/open/floor/wood,
/area/ruin/space/has_grav/powered/hilbertresearchfacility)
"QA" = (
diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
index dcd840a4d03..fa16a3647ba 100644
--- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
@@ -107,6 +107,16 @@
/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer4,
/turf/open/floor/plating,
/area/ruin/space/has_grav/listeningstation)
+"cO" = (
+/obj/structure/table,
+/obj/item/paper_bin,
+/obj/item/pen/edagger,
+/obj/item/reagent_containers/cup/glass/waterbottle{
+ pixel_x = 10;
+ pixel_y = 16
+ },
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/listeningstation)
"cU" = (
/obj/structure/cable,
/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
@@ -133,6 +143,16 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/iron,
/area/ruin/space/has_grav/listeningstation)
+"dm" = (
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/obj/item/radio/intercom/directional/east{
+ freerange = 1
+ },
+/obj/machinery/computer/camera_advanced{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/ruin/space/has_grav/listeningstation)
"dv" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
@@ -152,18 +172,6 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/iron/small,
/area/ruin/space/has_grav/listeningstation)
-"dI" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/beer/almost_empty{
- name = "Use To Avert Loneliness";
- desc = "It's been used...";
- pixel_x = 8
- },
-/obj/item/reagent_containers/spray/cleaner{
- pixel_x = -6
- },
-/turf/open/floor/plating,
-/area/ruin/space/has_grav/listeningstation)
"dW" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
@@ -278,6 +286,18 @@
/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/listeningstation)
+"ov" = (
+/obj/structure/table,
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{
+ name = "Use To Avert Loneliness";
+ desc = "It's been used...";
+ pixel_x = 8
+ },
+/obj/item/reagent_containers/spray/cleaner{
+ pixel_x = -6
+ },
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/listeningstation)
"oW" = (
/obj/machinery/telecomms/relay/preset/ruskie{
use_power = 0
@@ -530,16 +550,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/small,
/area/ruin/space/has_grav/listeningstation)
-"BQ" = (
-/obj/structure/table,
-/obj/item/paper_bin,
-/obj/item/pen/edagger,
-/obj/item/reagent_containers/food/drinks/waterbottle{
- pixel_x = 10;
- pixel_y = 16
- },
-/turf/open/floor/plating,
-/area/ruin/space/has_grav/listeningstation)
"BX" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/ash,
@@ -690,6 +700,18 @@
"JB" = (
/turf/closed/wall/r_wall,
/area/ruin/space/has_grav/listeningstation)
+"JC" = (
+/obj/structure/table,
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{
+ name = "Use To Avert Loneliness";
+ desc = "It's been used...";
+ pixel_x = 8
+ },
+/obj/item/reagent_containers/spray/cleaner{
+ pixel_x = -6
+ },
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/listeningstation)
"JD" = (
/obj/docking_port/stationary{
dir = 8;
@@ -824,16 +846,6 @@
/obj/machinery/light/directional/north,
/turf/open/floor/iron/small,
/area/ruin/space/has_grav/listeningstation)
-"RH" = (
-/obj/effect/turf_decal/tile/red/opposingcorners,
-/obj/item/radio/intercom/directional/east{
- freerange = 1
- },
-/obj/machinery/computer/camera_advanced{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/ruin/space/has_grav/listeningstation)
"RK" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -848,6 +860,16 @@
/obj/machinery/microwave,
/turf/open/floor/iron/small,
/area/ruin/space/has_grav/listeningstation)
+"Sa" = (
+/obj/structure/table,
+/obj/item/paper_bin,
+/obj/item/pen/edagger,
+/obj/item/reagent_containers/cup/glass/waterbottle{
+ pixel_x = 10;
+ pixel_y = 16
+ },
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/listeningstation)
"Sx" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
@@ -862,6 +884,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/ruin/space/has_grav/listeningstation)
+"SA" = (
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/obj/item/radio/intercom/directional/east{
+ freerange = 1
+ },
+/obj/machinery/computer/camera_advanced{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/ruin/space/has_grav/listeningstation)
"SB" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
@@ -1366,7 +1398,7 @@ JB
JB
JB
JB
-dI
+JC
eR
eR
cj
@@ -1437,14 +1469,14 @@ vI
JB
xp
SK
-RH
+SA
tm
TK
rG
Zj
wm
Sz
-BQ
+Sa
FV
DC
CU
diff --git a/_maps/RandomRuins/SpaceRuins/medieval1.dmm b/_maps/RandomRuins/SpaceRuins/medieval1.dmm
index 3234404c3f0..033164cc773 100644
--- a/_maps/RandomRuins/SpaceRuins/medieval1.dmm
+++ b/_maps/RandomRuins/SpaceRuins/medieval1.dmm
@@ -255,7 +255,7 @@
/area/ruin/space)
"Vt" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/glass/bucket/wooden{
+/obj/item/reagent_containers/cup/bucket/wooden{
pixel_x = 9;
pixel_y = 3
},
diff --git a/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm b/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm
index 11f1a6422cf..70a0fdaf5ce 100644
--- a/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm
+++ b/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm
@@ -31,7 +31,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)
@@ -208,13 +208,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" = (
@@ -304,7 +304,7 @@
"aX" = (
/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 870cd2b45ef..258695173e3 100644
--- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
@@ -1015,8 +1015,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/ancientstation/charlie/hydro)
@@ -1620,18 +1620,18 @@
/area/ruin/space/ancientstation/charlie/sec)
"eW" = (
/obj/structure/table/glass,
-/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,
@@ -2331,7 +2331,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,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
@@ -2737,14 +2737,14 @@
/obj/structure/table,
/obj/effect/decal/cleanable/dirt,
/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/ancientstation/delta/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/smart/manifold4w/supply/hidden/layer4{
dir = 5
},
@@ -5107,11 +5107,11 @@
/area/ruin/space/ancientstation/delta/biolab)
"pM" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -2;
pixel_y = 2
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 5;
pixel_y = -2
},
@@ -5296,14 +5296,14 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle{
+/obj/item/reagent_containers/cup/bottle{
pixel_x = 4;
list_reagents = list(/datum/reagent/growthserum=30);
name = "Experimental solution";
renamedByPlayer = 1;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle{
+/obj/item/reagent_containers/cup/bottle{
pixel_x = -4;
list_reagents = list(/datum/reagent/consumable/nutriment/peptides=30);
name = "Solution for Molly";
@@ -5718,13 +5718,13 @@
/area/ruin/space/ancientstation/delta/biolab)
"vL" = (
/obj/structure/table/glass,
-/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,
@@ -5754,10 +5754,10 @@
/area/ruin/space/ancientstation/beta/supermatter)
"vS" = (
/obj/structure/table/glass,
-/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,
@@ -6365,7 +6365,7 @@
"Bq" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
layer = 5
},
/turf/open/floor/iron/cafeteria,
@@ -6519,7 +6519,7 @@
/area/ruin/space/ancientstation/charlie/hall)
"CK" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/beaker/oldstation,
+/obj/item/reagent_containers/cup/beaker/oldstation,
/turf/open/floor/engine,
/area/ruin/space/ancientstation/delta/biolab)
"CN" = (
@@ -7350,10 +7350,10 @@
/area/ruin/solars/ancientstation/charlie/solars)
"JC" = (
/obj/structure/table/glass,
-/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,
@@ -7458,10 +7458,10 @@
/area/ruin/space/ancientstation/charlie/hall)
"Kb" = (
/obj/structure/table/glass,
-/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,
@@ -7653,10 +7653,10 @@
/area/ruin/space/ancientstation/delta/hall)
"LM" = (
/obj/structure/table/glass,
-/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,
@@ -7703,13 +7703,13 @@
/area/ruin/space/ancientstation/beta/atmos)
"LW" = (
/obj/structure/table/glass,
-/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,
@@ -7765,13 +7765,13 @@
/area/ruin/space/ancientstation/delta/hall)
"MN" = (
/obj/structure/table/glass,
-/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,
@@ -8211,10 +8211,10 @@
/area/ruin/space/ancientstation/charlie/hall)
"QO" = (
/obj/structure/table/glass,
-/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,
@@ -8471,7 +8471,7 @@
/obj/item/raw_anomaly_core/bluespace,
/obj/item/raw_anomaly_core/random,
/obj/item/clothing/suit/toggle/labcoat/science,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb,
/turf/open/floor/iron/dark,
/area/ruin/space/ancientstation/delta/ai)
"ST" = (
@@ -8603,10 +8603,10 @@
/area/ruin/space/ancientstation/delta/biolab)
"TZ" = (
/obj/structure/table/glass,
-/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,
@@ -8915,7 +8915,7 @@
/obj/structure/janitorialcart{
dir = 4
},
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/mop,
/turf/open/floor/plating/rust{
initial_gas_mix = "co2=6;o2=16;n2=82;TEMP=293.15"
diff --git a/_maps/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/RandomRuins/SpaceRuins/onehalf.dmm
index 527d16c2dda..381c821d498 100644
--- a/_maps/RandomRuins/SpaceRuins/onehalf.dmm
+++ b/_maps/RandomRuins/SpaceRuins/onehalf.dmm
@@ -800,8 +800,8 @@
/obj/item/tank/internals/oxygen/red,
/obj/item/clothing/head/helmet/space/eva,
/obj/item/clothing/suit/space/eva,
-/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/skyrat/blackmarket.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/blackmarket.dmm
index 2bc7c045473..668593479a3 100644
--- a/_maps/RandomRuins/SpaceRuins/skyrat/blackmarket.dmm
+++ b/_maps/RandomRuins/SpaceRuins/skyrat/blackmarket.dmm
@@ -289,18 +289,18 @@
/obj/item/food/meat/slab/monkey,
/obj/item/food/meat/slab/monkey,
/obj/item/food/meat/slab/monkey,
-/obj/item/reagent_containers/food/condiment/rice{
+/obj/item/reagent_containers/condiment/rice{
list_reagents = list(/datum/reagent/consumable/rice = 150);
name = "Basmati Rice Sack (4KG)";
volume = 150
},
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/enzyme{
list_reagents = list(/datum/reagent/consumable/enzyme = 500);
name = "universe-sized universal enyzyme";
volume = 500
},
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour{
list_reagents = list(/datum/reagent/consumable/flour = 600);
name = "Premium All-Purpose Flour (16KG)";
volume = 600
diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm
index 8e1a513d6e4..b155ac675c0 100644
--- a/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm
+++ b/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm
@@ -256,7 +256,7 @@
/obj/structure/reagent_dispensers/watertank/high{
tank_volume = 8000
},
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/machinery/light{
dir = 8
},
@@ -866,9 +866,9 @@
/obj/structure/closet/crate,
/obj/item/clothing/sextoy/dildo,
/obj/item/clothing/glasses/hypno,
-/obj/item/reagent_containers/glass/bottle/hexacrocin,
+/obj/item/reagent_containers/cup/bottle/hexacrocin,
/obj/item/key/lasso,
-/obj/item/reagent_containers/glass/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine,
/obj/item/gun/syringe/syndicate,
/obj/item/restraints/handcuffs/cable/zipties,
/turf/open/floor/iron/brown/side,
@@ -949,18 +949,18 @@
/obj/item/storage/box/ingredients/fruity,
/obj/item/storage/box/ingredients/fiesta,
/obj/item/storage/box/ingredients/american,
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour{
list_reagents = list(/datum/reagent/consumable/flour = 600);
name = "Premium All-Purpose Flour (16KG)";
volume = 600
},
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/enzyme{
list_reagents = list(/datum/reagent/consumable/enzyme = 500);
name = "universe-sized universal enyzyme";
volume = 500
},
-/obj/item/reagent_containers/food/condiment/rice{
+/obj/item/reagent_containers/condiment/rice{
list_reagents = list(/datum/reagent/consumable/rice = 150);
name = "Basmati Rice Sack (4KG)";
volume = 150
@@ -2483,8 +2483,8 @@
/obj/structure/reagent_dispensers/watertank/high{
tank_volume = 8000
},
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/reagent_containers/glass/beaker/bluespace,
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/reagent_containers/cup/beaker/bluespace,
/turf/open/floor/grass,
/area/ruin/space/has_grav/deepstorage/lostcargo)
"Rh" = (
@@ -2926,7 +2926,7 @@
dir = 4
},
/obj/item/mop/advanced,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/grenade/chem_grenade/cleaner,
/obj/item/grenade/chem_grenade/cleaner,
/obj/item/reagent_containers/spray/cleaner,
diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/dangerous_research.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/dangerous_research.dmm
index 8946b24ff69..15f22e13255 100644
--- a/_maps/RandomRuins/SpaceRuins/skyrat/dangerous_research.dmm
+++ b/_maps/RandomRuins/SpaceRuins/skyrat/dangerous_research.dmm
@@ -24,11 +24,11 @@
/area/ruin/space/has_grav)
"aB" = (
/obj/structure/closet/crate,
-/obj/item/reagent_containers/food/drinks/waterbottle/large,
-/obj/item/reagent_containers/food/drinks/waterbottle/large,
-/obj/item/reagent_containers/food/drinks/waterbottle/large,
-/obj/item/reagent_containers/food/drinks/waterbottle/large,
-/obj/item/reagent_containers/food/drinks/waterbottle/large,
+/obj/item/reagent_containers/cup/glass/waterbottle/large,
+/obj/item/reagent_containers/cup/glass/waterbottle/large,
+/obj/item/reagent_containers/cup/glass/waterbottle/large,
+/obj/item/reagent_containers/cup/glass/waterbottle/large,
+/obj/item/reagent_containers/cup/glass/waterbottle/large,
/obj/item/food/canned/beans,
/obj/item/food/canned/beans,
/obj/item/food/canned/beans,
@@ -1979,8 +1979,8 @@
"Gu" = (
/obj/effect/turf_decal/trimline/purple/line,
/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 = 8;
pixel_y = 2
},
diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/ghostship.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/ghostship.dmm
index fe1b82f7a21..ace5ed670ca 100644
--- a/_maps/RandomRuins/SpaceRuins/skyrat/ghostship.dmm
+++ b/_maps/RandomRuins/SpaceRuins/skyrat/ghostship.dmm
@@ -525,7 +525,7 @@
/obj/effect/turf_decal/stripes/asteroid/corner{
dir = 1
},
-/obj/item/reagent_containers/food/drinks/waterbottle/empty,
+/obj/item/reagent_containers/cup/glass/waterbottle/empty,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/fakelattice/passthru,
/turf/open/floor/plating,
diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm
index aa20bcace6e..f26652cc108 100644
--- a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm
+++ b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm
@@ -3412,11 +3412,11 @@
/area/ruin/space/has_grav/skyrat/interdynefob/research)
"ma" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -6;
pixel_y = 6
},
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -2;
pixel_y = 3
},
@@ -3839,10 +3839,10 @@
dir = 1
},
/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,
@@ -3880,7 +3880,7 @@
/area/ruin/space/has_grav/skyrat/interdynefob/maintenance/southeast)
"nW" = (
/obj/structure/bed/maint,
-/obj/item/reagent_containers/glass/bucket/wooden,
+/obj/item/reagent_containers/cup/bucket/wooden,
/turf/open/floor/iron/dark/brown/side{
dir = 5
},
@@ -4380,18 +4380,18 @@
/obj/item/storage/box/ingredients/fruity,
/obj/item/storage/box/ingredients/fiesta,
/obj/item/storage/box/ingredients/american,
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour{
list_reagents = list(/datum/reagent/consumable/flour=600);
name = "Premium All-Purpose Flour (16KG)";
volume = 600
},
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/enzyme{
list_reagents = list(/datum/reagent/consumable/enzyme=500);
name = "universe-sized universal enyzyme";
volume = 500
},
-/obj/item/reagent_containers/food/condiment/rice{
+/obj/item/reagent_containers/condiment/rice{
list_reagents = list(/datum/reagent/consumable/rice=150);
name = "Basmati Rice Sack (4KG)";
volume = 150
@@ -4418,7 +4418,7 @@
/area/ruin/space/has_grav/skyrat/interdynefob/security/prison)
"pB" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/drinkingglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass,
/turf/open/floor/wood,
/area/ruin/space/has_grav/skyrat/interdynefob/maintenance/southeast)
"pC" = (
@@ -4469,12 +4469,12 @@
/area/ruin/space/has_grav/skyrat/interdynefob/maintenance/southwest)
"pM" = (
/obj/machinery/biogenerator,
-/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/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/skyrat/interdynefob/security/prison)
"pN" = (
@@ -4561,7 +4561,7 @@
"pY" = (
/obj/structure/table/wood,
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/wood,
/area/ruin/space/has_grav/skyrat/interdynefob/maintenance/southeast)
@@ -5251,11 +5251,11 @@
/obj/item/plate,
/obj/item/plate,
/obj/item/plate,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 6
},
-/obj/item/reagent_containers/food/condiment/saltshaker,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/saltshaker,
+/obj/item/reagent_containers/condiment/enzyme{
pixel_y = 8
},
/turf/open/floor/iron/kitchen{
@@ -5801,10 +5801,10 @@
dir = 1
},
/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/machinery/light/directional/south,
@@ -5887,11 +5887,11 @@
dir = 1
},
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -3;
pixel_y = 16
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 3;
pixel_y = 16
},
@@ -5899,13 +5899,13 @@
/area/ruin/space/has_grav/skyrat/interdynefob/security/prison)
"uF" = (
/obj/structure/rack,
-/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
},
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/wirecutters,
/obj/item/shovel/spade,
/obj/item/shovel/spade,
@@ -7090,7 +7090,7 @@
/obj/structure/window/reinforced/survival_pod{
dir = 6
},
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/turf/open/floor/iron/large,
/area/ruin/space/has_grav/skyrat/interdynefob/service/diner)
"yC" = (
@@ -7246,7 +7246,7 @@
/area/ruin/space/has_grav/skyrat/interdynefob/medbay)
"yY" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/waterbottle/large,
+/obj/item/reagent_containers/cup/glass/waterbottle/large,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -7383,7 +7383,7 @@
"zv" = (
/obj/structure/table,
/obj/machinery/light/directional/south,
-/obj/item/reagent_containers/glass/bucket/wooden,
+/obj/item/reagent_containers/cup/bucket/wooden,
/turf/open/floor/iron/dark/purple/side{
dir = 10
},
@@ -8702,7 +8702,7 @@
/area/ruin/space/has_grav/skyrat/interdynefob/service/dorms/fitness)
"DX" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/turf/open/floor/wood,
/area/ruin/space/has_grav/skyrat/interdynefob/maintenance/southeast)
"DY" = (
@@ -9833,8 +9833,8 @@
/obj/structure/closet/secure_closet/freezer/kitchen{
req_access = list(150)
},
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/soymilk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/soymilk,
/obj/item/storage/fancy/egg_box,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/ruin/space/has_grav/skyrat/interdynefob/service/diner)
@@ -9974,11 +9974,11 @@
/area/ruin/space/has_grav/skyrat/interdynefob/halls)
"Iy" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -3;
pixel_y = 9
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
dir = 1;
pixel_x = 3;
pixel_y = 9
@@ -10184,7 +10184,7 @@
/area/ruin/space/has_grav/skyrat/interdynefob/halls)
"Ji" = (
/obj/structure/safe,
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game,
+/obj/item/reagent_containers/cup/soda_cans/pwr_game,
/obj/item/storage/box/syndie_kit/chameleon/ghostcafe{
desc = "A sleek, sturdy box.";
name = "Chameleon Kit"
@@ -10337,11 +10337,11 @@
dir = 10
},
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = -6;
pixel_y = 5
},
-/obj/item/reagent_containers/food/drinks/drinkingglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass,
/turf/open/floor/wood,
/area/ruin/space/has_grav/skyrat/interdynefob/maintenance/southeast)
"JG" = (
@@ -10660,8 +10660,8 @@
/obj/item/storage/box/lights/mixed,
/obj/item/clothing/gloves/botanic_leather,
/obj/item/clothing/gloves/color/blue,
-/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,
/obj/effect/turf_decal/tile/blue{
@@ -10939,10 +10939,10 @@
/area/ruin/space/has_grav/skyrat/interdynefob/bridge)
"LF" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/nutrient/ez{
+/obj/item/reagent_containers/cup/bottle/nutrient/ez{
pixel_x = -5
},
-/obj/item/reagent_containers/glass/bottle/nutrient/rh{
+/obj/item/reagent_containers/cup/bottle/nutrient/rh{
pixel_x = 5
},
/obj/item/reagent_containers/syringe,
@@ -11654,8 +11654,8 @@
/obj/structure/closet/secure_closet/freezer/kitchen{
req_access = list(150)
},
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/soymilk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/soymilk,
/obj/structure/sign/poster/contraband/kss13{
pixel_x = -32
},
@@ -11706,7 +11706,7 @@
/area/ruin/space/has_grav/skyrat/interdynefob/research)
"Od" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/potassium{
+/obj/item/reagent_containers/cup/bottle/potassium{
pixel_x = -4;
pixel_y = 3
},
@@ -11726,7 +11726,7 @@
"Of" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table/wood,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
/turf/open/floor/wood,
/area/ruin/space/has_grav/skyrat/interdynefob/maintenance/southwest)
"Og" = (
@@ -11936,7 +11936,7 @@
/area/ruin/space/has_grav/skyrat/interdynefob/bridge/admiral)
"OU" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/iron,
/area/ruin/space/has_grav/skyrat/interdynefob/maintenance/southwest)
"OV" = (
@@ -12321,7 +12321,7 @@
},
/area/ruin/space/has_grav/skyrat/interdynefob/security/prison)
"Qh" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/grass,
/area/ruin/space/has_grav/skyrat/interdynefob/maintenance/southwest)
@@ -12866,7 +12866,7 @@
"RS" = (
/obj/structure/sink/directional/west,
/obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/machinery/airalarm/directional/east{
req_access = list(150)
},
@@ -13117,7 +13117,7 @@
},
/area/ruin/space/has_grav/skyrat/interdynefob/security/prison)
"SK" = (
-/obj/item/reagent_containers/glass/bottle/nutrient/ez,
+/obj/item/reagent_containers/cup/bottle/nutrient/ez,
/turf/open/floor/grass,
/area/ruin/space/has_grav/skyrat/interdynefob/security/prison)
"SL" = (
@@ -13263,7 +13263,7 @@
/area/ruin/space/has_grav/skyrat/interdynefob/service/hydroponics)
"Tp" = (
/obj/effect/decal/cleanable/cum,
-/obj/item/reagent_containers/food/drinks/waterbottle/empty,
+/obj/item/reagent_containers/cup/glass/waterbottle/empty,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/ruin/space/has_grav/skyrat/interdynefob/maintenance/southwest)
@@ -14052,7 +14052,7 @@
/area/ruin/space/has_grav/skyrat/interdynefob/service/diner)
"Wl" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game,
+/obj/item/reagent_containers/cup/soda_cans/pwr_game,
/turf/open/floor/iron,
/area/ruin/space/has_grav/skyrat/interdynefob/maintenance/southwest)
"Wn" = (
diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/piratefort.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/piratefort.dmm
index e39a2d8e0bd..6fa3f9db433 100644
--- a/_maps/RandomRuins/SpaceRuins/skyrat/piratefort.dmm
+++ b/_maps/RandomRuins/SpaceRuins/skyrat/piratefort.dmm
@@ -133,10 +133,10 @@
"fN" = (
/obj/effect/turf_decal/bot,
/obj/structure/closet/crate/medical,
-/obj/item/reagent_containers/glass/beaker/cryoxadone,
-/obj/item/reagent_containers/glass/beaker/cryoxadone,
-/obj/item/reagent_containers/glass/beaker/synthflesh,
-/obj/item/reagent_containers/glass/beaker/synthflesh,
+/obj/item/reagent_containers/cup/beaker/cryoxadone,
+/obj/item/reagent_containers/cup/beaker/cryoxadone,
+/obj/item/reagent_containers/cup/beaker/synthflesh,
+/obj/item/reagent_containers/cup/beaker/synthflesh,
/obj/item/reagent_containers/pill/iron{
pixel_x = 8
},
@@ -413,8 +413,8 @@
/obj/structure/closet/secure_closet/freezer/fridge{
req_access = null
},
-/obj/item/reagent_containers/food/condiment/quality_oil,
-/obj/item/reagent_containers/food/condiment/quality_oil,
+/obj/item/reagent_containers/condiment/quality_oil,
+/obj/item/reagent_containers/condiment/quality_oil,
/turf/open/floor/iron/kitchen,
/area/ruin/space/has_grav/powered)
"rD" = (
@@ -1112,7 +1112,7 @@
/area/ruin/space/has_grav/powered)
"Yn" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/soysauce,
+/obj/item/reagent_containers/condiment/soysauce,
/turf/open/floor/iron/kitchen,
/area/ruin/space/has_grav/powered)
"Yt" = (
diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon2.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon2.dmm
index 31a1904024c..4f662f0440f 100644
--- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon2.dmm
+++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon2.dmm
@@ -53,7 +53,7 @@
"am" = (
/obj/structure/mopbucket,
/obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/soap/nanotrasen,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/afthall)
@@ -789,12 +789,12 @@
/area/ruin/space/has_grav/port_tarkon/centerhall)
"dW" = (
/obj/structure/closet/secure_closet/freezer/fridge/open,
-/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/sugar,
-/obj/item/reagent_containers/food/condiment/sugar,
+/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/sugar,
+/obj/item/reagent_containers/condiment/sugar,
/turf/open/floor/iron/cafeteria,
/area/ruin/space/has_grav/port_tarkon/kitchen)
"dX" = (
@@ -1974,17 +1974,17 @@
/area/ruin/space/has_grav/port_tarkon/porthall)
"kI" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -2
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -2
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 2;
pixel_y = 2
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 2;
pixel_y = 1
},
@@ -3787,7 +3787,7 @@
pixel_y = 8
},
/obj/effect/spawner/random/entertainment/cigarette_pack,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/port_tarkon/centerhall)
"uD" = (
@@ -5702,8 +5702,8 @@
/area/ruin/space/has_grav/port_tarkon/comms)
"FS" = (
/obj/structure/table/reinforced,
-/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/iron/cafeteria,
/area/ruin/space/has_grav/port_tarkon/kitchen)
"FT" = (
@@ -6812,8 +6812,8 @@
/area/ruin/space/has_grav/port_tarkon/forehall)
"KZ" = (
/obj/structure/table/reinforced,
-/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/cafeteria,
/area/ruin/space/has_grav/port_tarkon/kitchen)
"La" = (
diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon3.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon3.dmm
index e728a09dfe5..8d1ef10d201 100644
--- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon3.dmm
+++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon3.dmm
@@ -42,7 +42,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/mopbucket,
/obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/soap/nanotrasen,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/afthall)
@@ -693,12 +693,12 @@
"dW" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/secure_closet/freezer/fridge/open,
-/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/sugar,
-/obj/item/reagent_containers/food/condiment/sugar,
+/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/sugar,
+/obj/item/reagent_containers/condiment/sugar,
/turf/open/floor/iron/cafeteria,
/area/ruin/space/has_grav/port_tarkon/kitchen)
"dX" = (
@@ -1979,17 +1979,17 @@
/area/ruin/space/has_grav)
"kI" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -2
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -2
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 2;
pixel_y = 2
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 2;
pixel_y = 1
},
@@ -3779,7 +3779,7 @@
pixel_y = 8
},
/obj/effect/spawner/random/entertainment/cigarette_pack,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/port_tarkon/centerhall)
"uD" = (
@@ -5576,9 +5576,9 @@
/area/ruin/space/has_grav/port_tarkon/comms)
"FS" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/item/reagent_containers/condiment/enzyme,
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/food/condiment/sugar,
+/obj/item/reagent_containers/condiment/sugar,
/turf/open/floor/iron/cafeteria,
/area/ruin/space/has_grav/port_tarkon/kitchen)
"FT" = (
@@ -6518,8 +6518,8 @@
/area/ruin/space/has_grav/port_tarkon/forehall)
"KZ" = (
/obj/structure/table/reinforced,
-/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/decal/cleanable/dirt,
/turf/open/floor/iron/cafeteria,
/area/ruin/space/has_grav/port_tarkon/kitchen)
diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon4.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon4.dmm
index 0bc8174dd38..ef8b95f77ac 100644
--- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon4.dmm
+++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon4.dmm
@@ -34,7 +34,7 @@
"am" = (
/obj/structure/mopbucket,
/obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/soap/nanotrasen,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/afthall)
@@ -621,12 +621,12 @@
/area/ruin/space/has_grav/port_tarkon/centerhall)
"dW" = (
/obj/structure/closet/secure_closet/freezer/fridge/open,
-/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/sugar,
-/obj/item/reagent_containers/food/condiment/sugar,
+/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/sugar,
+/obj/item/reagent_containers/condiment/sugar,
/turf/open/floor/iron/cafeteria,
/area/ruin/space/has_grav/port_tarkon/kitchen)
"dX" = (
@@ -1711,17 +1711,17 @@
/area/ruin/space/has_grav/port_tarkon/forehall)
"kI" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -2
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -2
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 2;
pixel_y = 2
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 2;
pixel_y = 1
},
@@ -3289,7 +3289,7 @@
pixel_y = 8
},
/obj/effect/spawner/random/entertainment/cigarette_pack,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/port_tarkon/centerhall)
@@ -4856,8 +4856,8 @@
/area/ruin/space/has_grav/port_tarkon/comms)
"FS" = (
/obj/structure/table/reinforced,
-/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/iron/cafeteria,
/area/ruin/space/has_grav/port_tarkon/kitchen)
"FT" = (
@@ -5719,8 +5719,8 @@
/area/ruin/space/has_grav/port_tarkon/developement)
"KZ" = (
/obj/structure/table/reinforced,
-/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/cafeteria,
/area/ruin/space/has_grav/port_tarkon/kitchen)
"La" = (
diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon5.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon5.dmm
index 30a4c5969a9..63085ac7f9b 100644
--- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon5.dmm
+++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon5.dmm
@@ -49,7 +49,7 @@
"am" = (
/obj/structure/mopbucket,
/obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/soap/nanotrasen,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/afthall)
@@ -659,12 +659,12 @@
/area/ruin/space/has_grav/port_tarkon/centerhall)
"dW" = (
/obj/structure/closet/secure_closet/freezer/fridge/open,
-/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/sugar,
-/obj/item/reagent_containers/food/condiment/sugar,
+/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/sugar,
+/obj/item/reagent_containers/condiment/sugar,
/turf/open/floor/iron/cafeteria,
/area/ruin/space/has_grav/port_tarkon/kitchen)
"dX" = (
@@ -1887,17 +1887,17 @@
/area/ruin/space/has_grav/port_tarkon/forehall)
"kI" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -2
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -2
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 2;
pixel_y = 2
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 2;
pixel_y = 1
},
@@ -3534,7 +3534,7 @@
pixel_y = 8
},
/obj/effect/spawner/random/entertainment/cigarette_pack,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/port_tarkon/centerhall)
"uD" = (
@@ -5297,8 +5297,8 @@
/area/ruin/space/has_grav/port_tarkon/comms)
"FS" = (
/obj/structure/table/reinforced,
-/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/iron/cafeteria,
/area/ruin/space/has_grav/port_tarkon/kitchen)
"FT" = (
@@ -6255,8 +6255,8 @@
/area/ruin/space/has_grav/port_tarkon/forehall)
"KZ" = (
/obj/structure/table/reinforced,
-/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/cafeteria,
/area/ruin/space/has_grav/port_tarkon/kitchen)
"La" = (
diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/salvagepost.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/salvagepost.dmm
index df3068324ca..4efb0e4cd44 100644
--- a/_maps/RandomRuins/SpaceRuins/skyrat/salvagepost.dmm
+++ b/_maps/RandomRuins/SpaceRuins/skyrat/salvagepost.dmm
@@ -625,10 +625,10 @@
/obj/structure/rack/shelf,
/obj/effect/spawner/random/food_or_drink/donkpockets,
/obj/effect/spawner/random/food_or_drink/donkpockets,
-/obj/item/reagent_containers/food/drinks/waterbottle/large,
-/obj/item/reagent_containers/food/drinks/waterbottle/large,
-/obj/item/reagent_containers/food/drinks/waterbottle/large,
-/obj/item/reagent_containers/food/drinks/waterbottle/large,
+/obj/item/reagent_containers/cup/glass/waterbottle/large,
+/obj/item/reagent_containers/cup/glass/waterbottle/large,
+/obj/item/reagent_containers/cup/glass/waterbottle/large,
+/obj/item/reagent_containers/cup/glass/waterbottle/large,
/turf/open/floor/iron/dark,
/area/ruin/powered)
"Ee" = (
diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/scrapheap.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/scrapheap.dmm
index 04435dee555..53843dd8c14 100644
--- a/_maps/RandomRuins/SpaceRuins/skyrat/scrapheap.dmm
+++ b/_maps/RandomRuins/SpaceRuins/skyrat/scrapheap.dmm
@@ -641,8 +641,8 @@
"zC" = (
/obj/structure/closet/crate/medical,
/obj/effect/turf_decal/bot,
-/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,
/turf/open/floor/iron,
/area/space)
"zX" = (
@@ -1354,8 +1354,8 @@
/obj/structure/closet/crate/medical,
/obj/effect/turf_decal/bot,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/reagent_containers/glass/beaker/synthflesh,
-/obj/item/reagent_containers/glass/beaker/synthflesh,
+/obj/item/reagent_containers/cup/beaker/synthflesh,
+/obj/item/reagent_containers/cup/beaker/synthflesh,
/obj/item/reagent_containers/pill/iron,
/obj/item/reagent_containers/pill/iron,
/obj/item/reagent_containers/pill/iron,
diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/waypointstation.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/waypointstation.dmm
index 34c7e5c9258..17f260e0618 100644
--- a/_maps/RandomRuins/SpaceRuins/skyrat/waypointstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/skyrat/waypointstation.dmm
@@ -295,7 +295,7 @@
"pP" = (
/obj/structure/closet/crate/large,
/obj/effect/decal/cleanable/xenoblood/xgibs/down,
-/obj/item/reagent_containers/glass/bottle/random_virus,
+/obj/item/reagent_containers/cup/bottle/random_virus,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/waypoint)
"qh" = (
diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/wreckedhomestead.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/wreckedhomestead.dmm
index 153df82dde2..aa20c02b90d 100644
--- a/_maps/RandomRuins/SpaceRuins/skyrat/wreckedhomestead.dmm
+++ b/_maps/RandomRuins/SpaceRuins/skyrat/wreckedhomestead.dmm
@@ -77,7 +77,7 @@
"mP" = (
/obj/structure/table/reinforced,
/obj/item/storage/backpack/duffelbag/med/surgery,
-/obj/item/reagent_containers/glass/beaker/cryoxadone,
+/obj/item/reagent_containers/cup/beaker/cryoxadone,
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{
dir = 5
},
diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
index 95b4dd6f1c2..a9e71a89f29 100644
--- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
+++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
@@ -573,11 +573,11 @@
"fZ" = (
/obj/structure/table/wood,
/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = 7;
pixel_y = 9
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 7;
pixel_y = 5
},
@@ -851,7 +851,7 @@
"if" = (
/obj/structure/table/reinforced,
/obj/item/storage/bag/tray,
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 5
},
/turf/open/floor/iron/cafeteria,
@@ -920,7 +920,7 @@
pixel_x = 6;
pixel_y = 6
},
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
layer = 5
},
/obj/structure/cable,
@@ -954,7 +954,7 @@
dir = 10
},
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug/tea,
+/obj/item/reagent_containers/cup/glass/mug/tea,
/turf/open/floor/stone,
/area/ruin/space/has_grav/hotel/bar)
"iI" = (
@@ -1088,13 +1088,13 @@
/obj/structure/window/reinforced/survival_pod{
dir = 8
},
-/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/machinery/light/directional/south,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/ruin/space/has_grav/hotel/bar)
"jq" = (
-/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
/obj/effect/decal/cleanable/food/flour,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/ruin/space/has_grav/hotel/bar)
@@ -1495,7 +1495,7 @@
/area/ruin/space/has_grav/hotel/dock)
"mW" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug/tea,
+/obj/item/reagent_containers/cup/glass/mug/tea,
/turf/open/floor/carpet/blue,
/area/ruin/space/has_grav/hotel)
"mX" = (
@@ -2489,7 +2489,7 @@
pixel_x = -4;
pixel_y = 2
},
-/obj/item/reagent_containers/food/drinks/shaker{
+/obj/item/reagent_containers/cup/glass/shaker{
pixel_x = 6;
pixel_y = 17
},
@@ -2657,7 +2657,7 @@
pixel_x = -4;
pixel_y = 0
},
-/obj/item/reagent_containers/glass/rag{
+/obj/item/reagent_containers/cup/rag{
pixel_x = 10;
pixel_y = 17
},
@@ -2904,11 +2904,11 @@
"EC" = (
/obj/structure/table/wood,
/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = 7;
pixel_y = 9
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 7;
pixel_y = 5
},
@@ -3007,7 +3007,7 @@
},
/obj/structure/table/wood/fancy/orange,
/obj/machinery/light/directional/north,
-/obj/item/reagent_containers/food/drinks/mug/tea,
+/obj/item/reagent_containers/cup/glass/mug/tea,
/turf/open/floor/carpet/royalblue,
/area/ruin/space/has_grav/hotel/guestroom/room_4)
"FB" = (
@@ -3114,7 +3114,7 @@
/area/ruin/space/has_grav/hotel/guestroom/room_6)
"Gz" = (
/obj/structure/table/wood/fancy/royalblue,
-/obj/item/reagent_containers/food/drinks/mug/tea,
+/obj/item/reagent_containers/cup/glass/mug/tea,
/turf/open/floor/carpet/orange,
/area/ruin/space/has_grav/hotel/guestroom/room_6)
"GB" = (
@@ -3312,7 +3312,7 @@
/area/template_noop)
"Je" = (
/obj/structure/cable,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/catwalk_floor,
/area/ruin/space/has_grav/hotel/custodial)
"Jj" = (
@@ -3669,11 +3669,11 @@
"OJ" = (
/obj/structure/table/wood,
/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = 7;
pixel_y = 9
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 7;
pixel_y = 5
},
diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel_skyrat.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel_skyrat.dmm
index 5e6d52270b7..a86681afbf1 100644
--- a/_maps/RandomRuins/SpaceRuins/spacehotel_skyrat.dmm
+++ b/_maps/RandomRuins/SpaceRuins/spacehotel_skyrat.dmm
@@ -107,7 +107,7 @@
/area/ruin/space/has_grav/hotel)
"aF" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/food/drinks/bottle/champagne,
+/obj/item/reagent_containers/cup/glass/bottle/champagne,
/turf/open/floor/carpet/royalblack,
/area/ruin/space/has_grav/hotel/dock)
"aG" = (
@@ -443,7 +443,7 @@
/area/ruin/space/has_grav/hotel/dock)
"dv" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
/turf/open/floor/wood,
/area/ruin/space/has_grav/hotel/bar)
"dx" = (
@@ -1709,8 +1709,8 @@
/area/ruin/space/has_grav/hotel/dock)
"ji" = (
/obj/structure/table/glass,
-/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/space/has_grav/hotel/bar)
"jm" = (
@@ -2116,7 +2116,7 @@
/area/ruin/space/has_grav/hotel/security)
"kL" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/coffee,
+/obj/item/reagent_containers/cup/glass/coffee,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/ruin/space/has_grav/hotel/security)
@@ -2290,7 +2290,7 @@
/obj/structure/reagent_dispensers/watertank/high,
/obj/item/stack/sheet/mineral/wood/fifty,
/obj/item/stack/sheet/mineral/wood/fifty,
-/obj/item/reagent_containers/glass/bucket/wooden,
+/obj/item/reagent_containers/cup/bucket/wooden,
/turf/open/floor/wood,
/area/ruin/space/has_grav/hotel/sauna)
"lp" = (
@@ -2616,7 +2616,7 @@
/area/ruin/space/has_grav/hotel/custodial)
"mi" = (
/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{
dir = 1
@@ -3759,7 +3759,7 @@
/area/ruin/space/has_grav/hotel)
"vI" = (
/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)
"vK" = (
@@ -4989,10 +4989,10 @@
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/hotel/workroom)
"GL" = (
-/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 = list("away_general")
},
@@ -5060,10 +5060,10 @@
"HD" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
layer = 5
},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 5
},
/turf/open/floor/iron/cafeteria,
@@ -5201,8 +5201,8 @@
/area/ruin/space/has_grav/hotel/bar)
"Ja" = (
/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 = 8;
pixel_y = 2
},
@@ -5223,7 +5223,7 @@
/area/ruin/space/has_grav/hotel)
"Jh" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/turf/open/floor/wood,
/area/ruin/space/has_grav/hotel/bar)
"Jp" = (
@@ -5712,9 +5712,9 @@
/turf/open/floor/iron/freezer,
/area/ruin/space/has_grav/hotel/guestroom/room_5)
"OB" = (
-/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 = list("away_general")
},
@@ -6211,15 +6211,15 @@
/area/ruin/space/has_grav/hotel)
"SV" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
pixel_x = -5;
pixel_y = 4
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = 7;
pixel_y = 5
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = 7;
pixel_y = 12
},
@@ -6227,10 +6227,10 @@
/area/ruin/space/has_grav/hotel/workroom)
"SY" = (
/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,
@@ -6261,15 +6261,15 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/hotel)
"Tj" = (
-/obj/item/reagent_containers/glass/bottle/morphine,
-/obj/item/reagent_containers/glass/bottle/toxin{
+/obj/item/reagent_containers/cup/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/toxin{
pixel_x = 5;
pixel_y = 4
},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = 8
},
-/obj/item/reagent_containers/glass/bottle/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = -5
},
/obj/item/reagent_containers/syringe/epinephrine,
@@ -6282,7 +6282,7 @@
},
/obj/structure/closet/crate/hydroponics,
/obj/item/wirecutters,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/cultivator,
/obj/item/wrench,
/obj/item/shovel/spade,
@@ -6614,8 +6614,8 @@
/area/ruin/space/has_grav/hotel/workroom/quarters)
"WP" = (
/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,
/turf/open/floor/iron,
/area/ruin/space/has_grav/hotel/bar)
"WS" = (
diff --git a/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm b/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm
index 91bb2c78e65..b6e4413984d 100644
--- a/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm
+++ b/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm
@@ -266,11 +266,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/RandomRuins/SpaceRuins/whiteshipruin_box_skyrat.dmm b/_maps/RandomRuins/SpaceRuins/whiteshipruin_box_skyrat.dmm
index 58f6e17a10e..d254027f695 100644
--- a/_maps/RandomRuins/SpaceRuins/whiteshipruin_box_skyrat.dmm
+++ b/_maps/RandomRuins/SpaceRuins/whiteshipruin_box_skyrat.dmm
@@ -44,9 +44,9 @@
/area/ruin/space/has_grav/whiteship/box)
"fK" = (
/obj/structure/closet/crate,
-/obj/item/reagent_containers/food/drinks/waterbottle/large,
-/obj/item/reagent_containers/food/drinks/waterbottle/large,
-/obj/item/reagent_containers/food/drinks/waterbottle/large,
+/obj/item/reagent_containers/cup/glass/waterbottle/large,
+/obj/item/reagent_containers/cup/glass/waterbottle/large,
+/obj/item/reagent_containers/cup/glass/waterbottle/large,
/turf/open/floor/mineral/titanium/white,
/area/ruin/space/has_grav/whiteship/box)
"gK" = (
@@ -243,8 +243,8 @@
/obj/structure/closet/crate{
icon_state = "crateopen"
},
-/obj/item/reagent_containers/food/drinks/waterbottle,
-/obj/item/reagent_containers/food/drinks/waterbottle,
+/obj/item/reagent_containers/cup/glass/waterbottle,
+/obj/item/reagent_containers/cup/glass/waterbottle,
/turf/open/floor/mineral/titanium/white,
/area/ruin/space/has_grav/whiteship/box)
"zG" = (
@@ -341,7 +341,7 @@
/area/ruin/space/has_grav/whiteship/box)
"IA" = (
/obj/item/trash/can/food/beans,
-/obj/item/reagent_containers/food/drinks/waterbottle/large/empty,
+/obj/item/reagent_containers/cup/glass/waterbottle/large/empty,
/obj/item/trash/candy,
/obj/structure/closet/crate/trashcart,
/turf/open/floor/mineral/titanium/white,
@@ -353,7 +353,7 @@
"Jv" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/mini_fridge,
-/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull,
+/obj/item/reagent_containers/cup/soda_cans/grey_bull,
/turf/open/floor/mineral/titanium/white,
/area/ruin/space/has_grav/whiteship/box)
"Jy" = (
diff --git a/_maps/RandomZLevels/SnowCabin.dmm b/_maps/RandomZLevels/SnowCabin.dmm
index 3b6ed3d5b1a..a194fa041a6 100644
--- a/_maps/RandomZLevels/SnowCabin.dmm
+++ b/_maps/RandomZLevels/SnowCabin.dmm
@@ -279,7 +279,7 @@
},
/obj/structure/janitorialcart,
/obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/clothing/suit/caution,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
@@ -339,7 +339,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" = (
@@ -554,7 +554,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" = (
@@ -766,18 +766,18 @@
/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
},
/obj/structure/cable,
@@ -785,7 +785,7 @@
/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,
@@ -878,7 +878,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"
},
@@ -963,7 +963,7 @@
/area/awaymission/cabin/snowforest/sovietsurface)
"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" = (
@@ -1236,7 +1236,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" = (
@@ -2069,11 +2069,11 @@
"he" = (
/obj/structure/table/wood,
/obj/structure/cable,
-/obj/item/reagent_containers/food/drinks/mug/coco{
+/obj/item/reagent_containers/cup/glass/mug/coco{
desc = "Still hot!";
pixel_y = -2
},
-/obj/item/reagent_containers/food/drinks/mug/coco{
+/obj/item/reagent_containers/cup/glass/mug/coco{
desc = "Still hot!";
pixel_x = 8;
pixel_y = 8
@@ -2248,7 +2248,7 @@
/area/awaymission/cabin)
"hF" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug/coco{
+/obj/item/reagent_containers/cup/glass/mug/coco{
desc = "Still hot!";
pixel_y = 2
},
@@ -2300,7 +2300,7 @@
/turf/open/floor/plating/snowed,
/area/awaymission/cabin/caves)
"hQ" = (
-/obj/item/reagent_containers/food/drinks/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/turf/open/floor/plating/snowed,
/area/awaymission/cabin/caves)
"hR" = (
@@ -2428,7 +2428,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)
"iv" = (
@@ -2489,7 +2489,7 @@
/area/awaymission/cabin/caves)
"iR" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug/coco{
+/obj/item/reagent_containers/cup/glass/mug/coco{
desc = "Still hot!";
pixel_x = -7;
pixel_y = -2
@@ -2498,7 +2498,7 @@
/area/awaymission/cabin)
"iS" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug/coco{
+/obj/item/reagent_containers/cup/glass/mug/coco{
desc = "Still hot!";
pixel_x = 7;
pixel_y = 2
@@ -2507,7 +2507,7 @@
/area/awaymission/cabin)
"iT" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug/coco{
+/obj/item/reagent_containers/cup/glass/mug/coco{
desc = "Still hot!";
pixel_x = -4;
pixel_y = 4
@@ -2516,12 +2516,12 @@
/area/awaymission/cabin)
"iU" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug/coco{
+/obj/item/reagent_containers/cup/glass/mug/coco{
desc = "Still hot!";
pixel_x = -5;
pixel_y = 2
},
-/obj/item/reagent_containers/food/drinks/mug/coco{
+/obj/item/reagent_containers/cup/glass/mug/coco{
desc = "Still hot!";
pixel_x = 7;
pixel_y = -2
@@ -2748,14 +2748,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
},
@@ -3056,7 +3056,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 0d7de3b1621..ab3b00e8584 100644
--- a/_maps/RandomZLevels/TheBeach.dmm
+++ b/_maps/RandomZLevels/TheBeach.dmm
@@ -197,7 +197,7 @@
/turf/open/misc/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
},
@@ -224,7 +224,7 @@
/turf/open/misc/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
},
@@ -384,7 +384,7 @@
/area/awaymission/beach)
"bu" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
pixel_y = 3
},
/turf/open/floor/wood,
@@ -519,7 +519,7 @@
/area/awaymission/beach)
"bO" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/tequila{
+/obj/item/reagent_containers/cup/glass/bottle/tequila{
pixel_y = 2
},
/turf/open/floor/wood,
@@ -676,7 +676,7 @@
/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)
"cn" = (
@@ -708,14 +708,14 @@
req_access = list("kitchen")
},
/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" = (
@@ -781,7 +781,7 @@
/area/awaymission/beach)
"cD" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/glass/rag{
+/obj/item/reagent_containers/cup/rag{
pixel_y = 7
},
/obj/item/food/burger/crab{
@@ -792,12 +792,12 @@
/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" = (
@@ -839,12 +839,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/misc/beach/sand,
/area/awaymission/beach)
"cO" = (
@@ -852,11 +852,11 @@
/turf/open/misc/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;
pixel_y = -7
},
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb{
pixel_x = 13;
pixel_y = -7
},
@@ -864,7 +864,7 @@
/turf/open/misc/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 = -6
},
@@ -872,14 +872,14 @@
/turf/open/misc/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/misc/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 = -9
},
@@ -887,15 +887,15 @@
/turf/open/misc/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/misc/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 = -6
},
-/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind{
+/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{
pixel_x = 15
},
/obj/structure/fluff/beach_umbrella/science,
@@ -909,13 +909,13 @@
/turf/open/misc/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/misc/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;
pixel_y = -5
},
@@ -923,7 +923,7 @@
/turf/open/misc/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/misc/beach/sand,
@@ -969,7 +969,7 @@
/area/awaymission/beach)
"hw" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/ale,
+/obj/item/reagent_containers/cup/glass/bottle/ale,
/turf/open/floor/wood,
/area/awaymission/beach)
"iy" = (
@@ -997,7 +997,7 @@
/area/awaymission/beach)
"lA" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/maltliquor{
+/obj/item/reagent_containers/cup/glass/bottle/maltliquor{
pixel_y = 3
},
/turf/open/floor/wood,
@@ -1011,7 +1011,7 @@
/turf/open/floor/wood,
/area/awaymission/beach)
"mV" = (
-/obj/item/reagent_containers/food/drinks/bottle/beer/light{
+/obj/item/reagent_containers/cup/glass/bottle/beer/light{
pixel_x = -14;
pixel_y = 15
},
@@ -1025,8 +1025,8 @@
"sG" = (
/obj/structure/table/wood,
/obj/item/clothing/glasses/sunglasses,
-/obj/item/reagent_containers/food/drinks/bottle/beer,
-/obj/item/reagent_containers/food/drinks/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/turf/open/floor/wood,
/area/awaymission/beach)
"wr" = (
@@ -1058,7 +1058,7 @@
/area/awaymission/beach)
"zc" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/sake{
+/obj/item/reagent_containers/cup/glass/bottle/sake{
pixel_y = 4
},
/turf/open/floor/wood,
@@ -1122,16 +1122,16 @@
/area/awaymission/beach)
"Nr" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/beer,
-/obj/item/reagent_containers/food/drinks/bottle/beer,
-/obj/item/reagent_containers/food/drinks/bottle/beer,
-/obj/item/reagent_containers/food/drinks/bottle/beer,
-/obj/item/reagent_containers/food/drinks/bottle/beer,
-/obj/item/reagent_containers/food/drinks/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/misc/beach/sand,
/area/awaymission/beach)
"QQ" = (
-/obj/item/reagent_containers/food/drinks/bottle/rum{
+/obj/item/reagent_containers/cup/glass/bottle/rum{
pixel_y = 2
},
/obj/structure/table/wood,
@@ -1160,7 +1160,7 @@
/turf/open/floor/wood,
/area/awaymission/beach)
"Vx" = (
-/obj/item/reagent_containers/food/drinks/bottle/wine{
+/obj/item/reagent_containers/cup/glass/bottle/wine{
pixel_y = 4
},
/obj/structure/table/wood,
diff --git a/_maps/RandomZLevels/blackmesa.dmm b/_maps/RandomZLevels/blackmesa.dmm
index 2e6fa88cd06..5e2fc032854 100644
--- a/_maps/RandomZLevels/blackmesa.dmm
+++ b/_maps/RandomZLevels/blackmesa.dmm
@@ -116,7 +116,7 @@
/area/awaymission/black_mesa/xen/vortigaunt_village_nihilanth)
"abS" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/mug/tea,
+/obj/item/reagent_containers/cup/glass/mug/tea,
/turf/open/floor/iron/textured,
/area/awaymission/black_mesa/to_cryo_room)
"acc" = (
@@ -1101,7 +1101,7 @@
pixel_y = 29
},
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/beer/light{
+/obj/item/reagent_containers/cup/glass/bottle/beer/light{
pixel_x = -6;
pixel_y = -6
},
@@ -2128,7 +2128,7 @@
/area/awaymission/black_mesa/tram_room)
"aAI" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/beer/almost_empty{
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{
pixel_x = 8;
pixel_y = 3
},
@@ -2189,7 +2189,7 @@
/area/awaymission/black_mesa/tram_room)
"aBh" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/beer/light{
+/obj/item/reagent_containers/cup/glass/bottle/beer/light{
pixel_x = -5;
pixel_y = 9
},
@@ -2473,7 +2473,7 @@
/obj/item/stack/spacecash/c1{
pixel_y = 5
},
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
/turf/open/floor/iron/dark,
/area/awaymission/black_mesa/security_outpost)
"aEW" = (
@@ -2601,7 +2601,7 @@
/obj/item/paper/crumpled/awaymissions/moonoutpost19/hastey_note{
default_raw_text = "Right, I'm a commie? So what? I'm proud of it.."
},
-/obj/item/reagent_containers/food/drinks/bottle/vodka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
pixel_x = 11
},
/obj/effect/mapping_helpers/broken_floor,
@@ -3221,22 +3221,22 @@
/turf/open/misc/ironsand/black_mesa,
/area/awaymission/black_mesa)
"aOa" = (
-/obj/item/reagent_containers/food/condiment/milk{
+/obj/item/reagent_containers/condiment/milk{
pixel_x = 6;
pixel_y = 8
},
-/obj/item/reagent_containers/food/condiment/sugar{
+/obj/item/reagent_containers/condiment/sugar{
pixel_y = 4
},
-/obj/item/reagent_containers/food/condiment/soymilk{
+/obj/item/reagent_containers/condiment/soymilk{
pixel_x = -6;
pixel_y = 8
},
-/obj/item/reagent_containers/food/drinks/ice{
+/obj/item/reagent_containers/cup/glass/ice{
pixel_x = -4;
pixel_y = -2
},
-/obj/item/reagent_containers/food/drinks/bottle/cream{
+/obj/item/reagent_containers/cup/glass/bottle/juice/cream{
pixel_x = 3;
pixel_y = -2
},
@@ -3310,15 +3310,15 @@
pixel_x = -4;
pixel_y = 6
},
-/obj/item/reagent_containers/food/drinks/mug/coco{
+/obj/item/reagent_containers/cup/glass/mug/coco{
pixel_x = -2;
pixel_y = 4
},
-/obj/item/reagent_containers/food/drinks/mug/tea{
+/obj/item/reagent_containers/cup/glass/mug/tea{
pixel_x = 4;
pixel_y = 2
},
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee{
pixel_x = -3
},
/obj/structure/window/reinforced{
@@ -3373,7 +3373,7 @@
/turf/open/floor/plating,
/area/awaymission/black_mesa/entrance)
"aPB" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull,
+/obj/item/reagent_containers/cup/soda_cans/grey_bull,
/turf/open/misc/ironsand/black_mesa,
/area/awaymission/black_mesa)
"aPG" = (
@@ -5942,7 +5942,7 @@
/area/awaymission/black_mesa/xen/acid_lake_building)
"ezH" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/beaker/synthflesh,
+/obj/item/reagent_containers/cup/beaker/synthflesh,
/turf/open/floor/iron/smooth_large,
/area/awaymission/black_mesa/deep_sci_chem)
"ezT" = (
@@ -6401,10 +6401,10 @@
/area/awaymission/black_mesa/high_security_surgery)
"fwx" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee{
pixel_x = -3
},
-/obj/item/reagent_containers/food/drinks/mug/tea{
+/obj/item/reagent_containers/cup/glass/mug/tea{
pixel_x = 4;
pixel_y = 2
},
@@ -6804,7 +6804,7 @@
},
/obj/structure/table,
/obj/item/storage/fancy/donut_box,
-/obj/item/reagent_containers/food/drinks/coffee,
+/obj/item/reagent_containers/cup/glass/coffee,
/obj/item/assembly/signaler,
/obj/item/gun_maintenance_supplies,
/obj/item/gun_maintenance_supplies,
@@ -7417,7 +7417,7 @@
/area/awaymission/black_mesa/xen/acid_lake)
"hMp" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/mug/tea{
+/obj/item/reagent_containers/cup/glass/mug/tea{
pixel_x = 4;
pixel_y = 2
},
@@ -8720,8 +8720,8 @@
/area/awaymission/black_mesa/entrance_internal_hall)
"kAW" = (
/obj/structure/table,
-/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/smooth_large,
/area/awaymission/black_mesa/deep_sci_chem)
"kBh" = (
@@ -9217,11 +9217,11 @@
/area/awaymission/black_mesa/black_ops_entrance)
"lDC" = (
/obj/structure/closet/wardrobe,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey,
+/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,
/turf/open/floor/iron/dark/yellow,
/area/awaymission/black_mesa/hecu_zone_bathroom)
"lDP" = (
@@ -9533,7 +9533,7 @@
/area/awaymission/black_mesa/entrance_internal_hall)
"mnV" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/beaker/bluespace,
+/obj/item/reagent_containers/cup/beaker/bluespace,
/turf/open/floor/iron/smooth_large,
/area/awaymission/black_mesa/deep_sci_chem)
"mpE" = (
@@ -9723,7 +9723,7 @@
/turf/open/floor/iron/dark,
/area/awaymission/black_mesa/resonant_chamber)
"mPM" = (
-/obj/item/reagent_containers/food/drinks/bottle/beer/almost_empty,
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty,
/obj/effect/spawner/random/trash/mess,
/turf/open/floor/wood/parquet,
/area/awaymission/black_mesa/employee_dorm_room)
@@ -9873,7 +9873,7 @@
/area/awaymission/black_mesa/entrance_hall)
"njp" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/coffee,
+/obj/item/reagent_containers/cup/glass/coffee,
/turf/open/floor/iron/dark,
/area/awaymission/black_mesa/science_internal)
"njF" = (
@@ -12861,7 +12861,7 @@
/area/awaymission/black_mesa/deep_sci_storage)
"tvK" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee{
pixel_x = -3
},
/obj/item/food/cakeslice/pound_cake_slice{
@@ -14205,7 +14205,7 @@
"wmF" = (
/obj/structure/lattice/catwalk,
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/beer/light,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
/turf/open/floor/iron/dark,
/area/awaymission/black_mesa/xen/acid_lake)
"wmH" = (
diff --git a/_maps/RandomZLevels/caves.dmm b/_maps/RandomZLevels/caves.dmm
index f32bbde9109..798a345a3cf 100644
--- a/_maps/RandomZLevels/caves.dmm
+++ b/_maps/RandomZLevels/caves.dmm
@@ -1066,7 +1066,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" = (
@@ -1148,7 +1148,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 353766161ca..1bff694971e 100644
--- a/_maps/RandomZLevels/moonoutpost19.dmm
+++ b/_maps/RandomZLevels/moonoutpost19.dmm
@@ -2129,7 +2129,7 @@
/obj/item/reagent_containers/spray/pepper,
/obj/item/grenade/flashbang,
/obj/item/storage/belt/security,
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -3;
pixel_y = -2
},
@@ -3621,10 +3621,10 @@
"jm" = (
/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{
@@ -3874,7 +3874,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
},
@@ -4043,7 +4043,7 @@
"kn" = (
/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{
@@ -4818,9 +4818,9 @@
name = "kitchen Cabinet";
req_access = list("away_maintenance")
},
-/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{
heat_capacity = 1e+006;
@@ -4848,9 +4848,9 @@
name = "refrigerator";
req_access = list("away_maintenance")
},
-/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{
heat_capacity = 1e+006;
@@ -4960,15 +4960,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,
diff --git a/_maps/RandomZLevels/mothership_astrum.dmm b/_maps/RandomZLevels/mothership_astrum.dmm
index e2469a68961..e19f644f32b 100644
--- a/_maps/RandomZLevels/mothership_astrum.dmm
+++ b/_maps/RandomZLevels/mothership_astrum.dmm
@@ -515,7 +515,7 @@
/obj/structure/window{
dir = 8
},
-/obj/item/reagent_containers/glass/beaker/meta,
+/obj/item/reagent_containers/cup/beaker/meta,
/turf/open/floor/plating/abductor,
/area/awaymission/mothership_astrum/halls)
"iO" = (
@@ -827,7 +827,7 @@
/obj/structure/window{
dir = 8
},
-/obj/item/reagent_containers/glass/mortar,
+/obj/item/reagent_containers/cup/mortar,
/obj/item/pestle,
/turf/open/floor/plating/abductor2,
/area/awaymission/mothership_astrum/halls)
@@ -1316,7 +1316,7 @@
/turf/open/floor/plating/abductor2,
/area/awaymission/mothership_astrum/halls)
"uY" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
+/obj/item/reagent_containers/cup/soda_cans/starkist{
pixel_x = -6
},
/turf/open/misc/beach/sand,
@@ -1789,7 +1789,7 @@
/obj/structure/window{
dir = 4
},
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
/turf/open/floor/plating/abductor,
/area/awaymission/mothership_astrum/halls)
"BU" = (
@@ -1860,7 +1860,7 @@
/area/awaymission/mothership_astrum/halls)
"CB" = (
/obj/structure/table/abductor,
-/obj/item/reagent_containers/glass/beaker/bluespace,
+/obj/item/reagent_containers/cup/beaker/bluespace,
/turf/open/floor/mineral/abductor,
/area/awaymission/mothership_astrum/halls)
"CC" = (
@@ -1943,7 +1943,7 @@
/turf/open/floor/plating/abductor2,
/area/awaymission/mothership_astrum/halls)
"Ds" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime{
+/obj/item/reagent_containers/cup/soda_cans/lemon_lime{
pixel_x = -12
},
/turf/open/misc/beach/sand,
@@ -2113,7 +2113,7 @@
/area/awaymission/mothership_astrum/deck2)
"Fu" = (
/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/glass/bottle/ethanol{
+/obj/item/reagent_containers/cup/bottle/ethanol{
name = "Delicious Alcohol"
},
/turf/open/floor/wood,
@@ -2164,7 +2164,7 @@
/turf/open/floor/plating/abductor2,
/area/awaymission/mothership_astrum/halls)
"FL" = (
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/obj/structure/table/wood,
/obj/item/stack/spacecash/c10,
/obj/item/stack/spacecash/c100,
@@ -2554,11 +2554,11 @@
/area/awaymission/mothership_astrum/halls)
"JR" = (
/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
},
@@ -2797,7 +2797,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/obj/item/reagent_containers/glass/bottle/ethanol{
+/obj/item/reagent_containers/cup/bottle/ethanol{
name = "Delicious Alcohol"
},
/turf/open/floor/iron,
@@ -3174,7 +3174,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 10
},
-/obj/item/reagent_containers/glass/bottle/ethanol{
+/obj/item/reagent_containers/cup/bottle/ethanol{
name = "Delicious Alcohol"
},
/turf/open/floor/iron,
@@ -3186,7 +3186,7 @@
dir = 1
},
/obj/effect/turf_decal/stripes/line,
-/obj/item/reagent_containers/glass/bottle/ethanol{
+/obj/item/reagent_containers/cup/bottle/ethanol{
name = "Delicious Alcohol"
},
/turf/open/floor/iron,
@@ -3230,7 +3230,7 @@
"Qw" = (
/obj/structure/table/reinforced,
/obj/item/book/manual/wiki/barman_recipes,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
dir = 1
@@ -3798,7 +3798,7 @@
/turf/open/floor/mineral/abductor,
/area/awaymission/mothership_astrum/halls)
"Wv" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
pixel_x = -5;
pixel_y = -5
},
diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm
index c65e064401d..7041160f42e 100644
--- a/_maps/RandomZLevels/research.dmm
+++ b/_maps/RandomZLevels/research.dmm
@@ -1237,11 +1237,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
},
@@ -1249,11 +1249,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/research2.dmm b/_maps/RandomZLevels/research2.dmm
index fcaedb19657..97eeab02522 100644
--- a/_maps/RandomZLevels/research2.dmm
+++ b/_maps/RandomZLevels/research2.dmm
@@ -1565,11 +1565,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
},
@@ -1577,11 +1577,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 78fa5e454a0..b7565abd75e 100644
--- a/_maps/RandomZLevels/snowdin.dmm
+++ b/_maps/RandomZLevels/snowdin.dmm
@@ -1255,7 +1255,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" = (
@@ -1371,7 +1371,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" = (
@@ -5007,7 +5007,7 @@
/area/awaymission/snowdin/outside)
"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" = (
@@ -5472,7 +5472,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)
@@ -8856,7 +8856,7 @@
/turf/open/floor/iron/dark,
/area/awaymission/snowdin/cave)
"CI" = (
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
list_reagents = null
},
/obj/effect/turf_decal/tile/neutral,
@@ -8976,7 +8976,7 @@
/area/awaymission/snowdin/cave)
"Df" = (
/obj/item/stack/rods,
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
list_reagents = null
},
/obj/effect/turf_decal/tile/neutral,
@@ -8996,7 +8996,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 5
},
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
list_reagents = null
},
/turf/open/floor/mineral/plastitanium/red,
@@ -9033,7 +9033,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
list_reagents = null
},
/turf/open/floor/mineral/plastitanium/red,
@@ -9135,7 +9135,7 @@
/turf/open/floor/iron/dark/snowdin,
/area/awaymission/snowdin/cave)
"Ea" = (
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
list_reagents = null
},
/turf/open/floor/iron/dark,
@@ -9183,7 +9183,7 @@
/area/awaymission/snowdin/cave)
"Eo" = (
/obj/effect/turf_decal/weather/snow,
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
list_reagents = null
},
/turf/open/floor/iron/dark/snowdin,
@@ -9205,7 +9205,7 @@
/area/awaymission/snowdin/cave)
"Eu" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
list_reagents = null
},
/turf/open/floor/iron/dark,
@@ -9215,7 +9215,7 @@
dir = 4
},
/obj/item/stack/rods,
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
list_reagents = null
},
/turf/open/floor/mineral/plastitanium/red,
@@ -9237,7 +9237,7 @@
dir = 10
},
/obj/item/shard,
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
list_reagents = null
},
/turf/open/floor/mineral/plastitanium/red,
@@ -9246,7 +9246,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" = (
@@ -11894,7 +11894,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/awaymission/snowdin/post/broken_shuttle)
"PQ" = (
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
list_reagents = null
},
/obj/effect/turf_decal/tile/neutral/fourcorners,
diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm
index 14e50af667f..953163b9f00 100644
--- a/_maps/RandomZLevels/undergroundoutpost45.dmm
+++ b/_maps/RandomZLevels/undergroundoutpost45.dmm
@@ -294,7 +294,7 @@
/area/awaymission/undergroundoutpost45/central)
"aW" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/soda_cans/cola,
+/obj/item/reagent_containers/cup/soda_cans/cola,
/turf/open/floor/iron/grimy{
heat_capacity = 1e+006
},
@@ -1449,7 +1449,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{
dir = 1
},
@@ -1527,9 +1527,9 @@
},
/area/awaymission/undergroundoutpost45/central)
"dO" = (
-/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{
@@ -1987,7 +1987,7 @@
/area/awaymission/undergroundoutpost45/central)
"eS" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/iron{
heat_capacity = 1e+006
},
@@ -2247,7 +2247,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{
heat_capacity = 1e+006
},
@@ -2682,7 +2682,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,
@@ -2830,11 +2830,11 @@
"hb" = (
/obj/machinery/light/small/directional/east,
/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
},
@@ -2931,7 +2931,7 @@
"hn" = (
/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,
/obj/effect/turf_decal/tile/bar{
dir = 1
@@ -2961,7 +2961,7 @@
"hq" = (
/obj/structure/table,
/obj/item/stack/package_wrap,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
layer = 5
},
/turf/open/floor/iron/cafeteria{
@@ -3211,10 +3211,10 @@
/area/awaymission/undergroundoutpost45/crew_quarters)
"hR" = (
/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{
@@ -3399,7 +3399,7 @@
"io" = (
/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,
/obj/effect/turf_decal/tile/bar{
dir = 1
@@ -3552,7 +3552,7 @@
/area/awaymission/undergroundoutpost45/crew_quarters)
"iG" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/drinkingglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass,
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
dir = 1
@@ -3782,9 +3782,9 @@
name = "kitchen Cabinet";
req_access = list("away_maintenance")
},
-/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;
@@ -3949,7 +3949,7 @@
/area/awaymission/undergroundoutpost45/crew_quarters)
"jx" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
dir = 1
@@ -5207,10 +5207,10 @@
/area/awaymission/undergroundoutpost45/crew_quarters)
"lT" = (
/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,
diff --git a/_maps/map_files/Blueshift/BlueShift_lower.dmm b/_maps/map_files/Blueshift/BlueShift_lower.dmm
index b139bebfd08..dc63633a52c 100644
--- a/_maps/map_files/Blueshift/BlueShift_lower.dmm
+++ b/_maps/map_files/Blueshift/BlueShift_lower.dmm
@@ -823,7 +823,7 @@
/obj/item/food/jellysandwich/cherry{
pixel_y = 5
},
-/obj/item/reagent_containers/food/drinks/coffee,
+/obj/item/reagent_containers/cup/glass/coffee,
/turf/open/floor/plating,
/area/station/maintenance/evac_maintenance)
"aJb" = (
@@ -924,7 +924,7 @@
/area/station/maintenance/port/central)
"aMQ" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/sol_dry,
+/obj/item/reagent_containers/cup/soda_cans/sol_dry,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/maintenance/evac_maintenance)
@@ -1037,14 +1037,14 @@
/area/station/maintenance/cult_chapel)
"aTO" = (
/obj/structure/closet/secure_closet/freezer/fridge,
-/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/food/condiment/sugar,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/sugar,
+/obj/item/reagent_containers/condiment/sugar,
/obj/item/storage/fancy/egg_box,
/obj/item/storage/fancy/egg_box,
-/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/food/meat/slab,
/obj/item/food/meat/slab,
/obj/item/food/meat/slab,
@@ -1901,7 +1901,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,
@@ -5009,7 +5009,7 @@
/area/station/maintenance/department/electrical)
"dEr" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/plating/rust,
/area/station/maintenance/evac_maintenance)
"dEQ" = (
@@ -11158,7 +11158,7 @@
/area/space/nearstation)
"iPs" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
pixel_x = 16;
pixel_y = 8
},
@@ -11527,7 +11527,7 @@
"jdA" = (
/obj/effect/turf_decal/bot,
/obj/structure/rack,
-/obj/item/reagent_containers/food/drinks/coffee,
+/obj/item/reagent_containers/cup/glass/coffee,
/obj/effect/spawner/random/contraband/prison,
/turf/open/floor/plating,
/area/station/security/prison/safe)
@@ -13042,7 +13042,7 @@
pixel_x = -3;
pixel_y = -7
},
-/obj/item/reagent_containers/glass/bottle/fentanyl{
+/obj/item/reagent_containers/cup/bottle/fentanyl{
pixel_x = 8;
pixel_y = -7
},
@@ -13233,7 +13233,7 @@
/obj/item/pen{
pixel_x = -7
},
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
pixel_x = 6;
pixel_y = -4
},
@@ -17303,7 +17303,7 @@
pixel_x = -5;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/bottle/beer/light{
+/obj/item/reagent_containers/cup/glass/bottle/beer/light{
pixel_x = 5;
pixel_y = 12
},
@@ -17407,7 +17407,7 @@
/area/station/cargo/miningdock)
"nLm" = (
/obj/structure/sink/directional/south,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/stone,
/area/station/maintenance/abandon_cafeteria/hydro)
@@ -17952,7 +17952,7 @@
pixel_x = -3;
pixel_y = 5
},
-/obj/item/reagent_containers/food/drinks/shaker{
+/obj/item/reagent_containers/cup/glass/shaker{
pixel_x = 5
},
/obj/effect/decal/cleanable/dirt,
@@ -18115,7 +18115,7 @@
/turf/open/floor/plating,
/area/station/maintenance/department/cargo)
"ogg" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/iron,
/area/station/engineering/atmos/hfr_room)
"ohl" = (
@@ -18124,7 +18124,7 @@
pixel_x = -3;
pixel_y = 5
},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = 11;
pixel_y = 7
},
@@ -18602,7 +18602,7 @@
/area/station/engineering/atmos)
"ozV" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = 16;
pixel_y = 13
},
@@ -21798,7 +21798,7 @@
"rfQ" = (
/obj/machinery/door/firedoor,
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/bbqsauce{
+/obj/item/reagent_containers/condiment/bbqsauce{
pixel_x = 9;
pixel_y = 5
},
@@ -28015,7 +28015,7 @@
/area/station/cargo/storage)
"wcB" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko,
+/obj/item/reagent_containers/cup/soda_cans/thirteenloko,
/obj/effect/turf_decal/delivery,
/obj/structure/extinguisher_cabinet/directional/west,
/turf/open/floor/iron,
@@ -28519,14 +28519,14 @@
},
/obj/effect/turf_decal/tile/bar,
/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_y = 3
},
-/obj/item/reagent_containers/glass/rag{
+/obj/item/reagent_containers/cup/rag{
pixel_y = 3
},
/obj/effect/decal/cleanable/dirt,
@@ -29984,14 +29984,14 @@
/area/station/engineering/atmos/hallway)
"xzl" = (
/obj/structure/closet/secure_closet/freezer/fridge,
-/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/food/condiment/sugar,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/sugar,
+/obj/item/reagent_containers/condiment/sugar,
/obj/item/storage/fancy/egg_box,
/obj/item/storage/fancy/egg_box,
-/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/food/meat/slab,
/obj/item/food/meat/slab,
/obj/item/food/meat/slab,
@@ -30257,9 +30257,9 @@
/area/station/maintenance/department/engineering/atmos/port_maint)
"xII" = (
/obj/structure/closet/cardboard,
-/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,
/turf/open/floor/plating,
/area/station/maintenance/department/engine/atmos/lesser)
"xIK" = (
diff --git a/_maps/map_files/Blueshift/BlueShift_middle.dmm b/_maps/map_files/Blueshift/BlueShift_middle.dmm
index 0ea8a51e154..01159020b06 100644
--- a/_maps/map_files/Blueshift/BlueShift_middle.dmm
+++ b/_maps/map_files/Blueshift/BlueShift_middle.dmm
@@ -582,11 +582,11 @@
/area/station/engineering/main)
"afF" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
/obj/item/reagent_containers/syringe,
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 10
@@ -708,7 +708,7 @@
pixel_x = -6;
pixel_y = 11
},
-/obj/item/reagent_containers/food/drinks/flask/det{
+/obj/item/reagent_containers/cup/glass/flask/det{
pixel_y = 5
},
/obj/structure/cable,
@@ -2014,7 +2014,7 @@
/obj/item/clothing/suit/apron/chef,
/obj/item/book/manual/wiki/cooking_to_serve_man,
/obj/item/kitchen/rollingpin,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
pixel_x = 23;
pixel_y = 8
},
@@ -2542,7 +2542,7 @@
},
/area/station/hallway/primary/port)
"awo" = (
-/obj/item/reagent_containers/glass/bottle/thermite,
+/obj/item/reagent_containers/cup/bottle/thermite,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
"awC" = (
@@ -2588,7 +2588,7 @@
pixel_x = -4;
pixel_y = 6
},
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
/obj/item/food/hotcrossbun{
pixel_x = 7;
pixel_y = 5
@@ -3330,7 +3330,7 @@
/area/station/maintenance/port/fore)
"aGO" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_y = 7
},
/turf/open/floor/wood,
@@ -3832,7 +3832,7 @@
"aNQ" = (
/obj/structure/table,
/obj/structure/railing,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb{
pixel_x = -4;
pixel_y = 6
},
@@ -3972,7 +3972,7 @@
pixel_x = -5;
pixel_y = 2
},
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb{
pixel_x = 7;
pixel_y = 9
},
@@ -4220,16 +4220,16 @@
/area/station/cargo/office)
"aVa" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
pixel_x = -9;
pixel_y = 10
},
/obj/item/clothing/accessory/badge/holo/detective,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = 5;
pixel_y = 4
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
/obj/item/radio/intercom/directional/west,
/turf/open/floor/carpet,
/area/station/security/detectives_office)
@@ -5914,7 +5914,7 @@
/area/station/security/courtroom)
"btc" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/beer/almost_empty{
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{
pixel_x = 2;
pixel_y = 11
},
@@ -5951,10 +5951,10 @@
dir = 1
},
/obj/effect/turf_decal/tile/bar,
-/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/light/small/directional/south,
@@ -6168,7 +6168,7 @@
/area/station/security/brig)
"bwF" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/food/drinks/britcup,
+/obj/item/reagent_containers/cup/glass/britcup,
/turf/open/floor/wood,
/area/station/hallway/primary/central)
"bwI" = (
@@ -6599,7 +6599,7 @@
"bCQ" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = 4;
pixel_y = 5
},
@@ -7491,7 +7491,7 @@
pixel_x = -3;
pixel_y = 5
},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = 11;
pixel_y = 7
},
@@ -14353,15 +14353,15 @@
},
/obj/effect/turf_decal/tile/bar,
/obj/structure/table/wood/fancy/black,
-/obj/item/reagent_containers/food/drinks/bottle/lizardwine{
+/obj/item/reagent_containers/cup/glass/bottle/lizardwine{
pixel_x = 9;
pixel_y = 8
},
-/obj/item/reagent_containers/food/drinks/bottle/cognac{
+/obj/item/reagent_containers/cup/glass/bottle/cognac{
pixel_x = -5;
pixel_y = 7
},
-/obj/item/reagent_containers/food/drinks/bottle/sake{
+/obj/item/reagent_containers/cup/glass/bottle/sake{
pixel_x = 2;
pixel_y = 6
},
@@ -14635,7 +14635,7 @@
/obj/structure/window{
dir = 1
},
-/obj/item/reagent_containers/glass/bucket/wooden,
+/obj/item/reagent_containers/cup/bucket/wooden,
/obj/structure/flora/bush,
/turf/open/floor/grass,
/area/station/service/chapel)
@@ -14900,7 +14900,7 @@
pixel_x = -22
},
/obj/structure/rack,
-/obj/item/reagent_containers/glass/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine,
/obj/item/storage/box/chemimp{
pixel_x = 4;
pixel_y = 3
@@ -17043,7 +17043,7 @@
/area/space/nearstation)
"fho" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
/obj/item/food/dough,
/obj/machinery/newscaster/directional/east,
/turf/open/floor/iron/cafeteria,
@@ -19903,11 +19903,11 @@
dir = 1
},
/obj/effect/turf_decal/tile/bar,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -3;
pixel_y = 16
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 3;
pixel_y = 16
},
@@ -20831,7 +20831,7 @@
pixel_y = -4
},
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/food/drinks/bottle/molotov{
+/obj/item/reagent_containers/cup/glass/bottle/molotov{
pixel_x = 7;
pixel_y = 12
},
@@ -21412,11 +21412,11 @@
/area/station/common/locker_room_shower)
"gBY" = (
/obj/structure/table/glass,
-/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/light/directional/east,
@@ -21809,13 +21809,13 @@
pixel_x = 5;
pixel_y = 14
},
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
desc = "Takes you to a whole new level of thinking.";
name = "Meta-Cider";
pixel_x = -7;
pixel_y = 9
},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = -14;
pixel_y = 1
},
@@ -22076,10 +22076,10 @@
dir = 1
},
/obj/effect/turf_decal/tile/bar,
-/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,
@@ -23570,7 +23570,7 @@
pixel_x = -5;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/shaker{
+/obj/item/reagent_containers/cup/glass/shaker{
pixel_x = 4
},
/obj/machinery/light/directional/west,
@@ -23774,25 +23774,25 @@
},
/area/station/hallway/primary/port)
"hsU" = (
-/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
},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = -5;
pixel_y = 2
},
/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,
/obj/effect/turf_decal/siding/wood{
dir = 10
},
@@ -24788,13 +24788,13 @@
/area/station/security/prison/mess)
"hMB" = (
/obj/structure/rack,
-/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
},
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/wirecutters,
/obj/item/shovel/spade,
/obj/item/shovel/spade,
@@ -26485,7 +26485,7 @@
/turf/open/floor/plating,
/area/station/maintenance/department/security/prison_lower)
"ioL" = (
-/obj/item/reagent_containers/glass/bucket/wooden{
+/obj/item/reagent_containers/cup/bucket/wooden{
name = "waste bucket"
},
/turf/open/floor/plating,
@@ -27384,7 +27384,7 @@
/obj/effect/turf_decal/bot,
/obj/structure/window,
/obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
},
@@ -29019,11 +29019,11 @@
/area/station/security/lockers)
"jdc" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -3;
pixel_y = 9
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
dir = 1;
pixel_x = 3;
pixel_y = 9
@@ -30070,7 +30070,7 @@
/area/station/service/bar/atrium)
"jtT" = (
/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/glass/bowl{
+/obj/item/reagent_containers/cup/bowl{
pixel_y = 4
},
/turf/open/floor/carpet,
@@ -30508,7 +30508,7 @@
/area/station/hallway/primary/port)
"jBh" = (
/obj/structure/sink/directional/south,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
@@ -32449,7 +32449,7 @@
/obj/item/book/granter/action/spell/smoke/lesser,
/obj/item/nullrod,
/obj/item/organ/internal/heart,
-/obj/item/reagent_containers/food/drinks/bottle/holywater,
+/obj/item/reagent_containers/cup/glass/bottle/holywater,
/obj/item/soulstone/anybody/chaplain,
/obj/machinery/light/small/directional/north,
/turf/open/floor/iron/grimy,
@@ -33393,19 +33393,19 @@
/obj/machinery/chem_dispenser/drinks/beer{
pixel_y = 32
},
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{
pixel_x = -16;
pixel_y = 11
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = 3;
pixel_y = 8
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -6;
pixel_y = 8
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_y = 5
},
/turf/open/floor/iron/dark,
@@ -34857,11 +34857,11 @@
/obj/structure/table,
/obj/item/clipboard,
/obj/item/toy/figure/chef,
-/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/atmospherics/pipe/smart/simple/supply/hidden/layer4{
@@ -35037,14 +35037,14 @@
},
/obj/effect/turf_decal/tile/bar,
/obj/structure/table/wood/fancy/black,
-/obj/item/reagent_containers/food/drinks/bottle/champagne{
+/obj/item/reagent_containers/cup/glass/bottle/champagne{
pixel_y = 13
},
-/obj/item/reagent_containers/food/drinks/bottle/goldschlager{
+/obj/item/reagent_containers/cup/glass/bottle/goldschlager{
pixel_x = -12;
pixel_y = 10
},
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{
pixel_x = 11;
pixel_y = 11
},
@@ -37277,7 +37277,7 @@
pixel_x = -3;
pixel_y = 5
},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = 11;
pixel_y = 7
},
@@ -38388,15 +38388,15 @@
},
/obj/effect/turf_decal/tile/bar,
/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 = -1;
pixel_y = 4
},
-/obj/item/reagent_containers/glass/rag{
+/obj/item/reagent_containers/cup/rag{
pixel_y = 3
},
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{
@@ -42017,7 +42017,7 @@
"nvX" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = -1;
pixel_y = 4
},
@@ -42394,7 +42394,7 @@
/turf/open/floor/wood,
/area/station/command/heads_quarters/qm)
"nBT" = (
-/obj/item/reagent_containers/glass/bottle/nutrient/ez,
+/obj/item/reagent_containers/cup/bottle/nutrient/ez,
/turf/open/floor/grass,
/area/station/security/prison/garden)
"nCe" = (
@@ -42881,7 +42881,7 @@
"nLZ" = (
/obj/structure/table/reinforced,
/obj/effect/turf_decal/siding/wood,
-/obj/item/reagent_containers/food/condiment/bbqsauce{
+/obj/item/reagent_containers/condiment/bbqsauce{
pixel_x = 9;
pixel_y = 5
},
@@ -44784,15 +44784,15 @@
/area/station/hallway/primary/starboard)
"ovt" = (
/obj/structure/table/reinforced,
-/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 = -1;
pixel_y = 4
},
-/obj/item/reagent_containers/glass/rag{
+/obj/item/reagent_containers/cup/rag{
pixel_y = 3
},
/obj/effect/turf_decal/siding/thinplating/dark,
@@ -46078,18 +46078,18 @@
/obj/item/storage/box/ingredients/fruity,
/obj/item/storage/box/ingredients/fiesta,
/obj/item/storage/box/ingredients/american,
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour{
list_reagents = list(/datum/reagent/consumable/flour=600);
name = "Premium All-Purpose Flour (16KG)";
volume = 600
},
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/enzyme{
list_reagents = list(/datum/reagent/consumable/enzyme=500);
name = "universe-sized universal enyzyme";
volume = 500
},
-/obj/item/reagent_containers/food/condiment/rice{
+/obj/item/reagent_containers/condiment/rice{
list_reagents = list(/datum/reagent/consumable/rice=150);
name = "Basmati Rice Sack (4KG)";
volume = 150
@@ -48414,7 +48414,7 @@
pixel_x = -5;
pixel_y = 9
},
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{
dir = 4
},
@@ -48461,7 +48461,7 @@
/area/station/common/locker_room_shower)
"pDc" = (
/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/bot,
/obj/machinery/newscaster/directional/north,
/turf/open/floor/iron/dark/side{
@@ -48969,7 +48969,7 @@
/area/station/service/library/private)
"pKj" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko,
+/obj/item/reagent_containers/cup/soda_cans/thirteenloko,
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
@@ -49248,15 +49248,15 @@
/turf/open/floor/plating,
/area/station/maintenance/department/engineering/engine_aft_port)
"pOX" = (
-/obj/item/reagent_containers/glass/bottle/diethylamine{
+/obj/item/reagent_containers/cup/bottle/diethylamine{
pixel_x = -5;
pixel_y = 7
},
-/obj/item/reagent_containers/glass/bottle/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = 5;
pixel_y = 7
},
-/obj/item/reagent_containers/glass/bottle/diethylamine{
+/obj/item/reagent_containers/cup/bottle/diethylamine{
pixel_x = 1;
pixel_y = 4
},
@@ -51172,15 +51172,15 @@
},
/obj/effect/turf_decal/tile/bar,
/obj/structure/table/wood/fancy/black,
-/obj/item/reagent_containers/food/drinks/bottle/trappist{
+/obj/item/reagent_containers/cup/glass/bottle/trappist{
pixel_x = -4;
pixel_y = 7
},
-/obj/item/reagent_containers/food/drinks/bottle/tequila{
+/obj/item/reagent_containers/cup/glass/bottle/tequila{
pixel_x = -12;
pixel_y = 5
},
-/obj/item/reagent_containers/food/drinks/bottle/grappa{
+/obj/item/reagent_containers/cup/glass/bottle/grappa{
pixel_x = 4;
pixel_y = 11
},
@@ -52365,22 +52365,22 @@
/turf/open/openspace,
/area/station/maintenance/starboard/central)
"qTA" = (
-/obj/item/reagent_containers/food/condiment/milk{
+/obj/item/reagent_containers/condiment/milk{
pixel_x = 6;
pixel_y = 8
},
-/obj/item/reagent_containers/food/condiment/sugar{
+/obj/item/reagent_containers/condiment/sugar{
pixel_y = 4
},
-/obj/item/reagent_containers/food/condiment/soymilk{
+/obj/item/reagent_containers/condiment/soymilk{
pixel_x = -6;
pixel_y = 8
},
-/obj/item/reagent_containers/food/drinks/ice{
+/obj/item/reagent_containers/cup/glass/ice{
pixel_x = -4;
pixel_y = -2
},
-/obj/item/reagent_containers/food/drinks/bottle/cream{
+/obj/item/reagent_containers/cup/glass/bottle/juice/cream{
pixel_x = 3;
pixel_y = -2
},
@@ -53804,8 +53804,8 @@
/obj/item/mop,
/obj/item/pushbroom,
/obj/item/pushbroom,
-/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/storage/bag/trash,
/turf/open/floor/iron,
/area/station/security/prison/upper)
@@ -53839,11 +53839,11 @@
/obj/item/computer_hardware/hard_drive/portable/quartermaster,
/obj/item/computer_hardware/hard_drive/portable/quartermaster,
/obj/item/coin/gold,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -4;
pixel_y = 16
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = 6;
pixel_y = 16
},
@@ -54055,11 +54055,11 @@
"ryP" = (
/obj/structure/table/reinforced,
/obj/effect/turf_decal/siding/wood,
-/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{
@@ -60139,7 +60139,7 @@
/area/station/maintenance/central)
"tDA" = (
/obj/structure/table/wood/fancy/red,
-/obj/item/reagent_containers/food/drinks/trophy/gold_cup{
+/obj/item/reagent_containers/cup/glass/trophy/gold_cup{
pixel_y = 11
},
/obj/item/storage/belt/champion{
@@ -61149,14 +61149,14 @@
"tTe" = (
/obj/effect/turf_decal/siding/wood,
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{
pixel_y = 14
},
-/obj/item/reagent_containers/food/drinks/bottle/vodka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
pixel_x = 3;
pixel_y = 5
},
-/obj/item/reagent_containers/food/drinks/bottle/vodka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
pixel_x = -8;
pixel_y = 9
},
@@ -61323,6 +61323,8 @@
/obj/effect/turf_decal/trimline/yellow/filled/warning{
dir = 4
},
+/obj/item/screwdriver,
+/obj/item/reagent_containers/cup/glass/coffee,
/obj/machinery/status_display/ai/directional/east,
/obj/machinery/fax{
fax_name = "Engineering Lobby";
@@ -61725,11 +61727,11 @@
name = "Kitchen Counter Shutters"
},
/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
},
/turf/open/floor/iron/dark,
@@ -63048,21 +63050,21 @@
/area/station/security/processing)
"uyJ" = (
/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
@@ -65249,12 +65251,12 @@
/area/station/maintenance/port/aft)
"vnt" = (
/obj/machinery/biogenerator,
-/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/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/turf/open/floor/iron/dark/textured_edge,
/area/station/security/prison/garden)
"vnF" = (
@@ -65262,11 +65264,11 @@
/obj/machinery/chem_dispenser/drinks{
pixel_y = 32
},
-/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 = -1;
pixel_y = 4
},
@@ -65791,7 +65793,7 @@
/turf/closed/wall,
/area/station/service/chapel)
"vwO" = (
-/obj/item/reagent_containers/glass/bucket/wooden{
+/obj/item/reagent_containers/cup/bucket/wooden{
name = "waste bucket"
},
/obj/structure/sink/directional/east{
@@ -67786,7 +67788,7 @@
dir = 4
},
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/rum{
+/obj/item/reagent_containers/cup/glass/bottle/rum{
pixel_x = 6;
pixel_y = 6
},
@@ -67918,7 +67920,7 @@
"weJ" = (
/obj/effect/turf_decal/bot,
/obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/radio/intercom/directional/east,
/obj/effect/turf_decal/tile/green{
dir = 1
@@ -68184,7 +68186,7 @@
/area/station/engineering/storage/tcomms)
"wjt" = (
/obj/structure/table/wood/fancy/royalblack,
-/obj/item/reagent_containers/food/drinks/bottle/champagne{
+/obj/item/reagent_containers/cup/glass/bottle/champagne{
pixel_y = 11
},
/obj/machinery/camera/directional/south{
@@ -68813,7 +68815,7 @@
pixel_x = -3;
pixel_y = 5
},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = 11;
pixel_y = 7
},
@@ -69540,12 +69542,12 @@
/obj/structure/table/reinforced{
name = "Jim Norton's Quebecois Coffee table"
},
-/obj/item/reagent_containers/food/drinks/mug/coco{
+/obj/item/reagent_containers/cup/glass/mug/coco{
pixel_x = -2;
pixel_y = 4
},
-/obj/item/reagent_containers/food/drinks/mug/coco,
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/mug/coco,
+/obj/item/reagent_containers/cup/glass/coffee{
pixel_x = -3
},
/turf/open/floor/iron/dark,
@@ -69952,7 +69954,7 @@
pixel_x = 6;
pixel_y = 6
},
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
pixel_y = 5
},
/obj/item/storage/box/beakers{
@@ -71032,8 +71034,8 @@
/area/station/maintenance/department/engineering/engine_aft_port)
"xdH" = (
/obj/structure/reagent_dispensers/watertank,
-/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/firealarm/directional/west,
/obj/structure/extinguisher_cabinet/directional/south,
/turf/open/floor/iron/dark,
@@ -72809,7 +72811,7 @@
/area/station/security/checkpoint/escape)
"xGC" = (
/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"
},
@@ -73028,7 +73030,7 @@
/turf/open/water/overlay,
/area/station/hallway/primary/central)
"xJw" = (
-/obj/item/reagent_containers/glass/bucket/wooden{
+/obj/item/reagent_containers/cup/bucket/wooden{
name = "waste bucket"
},
/obj/structure/sink/directional/east{
@@ -74743,7 +74745,7 @@
/area/station/service/hydroponics)
"yiT" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/food/drinks/coffee,
+/obj/item/reagent_containers/cup/glass/coffee,
/obj/effect/turf_decal/tile/brown{
dir = 1
},
diff --git a/_maps/map_files/Blueshift/BlueShift_upper.dmm b/_maps/map_files/Blueshift/BlueShift_upper.dmm
index 50f8a0846dc..51ba4b46178 100644
--- a/_maps/map_files/Blueshift/BlueShift_upper.dmm
+++ b/_maps/map_files/Blueshift/BlueShift_upper.dmm
@@ -2369,15 +2369,15 @@
pixel_x = 9;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/bottle/kahlua{
+/obj/item/reagent_containers/cup/glass/bottle/kahlua{
pixel_x = -8;
pixel_y = 11
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -2;
pixel_y = 5
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -5;
pixel_y = 3
},
@@ -3720,16 +3720,16 @@
/area/station/commons/dorms)
"aNV" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -4;
pixel_y = 12
},
-/obj/item/reagent_containers/glass/bottle/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = 7;
pixel_y = 12
},
-/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 = 8;
pixel_y = 2
},
@@ -8241,7 +8241,7 @@
/area/station/maintenance/fore/upper)
"clr" = (
/obj/structure/table/wood/fancy/blue,
-/obj/item/reagent_containers/food/drinks/trophy/bronze_cup{
+/obj/item/reagent_containers/cup/glass/trophy/bronze_cup{
name = "3rd place prize for captain ''measure up'' contest";
pixel_y = 8
},
@@ -8348,11 +8348,11 @@
/area/station/maintenance/fore/upper)
"coM" = (
/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
},
@@ -8439,7 +8439,7 @@
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
"cpB" = (
-/obj/item/reagent_containers/glass/bucket/wooden,
+/obj/item/reagent_containers/cup/bucket/wooden,
/turf/open/floor/wood,
/area/station/service/barber)
"cpE" = (
@@ -9102,7 +9102,7 @@
/turf/open/floor/wood,
/area/station/service/electronic_marketing_den)
"cBf" = (
-/obj/item/reagent_containers/glass/bucket/wooden,
+/obj/item/reagent_containers/cup/bucket/wooden,
/turf/open/floor/wood,
/area/station/common/pool)
"cBi" = (
@@ -9665,10 +9665,10 @@
"cPH" = (
/obj/structure/table,
/obj/item/shovel/spade,
-/obj/item/reagent_containers/glass/bottle/nutrient/ez{
+/obj/item/reagent_containers/cup/bottle/nutrient/ez{
pixel_x = -5
},
-/obj/item/reagent_containers/glass/bottle/nutrient/rh{
+/obj/item/reagent_containers/cup/bottle/nutrient/rh{
pixel_x = 5
},
/obj/item/reagent_containers/syringe,
@@ -10860,7 +10860,7 @@
name = "Chemistry Lobby Shutters"
},
/obj/item/folder/white,
-/obj/item/reagent_containers/glass/bottle/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = -7;
pixel_y = 1
},
@@ -12541,10 +12541,10 @@
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
/obj/item/radio/intercom,
-/obj/item/reagent_containers/glass/bottle/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
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/dark,
/area/station/medical/medbay/lobby)
@@ -16265,11 +16265,11 @@
pixel_x = 3;
pixel_y = 4
},
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_x = -4;
pixel_y = 7
},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 7
},
/obj/item/reagent_containers/dropper{
@@ -18484,14 +18484,14 @@
/area/station/science/xenobiology)
"fYD" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/ethanol{
+/obj/item/reagent_containers/cup/bottle/ethanol{
pixel_x = -4;
pixel_y = 4
},
-/obj/item/reagent_containers/glass/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 10
},
@@ -19345,11 +19345,11 @@
/turf/open/floor/iron,
/area/station/commons/dorms)
"gpF" = (
-/obj/item/reagent_containers/food/drinks/bottle/wine/unlabeled{
+/obj/item/reagent_containers/cup/glass/bottle/wine/unlabeled{
pixel_x = -5;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/bottle/wine/unlabeled,
+/obj/item/reagent_containers/cup/glass/bottle/wine/unlabeled,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
"gpJ" = (
@@ -20107,11 +20107,11 @@
"gFq" = (
/obj/effect/turf_decal/delivery,
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = -5;
pixel_y = 6
},
-/obj/item/reagent_containers/glass/bottle/formaldehyde{
+/obj/item/reagent_containers/cup/bottle/formaldehyde{
pixel_y = 2
},
/obj/effect/turf_decal/trimline/yellow/filled/line{
@@ -22740,7 +22740,7 @@
name = "Chemistry Side Shutters"
},
/obj/item/folder/white,
-/obj/item/reagent_containers/glass/bottle/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = 5;
pixel_y = -3
},
@@ -23181,7 +23181,7 @@
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
"hIb" = (
-/obj/item/reagent_containers/glass/bucket/wooden,
+/obj/item/reagent_containers/cup/bucket/wooden,
/turf/open/floor/wood,
/area/station/command/heads_quarters/captain/private)
"hIe" = (
@@ -27063,7 +27063,7 @@
/obj/structure/table,
/obj/item/crowbar,
/obj/item/wrench,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/plating,
/area/station/service/hydroponics/garden/abandoned)
"iXE" = (
@@ -27797,10 +27797,10 @@
/obj/structure/table,
/obj/effect/turf_decal/bot,
/obj/item/folder/white,
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_y = 5
},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_y = 5
},
/obj/item/reagent_containers/dropper{
@@ -28325,7 +28325,7 @@
/area/station/maintenance/port/upper)
"jsK" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/colocup{
+/obj/item/reagent_containers/cup/glass/colocup{
pixel_x = 5
},
/obj/item/cigbutt{
@@ -29014,7 +29014,7 @@
/turf/open/floor/plating,
/area/station/science/ordnance/freezerchamber)
"jFC" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/grass,
/area/station/service/hydroponics/garden/abandoned)
@@ -30575,10 +30575,10 @@
"kkj" = (
/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{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 3
},
/obj/item/reagent_containers/dropper,
@@ -31792,23 +31792,23 @@
dir = 1
},
/obj/effect/turf_decal/tile/bar,
-/obj/item/reagent_containers/glass/rag{
+/obj/item/reagent_containers/cup/rag{
pixel_x = 2;
pixel_y = 11
},
-/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/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -2;
pixel_y = 9
},
-/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/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -2;
pixel_y = 9
},
@@ -32838,7 +32838,7 @@
pixel_x = 4;
pixel_y = 11
},
-/obj/item/reagent_containers/food/drinks/flask/gold{
+/obj/item/reagent_containers/cup/glass/flask/gold{
pixel_x = -8
},
/obj/item/razor{
@@ -33603,8 +33603,8 @@
/area/station/maintenance/xenobio_disposals)
"lnD" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/epinephrine,
-/obj/item/reagent_containers/glass/bottle/multiver{
+/obj/item/reagent_containers/cup/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = 6
},
/obj/item/reagent_containers/syringe,
@@ -35616,7 +35616,7 @@
/obj/item/knife{
pixel_x = 6
},
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
pixel_y = 5
},
/obj/machinery/camera/directional/east{
@@ -35768,12 +35768,12 @@
/turf/open/floor/iron,
/area/station/maintenance/clown_chamber)
"lUq" = (
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
pixel_x = -5;
pixel_y = 10
},
/obj/machinery/light_switch/directional/south,
-/obj/item/reagent_containers/food/drinks/flask,
+/obj/item/reagent_containers/cup/glass/flask,
/obj/structure/table/wood/fancy/royalblue,
/turf/open/floor/carpet/royalblue,
/area/station/command/heads_quarters/hop)
@@ -39635,11 +39635,11 @@
default_raw_text = "This message is dedicated to the many people that contributed to the blueshift class voidcraft initiative and it's continued development, we sincerely thank you for your input and service to maintain and uphold NT's finest stations and vessels.Damian Blue - for being the lead ship architect and project manager.Viro (the axolotl not the department) - for being a key part of initial testing and bureaucratic management.Friday - emotional and motivational support, general input on various key issues, if you're still around here sometimes know that you meant a great deal to the project!Xeon Saber - engineering advise and general design input, greatly helped make the most important section of the ship slightly less hectic.Kobe Ivanov - didived ship production into 3 seperate decks making it more managable, general performance boosts.A retired felinid - various bluespace improvements regarding the flow of atmospheric effects in surrounding space.A goofball - helped test and fix up various issues to great extent, their input and help has been of great value and we cannot thank them enough for what they've done.And another thanks to everyone else who has not been directly listed, you know who you are!This has been centcom, over and out!";
name = "A warm thank you"
},
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{
pixel_x = 6;
pixel_y = 19
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -1;
pixel_y = 12
},
@@ -40562,7 +40562,7 @@
pixel_x = 4;
pixel_y = 4
},
-/obj/item/reagent_containers/glass/bottle/mutagen,
+/obj/item/reagent_containers/cup/bottle/mutagen,
/obj/item/reagent_containers/syringe,
/obj/item/storage/pill_bottle/mutadone{
pixel_x = -8;
@@ -43250,10 +43250,10 @@
"oDx" = (
/obj/structure/table/glass,
/obj/item/stack/sheet/mineral/plasma,
-/obj/item/reagent_containers/glass/bottle/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
/obj/item/burner{
pixel_x = -11
},
@@ -43544,7 +43544,7 @@
/obj/structure/sign/poster/contraband/busty_backdoor_xeno_babes_6{
pixel_x = 32
},
-/obj/item/reagent_containers/glass/beaker/jar{
+/obj/item/reagent_containers/cup/beaker/jar{
name = "Sticky jar"
},
/obj/item/toy/toy_xeno{
@@ -45604,7 +45604,7 @@
/area/station/science/lab)
"ptT" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/dropper,
/obj/effect/turf_decal/trimline/green/filled/line{
@@ -46662,11 +46662,11 @@
color = "#52B4E9";
name = "blue line"
},
-/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
},
@@ -46735,11 +46735,11 @@
"pNx" = (
/obj/effect/turf_decal/stripes,
/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
},
@@ -46781,8 +46781,8 @@
/obj/item/storage/box/syringes{
pixel_y = 9
},
-/obj/item/reagent_containers/glass/bottle/epinephrine,
-/obj/item/reagent_containers/glass/bottle/multiver{
+/obj/item/reagent_containers/cup/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = 6
},
/obj/item/reagent_containers/syringe,
@@ -47311,7 +47311,7 @@
/area/station/hallway/primary/upper)
"pZm" = (
/obj/structure/table/wood/fancy/blue,
-/obj/item/reagent_containers/food/drinks/trophy/gold_cup{
+/obj/item/reagent_containers/cup/glass/trophy/gold_cup{
name = "#1st prize for Nanotrasen's finest captain's office";
pixel_y = 4
},
@@ -49841,11 +49841,11 @@
pixel_x = -9;
pixel_y = 4
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -3;
pixel_y = 9
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 3;
pixel_y = 9
},
@@ -49892,7 +49892,7 @@
dir = 6
},
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/obj/item/reagent_containers/dropper,
/turf/open/floor/iron,
/area/station/medical/chemistry)
@@ -49918,18 +49918,18 @@
/area/station/science/ordnance)
"qTw" = (
/obj/structure/table/wood/fancy/cyan,
-/obj/item/reagent_containers/food/drinks/trophy{
+/obj/item/reagent_containers/cup/glass/trophy{
desc = "You did good in the worst way possible.";
name = "Redshield 1st prize";
pixel_x = 10;
pixel_y = 11
},
-/obj/item/reagent_containers/food/drinks/trophy/bronze_cup{
+/obj/item/reagent_containers/cup/glass/trophy/bronze_cup{
name = "Foam force security team competition 3rd place";
pixel_x = -9;
pixel_y = 11
},
-/obj/item/reagent_containers/food/drinks/trophy/silver_cup{
+/obj/item/reagent_containers/cup/glass/trophy/silver_cup{
name = "Head of shitcurity competition 2nd place";
pixel_y = 8
},
@@ -51112,22 +51112,22 @@
dir = 1
},
/obj/effect/turf_decal/tile/bar,
-/obj/item/reagent_containers/food/drinks/bottle/champagne{
+/obj/item/reagent_containers/cup/glass/bottle/champagne{
pixel_x = 6;
pixel_y = 25
},
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{
pixel_x = -6;
pixel_y = 21
},
-/obj/item/reagent_containers/food/drinks/bottle/absinthe/premium{
+/obj/item/reagent_containers/cup/glass/bottle/absinthe/premium{
pixel_y = 13
},
-/obj/item/reagent_containers/food/drinks/bottle/lizardwine{
+/obj/item/reagent_containers/cup/glass/bottle/lizardwine{
pixel_x = 7;
pixel_y = 10
},
-/obj/item/reagent_containers/food/drinks/bottle/goldschlager{
+/obj/item/reagent_containers/cup/glass/bottle/goldschlager{
pixel_x = -2;
pixel_y = 11
},
@@ -51598,7 +51598,7 @@
"rya" = (
/obj/structure/rack,
/obj/item/reagent_containers/blood/random,
-/obj/item/reagent_containers/food/drinks/bottle/vodka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
},
@@ -52588,7 +52588,7 @@
/area/station/common/pool)
"rQQ" = (
/obj/structure/table/wood/fancy/blue,
-/obj/item/reagent_containers/food/drinks/trophy/silver_cup{
+/obj/item/reagent_containers/cup/glass/trophy/silver_cup{
name = "#2nd prize for the Nanotrasen official comdom competition";
pixel_y = 6
},
@@ -54784,7 +54784,7 @@
/area/station/commons/dorms)
"sCj" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/dropper,
/obj/effect/turf_decal/trimline/green/filled/line{
@@ -55014,28 +55014,28 @@
/area/station/science/tele_sci)
"sFJ" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bowl{
+/obj/item/reagent_containers/cup/bowl{
pixel_y = 4
},
-/obj/item/reagent_containers/glass/bowl{
+/obj/item/reagent_containers/cup/bowl{
pixel_y = 4
},
-/obj/item/reagent_containers/glass/bowl{
+/obj/item/reagent_containers/cup/bowl{
pixel_y = 4
},
-/obj/item/reagent_containers/glass/bowl{
+/obj/item/reagent_containers/cup/bowl{
pixel_y = 4
},
-/obj/item/reagent_containers/glass/bowl{
+/obj/item/reagent_containers/cup/bowl{
pixel_y = 4
},
-/obj/item/reagent_containers/glass/bowl{
+/obj/item/reagent_containers/cup/bowl{
pixel_y = 4
},
-/obj/item/reagent_containers/glass/bowl{
+/obj/item/reagent_containers/cup/bowl{
pixel_y = 4
},
-/obj/item/reagent_containers/glass/bowl{
+/obj/item/reagent_containers/cup/bowl{
pixel_y = 4
},
/obj/item/food/dough{
@@ -55071,10 +55071,10 @@
/obj/item/food/dough{
pixel_y = 5
},
-/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/item/radio/intercom/directional/east,
@@ -55358,7 +55358,7 @@
/area/space/nearstation)
"sLS" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
pixel_y = 2
},
/obj/effect/decal/cleanable/dirt,
@@ -56025,11 +56025,11 @@
/area/station/command/bridge)
"sWQ" = (
/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
},
/turf/open/floor/iron,
@@ -56549,7 +56549,7 @@
pixel_x = -15;
pixel_y = 6
},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_y = 4
},
/obj/item/reagent_containers/dropper{
@@ -58519,7 +58519,7 @@
/area/station/maintenance/department/science)
"tRM" = (
/obj/effect/spawner/random/trash/mess,
-/obj/item/reagent_containers/glass/bucket/wooden,
+/obj/item/reagent_containers/cup/bucket/wooden,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
"tRP" = (
@@ -59077,7 +59077,7 @@
/area/station/medical/treatment_center)
"ubw" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
pixel_x = -5;
pixel_y = 2
},
@@ -59368,12 +59368,12 @@
/area/station/maintenance/port/upper)
"uhq" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug/coco{
+/obj/item/reagent_containers/cup/glass/mug/coco{
desc = "Still hot!";
pixel_x = -4;
pixel_y = 4
},
-/obj/item/reagent_containers/food/drinks/shaker{
+/obj/item/reagent_containers/cup/glass/shaker{
pixel_x = 7;
pixel_y = 10
},
@@ -63742,7 +63742,7 @@
pixel_x = 2;
pixel_y = 2
},
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/obj/item/reagent_containers/dropper,
/obj/effect/turf_decal/tile/yellow{
dir = 1
@@ -65692,7 +65692,7 @@
name = "anime katana"
},
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy{
+/obj/item/reagent_containers/cup/soda_cans/monkey_energy{
pixel_x = 13
},
/obj/effect/turf_decal/siding/wood,
@@ -65876,7 +65876,7 @@
/area/station/ai_monitored/command/storage/eva)
"wvA" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
pixel_x = 10;
pixel_y = 13
},
@@ -65888,11 +65888,11 @@
pixel_x = -5;
pixel_y = 7
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = 10;
pixel_y = 5
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = 6;
pixel_y = 3
},
@@ -66077,7 +66077,7 @@
pixel_x = 2;
pixel_y = 2
},
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/obj/item/reagent_containers/dropper,
/obj/effect/turf_decal/tile/yellow,
/obj/effect/turf_decal/tile/yellow{
@@ -66515,7 +66515,7 @@
/area/station/medical/medbay/lobby)
"wIB" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = -5;
pixel_y = 6
},
@@ -66523,11 +66523,11 @@
dir = 9
},
/obj/machinery/status_display/ai/directional/west,
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
pixel_x = 8;
pixel_y = 5
},
-/obj/item/reagent_containers/glass/bottle/formaldehyde{
+/obj/item/reagent_containers/cup/bottle/formaldehyde{
pixel_y = 2
},
/obj/item/reagent_containers/syringe{
@@ -67357,14 +67357,14 @@
/area/station/science/tele_sci)
"wWT" = (
/obj/structure/table,
-/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/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/flour,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
+/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/food/cheese/royal,
/obj/machinery/light/directional/north,
/turf/open/floor/iron/cafeteria,
@@ -67748,7 +67748,7 @@
/area/station/science/research)
"xfm" = (
/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/iron,
/area/station/maintenance/fore/upper)
"xfo" = (
@@ -68425,18 +68425,18 @@
/obj/item/storage/box/ingredients/fruity,
/obj/item/storage/box/ingredients/fiesta,
/obj/item/storage/box/ingredients/american,
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour{
list_reagents = list(/datum/reagent/consumable/flour=600);
name = "Premium All-Purpose Flour (16KG)";
volume = 600
},
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/enzyme{
list_reagents = list(/datum/reagent/consumable/enzyme=500);
name = "universe-sized universal enyzyme";
volume = 500
},
-/obj/item/reagent_containers/food/condiment/rice{
+/obj/item/reagent_containers/condiment/rice{
list_reagents = list(/datum/reagent/consumable/rice=150);
name = "Basmati Rice Sack (4KG)";
volume = 150
@@ -69571,10 +69571,10 @@
pixel_x = 4;
pixel_y = 4
},
-/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/carpet/green,
@@ -69727,7 +69727,7 @@
"xNl" = (
/obj/structure/rack,
/obj/effect/turf_decal/bot,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey,
/turf/open/floor/plating,
/area/station/maintenance/department/science)
"xNt" = (
@@ -70693,7 +70693,7 @@
pixel_x = -5;
pixel_y = 9
},
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
dir = 5
},
diff --git a/_maps/map_files/CTF/downtown.dmm b/_maps/map_files/CTF/downtown.dmm
index a89d19bc078..f6086ee9748 100644
--- a/_maps/map_files/CTF/downtown.dmm
+++ b/_maps/map_files/CTF/downtown.dmm
@@ -58,7 +58,7 @@
dir = 1
},
/obj/effect/turf_decal/tile/bar,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = 4;
pixel_y = 5
},
@@ -446,11 +446,11 @@
/turf/open/floor/iron,
/area/centcom/ctf)
"iv" = (
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -9;
pixel_y = -4
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
/obj/structure/table/wood{
resistance_flags = 64
},
@@ -941,7 +941,7 @@
dir = 1
},
/obj/effect/turf_decal/tile/bar,
-/obj/item/reagent_containers/food/drinks/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/obj/structure/table/wood{
resistance_flags = 64
},
@@ -1031,7 +1031,7 @@
dir = 1
},
/obj/effect/turf_decal/tile/bar,
-/obj/item/reagent_containers/food/drinks/bottle/cognac,
+/obj/item/reagent_containers/cup/glass/bottle/cognac,
/obj/structure/table/reinforced/ctf,
/turf/open/floor/iron,
/area/centcom/ctf)
@@ -1467,7 +1467,7 @@
dir = 1
},
/obj/effect/turf_decal/tile/bar,
-/obj/item/reagent_containers/food/drinks/bottle/absinthe,
+/obj/item/reagent_containers/cup/glass/bottle/absinthe,
/obj/structure/table/reinforced/ctf,
/turf/open/floor/iron,
/area/centcom/ctf)
@@ -1483,7 +1483,7 @@
dir = 1
},
/obj/effect/turf_decal/tile/bar,
-/obj/item/reagent_containers/food/drinks/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/obj/structure/table/reinforced/ctf,
/turf/open/floor/iron,
/area/centcom/ctf)
@@ -1528,7 +1528,7 @@
/turf/open/floor/iron/dark,
/area/centcom/ctf)
"EJ" = (
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
/obj/structure/table/wood{
resistance_flags = 64
},
@@ -2100,7 +2100,7 @@
/turf/open/floor/iron,
/area/centcom/ctf)
"Rj" = (
-/obj/item/reagent_containers/food/condiment/saltshaker,
+/obj/item/reagent_containers/condiment/saltshaker,
/obj/effect/decal/cleanable/dirt,
/obj/structure/fluff/bus/passable{
resistance_flags = 64
@@ -2158,14 +2158,14 @@
dir = 1
},
/obj/effect/turf_decal/tile/bar,
-/obj/item/reagent_containers/food/drinks/drinkingglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass,
/obj/structure/table/wood{
resistance_flags = 64
},
/turf/open/floor/iron,
/area/centcom/ctf)
"RX" = (
-/obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola,
+/obj/item/reagent_containers/cup/glass/drinkingglass/filled/cola,
/obj/structure/table/wood{
resistance_flags = 64
},
@@ -2252,7 +2252,7 @@
dir = 1
},
/obj/effect/turf_decal/tile/bar,
-/obj/item/reagent_containers/food/drinks/bottle/gin,
+/obj/item/reagent_containers/cup/glass/bottle/gin,
/obj/structure/table/reinforced/ctf,
/turf/open/floor/iron,
/area/centcom/ctf)
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index cbeffa94d4a..584fab9f4c2 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -774,7 +774,7 @@
/area/space)
"aig" = (
/obj/structure/table/wood/poker,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/obj/item/reagent_containers/dropper,
/turf/open/floor/plating,
/area/station/service/abandoned_gambling_den)
@@ -4718,7 +4718,7 @@
"bgN" = (
/obj/structure/table/glass,
/obj/item/storage/medkit/regular,
-/obj/item/reagent_containers/glass/bottle/multiver,
+/obj/item/reagent_containers/cup/bottle/multiver,
/obj/item/reagent_containers/syringe,
/obj/effect/turf_decal/tile/red/anticorner/contrasted{
dir = 8
@@ -4872,7 +4872,7 @@
/turf/open/floor/plating,
/area/station/cargo/drone_bay)
"bik" = (
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
/obj/item/reagent_containers/syringe/antiviral,
/obj/item/reagent_containers/dropper,
/obj/structure/sign/warning/biohazard/directional/west,
@@ -8459,7 +8459,7 @@
/obj/item/wirecutters,
/obj/effect/turf_decal/box,
/obj/machinery/firealarm/directional/north,
-/obj/item/reagent_containers/glass/watering_can,
+/obj/item/reagent_containers/cup/watering_can,
/turf/open/floor/iron,
/area/station/service/hydroponics)
"bVI" = (
@@ -9704,7 +9704,7 @@
"cjD" = (
/obj/structure/janitorialcart,
/obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/radio/intercom/directional/east,
/obj/effect/turf_decal/siding/purple/corner{
dir = 4
@@ -10647,7 +10647,7 @@
pixel_x = 6;
pixel_y = 6
},
-/obj/item/reagent_containers/food/drinks/shaker{
+/obj/item/reagent_containers/cup/glass/shaker{
pixel_x = -6
},
/obj/machinery/requests_console/directional/east{
@@ -10655,7 +10655,7 @@
departmentType = 2;
name = "Bar Requests Console"
},
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
/turf/open/floor/iron/checker{
dir = 1
},
@@ -11871,7 +11871,7 @@
pixel_x = 14;
pixel_y = 4
},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = -8;
pixel_y = 12
},
@@ -14058,7 +14058,7 @@
/obj/effect/turf_decal/trimline/green/end{
dir = 1
},
-/obj/item/reagent_containers/glass/watering_can,
+/obj/item/reagent_containers/cup/watering_can,
/obj/effect/turf_decal/trimline/green/mid_joiner{
dir = 8
},
@@ -14159,19 +14159,19 @@
/turf/open/floor/iron/dark,
/area/station/science/explab)
"doF" = (
-/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
},
-/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
},
@@ -16820,7 +16820,7 @@
},
/obj/item/book/manual/wiki/cooking_to_serve_man,
/obj/item/knife/kitchen,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
/obj/structure/table,
/turf/open/floor/iron/cafeteria,
/area/station/service/kitchen)
@@ -16900,7 +16900,7 @@
/turf/open/floor/iron/white,
/area/station/medical/virology)
"dZq" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/plating,
/area/station/security/prison/safe)
@@ -18259,7 +18259,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko{
+/obj/item/reagent_containers/cup/soda_cans/thirteenloko{
pixel_x = -3;
pixel_y = 3
},
@@ -19648,15 +19648,15 @@
/area/station/maintenance/department/science)
"eJJ" = (
/obj/structure/closet/crate,
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
/obj/effect/spawner/random/contraband/prison,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
/obj/item/kitchen/fork/plastic,
/obj/item/kitchen/fork/plastic,
/obj/item/kitchen/fork/plastic,
@@ -21585,7 +21585,7 @@
/obj/effect/spawner/random/trash/box,
/obj/effect/spawner/random/food_or_drink/seed,
/obj/effect/spawner/random/trash/botanical_waste,
-/obj/item/reagent_containers/food/drinks/waterbottle/empty,
+/obj/item/reagent_containers/cup/glass/waterbottle/empty,
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -21705,7 +21705,7 @@
},
/obj/item/reagent_containers/blood/random,
/obj/effect/turf_decal/bot,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
layer = 5;
pixel_x = -6;
pixel_y = 8
@@ -22335,7 +22335,7 @@
/area/station/maintenance/fore)
"fsn" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/flask/gold,
+/obj/item/reagent_containers/cup/glass/flask/gold,
/obj/item/razor,
/turf/open/floor/iron/grimy,
/area/station/command/heads_quarters/captain/private)
@@ -24488,7 +24488,7 @@
/obj/structure/rack,
/obj/item/storage/bag/plants/portaseeder,
/obj/item/cultivator,
-/obj/item/reagent_containers/glass/watering_can,
+/obj/item/reagent_containers/cup/watering_can,
/obj/item/plant_analyzer,
/obj/structure/sign/poster/contraband/kudzu{
pixel_y = -32
@@ -27234,7 +27234,7 @@
/turf/open/floor/iron,
/area/station/maintenance/department/science)
"gCN" = (
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
/obj/item/reagent_containers/syringe/antiviral,
/obj/item/reagent_containers/dropper,
/obj/structure/sign/warning/biohazard/directional/east,
@@ -27289,13 +27289,13 @@
/turf/open/floor/iron,
/area/station/engineering/atmos)
"gDw" = (
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
layer = 5
},
/obj/item/kitchen/rollingpin,
/obj/structure/table,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 5
},
/turf/open/floor/iron/cafeteria,
@@ -30764,10 +30764,10 @@
/area/station/command/heads_quarters/ce)
"hyt" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_x = -2
},
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_x = 2
},
/obj/machinery/power/apc/auto_name/directional/west,
@@ -33133,7 +33133,7 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/structure/table/reinforced,
/obj/item/clipboard,
-/obj/item/reagent_containers/food/drinks/mug/tea{
+/obj/item/reagent_containers/cup/glass/mug/tea{
pixel_x = -7;
pixel_y = 8
},
@@ -38322,8 +38322,8 @@
"jqp" = (
/obj/structure/table/reinforced,
/obj/machinery/airalarm/directional/west,
-/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/siding/purple{
dir = 4
@@ -39882,8 +39882,8 @@
/area/station/engineering/atmos)
"jIH" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/glass/bottle/toxin{
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/bottle/toxin{
pixel_x = 4;
pixel_y = 2
},
@@ -40000,15 +40000,15 @@
/area/station/maintenance/department/chapel)
"jKt" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_x = -4;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_x = 4;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
@@ -41358,7 +41358,7 @@
/area/station/ai_monitored/turret_protected/aisat_interior)
"kaq" = (
/obj/effect/mapping_helpers/broken_floor,
-/obj/item/reagent_containers/food/drinks/bottle/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";
@@ -41366,11 +41366,11 @@
pixel_y = 5
},
/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 = -6;
pixel_y = 3
},
@@ -42444,11 +42444,11 @@
/obj/item/shovel/spade,
/obj/item/hatchet,
/obj/item/cultivator,
-/obj/item/reagent_containers/glass/bottle/nutrient/rh{
+/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/machinery/requests_console/directional/east{
department = "Garden";
name = "Garden Requests Console"
@@ -43063,8 +43063,8 @@
"kwt" = (
/obj/machinery/defibrillator_mount/directional/north,
/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/item/reagent_containers/glass/bottle/epinephrine,
-/obj/item/reagent_containers/glass/bottle/multiver{
+/obj/item/reagent_containers/cup/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = 6
},
/obj/item/reagent_containers/syringe,
@@ -45654,7 +45654,7 @@
pixel_x = 3;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee{
pixel_x = -4;
pixel_y = 2
},
@@ -48342,15 +48342,15 @@
/area/station/service/library)
"lNe" = (
/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,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
/turf/open/floor/iron,
/area/station/service/kitchen/abandoned)
"lNg" = (
@@ -49929,10 +49929,10 @@
dir = 4
},
/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,
@@ -50480,18 +50480,18 @@
"msc" = (
/obj/structure/table/reinforced,
/obj/machinery/status_display/evac/directional/north,
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
pixel_x = 7;
pixel_y = 7
},
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
pixel_x = -7;
pixel_y = 7
},
-/obj/item/reagent_containers/glass/bottle/chloralhydrate{
+/obj/item/reagent_containers/cup/bottle/chloralhydrate{
pixel_x = -7
},
-/obj/item/reagent_containers/glass/bottle/facid{
+/obj/item/reagent_containers/cup/bottle/facid{
pixel_x = 7
},
/obj/item/storage/backpack/duffelbag/sec/surgery{
@@ -51372,7 +51372,7 @@
"mDN" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee{
pixel_x = -3;
pixel_y = 4
},
@@ -54242,8 +54242,8 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/siding/yellow,
/obj/structure/table/glass,
-/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 = 8;
pixel_y = 2
},
@@ -54385,9 +54385,9 @@
/obj/machinery/power/apc/auto_name/directional/south,
/obj/item/storage/fancy/egg_box,
/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/soymilk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/soymilk,
/turf/open/floor/iron/dark,
/area/station/service/kitchen/coldroom)
"nsf" = (
@@ -55212,7 +55212,7 @@
},
/obj/effect/turf_decal/bot,
/obj/structure/closet/secure_closet/freezer/kitchen,
-/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
/turf/open/floor/iron/dark,
/area/station/service/kitchen/coldroom)
"nCS" = (
@@ -55291,10 +55291,10 @@
"nDL" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
-/obj/item/reagent_containers/glass/bottle/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
/obj/item/reagent_containers/syringe,
/obj/machinery/door/poddoor/shutters/window/preopen{
dir = 1;
@@ -55379,7 +55379,7 @@
/area/station/engineering/storage/tech)
"nEi" = (
/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
dir = 4
},
@@ -55495,10 +55495,10 @@
"nGd" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
-/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/poddoor/shutters/preopen{
@@ -56344,7 +56344,7 @@
/obj/item/pen{
pixel_x = -7
},
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass{
pixel_x = 6;
pixel_y = -4
},
@@ -64588,11 +64588,11 @@
/area/station/command/heads_quarters/qm)
"pYk" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = 5;
pixel_y = 2
},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -1;
pixel_y = 2
},
@@ -65185,7 +65185,7 @@
/obj/effect/turf_decal/delivery/white{
color = "#52B4E9"
},
-/obj/item/reagent_containers/glass/watering_can,
+/obj/item/reagent_containers/cup/watering_can,
/turf/open/floor/iron/dark/textured,
/area/station/service/hydroponics)
"qfo" = (
@@ -69824,7 +69824,7 @@
/area/station/engineering/transit_tube)
"rsY" = (
/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"
},
@@ -75207,7 +75207,7 @@
req_access = list("kitchen")
},
/obj/item/storage/bag/plants,
-/obj/item/reagent_containers/glass/watering_can,
+/obj/item/reagent_containers/cup/watering_can,
/turf/open/floor/iron,
/area/station/service/kitchen)
"sLK" = (
@@ -75643,7 +75643,7 @@
/area/station/cargo/drone_bay)
"sQV" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/obj/item/reagent_containers/dropper,
/turf/open/floor/plating,
/area/station/medical/abandoned)
@@ -78157,7 +78157,7 @@
/obj/effect/turf_decal/tile/red/opposingcorners{
dir = 1
},
-/obj/item/reagent_containers/glass/bowl{
+/obj/item/reagent_containers/cup/bowl{
pixel_y = 3
},
/obj/machinery/light_switch/directional/north{
@@ -80150,7 +80150,7 @@
/obj/effect/turf_decal/delivery/white{
color = "#52B4E9"
},
-/obj/item/reagent_containers/glass/watering_can,
+/obj/item/reagent_containers/cup/watering_can,
/turf/open/floor/iron/dark/textured,
/area/station/service/hydroponics)
"tXS" = (
@@ -82307,7 +82307,7 @@
/obj/structure/disposalpipe/segment,
/obj/structure/table/wood,
/obj/item/flashlight/lamp,
-/obj/item/reagent_containers/food/drinks/flask/det,
+/obj/item/reagent_containers/cup/glass/flask/det,
/turf/open/floor/carpet,
/area/station/security/detectives_office)
"uAA" = (
@@ -82821,10 +82821,10 @@
dir = 4
},
/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,
@@ -87266,7 +87266,7 @@
name = "scissors";
pixel_y = 1
},
-/obj/item/reagent_containers/glass/rag{
+/obj/item/reagent_containers/cup/rag{
pixel_y = 4
},
/obj/machinery/light/warm/directional/south,
@@ -87344,11 +87344,11 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/directional/south,
/obj/structure/table_frame,
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_x = 8;
pixel_y = 12
},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = -3;
pixel_y = 7
},
@@ -89675,7 +89675,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/item/clothing/suit/apron/chef,
/obj/item/clothing/head/chefhat,
-/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
/obj/effect/turf_decal/bot,
/obj/structure/sign/poster/contraband/random/directional/south,
/obj/item/kitchen/rollingpin{
@@ -89962,7 +89962,7 @@
/area/station/security/detectives_office)
"wqb" = (
/obj/machinery/biogenerator,
-/obj/item/reagent_containers/glass/watering_can,
+/obj/item/reagent_containers/cup/watering_can,
/turf/open/floor/iron/dark,
/area/station/service/hydroponics/garden)
"wqn" = (
@@ -90228,7 +90228,7 @@
/area/station/science/server)
"wsW" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine,
/obj/item/reagent_containers/syringe,
/obj/effect/turf_decal/tile/red/anticorner/contrasted{
dir = 4
@@ -91493,7 +91493,7 @@
/obj/structure/window,
/obj/structure/sink/directional/south,
/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/watering_can,
+/obj/item/reagent_containers/cup/watering_can,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/cobweb,
/obj/structure/cable,
@@ -91679,10 +91679,10 @@
dir = 4
},
/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
},
/turf/open/floor/iron/cafeteria,
@@ -93341,14 +93341,14 @@
"xhl" = (
/obj/structure/table,
/obj/item/book/manual/chef_recipes,
-/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_x = -8;
pixel_y = 5
},
-/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/item/reagent_containers/condiment/enzyme,
/obj/item/storage/fancy/egg_box,
/turf/open/floor/iron/cafeteria,
/area/station/security/prison/mess)
@@ -93541,8 +93541,8 @@
/area/station/hallway/primary/fore)
"xjH" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/epinephrine,
-/obj/item/reagent_containers/glass/bottle/multiver{
+/obj/item/reagent_containers/cup/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = 6
},
/obj/item/reagent_containers/dropper,
@@ -94011,11 +94011,11 @@
/area/station/service/barber)
"xpL" = (
/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,
@@ -94363,7 +94363,7 @@
/area/station/service/theater)
"xto" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine,
/obj/item/reagent_containers/syringe,
/obj/effect/turf_decal/tile/red/anticorner/contrasted{
dir = 1
@@ -94453,11 +94453,11 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/siding/yellow,
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -4;
pixel_y = 1
},
-/obj/item/reagent_containers/glass/bottle/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = 7;
pixel_y = 1
},
@@ -96925,7 +96925,7 @@
/area/station/commons/toilet/locker)
"xZl" = (
/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/drinks/bottle/holywater,
+/obj/item/reagent_containers/cup/glass/bottle/holywater,
/turf/open/floor/iron/grimy,
/area/station/service/chapel/office)
"xZz" = (
diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
index 9f3cfa2b6a1..92efc22de27 100644
--- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm
+++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
@@ -230,6 +230,15 @@
/obj/machinery/air_sensor/nitrogen_tank,
/turf/open/floor/engine/n2,
/area/station/engineering/atmos)
+"afq" = (
+/obj/structure/sink/directional/west,
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/mop,
+/obj/item/reagent_containers/cup/bottle/ammonia,
+/obj/machinery/airalarm/directional/south,
+/obj/effect/spawner/random/contraband/prison,
+/turf/open/floor/plating,
+/area/station/security/prison/safe)
"afs" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
@@ -476,24 +485,6 @@
/obj/effect/turf_decal/weather/snow/corner,
/turf/open/floor/plating/snowed/icemoon,
/area/icemoon/underground/explored)
-"ajA" = (
-/obj/structure/rack,
-/obj/item/reagent_containers/glass/bottle/carbon{
- pixel_x = 7;
- pixel_y = 3
- },
-/obj/item/reagent_containers/glass/bottle/ethanol{
- pixel_x = -5;
- pixel_y = 3
- },
-/obj/item/reagent_containers/glass/bottle/chlorine{
- pixel_x = 1
- },
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/iron/dark/textured_edge{
- dir = 8
- },
-/area/station/medical/medbay/central)
"ajF" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -732,6 +723,19 @@
},
/turf/open/floor/plating/icemoon,
/area/station/science/ordnance/bomb)
+"anS" = (
+/obj/machinery/shower/directional/north,
+/obj/structure/window/reinforced/tinted{
+ dir = 8
+ },
+/obj/structure/window/reinforced/tinted{
+ dir = 4
+ },
+/obj/machinery/door/window/left/directional/north{
+ name = "Shower Cubicle"
+ },
+/turf/open/floor/iron/freezer,
+/area/station/maintenance/starboard/fore)
"anY" = (
/obj/structure/sign/warning/no_smoking/directional/south,
/obj/machinery/light/directional/south,
@@ -916,6 +920,12 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
/area/mine/laborcamp)
+"aqf" = (
+/obj/structure/cable,
+/obj/item/reagent_containers/cup/glass/bottle/hooch,
+/obj/machinery/power/apc/five_k/directional/north,
+/turf/open/floor/plating,
+/area/mine/storage)
"aqp" = (
/obj/effect/turf_decal/trimline/green/filled/warning{
dir = 8
@@ -2557,24 +2567,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/science/ordnance)
-"aQD" = (
-/obj/item/reagent_containers/spray/plantbgone,
-/obj/item/reagent_containers/spray/pestspray{
- pixel_x = 3;
- pixel_y = 4
- },
-/obj/item/reagent_containers/glass/bottle/nutrient/ez,
-/obj/item/reagent_containers/glass/bottle/nutrient/rh{
- pixel_x = 2;
- pixel_y = 1
- },
-/obj/structure/table/glass,
-/obj/machinery/light/directional/east,
-/obj/effect/turf_decal/tile/green/anticorner/contrasted{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/service/hydroponics/garden)
"aQF" = (
/obj/docking_port/stationary{
dir = 8;
@@ -3331,6 +3323,17 @@
},
/turf/open/floor/plating,
/area/station/maintenance/department/medical/morgue)
+"bbL" = (
+/obj/structure/table,
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -3;
+ pixel_y = 5
+ },
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = 3
+ },
+/turf/open/floor/iron,
+/area/mine/laborcamp)
"bbP" = (
/obj/machinery/light/small/directional/south,
/obj/effect/turf_decal/tile/yellow,
@@ -3862,22 +3865,6 @@
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron/cafeteria,
/area/station/security/prison/work)
-"bkm" = (
-/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/large{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/reagent_containers/dropper,
-/obj/item/reagent_containers/dropper{
- pixel_x = -4;
- pixel_y = 4
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/science/xenobiology)
"bkq" = (
/obj/machinery/door/window/left/directional/east{
dir = 8;
@@ -4072,6 +4059,22 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
+"bnn" = (
+/obj/structure/table/wood,
+/obj/item/radio{
+ desc = "An old handheld radio. You could use it, if you really wanted to.";
+ icon_state = "radio";
+ name = "old radio";
+ pixel_y = 15
+ },
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = 3
+ },
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -3
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"bnp" = (
/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{
dir = 4
@@ -4299,27 +4302,6 @@
/obj/machinery/airalarm/directional/west,
/turf/open/floor/circuit,
/area/station/ai_monitored/turret_protected/aisat/hallway)
-"bqE" = (
-/obj/structure/table/wood,
-/obj/item/storage/box/matches,
-/obj/item/toy/cards/deck{
- pixel_y = 4
- },
-/obj/item/reagent_containers/food/drinks/drinkingglass{
- pixel_x = 14;
- pixel_y = 12
- },
-/obj/item/reagent_containers/food/drinks/drinkingglass{
- pixel_x = -18;
- pixel_y = 10
- },
-/obj/item/reagent_containers/food/drinks/drinkingglass{
- pixel_x = -10;
- pixel_y = 2
- },
-/obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/wood,
-/area/station/maintenance/fore)
"bqF" = (
/obj/structure/chair{
dir = 4
@@ -4492,6 +4474,22 @@
},
/turf/open/floor/iron,
/area/station/security/prison/mess)
+"btc" = (
+/obj/structure/table/glass,
+/obj/item/reagent_containers/cup/beaker/large{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/dropper,
+/obj/item/reagent_containers/dropper{
+ pixel_x = -4;
+ pixel_y = 4
+ },
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/science/xenobiology)
"btg" = (
/obj/machinery/door/airlock/maintenance{
name = "Atmospherics Maintenance"
@@ -4942,6 +4940,38 @@
/obj/machinery/firealarm/directional/west,
/turf/open/floor/carpet,
/area/station/security/prison/rec)
+"bAA" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/camera{
+ c_tag = "Chemistry Lab East";
+ dir = 6;
+ network = list("ss13","medbay")
+ },
+/obj/structure/table/reinforced,
+/obj/machinery/reagentgrinder{
+ pixel_x = -1;
+ pixel_y = 4
+ },
+/obj/item/reagent_containers/cup/beaker/large{
+ pixel_x = 3;
+ pixel_y = -8
+ },
+/obj/item/reagent_containers/cup/beaker/large{
+ pixel_x = -3;
+ pixel_y = -8
+ },
+/obj/item/stack/sheet/mineral/plasma{
+ pixel_y = -6
+ },
+/obj/item/reagent_containers/dropper{
+ pixel_y = -7
+ },
+/turf/open/floor/iron/dark/textured_half{
+ dir = 1
+ },
+/area/station/medical/chemistry)
"bAF" = (
/turf/open/floor/iron/chapel{
dir = 1
@@ -6347,6 +6377,20 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
+"bTj" = (
+/obj/structure/table/wood,
+/obj/item/book/granter/action/spell/smoke/lesser{
+ name = "mysterious old book of cloud-chasing"
+ },
+/obj/item/reagent_containers/cup/glass/bottle/holywater{
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/obj/item/nullrod{
+ pixel_x = 4
+ },
+/turf/open/floor/cult,
+/area/station/service/chapel/office)
"bTl" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -6820,30 +6864,6 @@
"bZQ" = (
/turf/closed/wall/r_wall,
/area/station/hallway/primary/starboard)
-"bZS" = (
-/obj/structure/table,
-/obj/item/storage/box/beakers{
- pixel_x = 2;
- pixel_y = 2
- },
-/obj/item/storage/box/syringes,
-/obj/item/reagent_containers/glass/bottle/morphine{
- pixel_x = 8;
- pixel_y = -3
- },
-/obj/item/reagent_containers/glass/bottle/epinephrine{
- pixel_x = 7;
- pixel_y = -3
- },
-/obj/item/reagent_containers/syringe{
- pixel_x = 6;
- pixel_y = -3
- },
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 10
- },
-/turf/open/floor/iron/dark,
-/area/station/medical/storage)
"bZV" = (
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable,
@@ -6969,6 +6989,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
+"cbu" = (
+/obj/machinery/recharge_station,
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/iron/freezer,
+/area/station/commons/toilet)
"cbF" = (
/obj/machinery/door/firedoor/heavy,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -7113,6 +7138,19 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron,
/area/station/commons/dorms)
+"cdf" = (
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 9
+ },
+/obj/structure/table,
+/obj/item/reagent_containers/cup/beaker,
+/obj/item/reagent_containers/syringe,
+/obj/item/reagent_containers/dropper,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/medical/virology)
"cdl" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
@@ -8494,6 +8532,16 @@
},
/turf/open/floor/plating/snowed/coldroom,
/area/station/service/kitchen/coldroom)
+"czp" = (
+/obj/structure/window/reinforced/tinted/frosted{
+ dir = 4
+ },
+/obj/structure/rack,
+/obj/item/stack/ducts/fifty,
+/obj/item/storage/box/swab,
+/obj/effect/spawner/random/contraband/permabrig_gear,
+/turf/open/floor/iron/grimy,
+/area/station/security/prison/work)
"czq" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
@@ -9186,17 +9234,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/commons/locker)
-"cIA" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_x = -3;
- pixel_y = 5
- },
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_x = 3
- },
-/turf/open/floor/iron,
-/area/mine/laborcamp)
"cIK" = (
/obj/structure/table/wood,
/obj/item/pai_card,
@@ -9314,10 +9351,57 @@
/obj/structure/sign/poster/random/directional/south,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"cKP" = (
+/obj/effect/turf_decal/tile/blue/half{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/green/half{
+ dir = 8
+ },
+/obj/structure/reagent_dispensers/watertank/high,
+/obj/effect/turf_decal/stripes/line,
+/obj/item/reagent_containers/cup/watering_can,
+/turf/open/floor/iron/half{
+ dir = 1
+ },
+/area/station/service/hydroponics)
+"cKQ" = (
+/obj/structure/table/glass,
+/obj/machinery/light/directional/west,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/multiver{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/syringe,
+/obj/machinery/defibrillator_mount/directional/north,
+/obj/item/radio/intercom/directional/west,
+/obj/effect/turf_decal/tile/blue/full,
+/turf/open/floor/iron/large,
+/area/station/medical/treatment_center)
"cKW" = (
/obj/effect/decal/cleanable/dirt,
/turf/closed/wall/r_wall,
/area/station/science/ordnance/testlab)
+"cKY" = (
+/obj/structure/table/glass,
+/obj/item/stack/medical/gauze{
+ pixel_x = -2;
+ pixel_y = 8
+ },
+/obj/item/stack/medical/mesh{
+ pixel_x = 6;
+ pixel_y = 5
+ },
+/obj/item/stack/medical/suture,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/multiver{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/syringe,
+/obj/machinery/defibrillator_mount/directional/east,
+/obj/effect/turf_decal/tile/blue/full,
+/turf/open/floor/iron/large,
+/area/station/medical/treatment_center)
"cLo" = (
/obj/machinery/recharge_station,
/turf/open/floor/iron,
@@ -9676,18 +9760,6 @@
dir = 1
},
/area/station/security/office)
-"cPk" = (
-/obj/structure/table/glass,
-/obj/item/cultivator,
-/obj/item/hatchet,
-/obj/item/crowbar,
-/obj/item/plant_analyzer,
-/obj/item/reagent_containers/glass/watering_can,
-/obj/effect/turf_decal/tile/green/half/contrasted{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/service/hydroponics/garden)
"cPp" = (
/obj/item/stack/cable_coil{
amount = 5
@@ -10152,6 +10224,17 @@
dir = 1
},
/area/station/security/prison/garden)
+"cXz" = (
+/obj/effect/turf_decal/tile/red/full,
+/obj/structure/table,
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -3
+ },
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = 3
+ },
+/turf/open/floor/iron/large,
+/area/station/service/kitchen/diner)
"cXV" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/trimline/dark_red/filled/line{
@@ -10785,6 +10868,15 @@
"dhq" = (
/turf/closed/mineral/random/labormineral/ice,
/area/icemoon/surface/outdoors/labor_camp)
+"dht" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/glass/mug/coco{
+ desc = "Still hot!";
+ pixel_x = -4;
+ pixel_y = 4
+ },
+/turf/open/floor/wood,
+/area/station/maintenance/space_hut/cabin)
"dhJ" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -11391,15 +11483,6 @@
/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/central/greater)
-"dqb" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug/coco{
- desc = "Still hot!";
- pixel_x = -4;
- pixel_y = 4
- },
-/turf/open/floor/wood,
-/area/station/maintenance/space_hut/cabin)
"dqd" = (
/obj/machinery/iv_drip,
/obj/structure/mirror/directional/north{
@@ -12160,16 +12243,26 @@
/turf/open/floor/iron/white,
/area/station/medical/pharmacy)
"dCq" = (
-/obj/machinery/shower/directional/north,
-/obj/structure/window/reinforced/tinted{
- dir = 8
+/obj/machinery/camera/directional/north{
+ c_tag = "Robotics Lab";
+ network = list("ss13","rd")
},
-/obj/machinery/door/window/left/directional/north{
- name = "Shower Cubicle"
+/obj/structure/table,
+/obj/item/book/manual/wiki/robotics_cyborgs{
+ pixel_x = 2;
+ pixel_y = 5
},
-/obj/item/soap/nanotrasen,
-/turf/open/floor/iron/freezer,
-/area/station/maintenance/starboard/fore)
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/machinery/button/door/directional/north{
+ id = "robotics";
+ name = "Shutters Control Button";
+ req_access = list("robotics")
+ },
+/turf/open/floor/iron/white,
+/area/station/science/robotics/lab)
"dCs" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -12196,19 +12289,6 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron/dark,
/area/station/commons/fitness)
-"dCX" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/machinery/reagentgrinder{
- pixel_x = 6;
- pixel_y = 6
- },
-/obj/item/reagent_containers/food/drinks/shaker{
- pixel_x = -6
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/table/wood,
-/turf/open/floor/stone,
-/area/station/service/bar)
"dDm" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/on{
dir = 1
@@ -12293,16 +12373,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/wood,
/area/station/maintenance/aft/greater)
-"dEo" = (
-/obj/structure/window/reinforced/tinted/frosted{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/turf/open/floor/iron/grimy,
-/area/station/security/prison/work)
"dEv" = (
/obj/machinery/airalarm/directional/south,
/turf/open/floor/wood,
@@ -13437,16 +13507,6 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron/white,
/area/station/medical/surgery/aft)
-"dWQ" = (
-/obj/effect/turf_decal/trimline/green/filled/line{
- dir = 9
- },
-/obj/structure/table,
-/obj/item/reagent_containers/glass/beaker,
-/obj/item/reagent_containers/syringe,
-/obj/item/reagent_containers/dropper,
-/turf/open/floor/iron/dark,
-/area/station/medical/virology)
"dWX" = (
/obj/machinery/modular_computer/console/preset/engineering,
/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
@@ -13751,6 +13811,18 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos/storage/gas)
+"ect" = (
+/obj/structure/table/glass,
+/obj/item/storage/box/beakers{
+ pixel_x = 2;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/dropper,
+/obj/item/radio/intercom/directional/west,
+/obj/effect/turf_decal/tile/yellow/full,
+/turf/open/floor/iron/white/smooth_large,
+/area/station/medical/pharmacy)
"ecw" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -14237,20 +14309,6 @@
},
/turf/open/floor/iron/grimy,
/area/station/service/chapel/office)
-"ejH" = (
-/obj/effect/turf_decal/tile/blue/half{
- dir = 4
- },
-/obj/effect/turf_decal/tile/green/half{
- dir = 8
- },
-/obj/structure/reagent_dispensers/watertank/high,
-/obj/effect/turf_decal/stripes/line,
-/obj/item/reagent_containers/glass/watering_can,
-/turf/open/floor/iron/half{
- dir = 1
- },
-/area/station/service/hydroponics)
"ejO" = (
/obj/structure/table/reinforced,
/obj/item/folder/white,
@@ -15454,6 +15512,18 @@
/obj/structure/bookcase/random/fiction,
/turf/open/floor/iron/dark,
/area/station/commons/lounge)
+"eDT" = (
+/obj/structure/table/glass,
+/obj/item/cultivator,
+/obj/item/hatchet,
+/obj/item/crowbar,
+/obj/item/plant_analyzer,
+/obj/item/reagent_containers/cup/watering_can,
+/obj/effect/turf_decal/tile/green/half/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/service/hydroponics/garden)
"eDX" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 1
@@ -15585,15 +15655,6 @@
/obj/structure/chair/stool/directional/south,
/turf/open/floor/wood,
/area/station/commons/dorms)
-"eGf" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/neutral/diagonal_edge,
-/obj/structure/closet/mini_fridge{
- name = "mini-fridge"
- },
-/obj/item/reagent_containers/food/condiment/milk,
-/turf/open/floor/iron/kitchen/diagonal,
-/area/station/service/kitchen)
"eGj" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white/textured,
@@ -15664,38 +15725,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
-"eHh" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/camera{
- c_tag = "Chemistry Lab East";
- dir = 6;
- network = list("ss13","medbay")
- },
-/obj/structure/table/reinforced,
-/obj/machinery/reagentgrinder{
- pixel_x = -1;
- pixel_y = 4
- },
-/obj/item/reagent_containers/glass/beaker/large{
- pixel_x = 3;
- pixel_y = -8
- },
-/obj/item/reagent_containers/glass/beaker/large{
- pixel_x = -3;
- pixel_y = -8
- },
-/obj/item/stack/sheet/mineral/plasma{
- pixel_y = -6
- },
-/obj/item/reagent_containers/dropper{
- pixel_y = -7
- },
-/turf/open/floor/iron/dark/textured_half{
- dir = 1
- },
-/area/station/medical/chemistry)
"eHq" = (
/obj/effect/turf_decal/tile/brown{
dir = 1
@@ -16254,6 +16283,27 @@
/obj/item/kirbyplants/random,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
+"ePV" = (
+/obj/structure/table/wood,
+/obj/item/storage/box/matches,
+/obj/item/toy/cards/deck{
+ pixel_y = 4
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass{
+ pixel_x = 14;
+ pixel_y = 12
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass{
+ pixel_x = -18;
+ pixel_y = 10
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass{
+ pixel_x = -10;
+ pixel_y = 2
+ },
+/obj/effect/mapping_helpers/broken_floor,
+/turf/open/floor/wood,
+/area/station/maintenance/fore)
"eQx" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -16632,6 +16682,19 @@
dir = 5
},
/area/station/maintenance/port/aft)
+"eVS" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/machinery/reagentgrinder{
+ pixel_x = 6;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/cup/glass/shaker{
+ pixel_x = -6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/table/wood,
+/turf/open/floor/stone,
+/area/station/service/bar)
"eVV" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -16824,16 +16887,6 @@
"eYC" = (
/turf/open/floor/iron/smooth,
/area/mine/laborcamp/security)
-"eYD" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/neutral/diagonal_edge,
-/obj/item/plate,
-/obj/item/reagent_containers/food/condiment/enzyme{
- pixel_x = -7;
- pixel_y = 6
- },
-/turf/open/floor/iron/kitchen/diagonal,
-/area/station/service/kitchen)
"eYH" = (
/obj/machinery/power/smes{
charge = 5e+006
@@ -17595,6 +17648,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/kitchen/diagonal,
/area/station/service/kitchen)
+"fkE" = (
+/obj/structure/table,
+/obj/effect/turf_decal/tile/neutral/diagonal_edge,
+/obj/item/plate,
+/obj/item/reagent_containers/condiment/enzyme{
+ pixel_x = -7;
+ pixel_y = 6
+ },
+/turf/open/floor/iron/kitchen/diagonal,
+/area/station/service/kitchen)
"fkF" = (
/obj/item/weldingtool,
/turf/open/floor/plating/snowed/icemoon,
@@ -17883,6 +17946,32 @@
dir = 9
},
/area/station/security/prison/safe)
+"fpu" = (
+/obj/effect/turf_decal/tile/brown{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/obj/machinery/camera{
+ c_tag = "Medbay Break Room";
+ dir = 1;
+ network = list("ss13","medbay")
+ },
+/obj/structure/table/glass,
+/obj/effect/spawner/random/entertainment/deck{
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = 7;
+ pixel_y = 9
+ },
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = 7;
+ pixel_y = 5
+ },
+/turf/open/floor/iron/white,
+/area/station/medical/break_room)
"fpA" = (
/obj/machinery/hydroponics/soil,
/obj/effect/turf_decal/siding/wideplating/dark{
@@ -18066,6 +18155,15 @@
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible,
/turf/open/floor/iron/cafeteria,
/area/station/engineering/atmos)
+"ftf" = (
+/obj/structure/table,
+/obj/item/kitchen/rollingpin,
+/obj/item/reagent_containers/condiment/enzyme,
+/obj/item/reagent_containers/condiment/sugar,
+/obj/structure/light_construct/directional/west,
+/obj/structure/sign/poster/official/random/directional/west,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"ftg" = (
/obj/machinery/light/small/directional/west,
/obj/machinery/mass_driver/trash,
@@ -19274,30 +19372,6 @@
dir = 1
},
/area/station/engineering/engine_smes)
-"fNu" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{
- pixel_x = 7;
- pixel_y = 20
- },
-/obj/item/taperecorder{
- pixel_x = -5;
- pixel_y = 1
- },
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
- pixel_x = 7;
- pixel_y = 8
- },
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
- pixel_x = 6
- },
-/obj/item/storage/secure/safe/hos{
- pixel_x = 35
- },
-/obj/machinery/light/directional/south,
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/command/heads_quarters/hos)
"fNx" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
@@ -19768,10 +19842,41 @@
},
/turf/open/floor/engine,
/area/station/maintenance/disposal/incinerator)
+"fVH" = (
+/obj/structure/closet/wardrobe/white,
+/obj/item/clothing/shoes/jackboots,
+/obj/item/reagent_containers/blood/random,
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka,
+/turf/open/floor/plating,
+/area/station/maintenance/port/fore)
"fVS" = (
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/iron,
/area/station/service/janitor)
+"fVV" = (
+/obj/structure/table,
+/obj/item/storage/box/beakers{
+ pixel_x = 2;
+ pixel_y = 2
+ },
+/obj/item/storage/box/syringes,
+/obj/item/reagent_containers/cup/bottle/morphine{
+ pixel_x = 8;
+ pixel_y = -3
+ },
+/obj/item/reagent_containers/cup/bottle/epinephrine{
+ pixel_x = 7;
+ pixel_y = -3
+ },
+/obj/item/reagent_containers/syringe{
+ pixel_x = 6;
+ pixel_y = -3
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 10
+ },
+/turf/open/floor/iron/dark,
+/area/station/medical/storage)
"fWa" = (
/obj/structure/chair/wood{
dir = 4
@@ -20410,6 +20515,13 @@
/obj/structure/table,
/turf/open/floor/plating,
/area/mine/eva/lower)
+"gfy" = (
+/obj/structure/window/reinforced/tinted/frosted{
+ dir = 8
+ },
+/obj/structure/table/wood,
+/turf/open/floor/carpet/blue,
+/area/station/security/prison/work)
"gfE" = (
/obj/machinery/light/small/directional/west,
/obj/structure/chair/stool/directional/south,
@@ -20648,6 +20760,15 @@
/obj/effect/spawner/random/structure/closet_maintenance,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"gkx" = (
+/obj/effect/decal/remains/human,
+/obj/item/reagent_containers/cup/glass/bottle/wine{
+ desc = "A fine bottle of amontillado wine. Yes, for the love of god!";
+ name = "bottle of amontillado wine";
+ pixel_x = 8
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/department/medical/morgue)
"gky" = (
/obj/structure/cable,
/obj/effect/spawner/random/engineering/tracking_beacon,
@@ -20947,6 +21068,13 @@
/obj/structure/statue/snow/snowman,
/turf/open/misc/asteroid/snow/standard_air,
/area/station/science/research)
+"gou" = (
+/obj/structure/window/reinforced/tinted/frosted{
+ dir = 8
+ },
+/obj/structure/chair/sofa/right,
+/turf/open/floor/carpet/blue,
+/area/station/security/prison/work)
"gov" = (
/obj/machinery/door/window/left/directional/west{
name = "Janitorial Delivery";
@@ -20980,12 +21108,6 @@
/obj/effect/mapping_helpers/airlock/access/all/medical/virology,
/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/virology)
-"goZ" = (
-/obj/structure/table/wood,
-/obj/item/food/chips,
-/obj/item/reagent_containers/food/drinks/soda_cans/cola,
-/turf/open/floor/carpet,
-/area/station/hallway/secondary/entry)
"gpj" = (
/obj/structure/chair/sofa/corp/right{
dir = 8
@@ -21072,6 +21194,16 @@
/obj/structure/sign/warning,
/turf/closed/wall/ice,
/area/icemoon/underground/explored)
+"gqK" = (
+/obj/machinery/atmospherics/components/binary/pump/on{
+ dir = 8;
+ name = "Air to Distro"
+ },
+/obj/structure/sink/directional/south,
+/obj/item/mop,
+/obj/item/reagent_containers/cup/bucket,
+/turf/open/floor/iron/smooth,
+/area/mine/laborcamp/security)
"gqT" = (
/obj/effect/landmark/event_spawn,
/obj/structure/disposalpipe/segment{
@@ -21249,6 +21381,13 @@
/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plating,
/area/station/maintenance/starboard/lesser)
+"gtk" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/obj/item/reagent_containers/cup/rag,
+/turf/open/floor/iron,
+/area/station/maintenance/starboard/fore)
"gtq" = (
/obj/machinery/door/poddoor/shutters/preopen{
dir = 8;
@@ -21549,6 +21688,20 @@
/obj/item/radio/intercom/directional/west,
/turf/open/floor/iron,
/area/station/science/robotics/mechbay)
+"gzI" = (
+/obj/effect/turf_decal/tile/red/full,
+/obj/effect/turf_decal/siding/white{
+ dir = 8
+ },
+/obj/structure/table,
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -3
+ },
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = 3
+ },
+/turf/open/floor/iron/large,
+/area/station/service/kitchen/diner)
"gzN" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -21652,6 +21805,18 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/carpet/blue,
/area/station/security/prison/work)
+"gBd" = (
+/obj/structure/safe,
+/obj/item/clothing/head/bearpelt,
+/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/cup/glass/bottle/vodka/badminka,
+/obj/effect/turf_decal/bot_white/left,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/command/nuke_storage)
"gBk" = (
/obj/machinery/camera/directional/west{
c_tag = "Central Hallway East"
@@ -22095,15 +22260,6 @@
/obj/effect/turf_decal/trimline/red/line,
/turf/open/floor/iron/dark/textured,
/area/station/security/range)
-"gHM" = (
-/obj/effect/decal/remains/human,
-/obj/item/reagent_containers/food/drinks/bottle/wine{
- desc = "A fine bottle of amontillado wine. Yes, for the love of god!";
- name = "bottle of amontillado wine";
- pixel_x = 8
- },
-/turf/open/floor/plating,
-/area/station/maintenance/department/medical/morgue)
"gHN" = (
/obj/effect/turf_decal/trimline/green/filled/corner{
dir = 1
@@ -22202,6 +22358,19 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/treatment_center)
+"gJp" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 10
+ },
+/obj/item/book/manual/wiki/barman_recipes{
+ pixel_x = 5;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/cup/rag,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/table/wood,
+/turf/open/floor/stone,
+/area/station/service/bar)
"gJs" = (
/obj/machinery/portable_atmospherics/canister,
/obj/structure/disposalpipe/segment,
@@ -22907,6 +23076,18 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
+"gVA" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/cup/beaker/large{
+ pixel_y = 5
+ },
+/obj/item/reagent_containers/dropper{
+ pixel_y = -4
+ },
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 4
+ },
+/area/station/medical/medbay/central)
"gVC" = (
/obj/machinery/light/small/directional/south,
/obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
@@ -23605,6 +23786,22 @@
"hgM" = (
/turf/closed/wall,
/area/station/security/execution/transfer)
+"hgQ" = (
+/obj/structure/closet/crate/hydroponics,
+/obj/item/shovel/spade,
+/obj/item/wrench,
+/obj/item/reagent_containers/cup/watering_can,
+/obj/item/wirecutters,
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/machinery/camera{
+ c_tag = "Service-Botany Bottom 1";
+ dir = 9
+ },
+/obj/machinery/newscaster/directional/north,
+/turf/open/floor/plating,
+/area/station/service/hydroponics)
"hgV" = (
/obj/effect/turf_decal/tile/blue{
dir = 1
@@ -23704,19 +23901,6 @@
"hjE" = (
/turf/closed/wall/r_wall,
/area/station/science/explab)
-"hjF" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 10
- },
-/obj/item/book/manual/wiki/barman_recipes{
- pixel_x = 5;
- pixel_y = 6
- },
-/obj/item/reagent_containers/glass/rag,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/table/wood,
-/turf/open/floor/stone,
-/area/station/service/bar)
"hjH" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible,
/turf/open/floor/plating,
@@ -23937,6 +24121,24 @@
/obj/machinery/newscaster/directional/east,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"hnW" = (
+/obj/structure/rack,
+/obj/item/reagent_containers/cup/bottle/potassium{
+ pixel_x = 7;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/bottle/phosphorus{
+ pixel_x = -5;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/bottle/sodium{
+ pixel_x = 1
+ },
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 4
+ },
+/area/station/medical/medbay/central)
"hoe" = (
/obj/effect/turf_decal/tile/blue{
dir = 8
@@ -24173,6 +24375,24 @@
},
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/engineering)
+"hrs" = (
+/obj/structure/rack,
+/obj/item/reagent_containers/cup/bottle/acidic_buffer{
+ pixel_x = 7;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/bottle/basic_buffer{
+ pixel_x = -5;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/bottle/formaldehyde{
+ pixel_x = 1
+ },
+/obj/structure/sign/warning/no_smoking/directional/north,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 8
+ },
+/area/station/medical/medbay/central)
"hrt" = (
/obj/structure/table/glass,
/obj/item/shovel/spade,
@@ -24629,6 +24849,21 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/engineering/lobby)
+"hyL" = (
+/obj/structure/window/reinforced/tinted/frosted{
+ dir = 4
+ },
+/obj/item/book/manual/wiki/cytology{
+ pixel_x = -4;
+ pixel_y = 4
+ },
+/obj/item/biopsy_tool{
+ pixel_x = 8;
+ pixel_y = 2
+ },
+/obj/structure/table,
+/turf/open/floor/iron/grimy,
+/area/station/security/prison/work)
"hyM" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -25076,14 +25311,6 @@
},
/turf/open/openspace,
/area/station/engineering/atmos/storage)
-"hGw" = (
-/obj/structure/window/reinforced/tinted{
- dir = 1
- },
-/obj/structure/rack,
-/obj/item/clothing/gloves/color/latex,
-/turf/open/floor/plating,
-/area/station/security/prison/safe)
"hGF" = (
/obj/structure/disposalpipe/sorting/mail/flip{
dir = 4;
@@ -25124,19 +25351,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
-"hHm" = (
-/obj/machinery/shower/directional/north,
-/obj/structure/window/reinforced/tinted{
- dir = 8
- },
-/obj/structure/window/reinforced/tinted{
- dir = 4
- },
-/obj/machinery/door/window/left/directional/north{
- name = "Shower Cubicle"
- },
-/turf/open/floor/iron/freezer,
-/area/station/maintenance/starboard/fore)
"hHp" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -25506,6 +25720,24 @@
/obj/machinery/telecomms/processor/preset_four,
/turf/open/floor/iron/dark/telecomms,
/area/station/tcommsat/server)
+"hOj" = (
+/obj/item/reagent_containers/spray/plantbgone,
+/obj/item/reagent_containers/spray/pestspray{
+ pixel_x = 3;
+ pixel_y = 4
+ },
+/obj/item/reagent_containers/cup/bottle/nutrient/ez,
+/obj/item/reagent_containers/cup/bottle/nutrient/rh{
+ pixel_x = 2;
+ pixel_y = 1
+ },
+/obj/structure/table/glass,
+/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/tile/green/anticorner/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/service/hydroponics/garden)
"hOk" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -26100,18 +26332,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/surgery/fore)
-"hYk" = (
-/obj/structure/table/glass,
-/obj/item/storage/box/beakers{
- pixel_x = 2;
- pixel_y = 2
- },
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/dropper,
-/obj/item/radio/intercom/directional/west,
-/obj/effect/turf_decal/tile/yellow/full,
-/turf/open/floor/iron/white/smooth_large,
-/area/station/medical/pharmacy)
"hYu" = (
/obj/machinery/light/directional/west,
/obj/machinery/camera/motion/directional/south{
@@ -27876,12 +28096,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
-"iAR" = (
-/obj/structure/cable,
-/obj/item/reagent_containers/food/drinks/bottle/hooch,
-/obj/machinery/power/apc/five_k/directional/north,
-/turf/open/floor/plating,
-/area/mine/storage)
"iBd" = (
/obj/structure/fireplace{
pixel_x = -32
@@ -27988,6 +28202,14 @@
/obj/item/stack/rods/ten,
/turf/open/floor/plating,
/area/station/maintenance/aft/lesser)
+"iCs" = (
+/obj/structure/window/reinforced/tinted/frosted{
+ dir = 8
+ },
+/obj/structure/table/wood,
+/obj/item/book/manual/wiki/detective,
+/turf/open/floor/carpet/blue,
+/area/station/security/prison/work)
"iCC" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -29111,6 +29333,12 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/iron,
/area/station/security/warden)
+"iUr" = (
+/obj/structure/table,
+/obj/item/trash/can/food/beans,
+/obj/item/reagent_containers/cup/glass/waterbottle/empty,
+/turf/open/floor/iron,
+/area/station/maintenance/starboard/fore)
"iUs" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -29697,11 +29925,6 @@
},
/turf/open/floor/iron/large,
/area/station/medical/medbay/aft)
-"jca" = (
-/obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
-/turf/open/floor/iron,
-/area/station/service/janitor)
"jcf" = (
/obj/machinery/computer/security,
/obj/structure/reagent_dispensers/wall/peppertank/directional/north,
@@ -29811,6 +30034,23 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply,
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
+"jeg" = (
+/obj/structure/table/glass,
+/obj/item/reagent_containers/cup/glass/bottle/amaretto{
+ pixel_x = -5;
+ pixel_y = 10
+ },
+/obj/item/reagent_containers/cup/glass/bottle/fernet{
+ pixel_x = 7;
+ pixel_y = 16
+ },
+/obj/item/reagent_containers/cup/soda_cans/sol_dry,
+/obj/item/reagent_containers/cup/glass/drinkingglass{
+ pixel_x = 10
+ },
+/obj/effect/mapping_helpers/burnt_floor,
+/turf/open/floor/plating,
+/area/station/maintenance/fore)
"jeh" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/oxygen_input{
dir = 1
@@ -29997,32 +30237,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/morgue)
-"jhK" = (
-/obj/effect/turf_decal/tile/brown{
- dir = 1
- },
-/obj/effect/turf_decal/tile/brown{
- dir = 4
- },
-/obj/machinery/camera{
- c_tag = "Medbay Break Room";
- dir = 1;
- network = list("ss13","medbay")
- },
-/obj/structure/table/glass,
-/obj/effect/spawner/random/entertainment/deck{
- pixel_x = -6
- },
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_x = 7;
- pixel_y = 9
- },
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_x = 7;
- pixel_y = 5
- },
-/turf/open/floor/iron/white,
-/area/station/medical/break_room)
"jhM" = (
/obj/docking_port/stationary/random/icemoon{
dir = 8;
@@ -30519,13 +30733,6 @@
"jqT" = (
/turf/closed/wall/r_wall,
/area/station/engineering/storage/tech)
-"jqY" = (
-/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,
-/turf/open/floor/plating,
-/area/station/maintenance/port/fore)
"jre" = (
/turf/closed/wall,
/area/station/maintenance/starboard/lesser)
@@ -30812,27 +31019,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"jvk" = (
-/obj/machinery/camera/directional/north{
- c_tag = "Robotics Lab";
- network = list("ss13","rd")
- },
-/obj/structure/table,
-/obj/item/book/manual/wiki/robotics_cyborgs{
- pixel_x = 2;
- pixel_y = 5
- },
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/machinery/button/door/directional/north{
- id = "robotics";
- name = "Shutters Control Button";
- req_access = list("robotics")
- },
-/turf/open/floor/iron/white,
-/area/station/science/robotics/lab)
"jvm" = (
/obj/structure/closet/secure_closet/courtroom,
/obj/item/gavelhammer,
@@ -31868,6 +32054,19 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat/atmos)
+"jMg" = (
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/structure/table/glass,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
+/obj/item/stack/sheet/mineral/plasma,
+/obj/machinery/light/directional/north,
+/turf/open/floor/iron/white,
+/area/station/medical/pharmacy)
"jMp" = (
/obj/machinery/vending/tool,
/obj/machinery/light/directional/east,
@@ -33600,22 +33799,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/security/prison/workout)
-"knK" = (
-/obj/structure/table/wood,
-/obj/item/radio{
- desc = "An old handheld radio. You could use it, if you really wanted to.";
- icon_state = "radio";
- name = "old radio";
- pixel_y = 15
- },
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_x = 3
- },
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_x = -3
- },
-/turf/open/floor/plating,
-/area/station/maintenance/port/aft)
"knU" = (
/obj/machinery/vending/coffee,
/obj/machinery/light/directional/east,
@@ -33698,19 +33881,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
-"kpQ" = (
-/obj/effect/turf_decal/trimline/green/filled/line{
- dir = 9
- },
-/obj/structure/table,
-/obj/item/reagent_containers/glass/beaker,
-/obj/item/reagent_containers/syringe,
-/obj/item/reagent_containers/dropper,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/medical/virology)
"kpU" = (
/obj/effect/turf_decal/siding/wood/corner{
dir = 8
@@ -34957,16 +35127,6 @@
/obj/structure/sign/poster/official/random/directional/north,
/turf/open/floor/iron/smooth,
/area/mine/laborcamp/security)
-"kJC" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/structure/cable,
-/obj/machinery/light/directional/south,
-/obj/structure/closet/secure_closet/psychology,
-/turf/open/floor/iron/white,
-/area/station/medical/psychology)
"kJI" = (
/obj/structure/transit_tube/station/reverse,
/turf/open/floor/plating,
@@ -36071,6 +36231,24 @@
/obj/machinery/light/directional/north,
/turf/open/openspace,
/area/station/science/xenobiology)
+"kZf" = (
+/obj/structure/rack,
+/obj/item/reagent_containers/cup/bottle/lithium{
+ pixel_x = 7;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/bottle/iron{
+ pixel_x = -5;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/bottle/multiver{
+ pixel_x = 1
+ },
+/obj/item/radio/intercom/directional/west,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 8
+ },
+/area/station/medical/medbay/central)
"kZh" = (
/obj/structure/cable,
/obj/structure/sign/poster/contraband/random/directional/west,
@@ -37575,6 +37753,30 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
+"lzY" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{
+ pixel_x = 7;
+ pixel_y = 20
+ },
+/obj/item/taperecorder{
+ pixel_x = -5;
+ pixel_y = 1
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = 7;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = 6
+ },
+/obj/item/storage/secure/safe/hos{
+ pixel_x = 35
+ },
+/obj/machinery/light/directional/south,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/command/heads_quarters/hos)
"lAc" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -37796,6 +37998,24 @@
/obj/item/trash/tray,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"lDi" = (
+/obj/structure/rack,
+/obj/item/reagent_containers/cup/bottle/carbon{
+ pixel_x = 7;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/bottle/ethanol{
+ pixel_x = -5;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/bottle/chlorine{
+ pixel_x = 1
+ },
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 8
+ },
+/area/station/medical/medbay/central)
"lDo" = (
/obj/structure/sign/directions/medical{
dir = 4;
@@ -38148,6 +38368,30 @@
},
/turf/open/floor/iron/dark/textured,
/area/station/security/prison)
+"lJT" = (
+/obj/structure/table/glass,
+/obj/structure/sign/barsign{
+ chosen_sign = "thecavern";
+ icon_state = "thecavern";
+ pixel_y = 32
+ },
+/obj/item/reagent_containers/cup/glass/bottle/vermouth{
+ pixel_x = 10;
+ pixel_y = 14
+ },
+/obj/item/reagent_containers/cup/glass/bottle/juice/pineapplejuice{
+ pixel_y = 9
+ },
+/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice{
+ pixel_x = 15
+ },
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
+ pixel_x = -11;
+ pixel_y = 5
+ },
+/obj/item/reagent_containers/cup/soda_cans/tonic,
+/turf/open/floor/plating,
+/area/station/maintenance/fore)
"lKk" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk{
@@ -39168,6 +39412,12 @@
/obj/effect/mapping_helpers/airlock/access/all/security/brig,
/turf/open/floor/iron,
/area/mine/laborcamp/security)
+"mcx" = (
+/obj/structure/table/wood,
+/obj/item/food/chips,
+/obj/item/reagent_containers/cup/soda_cans/cola,
+/turf/open/floor/carpet,
+/area/station/hallway/secondary/entry)
"mcF" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -39329,18 +39579,6 @@
/obj/effect/turf_decal/tile/neutral/full,
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
-"mfb" = (
-/obj/structure/table/glass,
-/obj/item/storage/box/beakers{
- pixel_x = 2;
- pixel_y = 2
- },
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/dropper,
-/obj/structure/extinguisher_cabinet/directional/south,
-/obj/effect/turf_decal/tile/yellow/full,
-/turf/open/floor/iron/white/smooth_large,
-/area/station/medical/pharmacy)
"mfz" = (
/obj/machinery/door/airlock{
name = "Unit B"
@@ -39419,19 +39657,6 @@
},
/turf/open/floor/iron,
/area/station/ai_monitored/command/storage/eva)
-"mhp" = (
-/obj/structure/table,
-/obj/item/reagent_containers/glass/beaker/large{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/reagent_containers/glass/beaker{
- pixel_x = 8;
- pixel_y = 2
- },
-/obj/item/reagent_containers/dropper,
-/turf/open/floor/iron/cafeteria,
-/area/station/science/lab)
"mhq" = (
/obj/structure/closet,
/obj/effect/spawner/random/maintenance,
@@ -39895,6 +40120,22 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"mpE" = (
+/obj/structure/rack,
+/obj/item/reagent_containers/dropper,
+/obj/item/storage/box/beakers{
+ pixel_x = 6;
+ pixel_y = 10
+ },
+/obj/item/reagent_containers/cup/bottle/welding_fuel,
+/obj/item/reagent_containers/cup/bottle/welding_fuel,
+/obj/machinery/camera/directional/west{
+ c_tag = "Security - Permabrig Cytology";
+ network = list("ss13","prison")
+ },
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/iron/grimy,
+/area/station/security/prison/work)
"mpH" = (
/obj/effect/landmark/event_spawn,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -39997,6 +40238,23 @@
/obj/effect/turf_decal/tile/yellow/opposingcorners,
/turf/open/floor/iron/white,
/area/station/maintenance/port/fore)
+"mrr" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/obj/machinery/camera{
+ c_tag = "Psychology";
+ dir = 6;
+ network = list("ss13","medbay");
+ pixel_y = -22
+ },
+/obj/machinery/newscaster/directional/east,
+/turf/open/floor/iron/white,
+/area/station/medical/psychology)
"mru" = (
/obj/structure/sign/warning/directional/north,
/obj/machinery/light/small/directional/north,
@@ -40036,16 +40294,6 @@
},
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/underground/explored)
-"mrU" = (
-/obj/structure/window/reinforced/tinted/frosted{
- dir = 4
- },
-/obj/structure/rack,
-/obj/item/stack/ducts/fifty,
-/obj/item/storage/box/swab,
-/obj/effect/spawner/random/contraband/permabrig_gear,
-/turf/open/floor/iron/grimy,
-/area/station/security/prison/work)
"mrX" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 8
@@ -40393,6 +40641,17 @@
},
/turf/open/floor/iron,
/area/station/cargo/office)
+"myq" = (
+/obj/structure/table,
+/obj/item/reagent_containers/cup/glass/coffee,
+/obj/item/reagent_containers/cup/glass/coffee{
+ pixel_x = -8;
+ pixel_y = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"myC" = (
/obj/machinery/door/airlock/security/glass{
name = "Security Office"
@@ -41067,20 +41326,6 @@
/obj/structure/sign/nanotrasen,
/turf/open/misc/asteroid/snow/icemoon,
/area/icemoon/underground/explored)
-"mKa" = (
-/obj/structure/toilet{
- pixel_y = 8
- },
-/obj/effect/landmark/start/hangover,
-/obj/machinery/button/door/directional/west{
- id = "Toilet1";
- name = "Lock Control";
- specialfunctions = 4;
- normaldoorcontrol = 1
- },
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/iron/freezer,
-/area/station/commons/toilet)
"mKd" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/tile/bar/opposingcorners,
@@ -41608,6 +41853,13 @@
},
/turf/open/floor/engine/air,
/area/station/engineering/atmos)
+"mTw" = (
+/obj/item/reagent_containers/cup/bucket,
+/obj/effect/turf_decal/trimline/green/filled/line,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/station/maintenance/starboard/aft)
"mTI" = (
/obj/structure/sink/kitchen/directional/south{
desc = "A sink used for washing one's hands and face. It looks rusty and home-made";
@@ -41900,6 +42152,22 @@
/obj/structure/sign/poster/official/random/directional/east,
/turf/open/floor/iron/smooth,
/area/mine/mechbay)
+"mXF" = (
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/item/radio/intercom/directional/south,
+/obj/structure/table/wood,
+/obj/machinery/fax{
+ name = "Psychology Office Fax Machine";
+ fax_name = "Psychology Office"
+ },
+/turf/open/floor/iron/white,
+/area/station/medical/psychology)
"mXK" = (
/obj/structure/table,
/obj/structure/reagent_dispensers/servingdish,
@@ -41948,13 +42216,6 @@
},
/turf/open/floor/wood/tile,
/area/station/service/theater)
-"mYI" = (
-/obj/item/reagent_containers/glass/bucket,
-/obj/effect/turf_decal/trimline/green/filled/line,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/station/maintenance/starboard/aft)
"mYJ" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -42866,24 +43127,6 @@
},
/turf/open/floor/iron,
/area/station/security/brig/upper)
-"nlq" = (
-/obj/structure/rack,
-/obj/item/reagent_containers/glass/bottle/acidic_buffer{
- pixel_x = 7;
- pixel_y = 3
- },
-/obj/item/reagent_containers/glass/bottle/basic_buffer{
- pixel_x = -5;
- pixel_y = 3
- },
-/obj/item/reagent_containers/glass/bottle/formaldehyde{
- pixel_x = 1
- },
-/obj/structure/sign/warning/no_smoking/directional/north,
-/turf/open/floor/iron/dark/textured_edge{
- dir = 8
- },
-/area/station/medical/medbay/central)
"nlz" = (
/obj/machinery/computer/security/hos,
/obj/machinery/requests_console/directional/north{
@@ -43574,6 +43817,19 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/cafeteria,
/area/station/commons/dorms/laundry)
+"nwA" = (
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -3
+ },
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = 3
+ },
+/obj/structure/window/reinforced/spawner/west,
+/obj/item/knife/plastic,
+/obj/structure/table/reinforced,
+/obj/item/radio/intercom/prison/directional/north,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"nwF" = (
/obj/structure/chair/sofa/bench{
dir = 4
@@ -44016,11 +44272,6 @@
/obj/machinery/power/apc/auto_name/directional/west,
/turf/open/floor/iron,
/area/station/security/prison/visit)
-"nCB" = (
-/obj/item/reagent_containers/glass/bucket,
-/obj/structure/sink/directional/east,
-/turf/open/floor/plating,
-/area/station/maintenance/starboard/fore)
"nCD" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -45439,6 +45690,14 @@
/obj/structure/sign/poster/official/work_for_a_future,
/turf/closed/wall,
/area/station/maintenance/port/greater)
+"nWC" = (
+/obj/structure/window/reinforced/tinted/frosted{
+ dir = 4
+ },
+/obj/structure/table,
+/obj/structure/microscope,
+/turf/open/floor/iron/grimy,
+/area/station/security/prison/work)
"nWH" = (
/turf/closed/wall,
/area/station/maintenance/department/cargo)
@@ -45848,12 +46107,6 @@
/obj/machinery/computer/arcade/orion_trail,
/turf/open/floor/iron,
/area/station/security/prison/work)
-"odD" = (
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka,
-/obj/structure/closet,
-/obj/effect/spawner/random/maintenance,
-/turf/open/floor/plating,
-/area/station/maintenance/starboard/fore)
"odN" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
@@ -46017,15 +46270,6 @@
},
/turf/open/floor/wood,
/area/station/service/library)
-"ogh" = (
-/obj/structure/table,
-/obj/item/kitchen/rollingpin,
-/obj/item/reagent_containers/food/condiment/enzyme,
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/structure/light_construct/directional/west,
-/obj/structure/sign/poster/official/random/directional/west,
-/turf/open/floor/plating,
-/area/station/maintenance/port/aft)
"ogl" = (
/obj/structure/chair/comfy/black{
dir = 1
@@ -46342,6 +46586,15 @@
},
/turf/open/lava/plasma/ice_moon,
/area/icemoon/underground/explored)
+"okX" = (
+/obj/structure/window/reinforced/tinted{
+ dir = 1
+ },
+/obj/effect/spawner/random/medical/patient_stretcher,
+/obj/effect/decal/cleanable/blood/gibs/torso,
+/obj/effect/mapping_helpers/burnt_floor,
+/turf/open/floor/plating,
+/area/station/security/prison/safe)
"olf" = (
/turf/open/floor/carpet,
/area/station/commons/dorms)
@@ -47056,19 +47309,6 @@
/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
-"oxF" = (
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_x = -3
- },
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_x = 3
- },
-/obj/structure/window/reinforced/spawner/west,
-/obj/item/knife/plastic,
-/obj/structure/table/reinforced,
-/obj/item/radio/intercom/prison/directional/north,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"oxJ" = (
/obj/structure/bed/dogbed/lia,
/mob/living/simple_animal/hostile/carp/lia,
@@ -48110,6 +48350,18 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
+"oOF" = (
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 10
+ },
+/obj/structure/table,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/multiver{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/syringe,
+/turf/open/floor/iron/white,
+/area/station/medical/chemistry)
"oOO" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/sign/warning/secure_area/directional/south,
@@ -48939,6 +49191,17 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/ce)
+"pci" = (
+/obj/structure/table/wood,
+/obj/item/storage/box/matches,
+/obj/item/razor{
+ pixel_x = -4;
+ pixel_y = 2
+ },
+/obj/item/clothing/mask/cigarette/cigar,
+/obj/item/reagent_containers/cup/glass/flask/gold,
+/turf/open/floor/carpet,
+/area/station/command/heads_quarters/captain)
"pcj" = (
/obj/machinery/door/airlock/mining/glass{
name = "Drone Bay"
@@ -49639,18 +49902,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth,
/area/station/security/holding_cell)
-"poV" = (
-/obj/structure/table/wood,
-/obj/item/phone{
- pixel_x = -5;
- pixel_y = 6
- },
-/obj/item/reagent_containers/food/drinks/britcup{
- pixel_x = 8;
- pixel_y = 8
- },
-/turf/open/floor/carpet/red,
-/area/station/commons/vacant_room/office)
"ppc" = (
/obj/item/trash/syndi_cakes,
/obj/effect/turf_decal/stripes/red/line{
@@ -49901,19 +50152,6 @@
"psb" = (
/turf/closed/wall/ice,
/area/icemoon/underground/explored)
-"pse" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/epinephrine,
-/obj/item/stack/sheet/mineral/plasma,
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron/white,
-/area/station/medical/pharmacy)
"psm" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/tile/red{
@@ -50531,23 +50769,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/hallway/primary/port)
-"pBy" = (
-/obj/structure/table/glass,
-/obj/item/reagent_containers/food/drinks/bottle/amaretto{
- pixel_x = -5;
- pixel_y = 10
- },
-/obj/item/reagent_containers/food/drinks/bottle/fernet{
- pixel_x = 7;
- pixel_y = 16
- },
-/obj/item/reagent_containers/food/drinks/soda_cans/sol_dry,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
- pixel_x = 10
- },
-/obj/effect/mapping_helpers/burnt_floor,
-/turf/open/floor/plating,
-/area/station/maintenance/fore)
"pBA" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -51647,6 +51868,24 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai_upload)
+"pTv" = (
+/obj/structure/rack,
+/obj/item/reagent_containers/cup/bottle/fluorine{
+ pixel_x = 7;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/bottle/epinephrine{
+ pixel_x = -5;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/bottle/iodine{
+ pixel_x = 1
+ },
+/obj/structure/sign/warning/chem_diamond/directional/west,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 8
+ },
+/area/station/medical/medbay/central)
"pTB" = (
/obj/effect/turf_decal/tile/brown{
dir = 8
@@ -51996,17 +52235,6 @@
/obj/effect/turf_decal/stripes/box,
/turf/open/floor/plating,
/area/station/commons/storage/mining)
-"qas" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/coffee,
-/obj/item/reagent_containers/food/drinks/coffee{
- pixel_x = -8;
- pixel_y = 5
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/airalarm/directional/south,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"qau" = (
/obj/structure/fence{
dir = 4
@@ -52399,19 +52627,16 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
-"qgD" = (
-/obj/structure/table/glass,
-/obj/item/hatchet,
-/obj/item/cultivator,
-/obj/item/crowbar,
-/obj/item/reagent_containers/glass/watering_can,
-/obj/item/plant_analyzer,
-/obj/machinery/firealarm/directional/west,
-/obj/effect/turf_decal/tile/green/half/contrasted{
+"qgE" = (
+/obj/structure/window/reinforced/tinted/frosted{
dir = 4
},
-/turf/open/floor/iron/dark,
-/area/station/service/hydroponics/garden)
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/turf/open/floor/iron/grimy,
+/area/station/security/prison/work)
"qgM" = (
/obj/effect/spawner/structure/window/hollow/directional{
dir = 10
@@ -52510,20 +52735,6 @@
/obj/machinery/meter/layer4,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
-"qik" = (
-/obj/structure/table/wood,
-/obj/item/book/granter/action/spell/smoke/lesser{
- name = "mysterious old book of cloud-chasing"
- },
-/obj/item/reagent_containers/food/drinks/bottle/holywater{
- pixel_x = -2;
- pixel_y = 2
- },
-/obj/item/nullrod{
- pixel_x = 4
- },
-/turf/open/floor/cult,
-/area/station/service/chapel/office)
"qis" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -53085,6 +53296,16 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/cargo/storage)
+"qrZ" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/structure/cable,
+/obj/machinery/light/directional/south,
+/obj/structure/closet/secure_closet/psychology,
+/turf/open/floor/iron/white,
+/area/station/medical/psychology)
"qsd" = (
/obj/structure/sign/warning/secure_area/directional/west,
/obj/structure/disposalpipe/segment,
@@ -53813,6 +54034,18 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
+"qEO" = (
+/obj/structure/table/glass,
+/obj/item/storage/box/beakers{
+ pixel_x = 2;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/dropper,
+/obj/structure/extinguisher_cabinet/directional/south,
+/obj/effect/turf_decal/tile/yellow/full,
+/turf/open/floor/iron/white/smooth_large,
+/area/station/medical/pharmacy)
"qEV" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -54539,6 +54772,18 @@
"qOl" = (
/turf/open/floor/wood,
/area/station/maintenance/port/aft)
+"qOu" = (
+/obj/structure/table/glass,
+/obj/machinery/light/directional/east,
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/multiver{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/syringe,
+/obj/effect/turf_decal/tile/blue/full,
+/turf/open/floor/iron/large,
+/area/station/medical/treatment_center)
"qOy" = (
/obj/machinery/porta_turret/ai{
dir = 4
@@ -55563,17 +55808,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
-"rdD" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/neutral/diagonal_edge,
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_x = -3
- },
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_x = 3
- },
-/turf/open/floor/iron/kitchen/diagonal,
-/area/station/service/kitchen)
"rdG" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 8
@@ -56761,6 +56995,27 @@
/obj/structure/sign/departments/chemistry/pharmacy/directional/west,
/turf/open/openspace,
/area/station/medical/medbay/lobby)
+"rzY" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+ dir = 8
+ },
+/obj/structure/filingcabinet,
+/obj/item/toy/figure/qm,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = 8;
+ pixel_y = 8
+ },
+/turf/open/floor/iron,
+/area/station/command/heads_quarters/qm)
"rAr" = (
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -56890,19 +57145,6 @@
},
/turf/open/floor/iron/textured_half,
/area/station/service/hydroponics)
-"rCs" = (
-/obj/effect/turf_decal/siding/white{
- dir = 8
- },
-/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_x = -3
- },
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_x = 3
- },
-/turf/open/floor/iron/white/smooth_large,
-/area/station/service/kitchen/diner)
"rCu" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/obj/effect/landmark/start/hangover,
@@ -57212,21 +57454,6 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
-"rFs" = (
-/obj/structure/window/reinforced/tinted/frosted{
- dir = 4
- },
-/obj/item/book/manual/wiki/cytology{
- pixel_x = -4;
- pixel_y = 4
- },
-/obj/item/biopsy_tool{
- pixel_x = 8;
- pixel_y = 2
- },
-/obj/structure/table,
-/turf/open/floor/iron/grimy,
-/area/station/security/prison/work)
"rFD" = (
/obj/machinery/firealarm/directional/east,
/turf/open/floor/iron,
@@ -57350,13 +57577,6 @@
/obj/effect/turf_decal/trimline/dark_blue/line,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/mix)
-"rIM" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/obj/item/reagent_containers/glass/rag,
-/turf/open/floor/iron,
-/area/station/maintenance/starboard/fore)
"rIU" = (
/turf/open/floor/iron/white,
/area/station/science/robotics/lab)
@@ -57921,6 +58141,27 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/ce)
+"rSQ" = (
+/obj/structure/table/glass,
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
+ pixel_x = -6;
+ pixel_y = 10
+ },
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
+ pixel_x = 6;
+ pixel_y = 10
+ },
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
+ pixel_x = -6;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
+ pixel_x = 6;
+ pixel_y = 6
+ },
+/obj/item/storage/pill_bottle/mannitol,
+/turf/open/floor/iron/white,
+/area/station/medical/cryo)
"rSW" = (
/obj/effect/turf_decal/stripes/corner{
dir = 8
@@ -58055,6 +58296,17 @@
/obj/effect/mapping_helpers/airlock/access/all/supply/mining,
/turf/open/floor/iron,
/area/station/cargo/miningdock)
+"rVh" = (
+/obj/structure/table,
+/obj/effect/turf_decal/tile/neutral/diagonal_edge,
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -3
+ },
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = 3
+ },
+/turf/open/floor/iron/kitchen/diagonal,
+/area/station/service/kitchen)
"rVq" = (
/obj/effect/turf_decal/trimline/blue/filled/corner{
dir = 4
@@ -58748,23 +59000,6 @@
/obj/structure/table/reinforced,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/command/storage/eva)
-"sfM" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/obj/machinery/camera{
- c_tag = "Psychology";
- dir = 6;
- network = list("ss13","medbay");
- pixel_y = -22
- },
-/obj/machinery/newscaster/directional/east,
-/turf/open/floor/iron/white,
-/area/station/medical/psychology)
"sfY" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -59065,27 +59300,6 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/morgue)
-"skN" = (
-/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
- pixel_x = -6;
- pixel_y = 10
- },
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
- pixel_x = 6;
- pixel_y = 10
- },
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
- pixel_x = -6;
- pixel_y = 6
- },
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
- pixel_x = 6;
- pixel_y = 6
- },
-/obj/item/storage/pill_bottle/mannitol,
-/turf/open/floor/iron/white,
-/area/station/medical/cryo)
"skU" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -59182,16 +59396,6 @@
/obj/item/radio/intercom/directional/east,
/turf/open/floor/iron/dark/textured,
/area/station/medical/cryo)
-"slL" = (
-/obj/machinery/shower/directional/north,
-/obj/structure/window/reinforced/tinted{
- dir = 4
- },
-/obj/machinery/door/window/left/directional/north{
- name = "Shower Cubicle"
- },
-/turf/open/floor/iron/freezer,
-/area/station/maintenance/starboard/fore)
"slU" = (
/obj/machinery/vending/coffee,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -59244,6 +59448,19 @@
/obj/item/implant/radio,
/turf/open/floor/iron/dark,
/area/station/commons/storage/primary)
+"sni" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/rag,
+/obj/item/clothing/head/collectable/tophat{
+ pixel_x = 6;
+ pixel_y = 5
+ },
+/obj/effect/spawner/random/entertainment/gambling{
+ pixel_x = -13
+ },
+/obj/effect/mapping_helpers/broken_floor,
+/turf/open/floor/wood,
+/area/station/maintenance/fore)
"snj" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
@@ -60319,14 +60536,6 @@
/obj/machinery/power/apc/auto_name/directional/east,
/turf/open/floor/plating,
/area/station/commons/storage/mining)
-"sDq" = (
-/obj/structure/window/reinforced/tinted/frosted{
- dir = 4
- },
-/obj/structure/table,
-/obj/structure/microscope,
-/turf/open/floor/iron/grimy,
-/area/station/security/prison/work)
"sDs" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -60518,6 +60727,16 @@
dir = 1
},
/area/station/ai_monitored/command/storage/eva)
+"sGe" = (
+/obj/machinery/shower/directional/north,
+/obj/structure/window/reinforced/tinted{
+ dir = 4
+ },
+/obj/machinery/door/window/left/directional/north{
+ name = "Shower Cubicle"
+ },
+/turf/open/floor/iron/freezer,
+/area/station/maintenance/starboard/fore)
"sGf" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/extinguisher_cabinet/directional/north,
@@ -60655,6 +60874,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/starboard/upper)
+"sHW" = (
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 9
+ },
+/obj/structure/table,
+/obj/item/reagent_containers/cup/beaker,
+/obj/item/reagent_containers/syringe,
+/obj/item/reagent_containers/dropper,
+/turf/open/floor/iron/dark,
+/area/station/medical/virology)
"sHX" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -61258,27 +61487,6 @@
/mob/living/simple_animal/bot/floorbot,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat/atmos)
-"sUA" = (
-/obj/structure/closet/crate,
-/obj/item/reagent_containers/food/drinks/waterbottle{
- pixel_x = 7;
- pixel_y = 6
- },
-/obj/item/reagent_containers/food/drinks/waterbottle{
- pixel_x = 7;
- pixel_y = 6
- },
-/obj/item/reagent_containers/food/drinks/waterbottle{
- pixel_x = 7;
- pixel_y = 6
- },
-/obj/item/food/canned/beans,
-/obj/item/food/canned/beans,
-/obj/item/food/canned/beans,
-/obj/effect/decal/cleanable/dirt/dust,
-/mob/living/simple_animal/mouse/white,
-/turf/open/floor/iron,
-/area/station/maintenance/starboard/fore)
"sUE" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/frame/computer{
@@ -61318,6 +61526,23 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/wood,
/area/station/maintenance/port/aft)
+"sUT" = (
+/obj/structure/table/wood,
+/obj/item/paper_bin/carbon{
+ pixel_x = -3;
+ pixel_y = 7
+ },
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
+ pixel_x = 9;
+ pixel_y = 7
+ },
+/obj/item/hand_labeler{
+ pixel_x = -6;
+ pixel_y = -6
+ },
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/carpet,
+/area/station/security/detectives_office)
"sVm" = (
/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
dir = 1
@@ -61444,20 +61669,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/fore/lesser)
-"sXj" = (
-/obj/effect/turf_decal/tile/red/full,
-/obj/effect/turf_decal/siding/white{
- dir = 8
- },
-/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_x = -3
- },
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_x = 3
- },
-/turf/open/floor/iron/large,
-/area/station/service/kitchen/diner)
"sXz" = (
/obj/machinery/light/directional/north,
/obj/machinery/status_display/evac/directional/north,
@@ -61542,26 +61753,6 @@
},
/turf/open/floor/iron,
/area/station/security/brig/upper)
-"sYI" = (
-/obj/structure/table/glass,
-/obj/item/stack/medical/gauze{
- pixel_x = -2;
- pixel_y = 8
- },
-/obj/item/stack/medical/mesh{
- pixel_x = 6;
- pixel_y = 5
- },
-/obj/item/stack/medical/suture,
-/obj/item/reagent_containers/glass/bottle/epinephrine,
-/obj/item/reagent_containers/glass/bottle/multiver{
- pixel_x = 6
- },
-/obj/item/reagent_containers/syringe,
-/obj/machinery/defibrillator_mount/directional/east,
-/obj/effect/turf_decal/tile/blue/full,
-/turf/open/floor/iron/large,
-/area/station/medical/treatment_center)
"sYJ" = (
/obj/structure/railing{
dir = 1
@@ -61863,6 +62054,19 @@
/obj/structure/fence,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/underground/explored)
+"tet" = (
+/obj/effect/turf_decal/siding/white{
+ dir = 8
+ },
+/obj/structure/table,
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -3
+ },
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = 3
+ },
+/turf/open/floor/iron/white/smooth_large,
+/area/station/service/kitchen/diner)
"teB" = (
/obj/machinery/conveyor_switch/oneway{
id = "packageSort2"
@@ -62715,22 +62919,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/break_room)
-"tsZ" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/item/radio/intercom/directional/south,
-/obj/structure/table/wood,
-/obj/machinery/fax{
- name = "Psychology Office Fax Machine";
- fax_name = "Psychology Office"
- },
-/turf/open/floor/iron/white,
-/area/station/medical/psychology)
"tta" = (
/obj/structure/table,
/obj/item/paper_bin{
@@ -62881,18 +63069,6 @@
/obj/effect/landmark/start/prisoner,
/turf/open/floor/iron,
/area/station/security/prison/mess)
-"tuJ" = (
-/obj/structure/safe,
-/obj/item/clothing/head/bearpelt,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
-/obj/item/gun/ballistic/revolver/russian,
-/obj/item/ammo_box/a357,
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka,
-/obj/effect/turf_decal/bot_white/left,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/command/nuke_storage)
"tuU" = (
/obj/structure/reagent_dispensers/wall/peppertank/directional/west,
/obj/machinery/airalarm/directional/north,
@@ -63008,23 +63184,21 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
-"twb" = (
-/obj/structure/rack,
-/obj/item/reagent_containers/glass/bottle/nitrogen{
- pixel_x = 7;
- pixel_y = 3
+"twp" = (
+/obj/structure/toilet{
+ pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/mercury{
- pixel_x = -5;
- pixel_y = 3
+/obj/effect/landmark/blobstart,
+/obj/effect/landmark/start/hangover,
+/obj/machinery/button/door/directional/west{
+ id = "Toilet2";
+ name = "Lock Control";
+ specialfunctions = 4;
+ normaldoorcontrol = 1
},
-/obj/item/reagent_containers/glass/bottle/oxygen{
- pixel_x = 1
- },
-/turf/open/floor/iron/dark/textured_edge{
- dir = 8
- },
-/area/station/medical/medbay/central)
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/iron/freezer,
+/area/station/commons/toilet)
"twt" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -63191,6 +63365,12 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/catwalk_floor/iron_smooth,
/area/station/maintenance/fore/lesser)
+"tyt" = (
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka,
+/obj/structure/closet,
+/obj/effect/spawner/random/maintenance,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/fore)
"tyv" = (
/obj/effect/landmark/start/librarian,
/obj/structure/chair/office,
@@ -63709,6 +63889,20 @@
dir = 1
},
/area/mine/living_quarters)
+"tFD" = (
+/obj/structure/toilet{
+ pixel_y = 8
+ },
+/obj/effect/landmark/start/hangover,
+/obj/machinery/button/door/directional/west{
+ id = "Toilet1";
+ name = "Lock Control";
+ specialfunctions = 4;
+ normaldoorcontrol = 1
+ },
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/iron/freezer,
+/area/station/commons/toilet)
"tFP" = (
/obj/structure/closet/crate,
/obj/machinery/light/small/directional/east,
@@ -63879,22 +64073,6 @@
},
/turf/open/floor/plating,
/area/station/science/xenobiology)
-"tIL" = (
-/obj/structure/closet/crate/hydroponics,
-/obj/item/shovel/spade,
-/obj/item/wrench,
-/obj/item/reagent_containers/glass/watering_can,
-/obj/item/wirecutters,
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
-/obj/machinery/camera{
- c_tag = "Service-Botany Bottom 1";
- dir = 9
- },
-/obj/machinery/newscaster/directional/north,
-/turf/open/floor/plating,
-/area/station/service/hydroponics)
"tIS" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 6
@@ -64098,18 +64276,6 @@
/obj/structure/sign/warning/cold_temp/directional/north,
/turf/open/floor/iron/dark,
/area/mine/storage)
-"tLd" = (
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- dir = 10
- },
-/obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/epinephrine,
-/obj/item/reagent_containers/glass/bottle/multiver{
- pixel_x = 6
- },
-/obj/item/reagent_containers/syringe,
-/turf/open/floor/iron/white,
-/area/station/medical/chemistry)
"tLi" = (
/obj/structure/flora/bush/sparsegrass/style_random,
/turf/open/misc/asteroid/snow/icemoon,
@@ -64268,12 +64434,6 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron,
/area/station/cargo/lobby)
-"tNZ" = (
-/obj/structure/table,
-/obj/item/trash/can/food/beans,
-/obj/item/reagent_containers/food/drinks/waterbottle/empty,
-/turf/open/floor/iron,
-/area/station/maintenance/starboard/fore)
"tOf" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -64915,22 +65075,6 @@
/obj/structure/cable,
/turf/open/misc/asteroid/snow/icemoon,
/area/icemoon/surface/outdoors/nospawn)
-"tZk" = (
-/obj/structure/rack,
-/obj/item/reagent_containers/dropper,
-/obj/item/storage/box/beakers{
- pixel_x = 6;
- pixel_y = 10
- },
-/obj/item/reagent_containers/glass/bottle/welding_fuel,
-/obj/item/reagent_containers/glass/bottle/welding_fuel,
-/obj/machinery/camera/directional/west{
- c_tag = "Security - Permabrig Cytology";
- network = list("ss13","prison")
- },
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/iron/grimy,
-/area/station/security/prison/work)
"tZm" = (
/obj/effect/turf_decal/trimline/blue/filled/line,
/turf/open/floor/iron/white,
@@ -65087,17 +65231,6 @@
/obj/effect/turf_decal/stripes/box,
/turf/open/floor/iron/dark/textured_large,
/area/station/medical/chemistry)
-"ubX" = (
-/obj/effect/turf_decal/tile/red/full,
-/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_x = -3
- },
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_x = 3
- },
-/turf/open/floor/iron/large,
-/area/station/service/kitchen/diner)
"ubY" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -65512,6 +65645,18 @@
/obj/effect/turf_decal/siding/thinplating/dark,
/turf/open/floor/plating,
/area/station/service/hydroponics)
+"uiy" = (
+/obj/structure/table/wood,
+/obj/item/phone{
+ pixel_x = -5;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/cup/glass/britcup{
+ pixel_x = 8;
+ pixel_y = 8
+ },
+/turf/open/floor/carpet/red,
+/area/station/commons/vacant_room/office)
"uiI" = (
/obj/structure/rack,
/obj/effect/spawner/random/maintenance/three,
@@ -65626,6 +65771,18 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron/dark,
/area/station/service/chapel)
+"ukv" = (
+/obj/item/storage/box/bodybags,
+/obj/structure/extinguisher_cabinet/directional/west,
+/obj/item/reagent_containers/syringe{
+ name = "steel point"
+ },
+/obj/item/reagent_containers/cup/bottle/multiver,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
+/obj/structure/table/glass,
+/obj/structure/window/reinforced,
+/turf/open/floor/iron/white/textured,
+/area/station/security/medical)
"ukw" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -65848,6 +66005,27 @@
/obj/structure/extinguisher_cabinet/directional/east,
/turf/open/floor/iron/dark,
/area/station/engineering/lobby)
+"ung" = (
+/obj/structure/closet/crate,
+/obj/item/reagent_containers/cup/glass/waterbottle{
+ pixel_x = 7;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/cup/glass/waterbottle{
+ pixel_x = 7;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/cup/glass/waterbottle{
+ pixel_x = 7;
+ pixel_y = 6
+ },
+/obj/item/food/canned/beans,
+/obj/item/food/canned/beans,
+/obj/item/food/canned/beans,
+/obj/effect/decal/cleanable/dirt/dust,
+/mob/living/simple_animal/mouse/white,
+/turf/open/floor/iron,
+/area/station/maintenance/starboard/fore)
"unm" = (
/obj/machinery/plumbing/growing_vat,
/obj/effect/decal/cleanable/dirt,
@@ -66143,19 +66321,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/white,
/area/station/science/research)
-"usm" = (
-/obj/structure/table/glass,
-/obj/machinery/light/directional/west,
-/obj/item/reagent_containers/glass/bottle/epinephrine,
-/obj/item/reagent_containers/glass/bottle/multiver{
- pixel_x = 6
- },
-/obj/item/reagent_containers/syringe,
-/obj/machinery/defibrillator_mount/directional/north,
-/obj/item/radio/intercom/directional/west,
-/obj/effect/turf_decal/tile/blue/full,
-/turf/open/floor/iron/large,
-/area/station/medical/treatment_center)
"uso" = (
/obj/structure/closet/crate/trashcart,
/obj/effect/spawner/random/contraband/prison,
@@ -66326,6 +66491,19 @@
/obj/structure/sign/departments/maint/directional/north,
/turf/open/floor/plating/snowed/icemoon,
/area/mine/eva)
+"uve" = (
+/obj/structure/table/glass,
+/obj/item/hatchet,
+/obj/item/cultivator,
+/obj/item/crowbar,
+/obj/item/reagent_containers/cup/watering_can,
+/obj/item/plant_analyzer,
+/obj/machinery/firealarm/directional/west,
+/obj/effect/turf_decal/tile/green/half/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/service/hydroponics/garden)
"uvi" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -66715,6 +66893,17 @@
/obj/effect/mapping_helpers/airlock/access/all/science/research,
/turf/open/floor/engine,
/area/station/science/explab)
+"uCL" = (
+/obj/machinery/shower/directional/north,
+/obj/structure/window/reinforced/tinted{
+ dir = 8
+ },
+/obj/machinery/door/window/left/directional/north{
+ name = "Shower Cubicle"
+ },
+/obj/item/soap/nanotrasen,
+/turf/open/floor/iron/freezer,
+/area/station/maintenance/starboard/fore)
"uCN" = (
/obj/structure/grille/broken,
/turf/open/misc/asteroid/snow/icemoon,
@@ -67558,27 +67747,6 @@
/obj/machinery/atmospherics/pipe/smart/simple/orange/visible,
/turf/closed/wall/r_wall,
/area/station/engineering/atmos)
-"uQA" = (
-/obj/structure/table/wood,
-/obj/item/paper_bin/carbon{
- pixel_x = -3;
- pixel_y = 7
- },
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
- pixel_x = 9;
- pixel_y = 7
- },
-/obj/item/hand_labeler{
- pixel_x = -6;
- pixel_y = -6
- },
-/obj/machinery/airalarm/directional/south,
-/obj/item/lighter{
- pixel_x = 8;
- pixel_y = -9
- },
-/turf/open/floor/carpet,
-/area/station/security/detectives_office)
"uQC" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/red,
@@ -67676,24 +67844,6 @@
dir = 1
},
/area/station/engineering/main)
-"uSW" = (
-/obj/structure/rack,
-/obj/item/reagent_containers/glass/bottle/fluorine{
- pixel_x = 7;
- pixel_y = 3
- },
-/obj/item/reagent_containers/glass/bottle/epinephrine{
- pixel_x = -5;
- pixel_y = 3
- },
-/obj/item/reagent_containers/glass/bottle/iodine{
- pixel_x = 1
- },
-/obj/structure/sign/warning/chem_diamond/directional/west,
-/turf/open/floor/iron/dark/textured_edge{
- dir = 8
- },
-/area/station/medical/medbay/central)
"uTa" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/cafeteria,
@@ -67736,16 +67886,6 @@
},
/turf/open/floor/wood/parquet,
/area/station/service/bar/atrium)
-"uUW" = (
-/obj/machinery/atmospherics/components/binary/pump/on{
- dir = 8;
- name = "Air to Distro"
- },
-/obj/structure/sink/directional/south,
-/obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
-/turf/open/floor/iron/smooth,
-/area/mine/laborcamp/security)
"uVa" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/sink/kitchen/directional/east{
@@ -68252,11 +68392,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/white,
/area/station/medical/medbay/aft)
-"vda" = (
-/obj/machinery/recharge_station,
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/iron/freezer,
-/area/station/commons/toilet)
"vdf" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
@@ -68301,6 +68436,11 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
/area/station/commons/locker)
+"vdF" = (
+/obj/item/reagent_containers/cup/bucket,
+/obj/structure/sink/directional/east,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/fore)
"vdM" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -68459,6 +68599,19 @@
},
/turf/open/floor/iron,
/area/station/science/xenobiology)
+"vfA" = (
+/obj/structure/table,
+/obj/item/reagent_containers/cup/beaker/large{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = 8;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/dropper,
+/turf/open/floor/iron/cafeteria,
+/area/station/science/lab)
"vfI" = (
/obj/machinery/door/window/right/directional/south{
name = "Ordnance Freezer Chamber Access";
@@ -68490,21 +68643,6 @@
/obj/effect/turf_decal/trimline/blue/filled/line,
/turf/open/floor/iron/white,
/area/station/medical/medbay/aft)
-"vgz" = (
-/obj/structure/toilet{
- pixel_y = 8
- },
-/obj/effect/landmark/blobstart,
-/obj/effect/landmark/start/hangover,
-/obj/machinery/button/door/directional/west{
- id = "Toilet2";
- name = "Lock Control";
- specialfunctions = 4;
- normaldoorcontrol = 1
- },
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/iron/freezer,
-/area/station/commons/toilet)
"vgC" = (
/obj/structure/cable,
/turf/open/floor/iron,
@@ -69085,18 +69223,6 @@
/obj/machinery/door/firedoor,
/turf/open/floor/plating,
/area/station/science/robotics/lab)
-"vnM" = (
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/beaker/large{
- pixel_y = 5
- },
-/obj/item/reagent_containers/dropper{
- pixel_y = -4
- },
-/turf/open/floor/iron/dark/textured_edge{
- dir = 4
- },
-/area/station/medical/medbay/central)
"vnN" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/trimline/yellow/filled/line{
@@ -70584,15 +70710,6 @@
/obj/item/seeds/glowshroom,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
-"vNg" = (
-/obj/structure/window/reinforced/tinted{
- dir = 1
- },
-/obj/effect/spawner/random/medical/patient_stretcher,
-/obj/effect/decal/cleanable/blood/gibs/torso,
-/obj/effect/mapping_helpers/burnt_floor,
-/turf/open/floor/plating,
-/area/station/security/prison/safe)
"vNk" = (
/obj/effect/landmark/start/hangover,
/obj/structure/chair/wood{
@@ -70647,6 +70764,12 @@
/obj/structure/extinguisher_cabinet/directional/north,
/turf/open/floor/iron,
/area/mine/production)
+"vNU" = (
+/obj/structure/rack,
+/obj/item/clothing/gloves/boxing/green,
+/obj/item/reagent_containers/cup/glass/waterbottle,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/fore)
"vOr" = (
/obj/structure/disposalpipe/junction{
dir = 8
@@ -71506,11 +71629,6 @@
/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/project)
-"wbm" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/bucket,
-/turf/open/floor/iron/dark,
-/area/mine/laborcamp)
"wbn" = (
/obj/structure/table,
/obj/structure/bedsheetbin,
@@ -71654,6 +71772,11 @@
},
/turf/open/floor/iron/smooth,
/area/mine/mechbay)
+"wes" = (
+/obj/item/mop,
+/obj/item/reagent_containers/cup/bucket,
+/turf/open/floor/iron,
+/area/station/service/janitor)
"wet" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
@@ -71738,15 +71861,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"wft" = (
-/obj/structure/sink/directional/west,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/mop,
-/obj/item/reagent_containers/glass/bottle/ammonia,
-/obj/machinery/airalarm/directional/south,
-/obj/effect/spawner/random/contraband/prison,
-/turf/open/floor/plating,
-/area/station/security/prison/safe)
"wfu" = (
/obj/structure/sign/poster/official/wtf_is_co2,
/turf/closed/wall/r_wall,
@@ -72264,19 +72378,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/mine/eva)
-"wmf" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/glass/rag,
-/obj/item/clothing/head/collectable/tophat{
- pixel_x = 6;
- pixel_y = 5
- },
-/obj/effect/spawner/random/entertainment/gambling{
- pixel_x = -13
- },
-/obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/wood,
-/area/station/maintenance/fore)
"wmu" = (
/obj/machinery/vending/wardrobe/sec_wardrobe,
/obj/effect/turf_decal/tile/red,
@@ -72829,17 +72930,6 @@
/obj/structure/cable,
/turf/open/floor/iron/dark/textured_half,
/area/station/service/bar/atrium)
-"wvd" = (
-/obj/structure/table/wood,
-/obj/item/storage/box/matches,
-/obj/item/razor{
- pixel_x = -4;
- pixel_y = 2
- },
-/obj/item/clothing/mask/cigarette/cigar,
-/obj/item/reagent_containers/food/drinks/flask/gold,
-/turf/open/floor/carpet,
-/area/station/command/heads_quarters/captain)
"wve" = (
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron/white,
@@ -73084,6 +73174,14 @@
/obj/effect/mapping_helpers/airlock/access/all/security/general,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
+"wyx" = (
+/obj/structure/window/reinforced/tinted{
+ dir = 1
+ },
+/obj/structure/rack,
+/obj/item/clothing/gloves/color/latex,
+/turf/open/floor/plating,
+/area/station/security/prison/safe)
"wyB" = (
/obj/machinery/conveyor{
dir = 1;
@@ -73145,14 +73243,6 @@
},
/turf/open/floor/iron,
/area/mine/laborcamp)
-"wzD" = (
-/obj/structure/window/reinforced/tinted/frosted{
- dir = 8
- },
-/obj/structure/table/wood,
-/obj/item/book/manual/wiki/detective,
-/turf/open/floor/carpet/blue,
-/area/station/security/prison/work)
"wAb" = (
/obj/structure/reagent_dispensers/fueltank,
/obj/effect/turf_decal/tile/yellow{
@@ -73517,13 +73607,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/science)
-"wEC" = (
-/obj/structure/window/reinforced/tinted/frosted{
- dir = 8
- },
-/obj/structure/table/wood,
-/turf/open/floor/carpet/blue,
-/area/station/security/prison/work)
"wEL" = (
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/west,
@@ -73962,12 +74045,6 @@
"wLl" = (
/turf/closed/wall/r_wall,
/area/station/science/research)
-"wLp" = (
-/obj/structure/rack,
-/obj/item/clothing/gloves/boxing/green,
-/obj/item/reagent_containers/food/drinks/waterbottle,
-/turf/open/floor/plating,
-/area/station/maintenance/starboard/fore)
"wLI" = (
/obj/machinery/light/directional/east,
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
@@ -74630,30 +74707,6 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/cargo/drone_bay)
-"wVh" = (
-/obj/structure/table/glass,
-/obj/structure/sign/barsign{
- chosen_sign = "thecavern";
- icon_state = "thecavern";
- pixel_y = 32
- },
-/obj/item/reagent_containers/food/drinks/bottle/vermouth{
- pixel_x = 10;
- pixel_y = 14
- },
-/obj/item/reagent_containers/food/drinks/bottle/pineapplejuice{
- pixel_y = 9
- },
-/obj/item/reagent_containers/food/drinks/bottle/orangejuice{
- pixel_x = 15
- },
-/obj/item/reagent_containers/food/drinks/bottle/vodka{
- pixel_x = -11;
- pixel_y = 5
- },
-/obj/item/reagent_containers/food/drinks/soda_cans/tonic,
-/turf/open/floor/plating,
-/area/station/maintenance/fore)
"wVl" = (
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -74679,13 +74732,6 @@
/obj/structure/extinguisher_cabinet/directional/south,
/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
-"wVK" = (
-/obj/structure/window/reinforced/tinted/frosted{
- dir = 8
- },
-/obj/structure/chair/sofa/right,
-/turf/open/floor/carpet/blue,
-/area/station/security/prison/work)
"wVR" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -74951,6 +74997,15 @@
/obj/effect/turf_decal/tile/red,
/turf/open/floor/iron,
/area/station/security/prison/mess)
+"wZV" = (
+/obj/structure/table,
+/obj/effect/turf_decal/tile/neutral/diagonal_edge,
+/obj/structure/closet/mini_fridge{
+ name = "mini-fridge"
+ },
+/obj/item/reagent_containers/condiment/milk,
+/turf/open/floor/iron/kitchen/diagonal,
+/area/station/service/kitchen)
"wZZ" = (
/obj/structure/tank_holder/oxygen/red,
/turf/open/floor/plating,
@@ -75685,18 +75740,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/wood,
/area/station/commons/dorms)
-"xkL" = (
-/obj/structure/table/glass,
-/obj/machinery/light/directional/east,
-/obj/structure/extinguisher_cabinet/directional/north,
-/obj/item/reagent_containers/glass/bottle/epinephrine,
-/obj/item/reagent_containers/glass/bottle/multiver{
- pixel_x = 6
- },
-/obj/item/reagent_containers/syringe,
-/obj/effect/turf_decal/tile/blue/full,
-/turf/open/floor/iron/large,
-/area/station/medical/treatment_center)
"xkZ" = (
/obj/machinery/teleport/station,
/obj/machinery/light/small/directional/east,
@@ -75882,6 +75925,11 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/station/maintenance/starboard/upper)
+"xnu" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/reagent_containers/cup/bucket,
+/turf/open/floor/iron/dark,
+/area/mine/laborcamp)
"xnC" = (
/obj/structure/sign/warning/fire/directional/east,
/turf/open/misc/asteroid/snow/icemoon,
@@ -76737,24 +76785,6 @@
"xCl" = (
/turf/open/floor/iron,
/area/station/science/robotics/lab)
-"xCo" = (
-/obj/structure/rack,
-/obj/item/reagent_containers/glass/bottle/lithium{
- pixel_x = 7;
- pixel_y = 3
- },
-/obj/item/reagent_containers/glass/bottle/iron{
- pixel_x = -5;
- pixel_y = 3
- },
-/obj/item/reagent_containers/glass/bottle/multiver{
- pixel_x = 1
- },
-/obj/item/radio/intercom/directional/west,
-/turf/open/floor/iron/dark/textured_edge{
- dir = 8
- },
-/area/station/medical/medbay/central)
"xCv" = (
/obj/machinery/computer/security,
/obj/effect/turf_decal/tile/red/half/contrasted,
@@ -76771,18 +76801,6 @@
/obj/machinery/nuclearbomb/beer,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
-"xCW" = (
-/obj/item/storage/box/bodybags,
-/obj/structure/extinguisher_cabinet/directional/west,
-/obj/item/reagent_containers/syringe{
- name = "steel point"
- },
-/obj/item/reagent_containers/glass/bottle/multiver,
-/obj/item/reagent_containers/glass/bottle/epinephrine,
-/obj/structure/table/glass,
-/obj/structure/window/reinforced,
-/turf/open/floor/iron/white/textured,
-/area/station/security/medical)
"xDb" = (
/turf/closed/wall/r_wall,
/area/station/medical/virology)
@@ -77385,27 +77403,6 @@
"xMT" = (
/turf/closed/wall,
/area/station/science/research)
-"xMU" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/brown{
- dir = 4
- },
-/obj/effect/turf_decal/tile/brown,
-/obj/effect/turf_decal/tile/brown{
- dir = 8
- },
-/obj/structure/filingcabinet,
-/obj/item/toy/figure/qm,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
- pixel_x = 8;
- pixel_y = 8
- },
-/turf/open/floor/iron,
-/area/station/command/heads_quarters/qm)
"xMW" = (
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 8
@@ -77639,24 +77636,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/eighties/red,
/area/station/security/prison/safe)
-"xSj" = (
-/obj/structure/rack,
-/obj/item/reagent_containers/glass/bottle/potassium{
- pixel_x = 7;
- pixel_y = 3
- },
-/obj/item/reagent_containers/glass/bottle/phosphorus{
- pixel_x = -5;
- pixel_y = 3
- },
-/obj/item/reagent_containers/glass/bottle/sodium{
- pixel_x = 1
- },
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/iron/dark/textured_edge{
- dir = 4
- },
-/area/station/medical/medbay/central)
"xSl" = (
/obj/item/radio/intercom/directional/south,
/obj/effect/turf_decal/siding/wood{
@@ -78664,6 +78643,23 @@
/obj/machinery/power/apc/auto_name/directional/east,
/turf/open/floor/iron/showroomfloor,
/area/station/security/prison/toilet)
+"yin" = (
+/obj/structure/rack,
+/obj/item/reagent_containers/cup/bottle/nitrogen{
+ pixel_x = 7;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/bottle/mercury{
+ pixel_x = -5;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/bottle/oxygen{
+ pixel_x = 1
+ },
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 8
+ },
+/area/station/medical/medbay/central)
"yiv" = (
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron,
@@ -108000,7 +107996,7 @@ vPx
qDG
bDj
ldH
-oxF
+nwA
nga
nIJ
kFx
@@ -112074,7 +112070,7 @@ iDt
iDt
vjh
szu
-cIA
+bbL
jLo
bJx
njJ
@@ -113621,7 +113617,7 @@ rVX
dqx
aoF
hVB
-wbm
+xnu
fkZ
vjh
pDW
@@ -114919,7 +114915,7 @@ ghx
ghx
iDt
nTO
-uUW
+gqK
eYC
xjO
nTO
@@ -164348,7 +164344,7 @@ vfg
bQA
hKT
cHZ
-qas
+myq
kXr
oGF
vGg
@@ -167355,7 +167351,7 @@ iDt
oqL
unm
cvG
-tZk
+mpE
fvK
cIc
uzM
@@ -167381,7 +167377,7 @@ ucN
scV
jIv
plN
-uQA
+sUT
ucN
iDt
ijY
@@ -167867,10 +167863,10 @@ ijY
hPs
gBX
oPa
-mrU
-dEo
-sDq
-rFs
+czp
+qgE
+nWC
+hyL
cIc
lBT
oVY
@@ -167879,7 +167875,7 @@ vVH
vVH
vVH
nYZ
-wft
+afq
xhK
iDt
ijY
@@ -168132,7 +168128,7 @@ cIc
lNn
oVY
pez
-vNg
+okX
qLg
vVH
vVH
@@ -168389,7 +168385,7 @@ cIc
kqn
oVY
pez
-hGw
+wyx
aQQ
fdm
grU
@@ -169409,9 +169405,9 @@ iDt
hPs
gBX
hPs
-wVK
-wzD
-wEC
+gou
+iCs
+gfy
una
cIc
mlX
@@ -173073,7 +173069,7 @@ udC
udC
iDt
vcj
-iAR
+aqf
vWz
vWz
beo
@@ -177171,7 +177167,7 @@ iDt
xMq
exw
exw
-tIL
+hgQ
fKy
bdr
ylr
@@ -177427,7 +177423,7 @@ iDt
xMq
xMq
exw
-ejH
+cKP
qXz
gAy
rhR
@@ -177684,7 +177680,7 @@ xMq
xMq
xMq
exw
-ejH
+cKP
sCZ
sCZ
eGM
@@ -177721,7 +177717,7 @@ hTa
txj
nyX
jjx
-tLd
+oOF
hjM
lAA
lAA
@@ -180537,7 +180533,7 @@ nxM
dTm
ofJ
hjM
-gHM
+gkx
eNm
hjM
ugs
@@ -180797,7 +180793,7 @@ hjM
hjM
hjM
hjM
-eHh
+bAA
vaZ
ubI
hOk
@@ -181824,10 +181820,10 @@ iiR
aZd
rqI
xDb
-dWQ
+sHW
eYR
pGS
-kpQ
+cdf
nKK
xDb
xMq
@@ -182826,7 +182822,7 @@ nPU
aTm
fYh
oXe
-hjF
+gJp
gGJ
vUi
dMS
@@ -183083,7 +183079,7 @@ rxY
fzK
bjZ
tAe
-dCX
+eVS
qYo
hxg
dMS
@@ -191554,7 +191550,7 @@ fsO
tBs
tWc
tBs
-qik
+bTj
wrX
umF
cUk
@@ -223430,7 +223426,7 @@ qqz
aUr
hNL
jbh
-goZ
+mcx
pqa
ejW
cVd
@@ -223676,7 +223672,7 @@ lJO
sEx
mcX
awh
-jqY
+fVH
lJO
anl
lJO
@@ -224724,7 +224720,7 @@ nwT
hkb
aaT
fFT
-poV
+uiy
bPw
tKI
sIM
@@ -224967,7 +224963,7 @@ mCT
qSa
mCT
gbS
-cPk
+eDT
oCO
hed
lYJ
@@ -225740,7 +225736,7 @@ eBB
nxV
nor
qiT
-qgD
+uve
hjv
gpp
tSN
@@ -226510,7 +226506,7 @@ urt
mCT
fzF
mAV
-aQD
+hOj
psr
oCO
wpO
@@ -228882,7 +228878,7 @@ bln
pRj
dMO
uVa
-ogh
+ftf
wAW
ktS
nxm
@@ -231194,7 +231190,7 @@ pXv
kNZ
pRj
bxV
-knK
+bnn
iaT
sOl
lLm
@@ -231392,7 +231388,7 @@ ybQ
egF
jYV
jDW
-tuJ
+gBd
ybQ
bln
jOt
@@ -231412,7 +231408,7 @@ dkf
qTp
ePs
gOJ
-xMU
+rzY
rbC
kXr
hrJ
@@ -239327,11 +239323,11 @@ jDt
wtg
loI
ehy
-fNu
+lzY
mgU
fLX
kcc
-xCW
+ukv
oIC
jjt
tpj
@@ -241184,7 +241180,7 @@ xLF
lpM
oGQ
wKw
-wvd
+pci
mhQ
hUV
tgA
@@ -241196,7 +241192,7 @@ rpG
jtY
xVK
tfx
-jca
+wes
fVS
cvS
gDp
@@ -242426,7 +242422,7 @@ skl
skl
skl
skl
-wVh
+lJT
tnP
cIK
jOQ
@@ -242683,9 +242679,9 @@ skl
pwx
deY
skl
-pBy
+jeg
xlH
-bqE
+ePV
jOQ
skl
ygB
@@ -242700,7 +242696,7 @@ uja
oiz
ehm
uja
-mKa
+tFD
chB
twU
uja
@@ -242942,7 +242938,7 @@ fhz
skl
jVb
tnP
-wmf
+sni
jOQ
skl
dnk
@@ -243214,7 +243210,7 @@ vmp
vmp
kxN
uja
-vgz
+twp
oUG
hsB
uja
@@ -243728,7 +243724,7 @@ mqy
mqy
tUn
uja
-vda
+cbu
mfz
twU
uja
@@ -243752,11 +243748,11 @@ jqE
fjK
sAT
azw
-nlq
-ajA
-uSW
-xCo
-twb
+hrs
+lDi
+pTv
+kZf
+yin
cvS
pjF
nhw
@@ -244262,15 +244258,15 @@ lso
dEV
ieZ
azw
-pse
+jMg
vPV
fHk
azw
tJV
-vnM
+gVA
tyf
hMH
-xSj
+hnW
cvS
dDC
gXm
@@ -244780,7 +244776,7 @@ opz
eyc
dCo
kuX
-hYk
+ect
dmI
hbC
veU
@@ -246063,7 +246059,7 @@ bai
azw
dmI
qMv
-mfb
+qEO
azw
fNA
eqp
@@ -246327,7 +246323,7 @@ iBj
mcW
sFG
lwQ
-usm
+cKQ
cyo
kpO
lup
@@ -246820,10 +246816,10 @@ pyj
lnq
hnf
bdP
-rCs
+tet
fAc
pxs
-sXj
+gzI
eCA
ihf
uMu
@@ -248101,7 +248097,7 @@ kQX
vLn
mdZ
wbB
-ubX
+cXz
eBa
qZB
ftM
@@ -248126,7 +248122,7 @@ qPu
niu
xoy
lwQ
-xkL
+qOu
oeW
aTZ
fle
@@ -248134,12 +248130,12 @@ pyu
qLo
tWL
rsR
-sYI
+cKY
vtk
kQM
upO
tQc
-bZS
+fVV
ubq
lfL
cYR
@@ -248622,7 +248618,7 @@ gtw
jQo
vMq
eUw
-eYD
+fkE
fkk
bPL
cpY
@@ -248872,14 +248868,14 @@ rrx
nIr
mdZ
fRJ
-ubX
+cXz
son
qZB
gtw
bDe
xbn
-rdD
-eGf
+rVh
+wZV
fkk
bpG
onv
@@ -249380,7 +249376,7 @@ gmW
bln
kKL
bgG
-tNZ
+iUr
kKL
hfh
bQr
@@ -249436,7 +249432,7 @@ hRA
kIu
rkL
uFz
-kJC
+qrZ
sZF
edT
wRr
@@ -249894,7 +249890,7 @@ lli
lli
bMF
ojV
-sUA
+ung
kKL
lli
lAG
@@ -249949,8 +249945,8 @@ fFJ
hRA
sHD
dnc
-sfM
-tsZ
+mrr
+mXF
sZF
sKf
mlo
@@ -250166,7 +250162,7 @@ cSQ
kKL
kKl
beT
-nCB
+vdF
giD
kKL
bws
@@ -250703,7 +250699,7 @@ rHz
fdY
xuM
ixd
-skN
+rSQ
ufN
sVm
dDw
@@ -250715,7 +250711,7 @@ cqj
qyf
mia
mFE
-jhK
+fpu
dmO
rYL
nAN
@@ -251262,7 +251258,7 @@ vYq
fWS
weR
jdJ
-dqb
+dht
jAQ
bln
bln
@@ -251519,7 +251515,7 @@ vYq
iAf
qPY
tUh
-dqb
+dht
jAQ
bln
bln
@@ -251691,7 +251687,7 @@ hOu
orf
hJx
lli
-wLp
+vNU
kKL
kKL
mMb
@@ -252205,7 +252201,7 @@ weF
orf
kKL
moF
-rIM
+gtk
kKL
dCA
atM
@@ -254320,7 +254316,7 @@ tJe
tDX
feZ
eJv
-bkm
+btc
owS
jkt
ccQ
@@ -254543,7 +254539,7 @@ cjl
rqT
ult
ult
-jvk
+dCq
rIU
jrZ
gqm
@@ -254772,7 +254768,7 @@ laY
kKL
kKL
lli
-odD
+tyt
hVo
hJx
lIC
@@ -256567,7 +256563,7 @@ pDe
fYj
meQ
vve
-slL
+sGe
kKL
mqO
fUc
@@ -256824,7 +256820,7 @@ fOz
gsH
kKL
qNu
-hHm
+anS
kKL
lUC
lUC
@@ -256907,7 +256903,7 @@ jOj
jOj
vzD
cef
-mYI
+mTw
uCo
lkO
kPw
@@ -257081,7 +257077,7 @@ dxs
pVi
kKL
fLb
-dCq
+uCL
kKL
nwd
epd
@@ -258152,7 +258148,7 @@ sut
tia
qNn
pOf
-mhp
+vfA
krY
clo
bUa
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index 97aa0128570..f848cf688be 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -1478,7 +1478,7 @@
/area/station/maintenance/disposal/incinerator)
"arX" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/drinkingglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass,
/obj/structure/cable,
/turf/open/floor/iron/white,
/area/station/security/prison/mess)
@@ -3278,7 +3278,7 @@
name = "Trash Chute";
req_access = list("janitor")
},
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/mop,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
@@ -4140,7 +4140,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/directional/north,
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -5535,7 +5535,7 @@
dir = 4
},
/obj/structure/sink/directional/west,
-/obj/item/reagent_containers/glass/watering_can,
+/obj/item/reagent_containers/cup/watering_can,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -7790,10 +7790,10 @@
dir = 4
},
/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,
@@ -9827,7 +9827,7 @@
"cXg" = (
/obj/structure/reagent_dispensers/watertank/high,
/obj/structure/railing,
-/obj/item/reagent_containers/glass/watering_can,
+/obj/item/reagent_containers/cup/watering_can,
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/service/hydroponics)
@@ -10798,7 +10798,7 @@
},
/obj/effect/turf_decal/tile/purple,
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/mug/coco,
+/obj/item/reagent_containers/cup/glass/mug/coco,
/turf/open/floor/iron/showroomfloor,
/area/station/command/heads_quarters/rd)
"dlI" = (
@@ -11309,15 +11309,15 @@
/area/station/maintenance/port/lesser)
"drM" = (
/obj/structure/closet/crate,
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
/obj/effect/spawner/random/contraband/prison,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
/obj/item/kitchen/fork/plastic,
/obj/item/kitchen/fork/plastic,
/obj/item/kitchen/fork/plastic,
@@ -11376,7 +11376,7 @@
dir = 1
},
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
pixel_x = 9;
pixel_y = 3
},
@@ -14208,7 +14208,7 @@
pixel_x = 4;
pixel_y = 4
},
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
/obj/structure/disposalpipe/segment{
dir = 10
},
@@ -16595,7 +16595,7 @@
/area/station/service/chapel)
"eUd" = (
/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
@@ -18051,17 +18051,17 @@
"fnZ" = (
/obj/structure/table,
/obj/machinery/light/directional/north,
-/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{
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/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;
@@ -20125,7 +20125,7 @@
},
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/tile/neutral,
-/obj/item/reagent_containers/food/drinks/shaker{
+/obj/item/reagent_containers/cup/glass/shaker{
pixel_x = 5
},
/obj/machinery/light_switch/directional/west{
@@ -23139,8 +23139,8 @@
"gFL" = (
/obj/structure/table,
/obj/item/storage/fancy/egg_box,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/rice,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/rice,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -27657,7 +27657,7 @@
/obj/structure/sink/directional/south,
/obj/effect/decal/cleanable/dirt,
/obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/disposal)
@@ -28108,7 +28108,7 @@
"hVZ" = (
/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/turf_decal/tile/neutral{
dir = 8
@@ -28472,7 +28472,7 @@
/obj/effect/turf_decal/siding/green{
dir = 4
},
-/obj/item/reagent_containers/glass/watering_can,
+/obj/item/reagent_containers/cup/watering_can,
/turf/open/floor/iron/dark,
/area/station/service/hydroponics/garden)
"ibm" = (
@@ -29518,7 +29518,7 @@
"ipL" = (
/obj/structure/closet/crate/hydroponics,
/obj/item/crowbar/red,
-/obj/item/reagent_containers/glass/watering_can,
+/obj/item/reagent_containers/cup/watering_can,
/obj/item/circuitboard/machine/biogenerator,
/obj/item/wirecutters,
/obj/item/wrench,
@@ -31179,7 +31179,7 @@
/area/station/science/ordnance/office)
"iKT" = (
/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/layer4,
/turf/open/floor/iron/grimy,
/area/station/service/chapel/office)
@@ -33830,7 +33830,7 @@
dir = 10
},
/obj/machinery/firealarm/directional/west,
-/obj/item/reagent_containers/food/drinks/bottle/wine/unlabeled,
+/obj/item/reagent_containers/cup/glass/bottle/wine/unlabeled,
/turf/open/floor/carpet/royalblue,
/area/station/service/chapel/office)
"jBr" = (
@@ -34342,16 +34342,16 @@
dir = 8
},
/obj/effect/turf_decal/tile/yellow,
-/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
},
/obj/item/reagent_containers/dropper{
@@ -37597,7 +37597,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 8
},
-/obj/item/reagent_containers/food/drinks/trophy/bronze_cup,
+/obj/item/reagent_containers/cup/glass/trophy/bronze_cup,
/obj/machinery/camera/autoname/directional/west,
/turf/open/floor/carpet/royalblue,
/area/station/service/chapel/office)
@@ -38334,7 +38334,7 @@
"kTe" = (
/obj/structure/table/glass,
/obj/item/storage/medkit/regular,
-/obj/item/reagent_containers/glass/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
/obj/item/reagent_containers/syringe,
/obj/machinery/camera/directional/east{
c_tag = "Security Infirmary"
@@ -38950,7 +38950,7 @@
/area/station/hallway/primary/central/fore)
"laE" = (
/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/plating,
/area/station/maintenance/department/bridge)
@@ -39885,7 +39885,7 @@
/obj/item/multitool{
pixel_x = 4
},
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
"lql" = (
@@ -41071,11 +41071,11 @@
/turf/open/floor/carpet,
/area/station/medical/psychology)
"lFS" = (
-/obj/item/reagent_containers/food/drinks/bottle/rum{
+/obj/item/reagent_containers/cup/glass/bottle/rum{
pixel_x = -7;
pixel_y = 2
},
-/obj/item/reagent_containers/food/drinks/colocup{
+/obj/item/reagent_containers/cup/glass/colocup{
pixel_x = 3;
pixel_y = 3
},
@@ -43882,17 +43882,17 @@
dir = 8
},
/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 = 8;
pixel_y = 2
},
/obj/item/reagent_containers/dropper,
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -4;
pixel_y = 12
},
-/obj/item/reagent_containers/glass/bottle/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = 7;
pixel_y = 12
},
@@ -48116,12 +48116,12 @@
"nIw" = (
/obj/structure/cable,
/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
@@ -52589,7 +52589,7 @@
dir = 9
},
/obj/machinery/airalarm/directional/west,
-/obj/item/reagent_containers/food/drinks/bottle/wine/unlabeled,
+/obj/item/reagent_containers/cup/glass/bottle/wine/unlabeled,
/turf/open/floor/carpet/royalblue,
/area/station/service/chapel/office)
"pal" = (
@@ -54001,10 +54001,10 @@
id = "kitchenshutters";
name = "Kitchen Shutters"
},
-/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,
@@ -55832,7 +55832,7 @@
/area/station/hallway/primary/central)
"pVS" = (
/obj/structure/closet/secure_closet/freezer/kitchen,
-/obj/item/reagent_containers/food/condiment/sugar,
+/obj/item/reagent_containers/condiment/sugar,
/obj/effect/turf_decal/bot,
/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/iron/freezer,
@@ -57348,18 +57348,18 @@
/obj/item/clipboard{
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
},
-/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
},
/obj/item/reagent_containers/dropper,
@@ -60873,7 +60873,7 @@
/obj/item/folder/white,
/obj/item/stack/sheet/mineral/plasma,
/obj/item/stack/sheet/mineral/plasma,
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -6
},
/obj/item/reagent_containers/syringe,
@@ -60953,10 +60953,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,
@@ -62203,7 +62203,7 @@
/area/station/tcommsat/computer)
"rLs" = (
/obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/watering_can,
+/obj/item/reagent_containers/cup/watering_can,
/obj/effect/turf_decal/tile/green{
dir = 1
},
@@ -64104,15 +64104,15 @@
/area/station/command/heads_quarters/ce)
"snW" = (
/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/bottle/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";
@@ -64174,12 +64174,12 @@
/area/station/maintenance/central)
"soZ" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
layer = 3.1;
pixel_x = -2;
pixel_y = 2
},
-/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
@@ -64677,19 +64677,19 @@
/turf/open/floor/iron/grimy,
/area/station/service/chapel/office)
"swA" = (
-/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/structure/table/wood,
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable,
@@ -70490,11 +70490,11 @@
dir = 1
},
/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
},
@@ -70760,8 +70760,8 @@
/obj/effect/turf_decal/siding/green{
dir = 8
},
-/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
},
@@ -70787,11 +70787,11 @@
/area/station/hallway/primary/central)
"ufD" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
pixel_x = -2;
pixel_y = 6
},
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
/obj/item/food/pie/cream{
pixel_y = -4
},
@@ -73223,7 +73223,7 @@
pixel_y = 6
},
/obj/item/knife/kitchen,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
@@ -74294,7 +74294,7 @@
/area/station/security/checkpoint/supply)
"vhf" = (
/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"
},
@@ -74585,7 +74585,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot,
/obj/structure/sink/directional/east,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/mop,
/obj/effect/turf_decal/stripes/corner,
/obj/machinery/button/door/directional/south{
@@ -77189,7 +77189,7 @@
"vTs" = (
/obj/machinery/hydroponics/constructable,
/obj/item/seeds/apple,
-/obj/item/reagent_containers/glass/bottle/nutrient/l4z,
+/obj/item/reagent_containers/cup/bottle/nutrient/l4z,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/directional/south,
/turf/open/floor/plating,
@@ -78621,17 +78621,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/directional/south{
@@ -84771,9 +84771,9 @@
/area/station/commons/storage/art)
"xZn" = (
/obj/machinery/firealarm/directional/west,
-/obj/item/reagent_containers/glass/bottle/ammonia,
+/obj/item/reagent_containers/cup/bottle/ammonia,
/obj/structure/rack,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/mop,
/obj/item/watertank/janitor,
/turf/open/floor/iron/grimy,
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index f6a40a90d41..4a3d2915886 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -2106,7 +2106,7 @@
/obj/item/crowbar,
/obj/machinery/light/directional/north,
/obj/item/plant_analyzer,
-/obj/item/reagent_containers/glass/watering_can,
+/obj/item/reagent_containers/cup/watering_can,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
@@ -3445,7 +3445,7 @@
},
/obj/item/clothing/mask/surgical,
/obj/item/clothing/suit/apron/surgical,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
/turf/open/floor/iron/white,
/area/station/medical/abandoned)
"bje" = (
@@ -3749,7 +3749,7 @@
/obj/structure/closet/crate/hydroponics,
/obj/item/shovel/spade,
/obj/item/wrench,
-/obj/item/reagent_containers/glass/watering_can,
+/obj/item/reagent_containers/cup/watering_can,
/obj/item/cultivator,
/obj/item/wirecutters,
/obj/machinery/airalarm/directional/south,
@@ -4091,17 +4091,17 @@
/area/station/maintenance/solars/port/fore)
"btH" = (
/obj/structure/table,
-/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,
/obj/item/reagent_containers/dropper,
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -4;
pixel_y = 12
},
-/obj/item/reagent_containers/glass/bottle/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = 7;
pixel_y = 12
},
@@ -5393,12 +5393,12 @@
/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/dropper,
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_x = -3;
pixel_y = 3
},
@@ -6511,21 +6511,21 @@
/area/station/solars/port/aft)
"cwa" = (
/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
@@ -6946,15 +6946,15 @@
/area/station/science/robotics/lab)
"cCM" = (
/obj/structure/lattice/catwalk,
-/obj/item/reagent_containers/food/drinks/bottle/rum{
+/obj/item/reagent_containers/cup/glass/bottle/rum{
pixel_x = -7;
pixel_y = 2
},
-/obj/item/reagent_containers/food/drinks/colocup{
+/obj/item/reagent_containers/cup/glass/colocup{
pixel_x = 3;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/colocup{
+/obj/item/reagent_containers/cup/glass/colocup{
pixel_x = 6;
pixel_y = -4
},
@@ -7087,7 +7087,7 @@
pixel_x = 6;
pixel_y = 6
},
-/obj/item/reagent_containers/food/drinks/shaker{
+/obj/item/reagent_containers/cup/glass/shaker{
pixel_x = -6
},
/obj/machinery/camera/directional/south{
@@ -7676,7 +7676,7 @@
"cTl" = (
/obj/structure/table/glass,
/obj/item/reagent_containers/syringe,
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
pixel_y = 6
},
/obj/effect/turf_decal/trimline/blue/filled/line{
@@ -9149,7 +9149,7 @@
/area/station/engineering/atmos/storage/gas)
"dsE" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 10
},
/obj/item/flashlight/lamp{
@@ -9451,7 +9451,7 @@
dir = 1
},
/obj/structure/extinguisher_cabinet/directional/south,
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
pixel_y = 2
},
/turf/open/floor/iron,
@@ -9961,7 +9961,7 @@
/turf/open/space/basic,
/area/space/nearstation)
"dJT" = (
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
/obj/structure/table/wood,
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/wood,
@@ -10066,7 +10066,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/rack,
/obj/item/reagent_containers/blood/random,
-/obj/item/reagent_containers/food/drinks/bottle/vodka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka,
/turf/open/floor/iron/white,
/area/station/medical/abandoned)
"dLu" = (
@@ -11749,7 +11749,7 @@
/obj/item/stack/spacecash/c1{
pixel_y = 9
},
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
/obj/structure/table/reinforced{
name = "Jim Norton's Quebecois Coffee table"
},
@@ -12015,27 +12015,27 @@
/turf/open/floor/wood,
/area/station/service/library)
"esd" = (
-/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
},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = -5;
pixel_y = 2
},
/obj/structure/table/wood,
/obj/structure/light_construct/small/directional/north,
/obj/machinery/newscaster/directional/north,
-/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,
/turf/open/floor/wood,
/area/station/maintenance/port/aft)
"ese" = (
@@ -12120,15 +12120,15 @@
/area/station/engineering/atmos)
"ett" = (
/obj/structure/rack,
-/obj/item/reagent_containers/glass/bottle/acidic_buffer{
+/obj/item/reagent_containers/cup/bottle/acidic_buffer{
pixel_x = 7;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/bottle/basic_buffer{
+/obj/item/reagent_containers/cup/bottle/basic_buffer{
pixel_x = -5;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/bottle/formaldehyde{
+/obj/item/reagent_containers/cup/bottle/formaldehyde{
pixel_x = 1
},
/obj/structure/sign/warning/chem_diamond/directional/north,
@@ -13480,7 +13480,7 @@
/turf/open/floor/iron/white,
/area/station/medical/surgery/theatre)
"eWy" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/structure/reagent_dispensers/watertank,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
@@ -17085,7 +17085,7 @@
/obj/item/hatchet,
/obj/item/cultivator,
/obj/item/crowbar,
-/obj/item/reagent_containers/glass/watering_can,
+/obj/item/reagent_containers/cup/watering_can,
/obj/item/plant_analyzer,
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -18257,8 +18257,8 @@
"gMg" = (
/obj/structure/table,
/obj/item/storage/medkit/regular,
-/obj/item/reagent_containers/glass/bottle/epinephrine,
-/obj/item/reagent_containers/glass/bottle/multiver,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/multiver,
/obj/item/reagent_containers/syringe,
/obj/structure/extinguisher_cabinet/directional/west,
/obj/effect/turf_decal/trimline/blue/filled/line{
@@ -18425,7 +18425,7 @@
"gOS" = (
/obj/structure/cable,
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/dropper,
/obj/machinery/camera/directional/north{
@@ -18971,11 +18971,11 @@
pixel_x = 3;
pixel_y = 4
},
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_x = -4;
pixel_y = 7
},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 7
},
/obj/item/reagent_containers/dropper{
@@ -19838,15 +19838,15 @@
name = "Pharmacy Desk";
req_access = list("medical")
},
-/obj/item/reagent_containers/glass/bottle/morphine,
-/obj/item/reagent_containers/glass/bottle/toxin{
+/obj/item/reagent_containers/cup/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/toxin{
pixel_x = 5;
pixel_y = 4
},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = 8
},
-/obj/item/reagent_containers/glass/bottle/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = -5
},
/obj/item/reagent_containers/syringe/epinephrine,
@@ -19895,7 +19895,7 @@
/obj/item/storage/bag/plants/portaseeder,
/obj/item/plant_analyzer,
/obj/item/cultivator,
-/obj/item/reagent_containers/glass/watering_can,
+/obj/item/reagent_containers/cup/watering_can,
/obj/structure/rack,
/obj/item/vending_refill/hydroseeds,
/turf/open/floor/plating,
@@ -22429,11 +22429,11 @@
"ikO" = (
/obj/machinery/newscaster/directional/north,
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 4;
pixel_y = 4
},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = -5;
pixel_y = 6
},
@@ -23917,11 +23917,11 @@
/obj/structure/table{
name = "Jim Norton's Quebecois Coffee table"
},
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee{
pixel_x = -3;
pixel_y = 9
},
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee{
pixel_x = 5;
pixel_y = 12
},
@@ -25609,7 +25609,7 @@
/area/station/medical/chemistry)
"jgW" = (
/obj/structure/rack,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/mop,
/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
@@ -26362,7 +26362,7 @@
/obj/item/kitchen/rollingpin,
/obj/effect/turf_decal/trimline/brown/warning,
/obj/machinery/camera/directional/north,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
/obj/effect/turf_decal/tile/bar{
dir = 1
},
@@ -26522,19 +26522,19 @@
/obj/effect/turf_decal/tile/blue/fourcorners,
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable,
-/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
},
-/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
},
@@ -27678,7 +27678,7 @@
"jRh" = (
/obj/structure/table/glass,
/obj/item/reagent_containers/syringe,
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
pixel_y = 6
},
/obj/machinery/camera/directional/north{
@@ -27790,7 +27790,7 @@
/obj/item/book/granter/action/spell/smoke/lesser{
name = "mysterious old book of cloud-chasing"
},
-/obj/item/reagent_containers/food/drinks/bottle/holywater{
+/obj/item/reagent_containers/cup/glass/bottle/holywater{
pixel_x = -2;
pixel_y = 2
},
@@ -28666,11 +28666,11 @@
"klj" = (
/obj/machinery/light/small/directional/north,
/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/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = -4;
pixel_y = -3
},
@@ -28679,7 +28679,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
},
@@ -29998,16 +29998,16 @@
/turf/open/floor/iron/white,
/area/station/security/prison)
"kKT" = (
-/obj/item/reagent_containers/glass/bottle/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = 7;
pixel_y = 12
},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -4;
pixel_y = 12
},
-/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 = 8;
pixel_y = 2
},
@@ -31031,22 +31031,22 @@
/area/station/maintenance/aft/greater)
"lar" = (
/obj/structure/noticeboard/directional/north,
-/obj/item/reagent_containers/food/condiment/milk{
+/obj/item/reagent_containers/condiment/milk{
pixel_x = 6;
pixel_y = 8
},
-/obj/item/reagent_containers/food/condiment/sugar{
+/obj/item/reagent_containers/condiment/sugar{
pixel_y = 4
},
-/obj/item/reagent_containers/food/condiment/soymilk{
+/obj/item/reagent_containers/condiment/soymilk{
pixel_x = -6;
pixel_y = 8
},
-/obj/item/reagent_containers/food/drinks/ice{
+/obj/item/reagent_containers/cup/glass/ice{
pixel_x = -4;
pixel_y = -2
},
-/obj/item/reagent_containers/food/drinks/bottle/cream{
+/obj/item/reagent_containers/cup/glass/bottle/juice/cream{
pixel_x = 3;
pixel_y = -2
},
@@ -31202,8 +31202,8 @@
"lds" = (
/obj/structure/table,
/obj/item/storage/fancy/egg_box,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/rice,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/rice,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -31269,15 +31269,15 @@
/area/station/engineering/break_room)
"lfk" = (
/obj/structure/rack,
-/obj/item/reagent_containers/glass/bottle/phosphorus{
+/obj/item/reagent_containers/cup/bottle/phosphorus{
pixel_x = -5;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/bottle/potassium{
+/obj/item/reagent_containers/cup/bottle/potassium{
pixel_x = 7;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/bottle/sodium{
+/obj/item/reagent_containers/cup/bottle/sodium{
pixel_x = 1
},
/turf/open/floor/iron/dark/textured_edge{
@@ -31740,9 +31740,9 @@
/turf/open/floor/plating,
/area/station/hallway/primary/fore)
"lnM" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/mop,
-/obj/item/reagent_containers/glass/bottle/ammonia,
+/obj/item/reagent_containers/cup/bottle/ammonia,
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/security/prison/safe)
@@ -33704,7 +33704,7 @@
/area/station/hallway/secondary/exit/departure_lounge)
"lZM" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/carpet,
/area/station/command/heads_quarters/captain/private)
@@ -34611,10 +34611,10 @@
/obj/structure/table,
/obj/item/food/mint,
/obj/item/kitchen/rollingpin,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
layer = 5
},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 5
},
/turf/open/floor/iron/cafeteria{
@@ -36237,16 +36237,16 @@
"mVf" = (
/obj/structure/table/glass,
/obj/item/reagent_containers/dropper,
-/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/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -4;
pixel_y = 12
},
-/obj/item/reagent_containers/glass/bottle/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = 7;
pixel_y = 12
},
@@ -37266,7 +37266,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,
/area/station/command/heads_quarters/captain/private)
"nnn" = (
@@ -37905,7 +37905,7 @@
/obj/effect/landmark/navigate_destination/bar,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
/obj/structure/table,
/turf/open/floor/iron,
/area/station/service/bar)
@@ -39032,7 +39032,7 @@
/area/station/commons/fitness/recreation)
"nUr" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
pixel_x = -6;
pixel_y = 11
},
@@ -39237,8 +39237,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
},
@@ -39343,15 +39343,15 @@
pixel_y = 3
},
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -11;
pixel_y = 14
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -6;
pixel_y = 10
},
-/obj/item/reagent_containers/glass/rag{
+/obj/item/reagent_containers/cup/rag{
pixel_x = -10;
pixel_y = 4
},
@@ -40470,7 +40470,7 @@
/area/station/hallway/primary/central)
"out" = (
/obj/structure/lattice,
-/obj/item/reagent_containers/food/drinks/bottle/goldschlager,
+/obj/item/reagent_containers/cup/glass/bottle/goldschlager,
/turf/open/space/basic,
/area/space/nearstation)
"ouM" = (
@@ -40681,7 +40681,7 @@
"oxf" = (
/obj/structure/table,
/obj/structure/sign/departments/medbay/directional/north,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/turf/open/floor/plating,
/area/station/maintenance/starboard/lesser)
"oxx" = (
@@ -41339,7 +41339,7 @@
"oJr" = (
/obj/machinery/airalarm/directional/west,
/obj/structure/rack,
-/obj/item/reagent_containers/glass/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine,
/obj/item/storage/box/chemimp{
pixel_x = 4;
pixel_y = 3
@@ -42612,15 +42612,15 @@
/area/station/commons/fitness/recreation)
"piT" = (
/obj/structure/rack,
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = -5;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/bottle/fluorine{
+/obj/item/reagent_containers/cup/bottle/fluorine{
pixel_x = 7;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/bottle/iodine{
+/obj/item/reagent_containers/cup/bottle/iodine{
pixel_x = 1
},
/turf/open/floor/iron/dark/textured_edge{
@@ -45456,9 +45456,9 @@
/area/station/maintenance/starboard/aft)
"qkm" = (
/obj/structure/closet/crate/freezer,
-/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy,
-/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy,
-/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy,
+/obj/item/reagent_containers/cup/soda_cans/monkey_energy,
+/obj/item/reagent_containers/cup/soda_cans/monkey_energy,
+/obj/item/reagent_containers/cup/soda_cans/monkey_energy,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"qko" = (
@@ -46797,7 +46797,7 @@
"qIB" = (
/obj/structure/closet,
/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
desc = "Takes you to a whole new level of thinking.";
name = "Meta-Cider"
},
@@ -46966,7 +46966,7 @@
/area/station/commons/vacant_room/office)
"qLR" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_y = 5
},
/obj/item/reagent_containers/dropper{
@@ -47173,11 +47173,11 @@
/area/station/security/prison/safe)
"qOV" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = 7;
pixel_y = 9
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 7;
pixel_y = 5
},
@@ -47599,7 +47599,7 @@
"qVM" = (
/obj/structure/table,
/obj/item/storage/bag/plants,
-/obj/item/reagent_containers/glass/watering_can,
+/obj/item/reagent_containers/cup/watering_can,
/obj/machinery/light/directional/north,
/obj/effect/turf_decal/trimline/brown/warning{
dir = 10
@@ -50651,7 +50651,7 @@
/area/station/medical/virology)
"rVb" = (
/obj/structure/sink/directional/west,
-/obj/item/reagent_containers/glass/watering_can,
+/obj/item/reagent_containers/cup/watering_can,
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 4
},
@@ -50871,15 +50871,15 @@
/area/station/medical/pharmacy)
"rYR" = (
/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
},
@@ -51499,17 +51499,17 @@
"sku" = (
/obj/structure/table,
/obj/structure/window,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
layer = 3.1;
pixel_x = -2;
pixel_y = 2
},
-/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/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
pixel_x = 9;
pixel_y = 3
},
@@ -51751,15 +51751,15 @@
/area/station/science/research)
"sqb" = (
/obj/structure/rack,
-/obj/item/reagent_containers/glass/bottle/ethanol{
+/obj/item/reagent_containers/cup/bottle/ethanol{
pixel_x = -5;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/bottle/carbon{
+/obj/item/reagent_containers/cup/bottle/carbon{
pixel_x = 7;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/bottle/chlorine{
+/obj/item/reagent_containers/cup/bottle/chlorine{
pixel_x = 1
},
/obj/machinery/light/directional/east,
@@ -52044,15 +52044,15 @@
departmentType = 2;
name = "Quartermaster's Requests Console"
},
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
pixel_x = -5;
pixel_y = 4
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = 2;
pixel_y = -4
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -9;
pixel_y = -4
},
@@ -53644,7 +53644,7 @@
"sWe" = (
/obj/structure/cable,
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/dropper,
/turf/open/floor/iron/white,
@@ -53847,13 +53847,13 @@
/area/station/engineering/atmospherics_engine)
"sZK" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 8;
pixel_y = 2
},
/obj/item/reagent_containers/dropper,
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/turf/open/floor/wood,
/area/station/maintenance/port/aft)
"sZN" = (
@@ -54120,7 +54120,7 @@
/obj/item/cultivator,
/obj/item/crowbar,
/obj/item/plant_analyzer,
-/obj/item/reagent_containers/glass/watering_can,
+/obj/item/reagent_containers/cup/watering_can,
/obj/structure/table/glass,
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 10
@@ -56088,10 +56088,10 @@
/area/station/security/prison/safe)
"tMK" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
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/siding/white/corner{
dir = 8
@@ -56202,7 +56202,7 @@
/area/station/commons/vacant_room/office)
"tOQ" = (
/obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/watering_can,
+/obj/item/reagent_containers/cup/watering_can,
/obj/effect/turf_decal/stripes/line,
/obj/machinery/light/directional/north,
/turf/open/floor/iron,
@@ -57420,7 +57420,7 @@
"ukv" = (
/obj/structure/rack,
/obj/item/clothing/mask/gas,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
@@ -57438,10 +57438,10 @@
/area/station/hallway/secondary/service)
"uky" = (
/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/tile/bar,
@@ -57503,15 +57503,15 @@
/area/station/science/xenobiology/hallway)
"umN" = (
/obj/structure/closet/crate,
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
/obj/effect/spawner/random/contraband/prison,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
/obj/item/kitchen/fork/plastic,
/obj/item/kitchen/fork/plastic,
/obj/item/kitchen/fork/plastic,
@@ -59938,10 +59938,10 @@
"vdX" = (
/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/preopen{
@@ -60436,18 +60436,18 @@
"vmm" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = 5;
pixel_y = 20
},
-/obj/item/reagent_containers/food/drinks/waterbottle{
+/obj/item/reagent_containers/cup/glass/waterbottle{
pixel_x = 7;
pixel_y = 6
},
/obj/item/plate{
pixel_x = -9
},
-/obj/item/reagent_containers/food/drinks/waterbottle{
+/obj/item/reagent_containers/cup/glass/waterbottle{
pixel_x = 7
},
/obj/effect/spawner/random/food_or_drink/donkpockets{
@@ -63205,7 +63205,7 @@
},
/obj/machinery/light/directional/north,
/obj/item/radio/intercom/directional/north,
-/obj/item/reagent_containers/food/drinks/mug{
+/obj/item/reagent_containers/cup/glass/mug{
pixel_x = -4;
pixel_y = 4
},
@@ -63588,15 +63588,15 @@
/area/station/science/robotics/mechbay)
"wrY" = (
/obj/structure/window/reinforced,
-/obj/item/reagent_containers/food/drinks/mug/coco{
+/obj/item/reagent_containers/cup/glass/mug/coco{
pixel_x = -2;
pixel_y = 4
},
-/obj/item/reagent_containers/food/drinks/mug/tea{
+/obj/item/reagent_containers/cup/glass/mug/tea{
pixel_x = 4;
pixel_y = 2
},
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee{
pixel_x = -3
},
/obj/structure/table/reinforced{
@@ -63699,15 +63699,15 @@
/area/station/hallway/secondary/exit/departure_lounge)
"wsW" = (
/obj/structure/rack,
-/obj/item/reagent_containers/glass/bottle/mercury{
+/obj/item/reagent_containers/cup/bottle/mercury{
pixel_x = -5;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/bottle/nitrogen{
+/obj/item/reagent_containers/cup/bottle/nitrogen{
pixel_x = 7;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/bottle/oxygen{
+/obj/item/reagent_containers/cup/bottle/oxygen{
pixel_x = 1
},
/turf/open/floor/iron/dark/textured_edge{
@@ -64612,15 +64612,15 @@
/area/station/commons/locker)
"wLz" = (
/obj/structure/rack,
-/obj/item/reagent_containers/glass/bottle/iron{
+/obj/item/reagent_containers/cup/bottle/iron{
pixel_x = -5;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/bottle/lithium{
+/obj/item/reagent_containers/cup/bottle/lithium{
pixel_x = 7;
pixel_y = 3
},
-/obj/item/reagent_containers/glass/bottle/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = 1
},
/turf/open/floor/iron/dark/textured_edge{
@@ -64751,7 +64751,7 @@
"wOy" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/sink/directional/west,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/mop,
/turf/open/floor/iron,
/area/station/service/janitor)
@@ -65191,7 +65191,7 @@
/turf/open/floor/iron/white,
/area/station/science/explab)
"wVO" = (
-/obj/item/reagent_containers/glass/bottle/toxin{
+/obj/item/reagent_containers/cup/bottle/toxin{
pixel_x = 4;
pixel_y = 2
},
@@ -65619,7 +65619,7 @@
/area/station/maintenance/starboard/greater)
"xdR" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/drinkingglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -65628,7 +65628,7 @@
/turf/open/floor/iron/white,
/area/station/security/prison/mess)
"xdV" = (
-/obj/item/reagent_containers/food/drinks/bottle/wine/unlabeled,
+/obj/item/reagent_containers/cup/glass/bottle/wine/unlabeled,
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating/airless,
/area/space/nearstation)
@@ -66713,7 +66713,7 @@
dir = 4
},
/obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/watering_can,
+/obj/item/reagent_containers/cup/watering_can,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron,
/area/station/service/hydroponics)
@@ -67299,12 +67299,12 @@
/area/station/medical/medbay/lobby)
"xIK" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
layer = 5;
pixel_x = -7;
pixel_y = 13
},
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour{
pixel_x = 1
},
/turf/open/floor/plating,
@@ -67354,8 +67354,8 @@
dir = 8
},
/obj/structure/table/glass,
-/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 = 8;
pixel_y = 2
},
diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm
index 065016c056c..37dda6ef208 100644
--- a/_maps/map_files/Mining/Lavaland.dmm
+++ b/_maps/map_files/Mining/Lavaland.dmm
@@ -204,6 +204,18 @@
},
/turf/open/floor/plating,
/area/mine/maintenance/production)
+"bC" = (
+/obj/structure/table,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = 3
+ },
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -3;
+ pixel_y = 5
+ },
+/turf/open/floor/iron/checker,
+/area/mine/laborcamp)
"bH" = (
/obj/structure/table,
/obj/item/book/manual/chef_recipes{
@@ -333,6 +345,10 @@
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
/turf/open/floor/plating,
/area/mine/maintenance/service)
+"cp" = (
+/obj/item/reagent_containers/cup/glass/colocup,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
"cq" = (
/obj/item/cultivator,
/turf/open/floor/iron/dark,
@@ -635,18 +651,6 @@
},
/turf/open/misc/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
-"ev" = (
-/obj/structure/sink/directional/east,
-/obj/item/reagent_containers/glass/bucket,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/green/filled/line{
- dir = 10
- },
-/obj/effect/turf_decal/trimline/blue/filled/warning,
-/turf/open/floor/iron/dark,
-/area/mine/hydroponics)
"eA" = (
/turf/closed/wall,
/area/mine/maintenance/public/south)
@@ -686,6 +690,13 @@
dir = 8
},
/area/mine/cafeteria)
+"eO" = (
+/obj/item/reagent_containers/cup/glass/colocup{
+ pixel_x = -5;
+ pixel_y = -3
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
"eP" = (
/obj/structure/chair/sofa/left,
/obj/effect/turf_decal/tile/bar/opposingcorners{
@@ -1103,6 +1114,12 @@
/obj/effect/turf_decal/sand/plating/volcanic,
/turf/open/floor/plating/lavaland_atmos,
/area/mine/maintenance/service/disposals)
+"gY" = (
+/obj/structure/table,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/kitchen/spoon,
+/turf/open/floor/iron/checker,
+/area/mine/laborcamp)
"hd" = (
/obj/machinery/door/airlock/security/glass{
name = "Labor Camp Shuttle Security Airlock"
@@ -1427,14 +1444,6 @@
},
/turf/open/floor/iron/edge,
/area/mine/living_quarters)
-"iS" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/holopad/secure,
-/turf/open/floor/iron/smooth_large,
-/area/mine/laborcamp/production)
"iX" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/chair/sofa/bench{
@@ -1629,22 +1638,6 @@
"kg" = (
/turf/closed/wall/r_wall,
/area/mine/laborcamp)
-"ki" = (
-/obj/structure/table/wood,
-/obj/machinery/light/directional/east,
-/obj/effect/turf_decal/tile/bar/opposingcorners{
- dir = 1
- },
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
- pixel_x = -3;
- pixel_y = 7
- },
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
- pixel_x = 6;
- pixel_y = 5
- },
-/turf/open/floor/iron/checker,
-/area/mine/cafeteria)
"kk" = (
/obj/structure/stone_tile/block{
dir = 8
@@ -1690,17 +1683,6 @@
dir = 1
},
/area/mine/production)
-"kA" = (
-/obj/structure/table,
-/obj/effect/spawner/random/food_or_drink/booze,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/poster/contraband/random/directional/north,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
- pixel_x = -7;
- pixel_y = 7
- },
-/turf/open/floor/plating,
-/area/mine/laborcamp)
"kB" = (
/obj/structure/stone_tile/surrounding_tile,
/obj/structure/stone_tile/surrounding_tile{
@@ -2675,6 +2657,13 @@
/obj/item/cigbutt,
/turf/open/floor/iron/smooth,
/area/mine/laborcamp/quarters)
+"oJ" = (
+/obj/item/reagent_containers/cup/glass/colocup{
+ pixel_x = -5;
+ pixel_y = -3
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
"oN" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/effect/decal/cleanable/dirt,
@@ -2934,6 +2923,23 @@
/obj/effect/turf_decal/siding/red,
/turf/open/floor/iron/edge,
/area/mine/lounge)
+"qf" = (
+/obj/structure/table,
+/obj/item/reagent_containers/cup/glass/bottle/beer{
+ pixel_x = 7;
+ pixel_y = 5
+ },
+/obj/item/reagent_containers/cup/glass/bottle/beer{
+ pixel_x = -1;
+ pixel_y = 9
+ },
+/obj/item/reagent_containers/cup/glass/bottle/beer{
+ pixel_x = -8
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
+/area/mine/cafeteria)
"qg" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -3053,6 +3059,18 @@
dir = 4
},
/area/mine/cafeteria)
+"qT" = (
+/obj/structure/table,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = 3
+ },
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -3;
+ pixel_y = 5
+ },
+/turf/open/floor/iron/checker,
+/area/mine/laborcamp)
"qV" = (
/obj/structure/table,
/obj/effect/decal/cleanable/dirt,
@@ -3168,15 +3186,6 @@
},
/turf/open/floor/plating,
/area/mine/production)
-"rM" = (
-/obj/structure/toilet{
- dir = 8;
- pixel_y = 6
- },
-/obj/structure/window/reinforced/tinted,
-/obj/structure/curtain,
-/turf/open/floor/iron/freezer,
-/area/mine/living_quarters)
"rO" = (
/obj/structure/stone_tile/block{
dir = 1
@@ -3817,18 +3826,6 @@
},
/turf/open/floor/iron/checker,
/area/mine/cafeteria)
-"wf" = (
-/obj/structure/table,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_x = 3
- },
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_x = -3;
- pixel_y = 5
- },
-/turf/open/floor/iron/checker,
-/area/mine/laborcamp)
"wg" = (
/obj/structure/chair/sofa/corp{
dir = 1
@@ -3890,13 +3887,6 @@
},
/turf/open/misc/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
-"wy" = (
-/obj/item/reagent_containers/food/drinks/colocup{
- pixel_x = -5;
- pixel_y = -3
- },
-/turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
"wA" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -4013,6 +4003,14 @@
/obj/structure/lattice/catwalk,
/turf/open/misc/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
+"xy" = (
+/obj/structure/closet/secure_closet/freezer/fridge,
+/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/effect/spawner/random/food_or_drink/booze,
+/turf/open/floor/iron/white,
+/area/mine/cafeteria)
"xz" = (
/obj/machinery/conveyor/inverted{
dir = 10;
@@ -4555,6 +4553,17 @@
/obj/structure/railing/corner,
/turf/open/misc/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
+"Bf" = (
+/obj/structure/table,
+/obj/effect/spawner/random/food_or_drink/booze,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/poster/contraband/random/directional/north,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = -7;
+ pixel_y = 7
+ },
+/turf/open/floor/plating,
+/area/mine/laborcamp)
"By" = (
/obj/machinery/door/poddoor/preopen{
id = "labor";
@@ -4774,6 +4783,15 @@
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
/turf/open/floor/plating,
/area/mine/maintenance/public/north)
+"CU" = (
+/obj/structure/toilet{
+ dir = 8;
+ pixel_y = 6
+ },
+/obj/structure/window/reinforced/tinted,
+/obj/structure/curtain,
+/turf/open/floor/iron/freezer,
+/area/mine/living_quarters)
"CX" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -5229,6 +5247,17 @@
},
/turf/open/floor/iron/dark/smooth_edge,
/area/mine/laborcamp/security)
+"Go" = (
+/obj/structure/sink/kitchen/directional/south{
+ desc = "A sink used for washing one's hands and face. It looks rusty and home-made";
+ name = "old sink"
+ },
+/obj/item/reagent_containers/cup/bucket,
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/mine/laborcamp)
"Gr" = (
/obj/effect/spawner/random/trash/botanical_waste,
/obj/effect/decal/cleanable/dirt,
@@ -5301,6 +5330,10 @@
},
/turf/open/floor/iron/dark/textured_large,
/area/mine/laborcamp/security)
+"GY" = (
+/obj/item/reagent_containers/cup/glass/colocup,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
"GZ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -5553,6 +5586,17 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/mine/maintenance/labor)
+"IF" = (
+/obj/structure/sink/kitchen/directional/south{
+ desc = "A sink used for washing one's hands and face. It looks rusty and home-made";
+ name = "old sink"
+ },
+/obj/item/reagent_containers/cup/bucket,
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/mine/laborcamp)
"IH" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -5680,6 +5724,18 @@
/obj/effect/mapping_helpers/airlock/access/any/security/brig,
/turf/open/floor/iron/dark,
/area/mine/laborcamp/security)
+"Jj" = (
+/obj/structure/sink/directional/east,
+/obj/item/reagent_containers/cup/bucket,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/blue/filled/warning,
+/turf/open/floor/iron/dark,
+/area/mine/hydroponics)
"Jl" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -6126,17 +6182,6 @@
dir = 1
},
/area/mine/medical)
-"LH" = (
-/obj/structure/sink/kitchen/directional/south{
- desc = "A sink used for washing one's hands and face. It looks rusty and home-made";
- name = "old sink"
- },
-/obj/item/reagent_containers/glass/bucket,
-/obj/effect/turf_decal/trimline/green/filled/line{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/mine/laborcamp)
"LJ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -6456,10 +6501,6 @@
},
/turf/open/floor/iron/checker,
/area/mine/cafeteria)
-"Ny" = (
-/obj/item/reagent_containers/food/drinks/colocup,
-/turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
"Nz" = (
/obj/effect/turf_decal/bot,
/obj/structure/ore_box,
@@ -6565,14 +6606,6 @@
},
/turf/open/floor/iron/dark,
/area/mine/mechbay)
-"Om" = (
-/obj/structure/closet/secure_closet/freezer/fridge,
-/obj/item/reagent_containers/food/drinks/bottle/beer,
-/obj/item/reagent_containers/food/drinks/bottle/beer,
-/obj/item/reagent_containers/food/drinks/bottle/beer,
-/obj/effect/spawner/random/food_or_drink/booze,
-/turf/open/floor/iron/white,
-/area/mine/cafeteria)
"Op" = (
/obj/structure/stone_tile/slab,
/turf/open/misc/asteroid/basalt/lava_land_surface,
@@ -6669,12 +6702,6 @@
/obj/structure/cable,
/turf/open/floor/iron/white/textured_large,
/area/mine/cafeteria)
-"OX" = (
-/obj/structure/table,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/kitchen/spoon,
-/turf/open/floor/iron/checker,
-/area/mine/laborcamp)
"OZ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -6748,6 +6775,17 @@
/obj/item/toy/beach_ball,
/turf/open/misc/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
+"Pv" = (
+/obj/structure/table,
+/obj/effect/spawner/random/food_or_drink/booze,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/poster/contraband/random/directional/north,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = -7;
+ pixel_y = 7
+ },
+/turf/open/floor/plating,
+/area/mine/laborcamp)
"PD" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/maintenance/two,
@@ -6788,6 +6826,23 @@
/obj/effect/turf_decal/sand/plating/volcanic,
/turf/open/floor/plating/lavaland_atmos,
/area/mine/maintenance/service/disposals)
+"PP" = (
+/obj/structure/table,
+/obj/item/reagent_containers/cup/glass/bottle/beer{
+ pixel_x = 7;
+ pixel_y = 5
+ },
+/obj/item/reagent_containers/cup/glass/bottle/beer{
+ pixel_x = -1;
+ pixel_y = 9
+ },
+/obj/item/reagent_containers/cup/glass/bottle/beer{
+ pixel_x = -8
+ },
+/turf/open/floor/iron/white/smooth_edge{
+ dir = 1
+ },
+/area/mine/cafeteria)
"PR" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/carpet/executive,
@@ -6845,6 +6900,14 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth,
/area/mine/laborcamp/production)
+"Qg" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/holopad/secure,
+/turf/open/floor/iron/smooth_large,
+/area/mine/laborcamp/production)
"Qi" = (
/obj/machinery/door/airlock/research/glass{
name = "Mining Station Mech Bay"
@@ -6885,6 +6948,12 @@
},
/turf/open/misc/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
+"Qy" = (
+/obj/structure/table,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/kitchen/spoon,
+/turf/open/floor/iron/checker,
+/area/mine/laborcamp)
"Qz" = (
/obj/structure/lattice/catwalk,
/obj/structure/disposalpipe/segment{
@@ -7032,23 +7101,6 @@
/obj/structure/closet/toolcloset,
/turf/open/floor/plating,
/area/mine/maintenance/service)
-"Ry" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/beer{
- pixel_x = 7;
- pixel_y = 5
- },
-/obj/item/reagent_containers/food/drinks/bottle/beer{
- pixel_x = -1;
- pixel_y = 9
- },
-/obj/item/reagent_containers/food/drinks/bottle/beer{
- pixel_x = -8
- },
-/turf/open/floor/iron/white/smooth_edge{
- dir = 1
- },
-/area/mine/cafeteria)
"RB" = (
/obj/structure/railing/corner{
dir = 1
@@ -7281,6 +7333,22 @@
dir = 1
},
/area/mine/production)
+"SU" = (
+/obj/structure/table/wood,
+/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = -3;
+ pixel_y = 7
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = 6;
+ pixel_y = 5
+ },
+/turf/open/floor/iron/checker,
+/area/mine/cafeteria)
"Tc" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -7298,6 +7366,14 @@
},
/turf/open/floor/iron/dark/smooth_edge,
/area/mine/eva)
+"Tn" = (
+/obj/structure/closet/secure_closet/freezer/fridge,
+/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/effect/spawner/random/food_or_drink/booze,
+/turf/open/floor/iron/white,
+/area/mine/cafeteria)
"To" = (
/obj/structure/table,
/obj/machinery/reagentgrinder,
@@ -7748,6 +7824,22 @@
/obj/structure/lattice/catwalk/mining,
/turf/open/lava/smooth/lava_land_surface,
/area/lavaland/surface/outdoors)
+"VM" = (
+/obj/structure/table/wood,
+/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/tile/bar/opposingcorners{
+ dir = 1
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = -3;
+ pixel_y = 7
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = 6;
+ pixel_y = 5
+ },
+/turf/open/floor/iron/checker,
+/area/mine/cafeteria)
"VO" = (
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable,
@@ -8211,6 +8303,14 @@
dir = 1
},
/area/mine/laborcamp/quarters)
+"YC" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/holopad/secure,
+/turf/open/floor/iron/smooth_large,
+/area/mine/laborcamp/production)
"YF" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -8242,6 +8342,18 @@
},
/turf/open/floor/iron/dark/textured_large,
/area/mine/production)
+"YX" = (
+/obj/structure/sink/directional/east,
+/obj/item/reagent_containers/cup/bucket,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/green/filled/line{
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/blue/filled/warning,
+/turf/open/floor/iron/dark,
+/area/mine/hydroponics)
"YY" = (
/obj/structure/rack,
/obj/item/storage/bag/ore,
@@ -10927,7 +11039,7 @@ pU
pU
pU
aj
-Ny
+cp
pU
uU
uU
@@ -11181,7 +11293,7 @@ uU
uU
uU
pU
-wy
+eO
Pp
pU
pU
@@ -24303,7 +24415,7 @@ gl
fh
Cz
Sg
-iS
+YC
Nb
NR
Kv
@@ -26103,7 +26215,7 @@ Zt
rS
Kp
Xy
-OX
+Qy
PY
st
nB
@@ -26361,7 +26473,7 @@ GD
Ut
Lf
nN
-wf
+bC
vZ
Lk
Ge
@@ -27643,7 +27755,7 @@ aj
aj
aj
Zt
-LH
+Go
sU
cq
Di
@@ -28679,7 +28791,7 @@ kg
kg
yG
kg
-kA
+Bf
kg
CD
Vq
@@ -37670,7 +37782,7 @@ KL
DW
Xg
qQ
-Om
+Tn
kY
pU
aj
@@ -38184,7 +38296,7 @@ Nw
DW
eD
OT
-Ry
+PP
Tc
aj
aj
@@ -38452,7 +38564,7 @@ pU
gx
Sn
Sz
-ev
+Jj
yX
PV
OF
@@ -39207,7 +39319,7 @@ kY
kY
kY
eP
-ki
+SU
DW
qg
kY
@@ -42031,7 +42143,7 @@ pU
cW
CX
iu
-rM
+CU
eC
qO
iu
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index e7aabff52ac..f149d2bbe48 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -296,6 +296,18 @@
/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
/turf/closed/indestructible/syndicate,
/area/centcom/syndicate_mothership/expansion_bioterrorism)
+"aY" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/glass/bottle/beer{
+ pixel_x = 5;
+ pixel_y = -2
+ },
+/obj/item/toy/cards/deck/syndicate{
+ pixel_x = -6;
+ pixel_y = 6
+ },
+/turf/open/floor/wood/tile,
+/area/centcom/syndicate_mothership/control)
"aZ" = (
/obj/effect/turf_decal/siding/thinplating_new/dark{
dir = 4
@@ -399,6 +411,11 @@
},
/turf/open/floor/iron,
/area/centcom/central_command_areas/prison)
+"bl" = (
+/obj/structure/sink/kitchen/directional/west,
+/obj/item/reagent_containers/cup/bucket,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/centcom/syndicate_mothership/control)
"bm" = (
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable,
@@ -884,19 +901,6 @@
dir = 1
},
/area/centcom/central_command_areas/holding)
-"cF" = (
-/obj/structure/table/wood,
-/obj/machinery/chem_dispenser/drinks/beer{
- dir = 4;
- pixel_x = -8;
- pixel_y = 1
- },
-/obj/item/reagent_containers/glass/beaker{
- pixel_x = 7;
- pixel_y = -4
- },
-/turf/open/floor/carpet/black,
-/area/centcom/central_command_areas/holding)
"cG" = (
/obj/structure/extinguisher_cabinet/directional/west,
/turf/open/floor/iron/dark/textured_large,
@@ -922,6 +926,35 @@
/obj/structure/bookcase/random/fiction,
/turf/open/floor/carpet/black,
/area/centcom/central_command_areas/holding)
+"cK" = (
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/obj/structure/table/wood/poker,
+/obj/machinery/light/warm/directional/north,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
+ pixel_x = -4;
+ pixel_y = 14
+ },
+/obj/item/toy/cards/deck{
+ pixel_x = 3;
+ pixel_y = 6
+ },
+/obj/item/clothing/mask/cigarette/robust{
+ pixel_x = -4;
+ pixel_y = 1
+ },
+/obj/effect/decal/cleanable/ash{
+ pixel_x = 12;
+ pixel_y = -6
+ },
+/obj/effect/spawner/random/entertainment/lighter{
+ pixel_x = 9;
+ pixel_y = -3
+ },
+/turf/open/floor/iron,
+/area/centcom/syndicate_mothership/control)
"cL" = (
/obj/item/gun/energy/pulse/carbine/loyalpin,
/obj/item/flashlight/seclite,
@@ -978,35 +1011,6 @@
},
/turf/open/floor/iron,
/area/centcom/tdome/observation)
-"cU" = (
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 9
- },
-/obj/structure/table/glass/plasmaglass,
-/obj/machinery/reagentgrinder{
- pixel_x = -5;
- pixel_y = 12
- },
-/obj/item/reagent_containers/glass/beaker/large{
- pixel_x = -7;
- pixel_y = -8
- },
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
- pixel_x = 9;
- pixel_y = -7
- },
-/obj/structure/sign/poster/contraband/lizard{
- pixel_x = -32
- },
-/obj/structure/sign/poster/contraband/kudzu{
- pixel_y = 32
- },
-/obj/item/reagent_containers/spray/plantbgone{
- pixel_x = 10;
- pixel_y = 5
- },
-/turf/open/floor/mineral/plastitanium/red,
-/area/centcom/syndicate_mothership/expansion_bioterrorism)
"cV" = (
/obj/effect/turf_decal/siding/wideplating,
/obj/machinery/light/small/directional/south,
@@ -1022,37 +1026,10 @@
/turf/open/floor/iron/dark,
/area/centcom/tdome/observation)
"cX" = (
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 1
- },
-/obj/structure/table/glass/plasmaglass,
-/obj/item/reagent_containers/syringe{
- pixel_x = -5;
- pixel_y = 12
- },
-/obj/item/reagent_containers/syringe{
- pixel_x = -2;
- pixel_y = 13
- },
-/obj/item/reagent_containers/syringe{
- pixel_x = 1;
- pixel_y = 14
- },
-/obj/machinery/light/cold/directional/north,
-/obj/item/reagent_containers/dropper{
- pixel_x = -4;
- pixel_y = -6
- },
-/obj/item/storage/box/monkeycubes{
- pixel_x = -6;
- pixel_y = 5
- },
-/obj/item/reagent_containers/glass/bottle/formaldehyde{
- pixel_x = 8;
- pixel_y = 4
- },
-/turf/open/floor/mineral/plastitanium/red,
-/area/centcom/syndicate_mothership/expansion_bioterrorism)
+/obj/structure/table/rolling,
+/obj/item/reagent_containers/condiment/soymilk,
+/turf/open/floor/mineral/titanium,
+/area/centcom/syndicate_mothership/control)
"cY" = (
/obj/machinery/icecream_vat,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -1454,20 +1431,6 @@
},
/turf/open/floor/wood/tile,
/area/centcom/central_command_areas/holding)
-"ec" = (
-/obj/structure/table/wood,
-/obj/machinery/chem_dispenser/drinks{
- dir = 4;
- pixel_x = -8;
- pixel_y = 4
- },
-/obj/item/reagent_containers/food/condiment/enzyme{
- layer = 5;
- pixel_x = 10;
- pixel_y = 2
- },
-/turf/open/floor/carpet/black,
-/area/centcom/central_command_areas/holding)
"ed" = (
/obj/machinery/vending/cola,
/obj/effect/turf_decal/siding/thinplating_new/dark{
@@ -1482,6 +1445,21 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/admin)
+"eg" = (
+/obj/structure/table/glass/plasmaglass,
+/obj/item/stack/sheet/mineral/plasma{
+ pixel_y = 15
+ },
+/obj/item/grenade/chem_grenade,
+/obj/item/stack/cable_coil,
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = 8;
+ pixel_y = 14
+ },
+/obj/machinery/light/cold/directional/west,
+/obj/item/stack/cable_coil,
+/turf/open/floor/mineral/titanium/tiled/yellow,
+/area/centcom/syndicate_mothership/expansion_chemicalwarfare)
"eh" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -1701,6 +1679,20 @@
/obj/machinery/light/directional/south,
/turf/open/misc/asteroid,
/area/centcom/central_command_areas/evacuation)
+"eL" = (
+/obj/structure/table/glass/plasmaglass,
+/obj/item/reagent_containers/cup/beaker/large{
+ pixel_x = -5;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = 8;
+ pixel_y = 2
+ },
+/obj/machinery/light/cold/directional/east,
+/obj/item/gun/syringe/syndicate,
+/turf/open/floor/mineral/titanium/tiled/yellow,
+/area/centcom/syndicate_mothership/expansion_chemicalwarfare)
"eM" = (
/obj/machinery/vending/cola,
/obj/effect/turf_decal/delivery,
@@ -2005,58 +1997,6 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
/area/centcom/central_command_areas/fore)
-"fB" = (
-/obj/structure/window/reinforced/survival_pod{
- name = "Tinted Window";
- opacity = 1
- },
-/obj/effect/turf_decal/siding/thinplating{
- dir = 6
- },
-/obj/structure/table/reinforced/plasmarglass,
-/obj/item/reagent_containers/glass/bottle/epinephrine,
-/obj/item/reagent_containers/glass/bottle/multiver{
- pixel_x = 6
- },
-/obj/item/reagent_containers/syringe{
- pixel_y = 15
- },
-/turf/open/floor/mineral/titanium/tiled/blue,
-/area/centcom/syndicate_mothership/control)
-"fC" = (
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 8
- },
-/obj/structure/table/glass/plasmaglass,
-/obj/item/folder/white{
- pixel_x = 4;
- pixel_y = -3
- },
-/obj/item/reagent_containers/syringe{
- pixel_x = -5;
- pixel_y = 12
- },
-/obj/item/reagent_containers/syringe{
- pixel_x = -2;
- pixel_y = 13
- },
-/obj/item/reagent_containers/syringe{
- pixel_x = 1;
- pixel_y = 14
- },
-/obj/item/reagent_containers/syringe{
- pixel_x = 4;
- pixel_y = 15
- },
-/obj/structure/extinguisher_cabinet/directional/west,
-/obj/item/reagent_containers/glass/bottle/radium{
- pixel_x = -8;
- pixel_y = 9
- },
-/obj/item/stack/sheet/mineral/plasma,
-/obj/item/stack/sheet/mineral/plasma,
-/turf/open/floor/mineral/plastitanium/red,
-/area/centcom/syndicate_mothership/expansion_bioterrorism)
"fD" = (
/obj/effect/turf_decal/siding/wood{
dir = 1
@@ -2676,12 +2616,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/supply)
-"hA" = (
-/obj/structure/closet/abductor,
-/obj/item/storage/box/alienhandcuffs,
-/obj/item/reagent_containers/glass/beaker/synthflesh,
-/turf/open/floor/plating/abductor,
-/area/centcom/abductor_ship)
"hB" = (
/obj/structure/closet{
anchored = 1;
@@ -2837,6 +2771,11 @@
},
/turf/open/floor/catwalk_floor,
/area/centcom/central_command_areas/holding)
+"hR" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/glass/trophy/gold_cup,
+/turf/open/floor/iron/grimy,
+/area/centcom/tdome/observation)
"hS" = (
/obj/structure/flora/rock/icy/style_random,
/turf/open/misc/asteroid/snow/airless,
@@ -2850,11 +2789,6 @@
/obj/item/mop,
/turf/open/floor/catwalk_floor/iron_smooth,
/area/centcom/syndicate_mothership/control)
-"hV" = (
-/obj/structure/table/rolling,
-/obj/item/reagent_containers/food/drinks/bottle/tomatojuice,
-/turf/open/floor/mineral/titanium,
-/area/centcom/syndicate_mothership/control)
"hW" = (
/obj/structure/chair/office,
/turf/open/floor/iron/grimy,
@@ -3626,6 +3560,15 @@
/obj/machinery/vending/cigarette/syndicate,
/turf/open/floor/catwalk_floor/titanium,
/area/centcom/syndicate_mothership/control)
+"jZ" = (
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/rag,
+/turf/open/floor/iron,
+/area/centcom/syndicate_mothership/control)
"ka" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -4715,17 +4658,37 @@
/turf/closed/indestructible/syndicate,
/area/centcom/syndicate_mothership/control)
"nh" = (
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/bottle/multiver{
- pixel_x = 6
+/obj/structure/closet/crate/freezer{
+ name = "pantry crate"
},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
- pixel_x = -4
+/obj/structure/sign/poster/contraband/moffuchis_pizza{
+ pixel_y = -32
},
-/obj/item/reagent_containers/hypospray/medipen,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/control)
+/obj/item/reagent_containers/condiment/rice{
+ pixel_y = 12
+ },
+/obj/item/reagent_containers/condiment/rice{
+ pixel_y = 12
+ },
+/obj/item/reagent_containers/condiment/saltshaker,
+/obj/item/reagent_containers/condiment/peppermill,
+/obj/item/food/grown/wheat,
+/obj/item/food/grown/wheat,
+/obj/item/reagent_containers/condiment/sugar,
+/obj/item/reagent_containers/condiment/sugar,
+/obj/item/food/grown/soybeans,
+/obj/item/food/grown/soybeans,
+/obj/item/food/grown/vanillapod,
+/obj/item/food/grown/vanillapod,
+/obj/item/food/grown/herbs,
+/obj/item/food/grown/herbs,
+/obj/item/food/grown/cocoapod,
+/obj/item/food/grown/cocoapod,
+/obj/item/food/grown/aloe,
+/obj/item/food/grown/coffee,
+/obj/item/food/grown/coffee,
+/turf/open/floor/plastic,
+/area/centcom/syndicate_mothership/expansion_fridgerummage)
"ni" = (
/obj/machinery/light/directional/south,
/obj/effect/turf_decal/tile/red/fourcorners,
@@ -4851,12 +4814,6 @@
/obj/effect/mapping_helpers/airlock/access/all/admin/general,
/turf/open/floor/iron,
/area/centcom/tdome/observation)
-"nD" = (
-/obj/item/mop,
-/obj/structure/sink/kitchen/directional/west,
-/obj/item/reagent_containers/glass/bucket,
-/turf/open/floor/catwalk_floor,
-/area/centcom/central_command_areas/holding)
"nE" = (
/obj/machinery/atmospherics/pipe/smart/simple/general/visible,
/turf/closed/indestructible/opsglass,
@@ -4924,6 +4881,12 @@
/obj/item/kirbyplants/random,
/turf/open/floor/iron,
/area/centcom/syndicate_mothership/control)
+"nR" = (
+/obj/structure/sink/kitchen/directional/west,
+/obj/item/reagent_containers/cup/bucket,
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/catwalk_floor,
+/area/centcom/central_command_areas/holding)
"nS" = (
/obj/structure/bookcase/random,
/obj/machinery/light/directional/north,
@@ -5400,6 +5363,15 @@
/obj/item/food/meat/slab/synthmeat,
/turf/open/floor/catwalk_floor,
/area/centcom/central_command_areas/holding)
+"pa" = (
+/obj/structure/table/wood,
+/obj/item/storage/box/drinkingglasses,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
+ pixel_y = 5
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/centcom/central_command_areas/briefing)
"pb" = (
/turf/open/misc/asteroid/snow/airless,
/area/centcom/syndicate_mothership/control)
@@ -5591,18 +5563,6 @@
},
/turf/open/floor/iron/grimy,
/area/centcom/central_command_areas/admin)
-"pF" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/fancy/egg_box,
-/obj/item/reagent_containers/food/condiment/flour{
- pixel_x = -5;
- pixel_y = 9
- },
-/obj/item/reagent_containers/food/condiment/rice{
- pixel_y = 12
- },
-/turf/open/floor/iron/cafeteria,
-/area/centcom/central_command_areas/holding)
"pG" = (
/obj/effect/turf_decal/weather/snow/corner{
dir = 1
@@ -6017,11 +5977,6 @@
},
/turf/open/floor/mineral/plastitanium/red,
/area/centcom/syndicate_mothership/expansion_bioterrorism)
-"qN" = (
-/obj/structure/table/rolling,
-/obj/item/reagent_containers/food/condiment/soymilk,
-/turf/open/floor/mineral/titanium,
-/area/centcom/syndicate_mothership/control)
"qQ" = (
/obj/machinery/light/small/directional/south,
/turf/open/floor/iron/smooth_half,
@@ -6105,16 +6060,6 @@
/obj/effect/turf_decal/stripes/full,
/turf/open/floor/mineral/titanium/yellow,
/area/centcom/syndicate_mothership/control)
-"rj" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/firedoor,
-/obj/item/reagent_containers/food/drinks/britcup,
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
-/area/centcom/central_command_areas/control)
"rk" = (
/turf/open/floor/wood,
/area/centcom/central_command_areas/courtroom)
@@ -6143,29 +6088,6 @@
},
/turf/open/floor/iron,
/area/centcom/central_command_areas/ferry)
-"ro" = (
-/obj/structure/closet/secure_closet/freezer/fridge/open{
- name = "freezer"
- },
-/obj/item/food/meat/slab/killertomato,
-/obj/item/food/meat/slab/killertomato,
-/obj/item/food/grown/tomato,
-/obj/item/food/grown/tomato,
-/obj/item/food/grown/tomato,
-/obj/item/food/grown/wheat,
-/obj/item/food/grown/wheat,
-/obj/item/food/grown/wheat,
-/obj/item/food/grown/berries,
-/obj/item/food/grown/berries,
-/obj/item/food/grown/cabbage,
-/obj/item/food/grown/cherries,
-/obj/item/food/grown/cherries,
-/obj/item/reagent_containers/food/condiment/enzyme{
- layer = 5
- },
-/obj/item/food/grown/redbeet,
-/turf/open/floor/catwalk_floor,
-/area/centcom/central_command_areas/holding)
"rp" = (
/obj/structure/table/glass/plasmaglass,
/obj/item/storage/pill_bottle{
@@ -6246,20 +6168,6 @@
/obj/structure/chair/stool/directional/west,
/turf/open/misc/beach/sand,
/area/centcom/central_command_areas/holding)
-"rD" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/firedoor,
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_x = -8;
- pixel_y = 5
- },
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_x = -8
- },
-/obj/item/reagent_containers/food/drinks/britcup,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
-/area/centcom/tdome/observation)
"rE" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -6322,13 +6230,11 @@
/area/centcom/central_command_areas/control)
"rL" = (
/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/machinery/newscaster/directional/south,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/centcom/tdome/observation)
+/obj/item/reagent_containers/cup/glass/bottle/sake{
+ pixel_y = 15
+ },
+/turf/open/floor/carpet/black,
+/area/centcom/central_command_areas/holding)
"rM" = (
/turf/open/floor/iron/grimy,
/area/centcom/central_command_areas/courtroom)
@@ -6440,33 +6346,6 @@
/obj/effect/mapping_helpers/airlock/access/all/admin/general,
/turf/open/floor/iron,
/area/centcom/central_command_areas/ferry)
-"sf" = (
-/obj/structure/table/glass/plasmaglass,
-/obj/item/stack/sheet/mineral/plasma{
- pixel_y = 15
- },
-/obj/item/grenade/chem_grenade,
-/obj/item/stack/cable_coil,
-/obj/item/reagent_containers/glass/beaker{
- pixel_x = 8;
- pixel_y = 14
- },
-/obj/machinery/light/cold/directional/west,
-/obj/item/stack/cable_coil,
-/turf/open/floor/mineral/titanium/tiled/yellow,
-/area/centcom/syndicate_mothership/expansion_chemicalwarfare)
-"sg" = (
-/obj/effect/turf_decal/delivery,
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 1
- },
-/obj/machinery/door/poddoor/shutters{
- id = "FBBZ1";
- name = "Security Shutters"
- },
-/obj/structure/fans/tiny,
-/turf/open/floor/mineral/titanium,
-/area/centcom/syndicate_mothership/control)
"sh" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{
@@ -6507,37 +6386,17 @@
/turf/open/floor/iron,
/area/centcom/central_command_areas/control)
"sp" = (
-/obj/structure/closet/crate/freezer{
- name = "pantry crate"
+/obj/structure/table/reinforced,
+/obj/item/storage/fancy/egg_box,
+/obj/item/reagent_containers/condiment/flour{
+ pixel_x = -5;
+ pixel_y = 9
},
-/obj/structure/sign/poster/contraband/moffuchis_pizza{
- pixel_y = -32
- },
-/obj/item/reagent_containers/food/condiment/rice{
+/obj/item/reagent_containers/condiment/rice{
pixel_y = 12
},
-/obj/item/reagent_containers/food/condiment/rice{
- pixel_y = 12
- },
-/obj/item/reagent_containers/food/condiment/saltshaker,
-/obj/item/reagent_containers/food/condiment/peppermill,
-/obj/item/food/grown/wheat,
-/obj/item/food/grown/wheat,
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/food/grown/soybeans,
-/obj/item/food/grown/soybeans,
-/obj/item/food/grown/vanillapod,
-/obj/item/food/grown/vanillapod,
-/obj/item/food/grown/herbs,
-/obj/item/food/grown/herbs,
-/obj/item/food/grown/cocoapod,
-/obj/item/food/grown/cocoapod,
-/obj/item/food/grown/aloe,
-/obj/item/food/grown/coffee,
-/obj/item/food/grown/coffee,
-/turf/open/floor/plastic,
-/area/centcom/syndicate_mothership/expansion_fridgerummage)
+/turf/open/floor/iron/cafeteria,
+/area/centcom/central_command_areas/holding)
"sq" = (
/obj/machinery/computer/shuttle/white_ship{
dir = 4
@@ -6614,22 +6473,6 @@
/obj/machinery/status_display/evac/directional/west,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/control)
-"sA" = (
-/obj/structure/sink/kitchen/directional/west,
-/obj/item/reagent_containers/glass/bucket,
-/obj/effect/turf_decal/siding/wood,
-/turf/open/floor/catwalk_floor,
-/area/centcom/central_command_areas/holding)
-"sB" = (
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/obj/structure/table/reinforced/plastitaniumglass,
-/obj/machinery/light/directional/west,
-/obj/item/reagent_containers/food/drinks/shaker,
-/turf/open/floor/iron,
-/area/centcom/syndicate_mothership/control)
"sC" = (
/obj/effect/turf_decal/tile/green{
dir = 1
@@ -6834,6 +6677,20 @@
/obj/structure/sign/departments/drop,
/turf/closed/indestructible/riveted,
/area/centcom/central_command_areas/ferry)
+"te" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -8;
+ pixel_y = 5
+ },
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = -8
+ },
+/obj/item/knife/kitchen,
+/obj/machinery/newscaster/directional/west,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/centcom/tdome/observation)
"tg" = (
/obj/structure/chair{
dir = 1
@@ -6845,6 +6702,35 @@
/obj/machinery/newscaster/directional/south,
/turf/open/floor/iron,
/area/centcom/central_command_areas/control)
+"th" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 1
+ },
+/obj/structure/sink/directional/south,
+/obj/item/shovel/spade{
+ pixel_x = -4
+ },
+/obj/item/reagent_containers/cup/bucket,
+/turf/open/floor/mineral/plastitanium/red,
+/area/centcom/syndicate_mothership/expansion_bioterrorism)
+"ti" = (
+/obj/structure/closet/secure_closet/freezer/fridge/open,
+/obj/item/food/grown/chili,
+/obj/item/food/grown/chili,
+/obj/item/food/grown/chili,
+/obj/item/food/grown/chili,
+/obj/item/food/grown/chili,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/soymilk,
+/obj/item/reagent_containers/condiment/soymilk,
+/obj/item/storage/fancy/egg_box,
+/obj/item/food/grown/citrus/lime,
+/obj/item/food/grown/citrus/orange,
+/obj/item/food/grown/citrus/lemon,
+/obj/item/food/grown/watermelon,
+/turf/open/floor/carpet/black,
+/area/centcom/central_command_areas/holding)
"tk" = (
/obj/structure/window/reinforced/survival_pod{
name = "Tinted Window";
@@ -7127,46 +7013,6 @@
/obj/effect/baseturf_helper/asteroid/snow,
/turf/closed/indestructible/syndicate,
/area/centcom/syndicate_mothership/control)
-"tZ" = (
-/obj/item/reagent_containers/glass/bottle/epinephrine{
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/bottle/multiver{
- pixel_x = -3
- },
-/obj/item/reagent_containers/glass/bottle/epinephrine{
- pixel_x = -3;
- pixel_y = 8
- },
-/obj/item/reagent_containers/glass/bottle/multiver{
- pixel_x = 6;
- pixel_y = 8
- },
-/obj/item/reagent_containers/syringe/epinephrine{
- pixel_x = 3;
- pixel_y = -2
- },
-/obj/item/reagent_containers/syringe/epinephrine{
- pixel_x = 4;
- pixel_y = 1
- },
-/obj/item/reagent_containers/syringe/epinephrine{
- pixel_x = -2;
- pixel_y = 5
- },
-/obj/item/reagent_containers/syringe/epinephrine{
- pixel_x = 2;
- pixel_y = 8
- },
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/turf/open/floor/iron/white,
-/area/centcom/central_command_areas/control)
"ub" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/centcom{
@@ -7185,26 +7031,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/control)
-"ud" = (
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/obj/structure/table/reinforced,
-/obj/item/knife/combat/survival{
- pixel_x = 7;
- pixel_y = 17
- },
-/obj/item/reagent_containers/food/drinks/bottle/rum{
- pixel_x = -5;
- pixel_y = 17
- },
-/obj/structure/sign/poster/contraband/red_rum{
- pixel_x = 32
- },
-/obj/machinery/recharger,
-/turf/open/floor/iron,
-/area/centcom/syndicate_mothership/control)
"uf" = (
/turf/closed/indestructible/riveted,
/area/centcom/tdome/administration)
@@ -7329,6 +7155,18 @@
},
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/control)
+"uz" = (
+/obj/effect/turf_decal/delivery,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 1
+ },
+/obj/machinery/door/poddoor/shutters{
+ id = "FBBZ1";
+ name = "Security Shutters"
+ },
+/obj/structure/fans/tiny,
+/turf/open/floor/mineral/titanium,
+/area/centcom/syndicate_mothership/control)
"uA" = (
/obj/structure/chair{
dir = 4
@@ -7410,20 +7248,6 @@
/obj/machinery/light/cold/directional/east,
/turf/open/floor/iron/smooth,
/area/centcom/syndicate_mothership/control)
-"uT" = (
-/obj/structure/table/glass/plasmaglass,
-/obj/item/reagent_containers/glass/beaker/large{
- pixel_x = -5;
- pixel_y = 8
- },
-/obj/item/reagent_containers/glass/beaker{
- pixel_x = 8;
- pixel_y = 2
- },
-/obj/machinery/light/cold/directional/east,
-/obj/item/gun/syringe/syndicate,
-/turf/open/floor/mineral/titanium/tiled/yellow,
-/area/centcom/syndicate_mothership/expansion_chemicalwarfare)
"uU" = (
/obj/machinery/door/poddoor/incinerator_ordmix{
id = "syn_ordmix_vent"
@@ -7712,24 +7536,6 @@
dir = 4
},
/area/centcom/syndicate_mothership/control)
-"vM" = (
-/obj/structure/closet/secure_closet/freezer/fridge/open,
-/obj/item/food/grown/chili,
-/obj/item/food/grown/chili,
-/obj/item/food/grown/chili,
-/obj/item/food/grown/chili,
-/obj/item/food/grown/chili,
-/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/storage/fancy/egg_box,
-/obj/item/food/grown/citrus/lime,
-/obj/item/food/grown/citrus/orange,
-/obj/item/food/grown/citrus/lemon,
-/obj/item/food/grown/watermelon,
-/turf/open/floor/carpet/black,
-/area/centcom/central_command_areas/holding)
"vN" = (
/obj/structure/chair/stool/directional/north,
/obj/structure/extinguisher_cabinet/directional/south,
@@ -7931,6 +7737,17 @@
},
/turf/open/floor/mineral/plastitanium/red,
/area/centcom/syndicate_mothership/expansion_bombthreat)
+"wp" = (
+/obj/structure/table/wood,
+/obj/item/storage/box/drinkingglasses,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
+ pixel_y = 5
+ },
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/status_display/evac/directional/south,
+/turf/open/floor/iron/dark,
+/area/centcom/tdome/administration)
"wq" = (
/obj/structure/chair/comfy/black{
dir = 1
@@ -8155,6 +7972,16 @@
},
/turf/open/floor/iron/white,
/area/centcom/tdome/observation)
+"wS" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
+ pixel_y = 5
+ },
+/obj/item/clothing/mask/cigarette/cigar/havana{
+ pixel_x = 2
+ },
+/turf/open/floor/iron,
+/area/centcom/central_command_areas/supplypod)
"wT" = (
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
@@ -8435,6 +8262,18 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5,
/turf/closed/indestructible/syndicate,
/area/centcom/syndicate_mothership/control)
+"xL" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/cup/bottle/multiver{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/epinephrine{
+ pixel_x = -4
+ },
+/obj/item/reagent_containers/hypospray/medipen,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/centcom/central_command_areas/control)
"xN" = (
/obj/effect/turf_decal/tile/blue/fourcorners,
/turf/open/floor/iron,
@@ -9830,17 +9669,6 @@
},
/turf/open/floor/iron,
/area/centcom/central_command_areas/control)
-"BK" = (
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 1
- },
-/obj/structure/sink/directional/south,
-/obj/item/shovel/spade{
- pixel_x = -4
- },
-/obj/item/reagent_containers/glass/bucket,
-/turf/open/floor/mineral/plastitanium/red,
-/area/centcom/syndicate_mothership/expansion_bioterrorism)
"BL" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -10137,6 +9965,15 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/evacuation)
+"CF" = (
+/obj/structure/table/wood,
+/obj/item/book/manual/wiki/barman_recipes,
+/obj/item/reagent_containers/cup/glass/shaker,
+/obj/item/reagent_containers/cup/rag,
+/obj/machinery/newscaster/directional/south,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/centcom/tdome/observation)
"CG" = (
/obj/effect/turf_decal/siding/wideplating/dark{
dir = 8
@@ -10213,11 +10050,6 @@
"CN" = (
/turf/closed/indestructible/syndicate,
/area/centcom/syndicate_mothership/expansion_bioterrorism)
-"CO" = (
-/obj/structure/sink/kitchen/directional/west,
-/obj/item/reagent_containers/glass/bucket,
-/turf/open/floor/catwalk_floor/iron_smooth,
-/area/centcom/syndicate_mothership/control)
"CP" = (
/obj/effect/turf_decal/siding/thinplating_new/dark{
dir = 8
@@ -10284,13 +10116,14 @@
/area/centcom/central_command_areas/control)
"Dc" = (
/obj/structure/table/reinforced,
-/obj/item/food/mint,
-/obj/item/reagent_containers/food/condiment/enzyme{
- pixel_y = 5
+/obj/machinery/door/firedoor,
+/obj/item/reagent_containers/cup/glass/britcup,
+/obj/structure/window/reinforced{
+ dir = 8
},
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/centcom/tdome/observation)
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron,
+/area/centcom/central_command_areas/control)
"Dd" = (
/obj/machinery/door/window/survival_pod{
dir = 8;
@@ -10308,6 +10141,16 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/mineral/titanium,
/area/centcom/syndicate_mothership/control)
+"De" = (
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/machinery/light/directional/west,
+/obj/item/reagent_containers/cup/glass/shaker,
+/turf/open/floor/iron,
+/area/centcom/syndicate_mothership/control)
"Df" = (
/obj/structure/table/reinforced,
/obj/effect/turf_decal/siding/red{
@@ -10590,6 +10433,15 @@
/obj/structure/sign/poster/contraband/cc64k_ad,
/turf/closed/indestructible/syndicate,
/area/centcom/syndicate_mothership/control)
+"DU" = (
+/obj/structure/table/reinforced,
+/obj/item/food/mint,
+/obj/item/reagent_containers/condiment/enzyme{
+ pixel_y = 5
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/centcom/tdome/observation)
"DV" = (
/obj/item/kirbyplants{
icon_state = "plant-21"
@@ -10707,6 +10559,12 @@
},
/turf/open/floor/iron/white,
/area/centcom/wizard_station)
+"Ep" = (
+/obj/structure/closet/abductor,
+/obj/item/storage/box/alienhandcuffs,
+/obj/item/reagent_containers/cup/beaker/synthflesh,
+/turf/open/floor/plating/abductor,
+/area/centcom/abductor_ship)
"Er" = (
/obj/structure/lattice/catwalk,
/obj/effect/turf_decal/stripes/line,
@@ -11197,6 +11055,26 @@
/obj/structure/chair/stool/directional/north,
/turf/open/floor/iron/dark/textured_large,
/area/centcom/syndicate_mothership/control)
+"FI" = (
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/obj/structure/table/reinforced,
+/obj/item/knife/combat/survival{
+ pixel_x = 7;
+ pixel_y = 17
+ },
+/obj/item/reagent_containers/cup/glass/bottle/rum{
+ pixel_x = -5;
+ pixel_y = 17
+ },
+/obj/structure/sign/poster/contraband/red_rum{
+ pixel_x = 32
+ },
+/obj/machinery/recharger,
+/turf/open/floor/iron,
+/area/centcom/syndicate_mothership/control)
"FJ" = (
/obj/structure/fence/cut/large{
dir = 4
@@ -11342,6 +11220,15 @@
},
/turf/open/floor/iron/grimy,
/area/centcom/central_command_areas/admin)
+"Gh" = (
+/obj/structure/table/wood,
+/obj/item/storage/box/drinkingglasses,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
+ pixel_y = 5
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/centcom/tdome/observation)
"Gi" = (
/obj/effect/turf_decal/siding/thinplating_new/dark{
dir = 6
@@ -11563,6 +11450,19 @@
},
/turf/open/floor/iron,
/area/centcom/central_command_areas/supply)
+"GM" = (
+/obj/structure/table/wood,
+/obj/machinery/chem_dispenser/drinks/beer{
+ dir = 4;
+ pixel_x = -8;
+ pixel_y = 1
+ },
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = 7;
+ pixel_y = -4
+ },
+/turf/open/floor/carpet/black,
+/area/centcom/central_command_areas/holding)
"GN" = (
/obj/structure/table/reinforced,
/obj/item/storage/fancy/donut_box,
@@ -11583,20 +11483,6 @@
initial_gas_mix = "TEMP=2.7"
},
/area/centcom/syndicate_mothership)
-"GR" = (
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_x = -8;
- pixel_y = 5
- },
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_x = -8
- },
-/obj/item/knife/kitchen,
-/obj/machinery/newscaster/directional/west,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/centcom/tdome/observation)
"GS" = (
/obj/effect/turf_decal/siding/wideplating/dark{
dir = 8
@@ -11619,6 +11505,20 @@
},
/turf/open/floor/iron/dark/textured_large,
/area/centcom/syndicate_mothership/control)
+"GV" = (
+/obj/structure/table/wood,
+/obj/machinery/chem_dispenser/drinks{
+ dir = 4;
+ pixel_x = -8;
+ pixel_y = 4
+ },
+/obj/item/reagent_containers/condiment/enzyme{
+ layer = 5;
+ pixel_x = 10;
+ pixel_y = 2
+ },
+/turf/open/floor/carpet/black,
+/area/centcom/central_command_areas/holding)
"GW" = (
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
@@ -11634,6 +11534,11 @@
/obj/structure/shuttle/engine/propulsion,
/turf/open/space,
/area/centcom/wizard_station)
+"GY" = (
+/obj/structure/table/rolling,
+/obj/item/reagent_containers/cup/glass/bottle/juice/tomatojuice,
+/turf/open/floor/mineral/titanium,
+/area/centcom/syndicate_mothership/control)
"GZ" = (
/obj/structure/sign/poster/contraband/gorlex_recruitment{
pixel_y = 32
@@ -11650,6 +11555,38 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/courtroom)
+"Hd" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 1
+ },
+/obj/structure/table/glass/plasmaglass,
+/obj/item/reagent_containers/syringe{
+ pixel_x = -5;
+ pixel_y = 12
+ },
+/obj/item/reagent_containers/syringe{
+ pixel_x = -2;
+ pixel_y = 13
+ },
+/obj/item/reagent_containers/syringe{
+ pixel_x = 1;
+ pixel_y = 14
+ },
+/obj/machinery/light/cold/directional/north,
+/obj/item/reagent_containers/dropper{
+ pixel_x = -4;
+ pixel_y = -6
+ },
+/obj/item/storage/box/monkeycubes{
+ pixel_x = -6;
+ pixel_y = 5
+ },
+/obj/item/reagent_containers/cup/bottle/formaldehyde{
+ pixel_x = 8;
+ pixel_y = 4
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/centcom/syndicate_mothership/expansion_bioterrorism)
"He" = (
/obj/item/kirbyplants/random,
/turf/open/floor/mineral/plastitanium,
@@ -11797,12 +11734,6 @@
},
/turf/open/misc/ice/icemoon,
/area/centcom/syndicate_mothership/control)
-"HC" = (
-/obj/structure/table/wood,
-/obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/shaker,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/supplypod)
"HE" = (
/obj/structure/flora/bush/lavendergrass/style_random,
/obj/structure/flora/bush/fullgrass/style_random,
@@ -11859,15 +11790,6 @@
"HN" = (
/turf/open/floor/mineral/titanium,
/area/centcom/syndicate_mothership/control)
-"HO" = (
-/obj/structure/table/wood,
-/obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
- pixel_y = 5
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/briefing)
"HP" = (
/obj/effect/landmark/abductor/scientist{
team_number = 2
@@ -11996,6 +11918,24 @@
/obj/machinery/recharger,
/turf/open/floor/carpet,
/area/centcom/syndicate_mothership/control)
+"Id" = (
+/obj/structure/window/reinforced/survival_pod{
+ name = "Tinted Window";
+ opacity = 1
+ },
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 6
+ },
+/obj/structure/table/reinforced/plasmarglass,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/multiver{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/syringe{
+ pixel_y = 15
+ },
+/turf/open/floor/mineral/titanium/tiled/blue,
+/area/centcom/syndicate_mothership/control)
"If" = (
/obj/machinery/atmospherics/components/unary/passive_vent{
dir = 4
@@ -12033,18 +11973,6 @@
},
/turf/open/floor/mineral/plastitanium,
/area/centcom/syndicate_mothership/expansion_bombthreat)
-"Im" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/beer{
- pixel_x = 5;
- pixel_y = -2
- },
-/obj/item/toy/cards/deck/syndicate{
- pixel_x = -6;
- pixel_y = 6
- },
-/turf/open/floor/wood/tile,
-/area/centcom/syndicate_mothership/control)
"In" = (
/obj/structure/flora/grass/both/style_random,
/obj/structure/railing{
@@ -12313,17 +12241,6 @@
},
/turf/open/floor/iron,
/area/centcom/tdome/arena)
-"Jf" = (
-/obj/structure/table/wood,
-/obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
- pixel_y = 5
- },
-/obj/machinery/light/directional/south,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/status_display/evac/directional/south,
-/turf/open/floor/iron/dark,
-/area/centcom/tdome/administration)
"Jg" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -12566,35 +12483,29 @@
/obj/effect/turf_decal/trimline/red,
/turf/open/floor/mineral/plastitanium,
/area/centcom/syndicate_mothership/expansion_chemicalwarfare)
-"Ka" = (
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
+"Kb" = (
+/obj/structure/closet/secure_closet/freezer/fridge/open{
+ name = "freezer"
},
-/obj/structure/table/wood/poker,
-/obj/machinery/light/warm/directional/north,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
- pixel_x = -4;
- pixel_y = 14
+/obj/item/food/meat/slab/killertomato,
+/obj/item/food/meat/slab/killertomato,
+/obj/item/food/grown/tomato,
+/obj/item/food/grown/tomato,
+/obj/item/food/grown/tomato,
+/obj/item/food/grown/wheat,
+/obj/item/food/grown/wheat,
+/obj/item/food/grown/wheat,
+/obj/item/food/grown/berries,
+/obj/item/food/grown/berries,
+/obj/item/food/grown/cabbage,
+/obj/item/food/grown/cherries,
+/obj/item/food/grown/cherries,
+/obj/item/reagent_containers/condiment/enzyme{
+ layer = 5
},
-/obj/item/toy/cards/deck{
- pixel_x = 3;
- pixel_y = 6
- },
-/obj/item/clothing/mask/cigarette/robust{
- pixel_x = -4;
- pixel_y = 1
- },
-/obj/effect/decal/cleanable/ash{
- pixel_x = 12;
- pixel_y = -6
- },
-/obj/effect/spawner/random/entertainment/lighter{
- pixel_x = 9;
- pixel_y = -3
- },
-/turf/open/floor/iron,
-/area/centcom/syndicate_mothership/control)
+/obj/item/food/grown/redbeet,
+/turf/open/floor/catwalk_floor,
+/area/centcom/central_command_areas/holding)
"Kc" = (
/obj/effect/turf_decal/siding/thinplating_new/dark{
dir = 1
@@ -13042,6 +12953,20 @@
/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/centcom/central_command_areas/evacuation/ship)
+"Lx" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor,
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -8;
+ pixel_y = 5
+ },
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = -8
+ },
+/obj/item/reagent_containers/cup/glass/britcup,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron,
+/area/centcom/tdome/observation)
"Ly" = (
/obj/machinery/door/airlock/titanium,
/turf/open/floor/mineral/titanium,
@@ -14366,35 +14291,6 @@
/obj/item/paper/pamphlet/centcom/visitor_info,
/turf/open/floor/iron,
/area/centcom/central_command_areas/supplypod)
-"PB" = (
-/obj/machinery/light/small/directional/west,
-/obj/structure/closet/secure_closet/freezer/fridge/open,
-/obj/item/food/meat/slab/rawcrab,
-/obj/item/food/meat/slab/rawcrab,
-/obj/item/food/meat/slab/rawcrab,
-/obj/item/food/fishmeat,
-/obj/item/food/fishmeat,
-/obj/item/food/fishmeat,
-/obj/item/food/grown/tomato,
-/obj/item/food/grown/tomato,
-/obj/item/food/grown/tomato,
-/obj/item/reagent_containers/food/condiment/enzyme{
- layer = 5
- },
-/obj/item/storage/fancy/egg_box,
-/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{
- pixel_x = -5;
- pixel_y = 9
- },
-/obj/item/reagent_containers/food/condiment/flour{
- pixel_x = -5;
- pixel_y = 9
- },
-/turf/open/floor/plastic,
-/area/centcom/syndicate_mothership/expansion_fridgerummage)
"PC" = (
/obj/structure/table/wood,
/obj/effect/turf_decal/siding/wood,
@@ -14734,6 +14630,46 @@
/obj/item/clothing/under/costume/roman,
/turf/open/floor/wood/parquet,
/area/centcom/central_command_areas/holding)
+"QE" = (
+/obj/item/reagent_containers/cup/bottle/epinephrine{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/multiver{
+ pixel_x = -3
+ },
+/obj/item/reagent_containers/cup/bottle/epinephrine{
+ pixel_x = -3;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/bottle/multiver{
+ pixel_x = 6;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/syringe/epinephrine{
+ pixel_x = 3;
+ pixel_y = -2
+ },
+/obj/item/reagent_containers/syringe/epinephrine{
+ pixel_x = 4;
+ pixel_y = 1
+ },
+/obj/item/reagent_containers/syringe/epinephrine{
+ pixel_x = -2;
+ pixel_y = 5
+ },
+/obj/item/reagent_containers/syringe/epinephrine{
+ pixel_x = 2;
+ pixel_y = 8
+ },
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/turf/open/floor/iron/white,
+/area/centcom/central_command_areas/control)
"QH" = (
/obj/item/toy/figure/syndie,
/turf/open/misc/asteroid/snow/icemoon,
@@ -14757,15 +14693,6 @@
},
/turf/open/floor/carpet/black,
/area/centcom/central_command_areas/holding)
-"QK" = (
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/obj/structure/table/wood,
-/obj/item/reagent_containers/glass/rag,
-/turf/open/floor/iron,
-/area/centcom/syndicate_mothership/control)
"QL" = (
/obj/structure/flora/bush/ferny/style_random,
/obj/structure/flora/bush/flowers_pp/style_random,
@@ -15950,6 +15877,12 @@
/obj/structure/noticeboard/directional/east,
/turf/open/floor/mineral/plastitanium,
/area/centcom/syndicate_mothership/expansion_bioterrorism)
+"Ud" = (
+/obj/structure/table/wood,
+/obj/item/storage/box/drinkingglasses,
+/obj/item/reagent_containers/cup/glass/shaker,
+/turf/open/floor/iron/dark,
+/area/centcom/central_command_areas/supplypod)
"Ue" = (
/obj/effect/baseturf_helper/asteroid/snow,
/turf/closed/indestructible/syndicate,
@@ -16157,11 +16090,6 @@
},
/turf/open/floor/wood/tile,
/area/centcom/central_command_areas/holding)
-"UD" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/trophy/gold_cup,
-/turf/open/floor/iron/grimy,
-/area/centcom/tdome/observation)
"UE" = (
/obj/structure/table/reinforced/plastitaniumglass,
/obj/item/paper_bin,
@@ -16515,6 +16443,35 @@
/obj/structure/cable,
/turf/open/floor/iron/grimy,
/area/centcom/central_command_areas/admin)
+"VA" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 9
+ },
+/obj/structure/table/glass/plasmaglass,
+/obj/machinery/reagentgrinder{
+ pixel_x = -5;
+ pixel_y = 12
+ },
+/obj/item/reagent_containers/cup/beaker/large{
+ pixel_x = -7;
+ pixel_y = -8
+ },
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
+ pixel_x = 9;
+ pixel_y = -7
+ },
+/obj/structure/sign/poster/contraband/lizard{
+ pixel_x = -32
+ },
+/obj/structure/sign/poster/contraband/kudzu{
+ pixel_y = 32
+ },
+/obj/item/reagent_containers/spray/plantbgone{
+ pixel_x = 10;
+ pixel_y = 5
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/centcom/syndicate_mothership/expansion_bioterrorism)
"VB" = (
/obj/structure/table/reinforced,
/obj/item/clipboard,
@@ -16738,6 +16695,12 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/courtroom)
+"Wj" = (
+/obj/item/mop,
+/obj/structure/sink/kitchen/directional/west,
+/obj/item/reagent_containers/cup/bucket,
+/turf/open/floor/catwalk_floor,
+/area/centcom/central_command_areas/holding)
"Wl" = (
/obj/structure/table/wood,
/obj/machinery/recharger,
@@ -17392,13 +17355,6 @@
/obj/item/toy/toy_xeno,
/turf/open/floor/wood/parquet,
/area/centcom/central_command_areas/holding)
-"XP" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/sake{
- pixel_y = 15
- },
-/turf/open/floor/carpet/black,
-/area/centcom/central_command_areas/holding)
"XQ" = (
/obj/machinery/computer/crew{
dir = 1
@@ -17997,14 +17953,34 @@
/turf/open/floor/plating,
/area/centcom/syndicate_mothership/control)
"ZK" = (
-/obj/structure/table/wood,
-/obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
- pixel_y = 5
+/obj/machinery/light/small/directional/west,
+/obj/structure/closet/secure_closet/freezer/fridge/open,
+/obj/item/food/meat/slab/rawcrab,
+/obj/item/food/meat/slab/rawcrab,
+/obj/item/food/meat/slab/rawcrab,
+/obj/item/food/fishmeat,
+/obj/item/food/fishmeat,
+/obj/item/food/fishmeat,
+/obj/item/food/grown/tomato,
+/obj/item/food/grown/tomato,
+/obj/item/food/grown/tomato,
+/obj/item/reagent_containers/condiment/enzyme{
+ layer = 5
},
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/centcom/tdome/observation)
+/obj/item/storage/fancy/egg_box,
+/obj/item/storage/fancy/egg_box,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/flour{
+ pixel_x = -5;
+ pixel_y = 9
+ },
+/obj/item/reagent_containers/condiment/flour{
+ pixel_x = -5;
+ pixel_y = 9
+ },
+/turf/open/floor/plastic,
+/area/centcom/syndicate_mothership/expansion_fridgerummage)
"ZM" = (
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
@@ -18021,16 +17997,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/ferry)
-"ZO" = (
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
- pixel_y = 5
- },
-/obj/item/clothing/mask/cigarette/cigar/havana{
- pixel_x = 2
- },
-/turf/open/floor/iron,
-/area/centcom/central_command_areas/supplypod)
"ZP" = (
/obj/machinery/light/directional/east,
/obj/effect/turf_decal/tile/green{
@@ -18077,6 +18043,40 @@
/obj/machinery/computer/security/telescreen/entertainment/directional/west,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/admin)
+"ZU" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 8
+ },
+/obj/structure/table/glass/plasmaglass,
+/obj/item/folder/white{
+ pixel_x = 4;
+ pixel_y = -3
+ },
+/obj/item/reagent_containers/syringe{
+ pixel_x = -5;
+ pixel_y = 12
+ },
+/obj/item/reagent_containers/syringe{
+ pixel_x = -2;
+ pixel_y = 13
+ },
+/obj/item/reagent_containers/syringe{
+ pixel_x = 1;
+ pixel_y = 14
+ },
+/obj/item/reagent_containers/syringe{
+ pixel_x = 4;
+ pixel_y = 15
+ },
+/obj/structure/extinguisher_cabinet/directional/west,
+/obj/item/reagent_containers/cup/bottle/radium{
+ pixel_x = -8;
+ pixel_y = 9
+ },
+/obj/item/stack/sheet/mineral/plasma,
+/obj/item/stack/sheet/mineral/plasma,
+/turf/open/floor/mineral/plastitanium/red,
+/area/centcom/syndicate_mothership/expansion_bioterrorism)
"ZV" = (
/obj/structure/table,
/obj/structure/bedsheetbin,
@@ -20069,7 +20069,7 @@ aa
aa
ks
kP
-hA
+Ep
lG
lj
mw
@@ -20096,7 +20096,7 @@ aa
aa
ks
kP
-hA
+Ep
lG
lj
mw
@@ -20126,7 +20126,7 @@ aa
aa
ks
kP
-hA
+Ep
lG
lj
mw
@@ -20153,7 +20153,7 @@ aa
aa
ks
kP
-hA
+Ep
lG
lj
mw
@@ -23164,7 +23164,7 @@ nH
Ue
rp
Zq
-sf
+eg
HY
zX
nH
@@ -23429,8 +23429,8 @@ ng
ng
ng
CN
-cU
-fC
+VA
+ZU
Xe
EA
RK
@@ -24200,7 +24200,7 @@ ng
ac
ng
CN
-cX
+Hd
pS
Gu
JO
@@ -24457,7 +24457,7 @@ gL
FD
Ih
RK
-BK
+th
Na
Sf
FM
@@ -25220,7 +25220,7 @@ nH
nH
pV
AP
-uT
+eL
Un
OI
we
@@ -26247,7 +26247,7 @@ Ff
bZ
ng
Uj
-fB
+Id
Md
Hg
Gi
@@ -26761,10 +26761,10 @@ nz
ng
fd
YJ
-sB
+De
lx
bK
-PB
+ZK
bK
ng
tz
@@ -27270,7 +27270,7 @@ Ff
Bt
Ff
nz
-hV
+GY
HN
dE
pZ
@@ -27278,7 +27278,7 @@ pZ
pZ
Gn
bK
-sp
+nh
bK
BV
Go
@@ -27788,7 +27788,7 @@ HN
HN
Wx
py
-QK
+jZ
fn
wE
bK
@@ -28316,7 +28316,7 @@ ng
MB
Jm
Fd
-Ka
+cK
HA
aC
nz
@@ -28554,7 +28554,7 @@ Bz
GD
Ff
nz
-qN
+cX
HN
HN
tY
@@ -29588,7 +29588,7 @@ Kn
ng
QT
Ut
-Im
+aY
aJ
ng
Gl
@@ -29853,7 +29853,7 @@ WW
WW
Hr
ng
-CO
+bl
ng
gd
ES
@@ -33694,7 +33694,7 @@ Zb
ll
ZJ
rP
-sg
+uz
ng
nz
nz
@@ -33951,7 +33951,7 @@ Zb
ll
ll
ll
-sg
+uz
oS
vL
uv
@@ -34208,7 +34208,7 @@ Zb
ll
ll
ll
-sg
+uz
Dg
vL
uv
@@ -35498,7 +35498,7 @@ ng
ng
Ws
Wa
-ud
+FI
ng
ng
xI
@@ -35538,7 +35538,7 @@ pJ
pJ
pJ
Nd
-ro
+Kb
Zo
YF
Nd
@@ -35785,7 +35785,7 @@ pJ
pJ
fg
bE
-pF
+sp
zS
Nd
Nd
@@ -36046,10 +36046,10 @@ Fh
hj
fO
AJ
-cF
-ec
+GM
+GV
Bn
-vM
+ti
pK
fO
tc
@@ -37075,7 +37075,7 @@ aF
fO
KE
Ww
-XP
+rL
Qa
SX
Zr
@@ -44798,7 +44798,7 @@ YC
YC
cN
CQ
-nD
+Wj
Nd
OL
aa
@@ -47365,7 +47365,7 @@ pJ
hs
pJ
Nd
-sA
+nR
uI
Ov
MX
@@ -54531,7 +54531,7 @@ wv
wv
mD
yL
-HO
+pa
cb
wW
tb
@@ -58662,8 +58662,8 @@ oi
QC
aM
BW
-GR
-Dc
+te
+DU
Tp
Yu
VT
@@ -59435,7 +59435,7 @@ Zj
bi
ni
zw
-rD
+Lx
Bs
di
QC
@@ -60717,7 +60717,7 @@ Rh
PT
QC
eN
-UD
+hR
Tl
QC
yY
@@ -62248,7 +62248,7 @@ mQ
io
io
iu
-rj
+Dc
DI
iu
in
@@ -62259,7 +62259,7 @@ Rh
Ad
QC
sc
-UD
+hR
YT
QC
yY
@@ -62504,7 +62504,7 @@ io
iu
io
el
-nh
+xL
Dv
DJ
XQ
@@ -63049,7 +63049,7 @@ Pj
Pr
Xw
Sz
-Jf
+wp
uf
uf
uf
@@ -64300,7 +64300,7 @@ io
zI
Ab
xN
-tZ
+QE
iu
qw
iu
@@ -64314,14 +64314,14 @@ Sl
Qi
cZ
QC
-ZK
+Gh
BW
uM
JV
dG
MR
TV
-rL
+CF
QC
IM
QP
@@ -69443,7 +69443,7 @@ aP
cg
qz
cg
-HC
+Ud
Ro
Yn
Se
@@ -70471,7 +70471,7 @@ Bd
cg
cg
cg
-ZO
+wS
Su
Yn
Vk
diff --git a/_maps/map_files/generic/CentCom_skyrat_z2.dmm b/_maps/map_files/generic/CentCom_skyrat_z2.dmm
index 35cfff6100f..820dfbfb8e6 100644
--- a/_maps/map_files/generic/CentCom_skyrat_z2.dmm
+++ b/_maps/map_files/generic/CentCom_skyrat_z2.dmm
@@ -206,7 +206,7 @@
"afD" = (
/obj/structure/closet/crate,
/obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/turf/open/indestructible/hotelwood,
/area/centcom/holding/cafe)
"afF" = (
@@ -385,8 +385,8 @@
/obj/item/clothing/suit/caution,
/obj/item/clothing/suit/caution,
/obj/item/clothing/suit/caution,
-/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,
/obj/effect/turf_decal/tile/blue{
@@ -744,19 +744,19 @@
/turf/open/floor/iron,
/area/centcom/interlink)
"akJ" = (
-/obj/item/reagent_containers/glass/beaker/bluespace{
+/obj/item/reagent_containers/cup/beaker/bluespace{
luminosity = 3;
name = "floofmagic beaker";
possible_transfer_amounts = list(5,10,15,20,25,30,50,100,150,200,250,500);
volume = 500
},
-/obj/item/reagent_containers/glass/beaker/bluespace{
+/obj/item/reagent_containers/cup/beaker/bluespace{
luminosity = 3;
name = "floofmagic beaker";
possible_transfer_amounts = list(5,10,15,20,25,30,50,100,150,200,250,500);
volume = 500
},
-/obj/item/reagent_containers/glass/beaker/bluespace{
+/obj/item/reagent_containers/cup/beaker/bluespace{
luminosity = 3;
name = "floofmagic beaker";
possible_transfer_amounts = list(5,10,15,20,25,30,50,100,150,200,250,500);
@@ -908,7 +908,7 @@
},
/area/centcom/holding/cafe)
"alM" = (
-/obj/item/reagent_containers/food/drinks/shaker{
+/obj/item/reagent_containers/cup/glass/shaker{
pixel_x = 1;
pixel_y = 13
},
@@ -921,32 +921,32 @@
},
/obj/item/seeds/ambrosia/gaia,
/obj/item/seeds/pumpkin/blumpkin,
-/obj/item/reagent_containers/glass/bucket/wooden{
+/obj/item/reagent_containers/cup/bucket/wooden{
name = "Rustic Bucket";
possible_transfer_amounts = list(5,10,15,20,25,30,50,100,150,200,250,500);
volume = 500
},
-/obj/item/reagent_containers/glass/bucket/wooden{
+/obj/item/reagent_containers/cup/bucket/wooden{
name = "Rustic Bucket";
possible_transfer_amounts = list(5,10,15,20,25,30,50,100,150,200,250,500);
volume = 500
},
-/obj/item/reagent_containers/glass/bucket/wooden{
+/obj/item/reagent_containers/cup/bucket/wooden{
name = "Rustic Bucket";
possible_transfer_amounts = list(5,10,15,20,25,30,50,100,150,200,250,500);
volume = 500
},
-/obj/item/reagent_containers/glass/bucket/wooden{
+/obj/item/reagent_containers/cup/bucket/wooden{
name = "Rustic Bucket";
possible_transfer_amounts = list(5,10,15,20,25,30,50,100,150,200,250,500);
volume = 500
},
-/obj/item/reagent_containers/glass/bucket/wooden{
+/obj/item/reagent_containers/cup/bucket/wooden{
name = "Rustic Bucket";
possible_transfer_amounts = list(5,10,15,20,25,30,50,100,150,200,250,500);
volume = 500
},
-/obj/item/reagent_containers/glass/bucket/wooden{
+/obj/item/reagent_containers/cup/bucket/wooden{
name = "Rustic Bucket";
possible_transfer_amounts = list(5,10,15,20,25,30,50,100,150,200,250,500);
volume = 500
@@ -1166,11 +1166,11 @@
pixel_x = 7
},
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -9;
pixel_y = 9
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -9
},
/turf/open/indestructible/hoteltile{
@@ -1695,7 +1695,7 @@
/obj/machinery/reagentgrinder{
pixel_y = 8
},
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/turf/open/indestructible/hoteltile{
icon_state = "darkfull"
},
@@ -2489,7 +2489,7 @@
/area/centcom/holding/cafe)
"aAv" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
/obj/machinery/reagentgrinder{
pixel_y = 8
},
@@ -2556,33 +2556,33 @@
/turf/open/floor/bamboo,
/area/centcom/holding/cafedorms)
"aAL" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko{
+/obj/item/reagent_containers/cup/soda_cans/thirteenloko{
pixel_x = -10;
pixel_y = 12
},
-/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko{
+/obj/item/reagent_containers/cup/soda_cans/thirteenloko{
pixel_x = -10;
pixel_y = 6
},
-/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko{
+/obj/item/reagent_containers/cup/soda_cans/thirteenloko{
pixel_x = -10
},
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
+/obj/item/reagent_containers/cup/soda_cans/starkist{
pixel_y = 12
},
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
+/obj/item/reagent_containers/cup/soda_cans/starkist{
pixel_y = 6
},
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist,
-/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind{
+/obj/item/reagent_containers/cup/soda_cans/starkist,
+/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{
pixel_x = 10;
pixel_y = 12
},
-/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind{
+/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{
pixel_x = 10;
pixel_y = 6
},
-/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind{
+/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{
pixel_x = 10
},
/obj/structure/table/wood,
@@ -2731,18 +2731,18 @@
/obj/structure/table{
name = "Jim Norton's Quebecois Coffee table"
},
-/obj/item/reagent_containers/food/condiment/sugar{
+/obj/item/reagent_containers/condiment/sugar{
pixel_y = 4
},
-/obj/item/reagent_containers/food/condiment/milk{
+/obj/item/reagent_containers/condiment/milk{
pixel_x = 6;
pixel_y = 8
},
-/obj/item/reagent_containers/food/condiment/soymilk{
+/obj/item/reagent_containers/condiment/soymilk{
pixel_x = -6;
pixel_y = 8
},
-/obj/item/reagent_containers/food/drinks/bottle/cream{
+/obj/item/reagent_containers/cup/glass/bottle/juice/cream{
pixel_x = 3;
pixel_y = -2
},
@@ -2884,7 +2884,7 @@
/area/centcom/holding/cafe)
"aCY" = (
/obj/item/reagent_containers/dropper,
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 8;
pixel_y = 2
},
@@ -2918,37 +2918,37 @@
/turf/open/misc/beach/sand,
/area/centcom/holding/cafepark)
"aDc" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb{
pixel_x = -8;
pixel_y = 12
},
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb{
pixel_x = -8;
pixel_y = 6
},
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb{
pixel_x = -8
},
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{
+/obj/item/reagent_containers/cup/soda_cans/pwr_game{
pixel_x = 2;
pixel_y = 12
},
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{
+/obj/item/reagent_containers/cup/soda_cans/pwr_game{
pixel_x = 2;
pixel_y = 6
},
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{
+/obj/item/reagent_containers/cup/soda_cans/pwr_game{
pixel_x = 2
},
-/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/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
pixel_x = 12;
pixel_y = 6
},
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
pixel_x = 12
},
/obj/structure/table/wood,
@@ -3543,16 +3543,16 @@
/area/centcom/holding/cafe)
"aIx" = (
/obj/structure/closet/crate/freezer,
-/obj/item/reagent_containers/food/condiment/yoghurt,
-/obj/item/reagent_containers/food/condiment/yoghurt,
-/obj/item/reagent_containers/food/condiment/yoghurt,
-/obj/item/reagent_containers/food/condiment/yoghurt,
-/obj/item/reagent_containers/food/condiment/yoghurt,
-/obj/item/reagent_containers/food/condiment/quality_oil,
-/obj/item/reagent_containers/food/condiment/quality_oil,
-/obj/item/reagent_containers/food/condiment/quality_oil,
-/obj/item/reagent_containers/food/condiment/quality_oil,
-/obj/item/reagent_containers/food/condiment/quality_oil,
+/obj/item/reagent_containers/condiment/yoghurt,
+/obj/item/reagent_containers/condiment/yoghurt,
+/obj/item/reagent_containers/condiment/yoghurt,
+/obj/item/reagent_containers/condiment/yoghurt,
+/obj/item/reagent_containers/condiment/yoghurt,
+/obj/item/reagent_containers/condiment/quality_oil,
+/obj/item/reagent_containers/condiment/quality_oil,
+/obj/item/reagent_containers/condiment/quality_oil,
+/obj/item/reagent_containers/condiment/quality_oil,
+/obj/item/reagent_containers/condiment/quality_oil,
/obj/item/food/larvae,
/obj/item/food/larvae,
/obj/item/food/larvae,
@@ -3803,7 +3803,7 @@
light_range = 10;
nightshift_light_power = 10
},
-/obj/item/reagent_containers/food/drinks/mug/tea,
+/obj/item/reagent_containers/cup/glass/mug/tea,
/turf/open/indestructible/hotelwood,
/area/centcom/holding/cafedorms)
"aLz" = (
@@ -3915,7 +3915,7 @@
/area/centcom/holding/cafedorms)
"aMI" = (
/obj/machinery/vending/hydronutrients{
- products = list(/obj/item/reagent_containers/glass/bottle/nutrient/ez=50,/obj/item/reagent_containers/glass/bottle/nutrient/l4z=20,/obj/item/reagent_containers/glass/bottle/nutrient/rh=10,/obj/item/reagent_containers/spray/pestspray=30,/obj/item/reagent_containers/syringe=5,/obj/item/storage/bag/plants=30,/obj/item/cultivator=10,/obj/item/shovel/spade=10,/obj/item/plant_analyzer=10)
+ products = list(/obj/item/reagent_containers/cup/bottle/nutrient/ez=50,/obj/item/reagent_containers/cup/bottle/nutrient/l4z=20,/obj/item/reagent_containers/cup/bottle/nutrient/rh=10,/obj/item/reagent_containers/spray/pestspray=30,/obj/item/reagent_containers/syringe=5,/obj/item/storage/bag/plants=30,/obj/item/cultivator=10,/obj/item/shovel/spade=10,/obj/item/plant_analyzer=10)
},
/turf/open/indestructible/hoteltile{
icon_state = "darkfull"
@@ -3992,28 +3992,28 @@
/turf/open/floor/carpet/royalblack,
/area/centcom/holding/cafedorms)
"aNi" = (
-/obj/item/reagent_containers/food/drinks/bottle/gin{
+/obj/item/reagent_containers/cup/glass/bottle/gin{
pixel_x = -7;
pixel_y = 15
},
-/obj/item/reagent_containers/food/drinks/shaker{
+/obj/item/reagent_containers/cup/glass/shaker{
pixel_x = 1;
pixel_y = 13
},
-/obj/item/reagent_containers/food/drinks/bottle/sake{
+/obj/item/reagent_containers/cup/glass/bottle/sake{
pixel_x = 10;
pixel_y = 11
},
-/obj/item/reagent_containers/food/drinks/bottle/kahlua{
+/obj/item/reagent_containers/cup/glass/bottle/kahlua{
pixel_x = 2;
pixel_y = 8
},
-/obj/item/reagent_containers/food/drinks/bottle/wine{
+/obj/item/reagent_containers/cup/glass/bottle/wine{
pixel_x = -3;
pixel_y = 7
},
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing{
+/obj/item/reagent_containers/cup/glass/bottle/bottleofnothing{
pixel_x = -8;
pixel_y = 6
},
@@ -4045,13 +4045,13 @@
/obj/item/storage/box/ingredients/fiesta,
/obj/item/storage/box/ingredients/american,
/obj/item/storage/box/ingredients/exotic,
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour{
list_reagents = list(/datum/reagent/consumable/flour=90);
name = "large flour sack";
possible_transfer_amounts = list(1,5,10,15,30,60,90);
volume = 90
},
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour{
list_reagents = list(/datum/reagent/consumable/flour=90);
name = "large flour sack";
possible_transfer_amounts = list(1,5,10,15,30,60,90);
@@ -4145,11 +4145,11 @@
/area/centcom/interlink)
"aNT" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/vodka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
pixel_x = 3;
pixel_y = 2
},
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
pixel_x = -5;
pixel_y = 4
},
@@ -4203,30 +4203,30 @@
},
/area/centcom/holding/cafe)
"aOr" = (
-/obj/item/reagent_containers/food/drinks/bottle/wine{
+/obj/item/reagent_containers/cup/glass/bottle/wine{
pixel_x = 9;
pixel_y = 19
},
-/obj/item/reagent_containers/food/drinks/bottle/tequila{
+/obj/item/reagent_containers/cup/glass/bottle/tequila{
pixel_y = 17
},
-/obj/item/reagent_containers/food/drinks/bottle/vermouth{
+/obj/item/reagent_containers/cup/glass/bottle/vermouth{
pixel_x = -15;
pixel_y = 15
},
-/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/hcider{
+/obj/item/reagent_containers/cup/glass/bottle/hcider{
pixel_x = 7;
pixel_y = 9
},
-/obj/item/reagent_containers/food/drinks/bottle/cognac{
+/obj/item/reagent_containers/cup/glass/bottle/cognac{
pixel_x = -10;
pixel_y = 7
},
-/obj/item/reagent_containers/food/drinks/bottle/vodka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
pixel_y = 6
},
/obj/structure/table/wood,
@@ -4448,11 +4448,11 @@
/area/centcom/holding/cafe)
"aQd" = (
/obj/structure/table/wood/fancy/royalblue,
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
+/obj/item/reagent_containers/cup/soda_cans/starkist{
pixel_x = 5;
pixel_y = 7
},
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb{
pixel_x = -3;
pixel_y = 2
},
@@ -4480,7 +4480,7 @@
/area/centcom/interlink)
"aQD" = (
/obj/structure/closet/secure_closet/freezer/fridge,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
layer = 5;
name = "universally-sized universal enzyme";
pixel_x = -4;
@@ -4492,11 +4492,11 @@
/area/centcom/holding/cafe)
"aQE" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/shaker{
+/obj/item/reagent_containers/cup/glass/shaker{
pixel_x = 1;
pixel_y = 13
},
-/obj/item/reagent_containers/food/drinks/bottle/rum{
+/obj/item/reagent_containers/cup/glass/bottle/rum{
pixel_x = -7;
pixel_y = 2
},
@@ -4637,33 +4637,33 @@
/area/centcom/interlink)
"aRt" = (
/obj/structure/table/wood/fancy/blue,
-/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/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
dir = 1;
pixel_x = -3;
pixel_y = 2
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -9;
pixel_y = 11
},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -3;
pixel_y = 11
},
-/obj/item/reagent_containers/food/condiment/pack/ketchup{
+/obj/item/reagent_containers/condiment/pack/ketchup{
pixel_x = 3
},
-/obj/item/reagent_containers/food/condiment/pack/ketchup{
+/obj/item/reagent_containers/condiment/pack/ketchup{
pixel_x = 5
},
-/obj/item/reagent_containers/food/condiment/pack/ketchup{
+/obj/item/reagent_containers/condiment/pack/ketchup{
pixel_x = 7
},
-/obj/item/reagent_containers/food/condiment/pack/hotsauce{
+/obj/item/reagent_containers/condiment/pack/hotsauce{
pixel_x = 5;
pixel_y = 2
},
@@ -5310,7 +5310,7 @@
/area/centcom/holding/cafepark)
"aWQ" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
/turf/open/indestructible/hotelwood,
/area/centcom/holding/cafe)
"aWT" = (
@@ -6663,11 +6663,11 @@
/area/centcom/holding/cafepark)
"fbn" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = 9;
pixel_y = 11
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
dir = 1;
pixel_x = 9;
pixel_y = 2
@@ -6888,11 +6888,11 @@
/area/centcom/interlink)
"fTu" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/shaker{
+/obj/item/reagent_containers/cup/glass/shaker{
pixel_x = 1;
pixel_y = 13
},
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
/turf/open/floor/wood,
/area/centcom/holding/cafe)
"fTV" = (
@@ -7244,21 +7244,21 @@
/obj/structure/closet/secure_closet/freezer/kitchen{
req_access = null
},
-/obj/item/reagent_containers/food/condiment/mayonnaise,
-/obj/item/reagent_containers/food/condiment/soysauce,
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/reagent_containers/food/condiment/rice{
+/obj/item/reagent_containers/condiment/mayonnaise,
+/obj/item/reagent_containers/condiment/soysauce,
+/obj/item/reagent_containers/condiment/sugar,
+/obj/item/reagent_containers/condiment/rice{
list_reagents = list(/datum/reagent/consumable/rice=90);
name = "large rice sack";
possible_transfer_amounts = list(1,5,10,15,20,25,30,50,60,90)
},
-/obj/item/reagent_containers/food/condiment/rice{
+/obj/item/reagent_containers/condiment/rice{
list_reagents = list(/datum/reagent/consumable/rice=90);
name = "large rice sack";
possible_transfer_amounts = list(1,5,10,15,20,25,30,50,60,90)
},
-/obj/item/reagent_containers/food/condiment/cornmeal,
-/obj/item/reagent_containers/food/condiment/cornmeal,
+/obj/item/reagent_containers/condiment/cornmeal,
+/obj/item/reagent_containers/condiment/cornmeal,
/turf/open/indestructible/hoteltile{
icon_state = "cafeteria"
},
@@ -7350,29 +7350,29 @@
/obj/structure/closet/crate/freezer{
name = "Cooler"
},
-/obj/item/reagent_containers/food/drinks/bottle/beer/light,
-/obj/item/reagent_containers/food/drinks/bottle/beer/light,
-/obj/item/reagent_containers/food/drinks/bottle/hcider{
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/glass/bottle/hcider{
pixel_x = 7;
pixel_y = 9
},
-/obj/item/reagent_containers/food/drinks/bottle/kahlua{
+/obj/item/reagent_containers/cup/glass/bottle/kahlua{
pixel_x = 2;
pixel_y = 8
},
-/obj/item/reagent_containers/food/drinks/bottle/gin{
+/obj/item/reagent_containers/cup/glass/bottle/gin{
pixel_x = -7;
pixel_y = 15
},
-/obj/item/reagent_containers/food/drinks/bottle/cognac{
+/obj/item/reagent_containers/cup/glass/bottle/cognac{
pixel_x = -10;
pixel_y = 7
},
/obj/machinery/light{
dir = 1
},
-/obj/item/reagent_containers/food/drinks/bottle/goldschlager,
-/obj/item/reagent_containers/food/drinks/bottle/sake{
+/obj/item/reagent_containers/cup/glass/bottle/goldschlager,
+/obj/item/reagent_containers/cup/glass/bottle/sake{
pixel_x = 10;
pixel_y = 11
},
@@ -8432,7 +8432,7 @@
"lIx" = (
/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/trimline/red/filled/line{
@@ -8872,7 +8872,7 @@
/area/centcom/interlink)
"niQ" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{
+/obj/item/reagent_containers/cup/soda_cans/pwr_game{
pixel_x = 2
},
/turf/open/misc/beach/sand,
@@ -9154,24 +9154,24 @@
/obj/item/storage/box/ingredients/fiesta,
/obj/item/storage/box/ingredients/american,
/obj/item/storage/box/ingredients/exotic,
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour{
list_reagents = list(/datum/reagent/consumable/flour=90);
name = "large flour sack";
possible_transfer_amounts = list(1,5,10,15,30,60,90);
volume = 90
},
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour{
list_reagents = list(/datum/reagent/consumable/flour=90);
name = "large flour sack";
possible_transfer_amounts = list(1,5,10,15,30,60,90);
volume = 90
},
-/obj/item/reagent_containers/food/condiment/rice{
+/obj/item/reagent_containers/condiment/rice{
list_reagents = list(/datum/reagent/consumable/rice=90);
name = "large rice sack";
possible_transfer_amounts = list(1,5,10,15,20,25,30,50,60,90)
},
-/obj/item/reagent_containers/food/condiment/rice{
+/obj/item/reagent_containers/condiment/rice{
list_reagents = list(/datum/reagent/consumable/rice=90);
name = "large rice sack";
possible_transfer_amounts = list(1,5,10,15,20,25,30,50,60,90)
@@ -9788,7 +9788,7 @@
/area/centcom/interlink)
"qxS" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/food/drinks/coffee,
+/obj/item/reagent_containers/cup/glass/coffee,
/obj/effect/turf_decal/tile/brown{
dir = 1
},
@@ -10149,7 +10149,7 @@
pixel_x = -2;
pixel_y = -2
},
-/obj/item/reagent_containers/food/drinks/waterbottle,
+/obj/item/reagent_containers/cup/glass/waterbottle,
/turf/open/floor/wood,
/area/centcom/holding/cafepark)
"rPm" = (
@@ -10344,7 +10344,7 @@
/area/space)
"sqx" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/food/drinks/coffee,
+/obj/item/reagent_containers/cup/glass/coffee,
/turf/open/floor/iron/brown/side{
dir = 4
},
@@ -10470,7 +10470,7 @@
/area/centcom/interlink)
"sTA" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug/tea,
+/obj/item/reagent_containers/cup/glass/mug/tea,
/turf/open/floor/iron,
/area/centcom/interlink)
"sYd" = (
@@ -10735,15 +10735,15 @@
/area/centcom/interlink)
"tYk" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
pixel_x = -5;
pixel_y = 4
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = 7;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = 7;
pixel_y = 12
},
@@ -10774,17 +10774,17 @@
/area/centcom/interlink)
"ueC" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
layer = 5
},
/obj/machinery/light,
-/obj/item/reagent_containers/glass/beaker/bluespace{
+/obj/item/reagent_containers/cup/beaker/bluespace{
luminosity = 3;
name = "floofmagic beaker";
possible_transfer_amounts = list(5,10,15,20,25,30,50,100,150,200,250,500);
volume = 500
},
-/obj/item/reagent_containers/glass/beaker/bluespace{
+/obj/item/reagent_containers/cup/beaker/bluespace{
luminosity = 3;
name = "floofmagic beaker";
possible_transfer_amounts = list(5,10,15,20,25,30,50,100,150,200,250,500);
@@ -11067,11 +11067,11 @@
/area/centcom/interlink)
"uYJ" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -5;
pixel_y = 14
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
dir = 1;
pixel_x = 5;
pixel_y = 14
@@ -11197,7 +11197,7 @@
/obj/item/instrument/trombone,
/obj/item/instrument/trumpet,
/obj/item/instrument/violin,
-/obj/item/reagent_containers/food/condiment/mayonnaise,
+/obj/item/reagent_containers/condiment/mayonnaise,
/obj/structure/closet/crate/wooden{
name = "band crate"
},
@@ -11264,12 +11264,12 @@
"vLz" = (
/obj/structure/table/reinforced,
/obj/machinery/door/poddoor/shutters/window/preopen,
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee{
pixel_x = 10;
pixel_y = 6
},
-/obj/item/reagent_containers/food/drinks/waterbottle,
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/waterbottle,
+/obj/item/reagent_containers/cup/glass/coffee{
pixel_x = -3
},
/turf/open/floor/iron,
@@ -11549,15 +11549,15 @@
/area/centcom/interlink)
"wId" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = 7;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = 7;
pixel_y = 12
},
-/obj/item/reagent_containers/food/drinks/bottle/vodka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
pixel_x = -5;
pixel_y = 6
},
diff --git a/_maps/map_files/tramstation/modular_pieces/maintenance_bar_1.dmm b/_maps/map_files/tramstation/modular_pieces/maintenance_bar_1.dmm
index 232b9787e11..9d35d1d578a 100644
--- a/_maps/map_files/tramstation/modular_pieces/maintenance_bar_1.dmm
+++ b/_maps/map_files/tramstation/modular_pieces/maintenance_bar_1.dmm
@@ -40,7 +40,7 @@
/area/station/maintenance/central/greater)
"u" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/mop,
/turf/open/floor/plating,
/area/station/maintenance/central/greater)
diff --git a/_maps/map_files/tramstation/modular_pieces/maintenance_miningsolar_cavetunnel_attachment_2.dmm b/_maps/map_files/tramstation/modular_pieces/maintenance_miningsolar_cavetunnel_attachment_2.dmm
index 5bb713e261d..ca4bb99b302 100644
--- a/_maps/map_files/tramstation/modular_pieces/maintenance_miningsolar_cavetunnel_attachment_2.dmm
+++ b/_maps/map_files/tramstation/modular_pieces/maintenance_miningsolar_cavetunnel_attachment_2.dmm
@@ -11,7 +11,7 @@
/area/mine/explored)
"h" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 7;
pixel_y = 5
},
diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm
index ae925fd407b..824bb83c967 100644
--- a/_maps/map_files/tramstation/tramstation.dmm
+++ b/_maps/map_files/tramstation/tramstation.dmm
@@ -220,6 +220,20 @@
/obj/item/stack/ore/glass,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"afB" = (
+/obj/structure/table/glass,
+/obj/item/crowbar,
+/obj/item/hatchet,
+/obj/item/plant_analyzer,
+/obj/item/cultivator,
+/obj/item/reagent_containers/cup/bucket,
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+ dir = 1
+ },
+/obj/machinery/newscaster/directional/north,
+/turf/open/floor/iron,
+/area/station/service/hydroponics/garden)
"afI" = (
/obj/machinery/light/directional/east,
/obj/effect/turf_decal/trimline/white/line{
@@ -880,26 +894,6 @@
"aqR" = (
/turf/open/misc/asteroid,
/area/mine/explored)
-"aqZ" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/coffee{
- pixel_x = -3;
- pixel_y = 10
- },
-/obj/item/reagent_containers/food/drinks/coffee{
- pixel_x = 10;
- pixel_y = 2
- },
-/obj/machinery/light/directional/east,
-/obj/machinery/firealarm/directional/east,
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/machinery/camera/directional/east{
- c_tag = "Civilian - Library East"
- },
-/turf/open/floor/wood/large,
-/area/station/service/library)
"arE" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/starboard/greater)
@@ -1008,6 +1002,27 @@
/obj/effect/spawner/random/engineering/tracking_beacon,
/turf/open/floor/iron/grimy,
/area/station/ai_monitored/turret_protected/aisat/foyer)
+"auK" = (
+/obj/structure/rack,
+/obj/item/reagent_containers/cup/bottle/mercury{
+ pixel_x = -5;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/bottle/nitrogen{
+ pixel_x = 7;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/bottle/oxygen{
+ pixel_x = 1
+ },
+/obj/machinery/firealarm/directional/north,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 8
+ },
+/area/station/medical/medbay/central)
"auX" = (
/obj/machinery/disposal/bin{
pixel_x = -2;
@@ -2024,23 +2039,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
-"aTd" = (
-/obj/structure/rack,
-/obj/item/reagent_containers/glass/bottle/epinephrine{
- pixel_x = -5;
- pixel_y = 3
- },
-/obj/item/reagent_containers/glass/bottle/fluorine{
- pixel_x = 7;
- pixel_y = 3
- },
-/obj/item/reagent_containers/glass/bottle/iodine{
- pixel_x = 1
- },
-/obj/structure/sign/warning/chem_diamond/directional/south,
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/iron/dark/textured_edge,
-/area/station/medical/medbay/central)
"aTi" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 9
@@ -2229,6 +2227,17 @@
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"aWT" = (
+/obj/structure/table,
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = 3
+ },
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -3
+ },
+/obj/machinery/computer/security/telescreen/entertainment/directional/west,
+/turf/open/floor/iron/checker,
+/area/station/commons/lounge)
"aWY" = (
/obj/structure/stairs/west,
/turf/open/floor/iron/stairs/right{
@@ -2499,18 +2508,6 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat/hallway)
-"bdf" = (
-/obj/structure/reagent_dispensers/watertank/high,
-/obj/effect/turf_decal/tile/green/fourcorners,
-/obj/structure/railing{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/yellow/warning{
- dir = 4
- },
-/obj/item/reagent_containers/glass/watering_can,
-/turf/open/floor/iron/dark,
-/area/station/service/hydroponics)
"bdz" = (
/obj/structure/railing/corner{
dir = 1
@@ -3281,30 +3278,6 @@
/obj/item/clothing/mask/whistle,
/turf/open/floor/iron,
/area/station/security/checkpoint/engineering)
-"bqH" = (
-/obj/structure/window/reinforced/spawner/west,
-/obj/structure/window/reinforced/spawner,
-/obj/structure/table/glass,
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- dir = 8
- },
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/glass/beaker{
- pixel_x = 8;
- pixel_y = 2
- },
-/obj/item/reagent_containers/glass/bottle/multiver{
- pixel_x = 7;
- pixel_y = 12
- },
-/obj/item/reagent_containers/glass/bottle/epinephrine{
- pixel_x = -4;
- pixel_y = 12
- },
-/obj/item/reagent_containers/dropper,
-/obj/item/reagent_containers/syringe,
-/turf/open/floor/iron/white,
-/area/station/medical/pharmacy)
"bqL" = (
/obj/structure/cable,
/obj/effect/turf_decal/trimline/red/filled/line{
@@ -3884,6 +3857,20 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
+"bAm" = (
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 9
+ },
+/obj/structure/cable,
+/obj/structure/table,
+/obj/item/reagent_containers/dropper{
+ pixel_y = -5
+ },
+/obj/item/reagent_containers/cup/beaker/large{
+ pixel_y = 6
+ },
+/turf/open/floor/iron/white,
+/area/station/science/explab)
"bAy" = (
/obj/structure/table/reinforced,
/obj/machinery/light/dim/directional/north,
@@ -5206,6 +5193,21 @@
/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms,
/turf/open/floor/plating,
/area/station/engineering/transit_tube)
+"bUp" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "playerscantreadthis";
+ name = "Kitchen Counter Shutters"
+ },
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = 3
+ },
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -3
+ },
+/turf/open/floor/iron/checker,
+/area/station/service/kitchen)
"bUQ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -6308,6 +6310,20 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/starboard/lesser)
+"cld" = (
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 9
+ },
+/obj/structure/cable,
+/obj/structure/table,
+/obj/item/reagent_containers/dropper{
+ pixel_y = -5
+ },
+/obj/item/reagent_containers/cup/beaker/large{
+ pixel_y = 6
+ },
+/turf/open/floor/iron/white,
+/area/station/science/explab)
"cli" = (
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 4
@@ -6372,6 +6388,19 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
+"cmd" = (
+/obj/structure/closet/secure_closet/hos,
+/obj/item/storage/secure/safe/hos{
+ pixel_x = 35
+ },
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
+/obj/structure/sign/poster/official/space_cops{
+ pixel_y = 32
+ },
+/turf/open/floor/carpet,
+/area/station/command/heads_quarters/hos)
"cml" = (
/obj/effect/turf_decal/tile{
dir = 8
@@ -7493,23 +7522,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/tram/right)
-"cDq" = (
-/obj/structure/reagent_dispensers/watertank/high,
-/obj/effect/turf_decal/tile/green/fourcorners,
-/obj/machinery/button/elevator{
- id = "ilovefortnite";
- name = "Smartfridge Dumbwaiter Call Button";
- pixel_y = -25
- },
-/obj/structure/railing{
- dir = 8
- },
-/obj/effect/turf_decal/trimline/yellow/warning{
- dir = 8
- },
-/obj/item/reagent_containers/glass/watering_can,
-/turf/open/floor/iron/dark,
-/area/station/service/hydroponics)
"cDu" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -7685,6 +7697,19 @@
"cFs" = (
/turf/open/openspace,
/area/station/hallway/primary/tram/left)
+"cFu" = (
+/obj/structure/table,
+/obj/effect/turf_decal/tile/green/fourcorners,
+/obj/item/storage/box/beakers{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/watering_can,
+/obj/machinery/camera/directional/north{
+ c_tag = "Service - Hydroponics"
+ },
+/turf/open/floor/iron/dark,
+/area/station/service/hydroponics)
"cFM" = (
/obj/effect/spawner/random/structure/crate,
/obj/effect/decal/cleanable/dirt,
@@ -7707,6 +7732,24 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"cGw" = (
+/obj/structure/table,
+/obj/item/reagent_containers/condiment/peppermill{
+ desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
+ pixel_x = -8;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/condiment/saltshaker{
+ layer = 3.1;
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/condiment/enzyme{
+ pixel_x = 9;
+ pixel_y = 3
+ },
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"cGC" = (
/obj/machinery/door/airlock/command/glass{
name = "Bridge Access"
@@ -7725,6 +7768,20 @@
/obj/effect/mapping_helpers/airlock/access/all/command/general,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
+"cGG" = (
+/obj/structure/table,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 4
+ },
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker,
+/obj/item/reagent_containers/dropper,
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/iron,
+/area/station/science/lab)
"cGO" = (
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 8
@@ -7793,6 +7850,21 @@
/obj/structure/railing,
/turf/open/floor/glass/reinforced,
/area/station/ai_monitored/turret_protected/aisat/hallway)
+"cId" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "playerscantreadthis";
+ name = "Kitchen Counter Shutters"
+ },
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = 3
+ },
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -3
+ },
+/turf/open/floor/iron/checker,
+/area/station/service/kitchen)
"cIm" = (
/obj/structure/closet/radiation,
/obj/effect/turf_decal/bot,
@@ -7839,23 +7911,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"cIP" = (
-/obj/structure/rack,
-/obj/item/reagent_containers/glass/bottle/ethanol{
- pixel_x = -5;
- pixel_y = 3
- },
-/obj/item/reagent_containers/glass/bottle/carbon{
- pixel_x = 7;
- pixel_y = 3
- },
-/obj/item/reagent_containers/glass/bottle/chlorine{
- pixel_x = 1
- },
-/turf/open/floor/iron/dark/textured_corner{
- dir = 1
- },
-/area/station/medical/medbay/central)
"cIQ" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/port/fore)
@@ -8528,23 +8583,6 @@
/obj/machinery/status_display/evac/directional/north,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat/foyer)
-"cXf" = (
-/obj/structure/table/glass,
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 4
- },
-/obj/item/storage/box/bodybags,
-/obj/item/reagent_containers/glass/bottle/multiver,
-/obj/item/reagent_containers/glass/bottle/epinephrine,
-/obj/item/reagent_containers/syringe,
-/obj/structure/extinguisher_cabinet/directional/west,
-/obj/machinery/camera{
- c_tag = "Security - Medical Center";
- dir = 10;
- network = list("ss13","Security")
- },
-/turf/open/floor/iron/white,
-/area/station/security/medical)
"cXj" = (
/obj/machinery/light/small/directional/north,
/obj/effect/decal/cleanable/dirt,
@@ -9045,6 +9083,19 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/command/storage/eva)
+"dgd" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/janitorialcart,
+/obj/item/mop,
+/obj/item/reagent_containers/cup/bucket,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/purple/filled/warning{
+ dir = 10
+ },
+/turf/open/floor/iron,
+/area/station/service/janitor)
"dgw" = (
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable,
@@ -9375,17 +9426,6 @@
},
/turf/open/floor/iron,
/area/station/security/checkpoint/medical)
-"dmz" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/sink/directional/east,
-/obj/item/reagent_containers/glass/bucket,
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
"dmN" = (
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 4
@@ -10042,19 +10082,6 @@
/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron,
/area/station/hallway/secondary/service)
-"dwo" = (
-/obj/structure/table,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_x = -3
- },
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_x = 3
- },
-/obj/machinery/computer/security/telescreen/entertainment/directional/west,
-/turf/open/floor/iron/checker,
-/area/station/commons/lounge)
"dwp" = (
/obj/machinery/light/directional/north,
/obj/machinery/door/firedoor/border_only{
@@ -10327,12 +10354,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"dzP" = (
-/obj/docking_port/stationary/mining_home{
- dir = 4
- },
-/turf/open/misc/asteroid/airless,
-/area/mine/explored)
"dzU" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/decal/cleanable/dirt,
@@ -10764,6 +10785,16 @@
},
/turf/open/openspace,
/area/station/science/xenobiology)
+"dHu" = (
+/obj/structure/closet/secure_closet/captains,
+/obj/item/reagent_containers/cup/glass/shaker,
+/obj/machinery/computer/security/telescreen/entertainment/directional/north,
+/obj/machinery/camera/directional/north{
+ c_tag = "Command - Captain's Quarters"
+ },
+/obj/structure/window/reinforced/spawner/east,
+/turf/open/floor/wood,
+/area/station/command/heads_quarters/captain/private)
"dHv" = (
/obj/structure/table/glass,
/turf/open/floor/iron/dark,
@@ -10812,6 +10843,17 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/tram/left)
+"dIS" = (
+/obj/structure/table/wood,
+/obj/machinery/reagentgrinder{
+ pixel_x = 6;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/cup/glass/shaker{
+ pixel_x = -6
+ },
+/turf/open/floor/iron/dark,
+/area/station/service/bar)
"dIY" = (
/obj/structure/window/reinforced{
dir = 4
@@ -12010,6 +12052,17 @@
"edQ" = (
/turf/open/floor/wood,
/area/station/service/bar/backroom)
+"eej" = (
+/obj/structure/table,
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = 3
+ },
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -3
+ },
+/obj/machinery/computer/security/telescreen/entertainment/directional/east,
+/turf/open/floor/iron/checker,
+/area/station/commons/lounge)
"eel" = (
/obj/effect/turf_decal/trimline/red/filled/corner,
/obj/effect/turf_decal/trimline/red/filled/line{
@@ -12312,35 +12365,6 @@
},
/turf/open/floor/iron,
/area/station/security/brig)
-"ejR" = (
-/obj/structure/closet/crate,
-/obj/item/reagent_containers/glass/bowl,
-/obj/effect/spawner/random/contraband/prison,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/kitchen/fork/plastic,
-/obj/item/kitchen/fork/plastic,
-/obj/item/kitchen/fork/plastic,
-/obj/item/storage/box/drinkingglasses,
-/obj/item/kitchen/spoon/plastic,
-/obj/item/kitchen/spoon/plastic,
-/obj/item/kitchen/spoon/plastic,
-/obj/item/knife/plastic,
-/obj/item/knife/plastic,
-/obj/item/knife/plastic,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/box/drinkingglasses,
-/obj/machinery/light/directional/south,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"ejS" = (
/obj/effect/turf_decal/sand/plating,
/obj/item/storage/toolbox/mechanical,
@@ -12458,23 +12482,6 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
-"ekZ" = (
-/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/nutrient/ez,
-/obj/item/reagent_containers/glass/bottle/nutrient/rh{
- pixel_x = 2;
- pixel_y = 1
- },
-/obj/item/reagent_containers/spray/pestspray{
- pixel_x = 3;
- pixel_y = 4
- },
-/obj/item/reagent_containers/spray/plantbgone,
-/obj/effect/turf_decal/trimline/neutral/filled/line{
- dir = 9
- },
-/turf/open/floor/iron,
-/area/station/service/hydroponics/garden)
"elo" = (
/obj/machinery/door/airlock/command/glass{
name = "Head of Security"
@@ -12734,6 +12741,23 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/security/office)
+"esa" = (
+/obj/structure/reagent_dispensers/watertank/high,
+/obj/effect/turf_decal/tile/green/fourcorners,
+/obj/machinery/button/elevator{
+ id = "ilovefortnite";
+ name = "Smartfridge Dumbwaiter Call Button";
+ pixel_y = -25
+ },
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/yellow/warning{
+ dir = 8
+ },
+/obj/item/reagent_containers/cup/watering_can,
+/turf/open/floor/iron/dark,
+/area/station/service/hydroponics)
"esc" = (
/obj/structure/sign/warning/electric_shock,
/turf/closed/wall/r_wall,
@@ -12936,12 +12960,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/pharmacy)
-"evo" = (
-/obj/docking_port/stationary/mining_home/common{
- dir = 4
- },
-/turf/open/misc/asteroid/airless,
-/area/mine/explored)
"evs" = (
/obj/effect/landmark/start/assistant,
/turf/open/floor/wood/parquet,
@@ -12954,6 +12972,18 @@
/obj/effect/turf_decal/stripes/white/full,
/turf/open/floor/iron,
/area/station/hallway/primary/tram/right)
+"evE" = (
+/obj/structure/safe,
+/obj/item/clothing/head/bearpelt,
+/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/cup/glass/bottle/vodka/badminka,
+/obj/effect/turf_decal/bot_white/left,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/command/nuke_storage)
"ewk" = (
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 8
@@ -13922,23 +13952,6 @@
"eOk" = (
/turf/open/floor/glass,
/area/station/cargo/storage)
-"eOu" = (
-/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
- pixel_x = 6;
- pixel_y = 10
- },
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
- pixel_x = -6;
- pixel_y = 10
- },
-/obj/item/storage/pill_bottle/mannitol,
-/obj/item/reagent_containers/dropper{
- pixel_y = 6
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
-/turf/open/floor/iron/dark,
-/area/station/medical/treatment_center)
"eOv" = (
/obj/structure/table,
/obj/effect/turf_decal/trimline/neutral/filled/line{
@@ -14558,6 +14571,23 @@
/obj/item/kirbyplants/random,
/turf/open/floor/iron,
/area/station/security/brig)
+"eYK" = (
+/obj/structure/reagent_dispensers/watertank/high,
+/obj/effect/turf_decal/tile/green/fourcorners,
+/obj/machinery/button/elevator{
+ id = "ilovefortnite";
+ name = "Smartfridge Dumbwaiter Call Button";
+ pixel_y = -25
+ },
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/yellow/warning{
+ dir = 8
+ },
+/obj/item/reagent_containers/cup/watering_can,
+/turf/open/floor/iron/dark,
+/area/station/service/hydroponics)
"eZa" = (
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 4
@@ -14582,6 +14612,20 @@
/mob/living/simple_animal/mouse,
/turf/open/floor/plating,
/area/station/maintenance/tram/right)
+"eZn" = (
+/obj/structure/table/glass,
+/obj/item/crowbar,
+/obj/item/hatchet,
+/obj/item/plant_analyzer,
+/obj/item/cultivator,
+/obj/item/reagent_containers/cup/bucket,
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+ dir = 1
+ },
+/obj/machinery/newscaster/directional/north,
+/turf/open/floor/iron,
+/area/station/service/hydroponics/garden)
"eZT" = (
/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 8
@@ -15146,6 +15190,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/secondary/service)
+"fjP" = (
+/obj/structure/reagent_dispensers/watertank,
+/obj/item/reagent_containers/cup/bucket,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/station/maintenance/department/security)
"fjQ" = (
/obj/structure/grille,
/turf/closed/wall/r_wall,
@@ -15380,6 +15430,28 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/ai_monitored/command/storage/eva)
+"fmZ" = (
+/obj/structure/window/reinforced/spawner/west,
+/obj/structure/table/glass,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = 8;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/cup/bottle/multiver{
+ pixel_x = 7;
+ pixel_y = 12
+ },
+/obj/item/reagent_containers/cup/bottle/epinephrine{
+ pixel_x = -4;
+ pixel_y = 12
+ },
+/obj/item/reagent_containers/dropper,
+/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron/white,
+/area/station/medical/chemistry)
"fnb" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 8
@@ -15728,6 +15800,25 @@
/obj/item/radio/intercom/directional/east,
/turf/open/floor/iron,
/area/station/hallway/secondary/service)
+"ftJ" = (
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/obj/structure/table,
+/obj/item/reagent_containers/cup/glass/bottle/beer{
+ pixel_x = 7;
+ pixel_y = 5
+ },
+/obj/item/reagent_containers/cup/glass/bottle/beer{
+ pixel_x = -1;
+ pixel_y = 9
+ },
+/obj/item/reagent_containers/cup/glass/bottle/beer{
+ pixel_x = -8
+ },
+/turf/open/floor/iron,
+/area/station/cargo/miningdock/cafeteria)
"ftP" = (
/obj/structure/window/reinforced/spawner/east,
/obj/machinery/shower/directional/west,
@@ -16907,6 +16998,23 @@
/obj/machinery/duct,
/turf/open/floor/iron/cafeteria,
/area/station/security/prison/mess)
+"fSc" = (
+/obj/structure/rack,
+/obj/item/reagent_containers/cup/bottle/ethanol{
+ pixel_x = -5;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/bottle/carbon{
+ pixel_x = 7;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/bottle/chlorine{
+ pixel_x = 1
+ },
+/turf/open/floor/iron/dark/textured_corner{
+ dir = 1
+ },
+/area/station/medical/medbay/central)
"fSe" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 8
@@ -17204,6 +17312,21 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/white,
/area/station/medical/surgery/aft)
+"fXJ" = (
+/obj/structure/table,
+/obj/item/phone{
+ pixel_x = 6;
+ pixel_y = 4
+ },
+/obj/item/reagent_containers/cup/glass/britcup{
+ pixel_x = -6;
+ pixel_y = 1
+ },
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/cargo/drone_bay)
"fXN" = (
/obj/structure/window/reinforced/spawner/west,
/turf/open/floor/carpet,
@@ -17701,6 +17824,27 @@
},
/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
+"ggE" = (
+/obj/structure/rack,
+/obj/item/reagent_containers/cup/bottle/acidic_buffer{
+ pixel_x = 7;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/bottle/basic_buffer{
+ pixel_x = -5;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/bottle/formaldehyde{
+ pixel_x = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/obj/structure/extinguisher_cabinet/directional/north,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 4
+ },
+/area/station/medical/medbay/central)
"ggI" = (
/obj/effect/turf_decal/trimline/yellow/filled/corner{
dir = 4
@@ -17758,6 +17902,12 @@
/obj/structure/ore_box,
/turf/open/misc/asteroid,
/area/mine/explored)
+"gig" = (
+/obj/structure/reagent_dispensers/watertank,
+/obj/item/reagent_containers/cup/bucket,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/station/service/janitor)
"gii" = (
/obj/machinery/door/airlock/maintenance_hatch{
name = "Public Garden Maintenance Access"
@@ -18207,6 +18357,29 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
+"gpV" = (
+/obj/structure/table/glass,
+/obj/item/stack/sheet/mineral/plasma{
+ pixel_y = 4
+ },
+/obj/item/stack/sheet/mineral/plasma{
+ pixel_y = 10
+ },
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = 8;
+ pixel_y = 2
+ },
+/obj/item/clothing/glasses/science,
+/obj/machinery/requests_console/directional/west{
+ department = "Pharmacy";
+ departmentType = 2;
+ name = "Pharmacy Requests Console";
+ receive_ore_updates = 1
+ },
+/obj/effect/turf_decal/tile/yellow/anticorner/contrasted,
+/turf/open/floor/iron/white,
+/area/station/medical/pharmacy)
"gqb" = (
/obj/structure/chair/stool/bar/directional/west,
/obj/effect/turf_decal/trimline/red/filled/line{
@@ -19013,6 +19186,18 @@
"gFf" = (
/turf/closed/wall/r_wall,
/area/station/ai_monitored/turret_protected/aisat/hallway)
+"gFo" = (
+/obj/structure/safe,
+/obj/item/clothing/head/bearpelt,
+/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/cup/glass/bottle/vodka/badminka,
+/obj/effect/turf_decal/bot_white/left,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/command/nuke_storage)
"gFu" = (
/obj/structure/chair/stool/directional/north,
/turf/open/floor/circuit/green,
@@ -19491,6 +19676,12 @@
},
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
+"gNJ" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/glass/shaker,
+/obj/machinery/light/dim/directional/east,
+/turf/open/floor/wood,
+/area/station/service/bar/backroom)
"gNK" = (
/obj/structure/table/reinforced,
/obj/machinery/door/window/brigdoor{
@@ -20316,19 +20507,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/cargo/office)
-"hbI" = (
-/obj/structure/table,
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 10
- },
-/obj/item/storage/box/bodybags{
- pixel_x = 3;
- pixel_y = 2
- },
-/obj/item/reagent_containers/glass/bottle/epinephrine,
-/obj/item/reagent_containers/syringe,
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/lobby)
"hbK" = (
/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 1
@@ -20528,12 +20706,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/tram/right)
-"hfa" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/rice,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
"hft" = (
/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible,
@@ -20844,6 +21016,29 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/storage/tech)
+"hkM" = (
+/obj/structure/table/glass,
+/obj/item/stack/sheet/mineral/plasma{
+ pixel_y = 4
+ },
+/obj/item/stack/sheet/mineral/plasma{
+ pixel_y = 10
+ },
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = 8;
+ pixel_y = 2
+ },
+/obj/item/clothing/glasses/science,
+/obj/machinery/requests_console/directional/west{
+ department = "Pharmacy";
+ departmentType = 2;
+ name = "Pharmacy Requests Console";
+ receive_ore_updates = 1
+ },
+/obj/effect/turf_decal/tile/yellow/anticorner/contrasted,
+/turf/open/floor/iron/white,
+/area/station/medical/pharmacy)
"hkR" = (
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 10
@@ -22171,6 +22366,17 @@
},
/turf/open/floor/glass/reinforced,
/area/station/security/brig)
+"hMH" = (
+/obj/structure/table/wood,
+/obj/machinery/reagentgrinder{
+ pixel_x = 6;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/cup/glass/shaker{
+ pixel_x = -6
+ },
+/turf/open/floor/iron/dark,
+/area/station/service/bar)
"hMI" = (
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
@@ -22726,15 +22932,6 @@
},
/turf/open/floor/plating,
/area/station/command/teleporter)
-"hWc" = (
-/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/multiver{
- pixel_x = 6
- },
-/obj/item/reagent_containers/glass/bottle/epinephrine,
-/obj/item/wrench/medical,
-/turf/open/floor/iron/dark,
-/area/station/medical/treatment_center)
"hWg" = (
/obj/structure/chair/pew/left,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -23174,6 +23371,25 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/commons/vacant_room/commissary)
+"ieu" = (
+/obj/structure/table,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = 8;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/obj/item/folder/yellow,
+/obj/item/pen{
+ pixel_x = 4;
+ pixel_y = 4
+ },
+/turf/open/floor/carpet,
+/area/station/command/heads_quarters/qm)
"iev" = (
/obj/structure/training_machine,
/obj/item/target,
@@ -23226,6 +23442,27 @@
},
/turf/open/floor/iron,
/area/station/engineering/transit_tube)
+"ieZ" = (
+/obj/structure/rack,
+/obj/item/reagent_containers/cup/bottle/acidic_buffer{
+ pixel_x = 7;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/bottle/basic_buffer{
+ pixel_x = -5;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/bottle/formaldehyde{
+ pixel_x = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/obj/structure/extinguisher_cabinet/directional/north,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 4
+ },
+/area/station/medical/medbay/central)
"ifk" = (
/obj/effect/turf_decal/sand/plating,
/obj/structure/ladder,
@@ -23425,22 +23662,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/virology)
-"ihD" = (
-/obj/structure/table/wood,
-/obj/item/paper_bin/carbon{
- pixel_x = -3;
- pixel_y = 7
- },
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
- pixel_y = 15;
- pixel_x = 9
- },
-/obj/item/lighter{
- pixel_y = -4;
- pixel_x = 9
- },
-/turf/open/floor/carpet,
-/area/station/security/detectives_office)
"ihI" = (
/obj/machinery/power/terminal{
dir = 8
@@ -23922,6 +24143,21 @@
},
/turf/open/floor/iron/dark,
/area/station/cargo/miningdock/oresilo)
+"irw" = (
+/obj/structure/table,
+/obj/item/phone{
+ pixel_x = 6;
+ pixel_y = 4
+ },
+/obj/item/reagent_containers/cup/glass/britcup{
+ pixel_x = -6;
+ pixel_y = 1
+ },
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/cargo/drone_bay)
"irB" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 4
@@ -24619,16 +24855,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/commons/storage/tools)
-"iBh" = (
-/obj/structure/table,
-/obj/item/reagent_containers/glass/beaker{
- pixel_x = 5
- },
-/obj/item/reagent_containers/food/condiment/enzyme{
- layer = 5
- },
-/turf/open/floor/iron/white,
-/area/station/service/kitchen)
"iBm" = (
/obj/machinery/light/directional/west,
/obj/structure/bed{
@@ -24726,17 +24952,6 @@
/obj/item/flashlight,
/turf/open/floor/iron/dark,
/area/station/engineering/supermatter/room)
-"iDe" = (
-/obj/structure/table/wood,
-/obj/machinery/reagentgrinder{
- pixel_x = 6;
- pixel_y = 6
- },
-/obj/item/reagent_containers/food/drinks/shaker{
- pixel_x = -6
- },
-/turf/open/floor/iron/dark,
-/area/station/service/bar)
"iDl" = (
/obj/structure/table/optable{
name = "Robotics Operating Table"
@@ -25070,6 +25285,20 @@
/obj/machinery/duct,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
+"iJG" = (
+/obj/structure/table,
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = 3
+ },
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -3
+ },
+/obj/machinery/camera/directional/north{
+ c_tag = "Service - Bar Lounge North West"
+ },
+/obj/machinery/computer/security/telescreen/entertainment/directional/west,
+/turf/open/floor/iron/checker,
+/area/station/commons/lounge)
"iJO" = (
/obj/effect/turf_decal/sand/plating,
/obj/structure/disposalpipe/segment{
@@ -25281,6 +25510,20 @@
},
/turf/closed/wall/r_wall,
/area/station/engineering/atmos)
+"iPf" = (
+/obj/structure/window/reinforced,
+/obj/structure/table/wood,
+/obj/item/radio/intercom/directional/east,
+/obj/item/reagent_containers/cup/glass/flask/gold,
+/obj/item/hand_tele,
+/obj/item/reagent_containers/cup/glass/flask/gold{
+ pixel_y = 10;
+ pixel_x = 11
+ },
+/obj/item/folder/blue,
+/obj/item/stamp/captain,
+/turf/open/floor/wood,
+/area/station/command/heads_quarters/captain)
"iPi" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
@@ -26417,21 +26660,6 @@
dir = 1
},
/area/station/security/execution/transfer)
-"jiM" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "playerscantreadthis";
- name = "Kitchen Counter Shutters"
- },
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_x = 3
- },
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_x = -3
- },
-/turf/open/floor/iron/checker,
-/area/station/service/kitchen)
"jiO" = (
/obj/structure/tank_dispenser,
/obj/effect/turf_decal/bot{
@@ -27333,6 +27561,20 @@
},
/turf/open/floor/catwalk_floor,
/area/station/maintenance/solars/port/aft)
+"jxZ" = (
+/obj/structure/window/reinforced,
+/obj/structure/table/wood,
+/obj/item/radio/intercom/directional/east,
+/obj/item/reagent_containers/cup/glass/flask/gold,
+/obj/item/hand_tele,
+/obj/item/reagent_containers/cup/glass/flask/gold{
+ pixel_y = 10;
+ pixel_x = 11
+ },
+/obj/item/folder/blue,
+/obj/item/stamp/captain,
+/turf/open/floor/wood,
+/area/station/command/heads_quarters/captain)
"jyp" = (
/obj/effect/turf_decal/trimline/yellow/filled/corner{
dir = 1
@@ -27355,6 +27597,35 @@
"jyH" = (
/turf/closed/wall,
/area/station/medical/pharmacy)
+"jyK" = (
+/obj/structure/closet/crate,
+/obj/item/reagent_containers/cup/bowl,
+/obj/effect/spawner/random/contraband/prison,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/kitchen/fork/plastic,
+/obj/item/kitchen/fork/plastic,
+/obj/item/kitchen/fork/plastic,
+/obj/item/storage/box/drinkingglasses,
+/obj/item/kitchen/spoon/plastic,
+/obj/item/kitchen/spoon/plastic,
+/obj/item/kitchen/spoon/plastic,
+/obj/item/knife/plastic,
+/obj/item/knife/plastic,
+/obj/item/knife/plastic,
+/obj/item/storage/bag/tray/cafeteria,
+/obj/item/storage/bag/tray/cafeteria,
+/obj/item/storage/bag/tray/cafeteria,
+/obj/item/storage/bag/tray/cafeteria,
+/obj/item/storage/box/drinkingglasses,
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"jyM" = (
/obj/machinery/power/turbine/core_rotor{
dir = 4;
@@ -28708,6 +28979,14 @@
/obj/effect/mapping_helpers/airlock/access/all/command/captain,
/turf/open/floor/wood,
/area/station/command/heads_quarters/captain/private)
+"jXZ" = (
+/obj/effect/turf_decal/sand/plating,
+/obj/structure/table,
+/obj/item/reagent_containers/cup/glass/bottle/beer{
+ pixel_x = -8
+ },
+/turf/open/floor/plating/airless,
+/area/mine/explored)
"jYf" = (
/obj/structure/chair/office{
dir = 8
@@ -28831,27 +29110,6 @@
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating,
/area/station/security/prison/workout)
-"jZN" = (
-/obj/structure/rack,
-/obj/item/reagent_containers/glass/bottle/mercury{
- pixel_x = -5;
- pixel_y = 3
- },
-/obj/item/reagent_containers/glass/bottle/nitrogen{
- pixel_x = 7;
- pixel_y = 3
- },
-/obj/item/reagent_containers/glass/bottle/oxygen{
- pixel_x = 1
- },
-/obj/machinery/firealarm/directional/north,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/turf/open/floor/iron/dark/textured_edge{
- dir = 8
- },
-/area/station/medical/medbay/central)
"jZT" = (
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 6
@@ -29454,6 +29712,27 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/cargo/miningdock)
+"kjM" = (
+/obj/structure/rack,
+/obj/item/reagent_containers/cup/bottle/phosphorus{
+ pixel_x = -5;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/bottle/potassium{
+ pixel_x = 7;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/bottle/sodium{
+ pixel_x = 1
+ },
+/obj/machinery/camera/directional/south{
+ c_tag = "Medical - Chemical Storage";
+ network = list("ss13","medbay")
+ },
+/turf/open/floor/iron/dark/textured_corner{
+ dir = 4
+ },
+/area/station/medical/medbay/central)
"kkd" = (
/obj/effect/turf_decal/trimline/yellow/warning{
dir = 1
@@ -30559,12 +30838,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
-"kCw" = (
-/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/station/maintenance/department/security)
"kCB" = (
/obj/structure/chair{
dir = 4
@@ -30944,17 +31217,6 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/iron,
/area/station/command/heads_quarters/ce)
-"kJf" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_x = 3
- },
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_x = -3
- },
-/obj/machinery/computer/security/telescreen/entertainment/directional/west,
-/turf/open/floor/iron/checker,
-/area/station/commons/lounge)
"kJh" = (
/obj/structure/window/reinforced{
dir = 8
@@ -31037,6 +31299,19 @@
/obj/machinery/light/directional/west,
/turf/open/floor/iron/cafeteria,
/area/station/commons/dorms/laundry)
+"kKr" = (
+/obj/structure/sign/poster/official/here_for_your_safety{
+ pixel_y = -32
+ },
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/cup/glass/coffee{
+ pixel_x = -7
+ },
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 6
+ },
+/turf/open/floor/iron,
+/area/station/security/checkpoint/supply)
"kKt" = (
/obj/structure/chair/stool/bar/directional/west,
/obj/effect/turf_decal/trimline/neutral/filled/line{
@@ -31512,6 +31787,15 @@
"kUo" = (
/turf/open/floor/iron/dark,
/area/station/service/chapel)
+"kUx" = (
+/obj/structure/table/glass,
+/obj/item/reagent_containers/cup/bottle/multiver{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/epinephrine,
+/obj/item/wrench/medical,
+/turf/open/floor/iron/dark,
+/area/station/medical/treatment_center)
"kUD" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -31860,6 +32144,16 @@
/obj/effect/spawner/random/aimodule/harmless,
/turf/open/floor/circuit/green,
/area/station/ai_monitored/turret_protected/ai_upload)
+"kZp" = (
+/obj/structure/table,
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = 5
+ },
+/obj/item/reagent_containers/condiment/enzyme{
+ layer = 5
+ },
+/turf/open/floor/iron/white,
+/area/station/service/kitchen)
"kZr" = (
/obj/structure/rack,
/obj/effect/spawner/random/maintenance/three,
@@ -31898,20 +32192,6 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
-"kZW" = (
-/obj/structure/table,
-/obj/effect/turf_decal/trimline/purple/filled/line{
- dir = 4
- },
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/glass/beaker,
-/obj/item/reagent_containers/dropper,
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
-/obj/machinery/airalarm/directional/south,
-/turf/open/floor/iron,
-/area/station/science/lab)
"lai" = (
/obj/structure/chair,
/obj/effect/turf_decal/trimline/neutral/filled/line{
@@ -32132,6 +32412,23 @@
},
/turf/open/floor/iron/dark,
/area/station/command/bridge)
+"ldB" = (
+/obj/structure/rack,
+/obj/item/reagent_containers/cup/bottle/epinephrine{
+ pixel_x = -5;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/bottle/fluorine{
+ pixel_x = 7;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/bottle/iodine{
+ pixel_x = 1
+ },
+/obj/structure/sign/warning/chem_diamond/directional/south,
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/iron/dark/textured_edge,
+/area/station/medical/medbay/central)
"ldC" = (
/obj/machinery/door/airlock{
name = "Bathroom"
@@ -32322,12 +32619,6 @@
},
/turf/open/floor/iron,
/area/station/security/execution/transfer)
-"lhf" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/shaker,
-/obj/machinery/light/dim/directional/east,
-/turf/open/floor/wood,
-/area/station/service/bar/backroom)
"lht" = (
/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 1
@@ -32585,6 +32876,25 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
+"lmn" = (
+/obj/structure/table,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = 8;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/obj/item/folder/yellow,
+/obj/item/pen{
+ pixel_x = 4;
+ pixel_y = 4
+ },
+/turf/open/floor/carpet,
+/area/station/command/heads_quarters/qm)
"lms" = (
/obj/effect/turf_decal/trimline/purple/filled/corner{
dir = 1
@@ -33369,6 +33679,12 @@
/obj/structure/cable,
/turf/open/floor/iron/white,
/area/station/science/lower)
+"lyc" = (
+/obj/structure/table,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/rice,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"lyd" = (
/obj/effect/turf_decal/trimline/blue/filled/corner{
dir = 1
@@ -33729,6 +34045,23 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible,
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
+"lFT" = (
+/obj/structure/table/glass,
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
+ pixel_x = 6;
+ pixel_y = 10
+ },
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
+ pixel_x = -6;
+ pixel_y = 10
+ },
+/obj/item/storage/pill_bottle/mannitol,
+/obj/item/reagent_containers/dropper{
+ pixel_y = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
+/turf/open/floor/iron/dark,
+/area/station/medical/treatment_center)
"lFW" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
@@ -34045,6 +34378,30 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/engineering/supermatter/room)
+"lLC" = (
+/obj/structure/window/reinforced/spawner/west,
+/obj/structure/window/reinforced/spawner,
+/obj/structure/table/glass,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 8
+ },
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = 8;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/cup/bottle/multiver{
+ pixel_x = 7;
+ pixel_y = 12
+ },
+/obj/item/reagent_containers/cup/bottle/epinephrine{
+ pixel_x = -4;
+ pixel_y = 12
+ },
+/obj/item/reagent_containers/dropper,
+/obj/item/reagent_containers/syringe,
+/turf/open/floor/iron/white,
+/area/station/medical/pharmacy)
"lLK" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -34219,6 +34576,17 @@
/obj/structure/weightmachine/weightlifter,
/turf/open/floor/iron,
/area/station/security/prison/workout)
+"lOG" = (
+/obj/structure/table,
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = 3
+ },
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -3
+ },
+/obj/machinery/computer/security/telescreen/entertainment/directional/east,
+/turf/open/floor/iron/checker,
+/area/station/commons/lounge)
"lOJ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -34753,6 +35121,12 @@
},
/turf/open/floor/iron,
/area/station/command/gateway)
+"lYl" = (
+/obj/structure/reagent_dispensers/watertank,
+/obj/item/reagent_containers/cup/bucket,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/station/service/janitor)
"lYo" = (
/obj/structure/fluff/tram_rail/floor,
/turf/open/floor/glass/reinforced,
@@ -35116,6 +35490,18 @@
/obj/structure/cable,
/turf/open/floor/iron/white,
/area/station/science/genetics)
+"mfB" = (
+/obj/structure/reagent_dispensers/watertank/high,
+/obj/effect/turf_decal/tile/green/fourcorners,
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/yellow/warning{
+ dir = 4
+ },
+/obj/item/reagent_containers/cup/watering_can,
+/turf/open/floor/iron/dark,
+/area/station/service/hydroponics)
"mfC" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -36331,6 +36717,19 @@
"myD" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/tram/right)
+"myE" = (
+/obj/structure/sign/poster/official/here_for_your_safety{
+ pixel_y = -32
+ },
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/cup/glass/coffee{
+ pixel_x = -7
+ },
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 6
+ },
+/turf/open/floor/iron,
+/area/station/security/checkpoint/supply)
"myM" = (
/obj/effect/turf_decal/delivery,
/obj/structure/holosign/barrier/atmos/sturdy,
@@ -36410,17 +36809,6 @@
/obj/machinery/atmospherics/pipe/smart/simple/green/visible,
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"mzC" = (
-/obj/structure/table/wood,
-/obj/item/nullrod{
- pixel_x = 4
- },
-/obj/item/reagent_containers/food/drinks/bottle/holywater{
- pixel_x = -2;
- pixel_y = 2
- },
-/turf/open/floor/cult,
-/area/station/service/chapel/office)
"mzH" = (
/obj/machinery/suit_storage_unit/security,
/obj/machinery/light/directional/south,
@@ -37619,6 +38007,23 @@
},
/turf/open/floor/iron,
/area/station/maintenance/tram/right)
+"mRw" = (
+/obj/structure/rack,
+/obj/item/reagent_containers/cup/bottle/epinephrine{
+ pixel_x = -5;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/bottle/fluorine{
+ pixel_x = 7;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/bottle/iodine{
+ pixel_x = 1
+ },
+/obj/structure/sign/warning/chem_diamond/directional/south,
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/iron/dark/textured_edge,
+/area/station/medical/medbay/central)
"mRy" = (
/obj/machinery/keycard_auth{
pixel_y = -24
@@ -39373,6 +39778,18 @@
/obj/effect/mapping_helpers/airlock/access/all/security/brig,
/turf/open/floor/iron/showroomfloor,
/area/station/security/lockers)
+"nxo" = (
+/obj/structure/reagent_dispensers/watertank/high,
+/obj/effect/turf_decal/tile/green/fourcorners,
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/yellow/warning{
+ dir = 4
+ },
+/obj/item/reagent_containers/cup/watering_can,
+/turf/open/floor/iron/dark,
+/area/station/service/hydroponics)
"nxx" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -39516,6 +39933,15 @@
},
/turf/open/floor/iron/dark,
/area/station/science/genetics)
+"nzJ" = (
+/obj/structure/table/glass,
+/obj/item/reagent_containers/cup/bottle/multiver{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/cup/bottle/epinephrine,
+/obj/item/wrench/medical,
+/turf/open/floor/iron/dark,
+/area/station/medical/treatment_center)
"nzO" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
@@ -40034,6 +40460,26 @@
/obj/structure/cable,
/turf/open/floor/circuit,
/area/station/ai_monitored/turret_protected/aisat_interior)
+"nNm" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/glass/coffee{
+ pixel_x = -3;
+ pixel_y = 10
+ },
+/obj/item/reagent_containers/cup/glass/coffee{
+ pixel_x = 10;
+ pixel_y = 2
+ },
+/obj/machinery/light/directional/east,
+/obj/machinery/firealarm/directional/east,
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/machinery/camera/directional/east{
+ c_tag = "Civilian - Library East"
+ },
+/turf/open/floor/wood/large,
+/area/station/service/library)
"nNq" = (
/obj/effect/spawner/random/engineering/tracking_beacon,
/turf/open/floor/engine,
@@ -40898,6 +41344,23 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/wood,
/area/station/service/bar/backroom)
+"oeV" = (
+/obj/structure/table/glass,
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 4
+ },
+/obj/item/storage/box/bodybags,
+/obj/item/reagent_containers/cup/bottle/multiver,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
+/obj/item/reagent_containers/syringe,
+/obj/structure/extinguisher_cabinet/directional/west,
+/obj/machinery/camera{
+ c_tag = "Security - Medical Center";
+ dir = 10;
+ network = list("ss13","Security")
+ },
+/turf/open/floor/iron/white,
+/area/station/security/medical)
"ofn" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/cafeteria,
@@ -41044,27 +41507,6 @@
/obj/item/storage/book/bible,
/turf/open/floor/carpet,
/area/station/service/chapel/monastery)
-"oid" = (
-/obj/structure/rack,
-/obj/item/reagent_containers/glass/bottle/acidic_buffer{
- pixel_x = 7;
- pixel_y = 3
- },
-/obj/item/reagent_containers/glass/bottle/basic_buffer{
- pixel_x = -5;
- pixel_y = 3
- },
-/obj/item/reagent_containers/glass/bottle/formaldehyde{
- pixel_x = 1
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/obj/structure/extinguisher_cabinet/directional/north,
-/turf/open/floor/iron/dark/textured_edge{
- dir = 4
- },
-/area/station/medical/medbay/central)
"oig" = (
/obj/effect/turf_decal/trimline/neutral/filled/corner{
dir = 8
@@ -41355,6 +41797,19 @@
},
/turf/open/floor/iron/cafeteria,
/area/station/service/kitchen)
+"olY" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/janitorialcart,
+/obj/item/mop,
+/obj/item/reagent_containers/cup/bucket,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/purple/filled/warning{
+ dir = 10
+ },
+/turf/open/floor/iron,
+/area/station/service/janitor)
"omc" = (
/turf/open/floor/iron/white,
/area/station/service/kitchen)
@@ -41623,6 +42078,19 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/security/prison/workout)
+"orV" = (
+/obj/structure/table,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 10
+ },
+/obj/item/storage/box/bodybags{
+ pixel_x = 3;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/cup/bottle/epinephrine,
+/obj/item/reagent_containers/syringe,
+/turf/open/floor/iron/white,
+/area/station/medical/medbay/lobby)
"osd" = (
/obj/machinery/telecomms/hub/preset,
/obj/effect/landmark/event_spawn,
@@ -41825,6 +42293,23 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"oxh" = (
+/obj/structure/table/glass,
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
+ pixel_x = 6;
+ pixel_y = 10
+ },
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
+ pixel_x = -6;
+ pixel_y = 10
+ },
+/obj/item/storage/pill_bottle/mannitol,
+/obj/item/reagent_containers/dropper{
+ pixel_y = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
+/turf/open/floor/iron/dark,
+/area/station/medical/treatment_center)
"oxs" = (
/obj/effect/turf_decal/trimline/neutral/filled/corner,
/obj/structure/disposalpipe/segment{
@@ -42507,26 +42992,18 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/construction/engineering)
+"oIY" = (
+/obj/docking_port/stationary/mining_home/common{
+ dir = 4
+ },
+/turf/open/misc/asteroid/airless,
+/area/mine/explored)
"oJk" = (
/obj/structure/sign/warning/vacuum/external/directional/west,
/obj/effect/turf_decal/sand/plating,
/obj/machinery/light/small/directional/east,
/turf/open/floor/plating,
/area/station/maintenance/starboard/lesser)
-"oJn" = (
-/obj/structure/table/glass,
-/obj/item/crowbar,
-/obj/item/hatchet,
-/obj/item/plant_analyzer,
-/obj/item/cultivator,
-/obj/item/reagent_containers/glass/bucket,
-/obj/machinery/light/directional/north,
-/obj/effect/turf_decal/trimline/neutral/filled/line{
- dir = 1
- },
-/obj/machinery/newscaster/directional/north,
-/turf/open/floor/iron,
-/area/station/service/hydroponics/garden)
"oJu" = (
/obj/effect/turf_decal/trimline/blue/filled/line,
/obj/machinery/photocopier,
@@ -42555,6 +43032,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
+"oKm" = (
+/obj/docking_port/stationary/mining_home/common{
+ dir = 4
+ },
+/turf/open/misc/asteroid/airless,
+/area/mine/explored)
"oKy" = (
/obj/structure/closet/crate,
/obj/effect/turf_decal/stripes/corner{
@@ -42996,19 +43479,6 @@
},
/turf/open/floor/iron,
/area/station/security/prison)
-"oSH" = (
-/obj/structure/window/reinforced,
-/obj/structure/table/wood,
-/obj/item/radio/intercom/directional/east,
-/obj/item/reagent_containers/food/drinks/flask/gold{
- pixel_y = 10;
- pixel_x = 11
- },
-/obj/item/folder/blue,
-/obj/item/hand_tele,
-/obj/item/stamp/captain,
-/turf/open/floor/wood,
-/area/station/command/heads_quarters/captain)
"oSI" = (
/obj/effect/turf_decal/trimline/neutral/line{
dir = 1
@@ -43051,6 +43521,17 @@
/obj/machinery/portable_atmospherics/canister/air,
/turf/open/floor/plating,
/area/station/maintenance/department/cargo)
+"oSY" = (
+/obj/structure/table/wood,
+/obj/item/nullrod{
+ pixel_x = 4
+ },
+/obj/item/reagent_containers/cup/glass/bottle/holywater{
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/turf/open/floor/cult,
+/area/station/service/chapel/office)
"oTa" = (
/obj/structure/railing{
dir = 9
@@ -43917,25 +44398,6 @@
/obj/machinery/light/small/directional/west,
/turf/open/floor/plating,
/area/station/maintenance/central/greater)
-"piJ" = (
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/beer{
- pixel_x = 7;
- pixel_y = 5
- },
-/obj/item/reagent_containers/food/drinks/bottle/beer{
- pixel_x = -1;
- pixel_y = 9
- },
-/obj/item/reagent_containers/food/drinks/bottle/beer{
- pixel_x = -8
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningdock/cafeteria)
"piX" = (
/turf/open/floor/engine/n2o,
/area/station/engineering/atmos)
@@ -44164,6 +44626,19 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/security/execution/transfer)
+"pmO" = (
+/obj/structure/table,
+/obj/effect/turf_decal/tile/green/fourcorners,
+/obj/item/storage/box/beakers{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/watering_can,
+/obj/machinery/camera/directional/north{
+ c_tag = "Service - Hydroponics"
+ },
+/turf/open/floor/iron/dark,
+/area/station/service/hydroponics)
"pmQ" = (
/obj/effect/turf_decal/trimline/neutral/filled/line,
/obj/effect/turf_decal/trimline/neutral/filled/corner{
@@ -44663,19 +45138,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/ordnance/office)
-"pux" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/green/fourcorners,
-/obj/item/storage/box/beakers{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/reagent_containers/glass/watering_can,
-/obj/machinery/camera/directional/north{
- c_tag = "Service - Hydroponics"
- },
-/turf/open/floor/iron/dark,
-/area/station/service/hydroponics)
"puH" = (
/obj/effect/turf_decal/trimline/neutral/filled/corner{
dir = 8
@@ -44756,6 +45218,19 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"pvK" = (
+/obj/structure/table,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -3
+ },
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = 3
+ },
+/obj/machinery/computer/security/telescreen/entertainment/directional/west,
+/turf/open/floor/iron/checker,
+/area/station/commons/lounge)
"pvL" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -45103,20 +45578,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/security/courtroom)
-"pzR" = (
-/obj/effect/turf_decal/trimline/purple/filled/line{
- dir = 9
- },
-/obj/structure/cable,
-/obj/structure/table,
-/obj/item/reagent_containers/dropper{
- pixel_y = -5
- },
-/obj/item/reagent_containers/glass/beaker/large{
- pixel_y = 6
- },
-/turf/open/floor/iron/white,
-/area/station/science/explab)
"pzV" = (
/obj/effect/turf_decal/stripes/corner,
/obj/effect/turf_decal/trimline/purple/filled/line,
@@ -45250,6 +45711,20 @@
/obj/effect/turf_decal/trimline/neutral/filled/warning,
/turf/open/floor/iron,
/area/station/security/checkpoint/supply)
+"pCK" = (
+/obj/structure/table,
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = 3
+ },
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -3
+ },
+/obj/machinery/camera/directional/north{
+ c_tag = "Service - Bar Lounge North West"
+ },
+/obj/machinery/computer/security/telescreen/entertainment/directional/west,
+/turf/open/floor/iron/checker,
+/area/station/commons/lounge)
"pCL" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -45325,6 +45800,19 @@
/obj/structure/lattice,
/turf/open/space/basic,
/area/mine/explored)
+"pDU" = (
+/obj/structure/closet/secure_closet/hos,
+/obj/item/storage/secure/safe/hos{
+ pixel_x = 35
+ },
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
+/obj/structure/sign/poster/official/space_cops{
+ pixel_y = 32
+ },
+/turf/open/floor/carpet,
+/area/station/command/heads_quarters/hos)
"pDV" = (
/obj/effect/mapping_helpers/airlock/locked,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -45408,6 +45896,23 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/cargo/miningdock)
+"pFi" = (
+/obj/structure/table/glass,
+/obj/item/reagent_containers/cup/bottle/nutrient/ez,
+/obj/item/reagent_containers/cup/bottle/nutrient/rh{
+ pixel_x = 2;
+ pixel_y = 1
+ },
+/obj/item/reagent_containers/spray/pestspray{
+ pixel_x = 3;
+ pixel_y = 4
+ },
+/obj/item/reagent_containers/spray/plantbgone,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+ dir = 9
+ },
+/turf/open/floor/iron,
+/area/station/service/hydroponics/garden)
"pFw" = (
/obj/machinery/vending/modularpc,
/obj/item/radio/intercom/directional/east,
@@ -47416,6 +47921,12 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
+"qpt" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/glass/shaker,
+/obj/machinery/light/dim/directional/east,
+/turf/open/floor/wood,
+/area/station/service/bar/backroom)
"qpx" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk{
@@ -47461,6 +47972,23 @@
},
/turf/open/floor/iron,
/area/station/cargo/office)
+"qpQ" = (
+/obj/structure/table/glass,
+/obj/item/reagent_containers/cup/bottle/nutrient/ez,
+/obj/item/reagent_containers/cup/bottle/nutrient/rh{
+ pixel_x = 2;
+ pixel_y = 1
+ },
+/obj/item/reagent_containers/spray/pestspray{
+ pixel_x = 3;
+ pixel_y = 4
+ },
+/obj/item/reagent_containers/spray/plantbgone,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+ dir = 9
+ },
+/turf/open/floor/iron,
+/area/station/service/hydroponics/garden)
"qpY" = (
/obj/effect/turf_decal/siding/wood{
dir = 8
@@ -48623,21 +49151,6 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/iron,
/area/station/cargo/miningdock)
-"qKy" = (
-/obj/structure/table,
-/obj/item/phone{
- pixel_x = 6;
- pixel_y = 4
- },
-/obj/item/reagent_containers/food/drinks/britcup{
- pixel_x = -6;
- pixel_y = 1
- },
-/obj/effect/turf_decal/trimline/brown/filled/line{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/cargo/drone_bay)
"qKC" = (
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 9
@@ -49371,6 +49884,17 @@
},
/turf/open/floor/iron/freezer,
/area/station/commons/toilet)
+"qYF" = (
+/obj/structure/table/wood,
+/obj/item/nullrod{
+ pixel_x = 4
+ },
+/obj/item/reagent_containers/cup/glass/bottle/holywater{
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/turf/open/floor/cult,
+/area/station/service/chapel/office)
"qYG" = (
/obj/machinery/atmospherics/components/binary/valve/digital,
/turf/open/floor/iron,
@@ -50363,6 +50887,23 @@
},
/turf/open/floor/iron/white,
/area/station/science/research)
+"rri" = (
+/obj/structure/table/glass,
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 4
+ },
+/obj/item/storage/box/bodybags,
+/obj/item/reagent_containers/cup/bottle/multiver,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
+/obj/item/reagent_containers/syringe,
+/obj/structure/extinguisher_cabinet/directional/west,
+/obj/machinery/camera{
+ c_tag = "Security - Medical Center";
+ dir = 10;
+ network = list("ss13","Security")
+ },
+/turf/open/floor/iron/white,
+/area/station/security/medical)
"rrk" = (
/turf/closed/wall/r_wall,
/area/station/security/interrogation)
@@ -50596,6 +51137,26 @@
"rvr" = (
/turf/closed/wall/r_wall,
/area/station/science/ordnance/burnchamber)
+"rvv" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/glass/coffee{
+ pixel_x = -3;
+ pixel_y = 10
+ },
+/obj/item/reagent_containers/cup/glass/coffee{
+ pixel_x = 10;
+ pixel_y = 2
+ },
+/obj/machinery/light/directional/east,
+/obj/machinery/firealarm/directional/east,
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/machinery/camera/directional/east{
+ c_tag = "Civilian - Library East"
+ },
+/turf/open/floor/wood/large,
+/area/station/service/library)
"rvD" = (
/obj/machinery/camera/directional/west{
c_tag = "Hallway - Service Wing Right Stairway"
@@ -50810,6 +51371,17 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/cargo/lobby)
+"ryN" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/sink/directional/east,
+/obj/item/reagent_containers/cup/bucket,
+/turf/open/floor/iron,
+/area/station/security/prison/garden)
"ryO" = (
/obj/structure/ladder,
/obj/machinery/light/small/directional/west,
@@ -51324,6 +51896,16 @@
/obj/structure/extinguisher_cabinet/directional/south,
/turf/open/floor/iron/white,
/area/station/science/lower)
+"rGG" = (
+/obj/structure/table,
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = 5
+ },
+/obj/item/reagent_containers/condiment/enzyme{
+ layer = 5
+ },
+/turf/open/floor/iron/white,
+/area/station/service/kitchen)
"rGN" = (
/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 8
@@ -51528,6 +52110,23 @@
},
/turf/open/floor/iron,
/area/station/science/robotics/mechbay)
+"rJX" = (
+/obj/structure/rack,
+/obj/item/reagent_containers/cup/bottle/ethanol{
+ pixel_x = -5;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/bottle/carbon{
+ pixel_x = 7;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/bottle/chlorine{
+ pixel_x = 1
+ },
+/turf/open/floor/iron/dark/textured_corner{
+ dir = 1
+ },
+/area/station/medical/medbay/central)
"rKc" = (
/obj/machinery/power/shieldwallgen,
/obj/effect/turf_decal/bot,
@@ -51668,6 +52267,19 @@
},
/turf/open/floor/iron,
/area/station/cargo/miningdock/cafeteria)
+"rMu" = (
+/obj/structure/table,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -3
+ },
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = 3
+ },
+/obj/machinery/computer/security/telescreen/entertainment/directional/west,
+/turf/open/floor/iron/checker,
+/area/station/commons/lounge)
"rMA" = (
/obj/effect/turf_decal/trimline/neutral/filled/corner,
/obj/effect/turf_decal/trimline/neutral/filled/corner{
@@ -52484,6 +53096,35 @@
/obj/item/shovel/spade,
/turf/open/floor/iron/dark,
/area/station/security/prison/garden)
+"rZN" = (
+/obj/structure/closet/crate,
+/obj/item/reagent_containers/cup/bowl,
+/obj/effect/spawner/random/contraband/prison,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/kitchen/fork/plastic,
+/obj/item/kitchen/fork/plastic,
+/obj/item/kitchen/fork/plastic,
+/obj/item/storage/box/drinkingglasses,
+/obj/item/kitchen/spoon/plastic,
+/obj/item/kitchen/spoon/plastic,
+/obj/item/kitchen/spoon/plastic,
+/obj/item/knife/plastic,
+/obj/item/knife/plastic,
+/obj/item/knife/plastic,
+/obj/item/storage/bag/tray/cafeteria,
+/obj/item/storage/bag/tray/cafeteria,
+/obj/item/storage/bag/tray/cafeteria,
+/obj/item/storage/bag/tray/cafeteria,
+/obj/item/storage/box/drinkingglasses,
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"rZP" = (
/obj/machinery/flasher/directional/east{
id = "medcell"
@@ -53067,29 +53708,6 @@
},
/turf/open/floor/wood,
/area/station/service/theater)
-"smx" = (
-/obj/structure/table/glass,
-/obj/item/stack/sheet/mineral/plasma{
- pixel_y = 4
- },
-/obj/item/stack/sheet/mineral/plasma{
- pixel_y = 10
- },
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/glass/beaker{
- pixel_x = 8;
- pixel_y = 2
- },
-/obj/item/clothing/glasses/science,
-/obj/machinery/requests_console/directional/west{
- department = "Pharmacy";
- departmentType = 2;
- name = "Pharmacy Requests Console";
- receive_ore_updates = 1
- },
-/obj/effect/turf_decal/tile/yellow/anticorner/contrasted,
-/turf/open/floor/iron/white,
-/area/station/medical/pharmacy)
"smy" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/obj/effect/turf_decal/trimline/red/filled/line{
@@ -53302,6 +53920,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai_upload)
+"sqo" = (
+/obj/structure/reagent_dispensers/watertank,
+/obj/item/reagent_containers/cup/bucket,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/station/maintenance/department/security)
"squ" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
@@ -53378,6 +54002,18 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
+"srH" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
+ pixel_x = 3
+ },
+/obj/item/lighter,
+/obj/item/paper_bin/carbon{
+ pixel_x = -3;
+ pixel_y = 7
+ },
+/turf/open/floor/carpet,
+/area/station/security/detectives_office)
"srS" = (
/obj/effect/turf_decal/tile/blue{
dir = 4
@@ -53595,19 +54231,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/tram/right)
-"swH" = (
-/obj/effect/turf_decal/bot,
-/obj/structure/janitorialcart,
-/obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
-/obj/effect/turf_decal/trimline/neutral/filled/line{
- dir = 10
- },
-/obj/effect/turf_decal/trimline/purple/filled/warning{
- dir = 10
- },
-/turf/open/floor/iron,
-/area/station/service/janitor)
"swM" = (
/obj/structure/toilet,
/obj/machinery/light/small/directional/east,
@@ -53635,19 +54258,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/tram/center)
-"swW" = (
-/obj/structure/closet/secure_closet/hos,
-/obj/item/storage/secure/safe/hos{
- pixel_x = 35
- },
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
-/obj/structure/sign/poster/official/space_cops{
- pixel_y = 32
- },
-/turf/open/floor/carpet,
-/area/station/command/heads_quarters/hos)
"sxk" = (
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron,
@@ -54082,6 +54692,30 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/checker,
/area/station/commons/lounge)
+"sHe" = (
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable,
+/obj/structure/table/glass,
+/obj/item/reagent_containers/cup/bottle/toxin{
+ pixel_x = 6;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/bottle/facid{
+ name = "fluorosulfuric acid bottle";
+ pixel_x = -3;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/cup/bottle/morphine{
+ name = "nyquil bottle";
+ pixel_x = 5;
+ pixel_y = 1
+ },
+/obj/item/reagent_containers/dropper,
+/obj/item/reagent_containers/syringe{
+ pixel_y = 5
+ },
+/turf/open/floor/iron/white,
+/area/station/security/execution/education)
"sHk" = (
/turf/closed/wall/r_wall,
/area/station/ai_monitored/turret_protected/ai_upload)
@@ -54171,16 +54805,6 @@
},
/turf/open/misc/asteroid/airless,
/area/mine/explored)
-"sIF" = (
-/obj/structure/closet/secure_closet/captains,
-/obj/item/reagent_containers/food/drinks/shaker,
-/obj/machinery/computer/security/telescreen/entertainment/directional/north,
-/obj/machinery/camera/directional/north{
- c_tag = "Command - Captain's Quarters"
- },
-/obj/structure/window/reinforced/spawner/east,
-/turf/open/floor/wood,
-/area/station/command/heads_quarters/captain/private)
"sIG" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
@@ -54672,28 +55296,6 @@
/obj/item/radio/intercom/directional/east,
/turf/open/floor/iron,
/area/station/hallway/primary/tram/right)
-"sSl" = (
-/obj/structure/window/reinforced/spawner/west,
-/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/glass/beaker{
- pixel_x = 8;
- pixel_y = 2
- },
-/obj/item/reagent_containers/glass/bottle/multiver{
- pixel_x = 7;
- pixel_y = 12
- },
-/obj/item/reagent_containers/glass/bottle/epinephrine{
- pixel_x = -4;
- pixel_y = 12
- },
-/obj/item/reagent_containers/dropper,
-/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
- dir = 4
- },
-/turf/open/floor/iron/white,
-/area/station/medical/chemistry)
"sSr" = (
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 8
@@ -55373,6 +55975,14 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/commons/dorms)
+"tdZ" = (
+/obj/effect/turf_decal/sand/plating,
+/obj/structure/table,
+/obj/item/reagent_containers/cup/glass/bottle/beer{
+ pixel_x = -8
+ },
+/turf/open/floor/plating/airless,
+/area/mine/explored)
"tea" = (
/obj/machinery/vending/coffee,
/obj/effect/turf_decal/stripes/line{
@@ -56223,6 +56833,16 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
+"tsd" = (
+/obj/structure/closet/secure_closet/captains,
+/obj/item/reagent_containers/cup/glass/shaker,
+/obj/machinery/computer/security/telescreen/entertainment/directional/north,
+/obj/machinery/camera/directional/north{
+ c_tag = "Command - Captain's Quarters"
+ },
+/obj/structure/window/reinforced/spawner/east,
+/turf/open/floor/wood,
+/area/station/command/heads_quarters/captain/private)
"tsj" = (
/obj/effect/turf_decal/siding/wood{
dir = 8
@@ -57449,36 +58069,6 @@
"tPE" = (
/turf/closed/wall,
/area/station/hallway/secondary/entry)
-"tPL" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/peppermill{
- desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
- pixel_x = -8;
- pixel_y = 2
- },
-/obj/item/reagent_containers/food/condiment/saltshaker{
- layer = 3.1;
- pixel_x = -2;
- pixel_y = 2
- },
-/obj/item/reagent_containers/food/condiment/enzyme{
- pixel_x = 9;
- pixel_y = 3
- },
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison/mess)
-"tPU" = (
-/obj/structure/safe,
-/obj/item/clothing/head/bearpelt,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
-/obj/item/gun/ballistic/revolver/russian,
-/obj/item/ammo_box/a357,
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka,
-/obj/effect/turf_decal/bot_white/left,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/command/nuke_storage)
"tPW" = (
/obj/machinery/suit_storage_unit/engine,
/obj/effect/turf_decal/bot{
@@ -57502,20 +58092,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/ordnance)
-"tQo" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_x = 3
- },
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_x = -3
- },
-/obj/machinery/camera/directional/north{
- c_tag = "Service - Bar Lounge North West"
- },
-/obj/machinery/computer/security/telescreen/entertainment/directional/west,
-/turf/open/floor/iron/checker,
-/area/station/commons/lounge)
"tQq" = (
/obj/machinery/recharge_station,
/turf/open/floor/plating,
@@ -57635,19 +58211,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
-"tRW" = (
-/obj/structure/sign/poster/official/here_for_your_safety{
- pixel_y = -32
- },
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/coffee{
- pixel_x = -7
- },
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 6
- },
-/turf/open/floor/iron,
-/area/station/security/checkpoint/supply)
"tRX" = (
/obj/effect/turf_decal/trimline/yellow/warning{
dir = 1
@@ -58265,6 +58828,19 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/wood,
/area/station/commons/vacant_room/office)
+"udv" = (
+/obj/structure/table,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 10
+ },
+/obj/item/storage/box/bodybags{
+ pixel_x = 3;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/cup/bottle/epinephrine,
+/obj/item/reagent_containers/syringe,
+/turf/open/floor/iron/white,
+/area/station/medical/medbay/lobby)
"udz" = (
/obj/machinery/door/airlock/external{
autoclose = 0;
@@ -58342,27 +58918,6 @@
},
/turf/open/floor/vault,
/area/station/hallway/primary/tram/left)
-"ueL" = (
-/obj/structure/rack,
-/obj/item/reagent_containers/glass/bottle/phosphorus{
- pixel_x = -5;
- pixel_y = 3
- },
-/obj/item/reagent_containers/glass/bottle/potassium{
- pixel_x = 7;
- pixel_y = 3
- },
-/obj/item/reagent_containers/glass/bottle/sodium{
- pixel_x = 1
- },
-/obj/machinery/camera/directional/south{
- c_tag = "Medical - Chemical Storage";
- network = list("ss13","medbay")
- },
-/turf/open/floor/iron/dark/textured_corner{
- dir = 4
- },
-/area/station/medical/medbay/central)
"ueZ" = (
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/turf/open/floor/engine/co2,
@@ -59737,6 +60292,18 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
+"uCP" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
+ pixel_x = 3
+ },
+/obj/item/lighter,
+/obj/item/paper_bin/carbon{
+ pixel_x = -3;
+ pixel_y = 7
+ },
+/turf/open/floor/carpet,
+/area/station/security/detectives_office)
"uDa" = (
/obj/structure/rack,
/obj/item/wrench,
@@ -59830,6 +60397,12 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/security/brig)
+"uEz" = (
+/obj/docking_port/stationary/mining_home{
+ dir = 4
+ },
+/turf/open/misc/asteroid/airless,
+/area/mine/explored)
"uEB" = (
/obj/machinery/vending/wardrobe/chef_wardrobe,
/obj/effect/turf_decal/bot_white,
@@ -59942,6 +60515,30 @@
"uGq" = (
/turf/closed/wall,
/area/station/science/ordnance/bomb)
+"uGs" = (
+/obj/structure/window/reinforced/spawner/west,
+/obj/structure/window/reinforced/spawner,
+/obj/structure/table/glass,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 8
+ },
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = 8;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/cup/bottle/multiver{
+ pixel_x = 7;
+ pixel_y = 12
+ },
+/obj/item/reagent_containers/cup/bottle/epinephrine{
+ pixel_x = -4;
+ pixel_y = 12
+ },
+/obj/item/reagent_containers/dropper,
+/obj/item/reagent_containers/syringe,
+/turf/open/floor/iron/white,
+/area/station/medical/pharmacy)
"uGy" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -60849,6 +61446,27 @@
/obj/machinery/light/directional/west,
/turf/open/floor/iron/freezer,
/area/station/security/prison)
+"uXM" = (
+/obj/structure/rack,
+/obj/item/reagent_containers/cup/bottle/phosphorus{
+ pixel_x = -5;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/bottle/potassium{
+ pixel_x = 7;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/bottle/sodium{
+ pixel_x = 1
+ },
+/obj/machinery/camera/directional/south{
+ c_tag = "Medical - Chemical Storage";
+ network = list("ss13","medbay")
+ },
+/turf/open/floor/iron/dark/textured_corner{
+ dir = 4
+ },
+/area/station/medical/medbay/central)
"uYa" = (
/obj/machinery/skill_station,
/turf/open/floor/iron/grimy,
@@ -61355,17 +61973,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
-"vgx" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_x = 3
- },
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_x = -3
- },
-/obj/machinery/computer/security/telescreen/entertainment/directional/east,
-/turf/open/floor/iron/checker,
-/area/station/commons/lounge)
"vgC" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -61541,30 +62148,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/cytology)
-"vje" = (
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable,
-/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/toxin{
- pixel_x = 6;
- pixel_y = 8
- },
-/obj/item/reagent_containers/glass/bottle/facid{
- name = "fluorosulfuric acid bottle";
- pixel_x = -3;
- pixel_y = 6
- },
-/obj/item/reagent_containers/glass/bottle/morphine{
- name = "nyquil bottle";
- pixel_x = 5;
- pixel_y = 1
- },
-/obj/item/reagent_containers/dropper,
-/obj/item/reagent_containers/syringe{
- pixel_y = 5
- },
-/turf/open/floor/iron/white,
-/area/station/security/execution/education)
"vjz" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
@@ -61674,14 +62257,6 @@
},
/turf/open/floor/iron,
/area/station/security/courtroom)
-"vno" = (
-/obj/effect/turf_decal/sand/plating,
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/beer{
- pixel_x = -8
- },
-/turf/open/floor/plating/airless,
-/area/mine/explored)
"vnD" = (
/obj/structure/reagent_dispensers/fueltank/large,
/obj/effect/turf_decal/bot{
@@ -62637,12 +63212,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/commons/dorms)
-"vCL" = (
-/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/station/service/janitor)
"vCQ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -62967,6 +63536,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/catwalk_floor,
/area/station/hallway/primary/tram/right)
+"vKd" = (
+/obj/structure/table,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/rice,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
"vKn" = (
/obj/machinery/door/airlock/hatch{
name = "Secure Pen"
@@ -62994,6 +63569,28 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
+"vKO" = (
+/obj/structure/window/reinforced/spawner/west,
+/obj/structure/table/glass,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = 8;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/cup/bottle/multiver{
+ pixel_x = 7;
+ pixel_y = 12
+ },
+/obj/item/reagent_containers/cup/bottle/epinephrine{
+ pixel_x = -4;
+ pixel_y = 12
+ },
+/obj/item/reagent_containers/dropper,
+/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron/white,
+/area/station/medical/chemistry)
"vKQ" = (
/obj/item/paper,
/obj/effect/decal/cleanable/dirt,
@@ -63144,25 +63741,6 @@
/obj/effect/mapping_helpers/airlock/access/all/supply/vault,
/turf/open/floor/iron/dark,
/area/station/cargo/miningdock/oresilo)
-"vNF" = (
-/obj/structure/table,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
- pixel_x = 8;
- pixel_y = 8
- },
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/obj/item/folder/yellow,
-/obj/item/pen{
- pixel_x = 4;
- pixel_y = 4
- },
-/obj/item/reagent_containers/food/drinks/bottle/whiskey,
-/turf/open/floor/carpet,
-/area/station/command/heads_quarters/qm)
"vNH" = (
/turf/closed/wall/r_wall,
/area/station/tcommsat/server)
@@ -64462,6 +65040,17 @@
/obj/structure/chair/stool/directional/south,
/turf/open/floor/carpet,
/area/station/hallway/secondary/entry)
+"wmX" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/sink/directional/east,
+/obj/item/reagent_containers/cup/bucket,
+/turf/open/floor/iron,
+/area/station/security/prison/garden)
"wna" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/cobweb/cobweb2,
@@ -65532,6 +66121,25 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/security/execution/transfer)
+"wGo" = (
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/obj/structure/table,
+/obj/item/reagent_containers/cup/glass/bottle/beer{
+ pixel_x = 7;
+ pixel_y = 5
+ },
+/obj/item/reagent_containers/cup/glass/bottle/beer{
+ pixel_x = -1;
+ pixel_y = 9
+ },
+/obj/item/reagent_containers/cup/glass/bottle/beer{
+ pixel_x = -8
+ },
+/turf/open/floor/iron,
+/area/station/cargo/miningdock/cafeteria)
"wGy" = (
/obj/effect/turf_decal/trimline/yellow/warning,
/obj/effect/turf_decal/trimline/neutral/filled/corner{
@@ -68268,6 +68876,12 @@
},
/turf/open/floor/iron/dark,
/area/station/command/bridge)
+"xAT" = (
+/obj/docking_port/stationary/mining_home{
+ dir = 4
+ },
+/turf/open/misc/asteroid/airless,
+/area/mine/explored)
"xAW" = (
/obj/effect/turf_decal/trimline/neutral/filled/corner{
dir = 1
@@ -69118,6 +69732,27 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit)
+"xRQ" = (
+/obj/structure/rack,
+/obj/item/reagent_containers/cup/bottle/mercury{
+ pixel_x = -5;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/bottle/nitrogen{
+ pixel_x = 7;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/cup/bottle/oxygen{
+ pixel_x = 1
+ },
+/obj/machinery/firealarm/directional/north,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 8
+ },
+/area/station/medical/medbay/central)
"xSv" = (
/obj/effect/turf_decal/trimline/blue/filled/line,
/turf/open/floor/iron/white,
@@ -69444,6 +70079,20 @@
/obj/item/cautery,
/turf/open/floor/iron/white,
/area/station/science/robotics/lab)
+"xWV" = (
+/obj/structure/table,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 4
+ },
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker,
+/obj/item/reagent_containers/dropper,
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/iron,
+/area/station/science/lab)
"xWX" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -70141,6 +70790,17 @@
},
/turf/open/floor/iron,
/area/station/security/office)
+"yjt" = (
+/obj/structure/table,
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = 3
+ },
+/obj/item/reagent_containers/condiment/saltshaker{
+ pixel_x = -3
+ },
+/obj/machinery/computer/security/telescreen/entertainment/directional/west,
+/turf/open/floor/iron/checker,
+/area/station/commons/lounge)
"yjN" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 4
@@ -84035,7 +84695,7 @@ iZf
rke
wCm
rFv
-vje
+sHe
gfK
dhe
dhe
@@ -88927,9 +89587,9 @@ rBz
ung
fZm
mgS
-tPL
+cGw
fSa
-ejR
+jyK
oVM
dhe
dhe
@@ -89443,7 +90103,7 @@ cQD
bvP
mgS
csS
-hfa
+lyc
oVM
rUR
rUR
@@ -90994,7 +91654,7 @@ rUR
rUR
rUR
pnp
-tPU
+gFo
lQM
jAk
pTU
@@ -94832,7 +95492,7 @@ dhe
duB
eRw
bEB
-dmz
+wmX
eay
qjG
duB
@@ -98453,7 +99113,7 @@ awa
kzE
mvf
top
-swH
+olY
ekB
dhe
dhe
@@ -98705,7 +99365,7 @@ pZW
gff
pZW
uuP
-vCL
+lYl
ekB
aYe
dWK
@@ -102033,7 +102693,7 @@ wRO
ykN
aiz
dyC
-bdf
+nxo
nUP
gvC
ugb
@@ -102540,14 +103200,14 @@ tNx
wHX
cbm
nUP
-pux
+pmO
wHX
nWT
wRO
ykN
aiz
mCR
-cDq
+esa
nUP
cQY
kDd
@@ -103076,7 +103736,7 @@ rbs
dfP
iwg
uPb
-lhf
+qpt
rpp
qjU
mcJ
@@ -111072,7 +111732,7 @@ mwK
mwK
mwK
mwK
-pzR
+bAm
wuC
oId
fke
@@ -111269,7 +111929,7 @@ dDG
wgT
dDG
dhe
-vno
+tdZ
dhe
dhe
dhe
@@ -112845,7 +113505,7 @@ ovz
arE
rIp
uBH
-tRW
+kKr
arE
eko
eko
@@ -115142,7 +115802,7 @@ dhe
unl
xiZ
nTG
-piJ
+wGo
taK
unl
qaV
@@ -117716,7 +118376,7 @@ dDG
dDG
dDG
dDG
-dzP
+xAT
dDG
dDG
dDG
@@ -149100,7 +149760,7 @@ bbb
wdU
jNb
ckM
-ekZ
+qpQ
jBy
iHr
mpw
@@ -149357,7 +150017,7 @@ hun
mmG
blu
ckM
-oJn
+eZn
gsF
mdY
mpw
@@ -151631,7 +152291,7 @@ mjM
qAg
qdr
sZD
-cXf
+oeV
lqP
run
dhe
@@ -152710,7 +153370,7 @@ dCL
jHK
tpR
sUs
-aqZ
+rvv
wLG
iuM
vbV
@@ -152985,7 +153645,7 @@ vzf
xIe
jDN
jFJ
-mzC
+oSY
jFJ
dhe
dhe
@@ -158293,7 +158953,7 @@ jhd
jhd
dhe
rmB
-swW
+cmd
bWb
ePL
omS
@@ -159096,7 +159756,7 @@ tFJ
bCu
aLB
ltw
-sIF
+tsd
pjt
ltw
vHq
@@ -159107,7 +159767,7 @@ eci
mNN
xEo
lQq
-ihD
+uCP
cCW
oBx
yiM
@@ -159615,7 +160275,7 @@ mSq
ltw
sWY
pbf
-oSH
+iPf
dch
llC
qzP
@@ -163983,7 +164643,7 @@ dhe
omm
gDR
omm
-kCw
+fjP
gPw
omm
dhe
@@ -165037,7 +165697,7 @@ jyH
vQM
cDf
ube
-smx
+gpV
wrT
jyH
yeT
@@ -166064,7 +166724,7 @@ dTr
xzq
dKo
lwK
-bqH
+lLC
oam
lum
bRU
@@ -166296,12 +166956,12 @@ bhs
bhs
eEw
wHW
-dwo
+pvK
fxs
isX
isX
cxc
-kJf
+yjt
jGD
izU
eSz
@@ -166549,7 +167209,7 @@ uzM
mdp
pLU
eSx
-tQo
+pCK
paT
eEw
mHc
@@ -166601,8 +167261,8 @@ uGL
tsH
sOH
qNI
-jZN
-ueL
+auK
+uXM
jYS
jYS
jYS
@@ -166819,7 +167479,7 @@ upn
rBF
mHc
eLu
-kJf
+yjt
vyH
qGw
dhw
@@ -166859,7 +167519,7 @@ keD
jHN
ncS
sHm
-aTd
+mRw
jYS
fOv
ygi
@@ -167094,7 +167754,7 @@ kLV
uPk
gHh
cen
-hbI
+udv
iZh
dyI
tDq
@@ -167115,8 +167775,8 @@ jtr
ayW
jPe
qNI
-oid
-cIP
+ggE
+rJX
jYS
mYc
cjT
@@ -167571,12 +168231,12 @@ eSx
qfs
tJg
vuD
-iBh
+kZp
qTs
guL
lNJ
rvd
-jiM
+cId
vJt
mHc
fjp
@@ -167624,7 +168284,7 @@ uZQ
xOn
dkW
dkW
-eOu
+oxh
xSZ
emr
dxw
@@ -168097,7 +168757,7 @@ vxV
crT
nKz
nKz
-iDe
+hMH
bKF
sBh
nKz
@@ -168138,7 +168798,7 @@ eGn
xOn
xOn
dkW
-hWc
+kUx
xSZ
bkM
eIw
@@ -168660,7 +169320,7 @@ adM
obH
csY
jYS
-sSl
+vKO
gio
mzm
jYS
@@ -168875,7 +169535,7 @@ eIP
npg
rIj
acq
-vgx
+lOG
vyH
jfC
lLg
@@ -178377,7 +179037,7 @@ cEi
heo
tII
clB
-vNF
+lmn
lST
fgO
whL
@@ -180207,7 +180867,7 @@ uuQ
lIs
iAp
sHV
-kZW
+cGG
tPZ
ezw
jIC
@@ -182988,7 +183648,7 @@ jhd
jhd
dDG
xxZ
-qKy
+fXJ
owm
xzU
pgn
@@ -185601,7 +186261,7 @@ dDG
dDG
dDG
dDG
-evo
+oIY
dDG
dDG
dDG
diff --git a/_maps/shuttles/emergency_bar.dmm b/_maps/shuttles/emergency_bar.dmm
index 4beb57538ee..5462fe34f1f 100644
--- a/_maps/shuttles/emergency_bar.dmm
+++ b/_maps/shuttles/emergency_bar.dmm
@@ -115,7 +115,7 @@
},
/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/directional/south,
/turf/open/floor/carpet,
/area/shuttle/escape)
@@ -252,7 +252,7 @@
/obj/structure/extinguisher_cabinet/directional/east,
/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,
/obj/effect/turf_decal/tile/bar{
dir = 1
@@ -492,7 +492,7 @@
"bN" = (
/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,
/obj/effect/turf_decal/tile/bar{
diff --git a/_maps/shuttles/emergency_bballhooper.dmm b/_maps/shuttles/emergency_bballhooper.dmm
index 2e62faad6cb..ee39aeae4ff 100644
--- a/_maps/shuttles/emergency_bballhooper.dmm
+++ b/_maps/shuttles/emergency_bballhooper.dmm
@@ -780,7 +780,7 @@
dir = 1
},
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/trophy/gold_cup{
+/obj/item/reagent_containers/cup/glass/trophy/gold_cup{
pixel_x = 0
},
/turf/open/floor/mineral/titanium/purple,
diff --git a/_maps/shuttles/emergency_casino.dmm b/_maps/shuttles/emergency_casino.dmm
index d84365116b3..236e34743b8 100644
--- a/_maps/shuttles/emergency_casino.dmm
+++ b/_maps/shuttles/emergency_casino.dmm
@@ -533,7 +533,7 @@
/obj/item/food/burger/chicken{
pixel_x = -3
},
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
pixel_x = 9;
pixel_y = 7
},
@@ -569,17 +569,17 @@
/area/shuttle/escape)
"pg" = (
/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/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
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/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = 6;
pixel_y = 8
},
@@ -659,7 +659,7 @@
/area/shuttle/escape)
"qM" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/flask,
+/obj/item/reagent_containers/cup/glass/flask,
/turf/open/floor/iron,
/area/shuttle/escape)
"qW" = (
@@ -717,7 +717,7 @@
/obj/structure/rack,
/obj/item/skub,
/obj/effect/turf_decal/delivery,
-/obj/item/reagent_containers/food/drinks/bottle/hooch,
+/obj/item/reagent_containers/cup/glass/bottle/hooch,
/obj/item/clothing/head/foilhat,
/obj/structure/sign/poster/random/directional/west,
/turf/open/floor/mineral/titanium,
@@ -784,7 +784,7 @@
/obj/structure/rack,
/obj/item/soap,
/obj/item/soap,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/delivery,
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
@@ -1229,15 +1229,15 @@
/area/shuttle/escape)
"MT" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/rum{
+/obj/item/reagent_containers/cup/glass/bottle/rum{
pixel_x = -5;
pixel_y = 7
},
-/obj/item/reagent_containers/food/drinks/bottle/amaretto{
+/obj/item/reagent_containers/cup/glass/bottle/amaretto{
pixel_x = 7;
pixel_y = 5
},
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
pixel_y = 4
},
/turf/open/floor/carpet/royalblue,
@@ -1318,15 +1318,15 @@
/area/shuttle/escape)
"Pu" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = 3;
pixel_y = 12
},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
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 = 2
},
@@ -1343,7 +1343,7 @@
},
/obj/machinery/status_display/evac/directional/north,
/obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/turf/open/floor/iron,
/area/shuttle/escape)
"PM" = (
@@ -1518,7 +1518,7 @@
pixel_x = -2;
pixel_y = 6
},
-/obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter{
+/obj/item/reagent_containers/cup/soda_cans/canned_laughter{
pixel_x = 7
},
/turf/open/floor/wood,
diff --git a/_maps/shuttles/emergency_cere.dmm b/_maps/shuttles/emergency_cere.dmm
index 858446afef9..8eaeb259123 100644
--- a/_maps/shuttles/emergency_cere.dmm
+++ b/_maps/shuttles/emergency_cere.dmm
@@ -651,7 +651,7 @@
/area/shuttle/escape)
"cm" = (
/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{
dir = 1
diff --git a/_maps/shuttles/emergency_cruise.dmm b/_maps/shuttles/emergency_cruise.dmm
index ef191445b10..59e0a812312 100644
--- a/_maps/shuttles/emergency_cruise.dmm
+++ b/_maps/shuttles/emergency_cruise.dmm
@@ -412,7 +412,7 @@
/area/shuttle/escape)
"tJ" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
pixel_x = 8;
pixel_y = -1
},
@@ -912,11 +912,11 @@
/area/shuttle/escape)
"Lo" = (
/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -3;
pixel_y = 6
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = 6;
pixel_y = 14
},
@@ -1066,7 +1066,7 @@
/area/shuttle/escape)
"UN" = (
/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/glass/rag{
+/obj/item/reagent_containers/cup/rag{
pixel_y = 7
},
/obj/effect/fun_balloon/sentience/emergency_shuttle{
diff --git a/_maps/shuttles/emergency_delta.dmm b/_maps/shuttles/emergency_delta.dmm
index 3799d36f2d6..9b3400a0bf3 100644
--- a/_maps/shuttles/emergency_delta.dmm
+++ b/_maps/shuttles/emergency_delta.dmm
@@ -211,17 +211,17 @@
/turf/open/floor/iron,
/area/shuttle/escape)
"ar" = (
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
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/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = 6;
pixel_y = 8
},
diff --git a/_maps/shuttles/emergency_discoinferno.dmm b/_maps/shuttles/emergency_discoinferno.dmm
index 314183c4ca7..a90a82aaf37 100644
--- a/_maps/shuttles/emergency_discoinferno.dmm
+++ b/_maps/shuttles/emergency_discoinferno.dmm
@@ -179,19 +179,19 @@
/area/shuttle/escape)
"S" = (
/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)
"T" = (
/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)
"U" = (
/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/directional/east,
/obj/item/coin/plasma,
/obj/item/coin/plasma,
@@ -199,19 +199,19 @@
/area/shuttle/escape)
"W" = (
/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)
"X" = (
/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/directional/south,
/turf/open/floor/mineral/gold,
/area/shuttle/escape)
"Z" = (
/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)
diff --git a/_maps/shuttles/emergency_donut.dmm b/_maps/shuttles/emergency_donut.dmm
index 096615d2ebc..0073c27abc8 100644
--- a/_maps/shuttles/emergency_donut.dmm
+++ b/_maps/shuttles/emergency_donut.dmm
@@ -381,17 +381,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/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
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/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = 6;
pixel_y = 8
},
diff --git a/_maps/shuttles/emergency_imfedupwiththisworld.dmm b/_maps/shuttles/emergency_imfedupwiththisworld.dmm
index b320b900473..1486b1dcb0e 100644
--- a/_maps/shuttles/emergency_imfedupwiththisworld.dmm
+++ b/_maps/shuttles/emergency_imfedupwiththisworld.dmm
@@ -70,7 +70,7 @@
/area/shuttle/escape)
"p" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
dir = 1
@@ -83,10 +83,10 @@
/area/shuttle/escape)
"r" = (
/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,
/obj/effect/turf_decal/tile/bar{
dir = 1
diff --git a/_maps/shuttles/emergency_kilo.dmm b/_maps/shuttles/emergency_kilo.dmm
index 878abf84a3b..ee21ecb9b8d 100644
--- a/_maps/shuttles/emergency_kilo.dmm
+++ b/_maps/shuttles/emergency_kilo.dmm
@@ -569,7 +569,7 @@
/obj/item/reagent_containers/hypospray/medipen{
pixel_y = -6
},
-/obj/item/reagent_containers/glass/bottle/multiver,
+/obj/item/reagent_containers/cup/bottle/multiver,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/escape)
"cY" = (
diff --git a/_maps/shuttles/emergency_luxury.dmm b/_maps/shuttles/emergency_luxury.dmm
index 77fa20e8509..6f6fc679b06 100644
--- a/_maps/shuttles/emergency_luxury.dmm
+++ b/_maps/shuttles/emergency_luxury.dmm
@@ -592,15 +592,15 @@
/area/shuttle/escape/luxury)
"bY" = (
/obj/structure/table/wood/fancy/black,
-/obj/item/reagent_containers/food/drinks/bottle/champagne{
+/obj/item/reagent_containers/cup/glass/bottle/champagne{
pixel_x = 7;
pixel_y = 11
},
-/obj/item/reagent_containers/food/drinks/shaker{
+/obj/item/reagent_containers/cup/glass/shaker{
pixel_x = -7;
pixel_y = 11
},
-/obj/item/reagent_containers/glass/rag{
+/obj/item/reagent_containers/cup/rag{
pixel_x = -6;
pixel_y = 4
},
@@ -716,8 +716,8 @@
/obj/effect/decal/cleanable/blood/old,
/obj/item/bot_assembly/medbot,
/obj/item/stack/medical/gauze,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey,
-/obj/item/reagent_containers/glass/bottle/ethanol,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey,
+/obj/item/reagent_containers/cup/bottle/ethanol,
/obj/item/organ/internal/stomach,
/obj/item/clothing/mask/surgical,
/turf/open/floor/iron,
@@ -813,17 +813,17 @@
/obj/item/storage/medkit/advanced,
/obj/item/storage/medkit/regular,
/obj/item/storage/medkit/fire,
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
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/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = 6;
pixel_y = 8
},
diff --git a/_maps/shuttles/emergency_medisim.dmm b/_maps/shuttles/emergency_medisim.dmm
index 99e9c649493..f6c335c84d7 100644
--- a/_maps/shuttles/emergency_medisim.dmm
+++ b/_maps/shuttles/emergency_medisim.dmm
@@ -87,17 +87,17 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"fW" = (
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = 6
},
-/obj/item/reagent_containers/glass/bottle/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
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/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = 6;
pixel_y = 8
},
@@ -155,10 +155,10 @@
/area/shuttle/escape/simulation)
"he" = (
/obj/structure/rack,
-/obj/item/reagent_containers/food/drinks/soda_cans/tonic,
-/obj/item/reagent_containers/food/drinks/soda_cans/tonic,
-/obj/item/reagent_containers/food/drinks/soda_cans/tonic,
-/obj/item/reagent_containers/food/drinks/soda_cans/tonic,
+/obj/item/reagent_containers/cup/soda_cans/tonic,
+/obj/item/reagent_containers/cup/soda_cans/tonic,
+/obj/item/reagent_containers/cup/soda_cans/tonic,
+/obj/item/reagent_containers/cup/soda_cans/tonic,
/turf/open/floor/iron/chapel{
dir = 4
},
@@ -1119,9 +1119,9 @@
/area/shuttle/escape/simulation)
"SC" = (
/obj/structure/rack,
-/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/cola,
+/obj/item/reagent_containers/cup/soda_cans/cola,
+/obj/item/reagent_containers/cup/soda_cans/cola,
+/obj/item/reagent_containers/cup/soda_cans/cola,
/turf/open/floor/iron/chapel,
/area/shuttle/escape/simulation)
"TE" = (
diff --git a/_maps/shuttles/emergency_meta.dmm b/_maps/shuttles/emergency_meta.dmm
index a4ffbc38238..0ef71b8e4bf 100644
--- a/_maps/shuttles/emergency_meta.dmm
+++ b/_maps/shuttles/emergency_meta.dmm
@@ -404,17 +404,17 @@
/area/shuttle/escape/brig)
"bu" = (
/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/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
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/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = 6;
pixel_y = 8
},
diff --git a/_maps/shuttles/emergency_monastery.dmm b/_maps/shuttles/emergency_monastery.dmm
index a3a4ec1804a..ea520109323 100644
--- a/_maps/shuttles/emergency_monastery.dmm
+++ b/_maps/shuttles/emergency_monastery.dmm
@@ -142,7 +142,7 @@
pixel_y = -32
},
/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/glass/mortar{
+/obj/item/reagent_containers/cup/mortar{
pixel_y = 8
},
/obj/item/pestle,
@@ -1360,7 +1360,7 @@
pixel_y = -32
},
/obj/machinery/light/dim/directional/south,
-/obj/item/reagent_containers/food/drinks/trophy{
+/obj/item/reagent_containers/cup/glass/trophy{
pixel_y = 10
},
/turf/open/floor/iron/dark,
@@ -1737,12 +1737,12 @@
/area/shuttle/escape)
"yP" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
layer = 3.1;
pixel_x = -2;
pixel_y = 2
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 5;
pixel_y = 6
},
@@ -1818,7 +1818,7 @@
/area/shuttle/escape)
"zP" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug/tea,
+/obj/item/reagent_containers/cup/glass/mug/tea,
/turf/open/floor/iron/dark,
/area/shuttle/escape)
"zQ" = (
@@ -1852,7 +1852,7 @@
/turf/open/floor/iron,
/area/shuttle/escape)
"Ac" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/turf/open/floor/iron,
/area/shuttle/escape)
"Ad" = (
@@ -2021,8 +2021,8 @@
/turf/open/floor/iron,
/area/shuttle/escape)
"Cn" = (
-/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/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 9
},
@@ -2168,7 +2168,7 @@
/area/shuttle/escape)
"Eb" = (
/obj/structure/water_source/puddle,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/landmark/event_spawn,
/turf/open/floor/grass,
/area/shuttle/escape)
@@ -2258,7 +2258,7 @@
/area/shuttle/escape)
"Fm" = (
/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
},
@@ -2271,11 +2271,11 @@
/area/shuttle/escape)
"Fx" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = 3;
pixel_y = 4
},
-/obj/item/reagent_containers/food/condiment/peppermill,
+/obj/item/reagent_containers/condiment/peppermill,
/obj/item/storage/box/ingredients/wildcard{
layer = 3.1
},
@@ -2856,7 +2856,7 @@
/area/shuttle/escape)
"Nf" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
/obj/item/kitchen/rollingpin,
/obj/item/knife/kitchen,
/obj/machinery/light/small/directional/south,
@@ -3122,7 +3122,7 @@
"Qs" = (
/obj/structure/table/wood,
/obj/item/newspaper,
-/obj/item/reagent_containers/food/drinks/coffee,
+/obj/item/reagent_containers/cup/glass/coffee,
/turf/open/floor/iron/dark,
/area/shuttle/escape)
"Qt" = (
@@ -3388,7 +3388,7 @@
/area/shuttle/escape)
"SR" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/wine{
+/obj/item/reagent_containers/cup/glass/bottle/wine{
pixel_y = 8
},
/turf/open/floor/iron/dark,
@@ -3480,7 +3480,7 @@
/area/shuttle/escape)
"Tx" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/trophy{
+/obj/item/reagent_containers/cup/glass/trophy{
pixel_y = 8
},
/turf/open/floor/carpet,
@@ -3806,7 +3806,7 @@
/area/shuttle/escape)
"XK" = (
/obj/structure/closet/crate/bin,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/shuttle/escape)
diff --git a/_maps/shuttles/emergency_nature.dmm b/_maps/shuttles/emergency_nature.dmm
index 6be4fd2b94f..f5c23e070c6 100644
--- a/_maps/shuttles/emergency_nature.dmm
+++ b/_maps/shuttles/emergency_nature.dmm
@@ -1043,7 +1043,7 @@
/obj/item/food/soup/monkeysdelight{
pixel_y = 4
},
-/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy{
+/obj/item/reagent_containers/cup/soda_cans/monkey_energy{
pixel_x = 6;
pixel_y = 5
},
@@ -1114,7 +1114,7 @@
/turf/open/floor/iron/white,
/area/shuttle/escape)
"SG" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/mob/living/simple_animal/hostile/retaliate/frog,
/turf/open/floor/grass,
/area/shuttle/escape)
diff --git a/_maps/shuttles/emergency_pubby.dmm b/_maps/shuttles/emergency_pubby.dmm
index d91b02e4ef8..4db06d5eccb 100644
--- a/_maps/shuttles/emergency_pubby.dmm
+++ b/_maps/shuttles/emergency_pubby.dmm
@@ -298,7 +298,7 @@
/area/shuttle/escape)
"aN" = (
/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{
dir = 1
},
diff --git a/_maps/shuttles/emergency_raven.dmm b/_maps/shuttles/emergency_raven.dmm
index 0750aca3589..d0ba8d2b694 100644
--- a/_maps/shuttles/emergency_raven.dmm
+++ b/_maps/shuttles/emergency_raven.dmm
@@ -737,17 +737,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/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
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/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = 6;
pixel_y = 8
},
diff --git a/_maps/shuttles/emergency_rollerdome.dmm b/_maps/shuttles/emergency_rollerdome.dmm
index 39ddccf0a39..80921fe5b3c 100644
--- a/_maps/shuttles/emergency_rollerdome.dmm
+++ b/_maps/shuttles/emergency_rollerdome.dmm
@@ -24,7 +24,7 @@
/area/shuttle/escape)
"eR" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/obj/item/storage/box/drinkingglasses,
/turf/open/floor/wood,
/area/shuttle/escape)
@@ -312,7 +312,7 @@
"Yr" = (
/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/directional/south,
/turf/open/floor/wood,
/area/shuttle/escape)
diff --git a/_maps/shuttles/emergency_russiafightpit.dmm b/_maps/shuttles/emergency_russiafightpit.dmm
index 62d4029155e..e0c0a2b5a5a 100644
--- a/_maps/shuttles/emergency_russiafightpit.dmm
+++ b/_maps/shuttles/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
},
@@ -312,7 +312,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" = (
@@ -407,7 +407,7 @@
"bt" = (
/obj/structure/extinguisher_cabinet/directional/east,
/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)
"bu" = (
@@ -471,12 +471,12 @@
/area/shuttle/escape)
"bH" = (
/obj/structure/closet,
-/obj/item/reagent_containers/food/drinks/bottle/beer,
-/obj/item/reagent_containers/food/drinks/bottle/beer,
-/obj/item/reagent_containers/food/drinks/bottle/beer,
-/obj/item/reagent_containers/food/drinks/bottle/beer,
-/obj/item/reagent_containers/food/drinks/bottle/beer,
-/obj/item/reagent_containers/food/drinks/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,
/area/shuttle/escape)
"bI" = (
diff --git a/_maps/shuttles/emergency_tram.dmm b/_maps/shuttles/emergency_tram.dmm
index c97888e2127..2cad8282cb6 100644
--- a/_maps/shuttles/emergency_tram.dmm
+++ b/_maps/shuttles/emergency_tram.dmm
@@ -291,17 +291,17 @@
/area/shuttle/escape)
"bc" = (
/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/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
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/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = 6;
pixel_y = 8
},
diff --git a/_maps/shuttles/emergency_wabbajack.dmm b/_maps/shuttles/emergency_wabbajack.dmm
index 23daae5eefa..9acda13e59c 100644
--- a/_maps/shuttles/emergency_wabbajack.dmm
+++ b/_maps/shuttles/emergency_wabbajack.dmm
@@ -221,11 +221,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/multiver,
+/obj/item/reagent_containers/cup/bottle/multiver,
/turf/open/floor/mineral/titanium/white,
/area/shuttle/escape)
"aU" = (
diff --git a/_maps/shuttles/hunter_russian.dmm b/_maps/shuttles/hunter_russian.dmm
index 8a727d9fdd4..de430d2c861 100644
--- a/_maps/shuttles/hunter_russian.dmm
+++ b/_maps/shuttles/hunter_russian.dmm
@@ -379,10 +379,10 @@
/obj/item/storage/box/drinkingglasses,
/obj/machinery/light/small/directional/west,
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/food/drinks/bottle/vodka,
-/obj/item/reagent_containers/food/drinks/bottle/vodka,
-/obj/item/reagent_containers/food/drinks/bottle/vodka,
-/obj/item/reagent_containers/food/drinks/bottle/vodka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka,
/obj/item/crowbar/large/old,
/obj/item/lighter/greyscale,
/turf/open/floor/pod/dark,
@@ -454,18 +454,18 @@
/area/shuttle/hunter/russian)
"IV" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -4;
pixel_y = 5
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -4;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{
pixel_x = 6
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -4
},
/obj/effect/turf_decal/siding/red{
diff --git a/_maps/shuttles/infiltrator_advanced.dmm b/_maps/shuttles/infiltrator_advanced.dmm
index 5263f395074..9936f1fdf28 100644
--- a/_maps/shuttles/infiltrator_advanced.dmm
+++ b/_maps/shuttles/infiltrator_advanced.dmm
@@ -32,17 +32,17 @@
"ag" = (
/obj/structure/table/reinforced,
/obj/machinery/light/directional/west,
-/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
},
@@ -595,7 +595,7 @@
/obj/item/reagent_containers/hypospray/medipen{
pixel_y = -6
},
-/obj/item/reagent_containers/glass/bottle/multiver,
+/obj/item/reagent_containers/cup/bottle/multiver,
/obj/structure/table/reinforced,
/obj/machinery/light/directional/north,
/obj/effect/decal/cleanable/dirt,
diff --git a/_maps/shuttles/infiltrator_basic.dmm b/_maps/shuttles/infiltrator_basic.dmm
index b1d39d266e8..6e445bea6ab 100644
--- a/_maps/shuttles/infiltrator_basic.dmm
+++ b/_maps/shuttles/infiltrator_basic.dmm
@@ -275,11 +275,11 @@
/area/shuttle/syndicate/hallway)
"bq" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_x = 5;
pixel_y = 5
},
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
/obj/item/reagent_containers/dropper{
pixel_x = -4;
pixel_y = -8
@@ -453,18 +453,18 @@
/area/shuttle/syndicate/medical)
"bR" = (
/obj/structure/table/reinforced,
-/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/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = 6;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = -3
},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
pixel_x = 6
},
/obj/effect/turf_decal/tile/yellow/half{
diff --git a/_maps/shuttles/pirate_default.dmm b/_maps/shuttles/pirate_default.dmm
index ad7d7788301..5a999d43860 100644
--- a/_maps/shuttles/pirate_default.dmm
+++ b/_maps/shuttles/pirate_default.dmm
@@ -544,12 +544,12 @@
"br" = (
/obj/structure/table/wood,
/obj/item/storage/box/matches,
-/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
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = 6;
pixel_y = 12
},
diff --git a/_maps/shuttles/pirate_dutchman.dmm b/_maps/shuttles/pirate_dutchman.dmm
index 7449e3071fb..686d6c90e22 100644
--- a/_maps/shuttles/pirate_dutchman.dmm
+++ b/_maps/shuttles/pirate_dutchman.dmm
@@ -66,12 +66,12 @@
dir = 5
},
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -5;
pixel_y = 8
},
/obj/item/stack/cannonball/fourteen,
-/obj/item/reagent_containers/glass/bucket/wooden,
+/obj/item/reagent_containers/cup/bucket/wooden,
/turf/open/floor/wood/airless,
/area/shuttle/pirate/flying_dutchman)
"an" = (
@@ -331,8 +331,8 @@
},
/obj/machinery/light/small/directional/south,
/obj/structure/fermenting_barrel/gunpowder,
-/obj/item/reagent_containers/glass/bucket/wooden,
-/obj/item/reagent_containers/glass/bucket/wooden,
+/obj/item/reagent_containers/cup/bucket/wooden,
+/obj/item/reagent_containers/cup/bucket/wooden,
/turf/open/floor/wood/airless,
/area/shuttle/pirate/flying_dutchman)
"hz" = (
@@ -577,8 +577,8 @@
},
/obj/machinery/light/small/directional/south,
/obj/structure/fermenting_barrel/gunpowder,
-/obj/item/reagent_containers/glass/bucket/wooden,
-/obj/item/reagent_containers/glass/bucket/wooden,
+/obj/item/reagent_containers/cup/bucket/wooden,
+/obj/item/reagent_containers/cup/bucket/wooden,
/turf/open/floor/wood/airless,
/area/shuttle/pirate/flying_dutchman)
"BK" = (
@@ -591,10 +591,10 @@
icon_state = "minibar";
name = "skeletal minibar"
},
-/obj/item/reagent_containers/food/condiment/milk{
+/obj/item/reagent_containers/condiment/milk{
pixel_x = -5
},
-/obj/item/reagent_containers/food/condiment/milk{
+/obj/item/reagent_containers/condiment/milk{
pixel_x = 5
},
/turf/open/floor/wood/airless,
@@ -623,7 +623,7 @@
/area/shuttle/pirate/flying_dutchman)
"Dr" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/rum{
+/obj/item/reagent_containers/cup/glass/bottle/rum{
desc = "Rum with ghostly properties that can help the drinker enter the spirit realm. It has fermented under the sea of space for ages.";
name = "Ghost Pirate Rum";
pixel_x = -4;
@@ -632,7 +632,7 @@
/obj/item/clothing/mask/cigarette/cigar{
pixel_x = 4
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -7;
pixel_y = 5
},
@@ -887,7 +887,7 @@
/obj/item/food/grown/sugarcane,
/obj/item/food/grown/sugarcane,
/obj/item/food/grown/sugarcane,
-/obj/item/reagent_containers/glass/bucket/wooden,
+/obj/item/reagent_containers/cup/bucket/wooden,
/turf/open/floor/wood/airless,
/area/shuttle/pirate/flying_dutchman)
"Vm" = (
diff --git a/_maps/shuttles/pirate_silverscale.dmm b/_maps/shuttles/pirate_silverscale.dmm
index 9b57d45cbe9..b9a8c5d0843 100644
--- a/_maps/shuttles/pirate_silverscale.dmm
+++ b/_maps/shuttles/pirate_silverscale.dmm
@@ -582,19 +582,19 @@
"Gy" = (
/obj/structure/table/glass,
/obj/machinery/light/small/directional/west,
-/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/cognac{
+/obj/item/reagent_containers/cup/glass/bottle/cognac{
pixel_x = -10;
pixel_y = 7
},
-/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/vodka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
pixel_x = 2;
pixel_y = 4
},
@@ -628,14 +628,14 @@
/area/shuttle/pirate)
"Jc" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = -8
},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = 9;
pixel_y = 9
},
-/obj/item/reagent_containers/food/drinks/bottle/wine{
+/obj/item/reagent_containers/cup/glass/bottle/wine{
pixel_y = 6
},
/obj/machinery/newscaster/directional/west,
@@ -733,29 +733,29 @@
/area/shuttle/pirate)
"Oo" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/food/drinks/bottle/tequila{
+/obj/item/reagent_containers/cup/glass/bottle/tequila{
pixel_x = 10;
pixel_y = 10
},
-/obj/item/reagent_containers/food/drinks/bottle/hcider{
+/obj/item/reagent_containers/cup/glass/bottle/hcider{
layer = 3.1;
pixel_x = -6;
pixel_y = 8
},
-/obj/item/reagent_containers/food/drinks/bottle/rum{
+/obj/item/reagent_containers/cup/glass/bottle/rum{
layer = 3.2;
pixel_x = -15;
pixel_y = 4
},
-/obj/item/reagent_containers/food/drinks/shaker{
+/obj/item/reagent_containers/cup/glass/shaker{
pixel_x = 1;
pixel_y = 13
},
-/obj/item/reagent_containers/food/drinks/bottle/gin{
+/obj/item/reagent_containers/cup/glass/bottle/gin{
pixel_x = -10;
pixel_y = 15
},
-/obj/item/reagent_containers/food/drinks/bottle/wine{
+/obj/item/reagent_containers/cup/glass/bottle/wine{
layer = 3.1;
pixel_x = 3;
pixel_y = 5
@@ -944,7 +944,7 @@
/area/shuttle/pirate)
"Xw" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = 9;
pixel_y = 9
},
@@ -958,7 +958,7 @@
pixel_y = 9
},
/obj/item/lighter,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
pixel_x = -8
},
/turf/open/floor/carpet/royalblack,
diff --git a/_maps/shuttles/ruin_caravan_victim.dmm b/_maps/shuttles/ruin_caravan_victim.dmm
index 10b1ed7cffa..50c6ba20cfd 100644
--- a/_maps/shuttles/ruin_caravan_victim.dmm
+++ b/_maps/shuttles/ruin_caravan_victim.dmm
@@ -136,21 +136,21 @@
locked = 0;
name = "fridge"
},
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/bottle/beer,
-/obj/item/reagent_containers/food/drinks/bottle/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/food/drinks/waterbottle{
+/obj/item/reagent_containers/cup/glass/waterbottle{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/waterbottle,
-/obj/item/reagent_containers/food/drinks/waterbottle{
+/obj/item/reagent_containers/cup/glass/waterbottle,
+/obj/item/reagent_containers/cup/glass/waterbottle{
pixel_x = 3;
pixel_y = -3
},
diff --git a/_maps/shuttles/ruin_pirate_cutter.dmm b/_maps/shuttles/ruin_pirate_cutter.dmm
index cd3e1f467cd..ed5ad714fc1 100644
--- a/_maps/shuttles/ruin_pirate_cutter.dmm
+++ b/_maps/shuttles/ruin_pirate_cutter.dmm
@@ -311,7 +311,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
},
@@ -322,7 +322,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
@@ -355,11 +355,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/skyrat/emergency_skyrat.dmm b/_maps/shuttles/skyrat/emergency_skyrat.dmm
index 9da369db0d9..c67fc9b46a7 100644
--- a/_maps/shuttles/skyrat/emergency_skyrat.dmm
+++ b/_maps/shuttles/skyrat/emergency_skyrat.dmm
@@ -41,7 +41,7 @@
/obj/structure/table,
/obj/structure/window/spawner,
/obj/item/toy/plush/skyrat/borbplushie,
-/obj/item/reagent_containers/food/drinks/bottle/gin,
+/obj/item/reagent_containers/cup/glass/bottle/gin,
/obj/structure/window/spawner/west,
/turf/open/floor/iron/shuttle/evac{
icon_state = "floorplace"
@@ -57,7 +57,7 @@
/obj/structure/table,
/obj/structure/window/spawner,
/obj/item/toy/plush/lizard_plushie/green,
-/obj/item/reagent_containers/food/drinks/bottle/hooch,
+/obj/item/reagent_containers/cup/glass/bottle/hooch,
/obj/structure/window/spawner/west,
/turf/open/floor/iron/shuttle/evac{
icon_state = "floorplace"
@@ -305,7 +305,7 @@
/obj/structure/table,
/obj/structure/window/spawner,
/obj/item/toy/plush/space_lizard_plushie,
-/obj/item/reagent_containers/food/drinks/bottle/grappa,
+/obj/item/reagent_containers/cup/glass/bottle/grappa,
/obj/structure/window/spawner/east,
/turf/open/floor/iron/shuttle/evac{
icon_state = "floorplace"
@@ -525,7 +525,7 @@
/obj/structure/table,
/obj/structure/window/spawner,
/obj/item/toy/plush/snakeplushie,
-/obj/item/reagent_containers/food/drinks/bottle/kahlua{
+/obj/item/reagent_containers/cup/glass/bottle/kahlua{
pixel_x = 7;
pixel_y = 4
},
diff --git a/_maps/shuttles/skyrat/goldeneye_cruiser.dmm b/_maps/shuttles/skyrat/goldeneye_cruiser.dmm
index 80cbc247fa3..e6ce170b600 100644
--- a/_maps/shuttles/skyrat/goldeneye_cruiser.dmm
+++ b/_maps/shuttles/skyrat/goldeneye_cruiser.dmm
@@ -125,12 +125,12 @@
"cl" = (
/obj/structure/table,
/obj/item/book/manual/chef_recipes,
-/obj/item/reagent_containers/food/condiment/enzyme,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/enzyme,
+/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 = 2
},
/obj/item/storage/fancy/egg_box,
@@ -661,10 +661,10 @@
/area/shuttle/syndicate/cruiser/brig)
"mW" = (
/obj/structure/rack,
-/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/dropper,
@@ -688,7 +688,7 @@
/area/shuttle/syndicate/cruiser/brig)
"nx" = (
/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/effect/turf_decal/bot_white,
/turf/open/floor/iron/dark/textured_large,
/area/shuttle/syndicate/cruiser/brig)
@@ -2074,7 +2074,7 @@
/obj/structure/janitorialcart{
dir = 4
},
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/mop,
/obj/effect/turf_decal/bot_white,
/turf/open/floor/iron/dark/textured_large,
@@ -2441,15 +2441,15 @@
/area/shuttle/syndicate/cruiser/brig)
"Ym" = (
/obj/structure/closet/crate,
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
/obj/effect/spawner/random/contraband/prison,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
/obj/item/kitchen/fork/plastic,
/obj/item/kitchen/fork/plastic,
/obj/item/kitchen/fork/plastic,
diff --git a/_maps/shuttles/skyrat/pirate_enclave.dmm b/_maps/shuttles/skyrat/pirate_enclave.dmm
index 8845b81e93e..1f793ade3d7 100644
--- a/_maps/shuttles/skyrat/pirate_enclave.dmm
+++ b/_maps/shuttles/skyrat/pirate_enclave.dmm
@@ -34,7 +34,7 @@
pixel_x = -4;
pixel_y = -1
},
-/obj/item/reagent_containers/glass/rag{
+/obj/item/reagent_containers/cup/rag{
pixel_x = 7;
pixel_y = 2
},
@@ -43,12 +43,13 @@
"aE" = (
/obj/effect/turf_decal/trimline/yellow/warning,
/obj/effect/turf_decal/delivery,
-/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy,
-/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy,
-/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy,
-/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy,
-/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy,
-/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy,
+/obj/structure/closet/crate/cardboard,
+/obj/item/reagent_containers/cup/soda_cans/monkey_energy,
+/obj/item/reagent_containers/cup/soda_cans/monkey_energy,
+/obj/item/reagent_containers/cup/soda_cans/monkey_energy,
+/obj/item/reagent_containers/cup/soda_cans/monkey_energy,
+/obj/item/reagent_containers/cup/soda_cans/monkey_energy,
+/obj/item/reagent_containers/cup/soda_cans/monkey_energy,
/obj/item/food/chocolatebar,
/obj/item/food/chocolatebar,
/obj/item/food/chocolatebar,
@@ -56,8 +57,8 @@
/obj/item/food/chocolatebar,
/obj/item/food/chocolatebar,
/obj/structure/closet/crate/freezer,
-/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy,
-/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy,
+/obj/item/reagent_containers/cup/soda_cans/monkey_energy,
+/obj/item/reagent_containers/cup/soda_cans/monkey_energy,
/obj/item/food/chocolatebar,
/obj/item/food/chocolatebar,
/turf/open/floor/iron/dark/brown/side{
@@ -693,6 +694,9 @@
/obj/item/knife{
pixel_x = 10
},
+/obj/item/reagent_containers/cup/soda_cans/monkey_energy,
+/obj/item/reagent_containers/cup/soda_cans/monkey_energy,
+/obj/item/reagent_containers/cup/soda_cans/monkey_energy,
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/slaver)
"kV" = (
@@ -1115,6 +1119,11 @@
/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4,
/obj/item/stamp,
/obj/item/stamp/denied,
+/obj/item/reagent_containers/cup/glass/mug/coco{
+ desc = "Still hot!";
+ pixel_x = -4;
+ pixel_y = 4
+ },
/obj/item/modular_computer/laptop/preset/civilian,
/turf/open/floor/wood,
/area/shuttle/syndicate/slaver)
@@ -1604,7 +1613,7 @@
/area/shuttle/syndicate/slaver)
"AB" = (
/obj/structure/table/wood/fancy/red,
-/obj/item/reagent_containers/food/drinks/bottle/holywater,
+/obj/item/reagent_containers/cup/glass/bottle/holywater,
/turf/open/floor/carpet,
/area/shuttle/syndicate/slaver)
"AH" = (
@@ -2359,7 +2368,7 @@
},
/obj/machinery/light/directional/east,
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
pixel_x = -4;
pixel_y = 2
},
@@ -2945,12 +2954,12 @@
"YE" = (
/obj/machinery/computer/security/telescreen/entertainment/directional/north,
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb{
pixel_x = -7;
pixel_y = 9
},
/obj/item/lighter,
-/obj/item/reagent_containers/food/drinks/mug/coco,
+/obj/item/reagent_containers/cup/glass/mug/coco,
/turf/open/floor/carpet/red,
/area/shuttle/syndicate/slaver)
"YF" = (
diff --git a/_maps/shuttles/skyrat/slaver_syndie.dmm b/_maps/shuttles/skyrat/slaver_syndie.dmm
index 100d4676c80..79b487148be 100644
--- a/_maps/shuttles/skyrat/slaver_syndie.dmm
+++ b/_maps/shuttles/skyrat/slaver_syndie.dmm
@@ -346,7 +346,7 @@
/area/shuttle/syndicate/slaver)
"pu" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug/coco{
+/obj/item/reagent_containers/cup/glass/mug/coco{
desc = "Still hot!";
pixel_x = -4;
pixel_y = 4
@@ -888,7 +888,7 @@
},
/obj/structure/table/glass,
/obj/item/healthanalyzer,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/obj/item/reagent_containers/spray,
/obj/item/reagent_containers/spray{
icon_state = "cleaner";
diff --git a/_maps/shuttles/whiteship_box.dmm b/_maps/shuttles/whiteship_box.dmm
index 5a6061b8892..4620ee04d91 100644
--- a/_maps/shuttles/whiteship_box.dmm
+++ b/_maps/shuttles/whiteship_box.dmm
@@ -242,12 +242,12 @@
locked = 0;
name = "fridge"
},
-/obj/item/reagent_containers/food/drinks/waterbottle{
+/obj/item/reagent_containers/cup/glass/waterbottle{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/waterbottle,
-/obj/item/reagent_containers/food/drinks/waterbottle{
+/obj/item/reagent_containers/cup/glass/waterbottle,
+/obj/item/reagent_containers/cup/glass/waterbottle{
pixel_x = 3;
pixel_y = -3
},
@@ -439,7 +439,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
@@ -511,7 +511,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
},
@@ -662,11 +662,11 @@
"bt" = (
/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
},
@@ -1451,11 +1451,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
},
@@ -1659,7 +1659,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
},
@@ -1778,25 +1778,25 @@
/obj/structure/closet/crate{
name = "food crate"
},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = -5;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = 2;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = -2
},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = 5
},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = 1;
pixel_y = -3
},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = 8;
pixel_y = -3
},
diff --git a/_maps/shuttles/whiteship_delta.dmm b/_maps/shuttles/whiteship_delta.dmm
index 854a9ce4ac3..799ed8adb0a 100644
--- a/_maps/shuttles/whiteship_delta.dmm
+++ b/_maps/shuttles/whiteship_delta.dmm
@@ -161,21 +161,21 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/bot_white,
/obj/structure/closet/crate,
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/waterbottle/large,
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large,
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = 3;
pixel_y = -3
},
-/obj/item/reagent_containers/food/drinks/waterbottle{
+/obj/item/reagent_containers/cup/glass/waterbottle{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/waterbottle,
-/obj/item/reagent_containers/food/drinks/waterbottle{
+/obj/item/reagent_containers/cup/glass/waterbottle,
+/obj/item/reagent_containers/cup/glass/waterbottle{
pixel_x = 3;
pixel_y = -3
},
@@ -231,7 +231,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
@@ -1723,10 +1723,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/multiver{
+/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = -3
},
/obj/item/reagent_containers/syringe,
@@ -1968,7 +1968,7 @@
cards = list("2 of Diamonds","3 of Clubs");
pixel_x = -5
},
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 7;
pixel_y = 4
},
@@ -1988,11 +1988,11 @@
name = "fridge"
},
/obj/item/food/sausage,
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/obj/item/food/sandwich,
/obj/structure/spider/stickyweb,
/obj/effect/turf_decal/tile/bar,
diff --git a/_maps/shuttles/whiteship_donut.dmm b/_maps/shuttles/whiteship_donut.dmm
index a5fe74d505d..3e3e7d71932 100644
--- a/_maps/shuttles/whiteship_donut.dmm
+++ b/_maps/shuttles/whiteship_donut.dmm
@@ -422,7 +422,7 @@
/area/shuttle/abandoned)
"bn" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/reagent_containers/food/drinks/mug,
+/obj/item/reagent_containers/cup/glass/mug,
/obj/effect/turf_decal/tile/blue,
/turf/open/floor/iron/airless,
/area/shuttle/abandoned)
diff --git a/_maps/shuttles/whiteship_kilo.dmm b/_maps/shuttles/whiteship_kilo.dmm
index b843907e32a..bfabe07c4f5 100644
--- a/_maps/shuttles/whiteship_kilo.dmm
+++ b/_maps/shuttles/whiteship_kilo.dmm
@@ -80,7 +80,7 @@
"eT" = (
/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
@@ -756,7 +756,7 @@
name = "fridge"
},
/obj/item/food/sausage,
-/obj/item/reagent_containers/food/drinks/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
/obj/item/food/sandwich,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/obj/effect/turf_decal/siding/thinplating_new{
@@ -889,7 +889,7 @@
"OS" = (
/obj/structure/table,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola{
+/obj/item/reagent_containers/cup/glass/drinkingglass/filled/cola{
pixel_y = 5;
pixel_x = 8
},
diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm
index f9f44fe714f..cc09997d35c 100644
--- a/_maps/shuttles/whiteship_meta.dmm
+++ b/_maps/shuttles/whiteship_meta.dmm
@@ -211,25 +211,25 @@
/obj/structure/closet/crate{
name = "food crate"
},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = -5;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = 2;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = -2
},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = 5
},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = 1;
pixel_y = -3
},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = 8;
pixel_y = -3
},
@@ -853,19 +853,19 @@
"cn" = (
/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,
@@ -913,7 +913,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
@@ -1048,18 +1048,18 @@
/area/shuttle/abandoned/cargo)
"cL" = (
/obj/structure/table,
-/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
},
@@ -1077,14 +1077,14 @@
"cM" = (
/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
},
@@ -1233,11 +1233,11 @@
"dj" = (
/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
@@ -1431,11 +1431,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
},
@@ -1473,7 +1473,7 @@
/obj/item/shovel/spade,
/obj/item/cultivator,
/obj/item/plant_analyzer,
-/obj/item/reagent_containers/glass/watering_can,
+/obj/item/reagent_containers/cup/watering_can,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/tile/green{
dir = 1
@@ -1551,11 +1551,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{
layer = 5;
pixel_x = -5;
pixel_y = 6
@@ -1817,7 +1817,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/crate/medical,
/obj/item/storage/medkit/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)
@@ -2014,7 +2014,7 @@
pixel_x = -11;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 6;
pixel_y = 14
},
diff --git a/_maps/shuttles/whiteship_tram.dmm b/_maps/shuttles/whiteship_tram.dmm
index 71149933075..2c002924b10 100644
--- a/_maps/shuttles/whiteship_tram.dmm
+++ b/_maps/shuttles/whiteship_tram.dmm
@@ -538,11 +538,11 @@
/area/shuttle/abandoned/bridge)
"bI" = (
/obj/structure/table/reinforced/rglass,
-/obj/item/reagent_containers/food/drinks/colocup{
+/obj/item/reagent_containers/cup/glass/colocup{
pixel_x = -1;
pixel_y = 13
},
-/obj/item/reagent_containers/food/drinks/colocup{
+/obj/item/reagent_containers/cup/glass/colocup{
pixel_x = 10;
pixel_y = 9
},
@@ -591,19 +591,19 @@
/area/shuttle/abandoned/engine)
"bO" = (
/obj/structure/rack,
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = -5;
pixel_y = 7
},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = -1;
pixel_y = 7
},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = 4;
pixel_y = 7
},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = 8;
pixel_y = 7
},
@@ -1137,7 +1137,7 @@
pixel_x = 6;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/bottle/sake{
+/obj/item/reagent_containers/cup/glass/bottle/sake{
pixel_x = -7;
pixel_y = 4
},
@@ -1161,7 +1161,7 @@
/area/shuttle/abandoned/bridge)
"sE" = (
/obj/structure/table/reinforced/plastitaniumglass,
-/obj/item/reagent_containers/glass/maunamug{
+/obj/item/reagent_containers/cup/maunamug{
pixel_x = 7;
pixel_y = 8
},
@@ -1437,11 +1437,11 @@
pixel_x = -4;
pixel_y = 10
},
-/obj/item/reagent_containers/food/drinks/bottle/sake{
+/obj/item/reagent_containers/cup/glass/bottle/sake{
pixel_x = 10;
pixel_y = 13
},
-/obj/item/reagent_containers/food/drinks/bottle/sake{
+/obj/item/reagent_containers/cup/glass/bottle/sake{
pixel_x = 9;
pixel_y = 4
},
diff --git a/_maps/skyrat/automapper/templates/Skyrat_Map_Reset.dmm b/_maps/skyrat/automapper/templates/Skyrat_Map_Reset.dmm
index da114eaeae8..d23c21a738c 100644
--- a/_maps/skyrat/automapper/templates/Skyrat_Map_Reset.dmm
+++ b/_maps/skyrat/automapper/templates/Skyrat_Map_Reset.dmm
@@ -292,11 +292,11 @@
/area/station/ai_monitored/security/armory)
"aL" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 4;
pixel_y = 4
},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = -5;
pixel_y = 6
},
@@ -1468,7 +1468,7 @@
/obj/item/cultivator,
/obj/item/shovel/spade,
/obj/item/storage/bag/plants,
-/obj/item/reagent_containers/glass/watering_can,
+/obj/item/reagent_containers/cup/watering_can,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/station/security/prison/garden)
@@ -1742,18 +1742,18 @@
/obj/item/storage/box/ingredients/fruity,
/obj/item/storage/box/ingredients/fiesta,
/obj/item/storage/box/ingredients/american,
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour{
list_reagents = list(/datum/reagent/consumable/flour=600);
name = "Premium All-Purpose Flour (16KG)";
volume = 600
},
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/enzyme{
list_reagents = list(/datum/reagent/consumable/enzyme=500);
name = "universe-sized universal enyzyme";
volume = 500
},
-/obj/item/reagent_containers/food/condiment/rice{
+/obj/item/reagent_containers/condiment/rice{
list_reagents = list(/datum/reagent/consumable/rice=150);
name = "Basmati Rice Sack (4KG)";
volume = 150
@@ -1987,7 +1987,7 @@
/obj/item/cultivator,
/obj/item/shovel/spade,
/obj/item/storage/bag/plants,
-/obj/item/reagent_containers/glass/watering_can,
+/obj/item/reagent_containers/cup/watering_can,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/station/security/prison/garden)
@@ -3118,18 +3118,18 @@
/area/station/security/execution/transfer)
"il" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
pixel_x = 7;
pixel_y = 7
},
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
pixel_x = -7;
pixel_y = 7
},
-/obj/item/reagent_containers/glass/bottle/chloralhydrate{
+/obj/item/reagent_containers/cup/bottle/chloralhydrate{
pixel_x = -7
},
-/obj/item/reagent_containers/glass/bottle/facid{
+/obj/item/reagent_containers/cup/bottle/facid{
pixel_x = 7
},
/obj/item/storage/backpack/duffelbag/sec/surgery{
@@ -3705,7 +3705,7 @@
plane = -7;
self_sustaining = 1
},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
pixel_x = 6;
pixel_y = -8
},
@@ -4691,11 +4691,11 @@
dir = 1
},
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -3;
pixel_y = 16
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 3;
pixel_y = 16
},
@@ -5489,7 +5489,7 @@
/area/station/hallway/primary/fore)
"oG" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bucket/wooden,
+/obj/item/reagent_containers/cup/bucket/wooden,
/obj/structure/cable,
/obj/machinery/light/directional/south,
/obj/effect/decal/cleanable/dirt,
@@ -6077,7 +6077,7 @@
"qw" = (
/obj/structure/table/glass,
/obj/item/reagent_containers/syringe,
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
pixel_y = 6
},
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -7911,8 +7911,8 @@
/obj/item/clothing/suit/caution,
/obj/item/clothing/suit/caution,
/obj/item/clothing/suit/caution,
-/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,
/obj/item/storage/bag/trash,
@@ -8953,19 +8953,19 @@
dir = 4
},
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/champagne{
+/obj/item/reagent_containers/cup/glass/bottle/champagne{
pixel_y = 18;
pixel_x = -5
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -7;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = 5;
pixel_y = 12
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = 3;
pixel_y = 1
},
@@ -10200,7 +10200,7 @@
"Bt" = (
/obj/structure/table/glass,
/obj/item/reagent_containers/syringe,
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
pixel_y = 6
},
/obj/effect/turf_decal/trimline/blue/filled/line{
@@ -10780,7 +10780,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot,
/obj/structure/sink/directional/east,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/mop,
/obj/effect/turf_decal/stripes/corner,
/obj/machinery/button/door/directional/south{
@@ -11001,7 +11001,7 @@
plane = -7;
self_sustaining = 1
},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
pixel_y = -5
},
/turf/open/floor/plating,
@@ -11156,7 +11156,7 @@
/area/station/hallway/primary/central)
"Es" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
/obj/item/storage/bag/tray,
/obj/item/storage/box/condimentbottles{
pixel_y = 10
@@ -11174,10 +11174,10 @@
dir = 1
},
/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/machinery/light/directional/south,
@@ -12856,7 +12856,7 @@
pixel_x = -3;
pixel_y = 2
},
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee{
pixel_x = 9;
pixel_y = 3
},
@@ -12927,7 +12927,7 @@
id = "IsolationFlash";
pixel_y = 28
},
-/obj/item/reagent_containers/glass/bucket/wooden,
+/obj/item/reagent_containers/cup/bucket/wooden,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark/brown/side{
dir = 5
@@ -14017,10 +14017,10 @@
dir = 1
},
/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/decal/cleanable/dirt,
@@ -14626,13 +14626,13 @@
/area/space/nearstation)
"Os" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 8;
pixel_y = 2
},
/obj/item/reagent_containers/dropper,
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/turf/open/floor/wood,
/area/station/maintenance/port/aft)
"Ot" = (
@@ -14874,11 +14874,11 @@
/area/station/security/prison/mess)
"Ph" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -3;
pixel_y = 9
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
dir = 1;
pixel_x = 3;
pixel_y = 9
@@ -15120,7 +15120,7 @@
plane = -7;
self_sustaining = 1
},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
pixel_x = -4
},
/turf/open/floor/plating,
@@ -17980,15 +17980,15 @@
/area/station/hallway/secondary/entry)
"Yk" = (
/obj/structure/closet/crate,
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
/obj/effect/spawner/random/contraband/prison,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
/obj/item/kitchen/fork/plastic,
/obj/item/kitchen/fork/plastic,
/obj/item/kitchen/fork/plastic,
diff --git a/_maps/skyrat/automapper/templates/centcom/centcom_shuttle_dock.dmm b/_maps/skyrat/automapper/templates/centcom/centcom_shuttle_dock.dmm
index 179c5a0b606..b703551266f 100644
--- a/_maps/skyrat/automapper/templates/centcom/centcom_shuttle_dock.dmm
+++ b/_maps/skyrat/automapper/templates/centcom/centcom_shuttle_dock.dmm
@@ -18,17 +18,6 @@
},
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
-"aF" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/poddoor/shutters/window{
- name = "Snack Counter Shutters";
- id = "cc_snack"
- },
-/obj/effect/turf_decal/siding/dark{
- dir = 5
- },
-/turf/open/floor/iron,
-/area/centcom/central_command_areas/evacuation)
"aP" = (
/obj/effect/turf_decal/skyrat_decals/misc/handicapped,
/obj/effect/turf_decal/siding/dark/corner{
@@ -36,22 +25,15 @@
},
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
-"aQ" = (
-/obj/effect/turf_decal/arrows,
-/turf/open/floor/iron,
-/area/centcom/central_command_areas/evacuation)
-"aX" = (
-/obj/machinery/vending/coffee,
-/obj/machinery/newscaster/directional/south,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/courtroom)
"aY" = (
-/obj/structure/chair/office{
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/structure/railing/corner{
dir = 4
},
-/obj/effect/turf_decal/tile/dark_blue/opposingcorners,
-/turf/open/floor/iron/dark,
+/obj/machinery/light/floor,
+/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
"ba" = (
/obj/structure/window/reinforced/spawner/north,
@@ -59,12 +41,6 @@
/obj/structure/flora/bush/flowers_br/style_random,
/turf/open/floor/grass,
/area/centcom/central_command_areas/evacuation)
-"be" = (
-/obj/effect/turf_decal/siding/dark{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/centcom/central_command_areas/evacuation)
"bp" = (
/obj/structure/chair/sofa/bench/left{
dir = 1
@@ -92,8 +68,10 @@
/turf/open/floor/wood/tile,
/area/centcom/central_command_areas/evacuation)
"cs" = (
-/obj/effect/turf_decal/tile/dark_blue/opposingcorners,
-/obj/machinery/status_display/evac/directional/north,
+/obj/machinery/vending/coffee,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/evacuation)
"cB" = (
@@ -124,54 +102,22 @@
/obj/effect/mapping_helpers/airlock/access/all/admin/general,
/turf/open/floor/iron,
/area/centcom/central_command_areas/control)
-"cV" = (
-/obj/effect/turf_decal/siding/dark_blue{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/centcom/central_command_areas/evacuation)
"cZ" = (
-/obj/effect/turf_decal/siding/dark,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/evacuation)
-"dh" = (
-/obj/structure/railing/corner{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/evacuation)
-"dr" = (
-/obj/machinery/status_display/evac/directional/south,
-/obj/item/kirbyplants/random,
+/obj/structure/chair/stool/bar/directional/north,
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
"dM" = (
-/obj/effect/turf_decal/tile/dark_blue/opposingcorners,
-/obj/machinery/light/directional/west,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/evacuation)
-"dW" = (
-/obj/structure/table/wood,
-/obj/item/paper_bin,
-/obj/item/pen/fourcolor,
-/obj/machinery/airalarm/directional/east,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/courtroom)
-"dX" = (
-/obj/structure/table/reinforced,
/obj/structure/window/reinforced/tinted{
dir = 1
},
-/obj/machinery/door/window/right/directional/west{
- name = "Deluxe Smokes";
- req_access = list("cent_general")
+/obj/structure/toilet{
+ dir = 8
},
-/obj/item/storage/fancy/cigarettes/cigars/cohiba{
- pixel_x = 6
+/obj/machinery/door/window/brigdoor/left/directional/west{
+ name = "Stall"
},
-/obj/item/storage/fancy/cigarettes/cigars/cohiba{
- pixel_y = 6
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
},
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/evacuation)
@@ -197,6 +143,16 @@
/obj/machinery/light/floor,
/turf/open/floor/grass,
/area/centcom/central_command_areas/evacuation)
+"em" = (
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark_blue,
+/turf/open/floor/iron,
+/area/centcom/central_command_areas/evacuation)
"eL" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/machinery/light/floor,
@@ -217,29 +173,20 @@
/obj/structure/flora/bush/flowers_br/style_random,
/turf/open/floor/grass,
/area/centcom/central_command_areas/evacuation)
-"eY" = (
-/obj/structure/chair/comfy/brown{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/courtroom)
"ff" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/structure/chair/sofa/bench,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/evacuation)
"fx" = (
-/turf/open/floor/iron/kitchen/small,
+/turf/open/floor/iron/kitchen,
/area/centcom/central_command_areas/evacuation)
"fD" = (
-/obj/structure/railing,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/evacuation)
-"fL" = (
-/obj/effect/turf_decal/skyrat_decals/misc/handicapped,
-/obj/effect/turf_decal/siding/dark{
- dir = 9
+/obj/machinery/door/airlock/centcom{
+ name = "Rest Area"
+ },
+/obj/effect/turf_decal/siding/dark_blue/corner{
+ dir = 4
},
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
@@ -265,33 +212,11 @@
/mob/living/simple_animal/butterfly,
/turf/open/floor/grass,
/area/centcom/central_command_areas/evacuation)
-"gN" = (
-/obj/item/kirbyplants{
- icon_state = "plant-21"
- },
-/obj/machinery/firealarm/directional/south,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/courtroom)
-"hn" = (
-/obj/effect/turf_decal/tile/dark_blue/opposingcorners,
-/obj/structure/tank_holder/extinguisher,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/evacuation)
"ho" = (
/obj/effect/turf_decal/siding/dark{
dir = 8
},
-/turf/open/floor/iron/kitchen/small,
-/area/centcom/central_command_areas/evacuation)
-"hp" = (
-/obj/machinery/door/window/left/directional/north{
- name = "Stall"
- },
-/obj/effect/turf_decal/siding/dark{
- dir = 1
- },
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/kitchen,
/area/centcom/central_command_areas/evacuation)
"hu" = (
/obj/structure/window/reinforced/spawner/east,
@@ -299,29 +224,11 @@
/obj/structure/flora/bush/flowers_yw/style_random,
/turf/open/floor/grass,
/area/centcom/central_command_areas/evacuation)
-"hv" = (
-/obj/effect/turf_decal/siding/dark{
- dir = 8
- },
-/obj/structure/table/reinforced,
-/obj/machinery/chem_dispenser/drinks/beer{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/evacuation)
"hx" = (
/obj/structure/flora/bush/lavendergrass,
/obj/structure/flora/bush/flowers_yw/style_random,
/turf/open/floor/grass,
/area/centcom/central_command_areas/evacuation)
-"hG" = (
-/obj/machinery/door/airlock/centcom{
- name = "CentCom Bar"
- },
-/obj/effect/mapping_helpers/airlock/access/all/admin/general,
-/obj/effect/turf_decal/siding/dark,
-/turf/open/floor/iron,
-/area/centcom/central_command_areas/evacuation)
"hU" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/structure/chair/sofa/bench/right{
@@ -330,34 +237,56 @@
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
"it" = (
-/turf/closed/indestructible/riveted,
-/area/centcom/central_command_areas/supplypod)
+/obj/machinery/door/window/brigdoor/left/directional/north{
+ name = "Stall"
+ },
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/centcom/central_command_areas/evacuation)
"iB" = (
/obj/structure/chair/stool/bar/directional/west,
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
"iO" = (
-/obj/machinery/chem_master/condimaster{
- name = "HoochMaster 2000"
+/obj/machinery/status_display/evac/directional/south,
+/obj/structure/rack,
+/obj/item/kitchen/fork{
+ pixel_x = 6
},
-/turf/open/floor/iron/dark,
+/obj/item/kitchen/fork{
+ pixel_x = 6
+ },
+/obj/item/kitchen/fork{
+ pixel_x = 6
+ },
+/obj/item/kitchen/fork{
+ pixel_x = 6
+ },
+/obj/item/kitchen/spoon{
+ pixel_x = -6
+ },
+/obj/item/kitchen/spoon{
+ pixel_x = -6
+ },
+/obj/item/kitchen/spoon{
+ pixel_x = -6
+ },
+/obj/item/kitchen/spoon{
+ pixel_x = -6
+ },
+/turf/open/floor/iron/kitchen,
/area/centcom/central_command_areas/evacuation)
-"ji" = (
-/obj/machinery/door/airlock/centcom{
- name = "CentCom Prisoner Receiving "
- },
-/obj/effect/mapping_helpers/airlock/access/all/admin/captain,
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/courtroom)
"jM" = (
/obj/machinery/door/airlock/centcom{
- name = "CentCom Relaxation Area"
+ name = "CentCom Security Checkpoint"
},
-/obj/effect/turf_decal/siding/dark{
+/obj/effect/mapping_helpers/airlock/access/all/admin/general,
+/obj/effect/turf_decal/siding/dark_blue{
dir = 4
},
-/turf/open/floor/plating,
+/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
"jP" = (
/obj/structure/table/reinforced,
@@ -382,26 +311,21 @@
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
"kK" = (
-/obj/structure/bookcase/random,
-/obj/machinery/airalarm/directional/south,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/courtroom)
-"kO" = (
-/obj/structure/railing/corner{
- dir = 1
- },
-/obj/effect/turf_decal/siding/dark{
- dir = 1
+/obj/structure/sink{
+ dir = 8;
+ pixel_x = 11
},
+/obj/structure/mirror/directional/east,
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
"lo" = (
-/obj/machinery/light/directional/north,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/status_display/evac/directional/north,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/courtroom)
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/structure/railing/corner,
+/obj/machinery/light/floor,
+/turf/open/floor/iron,
+/area/centcom/central_command_areas/evacuation)
"lp" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/siding/wood/corner{
@@ -409,39 +333,38 @@
},
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
-"lz" = (
-/obj/machinery/light/floor,
-/obj/effect/turf_decal/siding/dark{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/centcom/central_command_areas/evacuation)
"lB" = (
/obj/structure/closet/crate/bin,
/turf/open/floor/wood/tile,
/area/centcom/central_command_areas/evacuation)
"lP" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/dark_blue/opposingcorners,
-/obj/machinery/button/door{
- pixel_x = 8;
- name = "Shutters Control";
- id = "cc_arrivals"
- },
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/evacuation)
-"mp" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/courtroom)
-"mq" = (
-/obj/structure/railing/corner,
-/obj/effect/turf_decal/arrows{
+/obj/structure/railing{
dir = 8
},
-/obj/effect/turf_decal/siding/dark,
+/obj/structure/railing/corner,
+/obj/effect/turf_decal/siding/dark_blue{
+ dir = 1
+ },
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
+"mp" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark_blue{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/centcom/central_command_areas/evacuation)
+"mq" = (
+/obj/structure/window/reinforced/spawner/north,
+/obj/structure/table/reinforced,
+/obj/structure/window/reinforced/spawner/west,
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/effect/turf_decal/tile/dark_blue/opposingcorners,
+/turf/open/floor/iron/dark,
+/area/centcom/central_command_areas/evacuation)
"mt" = (
/obj/structure/window/reinforced/spawner/east,
/obj/structure/flora/bush/lavendergrass,
@@ -454,46 +377,39 @@
},
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
-"mL" = (
-/obj/structure/toilet{
- dir = 8
- },
-/obj/machinery/door/window/left/directional/west{
- name = "Stall"
- },
-/obj/structure/window/reinforced/tinted{
- dir = 1
- },
-/obj/effect/turf_decal/siding/dark{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/evacuation)
"ne" = (
/obj/structure/railing/corner{
dir = 8
},
-/obj/effect/turf_decal/siding/dark,
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
"nn" = (
-/obj/item/storage/briefcase{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/storage/secure/briefcase,
-/obj/structure/table/wood,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/chair/office,
+/obj/effect/turf_decal/tile/dark_blue/opposingcorners,
/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/courtroom)
+/area/centcom/central_command_areas/evacuation)
"nq" = (
/obj/machinery/light/directional/east,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/evacuation)
"nv" = (
-/turf/closed/indestructible/riveted,
-/area/centcom/central_command_areas/courtroom)
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
+/obj/structure/closet/secure_closet/freezer/fridge,
+/obj/item/reagent_containers/condiment/mayonnaise,
+/obj/item/reagent_containers/condiment/enzyme,
+/obj/item/storage/fancy/egg_box,
+/obj/item/storage/fancy/egg_box,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/soymilk,
+/obj/item/reagent_containers/condiment/soymilk,
+/obj/item/storage/fancy/egg_box,
+/obj/item/storage/fancy/egg_box,
+/turf/open/floor/iron/kitchen,
+/area/centcom/central_command_areas/evacuation)
"nx" = (
/obj/structure/window/reinforced/spawner,
/obj/structure/flora/bush/lavendergrass,
@@ -523,55 +439,15 @@
/mob/living/simple_animal/butterfly,
/turf/open/floor/grass,
/area/centcom/central_command_areas/evacuation)
-"oO" = (
-/obj/structure/table/reinforced,
-/obj/structure/window/reinforced/tinted,
-/obj/machinery/door/window/left/directional/west{
- req_access = list("cent_general");
- name = "Deluxe Smokes"
- },
-/obj/item/storage/fancy/cigarettes/cigars/havana{
- pixel_x = 6
- },
-/obj/item/storage/fancy/cigarettes/cigars/havana{
- pixel_y = 6
- },
-/obj/item/lighter{
- pixel_x = 8;
- pixel_y = 12
- },
-/obj/item/lighter{
- pixel_x = 4;
- pixel_y = 12
- },
-/obj/item/lighter{
- pixel_y = 12
- },
-/obj/machinery/light/directional/east,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/evacuation)
"oS" = (
-/obj/machinery/status_display/evac/directional/north,
-/obj/item/kirbyplants/random,
-/turf/open/floor/iron,
-/area/centcom/central_command_areas/evacuation)
-"pp" = (
-/obj/effect/turf_decal/tile/dark_blue/opposingcorners,
-/obj/effect/turf_decal/arrows{
- dir = 1
+/obj/structure/railing{
+ dir = 8
},
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/evacuation)
-"pA" = (
-/obj/structure/chair/sofa/bench{
- dir = 1
- },
-/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/siding/dark_blue,
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
"pL" = (
/obj/machinery/light/floor,
-/obj/effect/turf_decal/siding/dark,
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
"qB" = (
@@ -582,10 +458,13 @@
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
"qW" = (
-/obj/machinery/newscaster/directional/west,
-/obj/effect/turf_decal/tile/dark_blue/opposingcorners,
-/obj/machinery/light/directional/west,
-/turf/open/floor/iron/dark,
+/obj/structure/railing/corner,
+/obj/effect/turf_decal/siding/dark_blue{
+ dir = 1
+ },
+/obj/machinery/light/floor,
+/obj/effect/turf_decal/caution,
+/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
"rg" = (
/obj/effect/turf_decal/siding/dark{
@@ -597,8 +476,16 @@
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
"rj" = (
-/turf/open/floor/iron/grimy,
-/area/centcom/central_command_areas/courtroom)
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark_blue,
+/obj/machinery/light/floor,
+/obj/effect/turf_decal/caution{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/centcom/central_command_areas/evacuation)
"rn" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/structure/chair/sofa/bench/left{
@@ -613,7 +500,8 @@
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/evacuation)
"rG" = (
-/obj/structure/chair/stool/bar/directional/east,
+/obj/effect/turf_decal/siding/dark,
+/obj/effect/spawner/random/entertainment/arcade,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/evacuation)
"rV" = (
@@ -643,21 +531,14 @@
/turf/open/floor/wood/tile,
/area/centcom/central_command_areas/evacuation)
"sJ" = (
-/obj/structure/table/reinforced,
-/obj/item/folder/yellow{
- pixel_x = -5
+/obj/structure/railing/corner{
+ dir = 8
},
-/obj/item/folder/blue,
-/obj/effect/turf_decal/tile/dark_blue/opposingcorners,
-/obj/item/stamp/denied{
- pixel_x = 10;
- pixel_y = 10
+/obj/structure/railing/corner,
+/obj/effect/turf_decal/siding/dark_blue{
+ dir = 1
},
-/obj/item/stamp{
- pixel_x = 6;
- pixel_y = 4
- },
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
"sV" = (
/turf/open/floor/wood/tile,
@@ -667,39 +548,12 @@
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
"tO" = (
-/obj/machinery/door/poddoor/shutters/window{
- id = "cc_arrivals";
- name = "Relaxation Shutters"
- },
-/obj/structure/sign/poster/official/here_for_your_safety{
- pixel_y = 32
+/obj/machinery/door/airlock/centcom{
+ name = "Rest Area"
},
+/obj/effect/turf_decal/siding/dark_blue/corner,
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
-"ud" = (
-/obj/structure/sink/directional/west,
-/obj/structure/mirror/directional/east,
-/turf/open/floor/iron,
-/area/centcom/central_command_areas/evacuation)
-"ug" = (
-/obj/effect/turf_decal/siding/dark{
- dir = 8
- },
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/shaker{
- pixel_x = 7;
- pixel_y = 14
- },
-/obj/item/book/manual/wiki/barman_recipes{
- pixel_x = -5;
- pixel_y = 4
- },
-/obj/item/reagent_containers/glass/rag{
- pixel_x = -4;
- pixel_y = 11
- },
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/evacuation)
"uz" = (
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/evacuation)
@@ -716,23 +570,13 @@
},
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
-"vw" = (
-/obj/effect/turf_decal/siding/dark{
+"vP" = (
+/obj/effect/turf_decal/siding/dark/corner{
dir = 1
},
-/obj/structure/extinguisher_cabinet/directional/south,
-/turf/open/floor/iron/kitchen/small,
+/obj/machinery/griddle,
+/turf/open/floor/iron/kitchen,
/area/centcom/central_command_areas/evacuation)
-"vP" = (
-/obj/machinery/door/window/brigdoor{
- base_state = "rightsecure";
- name = "CentCom Stand";
- req_access = list("cent_captain")
- },
-/obj/machinery/firealarm/directional/west,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/courtroom)
"vQ" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/structure/chair/sofa/bench/left,
@@ -747,35 +591,18 @@
/obj/machinery/light/directional/north,
/turf/open/misc/asteroid,
/area/centcom/central_command_areas/evacuation)
-"wc" = (
-/obj/machinery/door/airlock/centcom{
- name = "CentCom Security"
- },
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/mapping_helpers/airlock/access/all/admin/captain,
-/turf/open/floor/iron,
-/area/centcom/central_command_areas/courtroom)
-"wg" = (
-/obj/structure/closet/crate/bin,
-/obj/effect/turf_decal/siding/dark{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/evacuation)
"wE" = (
/obj/structure/fans/tiny,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/evacuation)
-"wM" = (
-/obj/machinery/status_display/evac/directional/north,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/evacuation)
"wR" = (
/turf/open/space/basic,
/area/space)
"xi" = (
-/obj/structure/chair/stool/bar/directional/east,
+/obj/effect/turf_decal/siding/dark{
+ dir = 1
+ },
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
"xP" = (
@@ -787,21 +614,6 @@
},
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
-"xX" = (
-/obj/machinery/door/airlock/centcom{
- name = "CentCom Security Checkpoint"
- },
-/obj/effect/mapping_helpers/airlock/access/all/admin/general,
-/obj/effect/turf_decal/siding/dark_blue{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/evacuation)
-"xZ" = (
-/obj/machinery/vending/cigarette,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/courtroom)
"yp" = (
/obj/machinery/door/airlock/centcom{
name = "CentCom Security"
@@ -815,12 +627,6 @@
/obj/effect/mapping_helpers/airlock/access/all/admin/medical,
/turf/open/floor/iron,
/area/centcom/central_command_areas/control)
-"yC" = (
-/obj/structure/bookcase/random,
-/obj/machinery/status_display/evac/directional/south,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/courtroom)
"yH" = (
/obj/machinery/door/airlock/bathroom{
name = "Female Bathroom"
@@ -828,90 +634,40 @@
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
"yL" = (
-/obj/effect/turf_decal/siding/dark{
- dir = 9
+/obj/structure/railing/corner,
+/obj/effect/turf_decal/arrows,
+/obj/structure/sign/poster/official/help_others{
+ pixel_x = -32
},
-/turf/open/floor/iron/kitchen/small,
+/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
"yP" = (
-/obj/machinery/status_display/evac/directional/south,
-/obj/structure/rack,
-/obj/item/kitchen/fork{
- pixel_x = 6
+/obj/structure/sink/kitchen{
+ dir = 8;
+ pixel_x = 11;
+ pixel_y = 4
},
-/obj/item/kitchen/fork{
- pixel_x = 6
+/obj/structure/sign/poster/official/cleanliness{
+ pixel_x = 32
},
-/obj/item/kitchen/fork{
- pixel_x = 6
- },
-/obj/item/kitchen/fork{
- pixel_x = 6
- },
-/obj/item/kitchen/spoon{
- pixel_x = -6
- },
-/obj/item/kitchen/spoon{
- pixel_x = -6
- },
-/obj/item/kitchen/spoon{
- pixel_x = -6
- },
-/obj/item/kitchen/spoon{
- pixel_x = -6
- },
-/turf/open/floor/iron/kitchen/small,
+/turf/open/floor/iron/kitchen,
/area/centcom/central_command_areas/evacuation)
-"yT" = (
-/obj/machinery/door/airlock/centcom{
- name = "CentCom Security Checkpoint"
- },
-/obj/effect/mapping_helpers/airlock/access/all/admin/captain,
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/courtroom)
"zB" = (
-/obj/structure/railing{
+/obj/structure/chair/office{
dir = 1
},
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/evacuation)
-"zO" = (
-/obj/machinery/light/directional/west,
-/obj/effect/turf_decal/siding/dark,
+/obj/effect/turf_decal/tile/dark_blue/opposingcorners,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/evacuation)
"zR" = (
-/obj/structure/window/reinforced/tinted{
+/obj/effect/turf_decal/siding/dark{
dir = 1
},
-/obj/structure/toilet{
- dir = 8
- },
-/obj/machinery/door/window/left/directional/west{
- name = "Stall"
- },
-/obj/effect/turf_decal/siding/dark{
- dir = 8
- },
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/kitchen,
/area/centcom/central_command_areas/evacuation)
"zW" = (
-/obj/machinery/light/floor,
-/obj/structure/railing{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/evacuation)
-"Aa" = (
/obj/structure/table/reinforced,
-/obj/effect/spawner/costume/butler,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/evacuation)
-"Af" = (
-/obj/effect/turf_decal/siding/dark/corner{
- dir = 1
- },
+/obj/effect/turf_decal/tile/dark_blue/opposingcorners,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/evacuation)
"Ah" = (
@@ -925,23 +681,10 @@
/obj/structure/chair/sofa/bench,
/turf/open/floor/wood/tile,
/area/centcom/central_command_areas/evacuation)
-"AE" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/poddoor/shutters/window{
- name = "Snack Counter Shutters";
- id = "cc_snack"
- },
-/obj/effect/turf_decal/siding/dark/corner{
- dir = 4
- },
-/obj/effect/turf_decal/siding/dark/corner{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/centcom/central_command_areas/evacuation)
"AI" = (
-/obj/machinery/light/floor,
-/obj/structure/railing,
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/tile/dark_blue/opposingcorners,
+/obj/machinery/status_display/evac/directional/north,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/evacuation)
"AK" = (
@@ -960,11 +703,6 @@
/obj/machinery/light/directional/north,
/turf/open/floor/wood/tile,
/area/centcom/central_command_areas/evacuation)
-"Bo" = (
-/obj/structure/sink/directional/east,
-/obj/structure/mirror/directional/west,
-/turf/open/floor/iron,
-/area/centcom/central_command_areas/evacuation)
"Bs" = (
/obj/structure/chair/sofa/bench/corner,
/obj/item/kirbyplants/random{
@@ -1000,37 +738,6 @@
/obj/machinery/status_display/evac/directional/north,
/turf/open/floor/wood/tile,
/area/centcom/central_command_areas/evacuation)
-"BT" = (
-/obj/structure/chair/comfy/black{
- dir = 1
- },
-/obj/machinery/light/directional/south,
-/obj/machinery/status_display/evac/directional/south,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/courtroom)
-"Ca" = (
-/obj/machinery/button/door/directional/north{
- name = "Counter Shutter Control";
- id = "cc_bar";
- req_access = list("cent_general")
- },
-/obj/structure/rack,
-/obj/effect/spawner/costume/waiter,
-/obj/effect/spawner/costume/waiter,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/evacuation)
-"Cb" = (
-/obj/item/storage/briefcase{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/storage/secure/briefcase,
-/obj/structure/table/wood,
-/obj/structure/noticeboard/directional/east,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/courtroom)
"Ch" = (
/obj/structure/fluff/arc,
/turf/open/floor/grass,
@@ -1047,21 +754,6 @@
/obj/machinery/status_display/evac/directional/north,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/evacuation)
-"Cz" = (
-/obj/machinery/light/directional/south,
-/obj/structure/table/reinforced,
-/obj/item/plate/large,
-/obj/item/plate/large{
- pixel_y = 2
- },
-/obj/item/plate/large{
- pixel_y = 4
- },
-/obj/item/plate/large{
- pixel_y = 6
- },
-/turf/open/floor/iron/kitchen/small,
-/area/centcom/central_command_areas/evacuation)
"CA" = (
/obj/structure/window/reinforced/spawner/north,
/obj/structure/window/reinforced/spawner/east,
@@ -1089,7 +781,7 @@
/area/centcom/central_command_areas/evacuation)
"DK" = (
/obj/structure/sign/departments/restroom/directional/south,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
"Eb" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -1105,10 +797,8 @@
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/evacuation)
"EF" = (
-/obj/effect/turf_decal/siding/dark{
- dir = 1
- },
-/obj/structure/chair/stool/bar/directional/east,
+/obj/machinery/status_display/evac/directional/east,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
"EH" = (
@@ -1121,14 +811,8 @@
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
"EN" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/siding/dark{
- dir = 9
- },
-/obj/machinery/door/poddoor/shutters/window{
- name = "Bar Shutters";
- id = "cc_bar"
- },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/closet/crate/bin,
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
"EY" = (
@@ -1136,37 +820,24 @@
/obj/machinery/light/floor,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/evacuation)
-"Fe" = (
-/obj/machinery/door/poddoor/shutters/window{
- id = "cc_arrivals";
- name = "Relaxation Shutters"
- },
-/obj/structure/sign/poster/official/help_others{
- pixel_y = -32
- },
-/turf/open/floor/iron,
-/area/centcom/central_command_areas/evacuation)
-"Fj" = (
-/obj/structure/closet/crate/bin,
-/obj/machinery/light/directional/south,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/evacuation)
"Fm" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/evacuation)
"Fq" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/poddoor/shutters/window{
- name = "Bar Shutters";
- id = "cc_bar"
+/obj/structure/sign/departments/restroom/directional/south,
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
},
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
"FE" = (
-/obj/effect/turf_decal/siding/dark{
- dir = 1
- },
+/obj/structure/window/reinforced/spawner,
+/obj/structure/table/reinforced,
+/obj/structure/window/reinforced/spawner/west,
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/effect/turf_decal/tile/dark_blue/opposingcorners,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/evacuation)
"FQ" = (
@@ -1183,34 +854,19 @@
/turf/open/floor/iron,
/area/centcom/central_command_areas/control)
"FV" = (
-/obj/structure/sign/nanotrasen,
-/turf/closed/indestructible/riveted,
-/area/centcom/central_command_areas/courtroom)
-"FW" = (
+/obj/machinery/light/directional/south,
/obj/structure/table/reinforced,
-/obj/machinery/door/poddoor/shutters/window{
- name = "Snack Counter Shutters";
- id = "cc_snack"
+/obj/item/plate/large,
+/obj/item/plate/large{
+ pixel_y = 2
},
-/obj/effect/turf_decal/siding/dark{
- dir = 1
+/obj/item/plate/large{
+ pixel_y = 4
},
-/turf/open/floor/iron,
-/area/centcom/central_command_areas/evacuation)
-"FZ" = (
-/obj/effect/turf_decal/siding/dark{
- dir = 1
+/obj/item/plate/large{
+ pixel_y = 6
},
-/obj/structure/closet/secure_closet/freezer/fridge,
-/obj/item/reagent_containers/food/condiment/mayonnaise,
-/obj/item/reagent_containers/food/condiment/enzyme,
-/obj/item/storage/fancy/egg_box,
-/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/soymilk,
-/obj/item/reagent_containers/food/condiment/soymilk,
-/turf/open/floor/iron/kitchen/small,
+/turf/open/floor/iron/kitchen,
/area/centcom/central_command_areas/evacuation)
"Gw" = (
/obj/effect/turf_decal/siding/dark{
@@ -1231,31 +887,10 @@
/obj/structure/chair/sofa/bench,
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
-"Hn" = (
-/obj/effect/turf_decal/arrows{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/centcom/central_command_areas/evacuation)
-"Hs" = (
-/obj/structure/table/reinforced,
-/obj/machinery/reagentgrinder{
- desc = "Used to grind things up into raw materials and liquids.";
- pixel_y = 5
- },
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/evacuation)
"HD" = (
-/obj/structure/sink/kitchen/directional/east,
-/obj/structure/sign/poster/official/cleanliness{
- pixel_x = -32
- },
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/turf/open/floor/iron,
-/area/centcom/central_command_areas/evacuation)
-"HP" = (
-/obj/effect/turf_decal/siding/dark,
-/turf/open/floor/iron,
+/obj/machinery/newscaster/directional/west,
+/obj/effect/turf_decal/tile/dark_blue/opposingcorners,
+/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/evacuation)
"HT" = (
/obj/structure/window/reinforced/spawner/north,
@@ -1284,9 +919,11 @@
/turf/open/misc/asteroid,
/area/centcom/central_command_areas/evacuation)
"Iv" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/centcom/central_command_areas/courtroom)
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/tile/dark_blue/opposingcorners,
+/obj/machinery/status_display/evac/directional/south,
+/turf/open/floor/iron/dark,
+/area/centcom/central_command_areas/evacuation)
"Ix" = (
/obj/structure/window/reinforced/spawner,
/obj/structure/window/reinforced/spawner/west,
@@ -1302,11 +939,15 @@
/turf/open/floor/grass,
/area/centcom/central_command_areas/evacuation)
"IB" = (
-/obj/structure/bookcase/random,
-/obj/structure/noticeboard/directional/south,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/window/reinforced/spawner/north,
+/obj/structure/table/reinforced,
+/obj/item/folder/yellow{
+ pixel_x = -5
+ },
+/obj/item/folder/blue,
+/obj/effect/turf_decal/tile/dark_blue/opposingcorners,
/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/courtroom)
+/area/centcom/central_command_areas/evacuation)
"IC" = (
/obj/machinery/door/airlock/centcom{
name = "CentCom Security"
@@ -1326,21 +967,22 @@
},
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/evacuation)
-"IJ" = (
+"IP" = (
+/obj/effect/turf_decal/siding/dark_blue{
+ dir = 8
+ },
+/obj/machinery/light/floor,
+/turf/open/floor/iron,
+/area/centcom/central_command_areas/evacuation)
+"IX" = (
+/obj/structure/railing/corner{
+ dir = 1
+ },
/obj/structure/railing/corner{
dir = 4
},
-/obj/effect/turf_decal/arrows{
- dir = 8
- },
-/obj/effect/turf_decal/siding/dark{
- dir = 1
- },
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
-"IP" = (
-/turf/open/floor/wood,
-/area/centcom/central_command_areas/courtroom)
"Jc" = (
/obj/structure/window/reinforced/spawner,
/obj/structure/window/reinforced/spawner/east,
@@ -1348,12 +990,6 @@
/obj/structure/flora/bush/flowers_br/style_random,
/turf/open/floor/grass,
/area/centcom/central_command_areas/evacuation)
-"Jd" = (
-/obj/structure/table/wood,
-/obj/item/storage/fancy/donut_box,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/courtroom)
"Kc" = (
/obj/effect/turf_decal/siding/dark{
dir = 10
@@ -1361,15 +997,10 @@
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
"Kg" = (
-/obj/effect/turf_decal/siding/dark_blue,
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/centcom/central_command_areas/evacuation)
-"Kq" = (
-/obj/effect/turf_decal/siding/dark_blue{
- dir = 9
+/obj/structure/railing/corner,
+/obj/structure/railing/corner{
+ dir = 8
},
-/obj/machinery/light/directional/east,
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
"Kw" = (
@@ -1380,18 +1011,22 @@
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/evacuation)
"Kz" = (
-/obj/machinery/door/poddoor/shutters/window{
- id = "cc_arrivals";
- name = "Relaxation Shutters"
+/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
},
-/obj/effect/turf_decal/siding/dark/corner,
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
"KI" = (
-/obj/machinery/door/airlock/centcom{
- name = "CentCom Supplypod Loading"
+/obj/structure/table/reinforced,
+/obj/machinery/door/window/brigdoor/left/directional/north{
+ name = "CentCom Customs";
+ req_access = list("cent_captain")
},
-/obj/effect/mapping_helpers/airlock/access/all/admin/storage,
+/obj/machinery/door/window/left/directional/south{
+ name = "CentCom Desk"
+ },
+/obj/effect/turf_decal/tile/dark_blue/opposingcorners,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/evacuation)
"Li" = (
@@ -1407,22 +1042,27 @@
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
"LQ" = (
+/obj/structure/window/reinforced/spawner,
/obj/structure/table/reinforced,
-/obj/machinery/door/window/left/directional/east{
- name = "CentCom Desk"
- },
-/obj/machinery/door/window/brigdoor/left/directional/west{
- name = "CentCom Customs";
- req_access = list("cent_general")
+/obj/item/folder/yellow{
+ pixel_x = -5
},
+/obj/item/folder/blue,
/obj/effect/turf_decal/tile/dark_blue/opposingcorners,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/evacuation)
"Mm" = (
-/obj/structure/bookcase/random,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/courtroom)
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/arrows{
+ dir = 1
+ },
+/obj/structure/sign/poster/official/here_for_your_safety{
+ pixel_x = -32
+ },
+/turf/open/floor/iron,
+/area/centcom/central_command_areas/evacuation)
"Mp" = (
/obj/docking_port/stationary{
dir = 4;
@@ -1464,13 +1104,6 @@
/obj/structure/window/reinforced/spawner/north,
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
-"Nb" = (
-/obj/structure/table/wood,
-/obj/item/paper_bin,
-/obj/item/pen/fourcolor,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/courtroom)
"Nf" = (
/obj/structure/chair/sofa/bench{
dir = 1
@@ -1497,63 +1130,27 @@
/obj/machinery/light/directional/east,
/turf/open/floor/wood/tile,
/area/centcom/central_command_areas/evacuation)
-"NV" = (
-/obj/item/kirbyplants{
- icon_state = "plant-22"
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/courtroom)
-"Or" = (
-/obj/machinery/door/window/brigdoor{
- base_state = "rightsecure";
- name = "CentCom Stand";
- req_access = list("cent_captain")
- },
-/obj/machinery/firealarm/directional/east,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/courtroom)
-"Ou" = (
-/obj/effect/turf_decal/tile/dark_blue/opposingcorners,
-/obj/structure/table/reinforced,
-/obj/machinery/door/window/left/directional/south{
- name = "CentCom Security Customs"
- },
-/obj/machinery/door/window/brigdoor/left/directional/north{
- name = "CentCom Security Customs";
- req_access = list("cent_general")
- },
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/evacuation)
"OQ" = (
-/obj/structure/chair{
- dir = 1
+/obj/effect/turf_decal/siding/dark{
+ dir = 9
},
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/courtroom)
+/turf/open/floor/iron/kitchen,
+/area/centcom/central_command_areas/evacuation)
"OR" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/centcom{
- name = "CentCom"
- },
-/obj/effect/turf_decal/stripes/line{
+/obj/structure/railing{
dir = 8
},
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark_blue,
/turf/open/floor/iron,
-/area/centcom/central_command_areas/courtroom)
+/area/centcom/central_command_areas/evacuation)
"Pc" = (
/obj/effect/turf_decal/arrows{
dir = 8
},
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/evacuation)
-"Pe" = (
-/obj/effect/turf_decal/tile/dark_blue/opposingcorners,
-/obj/structure/table/reinforced,
-/obj/item/clothing/gloves/color/latex,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
"Pn" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -1562,18 +1159,19 @@
},
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
-"Pt" = (
-/obj/effect/turf_decal/siding/dark/corner{
- dir = 1
- },
-/obj/machinery/griddle,
-/turf/open/floor/iron/kitchen/small,
-/area/centcom/central_command_areas/evacuation)
"Pw" = (
-/obj/effect/turf_decal/siding/dark{
+/obj/structure/toilet{
+ dir = 8
+ },
+/obj/machinery/door/window/brigdoor/left/directional/west{
+ name = "Stall"
+ },
+/obj/structure/window/reinforced/tinted{
dir = 1
},
-/obj/machinery/vending/boozeomat,
+/obj/effect/turf_decal/siding/dark{
+ dir = 8
+ },
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/evacuation)
"PK" = (
@@ -1586,30 +1184,6 @@
},
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/evacuation)
-"PQ" = (
-/obj/effect/spawner/random/entertainment/arcade{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/evacuation)
-"PS" = (
-/obj/machinery/vending/snack,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/courtroom)
-"Qc" = (
-/obj/structure/chair/sofa/bench/right{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/centcom/central_command_areas/evacuation)
-"Qh" = (
-/obj/structure/table/reinforced,
-/obj/machinery/chem_dispenser/drinks{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/evacuation)
"Qk" = (
/obj/structure/toilet{
dir = 4
@@ -1620,7 +1194,11 @@
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/evacuation)
"Ql" = (
-/obj/effect/turf_decal/tile/bar/opposingcorners,
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = -12
+ },
+/obj/structure/mirror/directional/west,
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
"Qv" = (
@@ -1629,51 +1207,30 @@
},
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
-"Qy" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/siding/dark/corner{
- dir = 1
- },
-/obj/machinery/door/poddoor/shutters/window{
- name = "Bar Shutters";
- id = "cc_bar"
- },
-/turf/open/floor/iron,
-/area/centcom/central_command_areas/evacuation)
-"QF" = (
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/flour{
- pixel_x = -6;
- pixel_y = 6
- },
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/kitchen/rollingpin,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/evacuation)
-"QH" = (
-/turf/open/floor/iron,
-/area/centcom/central_command_areas/evacuation)
-"QJ" = (
-/obj/machinery/door/poddoor/shutters/window{
- id = "cc_arrivals";
- name = "Relaxation Shutters"
- },
-/obj/effect/turf_decal/siding/dark/corner{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/centcom/central_command_areas/evacuation)
-"QL" = (
+"Qx" = (
/obj/machinery/button/door/directional/north{
name = "Counter Shutter Control";
id = "cc_snack";
req_access = list("cent_general")
},
-/obj/effect/turf_decal/siding/dark{
- dir = 8
- },
+/obj/structure/rack,
+/obj/effect/spawner/costume/waiter,
+/obj/effect/spawner/costume/waiter,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/evacuation)
+"QF" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/condiment/flour{
+ pixel_x = -6;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/kitchen/rollingpin,
+/turf/open/floor/iron/dark,
+/area/centcom/central_command_areas/evacuation)
+"QH" = (
+/turf/open/floor/iron,
+/area/centcom/central_command_areas/evacuation)
"Rb" = (
/obj/effect/turf_decal/siding/dark{
dir = 10
@@ -1689,18 +1246,15 @@
/obj/item/kirbyplants/random,
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
-"Rn" = (
-/obj/effect/turf_decal/siding/dark{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/centcom/central_command_areas/evacuation)
"Ru" = (
/obj/machinery/door/airlock/centcom{
- name = "CentCom Prisoner Receiving "
+ name = "CentCom Security Checkpoint"
},
-/obj/effect/turf_decal/siding/dark,
-/turf/open/floor/iron,
+/obj/effect/mapping_helpers/airlock/access/all/admin/general,
+/obj/effect/turf_decal/siding/dark_blue{
+ dir = 4
+ },
+/turf/closed/indestructible/riveted,
/area/centcom/central_command_areas/evacuation)
"RE" = (
/obj/machinery/status_display/evac/directional/west,
@@ -1717,11 +1271,11 @@
"RU" = (
/obj/structure/table/reinforced,
/obj/machinery/light/directional/west,
-/obj/item/reagent_containers/food/condiment/rice{
+/obj/item/reagent_containers/condiment/rice{
pixel_x = -6;
pixel_y = 6
},
-/obj/item/reagent_containers/food/condiment/rice,
+/obj/item/reagent_containers/condiment/rice,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/evacuation)
"Sa" = (
@@ -1742,19 +1296,6 @@
},
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
-"SL" = (
-/obj/structure/chair/sofa/bench{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/centcom/central_command_areas/evacuation)
-"Ts" = (
-/obj/effect/turf_decal/skyrat_decals/misc/handicapped,
-/obj/effect/turf_decal/siding/dark/corner{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/centcom/central_command_areas/evacuation)
"TJ" = (
/obj/structure/window/reinforced/spawner/west,
/obj/structure/flora/bush/lavendergrass,
@@ -1776,23 +1317,23 @@
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
"TT" = (
-/obj/structure/table/reinforced,
-/obj/item/paper_bin,
-/obj/item/pen,
-/obj/effect/turf_decal/tile/dark_blue/opposingcorners,
-/turf/open/floor/iron/dark,
+/obj/structure/sign/departments/restroom/directional/south,
+/obj/effect/turf_decal/siding/dark/corner{
+ dir = 1
+ },
+/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
"Us" = (
-/obj/structure/table/wood,
-/obj/item/storage/fancy/donut_box,
-/obj/machinery/light/directional/south,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/table/reinforced,
+/obj/machinery/door/window/brigdoor/left/directional/south{
+ name = "CentCom Customs";
+ req_access = list("cent_captain")
+ },
+/obj/machinery/door/window/left/directional/north{
+ name = "CentCom Desk"
+ },
+/obj/effect/turf_decal/tile/dark_blue/opposingcorners,
/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/courtroom)
-"Uw" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/structure/chair/stool/bar/directional/east,
-/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
"UC" = (
/obj/effect/turf_decal/siding/dark_blue/corner{
@@ -1801,15 +1342,9 @@
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
"UU" = (
+/obj/item/kirbyplants/random,
+/obj/structure/extinguisher_cabinet/directional/north,
/obj/effect/turf_decal/tile/dark_blue/opposingcorners,
-/obj/machinery/light/directional/north,
-/obj/structure/noticeboard/directional/north,
-/obj/structure/table/reinforced,
-/obj/item/folder/yellow{
- pixel_x = -5
- },
-/obj/item/folder/blue,
-/obj/item/pen,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/evacuation)
"UV" = (
@@ -1823,21 +1358,10 @@
},
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
-"Vw" = (
-/obj/item/kirbyplants/random,
-/turf/open/floor/iron,
-/area/centcom/central_command_areas/evacuation)
"VE" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
-"VG" = (
-/obj/structure/sign/poster/official/cleanliness{
- pixel_x = 32
- },
-/obj/structure/sink/kitchen/directional/west,
-/turf/open/floor/iron/kitchen/small,
-/area/centcom/central_command_areas/evacuation)
"VK" = (
/obj/structure/chair/sofa/bench/corner{
dir = 4
@@ -1848,11 +1372,6 @@
},
/turf/open/floor/wood/tile,
/area/centcom/central_command_areas/evacuation)
-"VP" = (
-/obj/structure/extinguisher_cabinet/directional/south,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/courtroom)
"VV" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/siding/wood/corner{
@@ -1860,32 +1379,12 @@
},
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
-"We" = (
-/obj/structure/chair/sofa/bench/left{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/centcom/central_command_areas/evacuation)
-"Wj" = (
+"WD" = (
+/obj/item/kirbyplants/random,
+/obj/structure/extinguisher_cabinet/directional/south,
/obj/effect/turf_decal/tile/dark_blue/opposingcorners,
-/obj/structure/chair/office,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/evacuation)
-"WB" = (
-/obj/machinery/door/airlock/centcom{
- name = "CentCom Relaxation Area"
- },
-/obj/effect/turf_decal/siding/dark{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/centcom/central_command_areas/evacuation)
-"WD" = (
-/obj/structure/chair{
- dir = 1
- },
-/turf/open/floor/iron/grimy,
-/area/centcom/central_command_areas/courtroom)
"Xe" = (
/obj/structure/table,
/obj/item/paper/pamphlet/centcom/visitor_info{
@@ -1895,33 +1394,17 @@
/obj/item/paper/pamphlet/centcom/visitor_info,
/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
-"Xw" = (
-/obj/effect/turf_decal/tile/dark_blue/opposingcorners,
-/obj/machinery/computer/secure_data,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/evacuation)
-"XA" = (
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/evacuation)
"Yc" = (
/obj/structure/chair/sofa/bench/right{
dir = 1
},
/turf/open/floor/wood/tile,
/area/centcom/central_command_areas/evacuation)
-"Yp" = (
-/obj/structure/chair/comfy/black{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/courtroom)
"YL" = (
/obj/structure/railing/corner{
dir = 1
},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron,
/area/centcom/central_command_areas/evacuation)
"YR" = (
/obj/structure/chair/sofa/bench/left,
@@ -1956,12 +1439,6 @@
/area/centcom/central_command_areas/evacuation)
(1,1,1) = {"
-Yp
-mp
-NV
-mp
-Jd
-nv
jX
jX
jX
@@ -1983,15 +1460,8 @@ jX
kj
jX
cO
-jX
"}
(2,1,1) = {"
-rj
-rj
-rj
-rj
-eY
-FV
jX
DJ
kj
@@ -2013,15 +1483,8 @@ Fm
nq
Fm
Fm
-KI
"}
(3,1,1) = {"
-rj
-rj
-rj
-rj
-BT
-nv
jX
jX
jX
@@ -2043,15 +1506,8 @@ jX
jX
jX
IC
-jX
"}
(4,1,1) = {"
-rj
-rj
-rj
-rj
-eY
-nv
VK
sH
AM
@@ -2072,16 +1528,9 @@ jX
AK
RU
QF
-yL
-it
+OQ
"}
(5,1,1) = {"
-PS
-Nb
-mp
-mp
-nn
-nv
Ak
sV
sV
@@ -2102,16 +1551,9 @@ jX
Co
uz
uz
-vw
-it
+zR
"}
(6,1,1) = {"
-nv
-FV
-OR
-OR
-FV
-nv
BN
sV
sV
@@ -2129,19 +1571,12 @@ vi
CV
QH
jX
-Ca
+Qx
uz
uz
-FZ
-it
+nv
"}
(7,1,1) = {"
-vP
-mp
-mp
-mp
-gN
-nv
YR
sV
sV
@@ -2162,16 +1597,9 @@ jP
ho
ho
ho
-Pt
-it
+vP
"}
(8,1,1) = {"
-Iv
-mp
-IP
-IP
-NV
-nv
ZE
sV
sV
@@ -2192,16 +1620,9 @@ UV
fx
fx
fx
-Cz
-it
+FV
"}
(9,1,1) = {"
-nv
-lo
-WD
-rj
-kK
-nv
ZE
sV
rg
@@ -2218,20 +1639,13 @@ RI
uz
uz
LF
-FW
+jP
fx
fx
-VG
yP
-it
+iO
"}
(10,1,1) = {"
-Iv
-OQ
-WD
-rj
-yC
-nv
ZE
sV
Eb
@@ -2248,20 +1662,13 @@ GR
VE
uz
LF
-aF
-AE
+jP
+UV
jP
jX
jX
-it
"}
(11,1,1) = {"
-Iv
-OQ
-WD
-rj
-IB
-nv
ZE
sV
Kw
@@ -2282,16 +1689,9 @@ EY
uO
iB
QH
-wg
-it
+cs
"}
(12,1,1) = {"
-Iv
-OQ
-WD
-rj
-aX
-nv
Bl
sV
Eb
@@ -2308,20 +1708,13 @@ GR
VE
uz
VE
-Uw
EF
xi
QH
+QH
cC
-it
"}
(13,1,1) = {"
-wc
-mp
-rj
-rj
-Us
-nv
BN
sV
xP
@@ -2337,21 +1730,14 @@ Jc
vQ
uz
uz
-LF
EN
-Qy
-Fq
jX
jX
-it
+jX
+jX
+jX
"}
(14,1,1) = {"
-Iv
-OQ
-WD
-rj
-xZ
-FV
ce
sV
sV
@@ -2367,21 +1753,14 @@ qB
uz
uz
VE
-fL
Fq
+jX
Ql
-Ql
-HD
-Pw
-it
+PK
+PK
+Qk
"}
(15,1,1) = {"
-Iv
-OQ
-WD
-rj
-IB
-nv
Bs
HY
NI
@@ -2397,21 +1776,14 @@ uz
uz
EH
Gw
-Ts
-Fq
-Ql
-Ql
-Ql
-FE
+Kz
+gv
+QH
+EJ
+td
it
"}
(16,1,1) = {"
-Iv
-OQ
-WD
-rj
-yC
-nv
jX
jX
jX
@@ -2426,382 +1798,245 @@ uz
uz
VE
Gw
-Qv
-QH
+TT
+jX
+jX
+jX
+jX
+jX
jX
-QL
-hv
-ug
-Af
-it
"}
(17,1,1) = {"
-nv
-lo
-WD
-rj
-Mm
-nv
-uz
-uz
-zO
-QH
-QH
-BF
-Kc
-VE
-VE
-uz
-VE
-VE
-Gw
-Qv
-QH
-QH
-hG
-uz
-Qh
-Hs
-uz
-it
-"}
-(18,1,1) = {"
-Iv
-mp
-IP
-IP
-VP
-nv
-rG
rG
cZ
-QH
+bK
QH
QH
BF
Kc
-Rm
-Zt
-Rm
+VE
+VE
+uz
+VE
+VE
Gw
Qv
QH
-QH
-QH
-jX
-wM
-uz
-uz
-uz
-it
-"}
-(19,1,1) = {"
-Or
-mp
-dW
-Cb
-mp
-nv
-PQ
-PQ
-jX
-kj
-jM
-QJ
-Fe
-jX
-jX
-xX
-jX
-jX
-tO
-Kz
-WB
-kj
-jX
-iO
-dX
-oO
-Aa
-it
-"}
-(20,1,1) = {"
-nv
-yT
-nv
-nv
-ji
-nv
-jX
-jX
-jX
-uz
-fD
-be
-QH
-kj
-qW
-oe
-dM
-kj
-QH
-HP
-zB
-uz
-jX
-jX
-jX
-jX
-jX
-it
-"}
-(21,1,1) = {"
-jX
-oe
-oe
-kj
-oe
-dM
-cV
-We
-jX
-uz
-AI
-IJ
-QH
-kj
-lP
-oe
-oe
-Kg
-QH
-mq
-zW
-DK
-jX
-Bo
-PK
-PK
-Qk
-jX
-"}
-(22,1,1) = {"
-jX
-cs
-oe
-kj
-oe
-oe
-cV
-SL
-jX
-uz
-dh
-kO
-QH
-kj
-sJ
-aY
-TT
-Kg
-QH
-ne
-YL
-uz
-gv
-QH
-EJ
-td
-hp
-jX
-"}
-(23,1,1) = {"
-jX
-UU
-Wj
-Ou
-oe
-pp
-cV
-pA
-jX
-XA
-uz
-lz
-dr
-jX
-kj
-LQ
-kj
-jX
-oS
-pL
-uz
-Fj
-jX
-jX
-jX
-jX
-jX
-jX
-"}
-(24,1,1) = {"
-jX
-Xw
-oe
-kj
-oe
-oe
-cV
-SL
-jX
-uz
-uz
-be
-Hn
-UC
-sc
-sc
-sc
-bE
-aQ
-HP
-uz
-uz
+bK
yH
Dd
bK
QH
QH
-jX
"}
-(25,1,1) = {"
-kj
-Pe
-oe
-kj
-oe
-oe
-cV
-Qc
-jX
-uz
-uz
-vi
-Rn
-Rn
-Rn
-Rn
-Rn
-Rn
-Rn
-mG
-uz
+(18,1,1) = {"
+rG
+cZ
+QH
+QH
+QH
+QH
+BF
+Kc
+Rm
+Zt
+Rm
+Gw
+Qv
+QH
+QH
DK
jX
-ud
-mL
-zR
-zR
+kK
+Pw
+dM
+dM
+"}
+(19,1,1) = {"
jX
+jX
+jX
+jM
+jX
+kj
+kj
+fD
+jX
+jX
+jX
+tO
+kj
+kj
+jX
+Ru
+jX
+jX
+jX
+jX
+jX
+"}
+(20,1,1) = {"
+jX
+jX
+jX
+oe
+HD
+nn
+KI
+qW
+Mm
+kj
+yL
+rj
+Us
+zB
+HD
+oe
+jX
+jX
+jX
+jX
+jX
+"}
+(21,1,1) = {"
+wR
+wR
+jX
+AI
+oe
+zW
+FE
+lP
+IX
+kj
+Kg
+OR
+mq
+zW
+oe
+Iv
+jX
+wR
+wR
+wR
+wR
+"}
+(22,1,1) = {"
+wR
+wR
+jX
+UU
+oe
+oe
+LQ
+sJ
+aY
+kj
+lo
+em
+IB
+oe
+oe
+WD
+jX
+wR
+wR
+wR
+wR
+"}
+(23,1,1) = {"
+wR
+wR
+jX
+kj
+kj
+kj
+kj
+mp
+YL
+QH
+ne
+oS
+kj
+kj
+kj
+kj
+jX
+wR
+wR
+wR
+wR
+"}
+(24,1,1) = {"
+wR
+wR
+jX
+IP
+sc
+sc
+sc
+bE
+Pc
+QH
+Pc
+UC
+sc
+sc
+sc
+IP
+jX
+wR
+wR
+wR
+wR
+"}
+(25,1,1) = {"
+wR
+wR
+jX
+QH
+QH
+QH
+QH
+pL
+QH
+QH
+QH
+pL
+QH
+QH
+QH
+QH
+jX
+wR
+wR
+wR
+wR
"}
(26,1,1) = {"
-kj
-kj
-hn
-kj
-oe
-oe
-cV
-QH
-Ru
-uz
-uz
-uz
-uz
-Zt
-uz
-Pc
-uz
-Zt
-uz
-uz
-uz
-uz
-jX
-jX
-jX
-jX
-jX
-jX
-"}
-(27,1,1) = {"
wR
-kj
-kj
-kj
-oe
-Kq
-bE
-Vw
-jX
-uz
-uz
-uz
-uz
-uz
-uz
-uz
-uz
-uz
-uz
-uz
-uz
-uz
-jX
wR
+jX
+bt
+bt
+bt
+bt
+bt
+bt
+bt
+bt
+bt
+bt
+bt
+bt
+bt
+jX
wR
wR
wR
wR
"}
-(28,1,1) = {"
-wR
-wR
-wR
-kj
-kj
-jX
-jX
-jX
-jX
-bt
-bt
-bt
-bt
-bt
-bt
-bt
-bt
-bt
-bt
-bt
-bt
-bt
-jX
-wR
-wR
-wR
-wR
-wR
-"}
-(29,1,1) = {"
-wR
-wR
-wR
-wR
-wR
-wR
+(27,1,1) = {"
wR
wR
wR
@@ -2823,35 +2058,4 @@ wR
wR
wR
wR
-wR
-"}
-(30,1,1) = {"
-wR
-wR
-wR
-wR
-wR
-wR
-wR
-wR
-wR
-wR
-wR
-wR
-wR
-wR
-wR
-wR
-wR
-wR
-wR
-wR
-wR
-wR
-wR
-wR
-wR
-wR
-wR
-wR
"}
diff --git a/_maps/skyrat/automapper/templates/deltastation/deltastation_prison.dmm b/_maps/skyrat/automapper/templates/deltastation/deltastation_prison.dmm
index 477cd97dc08..9a86649f3b0 100644
--- a/_maps/skyrat/automapper/templates/deltastation/deltastation_prison.dmm
+++ b/_maps/skyrat/automapper/templates/deltastation/deltastation_prison.dmm
@@ -346,18 +346,18 @@
/obj/item/storage/box/ingredients/fruity,
/obj/item/storage/box/ingredients/fiesta,
/obj/item/storage/box/ingredients/american,
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour{
list_reagents = list(/datum/reagent/consumable/flour=600);
name = "Premium All-Purpose Flour (16KG)";
volume = 600
},
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/enzyme{
list_reagents = list(/datum/reagent/consumable/enzyme=500);
name = "universe-sized universal enyzyme";
volume = 500
},
-/obj/item/reagent_containers/food/condiment/rice{
+/obj/item/reagent_containers/condiment/rice{
list_reagents = list(/datum/reagent/consumable/rice=150);
name = "Basmati Rice Sack (4KG)";
volume = 150
@@ -824,7 +824,7 @@
plane = -7;
self_sustaining = 1
},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
pixel_y = -5
},
/turf/open/floor/plating,
@@ -978,7 +978,7 @@
plane = -7;
self_sustaining = 1
},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
pixel_x = -4
},
/turf/open/floor/plating,
@@ -1191,11 +1191,11 @@
/area/station/security/corrections_officer)
"lR" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -3;
pixel_y = 9
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
dir = 1;
pixel_x = 3;
pixel_y = 9
@@ -1229,7 +1229,7 @@
"mg" = (
/obj/structure/table/glass,
/obj/item/reagent_containers/syringe,
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
pixel_y = 6
},
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -1280,18 +1280,18 @@
/area/station/security/prison/garden)
"mM" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
pixel_x = 7;
pixel_y = 7
},
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
pixel_x = -7;
pixel_y = 7
},
-/obj/item/reagent_containers/glass/bottle/chloralhydrate{
+/obj/item/reagent_containers/cup/bottle/chloralhydrate{
pixel_x = -7
},
-/obj/item/reagent_containers/glass/bottle/facid{
+/obj/item/reagent_containers/cup/bottle/facid{
pixel_x = 7
},
/obj/item/storage/backpack/duffelbag/sec/surgery{
@@ -1587,7 +1587,7 @@
/obj/item/cultivator,
/obj/item/shovel/spade,
/obj/item/storage/bag/plants,
-/obj/item/reagent_containers/glass/watering_can,
+/obj/item/reagent_containers/cup/watering_can,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/station/security/prison/garden)
@@ -2266,11 +2266,11 @@
/area/station/security/prison)
"wD" = (
/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
pixel_x = -3;
pixel_y = 16
},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 3;
pixel_y = 16
},
@@ -2641,7 +2641,7 @@
"An" = (
/obj/structure/table/glass,
/obj/item/reagent_containers/syringe,
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
pixel_y = 6
},
/obj/effect/turf_decal/trimline/blue/filled/line{
@@ -2725,7 +2725,7 @@
plane = -7;
self_sustaining = 1
},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
pixel_x = 6;
pixel_y = -8
},
@@ -3458,11 +3458,11 @@
/area/station/security/execution/transfer)
"Ij" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 4;
pixel_y = 4
},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = -5;
pixel_y = 6
},
@@ -3473,10 +3473,10 @@
/area/station/security/medical)
"Il" = (
/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/machinery/light/directional/south,
@@ -4000,8 +4000,8 @@
/obj/item/clothing/suit/caution,
/obj/item/clothing/suit/caution,
/obj/item/clothing/suit/caution,
-/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,
/obj/item/storage/bag/trash,
@@ -4230,7 +4230,7 @@
id = "IsolationFlash";
pixel_y = 28
},
-/obj/item/reagent_containers/glass/bucket/wooden,
+/obj/item/reagent_containers/cup/bucket/wooden,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark/brown/side{
dir = 5
@@ -4361,7 +4361,7 @@
/area/station/security/prison)
"RX" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
/obj/item/storage/bag/tray,
/obj/item/storage/box/condimentbottles{
pixel_y = 10
@@ -4558,7 +4558,7 @@
/area/station/security/prison)
"Te" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/bucket/wooden,
+/obj/item/reagent_containers/cup/bucket/wooden,
/obj/structure/cable,
/obj/machinery/light/directional/south,
/obj/effect/decal/cleanable/dirt,
@@ -4647,10 +4647,10 @@
/area/station/security/prison/work)
"Ui" = (
/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/decal/cleanable/dirt,
@@ -4668,15 +4668,15 @@
/area/station/security/prison/mess)
"Uo" = (
/obj/structure/closet/crate,
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
/obj/effect/spawner/random/contraband/prison,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
/obj/item/kitchen/fork/plastic,
/obj/item/kitchen/fork/plastic,
/obj/item/kitchen/fork/plastic,
@@ -4753,7 +4753,7 @@
/obj/item/cultivator,
/obj/item/shovel/spade,
/obj/item/storage/bag/plants,
-/obj/item/reagent_containers/glass/watering_can,
+/obj/item/reagent_containers/cup/watering_can,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/station/security/prison/garden)
diff --git a/_maps/skyrat/automapper/templates/icebox/icebox_arrivals.dmm b/_maps/skyrat/automapper/templates/icebox/icebox_arrivals.dmm
index ae90ea1f8c5..30464024b1c 100644
--- a/_maps/skyrat/automapper/templates/icebox/icebox_arrivals.dmm
+++ b/_maps/skyrat/automapper/templates/icebox/icebox_arrivals.dmm
@@ -157,7 +157,7 @@
pixel_x = -3;
pixel_y = 2
},
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee{
pixel_x = 9;
pixel_y = 3
},
diff --git a/_maps/skyrat/automapper/templates/icebox/icebox_ntrep_office.dmm b/_maps/skyrat/automapper/templates/icebox/icebox_ntrep_office.dmm
index bdf033e3f5f..b2bcbe95494 100644
--- a/_maps/skyrat/automapper/templates/icebox/icebox_ntrep_office.dmm
+++ b/_maps/skyrat/automapper/templates/icebox/icebox_ntrep_office.dmm
@@ -207,19 +207,19 @@
dir = 4
},
/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/champagne{
- pixel_x = -5;
- pixel_y = 18
+/obj/item/reagent_containers/cup/glass/bottle/champagne{
+ pixel_y = 18;
+ pixel_x = -5
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -7;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = 5;
pixel_y = 12
},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = 3;
pixel_y = 1
},
diff --git a/_maps/skyrat/automapper/templates/kilostation/kilostation_ert_bay.dmm b/_maps/skyrat/automapper/templates/kilostation/kilostation_ert_bay.dmm
index 4362ce73d16..ff402be398d 100644
--- a/_maps/skyrat/automapper/templates/kilostation/kilostation_ert_bay.dmm
+++ b/_maps/skyrat/automapper/templates/kilostation/kilostation_ert_bay.dmm
@@ -674,7 +674,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot,
/obj/structure/sink/directional/east,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/mop,
/obj/effect/turf_decal/stripes/corner,
/obj/machinery/button/door/directional/south{
diff --git a/_maps/skyrat/automapper/templates/metastation/metastation_arrivals.dmm b/_maps/skyrat/automapper/templates/metastation/metastation_arrivals.dmm
index faf733e8ede..1ef0fcbdc60 100644
--- a/_maps/skyrat/automapper/templates/metastation/metastation_arrivals.dmm
+++ b/_maps/skyrat/automapper/templates/metastation/metastation_arrivals.dmm
@@ -38,13 +38,13 @@
/area/station/hallway/secondary/entry)
"aT" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
pixel_x = 8;
pixel_y = 2
},
/obj/item/reagent_containers/dropper,
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
/turf/open/floor/wood,
/area/station/maintenance/port/aft)
"bb" = (
diff --git a/_maps/templates/battlecruiser_starfury.dmm b/_maps/templates/battlecruiser_starfury.dmm
index 468b447fa89..5daae739296 100644
--- a/_maps/templates/battlecruiser_starfury.dmm
+++ b/_maps/templates/battlecruiser_starfury.dmm
@@ -56,11 +56,11 @@
/area/shuttle/sbc_starfury)
"ai" = (
/obj/structure/table/reinforced,
-/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,
/obj/item/wrench,
/obj/item/crowbar/red,
/turf/open/floor/iron,
@@ -2487,7 +2487,7 @@
pixel_x = -31
},
/obj/item/book/manual/wiki/barman_recipes,
-/obj/item/reagent_containers/food/drinks/shaker{
+/obj/item/reagent_containers/cup/glass/shaker{
pixel_x = 10
},
/obj/structure/table/reinforced/plastitaniumglass,
@@ -2502,11 +2502,11 @@
pixel_x = -6;
pixel_y = 6
},
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 5;
pixel_y = -2
},
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
/obj/structure/table/reinforced/plastitaniumglass,
/obj/effect/turf_decal/siding/dark{
dir = 1
@@ -3919,7 +3919,7 @@
/area/shuttle/sbc_starfury)
"mD" = (
/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
/obj/item/mop,
/turf/open/floor/plating,
/area/shuttle/sbc_starfury)
diff --git a/_maps/templates/holodeck_beach.dmm b/_maps/templates/holodeck_beach.dmm
index e508bab68df..577eb96abee 100644
--- a/_maps/templates/holodeck_beach.dmm
+++ b/_maps/templates/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/templates/holodeck_lounge.dmm b/_maps/templates/holodeck_lounge.dmm
index 44f51932f0e..1cacb65d52b 100644
--- a/_maps/templates/holodeck_lounge.dmm
+++ b/_maps/templates/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/shuttle_bar,
-/obj/item/reagent_containers/glass/rag{
+/obj/item/reagent_containers/cup/rag{
pixel_x = 10;
pixel_y = 1
},
@@ -54,7 +54,7 @@
/area/template_noop)
"i" = (
/obj/structure/table/wood/shuttle_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/templates/holodeck_medicalsim.dmm b/_maps/templates/holodeck_medicalsim.dmm
index 05c78550394..8a82cfbed69 100644
--- a/_maps/templates/holodeck_medicalsim.dmm
+++ b/_maps/templates/holodeck_medicalsim.dmm
@@ -587,9 +587,9 @@
dir = 8
},
/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,
/turf/open/floor/holofloor{
icon_state = "white"
},
@@ -743,7 +743,7 @@
dir = 8
},
/obj/structure/table,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
/turf/open/floor/holofloor{
icon_state = "white"
},
diff --git a/_maps/templates/holodeck_petpark.dmm b/_maps/templates/holodeck_petpark.dmm
index d0dc75dc1f3..8060cafb234 100644
--- a/_maps/templates/holodeck_petpark.dmm
+++ b/_maps/templates/holodeck_petpark.dmm
@@ -128,7 +128,7 @@
/turf/open/floor/holofloor,
/area/template_noop)
"X" = (
-/obj/item/reagent_containers/glass/watering_can,
+/obj/item/reagent_containers/cup/watering_can,
/turf/open/floor/holofloor/grass,
/area/template_noop)
"Z" = (
diff --git a/_maps/templates/shelter_2.dmm b/_maps/templates/shelter_2.dmm
index 11f19634af1..ac4e97b5cf1 100644
--- a/_maps/templates/shelter_2.dmm
+++ b/_maps/templates/shelter_2.dmm
@@ -105,11 +105,11 @@
"s" = (
/obj/machinery/light/directional/east,
/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
},
@@ -155,7 +155,7 @@
/area/misc/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 6ff99405988..4f3e3fc807f 100644
--- a/_maps/templates/shelter_3.dmm
+++ b/_maps/templates/shelter_3.dmm
@@ -40,8 +40,8 @@
/area/misc/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/misc/survivalpod)
@@ -189,11 +189,11 @@
/area/misc/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/code/__DEFINES/dcs/signals/signals_food.dm b/code/__DEFINES/dcs/signals/signals_food.dm
index c08e14392c5..a5be9bb7c14 100644
--- a/code/__DEFINES/dcs/signals/signals_food.dm
+++ b/code/__DEFINES/dcs/signals/signals_food.dm
@@ -21,7 +21,5 @@
//Drink
-///from base of obj/item/reagent_containers/food/drinks/attack(): (mob/living/M, mob/user)
-#define COMSIG_DRINK_DRANK "drink_drank"
-///from base of obj/item/reagent_containers/glass/attack(): (mob/M, mob/user)
+///from base of obj/item/reagent_containers/cup/attack(): (mob/M, mob/user)
#define COMSIG_GLASS_DRANK "glass_drank"
diff --git a/code/__HELPERS/ai.dm b/code/__HELPERS/ai.dm
index a030490c8e0..b5b64237f3f 100644
--- a/code/__HELPERS/ai.dm
+++ b/code/__HELPERS/ai.dm
@@ -39,8 +39,8 @@
return FALSE
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/__HELPERS/randoms.dm b/code/__HELPERS/randoms.dm
index 96218893a9b..f93f228f455 100644
--- a/code/__HELPERS/randoms.dm
+++ b/code/__HELPERS/randoms.dm
@@ -40,10 +40,10 @@
///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
+ /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() //! is at the start to prevent us from changing say modes via get_message_mode()
diff --git a/code/__HELPERS/type_processing.dm b/code/__HELPERS/type_processing.dm
index 98aed39eba1..2323699fe8a 100644
--- a/code/__HELPERS/type_processing.dm
+++ b/code/__HELPERS/type_processing.dm
@@ -10,8 +10,8 @@
/obj/item/radio/headset = "HEADSET",
/obj/item/clothing/head/helmet/space = "SPESSHELMET",
/obj/item/book/manual = "MANUAL",
- /obj/item/reagent_containers/food/drinks = "DRINK", //longest paths comes first
- /obj/item/reagent_containers/food = "FOOD",
+ /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",
/obj/machinery/portable_atmospherics = "PORT_ATMOS",
diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm
new file mode 100644
index 00000000000..e4ffdff8592
--- /dev/null
+++ b/code/_globalvars/lists/maintenance_loot.dm
@@ -0,0 +1,400 @@
+/* SKYRAT EDIT - MOVED TO MODULAR
+//as of:10/28/2019:
+//boxstation: ~153 loot items spawned
+//metastation: ~183 loot items spawned
+//deltastation: ~165 loot items spawned
+
+//how to balance maint loot spawns:
+// 1) Ensure each category has items of approximately the same power level
+// 2) Tune weight of each category until average power of a maint loot spawn is acceptable
+// 3) Mapping considerations - Loot value should scale with difficulty of acquisition, or an assistaint will run through collecting free gear with no risk
+
+//goal of maint loot:
+// 1) Provide random equipment to people who take effort to crawl maint
+// 2) Create memorable moments with very rare, crazy items
+
+//Loot tables
+
+GLOBAL_LIST_INIT(trash_loot, list(//junk: useless, very easy to get, or ghetto chemistry items
+ list(//trash
+ /obj/item/trash/can = 1,
+ /obj/item/trash/candy = 1,
+ /obj/item/trash/cheesie = 1,
+ /obj/item/trash/chips = 1,
+ /obj/item/trash/pistachios = 1,
+ /obj/item/trash/popcorn = 1,
+ /obj/item/trash/raisins = 1,
+ /obj/item/trash/sosjerky = 1,
+
+ /obj/item/c_tube = 1,
+ /obj/item/disk/data = 1,
+ /obj/item/folder/yellow = 1,
+ /obj/item/hand_labeler = 1,
+ /obj/item/paper = 1,
+ /obj/item/paper/crumpled = 1,
+ /obj/item/pen = 1,
+ /obj/item/photo/old = 1,
+ /obj/item/poster/random_contraband = 1,
+ /obj/item/poster/random_official = 1,
+ /obj/item/stack/sheet/cardboard = 1,
+ /obj/item/storage/box = 1,
+
+ /obj/effect/decal/cleanable/ash = 1,
+ /obj/item/camera = 1,
+ /obj/item/camera_film = 1,
+ /obj/item/cigbutt = 1,
+ /obj/item/coin/silver = 1,
+ /obj/item/food/urinalcake = 1,
+ /obj/item/light/bulb = 1,
+ /obj/item/light/tube = 1,
+ /obj/item/reagent_containers/cup/glass/drinkingglass = 1,
+
+ /obj/item/airlock_painter = 1,
+ /obj/item/airlock_painter/decal = 1,
+ /obj/item/airlock_painter/decal/tile = 1,
+ /obj/item/clothing/mask/breath = 1,
+ /obj/item/rack_parts = 1,
+ /obj/item/shard = 1,
+
+ /obj/item/reagent_containers/pill/maintenance/achievement = 1,
+ /obj/item/toy/eightball = 1,
+ ) = 8,
+
+ list(//tier 1 stock parts
+ /obj/item/stock_parts/capacitor = 1,
+ /obj/item/stock_parts/manipulator = 1,
+ /obj/item/stock_parts/matter_bin = 1,
+ /obj/item/stock_parts/micro_laser = 1,
+ /obj/item/stock_parts/scanning_module = 1,
+ ) = 1,
+ ))
+
+
+
+GLOBAL_LIST_INIT(common_loot, list( //common: basic items
+ list(//tools
+ /obj/item/analyzer = 1,
+ /obj/item/crowbar = 1,
+ /obj/item/geiger_counter = 1,
+ /obj/item/mop = 1,
+ /obj/item/pushbroom = 1,
+ /obj/item/reagent_containers/cup/bucket = 1,
+ /obj/item/screwdriver = 1,
+ /obj/item/t_scanner = 1,
+ /obj/item/toy/crayon/spraycan = 1,
+ /obj/item/weldingtool = 1,
+ /obj/item/wirecutters = 1,
+ /obj/item/wrench = 1,
+ ) = 1,
+
+ list(//equipment
+ /obj/effect/spawner/random/clothing/gloves = 1,
+ /obj/item/clothing/glasses/meson = 1,
+ /obj/item/clothing/glasses/science = 1,
+ /obj/item/clothing/gloves/color/black = 1,
+ /obj/item/clothing/gloves/color/fyellow = 1,
+ /obj/item/clothing/mask/gas = 1,
+ /obj/item/clothing/shoes/sneakers/black = 1,
+ /obj/item/clothing/suit/hazardvest = 1,
+ /obj/item/clothing/suit/toggle/labcoat = 1,
+ /obj/item/clothing/under/color/grey = 1,
+ /obj/item/radio/headset = 1,
+ /obj/item/storage/backpack = 1,
+ /obj/item/storage/belt/fannypack = 1,
+ /obj/item/storage/wallet/random = 1,
+ ) = 1,
+
+ list(//construction and crafting
+ /obj/item/sign = 1,
+ /obj/item/stack/cable_coil = 1,
+ /obj/item/stack/rods/twentyfive = 1,
+ /obj/item/stack/sheet/iron/twenty = 1,
+ /obj/item/stack/sheet/mineral/plasma = 1,
+ /obj/item/stock_parts/cell = 1,
+
+ //assemblies
+ /obj/item/assembly/health = 1,
+ /obj/item/assembly/igniter = 1,
+ /obj/item/assembly/infra = 1,
+ /obj/item/assembly/mousetrap = 1,
+ /obj/item/assembly/prox_sensor = 1,
+ /obj/item/assembly/signaler = 1,
+ /obj/item/assembly/timer = 1,
+ /obj/item/stack/package_wrap = 1,
+ /obj/item/stack/wrapping_paper = 1,
+ ) = 1,
+
+ list(//medical and chemicals
+ /obj/item/grenade/chem_grenade/cleaner = 1,
+ /obj/item/lead_pipe = 1,
+ /obj/item/reagent_containers/cup/beaker = 1,
+ /obj/item/reagent_containers/cup/bottle/random_buffer = 2,
+ /obj/item/reagent_containers/cup/rag = 1,
+ /obj/item/reagent_containers/hypospray/medipen/pumpup = 2,
+ /obj/item/reagent_containers/syringe = 1,
+ /obj/item/stock_parts/cell/lead = 1,
+ /obj/item/storage/box/matches = 1,
+ /obj/item/storage/fancy/cigarettes/dromedaryco = 1,
+ ) = 1,
+
+ list(//food
+ /obj/item/reagent_containers/cup/glass/bottle/beer = 1,
+ /obj/item/reagent_containers/cup/glass/coffee = 1,
+ ) = 1,
+
+ list(//misc
+ /obj/item/bodybag = 1,
+ /obj/item/extinguisher = 1,
+ /obj/item/grenade/smokebomb = 1,
+ /obj/item/radio/off = 1,
+ /obj/item/stack/spacecash/c10 = 1,
+ /obj/item/stack/sticky_tape = 1,
+ /obj/item/tank/internals/emergency_oxygen = 1,
+
+ //light sources
+ /obj/effect/spawner/random/decoration/glowstick = 1,
+ /obj/item/clothing/head/hardhat/red = 1,
+ /obj/item/flashlight = 1,
+ /obj/item/flashlight/flare = 1,
+ ) = 1,
+ ))
+
+
+
+GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items
+ list(//tools
+ /obj/item/grenade/iedcasing/spawned = 1,
+ /obj/item/hatchet = 1,
+ /obj/item/melee/baton/security/cattleprod = 1,
+ /obj/item/multitool = 1,
+ /obj/item/pen/fountain = 1,
+ /obj/item/restraints/handcuffs/cable = 1,
+ /obj/item/restraints/legcuffs/bola = 1,
+ /obj/item/roller = 1,
+ /obj/item/spear = 1,
+ /obj/item/weldingtool/largetank = 1,
+ ) = 8,
+
+ list(//equipment
+ /obj/item/clothing/ears/earmuffs = 1,
+ /obj/item/clothing/glasses/hud/diagnostic = 1,
+ /obj/item/clothing/glasses/hud/health = 1,
+ /obj/item/clothing/glasses/salesman = 1,
+ /obj/item/clothing/glasses/nightmare_vision = 1,
+ /obj/item/clothing/glasses/welding = 1,
+ /obj/item/clothing/gloves/tackler/offbrand = 1,
+ /obj/item/clothing/head/helmet/old = 1,
+ /obj/item/clothing/head/welding = 1,
+ /obj/item/clothing/mask/muzzle = 1,
+ /obj/item/clothing/suit/armor/vest/old = 1,
+ /obj/item/storage/belt/medical = 1,
+ /obj/item/storage/belt/utility = 1,
+ ) = 8,
+
+ list(//strange objects
+ /obj/item/relic = 5,
+ ) = 8,
+
+ list(//construction and crafting
+ /obj/item/beacon = 1,
+ /obj/item/paper/fluff/stations/soap = 1, //recipes count as crafting.
+ /obj/item/plaque = 1,
+ /obj/item/seeds/kronkus = 1,
+ /obj/item/seeds/odious_puffball = 1,
+ /obj/item/stack/sheet/mineral/wood/fifty = 1,
+ /obj/item/stock_parts/cell/high = 1,
+ /obj/item/storage/box/clown = 1,
+ /obj/item/weaponcrafting/receiver = 1,
+ ) = 8,
+
+ list(//medical and chemicals
+ list(//basic healing items
+ /obj/item/stack/medical/gauze = 1,
+ /obj/item/stack/medical/mesh = 1,
+ /obj/item/stack/medical/suture = 1,
+ ) = 1,
+ list(//medical chems
+ /obj/item/reagent_containers/cup/bottle/multiver = 1,
+ /obj/item/reagent_containers/hypospray/medipen = 1,
+ /obj/item/reagent_containers/syringe/convermol = 1,
+ ) = 1,
+ list(//drinks
+ /obj/item/reagent_containers/cup/glass/bottle/vodka = 1,
+ /obj/item/reagent_containers/cup/glass/drinkingglass/filled/nuka_cola = 1,
+ /obj/item/reagent_containers/cup/soda_cans/grey_bull = 1,
+ ) = 1,
+ list(//sprayers
+ /obj/item/reagent_containers/spray = 1,
+ /obj/item/watertank = 1,
+ /obj/item/watertank/janitor = 1,
+ ) = 1,
+ ) = 8,
+
+ list(//food
+ /obj/item/food/canned/peaches/maint = 1,
+ /obj/item/storage/box/donkpockets = 1,
+ /obj/item/storage/box/gum/happiness = 1,
+ list(//Donk Varieties
+ /obj/item/storage/box/donkpockets/donkpocketberry = 1,
+ /obj/item/storage/box/donkpockets/donkpockethonk = 1,
+ /obj/item/storage/box/donkpockets/donkpocketpizza = 1,
+ /obj/item/storage/box/donkpockets/donkpocketspicy = 1,
+ /obj/item/storage/box/donkpockets/donkpocketteriyaki = 1,
+ ) = 1,
+ list(//Donk-dinner Varieties
+ /obj/item/food/ready_donk = 1,
+ /obj/item/food/ready_donk/donkhiladas = 1,
+ /obj/item/food/ready_donk/mac_n_cheese = 1,
+ ) = 1,
+ /obj/item/food/monkeycube = 1,
+ ) = 8,
+
+ list(//modsuits
+ /obj/effect/spawner/random/mod/maint = 3,
+ /obj/item/mod/construction/broken_core = 1,
+ ) = 4,
+
+ list(//music
+ /obj/item/instrument/accordion = 5,
+ /obj/item/instrument/banjo = 5,
+ /obj/item/instrument/bikehorn = 2,
+ /obj/item/instrument/eguitar = 5,
+ /obj/item/instrument/glockenspiel = 5,
+ /obj/item/instrument/guitar = 5,
+ /obj/item/instrument/harmonica = 5,
+ /obj/item/instrument/musicalmoth = 1,
+ /obj/item/instrument/recorder = 5,
+ /obj/item/instrument/saxophone = 5,
+ /obj/item/instrument/trombone = 5,
+ /obj/item/instrument/trumpet = 5,
+ /obj/item/instrument/violin = 5,
+ /obj/item/instrument/violin/golden = 2,
+ ) = 2,
+
+ list(//fakeout items, keep this list at low relative weight
+ /obj/item/clothing/shoes/jackboots = 1,
+ /obj/item/dice/d20 = 1, //To balance out the stealth die of fates in oddities
+ ) = 1,
+))
+
+
+
+GLOBAL_LIST_INIT(rarity_loot, list(//rare: really good items
+ list(//tools
+ /obj/item/assembly/flash/memorizer = 1,
+ /obj/item/flashlight/flashdark = 1,
+ /obj/item/knife/kitchen = 1,
+ /obj/item/melee/baton/security/cattleprod/teleprod = 1,
+ /obj/item/pen/survival = 1,
+ /obj/item/restraints/handcuffs = 1,
+ /obj/item/shield/riot/buckler = 1,
+ /obj/item/throwing_star = 1,
+ /obj/item/weldingtool/hugetank = 1,
+ /obj/item/fishing_rod/master = 1,
+ ) = 1,
+
+ list(//equipment
+ /obj/item/clothing/glasses/hud/security = 1,
+ /obj/item/clothing/glasses/sunglasses = 1,
+ /obj/item/clothing/gloves/color/black = 1,
+ /obj/item/clothing/gloves/color/yellow = 1,
+ /obj/item/clothing/gloves/tackler/combat = 1,
+ /obj/item/clothing/head/helmet/justice = 1,
+ /obj/item/storage/belt/military/assault = 1,
+ /obj/item/storage/belt/security = 1,
+ ) = 1,
+
+ list(//paint
+ /obj/item/paint/anycolor = 1,
+ /obj/item/paint/black = 1,
+ /obj/item/paint/blue = 1,
+ /obj/item/paint/green = 1,
+ /obj/item/paint/paint_remover = 1,
+ /obj/item/paint/red = 1,
+ /obj/item/paint/violet = 1,
+ /obj/item/paint/white = 1,
+ /obj/item/paint/yellow = 1,
+ ) = 1,
+
+ list(//medical and chemicals
+ list(//medkits
+ /obj/item/storage/box/hug/medical = 1,
+ /obj/item/storage/medkit/emergency = 1,
+ /obj/item/storage/medkit/regular = 1,
+ ) = 1,
+ list(//medical chems
+ /obj/item/reagent_containers/hypospray/medipen/oxandrolone = 1,
+ /obj/item/reagent_containers/hypospray/medipen/salacid = 1,
+ /obj/item/reagent_containers/syringe/contraband/methamphetamine = 1,
+ ) = 1,
+ ) = 1,
+
+ list(//misc
+ /obj/item/book/granter/crafting_recipe/pipegun_prime = 1,
+ /obj/item/book/granter/crafting_recipe/trash_cannon = 1,
+ /obj/item/disk/nuclear/fake = 1,
+ /obj/item/skillchip/brainwashing = 1,
+ /obj/item/tattoo_kit = 1,
+ ) = 1,
+
+))
+
+
+
+GLOBAL_LIST_INIT(oddity_loot, list(//oddity: strange or crazy items
+ /obj/effect/rune/teleport = 1,
+ /obj/item/clothing/head/helmet/abductor = 1,
+ /obj/item/clothing/shoes/jackboots/fast = 1,
+ /obj/item/clothing/suit/armor/reactive/table = 1,
+ /obj/item/dice/d20/fate/stealth/cursed = 1, //Only rolls 1
+ /obj/item/dice/d20/fate/stealth/one_use = 1, //Looks like a d20, keep the d20 in the uncommon pool.
+ /obj/item/shadowcloak = 1,
+ /obj/item/spear/grey_tide = 1,
+ /obj/item/storage/box/donkpockets/donkpocketgondola = 1,
+ list(//music
+ /obj/item/instrument/saxophone/spectral = 1,
+ /obj/item/instrument/trombone/spectral = 1,
+ /obj/item/instrument/trumpet/spectral = 1,
+ ) = 1,
+ /obj/item/toy/cards/deck/tarot/haunted = 1,
+ ))
+
+//Maintenance loot spawner pools
+#define maint_trash_weight 4500
+#define maint_common_weight 4500
+#define maint_uncommon_weight 900
+#define maint_rarity_weight 99
+#define maint_oddity_weight 1 //1 out of 10,000 would give metastation (180 spawns) a 2 in 111 chance of spawning an oddity per round, similar to xeno egg
+#define maint_holiday_weight 3500 // When holiday loot is enabled, it'll give every loot item a 25% chance of being a holiday item
+
+//Loot pool used by default maintenance loot spawners
+GLOBAL_LIST_INIT(maintenance_loot, list(
+ GLOB.trash_loot = maint_trash_weight,
+ GLOB.common_loot = maint_common_weight,
+ GLOB.uncommon_loot = maint_uncommon_weight,
+ GLOB.rarity_loot = maint_rarity_weight,
+ GLOB.oddity_loot = maint_oddity_weight,
+ ))
+
+GLOBAL_LIST_INIT(ratking_trash, list(//Garbage: used by the regal rat mob when spawning garbage.
+ /obj/item/cigbutt,
+ /obj/item/trash/candy,
+ /obj/item/trash/cheesie,
+ /obj/item/trash/chips,
+ /obj/item/trash/pistachios,
+ /obj/item/trash/popcorn,
+ /obj/item/trash/raisins,
+ /obj/item/trash/sosjerky,
+ /obj/item/trash/syndi_cakes,
+ ))
+
+GLOBAL_LIST_INIT(ratking_coins, list(//Coins: Used by the regal rat mob when spawning coins.
+ /obj/item/coin/iron,
+ /obj/item/coin/plastic,
+ /obj/item/coin/silver,
+ /obj/item/coin/titanium,
+ ))
+
+// List of all maintenance loot spawners, for easy finding at roundstart.
+GLOBAL_LIST_EMPTY(maintenance_loot_spawners)
+*/
diff --git a/code/_globalvars/phobias.dm b/code/_globalvars/phobias.dm
index 4b0b738d0f0..678553e09d4 100644
--- a/code/_globalvars/phobias.dm
+++ b/code/_globalvars/phobias.dm
@@ -173,7 +173,7 @@ GLOBAL_LIST_INIT(phobia_objs, list(
/obj/item/clothing/shoes/cowboy/lizard,
/obj/item/food/kebab/tail,
/obj/item/organ/external/tail/lizard,
- /obj/item/reagent_containers/food/drinks/bottle/lizardwine,
+ /obj/item/reagent_containers/cup/glass/bottle/lizardwine,
/obj/item/toy/plush/lizard_plushie,
)),
@@ -413,7 +413,7 @@ GLOBAL_LIST_INIT(phobia_objs, list(
/obj/item/katana,
/obj/item/nullrod/claymore/katana,
/obj/item/nullrod/scythe/vibro,
- /obj/item/reagent_containers/food/drinks/bottle/sake,
+ /obj/item/reagent_containers/cup/glass/bottle/sake,
/obj/item/throwing_star,
/obj/item/toy/katana,
/obj/structure/mineral_door/paperframe,
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index 59541ff05eb..3e29015cec6 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -166,18 +166,18 @@
* Called from [/mob/living/proc/attackby]
*
* Arguments:
- * * mob/living/M - The mob being hit by this item
+ * * mob/living/target_mob - The mob being hit by this item
* * 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(user, COMSIG_MOB_ITEM_ATTACK, target_mob, user, params)
if(item_flags & NOBLUDGEON)
return
@@ -190,16 +190,16 @@
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
- if(force && M == user && user.client)
+ if(force && target_mob == user && user.client)
user.client.give_award(/datum/award/achievement/misc/selfouch, user)
- user.do_attack_animation(M)
- M.attacked_by(src, user)
+ user.do_attack_animation(target_mob)
+ target_mob.attacked_by(src, user)
- log_combat(user, M, "attacked", src.name, "(COMBAT MODE: [uppertext(user.combat_mode)]) (DAMTYPE: [uppertext(damtype)])")
+ log_combat(user, target_mob, "attacked", src.name, "(COMBAT MODE: [uppertext(user.combat_mode)]) (DAMTYPE: [uppertext(damtype)])")
add_fingerprint(user)
/// The equivalent of [/obj/item/proc/attack] but for alternate attacks, AKA right clicking
diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm
index d980928bb70..657ca851fe6 100644
--- a/code/datums/components/crafting/recipes.dm
+++ b/code/datums/components/crafting/recipes.dm
@@ -58,9 +58,9 @@
reqs = list(/datum/reagent/fuel = 50,
/obj/item/stack/cable_coil = 1,
/obj/item/assembly/igniter = 1,
- /obj/item/reagent_containers/food/drinks/soda_cans = 1)
- parts = list(/obj/item/reagent_containers/food/drinks/soda_cans = 1)
- time = 15
+ /obj/item/reagent_containers/cup/soda_cans = 1)
+ parts = list(/obj/item/reagent_containers/cup/soda_cans = 1)
+ time = 1.5 SECONDS
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
@@ -92,11 +92,11 @@
/datum/crafting_recipe/molotov
name = "Molotov"
- result = /obj/item/reagent_containers/food/drinks/bottle/molotov
- reqs = list(/obj/item/reagent_containers/glass/rag = 1,
- /obj/item/reagent_containers/food/drinks/bottle = 1)
- parts = list(/obj/item/reagent_containers/food/drinks/bottle = 1)
- time = 40
+ result = /obj/item/reagent_containers/cup/glass/bottle/molotov
+ reqs = list(/obj/item/reagent_containers/cup/rag = 1,
+ /obj/item/reagent_containers/cup/glass/bottle = 1)
+ parts = list(/obj/item/reagent_containers/cup/glass/bottle = 1)
+ time = 4 SECONDS
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
@@ -354,7 +354,7 @@
/datum/crafting_recipe/cleanbot
name = "Cleanbot"
result = /mob/living/simple_animal/bot/cleanbot
- reqs = list(/obj/item/reagent_containers/glass/bucket = 1,
+ reqs = list(/obj/item/reagent_containers/cup/bucket = 1,
/obj/item/assembly/prox_sensor = 1,
/obj/item/bodypart/r_arm/robot = 1)
time = 40
@@ -816,7 +816,7 @@
/datum/crafting_recipe/sillycup
name = "Paper Cup"
- result = /obj/item/reagent_containers/food/drinks/sillycup
+ result = /obj/item/reagent_containers/cup/glass/sillycup
time = 1 SECONDS
reqs = list(/obj/item/paper = 2)
category = CAT_MISC
@@ -1025,7 +1025,7 @@ SKYRAT EDIT STOP: Ash Rituals */
name = "Wooden Bucket"
time = 30
reqs = list(/obj/item/stack/sheet/mineral/wood = 3)
- result = /obj/item/reagent_containers/glass/bucket/wooden
+ result = /obj/item/reagent_containers/cup/bucket/wooden
category = CAT_PRIMAL
/datum/crafting_recipe/ore_sensor
@@ -1354,7 +1354,7 @@ SKYRAT EDIT STOP: Ash Rituals */
name = "Alcohol burner"
result = /obj/item/burner
time = 5 SECONDS
- reqs = list(/obj/item/reagent_containers/glass/beaker = 1,
+ reqs = list(/obj/item/reagent_containers/cup/beaker = 1,
/datum/reagent/consumable/ethanol = 15,
/obj/item/paper = 1
)
@@ -1364,7 +1364,7 @@ SKYRAT EDIT STOP: Ash Rituals */
name = "Oil burner"
result = /obj/item/burner/oil
time = 5 SECONDS
- reqs = list(/obj/item/reagent_containers/glass/beaker = 1,
+ reqs = list(/obj/item/reagent_containers/cup/beaker = 1,
/datum/reagent/fuel/oil = 15,
/obj/item/paper = 1
)
@@ -1374,7 +1374,7 @@ SKYRAT EDIT STOP: Ash Rituals */
name = "Fuel burner"
result = /obj/item/burner/fuel
time = 5 SECONDS
- reqs = list(/obj/item/reagent_containers/glass/beaker = 1,
+ reqs = list(/obj/item/reagent_containers/cup/beaker = 1,
/datum/reagent/fuel = 15,
/obj/item/paper = 1
)
diff --git a/code/datums/components/infective.dm b/code/datums/components/infective.dm
index 436a769d9e2..2d410d7cf92 100644
--- a/code/datums/components/infective.dm
+++ b/code/datums/components/infective.dm
@@ -30,9 +30,7 @@
RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/try_infect_attack)
RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/try_infect_equipped)
RegisterSignal(parent, COMSIG_FOOD_EATEN, .proc/try_infect_eat)
- if(istype(parent, /obj/item/reagent_containers/food/drinks))
- RegisterSignal(parent, COMSIG_DRINK_DRANK, .proc/try_infect_drink)
- else if(istype(parent, /obj/item/reagent_containers/glass))
+ if(istype(parent, /obj/item/reagent_containers/cup))
RegisterSignal(parent, COMSIG_GLASS_DRANK, .proc/try_infect_drink)
else if(istype(parent, /obj/effect/decal/cleanable/blood/gibs))
RegisterSignal(parent, COMSIG_GIBS_STREAK, .proc/try_infect_streak)
diff --git a/code/datums/components/udder.dm b/code/datums/components/udder.dm
index 2428bdcbf24..e8ffd33792c 100644
--- a/code/datums/components/udder.dm
+++ b/code/datums/components/udder.dm
@@ -47,7 +47,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)
@@ -108,10 +108,10 @@
* 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, span_warning("[milk_holder] is full."))
return
diff --git a/code/datums/station_traits/negative_traits.dm b/code/datums/station_traits/negative_traits.dm
index 3aad21239d0..b69f85f4748 100644
--- a/code/datums/station_traits/negative_traits.dm
+++ b/code/datums/station_traits/negative_traits.dm
@@ -175,8 +175,8 @@
/obj/item/melee/baseball_bat = 10,
/obj/item/melee/chainofcommand/tailwhip = 10,
/obj/item/melee/chainofcommand/tailwhip/kitty = 10,
- /obj/item/reagent_containers/food/drinks/bottle = 20,
- /obj/item/reagent_containers/food/drinks/bottle/kong = 5,
+ /obj/item/reagent_containers/cup/glass/bottle = 20,
+ /obj/item/reagent_containers/cup/glass/bottle/kong = 5,
/obj/item/switchblade/extended = 10,
/obj/item/sign/random = 10,
/obj/item/gun/ballistic/automatic/pistol = 1,
diff --git a/code/datums/station_traits/positive_traits.dm b/code/datums/station_traits/positive_traits.dm
index fc100771148..af3fbc378d0 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, /obj/item/pizzabox/pineapple))
new pizza_to_spawn(toLaunch)
for(var/i in 1 to 6)
- new /obj/item/reagent_containers/food/drinks/bottle/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/storage/subtypes/pockets.dm b/code/datums/storage/subtypes/pockets.dm
index 267209014c0..d168005c634 100644
--- a/code/datums/storage/subtypes/pockets.dm
+++ b/code/datums/storage/subtypes/pockets.dm
@@ -153,9 +153,9 @@
/datum/storage/pockets/helmet/New()
. = ..()
- set_holdable(list(/obj/item/reagent_containers/food/drinks/bottle/vodka,
- /obj/item/reagent_containers/food/drinks/bottle/molotov,
- /obj/item/reagent_containers/food/drinks/drinkingglass,
+ set_holdable(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))
@@ -177,7 +177,7 @@
/obj/item/melee/rune_carver,
/obj/item/melee/sickly_blade, // Normal sized, so you can only fit one.
/obj/item/organ, // Organs are also often used in rituals.
- /obj/item/reagent_containers/glass/beaker/eldritch,
+ /obj/item/reagent_containers/cup/beaker/eldritch,
))
var/static/list/exception_cache = typecacheof(list(/obj/item/bodypart, /obj/item/melee/sickly_blade))
diff --git a/code/game/machinery/computer/arena.dm b/code/game/machinery/computer/arena.dm
index a3743627755..a21f3f6a241 100644
--- a/code/game/machinery/computer/arena.dm
+++ b/code/game/machinery/computer/arena.dm
@@ -311,7 +311,7 @@
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)
diff --git a/code/game/machinery/computer/chef_orders/order_datum.dm b/code/game/machinery/computer/chef_orders/order_datum.dm
index a603e19cdad..0379eecd685 100644
--- a/code/game/machinery/computer/chef_orders/order_datum.dm
+++ b/code/game/machinery/computer/chef_orders/order_datum.dm
@@ -125,25 +125,25 @@
/datum/orderable_item/milk
name = "Milk"
category_index = CATEGORY_MILK_EGGS
- item_instance = /obj/item/reagent_containers/food/condiment/milk
+ item_instance = /obj/item/reagent_containers/condiment/milk
cost_per_order = 30
/datum/orderable_item/soymilk
name = "Soy Milk"
category_index = CATEGORY_MILK_EGGS
- item_instance = /obj/item/reagent_containers/food/condiment/soymilk
+ item_instance = /obj/item/reagent_containers/condiment/soymilk
cost_per_order = 30
/datum/orderable_item/cream
name = "Cream"
category_index = CATEGORY_MILK_EGGS
- item_instance = /obj/item/reagent_containers/food/drinks/bottle/cream
+ item_instance = /obj/item/reagent_containers/cup/glass/bottle/juice/cream
cost_per_order = 40
/datum/orderable_item/yoghurt
name = "Yoghurt"
category_index = CATEGORY_MILK_EGGS
- item_instance = /obj/item/reagent_containers/food/condiment/yoghurt
+ item_instance = /obj/item/reagent_containers/condiment/yoghurt
cost_per_order = 40
/datum/orderable_item/eggs
@@ -252,71 +252,71 @@
/datum/orderable_item/flour
name = "Flour Sack"
category_index = CATEGORY_SAUCES_REAGENTS
- item_instance = /obj/item/reagent_containers/food/condiment/flour
+ item_instance = /obj/item/reagent_containers/condiment/flour
cost_per_order = 30
/datum/orderable_item/sugar
name = "Sugar Sack"
category_index = CATEGORY_SAUCES_REAGENTS
- item_instance = /obj/item/reagent_containers/food/condiment/sugar
+ item_instance = /obj/item/reagent_containers/condiment/sugar
cost_per_order = 30
/datum/orderable_item/rice
name = "Rice Sack"
category_index = CATEGORY_SAUCES_REAGENTS
- item_instance = /obj/item/reagent_containers/food/condiment/rice
+ item_instance = /obj/item/reagent_containers/condiment/rice
cost_per_order = 30
/datum/orderable_item/cornmeal
name = "Cornmeal Box"
category_index = CATEGORY_SAUCES_REAGENTS
- item_instance = /obj/item/reagent_containers/food/condiment/cornmeal
+ item_instance = /obj/item/reagent_containers/condiment/cornmeal
cost_per_order = 30
/datum/orderable_item/enzyme
name = "Universal Enzyme"
category_index = CATEGORY_SAUCES_REAGENTS
- item_instance = /obj/item/reagent_containers/food/condiment/enzyme
+ item_instance = /obj/item/reagent_containers/condiment/enzyme
cost_per_order = 40
/datum/orderable_item/salt
name = "Salt Shaker"
category_index = CATEGORY_SAUCES_REAGENTS
- item_instance = /obj/item/reagent_containers/food/condiment/saltshaker
+ item_instance = /obj/item/reagent_containers/condiment/saltshaker
cost_per_order = 15
/datum/orderable_item/pepper
name = "Pepper Mill"
category_index = CATEGORY_SAUCES_REAGENTS
- item_instance = /obj/item/reagent_containers/food/condiment/peppermill
+ item_instance = /obj/item/reagent_containers/condiment/peppermill
cost_per_order = 15
/datum/orderable_item/soysauce
name = "Soy Sauce"
category_index = CATEGORY_SAUCES_REAGENTS
- item_instance = /obj/item/reagent_containers/food/condiment/soysauce
+ item_instance = /obj/item/reagent_containers/condiment/soysauce
cost_per_order = 15
/datum/orderable_item/bbqsauce
name = "BBQ Sauce"
category_index = CATEGORY_SAUCES_REAGENTS
- item_instance = /obj/item/reagent_containers/food/condiment/bbqsauce
+ item_instance = /obj/item/reagent_containers/condiment/bbqsauce
cost_per_order = 60
/datum/orderable_item/vinegar
name = "Vinegar"
category_index = CATEGORY_SAUCES_REAGENTS
- item_instance = /obj/item/reagent_containers/food/condiment/vinegar
+ item_instance = /obj/item/reagent_containers/condiment/vinegar
cost_per_order = 30
/datum/orderable_item/quality_oil
name = "Quality Oil"
category_index = CATEGORY_SAUCES_REAGENTS
- item_instance = /obj/item/reagent_containers/food/condiment/quality_oil
+ item_instance = /obj/item/reagent_containers/condiment/quality_oil
cost_per_order = 50 //Extra Virgin, just like you, the reader
/datum/orderable_item/peanut_butter
name = "Peanut Butter"
category_index = CATEGORY_SAUCES_REAGENTS
- item_instance = /obj/item/reagent_containers/food/condiment/peanut_butter
+ item_instance = /obj/item/reagent_containers/condiment/peanut_butter
cost_per_order = 30
diff --git a/code/game/machinery/dish_drive.dm b/code/game/machinery/dish_drive.dm
index f1c2b3dd7f6..7ab920d46f5 100644
--- a/code/game/machinery/dish_drive.dm
+++ b/code/game/machinery/dish_drive.dm
@@ -11,8 +11,8 @@
pass_flags = PASSTABLE
var/list/collectable_items = list(/obj/item/trash/waffles,//SKYRAT EDIT CHANGE: NO STATIC!
/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/iv_drip.dm b/code/game/machinery/iv_drip.dm
index c2cd3bfc9bd..711b1765e60 100644
--- a/code/game/machinery/iv_drip.dm
+++ b/code/game/machinery/iv_drip.dm
@@ -27,8 +27,7 @@
///Typecache of containers we accept
var/static/list/drip_containers = typecacheof(list(
/obj/item/reagent_containers/blood,
- /obj/item/reagent_containers/food,
- /obj/item/reagent_containers/glass,
+ /obj/item/reagent_containers/cup,
/obj/item/reagent_containers/chem_pack,
))
// If the blood draining tab should be greyed out
@@ -319,7 +318,7 @@
/obj/machinery/iv_drip/saline/Initialize(mapload)
AddElement(/datum/element/update_icon_blocker)
. = ..()
- reagent_container = new /obj/item/reagent_containers/glass/saline(src)
+ reagent_container = new /obj/item/reagent_containers/cup/saline(src)
/obj/machinery/iv_drip/saline/eject_beaker()
return
diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm
index 4dc7503c8ed..b9872da1226 100644
--- a/code/game/machinery/limbgrower.dm
+++ b/code/game/machinery/limbgrower.dm
@@ -96,7 +96,7 @@
return data
/obj/machinery/limbgrower/on_deconstruction()
- for(var/obj/item/reagent_containers/glass/our_beaker in component_parts)
+ for(var/obj/item/reagent_containers/cup/our_beaker in component_parts)
reagents.trans_to(our_beaker, our_beaker.reagents.maximum_volume)
..()
@@ -233,7 +233,7 @@
/obj/machinery/limbgrower/RefreshParts()
. = ..()
reagents.maximum_volume = 0
- for(var/obj/item/reagent_containers/glass/our_beaker in component_parts)
+ 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)
production_coefficient = 1.25
diff --git a/code/game/machinery/newscaster/newspaper.dm b/code/game/machinery/newscaster/newspaper.dm
index 2de86e1b5a5..ecc87c3ff78 100644
--- a/code/game/machinery/newscaster/newspaper.dm
+++ b/code/game/machinery/newscaster/newspaper.dm
@@ -25,7 +25,7 @@
user.visible_message(span_suicide("[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(span_suicide("[user] downs the contents of [W.name] in one gulp! Shoulda stuck to sudoku!"))
diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm
index 30a6ab86b4e..16c8639a69f 100644
--- a/code/game/machinery/syndicatebomb.dm
+++ b/code/game/machinery/syndicatebomb.dm
@@ -456,12 +456,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 && S.reagents && S.reagents.total_volume)
@@ -484,7 +484,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
@@ -526,7 +526,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/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm
index 6e8864acbdc..b5f011771ae 100644
--- a/code/game/objects/effects/decals/cleanable.dm
+++ b/code/game/objects/effects/decals/cleanable.dm
@@ -59,7 +59,7 @@
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 9f9d4116875..ef524124495 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -491,7 +491,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
break
if(dense_object)
continue
- debris += new /obj/item/reagent_containers/food/drinks/bottle/beer/almost_empty(turf_to_spawn_on)
+ debris += new /obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty(turf_to_spawn_on)
///Spawns the mob with some drugginess/drunkeness, and some disgust.
/obj/effect/landmark/start/hangover/proc/make_hungover(mob/hangover_mob)
diff --git a/code/game/objects/effects/spawners/random/entertainment.dm b/code/game/objects/effects/spawners/random/entertainment.dm
index fc3b1bbd8cb..61c67e11a5c 100644
--- a/code/game/objects/effects/spawners/random/entertainment.dm
+++ b/code/game/objects/effects/spawners/random/entertainment.dm
@@ -42,7 +42,7 @@
/obj/effect/spawner/random/entertainment/money = 3,
/obj/item/dice/d6 = 3,
/obj/item/storage/box/syndie_kit/throwing_weapons = 1,
- /obj/item/reagent_containers/food/drinks/bottle/vodka/badminka = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/vodka/badminka = 1,
)
/obj/effect/spawner/random/entertainment/coin
@@ -109,7 +109,7 @@
name = "recreational drugs spawner"
icon_state = "pill"
loot = list(
- /obj/item/reagent_containers/food/drinks/bottle/hooch = 50,
+ /obj/item/reagent_containers/cup/glass/bottle/hooch = 50,
/obj/item/clothing/mask/cigarette/rollie/cannabis = 15,
/obj/item/reagent_containers/syringe = 15,
/obj/item/cigbutt/roach = 15,
diff --git a/code/game/objects/effects/spawners/random/food_or_drink.dm b/code/game/objects/effects/spawners/random/food_or_drink.dm
index b6b94f7f97f..cdab1d31151 100644
--- a/code/game/objects/effects/spawners/random/food_or_drink.dm
+++ b/code/game/objects/effects/spawners/random/food_or_drink.dm
@@ -104,54 +104,54 @@
name = "good soda spawner"
icon_state = "can"
loot = list(
- /obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola = 3,
- /obj/item/reagent_containers/food/drinks/soda_cans/grey_bull = 3,
- /obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy = 2,
- /obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 2,
- /obj/item/reagent_containers/food/drinks/bottle/beer/light = 2,
- /obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 1,
- /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 1,
- /obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb = 1,
- /obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind = 1,
- /obj/item/reagent_containers/food/drinks/soda_cans/starkist = 1,
- /obj/item/reagent_containers/food/drinks/soda_cans/space_up = 1,
- /obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 1,
- /obj/item/reagent_containers/food/drinks/soda_cans/cola = 1,
+ /obj/item/reagent_containers/cup/glass/drinkingglass/filled/nuka_cola = 3,
+ /obj/item/reagent_containers/cup/soda_cans/grey_bull = 3,
+ /obj/item/reagent_containers/cup/soda_cans/monkey_energy = 2,
+ /obj/item/reagent_containers/cup/soda_cans/thirteenloko = 2,
+ /obj/item/reagent_containers/cup/glass/bottle/beer/light = 2,
+ /obj/item/reagent_containers/cup/soda_cans/shamblers = 1,
+ /obj/item/reagent_containers/cup/soda_cans/pwr_game = 1,
+ /obj/item/reagent_containers/cup/soda_cans/dr_gibb = 1,
+ /obj/item/reagent_containers/cup/soda_cans/space_mountain_wind = 1,
+ /obj/item/reagent_containers/cup/soda_cans/starkist = 1,
+ /obj/item/reagent_containers/cup/soda_cans/space_up = 1,
+ /obj/item/reagent_containers/cup/soda_cans/sol_dry = 1,
+ /obj/item/reagent_containers/cup/soda_cans/cola = 1,
)
/obj/effect/spawner/random/food_or_drink/booze
name = "booze spawner"
icon_state = "beer"
loot = list(
- /obj/item/reagent_containers/food/drinks/bottle/beer = 75,
- /obj/item/reagent_containers/food/drinks/bottle/ale = 25,
- /obj/item/reagent_containers/food/drinks/bottle/beer/light = 5,
- /obj/item/reagent_containers/food/drinks/bottle/maltliquor = 5,
- /obj/item/reagent_containers/food/drinks/bottle/whiskey = 5,
- /obj/item/reagent_containers/food/drinks/bottle/gin = 5,
- /obj/item/reagent_containers/food/drinks/bottle/vodka = 5,
- /obj/item/reagent_containers/food/drinks/bottle/tequila = 5,
- /obj/item/reagent_containers/food/drinks/bottle/rum = 5,
- /obj/item/reagent_containers/food/drinks/bottle/vermouth = 5,
- /obj/item/reagent_containers/food/drinks/bottle/cognac = 5,
- /obj/item/reagent_containers/food/drinks/bottle/wine = 5,
- /obj/item/reagent_containers/food/drinks/bottle/kahlua = 5,
- /obj/item/reagent_containers/food/drinks/bottle/amaretto = 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/sake = 5,
- /obj/item/reagent_containers/food/drinks/bottle/grappa = 5,
- /obj/item/reagent_containers/food/drinks/bottle/applejack = 5,
- /obj/item/reagent_containers/glass/bottle/ethanol = 2,
- /obj/item/reagent_containers/food/drinks/bottle/fernet = 2,
- /obj/item/reagent_containers/food/drinks/bottle/champagne = 2,
- /obj/item/reagent_containers/food/drinks/bottle/absinthe/premium = 2,
- /obj/item/reagent_containers/food/drinks/bottle/goldschlager = 2,
- /obj/item/reagent_containers/food/drinks/bottle/patron = 1,
- /obj/item/reagent_containers/food/drinks/bottle/kong = 1,
- /obj/item/reagent_containers/food/drinks/bottle/lizardwine = 1,
- /obj/item/reagent_containers/food/drinks/bottle/vodka/badminka = 1,
- /obj/item/reagent_containers/food/drinks/bottle/trappist = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/beer = 75,
+ /obj/item/reagent_containers/cup/glass/bottle/ale = 25,
+ /obj/item/reagent_containers/cup/glass/bottle/beer/light = 5,
+ /obj/item/reagent_containers/cup/glass/bottle/maltliquor = 5,
+ /obj/item/reagent_containers/cup/glass/bottle/whiskey = 5,
+ /obj/item/reagent_containers/cup/glass/bottle/gin = 5,
+ /obj/item/reagent_containers/cup/glass/bottle/vodka = 5,
+ /obj/item/reagent_containers/cup/glass/bottle/tequila = 5,
+ /obj/item/reagent_containers/cup/glass/bottle/rum = 5,
+ /obj/item/reagent_containers/cup/glass/bottle/vermouth = 5,
+ /obj/item/reagent_containers/cup/glass/bottle/cognac = 5,
+ /obj/item/reagent_containers/cup/glass/bottle/wine = 5,
+ /obj/item/reagent_containers/cup/glass/bottle/kahlua = 5,
+ /obj/item/reagent_containers/cup/glass/bottle/amaretto = 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/sake = 5,
+ /obj/item/reagent_containers/cup/glass/bottle/grappa = 5,
+ /obj/item/reagent_containers/cup/glass/bottle/applejack = 5,
+ /obj/item/reagent_containers/cup/bottle/ethanol = 2,
+ /obj/item/reagent_containers/cup/glass/bottle/fernet = 2,
+ /obj/item/reagent_containers/cup/glass/bottle/champagne = 2,
+ /obj/item/reagent_containers/cup/glass/bottle/absinthe/premium = 2,
+ /obj/item/reagent_containers/cup/glass/bottle/goldschlager = 2,
+ /obj/item/reagent_containers/cup/glass/bottle/patron = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/kong = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/lizardwine = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/vodka/badminka = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/trappist = 1,
)
/obj/effect/spawner/random/food_or_drink/pizzaparty
@@ -190,7 +190,7 @@
/obj/item/food/peanuts = 5,
/obj/item/food/cnds = 5,
/obj/item/food/energybar = 5,
- /obj/item/reagent_containers/food/drinks/dry_ramen = 5,
+ /obj/item/reagent_containers/cup/glass/dry_ramen = 5,
/obj/item/food/cornchips/random = 5,
/obj/item/food/semki = 5,
/obj/item/food/peanuts/random = 3,
@@ -219,17 +219,17 @@
name = "condiment spawner"
icon_state = "condiment"
loot = list(
- /obj/item/reagent_containers/food/condiment/saltshaker = 3,
- /obj/item/reagent_containers/food/condiment/peppermill = 3,
- /obj/item/reagent_containers/food/condiment/pack/ketchup = 3,
- /obj/item/reagent_containers/food/condiment/pack/hotsauce = 3,
- /obj/item/reagent_containers/food/condiment/pack/astrotame = 3,
- /obj/item/reagent_containers/food/condiment/pack/bbqsauce = 3,
- /obj/item/reagent_containers/food/condiment/bbqsauce = 1,
- /obj/item/reagent_containers/food/condiment/soysauce = 1,
- /obj/item/reagent_containers/food/condiment/vinegar = 1,
- /obj/item/reagent_containers/food/condiment/peanut_butter = 1,
- /obj/item/reagent_containers/food/condiment/quality_oil = 1,
+ /obj/item/reagent_containers/condiment/saltshaker = 3,
+ /obj/item/reagent_containers/condiment/peppermill = 3,
+ /obj/item/reagent_containers/condiment/pack/ketchup = 3,
+ /obj/item/reagent_containers/condiment/pack/hotsauce = 3,
+ /obj/item/reagent_containers/condiment/pack/astrotame = 3,
+ /obj/item/reagent_containers/condiment/pack/bbqsauce = 3,
+ /obj/item/reagent_containers/condiment/bbqsauce = 1,
+ /obj/item/reagent_containers/condiment/soysauce = 1,
+ /obj/item/reagent_containers/condiment/vinegar = 1,
+ /obj/item/reagent_containers/condiment/peanut_butter = 1,
+ /obj/item/reagent_containers/condiment/quality_oil = 1,
)
/obj/effect/spawner/random/food_or_drink/cups
diff --git a/code/game/objects/effects/spawners/random/trash.dm b/code/game/objects/effects/spawners/random/trash.dm
index bd94e40aea2..ef23a1f3cf6 100644
--- a/code/game/objects/effects/spawners/random/trash.dm
+++ b/code/game/objects/effects/spawners/random/trash.dm
@@ -11,9 +11,9 @@
/obj/item/shard = 10,
/obj/effect/spawner/random/trash/cigbutt = 10,
/obj/effect/spawner/random/trash/botanical_waste = 5,
- /obj/item/reagent_containers/glass = 5,
+ /obj/item/reagent_containers/cup = 5,
/obj/item/broken_bottle = 5,
- /obj/item/reagent_containers/glass/bowl = 5,
+ /obj/item/reagent_containers/cup/bowl = 5,
/obj/item/light/tube/broken = 5,
/obj/item/light/bulb/broken = 5,
/obj/item/assembly/mousetrap/armed = 5,
@@ -22,7 +22,7 @@
/obj/item/trash/candle = 1,
/obj/item/popsicle_stick = 1,
/obj/item/reagent_containers/syringe = 1,
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/obj/item/shard/plasma = 1,
)
@@ -140,8 +140,8 @@
/obj/item/clothing/head/cone = 7,
/obj/item/clothing/suit/caution = 3,
/mob/living/simple_animal/hostile/retaliate/frog = 2,
- /obj/item/reagent_containers/glass/rag = 2,
- /obj/item/reagent_containers/glass/bucket = 2,
+ /obj/item/reagent_containers/cup/rag = 2,
+ /obj/item/reagent_containers/cup/bucket = 2,
/obj/effect/decal/cleanable/blood/old = 2,
/obj/structure/mopbucket = 2,
)
@@ -184,8 +184,8 @@
/obj/structure/mopbucket = 10,
/obj/item/mop = 5,
/obj/item/clothing/suit/caution = 3,
- /obj/item/reagent_containers/glass/bucket = 1,
- /obj/item/reagent_containers/glass/bucket/wooden = 1,
+ /obj/item/reagent_containers/cup/bucket = 1,
+ /obj/item/reagent_containers/cup/bucket/wooden = 1,
)
/obj/effect/spawner/random/trash/caution_sign
@@ -203,8 +203,8 @@
name = "bucket spawner"
icon_state = "caution"
loot = list(
- /obj/item/reagent_containers/glass/bucket,
- /obj/item/reagent_containers/glass/bucket/wooden,
+ /obj/item/reagent_containers/cup/bucket,
+ /obj/item/reagent_containers/cup/bucket/wooden,
)
/obj/effect/spawner/random/trash/soap
diff --git a/code/game/objects/items/RSF.dm b/code/game/objects/items/RSF.dm
index ff9d4db773b..564a86257a3 100644
--- a/code/game/objects/items/RSF.dm
+++ b/code/game/objects/items/RSF.dm
@@ -31,7 +31,7 @@ RSF
var/dispense_cost = 0
w_class = WEIGHT_CLASS_NORMAL
///An associated list of atoms and charge costs. This can contain a separate list, as long as it's associated item is an object
- var/list/cost_by_item = list(/obj/item/reagent_containers/food/drinks/drinkingglass = 20,
+ var/list/cost_by_item = list(/obj/item/reagent_containers/cup/glass/drinkingglass = 20,
/obj/item/paper = 10,
/obj/item/storage/dice = 200,
/obj/item/pen = 50,
diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm
index 49aeaafbb33..de5f3229b0a 100644
--- a/code/game/objects/items/cigs_lighters.dm
+++ b/code/game/objects/items/cigs_lighters.dm
@@ -208,7 +208,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
else
to_chat(user, span_warning("There is nothing to smoke!"))
-/obj/item/clothing/mask/cigarette/afterattack(obj/item/reagent_containers/glass/glass, mob/user, proximity)
+/obj/item/clothing/mask/cigarette/afterattack(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
diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm
index d77039ae82e..974142fdcd4 100644
--- a/code/game/objects/items/circuitboards/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm
@@ -373,7 +373,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/offstation
name = "Ancient Circuit Imprinter"
@@ -424,7 +424,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/offstation
name = "Ancient Protolathe"
@@ -511,7 +511,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/techfab/department
name = "\improper Departmental Techfab"
@@ -703,7 +703,7 @@
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)
needs_anchored = FALSE
@@ -773,7 +773,7 @@
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/limbgrower/fullupgrade
@@ -782,7 +782,7 @@
build_path = /obj/machinery/limbgrower
req_components = list(
/obj/item/stock_parts/manipulator/femto = 1,
- /obj/item/reagent_containers/glass/beaker/bluespace = 2,
+ /obj/item/reagent_containers/cup/beaker/bluespace = 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 c1db2cd29fe..a41c27384fe 100644
--- a/code/game/objects/items/clown_items.dm
+++ b/code/game/objects/items/clown_items.dm
@@ -233,7 +233,7 @@
COOLDOWN_START(src, golden_horn_cooldown, 1 SECONDS)
//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/portable_chem_mixer.dm b/code/game/objects/items/devices/portable_chem_mixer.dm
index b2669b12575..82178e25035 100644
--- a/code/game/objects/items/devices/portable_chem_mixer.dm
+++ b/code/game/objects/items/devices/portable_chem_mixer.dm
@@ -23,10 +23,10 @@
atom_storage.max_total_storage = 200
atom_storage.max_slots = 50
atom_storage.set_holdable(list(
- /obj/item/reagent_containers/glass/beaker,
- /obj/item/reagent_containers/glass/bottle,
- /obj/item/reagent_containers/food/drinks/waterbottle,
- /obj/item/reagent_containers/food/condiment,
+ /obj/item/reagent_containers/cup/beaker,
+ /obj/item/reagent_containers/cup/bottle,
+ /obj/item/reagent_containers/cup/glass/waterbottle,
+ /obj/item/reagent_containers/condiment,
))
/obj/item/storage/portable_chem_mixer/Destroy()
diff --git a/code/game/objects/items/drug_items.dm b/code/game/objects/items/drug_items.dm
index 134b1dc43ab..d1ea8ea86f6 100644
--- a/code/game/objects/items/drug_items.dm
+++ b/code/game/objects/items/drug_items.dm
@@ -29,7 +29,7 @@
icon_state = pick("moon_rock1", "moon_rock2", "moon_rock3")
AddElement(/datum/element/swabable, CELL_LINE_TABLE_MOONICORN, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5)
-/obj/item/reagent_containers/glass/blastoff_ampoule
+/obj/item/reagent_containers/cup/blastoff_ampoule
name = "bLaSToFF ampoule" //stylized name
desc = "A small ampoule. The liquid inside appears to be boiling violently.\nYou suspect it contains bLasSToFF; the drug thought to be the cause of the infamous Luna nightclub mass casualty incident."
icon = 'icons/obj/drugs.dmi'
@@ -40,7 +40,7 @@
spillable = FALSE
list_reagents = list(/datum/reagent/drug/blastoff = 10)
-/obj/item/reagent_containers/glass/blastoff_ampoule/update_icon_state()
+/obj/item/reagent_containers/cup/blastoff_ampoule/update_icon_state()
. = ..()
if(!reagents.total_volume)
icon_state = "[base_icon_state]_empty"
@@ -49,7 +49,7 @@
else
icon_state = base_icon_state
-/obj/item/reagent_containers/glass/blastoff_ampoule/attack_self(mob/user)
+/obj/item/reagent_containers/cup/blastoff_ampoule/attack_self(mob/user)
if(!user.canUseTopic(src, BE_CLOSE, NO_DEXTERITY) || spillable)
return ..()
reagent_flags |= OPENCONTAINER
@@ -57,7 +57,7 @@
playsound(src, 'sound/items/ampoule_snap.ogg', 40)
update_appearance()
-/obj/item/reagent_containers/glass/blastoff_ampoule/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
+/obj/item/reagent_containers/cup/blastoff_ampoule/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
. = ..()
if(.)
return
diff --git a/code/game/objects/items/food/frozen.dm b/code/game/objects/items/food/frozen.dm
index 1550c12ce42..6743d59f2bb 100644
--- a/code/game/objects/items/food/frozen.dm
+++ b/code/game/objects/items/food/frozen.dm
@@ -73,7 +73,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
tastes = list("ice" = 1, "water" = 1)
foodtypes = SUGAR //We use SUGAR as a base line to act in as junkfood, other wise we use fruit
diff --git a/code/game/objects/items/food/salad.dm b/code/game/objects/items/food/salad.dm
index dda051ec6c8..a801bba0be2 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(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/vitamin = 2)
@@ -127,7 +127,7 @@
foodtypes = GRAIN | MEAT | VEGETABLES
-/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'
@@ -137,7 +137,7 @@
w_class = WEIGHT_CLASS_NORMAL
custom_price = PAYCHECK_CREW * 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 84255a7f546..995cd654a27 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(/datum/reagent/consumable/nutriment = 8, /datum/reagent/water = 5, /datum/reagent/consumable/nutriment/vitamin = 4)
@@ -55,7 +55,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, /datum/reagent/consumable/nutriment/vitamin = 7)
tastes = list("soy" = 1)
foodtypes = MEAT
diff --git a/code/game/objects/items/food/spaghetti.dm b/code/game/objects/items/food/spaghetti.dm
index e1e5200f4ef..54fd8e08b91 100644
--- a/code/game/objects/items/food/spaghetti.dm
+++ b/code/game/objects/items/food/spaghetti.dm
@@ -76,7 +76,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/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/liquidgibs = 3)
tastes = list("noodle" = 1, "meat" = 1)
foodtypes = GRAIN | MEAT | VEGETABLES
diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm
index d4e91d0ef59..e8e94950225 100644
--- a/code/game/objects/items/grenades/chem_grenade.dm
+++ b/code/game/objects/items/grenades/chem_grenade.dm
@@ -9,11 +9,11 @@
/// Which stage of construction this grenade is currently at.
var/stage = GRENADE_EMPTY
/// The set of reagent containers that have been added to this grenade casing.
- var/list/obj/item/reagent_containers/glass/beakers = list()
+ 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/glass/beaker, /obj/item/reagent_containers/glass/bottle)
+ var/list/allowed_containers = list(/obj/item/reagent_containers/cup/beaker, /obj/item/reagent_containers/cup/bottle)
/// The types of reagent containers that can't be added to this grenade casing.
- var/list/banned_containers = list(/obj/item/reagent_containers/glass/beaker/bluespace) //Containers to exclude from specific grenade subtypes
+ var/list/banned_containers = list(/obj/item/reagent_containers/cup/beaker/bluespace) //Containers to exclude from specific grenade subtypes
/// The maximum volume of the reagents in the grenade casing.
var/casing_holder_volume = 1000
/// The range that this grenade can splash reagents at if they aren't consumed on detonation.
@@ -40,7 +40,7 @@
if(user.can_see_reagents())
if(beakers.len)
. += span_notice("You scan the grenade and detect the following reagents:")
- for(var/obj/item/reagent_containers/glass/glass_beaker in beakers)
+ for(var/obj/item/reagent_containers/cup/glass_beaker in beakers)
for(var/datum/reagent/reagent in glass_beaker.reagents.reagent_list)
. += span_notice("[reagent.volume] units of [reagent.name] in the [glass_beaker.name].")
if(beakers.len == 1)
@@ -51,7 +51,7 @@
if(beakers.len == 2 && beakers[1].name == beakers[2].name)
. += span_notice("You see two [beakers[1].name]s inside the grenade.")
else
- for(var/obj/item/reagent_containers/glass/glass_beaker in beakers)
+ for(var/obj/item/reagent_containers/cup/glass_beaker in beakers)
. += span_notice("You see a [glass_beaker.name] inside the grenade.")
/obj/item/grenade/chem_grenade/update_name(updates)
@@ -238,7 +238,7 @@
return
var/list/datum/reagents/reactants = list()
- for(var/obj/item/reagent_containers/glass/glass_beaker in beakers)
+ for(var/obj/item/reagent_containers/cup/glass_beaker in beakers)
reactants += glass_beaker.reagents
var/turf/detonation_turf = get_turf(src)
@@ -257,7 +257,7 @@
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"
base_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.
@@ -399,8 +399,8 @@
/obj/item/grenade/chem_grenade/metalfoam/Initialize(mapload)
. = ..()
- var/obj/item/reagent_containers/glass/beaker/beaker_one = new(src)
- var/obj/item/reagent_containers/glass/beaker/beaker_two = new(src)
+ var/obj/item/reagent_containers/cup/beaker/beaker_one = new(src)
+ var/obj/item/reagent_containers/cup/beaker/beaker_two = new(src)
beaker_one.reagents.add_reagent(/datum/reagent/aluminium, 30)
beaker_two.reagents.add_reagent(/datum/reagent/foaming_agent, 10)
@@ -417,8 +417,8 @@
/obj/item/grenade/chem_grenade/smart_metal_foam/Initialize(mapload)
. = ..()
- var/obj/item/reagent_containers/glass/beaker/large/beaker_one = new(src)
- var/obj/item/reagent_containers/glass/beaker/beaker_two = 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)
beaker_one.reagents.add_reagent(/datum/reagent/aluminium, 75)
beaker_two.reagents.add_reagent(/datum/reagent/smart_foaming_agent, 25)
@@ -435,8 +435,8 @@
/obj/item/grenade/chem_grenade/incendiary/Initialize(mapload)
. = ..()
- var/obj/item/reagent_containers/glass/beaker/beaker_one = new(src)
- var/obj/item/reagent_containers/glass/beaker/beaker_two = new(src)
+ var/obj/item/reagent_containers/cup/beaker/beaker_one = new(src)
+ var/obj/item/reagent_containers/cup/beaker/beaker_two = new(src)
beaker_one.reagents.add_reagent(/datum/reagent/phosphorus, 25)
beaker_two.reagents.add_reagent(/datum/reagent/stable_plasma, 25)
@@ -453,8 +453,8 @@
/obj/item/grenade/chem_grenade/antiweed/Initialize(mapload)
. = ..()
- var/obj/item/reagent_containers/glass/beaker/beaker_one = new(src)
- var/obj/item/reagent_containers/glass/beaker/beaker_two = new(src)
+ var/obj/item/reagent_containers/cup/beaker/beaker_one = new(src)
+ var/obj/item/reagent_containers/cup/beaker/beaker_two = new(src)
beaker_one.reagents.add_reagent(/datum/reagent/toxin/plantbgone, 25)
beaker_one.reagents.add_reagent(/datum/reagent/potassium, 25)
@@ -472,8 +472,8 @@
/obj/item/grenade/chem_grenade/cleaner/Initialize(mapload)
. = ..()
- var/obj/item/reagent_containers/glass/beaker/beaker_one = new(src)
- var/obj/item/reagent_containers/glass/beaker/beaker_two = new(src)
+ var/obj/item/reagent_containers/cup/beaker/beaker_one = new(src)
+ var/obj/item/reagent_containers/cup/beaker/beaker_two = new(src)
beaker_one.reagents.add_reagent(/datum/reagent/fluorosurfactant, 40)
beaker_two.reagents.add_reagent(/datum/reagent/water, 40)
@@ -490,8 +490,8 @@
/obj/item/grenade/chem_grenade/ez_clean/Initialize(mapload)
. = ..()
- var/obj/item/reagent_containers/glass/beaker/large/beaker_one = new(src)
- var/obj/item/reagent_containers/glass/beaker/large/beaker_two = 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)
beaker_one.reagents.add_reagent(/datum/reagent/fluorosurfactant, 40)
beaker_two.reagents.add_reagent(/datum/reagent/water, 40)
@@ -509,8 +509,8 @@
/obj/item/grenade/chem_grenade/teargas/Initialize(mapload)
. = ..()
- var/obj/item/reagent_containers/glass/beaker/large/beaker_one = new(src)
- var/obj/item/reagent_containers/glass/beaker/large/beaker_two = 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)
beaker_one.reagents.add_reagent(/datum/reagent/consumable/condensedcapsaicin, 60)
beaker_one.reagents.add_reagent(/datum/reagent/potassium, 40)
@@ -528,8 +528,8 @@
/obj/item/grenade/chem_grenade/facid/Initialize(mapload)
. = ..()
- var/obj/item/reagent_containers/glass/beaker/bluespace/beaker_one = new(src)
- var/obj/item/reagent_containers/glass/beaker/bluespace/beaker_two = new(src)
+ var/obj/item/reagent_containers/cup/beaker/bluespace/beaker_one = new(src)
+ var/obj/item/reagent_containers/cup/beaker/bluespace/beaker_two = new(src)
beaker_one.reagents.add_reagent(/datum/reagent/toxin/acid/fluacid, 290)
beaker_one.reagents.add_reagent(/datum/reagent/potassium, 10)
@@ -548,8 +548,8 @@
/obj/item/grenade/chem_grenade/colorful/Initialize(mapload)
. = ..()
- var/obj/item/reagent_containers/glass/beaker/beaker_one = new(src)
- var/obj/item/reagent_containers/glass/beaker/beaker_two = new(src)
+ var/obj/item/reagent_containers/cup/beaker/beaker_one = new(src)
+ var/obj/item/reagent_containers/cup/beaker/beaker_two = new(src)
beaker_one.reagents.add_reagent(/datum/reagent/colorful_reagent, 25)
beaker_one.reagents.add_reagent(/datum/reagent/potassium, 25)
@@ -567,8 +567,8 @@
/obj/item/grenade/chem_grenade/glitter/Initialize(mapload)
. = ..()
- var/obj/item/reagent_containers/glass/beaker/beaker_one = new(src)
- var/obj/item/reagent_containers/glass/beaker/beaker_two = new(src)
+ var/obj/item/reagent_containers/cup/beaker/beaker_one = new(src)
+ var/obj/item/reagent_containers/cup/beaker/beaker_two = new(src)
beaker_one.reagents.add_reagent(glitter_type, 25)
beaker_one.reagents.add_reagent(/datum/reagent/potassium, 25)
@@ -600,8 +600,8 @@
/obj/item/grenade/chem_grenade/clf3/Initialize(mapload)
. = ..()
- var/obj/item/reagent_containers/glass/beaker/bluespace/beaker_one = new(src)
- var/obj/item/reagent_containers/glass/beaker/bluespace/beaker_two = new(src)
+ var/obj/item/reagent_containers/cup/beaker/bluespace/beaker_one = new(src)
+ var/obj/item/reagent_containers/cup/beaker/bluespace/beaker_two = new(src)
beaker_one.reagents.add_reagent(/datum/reagent/fluorosurfactant, 250)
beaker_one.reagents.add_reagent(/datum/reagent/clf3, 50)
@@ -618,8 +618,8 @@
/obj/item/grenade/chem_grenade/bioterrorfoam/Initialize(mapload)
. = ..()
- var/obj/item/reagent_containers/glass/beaker/bluespace/beaker_one = new(src)
- var/obj/item/reagent_containers/glass/beaker/bluespace/beaker_two = new(src)
+ var/obj/item/reagent_containers/cup/beaker/bluespace/beaker_one = new(src)
+ var/obj/item/reagent_containers/cup/beaker/bluespace/beaker_two = new(src)
beaker_one.reagents.add_reagent(/datum/reagent/cryptobiolin, 75)
beaker_one.reagents.add_reagent(/datum/reagent/water, 50)
@@ -638,8 +638,8 @@
/obj/item/grenade/chem_grenade/tuberculosis/Initialize(mapload)
. = ..()
- var/obj/item/reagent_containers/glass/beaker/bluespace/beaker_one = new(src)
- var/obj/item/reagent_containers/glass/beaker/bluespace/beaker_two = new(src)
+ var/obj/item/reagent_containers/cup/beaker/bluespace/beaker_one = new(src)
+ var/obj/item/reagent_containers/cup/beaker/bluespace/beaker_two = new(src)
beaker_one.reagents.add_reagent(/datum/reagent/potassium, 50)
beaker_one.reagents.add_reagent(/datum/reagent/phosphorus, 50)
@@ -659,8 +659,8 @@
/obj/item/grenade/chem_grenade/holy/Initialize(mapload)
. = ..()
- var/obj/item/reagent_containers/glass/beaker/meta/beaker_one = new(src)
- var/obj/item/reagent_containers/glass/beaker/meta/beaker_two = new(src)
+ var/obj/item/reagent_containers/cup/beaker/meta/beaker_one = new(src)
+ var/obj/item/reagent_containers/cup/beaker/meta/beaker_two = new(src)
beaker_one.reagents.add_reagent(/datum/reagent/potassium, 150)
beaker_two.reagents.add_reagent(/datum/reagent/water/holywater, 150)
diff --git a/code/game/objects/items/grenades/ghettobomb.dm b/code/game/objects/items/grenades/ghettobomb.dm
index 0d267b022a8..5803df6a47d 100644
--- a/code/game/objects/items/grenades/ghettobomb.dm
+++ b/code/game/objects/items/grenades/ghettobomb.dm
@@ -38,12 +38,12 @@
check_parts = TRUE
/obj/item/grenade/iedcasing/spawned/Initialize(mapload)
- new /obj/item/reagent_containers/food/drinks/soda_cans/random(src)
+ new /obj/item/reagent_containers/cup/soda_cans/random(src)
return ..()
/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)
stack_trace("[src] generated without a soda can!") //this shouldn't happen.
qdel(src)
diff --git a/code/game/objects/items/mop.dm b/code/game/objects/items/mop.dm
index dd26786f7ad..5b0f5396f5e 100644
--- a/code/game/objects/items/mop.dm
+++ b/code/game/objects/items/mop.dm
@@ -75,7 +75,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/items/storage.dm b/code/game/objects/items/robot/items/storage.dm
index 00891ae0fe1..c91bb690113 100644
--- a/code/game/objects/items/robot/items/storage.dm
+++ b/code/game/objects/items/robot/items/storage.dm
@@ -95,8 +95,8 @@
name = "beaker storage apparatus"
desc = "A special apparatus for carrying beakers without spilling the contents."
icon_state = "borg_beaker_apparatus"
- storable = list(/obj/item/reagent_containers/glass/beaker,
- /obj/item/reagent_containers/glass/bottle)
+ storable = list(/obj/item/reagent_containers/cup/beaker,
+ /obj/item/reagent_containers/cup/bottle)
/obj/item/borg/apparatus/beaker/Initialize(mapload)
add_glass()
@@ -105,7 +105,7 @@
return ..()
/obj/item/borg/apparatus/beaker/proc/add_glass()
- stored = new /obj/item/reagent_containers/glass/beaker/large(src)
+ stored = new /obj/item/reagent_containers/cup/beaker/large(src)
/obj/item/borg/apparatus/beaker/Destroy()
if(stored)
@@ -136,7 +136,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
@@ -162,14 +162,14 @@
name = "beverage storage apparatus"
desc = "A special apparatus for carrying drinks without spilling the contents. Will resynthesize any drinks you pour out!"
icon_state = "borg_beaker_apparatus"
- storable = list(/obj/item/reagent_containers/food/drinks,
- /obj/item/reagent_containers/food/condiment)
+ storable = list(/obj/item/reagent_containers/cup/glass,
+ /obj/item/reagent_containers/condiment)
/obj/item/borg/apparatus/beaker/service/add_glass()
- stored = new /obj/item/reagent_containers/food/drinks/drinkingglass(src)
+ stored = new /obj/item/reagent_containers/cup/glass/drinkingglass(src)
handle_reflling(stored, loc.loc, force = TRUE)
-/obj/item/borg/apparatus/beaker/service/proc/handle_reflling(obj/item/reagent_containers/glass, mob/living/silicon/robot/bro, force = FALSE)
+/obj/item/borg/apparatus/beaker/service/proc/handle_reflling(obj/item/reagent_containers/cup/glass, mob/living/silicon/robot/bro, force = FALSE)
if (isnull(bro))
bro = loc
if (!iscyborg(bro))
@@ -179,7 +179,7 @@
glass.AddComponent(/datum/component/reagent_refiller, power_draw_callback = CALLBACK(bro, /mob/living/silicon/robot.proc/draw_power))
/obj/item/borg/apparatus/beaker/service/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs)
- if (!istype(arrived, /obj/item/reagent_containers/food/drinks))
+ if (!istype(arrived, /obj/item/reagent_containers/cup/glass))
return
handle_reflling(arrived)
return ..()
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index f92aca756d6..961ca917ad3 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -324,7 +324,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
new/datum/stack_recipe("apiary", /obj/structure/beebox, 40, time = 50),\
new/datum/stack_recipe("tiki mask", /obj/item/clothing/mask/gas/tiki_mask, 2), \
new/datum/stack_recipe("honey frame", /obj/item/honey_frame, 5, time = 10),\
- new/datum/stack_recipe("wooden bucket", /obj/item/reagent_containers/glass/bucket/wooden, 3, time = 10),\
+ new/datum/stack_recipe("wooden bucket", /obj/item/reagent_containers/cup/bucket/wooden, 3, time = 10),\
new/datum/stack_recipe("rake", /obj/item/cultivator/rake, 5, time = 10),\
new/datum/stack_recipe("ore box", /obj/structure/ore_box, 4, time = 50, one_per_turf = TRUE, on_floor = TRUE),\
new/datum/stack_recipe("wooden crate", /obj/structure/closet/crate/wooden, 6, time = 50, one_per_turf = TRUE, on_floor = TRUE),\
@@ -332,7 +332,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
new/datum/stack_recipe("loom", /obj/structure/loom, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("water basin", /obj/structure/reagent_water_basin, 5, time = 20, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("forging work bench", /obj/structure/reagent_crafting_bench, 5, time = 20, one_per_turf = TRUE, on_floor = TRUE), \
- 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 = 100), \
new/datum/stack_recipe("bonfire", /obj/structure/bonfire, 10, time = 60, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("easel", /obj/structure/easel, 5, time = 10, one_per_turf = TRUE, on_floor = TRUE), \
@@ -438,7 +438,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
new/datum/stack_recipe("xenoarch bag", /obj/item/storage/bag/xenoarch, 4), /*SKYRAT EDIT ADDITION*/ \
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), \
+ new/datum/stack_recipe("rag", /obj/item/reagent_containers/cup/rag, 1), \
new/datum/stack_recipe("bedsheet", /obj/item/bedsheet, 3), \
new/datum/stack_recipe("double bedsheet", /obj/item/bedsheet/double, 6), \
new/datum/stack_recipe("empty sandbag", /obj/item/emptysandbag, 4), \
@@ -732,9 +732,9 @@ GLOBAL_LIST_INIT(plastic_recipes, list(
new /datum/stack_recipe("plastic floor tile", /obj/item/stack/tile/plastic, 1, 4, 20), \
new /datum/stack_recipe("folding plastic chair", /obj/structure/chair/plastic, 2), \
new /datum/stack_recipe("plastic flaps", /obj/structure/plasticflaps, 5, one_per_turf = TRUE, on_floor = TRUE, time = 40), \
- new /datum/stack_recipe("water bottle", /obj/item/reagent_containers/food/drinks/waterbottle/empty), \
- new /datum/stack_recipe("large water bottle", /obj/item/reagent_containers/food/drinks/waterbottle/large/empty, 3), \
- new /datum/stack_recipe("colo cups", /obj/item/reagent_containers/food/drinks/colocup, 1), \
+ 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("colo cups", /obj/item/reagent_containers/cup/glass/colocup, 1), \
new /datum/stack_recipe("wet floor sign", /obj/item/clothing/suit/caution, 2), \
new /datum/stack_recipe("warning cone", /obj/item/clothing/head/cone, 2), \
new /datum/stack_recipe("blank wall sign", /obj/item/sign, 1)))
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
index 80672b43d85..697b8eaea97 100644
--- a/code/game/objects/items/storage/backpack.dm
+++ b/code/game/objects/items/storage/backpack.dm
@@ -330,7 +330,7 @@
/obj/item/storage/pill_bottle/lsd = 10,
/obj/item/storage/fancy/cigarettes/cigpack_syndicate = 8,
/obj/item/storage/fancy/cigarettes/cigpack_shadyjims = 10,
- /obj/item/reagent_containers/food/drinks/bottle/absinthe = 12,
+ /obj/item/reagent_containers/cup/glass/bottle/absinthe = 12,
/obj/item/storage/box/fireworks/dangerous = 11,
/obj/item/food/grown/cannabis/white = 9,
/obj/item/food/grown/cannabis = 13,
@@ -672,7 +672,7 @@
new /obj/item/gun/ballistic/automatic/pistol/aps(src)
new /obj/item/ammo_box/magazine/m9mm_aps/fire(src)
new /obj/item/ammo_box/magazine/m9mm_aps/fire(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/grenade/syndieminibomb(src)
diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm
index 7c8e85a2c3c..d30cb7508a5 100644
--- a/code/game/objects/items/storage/bags.dm
+++ b/code/game/objects/items/storage/bags.dm
@@ -327,8 +327,8 @@
/obj/item/lighter,
/obj/item/organ,
/obj/item/plate,
- /obj/item/reagent_containers/food,
- /obj/item/reagent_containers/glass,
+ /obj/item/reagent_containers/condiment,
+ /obj/item/reagent_containers/cup,
/obj/item/rollingpaper,
/obj/item/storage/box/gum,
/obj/item/storage/box/matches,
@@ -411,9 +411,9 @@
atom_storage.set_holdable(list(
/obj/item/reagent_containers/chem_pack,
/obj/item/reagent_containers/dropper,
- /obj/item/reagent_containers/food/drinks/waterbottle,
- /obj/item/reagent_containers/glass/beaker,
- /obj/item/reagent_containers/glass/bottle,
+ /obj/item/reagent_containers/cup/glass/waterbottle,
+ /obj/item/reagent_containers/cup/beaker,
+ /obj/item/reagent_containers/cup/bottle,
/obj/item/reagent_containers/medigel,
/obj/item/reagent_containers/pill,
/obj/item/reagent_containers/syringe,
@@ -442,8 +442,8 @@
/obj/item/organ,
/obj/item/reagent_containers/blood,
/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/medipen,
/obj/item/reagent_containers/syringe,
))
@@ -471,8 +471,8 @@
/obj/item/organ,
/obj/item/petri_dish,
/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/syringe,
/obj/item/slime_extract,
/obj/item/swab,
@@ -500,7 +500,7 @@
/obj/item/assembly,
/obj/item/circuitboard,
/obj/item/electronics,
- /obj/item/reagent_containers/glass/beaker,
+ /obj/item/reagent_containers/cup/beaker,
/obj/item/stack/cable_coil,
/obj/item/stack/ore/bluespace_crystal,
/obj/item/stock_parts,
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 9ce3428e012..6027cdc83e5 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -242,9 +242,9 @@
/obj/item/radio,
/obj/item/reagent_containers/blood,
/obj/item/reagent_containers/dropper,
- /obj/item/reagent_containers/glass/beaker,
- /obj/item/reagent_containers/glass/bottle,
- /obj/item/reagent_containers/glass/vial, //SKYRAT EDIT HYPOSPRAYS
+ /obj/item/reagent_containers/cup/beaker,
+ /obj/item/reagent_containers/cup/bottle,
+ /obj/item/reagent_containers/cup/vial, //SKYRAT EDIT HYPOSPRAYS
/obj/item/reagent_containers/hypospray,
/obj/item/reagent_containers/medigel,
/obj/item/reagent_containers/pill,
@@ -275,8 +275,8 @@
SSwardrobe.provide_type(/obj/item/stack/medical/bone_gel, src)
SSwardrobe.provide_type(/obj/item/stack/sticky_tape/surgical, src)
SSwardrobe.provide_type(/obj/item/reagent_containers/syringe, src)
- SSwardrobe.provide_type(/obj/item/reagent_containers/glass/bottle/calomel, src)
- SSwardrobe.provide_type(/obj/item/reagent_containers/glass/bottle/formaldehyde, src)
+ SSwardrobe.provide_type(/obj/item/reagent_containers/cup/bottle/calomel, src)
+ SSwardrobe.provide_type(/obj/item/reagent_containers/cup/bottle/formaldehyde, src)
update_appearance()
/obj/item/storage/belt/medical/paramedic/get_types_to_preload()
@@ -286,8 +286,8 @@
to_preload += /obj/item/stack/medical/bone_gel
to_preload += /obj/item/stack/sticky_tape/surgical
to_preload += /obj/item/reagent_containers/syringe
- to_preload += /obj/item/reagent_containers/glass/bottle/calomel
- to_preload += /obj/item/reagent_containers/glass/bottle/formaldehyde
+ to_preload += /obj/item/reagent_containers/cup/bottle/calomel
+ to_preload += /obj/item/reagent_containers/cup/bottle/formaldehyde
return to_preload
/obj/item/storage/belt/medical/ert
@@ -412,8 +412,8 @@
/obj/item/organ/internal/regenerative_core,
/obj/item/pickaxe,
/obj/item/radio,
- /obj/item/reagent_containers/food/drinks,
- /obj/item/reagent_containers/food/drinks/bottle,
+ /obj/item/reagent_containers/cup/glass,
+ /obj/item/reagent_containers/cup/glass/bottle,
/obj/item/reagent_containers/hypospray,
/obj/item/reagent_containers/pill,
/obj/item/resonator,
@@ -527,7 +527,7 @@
atom_storage.max_specific_storage = WEIGHT_CLASS_SMALL
atom_storage.set_holdable(list(
/obj/item/food,
- /obj/item/reagent_containers/food/drinks
+ /obj/item/reagent_containers/cup/glass
))
var/amount = 5
@@ -547,15 +547,15 @@
/obj/item/food/spacetwinkie,
/obj/item/food/spaghetti/pastatomato,
/obj/item/food/syndicake,
- /obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola,
- /obj/item/reagent_containers/food/drinks/dry_ramen,
- /obj/item/reagent_containers/food/drinks/soda_cans/cola,
- /obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
- /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime,
- /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game,
- /obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind,
- /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/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)
@@ -621,7 +621,7 @@
/obj/item/grenade/c4,
/obj/item/lighter,
/obj/item/multitool,
- /obj/item/reagent_containers/food/drinks/bottle/molotov,
+ /obj/item/reagent_containers/cup/glass/bottle/molotov,
/obj/item/screwdriver,
))
@@ -692,7 +692,7 @@
/obj/item/paint/paint_remover,
/obj/item/plunger,
/obj/item/pushbroom,
- /obj/item/reagent_containers/glass/bucket, //SKYRAT EDIT - Bucket
+ /obj/item/reagent_containers/cup/bucket, //SKYRAT EDIT - Bucket
/obj/item/reagent_containers/spray,
/obj/item/soap,
))
@@ -865,8 +865,8 @@
/obj/item/gun/energy/floragun,
/obj/item/hatchet,
/obj/item/plant_analyzer,
- /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/spray/pestspray,
/obj/item/reagent_containers/spray/plantbgone,
/obj/item/secateurs,
diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm
index 53614b74c53..9d9acea4534 100644
--- a/code/game/objects/items/storage/book.dm
+++ b/code/game/objects/items/storage/book.dm
@@ -246,7 +246,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning",
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 021cb389e5a..c1b94a05172 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -263,7 +263,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"
@@ -271,18 +271,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/medigels
name = "box of medical gels"
@@ -449,7 +449,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"
@@ -458,7 +458,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"
@@ -467,7 +467,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
name = "box of donk-pockets"
@@ -1483,7 +1483,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"
@@ -1772,9 +1772,9 @@
/obj/item/storage/box/mothic_goods/PopulateContents()
for(var/i in 1 to 12)
var/randomFood = pick_weight(list(/obj/item/food/grown/toechtauese = 10,
- /obj/item/reagent_containers/food/condiment/cornmeal = 5,
- /obj/item/reagent_containers/food/condiment/yoghurt = 5,
- /obj/item/reagent_containers/food/condiment/quality_oil = 5,
+ /obj/item/reagent_containers/condiment/cornmeal = 5,
+ /obj/item/reagent_containers/condiment/yoghurt = 5,
+ /obj/item/reagent_containers/condiment/quality_oil = 5,
/obj/item/food/cheese/mozzarella = 5,
/obj/item/food/cheese/firm_cheese = 5,
/obj/item/food/cheese/wheel = 5,
diff --git a/code/game/objects/items/storage/medkit.dm b/code/game/objects/items/storage/medkit.dm
index ae2a627fbb6..bb7bc9b3010 100644
--- a/code/game/objects/items/storage/medkit.dm
+++ b/code/game/objects/items/storage/medkit.dm
@@ -71,8 +71,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/medigel,
diff --git a/code/game/objects/items/storage/sixpack.dm b/code/game/objects/items/storage/sixpack.dm
index 3a6fc1766c5..4f88dd4b1ad 100644
--- a/code/game/objects/items/storage/sixpack.dm
+++ b/code/game/objects/items/storage/sixpack.dm
@@ -27,10 +27,10 @@
atom_storage.max_total_storage = 12
atom_storage.max_slots = 6
atom_storage.set_holdable(list(
- /obj/item/reagent_containers/food/drinks/soda_cans,
- /obj/item/reagent_containers/food/drinks/bottle/beer,
- /obj/item/reagent_containers/food/drinks/bottle/ale,
- /obj/item/reagent_containers/food/drinks/waterbottle
+ /obj/item/reagent_containers/cup/soda_cans,
+ /obj/item/reagent_containers/cup/glass/bottle/beer,
+ /obj/item/reagent_containers/cup/glass/bottle/ale,
+ /obj/item/reagent_containers/cup/glass/waterbottle
))
/obj/item/storage/cans/sixsoda
@@ -39,7 +39,7 @@
/obj/item/storage/cans/sixsoda/PopulateContents()
for(var/i in 1 to 6)
- new /obj/item/reagent_containers/food/drinks/soda_cans/cola(src)
+ new /obj/item/reagent_containers/cup/soda_cans/cola(src)
/obj/item/storage/cans/sixbeer
name = "beer bottle ring"
@@ -47,4 +47,4 @@
/obj/item/storage/cans/sixbeer/PopulateContents()
for(var/i in 1 to 6)
- new /obj/item/reagent_containers/food/drinks/bottle/beer(src)
+ new /obj/item/reagent_containers/cup/glass/bottle/beer(src)
diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm
index 8db53e571f0..208de7b450a 100644
--- a/code/game/objects/items/storage/uplink_kits.dm
+++ b/code/game/objects/items/storage/uplink_kits.dm
@@ -173,7 +173,7 @@
new /obj/item/card/id/advanced/chameleon(src)
new /obj/item/clothing/under/chameleon(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)
if(KIT_NINJA)
new /obj/item/katana(src) // Unique , hard to tell how much tc this is worth. 8 tc?
@@ -222,7 +222,7 @@
new /obj/item/storage/belt/fannypack/yellow(src) // 0 tc
new /obj/item/grenade/spawnergrenade/buzzkill(src)
new /obj/item/grenade/spawnergrenade/buzzkill(src)
- 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/melee/beesword(src) //priceless
if(KIT_MR_FREEZE)
@@ -415,19 +415,19 @@
atom_storage.max_slots = 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
@@ -457,7 +457,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"
@@ -494,7 +494,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)
@@ -545,7 +545,7 @@
/obj/item/storage/box/syndie_kit/sleepytime/PopulateContents()
new /obj/item/clothing/under/syndicate/bloodred/sleepytime(src)
- new /obj/item/reagent_containers/food/drinks/mug/coco(src)
+ new /obj/item/reagent_containers/cup/glass/mug/coco(src)
new /obj/item/toy/plush/carpplushie(src)
new /obj/item/bedsheet/syndie(src)
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 4ca34a75d83..3959765f8f6 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -67,7 +67,7 @@
update_appearance()
/obj/item/toy/waterballoon/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, span_warning("[I] is empty."))
diff --git a/code/game/objects/structures/cannons/cannon.dm b/code/game/objects/structures/cannons/cannon.dm
index 6c07551bc96..e5569d7b88a 100644
--- a/code/game/objects/structures/cannons/cannon.dm
+++ b/code/game/objects/structures/cannons/cannon.dm
@@ -85,7 +85,7 @@
var/obj/item/reagent_containers/powder_keg = used_item
if(!(powder_keg.reagent_flags & OPENCONTAINER))
return ..()
- if(istype(powder_keg, /obj/item/reagent_containers/glass/rag))
+ if(istype(powder_keg, /obj/item/reagent_containers/cup/rag))
return ..()
if(!powder_keg.reagents.total_volume)
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 8104d06cd13..114a53a6c41 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/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/secure/bar.dm b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
index a0e0f932197..101b2d69c1e 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
@@ -13,7 +13,7 @@
/obj/structure/closet/secure_closet/bar/PopulateContents()
..()
for(var/i in 1 to 10)
- new /obj/item/reagent_containers/food/drinks/bottle/beer( src )
+ new /obj/item/reagent_containers/cup/glass/bottle/beer( src )
new /obj/item/etherealballdeployer(src)
new /obj/item/roulette_wheel_beacon(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 6f80dec88c5..74803f708f6 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
@@ -45,9 +45,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"
@@ -57,8 +57,8 @@
/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/food/condiment/soymilk(src)
+ new /obj/item/reagent_containers/condiment/milk(src)
+ new /obj/item/reagent_containers/condiment/soymilk(src)
for(var/i in 1 to 2)
new /obj/item/storage/fancy/egg_box(src)
@@ -84,7 +84,7 @@
/obj/structure/closet/secure_closet/freezer/gulag_fridge/PopulateContents()
..()
for(var/i in 1 to 3)
- new /obj/item/reagent_containers/food/drinks/bottle/beer/light(src)
+ new /obj/item/reagent_containers/cup/glass/bottle/beer/light(src)
/obj/structure/closet/secure_closet/freezer/fridge
name = "refrigerator"
@@ -93,8 +93,8 @@
/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/food/condiment/soymilk(src)
+ new /obj/item/reagent_containers/condiment/milk(src)
+ new /obj/item/reagent_containers/condiment/soymilk(src)
for(var/i in 1 to 2)
new /obj/item/storage/fancy/egg_box(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
index ffa53edf584..4326aead034 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/multiver = 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/multiver = 3,
/obj/item/storage/box/rxglasses = 1)
generate_items_inside(items_inside,src)
@@ -123,7 +123,7 @@
new /obj/item/storage/box/hypospray(src) //SKYRAT EDIT ADDITION - HYPOSPRAYS
new /obj/item/ph_booklet(src)
new /obj/item/reagent_containers/dropper(src)
- new /obj/item/reagent_containers/glass/bottle/acidic_buffer(src) //hopefully they get the hint
+ new /obj/item/reagent_containers/cup/bottle/acidic_buffer(src) //hopefully they get the hint
/obj/structure/closet/secure_closet/chemical/heisenberg //contains one of each beaker, syringe etc.
name = "advanced chemical closet"
diff --git a/code/game/objects/structures/crates_lockers/crates/wooden.dm b/code/game/objects/structures/crates_lockers/crates/wooden.dm
index d1d5cfddb5e..544662f9cc1 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/icemoon/cave_entrance.dm b/code/game/objects/structures/icemoon/cave_entrance.dm
index 758e55d7020..d1c28b4834b 100644
--- a/code/game/objects/structures/icemoon/cave_entrance.dm
+++ b/code/game/objects/structures/icemoon/cave_entrance.dm
@@ -141,7 +141,7 @@ GLOBAL_LIST_INIT(ore_probability, list(
if(2)
new /obj/item/clothing/glasses/godeye(loc)
if(3)
- new /obj/item/reagent_containers/glass/bottle/potion/flight(loc)
+ new /obj/item/reagent_containers/cup/bottle/potion/flight(loc)
if(4)
new /obj/item/organ/internal/heart/cursed/wizard(loc)
if(5)
@@ -171,7 +171,7 @@ GLOBAL_LIST_INIT(ore_probability, list(
if(16)
new /obj/item/seeds/gatfruit(loc)
if(17)
- new /obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola(loc)
+ new /obj/item/reagent_containers/cup/glass/drinkingglass/filled/nuka_cola(loc)
if(18)
new /obj/item/soulstone/anybody(loc)
if(19)
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index 5589b81c5d0..e28e68cb231 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -414,14 +414,14 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sink, (-14))
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, span_notice("You tear off a strip of gauze and make a rag."))
G.use(1)
return
if(istype(O, /obj/item/stack/sheet/cloth))
var/obj/item/stack/sheet/cloth/cloth = O
- new /obj/item/reagent_containers/glass/rag(loc)
+ new /obj/item/reagent_containers/cup/rag(loc)
to_chat(user, span_notice("You tear off a strip of cloth and make a rag."))
cloth.use(1)
return
@@ -634,14 +634,14 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sink/kitchen, (-16))
if(istype(O, /obj/item/stack/medical/gauze))
var/obj/item/stack/medical/gauze/G = O
- new /obj/item/reagent_containers/glass/rag(loc)
+ new /obj/item/reagent_containers/cup/rag(loc)
to_chat(user, span_notice("You tear off a strip of gauze and make a rag."))
G.use(1)
return
if(istype(O, /obj/item/stack/sheet/cloth))
var/obj/item/stack/sheet/cloth/cloth = O
- new /obj/item/reagent_containers/glass/rag(loc)
+ new /obj/item/reagent_containers/cup/rag(loc)
to_chat(user, span_notice("You tear off a strip of cloth and make a rag."))
cloth.use(1)
return
diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm
index 84a50d0ea1f..98701653deb 100644
--- a/code/modules/antagonists/cult/cult_items.dm
+++ b/code/modules/antagonists/cult/cult_items.dm
@@ -515,7 +515,7 @@ Striking a noncultist, however, will tear their flesh."}
user.Paralyze(100)
user.blind_eyes(30)
-/obj/item/reagent_containers/glass/beaker/unholywater
+/obj/item/reagent_containers/cup/beaker/unholywater
name = "flask of unholy water"
desc = "Toxic to nonbelievers; reinvigorating to the faithful - this flask may be sipped or thrown."
icon = 'icons/obj/drinks.dmi'
diff --git a/code/modules/antagonists/cult/cult_structure_altar.dm b/code/modules/antagonists/cult/cult_structure_altar.dm
index ac74e1fdd72..e86e4779ee4 100644
--- a/code/modules/antagonists/cult/cult_structure_altar.dm
+++ b/code/modules/antagonists/cult/cult_structure_altar.dm
@@ -23,7 +23,7 @@
),
UNHOLY_WATER = list(
PREVIEW_IMAGE = image(icon = 'icons/obj/drinks.dmi', icon_state = "holyflask"),
- OUTPUT_ITEMS = list(/obj/item/reagent_containers/glass/beaker/unholywater),
+ OUTPUT_ITEMS = list(/obj/item/reagent_containers/cup/beaker/unholywater),
),
)
diff --git a/code/modules/antagonists/heretic/items/eldritch_flask.dm b/code/modules/antagonists/heretic/items/eldritch_flask.dm
index 8ef025344cf..b5a76b03d89 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, hearms 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/eldritch.dmi'
diff --git a/code/modules/antagonists/heretic/knowledge/side_rust_ash.dm b/code/modules/antagonists/heretic/knowledge/side_rust_ash.dm
index f276c503476..0e15e167d2e 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 = PATH_SIDE
diff --git a/code/modules/art/paintings.dm b/code/modules/art/paintings.dm
index 5726a20cce9..8e85d9d1ff5 100644
--- a/code/modules/art/paintings.dm
+++ b/code/modules/art/paintings.dm
@@ -303,7 +303,7 @@
else if(istype(painting_implement, /obj/item/pen))
var/obj/item/pen/pen = painting_implement
return pen.colour
- else if(istype(painting_implement, /obj/item/soap) || istype(painting_implement, /obj/item/reagent_containers/glass/rag))
+ else if(istype(painting_implement, /obj/item/soap) || istype(painting_implement, /obj/item/reagent_containers/cup/rag))
return canvas_color
/// Generates medium description
@@ -318,7 +318,7 @@
return "Crayon on canvas"
else if(istype(painting_implement, /obj/item/pen))
return "Ink on canvas"
- else if(istype(painting_implement, /obj/item/soap) || istype(painting_implement, /obj/item/reagent_containers/glass/rag))
+ else if(istype(painting_implement, /obj/item/soap) || istype(painting_implement, /obj/item/reagent_containers/cup/rag))
return //These are just for cleaning, ignore them
else
return "Unknown medium"
diff --git a/code/modules/asset_cache/assets/research_designs.dm b/code/modules/asset_cache/assets/research_designs.dm
index bca782207a1..d5a21834e3b 100644
--- a/code/modules/asset_cache/assets/research_designs.dm
+++ b/code/modules/asset_cache/assets/research_designs.dm
@@ -24,7 +24,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
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
index 62cbb2d873b..81da5a1dccc 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
@@ -94,7 +94,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/consume_gas = FALSE
var/obj/item/radio/radio
@@ -413,7 +413,7 @@ GLOBAL_VAR_INIT(cryo_overlay_cover_off, mutable_appearance('icons/obj/cryogenics
return TOOL_ACT_TOOLTYPE_SUCCESS
/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, span_warning("A beaker is already loaded into [src]!"))
diff --git a/code/modules/awaymissions/super_secret_room.dm b/code/modules/awaymissions/super_secret_room.dm
index fa29e662bc3..36581106ee6 100644
--- a/code/modules/awaymissions/super_secret_room.dm
+++ b/code/modules/awaymissions/super_secret_room.dm
@@ -71,7 +71,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)
@@ -82,7 +82,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 a9ced8f3c2a..22208d4b880 100644
--- a/code/modules/cargo/bounties/mining.dm
+++ b/code/modules/cargo/bounties/mining.dm
@@ -61,7 +61,7 @@
name = "Mushroom Bowl"
description = "Lieutenant Jeb dropped his favorite mushroom bowl. Cheer him up by shipping a new one, will you?"
reward = CARGO_CRATE_VALUE * 15 //5x mushroom shavings
- wanted_types = list(/obj/item/reagent_containers/glass/bowl/mushroom_bowl = TRUE)
+ wanted_types = list(/obj/item/reagent_containers/cup/bowl/mushroom_bowl = TRUE)
/datum/bounty/item/mining/inocybe_mushroom
name = "Mushroom Caps"
diff --git a/code/modules/cargo/markets/market_items/misc.dm b/code/modules/cargo/markets/market_items/misc.dm
index e63377d5ae3..c96403fa30c 100644
--- a/code/modules/cargo/markets/market_items/misc.dm
+++ b/code/modules/cargo/markets/market_items/misc.dm
@@ -44,7 +44,7 @@
/datum/market_item/misc/holywater
name = "Flask of holy water"
desc = "Father Lootius' own brand of ready-made holy water."
- item = /obj/item/reagent_containers/food/drinks/bottle/holywater
+ item = /obj/item/reagent_containers/cup/glass/bottle/holywater
price_min = CARGO_CRATE_VALUE * 2
price_max = CARGO_CRATE_VALUE * 3
@@ -53,7 +53,7 @@
/datum/market_item/misc/holywater/spawn_item(loc)
if (prob(6.66))
- return new /obj/item/reagent_containers/glass/beaker/unholywater(loc)
+ return new /obj/item/reagent_containers/cup/beaker/unholywater(loc)
return ..()
/datum/market_item/misc/strange_seed
diff --git a/code/modules/cargo/markets/market_items/tools.dm b/code/modules/cargo/markets/market_items/tools.dm
index f88e1230904..1be815e4f6b 100644
--- a/code/modules/cargo/markets/market_items/tools.dm
+++ b/code/modules/cargo/markets/market_items/tools.dm
@@ -64,7 +64,7 @@
/datum/market_item/tool/thermite_bottle
name = "Thermite Bottle"
desc = "30u of Thermite to assist in creating a quick access point or get away!"
- item = /obj/item/reagent_containers/glass/bottle/thermite
+ item = /obj/item/reagent_containers/cup/bottle/thermite
price_min = CARGO_CRATE_VALUE * 2.5
price_max = CARGO_CRATE_VALUE * 7.5
diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm
index 19662ffe7ab..86424ac4620 100644
--- a/code/modules/cargo/packs.dm
+++ b/code/modules/cargo/packs.dm
@@ -238,9 +238,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
@@ -1217,19 +1217,19 @@
name = "Chemical Starter Kit Crate"
desc = "Contains thirteen different chemicals, for all the fun experiments you can make."
cost = CARGO_CRATE_VALUE * 2.6
- 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)
@@ -1254,11 +1254,11 @@
name = "Medical Supplies Crate"
desc = "Contains several medical supplies. German doctor not included."
cost = CARGO_CRATE_VALUE * 4
- contains = list(/obj/item/reagent_containers/glass/bottle/multiver,
- /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/multiver,
+ /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,
@@ -1307,21 +1307,21 @@
cost = CARGO_CRATE_VALUE * 5
access = ACCESS_CMO
access_view = ACCESS_VIROLOGY
- contains = list(/obj/item/reagent_containers/glass/bottle/flu_virion,
- /obj/item/reagent_containers/glass/bottle/cold,
- /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/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/flu_virion,
+ /obj/item/reagent_containers/cup/bottle/cold,
+ /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/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,
/obj/item/storage/box/syringes,
/obj/item/storage/box/beakers,
- /obj/item/reagent_containers/glass/bottle/mutagen)
+ /obj/item/reagent_containers/cup/bottle/mutagen)
crate_name = "virus crate"
crate_type = /obj/structure/closet/crate/secure/plasma
dangerous = TRUE
@@ -1557,9 +1557,9 @@
desc = "Fight back against dirt and grime with Nanotrasen's Janitorial Essentials(tm)! Contains three buckets, caution signs, and cleaner grenades. Also has a single mop, broom, spray cleaner, rag, and trash bag."
cost = CARGO_CRATE_VALUE * 2
access_view = 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,
@@ -1567,7 +1567,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)
@@ -1604,11 +1604,11 @@
desc = "Celebrate both life and death on the station with Nanotrasen's Party Essentials(tm)! Contains seven colored glowsticks, six beers, six sodas, two ales, and a bottle of patron, goldschlager, and shaker!"
cost = CARGO_CRATE_VALUE * 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/bottle/ale,
- /obj/item/reagent_containers/food/drinks/bottle/ale,
+ /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/storage/cans/sixbeer,
/obj/item/storage/cans/sixsoda,
/obj/item/flashlight/glowstick,
@@ -1725,7 +1725,7 @@
/obj/item/bouquet,
/obj/item/bouquet/sunflower,
/obj/item/bouquet/poppy,
- /obj/item/reagent_containers/food/drinks/bottle/champagne)
+ /obj/item/reagent_containers/cup/glass/bottle/champagne)
crate_name = "wedding crate"
/// Box of 7 grey IDs.
@@ -1863,15 +1863,15 @@
name = "Food Crate"
desc = "Get things cooking with this crate full of useful ingredients! Contains a dozen eggs, three bananas, and some flour, rice, milk, soymilk, salt, pepper, enzyme, sugar, and monkeymeat."
cost = CARGO_CRATE_VALUE * 2
- 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,
@@ -1907,8 +1907,8 @@
cost = CARGO_CRATE_VALUE * 3
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,
@@ -2066,7 +2066,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"
@@ -2076,7 +2076,7 @@
cost = CARGO_CRATE_VALUE * 4
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"
@@ -2335,7 +2335,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,
@@ -2490,7 +2490,7 @@
/obj/item/clothing/mask/gas/mime,
/obj/item/clothing/head/frenchberet,
/obj/item/clothing/suit/toggle/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
@@ -2779,8 +2779,8 @@
desc = "Keep your local chaplain happy and well-supplied, lest they call down judgement upon your cargo bay. Contains two bottles of holywater, bibles, chaplain robes, and burial garmets."
cost = CARGO_CRATE_VALUE * 6 // it costs so much because the Space Church needs funding to build a cathedral
access_view = 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/suit/hooded/chaplain_hoodie,
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index 497868dcf84..25073a20410 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -105,7 +105,7 @@
create_storage(type = /datum/storage/pockets/small/fedora/detective)
- 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 6226a6e4355..e087b23f288 100644
--- a/code/modules/clothing/outfits/ert.dm
+++ b/code/modules/clothing/outfits/ert.dm
@@ -293,7 +293,7 @@
/obj/item/grenade/clusterbuster/cleaner = 1,
/obj/item/melee/baton/security/loaded = 1,
/obj/item/mop/advanced = 1,
- /obj/item/reagent_containers/glass/bucket = 1,
+ /obj/item/reagent_containers/cup/bucket = 1,
/obj/item/storage/box/lights/mixed = 1,
/obj/item/storage/box/survival/engineer = 1,
)
@@ -417,7 +417,7 @@
back = /obj/item/storage/backpack/ert/janitor
backpack_contents = list(
/obj/item/mop/advanced = 1,
- /obj/item/reagent_containers/glass/bucket = 1,
+ /obj/item/reagent_containers/cup/bucket = 1,
/obj/item/storage/box/lights/mixed = 1,
/obj/item/storage/box/survival/engineer = 1,
)
diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm
index 95acf27030f..37de8bc46aa 100644
--- a/code/modules/clothing/outfits/standard.dm
+++ b/code/modules/clothing/outfits/standard.dm
@@ -80,13 +80,13 @@
r_pocket = /obj/item/grenade/chem_grenade/cleaner
l_pocket = /obj/item/grenade/chem_grenade/cleaner
r_hand = /obj/item/mop
- l_hand = /obj/item/reagent_containers/glass/bucket
+ l_hand = /obj/item/reagent_containers/cup/bucket
/datum/outfit/tournament/janitor/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
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/pirate.dm b/code/modules/clothing/spacesuits/pirate.dm
index 7aa3541c033..93149f4fdbd 100644
--- a/code/modules/clothing/spacesuits/pirate.dm
+++ b/code/modules/clothing/spacesuits/pirate.dm
@@ -16,7 +16,7 @@
desc = "A modified suit to allow space pirates to board shuttles and stations while avoiding the maw of the void. Comes with additional protection, and is lighter to move in."
icon_state = "spacepirate"
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/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/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 = 40, BOMB = 30, BIO = 30, FIRE = 60, ACID = 75)
strip_delay = 40
diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm
index e1f2a0aaa58..75a872439c2 100644
--- a/code/modules/clothing/suits/bio.dm
+++ b/code/modules/clothing/suits/bio.dm
@@ -19,7 +19,7 @@
clothing_flags = THICKMATERIAL
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
slowdown = 0.5
- allowed = list(/obj/item/tank/internals, /obj/item/reagent_containers/dropper, /obj/item/flashlight/pen, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/glass/beaker, /obj/item/gun/syringe)
+ allowed = list(/obj/item/tank/internals, /obj/item/reagent_containers/dropper, /obj/item/flashlight/pen, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/cup/beaker, /obj/item/gun/syringe)
armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 100, FIRE = 30, ACID = 100)
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL // SKYRAT EDIT ADDITION - HIDETAIL
strip_delay = 70
diff --git a/code/modules/clothing/suits/chaplainsuits.dm b/code/modules/clothing/suits/chaplainsuits.dm
index b332dc00672..e3f0fd18e9e 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)
worn_icon = 'icons/mob/clothing/suits/chaplain.dmi'
/obj/item/clothing/suit/chaplainsuit/armor
@@ -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
@@ -95,7 +95,7 @@
inhand_icon_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)
/obj/item/clothing/head/helmet/chaplain/clock
name = "forgotten helmet"
@@ -113,7 +113,7 @@
desc = "It sounds like hissing steam, ticking cogs, gone silent, It looks like a dead machine, trying to tick with life."
icon_state = "clockwork_cuirass"
inhand_icon_state = "clockwork_cuirass_inhand"
- 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
clothing_flags = NONE
@@ -133,7 +133,7 @@
desc = "God wills it!"
icon_state = "knight_templar"
inhand_icon_state = "knight_templar"
- 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
clothing_flags = NONE
@@ -201,7 +201,7 @@
worn_icon = 'icons/mob/clothing/suits/chaplain.dmi'
inhand_icon_state = "chaplain_hoodie"
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 f5482760324..42f4483e6d7 100644
--- a/code/modules/clothing/suits/costume.dm
+++ b/code/modules/clothing/suits/costume.dm
@@ -22,7 +22,8 @@
desc = "Yarr."
icon_state = "pirate"
inhand_icon_state = "pirate"
- allowed = list(/obj/item/melee/energy/sword/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/reagent_containers/food/drinks/bottle/rum)
+ body_parts_covered = CHEST|GROIN|ARMS
+ allowed = list(/obj/item/melee/energy/sword/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/reagent_containers/cup/glass/bottle/rum)
species_exception = list(/datum/species/golem)
/obj/item/clothing/suit/costume/pirate/armored
@@ -110,7 +111,7 @@
inhand_icon_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 ed6965bbbdc..b467bf17a66 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -11,7 +11,7 @@
inhand_icon_state = "apron"
blood_overlay_type = "armor"
body_parts_covered = CHEST|GROIN
- allowed = list(/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, /obj/item/graft, /obj/item/secateurs, /obj/item/geneshears)
+ allowed = list(/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, /obj/item/graft, /obj/item/secateurs, /obj/item/geneshears)
species_exception = list(/datum/species/golem)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 50, FIRE = 0, ACID = 0)
@@ -29,7 +29,7 @@
icon_state = "capjacket"
inhand_icon_state = "bio_suit"
body_parts_covered = CHEST|GROIN|ARMS
- 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
@@ -208,8 +208,8 @@
/obj/item/flashlight/pen,
/obj/item/healthanalyzer,
/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/syringe,
/obj/item/storage/pill_bottle,
diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm
index 4b405e1f6c1..3274dae6d7a 100644
--- a/code/modules/clothing/suits/labcoat.dm
+++ b/code/modules/clothing/suits/labcoat.dm
@@ -14,8 +14,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,
diff --git a/code/modules/clothing/suits/wintercoats.dm b/code/modules/clothing/suits/wintercoats.dm
index 7937b4fdf18..0975afe6ca6 100644
--- a/code/modules/clothing/suits/wintercoats.dm
+++ b/code/modules/clothing/suits/wintercoats.dm
@@ -132,7 +132,7 @@
/obj/item/hatchet,
/obj/item/plant_analyzer,
/obj/item/reagent_containers/spray/plantbgone,
- /obj/item/reagent_containers/glass/bottle,
+ /obj/item/reagent_containers/cup/bottle,
/obj/item/reagent_containers/spray/pestspray,
/obj/item/seeds,
/obj/item/storage/bag/plants,
@@ -152,8 +152,8 @@
allowed = list(
/obj/item/grenade/chem_grenade,
/obj/item/holosign_creator,
- /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/spray,
)
hoodtype = /obj/item/clothing/head/hooded/winterhood/janitor
@@ -204,8 +204,8 @@
/obj/item/gun/syringe,
/obj/item/healthanalyzer,
/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,
@@ -296,8 +296,8 @@
/obj/item/dnainjector,
/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,
@@ -447,7 +447,7 @@
allowed += list(
/obj/item/melee/baton/telescopic,
)
-
+
/obj/item/clothing/head/hooded/winterhood/cargo/qm
desc = "A dark brown winter hood"
icon_state = "hood_qm"
diff --git a/code/modules/events/shuttle_loan.dm b/code/modules/events/shuttle_loan.dm
index 52d372cfe6e..ddf8b9024fb 100644
--- a/code/modules/events/shuttle_loan.dm
+++ b/code/modules/events/shuttle_loan.dm
@@ -169,7 +169,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))
@@ -177,8 +177,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/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
deleted file mode 100644
index 117ffb914ba..00000000000
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ /dev/null
@@ -1,867 +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
-
-/obj/item/reagent_containers/food/drinks/attack(mob/living/M, mob/user, def_zone)
-
- if(!reagents || !reagents.total_volume)
- to_chat(user, span_warning("[src] is empty!"))
- return FALSE
-
- if(!canconsume(M, user))
- return FALSE
-
- if (!is_drainable())
- to_chat(user, span_warning("[src]'s lid hasn't been opened!"))
- return FALSE
-
- if(M == user)
- user.visible_message(span_notice("[user] swallows a gulp of [src]."), \
- span_notice("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(span_danger("[user] attempts to feed [M] the contents of [src]."), \
- span_userdanger("[user] attempts to feed you the contents of [src]."))
- if(!do_mob(user, M))
- return
- if(!reagents || !reagents.total_volume)
- return // The drink might be empty after the delay, such as by spam-feeding
- M.visible_message(span_danger("[user] fed [M] the contents of [src]."), \
- span_userdanger("[user] fed you the contents of [src]."))
- log_combat(user, M, "fed", reagents.get_reagent_log_string())
-
- SEND_SIGNAL(src, COMSIG_DRINK_DRANK, M, user)
- var/fraction = min(gulp_size/reagents.total_volume, 1)
- reagents.trans_to(M, gulp_size, transfered_by = user, methods = INGEST)
- checkLiked(fraction, M)
-
- playsound(M.loc,'sound/items/drink.ogg', rand(10,50), TRUE)
- if(iscarbon(M))
- var/mob/living/carbon/carbon_drinker = M
- var/list/diseases = carbon_drinker.get_static_viruses()
- if(LAZYLEN(diseases))
- var/list/datum/disease/diseases_to_add = list()
- for(var/d in diseases)
- var/datum/disease/malady = d
- if(malady.spread_flags & DISEASE_SPREAD_CONTACT_FLUIDS)
- diseases_to_add += malady
- if(LAZYLEN(diseases_to_add))
- AddComponent(/datum/component/infective, diseases_to_add)
- return TRUE
-
-/*
- * On accidental consumption, make sure the container is partially glass, and continue to the reagent_container proc
- */
-/obj/item/reagent_containers/food/drinks/on_accidental_consumption(mob/living/carbon/M, mob/living/carbon/user, obj/item/source_item, discover_after = TRUE)
- if(isGlass && !custom_materials)
- set_custom_materials(list(GET_MATERIAL_REF(/datum/material/glass) = 5))
- return ..()
-
-/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, span_warning("[src] is empty."))
- return
- if(target.reagents.holder_full())
- to_chat(user, span_warning("[target] is full."))
- return
-
- var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this, transfered_by = user)
- to_chat(user, span_notice("You transfer [trans] units of the solution to [target]."))
-
-
- else if(target.is_drainable()) //A dispenser. Transfer FROM it TO us.
- if (!is_refillable())
- to_chat(user, span_warning("[src]'s tab isn't open!"))
- return
-
- if(!target.reagents.total_volume)
- to_chat(user, span_warning("[target] is empty."))
- return
-
- if(reagents.holder_full())
- to_chat(user, span_warning("[src] is full."))
- return
-
- var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this, transfered_by = user)
- to_chat(user, span_notice("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.get_temperature()
- if(hotness && reagents)
- reagents.expose_temperature(hotness)
- to_chat(user, span_notice("You heat [name] with [I]!"))
-
- //Cooling method
- if(istype(I, /obj/item/extinguisher))
- var/obj/item/extinguisher/extinguisher = I
- if(extinguisher.safety)
- return
- if(extinguisher.reagents.total_volume < 1)
- to_chat(user, span_warning("\The [extinguisher] is empty!"))
- return
- var/cooling = (0 - reagents.chem_temp) * (extinguisher.cooling_power * 2)
- reagents.expose_temperature(cooling)
- to_chat(user, span_notice("You cool the [name] with the [I]!"))
- playsound(loc, 'sound/effects/extinguish.ogg', 75, TRUE, -3)
- extinguisher.reagents.remove_all(1)
- ..()
-
-/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
- 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/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(5)
- 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/ice
- name = "ice cup"
- desc = "Careful, cold ice, do not chew."
- custom_price = PAYCHECK_LOWER * 0.6
- icon_state = "icecup"
- 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"
- inhand_icon_state = "coffee"
- spillable = TRUE
-
-/obj/item/reagent_containers/food/drinks/mug/update_icon_state()
- icon_state = reagents.total_volume ? "tea" : "tea_empty"
- return ..()
-
-/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/coco
- name = "Dutch hot coco"
- desc = "Made in Space South America."
- list_reagents = list(/datum/reagent/consumable/hot_coco = 15, /datum/reagent/consumable/sugar = 5)
- foodtype = SUGAR
- resistance_flags = FREEZE_PROOF
- custom_price = PAYCHECK_CREW * 1.2
-
-
-/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/salt = 3)
- foodtype = GRAIN
- isGlass = FALSE
- custom_price = PAYCHECK_CREW * 0.9
-
-/obj/item/reagent_containers/food/drinks/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"
- inhand_icon_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_LOWER * 0.8
-
-/obj/item/reagent_containers/food/drinks/waterbottle/Initialize(mapload)
- . = ..()
- cap_overlay = mutable_appearance(icon, cap_icon_state)
- if(cap_on)
- spillable = FALSE
- update_appearance()
-
-/obj/item/reagent_containers/food/drinks/waterbottle/update_overlays()
- . = ..()
- if(cap_on)
- . += cap_overlay
-
-/obj/item/reagent_containers/food/drinks/waterbottle/examine(mob/user)
- . = ..()
- if(cap_lost)
- . += span_notice("The cap seems to be missing.")
- else if(cap_on)
- . += span_notice("The cap is firmly on to prevent spilling. Alt-click to remove the cap.")
- else
- . += span_notice("The cap has been taken off. Alt-click to put a cap on.")
-
-/obj/item/reagent_containers/food/drinks/waterbottle/AltClick(mob/user)
- . = ..()
- if(cap_lost)
- to_chat(user, span_warning("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, span_warning("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, span_notice("You remove the cap from [src]."))
- else
- cap_on = TRUE
- spillable = FALSE
- to_chat(user, span_notice("You put the cap on [src]."))
- update_appearance()
-
-/obj/item/reagent_containers/food/drinks/waterbottle/is_refillable()
- if(cap_on)
- return FALSE
- . = ..()
-
-/obj/item/reagent_containers/food/drinks/waterbottle/is_drainable()
- if(cap_on)
- return FALSE
- . = ..()
-
-/obj/item/reagent_containers/food/drinks/waterbottle/attack(mob/target, mob/living/user, def_zone)
- if(!target)
- return
-
- if(cap_on && reagents.total_volume && istype(target))
- to_chat(user, span_warning("You must remove the cap before you can do that!"))
- return
-
- return ..()
-
-/obj/item/reagent_containers/food/drinks/waterbottle/afterattack(obj/target, mob/living/user, proximity)
- if(cap_on && (target.is_refillable() || target.is_drainable() || (reagents.total_volume && !user.combat_mode)))
- to_chat(user, span_warning("You must remove the cap before you can do that!"))
- return
-
- else if(istype(target, /obj/item/reagent_containers/food/drinks/waterbottle))
- var/obj/item/reagent_containers/food/drinks/waterbottle/WB = target
- if(WB.cap_on)
- to_chat(user, span_warning("[WB] has a cap firmly twisted on!"))
- . = ..()
-
-// heehoo bottle flipping
-/obj/item/reagent_containers/food/drinks/waterbottle/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
- . = ..()
- if(!QDELETED(src) && cap_on && reagents.total_volume)
- if(prob(flip_chance)) // landed upright
- src.visible_message(span_notice("[src] lands upright!"))
- if(throwingdatum.thrower && isliving(throwingdatum.thrower))
- var/mob/living/living_thrower = throwingdatum.thrower
- living_thrower.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/food/drinks/waterbottle/pickup(mob/user)
- . = ..()
- animate(src, transform = null, time = 1, loop = 0)
-
-/obj/item/reagent_containers/food/drinks/waterbottle/empty
- list_reagents = list()
- cap_on = FALSE
-
-/obj/item/reagent_containers/food/drinks/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/food/drinks/waterbottle/large/empty
- list_reagents = list()
- cap_on = FALSE
-
-// Admin spawn
-/obj/item/reagent_containers/food/drinks/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/food/drinks/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 += span_notice("The writing reads '[random_reagent.name]'.")
- update_appearance()
-
-
-/obj/item/reagent_containers/food/drinks/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/food/drinks/sillycup/update_icon_state()
- icon_state = reagents.total_volume ? "water_cup" : "water_cup_e"
- return ..()
-
-/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
-
-/// Reagent container icon updates, especially this one, are complete jank. I will need to rework them after this is merged.
-/obj/item/reagent_containers/food/drinks/sillycup/smallcarton/on_reagent_change(datum/reagents/holder, ...)
- . = ..()
- if(!length(reagents.reagent_list))
- foodtype = NONE /// Why are food types on the _container_? TODO: move these to the reagents
- return
-
- switch(reagents.get_master_reagent_id())
- if(/datum/reagent/consumable/orangejuice)
- foodtype = FRUIT | BREAKFAST
- if(/datum/reagent/consumable/milk)
- foodtype = DAIRY | BREAKFAST
- if(/datum/reagent/consumable/applejuice)
- foodtype = FRUIT
- if(/datum/reagent/consumable/grapejuice)
- foodtype = FRUIT
- if(/datum/reagent/consumable/pineapplejuice)
- foodtype = FRUIT | PINEAPPLE
- if(/datum/reagent/consumable/milk/chocolate_milk)
- foodtype = SUGAR
- if(/datum/reagent/consumable/ethanol/eggnog)
- foodtype = MEAT
-
-/obj/item/reagent_containers/food/drinks/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/food/drinks/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/food/drinks/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/food/drinks/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/B = new (loc)
- B.mimic_broken(src, target)
- qdel(src)
- target.Bumped(B)
-
-/obj/item/reagent_containers/food/drinks/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"
- lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi'
- inhand_icon_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/food/drinks/colocup/Initialize(mapload)
- .=..()
- pixel_x = rand(-4,4)
- pixel_y = rand(-4,4)
- if (random_sprite)
- 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/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/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/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 = PAYCHECK_COMMAND * 2
- 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
-/// 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/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 = PAYCHECK_CREW * 0.9
- obj_flags = CAN_BE_HIT
- 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/food/drinks/soda_cans/random/Initialize(mapload)
- ..()
- var/T = pick(subtypesof(/obj/item/reagent_containers/food/drinks/soda_cans) - /obj/item/reagent_containers/food/drinks/soda_cans/random)
- new T(loc)
- return INITIALIZE_HINT_QDEL
-
-/obj/item/reagent_containers/food/drinks/soda_cans/suicide_act(mob/living/carbon/human/H)
- if(!reagents.total_volume)
- H.visible_message(span_warning("[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(span_suicide("[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/food/drinks/soda_cans/attack(mob/M, mob/living/user)
- if(istype(M, /mob/living/carbon) && !reagents.total_volume && user.combat_mode && user.zone_selected == BODY_ZONE_HEAD)
- if(M == user)
- user.visible_message(span_warning("[user] crushes the can of [src] on [user.p_their()] forehead!"), span_notice("You crush the can of [src] on your forehead."))
- else
- user.visible_message(span_warning("[user] crushes the can of [src] on [M]'s forehead!"), span_notice("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
- . = ..()
-
-/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)
- if(prob(fizziness))
- user.visible_message(span_danger("[user] opens [src], and is suddenly sprayed by the fizzing contents!"), span_danger("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 [src] with a satisfying pop.") //Ahhhhhhhh
- reagents.flags |= OPENCONTAINER
- playsound(src, SFX_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/food/drinks/soda_cans/proc/burst_soda(atom/target, hide_message = FALSE)
- if(!target)
- return
-
- if(ismob(target))
- var/mob/living/target_mob = target
- target_mob.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)
- iter_mob.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(span_danger("[src] spills over, fizzing its contents all over [target]!"))
- spillable = TRUE
- reagents.flags |= OPENCONTAINER
- reagents.expose(target, TOUCH)
- reagents.clear_reagents()
- throwforce = 0
-
-/obj/item/reagent_containers/food/drinks/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(span_danger("[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/food/drinks/soda_cans/attack_self(mob/user)
- if(!is_drainable())
- open_soda(user)
- return
- return ..()
-
-/obj/item/reagent_containers/food/drinks/soda_cans/attack_self_secondary(mob/user)
- if(!is_drainable())
- playsound(src, 'sound/effects/can_shake.ogg', 50, TRUE)
- user.visible_message(span_danger("[user] shakes [src]!"), span_danger("You shake up [src]!"), vision_distance=2)
- fizziness += SODA_FIZZINESS_SHAKE
- return
- return ..()
-
-/obj/item/reagent_containers/food/drinks/soda_cans/examine_more(mob/user)
- . = ..()
- if(!in_range(user, src))
- return
- if(fizziness > 30 && prob(fizziness * 2))
- . += span_notice("You examine [src] closer, and note the following...")
- . += "\t[span_warning("You get a menacing aura of fizziness from it...")]"
-
-#undef SODA_FIZZINESS_THROWN
-#undef SODA_FIZZINESS_SHAKE
-
-/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/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)
- foodtype = SUGAR
-
-/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. 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/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"
- inhand_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 ff84e3df858..00000000000
--- 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/examine(mob/user)
- . = ..()
- if(foodtype)
- var/list/types = bitfield_to_list(foodtype, FOOD_FLAGS)
- . += span_notice("It is [lowertext(english_list(types))].")
-
-/obj/item/reagent_containers/food/proc/checkLiked(fraction, mob/M)
- if(last_check_time + 50 < world.time)
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
- if(!HAS_TRAIT(H, TRAIT_AGEUSIA))
- if(foodtype & H.dna.species.toxic_food)
- to_chat(H,span_warning("What the hell was that thing?!"))
- H.adjust_disgust(25 + 30 * fraction)
- H.add_mood_event("toxic_food", /datum/mood_event/disgusting_food)
- else if(foodtype & H.dna.species.disliked_food)
- to_chat(H,span_notice("That didn't taste very good..."))
- H.adjust_disgust(11 + 15 * fraction)
- H.add_mood_event("gross_food", /datum/mood_event/gross_food)
- else if(foodtype & H.dna.species.liked_food)
- to_chat(H,span_notice("I love this taste!"))
- H.adjust_disgust(-5 + -2.5 * fraction)
- H.add_mood_event("fav_food", /datum/mood_event/favorite_food)
- else
- if(foodtype & H.dna.species.toxic_food)
- to_chat(H, span_warning("You don't feel so good..."))
- H.adjust_disgust(25 + 30 * fraction)
- if((foodtype & BREAKFAST) && world.time - SSticker.round_start_time < STOP_SERVING_BREAKFAST)
- H.add_mood_event("breakfast", /datum/mood_event/breakfast)
- last_check_time = world.time
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 ef1cf4dc56e..bd26dff5a39 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
@@ -3,9 +3,9 @@
#define DEEPFRYER_BURNTIME 120
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/storage,
/obj/item/delivery,
/obj/item/his_grace)))
diff --git a/code/modules/food_and_drinks/kitchen_machinery/grill.dm b/code/modules/food_and_drinks/kitchen_machinery/grill.dm
index be6f761c549..d625b628538 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/grill.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/grill.dm
@@ -13,7 +13,7 @@
layer = BELOW_OBJ_LAYER
use_power = NO_POWER_USE
var/grill_fuel = 0
- var/obj/item/reagent_containers/food/grilled_item
+ var/obj/item/food/grilled_item
var/grill_time = 0
var/datum/looping_sound/grill/grill_loop
@@ -50,7 +50,7 @@
if(I.resistance_flags & INDESTRUCTIBLE)
to_chat(user, span_warning("You don't feel it would be wise to grill [I]..."))
return ..()
- if(istype(I, /obj/item/reagent_containers/food/drinks))
+ if(istype(I, /obj/item/reagent_containers/cup/glass))
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, span_notice("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 f5db89fdfc0..92da655ed50 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
@@ -158,7 +158,7 @@
to_chat(user, span_warning("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
@@ -262,7 +262,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 75982c3fbb1..4894c37f8b7 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
@@ -380,7 +380,7 @@
/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)
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
// ----------------------------
@@ -479,11 +479,11 @@
/obj/machinery/smartfridge/chemistry/accept_check(obj/item/O)
var/static/list/chemfridge_typecache = typecacheof(list(
/obj/item/reagent_containers/syringe,
- /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/spray,
/obj/item/reagent_containers/medigel,
- /obj/item/reagent_containers/glass/vial, //SKYRAT EDIT HYPOSPRAYS
+ /obj/item/reagent_containers/cup/vial, //SKYRAT EDIT HYPOSPRAYS
/obj/item/reagent_containers/chem_pack
))
@@ -508,8 +508,8 @@
initial_contents = list(
/obj/item/reagent_containers/pill/epinephrine = 12,
/obj/item/reagent_containers/pill/multiver = 5,
- /obj/item/reagent_containers/glass/bottle/epinephrine = 1,
- /obj/item/reagent_containers/glass/bottle/multiver = 1)
+ /obj/item/reagent_containers/cup/bottle/epinephrine = 1,
+ /obj/item/reagent_containers/cup/bottle/multiver = 1)
// ----------------------------
// Virology Medical Smartfridge
@@ -522,13 +522,13 @@
/obj/machinery/smartfridge/chemistry/virology/preloaded
initial_contents = list(
/obj/item/reagent_containers/syringe/antiviral = 4,
- /obj/item/reagent_containers/glass/bottle/cold = 1,
- /obj/item/reagent_containers/glass/bottle/flu_virion = 1,
- /obj/item/reagent_containers/glass/bottle/mutagen = 1,
- /obj/item/reagent_containers/glass/bottle/sugar = 1,
- /obj/item/reagent_containers/glass/bottle/plasma = 1,
- /obj/item/reagent_containers/glass/bottle/synaptizine = 1,
- /obj/item/reagent_containers/glass/bottle/formaldehyde = 1)
+ /obj/item/reagent_containers/cup/bottle/cold = 1,
+ /obj/item/reagent_containers/cup/bottle/flu_virion = 1,
+ /obj/item/reagent_containers/cup/bottle/mutagen = 1,
+ /obj/item/reagent_containers/cup/bottle/sugar = 1,
+ /obj/item/reagent_containers/cup/bottle/plasma = 1,
+ /obj/item/reagent_containers/cup/bottle/synaptizine = 1,
+ /obj/item/reagent_containers/cup/bottle/formaldehyde = 1)
// ----------------------------
// Disk """fridge"""
diff --git a/code/modules/food_and_drinks/pizzabox.dm b/code/modules/food_and_drinks/pizzabox.dm
index a8cea48ae69..f8176b73e66 100644
--- a/code/modules/food_and_drinks/pizzabox.dm
+++ b/code/modules/food_and_drinks/pizzabox.dm
@@ -228,7 +228,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, span_warning("That's not a pizza!"))
..()
diff --git a/code/modules/food_and_drinks/recipes/food_mixtures.dm b/code/modules/food_and_drinks/recipes/food_mixtures.dm
index 756dc301b9f..88e612b6d7b 100644
--- a/code/modules/food_and_drinks/recipes/food_mixtures.dm
+++ b/code/modules/food_and_drinks/recipes/food_mixtures.dm
@@ -177,7 +177,7 @@
/datum/chemical_reaction/food/ricebowl
required_reagents = list(/datum/reagent/consumable/rice = 10, /datum/reagent/water = 10)
- required_container = /obj/item/reagent_containers/glass/bowl
+ required_container = /obj/item/reagent_containers/cup/bowl
mix_message = "The rice absorbs the water."
reaction_flags = REACTION_INSTANT
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm
index 641ec4ae8db..3a6974a9a71 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm
@@ -11,78 +11,78 @@
/datum/reagent/consumable/ethanol = 100
)
blacklist = list(/obj/item/organ/external/tail/lizard/fake)
- result = /obj/item/reagent_containers/food/drinks/bottle/lizardwine
+ result = /obj/item/reagent_containers/cup/glass/bottle/lizardwine
category = CAT_DRINK
/datum/crafting_recipe/moonshinejug
name = "Moonshine Jug"
time = 30
reqs = list(
- /obj/item/reagent_containers/food/drinks/bottle = 1,
+ /obj/item/reagent_containers/cup/glass/bottle = 1,
/datum/reagent/consumable/ethanol/moonshine = 100
)
- result = /obj/item/reagent_containers/food/drinks/bottle/moonshine
+ result = /obj/item/reagent_containers/cup/glass/bottle/moonshine
category = CAT_DRINK
/datum/crafting_recipe/hoochbottle
name = "Hooch Bottle"
time = 30
reqs = list(
- /obj/item/reagent_containers/food/drinks/bottle = 1,
+ /obj/item/reagent_containers/cup/glass/bottle = 1,
/obj/item/storage/box/papersack = 1,
/datum/reagent/consumable/ethanol/hooch = 100
)
- result = /obj/item/reagent_containers/food/drinks/bottle/hooch
+ result = /obj/item/reagent_containers/cup/glass/bottle/hooch
category = CAT_DRINK
/datum/crafting_recipe/blazaambottle
name = "Blazaam Bottle"
time = 20
reqs = list(
- /obj/item/reagent_containers/food/drinks/bottle = 1,
+ /obj/item/reagent_containers/cup/glass/bottle = 1,
/datum/reagent/consumable/ethanol/blazaam = 100
)
- result = /obj/item/reagent_containers/food/drinks/bottle/blazaam
+ result = /obj/item/reagent_containers/cup/glass/bottle/blazaam
category = CAT_DRINK
/datum/crafting_recipe/champagnebottle
name = "Champagne Bottle"
time = 30
reqs = list(
- /obj/item/reagent_containers/food/drinks/bottle = 1,
+ /obj/item/reagent_containers/cup/glass/bottle = 1,
/datum/reagent/consumable/ethanol/champagne = 100
)
- result = /obj/item/reagent_containers/food/drinks/bottle/champagne
+ result = /obj/item/reagent_containers/cup/glass/bottle/champagne
category = CAT_DRINK
/datum/crafting_recipe/trappistbottle
name = "Trappist Bottle"
time = 15
reqs = list(
- /obj/item/reagent_containers/food/drinks/bottle/small = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/small = 1,
/datum/reagent/consumable/ethanol/trappist = 50
)
- result = /obj/item/reagent_containers/food/drinks/bottle/trappist
+ result = /obj/item/reagent_containers/cup/glass/bottle/trappist
category = CAT_DRINK
/datum/crafting_recipe/goldschlagerbottle
name = "Goldschlager Bottle"
time = 30
reqs = list(
- /obj/item/reagent_containers/food/drinks/bottle = 1,
+ /obj/item/reagent_containers/cup/glass/bottle = 1,
/datum/reagent/consumable/ethanol/goldschlager = 100
)
- result = /obj/item/reagent_containers/food/drinks/bottle/goldschlager
+ result = /obj/item/reagent_containers/cup/glass/bottle/goldschlager
category = CAT_DRINK
/datum/crafting_recipe/patronbottle
name = "Patron Bottle"
time = 30
reqs = list(
- /obj/item/reagent_containers/food/drinks/bottle = 1,
+ /obj/item/reagent_containers/cup/glass/bottle = 1,
/datum/reagent/consumable/ethanol/patron = 100
)
- result = /obj/item/reagent_containers/food/drinks/bottle/patron
+ result = /obj/item/reagent_containers/cup/glass/bottle/patron
category = CAT_DRINK
////////////////////// Non-alcoholic recipes ///////////////////
@@ -91,10 +91,10 @@
name = "Holy Water Flask"
time = 30
reqs = list(
- /obj/item/reagent_containers/food/drinks/bottle = 1,
+ /obj/item/reagent_containers/cup/glass/bottle = 1,
/datum/reagent/water/holywater = 100
)
- result = /obj/item/reagent_containers/food/drinks/bottle/holywater
+ result = /obj/item/reagent_containers/cup/glass/bottle/holywater
category = CAT_DRINK
//flask of unholy water is a beaker for some reason, I will try making it a bottle and add it here once the antag freeze is over. t. kryson
@@ -103,40 +103,40 @@
name = "Nothing Bottle"
time = 30
reqs = list(
- /obj/item/reagent_containers/food/drinks/bottle = 1,
+ /obj/item/reagent_containers/cup/glass/bottle = 1,
/datum/reagent/consumable/nothing = 100
)
- result = /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing
+ result = /obj/item/reagent_containers/cup/glass/bottle/bottleofnothing
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 = 10
reqs = list(/obj/item/stack/sheet/cardboard = 1)
category = CAT_DRINK
/datum/crafting_recipe/candycornliquor
name = "candy corn liquor"
- result = /obj/item/reagent_containers/food/drinks/bottle/candycornliquor
+ result = /obj/item/reagent_containers/cup/glass/bottle/candycornliquor
time = 30
reqs = list(/datum/reagent/consumable/ethanol/whiskey = 100,
/obj/item/food/candy_corn = 1,
- /obj/item/reagent_containers/food/drinks/bottle = 1)
+ /obj/item/reagent_containers/cup/glass/bottle = 1)
category = CAT_DRINK
/datum/crafting_recipe/kong
name = "Kong"
- result = /obj/item/reagent_containers/food/drinks/bottle/kong
+ result = /obj/item/reagent_containers/cup/glass/bottle/kong
time = 30
reqs = list(/datum/reagent/consumable/ethanol/whiskey = 100,
/obj/item/food/monkeycube = 1,
- /obj/item/reagent_containers/food/drinks/bottle = 1)
+ /obj/item/reagent_containers/cup/glass/bottle = 1)
category = CAT_DRINK
/datum/crafting_recipe/pruno
name = "pruno mix"
- result = /obj/item/reagent_containers/food/drinks/bottle/pruno
+ result = /obj/item/reagent_containers/cup/glass/bottle/pruno
time = 30
reqs = list(/obj/item/storage/bag/trash = 1,
/obj/item/food/breadslice/moldy = 1,
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm
index bb725a1d40d..cd84b805418 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm
@@ -74,7 +74,7 @@
/datum/crafting_recipe/food/flavorless_sc
name = "Flavorless snowcone"
reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
+ /obj/item/reagent_containers/cup/glass/sillycup = 1,
/datum/reagent/consumable/ice = 15
)
result = /obj/item/food/snowcones
@@ -83,7 +83,7 @@
/datum/crafting_recipe/food/pineapple_sc
name = "Pineapple snowcone"
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
)
@@ -93,7 +93,7 @@
/datum/crafting_recipe/food/lime_sc
name = "Lime snowcone"
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
)
@@ -103,7 +103,7 @@
/datum/crafting_recipe/food/lemon_sc
name = "Lemon snowcone"
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
)
@@ -113,7 +113,7 @@
/datum/crafting_recipe/food/apple_sc
name = "Apple snowcone"
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
)
@@ -123,7 +123,7 @@
/datum/crafting_recipe/food/grape_sc
name = "Grape snowcone"
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/grapejuice = 5
)
@@ -133,7 +133,7 @@
/datum/crafting_recipe/food/orange_sc
name = "Orange snowcone"
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
)
@@ -143,7 +143,7 @@
/datum/crafting_recipe/food/blue_sc
name = "Bluecherry snowcone"
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
)
@@ -153,7 +153,7 @@
/datum/crafting_recipe/food/red_sc
name = "Cherry snowcone"
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
)
@@ -163,7 +163,7 @@
/datum/crafting_recipe/food/berry_sc
name = "Berry snowcone"
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
)
@@ -173,7 +173,7 @@
/datum/crafting_recipe/food/fruitsalad_sc
name = "Fruit Salad snowcone"
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,
@@ -186,7 +186,7 @@
/datum/crafting_recipe/food/mime_sc
name = "Mime snowcone"
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
)
@@ -196,7 +196,7 @@
/datum/crafting_recipe/food/clown_sc
name = "Clown snowcone"
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
)
@@ -206,7 +206,7 @@
/datum/crafting_recipe/food/soda_sc
name = "Space Cola snowcone"
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
)
@@ -216,7 +216,7 @@
/datum/crafting_recipe/food/spacemountainwind_sc
name = "Space Mountain Wind snowcone"
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
)
@@ -226,7 +226,7 @@
/datum/crafting_recipe/food/pwrgame_sc
name = "Pwrgame snowcone"
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
)
@@ -236,7 +236,7 @@
/datum/crafting_recipe/food/honey_sc
name = "Honey snowcone"
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
)
@@ -246,7 +246,7 @@
/datum/crafting_recipe/food/rainbow_sc
name = "Rainbow snowcone"
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/modules/food_and_drinks/recipes/tablecraft/recipes_lizard.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_lizard.dm
index 6a18ed613b4..392f1882a3f 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_lizard.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_lizard.dm
@@ -288,7 +288,7 @@
name = "Atrakor dumpling soup"
reqs = list(
/datum/reagent/water = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/meat/rawcutlet = 2,
/obj/item/food/grown/onion = 1,
/obj/item/food/lizard_dumplings = 1,
@@ -301,7 +301,7 @@
name = "Meatball noodle soup"
reqs = list(
/datum/reagent/water = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/meat/rawcutlet = 2,
/obj/item/food/grown/onion = 1,
/obj/item/food/spaghetti/nizaya = 1,
@@ -314,7 +314,7 @@
/datum/crafting_recipe/food/black_broth
name = "Tiziran black broth"
reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/tiziran_sausage = 1,
/obj/item/food/grown/onion = 1,
/datum/reagent/consumable/vinegar = 5,
@@ -327,7 +327,7 @@
/datum/crafting_recipe/food/jellyfish_stew
name = "Jellyfish stew"
reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/canned_jellyfish = 1,
/obj/item/food/grown/soybeans = 1,
/obj/item/food/grown/redbeet = 1,
@@ -339,7 +339,7 @@
/datum/crafting_recipe/food/rootbread_soup
name = "Rootbread soup"
reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/breadslice/root = 2,
/obj/item/food/grown/garlic = 1,
/obj/item/food/grown/chili = 1,
@@ -384,7 +384,7 @@
/datum/crafting_recipe/food/korta_ice
name = "Korta ice"
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/korta_nectar = 5,
/obj/item/food/grown/berries = 1
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
index eb820cd9efb..2db666e5bb0 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
@@ -101,9 +101,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)
result = /obj/item/food/melonkeg
subcategory = CAT_MISCFOOD
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_moth.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_moth.dm
index 7f929e05325..183fb7a44f1 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_moth.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_moth.dm
@@ -193,7 +193,7 @@
/obj/item/food/grown/eggplant = 1,
/obj/item/food/oven_baked_corn = 1,
/datum/reagent/water = 10,
- /obj/item/reagent_containers/glass/bowl = 1
+ /obj/item/reagent_containers/cup/bowl = 1
)
result = /obj/item/food/soup/moth_cotton_soup
subcategory = CAT_MOTH
@@ -206,7 +206,7 @@
/obj/item/food/grown/potato/sweet = 1,
/datum/reagent/consumable/flour = 5,
/datum/reagent/consumable/milk = 5,
- /obj/item/reagent_containers/glass/bowl = 1
+ /obj/item/reagent_containers/cup/bowl = 1
)
result = /obj/item/food/soup/moth_cheese_soup
subcategory = CAT_MOTH
@@ -219,7 +219,7 @@
/obj/item/seeds/ambrosia = 1,
/datum/reagent/water = 10,
/datum/reagent/consumable/vinegar = 5,
- /obj/item/reagent_containers/glass/bowl = 1
+ /obj/item/reagent_containers/cup/bowl = 1
)
result = /obj/item/food/soup/moth_seed_soup
subcategory = CAT_MOTH
@@ -234,7 +234,7 @@
/obj/item/food/grown/chili = 1,
/obj/item/food/oven_baked_corn = 1,
/datum/reagent/water = 5,
- /obj/item/reagent_containers/glass/bowl = 1
+ /obj/item/reagent_containers/cup/bowl = 1
)
result = /obj/item/food/soup/moth_bean_stew
subcategory = CAT_MOTH
@@ -247,7 +247,7 @@
/obj/item/food/grown/parsnip = 1,
/obj/item/food/grown/carrot = 1,
/datum/reagent/water = 5,
- /obj/item/reagent_containers/glass/bowl = 1
+ /obj/item/reagent_containers/cup/bowl = 1
)
result = /obj/item/food/soup/moth_oat_stew
subcategory = CAT_MOTH
@@ -259,7 +259,7 @@
/obj/item/food/tofu = 1,
/datum/reagent/consumable/yoghurt = 10,
/datum/reagent/consumable/vinegar = 2,
- /obj/item/reagent_containers/glass/bowl = 1
+ /obj/item/reagent_containers/cup/bowl = 1
)
result = /obj/item/food/soup/moth_fire_soup
subcategory = CAT_MOTH
@@ -299,7 +299,7 @@
reqs = list(
/datum/reagent/consumable/cornmeal = 10,
/datum/reagent/water = 10,
- /obj/item/reagent_containers/glass/bowl = 1
+ /obj/item/reagent_containers/cup/bowl = 1
)
result = /obj/item/food/soup/cornmeal_porridge
subcategory = CAT_MOTH
@@ -488,7 +488,7 @@
/datum/crafting_recipe/food/chili_sin_carne
name = "Chili sin carne (vegetarian chili)"
reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/datum/reagent/water = 10,
/datum/reagent/consumable/salt = 1,
/obj/item/food/grown/chili = 1,
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm
index 005abd9d1da..5c4a2ab876e 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm
@@ -6,7 +6,7 @@
/datum/crafting_recipe/food/herbsalad
name = "Herb salad"
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
)
@@ -16,7 +16,7 @@
/datum/crafting_recipe/food/aesirsalad
name = "Aesir salad"
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
)
@@ -26,7 +26,7 @@
/datum/crafting_recipe/food/validsalad
name = "Valid salad"
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
@@ -40,7 +40,7 @@
/datum/reagent/consumable/flour = 5,
/datum/reagent/consumable/salt = 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
)
@@ -63,7 +63,7 @@
/datum/crafting_recipe/food/fruitsalad
name = "Fruit salad"
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,
@@ -76,9 +76,9 @@
/datum/crafting_recipe/food/junglesalad
name = "Jungle salad"
reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
- /obj/item/food/grown/apple = 1,
- /obj/item/food/grown/grapes = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
+ /obj/item/food/grown/apple = 2,
+ /obj/item/food/grown/grapes = 2,
/obj/item/food/grown/banana = 2,
/obj/item/food/watermelonslice = 2
@@ -89,7 +89,7 @@
/datum/crafting_recipe/food/citrusdelight
name = "Citrus delight"
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
@@ -101,7 +101,7 @@
/datum/crafting_recipe/food/edensalad
name = "Salad of Eden"
reqs = list(
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/ambrosia/vulgaris = 1,
/obj/item/food/grown/ambrosia/deus = 1,
/obj/item/food/grown/ambrosia/gaia = 1,
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm
index 7637b7e1db7..1edc86a720e 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm
@@ -7,7 +7,7 @@
name = "Meatball soup"
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
@@ -19,7 +19,7 @@
name = "Vegetable soup"
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,
@@ -32,7 +32,7 @@
name = "Nettle soup"
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
@@ -43,7 +43,7 @@
/datum/crafting_recipe/food/wingfangchu
name = "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
)
@@ -54,7 +54,7 @@
name = "Wish soup"
reqs = list(
/datum/reagent/water = 20,
- /obj/item/reagent_containers/glass/bowl = 1
+ /obj/item/reagent_containers/cup/bowl = 1
)
result= /obj/item/food/soup/wish
subcategory = CAT_SOUP
@@ -62,7 +62,7 @@
/datum/crafting_recipe/food/hotchili
name = "Hot chili"
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
@@ -73,7 +73,7 @@
/datum/crafting_recipe/food/coldchili
name = "Cold chili"
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
@@ -84,7 +84,7 @@
/datum/crafting_recipe/food/clownchili
name = "Chili con carnival"
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,
@@ -97,7 +97,7 @@
name = "Tomato soup"
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
)
result = /obj/item/food/soup/tomato
@@ -107,7 +107,7 @@
name = "Eyeball soup"
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/internal/eyes = 1
)
@@ -119,7 +119,7 @@
name = "Miso soup"
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
)
@@ -130,7 +130,7 @@
name = "Blood soup"
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
)
result = /obj/item/food/soup/blood
@@ -141,7 +141,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
)
result = /obj/item/food/soup/slime
subcategory = CAT_SOUP
@@ -150,7 +150,7 @@
name = "Clowns tears"
reqs = list(
/datum/reagent/lube = 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
)
@@ -161,7 +161,7 @@
name = "Mystery soup"
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,
@@ -175,7 +175,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
)
result = /obj/item/food/soup/mushroom
@@ -185,7 +185,7 @@
name = "Beet soup"
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,
)
@@ -196,7 +196,7 @@
name = "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,
@@ -211,7 +211,7 @@
name = "Spacy liberty duff"
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
)
result = /obj/item/food/soup/spacylibertyduff
@@ -221,7 +221,7 @@
name = "Amanita jelly"
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
)
result = /obj/item/food/soup/amanitajelly
@@ -232,7 +232,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
)
result = /obj/item/food/soup/sweetpotato
@@ -242,7 +242,7 @@
name = "Red beet soup"
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
)
@@ -253,7 +253,7 @@
name = "French onion soup"
reqs = list(
/datum/reagent/water = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/onion = 1,
/obj/item/food/cheese/wedge = 1,
)
@@ -264,7 +264,7 @@
name = "Bisque"
reqs = list(
/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/salad/boiledrice = 1
)
@@ -276,7 +276,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
)
@@ -288,7 +288,7 @@
reqs = list(
/datum/reagent/water = 10,
/datum/reagent/consumable/salt = 5,
- /obj/item/reagent_containers/glass/bowl = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/grown/mushroom/jupitercup = 1
)
result = /obj/item/food/soup/electron
@@ -301,7 +301,7 @@
/obj/item/food/grown/peas = 2,
/obj/item/food/grown/parsnip = 1,
/obj/item/food/grown/carrot = 1,
- /obj/item/reagent_containers/glass/bowl = 1
+ /obj/item/reagent_containers/cup/bowl = 1
)
result = /obj/item/food/soup/peasoup
subcategory = CAT_SOUP
@@ -324,7 +324,7 @@
name = "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
)
result = /obj/item/food/soup/oatmeal
@@ -339,7 +339,7 @@
/obj/item/food/meat/cutlet = 1,
/obj/item/food/grown/carrot = 1,
/obj/item/food/grown/onion = 1,
- /obj/item/reagent_containers/glass/bowl = 1
+ /obj/item/reagent_containers/cup/bowl = 1
)
result = /obj/item/food/soup/zurek
subcategory = CAT_SOUP
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm
index 44b17e5849d..0357374b9a4 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm
@@ -41,7 +41,7 @@
/datum/crafting_recipe/food/beefnoodle
name = "Beef noodle"
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/modules/food_and_drinks/restaurant/generic_venues.dm b/code/modules/food_and_drinks/restaurant/generic_venues.dm
index 5e5123368db..c845f78649b 100644
--- a/code/modules/food_and_drinks/restaurant/generic_venues.dm
+++ b/code/modules/food_and_drinks/restaurant/generic_venues.dm
@@ -123,8 +123,8 @@
. = ..()
if(.)
return
- if(istype(object_used, /obj/item/reagent_containers/food/drinks))
- var/obj/item/reagent_containers/food/drinks/potential_drink = object_used
+ if(istype(object_used, /obj/item/reagent_containers/cup/glass))
+ var/obj/item/reagent_containers/cup/glass/potential_drink = object_used
return potential_drink.reagents.has_reagent(wanted_item, VENUE_BAR_MINIMUM_REAGENTS)
/obj/machinery/restaurant_portal/bar
diff --git a/code/modules/hydroponics/beekeeping/beekeeper_suit.dm b/code/modules/hydroponics/beekeeping/beekeeper_suit.dm
index ffd4886e35c..a9f188fc1dc 100644
--- a/code/modules/hydroponics/beekeeping/beekeeper_suit.dm
+++ b/code/modules/hydroponics/beekeeping/beekeeper_suit.dm
@@ -14,4 +14,4 @@
inhand_icon_state = "beekeeper"
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/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm
index c3388e7e587..6f324d8fd71 100644
--- a/code/modules/hydroponics/biogenerator.dm
+++ b/code/modules/hydroponics/biogenerator.dm
@@ -6,7 +6,7 @@
density = TRUE
circuit = /obj/item/circuitboard/machine/biogenerator
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
@@ -85,7 +85,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
update_appearance()
@@ -94,7 +94,7 @@
if(default_deconstruction_crowbar(O))
return
- if(istype(O, /obj/item/reagent_containers/glass))
+ if(istype(O, /obj/item/reagent_containers/cup))
if(panel_open)
to_chat(user, span_warning("Close the maintenance panel first."))
else
@@ -242,7 +242,7 @@
* user - the mob inserting the beaker
* inserted_beaker - the beaker we're inserting into the biogen
*/
-/obj/machinery/biogenerator/proc/insert_beaker(mob/living/user, obj/item/reagent_containers/glass/inserted_beaker)
+/obj/machinery/biogenerator/proc/insert_beaker(mob/living/user, obj/item/reagent_containers/cup/inserted_beaker)
if(!can_interact(user))
return
diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm
index e5ab9f200fc..df2d8630206 100644
--- a/code/modules/hydroponics/hydroitemdefines.dm
+++ b/code/modules/hydroponics/hydroitemdefines.dm
@@ -630,47 +630,47 @@
// *************************************
-/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 and gradual plant growth with each harvest."
list_reagents = list(/datum/reagent/plantnutriment/eznutriment = 50)
-/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 lightly heals the plant but causes significant mutations in plants over generations."
list_reagents = list(/datum/reagent/plantnutriment/left4zednutriment = 50)
-/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 while gradually preventing mutations."
list_reagents = list(/datum/reagent/plantnutriment/robustharvestnutriment = 50)
-/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 = 30
amount_per_transfer_from_this = 1
possible_transfer_amounts = list(1,2,5)
-/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 = 30)
-/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 = 30)
diff --git a/code/modules/jobs/job_types/bartender.dm b/code/modules/jobs/job_types/bartender.dm
index 3d643fddb0b..fb7a93328a5 100644
--- a/code/modules/jobs/job_types/bartender.dm
+++ b/code/modules/jobs/job_types/bartender.dm
@@ -20,11 +20,11 @@
/datum/job_department/service,
)
- family_heirlooms = list(/obj/item/reagent_containers/glass/rag, /obj/item/clothing/head/that, /obj/item/reagent_containers/food/drinks/shaker)
+ family_heirlooms = list(/obj/item/reagent_containers/cup/rag, /obj/item/clothing/head/that, /obj/item/reagent_containers/cup/glass/shaker)
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 = 10,
/obj/item/stack/sheet/mineral/uranium = 10,
)
diff --git a/code/modules/jobs/job_types/botanist.dm b/code/modules/jobs/job_types/botanist.dm
index 8193bd29b61..e7ba3e9d95d 100644
--- a/code/modules/jobs/job_types/botanist.dm
+++ b/code/modules/jobs/job_types/botanist.dm
@@ -22,16 +22,16 @@
family_heirlooms = list(
/obj/item/cultivator,
- /obj/item/reagent_containers/glass/watering_can/wood,
+ /obj/item/reagent_containers/cup/watering_can/wood,
/obj/item/toy/plush/beeplushie,
)
mail_goodies = list(
- /obj/item/reagent_containers/glass/bottle/mutagen = 20,
- /obj/item/reagent_containers/glass/bottle/saltpetre = 20,
- /obj/item/reagent_containers/glass/bottle/diethylamine = 20,
+ /obj/item/reagent_containers/cup/bottle/mutagen = 20,
+ /obj/item/reagent_containers/cup/bottle/saltpetre = 20,
+ /obj/item/reagent_containers/cup/bottle/diethylamine = 20,
/obj/item/gun/energy/floragun = 10,
- /obj/item/reagent_containers/glass/watering_can/advanced = 10,
+ /obj/item/reagent_containers/cup/watering_can/advanced = 10,
/obj/effect/spawner/random/food_or_drink/seed_rare = 5,// These are strong, rare seeds, so use sparingly.
/obj/item/food/monkeycube/bee = 2
)
diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm
index 190fa9bc361..230b1aff494 100755
--- a/code/modules/jobs/job_types/captain.dm
+++ b/code/modules/jobs/job_types/captain.dm
@@ -31,12 +31,12 @@
/datum/job_department/command,
)
- family_heirlooms = list(/obj/item/reagent_containers/food/drinks/flask/gold, /obj/item/toy/captainsaid/collector)
+ family_heirlooms = list(/obj/item/reagent_containers/cup/glass/flask/gold, /obj/item/toy/captainsaid/collector)
mail_goodies = list(
/obj/item/clothing/mask/cigarette/cigar/havana = 20,
/obj/item/storage/fancy/cigarettes/cigars/havana = 15,
- /obj/item/reagent_containers/food/drinks/bottle/champagne = 10,
+ /obj/item/reagent_containers/cup/glass/bottle/champagne = 10,
/obj/item/toy/captainsaid/collector = 20
)
diff --git a/code/modules/jobs/job_types/chaplain.dm b/code/modules/jobs/job_types/chaplain.dm
index d3970bddd36..61f8070c965 100644
--- a/code/modules/jobs/job_types/chaplain.dm
+++ b/code/modules/jobs/job_types/chaplain.dm
@@ -21,10 +21,10 @@
/datum/job_department/service,
)
- family_heirlooms = list(/obj/item/toy/windup_toolbox, /obj/item/reagent_containers/food/drinks/bottle/holywater)
+ family_heirlooms = list(/obj/item/toy/windup_toolbox, /obj/item/reagent_containers/cup/glass/bottle/holywater)
mail_goodies = list(
- /obj/item/reagent_containers/food/drinks/bottle/holywater = 30,
+ /obj/item/reagent_containers/cup/glass/bottle/holywater = 30,
/obj/item/toy/plush/awakenedplushie = 10,
/obj/item/grenade/chem_grenade/holy = 5,
/obj/item/toy/plush/narplush = 2,
diff --git a/code/modules/jobs/job_types/chemist.dm b/code/modules/jobs/job_types/chemist.dm
index 6ccd7590006..fb4ab83e7de 100644
--- a/code/modules/jobs/job_types/chemist.dm
+++ b/code/modules/jobs/job_types/chemist.dm
@@ -29,9 +29,9 @@
family_heirlooms = list(/obj/item/book/manual/wiki/chemistry, /obj/item/ph_booklet)
mail_goodies = list(
- /obj/item/reagent_containers/glass/bottle/flash_powder = 15,
- /obj/item/reagent_containers/glass/bottle/exotic_stabilizer = 5,
- /obj/item/reagent_containers/glass/bottle/leadacetate = 5,
+ /obj/item/reagent_containers/cup/bottle/flash_powder = 15,
+ /obj/item/reagent_containers/cup/bottle/exotic_stabilizer = 5,
+ /obj/item/reagent_containers/cup/bottle/leadacetate = 5,
/obj/item/paper/secretrecipe = 1
)
rpg_title = "Alchemist"
@@ -49,7 +49,7 @@
ears = /obj/item/radio/headset/headset_med
glasses = /obj/item/clothing/glasses/science
shoes = /obj/item/clothing/shoes/sneakers/white
- l_pocket = /obj/item/reagent_containers/glass/bottle/random_buffer
+ l_pocket = /obj/item/reagent_containers/cup/bottle/random_buffer
r_pocket = /obj/item/reagent_containers/dropper
backpack = /obj/item/storage/backpack/chemistry
diff --git a/code/modules/jobs/job_types/cook.dm b/code/modules/jobs/job_types/cook.dm
index 167455d0d1b..3afbfdde5d0 100644
--- a/code/modules/jobs/job_types/cook.dm
+++ b/code/modules/jobs/job_types/cook.dm
@@ -25,18 +25,18 @@
)
family_heirlooms = list(
- /obj/item/reagent_containers/food/condiment/saltshaker,
+ /obj/item/reagent_containers/condiment/saltshaker,
/obj/item/kitchen/rollingpin,
/obj/item/clothing/head/chefhat,
)
mail_goodies = list(
/obj/item/storage/box/ingredients/random = 80,
- /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/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/knife/kitchen = 4,
/obj/item/knife/butcher = 2
)
diff --git a/code/modules/jobs/job_types/detective.dm b/code/modules/jobs/job_types/detective.dm
index b94c6cc92ae..5aa3dc2a313 100644
--- a/code/modules/jobs/job_types/detective.dm
+++ b/code/modules/jobs/job_types/detective.dm
@@ -39,7 +39,7 @@
/obj/item/storage/belt/holster/detective/full = 1
)
- family_heirlooms = list(/obj/item/reagent_containers/food/drinks/bottle/whiskey)
+ family_heirlooms = list(/obj/item/reagent_containers/cup/glass/bottle/whiskey)
rpg_title = "Thiefcatcher" //I guess they caught them all rip thief...
job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN
diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm
index 48b6b49c0e8..5403653ae2c 100644
--- a/code/modules/jobs/job_types/head_of_personnel.dm
+++ b/code/modules/jobs/job_types/head_of_personnel.dm
@@ -37,7 +37,7 @@
/obj/item/stack/sheet/bone = 5
)
- family_heirlooms = list(/obj/item/reagent_containers/food/drinks/trophy/silver_cup)
+ family_heirlooms = list(/obj/item/reagent_containers/cup/glass/trophy/silver_cup)
rpg_title = "Guild Questgiver"
job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_BOLD_SELECT_TEXT | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN
diff --git a/code/modules/jobs/job_types/janitor.dm b/code/modules/jobs/job_types/janitor.dm
index 1298c1a93c9..d3f1ca6ee9c 100644
--- a/code/modules/jobs/job_types/janitor.dm
+++ b/code/modules/jobs/job_types/janitor.dm
@@ -20,7 +20,7 @@
/datum/job_department/service,
)
- family_heirlooms = list(/obj/item/mop, /obj/item/clothing/suit/caution, /obj/item/reagent_containers/glass/bucket, /obj/item/paper/fluff/stations/soap)
+ family_heirlooms = list(/obj/item/mop, /obj/item/clothing/suit/caution, /obj/item/reagent_containers/cup/bucket, /obj/item/paper/fluff/stations/soap)
mail_goodies = list(
/obj/item/grenade/chem_grenade/cleaner = 30,
diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm
index c76fbc86000..cc3993f6d27 100644
--- a/code/modules/jobs/job_types/medical_doctor.dm
+++ b/code/modules/jobs/job_types/medical_doctor.dm
@@ -31,7 +31,7 @@
/obj/item/scalpel/advanced = 6,
/obj/item/retractor/advanced = 6,
/obj/item/cautery/advanced = 6,
- /obj/item/reagent_containers/glass/bottle/formaldehyde = 6,
+ /obj/item/reagent_containers/cup/bottle/formaldehyde = 6,
/obj/effect/spawner/random/medical/organs = 5,
/obj/effect/spawner/random/medical/memeorgans = 1
)
diff --git a/code/modules/jobs/job_types/mime.dm b/code/modules/jobs/job_types/mime.dm
index 38899d55f0f..b91f1f71d80 100644
--- a/code/modules/jobs/job_types/mime.dm
+++ b/code/modules/jobs/job_types/mime.dm
@@ -25,7 +25,7 @@
mail_goodies = list(
/obj/item/food/baguette = 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 = 1,
)
rpg_title = "Fool"
@@ -51,7 +51,7 @@
suit = /obj/item/clothing/suit/toggle/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,
)
belt = /obj/item/modular_computer/tablet/pda/mime
diff --git a/code/modules/jobs/job_types/virologist.dm b/code/modules/jobs/job_types/virologist.dm
index 6666340437f..f85039217ee 100644
--- a/code/modules/jobs/job_types/virologist.dm
+++ b/code/modules/jobs/job_types/virologist.dm
@@ -29,9 +29,9 @@
family_heirlooms = list(/obj/item/reagent_containers/syringe)
mail_goodies = list(
- /obj/item/reagent_containers/glass/bottle/random_virus = 15,
- /obj/item/reagent_containers/glass/bottle/formaldehyde = 10,
- /obj/item/reagent_containers/glass/bottle/synaptizine = 10,
+ /obj/item/reagent_containers/cup/bottle/random_virus = 15,
+ /obj/item/reagent_containers/cup/bottle/formaldehyde = 10,
+ /obj/item/reagent_containers/cup/bottle/synaptizine = 10,
/obj/item/stack/sheet/mineral/plasma = 10,
/obj/item/stack/sheet/mineral/uranium = 5,
)
diff --git a/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm b/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm
index b93ca064978..30915dd47b0 100644
--- a/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm
+++ b/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm
@@ -152,7 +152,7 @@
new /obj/item/hemostat(src)
if(6)
- new /obj/item/reagent_containers/glass/beaker(src)
+ new /obj/item/reagent_containers/cup/beaker(src)
new /obj/item/clothing/glasses/science(src)
if(7)
new /obj/item/clothing/glasses/sunglasses(src)
diff --git a/code/modules/mapfluff/ruins/lavalandruin_code/syndicate_base.dm b/code/modules/mapfluff/ruins/lavalandruin_code/syndicate_base.dm
index 05d8838c89c..1b936458837 100644
--- a/code/modules/mapfluff/ruins/lavalandruin_code/syndicate_base.dm
+++ b/code/modules/mapfluff/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/mapfluff/ruins/spaceruin_code/forgottenship.dm b/code/modules/mapfluff/ruins/spaceruin_code/forgottenship.dm
index 4de701c3efe..926a0cc8143 100644
--- a/code/modules/mapfluff/ruins/spaceruin_code/forgottenship.dm
+++ b/code/modules/mapfluff/ruins/spaceruin_code/forgottenship.dm
@@ -20,17 +20,17 @@ GLOBAL_VAR_INIT(fscpassword, generate_password())
/obj/item/healthanalyzer = 4,
/obj/item/reagent_containers/pill/patch/libital = 5,
/obj/item/reagent_containers/pill/patch/aiuri = 5,
- /obj/item/reagent_containers/glass/bottle/multiver = 1,
- /obj/item/reagent_containers/glass/bottle/syriniver = 1,
- /obj/item/reagent_containers/glass/bottle/epinephrine = 3,
- /obj/item/reagent_containers/glass/bottle/morphine = 3,
- /obj/item/reagent_containers/glass/bottle/potass_iodide = 1,
- /obj/item/reagent_containers/glass/bottle/salglu_solution = 3,
+ /obj/item/reagent_containers/cup/bottle/multiver = 1,
+ /obj/item/reagent_containers/cup/bottle/syriniver = 1,
+ /obj/item/reagent_containers/cup/bottle/epinephrine = 3,
+ /obj/item/reagent_containers/cup/bottle/morphine = 3,
+ /obj/item/reagent_containers/cup/bottle/potass_iodide = 1,
+ /obj/item/reagent_containers/cup/bottle/salglu_solution = 3,
/obj/item/reagent_containers/syringe/antiviral = 5,
/obj/item/reagent_containers/medigel/libital = 2,
/obj/item/reagent_containers/medigel/aiuri = 2,
/obj/item/reagent_containers/medigel/sterilizine = 1)
- contraband = list(/obj/item/reagent_containers/glass/bottle/cold = 2,
+ contraband = list(/obj/item/reagent_containers/cup/bottle/cold = 2,
/obj/item/restraints/handcuffs = 4,
/obj/item/storage/backpack/duffelbag/syndie/surgery = 1,
/obj/item/storage/medkit/tactical = 1)
diff --git a/code/modules/mapfluff/ruins/spaceruin_code/oldstation.dm b/code/modules/mapfluff/ruins/spaceruin_code/oldstation.dm
index 3d85550d769..1c754575de9 100644
--- a/code/modules/mapfluff/ruins/spaceruin_code/oldstation.dm
+++ b/code/modules/mapfluff/ruins/spaceruin_code/oldstation.dm
@@ -234,7 +234,7 @@
sample.sample_color = COLOR_SAMPLE_BROWN
update_appearance()
-/obj/item/reagent_containers/glass/beaker/oldstation
+/obj/item/reagent_containers/cup/beaker/oldstation
name = "cultivation broth"
amount_per_transfer_from_this = 50
list_reagents = list(
diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm
index 935fd2c3d33..52e72bcbdfe 100644
--- a/code/modules/mapping/mapping_helpers.dm
+++ b/code/modules/mapping/mapping_helpers.dm
@@ -618,7 +618,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava)
else if(isopenturf(thing))
if(locate(/obj/structure/bed/dogbed/ian) in thing)
new /obj/item/clothing/head/festive(thing)
- var/obj/item/reagent_containers/food/drinks/bottle/champagne/iandrink = new(thing)
+ var/obj/item/reagent_containers/cup/glass/bottle/champagne/iandrink = new(thing)
iandrink.name = "dog champagne"
iandrink.pixel_y += 8
iandrink.pixel_x += 8
diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm
index bdaa7ca693e..ea3f4330df3 100644
--- a/code/modules/mining/abandoned_crates.dm
+++ b/code/modules/mining/abandoned_crates.dm
@@ -131,11 +131,11 @@
var/loot = rand(1,100) //100 different crates with varying chances of spawning
switch(loot)
if(1 to 5) //5% chance
- new /obj/item/reagent_containers/food/drinks/bottle/rum(src)
- new /obj/item/reagent_containers/food/drinks/bottle/whiskey(src)
- new /obj/item/reagent_containers/food/drinks/bottle/whiskey(src)
+ new /obj/item/reagent_containers/cup/glass/bottle/rum(src)
+ new /obj/item/reagent_containers/cup/glass/bottle/whiskey(src)
+ new /obj/item/reagent_containers/cup/glass/bottle/whiskey(src)
new /obj/item/lighter(src)
- new /obj/item/reagent_containers/food/drinks/bottle/absinthe/premium(src)
+ new /obj/item/reagent_containers/cup/glass/bottle/absinthe/premium(src)
for(var/i in 1 to 3)
new /obj/item/clothing/mask/cigarette/rollie(src)
if(6 to 10)
@@ -205,7 +205,7 @@
if(87) //1% chance
new /obj/item/weed_extract(src)
if(88)
- new /obj/item/reagent_containers/food/drinks/bottle/lizardwine(src)
+ new /obj/item/reagent_containers/cup/glass/bottle/lizardwine(src)
if(89)
new /obj/item/melee/energy/sword/bananium(src)
if(90)
diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm
index c35d9919053..b5c541f90fe 100644
--- a/code/modules/mining/lavaland/ash_flora.dm
+++ b/code/modules/mining/lavaland/ash_flora.dm
@@ -331,17 +331,17 @@
/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
reqs = list(/obj/item/food/grown/ash_flora/shavings = 5)
time = 30
category = CAT_PRIMAL
-/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_overlays()
+/obj/item/reagent_containers/cup/bowl/mushroom_bowl/update_overlays()
. = ..()
if(!reagents?.total_volume)
return
@@ -349,7 +349,7 @@
filling.color = mix_color_from_reagents(reagents.reagent_list)
. += filling
-/obj/item/reagent_containers/glass/bowl/mushroom_bowl/update_icon_state()
+/obj/item/reagent_containers/cup/bowl/mushroom_bowl/update_icon_state()
if(!reagents || !reagents.total_volume)
icon_state = "mushroom_bowl"
return ..()
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index f5c8f0dd1e5..6b089abb593 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -28,7 +28,7 @@
if(4)
new /obj/item/clothing/glasses/godeye(src)
if(5)
- new /obj/item/reagent_containers/glass/bottle/potion/flight(src)
+ new /obj/item/reagent_containers/cup/bottle/potion/flight(src)
if(6)
new /obj/item/clothing/gloves/gauntlets(src)
if(7)
diff --git a/code/modules/mining/lavaland/tendril_loot.dm b/code/modules/mining/lavaland/tendril_loot.dm
index f3d68151145..990d4810358 100644
--- a/code/modules/mining/lavaland/tendril_loot.dm
+++ b/code/modules/mining/lavaland/tendril_loot.dm
@@ -484,16 +484,16 @@
//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_state()
+/obj/item/reagent_containers/cup/bottle/potion/update_icon_state()
icon_state = "potionflask[reagents.total_volume ? null : "_empty"]"
return ..()
diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm
index 8f41a9ed304..c52cbce7f3e 100644
--- a/code/modules/mining/machine_vending.dm
+++ b/code/modules/mining/machine_vending.dm
@@ -14,8 +14,8 @@
new /datum/data/mining_equipment("10 Marker Beacons", /obj/item/stack/marker_beacon/ten, 100),
new /datum/data/mining_equipment("30 Marker Beacons", /obj/item/stack/marker_beacon/thirty, 300),
new /datum/data/mining_equipment("Skeleton Key", /obj/item/skeleton_key, 777),
- new /datum/data/mining_equipment("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 100),
- new /datum/data/mining_equipment("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe/premium, 100),
+ new /datum/data/mining_equipment("Whiskey", /obj/item/reagent_containers/cup/glass/bottle/whiskey, 100),
+ new /datum/data/mining_equipment("Absinthe", /obj/item/reagent_containers/cup/glass/bottle/absinthe/premium, 100),
new /datum/data/mining_equipment("Bubblegum Gum Packet", /obj/item/storage/box/gum/bubblegum, 100),
new /datum/data/mining_equipment("Cigar", /obj/item/clothing/mask/cigarette/cigar/havana, 150),
new /datum/data/mining_equipment("Soap", /obj/item/soap/nanotrasen, 200),
diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
index cce7a176e45..39e6f76e4bd 100644
--- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
+++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
@@ -32,7 +32,7 @@
disliked_food = FRUIT | CLOTH
liked_food = VEGETABLES
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC
- species_cookie = /obj/item/reagent_containers/food/condiment/milk
+ species_cookie = /obj/item/reagent_containers/condiment/milk
outfit_important_for_life = /datum/outfit/plasmaman
species_language_holder = /datum/language_holder/skeleton
diff --git a/code/modules/mob/living/carbon/human/species_types/skeletons.dm b/code/modules/mob/living/carbon/human/species_types/skeletons.dm
index e8892081d2e..9bfe6887327 100644
--- a/code/modules/mob/living/carbon/human/species_types/skeletons.dm
+++ b/code/modules/mob/living/carbon/human/species_types/skeletons.dm
@@ -37,7 +37,7 @@
wings_icons = list("Skeleton")
//They can technically be in an ERT
changesource_flags = MIRROR_BADMIN | WABBAJACK | ERT_SPAWN
- species_cookie = /obj/item/reagent_containers/food/condiment/milk
+ species_cookie = /obj/item/reagent_containers/condiment/milk
species_language_holder = /datum/language_holder/skeleton
bodypart_overrides = list(
diff --git a/code/modules/mob/living/silicon/robot/robot_model.dm b/code/modules/mob/living/silicon/robot/robot_model.dm
index 89780b77fc5..ebcd0838505 100644
--- a/code/modules/mob/living/silicon/robot/robot_model.dm
+++ b/code/modules/mob/living/silicon/robot/robot_model.dm
@@ -143,7 +143,7 @@
/obj/item/robot_model/proc/respawn_consumable(mob/living/silicon/robot/cyborg, coeff = 1)
SHOULD_CALL_PARENT(TRUE)
-
+
for(var/datum/robot_energy_storage/storage_datum in storages)
storage_datum.energy = min(storage_datum.max_energy, storage_datum.energy + coeff * storage_datum.recharge_rate)
@@ -375,7 +375,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,
@@ -445,7 +445,7 @@
if(block_buffer_change)
return FALSE
- var/obj/item/reagent_containers/glass/bucket/our_bucket = locate(/obj/item/reagent_containers/glass/bucket) in robot_owner.model.modules
+ var/obj/item/reagent_containers/cup/bucket/our_bucket = locate(/obj/item/reagent_containers/cup/bucket) in robot_owner.model.modules
bucket_ref = WEAKREF(our_bucket)
if(!buffer_on)
@@ -547,7 +547,7 @@
robot_owner.balloon_alert(robot_owner, "activation cancelled!")
return FALSE
- var/obj/item/reagent_containers/glass/bucket/our_bucket = bucket_ref?.resolve()
+ var/obj/item/reagent_containers/cup/bucket/our_bucket = bucket_ref?.resolve()
if(!buffer_on && our_bucket?.reagents?.total_volume < 0.1)
robot_owner.balloon_alert(robot_owner, "bucket is empty!")
return FALSE
@@ -558,7 +558,7 @@
SIGNAL_HANDLER
var/mob/living/silicon/robot/robot_owner = owner
- var/obj/item/reagent_containers/glass/bucket/our_bucket = bucket_ref?.resolve()
+ var/obj/item/reagent_containers/cup/bucket/our_bucket = bucket_ref?.resolve()
var/datum/reagents/reagents = our_bucket?.reagents
if(!reagents || reagents.total_volume < 0.1)
@@ -740,9 +740,9 @@
name = "Service"
basic_modules = list(
/obj/item/assembly/flash/cyborg,
- /obj/item/reagent_containers/glass/beaker/large, //I know a shaker is more appropiate but this is for ease of identification
+ /obj/item/reagent_containers/cup/beaker/large, //I know a shaker is more appropiate but this is for ease of identification
//Skyrat Edit Start: Borg Buff
- //obj/item/reagent_containers/food/condiment/enzyme, //edit
+ //obj/item/reagent_containers/condiment/enzyme, //edit
/obj/item/pen,
/obj/item/toy/crayon/spraycan/borg,
/obj/item/extinguisher/mini,
@@ -781,7 +781,7 @@
/obj/item/robot_model/service/respawn_consumable(mob/living/silicon/robot/cyborg, coeff = 1)
..()
- var/obj/item/reagent_containers/enzyme = locate(/obj/item/reagent_containers/food/condiment/enzyme) in basic_modules
+ var/obj/item/reagent_containers/enzyme = locate(/obj/item/reagent_containers/condiment/enzyme) in basic_modules
if(enzyme)
enzyme.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 7da69ada0be..9f33d3d0098 100644
--- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
@@ -410,7 +410,7 @@
/mob/living/simple_animal/bot/cleanbot/explode()
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)
return ..()
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index cc9096549c5..b5d1b765820 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -101,7 +101,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/drinking_oil = new(Tsec)
+ var/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass/drinking_oil = new(Tsec)
drinking_oil.reagents.add_reagent(/datum/reagent/consumable/ethanol/whiskey, 15)
return ..()
diff --git a/code/modules/mob/living/simple_animal/friendly/trader.dm b/code/modules/mob/living/simple_animal/friendly/trader.dm
index 8547c0bb183..2bfabda348c 100644
--- a/code/modules/mob/living/simple_animal/friendly/trader.dm
+++ b/code/modules/mob/living/simple_animal/friendly/trader.dm
@@ -231,7 +231,7 @@
/obj/item/shovel/serrated = 150
)
wanted_items = list(
- /obj/item/reagent_containers/food/condiment/milk = 1000,
+ /obj/item/reagent_containers/condiment/milk = 1000,
/obj/item/stack/sheet/bone = 420
)
buyphrase = "Bone appetit!"
diff --git a/code/modules/mob/living/simple_animal/hostile/goose.dm b/code/modules/mob/living/simple_animal/hostile/goose.dm
index f09bf024490..14284d414cd 100644
--- a/code/modules/mob/living/simple_animal/hostile/goose.dm
+++ b/code/modules/mob/living/simple_animal/hostile/goose.dm
@@ -118,7 +118,7 @@
if(feed(O))
return TRUE
-/mob/living/simple_animal/hostile/retaliate/goose/vomit/feed(obj/item/reagent_containers/food/tasty)
+/mob/living/simple_animal/hostile/retaliate/goose/vomit/feed(obj/item/food/tasty)
. = ..()
if(. || !istype(tasty))
return FALSE
@@ -127,7 +127,7 @@
visible_message(span_notice("[src] looks too full to eat \the [tasty]!"))
message_cooldown = world.time + 5 SECONDS
return FALSE
- if (tasty.foodtype & GROSS)
+ if (tasty.foodtypes & GROSS)
visible_message(span_notice("[src] hungrily gobbles up \the [tasty]!"))
tasty.forceMove(src)
playsound(src,'sound/items/eatfood.ogg', 70, TRUE)
@@ -140,12 +140,12 @@
message_cooldown = world.time + 5 SECONDS
return FALSE
-/mob/living/simple_animal/hostile/retaliate/goose/proc/choke(obj/item/reagent_containers/food/plastic)
+/mob/living/simple_animal/hostile/retaliate/goose/proc/choke(obj/item/food/plastic)
if(stat == DEAD || choking)
return
addtimer(CALLBACK(src, .proc/suffocate), 300)
-/mob/living/simple_animal/hostile/retaliate/goose/vomit/choke(obj/item/reagent_containers/food/plastic)
+/mob/living/simple_animal/hostile/retaliate/goose/vomit/choke(obj/item/food/plastic)
if(stat == DEAD || choking)
return
if(prob(25))
@@ -183,10 +183,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
diff --git a/code/modules/mob_spawn/corpses/mining_corpses.dm b/code/modules/mob_spawn/corpses/mining_corpses.dm
index bcecebfb1cf..0718fb972ec 100644
--- a/code/modules/mob_spawn/corpses/mining_corpses.dm
+++ b/code/modules/mob_spawn/corpses/mining_corpses.dm
@@ -139,7 +139,7 @@
if(!visualsOnly)
clown.fully_replace_character_name(clown.name, pick(GLOB.clown_names))
if(prob(70))
- var/backpack_loot = 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))
+ var/backpack_loot = 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))
if(backpack_loot == /obj/item/pneumatic_cannon/pie)
drop_a_pie_cannon = TRUE
else
@@ -217,4 +217,4 @@
suit_store = /obj/item/tome
back = /obj/item/storage/backpack/cultpack
r_pocket = /obj/item/clothing/glasses/hud/health/night/cultblind
- backpack_contents = list(/obj/item/reagent_containers/glass/beaker/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/beaker/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/mod/mod_theme.dm b/code/modules/mod/mod_theme.dm
index d2937d05865..e911df17462 100644
--- a/code/modules/mod/mod_theme.dm
+++ b/code/modules/mod/mod_theme.dm
@@ -420,8 +420,8 @@
/obj/item/tank/internals,
/obj/item/healthanalyzer,
/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,
@@ -506,8 +506,8 @@
/obj/item/tank/internals,
/obj/item/healthanalyzer,
/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,
diff --git a/code/modules/plumbing/plumbers/pill_press.dm b/code/modules/plumbing/plumbers/pill_press.dm
index 4605ef4a0e5..ecd0f8b5357 100644
--- a/code/modules/plumbing/plumbers/pill_press.dm
+++ b/code/modules/plumbing/plumbers/pill_press.dm
@@ -84,13 +84,13 @@
P.icon_state = patch_style
stored_products += P
else if (product == "bottle")
- var/obj/item/reagent_containers/glass/bottle/P = new(src)
+ var/obj/item/reagent_containers/cup/bottle/P = new(src)
reagents.trans_to(P, current_volume)
P.name = trim("[product_name] bottle")
stored_products += P
//SKYRAT EDIT HYPOVIALS
else if (product == "vial")
- var/obj/item/reagent_containers/glass/vial/small/P = new(src)
+ var/obj/item/reagent_containers/cup/vial/small/P = new(src)
reagents.trans_to(P, current_volume)
P.name = trim("[product_name] vial")
stored_products += P
@@ -98,7 +98,7 @@
if(stored_products.len)
var/pill_amount = 0
for(var/thing in loc)
- if(!istype(thing, /obj/item/reagent_containers/glass/bottle) && !istype(thing, /obj/item/reagent_containers/pill))
+ if(!istype(thing, /obj/item/reagent_containers/cup/bottle) && !istype(thing, /obj/item/reagent_containers/pill))
continue
pill_amount++
if(pill_amount >= max_floor_products) //too much so just stop
diff --git a/code/modules/plumbing/plumbers/reaction_chamber.dm b/code/modules/plumbing/plumbers/reaction_chamber.dm
index eddf6bd3e3c..0e3f790c174 100644
--- a/code/modules/plumbing/plumbers/reaction_chamber.dm
+++ b/code/modules/plumbing/plumbers/reaction_chamber.dm
@@ -23,9 +23,9 @@
///cool/heat power
var/heater_coefficient = 0.05 //same lvl as acclimator
///Beaker that holds the acidic buffer. I don't want to deal with snowflaking so it's just a separate thing. It's a small (50u) beaker
- var/obj/item/reagent_containers/glass/beaker/acidic_beaker
+ var/obj/item/reagent_containers/cup/beaker/acidic_beaker
///beaker that holds the alkaline buffer.
- var/obj/item/reagent_containers/glass/beaker/alkaline_beaker
+ var/obj/item/reagent_containers/cup/beaker/alkaline_beaker
/obj/machinery/plumbing/reaction_chamber/Initialize(mapload, bolt, layer)
. = ..()
diff --git a/code/modules/reagents/chemistry/machinery/chem_mass_spec.dm b/code/modules/reagents/chemistry/machinery/chem_mass_spec.dm
index 163ab86f9ed..2c61c068621 100644
--- a/code/modules/reagents/chemistry/machinery/chem_mass_spec.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_mass_spec.dm
@@ -39,7 +39,7 @@ This will not clean any inverted reagents. Inverted reagents will still be corre
. = ..()
ADD_TRAIT(src, DO_NOT_SPLASH, src.type)
if(mapload)
- beaker2 = new /obj/item/reagent_containers/glass/beaker/large(src)
+ beaker2 = new /obj/item/reagent_containers/cup/beaker/large(src)
AddElement( \
/datum/element/contextual_screentip_bare_hands, \
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index 2e024776752..951fe3c45fe 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -74,7 +74,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)
@@ -420,18 +420,18 @@
reagents.trans_to(P, vol_each, transfered_by = usr)
return TRUE
if(item_type == "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")
adjust_item_drop_location(P)
reagents.trans_to(P, vol_each, transfered_by = usr)
return TRUE
//SKYRAT EDIT ADDTION START
if(item_type == "vial")
- var/obj/item/reagent_containers/glass/vial/small/P
+ var/obj/item/reagent_containers/cup/vial/small/P
for(var/i = 0; i < amount; i++)
- P = new/obj/item/reagent_containers/glass/vial/small(drop_location())
+ P = new/obj/item/reagent_containers/cup/vial/small(drop_location())
P.name = trim("[name] vial")
adjust_item_drop_location(P)
reagents.trans_to(P, vol_each, transfered_by = usr)
@@ -445,18 +445,18 @@
return TRUE
//SKYRAT EDIT ADDTION END
if(item_type == "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.desc = "A small condiment pack. The label says it contains [name]."
reagents.trans_to(P, vol_each, transfered_by = usr)
return TRUE
if(item_type == "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
@@ -618,7 +618,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_recipe_debug.dm b/code/modules/reagents/chemistry/machinery/chem_recipe_debug.dm
index 76e4b0ce7d5..1ef4224a9a2 100644
--- a/code/modules/reagents/chemistry/machinery/chem_recipe_debug.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_recipe_debug.dm
@@ -133,7 +133,7 @@
say(span_warning("Unable to find product [reagent_type] in holder after reaction! reagents found are:"))
for(var/other_reagent in reagents.reagent_list)
say("[other_reagent]")
- var/obj/item/reagent_containers/glass/beaker/bluespace/beaker = new /obj/item/reagent_containers/glass/beaker/bluespace(loc)
+ var/obj/item/reagent_containers/cup/beaker/bluespace/beaker = new /obj/item/reagent_containers/cup/beaker/bluespace(loc)
reagents.trans_to(beaker)
beaker.name = "[cached_reactions[index]] failed"
if(!failed)
@@ -151,7 +151,7 @@
impure_string += "Reaction [cached_reactions[index]] has a product [reagent_type] [span_warning("[reagent.volume]u")] purity of [reagent.purity] index:[index]\n"
cached_purity = reagent.purity
if(beaker_spawn && reagents.total_volume)
- var/obj/item/reagent_containers/glass/beaker/bluespace/beaker = new /obj/item/reagent_containers/glass/beaker/bluespace(loc)
+ var/obj/item/reagent_containers/cup/beaker/bluespace/beaker = new /obj/item/reagent_containers/cup/beaker/bluespace(loc)
reagents.trans_to(beaker)
beaker.name = "[cached_reactions[index]] purity: [cached_purity]"
reagents.clear_reagents()
diff --git a/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm b/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm
index aad8df3c156..a7f7fae02bb 100644
--- a/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm
@@ -45,7 +45,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(span_notice("[src] dispenses a bluespace beaker."))
if("amount")
var/input = text2num(params["amount"])
diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm
index 0470486de21..b7cb4f93849 100644
--- a/code/modules/reagents/chemistry/machinery/pandemic.dm
+++ b/code/modules/reagents/chemistry/machinery/pandemic.dm
@@ -166,7 +166,7 @@
use_power(active_power_usage)
adv_disease = adv_disease.Copy()
var/list/data = list("viruses" = list(adv_disease))
- var/obj/item/reagent_containers/glass/bottle/bottle = new(drop_location())
+ var/obj/item/reagent_containers/cup/bottle/bottle = new(drop_location())
bottle.name = "[adv_disease.name] culture bottle"
bottle.desc = "A small bottle. Contains [adv_disease.agent] culture in synthblood medium."
bottle.reagents.add_reagent(/datum/reagent/blood, 20, data)
@@ -188,7 +188,7 @@
use_power(active_power_usage)
var/id = index
var/datum/disease/disease = SSdisease.archive_diseases[id]
- var/obj/item/reagent_containers/glass/bottle/bottle = new(drop_location())
+ var/obj/item/reagent_containers/cup/bottle/bottle = new(drop_location())
bottle.name = "[disease.name] vaccine bottle"
bottle.reagents.add_reagent(/datum/reagent/vaccine, 15, list(id))
wait = TRUE
diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
index d6615b0868e..8a593bebb0d 100644
--- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
@@ -25,7 +25,7 @@
/obj/machinery/reagentgrinder/Initialize(mapload)
. = ..()
holdingitems = list()
- beaker = new /obj/item/reagent_containers/glass/beaker/large(src)
+ beaker = new /obj/item/reagent_containers/cup/beaker/large(src)
warn_of_dust()
/// Add a description to the current beaker warning of blended dust, if it doesn't already have that warning.
diff --git a/code/modules/reagents/chemistry/recipes/drugs.dm b/code/modules/reagents/chemistry/recipes/drugs.dm
index 0a820469dd1..b692d22b516 100644
--- a/code/modules/reagents/chemistry/recipes/drugs.dm
+++ b/code/modules/reagents/chemistry/recipes/drugs.dm
@@ -141,7 +141,7 @@
/datum/chemical_reaction/blastoff_ampoule/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
var/location = get_turf(holder.my_atom)
for(var/iteration in 1 to created_volume)
- var/obj/item/reagent_containers/glass/blastoff_ampoule/new_ampoule = new(location)
+ var/obj/item/reagent_containers/cup/blastoff_ampoule/new_ampoule = new(location)
new_ampoule.pixel_x = rand(-6, 6)
new_ampoule.pixel_y = rand(-6, 6)
diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
index d1f4cd10897..e4215dc002b 100644
--- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm
+++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
@@ -608,5 +608,5 @@
required_container = /obj/item/slime_extract/rainbow
/datum/chemical_reaction/slime/flight_potion/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
- 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/chemistry/recipes/special.dm b/code/modules/reagents/chemistry/recipes/special.dm
index d89ee442ea8..3079ca1835f 100644
--- a/code/modules/reagents/chemistry/recipes/special.dm
+++ b/code/modules/reagents/chemistry/recipes/special.dm
@@ -5,9 +5,9 @@ GLOBAL_LIST_INIT(medicine_reagents, build_medicine_reagents())
/proc/build_reagents_to_food()
. = list()
- for (var/type in subtypesof(/obj/item/reagent_containers/food))
- var/obj/item/reagent_containers/food/item = new type()
- for(var/datum/reagent/reagent as anything in item.list_reagents)
+ for (var/type in subtypesof(/obj/item/food))
+ var/obj/item/food/item = new type()
+ for(var/datum/reagent/reagent as anything in item.food_reagents)
var/chem_flags = initial(reagent.chemical_flags)
if(!VALID_RANDOM_RECIPE_REAGENT(chem_flags))
continue
@@ -255,7 +255,7 @@ GLOBAL_LIST_INIT(medicine_reagents, build_medicine_reagents())
persistent = TRUE
persistence_period = 7 //Reset every week
randomize_container = TRUE
- possible_containers = list(/obj/item/reagent_containers/glass/bucket) //easy way to ensure no common conflicts
+ possible_containers = list(/obj/item/reagent_containers/cup/bucket) //easy way to ensure no common conflicts
randomize_req_temperature = TRUE
results = list(/datum/reagent/consumable/secretsauce=1)
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index 0675f25faea..c2a7b99738b 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -29,7 +29,7 @@
add_initial_reagents()
//SKYRAT EDIT ADDITION
- AddElement(/datum/element/liquids_interaction, on_interaction_callback = /obj/item/reagent_containers/glass/beaker/.proc/attack_on_liquids_turf)
+ AddElement(/datum/element/liquids_interaction, on_interaction_callback = /obj/item/reagent_containers/cup/beaker/.proc/attack_on_liquids_turf)
/obj/item/reagent_containers/proc/attack_on_liquids_turf(obj/item/reagent_containers/my_beaker, turf/T, mob/living/user, obj/effect/abstract/liquid_turf/liquids)
if(user.combat_mode)
@@ -71,7 +71,7 @@
RegisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_REM_REAGENT), .proc/on_reagent_change)
RegisterSignal(reagents, COMSIG_PARENT_QDELETING, .proc/on_reagents_del)
-/obj/item/reagent_containers/attack(mob/living/M, mob/living/user, params)
+/obj/item/reagent_containers/attack(mob/living/target_mob, mob/living/user, params)
if (!user.combat_mode)
return
return ..()
diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/reagents/reagent_containers/condiment.dm
similarity index 85%
rename from code/modules/food_and_drinks/food/condiment.dm
rename to code/modules/reagents/reagent_containers/condiment.dm
index c9a8227c5c7..092885b14f7 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)
@@ -36,11 +36,11 @@
icon_state = icon_empty
return ..()
-/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(span_suicide("[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, span_warning("None of [src] left, oh no!"))
@@ -66,7 +66,7 @@
playsound(M.loc,'sound/items/drink.ogg', rand(10,50), TRUE)
return TRUE
-/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
@@ -94,14 +94,14 @@
var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this, transfered_by = user)
to_chat(user, span_notice("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]
@@ -109,7 +109,7 @@
. += span_notice("[milk_required] milk, [enzyme_required] enzyme and you got cheese.")
. += span_warning("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"
@@ -119,7 +119,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]
@@ -127,7 +127,7 @@
var/sugar_required = recipe.required_reagents[/datum/reagent/consumable/sugar]
. += span_notice("[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"
@@ -139,7 +139,7 @@
list_reagents = list(/datum/reagent/consumable/salt = 20)
fill_icon_thresholds = null
-/obj/item/reagent_containers/food/condiment/saltshaker/suicide_act(mob/user)
+/obj/item/reagent_containers/condiment/saltshaker/suicide_act(mob/user)
user.visible_message(span_suicide("[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]"
@@ -148,7 +148,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
@@ -161,7 +161,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"
@@ -173,7 +173,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"
@@ -183,7 +183,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]
@@ -191,7 +191,7 @@
. += span_notice("[milk_required] milk, [enzyme_required] enzyme and you got cheese.")
. += span_warning("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"
@@ -201,7 +201,7 @@
list_reagents = list(/datum/reagent/consumable/flour = 30)
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]
@@ -214,7 +214,7 @@
. += span_notice("[dough_flour_required] flour, [dough_water_required] water makes normal dough. You can make flat dough from it.")
. += span_notice("[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"
@@ -224,7 +224,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"
@@ -234,7 +234,7 @@
list_reagents = list(/datum/reagent/consumable/rice = 30)
fill_icon_thresholds = null
-/obj/item/reagent_containers/food/condiment/cornmeal
+/obj/item/reagent_containers/condiment/cornmeal
name = "cornmeal box"
desc = "A big box of cornmeal. Great for southern style cooking."
icon_state = "cornmeal"
@@ -244,48 +244,48 @@
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"
list_reagents = list(/datum/reagent/consumable/mayonnaise = 50)
fill_icon_thresholds = null
-/obj/item/reagent_containers/food/condiment/vinegar
+/obj/item/reagent_containers/condiment/vinegar
name = "vinegar"
desc = "Perfect for chips, if you're feeling Space British."
icon_state = "vinegar"
list_reagents = list(/datum/reagent/consumable/vinegar = 50)
fill_icon_thresholds = null
-/obj/item/reagent_containers/food/condiment/quality_oil
+/obj/item/reagent_containers/condiment/quality_oil
name = "quality oil"
desc = "For the fancy chef inside everyone."
icon_state = "oliveoil"
list_reagents = list(/datum/reagent/consumable/quality_oil = 50)
fill_icon_thresholds = null
-/obj/item/reagent_containers/food/condiment/yoghurt
+/obj/item/reagent_containers/condiment/yoghurt
name = "yoghurt carton"
desc = "Creamy and smooth."
icon_state = "yoghurt"
list_reagents = list(/datum/reagent/consumable/yoghurt = 50)
fill_icon_thresholds = null
-/obj/item/reagent_containers/food/condiment/peanut_butter
+/obj/item/reagent_containers/condiment/peanut_butter
name = "peanut butter"
desc = "Tasty, fattening processed peanuts in a jar."
icon_state = "peanutbutter"
@@ -294,7 +294,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"
@@ -321,19 +321,19 @@
/// Can't use initial(name) for this. This stores the name set by condimasters.
var/originalname = "condiment"
-/obj/item/reagent_containers/food/condiment/pack/create_reagents(max_vol, flags)
+/obj/item/reagent_containers/condiment/pack/create_reagents(max_vol, flags)
. = ..()
RegisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_REM_REAGENT), .proc/on_reagent_add, TRUE)
RegisterSignal(reagents, COMSIG_REAGENTS_DEL_REAGENT, .proc/on_reagent_del, TRUE)
-/obj/item/reagent_containers/food/condiment/pack/update_icon()
+/obj/item/reagent_containers/condiment/pack/update_icon()
SHOULD_CALL_PARENT(FALSE)
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
@@ -355,7 +355,7 @@
. = ..()
/// Handles reagents getting added to the condiment pack.
-/obj/item/reagent_containers/food/condiment/pack/proc/on_reagent_add(datum/reagents/reagents)
+/obj/item/reagent_containers/condiment/pack/proc/on_reagent_add(datum/reagents/reagents)
SIGNAL_HANDLER
var/main_reagent = reagents.get_master_reagent_id()
if(main_reagent in possible_states)
@@ -367,29 +367,29 @@
desc = "A small condiment pack. The label says it contains [originalname]"
/// Handles reagents getting removed from the condiment pack.
-/obj/item/reagent_containers/food/condiment/pack/proc/on_reagent_del(datum/reagents/reagents)
+/obj/item/reagent_containers/condiment/pack/proc/on_reagent_del(datum/reagents/reagents)
SIGNAL_HANDLER
icon_state = "condi_empty"
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 71%
rename from code/modules/reagents/reagent_containers/glass.dm
rename to code/modules/reagents/reagent_containers/cups/_cup.dm
index f0854441bd3..69b150ad4d7
--- 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)
@@ -8,9 +7,54 @@
spillable = TRUE
resistance_flags = ACID_PROOF
+ lefthand_file = 'icons/mob/inhands/misc/drinks_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/misc/drinks_righthand.dmi'
-/obj/item/reagent_containers/glass/attack(mob/M, mob/living/user, obj/target)
- if(!canconsume(M, user))
+ ///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)
+ . += span_notice("It is [lowertext(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
+ if(HAS_TRAIT(H, TRAIT_AGEUSIA))
+ if(drink_type & H.dna.species.toxic_food)
+ to_chat(H, span_warning("You don't feel so good..."))
+ H.adjust_disgust(25 + 30 * fraction)
+ else
+ if(drink_type & H.dna.species.toxic_food)
+ to_chat(H,span_warning("What the hell was that thing?!"))
+ H.adjust_disgust(25 + 30 * fraction)
+ H.add_mood_event("toxic_food", /datum/mood_event/disgusting_food)
+ else if(drink_type & H.dna.species.disliked_food)
+ to_chat(H,span_notice("That didn't taste very good..."))
+ H.adjust_disgust(11 + 15 * fraction)
+ H.add_mood_event("gross_food", /datum/mood_event/gross_food)
+ else if(drink_type & H.dna.species.liked_food)
+ to_chat(H,span_notice("I love this taste!"))
+ H.adjust_disgust(-5 + -2.5 * fraction)
+ H.add_mood_event("fav_food", /datum/mood_event/favorite_food)
+
+ if((drink_type & BREAKFAST) && world.time - SSticker.round_start_time < STOP_SERVING_BREAKFAST)
+ H.add_mood_event("breakfast", /datum/mood_event/breakfast)
+ last_check_time = world.time
+
+/obj/item/reagent_containers/cup/attack(mob/living/target_mob, mob/living/user, obj/target)
+ if(!canconsume(target_mob, user))
return
if(!spillable)
@@ -20,35 +64,41 @@
to_chat(user, span_warning("[src] is empty!"))
return
- if(istype(M))
- if(M != user)
- M.visible_message(span_danger("[user] attempts to feed [M] something from [src]."), \
- span_userdanger("[user] attempts to feed you something from [src]."))
- if(!do_mob(user, M))
- return
- if(!reagents || !reagents.total_volume)
- return // The drink might be empty after the delay, such as by spam-feeding
- M.visible_message(span_danger("[user] feeds [M] something from [src]."), \
- span_userdanger("[user] feeds you something from [src]."))
- log_combat(user, M, "fed", reagents.get_reagent_log_string())
- else
- to_chat(user, span_notice("You swallow a gulp of [src]."))
- SEND_SIGNAL(src, COMSIG_GLASS_DRANK, M, user)
- addtimer(CALLBACK(reagents, /datum/reagents.proc/trans_to, M, 5, TRUE, TRUE, FALSE, user, FALSE, INGEST), 5)
- playsound(M.loc,'sound/items/drink.ogg', rand(10,50), TRUE)
- if(iscarbon(M))
- var/mob/living/carbon/carbon_drinker = M
- var/list/diseases = carbon_drinker.get_static_viruses()
- if(LAZYLEN(diseases))
- var/list/datum/disease/diseases_to_add = list()
- for(var/d in diseases)
- var/datum/disease/malady = d
- if(malady.spread_flags & DISEASE_SPREAD_CONTACT_FLUIDS)
- diseases_to_add += malady
- if(LAZYLEN(diseases_to_add))
- AddComponent(/datum/component/infective, diseases_to_add)
+ if(!istype(target_mob))
+ return
-/obj/item/reagent_containers/glass/afterattack(obj/target, mob/living/user, proximity)
+ if(target_mob != user)
+ target_mob.visible_message(span_danger("[user] attempts to feed [target_mob] something from [src]."), \
+ span_userdanger("[user] attempts to feed you something from [src]."))
+ if(!do_mob(user, 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(span_danger("[user] feeds [target_mob] something from [src]."), \
+ span_userdanger("[user] feeds you something from [src]."))
+ log_combat(user, target_mob, "fed", reagents.get_reagent_log_string())
+ else
+ to_chat(user, span_notice("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, methods = 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
@@ -82,7 +132,7 @@
target.update_appearance()
-/obj/item/reagent_containers/glass/afterattack_secondary(atom/target, mob/user, proximity_flag, click_parameters)
+/obj/item/reagent_containers/cup/afterattack_secondary(atom/target, mob/user, proximity_flag, click_parameters)
if((!proximity_flag) || !check_allowed_items(target,target_self=1))
return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
@@ -104,11 +154,12 @@
target.update_appearance()
return SECONDARY_ATTACK_CONTINUE_CHAIN
-/obj/item/reagent_containers/glass/attackby(obj/item/I, mob/user, params)
+/obj/item/reagent_containers/cup/attackby(obj/item/I, mob/user, params)
var/hotness = I.get_temperature()
if(hotness && reagents)
reagents.expose_temperature(hotness)
to_chat(user, span_notice("You heat [name] with [I]!"))
+ return
//Cooling method
if(istype(I, /obj/item/extinguisher))
@@ -123,28 +174,32 @@
to_chat(user, span_notice("You cool the [name] with the [I]!"))
playsound(loc, 'sound/effects/extinguish.ogg', 75, TRUE, -3)
extinguisher.reagents.remove_all(1)
+ return
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, span_notice("[src] is full."))
- else
- to_chat(user, span_notice("You break [E] in [src]."))
- E.reagents.trans_to(src, E.reagents.total_volume, transfered_by = user)
- qdel(E)
+ if(!reagents)
return
- ..()
+ if(reagents.total_volume >= reagents.maximum_volume)
+ to_chat(user, span_notice("[src] is full."))
+ else
+ to_chat(user, span_notice("You break [E] in [src]."))
+ for(var/datum/reagent/consumable/egg_reagents in E.food_reagents)
+ reagents.add_reagent(egg_reagents)
+ qdel(E)
+ return
+
+ return ..()
/*
* On accidental consumption, make sure the container is partially glass, and continue to the reagent_container proc
*/
-/obj/item/reagent_containers/glass/on_accidental_consumption(mob/living/carbon/M, mob/living/carbon/user, obj/item/source_item, discover_after = TRUE)
- if(!custom_materials)
+/obj/item/reagent_containers/cup/on_accidental_consumption(mob/living/carbon/M, mob/living/carbon/user, obj/item/source_item, discover_after = TRUE)
+ if(isGlass && !custom_materials)
set_custom_materials(list(GET_MATERIAL_REF(/datum/material/glass) = 5))//sets it to glass so, later on, it gets picked up by the glass catch (hope it doesn't 'break' things lol)
return ..()
-/obj/item/reagent_containers/glass/beaker
+/obj/item/reagent_containers/cup/beaker
name = "beaker"
desc = "A beaker. It can hold up to 60 units." //SKYRAT EDIT: Used to say can hold up to 50 units.
icon = 'icons/obj/chemical.dmi'
@@ -156,20 +211,20 @@
possible_transfer_amounts = list(5,10,15,20,30,60) //SKYRAT EDIT: Addition
fill_icon_thresholds = list(0, 1, 20, 40, 60, 80, 100)
-/obj/item/reagent_containers/glass/beaker/Initialize(mapload)
+/obj/item/reagent_containers/cup/beaker/Initialize(mapload)
. = ..()
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'
icon_state = "vapour"
-/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 120 units." //SKYRAT EDIT: Used to say Can hold up to 100 units.
icon_state = "beakerlarge"
@@ -180,7 +235,7 @@
possible_transfer_amounts = list(5,10,15,20,30,40,60,120) //SKYRAT EDIT: New Values
fill_icon_thresholds = list(0, 1, 20, 40, 60, 80, 100)
-/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 150 units." //SKYRAT EDIT: Used to say Can hold up to 120 units
icon_state = "beakerwhite"
@@ -191,7 +246,7 @@
possible_transfer_amounts = list(5,10,15,20,25,30,50,75,150) //SKYRAT EDIT: New Values
fill_icon_thresholds = list(0, 1, 10, 20, 40, 60, 80, 100)
-/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"
@@ -201,7 +256,7 @@
possible_transfer_amounts = list(5,10,15,20,25,30,60,120,180)
fill_icon_thresholds = list(0, 1, 10, 25, 35, 50, 60, 80, 100)
-/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."
@@ -211,7 +266,7 @@
volume = 50
amount_per_transfer_from_this = 10
-/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 \
@@ -222,35 +277,35 @@
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,20,25,30,50,100,300)
-/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/libital
+/obj/item/reagent_containers/cup/beaker/large/libital
name = "libital reserve tank (diluted)"
list_reagents = list(/datum/reagent/medicine/c2/libital = 10,/datum/reagent/medicine/granibitaluri = 40)
-/obj/item/reagent_containers/glass/beaker/large/aiuri
+/obj/item/reagent_containers/cup/beaker/large/aiuri
name = "aiuri reserve tank (diluted)"
list_reagents = list(/datum/reagent/medicine/c2/aiuri = 10, /datum/reagent/medicine/granibitaluri = 40)
-/obj/item/reagent_containers/glass/beaker/large/multiver
+/obj/item/reagent_containers/cup/beaker/large/multiver
name = "multiver reserve tank (diluted)"
list_reagents = list(/datum/reagent/medicine/c2/multiver = 10, /datum/reagent/medicine/granibitaluri = 40)
-/obj/item/reagent_containers/glass/beaker/large/epinephrine
+/obj/item/reagent_containers/cup/beaker/large/epinephrine
name = "epinephrine reserve tank (diluted)"
list_reagents = list(/datum/reagent/medicine/epinephrine = 50)
-/obj/item/reagent_containers/glass/beaker/synthflesh
+/obj/item/reagent_containers/cup/beaker/synthflesh
list_reagents = list(/datum/reagent/medicine/c2/synthflesh = 50)
-/obj/item/reagent_containers/glass/bucket//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
+/obj/item/reagent_containers/cup/bucket
name = "bucket"
desc = "It's a bucket. You can squeeze a mop's contents into it by using right-click." //SKYRAT EDIT CHANGE
icon = 'icons/obj/janitor.dmi'
@@ -278,7 +333,7 @@
ITEM_SLOT_DEX_STORAGE
)
-/obj/item/reagent_containers/glass/bucket/wooden
+/obj/item/reagent_containers/cup/bucket/wooden
name = "wooden bucket"
icon_state = "woodbucket"
inhand_icon_state = "woodbucket"
@@ -288,7 +343,7 @@
#define SQUEEZING_DISPERSAL_PERCENT 0.75 //SKYRAT EDIT ADDITION
-/obj/item/reagent_containers/glass/bucket/attackby(obj/O, mob/living/user, params) //SKYRAT EDIT CHANGE
+/obj/item/reagent_containers/cup/bucket/attackby(obj/O, mob/living/user, params) //SKYRAT EDIT CHANGE
if(istype(O, /obj/item/mop)) //SKYRAT EDIT CHANGE
var/is_right_clicking = LAZYACCESS(params2list(params), RIGHT_CLICK)
if(is_right_clicking)
@@ -313,13 +368,12 @@
qdel(O)
qdel(src)
user.put_in_hands(new /obj/item/bot_assembly/cleanbot)
- else
- ..()
+ return
#undef SQUEEZING_DISPERSAL_PERCENT //SKYRAT EDIT ADDITION
-/obj/item/reagent_containers/glass/bucket/equipped(mob/user, slot)
- ..()
+/obj/item/reagent_containers/cup/bucket/equipped(mob/user, slot)
+ . = ..()
if (slot == ITEM_SLOT_HEAD)
if(reagents.total_volume)
to_chat(user, span_userdanger("[src]'s contents spill all over you!"))
@@ -327,11 +381,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(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)
@@ -348,7 +402,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"
@@ -360,13 +414,13 @@
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(grinded)
grinded.forceMove(drop_location())
grinded = null
to_chat(user, span_notice("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)
@@ -427,7 +481,7 @@
return
to_chat(user, span_warning("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)
diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/cups/bottle.dm
similarity index 71%
rename from code/modules/reagents/reagent_containers/bottle.dm
rename to code/modules/reagents/reagent_containers/cups/bottle.dm
index 0cca5b225f5..458cdc687b1 100644
--- a/code/modules/reagents/reagent_containers/bottle.dm
+++ b/code/modules/reagents/reagent_containers/cups/bottle.dm
@@ -1,217 +1,223 @@
-//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"
inhand_icon_state = "atoxinbottle"
worn_icon_state = "bottle"
- possible_transfer_amounts = list(5,10,15,25,30)
+ possible_transfer_amounts = list(5, 10, 15, 25, 30)
volume = 30
fill_icon_thresholds = list(0, 1, 20, 40, 60, 80, 100)
-/obj/item/reagent_containers/glass/bottle/Initialize(mapload)
+/obj/item/reagent_containers/cup/bottle/Initialize(mapload)
. = ..()
if(!icon_state)
icon_state = "bottle"
update_appearance()
-/obj/item/reagent_containers/glass/bottle/epinephrine
+/obj/item/reagent_containers/cup/bottle/epinephrine
name = "epinephrine bottle"
desc = "A small bottle. Contains epinephrine - used to stabilize patients."
list_reagents = list(/datum/reagent/medicine/epinephrine = 30)
-/obj/item/reagent_containers/glass/bottle/toxin
+/obj/item/reagent_containers/cup/bottle/toxin
name = "toxin bottle"
desc = "A small bottle of toxins. Do not drink, it is poisonous."
list_reagents = list(/datum/reagent/toxin = 30)
-/obj/item/reagent_containers/glass/bottle/cyanide
+/obj/item/reagent_containers/cup/bottle/cyanide
name = "cyanide bottle"
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"
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"
desc = "A small bottle of morphine."
icon = 'icons/obj/chemical.dmi'
list_reagents = list(/datum/reagent/medicine/morphine = 30)
-/obj/item/reagent_containers/glass/bottle/chloralhydrate
+/obj/item/reagent_containers/cup/bottle/chloralhydrate
name = "chloral hydrate bottle"
desc = "A small bottle of Choral Hydrate. Mickey's Favorite!"
icon_state = "bottle20"
list_reagents = list(/datum/reagent/toxin/chloralhydrate = 15)
-/obj/item/reagent_containers/glass/bottle/mannitol
+/obj/item/reagent_containers/cup/bottle/mannitol
name = "mannitol bottle"
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/multiver
+/obj/item/reagent_containers/cup/bottle/multiver
name = "multiver bottle"
desc = "A small bottle of multiver, which removes toxins and other chemicals from the bloodstream but causes shortness of breath. All effects scale with the amount of reagents in the patient."
list_reagents = list(/datum/reagent/medicine/c2/multiver = 30)
-/obj/item/reagent_containers/glass/bottle/calomel
+/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/glass/bottle/syriniver
+/obj/item/reagent_containers/cup/bottle/syriniver
name = "syriniver bottle"
desc = "A small bottle of syriniver."
list_reagents = list(/datum/reagent/medicine/c2/syriniver = 30)
-/obj/item/reagent_containers/glass/bottle/mutagen
+/obj/item/reagent_containers/cup/bottle/mutagen
name = "unstable mutagen bottle"
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"
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"
desc = "A small bottle of synaptizine."
list_reagents = list(/datum/reagent/medicine/synaptizine = 30)
-/obj/item/reagent_containers/glass/bottle/ammonia
+/obj/item/reagent_containers/cup/bottle/ammonia
name = "ammonia bottle"
desc = "A small bottle of ammonia."
list_reagents = list(/datum/reagent/ammonia = 30)
-/obj/item/reagent_containers/glass/bottle/diethylamine
+/obj/item/reagent_containers/cup/bottle/diethylamine
name = "diethylamine bottle"
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"
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"
desc = "A small bottle. Contains the liquid essence of the gods."
icon = 'icons/obj/drinks.dmi'
icon_state = "holyflask"
list_reagents = list(/datum/reagent/medicine/adminordrazine = 30)
-/obj/item/reagent_containers/glass/bottle/capsaicin
+/obj/item/reagent_containers/cup/bottle/capsaicin
name = "Capsaicin Bottle"
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"
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"
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"
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"
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"
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"
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"
desc = "A small bottle. Contains formaldehyde, a chemical that prevents organs from decaying."
list_reagents = list(/datum/reagent/toxin/formaldehyde = 30)
-/obj/item/reagent_containers/glass/bottle/initropidril
+/obj/item/reagent_containers/cup/bottle/initropidril
name = "initropidril bottle"
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"
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"
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"
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"
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"
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"
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"
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"
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 solution bottle"
desc = "A small bottle of saline-glucose solution."
list_reagents = list(/datum/reagent/medicine/salglu_solution = 30)
-/obj/item/reagent_containers/glass/bottle/atropine
+/obj/item/reagent_containers/cup/bottle/atropine
name = "atropine bottle"
desc = "A small bottle of atropine."
list_reagents = list(/datum/reagent/medicine/atropine = 30)
-/obj/item/reagent_containers/glass/bottle/random_buffer
+/obj/item/reagent_containers/cup/bottle/random_buffer
name = "Buffer bottle"
desc = "A small bottle of chemical buffer."
-/obj/item/reagent_containers/glass/bottle/random_buffer/Initialize(mapload)
+/obj/item/reagent_containers/cup/bottle/random_buffer/Initialize(mapload)
. = ..()
if(prob(50))
name = "Acidic buffer bottle"
@@ -222,232 +228,232 @@
desc = "A small bottle of basic buffer."
reagents.add_reagent(/datum/reagent/reaction_agent/basic_buffer, 30)
-/obj/item/reagent_containers/glass/bottle/acidic_buffer
+/obj/item/reagent_containers/cup/bottle/acidic_buffer
name = "Acidic buffer bottle"
desc = "A small bottle of acidic buffer."
list_reagents = list(/datum/reagent/reaction_agent/acidic_buffer = 30)
-/obj/item/reagent_containers/glass/bottle/basic_buffer
+/obj/item/reagent_containers/cup/bottle/basic_buffer
name = "Basic buffer bottle"
desc = "A small bottle of basic buffer."
list_reagents = list(/datum/reagent/reaction_agent/basic_buffer = 30)
-/obj/item/reagent_containers/glass/bottle/romerol
+/obj/item/reagent_containers/cup/bottle/romerol
name = "romerol bottle"
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
+/obj/item/reagent_containers/cup/bottle/random_virus
name = "Experimental disease culture bottle"
desc = "A small bottle. Contains an untested viral culture in synthblood medium."
spawned_disease = /datum/disease/advance/random
-/obj/item/reagent_containers/glass/bottle/pierrot_throat
+/obj/item/reagent_containers/cup/bottle/pierrot_throat
name = "Pierrot's Throat culture bottle"
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"
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"
desc = "A small bottle. Contains H13N1 flu virion culture in synthblood medium."
spawned_disease = /datum/disease/advance/flu
-/obj/item/reagent_containers/glass/bottle/retrovirus
+/obj/item/reagent_containers/cup/bottle/retrovirus
name = "Retrovirus culture bottle"
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"
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"
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"
desc = "A small bottle. Contains Cryptococcus Cosmosis culture in synthblood medium."
icon_state = "bottle3"
spawned_disease = /datum/disease/brainrot
-/obj/item/reagent_containers/glass/bottle/magnitis
+/obj/item/reagent_containers/cup/bottle/magnitis
name = "Magnitis culture bottle"
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"
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"
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"
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"
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"
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"
desc = "A small bottle containing Bio Virus Antidote Kit."
list_reagents = list(/datum/reagent/vaccine/fungal_tb = 30)
//Oldstation.dmm chemical storage bottles
-/obj/item/reagent_containers/glass/bottle/hydrogen
+/obj/item/reagent_containers/cup/bottle/hydrogen
name = "hydrogen bottle"
list_reagents = list(/datum/reagent/hydrogen = 30)
-/obj/item/reagent_containers/glass/bottle/lithium
+/obj/item/reagent_containers/cup/bottle/lithium
name = "lithium bottle"
list_reagents = list(/datum/reagent/lithium = 30)
-/obj/item/reagent_containers/glass/bottle/carbon
+/obj/item/reagent_containers/cup/bottle/carbon
name = "carbon bottle"
list_reagents = list(/datum/reagent/carbon = 30)
-/obj/item/reagent_containers/glass/bottle/nitrogen
+/obj/item/reagent_containers/cup/bottle/nitrogen
name = "nitrogen bottle"
list_reagents = list(/datum/reagent/nitrogen = 30)
-/obj/item/reagent_containers/glass/bottle/oxygen
+/obj/item/reagent_containers/cup/bottle/oxygen
name = "oxygen bottle"
list_reagents = list(/datum/reagent/oxygen = 30)
-/obj/item/reagent_containers/glass/bottle/fluorine
+/obj/item/reagent_containers/cup/bottle/fluorine
name = "fluorine bottle"
list_reagents = list(/datum/reagent/fluorine = 30)
-/obj/item/reagent_containers/glass/bottle/sodium
+/obj/item/reagent_containers/cup/bottle/sodium
name = "sodium bottle"
list_reagents = list(/datum/reagent/sodium = 30)
-/obj/item/reagent_containers/glass/bottle/aluminium
+/obj/item/reagent_containers/cup/bottle/aluminium
name = "aluminium bottle"
list_reagents = list(/datum/reagent/aluminium = 30)
-/obj/item/reagent_containers/glass/bottle/silicon
+/obj/item/reagent_containers/cup/bottle/silicon
name = "silicon bottle"
list_reagents = list(/datum/reagent/silicon = 30)
-/obj/item/reagent_containers/glass/bottle/phosphorus
+/obj/item/reagent_containers/cup/bottle/phosphorus
name = "phosphorus bottle"
list_reagents = list(/datum/reagent/phosphorus = 30)
-/obj/item/reagent_containers/glass/bottle/sulfur
+/obj/item/reagent_containers/cup/bottle/sulfur
name = "sulfur bottle"
list_reagents = list(/datum/reagent/sulfur = 30)
-/obj/item/reagent_containers/glass/bottle/chlorine
+/obj/item/reagent_containers/cup/bottle/chlorine
name = "chlorine bottle"
list_reagents = list(/datum/reagent/chlorine = 30)
-/obj/item/reagent_containers/glass/bottle/potassium
+/obj/item/reagent_containers/cup/bottle/potassium
name = "potassium bottle"
list_reagents = list(/datum/reagent/potassium = 30)
-/obj/item/reagent_containers/glass/bottle/iron
+/obj/item/reagent_containers/cup/bottle/iron
name = "iron bottle"
list_reagents = list(/datum/reagent/iron = 30)
-/obj/item/reagent_containers/glass/bottle/copper
+/obj/item/reagent_containers/cup/bottle/copper
name = "copper bottle"
list_reagents = list(/datum/reagent/copper = 30)
-/obj/item/reagent_containers/glass/bottle/mercury
+/obj/item/reagent_containers/cup/bottle/mercury
name = "mercury bottle"
list_reagents = list(/datum/reagent/mercury = 30)
-/obj/item/reagent_containers/glass/bottle/radium
+/obj/item/reagent_containers/cup/bottle/radium
name = "radium bottle"
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"
list_reagents = list(/datum/reagent/water = 30)
-/obj/item/reagent_containers/glass/bottle/ethanol
+/obj/item/reagent_containers/cup/bottle/ethanol
name = "ethanol bottle"
list_reagents = list(/datum/reagent/consumable/ethanol = 30)
-/obj/item/reagent_containers/glass/bottle/sugar
+/obj/item/reagent_containers/cup/bottle/sugar
name = "sugar bottle"
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"
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"
list_reagents = list(/datum/reagent/fuel = 30)
-/obj/item/reagent_containers/glass/bottle/silver
+/obj/item/reagent_containers/cup/bottle/silver
name = "silver bottle"
list_reagents = list(/datum/reagent/silver = 30)
-/obj/item/reagent_containers/glass/bottle/iodine
+/obj/item/reagent_containers/cup/bottle/iodine
name = "iodine bottle"
list_reagents = list(/datum/reagent/iodine = 30)
-/obj/item/reagent_containers/glass/bottle/bromine
+/obj/item/reagent_containers/cup/bottle/bromine
name = "bromine bottle"
list_reagents = list(/datum/reagent/bromine = 30)
-/obj/item/reagent_containers/glass/bottle/thermite
+/obj/item/reagent_containers/cup/bottle/thermite
name = "thermite bottle"
list_reagents = list(/datum/reagent/thermite = 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"
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"
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"
desc = "A small bottle. Contains flash powder."
list_reagents = list(/datum/reagent/flash_powder = 30)
-/obj/item/reagent_containers/glass/bottle/exotic_stabilizer
+/obj/item/reagent_containers/cup/bottle/exotic_stabilizer
name = "exotic stabilizer bottle"
desc = "A small bottle. Contains exotic stabilizer."
list_reagents = list(/datum/reagent/exotic_stabilizer = 30)
-/obj/item/reagent_containers/glass/bottle/leadacetate
+/obj/item/reagent_containers/cup/bottle/leadacetate
name = "lead acetate bottle"
desc = "A small bottle. Contains lead acetate."
list_reagents = list(/datum/reagent/toxin/leadacetate = 30)
-/obj/item/reagent_containers/glass/bottle/caramel
+/obj/item/reagent_containers/cup/bottle/caramel
name = "bottle of caramel"
desc = "A bottle containing caramalized sugar, also known as caramel. Do not lick."
list_reagents = list(/datum/reagent/consumable/caramel = 30)
diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/reagents/reagent_containers/cups/drinkingglass.dm
similarity index 66%
rename from code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
rename to code/modules/reagents/reagent_containers/cups/drinkingglass.dm
index b078c265724..bcf37422af4 100644
--- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
+++ b/code/modules/reagents/reagent_containers/cups/drinkingglass.dm
@@ -1,4 +1,4 @@
-/obj/item/reagent_containers/food/drinks/drinkingglass
+/obj/item/reagent_containers/cup/glass/drinkingglass
name = "drinking glass"
desc = "Your standard drinking glass."
icon_state = "glass_empty"
@@ -16,26 +16,26 @@
pickup_sound = 'sound/items/handling/drinkglass_pickup.ogg'
custom_price = PAYCHECK_LOWER
-/obj/item/reagent_containers/food/drinks/drinkingglass/on_reagent_change(datum/reagents/holder, ...)
+/obj/item/reagent_containers/cup/glass/drinkingglass/on_reagent_change(datum/reagents/holder, ...)
. = ..()
if(!length(reagents.reagent_list))
renamedByPlayer = FALSE //so new drinks can rename the glass
-/obj/item/reagent_containers/food/drinks/drinkingglass/update_name(updates)
+/obj/item/reagent_containers/cup/glass/drinkingglass/update_name(updates)
if(renamedByPlayer)
return
. = ..()
var/datum/reagent/largest_reagent = reagents.get_master_reagent()
name = largest_reagent?.glass_name || initial(name)
-/obj/item/reagent_containers/food/drinks/drinkingglass/update_desc(updates)
+/obj/item/reagent_containers/cup/glass/drinkingglass/update_desc(updates)
if(renamedByPlayer)
return
. = ..()
var/datum/reagent/largest_reagent = reagents.get_master_reagent()
desc = largest_reagent?.glass_desc || initial(desc)
-/obj/item/reagent_containers/food/drinks/drinkingglass/update_icon_state()
+/obj/item/reagent_containers/cup/glass/drinkingglass/update_icon_state()
if(!reagents.total_volume)
icon_state = base_icon_state
return ..()
@@ -53,8 +53,10 @@
icon_state = base_icon_state
return ..()
-/obj/item/reagent_containers/food/drinks/drinkingglass/proc/get_glass_icon(datum/reagent/largest_reagent)
- return largest_reagent?.glass_icon_state
+/obj/item/reagent_containers/cup/glass/drinkingglass/proc/get_glass_icon(datum/reagent/largest_reagent)
+ if(!largest_reagent)
+ return FALSE
+ return largest_reagent.glass_icon_state
//Shot glasses!//
// This lets us add shots in here instead of lumping them in with drinks because >logic //
@@ -63,7 +65,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."
icon_state = "shotglass"
@@ -76,13 +78,13 @@
custom_materials = list(/datum/material/glass=100)
custom_price = PAYCHECK_CREW * 0.4
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/update_name(updates)
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass/update_name(updates)
if(renamedByPlayer)
return
. = ..()
name = "[length(reagents.reagent_list) ? "filled " : null]shot glass"
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/update_desc(updates)
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass/update_desc(updates)
if(renamedByPlayer)
return
. = ..()
@@ -91,32 +93,19 @@
else
desc = "The challenge is not taking as many as you can, but guessing what it is before you pass out."
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/get_glass_icon(datum/reagent/largest_reagent)
- return largest_reagent?.shot_glass_icon_state
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass/get_glass_icon(datum/reagent/largest_reagent)
+ if(!largest_reagent)
+ return FALSE
+ return largest_reagent.shot_glass_icon_state
-/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)
-/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)
-/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)
-
-/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, span_notice("[src] is full."))
- else
- to_chat(user, span_notice("You break [E] in [src]."))
- reagents.add_reagent(/datum/reagent/consumable/eggyolk, 2)
- reagents.add_reagent(/datum/reagent/consumable/eggwhite, 4)
- qdel(E)
- return
- else
- ..()
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 00000000000..0632e93a413
--- /dev/null
+++ b/code/modules/reagents/reagent_containers/cups/drinks.dm
@@ -0,0 +1,492 @@
+////////////////////////////////////////////////////////////////////////////////
+/// 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/ice
+ name = "ice cup"
+ desc = "Careful, cold ice, do not chew."
+ custom_price = PAYCHECK_LOWER * 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"
+ inhand_icon_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/coco
+ name = "Dutch hot coco"
+ desc = "Made in Space South America."
+ list_reagents = list(/datum/reagent/consumable/hot_coco = 15, /datum/reagent/consumable/sugar = 5)
+ drink_type = SUGAR
+ resistance_flags = FREEZE_PROOF
+ custom_price = PAYCHECK_CREW * 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/salt = 3)
+ drink_type = GRAIN
+ isGlass = FALSE
+ custom_price = PAYCHECK_CREW * 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"
+ inhand_icon_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_LOWER * 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)
+ . += span_notice("The cap seems to be missing.")
+ else if(cap_on)
+ . += span_notice("The cap is firmly on to prevent spilling. Alt-click to remove the cap.")
+ else
+ . += span_notice("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, span_warning("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, span_warning("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, span_notice("You remove the cap from [src]."))
+ else
+ cap_on = TRUE
+ spillable = FALSE
+ to_chat(user, span_notice("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, span_warning("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.combat_mode)))
+ to_chat(user, span_warning("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, span_warning("[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(span_notice("[src] lands upright!"))
+ if(throwingdatum.thrower)
+ var/mob/living/living_thrower = throwingdatum.thrower
+ living_thrower.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 += span_notice("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"
+ inhand_icon_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 72%
rename from code/modules/food_and_drinks/drinks/drinks/bottle.dm
rename to code/modules/reagents/reagent_containers/cups/glassbottle.dm
index eb9c0d8e19c..63aec93dc46 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/reagents/reagent_containers/cups/glassbottle.dm
@@ -1,10 +1,10 @@
-
+#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"
@@ -17,26 +17,23 @@
throwforce = 15
demolition_mod = 0.25
inhand_icon_state = "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
- age_restricted = TRUE // wrryy can't set an init value to see if foodtype contains ALCOHOL so here we go
+ drink_type = ALCOHOL
+ age_restricted = TRUE // wrryy can't set an init value to see if drink_type contains ALCOHOL so here we go
///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/food/drinks/bottle/small
+/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_CREW * 0.9
-/obj/item/reagent_containers/food/drinks/bottle/smash(mob/living/target, mob/thrower, ranged = FALSE)
+/obj/item/reagent_containers/cup/glass/bottle/smash(mob/living/target, mob/thrower, ranged = FALSE)
if(bartender_check(target) && ranged)
return
SplashReagents(target, ranged, override_spillable = TRUE)
- var/obj/item/broken_bottle/B = new (loc)
+ var/obj/item/broken_bottle/B = new(loc)
if(!ranged && thrower)
thrower.put_in_hands(B)
B.mimic_broken(src, target)
@@ -44,17 +41,17 @@
qdel(src)
target.Bumped(B)
-/obj/item/reagent_containers/food/drinks/bottle/attack_secondary(atom/target, mob/living/user, params)
+/obj/item/reagent_containers/cup/glass/bottle/try_splash(mob/living/user, atom/target)
- if(!target)
+ if(!target || !isliving(target))
return ..()
if(HAS_TRAIT(user, TRAIT_PACIFISM))
to_chat(user, span_warning("You don't want to harm [target]!"))
- return SECONDARY_ATTACK_CONTINUE_CHAIN
+ return FALSE
- if(!isliving(target) || !isGlass)
- return SECONDARY_ATTACK_CONTINUE_CHAIN
+ if(!isGlass)
+ return FALSE
var/mob/living/living_target = target
var/obj/item/bodypart/affecting = user.zone_selected //Find what the player is aiming at
@@ -67,14 +64,11 @@
var/mob/living/carbon/human/H = target
var/headarmor = 0 // Target's head armor
- armor_block = H.run_armor_check(affecting, MELEE,"","",armour_penetration) // For normal attack damage
+ armor_block = H.run_armor_check(affecting, 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) && affecting == BODY_ZONE_HEAD)
- headarmor = H.head.armor.melee
- else
- headarmor = 0
-
+ headarmor = (H.head.armor.melee) || 0
//Calculate the knockdown duration for the target.
armor_duration = (bottle_knockdown_duration - headarmor) + force
@@ -89,7 +83,7 @@
// You are going to knock someone down for longer if they are not wearing a helmet.
var/head_attack_message = ""
- if(affecting == BODY_ZONE_HEAD && istype(target, /mob/living/carbon/))
+ if(affecting == BODY_ZONE_HEAD && iscarbon(target))
head_attack_message = " on the head"
if(armor_duration)
living_target.apply_effect(min(armor_duration, 200) , EFFECT_KNOCKDOWN)
@@ -108,7 +102,7 @@
//Finally, smash the bottle. This kills (del) the bottle.
smash(target, user)
- return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+ return TRUE
//Keeping this here for now, I'll ask if I should keep it here.
/obj/item/broken_bottle
@@ -123,8 +117,6 @@
demolition_mod = 0.25
w_class = WEIGHT_CLASS_TINY
inhand_icon_state = "broken_beer"
- lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi'
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb_continuous = list("stabs", "slashes", "attacks")
attack_verb_simple = list("stab", "slash", "attack")
@@ -135,209 +127,208 @@
. = ..()
AddComponent(/datum/component/caltrop, min_damage = force)
AddComponent(/datum/component/butchering, \
- speed = 20 SECONDS, \
- effectiveness = 55, \
+ speed = 20 SECONDS, \
+ effectiveness = 55, \
)
/// 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/food/drinks/to_mimic, atom/target)
+/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(to_mimic.isGlass)
+ 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, SFX_SHATTER, 70, TRUE)
- else
- force = 0
- throwforce = 0
- desc = "A carton with the bottom half burst open. Might give you a papercut."
-
name = "broken [to_mimic.name]"
to_mimic.transfer_fingerprints_to(src)
-/obj/item/reagent_containers/food/drinks/bottle/beer
+/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)
- foodtype = GRAIN | ALCOHOL
+ drink_type = GRAIN | ALCOHOL
custom_price = PAYCHECK_CREW
-/obj/item/reagent_containers/food/drinks/bottle/beer/almost_empty
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty
list_reagents = list(/datum/reagent/consumable/ethanol/beer = 1)
-/obj/item/reagent_containers/food/drinks/bottle/beer/light
+/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/food/drinks/bottle/rootbeer
+/obj/item/reagent_containers/cup/glass/bottle/rootbeer
name = "Two-Time root beer"
desc = "A popular, old-fashioned brand of root beer, known for its extremely sugary formula. Might make you want a nap afterwards."
volume = 30
list_reagents = list(/datum/reagent/consumable/rootbeer = 30)
- foodtype = SUGAR | JUNKFOOD
+ drink_type = SUGAR | JUNKFOOD
custom_price = PAYCHECK_CREW * 1.5
custom_premium_price = PAYCHECK_CREW * 2
-/obj/item/reagent_containers/food/drinks/bottle/ale
+/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)
- foodtype = GRAIN | ALCOHOL
+ drink_type = GRAIN | ALCOHOL
custom_price = PAYCHECK_CREW
-/obj/item/reagent_containers/food/drinks/bottle/gin
+/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/kong
+/obj/item/reagent_containers/cup/glass/bottle/kong
name = "Kong"
desc = "Makes You Go Ape!®"
list_reagents = list(/datum/reagent/consumable/ethanol/whiskey/kong = 100)
-/obj/item/reagent_containers/food/drinks/bottle/candycornliquor
+/obj/item/reagent_containers/cup/glass/bottle/candycornliquor
name = "candy corn liquor"
desc = "Like they drank in 2D speakeasies."
list_reagents = list(/datum/reagent/consumable/ethanol/whiskey/candycorn = 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
age_restricted = FALSE
-/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/maltliquor
+/obj/item/reagent_containers/cup/glass/bottle/maltliquor
name = "\improper Rabid Bear malt liquor"
desc = "A 40 full of malt liquor. Kicks stronger than, well, a rabid bear."
icon_state = "maltliquorbottle"
list_reagents = list(/datum/reagent/consumable/ethanol/beer/maltliquor = 100)
custom_price = PAYCHECK_CREW
-/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/holywater/hell
+/obj/item/reagent_containers/cup/glass/bottle/holywater/hell
desc = "A flask of holy water...it's been sitting in the Necropolis a while though."
list_reagents = list(/datum/reagent/hellwater = 100)
-/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
-/obj/item/reagent_containers/food/drinks/bottle/wine/add_initial_reagents()
+/obj/item/reagent_containers/cup/glass/bottle/wine/add_initial_reagents()
. = ..()
var/wine_info = generate_vintage()
- var/datum/reagent/consumable/ethanol/wine/W = locate() in reagents.reagent_list
- if(W)
- LAZYSET(W.data,"vintage",wine_info)
+ var/datum/reagent/consumable/ethanol/wine/located_wine = locate() in reagents.reagent_list
+ if(located_wine)
+ LAZYSET(located_wine.data, "vintage", wine_info)
-/obj/item/reagent_containers/food/drinks/bottle/wine/proc/generate_vintage()
+/obj/item/reagent_containers/cup/glass/bottle/wine/proc/generate_vintage()
return "[GLOB.year_integer + 540] Nanotrasen Light Red"
-/obj/item/reagent_containers/food/drinks/bottle/wine/unlabeled
+/obj/item/reagent_containers/cup/glass/bottle/wine/unlabeled
name = "unlabeled wine bottle"
desc = "There's no label on this wine bottle."
-/obj/item/reagent_containers/food/drinks/bottle/wine/unlabeled/generate_vintage()
+/obj/item/reagent_containers/cup/glass/bottle/wine/unlabeled/generate_vintage()
var/current_year = GLOB.year_integer + 540
var/year = rand(current_year-50,current_year)
var/type = pick("Sparkling","Dry White","Sweet White","Rich White","Rose","Light Red","Medium Red","Bold Red","Dessert")
var/origin = pick("Nanotrasen","Syndicate","Local")
return "[year] [origin] [type]"
-/obj/item/reagent_containers/food/drinks/bottle/absinthe
+/obj/item/reagent_containers/cup/glass/bottle/absinthe
name = "extra-strong absinthe"
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.
@@ -351,9 +342,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))
@@ -372,47 +368,47 @@
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/amaretto
+/obj/item/reagent_containers/cup/glass/bottle/amaretto
name = "Luini Amaretto"
desc = "A gentle and syrup like drink, tastes of almonds and apricots"
icon_state = "disaronno"
list_reagents = list(/datum/reagent/consumable/ethanol/amaretto = 100)
-/obj/item/reagent_containers/food/drinks/bottle/grappa
+/obj/item/reagent_containers/cup/glass/bottle/grappa
name = "Phillipes 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"
@@ -423,154 +419,72 @@
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/bitters
+/obj/item/reagent_containers/cup/glass/bottle/bitters
name = "Andromeda Bitters"
desc = "An aromatic addition to any drink. Made in New Trinidad, now and forever."
icon_state = "bitters_bottle"
volume = 30
list_reagents = list(/datum/reagent/consumable/ethanol/bitters = 30)
-/obj/item/reagent_containers/food/drinks/bottle/curacao
+/obj/item/reagent_containers/cup/glass/bottle/curacao
name = "Beekhof Blauw Curaçao"
desc = "Still produced on the island of Curaçao, after all these years."
icon_state = "curacao_bottle"
list_reagents = list(/datum/reagent/consumable/ethanol/curacao = 100)
-/obj/item/reagent_containers/food/drinks/bottle/navy_rum
+/obj/item/reagent_containers/cup/glass/bottle/navy_rum
name = "Pride of the Union Navy-Strength Rum"
desc = "Ironically named, given it's made in Bermuda."
icon_state = "navy_rum_bottle"
list_reagents = list(/datum/reagent/consumable/ethanol/navy_rum = 100)
-//////////////////////////JUICES AND STUFF ///////////////////////
-
-/obj/item/reagent_containers/food/drinks/bottle/orangejuice
- name = "orange juice"
- desc = "Full of vitamins and deliciousness!"
- custom_price = PAYCHECK_CREW
- icon_state = "orangejuice"
- inhand_icon_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
- age_restricted = FALSE
-
-/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 = PAYCHECK_CREW
- icon_state = "cream"
- inhand_icon_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
- age_restricted = FALSE
-
-/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 = PAYCHECK_CREW
- icon_state = "tomatojuice"
- inhand_icon_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
- age_restricted = FALSE
-
-/obj/item/reagent_containers/food/drinks/bottle/limejuice
- name = "lime juice"
- desc = "Sweet-sour goodness."
- custom_price = PAYCHECK_CREW
- icon_state = "limejuice"
- inhand_icon_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
- age_restricted = FALSE
-
-/obj/item/reagent_containers/food/drinks/bottle/pineapplejuice
- name = "pineapple juice"
- desc = "Extremely tart, yellow juice."
- custom_price = PAYCHECK_CREW
- icon_state = "pineapplejuice"
- inhand_icon_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
- age_restricted = FALSE
-
-/obj/item/reagent_containers/food/drinks/bottle/menthol
- name = "menthol"
- desc = "Tastes naturally minty, and imparts a very mild numbing sensation."
- custom_price = PAYCHECK_CREW
- icon_state = "mentholbox"
- inhand_icon_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 = PAYCHECK_CREW
icon_state = "grenadine"
- isGlass = TRUE
list_reagents = list(/datum/reagent/consumable/grenadine = 100)
- foodtype = FRUIT
+ drink_type = FRUIT
age_restricted = FALSE
-/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 = PAYCHECK_CREW
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."
icon_state = "champagne_bottle"
base_icon_state = "champagne_bottle"
reagent_flags = TRANSPARENT
spillable = FALSE
- isGlass = TRUE
list_reagents = list(/datum/reagent/consumable/ethanol/champagne = 100)
-
-/obj/item/reagent_containers/food/drinks/bottle/champagne/attack_self(mob/user)
+/obj/item/reagent_containers/cup/glass/bottle/champagne/attack_self(mob/user)
if(spillable)
return ..()
balloon_alert(user, "fiddling with cork...")
if(do_after(user, 1 SECONDS, src))
return pop_cork(user)
-/obj/item/reagent_containers/food/drinks/bottle/champagne/update_icon_state()
+/obj/item/reagent_containers/cup/glass/bottle/champagne/update_icon_state()
. = ..()
if(spillable)
icon_state = "[base_icon_state]_popped"
else
icon_state = base_icon_state
-/obj/item/reagent_containers/food/drinks/bottle/champagne/proc/pop_cork(mob/user)
+/obj/item/reagent_containers/cup/glass/bottle/champagne/proc/pop_cork(mob/user)
user.visible_message(span_danger("[user] loosens the cork of [src] causing it to pop out of the bottle with great force."), \
span_nicegreen("You elegantly loosen the cork of [src] causing it to pop out of the bottle with great force."))
reagents.flags |= OPENCONTAINER
@@ -603,32 +517,32 @@
icon = 'icons/obj/drinks.dmi'
icon_state = "champagne_cork"
-/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!"
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."
icon_state = "moonshinebottle"
list_reagents = list(/datum/reagent/consumable/ethanol/moonshine = 100)
-/obj/item/reagent_containers/food/drinks/bottle/mushi_kombucha
+/obj/item/reagent_containers/cup/glass/bottle/mushi_kombucha
name = "Solzara Brewing Company Mushi Kombucha"
desc = "Best drunk over ice to savour the mushroomy flavour."
icon_state = "shroomy_bottle"
@@ -637,27 +551,35 @@
isGlass = FALSE
////////////////////////// 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 = 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/food/drinks/bottle/molotov/CheckParts(list/parts_list)
+/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/smash(atom/target, mob/thrower, ranged = FALSE)
+/obj/item/reagent_containers/cup/glass/bottle/molotov/smash(atom/target, mob/thrower, ranged = FALSE)
var/firestarter = 0
for(var/datum/reagent/contained_reagent in reagents.reagent_list)
for(var/accelerant_type in accelerants)
@@ -669,7 +591,7 @@
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.get_temperature() && !active)
active = TRUE
log_bomber(user, "has primed a", src, "for detonation")
@@ -679,7 +601,7 @@
if(!isGlass)
addtimer(CALLBACK(src, .proc/explode), 5 SECONDS)
-/obj/item/reagent_containers/food/drinks/bottle/molotov/proc/explode()
+/obj/item/reagent_containers/cup/glass/bottle/molotov/proc/explode()
if(!active)
return
if(get_turf(src))
@@ -691,7 +613,7 @@
target.fire_act()
qdel(src)
-/obj/item/reagent_containers/food/drinks/bottle/molotov/attack_self(mob/user)
+/obj/item/reagent_containers/cup/glass/bottle/molotov/attack_self(mob/user)
if(active)
if(!isGlass)
to_chat(user, span_danger("The flame's spread too far on it!"))
@@ -702,7 +624,7 @@
return
return ..()
-/obj/item/reagent_containers/food/drinks/bottle/pruno
+/obj/item/reagent_containers/cup/glass/bottle/pruno
name = "pruno mix"
desc = "A trash bag filled with fruit, sugar, yeast, and water, pulped together into a pungent slurry to be fermented in an enclosed space, traditionally the toilet. Security would love to confiscate this, one of the many things wrong with them."
icon = 'icons/obj/janitor.dmi'
@@ -712,18 +634,18 @@
var/fermentation_time_remaining /// for partial fermentation
var/fermentation_timer /// store the timer id of fermentation
-/obj/item/reagent_containers/food/drinks/bottle/pruno/Initialize(mapload)
+/obj/item/reagent_containers/cup/glass/bottle/pruno/Initialize(mapload)
. = ..()
RegisterSignal(src, COMSIG_MOVABLE_MOVED, .proc/check_fermentation)
-/obj/item/reagent_containers/food/drinks/bottle/pruno/Destroy()
+/obj/item/reagent_containers/cup/glass/bottle/pruno/Destroy()
UnregisterSignal(src, COMSIG_MOVABLE_MOVED)
return ..()
// Checks to see if the pruno can ferment, i.e. is it inside a structure (e.g. toilet), or a machine (e.g. washer)?
// TODO: make it so the washer spills reagents if a reagent container is in there, for now, you can wash pruno
-/obj/item/reagent_containers/food/drinks/bottle/pruno/proc/check_fermentation()
+/obj/item/reagent_containers/cup/glass/bottle/pruno/proc/check_fermentation()
SIGNAL_HANDLER
if (!(istype(loc, /obj/machinery) || istype(loc, /obj/structure)))
if(fermentation_timer)
@@ -740,7 +662,7 @@
// actually ferment
-/obj/item/reagent_containers/food/drinks/bottle/pruno/proc/do_fermentation()
+/obj/item/reagent_containers/cup/glass/bottle/pruno/proc/do_fermentation()
fermentation_time_remaining = null
fermentation_timer = null
reagents.remove_reagent(/datum/reagent/consumable/prunomix, 50)
@@ -755,3 +677,57 @@
for (var/mob/living/M in view(2, get_turf(src))) // letting people and/or narcs know when the pruno is done
to_chat(M, span_info("A pungent smell emanates from [src], like fruit puking out its guts."))
playsound(get_turf(src), 'sound/effects/bubbles2.ogg', 25, TRUE)
+
+/**
+ * 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_CREW
+ inhand_icon_state = "carton"
+ isGlass = FALSE
+ age_restricted = 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)
+ age_restricted = TRUE
+
+#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 00000000000..fcef087cb92
--- /dev/null
+++ b/code/modules/reagents/reagent_containers/cups/soda.dm
@@ -0,0 +1,268 @@
+
+//////////////////////////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_CREW * 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(span_warning("[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(span_suicide("[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/living/user)
+ if(istype(M, /mob/living/carbon) && !reagents.total_volume && user.combat_mode && user.zone_selected == BODY_ZONE_HEAD)
+ if(M == user)
+ user.visible_message(span_warning("[user] crushes the can of [src] on [user.p_their()] forehead!"), span_notice("You crush the can of [src] on your forehead."))
+ else
+ user.visible_message(span_warning("[user] crushes the can of [src] on [M]'s forehead!"), span_notice("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(span_danger("[user] opens [src], and is suddenly sprayed by the fizzing contents!"), span_danger("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 [src] with a satisfying pop.") //Ahhhhhhhh
+ reagents.flags |= OPENCONTAINER
+ playsound(src, SFX_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
+ target_mob.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)
+ iter_mob.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(span_danger("[src] spills over, fizzing its contents all over [target]!"))
+ spillable = TRUE
+ reagents.flags |= OPENCONTAINER
+ reagents.expose(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(span_danger("[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/attack_self_secondary(mob/user)
+ if(!is_drainable())
+ playsound(src, 'sound/effects/can_shake.ogg', 50, TRUE)
+ user.visible_message(span_danger("[user] shakes [src]!"), span_danger("You shake up [src]!"), vision_distance=2)
+ fizziness += SODA_FIZZINESS_SHAKE
+ 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))
+ . += span_notice("You examine [src] closer, and note the following...")
+ . += "\t[span_warning("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"
+ inhand_icon_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_containers/misc.dm b/code/modules/reagents/reagent_containers/misc.dm
index b8e772342a0..b7083ecd83d 100644
--- a/code/modules/reagents/reagent_containers/misc.dm
+++ b/code/modules/reagents/reagent_containers/misc.dm
@@ -1,4 +1,4 @@
-/obj/item/reagent_containers/glass/maunamug
+/obj/item/reagent_containers/cup/maunamug
name = "mauna mug"
desc = "A drink served in a classy mug. Now with built-in heating!"
icon = 'icons/obj/mauna_mug.dmi'
@@ -12,14 +12,14 @@
var/open = FALSE
var/on = FALSE
-/obj/item/reagent_containers/glass/maunamug/Initialize(mapload, vol)
+/obj/item/reagent_containers/cup/maunamug/Initialize(mapload, vol)
. = ..()
cell = new /obj/item/stock_parts/cell(src)
-/obj/item/reagent_containers/glass/maunamug/get_cell()
+/obj/item/reagent_containers/cup/maunamug/get_cell()
return cell
-/obj/item/reagent_containers/glass/maunamug/examine(mob/user)
+/obj/item/reagent_containers/cup/maunamug/examine(mob/user)
. = ..()
. += span_notice("The status display reads: Current temperature: [reagents.chem_temp]K Current Charge:[cell ? "[cell.charge / cell.maxcharge * 100]%" : "No cell found"].")
if(open)
@@ -27,7 +27,7 @@
if(cell && cell.charge > 0)
. += span_notice("Ctrl+Click to toggle the power.")
-/obj/item/reagent_containers/glass/maunamug/process(delta_time)
+/obj/item/reagent_containers/cup/maunamug/process(delta_time)
..()
if(on && (!cell || cell.charge <= 0)) //Check if we ran out of power
change_power_status(FALSE)
@@ -44,13 +44,13 @@
audible_message(span_notice("The Mauna Mug lets out a happy beep and turns off!"))
playsound(src, 'sound/machines/chime.ogg', 50)
-/obj/item/reagent_containers/glass/maunamug/Destroy()
+/obj/item/reagent_containers/cup/maunamug/Destroy()
if(cell)
QDEL_NULL(cell)
STOP_PROCESSING(SSobj, src)
. = ..()
-/obj/item/reagent_containers/glass/maunamug/CtrlClick(mob/living/user)
+/obj/item/reagent_containers/cup/maunamug/CtrlClick(mob/living/user)
if(on)
change_power_status(FALSE)
else
@@ -58,7 +58,7 @@
return FALSE //No power, so don't turn on
change_power_status(TRUE)
-/obj/item/reagent_containers/glass/maunamug/proc/change_power_status(status)
+/obj/item/reagent_containers/cup/maunamug/proc/change_power_status(status)
on = status
if(on)
START_PROCESSING(SSobj, src)
@@ -66,13 +66,13 @@
STOP_PROCESSING(SSobj, src)
update_appearance()
-/obj/item/reagent_containers/glass/maunamug/screwdriver_act(mob/living/user, obj/item/I)
+/obj/item/reagent_containers/cup/maunamug/screwdriver_act(mob/living/user, obj/item/I)
. = ..()
open = !open
to_chat(user, span_notice("You screw the battery case on [src] [open ? "open" : "closed"] ."))
update_appearance()
-/obj/item/reagent_containers/glass/maunamug/attackby(obj/item/I, mob/user, params)
+/obj/item/reagent_containers/cup/maunamug/attackby(obj/item/I, mob/user, params)
add_fingerprint(user)
if(!istype(I, /obj/item/stock_parts/cell))
return ..()
@@ -88,7 +88,7 @@
user.visible_message(span_notice("[user] inserts a power cell into [src]."), span_notice("You insert the power cell into [src]."))
update_appearance()
-/obj/item/reagent_containers/glass/maunamug/attack_hand(mob/living/user, list/modifiers)
+/obj/item/reagent_containers/cup/maunamug/attack_hand(mob/living/user, list/modifiers)
if(cell && open)
cell.update_appearance()
user.put_in_hands(cell)
@@ -99,14 +99,14 @@
return TRUE
return ..()
-/obj/item/reagent_containers/glass/maunamug/update_icon_state()
+/obj/item/reagent_containers/cup/maunamug/update_icon_state()
if(open)
icon_state = "[base_icon_state][cell ? null : "_no"]_bat"
return ..()
icon_state = "[base_icon_state][on ? "_on" : null]"
return ..()
-/obj/item/reagent_containers/glass/maunamug/update_overlays()
+/obj/item/reagent_containers/cup/maunamug/update_overlays()
. = ..()
if(!reagents.total_volume || reagents.chem_temp < 400)
return
@@ -116,7 +116,7 @@
mug_glow.alpha = 255 * intensity
. += mug_glow
-/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
@@ -129,15 +129,15 @@
volume = 5
spillable = FALSE
-/obj/item/reagent_containers/glass/rag/Initialize(mapload)
+/obj/item/reagent_containers/cup/rag/Initialize(mapload)
. = ..()
AddComponent(/datum/component/cleaner, 3 SECONDS)
-/obj/item/reagent_containers/glass/rag/suicide_act(mob/user)
+/obj/item/reagent_containers/cup/rag/suicide_act(mob/user)
user.visible_message(span_suicide("[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/living/user,proximity)
+/obj/item/reagent_containers/cup/rag/afterattack(atom/A as obj|turf|area, mob/living/user,proximity)
. = ..()
if(!proximity)
return
diff --git a/code/modules/reagents/reagent_containers/watering_can.dm b/code/modules/reagents/reagent_containers/watering_can.dm
index f3f72234de0..f1d484931a5 100644
--- a/code/modules/reagents/reagent_containers/watering_can.dm
+++ b/code/modules/reagents/reagent_containers/watering_can.dm
@@ -1,4 +1,4 @@
-/obj/item/reagent_containers/glass/watering_can
+/obj/item/reagent_containers/cup/watering_can
name = "watering can"
desc = "It's a watering can. It is scientifically proved that using a watering can to simulate rain increases plant happiness!"
icon = 'icons/obj/hydroponics/equipment.dmi'
@@ -12,7 +12,7 @@
amount_per_transfer_from_this = 20
possible_transfer_amounts = list(20,100)
-/obj/item/reagent_containers/glass/watering_can/wood
+/obj/item/reagent_containers/cup/watering_can/wood
name = "wood watering can"
desc = "An old metal-made watering can but shoddily painted to look like it was made of wood for some dubious reason..."
icon_state = "watering_can_wood"
@@ -20,7 +20,7 @@
volume = 70
possible_transfer_amounts = list(20,70)
-/obj/item/reagent_containers/glass/watering_can/advanced
+/obj/item/reagent_containers/cup/watering_can/advanced
desc = "Everything a botanist would want in a watering can. This marvel of technology generates its own water!"
name = "advanced watering can"
icon_state = "adv_watering_can"
@@ -32,16 +32,16 @@
///Determins what reagent to use for refilling
var/datum/reagent/refill_reagent = /datum/reagent/water
-/obj/item/reagent_containers/glass/watering_can/advanced/Initialize(mapload)
+/obj/item/reagent_containers/cup/watering_can/advanced/Initialize(mapload)
. = ..()
START_PROCESSING(SSobj, src)
-/obj/item/reagent_containers/glass/watering_can/advanced/process(delta_time)
+/obj/item/reagent_containers/cup/watering_can/advanced/process(delta_time)
///How much to refill
var/refill_add = min(volume - reagents.total_volume, refill_rate * delta_time)
if(refill_add > 0)
reagents.add_reagent(refill_reagent, refill_add)
-/obj/item/reagent_containers/glass/watering_can/advanced/Destroy()
+/obj/item/reagent_containers/cup/watering_can/advanced/Destroy()
STOP_PROCESSING(SSobj, src)
return ..()
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index 09a3231e348..0f4845abb67 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -315,7 +315,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/reagent_dispensers/wall/peppertank, 3
to_chat(user, span_warning("There aren't any cups left!"))
return
user.visible_message(span_notice("[user] takes a cup from [src]."), span_notice("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 0e492cd4e62..45317e74914 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 | AWAY_LATHE
materials = list(/datum/material/iron = 200)
- build_path = /obj/item/reagent_containers/glass/bucket
+ build_path = /obj/item/reagent_containers/cup/bucket
category = list(RND_CATEGORY_INITIAL, RND_CATEGORY_TOOLS, RND_CATEGORY_TOOL_DESIGNS)
departmental_flags = DEPARTMENT_BITFLAG_SERVICE
@@ -16,7 +16,7 @@
id = "watering_can"
build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
materials = list(/datum/material/iron = 200)
- build_path = /obj/item/reagent_containers/glass/watering_can
+ build_path = /obj/item/reagent_containers/cup/watering_can
category = list(RND_CATEGORY_INITIAL, RND_CATEGORY_TOOLS, RND_CATEGORY_TOOL_DESIGNS)
departmental_flags = DEPARTMENT_BITFLAG_SERVICE
@@ -523,7 +523,7 @@
id = "bowl"
build_type = AUTOLATHE | PROTOLATHE // SKYRAT EDIT - Original line: 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(RND_CATEGORY_INITIAL, RND_CATEGORY_TOOL_DESIGNS, RND_CATEGORY_DINNERWARE) // SKYRAT EDIT - Original line: category = list("initial","Dinnerware")
departmental_flags = DEPARTMENT_BITFLAG_SERVICE //SKYRAT EDIT: added to service techfab
@@ -533,7 +533,7 @@
//build_type = AUTOLATHE SKYRAT EDIT: Original Line
build_type = AUTOLATHE | PROTOLATHE // SKRAT EDIT
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(RND_CATEGORY_INITIAL, RND_CATEGORY_TOOL_DESIGNS, RND_CATEGORY_DINNERWARE) // SKYRAT EDIT
departmental_flags = DEPARTMENT_BITFLAG_SERVICE //SKYRAT EDIT: added to service techfab
@@ -542,7 +542,7 @@
id = "shot_glass"
build_type = AUTOLATHE | PROTOLATHE // SKYRAT EDIT - Original line: 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(RND_CATEGORY_INITIAL, RND_CATEGORY_TOOL_DESIGNS, RND_CATEGORY_DINNERWARE) // SKYRAT EDIT - Original line: category = list("initial","Dinnerware")
departmental_flags = DEPARTMENT_BITFLAG_SERVICE //SKYRAT EDIT: added to service techfab
@@ -551,7 +551,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(RND_CATEGORY_INITIAL, RND_CATEGORY_DINNERWARE)
/datum/design/cultivator
@@ -702,8 +702,7 @@
id = "beaker"
build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
materials = list(/datum/material/glass = 500)
- category = list(RND_CATEGORY_INITIAL, RND_CATEGORY_MEDICAL, RND_CATEGORY_MEDICAL_DESIGNS)
- build_path = /obj/item/reagent_containers/glass/beaker
+ build_path = /obj/item/reagent_containers/cup/beaker
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SERVICE
/datum/design/large_beaker
@@ -711,8 +710,7 @@
id = "large_beaker"
build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
materials = list(/datum/material/glass = 2500)
- category = list(RND_CATEGORY_INITIAL, RND_CATEGORY_MEDICAL, RND_CATEGORY_MEDICAL_DESIGNS)
- build_path = /obj/item/reagent_containers/glass/beaker/large
+ build_path = /obj/item/reagent_containers/cup/beaker/large
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SERVICE
/datum/design/pillbottle
diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index 4a6a93a9e88..d475c34c700 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -39,7 +39,7 @@
id = "bluespacebeaker"
build_type = PROTOLATHE | AWAY_LATHE
materials = list(/datum/material/glass = 5000, /datum/material/plastic = 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(RND_CATEGORY_MEDICAL_DESIGNS)
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE
@@ -49,7 +49,7 @@
id = "splitbeaker"
build_type = PROTOLATHE | AWAY_LATHE
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(RND_CATEGORY_MEDICAL_DESIGNS)
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL
@@ -59,7 +59,7 @@
build_type = PROTOLATHE | AWAY_LATHE
departmental_flags = DEPARTMENT_BITFLAG_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(RND_CATEGORY_MEDICAL_DESIGNS)
/datum/design/meta_beaker
@@ -68,9 +68,8 @@
build_type = PROTOLATHE | AWAY_LATHE
departmental_flags = DEPARTMENT_BITFLAG_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(RND_CATEGORY_MEDICAL_DESIGNS)
- build_path = /obj/item/reagent_containers/glass/beaker/meta
/datum/design/ph_meter
name = "Chemical Analyzer"
diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm
index 05de4194fb6..fcc5b68cf70 100644
--- a/code/modules/research/designs/misc_designs.dm
+++ b/code/modules/research/designs/misc_designs.dm
@@ -103,7 +103,7 @@
id = "mauna_mug"
build_type = PROTOLATHE | AWAY_LATHE
materials = list(/datum/material/iron = 1000, /datum/material/glass = 100)
- build_path = /obj/item/reagent_containers/glass/maunamug
+ build_path = /obj/item/reagent_containers/cup/maunamug
category = list(RND_CATEGORY_EQUIPMENT)
@@ -449,7 +449,7 @@
id = "adv_watering_can"
build_type = PROTOLATHE | AWAY_LATHE
materials = list(/datum/material/iron = 2500, /datum/material/glass = 200)
- build_path = /obj/item/reagent_containers/glass/watering_can/advanced
+ build_path = /obj/item/reagent_containers/cup/watering_can/advanced
category = list(RND_CATEGORY_INITIAL, RND_CATEGORY_TOOLS, RND_CATEGORY_TOOL_DESIGNS)
departmental_flags = DEPARTMENT_BITFLAG_SERVICE
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index 5fef0e2b54d..b5281f68489 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -69,7 +69,7 @@
if(initial(tempCheck.icon_state) != null) //check it's an actual usable item, in a hacky way
valid_items["[I]"] += 15
- if(ispath(I, /obj/item/reagent_containers/food))
+ if(ispath(I, /obj/item/food))
var/obj/item/tempCheck = I
if(initial(tempCheck.icon_state) != null) //check it's an actual usable item, in a hacky way
valid_items["[I]"] += rand(1,4)
@@ -348,7 +348,7 @@
if(prob(EFFECT_PROB_LOW) && criticalReaction)
visible_message(span_warning("[src]'s emergency coolant system gives off a small ding!"))
playsound(src, 'sound/machines/ding.ogg', 50, TRUE)
- var/obj/item/reagent_containers/food/drinks/coffee/C = new /obj/item/reagent_containers/food/drinks/coffee(get_turf(pick(oview(1,src))))
+ var/obj/item/reagent_containers/cup/glass/coffee/C = new /obj/item/reagent_containers/cup/glass/coffee(get_turf(pick(oview(1,src))))
chosenchem = pick(/datum/reagent/toxin/plasma,/datum/reagent/consumable/capsaicin,/datum/reagent/consumable/ethanol)
C.reagents.remove_any(25)
C.reagents.add_reagent(chosenchem , 50)
@@ -396,7 +396,7 @@
visible_message(span_notice("[src] lowers [exp_on]'s temperature."))
if(prob(EFFECT_PROB_LOW) && criticalReaction)
visible_message(span_warning("[src]'s emergency coolant system gives off a small ding!"))
- var/obj/item/reagent_containers/food/drinks/coffee/C = new /obj/item/reagent_containers/food/drinks/coffee(get_turf(pick(oview(1,src))))
+ var/obj/item/reagent_containers/cup/glass/coffee/C = new /obj/item/reagent_containers/cup/glass/coffee(get_turf(pick(oview(1,src))))
playsound(src, 'sound/machines/ding.ogg', 50, TRUE) //Ding! Your death coffee is ready!
chosenchem = pick(/datum/reagent/uranium,/datum/reagent/consumable/frostoil,/datum/reagent/medicine/ephedrine)
C.reagents.remove_any(25)
diff --git a/code/modules/research/machinery/_production.dm b/code/modules/research/machinery/_production.dm
index 097c5c4a0f4..7a2dfdb6a4c 100644
--- a/code/modules/research/machinery/_production.dm
+++ b/code/modules/research/machinery/_production.dm
@@ -62,7 +62,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)
@@ -80,7 +80,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/unit_tests/reagent_mod_expose.dm b/code/modules/unit_tests/reagent_mod_expose.dm
index 80cc039736a..5bf751a426c 100644
--- a/code/modules/unit_tests/reagent_mod_expose.dm
+++ b/code/modules/unit_tests/reagent_mod_expose.dm
@@ -16,7 +16,7 @@
var/mob/living/carbon/human/human = allocate(/mob/living/carbon/human)
var/obj/item/reagent_containers/dropper/dropper = allocate(/obj/item/reagent_containers/dropper)
- var/obj/item/reagent_containers/food/drinks/drink = allocate(/obj/item/reagent_containers/food/drinks/bottle)
+ var/obj/item/reagent_containers/cup/glass/bottle/drink = allocate(/obj/item/reagent_containers/cup/glass/bottle)
var/obj/item/reagent_containers/pill/patch/patch = allocate(/obj/item/reagent_containers/pill/patch)
var/obj/item/reagent_containers/syringe/syringe = allocate(/obj/item/reagent_containers/syringe)
diff --git a/code/modules/unit_tests/serving_tray.dm b/code/modules/unit_tests/serving_tray.dm
index 706a1407edf..fccdc012014 100644
--- a/code/modules/unit_tests/serving_tray.dm
+++ b/code/modules/unit_tests/serving_tray.dm
@@ -5,9 +5,9 @@
var/mob/living/carbon/human/human = allocate(/mob/living/carbon/human)
var/obj/structure/table/the_table = allocate(/obj/structure/table)
var/obj/item/storage/bag/tray/test_tray = allocate(/obj/item/storage/bag/tray)
- var/obj/item/reagent_containers/food/banana = allocate(/obj/item/food/rationpack)
+ var/obj/item/food/banana = allocate(/obj/item/food/rationpack)
var/obj/item/food/the_bread = allocate(/obj/item/food/breadslice)
- var/obj/item/reagent_containers/food/sugarcookie = allocate(/obj/item/food/cookie/sugar)
+ var/obj/item/food/sugarcookie = allocate(/obj/item/food/cookie/sugar)
var/obj/item/clothing/under/jumpsuit = allocate(/obj/item/clothing/under/color/black)
TEST_ASSERT_EQUAL((the_bread in test_tray.contents), FALSE, "The bread is on the serving tray at test start")
diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm
index 2b3acb7f0dd..5a0bf348574 100644
--- a/code/modules/vending/boozeomat.dm
+++ b/code/modules/vending/boozeomat.dm
@@ -5,52 +5,52 @@
icon_deny = "boozeomat-deny"
panel_type = "panel22"
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/soda_cans/sol_dry = 8,
- /obj/item/reagent_containers/food/drinks/bottle/grenadine = 4,
- /obj/item/reagent_containers/food/drinks/bottle/menthol = 4,
- /obj/item/reagent_containers/food/drinks/bottle/ale = 6,
- /obj/item/reagent_containers/food/drinks/bottle/beer = 6,
- /obj/item/reagent_containers/food/drinks/bottle/maltliquor = 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/navy_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/curacao = 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/amaretto = 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 = 15,
- /obj/item/reagent_containers/food/drinks/bottle/small = 15,
+ /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/glass/bottle/juice/menthol = 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/soda_cans/sol_dry = 8,
+ /obj/item/reagent_containers/cup/glass/bottle/grenadine = 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/maltliquor = 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/navy_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/curacao = 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/amaretto = 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 = 15,
+ /obj/item/reagent_containers/cup/glass/bottle/small = 15,
)
contraband = list(
- /obj/item/reagent_containers/food/drinks/mug/tea = 12,
- /obj/item/reagent_containers/food/drinks/bottle/fernet = 5,
+ /obj/item/reagent_containers/cup/glass/mug/tea = 12,
+ /obj/item/reagent_containers/cup/glass/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,
- /obj/item/reagent_containers/food/drinks/bottle/bitters = 5,
+ /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,
+ /obj/item/reagent_containers/cup/glass/bottle/bitters = 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?"
diff --git a/code/modules/vending/coffee.dm b/code/modules/vending/coffee.dm
index ccbe3221ac7..10b895d1367 100644
--- a/code/modules/vending/coffee.dm
+++ b/code/modules/vending/coffee.dm
@@ -6,12 +6,12 @@
icon_vend = "coffee-vend"
panel_type = "panel9"
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/coco = 3,
+ /obj/item/reagent_containers/cup/glass/coffee = 6,
+ /obj/item/reagent_containers/cup/glass/mug/tea = 6,
+ /obj/item/reagent_containers/cup/glass/mug/coco = 3,
)
contraband = list(
- /obj/item/reagent_containers/food/drinks/ice = 12,
+ /obj/item/reagent_containers/cup/glass/ice = 12,
)
refill_canister = /obj/item/vending_refill/coffee
default_price = PAYCHECK_LOWER
diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm
index d03e77d7b0a..1522ecb210e 100644
--- a/code/modules/vending/cola.dm
+++ b/code/modules/vending/cola.dm
@@ -7,27 +7,27 @@
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/food/drinks/soda_cans/sol_dry = 10,
- /obj/item/reagent_containers/food/drinks/waterbottle = 10,
- /obj/item/reagent_containers/food/drinks/bottle/mushi_kombucha = 3,
+ /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/sol_dry = 10,
+ /obj/item/reagent_containers/cup/glass/waterbottle = 10,
+ /obj/item/reagent_containers/cup/glass/bottle/mushi_kombucha = 3,
)
contraband = list(
- /obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 6,
- /obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 6,
+ /obj/item/reagent_containers/cup/soda_cans/thirteenloko = 6,
+ /obj/item/reagent_containers/cup/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,
- /obj/item/reagent_containers/food/drinks/bottle/rootbeer = 1,
+ /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,
+ /obj/item/reagent_containers/cup/glass/bottle/rootbeer = 1,
)
refill_canister = /obj/item/vending_refill/cola
default_price = PAYCHECK_CREW * 0.7
@@ -92,15 +92,15 @@
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/sol_dry = 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/sol_dry = 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 a2690ec5be2..679fd268b75 100644
--- a/code/modules/vending/drinnerware.dm
+++ b/code/modules/vending/drinnerware.dm
@@ -6,15 +6,15 @@
panel_type = "panel4"
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/kitchen/spoon = 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 c90b5655da4..f079f0e48e3 100644
--- a/code/modules/vending/liberation.dm
+++ b/code/modules/vending/liberation.dm
@@ -10,7 +10,7 @@
/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/bottle/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 0cd87dc93f1..7b89f7b004e 100644
--- a/code/modules/vending/magivend.dm
+++ b/code/modules/vending/magivend.dm
@@ -16,7 +16,7 @@
/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, FIRE = 100, ACID = 50)
resistance_flags = FIRE_PROOF
default_price = 0 //Just in case, since it's primary use is storage.
diff --git a/code/modules/vending/medical.dm b/code/modules/vending/medical.dm
index 0f33fe7a5ff..de96f918aaf 100644
--- a/code/modules/vending/medical.dm
+++ b/code/modules/vending/medical.dm
@@ -60,13 +60,13 @@
/obj/item/reagent_containers/pill/patch/aiuri = 5,
/obj/item/reagent_containers/syringe/convermol = 2,
/obj/item/reagent_containers/pill/insulin = 5,
- /obj/item/reagent_containers/glass/bottle/multiver = 2,
- /obj/item/reagent_containers/glass/bottle/syriniver = 2,
- /obj/item/reagent_containers/glass/bottle/epinephrine = 3,
- /obj/item/reagent_containers/glass/bottle/morphine = 4,
- /obj/item/reagent_containers/glass/bottle/potass_iodide = 1,
- /obj/item/reagent_containers/glass/bottle/salglu_solution = 3,
- /obj/item/reagent_containers/glass/bottle/toxin = 3,
+ /obj/item/reagent_containers/cup/bottle/multiver = 2,
+ /obj/item/reagent_containers/cup/bottle/syriniver = 2,
+ /obj/item/reagent_containers/cup/bottle/epinephrine = 3,
+ /obj/item/reagent_containers/cup/bottle/morphine = 4,
+ /obj/item/reagent_containers/cup/bottle/potass_iodide = 1,
+ /obj/item/reagent_containers/cup/bottle/salglu_solution = 3,
+ /obj/item/reagent_containers/cup/bottle/toxin = 3,
/obj/item/reagent_containers/syringe/antiviral = 6,
/obj/item/reagent_containers/medigel/libital = 2,
/obj/item/reagent_containers/medigel/aiuri = 2,
diff --git a/code/modules/vending/nutrimax.dm b/code/modules/vending/nutrimax.dm
index 24f8e3ee206..88fbe6c9953 100644
--- a/code/modules/vending/nutrimax.dm
+++ b/code/modules/vending/nutrimax.dm
@@ -10,9 +10,9 @@
products = list(
/obj/item/cultivator = 3,
/obj/item/plant_analyzer = 4,
- /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,
+ /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/secateurs = 3,
@@ -20,8 +20,8 @@
/obj/item/storage/bag/plants = 5,
)
contraband = list(
- /obj/item/reagent_containers/glass/bottle/ammonia = 10,
- /obj/item/reagent_containers/glass/bottle/diethylamine = 5,
+ /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 = PAYCHECK_CREW * 0.8
diff --git a/code/modules/vending/snack.dm b/code/modules/vending/snack.dm
index 2dbf5070e60..251afbce76b 100644
--- a/code/modules/vending/snack.dm
+++ b/code/modules/vending/snack.dm
@@ -21,7 +21,7 @@
/obj/item/food/cnds = 6,
/obj/item/food/cnds/random = 3,
/obj/item/food/semki = 6,
- /obj/item/reagent_containers/food/drinks/dry_ramen = 3,
+ /obj/item/reagent_containers/cup/glass/dry_ramen = 3,
/obj/item/storage/box/gum = 3,
/obj/item/food/energybar = 6,
)
diff --git a/code/modules/vending/sovietsoda.dm b/code/modules/vending/sovietsoda.dm
index 5779841aff3..ba997941a37 100644
--- a/code/modules/vending/sovietsoda.dm
+++ b/code/modules/vending/sovietsoda.dm
@@ -6,10 +6,10 @@
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,
+ /obj/item/reagent_containers/cup/glass/drinkingglass/filled/soda = 30,
)
contraband = list(
- /obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola = 20,
+ /obj/item/reagent_containers/cup/glass/drinkingglass/filled/cola = 20,
)
resistance_flags = FIRE_PROOF
refill_canister = /obj/item/vending_refill/sovietsoda
diff --git a/code/modules/vending/sustenance.dm b/code/modules/vending/sustenance.dm
index dbf330b01ec..b6cd5c511a3 100644
--- a/code/modules/vending/sustenance.dm
+++ b/code/modules/vending/sustenance.dm
@@ -9,14 +9,14 @@
products = list(
/obj/item/food/tofu/prison = 24,
/obj/item/food/breadslice/moldy = 15,
- /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,
/obj/item/kitchen/spoon/plastic = 6,
)
contraband = list(
/obj/item/knife = 6,
/obj/item/kitchen/spoon = 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,
)
diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
index 6866ef62d46..c1ccca0670d 100644
--- a/code/modules/vending/wardrobes.dm
+++ b/code/modules/vending/wardrobes.dm
@@ -295,7 +295,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,
@@ -334,7 +334,7 @@
/obj/item/clothing/head/chefhat = 1,
/obj/item/clothing/under/rank/civilian/cookjorts = 2,
/obj/item/clothing/shoes/cookflops = 2,
- /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
@@ -555,7 +555,7 @@
/obj/item/clothing/shoes/kim = 1,
/obj/item/clothing/gloves/kim = 1,
/obj/item/clothing/glasses/regular/kim = 1,
- /obj/item/reagent_containers/food/drinks/flask/det = 2,
+ /obj/item/reagent_containers/cup/glass/flask/det = 2,
/obj/item/storage/fancy/cigarettes = 5,
)
premium = list(
diff --git a/icons/mob/inhands/equipment/kitchen_lefthand.dmi b/icons/mob/inhands/equipment/kitchen_lefthand.dmi
index 0e3ffe3d72f..ca9cb2352ec 100644
Binary files a/icons/mob/inhands/equipment/kitchen_lefthand.dmi and b/icons/mob/inhands/equipment/kitchen_lefthand.dmi differ
diff --git a/icons/mob/inhands/equipment/kitchen_righthand.dmi b/icons/mob/inhands/equipment/kitchen_righthand.dmi
index b3fe0c7e550..561d6440c26 100644
Binary files a/icons/mob/inhands/equipment/kitchen_righthand.dmi and b/icons/mob/inhands/equipment/kitchen_righthand.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index 1ebc35bbc5c..93960307164 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index 080164461aa..1bd1d3edd83 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/mob/inhands/misc/drinks_lefthand.dmi b/icons/mob/inhands/misc/drinks_lefthand.dmi
new file mode 100644
index 00000000000..c4fb929d527
Binary files /dev/null and b/icons/mob/inhands/misc/drinks_lefthand.dmi differ
diff --git a/icons/mob/inhands/misc/drinks_righthand.dmi b/icons/mob/inhands/misc/drinks_righthand.dmi
new file mode 100644
index 00000000000..4f01313df37
Binary files /dev/null and b/icons/mob/inhands/misc/drinks_righthand.dmi differ
diff --git a/icons/mob/inhands/misc/food_lefthand.dmi b/icons/mob/inhands/misc/food_lefthand.dmi
index 501e5f2efce..f1062e114e8 100644
Binary files a/icons/mob/inhands/misc/food_lefthand.dmi and b/icons/mob/inhands/misc/food_lefthand.dmi differ
diff --git a/icons/mob/inhands/misc/food_righthand.dmi b/icons/mob/inhands/misc/food_righthand.dmi
index b8464b8f143..40039c63b32 100644
Binary files a/icons/mob/inhands/misc/food_righthand.dmi and b/icons/mob/inhands/misc/food_righthand.dmi differ
diff --git a/modular_skyrat/master_files/code/_globalvars/maint_loot_trash.dm b/modular_skyrat/master_files/code/_globalvars/maint_loot_trash.dm
index a6fdb22363d..5f65d3949a3 100644
--- a/modular_skyrat/master_files/code/_globalvars/maint_loot_trash.dm
+++ b/modular_skyrat/master_files/code/_globalvars/maint_loot_trash.dm
@@ -75,10 +75,10 @@ GLOBAL_LIST_INIT(trash_loot, list(// junk: useless, very easy to get, or ghetto
/obj/item/light/tube = 75,
/obj/item/paper/pamphlet/violent_video_games = 25,
/obj/item/photo/old = 50,
- /obj/item/reagent_containers/food/drinks/bottle/pruno = 100,
- /obj/item/reagent_containers/food/drinks/colocup = 50,
- /obj/item/reagent_containers/glass/bucket = 50,
- /obj/item/reagent_containers/glass/rag = 100 ,
+ /obj/item/reagent_containers/cup/glass/bottle/pruno = 100,
+ /obj/item/reagent_containers/cup/glass/colocup = 50,
+ /obj/item/reagent_containers/cup/bucket = 50,
+ /obj/item/reagent_containers/cup/rag = 100 ,
/obj/item/sign = 50,
/obj/item/staff/broom = 50,
/obj/item/storage/bag/tray = 25,
@@ -148,13 +148,13 @@ GLOBAL_LIST_INIT(trash_loot, list(// junk: useless, very easy to get, or ghetto
/obj/item/pneumatic_cannon/ghetto = 50,
/obj/item/radio = 200,
/obj/item/razor = 75,
- /obj/item/reagent_containers/food/condiment/mayonnaise = 75,
- /obj/item/reagent_containers/food/drinks/bottle/beer = 50,
- /obj/item/reagent_containers/food/drinks/bottle/lizardwine = 25,
- /obj/item/reagent_containers/food/drinks/bottle/moonshine = 75,
- /obj/item/reagent_containers/food/drinks/bottle/kong = 200,
- /obj/item/reagent_containers/food/drinks/bottle/vodka = 100,
- /obj/item/reagent_containers/food/drinks/dry_ramen = 75,
+ /obj/item/reagent_containers/condiment/mayonnaise = 75,
+ /obj/item/reagent_containers/cup/glass/bottle/beer = 50,
+ /obj/item/reagent_containers/cup/glass/bottle/lizardwine = 25,
+ /obj/item/reagent_containers/cup/glass/bottle/moonshine = 75,
+ /obj/item/reagent_containers/cup/glass/bottle/kong = 200,
+ /obj/item/reagent_containers/cup/glass/bottle/vodka = 100,
+ /obj/item/reagent_containers/cup/glass/dry_ramen = 75,
/obj/item/reagent_containers/hypospray/medipen/atropine = 100,
/obj/item/reagent_containers/hypospray/medipen/blood_loss = 75,
/obj/item/reagent_containers/hypospray/medipen/ekit = 200,
@@ -228,7 +228,7 @@ GLOBAL_LIST_INIT(trash_loot, list(// junk: useless, very easy to get, or ghetto
/obj/item/barcodescanner = 10,
/obj/item/cane = 20,
/obj/item/clothing/accessory/pocketprotector = 10,
- /obj/item/reagent_containers/food/drinks/soda_cans/random = 100,
+ /obj/item/reagent_containers/cup/soda_cans/random = 100,
/obj/item/storage/box/ingredients/random = 100,
/obj/item/bedsheet/random = 20,
/obj/item/clothing/mask/cigarette/pipe = 10,
@@ -251,9 +251,9 @@ GLOBAL_LIST_INIT(trash_loot, list(// junk: useless, very easy to get, or ghetto
/obj/item/pushbroom = 100,
/obj/item/rack_parts = 100,
/obj/item/radio/headset = 100,
- /obj/item/reagent_containers/food/drinks/coffee = 50,
- /obj/item/reagent_containers/food/drinks/flask = 50,
- /obj/item/reagent_containers/food/drinks/ice/prison = 200,
+ /obj/item/reagent_containers/cup/glass/coffee = 50,
+ /obj/item/reagent_containers/cup/glass/flask = 50,
+ /obj/item/reagent_containers/cup/glass/ice/prison = 200,
/obj/item/reagent_containers/spray/pestspray = 50,
/obj/item/reagent_containers/spray/weedspray = 50,
/obj/item/stack/arcadeticket/thirty = 20,
@@ -275,8 +275,8 @@ GLOBAL_LIST_INIT(trash_loot, list(// junk: useless, very easy to get, or ghetto
/obj/item/paper_bin = 50,
/obj/item/paper_bin/construction = 25,
/obj/item/pizzabox/pineapple = 100,
- /obj/item/reagent_containers/food/drinks/bottle/vodka/badminka = 50,
- /obj/item/reagent_containers/food/drinks/bottle/whiskey = 50,
+ /obj/item/reagent_containers/cup/glass/bottle/vodka/badminka = 50,
+ /obj/item/reagent_containers/cup/glass/bottle/whiskey = 50,
/obj/item/stack/circuit_stack/full = 100,
/obj/item/stack/conveyor/thirty = 100,
/obj/item/stack/ducts/fifty = 100,
diff --git a/modular_skyrat/master_files/code/_globalvars/maint_loot_uncommon.dm b/modular_skyrat/master_files/code/_globalvars/maint_loot_uncommon.dm
index c5e2a573e4e..849c07c04ea 100644
--- a/modular_skyrat/master_files/code/_globalvars/maint_loot_uncommon.dm
+++ b/modular_skyrat/master_files/code/_globalvars/maint_loot_uncommon.dm
@@ -107,8 +107,8 @@ GLOBAL_LIST_INIT(uncommon_loot, list(// uncommon: useful items
/obj/item/mining_voucher = 5,
/obj/item/mmi = 5,
/obj/item/papercutter = 5,
- /obj/item/reagent_containers/food/drinks/bottle/holywater = 5,
- /obj/item/reagent_containers/glass/bottle/traitor = 25,
+ /obj/item/reagent_containers/cup/glass/bottle/holywater = 5,
+ /obj/item/reagent_containers/cup/bottle/traitor = 25,
/obj/item/restraints/handcuffs = 50,
/obj/item/stack/ore/bluespace_crystal/artificial = 5,
/obj/item/storage/box/fireworks = 5,
@@ -180,7 +180,7 @@ GLOBAL_LIST_INIT(uncommon_loot, list(// uncommon: useful items
/obj/item/melee/chainofcommand/tailwhip = 25,
/obj/item/melee/flyswatter = 100,
/obj/item/melee/skateboard/hoverboard = 25,
- /obj/item/reagent_containers/food/drinks/waterbottle/relic = 5,
+ /obj/item/reagent_containers/cup/glass/waterbottle/relic = 5,
/obj/item/rsf = 5,
/obj/item/rupee = 5,
/obj/item/sord = 5,
@@ -248,7 +248,7 @@ GLOBAL_LIST_INIT(uncommon_loot, list(// uncommon: useful items
/obj/item/food/monkeycube = 100,
/obj/item/hot_potato/harmless = 25,
/obj/item/implanter/sad_trombone = 25,
- /obj/item/reagent_containers/food/drinks/waterbottle = 25,
+ /obj/item/reagent_containers/cup/glass/waterbottle = 25,
/obj/item/stamp = 5,
/obj/item/storage/backpack = 100,
/obj/item/storage/belt = 100,
diff --git a/modular_skyrat/master_files/code/game/objects/items/holy_weapons.dm b/modular_skyrat/master_files/code/game/objects/items/holy_weapons.dm
index 29612bbf373..7aa59f2e337 100644
--- a/modular_skyrat/master_files/code/game/objects/items/holy_weapons.dm
+++ b/modular_skyrat/master_files/code/game/objects/items/holy_weapons.dm
@@ -54,7 +54,7 @@
inhand_icon_state = "cultrobes"
body_parts_covered = CHEST|GROIN|LEGS|ARMS
armor = list(MELEE = 50, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 0, BIO = 0, FIRE = 80, ACID = 80, WOUND = 20) // Chaplain Riot armor
- 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/cultlain_hood
/obj/item/clothing/head/hooded/cultlain_hood
diff --git a/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/smuggling.dm b/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/smuggling.dm
index ca6eb12edd5..a6a794a8b67 100644
--- a/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/smuggling.dm
+++ b/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/smuggling.dm
@@ -24,7 +24,7 @@
var/list/possible_contrabands = list(
/obj/item/pen/edagger/prototype = 2,
/obj/item/gun/syringe/syndicate/prototype = 4,
- /obj/item/reagent_containers/glass/bottle/ritual_wine = 6, // poison kit price
+ /obj/item/reagent_containers/cup/bottle/ritual_wine = 6, // poison kit price
)
/datum/traitor_objective/smuggle/is_duplicate(datum/traitor_objective/smuggle/objective_to_compare)
diff --git a/modular_skyrat/master_files/code/modules/cargo/exports/traitor.dm b/modular_skyrat/master_files/code/modules/cargo/exports/traitor.dm
index 61128a3ef7d..ba4afdb82a0 100644
--- a/modular_skyrat/master_files/code/modules/cargo/exports/traitor.dm
+++ b/modular_skyrat/master_files/code/modules/cargo/exports/traitor.dm
@@ -16,5 +16,5 @@
cost = CARGO_CRATE_VALUE * 15
unit_name = "super high value contraband"
export_types = list(
- /obj/item/reagent_containers/glass/bottle/ritual_wine
+ /obj/item/reagent_containers/cup/bottle/ritual_wine
)
diff --git a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/bananaspider.dm b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/bananaspider.dm
index 6dcf514ab53..eca6fcf650f 100644
--- a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/bananaspider.dm
+++ b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/bananaspider.dm
@@ -10,7 +10,7 @@
maxHealth = 1
turns_per_move = 5 // this isn't player speed =|
speed = 2 // this is player speed
- loot = list(/obj/item/reagent_containers/food/snacks/deadbanana_spider)
+ loot = list(/obj/item/food/deadbanana_spider)
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 270
maxbodytemp = INFINITY
@@ -31,18 +31,18 @@
. = ..()
AddComponent(/datum/component/slippery, 40)
-/obj/item/reagent_containers/food/snacks/deadbanana_spider
+/obj/item/food/deadbanana_spider
name = "dead banana spider"
desc = "Thank god it's gone...but it does look slippery."
icon = 'modular_skyrat/master_files/icons/mob/newmobs.dmi'
icon_state = "bananaspider_peel"
- list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
- foodtype = GORE | MEAT | RAW
+ food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
+ foodtypes = GORE | MEAT | RAW
grind_results = list(/datum/reagent/blood = 20, /datum/reagent/liquidgibs = 5)
juice_results = list(/datum/reagent/consumable/banana = 10)
-/obj/item/reagent_containers/food/snacks/deadbanana_spider/Initialize(mapload)
+/obj/item/food/deadbanana_spider/Initialize(mapload)
. = ..()
AddComponent(/datum/component/slippery, 20)
diff --git a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/hostile/grabbagmob.dm b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/hostile/grabbagmob.dm
index 2b1cdf8580a..61fdaaa7ce8 100644
--- a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/hostile/grabbagmob.dm
+++ b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/hostile/grabbagmob.dm
@@ -609,7 +609,7 @@
mob_biotypes = MOB_ORGANIC|MOB_BUG
speak_chance = 0
turns_per_move = 5
- loot = list(/obj/item/reagent_containers/glass/bottle/rezadone)
+ loot = list(/obj/item/reagent_containers/cup/bottle/rezadone)
response_help_continuous = "pokes"
response_help_simple = "poke"
response_disarm_continuous = "gently pushes aside"
diff --git a/modular_skyrat/master_files/code/modules/reagents/bottle.dm b/modular_skyrat/master_files/code/modules/reagents/bottle.dm
index fc519b2f1de..2712e6e50e8 100644
--- a/modular_skyrat/master_files/code/modules/reagents/bottle.dm
+++ b/modular_skyrat/master_files/code/modules/reagents/bottle.dm
@@ -1,6 +1,6 @@
-/obj/item/reagent_containers/glass/bottle/rezadone
+/obj/item/reagent_containers/cup/bottle/rezadone
name = "rezadone bottle"
desc = "A small bottle of rezadone."
list_reagents = list(/datum/reagent/medicine/rezadone = 15)
-
-
+
+
diff --git a/modular_skyrat/modules/aesthetics/janitor/janitor.dm b/modular_skyrat/modules/aesthetics/janitor/janitor.dm
index a7476b4c268..9b9d60ae342 100644
--- a/modular_skyrat/modules/aesthetics/janitor/janitor.dm
+++ b/modular_skyrat/modules/aesthetics/janitor/janitor.dm
@@ -1,5 +1,5 @@
/obj/structure/mopbucket
icon = 'modular_skyrat/modules/aesthetics/janitor/janitor.dmi'
-/obj/item/reagent_containers/glass/bucket
+/obj/item/reagent_containers/cup/bucket
icon = 'modular_skyrat/modules/aesthetics/janitor/janitor.dmi'
diff --git a/modular_skyrat/modules/ashwalkers/code/items/ash_centrifuge.dm b/modular_skyrat/modules/ashwalkers/code/items/ash_centrifuge.dm
index 6f1198f1168..41704dcb5fc 100644
--- a/modular_skyrat/modules/ashwalkers/code/items/ash_centrifuge.dm
+++ b/modular_skyrat/modules/ashwalkers/code/items/ash_centrifuge.dm
@@ -1,15 +1,15 @@
-/obj/item/reagent_containers/glass/primitive_centrifuge
+/obj/item/reagent_containers/cup/primitive_centrifuge
name = "primitive centrifuge"
desc = "A small cup that allows a person to slowly spin out liquids they do not desire."
icon = 'modular_skyrat/modules/ashwalkers/icons/misc_tools.dmi'
icon_state = "primitive_centrifuge"
-/obj/item/reagent_containers/glass/primitive_centrifuge/examine()
+/obj/item/reagent_containers/cup/primitive_centrifuge/examine()
. = ..()
. += span_notice("Ctrl + Click to select chemicals to remove.")
. += span_notice("Ctrl + Shift + Click to select a chemical to keep, the rest removed.")
-/obj/item/reagent_containers/glass/primitive_centrifuge/CtrlClick(mob/user)
+/obj/item/reagent_containers/cup/primitive_centrifuge/CtrlClick(mob/user)
if(!length(reagents.reagent_list))
return
var/datum/user_input = tgui_input_list(user, "Select which chemical to remove.", "Removal Selection", reagents.reagent_list)
@@ -22,7 +22,7 @@
reagents.del_reagent(user_input.type)
to_chat(user, span_notice("You remove a reagent from [src]."))
-/obj/item/reagent_containers/glass/primitive_centrifuge/CtrlShiftClick(mob/user)
+/obj/item/reagent_containers/cup/primitive_centrifuge/CtrlShiftClick(mob/user)
if(!length(reagents.reagent_list))
return
var/datum/user_input = tgui_input_list(user, "Select which chemical to keep, the rest removed.", "Keep Selection", reagents.reagent_list)
diff --git a/modular_skyrat/modules/black_mesa/code/armaments/armament_miscellaneous.dm b/modular_skyrat/modules/black_mesa/code/armaments/armament_miscellaneous.dm
index ad51ba64056..530a10c45d4 100644
--- a/modular_skyrat/modules/black_mesa/code/armaments/armament_miscellaneous.dm
+++ b/modular_skyrat/modules/black_mesa/code/armaments/armament_miscellaneous.dm
@@ -43,6 +43,6 @@
cost = 1
/datum/armament_entry/hecu/misc/whiskey
- item_type = /obj/item/reagent_containers/food/drinks/bottle/whiskey
+ item_type = /obj/item/reagent_containers/cup/glass/bottle/whiskey
max_purchase = 2
cost = 1
diff --git a/modular_skyrat/modules/black_mesa/code/ghost_spawners.dm b/modular_skyrat/modules/black_mesa/code/ghost_spawners.dm
index 5d87e057f0e..e343b0f36bf 100644
--- a/modular_skyrat/modules/black_mesa/code/ghost_spawners.dm
+++ b/modular_skyrat/modules/black_mesa/code/ghost_spawners.dm
@@ -19,7 +19,7 @@
suit = /obj/item/clothing/suit/toggle/labcoat
shoes = /obj/item/clothing/shoes/laceup
back = /obj/item/storage/backpack
- backpack_contents = list(/obj/item/radio, /obj/item/reagent_containers/glass/beaker)
+ backpack_contents = list(/obj/item/radio, /obj/item/reagent_containers/cup/beaker)
id = /obj/item/card/id
id_trim = /datum/id_trim/science_team
@@ -136,7 +136,7 @@
belt = /obj/item/storage/belt/military/assault/hecu
ears = /obj/item/radio/headset/headset_faction
shoes = /obj/item/clothing/shoes/combat
- l_pocket = /obj/item/reagent_containers/food/drinks/flask
+ l_pocket = /obj/item/reagent_containers/cup/glass/flask
r_pocket = /obj/item/flashlight/flare
back = /obj/item/storage/backpack/ert/odst/hecu
backpack_contents = list(
diff --git a/modular_skyrat/modules/cargo/code/packs.dm b/modular_skyrat/modules/cargo/code/packs.dm
index 4e560726ad5..3f2b3c786a4 100644
--- a/modular_skyrat/modules/cargo/code/packs.dm
+++ b/modular_skyrat/modules/cargo/code/packs.dm
@@ -33,8 +33,8 @@
desc = "Contains two of the following: Morphine bottles, syringes, breath masks, and anesthetic tanks. Requires Medical Access to open."
access = ACCESS_MEDICAL
cost = CARGO_CRATE_VALUE * 4
- contains = list(/obj/item/reagent_containers/glass/bottle/morphine,
- /obj/item/reagent_containers/glass/bottle/morphine,
+ contains = list(/obj/item/reagent_containers/cup/bottle/morphine,
+ /obj/item/reagent_containers/cup/bottle/morphine,
/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/syringe,
/obj/item/clothing/mask/breath,
@@ -316,7 +316,7 @@
/obj/item/food/enchiladas,
/obj/item/food/carneburrito,
/obj/item/food/cheesyburrito,
- /obj/item/reagent_containers/glass/bottle/capsaicin)
+ /obj/item/reagent_containers/cup/bottle/capsaicin)
crate_name = "fiesta crate"
/datum/supply_pack/organic/fakemeat
@@ -357,10 +357,10 @@
name = "Fine Cuisine Assortment Value Pack"
desc = "Chef slop boring? Have high-maintenance crewmembers that with wings? Maybe you just want to revel in the sinful delight that are Cheese Curds? The Finest of our trade union has made the pack for you, containing a mix of fine oils, vinegar, and exceptionally rare ingredients."
cost = CARGO_CRATE_VALUE * 5
- contains = list(/obj/item/reagent_containers/food/condiment/quality_oil,
- /obj/item/reagent_containers/food/condiment/quality_oil,
- /obj/item/reagent_containers/food/condiment/vinegar,
- /obj/item/reagent_containers/food/condiment/vinegar,
+ contains = list(/obj/item/reagent_containers/condiment/quality_oil,
+ /obj/item/reagent_containers/condiment/quality_oil,
+ /obj/item/reagent_containers/condiment/vinegar,
+ /obj/item/reagent_containers/condiment/vinegar,
/obj/item/food/canned/tomatoes,
/obj/item/food/canned/tomatoes,
/obj/item/food/canned/pine_nuts,
@@ -376,16 +376,16 @@
name = "Quality Oil Bulk Pack"
desc = "Normal cooking oil not cutting it? Chef throw all the quality stuff in the frier because they thought it was funny? Well, We got you covered, Introducing a bulk pack of Ten (10) bottles of our finest oils, blended for the perfect taste in cold recipes, and a resistance for going acrid when cooking."
cost = CARGO_CRATE_VALUE * 9
- contains = list(/obj/item/reagent_containers/food/condiment/quality_oil,
- /obj/item/reagent_containers/food/condiment/quality_oil,
- /obj/item/reagent_containers/food/condiment/quality_oil,
- /obj/item/reagent_containers/food/condiment/quality_oil,
- /obj/item/reagent_containers/food/condiment/quality_oil,
- /obj/item/reagent_containers/food/condiment/quality_oil,
- /obj/item/reagent_containers/food/condiment/quality_oil,
- /obj/item/reagent_containers/food/condiment/quality_oil,
- /obj/item/reagent_containers/food/condiment/quality_oil,
- /obj/item/reagent_containers/food/condiment/quality_oil)
+ contains = list(/obj/item/reagent_containers/condiment/quality_oil,
+ /obj/item/reagent_containers/condiment/quality_oil,
+ /obj/item/reagent_containers/condiment/quality_oil,
+ /obj/item/reagent_containers/condiment/quality_oil,
+ /obj/item/reagent_containers/condiment/quality_oil,
+ /obj/item/reagent_containers/condiment/quality_oil,
+ /obj/item/reagent_containers/condiment/quality_oil,
+ /obj/item/reagent_containers/condiment/quality_oil,
+ /obj/item/reagent_containers/condiment/quality_oil,
+ /obj/item/reagent_containers/condiment/quality_oil)
crate_name = "bulk quality oil pack"
crate_type = /obj/structure/closet/crate/freezer
@@ -393,16 +393,16 @@
name = "Vinegar Bulk Pack"
desc = "Mothic Cuisine night? The winged fellows in port? Well, We'll have you cooking in no time. Refined from several rich wines and cultivated for just the right bite, This pack Ten (10) Bottles of vinegar for the perfect dressings and sauces."
cost = CARGO_CRATE_VALUE * 4
- contains = list(/obj/item/reagent_containers/food/condiment/vinegar,
- /obj/item/reagent_containers/food/condiment/vinegar,
- /obj/item/reagent_containers/food/condiment/vinegar,
- /obj/item/reagent_containers/food/condiment/vinegar,
- /obj/item/reagent_containers/food/condiment/vinegar,
- /obj/item/reagent_containers/food/condiment/vinegar,
- /obj/item/reagent_containers/food/condiment/vinegar,
- /obj/item/reagent_containers/food/condiment/vinegar,
- /obj/item/reagent_containers/food/condiment/vinegar,
- /obj/item/reagent_containers/food/condiment/vinegar)
+ contains = list(/obj/item/reagent_containers/condiment/vinegar,
+ /obj/item/reagent_containers/condiment/vinegar,
+ /obj/item/reagent_containers/condiment/vinegar,
+ /obj/item/reagent_containers/condiment/vinegar,
+ /obj/item/reagent_containers/condiment/vinegar,
+ /obj/item/reagent_containers/condiment/vinegar,
+ /obj/item/reagent_containers/condiment/vinegar,
+ /obj/item/reagent_containers/condiment/vinegar,
+ /obj/item/reagent_containers/condiment/vinegar,
+ /obj/item/reagent_containers/condiment/vinegar)
crate_name = "bulk vinegar pack"
crate_type = /obj/structure/closet/crate/freezer
@@ -459,7 +459,7 @@
/obj/item/stock_parts/cell/high,
/obj/item/stack/cable_coil,
/obj/item/book/manual/wiki/barman_recipes,
- /obj/item/reagent_containers/food/drinks/shaker,
+ /obj/item/reagent_containers/cup/glass/shaker,
/obj/item/circuitboard/machine/chem_dispenser/drinks/beer,
/obj/item/circuitboard/machine/chem_dispenser/drinks,
/obj/item/circuitboard/machine/dish_drive)
@@ -504,9 +504,9 @@
/obj/item/grenade/chem_grenade/cleaner,
/obj/item/grenade/chem_grenade/cleaner,
/obj/item/grenade/chem_grenade/cleaner,
- /obj/item/reagent_containers/glass/bottle/ammonia,
- /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/reagent_containers/cup/bottle/ammonia)
crate_name = "premium janitorial crate"
/datum/supply_pack/service/lamplight
diff --git a/modular_skyrat/modules/customization/modules/clothing/storage/belts.dm b/modular_skyrat/modules/customization/modules/clothing/storage/belts.dm
index 4408dfec706..b10cdf6abf3 100644
--- a/modular_skyrat/modules/customization/modules/clothing/storage/belts.dm
+++ b/modular_skyrat/modules/customization/modules/clothing/storage/belts.dm
@@ -154,12 +154,12 @@
atom_storage.set_holdable(list(
/obj/item/dnainjector,
/obj/item/reagent_containers/dropper,
- /obj/item/reagent_containers/glass/bottle,
+ /obj/item/reagent_containers/cup/bottle,
/obj/item/reagent_containers/pill,
/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/medigel,
/obj/item/storage/pill_bottle,
/obj/item/implanter,
- /obj/item/reagent_containers/glass/vial,
+ /obj/item/reagent_containers/cup/vial,
/obj/item/weaponcell/medical
))
diff --git a/modular_skyrat/modules/customization/modules/clothing/suits/coats.dm b/modular_skyrat/modules/customization/modules/clothing/suits/coats.dm
index 6a5091aac1a..ae08885a080 100644
--- a/modular_skyrat/modules/customization/modules/clothing/suits/coats.dm
+++ b/modular_skyrat/modules/customization/modules/clothing/suits/coats.dm
@@ -8,7 +8,7 @@
desc = "A winter coat with blue markings. Warm, but probably won't protect from biological agents. For the cozy doctor on the go."
icon_state = "coatparamed"
inhand_icon_state = "coatparamed"
- 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/baton/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/baton/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" = 0, "bio" = 50, "fire" = 0, "acid" = 45, "wound" = 3)
hoodtype = /obj/item/clothing/head/hooded/winterhood/paramedic
@@ -78,7 +78,7 @@
icon_state = "coatnarsie"
inhand_icon_state = "coatnarsie"
armor = list("melee" = 30, "bullet" = 20, "laser" = 30,"energy" = 10, "bomb" = 30, "bio" = 10, "fire" = 30, "acid" = 30, "wound" = 10)
- allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/restraints/legcuffs/bola/cult,/obj/item/melee/cultblade,/obj/item/melee/cultblade/dagger,/obj/item/reagent_containers/glass/beaker/unholywater,/obj/item/cult_shift,/obj/item/flashlight/flare/culttorch,/obj/item/melee/cultblade/halberd)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/restraints/legcuffs/bola/cult,/obj/item/melee/cultblade,/obj/item/melee/cultblade/dagger,/obj/item/reagent_containers/cup/beaker/unholywater,/obj/item/cult_shift,/obj/item/flashlight/flare/culttorch,/obj/item/melee/cultblade/halberd)
hoodtype = /obj/item/clothing/head/hooded/winterhood/narsie
/obj/item/clothing/head/hooded/winterhood/narsie
diff --git a/modular_skyrat/modules/customization/modules/clothing/suits/trek.dm b/modular_skyrat/modules/customization/modules/clothing/suits/trek.dm
index 68673949823..c36a490c7a9 100644
--- a/modular_skyrat/modules/customization/modules/clothing/suits/trek.dm
+++ b/modular_skyrat/modules/customization/modules/clothing/suits/trek.dm
@@ -18,8 +18,8 @@
/obj/item/hypospray,
/obj/item/healthanalyzer,
/obj/item/reagent_containers/syringe,
- /obj/item/reagent_containers/glass/vial,
- /obj/item/reagent_containers/glass/beaker,
+ /obj/item/reagent_containers/cup/vial,
+ /obj/item/reagent_containers/cup/beaker,
/obj/item/storage/pill_bottle,
/obj/item/taperecorder)
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
diff --git a/modular_skyrat/modules/customization/modules/clothing/under/utility_port/suits_port.dm b/modular_skyrat/modules/customization/modules/clothing/under/utility_port/suits_port.dm
index 154adba9b46..a3170ca6843 100644
--- a/modular_skyrat/modules/customization/modules/clothing/under/utility_port/suits_port.dm
+++ b/modular_skyrat/modules/customization/modules/clothing/under/utility_port/suits_port.dm
@@ -6,7 +6,7 @@
desc = "A heavy jacket made from wool originally stolen from the chef's goat. This new design is made to fit the classic suit-and-tie aesthetic, but without the hypothermia."
icon_state = "coatbar"
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
- allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/reagent_containers/food/drinks/shaker, /obj/item/reagent_containers/food/drinks/flask, /obj/item/reagent_containers/glass/rag)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/reagent_containers/cup/glass/shaker, /obj/item/reagent_containers/cup/glass/flask, /obj/item/reagent_containers/cup/rag)
hoodtype = /obj/item/clothing/head/hooded/winterhood/bartender
/obj/item/clothing/head/hooded/winterhood/bartender
diff --git a/modular_skyrat/modules/customization/modules/reagents/chemistry/reagents/drinks.dm b/modular_skyrat/modules/customization/modules/reagents/chemistry/reagents/drinks.dm
index 32888d995ac..eab56983a1f 100644
--- a/modular_skyrat/modules/customization/modules/reagents/chemistry/reagents/drinks.dm
+++ b/modular_skyrat/modules/customization/modules/reagents/chemistry/reagents/drinks.dm
@@ -1,18 +1,18 @@
-/obj/item/reagent_containers/food/drinks/soda_cans/skyrat/lubricola
+/obj/item/reagent_containers/cup/soda_cans/skyrat/lubricola
name = "LubriCola"
desc = "The perfect lubricant for your weary gears."
icon_state = "lubricola"
list_reagents = list(/datum/reagent/fuel/oil = 30)
custom_price = PAYCHECK_LOWER * 1.2
-/obj/item/reagent_containers/food/drinks/soda_cans/skyrat/welding_fizz
+/obj/item/reagent_containers/cup/soda_cans/skyrat/welding_fizz
name = "Welding Fizz"
desc = "More energy than in an IED! Now carbonated. WARNING: Contains toxic and flammable fuels."
icon_state = "welding_fizz"
list_reagents = list(/datum/reagent/fuel = 25, /datum/reagent/carbondioxide = 5)
custom_price = PAYCHECK_LOWER * 1.2
-/obj/item/reagent_containers/food/drinks/soda_cans/skyrat/synthanolcan
+/obj/item/reagent_containers/cup/soda_cans/skyrat/synthanolcan
name = "Silly Cone's Synthanol"
desc = "A recompiling can of synthanol."
icon_state = "synthanolcan"
@@ -33,10 +33,10 @@
/// 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/food/drinks/soda_cans/skyrat
+/obj/item/reagent_containers/cup/soda_cans/skyrat
icon = 'modular_skyrat/master_files/icons/obj/drinks.dmi'
-/obj/item/reagent_containers/food/drinks/soda_cans/skyrat/attack(mob/M, mob/living/user)
+/obj/item/reagent_containers/cup/soda_cans/skyrat/attack(mob/M, mob/living/user)
if(istype(M, /mob/living/carbon) && !reagents.total_volume && user.combat_mode && user.zone_selected == BODY_ZONE_HEAD)
if(M == user)
user.visible_message(span_warning("[user] crushes the can of [src] on [user.p_their()] forehead!"), span_notice("You crush the can of [src] on your forehead."))
@@ -49,7 +49,7 @@
return TRUE
. = ..()
-/obj/item/reagent_containers/food/drinks/soda_cans/skyrat/bullet_act(obj/projectile/P)
+/obj/item/reagent_containers/cup/soda_cans/skyrat/bullet_act(obj/projectile/P)
. = ..()
if(!(P.nodamage) && P.damage_type == BRUTE && !QDELETED(src))
var/obj/item/trash/can/skyrat/crushed_can = new /obj/item/trash/can/skyrat(src.loc)
@@ -67,7 +67,7 @@
* * hide_message - Stops the generic fizzing message, so you can do your own
*/
-/obj/item/reagent_containers/food/drinks/soda_cans/skyrat/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
+/obj/item/reagent_containers/cup/soda_cans/skyrat/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
diff --git a/modular_skyrat/modules/customization/readme.md b/modular_skyrat/modules/customization/readme.md
index 83a9eb996d0..af197a1baca 100644
--- a/modular_skyrat/modules/customization/readme.md
+++ b/modular_skyrat/modules/customization/readme.md
@@ -10,39 +10,39 @@ Re-writes how mutant bodyparts exist and how they're handled. Adds in a per limb
### TG Proc Changes:
-./code/__HELPERS/global_lists.dm > /proc/make_datum_references_lists()
-./code/__HELPERS/mobs.dm > /proc/random_features()
-./code/controllers/subsystem/job.dm > /datum/controller/subsystem/job/proc/EquipRank()
-./code/datums/dna.dm > /datum/dna/proc/initialize_dna() , /mob/living/carbon/set_species()
-./code/modules/admin/create_mob.dm > /proc/randomize_human()
-./code/modules/client/preferences.dm > ALMOST THE ENTIRETY OF THE FILE
-./code/modules/client/preferences_savefile.dm > ONCE AGAIN, THE ENTIRE FILE
-./code/modules/mob/dead/new_player/preferences_setup.dm > /datum/preferences/proc/random_character(), /datum/preferences/proc/random_species(), /datum/preferences/proc/update_preview_icon()
-./code/modules/mob/living/carbon/carbon_update_icons.dm > /mob/living/carbon/update_worn_mask(), /mob/living/carbon/update_worn_head(), /mob/living/carbon/proc/update_body_parts(), /mob/living/carbon/proc/generate_icon_render_key()
-./code/modules/mob/living/carbon/human/emote.dm > /datum/emote/living/carbon/human/wag/run_emote(), /datum/emote/living/carbon/human/wag/can_run_emote()
-./code/modules/mob/living/carbon/human/examine.dm > /mob/living/carbon/human/examine()
-./code/modules/mob/living/carbon/human/human_update_icons.dm > /mob/living/carbon/human/update_worn_undersuit(), /mob/living/carbon/human/update_worn_glasses(), /mob/living/carbon/human/update_worn_shoes(), /mob/living/carbon/human/update_worn_oversuit(), /obj/item/proc/build_worn_icon(), /mob/living/carbon/human/generate_icon_render_key()
-./code/modules/mob/living/carbon/human/species.dm > /datum/species/proc/on_species_gain(), /datum/species/proc/handle_body(), /datum/species/proc/handle_mutant_bodyparts(), /datum/species/proc/can_equip(), /datum/species/proc/can_wag_tail(), /datum/species/proc/stop_wagging_tail(), /datum/species/proc/start_wagging_tail(), /datum/species/proc/is_wagging_tail(), /datum/species/proc/handle_hair()
-./code/modules/mob/living/carbon/human/species_types/felinid.dm > the 5 procs related to wagging tail
-./code/modules/mob/living/carbon/human/species_types/lizardpeople.dm the 5 procs related to wagging tail and - /datum/species/lizard/on_species_gain()
-./code/modules/surgery/bodyparts/_bodyparts.dm > /obj/item/bodypart/proc/get_limb_icon()
-./code/modules/surgery/organs/ears.dm > /obj/item/organ/internal/ears/cat/Insert(), /obj/item/organ/internal/ears/cat/Remove()
-./code/modules/surgery/organs/tails.dm > /obj/item/organ/external/tail/cat/Insert(), /obj/item/organ/external/tail/cat/Remove(), /obj/item/organ/external/tail/lizard/Initialize(mapload), /obj/item/organ/external/tail/lizard/Insert(), /obj/item/organ/external/tail/lizard/Remove()
-./code/modules/surgery/bodyparts/dismemberment.dm > /mob/living/carbon/regenerate_limb()
-./code/modules/mob/living/carbon/human/status_procs.dm > /mob/living/carbon/human/become_husk() > APPENDED
-./code/modules/reagents/chemistry/holder.dm > /datum/reagents/metabolize()
-./code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm > /obj/item/reagent_containers/food/drinks/drinkingglass/on_reagent_change()
-./code/modules/mob/living/carbon/human/human_defense.dm > /mob/living/carbon/human/emp_act()
-./code/modules/mob/living/carbon/human.dm > /mob/living/carbon/human/revive() > APPENDED
-./code/modules/reagents/chemistry/reagents/food_reagents.dm > datum/reagent/consumable/on_mob_life()
-./code/datums/traits/negative.dm > /datum/quirk/prosthetic_limb
-.\code\modules\client.dm > /client/proc/update_special_keybinds()
-./code/datums/traits/negative.dm > /datum/quirk/prosthetic_limb
+ ./code/__HELPERS/global_lists.dm > /proc/make_datum_references_lists()
+ ./code/__HELPERS/mobs.dm > /proc/random_features()
+ ./code/controllers/subsystem/job.dm > /datum/controller/subsystem/job/proc/EquipRank()
+ ./code/datums/dna.dm > /datum/dna/proc/initialize_dna() , /mob/living/carbon/set_species()
+ ./code/modules/admin/create_mob.dm > /proc/randomize_human()
+ ./code/modules/client/preferences.dm > ALMOST THE ENTIRETY OF THE FILE
+ ./code/modules/client/preferences_savefile.dm > ONCE AGAIN, THE ENTIRE FILE
+ ./code/modules/mob/dead/new_player/preferences_setup.dm > /datum/preferences/proc/random_character(), /datum/preferences/proc/random_species(), /datum/preferences/proc/update_preview_icon()
+ ./code/modules/mob/living/carbon/carbon_update_icons.dm > /mob/living/carbon/update_inv_wear_mask(), /mob/living/carbon/update_inv_head(), /mob/living/carbon/proc/update_body_parts(), /mob/living/carbon/proc/generate_icon_render_key()
+ ./code/modules/mob/living/carbon/human/emote.dm > /datum/emote/living/carbon/human/wag/run_emote(), /datum/emote/living/carbon/human/wag/can_run_emote()
+ ./code/modules/mob/living/carbon/human/examine.dm > /mob/living/carbon/human/examine()
+ ./code/modules/mob/living/carbon/human/human_update_icons.dm > /mob/living/carbon/human/update_inv_w_uniform(), /mob/living/carbon/human/update_inv_glasses(), /mob/living/carbon/human/update_inv_shoes(), /mob/living/carbon/human/update_inv_wear_suit(), /obj/item/proc/build_worn_icon(), /mob/living/carbon/human/generate_icon_render_key()
+ ./code/modules/mob/living/carbon/human/species.dm > /datum/species/proc/on_species_gain(), /datum/species/proc/handle_body(), /datum/species/proc/handle_mutant_bodyparts(), /datum/species/proc/can_equip(), /datum/species/proc/can_wag_tail(), /datum/species/proc/stop_wagging_tail(), /datum/species/proc/start_wagging_tail(), /datum/species/proc/is_wagging_tail(), /datum/species/proc/handle_hair()
+ ./code/modules/mob/living/carbon/human/species_types/felinid.dm > the 5 procs related to wagging tail
+ ./code/modules/mob/living/carbon/human/species_types/lizardpeople.dm the 5 procs related to wagging tail and - /datum/species/lizard/on_species_gain()
+ ./code/modules/surgery/bodyparts/_bodyparts.dm > /obj/item/bodypart/proc/get_limb_icon()
+ ./code/modules/surgery/organs/ears.dm > /obj/item/organ/internal/ears/cat/Insert(), /obj/item/organ/internal/ears/cat/Remove()
+ ./code/modules/surgery/organs/tails.dm > /obj/item/organ/external/tail/cat/Insert(), /obj/item/organ/external/tail/cat/Remove(), /obj/item/organ/external/tail/lizard/Initialize(mapload), /obj/item/organ/external/tail/lizard/Insert(), /obj/item/organ/external/tail/lizard/Remove()
+ ./code/modules/surgery/bodyparts/dismemberment.dm > /mob/living/carbon/regenerate_limb()
+ ./code/modules/mob/living/carbon/human/status_procs.dm > /mob/living/carbon/human/become_husk() > APPENDED
+ ./code/modules/reagents/chemistry/holder.dm > /datum/reagents/metabolize()
+ ./code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm > /obj/item/reagent_containers/cup/glass/drinkingglass/on_reagent_change()
+ ./code/modules/mob/living/carbon/human/human_defense.dm > /mob/living/carbon/human/emp_act()
+ ./code/modules/mob/living/carbon/human.dm > /mob/living/carbon/human/revive() > APPENDED
+ ./code/modules/reagents/chemistry/reagents/food_reagents.dm > datum/reagent/consumable/on_mob_life()
+ ./code/datums/traits/negative.dm > /datum/quirk/prosthetic_limb
+ .\code\modules\client.dm > /client/proc/update_special_keybinds()
+ ./code/datums/traits/negative.dm > /datum/quirk/prosthetic_limb
-./code/modules/mob/living/carbon/human/species.dm > /datum/species/regenerate_organs() > APPENDED
+ ./code/modules/mob/living/carbon/human/species.dm > /datum/species/regenerate_organs() > APPENDED
-./code/controllers/subsystem/job.dm > /datum/controller/subsystem/job/proc/FindOccupationCandidates(), /datum/controller/subsystem/job/proc/GiveRandomJob(), /datum/controller/subsystem/job/proc/DivideOccupations(), /datum/controller/subsystem/job/proc/AssignRole()
-./code/modules/mob/dead/new_player/new_player.dm > /mob/dead/new_player/proc/IsJobUnavailable(), /proc/get_job_unavailable_error_message()
+ ./code/controllers/subsystem/job.dm > /datum/controller/subsystem/job/proc/FindOccupationCandidates(), /datum/controller/subsystem/job/proc/GiveRandomJob(), /datum/controller/subsystem/job/proc/DivideOccupations(), /datum/controller/subsystem/job/proc/AssignRole()
+ ./code/modules/mob/dead/new_player/new_player.dm > /mob/dead/new_player/proc/IsJobUnavailable(), /proc/get_job_unavailable_error_message()
### Defines:
diff --git a/modular_skyrat/modules/exp_corps/code/clothing.dm b/modular_skyrat/modules/exp_corps/code/clothing.dm
index ac114f16907..a2b889c92a1 100644
--- a/modular_skyrat/modules/exp_corps/code/clothing.dm
+++ b/modular_skyrat/modules/exp_corps/code/clothing.dm
@@ -56,9 +56,9 @@
name = "pointman's chest rig"
/obj/item/storage/belt/military/expeditionary_corps/pointman/PopulateContents()
- new /obj/item/reagent_containers/food/drinks/bottle/whiskey(src)
+ new /obj/item/reagent_containers/cup/glass/bottle/whiskey(src)
new /obj/item/stack/sheet/plasteel(src,5)
- new /obj/item/reagent_containers/glass/bottle/morphine(src)
+ new /obj/item/reagent_containers/cup/bottle/morphine(src)
/obj/item/storage/belt/military/expeditionary_corps/marksman
name = "marksman's chest rig"
diff --git a/modular_skyrat/modules/exp_corps/code/expeditionary_trooper.dm b/modular_skyrat/modules/exp_corps/code/expeditionary_trooper.dm
index 26b309c7a5c..5d058c993cf 100644
--- a/modular_skyrat/modules/exp_corps/code/expeditionary_trooper.dm
+++ b/modular_skyrat/modules/exp_corps/code/expeditionary_trooper.dm
@@ -77,7 +77,7 @@
new /obj/item/storage/box/donkpockets(src)
new /obj/item/flashlight/glowstick(src)
new /obj/item/tank/internals/emergency_oxygen/double(src)
- new /obj/item/reagent_containers/food/drinks/waterbottle(src)
+ new /obj/item/reagent_containers/cup/glass/waterbottle(src)
new /obj/item/reagent_containers/blood/universal(src)
new /obj/item/reagent_containers/syringe(src)
new /obj/item/storage/pill_bottle/multiver(src)
diff --git a/modular_skyrat/modules/faction/code/mapping/mapping_helpers.dm b/modular_skyrat/modules/faction/code/mapping/mapping_helpers.dm
index 2bad22c96cb..c1f62ab5260 100644
--- a/modular_skyrat/modules/faction/code/mapping/mapping_helpers.dm
+++ b/modular_skyrat/modules/faction/code/mapping/mapping_helpers.dm
@@ -52,7 +52,7 @@
for(var/i in 1 to 10)
new /obj/item/food/canned/beans(src)
for(var/i in 1 to 10)
- new /obj/item/reagent_containers/food/drinks/waterbottle(src)
+ new /obj/item/reagent_containers/cup/glass/waterbottle(src)
if(2)
new /obj/item/stack/sheet/iron/fifty(src)
new /obj/item/stack/rods/fifty(src)
diff --git a/modular_skyrat/modules/faction/maps/shuttles/tradership_faction.dmm b/modular_skyrat/modules/faction/maps/shuttles/tradership_faction.dmm
index eea04b47fb5..550171a9b18 100644
--- a/modular_skyrat/modules/faction/maps/shuttles/tradership_faction.dmm
+++ b/modular_skyrat/modules/faction/maps/shuttles/tradership_faction.dmm
@@ -312,25 +312,25 @@
/obj/structure/closet/crate{
name = "food crate"
},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = -5;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = 2;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = -2
},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = 5
},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = 1;
pixel_y = -3
},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
+/obj/item/reagent_containers/cup/glass/waterbottle/large{
pixel_x = 8;
pixel_y = -3
},
@@ -1397,19 +1397,19 @@
"cn" = (
/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,
@@ -1426,7 +1426,7 @@
pixel_x = -11;
pixel_y = 3
},
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
pixel_x = 6;
pixel_y = 14
},
@@ -1737,18 +1737,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
},
@@ -1765,14 +1765,14 @@
"cM" = (
/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
},
@@ -1949,7 +1949,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
@@ -2069,11 +2069,11 @@
"dj" = (
/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
@@ -2433,11 +2433,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
},
@@ -2482,7 +2482,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{
dir = 1
@@ -2535,7 +2535,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/crate/medical,
/obj/item/storage/medkit/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/trader/cargo)
@@ -2586,11 +2586,11 @@
/obj/item/knife{
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{
layer = 5;
pixel_x = -5;
pixel_y = 6
diff --git a/modular_skyrat/modules/ghostcafe/code/robot_ghostcafe.dm b/modular_skyrat/modules/ghostcafe/code/robot_ghostcafe.dm
index d4ce20b0c90..fea2138d48e 100644
--- a/modular_skyrat/modules/ghostcafe/code/robot_ghostcafe.dm
+++ b/modular_skyrat/modules/ghostcafe/code/robot_ghostcafe.dm
@@ -43,7 +43,7 @@
/obj/item/reagent_containers/borghypo/borgshaker/specific/soda,
/obj/item/reagent_containers/borghypo/borgshaker/specific/alcohol,
/obj/item/reagent_containers/borghypo/borgshaker/specific/misc,
- /obj/item/reagent_containers/food/drinks/drinkingglass,
+ /obj/item/reagent_containers/cup/glass/drinkingglass,
/obj/item/soap/nanotrasen,
/obj/item/mop/cyborg, // Soap's good and all, but a mop is good, too
/obj/item/lightreplacer, // Lights go out sometimes, or get broken, let the Borg help fix them
diff --git a/modular_skyrat/modules/gun_cargo/code/armament_datums/interdyne.dm b/modular_skyrat/modules/gun_cargo/code/armament_datums/interdyne.dm
index 03efd66d2ab..45f72575270 100644
--- a/modular_skyrat/modules/gun_cargo/code/armament_datums/interdyne.dm
+++ b/modular_skyrat/modules/gun_cargo/code/armament_datums/interdyne.dm
@@ -52,22 +52,22 @@
interest_addition = COMPANY_INTEREST_CHEMICAL
/datum/armament_entry/cargo_gun/interdyne/chemical/atropine
- item_type = /obj/item/reagent_containers/glass/bottle/atropine
+ item_type = /obj/item/reagent_containers/cup/bottle/atropine
lower_cost = CARGO_CRATE_VALUE * 1.5
upper_cost = CARGO_CRATE_VALUE * 2.5
/datum/armament_entry/cargo_gun/interdyne/chemical/epinephrine
- item_type = /obj/item/reagent_containers/glass/bottle/epinephrine
+ item_type = /obj/item/reagent_containers/cup/bottle/epinephrine
lower_cost = CARGO_CRATE_VALUE * 1
upper_cost = CARGO_CRATE_VALUE * 1.5
/datum/armament_entry/cargo_gun/interdyne/chemical/saline
- item_type = /obj/item/reagent_containers/glass/bottle/salglu_solution
+ item_type = /obj/item/reagent_containers/cup/bottle/salglu_solution
lower_cost = CARGO_CRATE_VALUE * 1
upper_cost = CARGO_CRATE_VALUE * 1.5
/datum/armament_entry/cargo_gun/interdyne/chemical/ephedrine
- item_type = /obj/item/reagent_containers/glass/bottle/ephedrine
+ item_type = /obj/item/reagent_containers/cup/bottle/ephedrine
lower_cost = CARGO_CRATE_VALUE * 3
upper_cost = CARGO_CRATE_VALUE * 4
@@ -77,34 +77,34 @@
contraband = TRUE
/datum/armament_entry/cargo_gun/interdyne/chemical_contra/toxin
- item_type = /obj/item/reagent_containers/glass/bottle/toxin
+ item_type = /obj/item/reagent_containers/cup/bottle/toxin
lower_cost = CARGO_CRATE_VALUE * 2
upper_cost = CARGO_CRATE_VALUE * 4
/datum/armament_entry/cargo_gun/interdyne/chemical_contra/chloralhydrate
- item_type = /obj/item/reagent_containers/glass/bottle/chloralhydrate
+ item_type = /obj/item/reagent_containers/cup/bottle/chloralhydrate
lower_cost = CARGO_CRATE_VALUE * 2
upper_cost = CARGO_CRATE_VALUE * 4
/datum/armament_entry/cargo_gun/interdyne/chemical_contra/histamine
- item_type = /obj/item/reagent_containers/glass/bottle/histamine
+ item_type = /obj/item/reagent_containers/cup/bottle/histamine
lower_cost = CARGO_CRATE_VALUE * 2
upper_cost = CARGO_CRATE_VALUE * 3
/datum/armament_entry/cargo_gun/interdyne/chemical_contra/cyanide
- item_type = /obj/item/reagent_containers/glass/bottle/cyanide
+ item_type = /obj/item/reagent_containers/cup/bottle/cyanide
lower_cost = CARGO_CRATE_VALUE * 3
upper_cost = CARGO_CRATE_VALUE * 4
interest_required = PASSED_INTEREST
/datum/armament_entry/cargo_gun/interdyne/chemical_contra/amanitin
- item_type = /obj/item/reagent_containers/glass/bottle/amanitin
+ item_type = /obj/item/reagent_containers/cup/bottle/amanitin
lower_cost = CARGO_CRATE_VALUE * 3
upper_cost = CARGO_CRATE_VALUE * 4
interest_required = PASSED_INTEREST
/datum/armament_entry/cargo_gun/interdyne/chemical_contra/pancuronium
- item_type = /obj/item/reagent_containers/glass/bottle/pancuronium
+ item_type = /obj/item/reagent_containers/cup/bottle/pancuronium
lower_cost = CARGO_CRATE_VALUE * 6
upper_cost = CARGO_CRATE_VALUE * 7
interest_required = HIGH_INTEREST
diff --git a/modular_skyrat/modules/gun_cargo/code/objects/bottles.dm b/modular_skyrat/modules/gun_cargo/code/objects/bottles.dm
index e3f919ec77d..c48c1841b8a 100644
--- a/modular_skyrat/modules/gun_cargo/code/objects/bottles.dm
+++ b/modular_skyrat/modules/gun_cargo/code/objects/bottles.dm
@@ -1,4 +1,4 @@
-/obj/item/reagent_containers/glass/bottle/ephedrine
+/obj/item/reagent_containers/cup/bottle/ephedrine
name = "ephedrine bottle"
desc = "A small bottle. Contains ephedrine - used to move faster and resist stun effects."
list_reagents = list(/datum/reagent/medicine/ephedrine = 30)
diff --git a/modular_skyrat/modules/hyposprays/code/autolathe_designs.dm b/modular_skyrat/modules/hyposprays/code/autolathe_designs.dm
index f2edefa892d..ffb07b77759 100644
--- a/modular_skyrat/modules/hyposprays/code/autolathe_designs.dm
+++ b/modular_skyrat/modules/hyposprays/code/autolathe_designs.dm
@@ -3,7 +3,7 @@
id = "large_hypovial"
build_type = AUTOLATHE | PROTOLATHE
materials = list(/datum/material/iron = 2500)
- build_path = /obj/item/reagent_containers/glass/vial/large
+ build_path = /obj/item/reagent_containers/cup/vial/large
category = list(RND_CATEGORY_INITIAL, RND_CATEGORY_MEDICAL, "Medical Designs")
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL
diff --git a/modular_skyrat/modules/hyposprays/code/hypospray_kits.dm b/modular_skyrat/modules/hyposprays/code/hypospray_kits.dm
index 5a03c05f2eb..4788bec9c9f 100644
--- a/modular_skyrat/modules/hyposprays/code/hypospray_kits.dm
+++ b/modular_skyrat/modules/hyposprays/code/hypospray_kits.dm
@@ -26,7 +26,7 @@
atom_storage.max_slots = 12
atom_storage.can_hold = typecacheof(list(
/obj/item/hypospray/mkii,
- /obj/item/reagent_containers/glass/vial
+ /obj/item/reagent_containers/cup/vial
))
update_icon_state()
update_icon()
@@ -101,16 +101,16 @@
if(empty)
return
new /obj/item/hypospray/mkii/cmo(src)
- new /obj/item/reagent_containers/glass/vial/large/multiver(src)
- new /obj/item/reagent_containers/glass/vial/large/salglu(src)
- new /obj/item/reagent_containers/glass/vial/large/synthflesh(src)
+ new /obj/item/reagent_containers/cup/vial/large/multiver(src)
+ new /obj/item/reagent_containers/cup/vial/large/salglu(src)
+ new /obj/item/reagent_containers/cup/vial/large/synthflesh(src)
/obj/item/storage/box/vials
name = "box of hypovials"
/obj/item/storage/box/vials/PopulateContents()
for(var/i in 1 to 7)
- new /obj/item/reagent_containers/glass/vial/small( src )
+ new /obj/item/reagent_containers/cup/vial/small( src )
/obj/item/storage/box/hypospray
name = "box of hypospray kits"
diff --git a/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm b/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm
index ed3fda3ac8c..e2a6a6b5f87 100644
--- a/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm
+++ b/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm
@@ -22,12 +22,12 @@
icon = 'modular_skyrat/modules/hyposprays/icons/hyposprays.dmi'
desc = "A new development from DeForest Medical, this hypospray takes 60-unit vials as the drug supply for easy swapping."
w_class = WEIGHT_CLASS_TINY
- var/list/allowed_containers = list(/obj/item/reagent_containers/glass/vial/small)
+ var/list/allowed_containers = list(/obj/item/reagent_containers/cup/vial/small)
/// Is the hypospray only able to use small vials. Relates to the loaded overlays
var/small_only = TRUE
/// Inject or spray?
var/mode = HYPO_INJECT
- var/obj/item/reagent_containers/glass/vial/vial
+ var/obj/item/reagent_containers/cup/vial/vial
/// If the Hypospray starts with a vial, which vial does it start with?
var/start_vial
/// Does the Hypospray start with a vial?
@@ -49,11 +49,11 @@
/obj/item/hypospray/mkii/cmo
name = "hypospray mk.II deluxe"
- allowed_containers = list(/obj/item/reagent_containers/glass/vial/small, /obj/item/reagent_containers/glass/vial/large)
+ allowed_containers = list(/obj/item/reagent_containers/cup/vial/small, /obj/item/reagent_containers/cup/vial/large)
icon_state = "cmo2"
desc = "The deluxe hypospray can take larger 120-unit vials. It also acts faster and can deliver more reagents per spray."
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
- start_vial = /obj/item/reagent_containers/glass/vial/large/deluxe
+ start_vial = /obj/item/reagent_containers/cup/vial/large/deluxe
spawnwithvial = TRUE
small_only = FALSE
inject_wait = DELUXE_WAIT_INJECT
@@ -103,8 +103,8 @@
. += "It has no vial loaded in."
/obj/item/hypospray/mkii/proc/unload_hypo(obj/item/hypo, mob/user)
- if((istype(hypo, /obj/item/reagent_containers/glass/vial)))
- var/obj/item/reagent_containers/glass/vial/container = hypo
+ if((istype(hypo, /obj/item/reagent_containers/cup/vial)))
+ var/obj/item/reagent_containers/cup/vial/container = hypo
container.forceMove(user.loc)
user.put_in_hands(container)
to_chat(user, span_notice("You remove [vial] from [src]."))
@@ -116,14 +116,14 @@
return
/obj/item/hypospray/mkii/proc/insert_vial(obj/item/new_vial, mob/living/user, obj/item/current_vial)
- var/obj/item/reagent_containers/glass/vial/container = new_vial
+ var/obj/item/reagent_containers/cup/vial/container = new_vial
var/old_loc //The location of and old vial.
if(!is_type_in_list(container, allowed_containers))
to_chat(user, span_notice("[src] doesn't accept this type of vial."))
return FALSE
if(current_vial)
old_loc = container.loc
- var/obj/item/reagent_containers/glass/vial/old_container = current_vial
+ var/obj/item/reagent_containers/cup/vial/old_container = current_vial
old_container.forceMove(drop_location())
if(!user.transferItemToLoc(container, src))
return FALSE
@@ -138,7 +138,7 @@
current_vial.forceMove(old_loc)
/obj/item/hypospray/mkii/attackby(obj/item/used_item, mob/living/user)
- if((istype(used_item, /obj/item/reagent_containers/glass/vial) && vial != null))
+ if((istype(used_item, /obj/item/reagent_containers/cup/vial) && vial != null))
if(!quickload)
to_chat(user, span_warning("[src] can not hold more than one vial!"))
return FALSE
@@ -146,7 +146,7 @@
insert_vial(used_item, user, vial)
return TRUE
- if((istype(used_item, /obj/item/reagent_containers/glass/vial)))
+ if((istype(used_item, /obj/item/reagent_containers/cup/vial)))
insert_vial(used_item, user)
return TRUE
@@ -186,7 +186,7 @@
return SECONDARY_ATTACK_CONTINUE_CHAIN
/obj/item/hypospray/mkii/afterattack(atom/target, mob/living/user, proximity)
- if(istype(target, /obj/item/reagent_containers/glass/vial))
+ if(istype(target, /obj/item/reagent_containers/cup/vial))
insert_vial(target, user, vial)
return TRUE
diff --git a/modular_skyrat/modules/hyposprays/code/hypovials.dm b/modular_skyrat/modules/hyposprays/code/hypovials.dm
index d4a3ae14f30..2ba0e495fb9 100644
--- a/modular_skyrat/modules/hyposprays/code/hypovials.dm
+++ b/modular_skyrat/modules/hyposprays/code/hypovials.dm
@@ -1,4 +1,4 @@
-/obj/item/reagent_containers/glass/vial
+/obj/item/reagent_containers/cup/vial
name = "broken hypovial"
desc = "You probably shouldn't be seeing this. Shout at a coder."
icon = 'modular_skyrat/modules/hyposprays/icons/vials.dmi'
@@ -11,7 +11,7 @@
fill_icon_thresholds = list(10, 25, 50, 75, 100)
var/chem_color //Used for hypospray overlay
-/obj/item/reagent_containers/glass/vial/update_overlays()
+/obj/item/reagent_containers/cup/vial/update_overlays()
. = ..()
if(!fill_icon_thresholds)
return
@@ -35,22 +35,22 @@
chem_color = filling.color
. += filling
-/obj/item/reagent_containers/glass/vial/Initialize(mapload)
+/obj/item/reagent_containers/cup/vial/Initialize(mapload)
. = ..()
update_icon()
-/obj/item/reagent_containers/glass/vial/on_reagent_change()
+/obj/item/reagent_containers/cup/vial/on_reagent_change()
update_icon()
//Fit in all hypos
-/obj/item/reagent_containers/glass/vial/small
+/obj/item/reagent_containers/cup/vial/small
name = "hypovial"
desc = "A small, 60u capacity vial compatible with most hyposprays."
volume = 60
possible_transfer_amounts = list(1,2,5,10,20,30,40,50,60)
//Fit in CMO hypo only
-/obj/item/reagent_containers/glass/vial/large
+/obj/item/reagent_containers/cup/vial/large
name = "large hypovial"
icon_state = "hypoviallarge"
desc = "A large, 120u capacity vial that fits only in the most deluxe hyposprays."
@@ -59,18 +59,18 @@
possible_transfer_amounts = list(1,2,5,10,20,30,40,50,100,120)
//Hypos that are in the CMO's kit round start
-/obj/item/reagent_containers/glass/vial/large/deluxe
+/obj/item/reagent_containers/cup/vial/large/deluxe
name = "deluxe hypovial"
list_reagents = list(/datum/reagent/medicine/omnizine = 20, /datum/reagent/medicine/leporazine = 20, /datum/reagent/medicine/atropine = 20)
-/obj/item/reagent_containers/glass/vial/large/salglu
+/obj/item/reagent_containers/cup/vial/large/salglu
name = "large green hypovial (salglu)"
list_reagents = list(/datum/reagent/medicine/salglu_solution = 60)
-/obj/item/reagent_containers/glass/vial/large/synthflesh
+/obj/item/reagent_containers/cup/vial/large/synthflesh
name = "large orange hypovial (synthflesh)"
list_reagents = list(/datum/reagent/medicine/c2/synthflesh = 60)
-/obj/item/reagent_containers/glass/vial/large/multiver
+/obj/item/reagent_containers/cup/vial/large/multiver
name = "large black hypovial (multiver)"
list_reagents = list(/datum/reagent/medicine/c2/multiver = 60)
diff --git a/modular_skyrat/modules/implants/code/augments_arms.dm b/modular_skyrat/modules/implants/code/augments_arms.dm
index 3b53ed90113..0620dbba5ea 100644
--- a/modular_skyrat/modules/implants/code/augments_arms.dm
+++ b/modular_skyrat/modules/implants/code/augments_arms.dm
@@ -79,7 +79,7 @@
/obj/item/organ/internal/cyberimp/arm/janitor
name = "janitorial tools implant"
desc = "A set of janitorial tools on the user's arm."
- items_to_create = list(/obj/item/lightreplacer, /obj/item/holosign_creator, /obj/item/soap/nanotrasen, /obj/item/reagent_containers/spray/cyborg_drying, /obj/item/mop/advanced, /obj/item/paint/paint_remover, /obj/item/reagent_containers/glass/beaker/large, /obj/item/reagent_containers/spray/cleaner) //Beaker if for refilling sprays
+ items_to_create = list(/obj/item/lightreplacer, /obj/item/holosign_creator, /obj/item/soap/nanotrasen, /obj/item/reagent_containers/spray/cyborg_drying, /obj/item/mop/advanced, /obj/item/paint/paint_remover, /obj/item/reagent_containers/cup/beaker/large, /obj/item/reagent_containers/spray/cleaner) //Beaker if for refilling sprays
/obj/item/organ/internal/cyberimp/arm/janitor/emag_act()
for(var/datum/weakref/created_item in items_list)
diff --git a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_pocket.dm b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_pocket.dm
index b5a1f8ebabc..064c4f0a50f 100644
--- a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_pocket.dm
+++ b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_pocket.dm
@@ -88,7 +88,7 @@ GLOBAL_LIST_INIT(loadout_pocket_items, generate_loadout_items(/datum/loadout_ite
/datum/loadout_item/pocket_items/rag
name = "Rag"
- item_path = /obj/item/reagent_containers/glass/rag
+ item_path = /obj/item/reagent_containers/cup/rag
/datum/loadout_item/pocket_items/razor
name = "Razor"
@@ -124,7 +124,7 @@ GLOBAL_LIST_INIT(loadout_pocket_items, generate_loadout_items(/datum/loadout_ite
/datum/loadout_item/pocket_items/flask
name = "Flask"
- item_path = /obj/item/reagent_containers/food/drinks/flask
+ item_path = /obj/item/reagent_containers/cup/glass/flask
/datum/loadout_item/pocket_items/skub
name = "Skub"
diff --git a/modular_skyrat/modules/modular_ert/code/fumigators/fumigator_outfit.dm b/modular_skyrat/modules/modular_ert/code/fumigators/fumigator_outfit.dm
index 3393160c900..e7341ceeb66 100644
--- a/modular_skyrat/modules/modular_ert/code/fumigators/fumigator_outfit.dm
+++ b/modular_skyrat/modules/modular_ert/code/fumigators/fumigator_outfit.dm
@@ -17,7 +17,7 @@
/obj/item/storage/box/survival,\
/obj/item/hatchet,\
/obj/item/toy/plush/goatplushie,\
- /obj/item/reagent_containers/glass/bottle/killer/weedkiller,\
+ /obj/item/reagent_containers/cup/bottle/killer/weedkiller,\
/obj/item/grenade/chem_grenade/antiweed,\
)
@@ -36,6 +36,6 @@
/obj/item/storage/box/survival,\
/obj/item/melee/tomahawk,\
/obj/item/toy/plush/goatplushie,\
- /obj/item/reagent_containers/glass/bottle/killer/weedkiller,\
+ /obj/item/reagent_containers/cup/bottle/killer/weedkiller,\
/obj/item/grenade/chem_grenade/antiweed,\
)
diff --git a/modular_skyrat/modules/modular_ert/code/marine_override/modified_equipment.dm b/modular_skyrat/modules/modular_ert/code/marine_override/modified_equipment.dm
index 9256fac9bc3..d1485e30c22 100644
--- a/modular_skyrat/modules/modular_ert/code/marine_override/modified_equipment.dm
+++ b/modular_skyrat/modules/modular_ert/code/marine_override/modified_equipment.dm
@@ -36,7 +36,7 @@
/obj/item/sensor_device = 1,
/obj/item/stack/medical/gauze/twelve = 1,
/obj/item/reagent_containers/syringe = 1,
- /obj/item/reagent_containers/glass/bottle/formaldehyde = 1,
+ /obj/item/reagent_containers/cup/bottle/formaldehyde = 1,
/obj/item/stack/sticky_tape/surgical = 1,
)
l_hand = /obj/item/gun/medbeam
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_chemistry/chemistry_for_ERP.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_chemistry/chemistry_for_ERP.dm
index de06eebe594..11ed4afd2fc 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_chemistry/chemistry_for_ERP.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_chemistry/chemistry_for_ERP.dm
@@ -657,37 +657,37 @@
// BOTTLES
-/obj/item/reagent_containers/glass/bottle/crocin
+/obj/item/reagent_containers/cup/bottle/crocin
name = "crocin bottle"
desc = "A bottle of mild aphrodisiac. Increases libido."
list_reagents = list(/datum/reagent/drug/aphrodisiac/crocin = 30)
-/obj/item/reagent_containers/glass/bottle/hexacrocin
+/obj/item/reagent_containers/cup/bottle/hexacrocin
name = "hexacrocin bottle"
desc = "A bottle of strong aphrodisiac. Increases libido. Potentially dangerous."
list_reagents = list(/datum/reagent/drug/aphrodisiac/crocin/hexacrocin = 30)
-/obj/item/reagent_containers/glass/bottle/dopamine
+/obj/item/reagent_containers/cup/bottle/dopamine
name = "dopamine bottle"
desc = "Pure pleasure and happines in a bottle."
list_reagents = list(/datum/reagent/drug/aphrodisiac/dopamine = 30)
-/obj/item/reagent_containers/glass/bottle/camphor
+/obj/item/reagent_containers/cup/bottle/camphor
name = "camphor bottle"
desc = "A bottle of mild anaphrodisiac. Reduces libido."
list_reagents = list(/datum/reagent/drug/aphrodisiac/camphor = 30)
-/obj/item/reagent_containers/glass/bottle/pentacamphor
+/obj/item/reagent_containers/cup/bottle/pentacamphor
name = "pentacamphor bottle"
desc = "A bottle of strong anaphrodisiac. Reduces libido."
list_reagents = list(/datum/reagent/drug/aphrodisiac/camphor/pentacamphor = 30)
-/obj/item/reagent_containers/glass/bottle/breast_enlarger
+/obj/item/reagent_containers/cup/bottle/breast_enlarger
name = "succubus milk bottle"
desc = "A bottle of strong breast enlargement reagent."
list_reagents = list(/datum/reagent/drug/aphrodisiac/breast_enlarger = 30)
-/obj/item/reagent_containers/glass/bottle/penis_enlarger
+/obj/item/reagent_containers/cup/bottle/penis_enlarger
name = "incubus draft bottle"
desc = "A bottle of strong penis enlargement reagent."
list_reagents = list(/datum/reagent/drug/aphrodisiac/penis_enlarger = 30)
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm
index 91ac8ea3866..a6826a1ee4c 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm
@@ -4,7 +4,7 @@
/datum/storage/pockets/small/bdsm_mask/New()
. = ..()
- can_hold = typecacheof(/obj/item/reagent_containers/glass/lewd_filter)
+ can_hold = typecacheof(/obj/item/reagent_containers/cup/lewd_filter)
/obj/item/clothing/mask/gas/bdsm_mask
name = "latex gasmask"
@@ -148,7 +148,7 @@
/datum/storage/pockets/small/bdsm_mask/attackby(datum/source, obj/item/used_item, mob/user, params)
. = ..()
var/obj/item/clothing/mask/gas/bdsm_mask/worn_mask = user.get_item_by_slot(ITEM_SLOT_MASK)
- if(istype(used_item, /obj/item/reagent_containers/glass/lewd_filter))
+ if(istype(used_item, /obj/item/reagent_containers/cup/lewd_filter))
if(worn_mask) // Null check
if(istype(worn_mask, /obj/item/clothing/mask/gas/bdsm_mask)) // Check that the mask is of the correct type
if(worn_mask.mask_on == TRUE)
@@ -180,7 +180,7 @@
mask.breath_status = TRUE
var/mob/living/carbon/affected_mob = usr
affected_mob.try_lewd_autoemote("inhale")
- var/obj/item/reagent_containers/glass/lewd_filter/filter = mask.contents[1]
+ var/obj/item/reagent_containers/cup/lewd_filter/filter = mask.contents[1]
filter.reagent_consumption(affected_mob, filter.amount_per_transfer_from_this)
return
return ..()
@@ -272,7 +272,7 @@
*/
// Here goes code for lewd gasmask filter
-/obj/item/reagent_containers/glass/lewd_filter
+/obj/item/reagent_containers/cup/lewd_filter
name = "gasmask filter"
desc = "A strange looking air filter. It may not be a good idea to breathe this in..."
icon = 'modular_skyrat/modules/modular_items/lewd_items/icons/obj/lewd_items/lewd_items.dmi'
@@ -286,21 +286,21 @@
list_reagents = list(/datum/reagent/drug/aphrodisiac/crocin = 50)
// Standard initialize code for filter
-/obj/item/reagent_containers/glass/lewd_filter/Initialize(mapload)
+/obj/item/reagent_containers/cup/lewd_filter/Initialize(mapload)
. = ..()
update_icon()
// Legacy code from reagent_containers class. Most likely not really needed and can be cleared
-/obj/item/reagent_containers/glass/lewd_filter/get_part_rating()
+/obj/item/reagent_containers/cup/lewd_filter/get_part_rating()
return reagents.maximum_volume
// Reagent consumption process handler
-/obj/item/reagent_containers/glass/lewd_filter/proc/reagent_consumption(mob/living/user, amount_per_transfer_from_this)
+/obj/item/reagent_containers/cup/lewd_filter/proc/reagent_consumption(mob/living/user, amount_per_transfer_from_this)
SEND_SIGNAL(src, COMSIG_GLASS_DRANK, user, user)
addtimer(CALLBACK(reagents, /datum/reagents.proc/trans_to, user, amount_per_transfer_from_this, TRUE, TRUE, FALSE, user, FALSE, INGEST), 5)
// I just wanted to add 2th color variation. Because.
-/obj/item/reagent_containers/glass/lewd_filter/AltClick(mob/user)
+/obj/item/reagent_containers/cup/lewd_filter/AltClick(mob/user)
// Catch first AltClick and open reskin menu
if(unique_reskin && !current_skin && user.canUseTopic(src, BE_CLOSE, NO_DEXTERITY))
reskin_obj(user)
@@ -311,19 +311,19 @@
if(iscarbon(user))
if(istype(worn_mask, /obj/item/clothing/mask/gas/bdsm_mask))
if(worn_mask.mask_on == TRUE)
- if(istype(src, /obj/item/reagent_containers/glass/lewd_filter))
+ if(istype(src, /obj/item/reagent_containers/cup/lewd_filter))
to_chat(user, span_warning("You can't change the flow rate of the valve while the mask is on!"))
return
. = ..()
// Filter click handling
-/obj/item/reagent_containers/glass/lewd_filter/attack_hand(mob/user)
+/obj/item/reagent_containers/cup/lewd_filter/attack_hand(mob/user)
var/obj/item/clothing/mask/gas/bdsm_mask/worn_mask = user.get_item_by_slot(ITEM_SLOT_MASK)
if(worn_mask)
if(iscarbon(user))
if(istype(worn_mask, /obj/item/clothing/mask/gas/bdsm_mask))
if(worn_mask.mask_on == TRUE)
- if(istype(src, /obj/item/reagent_containers/glass/lewd_filter))
+ if(istype(src, /obj/item/reagent_containers/cup/lewd_filter))
// Place for text about the impossibility of detaching the filter
to_chat(user, span_warning("You can't detach the filter while the mask is locked!"))
return
@@ -336,7 +336,7 @@
return ..() || ((obj_flags & CAN_BE_HIT) && used_item.attack_atom(src, user))
// Mouse drop handler
-/obj/item/reagent_containers/glass/lewd_filter/MouseDrop(atom/over_object)
+/obj/item/reagent_containers/cup/lewd_filter/MouseDrop(atom/over_object)
var/mob/affected_mob = usr
var/mob/living/carbon/human/affected_human = usr
var/obj/item/clothing/mask/gas/bdsm_mask/worn_mask = affected_human.get_item_by_slot(ITEM_SLOT_MASK)
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/erp_belt.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/erp_belt.dm
index 13c8cead088..db2fc7eaacb 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/erp_belt.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/erp_belt.dm
@@ -36,7 +36,7 @@
/obj/item/spanking_pad,
/obj/item/clothing/sextoy/vibrator,
/obj/item/restraints/handcuffs/lewd,
- /obj/item/reagent_containers/glass/lewd_filter,
+ /obj/item/reagent_containers/cup/lewd_filter,
/obj/item/assembly/signaler, //because it's used for several toys
//clothing
@@ -82,9 +82,9 @@
//chems
/obj/item/reagent_containers/pill/crocin,
/obj/item/reagent_containers/pill/camphor,
- /obj/item/reagent_containers/glass/bottle/breast_enlarger,
- /obj/item/reagent_containers/glass/bottle/penis_enlarger,
+ /obj/item/reagent_containers/cup/bottle/breast_enlarger,
+ /obj/item/reagent_containers/cup/bottle/penis_enlarger,
/obj/item/reagent_containers/pill/hexacrocin,
/obj/item/reagent_containers/pill/pentacamphor,
- /obj/item/reagent_containers/glass/bottle/hexacrocin,
- /obj/item/reagent_containers/glass/bottle/pentacamphor))
+ /obj/item/reagent_containers/cup/bottle/hexacrocin,
+ /obj/item/reagent_containers/cup/bottle/pentacamphor))
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm
index 05edfe989c7..39f41cf8873 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm
@@ -65,7 +65,7 @@
*/
var/obj/item/organ/external/genital/current_selected_organ = null // Organ selected in UI
- var/obj/item/reagent_containers/glass/beaker = null // Beaker inserted in machine
+ var/obj/item/reagent_containers/cup/beaker = null // Beaker inserted in machine
var/mob/living/carbon/human/current_mob = null // Mob buckled to the machine
var/obj/item/organ/external/genital/breasts/current_breasts = null // Buckled mob breasts
var/obj/item/organ/external/genital/testicles/current_testicles = null // Buckled mob testicles
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_remove_erp_items.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_remove_erp_items.dm
index a41ad975ed0..b717cc47d33 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_remove_erp_items.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_remove_erp_items.dm
@@ -38,7 +38,7 @@
if(CONFIG_GET(flag/disable_lewd_items))
return INITIALIZE_HINT_QDEL
-/obj/item/reagent_containers/glass/lewd_filter/Initialize(mapload)
+/obj/item/reagent_containers/cup/lewd_filter/Initialize(mapload)
. = ..()
if(CONFIG_GET(flag/disable_lewd_items))
return INITIALIZE_HINT_QDEL
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/lustwish.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/lustwish.dm
index 2ad1b29cd66..52c558cea8e 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/lustwish.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/lustwish.dm
@@ -48,7 +48,7 @@
/obj/item/clothing/glasses/blindfold/kinky = 5,
/obj/item/clothing/ears/kinky_headphones = 5,
/obj/item/clothing/mask/gas/bdsm_mask = 5,
- /obj/item/reagent_containers/glass/lewd_filter = 5,
+ /obj/item/reagent_containers/cup/lewd_filter = 5,
/obj/item/clothing/glasses/hypno = 4,
/obj/item/clothing/head/kitty = 4,
/obj/item/clothing/head/rabbitears = 4,
@@ -95,10 +95,10 @@
//chems
/obj/item/reagent_containers/pill/crocin = 20,
/obj/item/reagent_containers/pill/camphor = 10,
- /obj/item/reagent_containers/glass/bottle/crocin = 6,
- /obj/item/reagent_containers/glass/bottle/camphor = 3,
- /obj/item/reagent_containers/glass/bottle/breast_enlarger = 6, //Those are legal 'cause you can just turn off prefs in round in "CLOWN SMOKE MACHINE+PENIS ENLARGEMENT CHEMICAL CASE". Yes, i have special code-phrase for this. I've seen some shit.
- /obj/item/reagent_containers/glass/bottle/penis_enlarger = 6,
+ /obj/item/reagent_containers/cup/bottle/crocin = 6,
+ /obj/item/reagent_containers/cup/bottle/camphor = 3,
+ /obj/item/reagent_containers/cup/bottle/breast_enlarger = 6, //Those are legal 'cause you can just turn off prefs in round in "CLOWN SMOKE MACHINE+PENIS ENLARGEMENT CHEMICAL CASE". Yes, i have special code-phrase for this. I've seen some shit.
+ /obj/item/reagent_containers/cup/bottle/penis_enlarger = 6,
//special
/obj/item/clothing/glasses/nice_goggles = 1, //easter egg, don't touch plz)
@@ -122,8 +122,8 @@
/obj/item/clothing/suit/straight_jacket/kinky_sleepbag = 2, //my favorite thing, spent 1 month on it. Don't remove please.
/obj/item/reagent_containers/pill/hexacrocin = 10,
/obj/item/reagent_containers/pill/pentacamphor = 5,
- /obj/item/reagent_containers/glass/bottle/hexacrocin = 4,
- /obj/item/reagent_containers/glass/bottle/pentacamphor = 2)
+ /obj/item/reagent_containers/cup/bottle/hexacrocin = 4,
+ /obj/item/reagent_containers/cup/bottle/pentacamphor = 2)
refill_canister = /obj/item/vending_refill/lustwish
payment_department = ACCOUNT_SRV
diff --git a/modular_skyrat/modules/modular_vending/code/boozeomat.dm b/modular_skyrat/modules/modular_vending/code/boozeomat.dm
index 1c58904d891..c5eaf045b43 100644
--- a/modular_skyrat/modules/modular_vending/code/boozeomat.dm
+++ b/modular_skyrat/modules/modular_vending/code/boozeomat.dm
@@ -1,4 +1,4 @@
/obj/machinery/vending/boozeomat
skyrat_products = list(
- /obj/item/reagent_containers/food/drinks/soda_cans/skyrat/synthanolcan = 6,
+ /obj/item/reagent_containers/cup/soda_cans/skyrat/synthanolcan = 6,
)
diff --git a/modular_skyrat/modules/modular_vending/code/cola.dm b/modular_skyrat/modules/modular_vending/code/cola.dm
index 4c2bec10566..da2672c2991 100644
--- a/modular_skyrat/modules/modular_vending/code/cola.dm
+++ b/modular_skyrat/modules/modular_vending/code/cola.dm
@@ -1,5 +1,5 @@
/obj/machinery/vending/cola
skyrat_products = list(
- /obj/item/reagent_containers/food/drinks/soda_cans/skyrat/lubricola = 10,
- /obj/item/reagent_containers/food/drinks/soda_cans/skyrat/welding_fizz = 10,
+ /obj/item/reagent_containers/cup/soda_cans/skyrat/lubricola = 10,
+ /obj/item/reagent_containers/cup/soda_cans/skyrat/welding_fizz = 10,
)
diff --git a/modular_skyrat/modules/modular_vending/code/wardrobes.dm b/modular_skyrat/modules/modular_vending/code/wardrobes.dm
index 76696efe3c8..901b5bfd8e2 100644
--- a/modular_skyrat/modules/modular_vending/code/wardrobes.dm
+++ b/modular_skyrat/modules/modular_vending/code/wardrobes.dm
@@ -53,7 +53,7 @@
/obj/item/clothing/under/rank/rnd/roboticist/skyrat/sleek = 2,
/obj/item/tank/internals/anesthetic = 2,
/obj/item/clothing/mask/breath = 2,
- /obj/item/reagent_containers/glass/bottle/morphine = 2,
+ /obj/item/reagent_containers/cup/bottle/morphine = 2,
/obj/item/reagent_containers/syringe = 2,
)
diff --git a/modular_skyrat/modules/moretraitoritems/code/drinkingglass.dm b/modular_skyrat/modules/moretraitoritems/code/drinkingglass.dm
index 83caf1ac6c2..560082e8b55 100644
--- a/modular_skyrat/modules/moretraitoritems/code/drinkingglass.dm
+++ b/modular_skyrat/modules/moretraitoritems/code/drinkingglass.dm
@@ -1,4 +1,4 @@
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/syndicate
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass/syndicate
name = "shot glass"
desc = "A shot glass - the universal symbol for terrible decisions."
icon_state = "shotglass"
@@ -16,4 +16,4 @@
/obj/item/storage/box/syndieshotglasses/PopulateContents()
for(var/i in 1 to 7)
- new /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/syndicate(src)
+ new /obj/item/reagent_containers/cup/glass/drinkingglass/shotglass/syndicate(src)
diff --git a/modular_skyrat/modules/moretraitoritems/code/smuggling_gear.dm b/modular_skyrat/modules/moretraitoritems/code/smuggling_gear.dm
index 1c521f5cfea..d5a797cba89 100644
--- a/modular_skyrat/modules/moretraitoritems/code/smuggling_gear.dm
+++ b/modular_skyrat/modules/moretraitoritems/code/smuggling_gear.dm
@@ -15,7 +15,7 @@
hidden_icon = "eprototypedagger"
//smuggling container
-/obj/item/reagent_containers/glass/bottle/ritual_wine
+/obj/item/reagent_containers/cup/bottle/ritual_wine
name = "ritual wine bottle"
desc = "Contains an incredibly potent mix of various hallucinogenics, herbal extracts, and hard drugs. \
the Tiger Cooperative praises it as a link to higher powers, but for all intents and purposes this should \
diff --git a/modular_skyrat/modules/moretraitoritems/code/syndicate_loadout.dm b/modular_skyrat/modules/moretraitoritems/code/syndicate_loadout.dm
index 6d9a54320d2..143c13c40bf 100644
--- a/modular_skyrat/modules/moretraitoritems/code/syndicate_loadout.dm
+++ b/modular_skyrat/modules/moretraitoritems/code/syndicate_loadout.dm
@@ -111,7 +111,7 @@
new /obj/item/card/id/advanced/chameleon(src)
new /obj/item/card/emag/doorjack(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)
/obj/item/storage/backpack/duffelbag/syndie/loadout/darklord/PopulateContents()
new /obj/item/dualsaber(src)
@@ -134,7 +134,7 @@
new /obj/item/storage/belt/fannypack/yellow(src)
new /obj/item/grenade/spawnergrenade/buzzkill(src)
new /obj/item/grenade/spawnergrenade/buzzkill(src)
- new /obj/item/reagent_containers/glass/bottle/beesease(src)
+ new /obj/item/reagent_containers/cup/bottle/beesease(src)
new /obj/item/melee/beesword(src)
/obj/item/storage/backpack/duffelbag/syndie/loadout/cryomancer/PopulateContents()
@@ -193,7 +193,7 @@
new /obj/item/switchblade(src)
new /obj/item/clothing/shoes/laceup(src)
new /obj/item/virgin_mary(src)
- new /obj/item/reagent_containers/food/drinks/bottle/whiskey(src)
+ new /obj/item/reagent_containers/cup/glass/bottle/whiskey(src)
new /obj/item/storage/box/drinkingglasses(src)
new /obj/item/storage/fancy/candle_box(src)
new /obj/item/clothing/glasses/sunglasses(src)
diff --git a/modular_skyrat/modules/mutants/code/mutant_cure.dm b/modular_skyrat/modules/mutants/code/mutant_cure.dm
index 6be8dcaa794..ad3e2d5f4ef 100644
--- a/modular_skyrat/modules/mutants/code/mutant_cure.dm
+++ b/modular_skyrat/modules/mutants/code/mutant_cure.dm
@@ -295,7 +295,7 @@
new /obj/item/hnz_cure(get_turf(src))
new /obj/item/hnz_cure(get_turf(src))
else
- new /obj/item/reagent_containers/glass/bottle/hnz/one(get_turf(src))
+ new /obj/item/reagent_containers/cup/bottle/hnz/one(get_turf(src))
flick("h_lathe_leave", src)
use_power(3000)
playsound(loc, 'sound/machines/ding.ogg', 60, 1)
@@ -343,7 +343,7 @@
. = ..()
try_to_mutant_infect(exposed_mob, TRUE)
-/obj/item/reagent_containers/glass/bottle/hnz
+/obj/item/reagent_containers/cup/bottle/hnz
name = "HNZ-1 bottle"
desc = "A small bottle of the HNZ-1 pathogen. Nanotrasen Bioweapons inc."
icon = 'modular_skyrat/modules/mutants/icons/extractor.dmi'
@@ -351,7 +351,7 @@
list_reagents = list(/datum/reagent/hnz = 30)
custom_materials = list(/datum/material/glass=500)
-/obj/item/reagent_containers/glass/bottle/hnz/one
+/obj/item/reagent_containers/cup/bottle/hnz/one
list_reagents = list(/datum/reagent/hnz = 1)
@@ -362,8 +362,8 @@
max_integrity = 500
/obj/item/storage/briefcase/virology/hnz/PopulateContents()
- new /obj/item/reagent_containers/glass/bottle/hnz/one(src)
- new /obj/item/reagent_containers/glass/bottle/hnz/one(src)
+ new /obj/item/reagent_containers/cup/bottle/hnz/one(src)
+ new /obj/item/reagent_containers/cup/bottle/hnz/one(src)
new /obj/item/circuitboard/machine/rna_recombinator(src)
new /obj/item/rna_extractor(src)
new /obj/item/rna_vial(src)
diff --git a/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm b/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm
index 13b0ae92852..67feb94f9ba 100644
--- a/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm
+++ b/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm
@@ -34,7 +34,7 @@
mail_goodies = list(
/obj/item/clothing/mask/cigarette/cigar/havana = 20,
/obj/item/storage/fancy/cigarettes/cigars/havana = 15,
- /obj/item/reagent_containers/food/drinks/bottle/champagne = 10
+ /obj/item/reagent_containers/cup/glass/bottle/champagne = 10
)
veteran_only = TRUE
diff --git a/modular_skyrat/modules/novaya_ert/code/rationpacks.dm b/modular_skyrat/modules/novaya_ert/code/rationpacks.dm
index 91e01f7314d..170411fa008 100644
--- a/modular_skyrat/modules/novaya_ert/code/rationpacks.dm
+++ b/modular_skyrat/modules/novaya_ert/code/rationpacks.dm
@@ -47,7 +47,7 @@
new /obj/item/food/nri_course/main(src)
new /obj/item/food/nri_course/side(src)
new /obj/item/storage/box/gum(src)
- new /obj/item/reagent_containers/food/drinks/waterbottle(src)
+ new /obj/item/reagent_containers/cup/glass/waterbottle(src)
new /obj/item/storage/fancy/cigarettes/cigpack_robust(src)
new /obj/item/storage/box/matches(src)
diff --git a/modular_skyrat/modules/opposing_force/code/equipment/utility.dm b/modular_skyrat/modules/opposing_force/code/equipment/utility.dm
index 0570cacf1f5..6acb10a70e9 100644
--- a/modular_skyrat/modules/opposing_force/code/equipment/utility.dm
+++ b/modular_skyrat/modules/opposing_force/code/equipment/utility.dm
@@ -51,7 +51,7 @@
item_type = /obj/item/suppressor
/datum/opposing_force_equipment/gear/extendedrag
- item_type = /obj/item/reagent_containers/glass/rag/large
+ item_type = /obj/item/reagent_containers/cup/rag/large
description = "A damp rag made with extra absorbant materials. The perfectly innocent tool to kidnap your local assistant. \
Apply up to 30u liquids and use combat mode to smother anyone not covering their mouth."
diff --git a/modular_skyrat/modules/opposing_force/code/items.dm b/modular_skyrat/modules/opposing_force/code/items.dm
index 126c9952f21..79c33496a70 100644
--- a/modular_skyrat/modules/opposing_force/code/items.dm
+++ b/modular_skyrat/modules/opposing_force/code/items.dm
@@ -9,7 +9,7 @@
var/datum/component/uplink/hidden_uplink = GetComponent(/datum/component/uplink)
hidden_uplink.name = "old radio"
-/obj/item/reagent_containers/glass/rag/large
+/obj/item/reagent_containers/cup/rag/large
volume = 30
amount_per_transfer_from_this = 30
desc = "A damp rag made from a highly absorbant materials. Can hold up to 30u liquids. You can also clean up messes I guess."
diff --git a/modular_skyrat/modules/pollution/code/pollution_initializations.dm b/modular_skyrat/modules/pollution/code/pollution_initializations.dm
index 07f7541e4e2..086c8852912 100644
--- a/modular_skyrat/modules/pollution/code/pollution_initializations.dm
+++ b/modular_skyrat/modules/pollution/code/pollution_initializations.dm
@@ -22,14 +22,14 @@
. = ..()
AddElement(/datum/element/pollution_emitter, /datum/pollutant/decaying_waste, 30)
-/obj/item/reagent_containers/food/drinks/coffee/Initialize(mapload)
+/obj/item/reagent_containers/cup/glass/coffee/Initialize(mapload)
. = ..()
AddComponent(/datum/component/temporary_pollution_emission, /datum/pollutant/food/coffee, 5, 3 MINUTES)
-/obj/item/reagent_containers/food/drinks/mug/tea/Initialize(mapload)
+/obj/item/reagent_containers/cup/glass/mug/tea/Initialize(mapload)
. = ..()
AddComponent(/datum/component/temporary_pollution_emission, /datum/pollutant/food/tea, 5, 3 MINUTES)
-/obj/item/reagent_containers/food/drinks/mug/coco/Initialize(mapload)
+/obj/item/reagent_containers/cup/glass/mug/coco/Initialize(mapload)
. = ..()
AddComponent(/datum/component/temporary_pollution_emission, /datum/pollutant/food/chocolate, 5, 3 MINUTES)
diff --git a/modular_skyrat/modules/primitive_fun/code/ceramics.dm b/modular_skyrat/modules/primitive_fun/code/ceramics.dm
index 35f0a6ec287..c361e465a73 100644
--- a/modular_skyrat/modules/primitive_fun/code/ceramics.dm
+++ b/modular_skyrat/modules/primitive_fun/code/ceramics.dm
@@ -60,8 +60,8 @@
cost = CARGO_CRATE_VALUE * 2
unit_name = "ceramic product"
export_types = list(/obj/item/plate/ceramic,
- /obj/item/reagent_containers/glass/bowl/ceramic,
- /obj/item/reagent_containers/glass/beaker/large/ceramic)
+ /obj/item/reagent_containers/cup/bowl/ceramic,
+ /obj/item/reagent_containers/cup/beaker/large/ceramic)
/datum/export/ceramics/sell_object(obj/O, datum/export_report/report, dry_run, apply_elastic = FALSE) //I really dont want them to feel gimped
. = ..()
@@ -91,9 +91,9 @@
name = "ceramic bowl"
desc = "A piece of clay with a raised lip, in the shape of a bowl."
icon_state = "clay_bowl"
- forge_item = /obj/item/reagent_containers/glass/bowl/ceramic
+ forge_item = /obj/item/reagent_containers/cup/bowl/ceramic
-/obj/item/reagent_containers/glass/bowl/ceramic
+/obj/item/reagent_containers/cup/bowl/ceramic
name = "ceramic bowl"
icon = 'modular_skyrat/modules/primitive_fun/icons/prim_fun.dmi'
icon_state = "clay_bowl"
@@ -103,9 +103,9 @@
name = "ceramic cup"
desc = "A piece of clay with high walls, in the shape of a cup. It can hold 120 units."
icon_state = "clay_cup"
- forge_item = /obj/item/reagent_containers/glass/beaker/large/ceramic
+ forge_item = /obj/item/reagent_containers/cup/beaker/large/ceramic
-/obj/item/reagent_containers/glass/beaker/large/ceramic
+/obj/item/reagent_containers/cup/beaker/large/ceramic
name = "ceramic cup"
desc = "A cup that is made from ceramic."
icon = 'modular_skyrat/modules/primitive_fun/icons/prim_fun.dmi'
diff --git a/modular_skyrat/modules/primitive_fun/code/glassblowing.dm b/modular_skyrat/modules/primitive_fun/code/glassblowing.dm
index 66e14ba878b..e27d7c69881 100644
--- a/modular_skyrat/modules/primitive_fun/code/glassblowing.dm
+++ b/modular_skyrat/modules/primitive_fun/code/glassblowing.dm
@@ -13,8 +13,8 @@
unit_name = "glassblowing product"
export_types = list(/obj/item/glassblowing/glass_lens,
/obj/item/glassblowing/glass_globe,
- /obj/item/reagent_containers/glass/bowl/blowing_glass,
- /obj/item/reagent_containers/glass/beaker/large/blowing_glass,
+ /obj/item/reagent_containers/cup/bowl/blowing_glass,
+ /obj/item/reagent_containers/cup/beaker/large/blowing_glass,
/obj/item/plate/blowing_glass)
/datum/export/glassblowing/sell_object(obj/O, datum/export_report/report, dry_run, apply_elastic = FALSE) //I really dont want them to feel gimped
@@ -25,13 +25,13 @@
desc = "A glass bowl that is capable of carrying things."
icon_state = "glass_lens"
-/obj/item/reagent_containers/glass/bowl/blowing_glass
+/obj/item/reagent_containers/cup/bowl/blowing_glass
name = "glass bowl"
desc = "A glass bowl that is capable of carrying things."
icon = 'modular_skyrat/modules/primitive_fun/icons/prim_fun.dmi'
icon_state = "glass_bowl"
-/obj/item/reagent_containers/glass/beaker/large/blowing_glass
+/obj/item/reagent_containers/cup/beaker/large/blowing_glass
name = "glass cup"
desc = "A glass cup that is capable of carrying liquids."
icon = 'modular_skyrat/modules/primitive_fun/icons/prim_fun.dmi'
@@ -183,13 +183,13 @@
find_glass.chosen_item = /obj/item/plate/blowing_glass
find_glass.required_actions = list(3,3,3,0,0) //blowing, spinning, paddling
if("Bowl")
- find_glass.chosen_item = /obj/item/reagent_containers/glass/bowl/blowing_glass
+ find_glass.chosen_item = /obj/item/reagent_containers/cup/bowl/blowing_glass
find_glass.required_actions = list(2,2,2,0,3) //blowing, spinning, paddling
if("Globe")
find_glass.chosen_item = /obj/item/glassblowing/glass_globe
find_glass.required_actions = list(6,3,0,0,0) //blowing, spinning
if("Cup")
- find_glass.chosen_item = /obj/item/reagent_containers/glass/beaker/large/blowing_glass
+ find_glass.chosen_item = /obj/item/reagent_containers/cup/beaker/large/blowing_glass
find_glass.required_actions = list(3,3,3,0,0) //blowing, spinning, paddling
if("Lens")
find_glass.chosen_item = /obj/item/glassblowing/glass_lens
diff --git a/modular_skyrat/modules/reagent_forging/code/crafting_bench.dm b/modular_skyrat/modules/reagent_forging/code/crafting_bench.dm
index e7e23811206..1d3806f72e9 100644
--- a/modular_skyrat/modules/reagent_forging/code/crafting_bench.dm
+++ b/modular_skyrat/modules/reagent_forging/code/crafting_bench.dm
@@ -49,7 +49,7 @@
"Buckler Shield" = /obj/item/shield/riot/buckler/reagent_weapon,
"Coil" = /obj/item/forging/coil,
"Seed Mesh" = /obj/item/seed_mesh,
- "Primitive Centrifuge" = /obj/item/reagent_containers/glass/primitive_centrifuge,
+ "Primitive Centrifuge" = /obj/item/reagent_containers/cup/primitive_centrifuge,
"Bokken" = /obj/item/forging/reagent_weapon/bokken,
"Bow" = /obj/item/forging/incomplete_bow,
)
diff --git a/modular_skyrat/modules/salon/code/barber.dm b/modular_skyrat/modules/salon/code/barber.dm
index a168ecc9cc9..42c35778566 100644
--- a/modular_skyrat/modules/salon/code/barber.dm
+++ b/modular_skyrat/modules/salon/code/barber.dm
@@ -58,7 +58,7 @@
new /obj/item/reagent_containers/spray/quantum_hair_dye(src)
new /obj/item/reagent_containers/spray/barbers_aid(src)
new /obj/item/reagent_containers/spray/cleaner(src)
- new /obj/item/reagent_containers/glass/rag(src)
+ new /obj/item/reagent_containers/cup/rag(src)
new /obj/item/storage/medkit(src)
/obj/effect/landmark/start/barber
diff --git a/modular_skyrat/modules/sec_haul/code/security_medic/secmed_clothes.dm b/modular_skyrat/modules/sec_haul/code/security_medic/secmed_clothes.dm
index acb196d94b9..735522ed4f0 100644
--- a/modular_skyrat/modules/sec_haul/code/security_medic/secmed_clothes.dm
+++ b/modular_skyrat/modules/sec_haul/code/security_medic/secmed_clothes.dm
@@ -5,7 +5,7 @@
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suit.dmi'
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
armor = list(MELEE = 35, BULLET = 30, LASER = 30, ENERGY = 40, BOMB = 25, BIO = 0, FIRE = 50, ACID = 50, WOUND = 10)
- 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, /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/baton/telescopic, /obj/item/soap, /obj/item/tank/internals/emergency_oxygen, /obj/item/gun, /obj/item/storage/medkit)
+ 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, /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/baton/telescopic, /obj/item/soap, /obj/item/tank/internals/emergency_oxygen, /obj/item/gun, /obj/item/storage/medkit)
/obj/item/clothing/suit/toggle/labcoat/security_medic/blue
icon_state = "secmed_labcoat_blue"
@@ -19,7 +19,7 @@
icon_state = "secmed_vest"
worn_icon_state = "secmed_vest"
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
- 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, /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/baton/telescopic, /obj/item/soap, /obj/item/tank/internals/emergency_oxygen, /obj/item/gun, /obj/item/storage/medkit)
+ 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, /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/baton/telescopic, /obj/item/soap, /obj/item/tank/internals/emergency_oxygen, /obj/item/gun, /obj/item/storage/medkit)
armor = list(MELEE = 35, BULLET = 30, LASER = 30, ENERGY = 40, BOMB = 25, BIO = 0, FIRE = 50, ACID = 50, WOUND = 10)
/obj/item/clothing/suit/hazardvest/security_medic/blue
@@ -34,7 +34,7 @@
icon_state = "secmed_armor"
worn_icon_state = "secmed_armor"
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
- 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, /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/baton/telescopic, /obj/item/soap, /obj/item/tank/internals/emergency_oxygen, /obj/item/gun, /obj/item/storage/medkit)
+ 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, /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/baton/telescopic, /obj/item/soap, /obj/item/tank/internals/emergency_oxygen, /obj/item/gun, /obj/item/storage/medkit)
/obj/item/clothing/under/rank/security/peacekeeper/security_medic
name = "security medics's uniform"
diff --git a/tgstation.dme b/tgstation.dme
index 399d6ac39ed..674813c4931 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -466,6 +466,7 @@
#include "code\_globalvars\lists\color.dm"
#include "code\_globalvars\lists\flavor_misc.dm"
#include "code\_globalvars\lists\keybindings.dm"
+#include "code\_globalvars\lists\maintenance_loot.dm"
#include "code\_globalvars\lists\mapping.dm"
#include "code\_globalvars\lists\mobs.dm"
#include "code\_globalvars\lists\names.dm"
@@ -3021,13 +3022,8 @@
#include "code\modules\fishing\sources\_fish_source.dm"
#include "code\modules\fishing\sources\source_types.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"
@@ -4179,10 +4175,9 @@
#include "code\modules\reagents\chemistry\recipes\special.dm"
#include "code\modules\reagents\chemistry\recipes\toxins.dm"
#include "code\modules\reagents\reagent_containers\blood_pack.dm"
-#include "code\modules\reagents\reagent_containers\bottle.dm"
#include "code\modules\reagents\reagent_containers\chem_pack.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\medigel.dm"
#include "code\modules\reagents\reagent_containers\misc.dm"
@@ -4191,6 +4186,12 @@
#include "code\modules\reagents\reagent_containers\spray.dm"
#include "code\modules\reagents\reagent_containers\syringes.dm"
#include "code\modules\reagents\reagent_containers\watering_can.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\reagents\withdrawal\_addiction.dm"
#include "code\modules\reagents\withdrawal\generic_addictions.dm"
#include "code\modules\recycling\conveyor.dm"
diff --git a/tools/UpdatePaths/Scripts/69081_drinks_refactor.txt b/tools/UpdatePaths/Scripts/69081_drinks_refactor.txt
new file mode 100644
index 00000000000..746a1519130
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/69081_drinks_refactor.txt
@@ -0,0 +1,25 @@
+# Glasses to cups
+/obj/item/reagent_containers/cup/@SUBTYPES : /obj/item/reagent_containers/cup/@SUBTYPES {@OLD}
+
+# Foods
+/obj/item/reagent_containers/cup/glass/@SUBTYPES : /obj/item/reagent_containers/cup/glass/@SUBTYPES {@OLD}
+/obj/item/reagent_containers/condiment/@SUBTYPES : /obj/item/reagent_containers/condiment/@SUBTYPES {@OLD}
+
+# Sodas
+/obj/item/reagent_containers/cup/soda_cans/@SUBTYPES : /obj/item/reagent_containers/cup/soda_cans/@SUBTYPES {@OLD}
+/obj/item/reagent_containers/cup/soda_cans/@SUBTYPES : /obj/item/reagent_containers/cup/soda_cans/@SUBTYPES {@OLD}
+
+# Juices
+/obj/item/reagent_containers/cup/glass/glass/bottle/tomatojuice : /obj/item/reagent_containers/cup/glass/bottle/juice/tomatojuice {@OLD}
+/obj/item/reagent_containers/cup/glass/glass/bottle/orangejuice : /obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice {@OLD}
+/obj/item/reagent_containers/cup/glass/glass/bottle/cream : /obj/item/reagent_containers/cup/glass/bottle/juice/cream {@OLD}
+/obj/item/reagent_containers/cup/glass/glass/bottle/limejuice : /obj/item/reagent_containers/cup/glass/bottle/juice/limejuice {@OLD}
+/obj/item/reagent_containers/cup/glass/glass/bottle/pineapplejuice : /obj/item/reagent_containers/cup/glass/bottle/juice/pineapplejuice {@OLD}
+/obj/item/reagent_containers/cup/glass/glass/bottle/menthol : /obj/item/reagent_containers/cup/glass/bottle/juice/menthol {@OLD}
+
+/obj/item/reagent_containers/cup/glass/bottle/tomatojuice : /obj/item/reagent_containers/cup/glass/bottle/juice/tomatojuice {@OLD}
+/obj/item/reagent_containers/cup/glass/bottle/orangejuice : /obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice {@OLD}
+/obj/item/reagent_containers/cup/glass/bottle/cream : /obj/item/reagent_containers/cup/glass/bottle/juice/cream {@OLD}
+/obj/item/reagent_containers/cup/glass/bottle/limejuice : /obj/item/reagent_containers/cup/glass/bottle/juice/limejuice {@OLD}
+/obj/item/reagent_containers/cup/glass/bottle/pineapplejuice : /obj/item/reagent_containers/cup/glass/bottle/juice/pineapplejuice {@OLD}
+/obj/item/reagent_containers/cup/glass/bottle/menthol : /obj/item/reagent_containers/cup/glass/bottle/juice/menthol {@OLD}