IPC bleeding v2

This commit is contained in:
Aurorablade
2018-04-22 00:21:48 -04:00
parent 1aa28c5d71
commit 72a3c66cf5
9 changed files with 31 additions and 11 deletions
+2 -2
View File
@@ -1,4 +1,4 @@
/****************************************************
F/****************************************************
BLOOD SYSTEM
****************************************************/
@@ -64,7 +64,7 @@
var/obj/item/organ/external/BP = X
var/brutedamage = BP.brute_dam
if(BP.status & ORGAN_ROBOT)
if((BP.status & ORGAN_ROBOT) && !isSynthetic())
continue
//We want an accurate reading of .len
+1 -1
View File
@@ -83,7 +83,7 @@
if(!breath || (breath.total_moles() == 0))
if(H.health >= config.health_threshold_crit)
H.adjustOxyLoss(HUMAN_MAX_OXYLOSS)
else
else if(!(NOCRITDAMAGE in H.species.species_traits))
H.adjustOxyLoss(HUMAN_CRIT_MAX_OXYLOSS)
H.failed_last_breath = TRUE
+3
View File
@@ -205,6 +205,9 @@
if(!affected)
return -1
if(target.bleed_rate > 1)//heal bleeding if it exists while we are here.
target.bleed_rate = 0
if(implement_type in implements_heal_burn)
current_type = "burn"
var/obj/item/stack/cable_coil/C = tool