Merge pull request #14121 from AffectedArc07/restores-glass-transfer

Restores ability to set transfer amount on glasses
This commit is contained in:
variableundefined
2020-08-28 14:14:42 -04:00
committed by GitHub
3 changed files with 9 additions and 0 deletions
@@ -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
+1
View File
@@ -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)
@@ -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)