added in (still not working) mutcolors code

Monkestation · Oct 25, 2023 · 2c28cd5 · 2c28cd5
1 parent 7abc643
commit 2c28cd5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/code/__DEFINES/external_organs.dm b/code/__DEFINES/external_organs.dm
@@ -6,6 +6,9 @@
 #define ORGAN_COLOR_HAIR (1<<2)
 ///uses the parents anime color
 #define ORGAN_COLOR_ANIME (1<<3)
+///uses the parents mutcolor secondary
+#define ORGAN_COLOR_MUTSECONDARY (1<<4)
+
 ///Tail wagging
 #define WAG_ABLE (1<<0)
 #define WAG_WAGGING (1<<1)
diff --git a/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm b/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm
@@ -140,6 +140,11 @@
 				return
 			var/mob/living/carbon/human/human_owner = ownerlimb.owner
 			draw_color = human_owner.dna.features["animecolor"]
+		if(ORGAN_COLOR_MUTSECONDARY)
+			if(!ishuman(ownerlimb.owner))
+				return
+			var/mob/living/carbon/human/human_owner = ownerlimb.owner
+			draw_color = human_owner.dna.features["mcolor_secondary"]
 
 	return TRUE
 

diff --git a/monkestation/code/modules/mob/living/carbon/human/species_type/floran.dm b/monkestation/code/modules/mob/living/carbon/human/species_type/floran.dm
@@ -5,7 +5,7 @@
 	sexes = FALSE
 	species_traits = list(
 		MUTCOLORS,
-		// MUTCOLORS_SECONDARY,
+		MUTCOLORS_SECONDARY,
 		NO_UNDERWEAR,
 	)
 	inherent_traits = list(
@@ -74,9 +74,9 @@
 		H.adjustToxLoss(3 * REM * seconds_per_tick)
 		H.reagents.remove_reagent(chem.type, REAGENTS_METABOLISM * seconds_per_tick)
 		return TRUE
-	// if(chem.type == /datum/reagent/potassium)
-	// 	H.reagents.remove_reagent(chem.type, /*All of the reagent*/)
-	// 	explosion(H.loc, 0, 0, 0, 1, 1)
+	/*if(chem.type == /datum/reagent/potassium)
+		H.reagents.remove_reagent(chem.type, /*All of the reagent*/)
+		explosion(H.loc, 0, 0, 0, 1, 1)*/
 	return ..()
 
 /datum/species/floran/randomize_features(mob/living/carbon/human_mob)

diff --git a/monkestation/code/modules/surgery/organs/external/floran_accessories.dm b/monkestation/code/modules/surgery/organs/external/floran_accessories.dm
@@ -15,6 +15,7 @@
 /datum/bodypart_overlay/mutant/floran_leaves
 	layers = EXTERNAL_ADJACENT
 	feature_key = "floran_leaves"
+	// color_source = ORGAN_COLOR_MUTSECONDARY
 
 	var/color_swapped_layer = EXTERNAL_ADJACENT//Remove when MUTCOLORS_SECONDARY works
 	var/color_inverse_base = 255//Remove when MUTCOLORS_SECONDARY works