diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 34e98680d5d..eaf69ca9ce9 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -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 diff --git a/code/datums/chimeric_organs/inputs/stress.dm b/code/datums/chimeric_organs/inputs/stress.dm index 69b7c85224c..ec3577ff5de 100644 --- a/code/datums/chimeric_organs/inputs/stress.dm +++ b/code/datums/chimeric_organs/inputs/stress.dm @@ -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) diff --git a/code/modules/mob/living/carbon/stress.dm b/code/modules/mob/living/carbon/stress.dm index d3cd83d50c5..82c6862a162 100644 --- a/code/modules/mob/living/carbon/stress.dm +++ b/code/modules/mob/living/carbon/stress.dm @@ -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) @@ -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)