Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removes all sources of random viruses #576

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion code/game/machinery/computer/dna_console.dm
Original file line number Diff line number Diff line change
Expand Up @@ -714,12 +714,13 @@
//First check is for the more-likely, weaker random virus. Second is for a tougher one. There's a chance both checks fail and you get nothing.
//This change was to bring it more in line with what I originally imagined, that the virus risk was from the virus misbehaving somehow - it
//should be a "sometimes" thing, not an "always" thing, but risky enough to force the need for precautions to isolate the subject
if(prob(60))
/*if(prob(60)) //monkestation removal
var/datum/disease/advance/random/random_disease = new /datum/disease/advance/random(2,2)
random_disease.try_infect(scanner_occupant, FALSE)
else if (prob(30))
var/datum/disease/advance/random/random_disease = new /datum/disease/advance/random(3,4)
random_disease.try_infect(scanner_occupant, FALSE)
*/ //monkestation removal
//Instantiate list to hold resulting mutation_index
var/mutation_data[0]
//Start with the bad mutation, overwrite with the desired mutation if it passes the check
Expand Down
4 changes: 2 additions & 2 deletions code/modules/events/disease_outbreak.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
typepath = /datum/round_event/disease_outbreak
max_occurrences = 1
min_players = 10
weight = 5
weight = 0 //monkestation edit 5 ==> 0
category = EVENT_CATEGORY_HEALTH
description = "A 'classic' virus will infect some members of the crew."
min_wizard_trigger_potency = 2
Expand Down Expand Up @@ -144,7 +144,7 @@
name = "Disease Outbreak: Advanced"
typepath = /datum/round_event/disease_outbreak/advanced
category = EVENT_CATEGORY_HEALTH
weight = 15
weight = 0 //Monkestation edit 15 ==> 0
min_players = 35 // To avoid shafting lowpop
earliest_start = 15 MINUTES // give the chemist a chance
description = "An 'advanced' disease will infect some members of the crew."
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/basic/vermin/mouse.dm
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
var/static/list/loc_connections = list(
COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
)
var/datum/disease/advance/R = new /datum/disease/advance/random(rand(1, 6), 9, 1)
var/datum/disease/R = new /datum/disease/food //monkestation change advance/random to food poisoning
ratdisease += R
AddElement(/datum/element/connect_loc, loc_connections)
make_tameable()
Expand Down
3 changes: 2 additions & 1 deletion code/modules/surgery/organs/lungs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -459,12 +459,13 @@
// Inhale Miasma. Exhale nothing.
breathe_gas_volume(breath, /datum/gas/miasma)
// Miasma sickness
if(prob(0.5 * miasma_pp))
/*if(prob(0.5 * miasma_pp)) //MONKESTATION REMOVAL
var/datum/disease/advance/miasma_disease = new /datum/disease/advance/random(max_symptoms = min(round(max(miasma_pp / 2, 1), 1), 6), max_level = min(round(max(miasma_pp, 1), 1), 8))
// tl;dr the first argument chooses the smaller of miasma_pp/2 or 6(typical max virus symptoms), the second chooses the smaller of miasma_pp or 8(max virus symptom level)
// Each argument has a minimum of 1 and rounds to the nearest value. Feel free to change the pp scaling I couldn't decide on good numbers for it.
miasma_disease.name = "Unknown"
miasma_disease.try_infect(breather)
*/ //MONKESTATION REMOVAL
// Miasma side effects
switch(miasma_pp)
if(0.25 to 5)
Expand Down
49 changes: 49 additions & 0 deletions monkestation/code/datums/diseases/food_poisoning.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
/datum/disease/food
name = "Food Poisoning"
max_stages = 4
cure_text = "Spaceacillin"
cures = list(/datum/reagent/medicine/spaceacillin)
agent = "Salmonella Cosmosis"
spread_text = "Infected Food or Blood"
viable_mobtypes = list(/mob/living/carbon/human)
spreading_modifier = 1
desc = "If left untreated the subject will vomit profusely."
severity = DISEASE_SEVERITY_HARMFUL
disease_flags = CAN_CARRY|CAN_RESIST
spread_flags = DISEASE_SPREAD_BLOOD
required_organs = list(/obj/item/organ/internal/stomach)
bypasses_immunity = TRUE

/datum/disease/food/stage_act(seconds_per_tick, times_fired)
. = ..()
if(!.)
return

switch(stage)
if(2)
if(SPT_PROB(1, seconds_per_tick))
to_chat(affected_mob, span_danger("[pick("Your stomach hurts.", "Your stomach feels like its spinning.")]"))
affected_mob.adjust_disgust(10)
affected_mob.stamina.adjust(-15)
if(prob(20))
affected_mob.adjustToxLoss(1, FALSE)
if(3)
if(SPT_PROB(1, seconds_per_tick))
to_chat(affected_mob, span_danger("[pick("Your stomach hurts.", "Your stomach feels like its spinning.")]"))
affected_mob.stamina.adjust(-15)
if(prob(20))
affected_mob.adjustToxLoss(1, FALSE)
if(SPT_PROB(1.5, seconds_per_tick))
to_chat(affected_mob, span_warning("[pick("You feel nauseated.", "You feel like you're going to throw up!")]"))
affected_mob.adjust_disgust(30)
if(4)
if(SPT_PROB(1.5, seconds_per_tick))
to_chat(affected_mob, span_warning("[pick("Your head hurts.", "Your head pounds.")]"))
affected_mob.stamina.adjust(-25)
if(SPT_PROB(2.5, seconds_per_tick))
to_chat(affected_mob, span_warning("[pick("You feel nauseated.", "You feel like you're going to throw up!")]"))
affected_mob.adjust_disgust(40)
if(SPT_PROB(6, seconds_per_tick))
affected_mob.adjust_disgust(10)
affected_mob.vomit(20, FALSE, distance = 1)

1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -5487,6 +5487,7 @@
#include "monkestation\code\datums\components\multi_hit.dm"
#include "monkestation\code\datums\components\throw_bounce.dm"
#include "monkestation\code\datums\components\turf_healing.dm"
#include "monkestation\code\datums\diseases\food_poisoning.dm"
#include "monkestation\code\datums\diseases\advance\symptoms\clockwork.dm"
#include "monkestation\code\datums\keybinding\carbon.dm"
#include "monkestation\code\datums\keybinding\living.dm"
Expand Down