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

Merge pull request #3024 from Cameron653/master

Browse Source 
Prevents halloss showing up as actual wounds on self examine
This commit is contained in:
Anewbe
2017-03-01 15:03:44 -06:00
committed by GitHub
parent 561f10bced 073d8b4fc4
commit 8af4c2ba46
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/mob/living/carbon/carbon.dm
View File

@@ -166,11 +166,13 @@
var/list/status = list() var/list/status = list()
var/brutedamage = org.brute_dam var/brutedamage = org.brute_dam
var/burndamage = org.burn_dam var/burndamage = org.burn_dam
if(halloss > 0) /*
if(halloss > 0) //Makes halloss show up as actual wounds on self examine.
if(prob(30)) if(prob(30))
brutedamage += halloss brutedamage += halloss
if(prob(30)) if(prob(30))
burndamage += halloss burndamage += halloss
*/
switch(brutedamage) switch(brutedamage)
if(1 to 20) if(1 to 20)
status += "bruised" status += "bruised"
@@ -460,4 +462,4 @@
/mob/living/carbon/can_feel_pain(var/check_organ) /mob/living/carbon/can_feel_pain(var/check_organ)
if(isSynthetic()) if(isSynthetic())
return 0 return 0
return !(species.flags & NO_PAIN) return !(species.flags & NO_PAIN)