From bc7a4f67d6f0e1154201c6e7d8c5df4e7dcf775c Mon Sep 17 00:00:00 2001
From: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com>
Date: Sat, 30 Mar 2024 09:38:59 -0600
Subject: [PATCH] Fixes Hemophage and Humanoid skintone issues (#1305)

## About The Pull Request

Adds greyscale versions of human sprites so that it doesn't try to add
skin tone on top of mutant color selections. It'll make playing
porcealine white (or any light color) characters possible.

Specifically, some mutant human bodypart varients have been added that
use these new greyscale human sprites I've cooked up.

Before


![image](https://github.com/Bubberstation/Bubberstation/assets/95130227/d120deff-1656-49aa-b136-afb4ecefed18)

After


![image](https://github.com/Bubberstation/Bubberstation/assets/95130227/4558095f-fe48-48c9-a35f-9ec2ca177a50)

## Why It's Good For The Game

This annoyed the shit out of me when trying to color my hemophage. More
flexibility in making characters. (You don't have to pick anthromorph
just to avoid this)

## Proof Of Testing


![image](https://github.com/Bubberstation/Bubberstation/assets/95130227/50184558-d973-4252-8930-40f6ed257890)


![image](https://github.com/Bubberstation/Bubberstation/assets/95130227/8becb3f9-999a-43dd-a855-36f8615c9c4d)


## Changelog

:cl:
fix: Humanoid and Hemophage sprites no longer have base skin tone
issues. Added human greyscale sprites.
/:cl:

---------

Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
---
 code/__DEFINES/~~bubber_defines/species.dm    |   3 +-
 ...hot_humanoids__datum_species_hemophage.png | Bin 1081 -> 1100 bytes
 ...shot_humanoids__datum_species_humanoid.png | Bin 2675 -> 2655 bytes
 .../hemophage/hemophage_species.dm            |  17 ++++++++
 .../human/species_types/humanoid_overrides.dm |   9 ++++
 .../bodyparts/species_parts/misc_bodyparts.dm |  40 +++++++++++++++---
 .../mob/species/human_parts_greyscale.dmi     | Bin 2320 -> 3084 bytes
 .../modules/hemophages/code/species.dm        |   5 ---
 tgstation.dme                                 |   2 +-
 9 files changed, 63 insertions(+), 13 deletions(-)
 create mode 100644 modular_zubbers/code/modules/mob/living/carbon/human/species_types/humanoid_overrides.dm
 delete mode 100644 modular_zubbers/modules/hemophages/code/species.dm

diff --git a/code/__DEFINES/~~bubber_defines/species.dm b/code/__DEFINES/~~bubber_defines/species.dm
index 507a232760f..f5f035de26d 100644
--- a/code/__DEFINES/~~bubber_defines/species.dm
+++ b/code/__DEFINES/~~bubber_defines/species.dm
@@ -1,3 +1,4 @@
 #define SPECIES_SHADEKIN "shadekin"
+#define SPECIES_MUTANT_HUMAN "mhuman" // Hemophages and Demihuman sprite overrides
 #define SPECIES_ABDUCTOR_STATION "lesser_abductor"
-#define BODYPART_ICON_SHADEKIN 'modular_zubbers/icons/mob/species/human_parts_greyscale.dmi'
+#define BODYPART_ICON_BUBBER 'modular_zubbers/icons/mob/species/human_parts_greyscale.dmi'
diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_hemophage.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_hemophage.png
index da1219f9949f6ce3dc7c4d69e245a67357e369b6..a10ac2d72ef6567d423725f5b7bb9d869d4e82d7 100644
GIT binary patch
delta 953
zcmV;q14jJ02+RnOB!7NTOjJd{z`zm`5*8K~7#J8D8X6rP9RS_{0Pz5nzqSAX00930
ziHV5-zW}hXumG9>0M7t5I6;n(lNuT!R$61Tv$J$}fOmU?QBPX{!~g)=008g+5fl_6
zCMFmh9H*+b)YspMi=qI^03;+TEiE(4&C%}e?j0T^rKz@baR`C{wg9Yl60wn-fqx50
zL_t(oh3%Hza@!yfg|Pq;D~b&Q3i40VDvoTw{|j~(IcX=bxRdEcFN(&t?6do6K{96<
z`>SKsG`t$Xn`Tv!8zH5v5jg0gsq0eG0Zq~?SKz4vLF(cjK(<P$R?_-1Nc};ob+=Yh
z5xTko9w@-0P+iw4(Gz+vc$(rPp?^QI%~rv&AxqrwX4UWwM3Mwp13I5co(?LXX=AqA
ztudO=2O~8cW}xz|cE0rvKFj%5f5V||nc$6e&UoXTHNL28Ya!oSP3R5)4)Wo%5CQrC
z1Q>cK>C8K0At-=ojVl10(SsfacxgfpAUF?2=#WPw-40LyEJZ<w3cdC>0Dqok0QhB@
z0nCBrItxCq4?y~s>2P<Jd?+E)S?tCbZh#QSE@t``XP?$k58F(KfZZ6pF~Jxg#@(0$
zVvj4RaUJ`Z=`8NLxIY}9U%np?`?%X>fZdO{KOQ0bc-+UB=@1baR^YG#{6gr4(sAG-
z8drQu{z%7r?cpkgr{o=w^nWTKu+l^F0f6d5;Tiac0CxiJ0s@TX?Q8lpy}nKi-=;6=
zr?<D$G_!falcGLPNuTDT&d#UP`FvrQGoE}w|62o$1N^zz1FXQDd9^(N|6UBfNLVfA
z4vb3v%{`?kSU4B&DoI%KMLB;Vh$<lgL`S>hMs=cE0$xL@HD&LtUw<n_)t83oh2+p9
z5G8D&dEgR)NWki;Z`-b;E9knm?OXCrO3t6!wymuJ$SvnYm!!1}9{#MA4r2qd4^kKX
zAI#svu3gzP7mFSSF!=%j^1-*AsSz+Aw&g(=2;jQ|>}Dn)gaTml5@fS31#Jto;NcP#
zfEj#1qlfUkf@J&VUVjB<=@haGbOIPGpbCHzOagpf1T=r#FU>uG!6=(|a%leH3Vp#n
z05lTUfIY%z5tao3W7YdW8xfGNVM6S$;}{Qz=NAg_@_abNalGz{UN!h@tlM{*!!>V^
zei5qqHv*lHglc{w)bjrW5CB`!Tm#IoA=LoM{40cc=@DuH*d`oYDEV^hA?UG~KMlC`
b2)~b?Gayz{lCLXf00000NkvXXu0mjfgP^Yo

delta 916
zcmV;F18e-u2)PK5Bwue(OjJd{z`zm`5*8K~7#J8D8X6rP9RU9Tl)ttB?f?J)0Evl-
z0JH$Gu&@Bx0074T0GR+aI6;n(lNuT!R$61Tv$J$}fOmU?QBPYD6ci#RCKwzXr>eHp
z*WZbYqLGgk1nx!2*O9A%e+NlKK~z|U?Uvng+aM5yu>b{!An{vlCsiET@BfV5MNZlY
zEbe4-(Tn1-E&1$zS|Q9?#=dpzhJkkj_%Q4`@*t#?Jpu<^41HZnI$$Vz=L)=3AV^)@
z1IQ7Fr1fo(`h!&aaj&EzbaewfP=H6Fpa3N_p=-g*Ej|+Z6Vpabf67q#jLm%54Sa@3
ziZCmsW-^~iUS3o_v(8P^<eVjR@1%v7^HhGYF_{$MyPY5G4;(hM3CV>RU2-u7mzuf_
z0rEqzgdPD9As@aQ5uke@z_7lhvlLx`pbTPgu>pwAdh0#BEum)+VuB)Ut|N*bJQM&^
z(a@p7WYZ0RM->2mf7$K;?t#@h%PF%DKsl>)csg4?lu+qxQj^X%K-O?p>v;EN4y~_s
z2ryGl&SmFPo=g>>jn+7W7UxmxdcDtP(ud>e`Q_*7c+iviyr7GIIzjg7)Y2hhW>`VQ
z3h<=Tb<thXb^8y4ljve|mHd^C&pN?X8mr_TQ1mV!v(_T{e*i%Bxv>WRA;6u0yMPR1
z`}mr^EU&K%!;j@l`uXkcysT_p@Sv%$OVO9Lsk6)Ze7RiN^@0aq(7$VdaezNJdw?C7
zGw-$s;NP3UHwnAV+=0=_zqzLr4GZVuT_p)yzG&xf1koiFfEa0aoYg40CEztiwI}Ua
z@6|}vSBB6+e{yIMh!SRyxP%}QuzP|IVI1iSp#3n~kWW%_{$z|&G(ah14Ch3bWUb5z
z{;Zu2V+J{8X`B8J<{x0!?(CVHMSBk>-ylFf_;z$X0_MZE>}`VpzUyH(a~UBN0F$?%
zP<1J2TcG6xm*@bTPZ^CK!s`l(?YnywxUEyDDzF9Mf3Scq07`HL@Ocu@{Bgf@_W%x~
zLfy%s`DbhrFo;^psA2Dru}Ao<!n9-!3l+VOSc;owl+N`W7Q_LYfaCG`g{t7?`FO<M
z;6U`MInBCn-{l_Wx<UF)=;q%DbUqTg`GwHS{|`U_Y)NYmu)>Da0~GV`5Z0|n=mlVN
qaHZtyBCUs@$7cRC;MODjIer0_3Q+s<#b3n$0000<MNUMnLSTZT>9}72

diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_humanoid.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_humanoid.png
index daf59febb0397641c4c5014bd50a7c5408b2be80..30838bfd388c61c2408da81d4406b6838183c7c4 100644
GIT binary patch
delta 2526
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

delta 2546
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
IM6N<$f(;YOTmS$7

diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/hemophage/hemophage_species.dm b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/hemophage/hemophage_species.dm
index e884d2f6276..4b8a6cb3d90 100644
--- a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/hemophage/hemophage_species.dm
+++ b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/hemophage/hemophage_species.dm
@@ -1,6 +1,23 @@
 /datum/species/hemophage
 	inherent_biotypes = MOB_HUMANOID | MOB_ORGANIC | MOB_VAMPIRIC
+	bodypart_overrides = list(
+		BODY_ZONE_HEAD = /obj/item/bodypart/head/mhuman,
+		BODY_ZONE_CHEST = /obj/item/bodypart/chest/mhuman,
+		BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left/mhuman,
+		BODY_ZONE_R_ARM = /obj/item/bodypart/arm/right/mhuman,
+		BODY_ZONE_L_LEG = /obj/item/bodypart/leg/left/mhuman,
+		BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/mhuman,
+	)
 
+// MUTANT COLOR OVERRIDE
+
+/datum/species/hemophage/New()
+	inherent_traits |= list(
+		TRAIT_MUTANT_COLORS,
+	)
+	. = ..()
+
+// BLOODSUCKER SPECIFIC FIXES
 /datum/species/hemophage/on_bloodsucker_gain(mob/living/carbon/human/target)
 	to_chat(target, span_warning("Your hemophage features have been removed, your nature as a bloodsucker abates the hemophage virus."))
 	// Without this any new organs would get corrupted again.
diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/humanoid_overrides.dm b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/humanoid_overrides.dm
new file mode 100644
index 00000000000..91d93ab9b3c
--- /dev/null
+++ b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/humanoid_overrides.dm
@@ -0,0 +1,9 @@
+/datum/species/humanoid
+	bodypart_overrides = list(
+		BODY_ZONE_HEAD = /obj/item/bodypart/head/mhuman,
+		BODY_ZONE_CHEST = /obj/item/bodypart/chest/mhuman,
+		BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left/mhuman,
+		BODY_ZONE_R_ARM = /obj/item/bodypart/arm/right/mhuman,
+		BODY_ZONE_L_LEG = /obj/item/bodypart/leg/left/mhuman,
+		BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/mhuman,
+	)
diff --git a/modular_zubbers/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm b/modular_zubbers/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm
index 04074c257ae..b839737d715 100644
--- a/modular_zubbers/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm
+++ b/modular_zubbers/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm
@@ -1,25 +1,53 @@
+// SHADEKIN //
+
 /obj/item/bodypart/head/shadekin
-	icon_greyscale = BODYPART_ICON_SHADEKIN
+	icon_greyscale = BODYPART_ICON_BUBBER
 	limb_id = SPECIES_SHADEKIN
 	is_dimorphic = TRUE
 
 /obj/item/bodypart/chest/shadekin
-	icon_greyscale = BODYPART_ICON_SHADEKIN
+	icon_greyscale = BODYPART_ICON_BUBBER
 	limb_id = SPECIES_SHADEKIN
 	is_dimorphic = TRUE
 
 /obj/item/bodypart/arm/left/shadekin
-	icon_greyscale = BODYPART_ICON_SHADEKIN
+	icon_greyscale = BODYPART_ICON_BUBBER
 	limb_id = SPECIES_SHADEKIN
 
 /obj/item/bodypart/arm/right/shadekin
-	icon_greyscale = BODYPART_ICON_SHADEKIN
+	icon_greyscale = BODYPART_ICON_BUBBER
 	limb_id = SPECIES_SHADEKIN
 
 /obj/item/bodypart/leg/left/shadekin
-	icon_greyscale = BODYPART_ICON_SHADEKIN
+	icon_greyscale = BODYPART_ICON_BUBBER
 	limb_id = SPECIES_SHADEKIN
 
 /obj/item/bodypart/leg/right/shadekin
-	icon_greyscale = BODYPART_ICON_SHADEKIN
+	icon_greyscale = BODYPART_ICON_BUBBER
 	limb_id = SPECIES_SHADEKIN
+
+// MUTANT HUMAN PART OVERRIDES - HEMOPHAGE AND HUMANOID SPRITE OVERRIDES//
+
+/obj/item/bodypart/head/mhuman
+	icon_greyscale = BODYPART_ICON_BUBBER
+	limb_id = SPECIES_MUTANT_HUMAN
+
+/obj/item/bodypart/chest/mhuman
+	icon_greyscale = BODYPART_ICON_BUBBER
+	limb_id = SPECIES_MUTANT_HUMAN
+
+/obj/item/bodypart/arm/left/mhuman
+	icon_greyscale = BODYPART_ICON_MAMMAL
+	limb_id = SPECIES_MAMMAL
+
+/obj/item/bodypart/arm/right/mhuman
+	icon_greyscale = BODYPART_ICON_MAMMAL
+	limb_id = SPECIES_MAMMAL
+
+/obj/item/bodypart/leg/left/mhuman
+	icon_greyscale = BODYPART_ICON_BUBBER
+	limb_id = SPECIES_MUTANT_HUMAN
+
+/obj/item/bodypart/leg/right/mhuman
+	icon_greyscale = BODYPART_ICON_BUBBER
+	limb_id = SPECIES_MUTANT_HUMAN
diff --git a/modular_zubbers/icons/mob/species/human_parts_greyscale.dmi b/modular_zubbers/icons/mob/species/human_parts_greyscale.dmi
index 16629622c646ae1649bfea68860a6cf43e928d65..269eb63e0147c033b8178cfc62cd8b50bc4813b2 100644
GIT binary patch
delta 2804
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
a1$aUZU&IxO$NKsI_(qspnH8H}jrt#gf?Xs4

delta 2034
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
LPM6<X-irSp6%qS;

diff --git a/modular_zubbers/modules/hemophages/code/species.dm b/modular_zubbers/modules/hemophages/code/species.dm
deleted file mode 100644
index 014c3e5ee18..00000000000
--- a/modular_zubbers/modules/hemophages/code/species.dm
+++ /dev/null
@@ -1,5 +0,0 @@
-/datum/species/hemophage/New()
-	inherent_traits |= list(
-		TRAIT_MUTANT_COLORS,
-	)
-	. = ..()
diff --git a/tgstation.dme b/tgstation.dme
index bbb2f7e0716..67b487ecac1 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -8477,6 +8477,7 @@
 #include "modular_zubbers\code\modules\mob\living\carbon\human\_species.dm"
 #include "modular_zubbers\code\modules\mob\living\carbon\human\human.dm"
 #include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\abductor.dm"
+#include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\humanoid_overrides.dm"
 #include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\jellypeople.dm"
 #include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\lizardpeople.dm"
 #include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\monkeys.dm"
@@ -8623,7 +8624,6 @@
 #include "modular_zubbers\modules\gladiator\code\game\objects\items\gladiator_items.dm"
 #include "modular_zubbers\modules\hacks\atmos\force_atmos.dm"
 #include "modular_zubbers\modules\hemophages\code\limbgrower.dm"
-#include "modular_zubbers\modules\hemophages\code\species.dm"
 #include "modular_zubbers\modules\hydroponics\code\grown\rocks.dm"
 #include "modular_zubbers\modules\hydroponics\code\plantgenes\hydroponics.dm"
 #include "modular_zubbers\modules\hydroponics\code\vending\megaseed.dm"