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/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/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 b8cf7f5c429..3f9192a3b79 100644 --- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm +++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm @@ -332,11 +332,11 @@ /area/ruin/space/ks13/engineering/atmos) "eL" = ( /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 = -7; pixel_y = 6 }, -/obj/item/reagent_containers/food/drinks/bottle/beer/almost_empty, +/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty, /turf/open/floor/plating, /area/ruin/space/ks13/command/bridge) "eM" = ( @@ -3700,11 +3700,11 @@ /area/ruin/space/ks13/engineering/atmos) "Dj" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/vodka{ +/obj/item/reagent_containers/cup/glass/bottle/vodka{ pixel_x = 6; pixel_y = 10 }, -/obj/item/reagent_containers/food/drinks/bottle/vodka{ +/obj/item/reagent_containers/cup/glass/bottle/vodka{ pixel_x = -7; pixel_y = 13 }, @@ -4314,11 +4314,11 @@ /area/ruin/space/ks13/tool_storage) "Gq" = ( /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 = -6; pixel_y = 12 }, -/obj/item/reagent_containers/food/drinks/bottle/beer/almost_empty, +/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty, /turf/open/floor/iron, /area/ruin/space/ks13/command/bridge) "Gr" = ( @@ -4589,18 +4589,18 @@ /area/ruin/space/ks13/science/ordnance) "HL" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = 8; pixel_y = 9 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = 8 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = -7; pixel_y = 9 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = -7 }, /obj/effect/decal/cleanable/dirt, @@ -5767,10 +5767,10 @@ /area/ruin/space/ks13/dorms) "Oe" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = -8 }, -/obj/item/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/cup/beaker/large{ pixel_x = 5 }, /obj/effect/decal/cleanable/dirt, @@ -6549,7 +6549,7 @@ /area/ruin/space/ks13/medical/medbay) "Sf" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ list_reagents = list(/datum/reagent/toxin/acid=50) }, /obj/item/paper/crumpled/bloody/ruins/thederelict/unfinished, @@ -8089,11 +8089,11 @@ /area/ruin/space/ks13/ai/vault) "ZC" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = 9; pixel_y = 7 }, -/obj/item/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/cup/beaker/large{ pixel_x = -4; pixel_y = 4 }, 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 eefc0e3fbe9..77ef4d1bfd6 100644 --- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm @@ -164,7 +164,7 @@ /area/ruin/space/has_grav/listeningstation) "eW" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/bottle/beer/almost_empty{ +/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{ name = "Use To Avert Loneliness"; desc = "It's been used..."; pixel_x = 8 @@ -924,7 +924,7 @@ /obj/structure/table, /obj/item/paper_bin, /obj/item/pen/edagger, -/obj/item/reagent_containers/food/drinks/waterbottle{ +/obj/item/reagent_containers/cup/glass/waterbottle{ pixel_x = 10; pixel_y = 16 }, 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/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/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/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/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/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/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/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 055eb33e81c..df7870c7f2e 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -8288,7 +8288,7 @@ /area/station/security/office) "bTW" = ( /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) @@ -9416,7 +9416,7 @@ /area/station/ai_monitored/security/armory) "cgH" = ( /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) "cgJ" = ( @@ -10881,10 +10881,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, @@ -13063,7 +13063,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, @@ -13781,11 +13781,11 @@ /area/station/medical/psychology) "dkp" = ( /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 }, @@ -14734,15 +14734,15 @@ /area/station/engineering/main) "dwC" = ( /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, @@ -15273,19 +15273,19 @@ /turf/open/floor/iron, /area/station/cargo/office) "dEm" = ( -/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 }, @@ -15481,7 +15481,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) "dGG" = ( @@ -17045,7 +17045,7 @@ /area/station/science/ordnance/bomb) "ebO" = ( /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) @@ -18527,10 +18527,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, @@ -20270,10 +20270,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, @@ -21292,7 +21292,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{ @@ -21300,7 +21300,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 }, @@ -23421,7 +23421,7 @@ "fFU" = ( /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 }, @@ -24499,8 +24499,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 }, @@ -26781,7 +26781,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 }, @@ -27072,7 +27072,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 }, @@ -27748,7 +27748,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 }, @@ -28543,7 +28543,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{ @@ -28561,7 +28561,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 }, @@ -29857,7 +29857,7 @@ /area/station/command/heads_quarters/rd) "hle" = ( /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 @@ -31276,7 +31276,7 @@ /turf/open/floor/iron, /area/station/security/brig) "hFZ" = ( -/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, @@ -32187,7 +32187,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 @@ -35459,11 +35459,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 }, @@ -36278,7 +36278,7 @@ /area/station/hallway/primary/central/fore) "iSV" = ( /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"; @@ -36286,11 +36286,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 }, @@ -36787,8 +36787,8 @@ "iZt" = ( /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 @@ -38563,15 +38563,15 @@ /area/station/maintenance/starboard/aft) "jtf" = ( /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, @@ -40456,11 +40456,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 }, @@ -41108,8 +41108,8 @@ /area/station/ai_monitored/command/storage/eva) "jWG" = ( /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 }, @@ -43468,7 +43468,7 @@ /area/station/maintenance/port/fore) "kBt" = ( /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 @@ -44065,10 +44065,10 @@ /area/station/maintenance/department/eva/abandoned) "kIM" = ( /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, @@ -45094,8 +45094,8 @@ "kXa" = ( /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, @@ -48108,15 +48108,15 @@ /area/station/medical/pharmacy) "lKd" = ( /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) "lKe" = ( @@ -50667,8 +50667,8 @@ /area/station/commons/storage/primary) "mtQ" = ( /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, @@ -54870,7 +54870,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 @@ -57577,7 +57577,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, @@ -58456,7 +58456,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{ @@ -59145,7 +59145,7 @@ /area/station/command/corporate_showroom) "oEK" = ( /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" }, @@ -59468,7 +59468,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) "oJy" = ( @@ -62535,7 +62535,7 @@ /area/station/command/bridge) "pzz" = ( /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 }, @@ -63611,7 +63611,7 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) "pMa" = ( -/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) @@ -67387,10 +67387,10 @@ "qKH" = ( /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; @@ -67487,7 +67487,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) @@ -67693,11 +67693,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" @@ -67716,7 +67716,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) "qOn" = ( @@ -68013,7 +68013,7 @@ /turf/open/floor/plating, /area/station/security/prison/mess) "qSa" = ( -/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, @@ -70334,11 +70334,11 @@ /area/station/maintenance/solars/starboard/aft) "rzU" = ( /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, @@ -70708,7 +70708,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) "rEU" = ( @@ -71235,7 +71235,7 @@ "rLO" = ( /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 @@ -76210,10 +76210,10 @@ "sXK" = ( /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{ @@ -77481,18 +77481,18 @@ "tqp" = ( /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{ @@ -77602,13 +77602,13 @@ /turf/open/floor/iron, /area/station/hallway/primary/fore) "trC" = ( -/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, @@ -77776,7 +77776,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) "tsP" = ( @@ -79633,7 +79633,7 @@ /area/station/service/abandoned_gambling_den) "tPD" = ( /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) "tPE" = ( @@ -80594,14 +80594,14 @@ "ubL" = ( /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) @@ -84987,7 +84987,7 @@ "vgA" = ( /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 @@ -85314,7 +85314,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 }, @@ -90014,7 +90014,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) "wqn" = ( @@ -91745,7 +91745,7 @@ /area/station/medical/break_room) "wJQ" = ( /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) @@ -92953,9 +92953,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) "xbT" = ( @@ -93858,7 +93858,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 }, @@ -95161,7 +95161,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 diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 78b6499893d..ec138fe8fda 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -29,7 +29,7 @@ /obj/structure/closet/wardrobe/white, /obj/item/clothing/shoes/jackboots, /obj/item/reagent_containers/blood/random, -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, +/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka, /turf/open/floor/plating, /area/station/maintenance/port/fore) "aaK" = ( @@ -768,7 +768,7 @@ pixel_x = -5; pixel_y = 6 }, -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/cup/glass/britcup{ pixel_x = 8; pixel_y = 8 }, @@ -1266,7 +1266,7 @@ }, /obj/structure/sink/directional/south, /obj/item/mop, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/iron/smooth, /area/mine/laborcamp/security) "auz" = ( @@ -3779,7 +3779,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/item/radio/intercom/directional/west, /obj/effect/turf_decal/tile/yellow/full, @@ -6979,8 +6979,8 @@ /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{ +/obj/item/reagent_containers/cup/bottle/epinephrine, +/obj/item/reagent_containers/cup/bottle/multiver{ pixel_x = 6 }, /obj/item/reagent_containers/syringe, @@ -7279,7 +7279,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/machinery/firealarm/directional/west, /obj/effect/turf_decal/tile/green/half/contrasted{ @@ -7450,7 +7450,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/item/reagent_containers/glass/rag, +/obj/item/reagent_containers/cup/rag, /turf/open/floor/iron, /area/station/maintenance/starboard/fore) "cjJ" = ( @@ -9690,7 +9690,7 @@ /area/station/security/prison/workout) "cQc" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/glass/rag, +/obj/item/reagent_containers/cup/rag, /obj/item/clothing/head/collectable/tophat{ pixel_x = 6; pixel_y = 5 @@ -10544,8 +10544,8 @@ "dcQ" = ( /obj/structure/table, /obj/item/kitchen/rollingpin, -/obj/item/reagent_containers/food/condiment/enzyme, -/obj/item/reagent_containers/food/condiment/sugar, +/obj/item/reagent_containers/condiment/enzyme, +/obj/item/reagent_containers/condiment/sugar, /obj/structure/light_construct/directional/west, /obj/structure/sign/poster/official/random/directional/west, /turf/open/floor/plating, @@ -10926,7 +10926,7 @@ /area/station/hallway/primary/port) "djC" = ( /obj/effect/decal/remains/human, -/obj/item/reagent_containers/food/drinks/bottle/wine{ +/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 @@ -11585,11 +11585,11 @@ pixel_x = -1; pixel_y = 4 }, -/obj/item/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/cup/beaker/large{ pixel_x = 3; pixel_y = -8 }, -/obj/item/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/cup/beaker/large{ pixel_x = -3; pixel_y = -8 }, @@ -14256,7 +14256,7 @@ /obj/structure/closet/mini_fridge{ name = "mini-fridge" }, -/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/condiment/milk, /turf/open/floor/iron/kitchen/diagonal, /area/station/service/kitchen) "ekk" = ( @@ -14276,7 +14276,7 @@ dir = 1 }, /obj/structure/table/glass, -/obj/item/reagent_containers/glass/bottle/epinephrine, +/obj/item/reagent_containers/cup/bottle/epinephrine, /obj/item/stack/sheet/mineral/plasma, /obj/machinery/light/directional/north, /turf/open/floor/iron/white, @@ -15729,7 +15729,7 @@ dir = 9 }, /obj/structure/table, -/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/dark, @@ -17911,15 +17911,15 @@ /area/station/science/robotics/mechbay) "fqW" = ( /obj/structure/rack, -/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/ethanol{ +/obj/item/reagent_containers/cup/bottle/ethanol{ pixel_x = -5; pixel_y = 3 }, -/obj/item/reagent_containers/glass/bottle/chlorine{ +/obj/item/reagent_containers/cup/bottle/chlorine{ pixel_x = 1 }, /obj/machinery/airalarm/directional/west, @@ -18514,7 +18514,7 @@ "fAF" = ( /obj/structure/rack, /obj/item/clothing/gloves/boxing/green, -/obj/item/reagent_containers/food/drinks/waterbottle, +/obj/item/reagent_containers/cup/glass/waterbottle, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "fAV" = ( @@ -18978,8 +18978,8 @@ "fIu" = ( /obj/structure/table/glass, /obj/machinery/light/directional/west, -/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, @@ -19148,11 +19148,11 @@ /obj/effect/spawner/random/entertainment/deck{ pixel_x = -6 }, -/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 }, @@ -19227,15 +19227,15 @@ /area/station/cargo/drone_bay) "fMg" = ( /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/no_smoking/directional/north, @@ -20079,8 +20079,8 @@ /area/station/cargo/office) "gaq" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/coffee, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/cup/glass/coffee, +/obj/item/reagent_containers/cup/glass/coffee{ pixel_x = -8; pixel_y = 5 }, @@ -20218,15 +20218,15 @@ /area/icemoon/underground/explored) "gbB" = ( /obj/structure/closet/crate, -/obj/item/reagent_containers/food/drinks/waterbottle{ +/obj/item/reagent_containers/cup/glass/waterbottle{ pixel_x = 7; pixel_y = 6 }, -/obj/item/reagent_containers/food/drinks/waterbottle{ +/obj/item/reagent_containers/cup/glass/waterbottle{ pixel_x = 7; pixel_y = 6 }, -/obj/item/reagent_containers/food/drinks/waterbottle{ +/obj/item/reagent_containers/cup/glass/waterbottle{ pixel_x = 7; pixel_y = 6 }, @@ -21693,7 +21693,7 @@ }, /obj/structure/reagent_dispensers/watertank/high, /obj/effect/turf_decal/stripes/line, -/obj/item/reagent_containers/glass/watering_can, +/obj/item/reagent_containers/cup/watering_can, /turf/open/floor/iron/half{ dir = 1 }, @@ -21853,16 +21853,16 @@ /area/station/maintenance/department/medical/central) "gDz" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/food/drinks/bottle/amaretto{ +/obj/item/reagent_containers/cup/glass/bottle/amaretto{ pixel_x = -5; pixel_y = 10 }, -/obj/item/reagent_containers/food/drinks/bottle/fernet{ +/obj/item/reagent_containers/cup/glass/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{ +/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, @@ -22510,11 +22510,11 @@ /area/station/maintenance/aft/lesser) "gNi" = ( /obj/structure/table, -/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 }, @@ -23518,11 +23518,11 @@ /area/station/medical/medbay/aft) "hdV" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3; pixel_y = 5 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3 }, /turf/open/floor/iron, @@ -23645,10 +23645,10 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "hfq" = ( -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3 }, /obj/structure/window/reinforced/spawner/west, @@ -25657,11 +25657,11 @@ "hPf" = ( /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/reagent_containers/cup/glass/drinkingglass/shotglass, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, /obj/item/gun/ballistic/revolver/russian, /obj/item/ammo_box/a357, -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, +/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka, /obj/effect/turf_decal/bot_white/left, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, @@ -27230,10 +27230,10 @@ "ioo" = ( /obj/structure/table, /obj/effect/turf_decal/tile/neutral/diagonal_edge, -/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/kitchen/diagonal, @@ -27619,7 +27619,7 @@ dir = 9 }, /obj/structure/table, -/obj/item/reagent_containers/glass/beaker, +/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{ @@ -27992,10 +27992,10 @@ dir = 8 }, /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/large, @@ -29197,7 +29197,7 @@ /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) "iTP" = ( -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/trimline/green/filled/line, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -31121,8 +31121,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 }, @@ -32848,7 +32848,7 @@ /obj/structure/table, /obj/effect/turf_decal/tile/neutral/diagonal_edge, /obj/item/plate, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ pixel_x = -7; pixel_y = 6 }, @@ -32949,15 +32949,15 @@ /obj/item/toy/cards/deck{ pixel_y = 4 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass{ pixel_x = 14; pixel_y = 12 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass{ pixel_x = -18; pixel_y = 10 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass{ pixel_x = -10; pixel_y = 2 }, @@ -33776,7 +33776,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) "kpu" = ( @@ -34175,7 +34175,7 @@ "kum" = ( /obj/structure/table, /obj/item/trash/can/food/beans, -/obj/item/reagent_containers/food/drinks/waterbottle/empty, +/obj/item/reagent_containers/cup/glass/waterbottle/empty, /turf/open/floor/iron, /area/station/maintenance/starboard/fore) "kuu" = ( @@ -34718,7 +34718,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 }, @@ -35656,7 +35656,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/wirecutters, /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -36049,15 +36049,15 @@ /area/station/hallway/primary/fore) "kWL" = ( /obj/structure/rack, -/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/mercury{ +/obj/item/reagent_containers/cup/bottle/mercury{ pixel_x = -5; 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{ @@ -36281,8 +36281,8 @@ /obj/item/reagent_containers/syringe{ name = "steel point" }, -/obj/item/reagent_containers/glass/bottle/multiver, -/obj/item/reagent_containers/glass/bottle/epinephrine, +/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, @@ -36510,8 +36510,8 @@ pixel_x = 6; pixel_y = 10 }, -/obj/item/reagent_containers/glass/bottle/welding_fuel, -/obj/item/reagent_containers/glass/bottle/welding_fuel, +/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") @@ -37374,7 +37374,7 @@ /area/station/science/xenobiology) "lrw" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/cup/beaker/large{ pixel_x = -3; pixel_y = 3 }, @@ -37683,10 +37683,10 @@ "lxf" = ( /obj/effect/turf_decal/tile/red/full, /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/large, @@ -39586,7 +39586,7 @@ pixel_x = -3; pixel_y = 7 }, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ pixel_x = 9; pixel_y = 7 }, @@ -39646,7 +39646,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/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -39735,7 +39735,7 @@ pixel_x = 5; pixel_y = 6 }, -/obj/item/reagent_containers/glass/rag, +/obj/item/reagent_containers/cup/rag, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/table/wood, /turf/open/floor/stone, @@ -42217,7 +42217,7 @@ /obj/item/hatchet, /obj/item/crowbar, /obj/item/plant_analyzer, -/obj/item/reagent_containers/glass/watering_can, +/obj/item/reagent_containers/cup/watering_can, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 4 }, @@ -43405,7 +43405,7 @@ /area/station/medical/medbay/aft) "npH" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/iron/dark, /area/mine/laborcamp) "npJ" = ( @@ -43799,7 +43799,7 @@ /turf/open/floor/iron, /area/station/security/prison/mess) "nwI" = ( -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/structure/sink/directional/east, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) @@ -44227,15 +44227,15 @@ /area/station/hallway/secondary/exit/departure_lounge) "nCb" = ( /obj/structure/rack, -/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/iron{ +/obj/item/reagent_containers/cup/bottle/iron{ pixel_x = -5; pixel_y = 3 }, -/obj/item/reagent_containers/glass/bottle/multiver{ +/obj/item/reagent_containers/cup/bottle/multiver{ pixel_x = 1 }, /obj/item/radio/intercom/directional/west, @@ -45259,9 +45259,9 @@ }, /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{ +/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 }, @@ -45547,21 +45547,21 @@ icon_state = "thecavern"; pixel_y = 32 }, -/obj/item/reagent_containers/food/drinks/bottle/vermouth{ +/obj/item/reagent_containers/cup/glass/bottle/vermouth{ pixel_x = 10; pixel_y = 14 }, -/obj/item/reagent_containers/food/drinks/bottle/pineapplejuice{ +/obj/item/reagent_containers/cup/glass/bottle/juice/pineapplejuice{ pixel_y = 9 }, -/obj/item/reagent_containers/food/drinks/bottle/orangejuice{ +/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice{ pixel_x = 15 }, -/obj/item/reagent_containers/food/drinks/bottle/vodka{ +/obj/item/reagent_containers/cup/glass/bottle/vodka{ pixel_x = -11; pixel_y = 5 }, -/obj/item/reagent_containers/food/drinks/soda_cans/tonic, +/obj/item/reagent_containers/cup/soda_cans/tonic, /turf/open/floor/plating, /area/station/maintenance/fore) "nTL" = ( @@ -46117,7 +46117,7 @@ /area/station/science/xenobiology) "odf" = ( /obj/structure/cable, -/obj/item/reagent_containers/food/drinks/bottle/hooch, +/obj/item/reagent_containers/cup/glass/bottle/hooch, /obj/machinery/power/apc/five_k/directional/north, /turf/open/floor/plating, /area/mine/storage) @@ -47044,7 +47044,7 @@ /area/station/science/xenobiology) "orE" = ( /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{ @@ -51108,15 +51108,15 @@ /area/station/maintenance/aft/greater) "pHS" = ( /obj/structure/rack, -/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/epinephrine{ +/obj/item/reagent_containers/cup/bottle/epinephrine{ pixel_x = -5; pixel_y = 3 }, -/obj/item/reagent_containers/glass/bottle/iodine{ +/obj/item/reagent_containers/cup/bottle/iodine{ pixel_x = 1 }, /obj/structure/sign/warning/chem_diamond/directional/west, @@ -55881,10 +55881,10 @@ dir = 8 }, /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/white/smooth_large, @@ -59954,8 +59954,8 @@ pixel_y = 5 }, /obj/item/stack/medical/suture, -/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, @@ -60387,7 +60387,7 @@ /area/station/maintenance/department/electrical) "sBt" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{ +/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{ pixel_x = 7; pixel_y = 20 }, @@ -60395,11 +60395,11 @@ pixel_x = -5; pixel_y = 1 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = 7; pixel_y = 8 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = 6 }, /obj/item/storage/secure/safe/hos{ @@ -63325,7 +63325,7 @@ /area/station/service/library) "tyK" = ( /obj/item/mop, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/iron, /area/station/service/janitor) "tyS" = ( @@ -64333,7 +64333,7 @@ /turf/closed/wall, /area/station/medical/break_room) "tMY" = ( -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, +/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka, /obj/structure/closet, /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, @@ -64455,7 +64455,7 @@ "tPg" = ( /obj/structure/table/wood, /obj/item/food/chips, -/obj/item/reagent_containers/food/drinks/soda_cans/cola, +/obj/item/reagent_containers/cup/soda_cans/cola, /turf/open/floor/carpet, /area/station/hallway/secondary/entry) "tPz" = ( @@ -65998,9 +65998,9 @@ /area/station/hallway/primary/fore) "uoi" = ( /obj/structure/sink/directional/west, -/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/machinery/airalarm/directional/south, /obj/effect/spawner/random/contraband/prison, /turf/open/floor/plating, @@ -67303,10 +67303,10 @@ name = "old radio"; pixel_y = 15 }, -/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/plating, @@ -70080,7 +70080,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/structure/extinguisher_cabinet/directional/south, /obj/effect/turf_decal/tile/yellow/full, @@ -71018,8 +71018,8 @@ dir = 10 }, /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/syringe, @@ -71047,11 +71047,11 @@ pixel_y = 2 }, /obj/item/storage/box/syringes, -/obj/item/reagent_containers/glass/bottle/morphine{ +/obj/item/reagent_containers/cup/bottle/morphine{ pixel_x = 8; pixel_y = -3 }, -/obj/item/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/cup/bottle/epinephrine{ pixel_x = 7; pixel_y = -3 }, @@ -73335,7 +73335,7 @@ pixel_x = 2; pixel_y = 5 }, -/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/cup/beaker/large, /obj/effect/turf_decal/tile/red{ dir = 4 }, @@ -76776,19 +76776,19 @@ /area/station/maintenance/starboard/fore) "xCQ" = ( /obj/structure/table/glass, -/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 }, @@ -77897,7 +77897,7 @@ /area/station/commons/locker) "xVO" = ( /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 @@ -78657,15 +78657,15 @@ /area/station/security/prison/toilet) "yiK" = ( /obj/structure/rack, -/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/phosphorus{ +/obj/item/reagent_containers/cup/bottle/phosphorus{ pixel_x = -5; pixel_y = 3 }, -/obj/item/reagent_containers/glass/bottle/sodium{ +/obj/item/reagent_containers/cup/bottle/sodium{ pixel_x = 1 }, /obj/machinery/firealarm/directional/south, 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 8c04940a175..d7c38c9ce2d 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -2090,7 +2090,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) @@ -3429,7 +3429,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" = ( @@ -3739,7 +3739,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, @@ -4066,17 +4066,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 }, @@ -5398,12 +5398,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 }, @@ -6517,21 +6517,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 @@ -6933,15 +6933,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 }, @@ -7074,7 +7074,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{ @@ -7671,7 +7671,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{ @@ -9145,7 +9145,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{ @@ -9447,7 +9447,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, @@ -9968,7 +9968,7 @@ /turf/open/floor/iron, /area/station/command/heads_quarters/ce) "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, @@ -10073,7 +10073,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" = ( @@ -11752,7 +11752,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" }, @@ -12018,27 +12018,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" = ( @@ -12123,15 +12123,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, @@ -13479,7 +13479,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, @@ -17060,7 +17060,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 @@ -18218,8 +18218,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{ @@ -18385,7 +18385,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{ @@ -18922,11 +18922,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{ @@ -19796,15 +19796,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, @@ -19853,7 +19853,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, @@ -22424,11 +22424,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 }, @@ -23941,11 +23941,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 }, @@ -25615,7 +25615,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, @@ -26352,7 +26352,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 }, @@ -26512,19 +26512,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 }, @@ -27660,7 +27660,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{ @@ -27772,7 +27772,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 }, @@ -28667,11 +28667,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 }, @@ -28680,7 +28680,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 }, @@ -30024,16 +30024,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 }, @@ -31045,22 +31045,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 }, @@ -31216,8 +31216,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 @@ -31283,15 +31283,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{ @@ -31754,9 +31754,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) @@ -33723,7 +33723,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) @@ -34619,10 +34619,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{ @@ -36245,16 +36245,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 }, @@ -37307,7 +37307,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" = ( @@ -37929,7 +37929,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) @@ -39056,7 +39056,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 }, @@ -39261,8 +39261,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 }, @@ -39350,15 +39350,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 }, @@ -40477,7 +40477,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" = ( @@ -40687,7 +40687,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" = ( @@ -41320,7 +41320,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 @@ -42620,15 +42620,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{ @@ -45480,9 +45480,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" = ( @@ -46819,7 +46819,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" }, @@ -46988,7 +46988,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{ @@ -47195,11 +47195,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 }, @@ -47589,7 +47589,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 @@ -50625,7 +50625,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 }, @@ -50858,15 +50858,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 }, @@ -51500,17 +51500,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 }, @@ -51770,15 +51770,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, @@ -52063,15 +52063,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 }, @@ -53650,7 +53650,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, @@ -53853,13 +53853,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" = ( @@ -54126,7 +54126,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 @@ -56044,10 +56044,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 @@ -56158,7 +56158,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, @@ -57371,7 +57371,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 }, @@ -57389,10 +57389,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, @@ -57454,15 +57454,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, @@ -59867,10 +59867,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{ @@ -60377,18 +60377,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{ @@ -63150,7 +63150,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 }, @@ -63515,15 +63515,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{ @@ -63626,15 +63626,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{ @@ -64539,15 +64539,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{ @@ -64678,7 +64678,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) @@ -65118,7 +65118,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 }, @@ -65538,7 +65538,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 @@ -65547,7 +65547,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) @@ -66632,7 +66632,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) @@ -67239,12 +67239,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, @@ -67294,8 +67294,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 b070a267d8f..44182105dcc 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -325,10 +325,10 @@ "ck" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, -/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; pixel_y = 5 }, @@ -1284,7 +1284,7 @@ /area/mine/storage/public) "hW" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/bowl, +/obj/item/reagent_containers/cup/bowl, /obj/item/kitchen/spoon, /turf/open/floor/iron/checker, /area/mine/laborcamp) @@ -2483,7 +2483,7 @@ 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/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/trimline/green/filled/line{ dir = 1 }, @@ -2981,11 +2981,11 @@ /obj/effect/turf_decal/tile/bar/opposingcorners{ dir = 1 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = -3; pixel_y = 7 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = 6; pixel_y = 5 }, @@ -3320,15 +3320,15 @@ /area/lavaland/surface/outdoors) "sW" = ( /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 }, -/obj/item/reagent_containers/food/drinks/bottle/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = -1; pixel_y = 9 }, -/obj/item/reagent_containers/food/drinks/bottle/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = -8 }, /turf/open/floor/iron/white/smooth_edge{ @@ -3984,7 +3984,7 @@ /area/mine/cafeteria) "xr" = ( /obj/structure/sink/directional/east, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, @@ -4088,7 +4088,7 @@ /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{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = -7; pixel_y = 7 }, @@ -4551,9 +4551,9 @@ /area/lavaland/surface/outdoors) "AV" = ( /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/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) @@ -5246,7 +5246,7 @@ /turf/open/floor/iron/smooth, /area/mine/laborcamp/production) "Gl" = ( -/obj/item/reagent_containers/food/drinks/colocup, +/obj/item/reagent_containers/cup/glass/colocup, /turf/open/misc/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "Gm" = ( @@ -7603,7 +7603,7 @@ /turf/open/misc/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "Vc" = ( -/obj/item/reagent_containers/food/drinks/colocup{ +/obj/item/reagent_containers/cup/glass/colocup{ pixel_x = -5; pixel_y = -3 }, diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index c44d0d0eb11..4499eb4fbb5 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -723,11 +723,11 @@ pixel_x = -5; pixel_y = 12 }, -/obj/item/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/cup/beaker/large{ pixel_x = -7; pixel_y = -8 }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/cup/beaker/cryoxadone{ pixel_x = 9; pixel_y = -7 }, @@ -2038,7 +2038,7 @@ pixel_x = -8; pixel_y = 1 }, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = 7; pixel_y = -4 }, @@ -2181,7 +2181,7 @@ "gp" = ( /obj/structure/table/wood, /obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ pixel_y = 5 }, /obj/machinery/light/directional/south, @@ -2561,18 +2561,18 @@ /obj/item/food/grown/tomato, /obj/item/food/grown/tomato, /obj/item/food/grown/tomato, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/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{ +/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/food/condiment/flour{ +/obj/item/reagent_containers/condiment/flour{ pixel_x = -5; pixel_y = 9 }, @@ -2880,7 +2880,7 @@ dir = 1 }, /obj/structure/table/wood, -/obj/item/reagent_containers/glass/rag, +/obj/item/reagent_containers/cup/rag, /turf/open/floor/iron, /area/centcom/syndicate_mothership/control) "ik" = ( @@ -4166,7 +4166,7 @@ /area/centcom/central_command_areas/prison) "lQ" = ( /obj/structure/table/rolling, -/obj/item/reagent_containers/food/condiment/soymilk, +/obj/item/reagent_containers/condiment/soymilk, /turf/open/floor/mineral/titanium, /area/centcom/syndicate_mothership/control) "lR" = ( @@ -4842,7 +4842,7 @@ /area/centcom/central_command_areas/control) "nP" = ( /obj/structure/sink/kitchen/directional/west, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/catwalk_floor/iron_smooth, /area/centcom/syndicate_mothership/control) "nQ" = ( @@ -8360,7 +8360,7 @@ /area/centcom/central_command_areas/control) "yA" = ( /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 = -2 }, @@ -9122,14 +9122,14 @@ "AC" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -8; pixel_y = 5 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8 }, -/obj/item/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/cup/glass/britcup, /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/centcom/tdome/observation) @@ -9523,17 +9523,17 @@ /turf/open/floor/iron/white, /area/centcom/central_command_areas/control) "BG" = ( -/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 }, @@ -9771,18 +9771,18 @@ /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{ +/obj/item/reagent_containers/condiment/rice{ pixel_y = 12 }, -/obj/item/reagent_containers/food/condiment/saltshaker, -/obj/item/reagent_containers/food/condiment/peppermill, +/obj/item/reagent_containers/condiment/saltshaker, +/obj/item/reagent_containers/condiment/peppermill, /obj/item/food/grown/wheat, /obj/item/food/grown/wheat, -/obj/item/reagent_containers/food/condiment/sugar, -/obj/item/reagent_containers/food/condiment/sugar, +/obj/item/reagent_containers/condiment/sugar, +/obj/item/reagent_containers/condiment/sugar, /obj/item/food/grown/soybeans, /obj/item/food/grown/soybeans, /obj/item/food/grown/vanillapod, @@ -10177,7 +10177,7 @@ "Du" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/cup/glass/britcup, /obj/structure/window/reinforced{ dir = 8 }, @@ -11034,7 +11034,7 @@ /area/centcom/syndicate_mothership/expansion_bombthreat) "FQ" = ( /obj/structure/table/rolling, -/obj/item/reagent_containers/food/drinks/bottle/tomatojuice, +/obj/item/reagent_containers/cup/glass/bottle/juice/tomatojuice, /turf/open/floor/mineral/titanium, /area/centcom/syndicate_mothership/control) "FR" = ( @@ -11119,7 +11119,7 @@ pixel_x = 7; pixel_y = 17 }, -/obj/item/reagent_containers/food/drinks/bottle/rum{ +/obj/item/reagent_containers/cup/glass/bottle/rum{ pixel_x = -5; pixel_y = 17 }, @@ -11267,7 +11267,7 @@ }, /obj/item/grenade/chem_grenade, /obj/item/stack/cable_coil, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = 8; pixel_y = 14 }, @@ -11839,7 +11839,7 @@ /obj/item/shovel/spade{ pixel_x = -4 }, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/mineral/plastitanium/red, /area/centcom/syndicate_mothership/expansion_bioterrorism) "In" = ( @@ -11996,7 +11996,7 @@ pixel_x = -6; pixel_y = 5 }, -/obj/item/reagent_containers/glass/bottle/formaldehyde{ +/obj/item/reagent_containers/cup/bottle/formaldehyde{ pixel_x = 8; pixel_y = 4 }, @@ -13081,7 +13081,7 @@ }, /obj/structure/table/wood/poker, /obj/machinery/light/warm/directional/north, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ pixel_x = -4; pixel_y = 14 }, @@ -13326,7 +13326,7 @@ /area/centcom/central_command_areas/holding) "Ne" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/trophy/gold_cup, +/obj/item/reagent_containers/cup/glass/trophy/gold_cup, /turf/open/floor/iron/grimy, /area/centcom/tdome/observation) "Ng" = ( @@ -13342,7 +13342,7 @@ "Nh" = ( /obj/structure/table/wood, /obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/cup/glass/shaker, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/supplypod) "Nj" = ( @@ -13507,7 +13507,7 @@ "NH" = ( /obj/structure/table/reinforced, /obj/item/food/mint, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ pixel_y = 5 }, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -13620,11 +13620,11 @@ "Ob" = ( /obj/structure/table/reinforced, /obj/item/storage/fancy/egg_box, -/obj/item/reagent_containers/food/condiment/flour{ +/obj/item/reagent_containers/condiment/flour{ pixel_x = -5; pixel_y = 9 }, -/obj/item/reagent_containers/food/condiment/rice{ +/obj/item/reagent_containers/condiment/rice{ pixel_y = 12 }, /turf/open/floor/iron/cafeteria, @@ -14213,11 +14213,11 @@ /area/centcom/central_command_areas/holding) "Py" = ( /obj/structure/table/glass/plasmaglass, -/obj/item/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/cup/beaker/large{ pixel_x = -5; pixel_y = 8 }, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = 8; pixel_y = 2 }, @@ -14282,7 +14282,7 @@ /area/centcom/central_command_areas/ferry) "PI" = ( /obj/structure/sink/kitchen/directional/west, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/siding/wood, /turf/open/floor/catwalk_floor, /area/centcom/central_command_areas/holding) @@ -14311,8 +14311,8 @@ "PN" = ( /obj/structure/table/wood, /obj/item/book/manual/wiki/barman_recipes, -/obj/item/reagent_containers/food/drinks/shaker, -/obj/item/reagent_containers/glass/rag, +/obj/item/reagent_containers/cup/glass/shaker, +/obj/item/reagent_containers/cup/rag, /obj/machinery/newscaster/directional/south, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, @@ -14329,10 +14329,10 @@ /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/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, @@ -14935,11 +14935,11 @@ /area/centcom/tdome/administration) "Rx" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -8; pixel_y = 5 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8 }, /obj/item/knife/kitchen, @@ -15063,7 +15063,7 @@ "RQ" = ( /obj/structure/closet/abductor, /obj/item/storage/box/alienhandcuffs, -/obj/item/reagent_containers/glass/beaker/synthflesh, +/obj/item/reagent_containers/cup/beaker/synthflesh, /turf/open/floor/plating/abductor, /area/centcom/abductor_ship) "RR" = ( @@ -15125,7 +15125,7 @@ /area/centcom/central_command_areas/holding) "Sb" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/sake{ +/obj/item/reagent_containers/cup/glass/bottle/sake{ pixel_y = 15 }, /turf/open/floor/carpet/black, @@ -15521,7 +15521,7 @@ /obj/item/food/grown/cabbage, /obj/item/food/grown/cherries, /obj/item/food/grown/cherries, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ layer = 5 }, /obj/item/food/grown/redbeet, @@ -15553,7 +15553,7 @@ /area/centcom/central_command_areas/control) "Tj" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ pixel_y = 5 }, /obj/item/clothing/mask/cigarette/cigar/havana{ @@ -15744,7 +15744,7 @@ "TL" = ( /obj/item/mop, /obj/structure/sink/kitchen/directional/west, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/catwalk_floor, /area/centcom/central_command_areas/holding) "TM" = ( @@ -16044,10 +16044,10 @@ /area/centcom/syndicate_mothership) "Uv" = ( /obj/structure/table/reinforced, -/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{ pixel_x = -4 }, /obj/item/reagent_containers/hypospray/medipen, @@ -16477,7 +16477,7 @@ }, /obj/structure/table/reinforced/plastitaniumglass, /obj/machinery/light/directional/west, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/cup/glass/shaker, /turf/open/floor/iron, /area/centcom/syndicate_mothership/control) "VI" = ( @@ -16593,7 +16593,7 @@ pixel_y = 15 }, /obj/structure/extinguisher_cabinet/directional/west, -/obj/item/reagent_containers/glass/bottle/radium{ +/obj/item/reagent_containers/cup/bottle/radium{ pixel_x = -8; pixel_y = 9 }, @@ -16907,7 +16907,7 @@ "WI" = ( /obj/structure/table/wood, /obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ pixel_y = 5 }, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -16939,7 +16939,7 @@ "WN" = ( /obj/structure/table/wood, /obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ pixel_y = 5 }, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -17449,8 +17449,8 @@ dir = 6 }, /obj/structure/table/reinforced/plasmarglass, -/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{ @@ -17953,7 +17953,7 @@ pixel_x = -8; pixel_y = 4 }, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ layer = 5; pixel_x = 10; pixel_y = 2 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 76c3b6fd97c..45b0faebcab 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -331,7 +331,7 @@ pixel_x = 6; pixel_y = 6 }, -/obj/item/reagent_containers/food/drinks/shaker{ +/obj/item/reagent_containers/cup/glass/shaker{ pixel_x = -6 }, /turf/open/floor/iron/dark, @@ -3101,7 +3101,7 @@ "bnN" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/table, -/obj/item/reagent_containers/food/drinks/bottle/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = -8 }, /turf/open/floor/plating/airless, @@ -4294,7 +4294,7 @@ /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, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/iron, /area/station/security/prison/garden) "bHP" = ( @@ -5479,16 +5479,16 @@ /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, /obj/structure/table/glass, -/obj/item/reagent_containers/glass/bottle/toxin{ +/obj/item/reagent_containers/cup/bottle/toxin{ pixel_x = 6; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/facid{ +/obj/item/reagent_containers/cup/bottle/facid{ name = "fluorosulfuric acid bottle"; pixel_x = -3; pixel_y = 6 }, -/obj/item/reagent_containers/glass/bottle/morphine{ +/obj/item/reagent_containers/cup/bottle/morphine{ name = "nyquil bottle"; pixel_x = 5; pixel_y = 1 @@ -7181,7 +7181,7 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/reagent_containers/glass/watering_can, +/obj/item/reagent_containers/cup/watering_can, /obj/machinery/camera/directional/north{ c_tag = "Service - Hydroponics" }, @@ -7647,8 +7647,8 @@ /obj/item/stack/sheet/mineral/plasma{ pixel_y = 10 }, -/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 }, @@ -10043,7 +10043,7 @@ /area/station/tcommsat/computer) "dwZ" = ( /obj/structure/closet/secure_closet/captains, -/obj/item/reagent_containers/food/drinks/shaker, +/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" @@ -10653,7 +10653,7 @@ pixel_y = -32 }, /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/cup/glass/coffee{ pixel_x = -7 }, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -15076,11 +15076,11 @@ "fkc" = ( /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/reagent_containers/cup/glass/drinkingglass/shotglass, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, /obj/item/gun/ballistic/revolver/russian, /obj/item/ammo_box/a357, -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, +/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka, /obj/effect/turf_decal/bot_white/left, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, @@ -16377,7 +16377,7 @@ /obj/effect/turf_decal/trimline/yellow/warning{ 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) "fIr" = ( @@ -16552,10 +16552,10 @@ /area/station/service/library) "fLE" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3 }, /obj/machinery/camera/directional/north{ @@ -17369,7 +17369,7 @@ pixel_x = 3; pixel_y = 2 }, -/obj/item/reagent_containers/glass/bottle/epinephrine, +/obj/item/reagent_containers/cup/bottle/epinephrine, /obj/item/reagent_containers/syringe, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) @@ -18366,10 +18366,10 @@ /area/station/service/kitchen) "guf" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/cup/beaker{ pixel_x = 5 }, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ layer = 5 }, /turf/open/floor/iron/white, @@ -18474,7 +18474,7 @@ /area/station/engineering/atmos) "gvU" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/service/janitor) @@ -19424,15 +19424,15 @@ dir = 1 }, /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 }, -/obj/item/reagent_containers/food/drinks/bottle/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = -1; pixel_y = 9 }, -/obj/item/reagent_containers/food/drinks/bottle/beer{ +/obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = -8 }, /turf/open/floor/iron, @@ -19528,15 +19528,15 @@ /area/station/command/bridge) "gOp" = ( /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 }, /turf/open/floor/iron/dark/textured_corner{ @@ -20902,7 +20902,7 @@ pixel_x = 6; pixel_y = 4 }, -/obj/item/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/cup/glass/britcup{ pixel_x = -6; pixel_y = 1 }, @@ -21957,9 +21957,9 @@ /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/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 }, @@ -25788,8 +25788,8 @@ /area/station/hallway/secondary/exit/departure_lounge) "iWZ" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/rice, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/rice, /turf/open/floor/iron/cafeteria, /area/station/security/prison/mess) "iXc" = ( @@ -26405,10 +26405,10 @@ /area/station/science/lower) "jjy" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3 }, /obj/machinery/computer/security/telescreen/entertainment/directional/east, @@ -26925,15 +26925,15 @@ /area/station/hallway/primary/tram/right) "jsN" = ( /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, @@ -30454,7 +30454,7 @@ /obj/item/nullrod{ pixel_x = 4 }, -/obj/item/reagent_containers/food/drinks/bottle/holywater{ +/obj/item/reagent_containers/cup/glass/bottle/holywater{ pixel_x = -2; pixel_y = 2 }, @@ -31487,8 +31487,8 @@ 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/cup/bottle/multiver, +/obj/item/reagent_containers/cup/bottle/epinephrine, /obj/item/reagent_containers/syringe, /obj/structure/extinguisher_cabinet/directional/west, /obj/machinery/camera{ @@ -33695,17 +33695,17 @@ /area/station/security/prison/workout) "lFt" = ( /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{ layer = 3.1; pixel_x = -2; pixel_y = 2 }, -/obj/item/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ pixel_x = 9; pixel_y = 3 }, @@ -34648,10 +34648,10 @@ /area/station/security/courtroom) "lWy" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3 }, /obj/machinery/computer/security/telescreen/entertainment/directional/west, @@ -35480,15 +35480,15 @@ /area/station/commons/dorms) "mla" = ( /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 }, /obj/machinery/camera/directional/south{ @@ -36658,15 +36658,15 @@ /area/station/engineering/atmos) "mBV" = ( /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 }, /obj/machinery/firealarm/directional/north, @@ -37813,16 +37813,16 @@ "mUn" = ( /obj/structure/window/reinforced/spawner/west, /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 }, -/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 }, @@ -38383,16 +38383,16 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 }, -/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/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 }, @@ -38446,15 +38446,15 @@ /area/station/ai_monitored/command/storage/eva) "neY" = ( /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 }, /obj/structure/sign/warning/chem_diamond/directional/south, @@ -39809,8 +39809,8 @@ /area/station/security/checkpoint/supply) "nEF" = ( /obj/structure/table/glass, -/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 }, @@ -39926,10 +39926,10 @@ id = "playerscantreadthis"; name = "Kitchen Counter 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/checker, @@ -43569,15 +43569,15 @@ /area/station/engineering/supermatter/room) "paz" = ( /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/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -46015,7 +46015,7 @@ /obj/effect/turf_decal/trimline/yellow/warning{ dir = 8 }, -/obj/item/reagent_containers/glass/watering_can, +/obj/item/reagent_containers/cup/watering_can, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "pQd" = ( @@ -46321,7 +46321,7 @@ /obj/item/hatchet, /obj/item/plant_analyzer, /obj/item/cultivator, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/machinery/light/directional/north, /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 1 @@ -46492,11 +46492,11 @@ /area/station/ai_monitored/turret_protected/aisat/foyer) "pXJ" = ( /obj/structure/table/glass, -/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 }, @@ -46718,11 +46718,11 @@ "qbZ" = ( /obj/structure/table, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = 8; pixel_y = 8 }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, /obj/structure/disposalpipe/segment{ dir = 5 }, @@ -46731,7 +46731,7 @@ pixel_x = 4; pixel_y = 4 }, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/cup/glass/bottle/whiskey, /turf/open/floor/carpet, /area/station/command/heads_quarters/qm) "qca" = ( @@ -52522,7 +52522,7 @@ /area/station/science/research) "rYt" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/cup/glass/shaker, /obj/machinery/light/dim/directional/east, /turf/open/floor/wood, /area/station/service/bar/backroom) @@ -54245,10 +54245,10 @@ /area/mine/explored) "sIq" = ( /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/wrench/medical, /turf/open/floor/iron/dark, /area/station/medical/treatment_center) @@ -54858,7 +54858,7 @@ /obj/effect/turf_decal/bot, /obj/structure/janitorialcart, /obj/item/mop, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 10 }, @@ -55792,10 +55792,10 @@ /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{ +/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/computer/security/telescreen/entertainment/directional/west, @@ -57228,7 +57228,7 @@ /obj/structure/window/reinforced, /obj/structure/table/wood, /obj/item/radio/intercom/directional/east, -/obj/item/reagent_containers/food/drinks/flask/gold{ +/obj/item/reagent_containers/cup/glass/flask/gold{ pixel_y = 10; pixel_x = 11 }, @@ -60334,8 +60334,8 @@ /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/cup/beaker/large, +/obj/item/reagent_containers/cup/beaker, /obj/item/reagent_containers/dropper, /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -63309,7 +63309,7 @@ /obj/item/reagent_containers/dropper{ pixel_y = -5 }, -/obj/item/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/cup/beaker/large{ pixel_y = 6 }, /turf/open/floor/iron/white, @@ -68841,7 +68841,7 @@ pixel_x = -3; pixel_y = 7 }, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ pixel_y = 15; pixel_x = 9 }, @@ -69307,7 +69307,7 @@ /area/station/service/library) "xVZ" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/cup/bucket, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/security) @@ -69641,11 +69641,11 @@ /area/station/security/courtroom) "yaS" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/cup/glass/coffee{ pixel_x = -3; pixel_y = 10 }, -/obj/item/reagent_containers/food/drinks/coffee{ +/obj/item/reagent_containers/cup/glass/coffee{ pixel_x = 10; pixel_y = 2 }, 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 c602d544a37..b16cda14a29 100644 --- a/_maps/shuttles/emergency_discoinferno.dmm +++ b/_maps/shuttles/emergency_discoinferno.dmm @@ -69,7 +69,7 @@ "n" = ( /obj/structure/table/wood/poker, /obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/cup/glass/bottle/whiskey, /obj/machinery/light/directional/south, /turf/open/floor/mineral/gold, /area/shuttle/escape) @@ -131,12 +131,12 @@ /area/shuttle/escape) "A" = ( /obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/drinks/bottle/cognac, +/obj/item/reagent_containers/cup/glass/bottle/cognac, /turf/open/floor/wood, /area/shuttle/escape) "B" = ( /obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, +/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka, /turf/open/floor/wood, /area/shuttle/escape) "C" = ( @@ -169,9 +169,9 @@ /area/shuttle/escape) "H" = ( /obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, /obj/machinery/light/directional/east, /obj/item/coin/plasma, /obj/item/coin/plasma, @@ -191,12 +191,12 @@ /area/shuttle/escape) "K" = ( /obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/drinks/bottle/absinthe, +/obj/item/reagent_containers/cup/glass/bottle/absinthe, /turf/open/floor/wood, /area/shuttle/escape) "L" = ( /obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/drinks/bottle/lizardwine, +/obj/item/reagent_containers/cup/glass/bottle/lizardwine, /turf/open/floor/wood, /area/shuttle/escape) "M" = ( diff --git a/_maps/shuttles/emergency_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 b16832728db..8cfc2d4ed5e 100644 --- a/_maps/shuttles/emergency_nature.dmm +++ b/_maps/shuttles/emergency_nature.dmm @@ -390,7 +390,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 }, @@ -893,7 +893,7 @@ /turf/open/floor/iron/white, /area/shuttle/escape) "Iw" = ( -/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/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/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 a772f65a314..e86cb071ca6 100644 --- a/code/__HELPERS/randoms.dm +++ b/code/__HELPERS/randoms.dm @@ -31,10 +31,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 index 2f97a7816a8..c4b647b6f9e 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -46,7 +46,7 @@ GLOBAL_LIST_INIT(trash_loot, list(//junk: useless, very easy to get, or ghetto c /obj/item/food/urinalcake = 1, /obj/item/light/bulb = 1, /obj/item/light/tube = 1, - /obj/item/reagent_containers/food/drinks/drinkingglass = 1, + /obj/item/reagent_containers/cup/glass/drinkingglass = 1, /obj/item/airlock_painter = 1, /obj/item/airlock_painter/decal = 1, @@ -77,7 +77,7 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items /obj/item/geiger_counter = 1, /obj/item/mop = 1, /obj/item/pushbroom = 1, - /obj/item/reagent_containers/glass/bucket = 1, + /obj/item/reagent_containers/cup/bucket = 1, /obj/item/screwdriver = 1, /obj/item/t_scanner = 1, /obj/item/toy/crayon/spraycan = 1, @@ -126,9 +126,9 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items list(//medical and chemicals /obj/item/grenade/chem_grenade/cleaner = 1, /obj/item/lead_pipe = 1, - /obj/item/reagent_containers/glass/beaker = 1, - /obj/item/reagent_containers/glass/bottle/random_buffer = 2, - /obj/item/reagent_containers/glass/rag = 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, @@ -137,8 +137,8 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items ) = 1, list(//food - /obj/item/reagent_containers/food/drinks/bottle/beer = 1, - /obj/item/reagent_containers/food/drinks/coffee = 1, + /obj/item/reagent_containers/cup/glass/bottle/beer = 1, + /obj/item/reagent_containers/cup/glass/coffee = 1, ) = 1, list(//misc @@ -213,14 +213,14 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items /obj/item/stack/medical/suture = 1, ) = 1, list(//medical chems - /obj/item/reagent_containers/glass/bottle/multiver = 1, + /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/food/drinks/bottle/vodka = 1, - /obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola = 1, - /obj/item/reagent_containers/food/drinks/soda_cans/grey_bull = 1, + /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, 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 4d7c77ada0a..bd6619355ef 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 @@ -191,16 +191,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 fc267bff799..b3ad127b364 100644 --- a/code/datums/components/crafting/recipes.dm +++ b/code/datums/components/crafting/recipes.dm @@ -67,8 +67,8 @@ 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) + /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 @@ -101,10 +101,10 @@ /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) + 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 @@ -363,7 +363,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 = 4 SECONDS @@ -802,7 +802,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 @@ -1006,7 +1006,7 @@ name = "Wooden Bucket" time = 3 SECONDS 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 @@ -1335,7 +1335,7 @@ 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 ) @@ -1345,7 +1345,7 @@ 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 ) @@ -1355,7 +1355,7 @@ 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 b25216f05c4..62f9c7845cc 100644 --- a/code/datums/station_traits/negative_traits.dm +++ b/code/datums/station_traits/negative_traits.dm @@ -170,8 +170,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 4205201840c..fdb26481be5 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 d93375c8148..729516ff031 100644 --- a/code/game/machinery/dish_drive.dm +++ b/code/game/machinery/dish_drive.dm @@ -11,8 +11,8 @@ pass_flags = PASSTABLE var/static/list/collectable_items = list(/obj/item/trash/waffles, /obj/item/trash/tray, - /obj/item/reagent_containers/glass/bowl, - /obj/item/reagent_containers/food/drinks/drinkingglass, + /obj/item/reagent_containers/cup/bowl, + /obj/item/reagent_containers/cup/glass/drinkingglass, /obj/item/kitchen/fork, /obj/item/shard, /obj/item/broken_bottle) diff --git a/code/game/machinery/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 217f80878e3..a356506b2d0 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 37a80fcbe02..4381a9caced 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -443,12 +443,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) @@ -471,7 +471,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 @@ -513,7 +513,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 a7ef07e012b..74279695a73 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -480,7 +480,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 fc3b0086636..bcfff42cbae 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -203,7 +203,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 1d2094f9fdc..d52819bab5a 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" @@ -700,7 +700,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 @@ -770,7 +770,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 @@ -779,7 +779,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 5348ecbf9e8..d328d557b9d 100644 --- a/code/game/objects/items/mop.dm +++ b/code/game/objects/items/mop.dm @@ -56,7 +56,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 19d58f5d459..8a4da373cf2 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -267,13 +267,13 @@ 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),\ new/datum/stack_recipe("baseball bat", /obj/item/melee/baseball_bat, 5, time = 15),\ new/datum/stack_recipe("loom", /obj/structure/loom, 10, time = 15, 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), \ @@ -376,7 +376,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \ new/datum/stack_recipe("construction bag", /obj/item/storage/bag/construction, 4), \ 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), \ @@ -667,9 +667,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 d67885f280b..d9d0d9243b6 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -634,7 +634,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 7fee8abde71..15ac4bbc975 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 e85005f26cf..89cdcd20d5c 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -240,8 +240,8 @@ /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/cup/beaker, + /obj/item/reagent_containers/cup/bottle, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/medigel, /obj/item/reagent_containers/pill, @@ -271,8 +271,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() @@ -282,8 +282,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 @@ -389,8 +389,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, @@ -504,7 +504,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 @@ -524,15 +524,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) @@ -598,7 +598,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, )) @@ -837,8 +837,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 348c71b0f25..a3bf2ae0bc0 100644 --- a/code/game/objects/items/storage/book.dm +++ b/code/game/objects/items/storage/book.dm @@ -251,7 +251,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 fe43129c242..c73da60787c 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -253,7 +253,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" @@ -261,18 +261,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" @@ -439,7 +439,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" @@ -448,7 +448,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" @@ -457,7 +457,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" @@ -1468,7 +1468,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" @@ -1757,9 +1757,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 baa4c201531..fc52f909e7d 100644 --- a/code/game/objects/items/storage/medkit.dm +++ b/code/game/objects/items/storage/medkit.dm @@ -69,8 +69,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 9a1a8f6625c..311bc3850f5 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 2c6b11b112b..3bc3d16ee61 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 2bdf0038917..5ad44de7b38 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 0dc35bba837..eabfae7ab15 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm @@ -13,6 +13,6 @@ /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 5e4f32c444e..c275c838eb4 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) @@ -119,7 +119,7 @@ new /obj/item/storage/box/medigels(src) 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 c38242ca62d..1d5985d1e89 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 16c5e5e8165..549ed4befec 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/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm index d153ab617dc..30eda06da71 100644 --- a/code/modules/awaymissions/mission_code/snowdin.dm +++ b/code/modules/awaymissions/mission_code/snowdin.dm @@ -180,7 +180,7 @@ . += span_info("Some liquid plasma could probably be scooped up with a container.") /turf/open/lava/plasma/attackby(obj/item/I, mob/user, params) - var/obj/item/reagent_containers/glass/C = I + var/obj/item/reagent_containers/cup/C = I if(C.reagents.total_volume >= C.volume) to_chat(user, span_danger("[C] is full.")) return 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 d4287e87902..4e44ae58b4e 100644 --- a/code/modules/cargo/bounties/mining.dm +++ b/code/modules/cargo/bounties/mining.dm @@ -54,7 +54,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 d91cdaf2db4..412b0ae013f 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 @@ -1203,19 +1203,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) @@ -1240,11 +1240,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, @@ -1293,21 +1293,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 @@ -1541,9 +1541,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, @@ -1551,7 +1551,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) @@ -1588,11 +1588,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, @@ -1709,7 +1709,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. @@ -1847,15 +1847,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, @@ -1891,8 +1891,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, @@ -2050,7 +2050,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" @@ -2060,7 +2060,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" @@ -2311,7 +2311,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, @@ -2466,7 +2466,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 @@ -2755,8 +2755,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 3d148c84951..031d95f3061 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 768e4b62d01..b18f7bf82f9 100644 --- a/code/modules/clothing/outfits/standard.dm +++ b/code/modules/clothing/outfits/standard.dm @@ -79,13 +79,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 d7d08c8e1cc..07b69a48fd4 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 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 6112ba14601..b736aee0ca9 100644 --- a/code/modules/clothing/suits/costume.dm +++ b/code/modules/clothing/suits/costume.dm @@ -23,7 +23,7 @@ icon_state = "pirate" inhand_icon_state = "pirate" body_parts_covered = CHEST|GROIN|ARMS - allowed = list(/obj/item/melee/energy/sword/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/reagent_containers/food/drinks/bottle/rum) + 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 @@ -114,7 +114,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 6f4c72ef70c..39b5f83c37e 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 b9c8cd6f3b1..bcd55a84bbd 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, @@ -295,8 +295,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, @@ -446,7 +446,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 eae6a05d0d9..a33c9f2b8ba 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 b9b4ff05de5..4bb9cfe93c9 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 acb247979ad..9a202495816 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 7f3036ee8c4..5402b745483 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,8 +479,8 @@ /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/chem_pack @@ -507,8 +507,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 @@ -521,13 +521,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 395a0f7897f..5f014d08056 100644 --- a/code/modules/food_and_drinks/recipes/food_mixtures.dm +++ b/code/modules/food_and_drinks/recipes/food_mixtures.dm @@ -172,7 +172,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 070ea8d61bd..a84b1949fc6 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,7 +76,7 @@ /datum/crafting_recipe/food/junglesalad name = "Jungle salad" reqs = list( - /obj/item/reagent_containers/glass/bowl = 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, @@ -88,7 +88,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 @@ -100,7 +100,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 22ebffa3869..f73b24cb9ff 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 cad75189b3a..4e32b0a8845 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -628,47 +628,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 778298b4a61..3656234f4ee 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 b4d45878b3d..a9fcab846b6 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" 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 152f27c5df4..abb964551ac 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 7d1d6b9dec4..4d035dfa137 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 c1a1e3dee19..63a0ef170c6 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 c8f08877d97..0d5e726405d 100644 --- a/code/modules/mining/lavaland/ash_flora.dm +++ b/code/modules/mining/lavaland/ash_flora.dm @@ -316,17 +316,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 @@ -334,7 +334,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 4a570efd039..0a5a2c21e67 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 ef809226217..96d1ec75a33 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 1d23f02e021..61d6574d424 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 c556040514c..91dbf89c6e6 100644 --- a/code/modules/mob/living/silicon/robot/robot_model.dm +++ b/code/modules/mob/living/silicon/robot/robot_model.dm @@ -351,7 +351,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, @@ -421,7 +421,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) @@ -523,7 +523,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 @@ -534,7 +534,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) @@ -720,8 +720,8 @@ 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/food/condiment/enzyme, + /obj/item/reagent_containers/cup/beaker/large, //I know a shaker is more appropiate but this is for ease of identification + /obj/item/reagent_containers/condiment/enzyme, /obj/item/pen, /obj/item/toy/crayon/spraycan/borg, /obj/item/extinguisher/mini, @@ -753,7 +753,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 d88141a8908..1d5ec1b77be 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 1e0e06a7304..d232c7fbce7 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 b09812ddaf8..019a86ea538 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 409ceb58247..5cb3c885108 100644 --- a/code/modules/plumbing/plumbers/pill_press.dm +++ b/code/modules/plumbing/plumbers/pill_press.dm @@ -81,14 +81,14 @@ 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 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 d31f9bc5ae3..51c4896961b 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 a1fadc97098..15bde4597cb 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) @@ -413,26 +413,26 @@ 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 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 @@ -594,7 +594,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 ad68a08bd98..35822d2db36 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 078236539a2..3d7ef740e8e 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -41,7 +41,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 66% rename from code/modules/reagents/reagent_containers/glass.dm rename to code/modules/reagents/reagent_containers/cups/_cup.dm index 69bd1f15860..d184f8fcdb9 --- 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 50 units." icon = 'icons/obj/chemical.dmi' @@ -154,20 +209,20 @@ custom_materials = list(/datum/material/glass=500) 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 100 units." icon_state = "beakerlarge" @@ -177,7 +232,7 @@ possible_transfer_amounts = list(5,10,15,20,25,30,50,100) 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 120 units." icon_state = "beakerwhite" @@ -187,7 +242,7 @@ possible_transfer_amounts = list(5,10,15,20,25,30,60,120) 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" @@ -197,7 +252,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." @@ -207,7 +262,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 \ @@ -218,35 +273,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 +/obj/item/reagent_containers/cup/bucket name = "bucket" desc = "It's a bucket." icon = 'icons/obj/janitor.dmi' @@ -274,7 +329,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" @@ -282,7 +337,7 @@ armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 0, ACID = 50) resistance_flags = FLAMMABLE -/obj/item/reagent_containers/glass/bucket/attackby(obj/O, mob/user, params) +/obj/item/reagent_containers/cup/bucket/attackby(obj/O, mob/user, params) if(istype(O, /obj/item/mop)) if(reagents.total_volume < 1) to_chat(user, span_warning("[src] is out of water!")) @@ -290,16 +345,18 @@ reagents.trans_to(O, 5, transfered_by = user) to_chat(user, span_notice("You wet [O] in [src].")) playsound(loc, 'sound/effects/slosh.ogg', 25, TRUE) + return else if(isprox(O)) //This works with wooden buckets for now. Somewhat unintended, but maybe someone will add sprites for it soon(TM) to_chat(user, span_notice("You add [O] to [src].")) qdel(O) qdel(src) user.put_in_hands(new /obj/item/bot_assembly/cleanbot) - else - ..() + return -/obj/item/reagent_containers/glass/bucket/equipped(mob/user, slot) - ..() + return ..() + +/obj/item/reagent_containers/cup/bucket/equipped(mob/user, slot) + . = ..() if (slot == ITEM_SLOT_HEAD) if(reagents.total_volume) to_chat(user, span_userdanger("[src]'s contents spill all over you!")) @@ -307,11 +364,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) @@ -328,7 +385,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" @@ -340,13 +397,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) @@ -382,7 +439,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 64% rename from code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm rename to code/modules/reagents/reagent_containers/cups/drinkingglass.dm index 39085d6e1d9..8e4b4150ebf 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 ..() @@ -50,8 +50,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 // @@ -60,7 +62,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" @@ -73,13 +75,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 . = ..() @@ -88,32 +90,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 f5916317c6c..4fb14ebbc92 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -303,7 +303,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 23209fd7c86..7769c82132d 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("initial","Tools","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("initial","Tools","Tool Designs") departmental_flags = DEPARTMENT_BITFLAG_SERVICE @@ -514,7 +514,7 @@ id = "bowl" build_type = AUTOLATHE materials = list(/datum/material/glass = 500) - build_path = /obj/item/reagent_containers/glass/bowl + build_path = /obj/item/reagent_containers/cup/bowl category = list("initial","Dinnerware") /datum/design/drinking_glass @@ -522,7 +522,7 @@ id = "drinking_glass" build_type = AUTOLATHE materials = list(/datum/material/glass = 500) - build_path = /obj/item/reagent_containers/food/drinks/drinkingglass + build_path = /obj/item/reagent_containers/cup/glass/drinkingglass category = list("initial","Dinnerware") /datum/design/shot_glass @@ -530,7 +530,7 @@ id = "shot_glass" build_type = AUTOLATHE materials = list(/datum/material/glass = 100) - build_path = /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass + build_path = /obj/item/reagent_containers/cup/glass/drinkingglass/shotglass category = list("initial","Dinnerware") /datum/design/shaker @@ -538,7 +538,7 @@ id = "shaker" build_type = AUTOLATHE materials = list(/datum/material/iron = 1500) - build_path = /obj/item/reagent_containers/food/drinks/shaker + build_path = /obj/item/reagent_containers/cup/glass/shaker category = list("initial","Dinnerware") /datum/design/cultivator @@ -689,7 +689,7 @@ id = "beaker" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE materials = list(/datum/material/glass = 500) - build_path = /obj/item/reagent_containers/glass/beaker + build_path = /obj/item/reagent_containers/cup/beaker category = list("initial", "Medical", "Medical Designs") departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SERVICE @@ -698,7 +698,7 @@ id = "large_beaker" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE materials = list(/datum/material/glass = 2500) - build_path = /obj/item/reagent_containers/glass/beaker/large + build_path = /obj/item/reagent_containers/cup/beaker/large category = list("initial", "Medical", "Medical Designs") departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SERVICE diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index 101bfc3991a..47c2ebdb4bd 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("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("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("Medical Designs") /datum/design/meta_beaker @@ -68,7 +68,7 @@ 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("Medical Designs") /datum/design/ph_meter diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm index 79a3a0e4d75..1ab60ff7e85 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("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("initial","Tools","Tool Designs") departmental_flags = DEPARTMENT_BITFLAG_SERVICE diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index 782f62857be..2f3ff2286ad 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 56ebc486d3d..709eb5e7d33 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -293,7 +293,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, @@ -332,7 +332,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 @@ -553,7 +553,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 a356492120e..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/tgstation.dme b/tgstation.dme index 3a312c8e8dd..7a655f869c4 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -2958,13 +2958,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" @@ -4112,10 +4107,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" @@ -4124,6 +4118,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..600561732bd --- /dev/null +++ b/tools/UpdatePaths/Scripts/69081_drinks_refactor.txt @@ -0,0 +1,25 @@ +# Glasses to cups +/obj/item/reagent_containers/glass/@SUBTYPES : /obj/item/reagent_containers/cup/@SUBTYPES {@OLD} + +# Foods +/obj/item/reagent_containers/food/drinks/@SUBTYPES : /obj/item/reagent_containers/cup/glass/@SUBTYPES {@OLD} +/obj/item/reagent_containers/food/condiment/@SUBTYPES : /obj/item/reagent_containers/condiment/@SUBTYPES {@OLD} + +# Sodas +/obj/item/reagent_containers/cup/glass/soda_cans/@SUBTYPES : /obj/item/reagent_containers/cup/soda_cans/@SUBTYPES {@OLD} +/obj/item/reagent_containers/food/drinks/soda_cans/@SUBTYPES : /obj/item/reagent_containers/cup/soda_cans/@SUBTYPES {@OLD} + +# Juices +/obj/item/reagent_containers/food/drinks/glass/bottle/tomatojuice : /obj/item/reagent_containers/cup/glass/bottle/juice/tomatojuice {@OLD} +/obj/item/reagent_containers/food/drinks/glass/bottle/orangejuice : /obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice {@OLD} +/obj/item/reagent_containers/food/drinks/glass/bottle/cream : /obj/item/reagent_containers/cup/glass/bottle/juice/cream {@OLD} +/obj/item/reagent_containers/food/drinks/glass/bottle/limejuice : /obj/item/reagent_containers/cup/glass/bottle/juice/limejuice {@OLD} +/obj/item/reagent_containers/food/drinks/glass/bottle/pineapplejuice : /obj/item/reagent_containers/cup/glass/bottle/juice/pineapplejuice {@OLD} +/obj/item/reagent_containers/food/drinks/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}