Bloody Mess Fix

This commit is contained in:
Fox-McCloud
2015-11-05 08:01:26 -05:00
parent 736baf3890
commit 9e095bf360
3 changed files with 6 additions and 4 deletions
+2 -2
View File
@@ -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)
+2 -2
View File
@@ -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
+2
View File
@@ -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*"