Merge branch 'master' into protean-rework

This commit is contained in:
BlackMajor
2022-10-01 19:58:22 +13:00
committed by GitHub
383 changed files with 17836 additions and 16174 deletions

View File

@@ -734,7 +734,7 @@ Note that amputating the affected organ does in fact remove the infection from t
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)
if(W.damage <= 0 && W.created + 10 MINUTES <= world.time)
wounds -= W
continue
// let the GC handle the deletion of the wound