From 57a31355e7559484d6b4db22e048954c3430bc38 Mon Sep 17 00:00:00 2001 From: Matt Atlas Date: Mon, 23 Oct 2023 23:42:49 +0200 Subject: [PATCH] Fixes borers being able to give people Limitless psi rank. (#17659) Co-authored-by: Matt Atlas --- .../mob/living/carbon/human/human_helpers.dm | 1 - .../psionics/complexus/complexus_latency.dm | 3 +- html/changelogs/mattatlas-fixdontremove.yml | 41 +++++++++++++++++++ 3 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/mattatlas-fixdontremove.yml diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index 7668264f648..a7914bd93e7 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -204,7 +204,6 @@ to_chat(src, SPAN_DANGER("An indescribable, brain-tearing sound hisses from [source], and you collapse in a seizure!")) seizure() custom_pain(SPAN_DANGER(FONT_LARGE("[pick(psi_operancy_messages)]")), 25) - set_psi_rank(PSI_RANK_HARMONIOUS) sleep(30) addtimer(CALLBACK(psi, TYPE_PROC_REF(/datum/psi_complexus, check_psionic_trigger), 100, source, TRUE), 4.5 SECONDS) diff --git a/code/modules/psionics/complexus/complexus_latency.dm b/code/modules/psionics/complexus/complexus_latency.dm index 5637a9befa7..d6bf8c3077c 100644 --- a/code/modules/psionics/complexus/complexus_latency.dm +++ b/code/modules/psionics/complexus/complexus_latency.dm @@ -1,6 +1,5 @@ /datum/psi_complexus/proc/check_psionic_trigger(var/trigger_strength = 0, var/source, var/redactive = FALSE) - var/new_rank = rand(2,5) - owner.set_psi_rank(new_rank) + owner.set_psi_rank(PSI_RANK_HARMONIOUS) to_chat(owner, SPAN_DANGER("You scream internally as your psionics are forced into operancy by [source]!")) if(!redactive) owner.adjustBrainLoss(rand(trigger_strength * 2, trigger_strength * 4)) return TRUE diff --git a/html/changelogs/mattatlas-fixdontremove.yml b/html/changelogs/mattatlas-fixdontremove.yml new file mode 100644 index 00000000000..718e8a60d97 --- /dev/null +++ b/html/changelogs/mattatlas-fixdontremove.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: MattAtlas + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixes Borer psionic jumpstart being able to give their host non-existant psi ranks."