mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-28 14:37:04 +01:00
Merge pull request #14780 from farie82/virus-cure-fix
Makes advanced viruses not runtime when they are cured
This commit is contained in:
@@ -75,7 +75,7 @@ GLOBAL_LIST_INIT(diseases, subtypesof(/datum/disease))
|
||||
var/cure = has_cure()
|
||||
|
||||
if(carrier && !cure)
|
||||
return
|
||||
return TRUE
|
||||
|
||||
stage = min(stage, max_stages)
|
||||
|
||||
@@ -89,6 +89,8 @@ GLOBAL_LIST_INIT(diseases, subtypesof(/datum/disease))
|
||||
if(disease_flags & CURABLE)
|
||||
if(cure && prob(cure_chance))
|
||||
cure()
|
||||
return FALSE
|
||||
return TRUE
|
||||
|
||||
|
||||
/datum/disease/proc/has_cure()
|
||||
|
||||
@@ -69,7 +69,8 @@ GLOBAL_LIST_INIT(advance_cures, list(
|
||||
|
||||
// Randomly pick a symptom to activate.
|
||||
/datum/disease/advance/stage_act()
|
||||
..()
|
||||
if(!..())
|
||||
return FALSE
|
||||
if(symptoms && symptoms.len)
|
||||
|
||||
if(!processing)
|
||||
@@ -81,6 +82,7 @@ GLOBAL_LIST_INIT(advance_cures, list(
|
||||
S.Activate(src)
|
||||
else
|
||||
CRASH("We do not have any symptoms during stage_act()!")
|
||||
return TRUE
|
||||
|
||||
// Compares type then ID.
|
||||
/datum/disease/advance/IsSame(datum/disease/advance/D)
|
||||
|
||||
Reference in New Issue
Block a user