From 63403a8421588ed645e34e10d065c3c59ef19e81 Mon Sep 17 00:00:00 2001
From: Erika Fox <94164348+Erikafox@users.noreply.github.com>
Date: Thu, 14 Nov 2024 13:16:24 -0500
Subject: [PATCH] Legion Core Fluff Change + Cloneloss (#3697)
## About The Pull Request
rewrites some regenerative core fluff
regen cores now do some cloneloss on the end of the effect
## Why It's Good For The Game
I think this is more flavorful than free heals
## Changelog
:cl:
balance: legion cores now slowly build up cloneloss when you use them.
/:cl:
---------
Co-authored-by: Sun-Soaked <45698967+Sun-Soaked@users.noreply.github.com>
---
code/datums/mood_events/drug_events.dm | 8 +++---
.../mood_events/generic_negative_events.dm | 2 +-
code/datums/status_effects/buffs.dm | 6 +++--
.../mining/equipment/regenerative_core.dm | 26 +++++++++++--------
.../chemistry/reagents/medicine_reagents.dm | 4 +--
5 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/code/datums/mood_events/drug_events.dm b/code/datums/mood_events/drug_events.dm
index 986013232bc9..6294ef67ce40 100644
--- a/code/datums/mood_events/drug_events.dm
+++ b/code/datums/mood_events/drug_events.dm
@@ -80,9 +80,9 @@
timeout = 3 MINUTES
/datum/mood_event/legion_good
- mood_change = 20
- description = span_nicegreen("I'm feeling great!")
+ mood_change = 5
+ description = span_nicegreen("Everything feels so light! I'm strong! Unstoppable!")
/datum/mood_event/legion_bad
- mood_change = -20
- description = span_warning("That felt awful!")
+ mood_change = -4
+ description = span_warning("Something is slithering through my veins")
diff --git a/code/datums/mood_events/generic_negative_events.dm b/code/datums/mood_events/generic_negative_events.dm
index aa98d3ba860f..067807d7a6b4 100644
--- a/code/datums/mood_events/generic_negative_events.dm
+++ b/code/datums/mood_events/generic_negative_events.dm
@@ -116,7 +116,7 @@
mood_change = -4
/datum/mood_event/healsbadman
- description = span_warning("I feel like I'm held together by flimsy string, and could fall apart at any moment!")
+ description = span_warning("I feel like something is moving through my veins, eating away at me!")
mood_change = -4
timeout = 2 MINUTES
diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm
index 62b5a1827de7..87e6d15bcd22 100644
--- a/code/datums/status_effects/buffs.dm
+++ b/code/datums/status_effects/buffs.dm
@@ -406,14 +406,16 @@
/datum/status_effect/regenerative_core/on_apply()
ADD_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, id)
- owner.adjustBruteLoss(-25)
- owner.adjustFireLoss(-25)
+ owner.adjustBruteLoss(-20)
+ owner.adjustFireLoss(-20)
owner.remove_CC()
+ owner.reagents.add_reagent(/datum/reagent/medicine/soulus=15)
owner.bodytemperature = owner.get_body_temp_normal()
return TRUE
/datum/status_effect/regenerative_core/on_remove()
REMOVE_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, id)
+ to_chat(owner, span_warning("The tendrils of the regenerative core sink into your flesh, leaving dark markings where they dive."))
/datum/status_effect/antimagic
id = "antimagic"
diff --git a/code/modules/mining/equipment/regenerative_core.dm b/code/modules/mining/equipment/regenerative_core.dm
index 4bd6824327f3..f0214ffcc22c 100644
--- a/code/modules/mining/equipment/regenerative_core.dm
+++ b/code/modules/mining/equipment/regenerative_core.dm
@@ -67,7 +67,7 @@
owner.adjustOxyLoss(-50)
owner.adjustToxLoss(-50)
if(owner.dna.species.id != SPECIES_IPC)
- owner.adjustCloneLoss(10) //dont abuse it or take cloneloss (organic only)
+ owner.adjustCloneLoss(20) //dont abuse it or take cloneloss (organic only)
qdel(src)
/obj/item/organ/regenerative_core/on_life()
@@ -79,21 +79,25 @@
/obj/item/organ/regenerative_core/proc/applyto(atom/target, mob/user)
if(ishuman(target))
var/mob/living/carbon/human/H = target
+ if(H.dna.species.id == SPECIES_IPC)
+ to_chat(user, span_notice("[src] has no effect on silicate life."))
+ return
if(inert)
- to_chat(user, "[src] has decayed and can no longer be used to heal.")
+ to_chat(user, span_notice("[src] has decayed past usabality."))
return
else
if(H.stat == DEAD)
- to_chat(user, "[src] is useless on the dead.")
+ to_chat(user, span_notice("[src] is useless on the dead."))
return
if(H != user)
- H.visible_message("[user] forces [H] to apply [src]... Black tendrils entangle and reinforce [H.p_them()]!")
+ H.visible_message(span_notice("[user] smears [src] across [H]... malignant black tendrils entangle and reinforce [H.p_their()] flesh!"))
SSblackbox.record_feedback("nested tally", "hivelord_core", 1, list("[type]", "used", "other"))
else
- to_chat(user, "You start to smear [src] on yourself. Disgusting tendrils hold you together and allow you to keep moving, but for how long?")
+ to_chat(user, span_notice("You smear [src] across your body. Malignant black tendrils start to grow around the application site, reinforcing your flesh!"))
SSblackbox.record_feedback("nested tally", "hivelord_core", 1, list("[type]", "used", "self"))
H.apply_status_effect(STATUS_EFFECT_REGENERATIVE_CORE)
- SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "core", /datum/mood_event/healsbadman) //Now THIS is a miner buff (fixed - nerf)
+ H.force_scream()
+ SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "core", /datum/mood_event/healsbadman)
qdel(src)
/obj/item/organ/regenerative_core/afterattack(atom/target, mob/user, proximity_flag)
@@ -179,21 +183,21 @@
if(ishuman(target))
var/mob/living/carbon/human/H = target
if(inert)
- to_chat(user, "[src] has broken and can no longer be used to heal.")
+ to_chat(user, span_notice("[src] has decayed beyond usability."))
return
else
if(H.stat == DEAD)
- to_chat(user, "[src] is useless on the dead.")
+ to_chat(user, span_notice("[src] is useless on the dead."))
return
if(H != user)
- H.visible_message("[user] forces [H] to apply [src]... Cancer like crystals grow on and reinforce [H.p_them()]!")
+ H.visible_message(span_notice("[user] smears [src] across [H]... malignant crystals and cancerous tendrils grow on and reinforce [H.p_them()]!"))
SSblackbox.record_feedback("nested tally", "hivelord_core", 1, list("[type]", "used", "other"))
else
- to_chat(user, "You start to apply [src] on yourself. Cancer like crystals hold you together and add something to you to keep yourself moving, but for how long?")
+ to_chat(user, span_notice("You smear [src] across yourself. malignant crystals and cancerous tendrils grow on you, toughening and healing where they touch."))
SSblackbox.record_feedback("nested tally", "hivelord_core", 1, list("[type]", "used", "self"))
H.apply_status_effect(STATUS_EFFECT_REGENERATIVE_CORE)
H.reagents.add_reagent(/datum/reagent/determination, 4)
- SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "core", /datum/mood_event/healsbadman) //Now THIS is a miner buff (fixed - nerf)
+ SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "core", /datum/mood_event/healsbadman)
qdel(src)
/obj/item/organ/regenerative_core/legion/crystal/update_icon_state()
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index 3cbc70c96f23..123fd24a249d 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -1956,7 +1956,7 @@
reagent_state = SOLID
color = "#302f20"
metabolization_rate = REAGENTS_METABOLISM * 0.8
- overdose_threshold = 100
+ overdose_threshold = 50
var/clone_dam = 0.25
/datum/reagent/medicine/soulus/expose_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
@@ -1976,7 +1976,7 @@
/datum/reagent/medicine/soulus/on_mob_life(mob/living/carbon/M)
M.adjustFireLoss(-0.1*REM, 0)
M.adjustBruteLoss(-0.1*REM, 0)
- M.adjustCloneLoss(clone_dam *REM, 0)
+ M.adjustCloneLoss(clone_dam*REM, 0)
..()
/datum/reagent/medicine/soulus/overdose_process(mob/living/M)