Merge branch 'master' into development

# Conflicts:
#	code/modules/admin/admin_verbs.dm
This commit is contained in:
skull132
2017-02-07 21:00:23 +02:00
11 changed files with 119 additions and 58 deletions
@@ -71,6 +71,9 @@ var/global/list/image/splatter_cache=list()
if(amount < 1)
return
if (!blood_DNA || !islist(blood_DNA))
blood_DNA = list()
var/obj/item/organ/external/l_foot = perp.get_organ("l_foot")
var/obj/item/organ/external/r_foot = perp.get_organ("r_foot")
var/hasfeet = 1