diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index 82099a7532b..5efa1554baf 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -266,7 +266,6 @@ properties["severity"] = round((properties["severity"] / 2), 1) properties["severity"] *= (symptoms.len / VIRUS_SYMPTOM_LIMIT) //fewer symptoms, less severity properties["severity"] = round(clamp(properties["severity"], 1, 7), 1) - properties["capacity"] = get_symptom_weights() // Assign the properties that are in the list. /datum/disease/advance/proc/assign_properties() @@ -342,7 +341,7 @@ // Will generate a random cure, the more resistance the symptoms have, the harder the cure. /datum/disease/advance/proc/generate_cure() if(properties?.len) - var/res = clamp(properties["resistance"] - (symptoms.len * 0.5), 1, advance_cures.len) + var/res = clamp(properties["resistance"] - (symptoms.len / 2), 1, advance_cures.len) if(res == oldres) return cures = list(pick(advance_cures[res])) @@ -405,7 +404,7 @@ /datum/disease/advance/proc/AddSymptom(datum/symptom/S) if(HasSymptom(S)) return - while(get_symptom_weights() + S.weight > VIRUS_SYMPTOM_LIMIT) + if(symptoms.len >= VIRUS_SYMPTOM_LIMIT) RemoveSymptom(pick(symptoms)) symptoms += S S.OnAdd(src) @@ -422,12 +421,6 @@ S.name += " (neutered)" S.OnRemove(src) -/// How much of the symptom capacity is currently being used? -/datum/disease/advance/proc/get_symptom_weights() - . = 0 - for(var/datum/symptom/symptom as anything in symptoms) - . += symptom.weight - /* Static Procs diff --git a/code/datums/diseases/advance/symptoms/cough.dm b/code/datums/diseases/advance/symptoms/cough.dm index 6b46667741c..2648ece75cf 100644 --- a/code/datums/diseases/advance/symptoms/cough.dm +++ b/code/datums/diseases/advance/symptoms/cough.dm @@ -10,7 +10,6 @@ name = "Cough" desc = "The virus irritates the throat of the host, causing occasional coughing. Each cough will try to infect bystanders who are within 1 tile of the host with the virus." illness = "Jest Infection" - weight = 2 stealth = -1 resistance = 3 stage_speed = 1 diff --git a/code/datums/diseases/advance/symptoms/sneeze.dm b/code/datums/diseases/advance/symptoms/sneeze.dm index 0e54bfad385..175c5c3c762 100644 --- a/code/datums/diseases/advance/symptoms/sneeze.dm +++ b/code/datums/diseases/advance/symptoms/sneeze.dm @@ -10,7 +10,6 @@ name = "Sneezing" desc = "The virus causes irritation of the nasal cavity, making the host sneeze occasionally. Sneezes from this symptom will spread the virus in a 4 meter cone in front of the host." illness = "Bard Flu" - weight = 2 stealth = -2 resistance = 3 stage_speed = 0 diff --git a/code/datums/diseases/advance/symptoms/symptoms.dm b/code/datums/diseases/advance/symptoms/symptoms.dm index 5a4331b3c61..28ba45f8de4 100644 --- a/code/datums/diseases/advance/symptoms/symptoms.dm +++ b/code/datums/diseases/advance/symptoms/symptoms.dm @@ -39,8 +39,6 @@ var/naturally_occuring = TRUE ///If the symptom requires an organ for the effects to function, robotic organs are immune to disease unless inorganic biology symptom is present var/required_organ - /// How much space does this symptom use? - var/weight = 1 /datum/symptom/New() var/list/S = SSdisease.list_symptoms @@ -108,7 +106,6 @@ var/list/data = list() data["name"] = name data["desc"] = desc - data["weight"] = weight data["stealth"] = stealth data["resistance"] = resistance data["stage_speed"] = stage_speed diff --git a/tgui/packages/tgui/interfaces/Pandemic/Symptom.tsx b/tgui/packages/tgui/interfaces/Pandemic/Symptom.tsx index 5fa92583f2e..cdbb49f715f 100644 --- a/tgui/packages/tgui/interfaces/Pandemic/Symptom.tsx +++ b/tgui/packages/tgui/interfaces/Pandemic/Symptom.tsx @@ -70,7 +70,7 @@ const Thresholds = (props) => { /** Displays the numerical trait modifiers for a virus symptom */ const Traits = (props) => { const { - symptom: { level, weight, resistance, stage_speed, stealth, transmission }, + symptom: { level, resistance, stage_speed, stealth, transmission }, } = props; return ( @@ -81,11 +81,6 @@ const Traits = (props) => { {level} - - - {weight} - - {resistance}