cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 11:07:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makes food not a subtype of reagent holders (#23379)

Browse Source 
* I am suffering

* Alright this should be all now

* Fixes CI

* I hate the online merge resolver.

* This got lost in the merge master

* Updatepaths fixed + new added

* Contra review

* Fixes desserts

* Oops

* This should fix it

* Maybe?

* Attempt 3

* Missed conflict

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/food_and_drinks/food/foods/pizza.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Fixes grinders

* Adds comment

* Warrior review

* Warrior + Sirryan review

* Update code/modules/food_and_drinks/food_base.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
This commit is contained in:
DGamerL
2024-01-21 19:00:02 +00:00
committed by GitHub
co-authored by Ryan Henri215
parent 22fbd9aced
commit db578cdc6f
276 changed files with 10289 additions and 10287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+1 -1
View File
@@ -240,7 +240,7 @@
if(isrobot(user))
return
if((istype(I, /obj/item/reagent_containers/glass) || istype(I, /obj/item/reagent_containers/food/drinks)) && user.a_intent != INTENT_HARM)
if((istype(I, /obj/item/reagent_containers/glass) || istype(I, /obj/item/reagent_containers/drinks)) && user.a_intent != INTENT_HARM)
if(panel_open)
to_chat(user, "<span class='notice'>Close the maintenance panel first.</span>")
return
code/modules/reagents/chemistry/machinery/chem_master.dm
+3 -3
View File
@@ -122,7 +122,7 @@
to_chat(user, "<span class='warning'>You can't use [src] while it's panel is opened!</span>")
return TRUE
if((istype(I, /obj/item/reagent_containers/glass) || istype(I, /obj/item/reagent_containers/food/drinks/drinkingglass)) && user.a_intent != INTENT_HARM)
if((istype(I, /obj/item/reagent_containers/glass) || istype(I, /obj/item/reagent_containers/drinks/drinkingglass)) && user.a_intent != INTENT_HARM)
if(!user.drop_item())
to_chat(user, "<span class='warning'>[I] is stuck to you!</span>")
return
@@ -327,7 +327,7 @@
if("create_condi_bottle")
if(!condi || !reagents.total_volume)
return
var/obj/item/reagent_containers/food/condiment/P = new(loc)
var/obj/item/reagent_containers/condiment/P = new(loc)
reagents.trans_to(P, 50)
if("create_pills")
var/medicine_name = pillname
@@ -577,7 +577,7 @@
return
if(!length(answer))
answer = reagents.get_master_reagent_name()
var/obj/item/reagent_containers/food/condiment/pack/P = new(loc)
var/obj/item/reagent_containers/condiment/pack/P = new(loc)
P.originalname = answer
P.name = "[answer] pack"
P.desc = "A small condiment pack. The label says it contains [answer]."
code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+53 -47
View File
@@ -35,25 +35,25 @@
/obj/item/grown/novaflower = list("capsaicin" = 0, "condensedcapsaicin" = 0),
//Blender Stuff
/obj/item/reagent_containers/food/snacks/grown/tomato = list("ketchup" = 0),
/obj/item/reagent_containers/food/snacks/grown/wheat = list("flour" = -5),
/obj/item/reagent_containers/food/snacks/grown/oat = list("flour" = -5),
/obj/item/reagent_containers/food/snacks/grown/cherries = list("cherryjelly" = 0),
/obj/item/reagent_containers/food/snacks/grown/bluecherries = list("bluecherryjelly" = 0),
/obj/item/reagent_containers/food/snacks/egg = list("egg" = -5),
/obj/item/reagent_containers/food/snacks/grown/rice = list("rice" = -5),
/obj/item/reagent_containers/food/snacks/grown/olive = list("olivepaste" = 0, "sodiumchloride" = 0),
/obj/item/reagent_containers/food/snacks/grown/peanuts = list("peanutbutter" = 0),
/obj/item/food/snacks/grown/tomato = list("ketchup" = 0),
/obj/item/food/snacks/grown/wheat = list("flour" = -5),
/obj/item/food/snacks/grown/oat = list("flour" = -5),
/obj/item/food/snacks/grown/cherries = list("cherryjelly" = 0),
/obj/item/food/snacks/grown/bluecherries = list("bluecherryjelly" = 0),
/obj/item/food/snacks/egg = list("egg" = -5),
/obj/item/food/snacks/grown/rice = list("rice" = -5),
/obj/item/food/snacks/grown/olive = list("olivepaste" = 0, "sodiumchloride" = 0),
/obj/item/food/snacks/grown/peanuts = list("peanutbutter" = 0),
//Grinder stuff, but only if dry
/obj/item/reagent_containers/food/snacks/grown/coffee/robusta = list("coffeepowder" = 0, "morphine" = 0),
/obj/item/reagent_containers/food/snacks/grown/coffee = list("coffeepowder" = 0),
/obj/item/reagent_containers/food/snacks/grown/tea/astra = list("teapowder" = 0, "salglu_solution" = 0),
/obj/item/reagent_containers/food/snacks/grown/tea = list("teapowder" = 0),
/obj/item/food/snacks/grown/coffee/robusta = list("coffeepowder" = 0, "morphine" = 0),
/obj/item/food/snacks/grown/coffee = list("coffeepowder" = 0),
/obj/item/food/snacks/grown/tea/astra = list("teapowder" = 0, "salglu_solution" = 0),
/obj/item/food/snacks/grown/tea = list("teapowder" = 0),
//All types that you can put into the grinder to transfer the reagents to the beaker. !Put all recipes above this.!
/obj/item/slime_extract = list(),
/obj/item/reagent_containers/food = list(),
/obj/item/food = list(),
/obj/item/reagent_containers/pill = list(),
/obj/item/reagent_containers/patch = list()
)
@@ -61,33 +61,33 @@
var/list/juice_items = list (
//Juicer Stuff
/obj/item/reagent_containers/food/snacks/grown/soybeans = list("soymilk" = 0),
/obj/item/reagent_containers/food/snacks/grown/corn = list("corn_starch" = 0),
/obj/item/reagent_containers/food/snacks/grown/tomato = list("tomatojuice" = 0),
/obj/item/reagent_containers/food/snacks/grown/carrot = list("carrotjuice" = 0),
/obj/item/reagent_containers/food/snacks/grown/berries = list("berryjuice" = 0),
/obj/item/reagent_containers/food/snacks/grown/banana = list("banana" = 0),
/obj/item/reagent_containers/food/snacks/grown/potato = list("potato" = 0),
/obj/item/reagent_containers/food/snacks/grown/citrus/lemon = list("lemonjuice" = 0),
/obj/item/reagent_containers/food/snacks/grown/citrus/orange = list("orangejuice" = 0),
/obj/item/reagent_containers/food/snacks/grown/citrus/lime = list("limejuice" = 0),
/obj/item/reagent_containers/food/snacks/grown/watermelon = list("watermelonjuice" = 0),
/obj/item/reagent_containers/food/snacks/watermelonslice = list("watermelonjuice" = 0),
/obj/item/reagent_containers/food/snacks/grown/berries/poison = list("poisonberryjuice" = 0),
/obj/item/reagent_containers/food/snacks/grown/pumpkin/blumpkin = list("blumpkinjuice" = 0), //order is important here as blumpkin is a subtype of pumpkin, if switched blumpkins will produce pumpkin juice
/obj/item/reagent_containers/food/snacks/grown/pumpkin = list("pumpkinjuice" = 0),
/obj/item/reagent_containers/food/snacks/grown/apple = list("applejuice" = 0),
/obj/item/reagent_containers/food/snacks/grown/grapes = list("grapejuice" = 0),
/obj/item/reagent_containers/food/snacks/grown/pineapple = list("pineapplejuice" = 0)
/obj/item/food/snacks/grown/soybeans = list("soymilk" = 0),
/obj/item/food/snacks/grown/corn = list("corn_starch" = 0),
/obj/item/food/snacks/grown/tomato = list("tomatojuice" = 0),
/obj/item/food/snacks/grown/carrot = list("carrotjuice" = 0),
/obj/item/food/snacks/grown/berries = list("berryjuice" = 0),
/obj/item/food/snacks/grown/banana = list("banana" = 0),
/obj/item/food/snacks/grown/potato = list("potato" = 0),
/obj/item/food/snacks/grown/citrus/lemon = list("lemonjuice" = 0),
/obj/item/food/snacks/grown/citrus/orange = list("orangejuice" = 0),
/obj/item/food/snacks/grown/citrus/lime = list("limejuice" = 0),
/obj/item/food/snacks/grown/watermelon = list("watermelonjuice" = 0),
/obj/item/food/snacks/watermelonslice = list("watermelonjuice" = 0),
/obj/item/food/snacks/grown/berries/poison = list("poisonberryjuice" = 0),
/obj/item/food/snacks/grown/pumpkin/blumpkin = list("blumpkinjuice" = 0), //order is important here as blumpkin is a subtype of pumpkin, if switched blumpkins will produce pumpkin juice
/obj/item/food/snacks/grown/pumpkin = list("pumpkinjuice" = 0),
/obj/item/food/snacks/grown/apple = list("applejuice" = 0),
/obj/item/food/snacks/grown/grapes = list("grapejuice" = 0),
/obj/item/food/snacks/grown/pineapple = list("pineapplejuice" = 0)
)
var/list/dried_items = list(
//Grinder stuff, but only if dry,
/obj/item/reagent_containers/food/snacks/grown/coffee/robusta = list("coffeepowder" = 0, "morphine" = 0),
/obj/item/reagent_containers/food/snacks/grown/coffee = list("coffeepowder" = 0),
/obj/item/reagent_containers/food/snacks/grown/tea/astra = list("teapowder" = 0, "salglu_solution" = 0),
/obj/item/reagent_containers/food/snacks/grown/tea = list("teapowder" = 0)
/obj/item/food/snacks/grown/coffee/robusta = list("coffeepowder" = 0, "morphine" = 0),
/obj/item/food/snacks/grown/coffee = list("coffeepowder" = 0),
/obj/item/food/snacks/grown/tea/astra = list("teapowder" = 0, "salglu_solution" = 0),
/obj/item/food/snacks/grown/tea = list("teapowder" = 0)
)
var/list/holdingitems = list()
@@ -180,8 +180,8 @@
return TRUE //no afterattack
if(is_type_in_list(I, dried_items))
if(istype(I, /obj/item/reagent_containers/food/snacks/grown))
var/obj/item/reagent_containers/food/snacks/grown/G = I
if(istype(I, /obj/item/food/snacks/grown))
var/obj/item/food/snacks/grown/G = I
if(!G.dry)
to_chat(user, "<span class='warning'>You must dry that first!</span>")
return FALSE
@@ -285,8 +285,8 @@
items_counts[display_name] += S.amount
continue
else if(istype(O, /obj/item/reagent_containers/food))
var/obj/item/reagent_containers/food/food = O
else if(isfood(O))
var/obj/item/food/food = O
if(!items_counts[display_name])
if(food.ingredient_name)
name_overrides[display_name] = food.ingredient_name
@@ -366,12 +366,12 @@
if(istype(O, i))
return blend_items[i]
/obj/machinery/reagentgrinder/proc/get_allowed_snack_by_id(obj/item/reagent_containers/food/snacks/O)
/obj/machinery/reagentgrinder/proc/get_allowed_snack_by_id(obj/item/food/snacks/O)
for(var/i in blend_items)
if(istype(O, i))
return blend_items[i]
/obj/machinery/reagentgrinder/proc/get_allowed_juice_by_id(obj/item/reagent_containers/food/snacks/O)
/obj/machinery/reagentgrinder/proc/get_allowed_juice_by_id(obj/item/food/snacks/O)
for(var/i in juice_items)
if(istype(O, i))
return juice_items[i]
@@ -384,7 +384,7 @@
else
return round(O.seed.potency)
/obj/machinery/reagentgrinder/proc/get_juice_amount(obj/item/reagent_containers/food/snacks/grown/O)
/obj/machinery/reagentgrinder/proc/get_juice_amount(obj/item/food/snacks/grown/O)
if(!istype(O) || !O.seed)
return 5
else if(O.seed.potency == -1)
@@ -413,7 +413,7 @@
SStgui.update_uis(src)
//Snacks
for(var/obj/item/reagent_containers/food/snacks/O in holdingitems)
for(var/obj/item/food/snacks/O in holdingitems)
if(beaker.reagents.holder_full())
break
@@ -451,13 +451,19 @@
SStgui.update_uis(src)
//Snacks and Plants
for(var/obj/item/reagent_containers/food/snacks/O in holdingitems)
for(var/obj/item/food/snacks/O in holdingitems)
if(beaker.reagents.holder_full())
break
var/allowed = get_allowed_snack_by_id(O)
if(isnull(allowed))
break
if(!length(allowed)) // We don't have anything specific allowed therefore we can just transfer everything
if(beaker.reagents.holder_full())
continue
var/amount = O.reagents.total_volume
O.reagents.trans_to(beaker, amount)
if(!O.reagents.total_volume)
remove_object(O)
continue
for(var/r_id in allowed)
code/modules/reagents/chemistry/reagents/food_reagents.dm
+5 -5
View File
@@ -601,7 +601,7 @@
/datum/reagent/consumable/chocolate/reaction_turf(turf/T, volume)
if(volume >= 5 && !isspaceturf(T))
new /obj/item/reagent_containers/food/snacks/choc_pile(T)
new /obj/item/food/snacks/choc_pile(T)
/datum/reagent/consumable/mugwort
name = "Mugwort"
@@ -669,7 +669,7 @@
/datum/reagent/consumable/cheese/reaction_turf(turf/T, volume)
if(volume >= 5 && !isspaceturf(T))
new /obj/item/reagent_containers/food/snacks/cheesewedge(T)
new /obj/item/food/snacks/cheesewedge(T)
/datum/reagent/consumable/fake_cheese
name = "Cheese substitute"
@@ -711,7 +711,7 @@
/datum/reagent/consumable/weird_cheese/reaction_turf(turf/T, volume)
if(volume >= 5 && !isspaceturf(T))
new /obj/item/reagent_containers/food/snacks/weirdcheesewedge(T)
new /obj/item/food/snacks/weirdcheesewedge(T)
/datum/reagent/consumable/beans
name = "Refried beans"
@@ -935,11 +935,11 @@
/datum/reagent/ectoplasm/reaction_turf(turf/T, volume)
if(volume >= 10 && !isspaceturf(T))
new /obj/item/reagent_containers/food/snacks/ectoplasm(T)
new /obj/item/food/snacks/ectoplasm(T)
/datum/reagent/consumable/bread/reaction_turf(turf/T, volume)
if(volume >= 5 && !isspaceturf(T))
new /obj/item/reagent_containers/food/snacks/breadslice(T)
new /obj/item/food/snacks/breadslice(T)
/datum/reagent/soap
name = "Soap"
code/modules/reagents/chemistry/recipes/food_reactions.dm
+8 -8
View File
@@ -10,7 +10,7 @@
/datum/chemical_reaction/tofu/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/reagent_containers/food/snacks/tofu(location)
new /obj/item/food/snacks/tofu(location)
/datum/chemical_reaction/chocolate_bar
name = "Chocolate Bar"
@@ -22,7 +22,7 @@
/datum/chemical_reaction/chocolate_bar/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/reagent_containers/food/snacks/chocolatebar(location)
new /obj/item/food/snacks/chocolatebar(location)
/datum/chemical_reaction/chocolate_bar2
name = "Chocolate Bar"
@@ -34,7 +34,7 @@
/datum/chemical_reaction/chocolate_bar2/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/reagent_containers/food/snacks/chocolatebar(location)
new /obj/item/food/snacks/chocolatebar(location)
/datum/chemical_reaction/soysauce
name = "Soy Sauce"
@@ -75,7 +75,7 @@
/datum/chemical_reaction/cheesewheel/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/reagent_containers/food/snacks/sliceable/cheesewheel(location)
new /obj/item/food/snacks/sliceable/cheesewheel(location)
/datum/chemical_reaction/syntiflesh
name = "Syntiflesh"
@@ -87,7 +87,7 @@
/datum/chemical_reaction/syntiflesh/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/reagent_containers/food/snacks/meat/syntiflesh(location)
new /obj/item/food/snacks/meat/syntiflesh(location)
/datum/chemical_reaction/hot_ramen
name = "Hot Ramen"
@@ -114,7 +114,7 @@
/datum/chemical_reaction/dough/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i in 1 to created_volume)
new /obj/item/reagent_containers/food/snacks/dough(location)
new /obj/item/food/snacks/dough(location)
///Cookies by Ume
@@ -129,7 +129,7 @@
/datum/chemical_reaction/cookiedough/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i in 1 to created_volume)
new /obj/item/reagent_containers/food/snacks/cookiedough(location)
new /obj/item/food/snacks/cookiedough(location)
/datum/chemical_reaction/corn_syrup
@@ -183,7 +183,7 @@
/datum/chemical_reaction/weird_cheese/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i in 1 to created_volume)
new /obj/item/reagent_containers/food/snacks/weirdcheesewedge(location)
new /obj/item/food/snacks/weirdcheesewedge(location)
/datum/chemical_reaction/hydrogenated_soybeanoil
name = "Partially hydrogenated space-soybean oil"
code/modules/reagents/chemistry/recipes/others.dm
+1 -1
View File
@@ -263,7 +263,7 @@
/datum/chemical_reaction/meatification/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
new /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct(location)
new /obj/item/food/snacks/meat/slab/meatproduct(location)
/datum/chemical_reaction/lye
name = "lye"
code/modules/reagents/chemistry/recipes/slime_extracts.dm
+50 -48
View File
@@ -38,7 +38,7 @@
/datum/chemical_reaction/slimemonkey/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
for(var/i = 1, i <= 3, i++)
var/obj/item/reagent_containers/food/snacks/monkeycube/M = new /obj/item/reagent_containers/food/snacks/monkeycube
var/obj/item/food/snacks/monkeycube/M = new /obj/item/food/snacks/monkeycube
M.forceMove(get_turf(holder.my_atom))
//Green
@@ -147,37 +147,39 @@
/datum/chemical_reaction/slimebork/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
var/list/blocked = list(/obj/item/reagent_containers/food/snacks,
/obj/item/reagent_containers/food/snacks/breadslice,
/obj/item/reagent_containers/food/snacks/sliceable,
/obj/item/reagent_containers/food/snacks/sliceable/pizza,
/obj/item/reagent_containers/food/snacks/margheritapizzaslice,
/obj/item/reagent_containers/food/snacks/meatpizzaslice,
/obj/item/reagent_containers/food/snacks/mushroompizzaslice,
/obj/item/reagent_containers/food/snacks/vegetablepizzaslice,
/obj/item/reagent_containers/food/snacks/cheesepizzaslice,
/obj/item/reagent_containers/food/snacks/garlicpizzaslice,
/obj/item/reagent_containers/food/snacks/donkpocketpizzaslice,
/obj/item/reagent_containers/food/snacks/dankpizzaslice,
/obj/item/reagent_containers/food/snacks/macpizzaslice,
/obj/item/reagent_containers/food/snacks/firecrackerpizzaslice,
/obj/item/reagent_containers/food/snacks/pestopizzaslice,
/obj/item/reagent_containers/food/snacks/pepperonipizzaslice,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat/slab,
/obj/item/reagent_containers/food/snacks/grown,
/obj/item/reagent_containers/food/snacks/grown/shell,
/obj/item/reagent_containers/food/snacks/grown/mushroom,
/obj/item/reagent_containers/food/snacks/deepfryholder,
/obj/item/reagent_containers/food/snacks/chinese,
/obj/item/reagent_containers/food/snacks/human,
/obj/item/reagent_containers/food/snacks/monstermeat,
/obj/item/reagent_containers/food/snacks/meatsteak/stimulating,
/obj/item/reagent_containers/food/snacks/egg/watcher
)
blocked |= typesof(/obj/item/reagent_containers/food/snacks/customizable)
var/list/borks = typesof(/obj/item/reagent_containers/food/snacks) - blocked
var/list/blocked = list(
/obj/item/food/snacks,
/obj/item/food/snacks/breadslice,
/obj/item/food/snacks/sliceable,
/obj/item/food/snacks/sliceable/pizza,
/obj/item/food/snacks/margheritapizzaslice,
/obj/item/food/snacks/meatpizzaslice,
/obj/item/food/snacks/mushroompizzaslice,
/obj/item/food/snacks/vegetablepizzaslice,
/obj/item/food/snacks/cheesepizzaslice,
/obj/item/food/snacks/garlicpizzaslice,
/obj/item/food/snacks/donkpocketpizzaslice,
/obj/item/food/snacks/dankpizzaslice,
/obj/item/food/snacks/macpizzaslice,
/obj/item/food/snacks/firecrackerpizzaslice,
/obj/item/food/snacks/pestopizzaslice,
/obj/item/food/snacks/pepperonipizzaslice,
/obj/item/food/snacks/meat,
/obj/item/food/snacks/meat/slab,
/obj/item/food/snacks/grown,
/obj/item/food/snacks/grown/shell,
/obj/item/food/snacks/grown/mushroom,
/obj/item/food/snacks/deepfryholder,
/obj/item/food/snacks/chinese,
/obj/item/food/snacks/human,
/obj/item/food/snacks/monstermeat,
/obj/item/food/snacks/meatsteak/stimulating,
/obj/item/food/snacks/egg/watcher
)
blocked |= typesof(/obj/item/food/snacks/customizable)
var/list/borks = typesof(/obj/item/food/snacks) - blocked
// BORK BORK BORK
playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
@@ -207,24 +209,24 @@
/datum/chemical_reaction/slimebork2/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
var/list/borks = subtypesof(/obj/item/reagent_containers/food/drinks)
var/list/blocked = list(/obj/item/reagent_containers/food/drinks/cans/adminbooze,
/obj/item/reagent_containers/food/drinks/cans/madminmalt,
/obj/item/reagent_containers/food/drinks/shaker,
/obj/item/reagent_containers/food/drinks/britcup,
/obj/item/reagent_containers/food/drinks/sillycup,
/obj/item/reagent_containers/food/drinks/cans,
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
/obj/item/reagent_containers/food/drinks/drinkingglass,
/obj/item/reagent_containers/food/drinks/bottle,
/obj/item/reagent_containers/food/drinks/everfull,
/obj/item/reagent_containers/food/drinks/bottle/dragonsbreath,
/obj/item/reagent_containers/food/drinks/bottle/immortality,
/obj/item/reagent_containers/food/drinks/mushroom_bowl
var/list/borks = subtypesof(/obj/item/reagent_containers/drinks)
var/list/blocked = list(/obj/item/reagent_containers/drinks/cans/adminbooze,
/obj/item/reagent_containers/drinks/cans/madminmalt,
/obj/item/reagent_containers/drinks/shaker,
/obj/item/reagent_containers/drinks/britcup,
/obj/item/reagent_containers/drinks/sillycup,
/obj/item/reagent_containers/drinks/cans,
/obj/item/reagent_containers/drinks/drinkingglass/shotglass,
/obj/item/reagent_containers/drinks/drinkingglass,
/obj/item/reagent_containers/drinks/bottle,
/obj/item/reagent_containers/drinks/everfull,
/obj/item/reagent_containers/drinks/bottle/dragonsbreath,
/obj/item/reagent_containers/drinks/bottle/immortality,
/obj/item/reagent_containers/drinks/mushroom_bowl
)
blocked += typesof(/obj/item/reagent_containers/food/drinks/flask)
blocked += typesof(/obj/item/reagent_containers/food/drinks/trophy)
blocked += typesof(/obj/item/reagent_containers/food/drinks/cans/bottler)
blocked += typesof(/obj/item/reagent_containers/drinks/flask)
blocked += typesof(/obj/item/reagent_containers/drinks/trophy)
blocked += typesof(/obj/item/reagent_containers/drinks/cans/bottler)
borks -= blocked
// BORK BORK BORK
code/modules/reagents/reagent_containers.dm
-1
View File
@@ -57,7 +57,6 @@
if(!QDELETED(src))
..()
/obj/item/reagent_containers/proc/add_lid()
if(has_lid)
container_type ^= REFILLABLE | DRAINABLE
code/modules/reagents/reagent_containers/chemical_bottle.dm
+1 -1
View File
@@ -1,4 +1,4 @@
//Not to be confused with /obj/item/reagent_containers/food/drinks/bottle
//Not to be confused with /obj/item/reagent_containers/drinks/bottle
/obj/item/reagent_containers/glass/bottle
code/modules/reagents/reagent_containers/dropper.dm
+1 -1
View File
@@ -72,7 +72,7 @@
return
if(reagents.total_volume)
if(!target.is_open_container() && !(istype(target, /obj/item/reagent_containers/food) && !ispill(target)) && !istype(target, /obj/item/clothing/mask/cigarette))
if(!target.is_open_container() && !(isfood(target) && !ispill(target)) && !istype(target, /obj/item/clothing/mask/cigarette))
to_chat(user, "<span class='warning'>You cannot directly fill this object.</span>")
return
code/modules/reagents/reagent_containers/syringes.dm
+1 -1
View File
@@ -136,7 +136,7 @@
add_attack_logs(user, L, "Injected with [name] containing [contained], transfered [amount_per_transfer_from_this] units", reagents.harmless_helper() ? ATKLOG_ALMOSTALL : null)
if(istype(target, /obj/item/reagent_containers/food))
if(isfood(target))
var/list/chemicals = list()
for(var/datum/reagent/chem in reagents.reagent_list)
code/modules/reagents/reagent_dispenser.dm
+1 -1
View File
@@ -256,7 +256,7 @@
to_chat(user, "<span class='warning'>There aren't any cups left!</span>")
return
user.visible_message("<span class='notice'>[user] takes a cup from [src].</span>", "<span class='notice'>You take a paper cup from [src].</span>")
var/obj/item/reagent_containers/food/drinks/sillycup/S = new(get_turf(src))
var/obj/item/reagent_containers/drinks/sillycup/S = new(get_turf(src))
user.put_in_hands(S)
paper_cups--