From c4fb2c6d60c26735fab2ca55ee02c42d8e1aae33 Mon Sep 17 00:00:00 2001
From: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Date: Mon, 23 May 2022 23:11:00 +0200
Subject: [PATCH] Crusher Code Cleanup (#14080)

---
 code/modules/mob/holder.dm                    |   9 ++++++---
 .../mob/living/simple_animal/friendly/cat.dm  |  14 +++++++-------
 icons/mob/npc/pets.dmi                        | Bin 102588 -> 102590 bytes
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm
index 8225a8a258e..e6a53568403 100644
--- a/code/modules/mob/holder.dm
+++ b/code/modules/mob/holder.dm
@@ -421,19 +421,22 @@ var/list/holder_mob_icon_cache = list()
 	icon_state = "kitten"
 	icon_state_dead = "cat_kitten_dead"
 	item_state = "kitten"
+
 /obj/item/holder/cat/penny
 	name = "Penny"
 	desc = "An important cat, straight from Central Command."
 	icon_state = "penny"
 	icon_state_dead = "penny_dead"
 	item_state = "penny"
+
 /obj/item/holder/cat/crusher
 	name = "Crusher"
 	desc = "The Medbay's newest mascot. Lovely."
-	icon_state = "styx"
-	icon_state_dead = "styx_dead"
-	item_state = "styx"
+	icon_state = "crusher"
+	icon_state_dead = "crusher_dead"
+	item_state = "crusher"
 	slot_flags = SLOT_HEAD
+
 /obj/item/holder/carp/baby
 	name = "baby space carp"
 	desc = "Awfully cute! Looks friendly!"
diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index b6e89767379..e4419fa27c3 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -332,17 +332,17 @@
 	icon_rest = "penny_rest"
 	holder_type = /obj/item/holder/cat/penny
 
-/mob/living/simple_animal/cat/crusher // Goodbye Runtime, make way for the new girl in town.
+/mob/living/simple_animal/cat/crusher
 	name = "Crusher"
 	desc = "A cream coloured, young, and cuddly cat, with a small tag on her collar that says \"Dr. Crusher\". She never lets an opportunity pass to receive some pets or prey on some unsuspecting mice."
 	named = TRUE
 	gender = FEMALE
-	icon_state = "styx"
-	icon_state = "styx"
-	icon_living = "styx"
-	icon_dead = "styx_dead"
-	icon_rest = "styx_rest"
-	can_nap = 1
+	icon_state = "crusher"
+	icon_state = "crusher"
+	icon_living = "crusher"
+	icon_dead = "crusher_dead"
+	icon_rest = "crusher_rest"
+	can_nap = TRUE
 	holder_type = /obj/item/holder/cat/crusher
 
 /mob/living/simple_animal/cat/crusher/examine(mob/user)
diff --git a/icons/mob/npc/pets.dmi b/icons/mob/npc/pets.dmi
index 0ad73499b7fa38266db17f2d0b3815f352b7cb61..b88b65f2cad8ebb49c1284c1a8357ff05faa4a04 100644
GIT binary patch
delta 560
zcmV-00?+-tp$5L829P9w5qeZubVOxyV{&P5bZKvH004NLt(DPE^B@?8kK3ytdP<Cg
z{+{*3%$ObMEi`PUEwP0L*j(@4gH_#rOZzg-(t{-rA0H1da7!Mao;R;#{jy09(mG`{
z$w_v1pC<3B^bN@gXKB(%RX6_h$9dr;$;nMEZ71|inv}{ql9McdO)4uo=}1mi7{=42
zl&u&@PF8oEj$fK|<{&$%{bi+{Y4_dMEY3K~T{UG<N>P5-Tg|N$V?`(28(?pii(AWB
z3hS@m*NeRcnYh0CeU0_BGqzU1?gy#Zy|=ZB=&WcPthvH2gROGn7f{?vTjc~Ai@qO#
zU<9eyX!QL6Zh`QB%l1P|WH5w>dn&ASej3cqCZ&w7C`%J7-<2*WssPav9!j9_MI#~1
zsX*tK97Bo)plI<7HqZV>Jp<h{P(B0gGf4lN@?I{#B6C>W7Mv<!n=rC~zmWtCjwI%g
z{{o6mCWn*B|0bCnJ)j(nFb5;d5&gZ?8h9zfROCw`wH`2kubgtqDgS>g_Wnt&2Sn4@
z4+;W8D|5V_iIZ8GBc`J=M?^+tj*tprt?@<GhH}Hs569&1N3n||GCwc0;;q;YJ7Iem
zM7H*e1zdiyfKYXiZW=l}4jIj8MzhONGbiccY!m*`j82aa%Um44vwPP_yL=PPago>e
ysnnJC$LDAs?EW8N<f{Gb3P;0XyCqMrYqEaXq#rO7dN_4O3Uh-z0=GN@0f3J4d<;PV

delta 558
zcmV+}0@3}xp$5F629P9w4|-HsbVOxyV{&P5bZKvH004NLt(C!U;~*48*Y;PSc8jVB
zcxLBKm1>kl`wJF{v4d)Z1tc|pKZ{tMWX9N+w2HEbba*_@yM#yb{PKJEMz*iJ{4A|g
zMw5~hPe1bPL)HFBO2S#59i?iI{_?|l;Uy`_Lo01B^h2K2$~sbik|NI<D|+cjNj4b9
z^Q@Mg2&5#NCr+ntp7rJ|d#U|xrGx2C{obtZxX9hLWmQX2|E;%KIw{7AUbuI_-XfQF
zmZ=oh-*9SIdy6t@eGR7;>*-)@tAOc8snprqRwZ;+bw{kZ%C3W*a^ee6+DSX*1R9HB
z2tY8RRBAMaA%G))5Psc$j7bcJ@NiF+mCnzD#nq;i(G6vJX61*{^-L8YTEasK6uvr2
z2y-gZ`7OtgVi71=JcG@%?@`Y{_Y9QJK>G~R|E|23>#xWXmNtS*C2R;23;3Hzz~Dq;
z4*3_L<YaO<nf!Z_$<YhS!3c9O!W_{*NUedFB2Fc~6jJMdfO+MVQ%?E6Yq9rFY8?<w
zQ$HvO2yM)GKa(c2F(am<F(V?QF(afxSZjRMbg|s9>&r3w`LEc`6<OXFI`LlY!$H^q
z29eQzvVhA^77(h=(#=Cx*P);VEogDOYT+jRx*EbyTG09Raha>@oe%3tk3(rucRq}F
w{%trPz-!_he1PuBr5TWm=jxHXylu($b(jAE1%+}v>vqsWgFXVcJ^}%Nj&O1oqW}N^