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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-09-10 22:02:24 -04:00
committed by GitHub
parent 207feae563
commit a993b670fe
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -732,11 +732,7 @@ Note that amputating the affected organ does in fact remove the infection from t
for(var/datum/wound/W in wounds) for(var/datum/wound/W in wounds)
// wounds can disappear after 10 minutes at the earliest // wounds can disappear after 10 minutes at the earliest
<<<<<<< HEAD
if(W.damage <= 0 && W.created + 10 * 10 * 60 <= world.time)
=======
if(W.damage <= 0 && W.created + 10 MINUTES <= world.time) if(W.damage <= 0 && W.created + 10 MINUTES <= world.time)
>>>>>>> e1ed0044bb... Merge pull request #13698 from Heroman3003/woundfix
wounds -= W wounds -= W
continue continue
// let the GC handle the deletion of the wound // let the GC handle the deletion of the wound