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

Merge pull request #2332 from Cameron653/master

Browse Source 
Makes pierce damage heal correctly when bandaged
This commit is contained in:
Yoshax
2016-08-16 19:15:01 +01:00
committed by GitHub
parent 9b6684cf1a 995ae56dfe
commit c160b88f57
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/organs/wound.dm
View File

@@ -92,7 +92,7 @@
// checks whether the wound has been appropriately treated // checks whether the wound has been appropriately treated
proc/is_treated() proc/is_treated()
if(damage_type == BRUISE || damage_type == CUT) if(damage_type == BRUISE || damage_type == CUT || damage_type == PIERCE)
return bandaged return bandaged
else if(damage_type == BURN) else if(damage_type == BURN)
return salved return salved
@@ -398,4 +398,4 @@ datum/wound/puncture/massive
..(damage_amt) ..(damage_amt)
/datum/wound/lost_limb/can_merge(var/datum/wound/other) /datum/wound/lost_limb/can_merge(var/datum/wound/other)
return 0 //cannot be merged return 0 //cannot be merged