You can now click on symptoms in the Pandemic to see their description and stats (#29866)

* You can now click on symptoms in the Pandemic to see their description and stats

* Threshold info

* NO WHITESPACE
This commit is contained in:
XDTM
2017-08-20 01:52:09 +02:00
committed by Jordan Brown
parent a960747423
commit 28a5901170
36 changed files with 322 additions and 132 deletions

View File

@@ -14,3 +14,10 @@ SUBSYSTEM_DEF(disease)
/datum/controller/subsystem/disease/stat_entry(msg)
..("P:[active_diseases.len]")
/datum/controller/subsystem/disease/proc/get_disease_name(id)
var/datum/disease/advance/A = archive_diseases[id]
if(A.name)
return A.name
else
return "Unknown"

View File

@@ -34,20 +34,20 @@
..(process, D, copy)
// Hullucigen
// Hallucigen
/datum/disease/advance/hullucigen/New(var/process = TRUE, var/datum/disease/advance/D, var/copy = FALSE)
/datum/disease/advance/hallucigen/New(var/process = TRUE, var/datum/disease/advance/D, var/copy = FALSE)
if(!D)
name = "Reality Impairment"
name = "Second Sight"
symptoms = list(new/datum/symptom/hallucigen)
..(process, D, copy)
// Sensory Restoration
/datum/disease/advance/sensory_restoration/New(var/process = TRUE, var/datum/disease/advance/D, var/copy = FALSE)
/datum/disease/advance/mind_restoration/New(var/process = TRUE, var/datum/disease/advance/D, var/copy = FALSE)
if(!D)
name = "Reality Enhancer"
symptoms = list(new/datum/symptom/sensory_restoration)
name = "Intelligence Booster"
symptoms = list(new/datum/symptom/mind_restoration)
..(process, D, copy)
// Sensory Destruction

View File

@@ -17,6 +17,7 @@ BONUS
/datum/symptom/beard
name = "Facial Hypertrichosis"
desc = "The virus increases hair production significantly, causing rapid beard growth."
stealth = -3
resistance = -1
stage_speed = -3

View File

@@ -18,6 +18,7 @@ Bonus
/datum/symptom/choking
name = "Choking"
desc = "The virus causes inflammation of the host's air conduits, leading to intermittent choking."
stealth = -3
resistance = -2
stage_speed = -2
@@ -27,6 +28,8 @@ Bonus
base_message_chance = 15
symptom_delay_min = 10
symptom_delay_max = 30
threshold_desc = "<b>Stage Speed 8:</b> Causes choking more frequently.<br>\
<b>Stealth 4:</b> The symptom remains hidden until active."
/datum/symptom/choking/Start(datum/disease/advance/A)
..()
@@ -84,6 +87,7 @@ Bonus
/datum/symptom/asphyxiation
name = "Acute respiratory distress syndrome"
desc = "The virus causes shrinking of the host's lungs, causing severe asphyxiation. May also lead to heart attacks."
stealth = -2
resistance = -0
stage_speed = -1

View File

@@ -18,6 +18,7 @@ Bonus
/datum/symptom/confusion
name = "Confusion"
desc = "The virus interferes with the proper function of the neural system, leading to bouts of confusion and erratic movement."
stealth = 1
resistance = -1
stage_speed = -3
@@ -28,6 +29,9 @@ Bonus
symptom_delay_min = 10
symptom_delay_max = 30
var/brain_damage = FALSE
threshold_desc = "<b>Resistance 6:</b> Causes brain damage over time.<br>\
<b>Transmission 6:</b> Increases confusion duration.<br>\
<b>Stealth 4:</b> The symptom remains hidden until active."
/datum/symptom/confusion/Start(datum/disease/advance/A)
..()

View File

@@ -18,6 +18,7 @@ BONUS
/datum/symptom/cough
name = "Cough"
desc = "The virus irritates the throat of the host, causing occasional coughing."
stealth = -1
resistance = 3
stage_speed = 1
@@ -28,6 +29,11 @@ BONUS
symptom_delay_min = 2
symptom_delay_max = 15
var/infective = FALSE
threshold_desc = "<b>Resistance 3:</b> Host will drop small items when coughing.<br>\
<b>Resistance 10:</b> Occasionally causes coughing fits that stun the host.<br>\
<b>Stage Speed 6:</b> Increases cough frequency.<br>\
<b>If Airborne:</b> Coughing will infect bystanders.<br>\
<b>Stealth 4:</b> The symptom remains hidden until active."
/datum/symptom/cough/Start(datum/disease/advance/A)
..()

View File

@@ -18,6 +18,7 @@ Bonus
/datum/symptom/deafness
name = "Deafness"
desc = "The virus causes inflammation of the eardrums, causing intermittent deafness."
stealth = -1
resistance = -2
stage_speed = -1
@@ -27,6 +28,8 @@ Bonus
base_message_chance = 100
symptom_delay_min = 25
symptom_delay_max = 80
threshold_desc = "<b>Resistance 9:</b> Causes permanent deafness, instead of intermittent.<br>\
<b>Stealth 4:</b> The symptom remains hidden until active."
/datum/symptom/deafness/Start(datum/disease/advance/A)
..()

View File

@@ -18,7 +18,7 @@ Bonus
/datum/symptom/dizzy // Not the egg
name = "Dizziness"
stealth = 2
desc = "The virus causes inflammation of the vestibular system, leading to bouts of dizziness."
resistance = -2
stage_speed = -3
transmittable = -1
@@ -27,6 +27,8 @@ Bonus
base_message_chance = 50
symptom_delay_min = 15
symptom_delay_max = 40
threshold_desc = "<b>Transmission 6:</b> Also causes druggy vision.<br>\
<b>Stealth 4:</b> The symptom remains hidden until active."
/datum/symptom/dizzy/Start(datum/disease/advance/A)
..()

View File

@@ -16,8 +16,8 @@ Bonus
*/
/datum/symptom/fever
name = "Fever"
desc = "The virus causes a febrile response from the host, raising its body temperature."
stealth = 0
resistance = 3
stage_speed = 3
@@ -28,6 +28,8 @@ Bonus
symptom_delay_min = 10
symptom_delay_max = 30
var/unsafe = FALSE //over the heat threshold
threshold_desc = "<b>Resistance 5:</b> Increases fever intensity, fever can overheat and harm the host.<br>\
<b>Resistance 10:</b> Further increases fever intensity."
/datum/symptom/fever/Start(datum/disease/advance/A)
..()

View File

@@ -18,6 +18,7 @@ Bonus
/datum/symptom/fire
name = "Spontaneous Combustion"
desc = "The virus turns fat into an extremely flammable compound, and raises the body's temperature, making the host burst into flames spontaneously."
stealth = 1
resistance = -4
stage_speed = -4
@@ -28,6 +29,10 @@ Bonus
symptom_delay_min = 20
symptom_delay_max = 75
var/infective = FALSE
threshold_desc = "<b>Stage Speed 4:</b> Increases the intensity of the flames.<br>\
<b>Stage Speed 8:</b> Further increases flame intensity.<br>\
<b>Transmission 8:</b> Host will spread the virus through skin flakes when bursting into flame.<br>\
<b>Stealth 4:</b> The symptom remains hidden until active."
/datum/symptom/fire/Start(datum/disease/advance/A)
..()
@@ -94,6 +99,7 @@ Bonus
/datum/symptom/alkali
name = "Alkali perspiration"
desc = "The virus attaches to sudoriparous glands, synthesizing a chemical that bursts into flames when reacting with water, leading to self-immolation."
stealth = 2
resistance = -2
stage_speed = -2
@@ -105,6 +111,9 @@ Bonus
symptom_delay_max = 90
var/chems = FALSE
var/explosion_power = 1
threshold_desc = "<b>Resistance 9:</b> Doubles the intensity of the effect, but reduces its frequency.<br>\
<b>Stage Speed 8:</b> Increases explosion radius when the host is wet.<br>\
<b>Transmission 8:</b> Additionally synthesizes chlorine trifluoride and napalm inside the host."
/datum/symptom/alkali/Start(datum/disease/advance/A)
..()

View File

@@ -18,6 +18,7 @@ Bonus
/datum/symptom/flesh_eating
name = "Necrotizing Fasciitis"
desc = "The virus aggressively attacks body cells, necrotizing tissues and organs."
stealth = -3
resistance = -4
stage_speed = 0
@@ -29,6 +30,8 @@ Bonus
symptom_delay_max = 60
var/bleed = FALSE
var/pain = FALSE
threshold_desc = "<b>Resistance 7:</b> Host will bleed profusely during necrosis.<br>\
<b>Transmission 8:</b> Causes extreme pain to the host, weakening it."
/datum/symptom/flesh_eating/Start(datum/disease/advance/A)
..()
@@ -80,6 +83,7 @@ Bonus
/datum/symptom/flesh_death
name = "Autophagocytosis Necrosis"
desc = "The virus rapidly consumes infected cells, leading to heavy and widespread damage."
stealth = -2
resistance = -2
stage_speed = 1
@@ -91,6 +95,8 @@ Bonus
symptom_delay_max = 6
var/chems = FALSE
var/zombie = FALSE
threshold_desc = "<b>Stage Speed 7:</b> Synthesizes Heparin and Lipolicide inside the host, causing increased bleeding and hunger.<br>\
<b>Stealth 5:</b> The symptom remains hidden until active."
/datum/symptom/flesh_death/Start(datum/disease/advance/A)
..()

View File

@@ -16,8 +16,8 @@ Bonus
*/
/datum/symptom/genetic_mutation
name = "Deoxyribonucleic Acid Saboteur"
desc = "The virus bonds with the DNA of the host, causing damaging mutations until removed."
stealth = -2
resistance = -3
stage_speed = 0
@@ -30,6 +30,9 @@ Bonus
symptom_delay_min = 60
symptom_delay_max = 120
var/no_reset = FALSE
threshold_desc = "<b>Resistance 8:</b> Causes two harmful mutations at once.<br>\
<b>Stage Speed 10:</b> Increases mutation frequency.<br>\
<b>Stealth 5:</b> The mutations persist even if the virus is cured."
/datum/symptom/genetic_mutation/Activate(datum/disease/advance/A)
if(!..())

View File

@@ -16,8 +16,8 @@ Bonus
*/
/datum/symptom/hallucigen
name = "Hallucigen"
desc = "The virus stimulates the brain, causing occasional hallucinations."
stealth = -2
resistance = -3
stage_speed = -3
@@ -28,6 +28,8 @@ Bonus
symptom_delay_min = 25
symptom_delay_max = 90
var/fake_healthy = FALSE
threshold_desc = "<b>Stage Speed 7:</b> Increases the amount of hallucinations.<br>\
<b>Stealth 4:</b> The virus mimics positive symptoms.."
/datum/symptom/hallucigen/Start(datum/disease/advance/A)
..()

View File

@@ -19,6 +19,7 @@ BONUS
/datum/symptom/headache
name = "Headache"
desc = "The virus causes inflammation inside the brain, causing constant headaches."
stealth = -1
resistance = 4
stage_speed = 2
@@ -28,6 +29,9 @@ BONUS
base_message_chance = 100
symptom_delay_min = 15
symptom_delay_max = 30
threshold_desc = "<b>Stage Speed 6:</b> Headaches will cause severe pain, that weakens the host.<br>\
<b>Stage Speed 9:</b> Headaches become less frequent but far more intense, preventing any action from the host.<br>\
<b>Stealth 4:</b> Reduces headache frequency until later stages."
/datum/symptom/headache/Start(datum/disease/advance/A)
..()
@@ -45,11 +49,11 @@ BONUS
return
var/mob/living/M = A.affected_mob
if(power < 2)
if(prob(base_message_chance))
if(prob(base_message_chance) || A.stage >=4)
to_chat(M, "<span class='warning'>[pick("Your head hurts.", "Your head pounds.")]</span>")
if(power >= 2)
if(power >= 2 && A.stage >= 4)
to_chat(M, "<span class='warning'>[pick("Your head hurts a lot.", "Your head pounds incessantly.")]</span>")
M.adjustStaminaLoss(25)
if(power >= 3)
if(power >= 3 && A.stage >= 5)
to_chat(M, "<span class='userdanger'>[pick("Your head hurts!", "You feel a burning knife inside your brain!", "A wave of pain fills your head!")]</span>")
M.Stun(35)

View File

@@ -1,5 +1,6 @@
/datum/symptom/heal
name = "Basic Healing (does nothing)" //warning for adminspawn viruses
desc = "You should not be seeing this."
stealth = 1
resistance = -4
stage_speed = -4
@@ -9,6 +10,9 @@
symptom_delay_min = 1
symptom_delay_max = 1
var/hide_healing = FALSE
threshold_desc = "<b>Stage Speed 6:</b> Doubles healing speed.<br>\
<b>Stage Speed 11:</b> Triples healing speed.<br>\
<b>Stealth 4:</b> Healing will no longer be visible to onlookers."
/datum/symptom/heal/Start(datum/disease/advance/A)
..()
@@ -51,6 +55,7 @@ Bonus
/datum/symptom/heal/toxin
name = "Toxic Filter"
desc = "The virus synthesizes regenerative chemicals in the bloodstream, repairing damage caused by toxins."
stealth = 1
resistance = -4
stage_speed = -4
@@ -87,6 +92,7 @@ Bonus
stage_speed = -2
transmittable = -2
level = 8
desc = "The virus stimulates production of special stem cells in the bloodstream, causing rapid reparation of any damage caused by toxins."
/datum/symptom/heal/toxin/plus/Heal(mob/living/M, datum/disease/advance/A)
var/heal_amt = 2 * power
@@ -115,6 +121,7 @@ Bonus
/datum/symptom/heal/brute
name = "Regeneration"
desc = "The virus stimulates the regenerative process in the host, causing faster wound healing."
stealth = 1
resistance = -4
stage_speed = -4
@@ -158,6 +165,7 @@ Bonus
/datum/symptom/heal/brute/plus
name = "Flesh Mending"
desc = "The virus rapidly mutates into body cells, effectively allowing it to quickly fix the host's wounds."
stealth = 0
resistance = 0
stage_speed = -2
@@ -207,6 +215,7 @@ Bonus
/datum/symptom/heal/burn
name = "Tissue Regrowth"
desc = "The virus recycles dead and burnt tissues, speeding up the healing of damage caused by burns."
stealth = 1
resistance = -4
stage_speed = -4
@@ -248,7 +257,8 @@ Bonus
/datum/symptom/heal/burn/plus
name = "Heat Resistance"
name = "Temperature Adaptation"
desc = "The virus quickly balances body heat, while also replacing tissues damaged by external sources."
stealth = 0
resistance = 0
stage_speed = -2
@@ -297,6 +307,7 @@ Bonus
/datum/symptom/heal/dna
name = "Deoxyribonucleic Acid Restoration"
desc = "The virus repairs the host's genome, purging negative mutations."
stealth = -1
resistance = -1
stage_speed = 0
@@ -304,9 +315,11 @@ Bonus
level = 5
symptom_delay_min = 3
symptom_delay_max = 8
threshold_desc = "<b>Stage Speed 6:</b> Additionally heals brain damage.<br>\
<b>Stage Speed 11:</b> Increases brain damage healing."
/datum/symptom/heal/dna/Heal(mob/living/carbon/M, datum/disease/advance/A)
var/amt_healed = 2 * power
var/amt_healed = 2 * (power - 1)
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]

View File

@@ -19,6 +19,7 @@ BONUS
/datum/symptom/itching
name = "Itching"
desc = "The virus irritates the skin, causing itching."
stealth = 0
resistance = 3
stage_speed = 3
@@ -28,6 +29,8 @@ BONUS
symptom_delay_min = 5
symptom_delay_max = 25
var/scratch = FALSE
threshold_desc = "<b>Transmission 6:</b> Increases frequency of itching.<br>\
<b>Stage Speed 7:</b> The host will scrath itself when itching, causing superficial damage."
/datum/symptom/itching/Start(datum/disease/advance/A)
..()

View File

@@ -14,6 +14,7 @@ Bonus
*/
/datum/symptom/narcolepsy
name = "Narcolepsy"
desc = "The virus causes a hormone imbalance, making the host sleepy and narcoleptic."
stealth = -1
resistance = -2
stage_speed = -3
@@ -25,6 +26,8 @@ Bonus
var/sleep_level = 0
var/sleepy_ticks = 0
var/stamina = FALSE
threshold_desc = "<b>Transmission 7:</b> Also relaxes the muscles, weakening and slowing the host.<br>\
<b>Resistance 10:</b> Causes narcolepsy more often, increasing the chance of the host falling asleep."
/datum/symptom/narcolepsy/Start(datum/disease/advance/A)
..()

View File

@@ -18,6 +18,7 @@ Bonus
/datum/symptom/oxygen
name = "Self-Respiration"
desc = "The virus rapidly synthesizes oxygen, effectively removing the need for breathing."
stealth = 1
resistance = -3
stage_speed = -3
@@ -27,6 +28,7 @@ Bonus
symptom_delay_min = 1
symptom_delay_max = 1
var/regenerate_blood = FALSE
threshold_desc = "<b>Resistance 8:</b>Additionally regenerates lost blood.<br>"
/datum/symptom/oxygen/Start(datum/disease/advance/A)
..()

View File

@@ -15,8 +15,9 @@ Bonus
//////////////////////////////////////
*/
/datum/symptom/sensory_restoration
name = "Sensory Restoration"
/datum/symptom/mind_restoration
name = "Mind Restoration"
desc = "The virus strengthens the bonds between neurons, reducing the duration of any ailments of the mind."
stealth = -1
resistance = -4
stage_speed = -4
@@ -27,15 +28,17 @@ Bonus
symptom_delay_max = 10
var/purge_alcohol = FALSE
var/brain_heal = FALSE
threshold_desc = "<b>Resistance 6:</b> Heals brain damage.<br>\
<b>Transmission 8:</b> Purges alcohol in the bloodstream."
/datum/symptom/sensory_restoration/Start(datum/disease/advance/A)
/datum/symptom/mind_restoration/Start(datum/disease/advance/A)
..()
if(A.properties["resistance"] >= 6) //heal brain damage
brain_heal = TRUE
if(A.properties["transmittable"] >= 8) //purge alcohol
purge_alcohol = TRUE
/datum/symptom/sensory_restoration/Activate(var/datum/disease/advance/A)
/datum/symptom/mind_restoration/Activate(var/datum/disease/advance/A)
if(!..())
return
var/mob/living/M = A.affected_mob

View File

@@ -15,8 +15,8 @@ BONUS
*/
/datum/symptom/shedding
name = "Alopecia"
desc = "The virus causes rapid shedding of head and body hair."
stealth = 0
resistance = 1
stage_speed = -1

View File

@@ -16,8 +16,8 @@ Bonus
*/
/datum/symptom/shivering
name = "Shivering"
desc = "The virus inhibits the body's thermoregulation, cooling the body down."
stealth = 0
resistance = 2
stage_speed = 2
@@ -27,6 +27,8 @@ Bonus
symptom_delay_min = 10
symptom_delay_max = 30
var/unsafe = FALSE //over the cold threshold
threshold_desc = "<b>Stage Speed 5:</b> Increases cooling speed; the host can fall below safe temperature levels.<br>\
<b>Stage Speed 10:</b> Further increases cooling speed."
/datum/symptom/fever/Start(datum/disease/advance/A)
..()

View File

@@ -17,6 +17,7 @@ BONUS
/datum/symptom/vitiligo
name = "Vitiligo"
desc = "The virus destroys skin pigment cells, causing rapid loss of pigmentation in the host."
stealth = -3
resistance = -1
stage_speed = -1
@@ -61,6 +62,7 @@ BONUS
/datum/symptom/revitiligo
name = "Revitiligo"
desc = "The virus causes increased production of skin pigment cells, making the host's skin grow darker over time."
stealth = -3
resistance = -1
stage_speed = -1

View File

@@ -18,6 +18,7 @@ Bonus
/datum/symptom/sneeze
name = "Sneezing"
desc = "The virus causes irritation of the nasal cavity, making the host sneeze occasionally."
stealth = -2
resistance = 3
stage_speed = 0
@@ -26,6 +27,8 @@ Bonus
severity = 1
symptom_delay_min = 5
symptom_delay_max = 35
threshold_desc = "<b>Transmission 9:</b> Increases sneezing range, spreading the virus over a larger area.<br>\
<b>Stealth 4:</b> The symptom remains hidden until active."
/datum/symptom/sneeze/Start(datum/disease/advance/A)
..()

View File

@@ -3,6 +3,8 @@
/datum/symptom
// Buffs/Debuffs the symptom has to the overall engineered disease.
var/name = ""
var/desc = "If you see this something went very wrong." //Basic symptom description
var/threshold_desc = "" //Description of threshold effects
var/stealth = 0
var/resistance = 0
var/stage_speed = 0
@@ -25,6 +27,7 @@
var/power = 1
//A neutered symptom has no effect, and only affects statistics.
var/neutered = FALSE
var/list/thresholds
/datum/symptom/New()
var/list/S = SSdisease.list_symptoms
@@ -37,7 +40,6 @@
// Called when processing of the advance disease, which holds this symptom, starts.
/datum/symptom/proc/Start(datum/disease/advance/A)
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.
/datum/symptom/proc/End(datum/disease/advance/A)
@@ -58,3 +60,6 @@
new_symp.id = id
new_symp.neutered = neutered
return new_symp
/datum/symptom/proc/generate_threshold_desc()
return

View File

@@ -15,6 +15,7 @@ BONUS
*/
/datum/symptom/viraladaptation
name = "Viral self-adaptation"
desc = "The virus mimics the function of normal body cells, becoming harder to spot and to eradicate, but reducing its speed."
stealth = 3
resistance = 5
stage_speed = -3
@@ -38,6 +39,8 @@ BONUS
*/
/datum/symptom/viralevolution
name = "Viral evolutionary acceleration"
desc = "The virus quickly adapts to spread as fast as possible both outside and inside a host. \
This, however, makes the virus easier to spot, and less able to fight off a cure."
stealth = -2
resistance = -3
stage_speed = 5
@@ -65,6 +68,8 @@ Bonus
/datum/symptom/viralreverse
name = "Viral aggressive metabolism"
desc = "The virus sacrifices its long term survivability to gain a near-instant spread when inside a host. \
The virus will start at the lastest stage, but will eventually decay and die off by itself."
stealth = -2
resistance = 1
stage_speed = 3
@@ -73,6 +78,8 @@ Bonus
symptom_delay_min = 1
symptom_delay_max = 1
var/time_to_cure
threshold_desc = "<b>Resistance/Stage Speed:</b> Highest between these determines the amount of time before self-curing.<br>\
<b>Stealth 4:</b> Doubles the time before the virus self-cures."
/datum/symptom/viralreverse/Activate(datum/disease/advance/A)
if(!..())

View File

@@ -18,6 +18,7 @@ Bonus
/datum/symptom/visionloss
name = "Hyphema"
desc = "The virus causes inflammation of the retina, leading to eye damage and eventually blindness."
stealth = -1
resistance = -4
stage_speed = -4
@@ -28,6 +29,8 @@ Bonus
symptom_delay_min = 25
symptom_delay_max = 80
var/remove_eyes = FALSE
threshold_desc = "<b>Resistance 12:</b> Weakens extraocular muscles, eventually leading to complete detachment of the eyes.<br>\
<b>Stealth 4:</b> The symptom remains hidden until active."
/datum/symptom/visionloss/Start(datum/disease/advance/A)
..()
@@ -88,6 +91,7 @@ Bonus
/datum/symptom/visionaid
name = "Ocular Restoration"
desc = "The virus stimulates the production and replacement of eye cells, causing the host to regenerate its eyes when damaged."
stealth = -1
resistance = -3
stage_speed = -2

View File

@@ -18,6 +18,7 @@ Bonus
/datum/symptom/voice_change
name = "Voice Change"
desc = "The virus alters the pitch and tone of the host's vocal cords, changing how their voice sounds."
stealth = -1
resistance = -2
stage_speed = -2
@@ -30,6 +31,9 @@ Bonus
var/scramble_language = FALSE
var/datum/language/current_language
var/datum/language_holder/original_language
threshold_desc = "<b>Transmission 14:</b> The host's language center of the brain is damaged, leading to complete inability to speak or understand any language.<br>\
<b>Stage Speed 7:</b> Changes voice more often.<br>\
<b>Stealth 3:</b> The symptom remains hidden until active."
/datum/symptom/voice_change/Start(datum/disease/advance/A)
..()

View File

@@ -22,6 +22,7 @@ Bonus
/datum/symptom/vomit
name = "Vomiting"
desc = "The virus causes nausea and irritates the stomach, causing occasional vomit."
stealth = -2
resistance = -1
stage_speed = 0
@@ -33,6 +34,9 @@ Bonus
symptom_delay_max = 80
var/vomit_blood = FALSE
var/proj_vomit = 0
threshold_desc = "<b>Resistance 7:</b> Host will vomit blood, causing internal damage.<br>\
<b>Transmission 7:</b> Host will projectile vomit, increasing vomiting range.<br>\
<b>Stealth 4:</b> The symptom remains hidden until active."
/datum/symptom/vomit/Start(datum/disease/advance/A)
..()

View File

@@ -18,6 +18,7 @@ Bonus
/datum/symptom/weight_gain
name = "Weight Gain"
desc = "The virus mutates the host's metabolism, making it gain weight much faster than normal."
stealth = -3
resistance = -3
stage_speed = -2
@@ -27,6 +28,7 @@ Bonus
base_message_chance = 100
symptom_delay_min = 15
symptom_delay_max = 45
threshold_desc = "<b>Stealth 4:</b> The symptom is less noticeable."
/datum/symptom/weight_gain/Start(datum/disease/advance/A)
..()
@@ -66,6 +68,7 @@ Bonus
/datum/symptom/weight_loss
name = "Weight Loss"
desc = "The virus mutates the host's metabolism, making it almost unable to gain nutrition from food."
stealth = -3
resistance = -2
stage_speed = -2
@@ -75,6 +78,7 @@ Bonus
base_message_chance = 100
symptom_delay_min = 15
symptom_delay_max = 45
threshold_desc = "<b>Stealth 4:</b> The symptom is less noticeable."
/datum/symptom/weight_loss/Start(datum/disease/advance/A)
..()
@@ -116,6 +120,7 @@ Bonus
/datum/symptom/weight_even
name = "Weight Even"
desc = "The virus alters the host's metabolism, making it far more efficient then normal, and synthesizing nutrients from normally unedible sources."
stealth = -3
resistance = -2
stage_speed = -2

View File

@@ -18,6 +18,8 @@ BONUS
/datum/symptom/youth
name = "Eternal Youth"
desc = "The virus becomes symbiotically connected to the cells in the host's body, preventing and reversing aging. \
The virus, in turn, becomes more resistant, spreads faster, and is harder to spot, although it doesn't thrive as well without a host."
stealth = 3
resistance = 4
stage_speed = 4

View File

@@ -811,7 +811,7 @@
/obj/item/reagent_containers/glass/bottle/magnitis,
/obj/item/reagent_containers/glass/bottle/pierrot_throat,
/obj/item/reagent_containers/glass/bottle/brainrot,
/obj/item/reagent_containers/glass/bottle/hullucigen_virion,
/obj/item/reagent_containers/glass/bottle/hallucigen_virion,
/obj/item/reagent_containers/glass/bottle/anxiety,
/obj/item/reagent_containers/glass/bottle/beesease,
/obj/item/storage/box/syringes,

View File

@@ -1,3 +1,6 @@
#define MAIN_SCREEN 1
#define SYMPTOM_DETAILS 2
/obj/machinery/computer/pandemic
name = "PanD.E.M.I.C 2200"
desc = "Used to work with viruses."
@@ -10,6 +13,8 @@
idle_power_usage = 20
resistance_flags = ACID_PROOF
var/wait
var/mode = MAIN_SCREEN
var/datum/symptom/selected_symptom
var/obj/item/reagent_containers/beaker
/obj/machinery/computer/pandemic/Initialize()
@@ -34,9 +39,7 @@
/obj/machinery/computer/pandemic/proc/get_viruses_data(datum/reagent/blood/B)
. = list()
if(!islist(B.data["viruses"]))
return
var/list/V = B.data["viruses"]
var/list/V = B.get_diseases()
var/index = 1
for(var/virus in V)
var/datum/disease/D = virus
@@ -47,21 +50,24 @@
this["name"] = D.name
if(istype(D, /datum/disease/advance))
var/datum/disease/advance/A = D
var/datum/disease/advance/archived = SSdisease.archive_diseases[D.GetDiseaseID()]
if(archived.name == "Unknown")
var/disease_name = SSdisease.get_disease_name(A.GetDiseaseID())
if(disease_name == "Unknown")
this["can_rename"] = TRUE
this["name"] = archived.name
this["name"] = disease_name
this["is_adv"] = TRUE
this["resistance"] = A.totalResistance()
this["stealth"] = A.totalStealth()
this["stage_speed"] = A.totalStageSpeed()
this["transmission"] = A.totalTransmittable()
this["symptoms"] = list()
var/symptom_index = 1
for(var/symptom in A.symptoms)
var/datum/symptom/S = symptom
var/list/this_symptom = list()
this_symptom["name"] = S.name
this_symptom["sym_index"] = symptom_index
symptom_index++
this["symptoms"] += list(this_symptom)
this["resistance"] = A.totalResistance()
this["stealth"] = A.totalStealth()
this["stage_speed"] = A.totalStageSpeed()
this["transmission"] = A.totalTransmittable()
this["index"] = index++
this["agent"] = D.agent
this["description"] = D.desc || "none"
@@ -70,6 +76,20 @@
. += list(this)
/obj/machinery/computer/pandemic/proc/get_symptom_data(datum/symptom/S)
. = list()
var/list/this = list()
this["name"] = S.name
this["desc"] = S.desc
this["stealth"] = S.stealth
this["resistance"] = S.resistance
this["stage_speed"] = S.stage_speed
this["transmission"] = S.transmittable
this["level"] = S.level
this["neutered"] = S.neutered
this["threshold_desc"] = S.threshold_desc
. += this
/obj/machinery/computer/pandemic/proc/get_resistance_data(datum/reagent/blood/B)
. = list()
if(!islist(B.data["resistances"]))
@@ -81,6 +101,7 @@
if(D)
this["id"] = id
this["name"] = D.name
. += list(this)
/obj/machinery/computer/pandemic/proc/reset_replicator_cooldown()
@@ -113,18 +134,23 @@
/obj/machinery/computer/pandemic/ui_data(mob/user)
var/list/data = list()
data["is_ready"] = !wait
if(beaker)
data["has_beaker"] = TRUE
if(!beaker.reagents.total_volume || !beaker.reagents.reagent_list)
data["beaker_empty"] = TRUE
var/datum/reagent/blood/B = locate() in beaker.reagents.reagent_list
if(B)
data["has_blood"] = TRUE
data["blood"] = list()
data["blood"]["dna"] = B.data["blood_DNA"] || "none"
data["blood"]["type"] = B.data["blood_type"] || "none"
data["viruses"] = get_viruses_data(B)
data["resistances"] = get_resistance_data(B)
data["mode"] = mode
switch(mode)
if(MAIN_SCREEN)
if(beaker)
data["has_beaker"] = TRUE
if(!beaker.reagents.total_volume || !beaker.reagents.reagent_list)
data["beaker_empty"] = TRUE
var/datum/reagent/blood/B = locate() in beaker.reagents.reagent_list
if(B)
data["has_blood"] = TRUE
data["blood"] = list()
data["blood"]["dna"] = B.data["blood_DNA"] || "none"
data["blood"]["type"] = B.data["blood_type"] || "none"
data["viruses"] = get_viruses_data(B)
data["resistances"] = get_resistance_data(B)
if(SYMPTOM_DETAILS)
data["symptom"] = get_symptom_data(selected_symptom)
return data
@@ -166,8 +192,8 @@
addtimer(CALLBACK(src, .proc/reset_replicator_cooldown), 50)
. = TRUE
if("create_vaccine_bottle")
var/index = params["index"]
var/datum/disease/D = SSdisease.archive_diseases[index]
var/index = text2num(params["index"])
var/datum/disease/D = SSdisease.archive_diseases[get_virus_id_by_index(index)]
var/obj/item/reagent_containers/glass/bottle/B = new(get_turf(src))
B.name = "[D.name] vaccine bottle"
B.reagents.add_reagent("vaccine", 15, list(index))
@@ -175,6 +201,19 @@
update_icon()
addtimer(CALLBACK(src, .proc/reset_replicator_cooldown), 200)
. = TRUE
if("symptom_details")
var/picked_symptom_index = text2num(params["picked_symptom"])
var/index = text2num(params["index"])
var/datum/disease/advance/A = get_by_index("viruses", index)
var/datum/symptom/S = A.symptoms[picked_symptom_index]
mode = SYMPTOM_DETAILS
selected_symptom = S
. = TRUE
if("back")
mode = MAIN_SCREEN
selected_symptom = null
. = TRUE
/obj/machinery/computer/pandemic/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/reagent_containers) && (I.container_type & OPENCONTAINER_1))

View File

@@ -62,6 +62,13 @@
data["viruses"] = preserve
return 1
/datum/reagent/blood/proc/get_diseases()
. = list()
if(data && data["viruses"])
for(var/thing in data["viruses"])
var/datum/disease/D = thing
. += D
/datum/reagent/blood/reaction_turf(turf/T, reac_volume)//splash the blood all over the place
if(!istype(T))
return

View File

@@ -270,11 +270,11 @@
icon_state = "bottle3"
spawned_disease = /datum/disease/advance/heal
/obj/item/reagent_containers/glass/bottle/hullucigen_virion
name = "Hullucigen virion culture bottle"
desc = "A small bottle. Contains hullucigen virion culture in synthblood medium."
/obj/item/reagent_containers/glass/bottle/hallucigen_virion
name = "Hallucigen virion culture bottle"
desc = "A small bottle. Contains hallucigen virion culture in synthblood medium."
icon_state = "bottle3"
spawned_disease = /datum/disease/advance/hullucigen
spawned_disease = /datum/disease/advance/hallucigen
/obj/item/reagent_containers/glass/bottle/pierrot_throat
name = "Pierrot's Throat culture bottle"

File diff suppressed because one or more lines are too long

View File

@@ -1,84 +1,113 @@
<ui-display title='Beaker' button>
{{#partial button}}
<ui-button icon='remove' state='{{data.has_beaker ? null : "disabled"}}' action='empty_eject_beaker'>
Empty and eject
</ui-button>
<ui-button icon='trash' state='{{data.has_beaker ? null : "disabled"}}' action='empty_beaker'>
Empty
</ui-button>
<ui-button icon='eject' state='{{data.has_beaker ? null : "disabled"}}' action='eject_beaker'>
Eject
</ui-button>
{{/partial}}
{{#if data.has_beaker}}
<ui-section>
{{#if data.beaker_empty}}
<span class='bad'>The beaker is empty!</span>
{{else}}
<ui-subdisplay title='Blood'>
{{#if data.has_blood}}
<ui-section label='Blood DNA'>{{data.blood.dna}}</ui-section>
<ui-section label='Blood type'>{{data.blood.type}}</ui-section>
{{else}}
<ui-section>
<span class='average'>No blood sample detected.</span>
</ui-section>
{{/if}}
</ui-subdisplay>
{{/if}}
</ui-section>
{{else}}
<ui-section>
<span class='bad'>No beaker loaded.</span>
</ui-section>
{{/if}}
</ui-display>
{{#if data.has_blood}}
<ui-display title='Diseases'>
{{#each data.viruses}}
<ui-display title='{{name}}' button>
{{#partial button}}
{{#if is_adv}}
<ui-button icon='pencil' action='rename_disease' state='{{can_rename ? "" : "disabled"}}' params='{"index": {{index}}}'>
Name advanced disease
</ui-button>
{{/if}}
<ui-button icon='flask' action='create_culture_bottle' state='{{data.is_ready ? "" : "disabled"}}' params='{"index": {{index}}}'>
Create virus culture bottle
</ui-button>
{{/partial}}
<ui-section label='Disease agent'>{{agent}}</ui-section>
<ui-section label='Description'>{{description}}</ui-section>
<ui-section label='Spread'>{{spread}}</ui-section>
<ui-section label='Possible cure'>{{cure}} </ui-section>
{{#if is_adv}}
<ui-section label='Resistance'>{{resistance}}</ui-section>
<ui-section label='Stealth'>{{stealth}}</ui-section>
<ui-section label='Stage speed'>{{stage_speed}}</ui-section>
<ui-section label='Symptoms'>
{{#each symptoms}}
<span>{{name}}</span><br />
{{/each}}
</ui-section>
{{#if data.mode == 1}}
<ui-display title='Beaker' button>
{{#partial button}}
<ui-button icon='remove' state='{{data.has_beaker ? null : "disabled"}}' action='empty_eject_beaker'>
Empty and eject
</ui-button>
<ui-button icon='trash' state='{{data.has_beaker ? null : "disabled"}}' action='empty_beaker'>
Empty
</ui-button>
<ui-button icon='eject' state='{{data.has_beaker ? null : "disabled"}}' action='eject_beaker'>
Eject
</ui-button>
{{/partial}}
{{#if data.has_beaker}}
<ui-section>
{{#if data.beaker_empty}}
<span class='bad'>The beaker is empty!</span>
{{else}}
<ui-subdisplay title='Blood'>
{{#if data.has_blood}}
<ui-section label='Blood DNA'>{{data.blood.dna}}</ui-section>
<ui-section label='Blood type'>{{data.blood.type}}</ui-section>
{{else}}
<ui-section>
<span class='average'>No blood sample detected.</span>
</ui-section>
{{/if}}
</ui-subdisplay>
{{/if}}
</ui-display>
{{else}}
<ui-section>
<span class='average'>No detectable virus in the blood sample.</span>
</ui-section>
{{/each}}
</ui-display>
<ui-display title='Antibodies'>
{{#each data.resistances}}
<ui-section label='{{name}}'>
<ui-button icon='eyedropper' state='{{data.is_ready ? "" : "disabled"}}' action='create_vaccine_bottle' params='{"index": {{id}}}'>
Create vaccine bottle
</ui-button>
</ui-section>
{{else}}
<ui-section>
<span class='average'>No antibodies detected in the blood sample.</span>
<span class='bad'>No beaker loaded.</span>
</ui-section>
{{/each}}
{{/if}}
</ui-display>
{{/if}}
{{#if data.has_blood}}
<ui-display title='Diseases'>
{{#each data.viruses}}
<ui-display title='{{name}}' button>
{{#partial button}}
{{#if is_adv}}
<ui-button icon='pencil' action='rename_disease' state='{{can_rename ? "" : "disabled"}}' params='{"index": {{index}}}'>
Name advanced disease
</ui-button>
{{/if}}
<ui-button icon='flask' action='create_culture_bottle' state='{{data.is_ready ? "" : "disabled"}}' params='{"index": {{index}}}'>
Create virus culture bottle
</ui-button>
{{/partial}}
<ui-section label='Disease agent'>{{agent}}</ui-section>
<ui-section label='Description'>{{description}}</ui-section>
<ui-section label='Spread'>{{spread}}</ui-section>
<ui-section label='Possible cure'>{{cure}} </ui-section>
{{#if is_adv}}
<ui-section label='Symptoms'>
{{#each symptoms}}
<ui-button action='symptom_details' state="" params='{"picked_symptom": {{sym_index}}, "index": {{index}}}'>
{{name}}
</ui-button><br />
{{/each}}
</ui-section>
<ui-section label='Resistance'>{{resistance}}</ui-section>
<ui-section label='Stealth'>{{stealth}}</ui-section>
<ui-section label='Stage speed'>{{stage_speed}}</ui-section>
<ui-section label='Transmittability'>{{transmission}}</ui-section>
{{/if}}
</ui-display>
{{else}}
<ui-section>
<span class='average'>No detectable virus in the blood sample.</span>
</ui-section>
{{/each}}
</ui-display>
<ui-display title='Antibodies'>
{{#each data.resistances}}
<ui-section label='{{name}}'>
<ui-button icon='eyedropper' state='{{data.is_ready ? "" : "disabled"}}' action='create_vaccine_bottle' params='{"index": {{id}}}'>
Create vaccine bottle
</ui-button>
</ui-section>
{{else}}
<ui-section>
<span class='average'>No antibodies detected in the blood sample.</span>
</ui-section>
{{/each}}
</ui-display>
{{/if}}
{{else}}
<ui-button icon='undo' state="" action='back'>
Back
</ui-button>
{{#with data.symptom}}
<ui-display title='{{name}}'>
<ui-section>
{{desc}}
{{#if neutered}}
<br/>
<b>This symptom has been neutered, and has no effect. It will still affect the virus' statistics.</b>
{{/if}}
</ui-section>
<ui-section>
<ui-section label='Level'>{{level}}</ui-section>
<ui-section label='Resistance'>{{resistance}}</ui-section>
<ui-section label='Stealth'>{{stealth}}</ui-section>
<ui-section label='Stage speed'>{{stage_speed}}</ui-section>
<ui-section label='Transmittability'>{{transmission}}</ui-section>
</ui-section>
<ui-subdisplay title='Effect Thresholds'>
<ui-section>{{{threshold_desc}}}</ui-section>
</ui-subdisplay>
{{/with}}
{{/if}}