Update of master required.

This commit is contained in:
Fermi
2019-05-22 16:50:53 +01:00
parent e86585935f
commit 7cb7f5de73
7 changed files with 225 additions and 181 deletions
+2 -2
View File
@@ -44,7 +44,7 @@
/obj/item/reagent_containers/attack(mob/M, mob/user, def_zone)
if(user.a_intent == INTENT_HARM)
return ..()
/*Checking to see if I can delete this
/obj/item/reagent_containers/attack(obj/item/W, mob/user, params)
..()
if(!istype(W, /obj/item/pHpaper))
@@ -85,7 +85,7 @@
if(-INFINITY to 1)
P.color = "#ef1d26"
P.used = TRUE
*/
/obj/item/reagent_containers/proc/canconsume(mob/eater, mob/user)