From 9e095bf360b4ec281244057be6b6f460e94f1f94 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Thu, 5 Nov 2015 08:01:26 -0500 Subject: [PATCH] Bloody Mess Fix --- code/_onclick/item_attack.dm | 4 ++-- code/game/machinery/doors/door.dm | 4 ++-- code/game/turfs/simulated.dm | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index afb2ca35a73..9ab4aa159d0 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -158,9 +158,9 @@ M.take_organ_damage(power) if (prob(33)) // Added blood for whacking non-humans too - var/turf/location = M.loc + var/turf/simulated/location = M.loc if (istype(location, /turf/simulated)) - location:add_blood_floor(M) + location.add_blood_floor(M) if("fire") if (!(RESIST_COLD in M.mutations)) M.take_organ_damage(0, power) diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 08d8cab4438..8912d68247f 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -266,9 +266,9 @@ L.Weaken(5) else //for simple_animals & borgs L.adjustBruteLoss(DOOR_CRUSH_DAMAGE) - var/turf/location = src.loc + var/turf/simulated/location = src.loc if(istype(location, /turf/simulated)) //add_blood doesn't work for borgs/xenos, but add_blood_floor does. - location.add_blood(L) + location.add_blood_floor(L) /obj/machinery/door/proc/requiresID() return 1 diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm index 9d33e96382d..10d764badb4 100644 --- a/code/game/turfs/simulated.dm +++ b/code/game/turfs/simulated.dm @@ -149,6 +149,8 @@ // Only adds blood on the floor -- Skie /turf/simulated/proc/add_blood_floor(mob/living/carbon/M as mob) + if(ishuman(M)) + blood_splatter(src,M,1) if( istype(M, /mob/living/carbon/alien )) var/obj/effect/decal/cleanable/blood/xeno/this = new /obj/effect/decal/cleanable/blood/xeno(src) this.blood_DNA["UNKNOWN BLOOD"] = "X*"