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

Fixes Start() of symptoms still working when neutered

Browse Source
This commit is contained in:
XDTM
2017-10-09 02:10:17 +02:00
committed by CitadelStationBot
parent 1f349aeccc
commit 6e24ca43be
24 changed files with 138 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/diseases/advance/symptoms/choking.dm
+10
View File
@@ -32,7 +32,12 @@ Bonus
<b>Stealth 4:</b> The symptom remains hidden until active."
/datum/symptom/choking/Start(datum/disease/advance/A)
<<<<<<< HEAD
..()
=======
if(!..())
return
>>>>>>> 1940af0... Fixes Start() of symptoms still working when neutered (#31435)
if(A.properties["stage_rate"] >= 8)
symptom_delay_min = 7
symptom_delay_max = 24
@@ -100,7 +105,12 @@ Bonus
var/paralysis = FALSE
/datum/symptom/asphyxiation/Start(datum/disease/advance/A)
<<<<<<< HEAD
..()
=======
if(!..())
return
>>>>>>> 1940af0... Fixes Start() of symptoms still working when neutered (#31435)
if(A.properties["stage_rate"] >= 8)
paralysis = TRUE
if(A.properties["transmission"] >= 8)
code/datums/diseases/advance/symptoms/confusion.dm
+2 -1
View File
@@ -34,7 +34,8 @@ Bonus
<b>Stealth 4:</b> The symptom remains hidden until active."
/datum/symptom/confusion/Start(datum/disease/advance/A)
..()
if(!..())
return
if(A.properties["resistance"] >= 6)
brain_damage = TRUE
if(A.properties["transmittable"] >= 6)
code/datums/diseases/advance/symptoms/cough.dm
+2 -1
View File
@@ -36,7 +36,8 @@ BONUS
<b>Stealth 4:</b> The symptom remains hidden until active."
/datum/symptom/cough/Start(datum/disease/advance/A)
..()
if(!..())
return
if(A.properties["stealth"] >= 4)
suppress_warning = TRUE
if(A.spread_flags &= AIRBORNE) //infect bystanders
code/datums/diseases/advance/symptoms/deafness.dm
+2 -1
View File
@@ -32,7 +32,8 @@ Bonus
<b>Stealth 4:</b> The symptom remains hidden until active."
/datum/symptom/deafness/Start(datum/disease/advance/A)
..()
if(!..())
return
if(A.properties["stealth"] >= 4)
suppress_warning = TRUE
if(A.properties["resistance"] >= 9) //permanent deafness
code/datums/diseases/advance/symptoms/dizzy.dm
+5
View File
@@ -31,7 +31,12 @@ Bonus
<b>Stealth 4:</b> The symptom remains hidden until active."
/datum/symptom/dizzy/Start(datum/disease/advance/A)
<<<<<<< HEAD
..()
=======
if(!..())
return
>>>>>>> 1940af0... Fixes Start() of symptoms still working when neutered (#31435)
if(A.properties["stealth"] >= 4)
suppress_warning = TRUE
if(A.properties["transmittable"] >= 6) //druggy
code/datums/diseases/advance/symptoms/fever.dm
+5
View File
@@ -32,7 +32,12 @@ Bonus
<b>Resistance 10:</b> Further increases fever intensity."
/datum/symptom/fever/Start(datum/disease/advance/A)
<<<<<<< HEAD
..()
=======
if(!..())
return
>>>>>>> 1940af0... Fixes Start() of symptoms still working when neutered (#31435)
if(A.properties["resistance"] >= 5) //dangerous fever
power = 1.5
unsafe = TRUE
code/datums/diseases/advance/symptoms/fire.dm
+4 -2
View File
@@ -35,7 +35,8 @@ Bonus
<b>Stealth 4:</b> The symptom remains hidden until active."
/datum/symptom/fire/Start(datum/disease/advance/A)
..()
if(!..())
return
if(A.properties["stage_rate"] >= 4)
power = 1.5
if(A.properties["stage_rate"] >= 8)
@@ -116,7 +117,8 @@ Bonus
<b>Transmission 8:</b> Additionally synthesizes chlorine trifluoride and napalm inside the host."
/datum/symptom/alkali/Start(datum/disease/advance/A)
..()
if(!..())
return
if(A.properties["resistance"] >= 9) //intense but sporadic effect
power = 2
symptom_delay_min = 50
code/datums/diseases/advance/symptoms/flesh_eating.dm
+10
View File
@@ -34,7 +34,12 @@ Bonus
<b>Transmission 8:</b> Causes extreme pain to the host, weakening it."
/datum/symptom/flesh_eating/Start(datum/disease/advance/A)
<<<<<<< HEAD
..()
=======
if(!..())
return
>>>>>>> 1940af0... Fixes Start() of symptoms still working when neutered (#31435)
if(A.properties["resistance"] >= 7) //extra bleeding
bleed = TRUE
if(A.properties["transmittable"] >= 8) //extra stamina damage
@@ -99,7 +104,12 @@ Bonus
<b>Stealth 5:</b> The symptom remains hidden until active."
/datum/symptom/flesh_death/Start(datum/disease/advance/A)
<<<<<<< HEAD
..()
=======
if(!..())
return
>>>>>>> 1940af0... Fixes Start() of symptoms still working when neutered (#31435)
if(A.properties["stealth"] >= 5)
suppress_warning = TRUE
if(A.properties["stage_rate"] >= 7) //bleeding and hunger
code/datums/diseases/advance/symptoms/genetics.dm
+23
View File
@@ -45,11 +45,20 @@ Bonus
to_chat(C, "<span class='warning'>[pick("Your skin feels itchy.", "You feel light headed.")]</span>")
C.dna.remove_mutation_group(possible_mutations)
for(var/i in 1 to power)
<<<<<<< HEAD
C.randmut(possible_mutations)
// Archive their DNA before they were infected.
/datum/symptom/genetic_mutation/Start(datum/disease/advance/A)
..()
=======
C.randmut(possible_mutations)
// Archive their DNA before they were infected.
/datum/symptom/genetic_mutation/Start(datum/disease/advance/A)
if(!..())
return
>>>>>>> 1940af0... Fixes Start() of symptoms still working when neutered (#31435)
if(A.properties["stealth"] >= 5) //don't restore dna after curing
no_reset = TRUE
if(A.properties["stage_rate"] >= 10) //mutate more often
@@ -57,6 +66,7 @@ Bonus
symptom_delay_max = 60
if(A.properties["resistance"] >= 8) //mutate twice
power = 2
<<<<<<< HEAD
possible_mutations = (GLOB.bad_mutations | GLOB.not_good_mutations) - GLOB.mutations_list[RACEMUT]
var/mob/living/carbon/M = A.affected_mob
if(M)
@@ -66,6 +76,19 @@ Bonus
// Give them back their old DNA when cured.
/datum/symptom/genetic_mutation/End(datum/disease/advance/A)
=======
possible_mutations = (GLOB.bad_mutations | GLOB.not_good_mutations) - GLOB.mutations_list[RACEMUT]
var/mob/living/carbon/M = A.affected_mob
if(M)
if(!M.has_dna())
return
archived_dna = M.dna.struc_enzymes
// Give them back their old DNA when cured.
/datum/symptom/genetic_mutation/End(datum/disease/advance/A)
if(!..())
return
>>>>>>> 1940af0... Fixes Start() of symptoms still working when neutered (#31435)
if(!no_reset)
var/mob/living/carbon/M = A.affected_mob
if(M && archived_dna)
code/datums/diseases/advance/symptoms/hallucigen.dm
+5
View File
@@ -32,7 +32,12 @@ Bonus
<b>Stealth 4:</b> The virus mimics positive symptoms.."
/datum/symptom/hallucigen/Start(datum/disease/advance/A)
<<<<<<< HEAD
..()
=======
if(!..())
return
>>>>>>> 1940af0... Fixes Start() of symptoms still working when neutered (#31435)
if(A.properties["stealth"] >= 4) //fake good symptom messages
fake_healthy = TRUE
base_message_chance = 50
code/datums/diseases/advance/symptoms/headache.dm
+5
View File
@@ -34,7 +34,12 @@ BONUS
<b>Stealth 4:</b> Reduces headache frequency until later stages."
/datum/symptom/headache/Start(datum/disease/advance/A)
<<<<<<< HEAD
..()
=======
if(!..())
return
>>>>>>> 1940af0... Fixes Start() of symptoms still working when neutered (#31435)
if(A.properties["stealth"] >= 4)
base_message_chance = 50
if(A.properties["stage_rate"] >= 6) //severe pain
code/datums/diseases/advance/symptoms/heal.dm
+2 -1
View File
@@ -15,7 +15,8 @@
<b>Stealth 4:</b> Healing will no longer be visible to onlookers."
/datum/symptom/heal/Start(datum/disease/advance/A)
..()
if(!..())
return
if(A.properties["stealth"] >= 4) //invisible healing
hide_healing = TRUE
if(A.properties["stage_rate"] >= 6) //stronger healing
code/datums/diseases/advance/symptoms/itching.dm
+5
View File
@@ -33,7 +33,12 @@ BONUS
<b>Stage Speed 7:</b> The host will scrath itself when itching, causing superficial damage."
/datum/symptom/itching/Start(datum/disease/advance/A)
<<<<<<< HEAD
..()
=======
if(!..())
return
>>>>>>> 1940af0... Fixes Start() of symptoms still working when neutered (#31435)
if(A.properties["transmittable"] >= 6) //itch more often
symptom_delay_min = 1
symptom_delay_max = 4
code/datums/diseases/advance/symptoms/narcolepsy.dm
+2 -1
View File
@@ -30,7 +30,8 @@ Bonus
<b>Resistance 10:</b> Causes narcolepsy more often, increasing the chance of the host falling asleep."
/datum/symptom/narcolepsy/Start(datum/disease/advance/A)
..()
if(!..())
return
if(A.properties["transmittable"] >= 7) //stamina damage
stamina = TRUE
if(A.properties["resistance"] >= 10) //act more often
code/datums/diseases/advance/symptoms/oxygen.dm
+5
View File
@@ -31,7 +31,12 @@ Bonus
threshold_desc = "<b>Resistance 8:</b>Additionally regenerates lost blood.<br>"
/datum/symptom/oxygen/Start(datum/disease/advance/A)
<<<<<<< HEAD
..()
=======
if(!..())
return
>>>>>>> 1940af0... Fixes Start() of symptoms still working when neutered (#31435)
if(A.properties["resistance"] >= 8) //blood regeneration
regenerate_blood = TRUE
code/datums/diseases/advance/symptoms/sensory.dm
+2 -1
View File
@@ -32,7 +32,8 @@ Bonus
<b>Transmission 8:</b> Purges alcohol in the bloodstream."
/datum/symptom/mind_restoration/Start(datum/disease/advance/A)
..()
if(!..())
return
if(A.properties["resistance"] >= 6) //heal brain damage
brain_heal = TRUE
if(A.properties["transmittable"] >= 8) //purge alcohol
code/datums/diseases/advance/symptoms/shivering.dm
+5
View File
@@ -31,7 +31,12 @@ Bonus
<b>Stage Speed 10:</b> Further increases cooling speed."
/datum/symptom/fever/Start(datum/disease/advance/A)
<<<<<<< HEAD
..()
=======
if(!..())
return
>>>>>>> 1940af0... Fixes Start() of symptoms still working when neutered (#31435)
if(A.properties["stage_speed"] >= 5) //dangerous cold
power = 1.5
unsafe = TRUE
code/datums/diseases/advance/symptoms/sneeze.dm
+2 -1
View File
@@ -31,7 +31,8 @@ Bonus
<b>Stealth 4:</b> The symptom remains hidden until active."
/datum/symptom/sneeze/Start(datum/disease/advance/A)
..()
if(!..())
return
if(A.properties["transmittable"] >= 9) //longer spread range
power = 2
if(A.properties["stealth"] >= 4)
code/datums/diseases/advance/symptoms/symptoms.dm
+21
View File
@@ -33,6 +33,7 @@
var/list/S = SSdisease.list_symptoms
for(var/i = 1; i <= S.len; i++)
if(type == S[i])
<<<<<<< HEAD
id = "[i]"
return
CRASH("We couldn't assign an ID!")
@@ -46,6 +47,26 @@
return
/datum/symptom/proc/Activate(datum/disease/advance/A)
=======
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)
if(neutered)
return FALSE
next_activation = world.time + rand(symptom_delay_min * 10, symptom_delay_max * 10) //so it doesn't instantly activate on infection
return TRUE
// 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)
if(neutered)
return FALSE
return TRUE
/datum/symptom/proc/Activate(datum/disease/advance/A)
>>>>>>> 1940af0... Fixes Start() of symptoms still working when neutered (#31435)
if(neutered)
return FALSE
if(world.time < next_activation)
code/datums/diseases/advance/symptoms/viral.dm
+2 -1
View File
@@ -97,7 +97,8 @@ Bonus
A.cure()
/datum/symptom/viralreverse/Start(datum/disease/advance/A)
..()
if(!..())
return
A.stage = 5
if(A.properties["stealth"] >= 4) //more time before it's cured
power = 2
code/datums/diseases/advance/symptoms/vision.dm
+2 -1
View File
@@ -33,7 +33,8 @@ Bonus
<b>Stealth 4:</b> The symptom remains hidden until active."
/datum/symptom/visionloss/Start(datum/disease/advance/A)
..()
if(!..())
return
if(A.properties["stealth"] >= 4)
suppress_warning = TRUE
if(A.properties["resistance"] >= 12) //goodbye eyes
code/datums/diseases/advance/symptoms/voice_change.dm
+5
View File
@@ -36,7 +36,12 @@ Bonus
<b>Stealth 3:</b> The symptom remains hidden until active."
/datum/symptom/voice_change/Start(datum/disease/advance/A)
<<<<<<< HEAD
..()
=======
if(!..())
return
>>>>>>> 1940af0... Fixes Start() of symptoms still working when neutered (#31435)
if(A.properties["stealth"] >= 3)
suppress_warning = TRUE
if(A.properties["stage_rate"] >= 7) //faster change of voice
code/datums/diseases/advance/symptoms/vomit.dm
+2 -1
View File
@@ -39,7 +39,8 @@ Bonus
<b>Stealth 4:</b> The symptom remains hidden until active."
/datum/symptom/vomit/Start(datum/disease/advance/A)
..()
if(!..())
return
if(A.properties["stealth"] >= 4)
suppress_warning = TRUE
if(A.properties["resistance"] >= 7) //blood vomit
code/datums/diseases/advance/symptoms/weight.dm
+10
View File
@@ -31,7 +31,12 @@ Bonus
threshold_desc = "<b>Stealth 4:</b> The symptom is less noticeable."
/datum/symptom/weight_gain/Start(datum/disease/advance/A)
<<<<<<< HEAD
..()
=======
if(!..())
return
>>>>>>> 1940af0... Fixes Start() of symptoms still working when neutered (#31435)
if(A.properties["stealth"] >= 4) //warn less often
base_message_chance = 25
@@ -81,7 +86,12 @@ Bonus
threshold_desc = "<b>Stealth 4:</b> The symptom is less noticeable."
/datum/symptom/weight_loss/Start(datum/disease/advance/A)
<<<<<<< HEAD
..()
=======
if(!..())
return
>>>>>>> 1940af0... Fixes Start() of symptoms still working when neutered (#31435)
if(A.properties["stealth"] >= 4) //warn less often
base_message_chance = 25