From 33e46eb74bde95c0c6b960ef4106ffeafbe0dc5b Mon Sep 17 00:00:00 2001
From: OrbisAnima <orbisanima@gmail.com>
Date: Wed, 18 Dec 2024 00:42:47 -0300
Subject: [PATCH 1/4] Allows Felinids to shower (#4686)

sets to 0 stamina damage of water haters when in water instead of being damaged (compared to being recovered for regular people)
---
 code/datums/status_effects/neutral.dm | 45 +++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm
index f8814c56f14..f134b31eb20 100644
--- a/code/datums/status_effects/neutral.dm
+++ b/code/datums/status_effects/neutral.dm
@@ -610,7 +610,52 @@
 	SIGNAL_HANDLER
 	qdel(src)
 
+<<<<<<< HEAD
 /atom/movable/screen/alert/status_effect/shower_regen
+=======
+/datum/status_effect/washing_regen
+	id = "shower_regen"
+	duration = STATUS_EFFECT_PERMANENT
+	status_type = STATUS_EFFECT_UNIQUE
+	alert_type = /atom/movable/screen/alert/status_effect/washing_regen
+	///The screen alert shown if you hate water
+	var/hater_alert = /atom/movable/screen/alert/status_effect/washing_regen/hater
+	/// How much stamina we regain from washing
+	var/stamina_heal_per_tick = -4
+	/// How much brute, tox and fie damage we heal from this
+	var/heal_per_tick = 0
+
+/datum/status_effect/washing_regen/on_apply()
+	. = ..()
+	if(HAS_TRAIT(owner, TRAIT_WATER_HATER) && !HAS_TRAIT(owner, TRAIT_WATER_ADAPTATION))
+		alert_type = hater_alert
+
+/datum/status_effect/washing_regen/tick(seconds_between_ticks)
+	. = ..()
+	var/water_adaptation = HAS_TRAIT(owner, TRAIT_WATER_ADAPTATION)
+	var/water_hater = HAS_TRAIT(owner, TRAIT_WATER_HATER)
+	var/stam_recovery = (water_hater && !water_adaptation ? -stamina_heal_per_tick : stamina_heal_per_tick) * seconds_between_ticks
+	var/recovery = heal_per_tick
+	if(water_adaptation)
+		recovery -= 1
+		stam_recovery *= 1.5
+	else if(water_hater)
+		recovery *= 0
+		stam_recovery = 0 // NOVA EDIT ADDITIION - null the stamina damage.
+	recovery *= seconds_between_ticks
+
+	var/healed = 0
+	if(recovery) //very mild healing for those with the water adaptation trait (fish infusion)
+		healed += owner.adjustOxyLoss(recovery * (water_adaptation ? 1.5 : 1), updating_health = FALSE, required_biotype = MOB_ORGANIC)
+		healed += owner.adjustFireLoss(recovery, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
+		healed += owner.adjustToxLoss(recovery, updating_health = FALSE, required_biotype = MOB_ORGANIC)
+		healed += owner.adjustBruteLoss(recovery, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
+	healed += owner.adjustStaminaLoss(stam_recovery, updating_stamina = FALSE)
+	if(healed)
+		owner.updatehealth()
+
+/atom/movable/screen/alert/status_effect/washing_regen
+>>>>>>> c3c1ae504ae (Allows Felinids to shower (#4686))
 	name = "Washing"
 	desc = "A good wash fills me with energy!"
 	icon_state = "shower_regen"

From 32f188bfff29812cb2843289fe7711207bcdb2da Mon Sep 17 00:00:00 2001
From: StealsThePRs <StealsThe@Email.com>
Date: Wed, 18 Dec 2024 06:43:13 +0300
Subject: [PATCH 2/4] [MIRROR] Allows Felinids to shower


From e24941a5ed88bd7eddf1d33050b4cd4b440b06e1 Mon Sep 17 00:00:00 2001
From: Feenie <62373791+FeenieRU@users.noreply.github.com>
Date: Wed, 18 Dec 2024 13:48:28 +0300
Subject: [PATCH 3/4] Fix conflict

---
 code/datums/status_effects/neutral.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm
index f134b31eb20..42391726785 100644
--- a/code/datums/status_effects/neutral.dm
+++ b/code/datums/status_effects/neutral.dm
@@ -610,9 +610,6 @@
 	SIGNAL_HANDLER
 	qdel(src)
 
-<<<<<<< HEAD
-/atom/movable/screen/alert/status_effect/shower_regen
-=======
 /datum/status_effect/washing_regen
 	id = "shower_regen"
 	duration = STATUS_EFFECT_PERMANENT
@@ -655,7 +652,6 @@
 		owner.updatehealth()
 
 /atom/movable/screen/alert/status_effect/washing_regen
->>>>>>> c3c1ae504ae (Allows Felinids to shower (#4686))
 	name = "Washing"
 	desc = "A good wash fills me with energy!"
 	icon_state = "shower_regen"

From 51a70225883d4ea1dca6d61b4e6265efebdd4c61 Mon Sep 17 00:00:00 2001
From: Feenie <62373791+FeenieRU@users.noreply.github.com>
Date: Wed, 18 Dec 2024 14:29:36 +0300
Subject: [PATCH 4/4] Fix conflict 2

---
 code/datums/status_effects/neutral.dm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm
index 42391726785..90f9a3c3097 100644
--- a/code/datums/status_effects/neutral.dm
+++ b/code/datums/status_effects/neutral.dm
@@ -656,6 +656,10 @@
 	desc = "A good wash fills me with energy!"
 	icon_state = "shower_regen"
 
+/atom/movable/screen/alert/status_effect/washing_regen/hater
+	desc = "Waaater... Fuck this WATER!!"
+	icon_state = "shower_regen_catgirl"
+
 /atom/movable/screen/alert/status_effect/shower_regen/hater
 	name = "Washing"
 	desc = "Waaater... Fuck this WATER!!"