Skip to content

Commit 3db00e7

Browse files
committed
Remove liquid level checks
1 parent 029351f commit 3db00e7

File tree

2 files changed

+0
-26
lines changed

2 files changed

+0
-26
lines changed

code/modules/reagents/reagent_containers.dm

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -350,13 +350,8 @@
350350
var/trans = reagents.trans_to(target, amount_per_transfer_from_this)
351351
to_chat(user, SPAN_NOTICE("You transfer [trans] units of the solution to [target]."))
352352
on_pour()
353-
if (istype(target, /obj/item/reagent_containers))
354-
var/obj/item/reagent_containers/container = target
355-
container.on_receiving_pour()
356353
return 1
357354

358355
/obj/item/reagent_containers/proc/on_pour()
359356
playsound(src, /singleton/sound_category/generic_pour_sound, 25, 1)
360357

361-
/obj/item/reagent_containers/proc/on_receiving_pour()
362-
return

code/modules/reagents/reagent_containers/food/cans.dm

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,27 +27,6 @@
2727
. += "If it's empty, you can crush it on your forehead by selecting your head and clicking on yourself with harm intent."
2828
. += "You can also crush cans on other people's foreheads as well."
2929

30-
/obj/item/reagent_containers/food/drinks/cans/standard_feed_mob(var/mob/user, var/mob/living/target)
31-
..()
32-
if(reagents && reagents.total_volume > 0) // Handle trash persistency when drinking
33-
persistency_considered_trash = TRUE
34-
else
35-
persistency_considered_trash = FALSE
36-
37-
/obj/item/reagent_containers/food/drinks/cans/standard_pour_into(var/mob/user, var/atom/target)
38-
..()
39-
if(reagents && reagents.total_volume > 0) // Handle trash persistency when pouring out
40-
persistency_considered_trash = TRUE
41-
else
42-
persistency_considered_trash = FALSE
43-
44-
/obj/item/reagent_containers/food/drinks/cans/on_receiving_pour()
45-
..()
46-
if(reagents && reagents.total_volume > 0) // Handle trash persistency when receiving new liquid
47-
persistency_considered_trash = TRUE
48-
else
49-
persistency_considered_trash = FALSE
50-
5130
/obj/item/reagent_containers/food/drinks/cans/persistence_get_content()
5231
var/list/content = list()
5332
content["name"] = name

0 commit comments

Comments
 (0)