Merge pull request #99 from Artemchik542/second-color-revert

Полный реверт пиара #75

code/__DEFINES/DNA.dm

@@ -60,12 +60,9 @@
 #define DNA_MOTH_MARKINGS_BLOCK 13
 #define DNA_MUSHROOM_CAPS_BLOCK 14
 #define DNA_POD_HAIR_BLOCK 15
-#define DNA_MUTANT_COLOR_SECONDARY_BLOCK 16 //Add secondary color for species MASSMETA EDIT
-
-//#define DNA_FEATURE_BLOCKS 16
-#define DNA_FEATURE_BLOCKS 17 // add +1 new DNA BLOCK
 #define DNA_MONKEY_TAIL_BLOCK 16
 
+#define DNA_FEATURE_BLOCKS 16
 
 #define DNA_SEQUENCE_LENGTH 4
 #define DNA_MUTATION_BLOCKS 8

code/__DEFINES/sprite_accessories.dm

@@ -1,8 +1,6 @@
 // ~color source defines for sprite accessories
 /// Color of the sprite accessory will match the owner's mutant color, which is granted by certain species
 #define MUTANT_COLOR "mutant_color"
-///Secondary color of the sprite accessory will match the owner's mutant secondary color, which is granted by certain species
-#define MUTANT_COLOR_SECONDARY "mutant_color_secondary" // MASSMETA EDIT
 /// Color of the sprite accessory will match the owner's hair color
 #define HAIR_COLOR "hair_color"
 /// Color of the sprite accessory will match the owner's facial hair color
@@ -14,4 +12,4 @@
 /// Uses the species's mutant color for the hair color
 #define USE_MUTANT_COLOR "use_mutant_color"
 /// Uses the species's fixed mutant color for the hair color
-#define USE_FIXED_MUTANT_COLOR "use_fixed_mutant_color"
+#define USE_FIXED_MUTANT_COLOR "use_fixed_mutant_color"

code/__DEFINES/traits/declarations.dm

@@ -144,12 +144,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_USES_SKINTONES "uses_skintones"
 /// Species with this trait use mutant colors for coloration
 #define TRAIT_MUTANT_COLORS "mutcolors"
-/// Species with this trait use second mutant colors for coloration
-#define TRAIT_MUTANT_COLORS_SECONDARY "mutcolors_secondary" // MASSMETA EDIT
 /// Species with this trait have mutant colors that cannot be chosen by the player, nor altered ingame by external means
 #define TRAIT_FIXED_MUTANT_COLORS "fixed_mutcolors"
-/// Species with this trait have second mutant colors that cannot be chosen by the player, nor altered ingame by external means
-#define TRAIT_FIXED_MUTANT_COLORS_SECONDARY "fixed_mutcolors_secondary" // MASSMETA EDIT
 /// Species with this trait have a haircolor that cannot be chosen by the player, nor altered ingame by external means
 #define TRAIT_FIXED_HAIRCOLOR "fixed_haircolor"
 /// Humans with this trait won't get bloody hands, nor bloody feet

code/_globalvars/traits/_traits.dm

@@ -222,7 +222,6 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_FIST_MINING" = TRAIT_FIST_MINING,
 		"TRAIT_FIXED_HAIRCOLOR" = TRAIT_FIXED_HAIRCOLOR,
 		"TRAIT_FIXED_MUTANT_COLORS" = TRAIT_FIXED_MUTANT_COLORS,
-		"TRAIT_FIXED_MUTANT_COLORS_SECONDARY" = TRAIT_FIXED_MUTANT_COLORS_SECONDARY, // MASSMETA EDIT
 		"TRAIT_FLESH_DESIRE" = TRAIT_FLESH_DESIRE,
 		"TRAIT_FLOORED" = TRAIT_FLOORED,
 		"TRAIT_FORBID_MINING_SHUTTLE_CONSOLE_OUTSIDE_STATION" = TRAIT_FORBID_MINING_SHUTTLE_CONSOLE_OUTSIDE_STATION,
@@ -310,7 +309,6 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_MULTIZ_SUIT_SENSORS" = TRAIT_MULTIZ_SUIT_SENSORS,
 		"TRAIT_MUSICIAN" = TRAIT_MUSICIAN,
 		"TRAIT_MUTANT_COLORS" = TRAIT_MUTANT_COLORS,
-		"TRAIT_MUTANT_COLORS_SECONDARY" = TRAIT_MUTANT_COLORS_SECONDARY, // MASSMETA EDIT
 		"TRAIT_MUTE" = TRAIT_MUTE,
 		"TRAIT_NAIVE" = TRAIT_NAIVE,
 		"TRAIT_NEARSIGHTED_CORRECTED" = TRAIT_NEARSIGHTED_CORRECTED,

code/_globalvars/traits/admin_tooling.dm

@@ -80,7 +80,6 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"TRAIT_FIST_MINING" = TRAIT_FIST_MINING,
 		"TRAIT_FIXED_HAIRCOLOR" = TRAIT_FIXED_HAIRCOLOR,
 		"TRAIT_FIXED_MUTANT_COLORS" = TRAIT_FIXED_MUTANT_COLORS,
-		"TRAIT_FIXED_MUTANT_COLORS_SECONDARY" = TRAIT_FIXED_MUTANT_COLORS_SECONDARY, // MASSMETA EDIT
 		"TRAIT_FLOORED" = TRAIT_FLOORED,
 		"TRAIT_FORCED_STANDING" = TRAIT_FORCED_STANDING,
 		"TRAIT_FREERUNNING" = TRAIT_FREERUNNING,
@@ -127,7 +126,6 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"TRAIT_MORBID" = TRAIT_MORBID,
 		"TRAIT_MUSICIAN" = TRAIT_MUSICIAN,
 		"TRAIT_MUTANT_COLORS" = TRAIT_MUTANT_COLORS,
-		"TRAIT_MUTANT_COLORS_SECONDARY" = TRAIT_MUTANT_COLORS_SECONDARY, // MASSMETA EDIT
 		"TRAIT_MUTE" = TRAIT_MUTE,
 		"TRAIT_NAIVE" = TRAIT_NAIVE,
 		"TRAIT_NEVER_WOUNDED" = TRAIT_NEVER_WOUNDED,

code/datums/bodypart_overlays/bodypart_overlay.dm

@@ -15,14 +15,6 @@
 	. = get_image(layer, limb)
 	color_image(., layer, limb)
 
-// Edit START (secondary color)
-
-///Wrapper for getting the proper secondary image, colored and everything
-/datum/bodypart_overlay/proc/get_extended_overlay(layer, obj/item/bodypart/limb) // MASSMETA EDIT
-	return
-
-//Edit END
-
 ///Generate the image. Needs to be overriden
 /datum/bodypart_overlay/proc/get_image(layer, obj/item/bodypart/limb)
 	CRASH("Get image needs to be overridden")

code/datums/bodypart_overlays/mutant_bodypart_overlay.dm

@@ -23,20 +23,6 @@
 	draw_color = "#[random_color()]"
 	imprint_on_next_insertion = FALSE
 
-// Edit START (secondary color)
-
-/datum/bodypart_overlay/mutant/get_extended_overlay(layer, obj/item/bodypart/limb) // MASSMETA EDIT
-	layer = bitflag_to_layer(layer)
-	var/passed_color = sprite_datum.color_src ? draw_color : null
-	var/mob/living/carbon/human/owner = limb.owner
-	if(!owner)
-		return
-	var/datum/species/owner_species = owner.dna.species
-
-	return owner_species.return_accessory_layer(-layer, sprite_datum, owner, passed_color)
-
-// Edit END
-
 ///Grab a random sprite
 /datum/bodypart_overlay/mutant/proc/randomize_sprite()
 	sprite_datum = get_random_appearance()

code/datums/dna.dm

@@ -23,7 +23,6 @@ GLOBAL_LIST_INIT(identity_block_lengths, list(
  */
 GLOBAL_LIST_INIT(features_block_lengths, list(
 		"[DNA_MUTANT_COLOR_BLOCK]" = DNA_BLOCK_SIZE_COLOR,
-		"[DNA_MUTANT_COLOR_SECONDARY_BLOCK]" = DNA_BLOCK_SIZE_COLOR, // MASSMETA EDIT
 		"[DNA_ETHEREAL_COLOR_BLOCK]" = DNA_BLOCK_SIZE_COLOR,
 	))
 
@@ -62,7 +61,7 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block())
 	/// Assoc list of feature keys to their value
 	/// Note if you set these manually, and do not update [unique_features] afterwards, it will likely be reset.
 
-	var/list/features = list("mcolor" = COLOR_WHITE, "mcolor_secondary" = COLOR_WHITE) // MASSMETA EDIT
+	var/list/features = list("mcolor" = COLOR_WHITE)
 
 	///Stores the hashed values of the person's non-human features
 	var/unique_features
@@ -208,12 +207,6 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block())
 
 	if(features["mcolor"])
 		L[DNA_MUTANT_COLOR_BLOCK] = sanitize_hexcolor(features["mcolor"], include_crunch = FALSE)
-
-	// Add secondary species color
-	if(features["mcolor_secondary"])
-		L[DNA_MUTANT_COLOR_SECONDARY_BLOCK] = sanitize_hexcolor(features["mcolor_secondary"], include_crunch = FALSE) // MASSMETA EDIT
-	// Edit End
-
 	if(features["ethcolor"])
 		L[DNA_ETHEREAL_COLOR_BLOCK] = sanitize_hexcolor(features["ethcolor"], include_crunch = FALSE)
 	if(features["body_markings"])
@@ -360,12 +353,6 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block())
 	switch(blocknumber)
 		if(DNA_MUTANT_COLOR_BLOCK)
 			set_uni_feature_block(blocknumber, sanitize_hexcolor(features["mcolor"], include_crunch = FALSE))
-
-		// Add secondary color for species
-		if(DNA_MUTANT_COLOR_SECONDARY_BLOCK)
-			set_uni_feature_block(blocknumber, sanitize_hexcolor(features["mcolor_secondary"], include_crunch = FALSE)) // MASSMETA EDIT
-		// Edit End
-
 		if(DNA_ETHEREAL_COLOR_BLOCK)
 			set_uni_feature_block(blocknumber, sanitize_hexcolor(features["ethcolor"], include_crunch = FALSE))
 		if(DNA_LIZARD_MARKINGS_BLOCK)
@@ -484,7 +471,6 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block())
 			features |= GLOB.species_prototypes[species_type].randomize_features()
 
 		features["mcolor"] = "#[random_color()]"
-		features["mcolor_secondary"] = "#[random_color()]" // MASSMETA EDIT
 
 	update_dna_identity()
 
@@ -663,12 +649,6 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block())
 	var/features = dna.unique_features
 	if(dna.features["mcolor"])
 		dna.features["mcolor"] = sanitize_hexcolor(get_uni_feature_block(features, DNA_MUTANT_COLOR_BLOCK))
-
-	// Add secondary color for species
-	if(dna.features["mcolor_secondary"])
-		dna.features["mcolor_secondary"] = sanitize_hexcolor(get_uni_feature_block(features, DNA_MUTANT_COLOR_SECONDARY_BLOCK)) // MASSMETA EDIT
-	// Edit End
-
 	if(dna.features["ethcolor"])
 		dna.features["ethcolor"] = sanitize_hexcolor(get_uni_feature_block(features, DNA_ETHEREAL_COLOR_BLOCK))
 	if(dna.features["body_markings"])

code/modules/mob/living/carbon/human/_species.dm

@@ -703,11 +703,6 @@ GLOBAL_LIST_EMPTY(features_by_species)
 					switch(accessory.color_src)
 						if(MUTANT_COLOR)
 							accessory_overlay.color = fixed_mut_color || source.dna.features["mcolor"]
-						// Edit START (secondary color)
-						if(MUTANT_COLOR_SECONDARY) // MASSMETA EDIT
-							if(fixed_mut_color)
-								accessory_overlay.color = fixed_mut_color || source.dna.features["mcolor_secondary"]
-						// Edit END
 						if(HAIR_COLOR)
 							accessory_overlay.color = get_fixed_hair_color(source) || source.hair_color
 						if(FACIAL_HAIR_COLOR)
@@ -718,13 +713,6 @@ GLOBAL_LIST_EMPTY(features_by_species)
 					accessory_overlay.color = forced_colour
 			standing += accessory_overlay
 
-			// Edit START (secondary color)
-
-			if(length(accessory.external_slots)) // MASSMETA EDIT
-				standing += return_accessory_layer(layer, accessory, source, accessory_overlay.color)
-
-			// Edit END
-
 			if(accessory.hasinner)
 				var/mutable_appearance/inner_accessory_overlay = mutable_appearance(accessory.icon, layer = -layer)
 				if(accessory.gender_specific)

code/modules/mob/living/carbon/human/dummy.dm

@@ -102,7 +102,6 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)
 
 /proc/create_consistent_human_dna(mob/living/carbon/human/target)
 	target.dna.features["mcolor"] = COLOR_VIBRANT_LIME
-	target.dna.features["mcolor_secondary"] = COLOR_VIBRANT_LIME // secondary color MASSMETA EDIT
 	target.dna.features["ethcolor"] = COLOR_WHITE
 	target.dna.features["body_markings"] = get_consistent_feature_entry(SSaccessories.body_markings_list)
 	target.dna.features["ears"] = get_consistent_feature_entry(SSaccessories.ears_list)

code/modules/mob/living/carbon/human/species_types/lizardpeople.dm

@@ -5,7 +5,6 @@
 	id = SPECIES_LIZARD
 	inherent_traits = list(
 		TRAIT_MUTANT_COLORS,
-		TRAIT_MUTANT_COLORS_SECONDARY, // Add secondary color MASSMETA EDIT
 		TRAIT_TACKLING_TAILED_DEFENDER,
 	)
 	inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_REPTILE
@@ -158,7 +157,6 @@ Lizard subspecies: ASHWALKERS
 	mutantbrain = /obj/item/organ/internal/brain/primitive
 	inherent_traits = list(
 		TRAIT_MUTANT_COLORS,
-		TRAIT_MUTANT_COLORS_SECONDARY, // Add secondary color MASSMETA EDIT
 		TRAIT_VIRUSIMMUNE,
 		TRAIT_FORBID_MINING_SHUTTLE_CONSOLE_OUTSIDE_STATION,
 	)

code/modules/surgery/bodyparts/_bodyparts.dm

@@ -1060,14 +1060,6 @@
 				if(overlay.layers & external_layer)
 					. += overlay.get_overlay(external_layer, src)
 
-				// Edit START (secondary color)
-
-				if(overlay.get_extended_overlay(external_layer, src)) // MASSMETA EDIT
-					for(var/mutable_appearance/item as anything in overlay.get_extended_overlay(external_layer, src))
-						. += item
-
-				// Edit END
-
 	return .
 
 /obj/item/bodypart/proc/huskify_image(image/thing_to_husk, draw_blood = TRUE)

code/modules/surgery/organs/external/tails.dm

@@ -79,25 +79,6 @@
 		organ_owner.add_mood_event("tail_lost", /datum/mood_event/tail_lost)
 		organ_owner.add_mood_event("tail_balance_lost", /datum/mood_event/tail_balance_lost)
 
-/obj/item/organ/external/tail/proc/wag(mob/living/carbon/organ_owner, start = TRUE, stop_after = 0)
-	if(!(wag_flags & WAG_ABLE))
-		return
-
-	if(start)
-		if(start_wag(organ_owner) && stop_after)
-			addtimer(CALLBACK(src, PROC_REF(wag), organ_owner, FALSE), stop_after, TIMER_STOPPABLE|TIMER_DELETE_ME)
-	else
-		stop_wag(organ_owner)
-
-	// Edit START
-
-	owner.update_body_parts() // MASSMETA EDIT
-	if(ishuman(owner))
-		var/mob/living/carbon/human/human = owner
-		human.update_mutant_bodyparts()
-
-	// Edit END
-
 ///We need some special behaviour for accessories, wrapped here so we can easily add more interactions later
 ///Accepts an optional timeout after which we remove the tail wagging
 ///Returns false if the wag worked, true otherwise
@@ -235,4 +216,4 @@
 /datum/bodypart_overlay/mutant/tail_spines/can_draw_on_bodypart(mob/living/carbon/human/human)
 	. = ..()
 	if(human.wear_suit && (human.wear_suit.flags_inv & HIDEJUMPSUIT))
-		return FALSE
+		return FALSE

massmeta/includes.dm

@@ -76,22 +76,20 @@
 #include "code\game\objects\structures\crates_lockers\crates\large.dm"
 #include "code\modules\cargo\packs\imports.dm"
 
-//species secondary color
-#include "code\modules\client\preferences\species_features\mutants_color_secondary.dm"
-#include "code\modules\mob\dead\new_player\sprite_accessories\multi_part.dm"
-#include "code\modules\mob\living\carbon\human\accessory_helpers.dm"
 //features
 #include "features\additional_circuit\includes.dm"
 #include "features\hardsuits\code\_jetpack.dm"
 #include "features\hardsuits\code\armor.dm"
 #include "features\hardsuits\code\hardsuit.dm"
 #include "features\hardsuits\code\helmet.dm"
 #include "features\hardsuits\code\space_suit_beacon.dm"
+
 //buts
 #include "code\modules\surgery\organs\internal\butts\butts.dm"
 #include "code\modules\surgery\organs\internal\butts\butts_init.dm"
+
 //gay removal (6.21 КоАП РФ)
 #include "code\modules\clothing\under\accessories\badges.dm"
 #include "code\modules\clothing\shoes\sneakers.dm"
 #include "code\modules\client\preferences\pride_pin.dm"
-#include "code\datums\quirks\neutral_quirks\pride_pin.dm"
+#include "code\datums\quirks\neutral_quirks\pride_pin.dm"