From c4547e725105de0bc3d7baeeaab49d926bedd1d9 Mon Sep 17 00:00:00 2001
From: XFirebirdX <142694283+XFirebirdX@users.noreply.github.com>
Date: Fri, 25 Aug 2023 18:04:25 +0200
Subject: [PATCH] Removes old lines of code mentioning genetic_damage, fixes
text misleading to receiving "genetic_damage". (#22068)
* Removes and changes unrequired code and false text
* Update code/modules/antagonists/changeling/datum_changeling.dm
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
---------
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
---
code/datums/status_effects/buffs.dm | 1 -
code/game/gamemodes/changeling/changeling.dm | 1 -
code/modules/antagonists/changeling/datum_changeling.dm | 6 +-----
code/modules/antagonists/changeling/powers/lesserform.dm | 1 -
.../antagonists/changeling/powers/strained_muscles.dm | 2 +-
5 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm
index 946188aec14..a72de5fb471 100644
--- a/code/datums/status_effects/buffs.dm
+++ b/code/datums/status_effects/buffs.dm
@@ -448,7 +448,6 @@
to_chat(owner, "We collapse in exhaustion.")
owner.Weaken(6 SECONDS)
owner.emote("gasp")
- cling.genetic_damage += stacks
cling = null
/datum/status_effect/panacea
diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm
index d10a3a7d401..e6aa485df90 100644
--- a/code/game/gamemodes/changeling/changeling.dm
+++ b/code/game/gamemodes/changeling/changeling.dm
@@ -1,5 +1,4 @@
#define LING_FAKEDEATH_TIME 40 SECONDS
-#define LING_DEAD_GENETIC_DAMAGE_HEAL_CAP 50 //The lowest value of genetic_damage handle_changeling() can take it to while dead.
#define LING_ABSORB_RECENT_SPEECH 8 //The amount of recent spoken lines to gain on absorbing a mob
GLOBAL_LIST_INIT(possible_changeling_IDs, list("Alpha","Beta","Gamma","Delta","Epsilon","Zeta","Eta","Theta","Iota","Kappa","Lambda","Mu","Nu","Xi","Omicron","Pi","Rho","Sigma","Tau","Upsilon","Phi","Chi","Psi","Omega"))
diff --git a/code/modules/antagonists/changeling/datum_changeling.dm b/code/modules/antagonists/changeling/datum_changeling.dm
index 2ca7e16979c..1c4150f9d19 100644
--- a/code/modules/antagonists/changeling/datum_changeling.dm
+++ b/code/modules/antagonists/changeling/datum_changeling.dm
@@ -36,8 +36,6 @@
var/sting_range = 2
/// The changeling's identifier when speaking in the hivemind, i.e. "Mr. Delta 123".
var/changelingID = "Changeling"
- /// The current amount of genetic damage incurred from power use.
- var/genetic_damage = 0
/// If the changeling is in the process of absorbing someone.
var/is_absorbing = FALSE
/// The amount of points available to purchase changeling abilities.
@@ -185,10 +183,8 @@
var/mob/living/carbon/human/H = owner.current
if(H.stat == DEAD)
chem_charges = clamp(0, chem_charges + chem_recharge_rate - chem_recharge_slowdown, chem_storage * 0.5)
- genetic_damage = directional_bounded_sum(genetic_damage, -1, LING_DEAD_GENETIC_DAMAGE_HEAL_CAP, 0)
- else // Not dead? no chem/genetic_damage caps.
+ else
chem_charges = clamp(0, chem_charges + chem_recharge_rate - chem_recharge_slowdown, chem_storage)
- genetic_damage = max(0, genetic_damage - 1)
update_chem_charges_ui(H)
/datum/antagonist/changeling/proc/update_chem_charges_ui(mob/living/carbon/human/H = owner.current)
diff --git a/code/modules/antagonists/changeling/powers/lesserform.dm b/code/modules/antagonists/changeling/powers/lesserform.dm
index 5dc6e4c8252..f61eb1d9bea 100644
--- a/code/modules/antagonists/changeling/powers/lesserform.dm
+++ b/code/modules/antagonists/changeling/powers/lesserform.dm
@@ -20,7 +20,6 @@
return FALSE
H.visible_message("[H] transforms!")
- cling.genetic_damage = 30
to_chat(H, "Our genes cry out!")
H.monkeyize()
diff --git a/code/modules/antagonists/changeling/powers/strained_muscles.dm b/code/modules/antagonists/changeling/powers/strained_muscles.dm
index 2e50c0f5d25..782602c983a 100644
--- a/code/modules/antagonists/changeling/powers/strained_muscles.dm
+++ b/code/modules/antagonists/changeling/powers/strained_muscles.dm
@@ -4,7 +4,7 @@
/datum/action/changeling/strained_muscles
name = "Strained Muscles"
desc = "We evolve the ability to reduce the acid buildup in our muscles, allowing us to move much faster."
- helptext = "The strain will use up our chemicals faster over time, and is not sustainable. Causes slight genetic damage to our genome. Can not be used in lesser form."
+ helptext = "The strain will use up our chemicals faster over time, and is not sustainable. Can not be used in lesser form."
button_icon_state = "strained_muscles"
chemical_cost = 0
dna_cost = 1