From cb532b5ab6ec0eba77eab5d65df35b597706d787 Mon Sep 17 00:00:00 2001
From: Seris02 <49109742+Seris02@users.noreply.github.com>
Date: Sun, 12 Sep 2021 22:35:36 +0800
Subject: [PATCH] [SEMI-MODULAR] fixes bloody soles on digitigrade legs again
 (#8127)

* yes

* woops don't need that
---
 code/datums/components/bloodysoles.dm         |  24 ++++++++----------
 .../code/modules/clothing/shoes/_shoes.dm     |   4 +--
 .../digi_bloodsole/icons/effects/64x64.dmi    | Bin 1113 -> 1116 bytes
 .../digi_bloodsole/icons/effects/blood.dmi    | Bin 883 -> 888 bytes
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/code/datums/components/bloodysoles.dm b/code/datums/components/bloodysoles.dm
index 3100ddb665e..59182d74d25 100644
--- a/code/datums/components/bloodysoles.dm
+++ b/code/datums/components/bloodysoles.dm
@@ -230,12 +230,8 @@
 		return COMPONENT_INCOMPATIBLE
 	parent_atom = parent
 	wielder = parent
-	//SKYRAT EDIT REMOVAL BEGIN -DIGI_BLOODSOLE
-	/*
 	if(!bloody_feet)
 		bloody_feet = mutable_appearance('icons/effects/blood.dmi', "shoeblood", SHOES_LAYER)
-	*/
-	//SKYRAT EDIT REMOVAL END
 	RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, .proc/on_clean)
 	RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/on_moved)
 	RegisterSignal(parent, COMSIG_STEP_ON_BLOOD, .proc/on_step_blood)
@@ -245,6 +241,7 @@
 /datum/component/bloodysoles/feet/update_icon()
 	if(ishuman(wielder))
 		var/mob/living/carbon/human/human = wielder
+		fix_soles() //SKYRAT ADDITION - DIGI_BLOODSOLE
 		if(NOBLOODOVERLAY in human.dna.species.species_traits)
 			return
 		if(bloody_shoes[BLOOD_STATE_HUMAN] > 0 && !is_obscured())
@@ -280,20 +277,21 @@
 	..()
 
 /datum/component/bloodysoles/feet/on_step_blood(datum/source, obj/effect/decal/cleanable/pool)
-	//SKYRAT EDIT ADDITION BEGIN - DIGI_BLOODSOLE
-	//this is done in on_step_blood because both update_icon() and initialize() are called before copy_to() is called, which means we wouldn't be able to see if they had digitigrade legs
-	if(!bloody_feet)
-		var/mob/living/carbon/H = parent
-		if (DIGITIGRADE in H.dna.species.species_traits)
-			bloody_feet = mutable_appearance('modular_skyrat/modules/digi_bloodsole/icons/effects/blood.dmi', "shoeblood", SHOES_LAYER)
-		else
-			bloody_feet = mutable_appearance('icons/effects/blood.dmi', "shoeblood", SHOES_LAYER)
-	//SKYRAT EDIT ADDITION END
 	if(wielder.num_legs < 2)
 		return
 
 	..()
 
+//SKYRAT EDIT ADDITION BEGIN - DIGI_BLOODSOLE
+/datum/component/bloodysoles/feet/proc/fix_soles()
+	var/mob/living/carbon/H = parent
+	if (DIGITIGRADE in H.dna.species.species_traits)
+		if (bloody_feet.icon_state != "shoeblood_digi")
+			bloody_feet = mutable_appearance('modular_skyrat/modules/digi_bloodsole/icons/effects/blood.dmi', "shoeblood_digi", SHOES_LAYER)
+	else if (bloody_feet.icon_state != "shoeblood")
+		bloody_feet = mutable_appearance('icons/effects/blood.dmi', "shoeblood", SHOES_LAYER)
+//SKYRAT EDIT ADDITION END
+
 /datum/component/bloodysoles/feet/proc/unequip_shoecover(datum/source)
 	SIGNAL_HANDLER
 
diff --git a/modular_skyrat/modules/digi_bloodsole/code/modules/clothing/shoes/_shoes.dm b/modular_skyrat/modules/digi_bloodsole/code/modules/clothing/shoes/_shoes.dm
index e0e8eeaf728..679010bf1b8 100644
--- a/modular_skyrat/modules/digi_bloodsole/code/modules/clothing/shoes/_shoes.dm
+++ b/modular_skyrat/modules/digi_bloodsole/code/modules/clothing/shoes/_shoes.dm
@@ -7,9 +7,9 @@
 	if(HAS_BLOOD_DNA(src))
 		if (mutant_styles & STYLE_DIGITIGRADE)
 			if(clothing_flags & LARGE_WORN_ICON)
-				. += mutable_appearance('modular_skyrat/modules/digi_bloodsole/icons/effects/64x64.dmi', "shoeblood_large")
+				. += mutable_appearance('modular_skyrat/modules/digi_bloodsole/icons/effects/64x64.dmi', "shoeblood_large_digi")
 			else
-				. += mutable_appearance('modular_skyrat/modules/digi_bloodsole/icons/effects/blood.dmi', "shoeblood")
+				. += mutable_appearance('modular_skyrat/modules/digi_bloodsole/icons/effects/blood.dmi', "shoeblood_digi")
 		else
 			if(clothing_flags & LARGE_WORN_ICON)
 				. += mutable_appearance('icons/effects/64x64.dmi', "shoeblood_large")
diff --git a/modular_skyrat/modules/digi_bloodsole/icons/effects/64x64.dmi b/modular_skyrat/modules/digi_bloodsole/icons/effects/64x64.dmi
index 507127cc7f904f3e9300b18e2208c6b86cb98d19..0576d056ec2e683de79ef4ca7e3afdabef0e8183 100644
GIT binary patch
delta 145
zcmV;C0B--;2;2yeB!7H*R9JLGWpiV4X>fFDZ*Bkpc$_82u?oU45C-5m_Y^<vE(*cz
z7D<r|?JJZ>&g7sP$OV0U2fyu`aa-<jLs%nyq?@)k82)r7_tiWq7*|iOik3S5v5|&=
zF<EW$I9kj5k$RCmYte~Z)^1>Ua?hS#Vqjco#<B&3HPR1Cbp{|kZ2o5*v8J;FPN_l5

delta 142
zcmV;90CE4^2-ygbB!78&R9JLGWpiV4X>fFDZ*Bkpc$_82u?mAQ5C-5m_Y^<6ONG$w
zmJ%r$^c5r}R}-)e<buAwgWvY`cujA=z|EcxshZ0l3_Co?oH@1x#?z8XlDE|EXbVli
w=rk4i?4`tY4|S7{Ow3imuw=e9{6xVRsmHW9xY^SMk;fiEmjk#Fl(DI^1NwwR>;M1&

diff --git a/modular_skyrat/modules/digi_bloodsole/icons/effects/blood.dmi b/modular_skyrat/modules/digi_bloodsole/icons/effects/blood.dmi
index 4c531deb616fd0f480eeba508d976a160d8cda02..742e9570a602fdf0bd93d7138d9daa5f3a96745d 100644
GIT binary patch
delta 141
zcmV;80CNBH2KWY$B!75%R9JLGWpiV4X>fFDZ*Bkpc$_82u?mAQ5C-5m_Y^<6m)g4C
zQX-N;U!hoXnuE51T+r8d@Y}u?uVD-`{1j-HVw(S8^tU^?Lt{-~JRjte=$7ggt4kFy
v8cSI|-<;z+>ZT33sKvnO$*pDiiGk5ki(&TgQ=k)SI33BFAOaE<v7pleDK|rg

delta 138
zcmV;50CoTP2J;4xB!6>yR9JLGWpiV4X>fFDZ*Bkpc$_82Jqm;{5C+gXbBYh`W&LTV
zSt61`@1SJd1at$Lpx3wXb+5*EoZJFCJGvxmOn)$j=0oO=z63D(j!cmF3+0WLwFnrM
sh9ujOlCQ}4m=%nH%%0a%6pWT?jEjYx9X-9y8_nF-$vOZ40<oyj0_HVA0ssI2