cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7539 from mwerezak/shock

Browse Source 
Fixes traumatic_shock affecting species with NO_PAIN
This commit is contained in:
Ccomp5950
2014-12-25 23:15:55 -05:00
parent b808c20828 f8ec11ddb2
commit 899b415511
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
code/modules/mob/living/carbon/human/human_movement.dm
View File

@@ -26,7 +26,16 @@
if(wear_suit) if(wear_suit)
tally += wear_suit.slowdown tally += wear_suit.slowdown
if(!buckled || (buckled && !istype(buckled, /obj/structure/stool/bed/chair/wheelchair))) if(istype(buckled, /obj/structure/stool/bed/chair/wheelchair))
for(var/organ_name in list("l_hand","r_hand","l_arm","r_arm"))
var/datum/organ/external/E = get_organ(organ_name)
if(!E || (E.status & ORGAN_DESTROYED))
tally += 4
if(E.status & ORGAN_SPLINTED)
tally += 0.5
else if(E.status & ORGAN_BROKEN)
tally += 1.5
else
if(shoes) if(shoes)
tally += shoes.slowdown tally += shoes.slowdown
@@ -38,17 +47,7 @@
tally += 0.5 tally += 0.5
else if(E.status & ORGAN_BROKEN) else if(E.status & ORGAN_BROKEN)
tally += 1.5 tally += 1.5
if(buckled && istype(buckled, /obj/structure/stool/bed/chair/wheelchair))
for(var/organ_name in list("l_hand","r_hand","l_arm","r_arm"))
var/datum/organ/external/E = get_organ(organ_name)
if(!E || (E.status & ORGAN_DESTROYED))
tally += 4
if(E.status & ORGAN_SPLINTED)
tally += 0.5
else if(E.status & ORGAN_BROKEN)
tally += 1.5
if(shock_stage >= 10) tally += 3 if(shock_stage >= 10) tally += 3
if(FAT in src.mutations) if(FAT in src.mutations)

4
code/modules/mob/living/carbon/shock.dm
View File

@@ -3,6 +3,10 @@
// proc to find out in how much pain the mob is at the moment // proc to find out in how much pain the mob is at the moment
/mob/living/carbon/proc/updateshock() /mob/living/carbon/proc/updateshock()
if (species && (species.flags & NO_PAIN))
src.traumatic_shock = 0
return 0
src.traumatic_shock = \ src.traumatic_shock = \
1 * src.getOxyLoss() + \ 1 * src.getOxyLoss() + \
0.7 * src.getToxLoss() + \ 0.7 * src.getToxLoss() + \