Fix conflict 2

Fluffy-Frontier · Dec 18, 2024 · 51a7022 · 51a7022
1 parent e24941a
commit 51a7022
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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!!"