Merge branch 'master' into development

# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_xeno.dm
#	code/modules/customitems/item_defines.dm
This commit is contained in:
skull132
2017-09-09 21:38:02 +03:00
79 changed files with 1476 additions and 907 deletions

View File

@@ -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)

View File

@@ -4351,7 +4351,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/Initialize()
. = ..()