Skip to content

Fix Malaguero + Other Stress Events #5747

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.

Sign up for GitHub

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

Merged
KevinfromHP merged 2 commits into from
Mar 22, 2026
Merged

Fix Malaguero + Other Stress Events #5747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
add3c30
fix malaguero?
KevinfromHP Mar 21, 2026
1f23379
Update screen_objects.dm
KevinfromHP Mar 21, 2026
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
6 changes: 4 additions & 2 deletions code/_onclick/hud/screen_objects.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1555,10 +1555,12 @@
if(!length(M.stressors))
to_chat(M, span_info("I'm not feeling much of anything right now."))
for(var/datum/stress_event/stress_event in M.stressors)
if(!stress_event.can_show())
if(!stress_event.can_show(M))
continue
var/count = stress_event.stacks
var/ddesc = islist(stress_event.desc) ? pick(stress_event.desc) : stress_event.desc
var/ddesc = stress_event.get_desc(M)
if(islist(ddesc))
ddesc = pick(ddesc)
if(count > 1)
to_chat(M, "• [ddesc] (x[count])")
else
Expand Down
4 changes: 2 additions & 2 deletions code/datums/chimeric_organs/inputs/stress.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
/datum/chimeric_node/input/stress/proc/on_stress_add(datum/source, datum/stress_event/event)
SIGNAL_HANDLER
if(stress_needed > 0)
if(stress_needed > event.get_stress())
if(stress_needed > event.get_stress(src))
return FALSE
else
if(stress_needed < event.get_stress())
if(stress_needed < event.get_stress(src))
return FALSE
var/potency = node_purity / 100
trigger_output(potency)
Expand Down
8 changes: 4 additions & 4 deletions code/modules/mob/living/carbon/stress.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,15 +184,15 @@
existing_event.timer = initial(existing_event.timer) + world.time // RESET THE TIMER
if(existing_event.stacks >= existing_event.max_stacks)
return
var/pre_stack = existing_event.get_stress()
var/pre_stack = existing_event.get_stress(src)
existing_event.stacks++
var/post_stack = existing_event.get_stress()
var/post_stack = existing_event.get_stress(src)
adjust_stress(post_stack-pre_stack)
existing_event.on_apply(src)
else
new_event.timer += world.time
stressors += new_event
adjust_stress(new_event.get_stress())
adjust_stress(new_event.get_stress(src))
new_event.on_apply(src)
SEND_SIGNAL(src, COMSIG_MOB_ADD_STRESS, new_event)

Expand All @@ -205,7 +205,7 @@
var/datum/stress_event/stress_event = has_stress_type(stress_type)
if(stress_event)
stress_event.on_remove(src)
adjust_stress(-1 * stress_event.get_stress())
adjust_stress(-1 * stress_event.get_stress(src))
stressors -= stress_event
qdel(stress_event)

Expand Down
Loading