Dropper, flour and ration fixes (#3413)

-fixes being able to use dropprs on synth
-fixes flour stacking on the same title
-fixes liquid ration having far less nutriment that it should
This commit is contained in:
Alberyk
2017-09-09 18:59:10 +03:00
committed by Erki
parent 2913e9ca35
commit c5a7bc0361
3 changed files with 7 additions and 1 deletions
@@ -354,6 +354,9 @@
/datum/reagent/nutriment/flour/touch_turf(var/turf/simulated/T)
if(!istype(T, /turf/space))
if(locate(/obj/effect/decal/cleanable/flour) in T)
return
new /obj/effect/decal/cleanable/flour(T)
/datum/reagent/nutriment/coco
@@ -38,6 +38,9 @@
if(istype(target, /mob/living/carbon/human))
var/mob/living/carbon/human/victim = target
if(victim.isSynthetic())
return
var/obj/item/safe_thing = null
if(victim.wear_mask)
if (victim.wear_mask.body_parts_covered & EYES)
@@ -4353,7 +4353,7 @@
filling_color = "#A8A8A8"
center_of_mass = list("x"=16, "y"=15)
nutriment_desc = list("chalk" = 3)
nutriment_amt = 3
nutriment_amt = 10
/obj/item/weapon/reagent_containers/food/snacks/liquidfood/New()
..()