From 7e2546827f36e176dc5da6fccc27079578992ad2 Mon Sep 17 00:00:00 2001 From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Thu, 20 Aug 2020 12:06:18 +0100 Subject: [PATCH] Restores ability to set transfer amount on glasses --- code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm | 4 ++++ code/modules/food_and_drinks/food.dm | 1 + code/modules/food_and_drinks/food/condiment.dm | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm index 5f13f5c7a06..8313b967722 100644 --- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm +++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm @@ -13,6 +13,10 @@ max_integrity = 20 resistance_flags = ACID_PROOF +/obj/item/reagent_containers/food/drinks/set_APTFT() + set hidden = FALSE + ..() + /obj/item/reagent_containers/food/drinks/drinkingglass/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/reagent_containers/food/snacks/egg)) //breaking eggs var/obj/item/reagent_containers/food/snacks/egg/E = I diff --git a/code/modules/food_and_drinks/food.dm b/code/modules/food_and_drinks/food.dm index 2180f9a0f63..15e28cc6c62 100644 --- a/code/modules/food_and_drinks/food.dm +++ b/code/modules/food_and_drinks/food.dm @@ -35,6 +35,7 @@ /obj/item/reagent_containers/food/set_APTFT() set hidden = TRUE + ..() /obj/item/reagent_containers/food/proc/check_for_ants() if(!antable) diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm index bdeadf2a72c..733ac4692a3 100644 --- a/code/modules/food_and_drinks/food/condiment.dm +++ b/code/modules/food_and_drinks/food/condiment.dm @@ -29,6 +29,10 @@ /obj/item/reagent_containers/food/condiment/attack_self(mob/user) return +/obj/item/reagent_containers/food/condiment/set_APTFT() + set hidden = FALSE + ..() + /obj/item/reagent_containers/food/condiment/attack(mob/M, mob/user, def_zone) if(!reagents || !reagents.total_volume)