Skip to content

Commit

Permalink
Removes old lines of code mentioning genetic_damage, fixes text misle…
Browse files Browse the repository at this point in the history
…ading to receiving "genetic_damage". (ParadiseSS13#22068)

* Removes and changes unrequired code and false text

* Update code/modules/antagonists/changeling/datum_changeling.dm

Co-authored-by: SteelSlayer <[email protected]>

---------

Co-authored-by: SteelSlayer <[email protected]>
  • Loading branch information
2 people authored and Furrior committed Aug 25, 2023
1 parent e8cf08c commit 1e410bc
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 9 deletions.
1 change: 0 additions & 1 deletion code/datums/status_effects/buffs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,6 @@
to_chat(owner, "<span class='danger'>We collapse in exhaustion.</span>")
owner.Weaken(6 SECONDS)
owner.emote("gasp")
cling.genetic_damage += stacks
cling = null

/datum/status_effect/panacea
Expand Down
1 change: 0 additions & 1 deletion code/game/gamemodes/changeling/changeling.dm
Original file line number Diff line number Diff line change
@@ -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"))
Expand Down
6 changes: 1 addition & 5 deletions code/modules/antagonists/changeling/datum_changeling.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion code/modules/antagonists/changeling/powers/lesserform.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
return FALSE

H.visible_message("<span class='warning'>[H] transforms!</span>")
cling.genetic_damage = 30
to_chat(H, "<span class='warning'>Our genes cry out!</span>")
H.monkeyize()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1e410bc

Please sign in to comment.