yes

travis die

code/__DEFINES/DNA.dm

@@ -105,6 +105,7 @@
 #define MATRIXED		22	//if icon is color matrix'd
 #define SKINTONE		23	//uses skin tones
 #define HORNCOLOR		24
+#define WINGCOLOR		25
 
 //organ slots
 #define ORGAN_SLOT_BRAIN "brain"

code/game/objects/items/grenades/plastic.dm

@@ -174,6 +174,7 @@
 	gender = PLURAL
 	var/open_panel = 0
 	can_attach_mob = TRUE
+	full_damage_on_mobs = TRUE
 
 /obj/item/grenade/plastic/c4/New()
 	wires = new /datum/wires/explosive/c4(src)

code/modules/client/preferences.dm

@@ -86,6 +86,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	var/skin_tone = "caucasian1"		//Skin color
 	var/eye_color = "000"				//Eye color
 	var/horn_color = "85615a"			//Horn color
+	var/wing_color = "fff"				//Wing color
 	var/datum/species/pref_species = new /datum/species/human()	//Mutant race
 	var/list/features = list("mcolor" = "FFF",
 		"tail_lizard" = "Smooth",
@@ -591,6 +592,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 				dat += "<h3>Decorative wings</h3>"
 
 				dat += "<a style='display:block;width:100px' href='?_src_=prefs;preference=deco_wings;task=input'>[features["deco_wings"]]</a>"
+				dat += "<span style='border:1px solid #161616; background-color: #[wing_color];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=wings_color;task=input'>Change</a><BR>"
+
 			if("insect_wings" in pref_species.default_features)
 				if(!mutant_category)
 					dat += APPEARANCE_CATEGORY_COLUMN
@@ -598,6 +601,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 				dat += "<h3>Insect wings</h3>"
 
 				dat += "<a style='display:block;width:100px' href='?_src_=prefs;preference=insect_wings;task=input'>[features["insect_wings"]]</a>"
+				dat += "<span style='border:1px solid #161616; background-color: #[wing_color];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=wings_color;task=input'>Change</a><BR>"
 				mutant_category++
 				if(mutant_category >= MAX_MUTANT_ROWS)
 					dat += "</td>"
@@ -1689,7 +1693,10 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 				if("horns_color")
 					var/new_horn_color = input(user, "Choose your character's horn colour:", "Character Preference","#"+horn_color) as color|null
 					if(new_horn_color)
-						horn_color = sanitize_hexcolor(new_horn_color)
+						if (new_horn_color == "#000000")
+							horn_color = "#85615A"
+						else
+							horn_color = sanitize_hexcolor(new_horn_color)
 
 				if("wings")
 					var/new_wings
@@ -1697,6 +1704,14 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					if(new_wings)
 						features["wings"] = new_wings
 
+				if("wings_color")
+					var/new_wing_color = input(user, "Choose your character's wing colour:", "Character Preference","#"+wing_color) as color|null
+					if(new_wing_color)
+						if (new_wing_color == "#000000")
+							wing_color = "#FFFFFF"
+						else
+							wing_color = sanitize_hexcolor(new_wing_color)
+
 				if("frills")
 					var/new_frills
 					new_frills = input(user, "Choose your character's frills:", "Character Preference") as null|anything in GLOB.frills_list
@@ -1730,13 +1745,13 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					new_insect_wings = input(user, "Choose your character's wings:", "Character Preference") as null|anything in GLOB.insect_wings_list
 					if(new_insect_wings)
 						features["insect_wings"] = new_insect_wings
-				
+
 				if("deco_wings")
 					var/new_deco_wings
 					new_deco_wings = input(user, "Choose your character's wings:", "Character Preference") as null|anything in GLOB.deco_wings_list
 					if(new_deco_wings)
 						features["deco_wings"] = new_deco_wings
-				
+
 				if("insect_fluffs")
 					var/new_insect_fluff
 					new_insect_fluff = input(user, "Choose your character's wings:", "Character Preference") as null|anything in GLOB.insect_fluffs_list
@@ -2262,6 +2277,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	character.hair_color = hair_color
 	character.facial_hair_color = facial_hair_color
 	character.horn_color = horn_color
+	character.wing_color = wing_color
 
 	character.skin_tone = skin_tone
 	character.hair_style = hair_style

code/modules/client/preferences_savefile.dm

@@ -317,6 +317,12 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	if(!S["features["mcolor"]"] || S["features["mcolor"]"] == "#000")
 		WRITE_FILE(S["features["mcolor"]"]	, "#FFF")
 
+	if(!S["features["horn_color"]"] || S["features["horn_color"]"] == "#000")
+		WRITE_FILE(S["features["horn_color"]"]	, "#85615a")
+
+	if(!S["features["wing_color"]"] || S["features["wing_color"]"] == "#000")
+		WRITE_FILE(S["features["wing_color"]"]	, "#FFF")
+
 	//Character
 	S["real_name"]				>> real_name
 	S["nameless"]				>> nameless
@@ -338,6 +344,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["socks"]					>> socks
 	S["socks_color"]			>> socks_color
 	S["horn_color"]				>> horn_color
+	S["wing_color"]				>> wing_color
 	S["backbag"]				>> backbag
 	S["jumpsuit_style"]			>> jumpsuit_style
 	S["uplink_loc"]				>> uplink_spawn_loc
@@ -449,6 +456,12 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	if(!features["mcolor"] || features["mcolor"] == "#000")
 		features["mcolor"] = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F")
 
+	if(!features["horn_color"] || features["horn_color"] == "#000")
+		features["horn_color"] = "85615a"
+
+	if(!features["wing_color"] || features["wing_color"] == "#000")
+		features["wing_color"] = "FFFFFF"
+
 	nameless		= sanitize_integer(nameless, 0, 1, initial(nameless))
 	be_random_name	= sanitize_integer(be_random_name, 0, 1, initial(be_random_name))
 	be_random_body	= sanitize_integer(be_random_body, 0, 1, initial(be_random_body))
@@ -471,6 +484,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	eye_color						= sanitize_hexcolor(eye_color, 3, 0)
 	skin_tone						= sanitize_inlist(skin_tone, GLOB.skin_tones)
 	horn_color						= sanitize_hexcolor(horn_color, 3, FALSE)
+	wing_color						= sanitize_hexcolor(wing_color, 3, FALSE, "#FFFFFF")
 	backbag							= sanitize_inlist(backbag, GLOB.backbaglist, initial(backbag))
 	jumpsuit_style					= sanitize_inlist(jumpsuit_style, GLOB.jumpsuitlist, initial(jumpsuit_style))
 	uplink_spawn_loc				= sanitize_inlist(uplink_spawn_loc, GLOB.uplink_spawn_loc_list, initial(uplink_spawn_loc))
@@ -485,7 +499,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	features["body_markings"]		= sanitize_inlist(features["body_markings"], GLOB.body_markings_list)
 	features["feature_lizard_legs"]	= sanitize_inlist(features["legs"], GLOB.legs_list)
 	features["insect_wings"] 		= sanitize_inlist(features["insect_wings"], GLOB.insect_wings_list)
-	features["deco_wings"] 		= sanitize_inlist(features["deco_wings"], GLOB.deco_wings_list)
+	features["deco_wings"] 			= sanitize_inlist(features["deco_wings"], GLOB.deco_wings_list, "None")
 	features["insect_fluff"]		= sanitize_inlist(features["insect_fluff"], GLOB.insect_fluffs_list)
 
 	joblessrole	= sanitize_integer(joblessrole, 1, 3, initial(joblessrole))
@@ -540,6 +554,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	WRITE_FILE(S["socks"]					, socks)
 	WRITE_FILE(S["socks_color"]				, socks_color)
 	WRITE_FILE(S["horn_color"]				, horn_color)
+	WRITE_FILE(S["wing_color"]				, wing_color)
 	WRITE_FILE(S["backbag"]					, backbag)
 	WRITE_FILE(S["jumpsuit_style"]			, jumpsuit_style)
 	WRITE_FILE(S["uplink_loc"]				, uplink_spawn_loc)

code/modules/flufftext/Hallucination.dm

@@ -771,7 +771,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
 	..()
 	var/turf/source = random_far_turf()
 	if(!sound_type)
-		sound_type = pick("airlock","airlock pry","console","explosion","far explosion","mech","glass","alarm","beepsky","mech","wall decon","door hack")
+		sound_type = pick("airlock","airlock pry","console","flash","explosion","far explosion","mech","glass","alarm","beepsky","mech","wall decon","door hack")
 	feedback_details += "Type: [sound_type]"
 	//Strange audio
 	switch(sound_type)
@@ -788,6 +788,8 @@ GLOBAL_LIST_INIT(hallucination_list, list(
 				target.playsound_local(source,'sound/effects/explosion1.ogg', 50, 1)
 			else
 				target.playsound_local(source, 'sound/effects/explosion2.ogg', 50, 1)
+		if("flash")
+			target.playsound_local(source, 'sound/weapons/flash.ogg', 50, 1)
 		if("far explosion")
 			target.playsound_local(source, 'sound/effects/explosionfar.ogg', 50, 1)
 		if("glass")
@@ -1291,4 +1293,4 @@ GLOBAL_LIST_INIT(hallucination_list, list(
 	H.hal_target = target
 	H.preparePixelProjectile(target, start)
 	H.fire()
-	qdel(src)
+	qdel(src)

code/modules/mining/equipment/explorer_gear.dm

@@ -129,7 +129,7 @@
 
 /obj/item/clothing/suit/hooded/explorer/seva
 	name = "SEVA Suit"
-	desc = "A fire-proof suit for exploring hot environments."
+	desc = "A fire-proof suit for exploring hot environments. Its design and material make it easier for a Goliath to keep their grip on the wearer."
 	icon_state = "seva"
 	item_state = "seva"
 	w_class = WEIGHT_CLASS_BULKY
@@ -141,7 +141,7 @@
 
 /obj/item/clothing/head/hooded/explorer/seva
 	name = "SEVA Hood"
-	desc = "A fire-proof hood for exploring hot environments."
+	desc = "A fire-proof hood for exploring hot environments. Its design and material make it easier for a Goliath to keep their grip on the wearer."
 	icon_state = "seva"
 	item_state = "seva"
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
@@ -159,7 +159,7 @@
 
 /obj/item/clothing/suit/hooded/explorer/exo
 	name = "Exo-suit"
-	desc = "A robust suit for exploring dangerous environments."
+	desc = "A robust suit for fighting dangerous animals. Its design and material make it harder for a Goliath to keep their grip on the wearer."
 	icon_state = "exo"
 	item_state = "exo"
 	w_class = WEIGHT_CLASS_BULKY
@@ -170,7 +170,7 @@
 
 /obj/item/clothing/head/hooded/explorer/exo
 	name = "Exo-hood"
-	desc = "A robust helmet for exploring dangerous environments."
+	desc = "A robust helmet for fighting dangerous animals. Its design and material make it harder for a Goliath to keep their grip on the wearer."
 	icon_state = "exo"
 	item_state = "exo"
 	armor = list("melee" = 65, "bullet" = 5, "laser" = 5, "energy" = 5, "bomb" = 60, "bio" = 25, "rad" = 10, "fire" = 0, "acid" = 0)

code/modules/mob/dead/new_player/preferences_setup.dm

@@ -17,6 +17,8 @@
 	hair_color = random_short_color()
 	facial_hair_color = hair_color
 	eye_color = random_eye_color()
+	horn_color = "85615a"
+	wing_color = "fff"
 	if(!pref_species)
 		var/rando_race = pick(GLOB.roundstart_races)
 		pref_species = new rando_race()

code/modules/mob/dead/new_player/sprite_accessories/wings.dm

@@ -30,6 +30,7 @@
 // Decorative wings
 /datum/sprite_accessory/deco_wings
 	icon = 'icons/mob/wings.dmi'
+	color_src = WINGCOLOR
 
 /datum/sprite_accessory/deco_wings/plain
 	name = "Plain"
@@ -104,6 +105,22 @@
 	center = TRUE
 	dimension_y = 34
 
+/datum/sprite_accessory/deco_wings/bee
+	name = "Bee"
+	icon_state = "bee"
+
+/datum/sprite_accessory/deco_wings/fairy
+	name = "Fairy"
+	icon_state = "fairy"
+
+/datum/sprite_accessory/deco_wings/bat
+	name = "Bat"
+	icon_state = "bat"
+
+/datum/sprite_accessory/deco_wings/feathery
+	name = "Feathery"
+	icon_state = "feathery"
+
 /datum/sprite_accessory/deco_wings/none
 	name = "None"
 	icon_state = "none"
@@ -113,7 +130,7 @@
 
 /datum/sprite_accessory/insect_wings
 	icon = 'icons/mob/wings.dmi'
-	color_src = null
+	color_src = WINGCOLOR
 
 /datum/sprite_accessory/insect_wings/none
 	name = "None"
@@ -183,35 +200,10 @@
 	name = "Snow"
 	icon_state = "snow"
 
-/datum/sprite_accessory/insect_wings/colored
-	name = "Colored (Hair)"
-	icon_state = "snowplain"
-	color_src = HAIR
-
-/datum/sprite_accessory/insect_fluff/colored1
-	name = "Colored (Primary)"
-	icon_state = "snowplain"
-	color_src = MUTCOLORS
-
-/datum/sprite_accessory/insect_fluff/colored2
-	name = "Colored (Secondary)"
-	icon_state = "snowplain"
-	color_src = MUTCOLORS2
-
-/datum/sprite_accessory/insect_fluff/colored3
-	name = "Colored (Tertiary)"
-	icon_state = "snowplain"
-	color_src = MUTCOLORS3
-
 /datum/sprite_accessory/insect_wings/bee
 	name = "Bee"
 	icon_state = "bee"
 
-/datum/sprite_accessory/insect_wings/bee_color
-	name = "Bee (Hair colored)"
-	icon_state = "bee"
-	color_src = HAIR
-
 /datum/sprite_accessory/insect_wings/fairy
 	name = "Fairy"
 	icon_state = "fairy"

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

@@ -19,6 +19,8 @@
 
 	var/horn_color = "85615a"	//specific horn colors, because why not?
 
+	var/wing_color = "fff"		//wings too
+
 	var/skin_tone = "caucasian1"	//Skin tone
 
 	var/lip_style = null	//no lipstick by default- arguably misleading, as it could be used for general makeup

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

@@ -37,6 +37,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 	var/hair_alpha = 255	// the alpha used by the hair. 255 is completely solid, 0 is transparent.
 
 	var/horn_color	//specific horn colors, because why not?
+	var/wing_color
 
 	var/use_skintones = 0	// does it use skintones or not? (spoiler alert this is only used by humans)
 	var/exotic_blood = ""	// If your race wants to bleed something other than bog standard blood, change this to reagent id.
@@ -869,6 +870,8 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 							accessory_overlay.color = "#[H.eye_color]"
 						if(HORNCOLOR)
 							accessory_overlay.color = "#[H.horn_color]"
+						if(WINGCOLOR)
+							accessory_overlay.color = "#[H.wing_color]"
 				else
 					accessory_overlay.color = forced_colour
 			else
@@ -946,6 +949,8 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 
 					if(HORNCOLOR)
 						extra_accessory_overlay.color = "#[H.horn_color]"
+					if(WINGCOLOR)
+						extra_accessory_overlay.color = "#[H.wing_color]"
 
 				if(OFFSET_MUTPARTS in H.dna.species.offset_features)
 					extra_accessory_overlay.pixel_x += H.dna.species.offset_features[OFFSET_MUTPARTS][1]
@@ -985,6 +990,8 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 							extra2_accessory_overlay.color = "#[H.hair_color]"
 					if(HORNCOLOR)
 						extra2_accessory_overlay.color = "#[H.horn_color]"
+					if(WINGCOLOR)
+						extra2_accessory_overlay.color = "#[H.wing_color]"
 
 				if(OFFSET_MUTPARTS in H.dna.species.offset_features)
 					extra2_accessory_overlay.pixel_x += H.dna.species.offset_features[OFFSET_MUTPARTS][1]

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

@@ -3,7 +3,7 @@
 	id = "insect"
 	say_mod = "flutters"
 	default_color = "00FF00"
-	species_traits = list(LIPS,NOEYES,HAIR,FACEHAIR,MUTCOLORS,HORNCOLOR)
+	species_traits = list(LIPS,NOEYES,HAIR,FACEHAIR,MUTCOLORS,HORNCOLOR,WINGCOLOR)
 	inherent_biotypes = list(MOB_ORGANIC, MOB_HUMANOID, MOB_BUG)
 	mutant_bodyparts = list("mam_ears", "mam_snout", "mam_tail", "taur", "insect_wings", "mam_snouts", "insect_fluff","horns")
 	default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_tail" = "None", "mam_ears" = "None",

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

@@ -4,8 +4,8 @@
 	id = "felinid"
 	limbs_id = "human"
 
-	mutant_bodyparts = list("mam_ears", "mam_tail")
+	mutant_bodyparts = list("mam_ears", "mam_tail", "deco_wings")
-	default_features = list("mcolor" = "FFF", "mam_tail" = "Cat", "mam_ears" = "Cat", "wings" = "None")
+	default_features = list("mcolor" = "FFF", "mam_tail" = "Cat", "mam_ears" = "Cat", "wings" = "None", "deco_wings" = "None")
 
 	mutantears = /obj/item/organ/ears/cat
 	mutanttail = /obj/item/organ/tail/cat

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

@@ -3,7 +3,7 @@
 	id = "mammal"
 	default_color = "4B4B4B"
 	should_draw_citadel = TRUE
-	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,HORNCOLOR)
+	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,HORNCOLOR,WINGCOLOR)
 	inherent_biotypes = list(MOB_ORGANIC, MOB_HUMANOID)
 	mutant_bodyparts = list("mam_tail", "mam_ears", "mam_body_markings", "mam_snouts", "deco_wings", "taur", "horns", "legs")
 	default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_snouts" = "Husky", "mam_tail" = "Husky", "mam_ears" = "Husky", "deco_wings" = "None",

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

@@ -1,41 +1,42 @@
-/datum/species/human
+/datum/species/human
-	name = "Human"
+	name = "Human"
-	id = "human"
+	id = "human"
-	default_color = "FFFFFF"
+	default_color = "FFFFFF"
-	species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,MUTCOLORS_PARTSONLY)
+
-	mutant_bodyparts = list("ears", "tail_human", "wings", "taur") // CITADEL EDIT gives humans snowflake parts
+	species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,MUTCOLORS_PARTSONLY,WINGCOLOR)
-	default_features = list("mcolor" = "FFF", "mcolor2" = "FFF","mcolor3" = "FFF","tail_human" = "None", "ears" = "None", "wings" = "None", "taur" = "None")
+	mutant_bodyparts = list("ears", "tail_human", "wings", "taur", "deco_wings") // CITADEL EDIT gives humans snowflake parts
-	use_skintones = 1
+	default_features = list("mcolor" = "FFF", "mcolor2" = "FFF","mcolor3" = "FFF","tail_human" = "None", "ears" = "None", "wings" = "None", "taur" = "None", "deco_wings" = "None")
-	skinned_type = /obj/item/stack/sheet/animalhide/human
+	use_skintones = 1
-	disliked_food = GROSS | RAW
+	skinned_type = /obj/item/stack/sheet/animalhide/human
-	liked_food = JUNKFOOD | FRIED
+	disliked_food = GROSS | RAW
-
+	liked_food = JUNKFOOD | FRIED
-/datum/species/human/qualifies_for_rank(rank, list/features)
+
-	return TRUE	//Pure humans are always allowed in all roles.
+/datum/species/human/qualifies_for_rank(rank, list/features)
-
+	return TRUE	//Pure humans are always allowed in all roles.
-/datum/species/human/spec_death(gibbed, mob/living/carbon/human/H)
+
-	if(H)
+/datum/species/human/spec_death(gibbed, mob/living/carbon/human/H)
-		stop_wagging_tail(H)
+	if(H)
-
+		stop_wagging_tail(H)
-/datum/species/human/spec_stun(mob/living/carbon/human/H,amount)
+
-	if(H)
+/datum/species/human/spec_stun(mob/living/carbon/human/H,amount)
-		stop_wagging_tail(H)
+	if(H)
-	. = ..()
+		stop_wagging_tail(H)
-
+	. = ..()
-/datum/species/human/can_wag_tail(mob/living/carbon/human/H)
+
-	return ("tail_human" in mutant_bodyparts) || ("waggingtail_human" in mutant_bodyparts)
+/datum/species/human/can_wag_tail(mob/living/carbon/human/H)
-
+	return ("tail_human" in mutant_bodyparts) || ("waggingtail_human" in mutant_bodyparts)
-/datum/species/human/is_wagging_tail(mob/living/carbon/human/H)
+
-	return ("waggingtail_human" in mutant_bodyparts)
+/datum/species/human/is_wagging_tail(mob/living/carbon/human/H)
-
+	return ("waggingtail_human" in mutant_bodyparts)
-/datum/species/human/start_wagging_tail(mob/living/carbon/human/H)
+
-	if("tail_human" in mutant_bodyparts)
+/datum/species/human/start_wagging_tail(mob/living/carbon/human/H)
-		mutant_bodyparts -= "tail_human"
+	if("tail_human" in mutant_bodyparts)
-		mutant_bodyparts |= "waggingtail_human"
+		mutant_bodyparts -= "tail_human"
-	H.update_body()
+		mutant_bodyparts |= "waggingtail_human"
-
+	H.update_body()
-/datum/species/human/stop_wagging_tail(mob/living/carbon/human/H)
+
-	if("waggingtail_human" in mutant_bodyparts)
+/datum/species/human/stop_wagging_tail(mob/living/carbon/human/H)
-		mutant_bodyparts -= "waggingtail_human"
+	if("waggingtail_human" in mutant_bodyparts)
-		mutant_bodyparts |= "tail_human"
+		mutant_bodyparts -= "waggingtail_human"
-	H.update_body()
+		mutant_bodyparts |= "tail_human"
+	H.update_body()

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

@@ -4,10 +4,10 @@
 	id = "jelly"
 	default_color = "00FF90"
 	say_mod = "chirps"
-	species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,NOBLOOD)
+	species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,NOBLOOD,WINGCOLOR)
 	mutantlungs = /obj/item/organ/lungs/slime
-	mutant_bodyparts = list("mam_tail", "mam_ears", "mam_snouts", "taur") //CIT CHANGE
+	mutant_bodyparts = list("mam_tail", "mam_ears", "mam_snouts", "taur", "deco_wings") //CIT CHANGE
-	default_features = list("mcolor" = "FFF", "mam_tail" = "None", "mam_ears" = "None", "mam_snouts" = "None", "taur" = "None") //CIT CHANGE
+	default_features = list("mcolor" = "FFF", "mam_tail" = "None", "mam_ears" = "None", "mam_snouts" = "None", "taur" = "None", "deco_wings" = "None") //CIT CHANGE
 	inherent_traits = list(TRAIT_TOXINLOVER)
 	meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/slime
 	exotic_blood = "slimejelly"

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

@@ -4,16 +4,16 @@
 	id = "lizard"
 	say_mod = "hisses"
 	default_color = "00FF00"
-	species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,LIPS,HORNCOLOR)
+	species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,LIPS,HORNCOLOR,WINGCOLOR)
 	inherent_biotypes = list(MOB_ORGANIC, MOB_HUMANOID, MOB_REPTILE)
-	mutant_bodyparts = list("tail_lizard", "snout", "spines", "horns", "frills", "body_markings", "legs", "taur")
+	mutant_bodyparts = list("tail_lizard", "snout", "spines", "horns", "frills", "body_markings", "legs", "taur", "deco_wings")
 	mutanttongue = /obj/item/organ/tongue/lizard
 	mutanttail = /obj/item/organ/tail/lizard
 	coldmod = 1.5
 	heatmod = 0.67
 	default_features = list("mcolor" = "0F0", "mcolor2" = "0F0", "mcolor3" = "0F0", "tail_lizard" = "Smooth", "snout" = "Round",
 							 "horns" = "None", "frills" = "None", "spines" = "None", "body_markings" = "None",
-							  "legs" = "Digitigrade", "taur" = "None")
+							  "legs" = "Digitigrade", "taur" = "None", "deco_wings" = "None")
 	attack_verb = "slash"
 	attack_sound = 'sound/weapons/slash.ogg'
 	miss_sound = 'sound/weapons/slashmiss.ogg'

code/modules/mob/living/simple_animal/guardian/types/support.dm

@@ -30,7 +30,7 @@
 		C.adjustBruteLoss(-5)
 		C.adjustFireLoss(-5)
 		C.adjustOxyLoss(-5)
-		C.adjustToxLoss(-5)
+		C.adjustToxLoss(-5, forced = TRUE)
 		var/obj/effect/temp_visual/heal/H = new /obj/effect/temp_visual/heal(get_turf(C))
 		if(namedatum)
 			H.color = namedatum.colour

html/changelogs/AutoChangeLog-pr-9520.yml

@@ -0,0 +1,4 @@
+author: "r4d6"
+delete-after: True
+changes: 
+  - rscadd: "Added Decorative Wings for Humans, Felinids, Slimepersons and Lizardpeoples."

html/changelogs/AutoChangeLog-pr-9524.yml

@@ -0,0 +1,7 @@
+author: "Linzolle"
+delete-after: True
+changes: 
+  - rscadd: "Decorative and insect wings can now be coloured individually, similar to horns."
+  - bugfix: "people getting assigned wings if their savefile is old."
+  - rscdel: "wings that take the hair colour. Unnecessary if you can just set the colour."
+  - tweak: "Cannot make horns pure black. Trying to do so will set it to a default value."

html/changelogs/AutoChangeLog-pr-9525.yml

@@ -0,0 +1,4 @@
+author: "Linzolle"
+delete-after: True
+changes: 
+  - bugfix: "decorative angel wings being invisible"

html/changelogs/AutoChangeLog-pr-9536.yml

@@ -0,0 +1,4 @@
+author: "r4d6"
+delete-after: True
+changes: 
+  - tweak: "Change the SEVA suit & Exo-suit's descriptions"