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] 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!!"