cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-23 20:16:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Should stop robolimbs bleeding.

Browse Source
This commit is contained in:
Chinsky
2013-01-23 02:47:37 +04:00
parent 510dac274b
commit d0ae053098
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/organs/organ_external.dm
+4 -3
View File
@@ -175,7 +175,7 @@
else if(W.damage_type == BURN)
burn_dam += W.damage
if(W.bleeding())
if(!(status & ORGAN_ROBOT) && W.bleeding())
status |= ORGAN_BLEEDING
number_wounds += W.amount
@@ -490,7 +490,8 @@
switch(type)
if(CUT)
src.status |= ORGAN_BLEEDING
if(!(status & ORGAN_ROBOT))
src.status |= ORGAN_BLEEDING
var/list/size_names = list(/datum/wound/cut, /datum/wound/deep_cut, /datum/wound/flesh_wound, /datum/wound/gaping_wound, /datum/wound/big_gaping_wound, /datum/wound/massive_wound)
wound_type = size_names[size]
@@ -509,7 +510,7 @@
// Possibly trigger an internal wound, too.
var/local_damage = brute_dam + burn_dam + damage
if(damage > 10 && type != BURN && local_damage > 20 && prob(damage))
if(damage > 10 && type != BURN && local_damage > 20 && prob(damage) && !(status & ORGAN_ROBOT))
var/datum/wound/internal_bleeding/I = new (15)
wounds += I
owner.custom_pain("You feel something rip in your [display_name]!", 1)