cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Virology Fixes (#11254)

Browse Source 
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-07-26 19:51:45 -07:00
committed by GitHub
parent 4afce892c6
commit 66424e44b2
7 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/datums/diseases/_disease.dm
View File

@@ -60,6 +60,9 @@ GLOBAL_LIST_INIT(diseases, subtypesof(/datum/disease))
if(global_flag_check(virus_modifiers, CARRIER) && !cure) if(global_flag_check(virus_modifiers, CARRIER) && !cure)
return FALSE return FALSE
if(global_flag_check(virus_modifiers, DORMANT))
return FALSE
if(!global_flag_check(virus_modifiers, PROCESSING)) if(!global_flag_check(virus_modifiers, PROCESSING))
virus_modifiers |= PROCESSING virus_modifiers |= PROCESSING
Start() Start()
@@ -184,6 +187,7 @@ GLOBAL_LIST_INIT(diseases, subtypesof(/datum/disease))
/datum/disease/proc/Copy() /datum/disease/proc/Copy()
var/datum/disease/D = new type() var/datum/disease/D = new type()
D.strain_data = strain_data.Copy() D.strain_data = strain_data.Copy()
D.virus_modifiers = virus_modifiers
return D return D
/datum/disease/proc/GetDiseaseID() /datum/disease/proc/GetDiseaseID()

2
code/datums/diseases/advance/advance.dm
View File

@@ -58,8 +58,6 @@ GLOBAL_LIST_INIT(advance_cures, list(
/datum/disease/advance/stage_act() /datum/disease/advance/stage_act()
if(!..()) if(!..())
return FALSE return FALSE
if(global_flag_check(virus_modifiers, DORMANT))
return FALSE
if(symptoms && length(symptoms)) if(symptoms && length(symptoms))
if(!s_processing) if(!s_processing)

8
code/datums/diseases/advance/disease_preset.dm
View File

@@ -51,10 +51,10 @@
if(SPECIES_UNATHI, SPECIES_TAJARAN) // Mice devourers if(SPECIES_UNATHI, SPECIES_TAJARAN) // Mice devourers
sickrisk = 0.5 sickrisk = 0.5
if(SPECIES_XENOCHIMERA) if(SPECIES_XENOCHIMERA)
var/datum/disease/advance/dormant_roanoake = new /datum/disease/roanoake var/datum/disease/roanoke/dormant_roanoke = new
dormant_roanoake.virus_modifiers |= DORMANT dormant_roanoke.virus_modifiers |= DORMANT
ForceContractDisease(dormant_roanoake, TRUE) ForceContractDisease(dormant_roanoke, TRUE)
return return TRUE
if(SPECIES_PROMETHEAN) // Too clean if(SPECIES_PROMETHEAN) // Too clean
return return

2
code/datums/diseases/advance/symptoms/blobspores.dm
View File

@@ -90,7 +90,7 @@ BONUS
ready_to_pop = TRUE ready_to_pop = TRUE
/datum/symptom/blobspores/OnDeath(datum/disease/advance/A) /datum/symptom/blobspores/OnDeath(datum/disease/advance/A)
if(neutered) if(!..())
return return
var/mob/living/M = A.affected_mob var/mob/living/M = A.affected_mob
M.visible_message(span_danger("[M] starts swelling grotesquely!")) M.visible_message(span_danger("[M] starts swelling grotesquely!"))

12
code/datums/diseases/roanoake.dm → code/datums/diseases/roanoke.dm
View File

@@ -1,6 +1,6 @@
/datum/disease/roanoake /datum/disease/roanoke
name = "Roanoake Syndrome" name = "Roanoke Syndrome"
medical_name = "Roanoake Syndrome" medical_name = "Roanoke Syndrome"
max_stages = 6 max_stages = 6
stage_prob = 2 stage_prob = 2
spread_text = "Blood and close contact" spread_text = "Blood and close contact"
@@ -18,13 +18,13 @@
var/list/obj/item/organ/organ_list = list() var/list/obj/item/organ/organ_list = list()
var/obj/item/organ/O var/obj/item/organ/O
/datum/disease/roanoake/Start() /datum/disease/roanoke/Start()
var/mob/living/carbon/human/M = affected_mob var/mob/living/carbon/human/M = affected_mob
organ_list += M.organs organ_list += M.organs
organ_list += M.internal_organs organ_list += M.internal_organs
/datum/disease/roanoake/stage_act() /datum/disease/roanoke/stage_act()
if(!..()) if(!..())
return FALSE return FALSE
var/mob/living/carbon/human/M = affected_mob var/mob/living/carbon/human/M = affected_mob
@@ -88,6 +88,6 @@
cure() cure()
return return
/datum/disease/roanoake/proc/fever(var/mob/living/M, var/datum/disease/D) /datum/disease/roanoke/proc/fever(var/mob/living/M, var/datum/disease/D)
M.bodytemperature = min(M.bodytemperature + (2 * stage), BODYTEMP_HEAT_DAMAGE_LIMIT - 1) M.bodytemperature = min(M.bodytemperature + (2 * stage), BODYTEMP_HEAT_DAMAGE_LIMIT - 1)
return TRUE return TRUE

2
code/game/objects/items/devices/extrapolator.dm
View File

@@ -171,7 +171,7 @@
for(var/datum/symptom/symptom in advance_disease.symptoms) for(var/datum/symptom/symptom in advance_disease.symptoms)
message += "[symptom.name]" message += "[symptom.name]"
else else
message += span_info("<b>[disease.name]</b>, stage [disease.stage]/[disease.max_stages].") message += span_info("<b>[disease.name]</b>, [global_flag_check(disease.virus_modifiers, DORMANT) ? "<i>dormant virus</i>" : "stage [disease.stage]/[disease.max_stages]"].")
disease.addToDB() disease.addToDB()

2
vorestation.dme
View File

@@ -646,7 +646,7 @@
#include "code\datums\diseases\gbs.dm" #include "code\datums\diseases\gbs.dm"
#include "code\datums\diseases\lycancoughy.dm" #include "code\datums\diseases\lycancoughy.dm"
#include "code\datums\diseases\magnitis.dm" #include "code\datums\diseases\magnitis.dm"
#include "code\datums\diseases\roanoake.dm" #include "code\datums\diseases\roanoke.dm"
#include "code\datums\diseases\advance\advance.dm" #include "code\datums\diseases\advance\advance.dm"
#include "code\datums\diseases\advance\disease_preset.dm" #include "code\datums\diseases\advance\disease_preset.dm"
#include "code\datums\diseases\advance\symptoms\blobspores.dm" #include "code\datums\diseases\advance\symptoms\blobspores.dm"