From 3947a03b24fdc983d8db31982c4ce55c42b8f837 Mon Sep 17 00:00:00 2001 From: oranges Date: Mon, 22 Jul 2024 09:03:58 +1200 Subject: [PATCH] Revert "Adds the other half of the fox infusion because Arm is a coward" (#85173) Reverts tgstation/tgstation#85129 --- code/datums/sprite_accessories.dm | 7 ------- .../infuser_tier_zero_entries.dm | 1 - code/modules/surgery/organs/external/tails.dm | 15 +++------------ icons/mob/human/cat_features.dmi | Bin 3129 -> 1906 bytes 4 files changed, 3 insertions(+), 20 deletions(-) diff --git a/code/datums/sprite_accessories.dm b/code/datums/sprite_accessories.dm index 8f5bff2be6a..eccb2161c73 100644 --- a/code/datums/sprite_accessories.dm +++ b/code/datums/sprite_accessories.dm @@ -1781,13 +1781,6 @@ icon_state = "default" color_src = HAIR_COLOR -/datum/sprite_accessory/tails/human/fox - name = "Fox" - icon_state = "fox" - icon = 'icons/mob/human/cat_features.dmi' - color_src = HAIR_COLOR - locked = TRUE - /datum/sprite_accessory/tails/monkey/default name = "Monkey" icon = 'icons/mob/human/species/monkey/monkey_tail.dmi' diff --git a/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_zero_entries.dm b/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_zero_entries.dm index 8a5d93d11f3..235986cbd0d 100644 --- a/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_zero_entries.dm +++ b/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_zero_entries.dm @@ -41,7 +41,6 @@ /mob/living/basic/pet/fox, ) output_organs = list( - /obj/item/organ/external/tail/cat/fox, /obj/item/organ/internal/ears/fox, ) infusion_desc = "inexcusable" diff --git a/code/modules/surgery/organs/external/tails.dm b/code/modules/surgery/organs/external/tails.dm index 00705c341cf..e4cd3f50a49 100644 --- a/code/modules/surgery/organs/external/tails.dm +++ b/code/modules/surgery/organs/external/tails.dm @@ -150,9 +150,6 @@ return FALSE return TRUE -/datum/bodypart_overlay/mutant/tail/get_global_feature_list() - return SSaccessories.tails_list_human - /obj/item/organ/external/tail/cat name = "tail" preference = "feature_human_tail" @@ -161,6 +158,9 @@ wag_flags = WAG_ABLE +/datum/bodypart_overlay/mutant/tail/get_global_feature_list() + return SSaccessories.tails_list_human + /obj/item/organ/external/tail/cat/get_butt_sprite() return icon('icons/mob/butts.dmi', BUTT_SPRITE_CAT) @@ -169,15 +169,6 @@ feature_key = "tail_cat" color_source = ORGAN_COLOR_HAIR -/obj/item/organ/external/tail/cat/fox - name = "fox tail" - bodypart_overlay = /datum/bodypart_overlay/mutant/tail/cat/fox - dna_block = null - sprite_accessory_override = /datum/sprite_accessory/tails/human/fox - -///Fox tail bodypart overlay -/datum/bodypart_overlay/mutant/tail/cat/fox - /obj/item/organ/external/tail/monkey name = "monkey tail" preference = "feature_monkey_tail" diff --git a/icons/mob/human/cat_features.dmi b/icons/mob/human/cat_features.dmi index 022169c9dc1c6766e9dc2cc3df09489b7428fd0f..6e7fd024fee1d2b32e9e8feac22fbd88cb568dc4 100644 GIT binary patch delta 1898 zcmV-w2bK7_81fD!iBL{Q4GJ0x0000DNk~Le0004i0004C1Oos706?v?4gdfE9+4#< zf55=ND1bCM00001bW%=J06^y0W&i*H>3URHbVOxyV{&P5bZKvH004NLos_)}f-n?? zXZjQktj74ax)4wq#KgFhYD>9EDX|ohx0hm~gCx?X%el$@a?U+N102TtB*oD&K@X;C zs3hLv&3u8p7N{=zVZB0L!GIU~J=B_Lf7VOC%otI1b|X65oloh-M;--L8yjifG!Lpleqyb>;iLpXbF2000IJNkl!Ef6(6o;iSQGJY(9ePyK9ePaaF4)mXTcF1PUGD+} z_&i{TUA<+%_GeFaGMi5#pG3;Gz+yEtY5`{rr8gZ~A_dA+)8r-Ja#lrEEO(g9?Z<=#W-HaU_naoFSg;5M0d0JeJs zFbbz0fU(@mN|%MZb~4z%Jf?J6O#5flEbT(+GMRP&^7?Sz1k=6+00000e*oZAD7L#3 z<*`VT+l6X!CX2;^Jc*<`ztB9qIFu_eNzms9;y#lp)ixvR^FkMTaGuFsyX#?GeZI2K zxy)Q9<c|9sh?hdr}qVtFp(a`n)000000001RqD(pY(1&c`0K3E?y*MP+tvA_8dW^QBvxRMg$losje`K*`WNf81HpZ&U!bx@+8%fRyIdgR#zODz^jv9_llSB%!;#`ux0o%y!0V zuLO`)qD|%QK-1^Np!ot&+6(W5Gj0?8sC%g0U#zqD@aO-Bwr}+2t}grc0000000000 z5JTMJEF)tJvJtwFv@Bht`a9r~aXS~s8Q9)F|49ZQ^!b>FukBmJouJSiumf-<7?g+KH`s$7 zvpkM{-^49&G;9FGPfSbz_HRs7dwT?j1~7uYFE0?*7XknP008jv>vren&8l5DQ|yn< zKlL_S`H#;&f3@pAD)vX`(`AxeFBF5D*6WbdtHZey&RO2!&{;cx;y}It0Kf~G=ku2G zIDSN9%H8L1d0R{wu)DH4IP}sY)>(rCkV`bVr#cK?hDxP&&+5N&oJ)OpJ-ahj6X*Im z`szA^kuwN_b5xngkT@rcXfsImKxLLg5)7siNkaDke;hW=D*OxA=jHW;cDO`g|!{i=s!uPnAZ z4@JAme&6p}{?8pYJJM@ezSqMwd8>uWS<-p|aoeClVSRqQNz&Ve*1`1$S$=n~dvxdd z8+ahPf8TFx{*vXdtXB&F000000000mJ&rA}@0}ic{j}+!*H4?Z`kn{qzr}VJ$9k~z zlto~E;JJ2wzUuG5W054c3)Q5NAt*%YYMmcYT?)((gr=Cf_5J4Ig(&^7Hc$fy%nz)# zI{*Lx000000000u8IGOc$S+?uKWTFUgl;`we@}quctYRitVojE4ii}{#QEOdB!(e+$qxjmr^R;XqorM| z)YJRtve>ibDs-w$*tjL-x}_XLQdS<#UX8AzvI k4*&oF0000005C590&#=9ZzMyq!TpsJ^%m! literal 3129 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 NWnq7+^2B-ke*pJ?ER6sF