cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Virology fixes (#11500)

Browse Source 
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-08-25 15:04:53 -07:00
committed by GitHub
parent 3e4f266a85
commit d1c0c3ee0d
5 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/datums/diseases/advance/advance.dm
View File

@@ -308,7 +308,6 @@ GLOBAL_LIST_INIT(advance_cures, list(
var/s = safepick(symptoms) var/s = safepick(symptoms)
if(s) if(s)
NeuterSymptom(s) NeuterSymptom(s)
Refresh(TRUE)
// Falter the disease, making it non-spreadable. // Falter the disease, making it non-spreadable.
/datum/disease/advance/proc/Falter() /datum/disease/advance/proc/Falter()

3
code/datums/diseases/advance/symptoms/blobspores.dm
View File

@@ -92,6 +92,8 @@ BONUS
/datum/symptom/blobspores/OnDeath(datum/disease/advance/A) /datum/symptom/blobspores/OnDeath(datum/disease/advance/A)
if(!..()) if(!..())
return return
if(!ready_to_pop)
return
var/mob/living/M = A.affected_mob var/mob/living/M = A.affected_mob
M.visible_message(span_danger("[M] starts swelling grotesquely!")) M.visible_message(span_danger("[M] starts swelling grotesquely!"))
addtimer(CALLBACK(src, PROC_REF(pop), A, M), 10 SECONDS) addtimer(CALLBACK(src, PROC_REF(pop), A, M), 10 SECONDS)
@@ -107,7 +109,6 @@ BONUS
if(node_blob) if(node_blob)
blob_options += /obj/structure/blob/node blob_options += /obj/structure/blob/node
var/pick_blob = pick(blob_options) var/pick_blob = pick(blob_options)
if(ready_to_pop)
for(var/i in 1 to rand(1, 6)) for(var/i in 1 to rand(1, 6))
new /mob/living/simple_mob/blob/spore(M.loc) new /mob/living/simple_mob/blob/spore(M.loc)
new pick_blob(M.loc) new pick_blob(M.loc)

2
code/datums/diseases/advance/symptoms/heal.dm
View File

@@ -124,7 +124,7 @@
if(prob(5) && bruteheal) if(prob(5) && bruteheal)
if(H.stat != DEAD) if(H.stat != DEAD)
to_chat(H, span_userdanger("You retch, and a splatter of gore escapes your gullet!")) to_chat(H, span_userdanger("You retch, and a splatter of gore escapes your gullet!"))
H.vomit(lost_nutrition = 0, blood = TRUE, stun = FALSE) H.do_vomit(lost_nutrition = 0, blood = TRUE, stun = FALSE)
// Spitting tumors go here! IF they get up-ported. // Spitting tumors go here! IF they get up-ported.
if(tetsuo) if(tetsuo)
var/list/missing = H.get_missing_limbs() var/list/missing = H.get_missing_limbs()

2
code/datums/diseases/advance/symptoms/shivering.dm
View File

@@ -62,7 +62,7 @@ Bonus
if(!unsafe || A.stage < 4) if(!unsafe || A.stage < 4)
to_chat(M, span_warning(pick("You feel cold.", "You shiver."))) to_chat(M, span_warning(pick("You feel cold.", "You shiver.")))
else else
to_chat(M, span_userdanger(pick("You fel your blood run cold.", "You feel ice in your veins.", "You feel like you can't heat up.", "You shiver violently."))) to_chat(M, span_userdanger(pick("You feel your blood run cold.", "You feel ice in your veins.", "You feel like you can't heat up.", "You shiver violently.")))
set_body_temp(M, A) set_body_temp(M, A)
/datum/symptom/shivering/proc/set_body_temp(var/mob/living/carbon/H, datum/disease/advance/A) /datum/symptom/shivering/proc/set_body_temp(var/mob/living/carbon/H, datum/disease/advance/A)

11
code/datums/diseases/advance/symptoms/stimulant.dm
View File

@@ -24,8 +24,8 @@ Bonus
transmission = -3 transmission = -3
level = 8 level = 8
severity = 1 severity = 1
symptom_delay_min = 1 symptom_delay_min = 25 SECONDS
symptom_delay_max = 1 symptom_delay_max = 35 SECONDS
var/clearacc = FALSE var/clearacc = FALSE
@@ -72,18 +72,15 @@ Bonus
H.drowsyness = max(0, H.drowsyness - 10 * power) H.drowsyness = max(0, H.drowsyness - 10 * power)
H.AdjustSleeping(-10 * power) H.AdjustSleeping(-10 * power)
H.AdjustStunned(-10 * power) H.AdjustStunned(-10 * power)
if(prob(power) && prob(50))
if(H.stat)
H.emote("twitch") H.emote("twitch")
H.make_jittery(2 * power)
H.reagents.add_reagent(REAGENT_ID_HYPERZINE, 5) H.reagents.add_reagent(REAGENT_ID_HYPERZINE, 5)
to_chat(H, span_notice("[pick("You feel nevervous...", "You feel anxious.", "You feel like everything is moving in slow motion.")]")) if(prob(base_message_chance))
to_chat(H, span_notice("[pick("You feel nervous...", "You feel anxious.", "You feel like everything is moving in slow motion.")]"))
if(H.nutrition > 150 - (30 * power)) if(H.nutrition > 150 - (30 * power))
H.nutrition = max(150 - (30 * power), H.nutrition - (2 * power)) H.nutrition = max(150 - (30 * power), H.nutrition - (2 * power))
if(prob(25)) if(prob(25))
H.make_jittery(2 * power) H.make_jittery(2 * power)
if(clearacc) if(clearacc)
if(prob(power) && prob(50)) if(prob(power) && prob(50))
if(H.stat)
H.emote("scream") H.emote("scream")
H.hallucination = min(20, H.hallucination + (5 * power)) H.hallucination = min(20, H.hallucination + (5 * power))