Merge pull request #13471 from lm40/master

Makes wounds disappear
This commit is contained in:
Novacat
2022-08-10 20:09:51 -04:00
committed by CHOMPStation2
parent 3b71780c21
commit a6bac4271c

View File

@@ -595,6 +595,8 @@ This function completely restores a damaged organ to perfect condition.
return 1
else
last_dam = brute_dam + burn_dam
if (number_wounds != 0)
return 1
if(germ_level)
return 1
return 0
@@ -731,8 +733,8 @@ Note that amputating the affected organ does in fact remove the infection from t
return
for(var/datum/wound/W in wounds)
// wounds can disappear after 10 minutes at the earliest
if(W.damage <= 0 && W.created + 10 * 10 * 60 <= world.time)
// wounds used to be able to disappear after 10 minutes at the earliest, for now just remove them as soon as there is no damage
if(W.damage <= 0)
wounds -= W
continue
// let the GC handle the deletion of the wound