cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes non-advanced viruses from being seen in the PANDEMIC [MDB IGNORE] (#19526)

Browse Source 
* Fixes non-advanced viruses from being seen in the PANDEMIC (#73613)

## About The Pull Request

Early continue was blocking traits being added to ui data.

Added some sanity to stop some bluescreens.

## Changelog

🆑 Melbert
fix: Premade viruses (GBS, beesease, etc) now show up in the PANDEMIC
again
fix: PANDEMICs should bluescreen less often. Maybe.
/🆑

* Fixes non-advanced viruses from being seen in the PANDEMIC

---------

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-02-25 16:46:45 -08:00
committed by GitHub
co-authored by MrMelbert
parent 98932b748d
commit bd0ed9c995
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/machinery/pandemic.dm
+15 -16
View File
@@ -308,22 +308,21 @@
traits["index"] = index++
traits["name"] = disease.name
traits["spread"] = disease.spread_text || "none"
if(!istype(disease, /datum/disease/advance)) // Advanced diseases get more info
continue
var/datum/disease/advance/adv_disease = disease
var/disease_name = SSdisease.get_disease_name(adv_disease.GetDiseaseID())
traits["can_rename"] = ((disease_name == "Unknown") && adv_disease.mutable)
traits["is_adv"] = TRUE
traits["name"] = disease_name
traits["resistance"] = adv_disease.totalResistance()
traits["stage_speed"] = adv_disease.totalStageSpeed()
traits["stealth"] = adv_disease.totalStealth()
traits["symptoms"] = list()
for(var/datum/symptom/symptom as anything in adv_disease.symptoms)
var/list/this_symptom = list()
this_symptom = symptom.get_symptom_data()
traits["symptoms"] += list(this_symptom)
traits["transmission"] = adv_disease.totalTransmittable()
if(istype(disease, /datum/disease/advance)) // Advanced diseases get more info
var/datum/disease/advance/adv_disease = disease
var/disease_name = SSdisease.get_disease_name(adv_disease.GetDiseaseID())
traits["can_rename"] = ((disease_name == "Unknown") && adv_disease.mutable)
traits["is_adv"] = TRUE
traits["name"] = disease_name
traits["resistance"] = adv_disease.totalResistance()
traits["stage_speed"] = adv_disease.totalStageSpeed()
traits["stealth"] = adv_disease.totalStealth()
traits["symptoms"] = list()
for(var/datum/symptom/symptom as anything in adv_disease.symptoms)
var/list/this_symptom = list()
this_symptom = symptom.get_symptom_data()
traits["symptoms"] += list(this_symptom)
traits["transmission"] = adv_disease.totalTransmittable()
data += list(traits)
return data
tgui/packages/tgui/interfaces/Pandemic/Specimen.tsx
+2 -1
View File
@@ -56,7 +56,8 @@ const Buttons = (props, context) => {
<Button
icon="flask"
content="Create culture bottle"
disabled={!is_ready}
disabled={!is_ready || !virus}
tooltip={virus ? '' : 'No virus culture found.'}
onClick={() =>
act('create_culture_bottle', {
index: virus.index,