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

Fixes virology timing in a better way (#2124)

Browse Source
This commit is contained in:
CitadelStationBot
2017-07-27 07:30:43 -05:00
committed by kevinz000
parent 5872213462
commit 53dc265b94
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/diseases/advance/symptoms/heal.dm
+7 -7
View File
@@ -58,7 +58,7 @@ Bonus
level = 6
/datum/symptom/heal/toxin/Heal(mob/living/M, datum/disease/advance/A)
var/heal_amt = 0.5 * power
var/heal_amt = 1 * power
if(M.toxloss > 0 && prob(base_message_chance) && !hide_healing)
new /obj/effect/temp_visual/heal(get_turf(M), "#66FF99")
M.adjustToxLoss(-heal_amt)
@@ -89,7 +89,7 @@ Bonus
level = 8
/datum/symptom/heal/toxin/plus/Heal(mob/living/M, datum/disease/advance/A)
var/heal_amt = 1 * power
var/heal_amt = 2 * power
if(M.toxloss > 0 && prob(base_message_chance) && !hide_healing)
new /obj/effect/temp_visual/heal(get_turf(M), "#00FF00")
M.adjustToxLoss(-heal_amt)
@@ -122,7 +122,7 @@ Bonus
level = 6
/datum/symptom/heal/brute/Heal(mob/living/carbon/M, datum/disease/advance/A)
var/heal_amt = 1 * power
var/heal_amt = 2 * power
var/list/parts = M.get_damaged_bodyparts(1,1) //1,1 because it needs inputs.
@@ -165,7 +165,7 @@ Bonus
level = 8
/datum/symptom/heal/brute/plus/Heal(mob/living/carbon/M, datum/disease/advance/A)
var/heal_amt = 2 * power
var/heal_amt = 4 * power
var/list/parts = M.get_damaged_bodyparts(1,1) //1,1 because it needs inputs.
@@ -214,7 +214,7 @@ Bonus
level = 6
/datum/symptom/heal/burn/Heal(mob/living/carbon/M, datum/disease/advance/A)
var/heal_amt = 1 * power
var/heal_amt = 2 * power
var/list/parts = M.get_damaged_bodyparts(1,1) //1,1 because it needs inputs.
@@ -256,7 +256,7 @@ Bonus
level = 8
/datum/symptom/heal/burn/plus/Heal(mob/living/carbon/M, datum/disease/advance/A)
var/heal_amt = 2 * power
var/heal_amt = 4 * power
var/list/parts = M.get_damaged_bodyparts(1,1) //1,1 because it needs inputs.
@@ -306,7 +306,7 @@ Bonus
symptom_delay_max = 8
/datum/symptom/heal/dna/Heal(mob/living/carbon/M, datum/disease/advance/A)
var/amt_healed = 1 * power
var/amt_healed = 2 * power
M.adjustBrainLoss(-amt_healed)
//Non-power mutations, excluding race, so the virus does not force monkey -> human transformations.
var/list/unclean_mutations = (GLOB.not_good_mutations|GLOB.bad_mutations) - GLOB.mutations_list[RACEMUT]
code/datums/diseases/advance/symptoms/oxygen.dm
+2 -2
View File
@@ -39,8 +39,8 @@ Bonus
var/mob/living/carbon/M = A.affected_mob
switch(A.stage)
if(4, 5)
M.adjustOxyLoss(-3, 0)
M.losebreath = max(0, M.losebreath - 2)
M.adjustOxyLoss(-7, 0)
M.losebreath = max(0, M.losebreath - 4)
if(regenerate_blood && M.blood_volume < BLOOD_VOLUME_NORMAL)
M.blood_volume += 1
else
code/datums/diseases/advance/symptoms/symptoms.dm
+4 -5
View File
@@ -18,7 +18,7 @@
//If the early warnings are suppressed or not
var/suppress_warning = FALSE
//Ticks between each activation
var/symptom_counter = 0
var/next_activation = 0
var/symptom_delay_min = 1
var/symptom_delay_max = 1
//Can be used to multiply virus effects
@@ -36,7 +36,7 @@
// Called when processing of the advance disease, which holds this symptom, starts.
/datum/symptom/proc/Start(datum/disease/advance/A)
symptom_counter = rand(symptom_delay_min, symptom_delay_max)
next_activation = world.time + rand(symptom_delay_min * 10, symptom_delay_max * 10) //so it doesn't instantly activate on infection
return
// Called when the advance disease is going to be deleted or when the advance disease stops processing.
@@ -46,11 +46,10 @@
/datum/symptom/proc/Activate(datum/disease/advance/A)
if(neutered)
return FALSE
if(symptom_counter)
symptom_counter--
if(world.time < next_activation)
return FALSE
else
symptom_counter = rand(symptom_delay_min, symptom_delay_max)
next_activation = world.time + rand(symptom_delay_min * 10, symptom_delay_max * 10)
return TRUE
/datum/symptom/proc/Copy()