cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-14 11:52:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update symptoms.dm

Browse Source
This commit is contained in:
LetterJay
2017-10-08 22:38:01 -05:00
committed by GitHub
parent 73bbc4d4f9
commit 2333f5ee11
1 changed files with 20 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/datums/diseases/advance/symptoms/symptoms.dm
View File

@@ -33,21 +33,6 @@
var/list/S = SSdisease.list_symptoms var/list/S = SSdisease.list_symptoms
for(var/i = 1; i <= S.len; i++) for(var/i = 1; i <= S.len; i++)
if(type == S[i]) if(type == S[i])
<<<<<<< HEAD
id = "[i]"
return
CRASH("We couldn't assign an ID!")
// Called when processing of the advance disease, which holds this symptom, starts.
/datum/symptom/proc/Start(datum/disease/advance/A)
next_activation = world.time + rand(symptom_delay_min * 10, symptom_delay_max * 10) //so it doesn't instantly activate on infection
// Called when the advance disease is going to be deleted or when the advance disease stops processing.
/datum/symptom/proc/End(datum/disease/advance/A)
return
/datum/symptom/proc/Activate(datum/disease/advance/A)
=======
id = "[i]" id = "[i]"
return return
CRASH("We couldn't assign an ID!") CRASH("We couldn't assign an ID!")
@@ -66,7 +51,6 @@
return TRUE return TRUE
/datum/symptom/proc/Activate(datum/disease/advance/A) /datum/symptom/proc/Activate(datum/disease/advance/A)
>>>>>>> 1940af0... Fixes Start() of symptoms still working when neutered (#31435)
if(neutered) if(neutered)
return FALSE return FALSE
if(world.time < next_activation) if(world.time < next_activation)