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

Reverts projectile sneezing :( (#89292)

Browse Source 
## About The Pull Request

Reverts #83361

## Why It's Good For The Game

I PR'd the original with the intent of making disease battling more
engaging by adding warnings and sneeze dodging, but this was rejected
and instead we got a very awkward middle ground where no one is happy
and the original PR didnt accomplish what it set out to accomplish. You
can't dodge the sneeze because it's a shotgun spread and invisible :/.
The sneeze catchers are even somewhat buggy and the sneeze warning leads
to extra chat clutter
This commit is contained in:
Time-Green
2025-03-12 15:45:42 -04:00
committed by Roxy
parent cc72421d09
commit f5e1466305
14 changed files with 21 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/diseases/advance/symptoms/sneeze.dm
+2 -2
View File
@@ -52,8 +52,8 @@
if(!suppress_warning)
affected_mob.emote("sniff")
else
if(affected_mob.can_spread_airborne_diseases()) //don't spread germs if they covered their mouth
affected_mob.infectious_sneeze(active_disease, TRUE, range = spread_range)
affected_mob.emote("sneeze")
active_disease.airborne_spread(spread_range = src.spread_range, force_spread = TRUE, require_facing = TRUE)
if(cartoon_sneezing) //Yeah, this can fling you around even if you have a space suit helmet on. It's, uh, bluespace snot, yeah.
to_chat(affected_mob, span_userdanger("You are launched violently backwards by an all-mighty sneeze!"))
var/sneeze_distance = rand(2,4) //twice as far as a normal baseball bat strike will fling you
code/datums/diseases/cold.dm
+3 -3
View File
@@ -6,7 +6,7 @@
cures = list(/datum/reagent/medicine/spaceacillin)
agent = "XY-rhinovirus"
viable_mobtypes = list(/mob/living/carbon/human)
spreading_modifier = 0.1
spreading_modifier = 0.5
spread_text = "Airborne"
severity = DISEASE_SEVERITY_NONTHREAT
required_organ = ORGAN_SLOT_LUNGS
@@ -20,7 +20,7 @@
switch(stage)
if(2)
if(SPT_PROB(0.5, seconds_per_tick))
affected_mob.infectious_sneeze(src, TRUE)
affected_mob.emote("sneeze")
if(SPT_PROB(0.5, seconds_per_tick))
affected_mob.emote("cough")
if(SPT_PROB(0.5, seconds_per_tick))
@@ -33,7 +33,7 @@
return FALSE
if(3)
if(SPT_PROB(0.5, seconds_per_tick))
affected_mob.infectious_sneeze(src, TRUE)
affected_mob.emote("sneeze")
if(SPT_PROB(0.5, seconds_per_tick))
affected_mob.emote("cough")
if(SPT_PROB(0.5, seconds_per_tick))
code/datums/diseases/cold9.dm
+2 -2
View File
@@ -20,7 +20,7 @@
if(2)
affected_mob.adjust_bodytemperature(-5 * seconds_per_tick)
if(SPT_PROB(0.5, seconds_per_tick))
affected_mob.infectious_sneeze(src, TRUE)
affected_mob.emote("sneeze")
if(SPT_PROB(0.5, seconds_per_tick))
affected_mob.emote("cough")
if(SPT_PROB(0.5, seconds_per_tick))
@@ -34,7 +34,7 @@
if(3)
affected_mob.adjust_bodytemperature(-10 * seconds_per_tick)
if(SPT_PROB(0.5, seconds_per_tick))
affected_mob.infectious_sneeze(src, TRUE)
affected_mob.emote("sneeze")
if(SPT_PROB(0.5, seconds_per_tick))
affected_mob.emote("cough")
if(SPT_PROB(0.5, seconds_per_tick))
code/datums/diseases/dna_spread.dm
+1 -1
View File
@@ -40,7 +40,7 @@
switch(stage)
if(2, 3) //Pretend to be a cold and give time to spread.
if(SPT_PROB(4, seconds_per_tick))
affected_mob.sneeze()
affected_mob.emote("sneeze")
if(SPT_PROB(4, seconds_per_tick))
affected_mob.emote("cough")
if(SPT_PROB(0.5, seconds_per_tick))
code/datums/diseases/fake_gbs.dm
+1 -1
View File
@@ -19,7 +19,7 @@
switch(stage)
if(2)
if(SPT_PROB(0.5, seconds_per_tick))
affected_mob.sneeze()
affected_mob.emote("sneeze")
if(3)
if(SPT_PROB(2.5, seconds_per_tick))
affected_mob.emote("cough")
code/datums/diseases/flu.dm
+3 -3
View File
@@ -7,7 +7,7 @@
cure_chance = 5
agent = "H13N1 flu virion"
viable_mobtypes = list(/mob/living/carbon/human)
spreading_modifier = 0.1
spreading_modifier = 0.75
desc = "If left untreated the subject will feel quite unwell."
severity = DISEASE_SEVERITY_MINOR
required_organ = ORGAN_SLOT_LUNGS
@@ -20,7 +20,7 @@
switch(stage)
if(2)
if(SPT_PROB(0.5, seconds_per_tick))
affected_mob.infectious_sneeze(src, TRUE)
affected_mob.emote("sneeze")
if(SPT_PROB(0.5, seconds_per_tick))
affected_mob.emote("cough")
if(SPT_PROB(0.5, seconds_per_tick))
@@ -38,7 +38,7 @@
if(3)
if(SPT_PROB(0.5, seconds_per_tick))
affected_mob.infectious_sneeze(src, TRUE)
affected_mob.emote("sneeze")
if(SPT_PROB(0.5, seconds_per_tick))
affected_mob.emote("cough")
if(SPT_PROB(0.5, seconds_per_tick))
code/datums/diseases/fluspanish.dm
+3 -3
View File
@@ -7,7 +7,7 @@
cure_chance = 5
agent = "1nqu1s1t10n flu virion"
viable_mobtypes = list(/mob/living/carbon/human)
spreading_modifier = 0.1
spreading_modifier = 0.75
desc = "If left untreated the subject will burn to death for being a heretic."
severity = DISEASE_SEVERITY_DANGEROUS
required_organ = ORGAN_SLOT_LUNGS
@@ -21,7 +21,7 @@
if(2)
affected_mob.adjust_bodytemperature(5 * seconds_per_tick)
if(SPT_PROB(2.5, seconds_per_tick))
affected_mob.infectious_sneeze(src, TRUE)
affected_mob.emote("sneeze")
if(SPT_PROB(2.5, seconds_per_tick))
affected_mob.emote("cough")
if(SPT_PROB(0.5, seconds_per_tick))
@@ -31,7 +31,7 @@
if(3)
affected_mob.adjust_bodytemperature(10 * seconds_per_tick)
if(SPT_PROB(2.5, seconds_per_tick))
affected_mob.infectious_sneeze(src, TRUE)
affected_mob.emote("sneeze")
if(SPT_PROB(2.5, seconds_per_tick))
affected_mob.emote("cough")
if(SPT_PROB(2.5, seconds_per_tick))
code/datums/diseases/wizarditis.dm
+1 -1
View File
@@ -99,7 +99,7 @@
var/datum/action/cooldown/spell/picked = pick(random_spells)
picked.Activate(affected_mob)
affected_mob.sneeze()
affected_mob.emote("sneeze")
return
/datum/disease/wizarditis/proc/spawn_wizard_clothes(chance = 0)