shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update choking.dm

Browse Source
This commit is contained in:
LetterJay
2017-10-08 22:38:44 -05:00
committed by GitHub
parent e65943276d
commit d1d671da47
1 changed files with 77 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/diseases/advance/symptoms/choking.dm
-8
View File
@@ -32,12 +32,8 @@ Bonus
<b>Stealth 4:</b> The symptom remains hidden until active." <b>Stealth 4:</b> The symptom remains hidden until active."
/datum/symptom/choking/Start(datum/disease/advance/A) /datum/symptom/choking/Start(datum/disease/advance/A)
<<<<<<< HEAD
..()
=======
if(!..()) if(!..())
return return
>>>>>>> 1940af0... Fixes Start() of symptoms still working when neutered (#31435)
if(A.properties["stage_rate"] >= 8) if(A.properties["stage_rate"] >= 8)
symptom_delay_min = 7 symptom_delay_min = 7
symptom_delay_max = 24 symptom_delay_max = 24
@@ -105,12 +101,8 @@ Bonus
var/paralysis = FALSE var/paralysis = FALSE
/datum/symptom/asphyxiation/Start(datum/disease/advance/A) /datum/symptom/asphyxiation/Start(datum/disease/advance/A)
<<<<<<< HEAD
..()
=======
if(!..()) if(!..())
return return
>>>>>>> 1940af0... Fixes Start() of symptoms still working when neutered (#31435)
if(A.properties["stage_rate"] >= 8) if(A.properties["stage_rate"] >= 8)
paralysis = TRUE paralysis = TRUE
if(A.properties["transmission"] >= 8) if(A.properties["transmission"] >= 8)