Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit226

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

@@ -151,7 +151,7 @@
 			message_admins(msg)
 			to_chat(usr, "<span class='danger'>The round is either not ready, or has already finished...</span>")
 			return
-			
+
 		if(!GLOB.enter_allowed)
 			to_chat(usr, "<span class='notice'>There is an administrative lock on entering the game!</span>")
 			return

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/body_markings.dm

@@ -54,6 +54,10 @@
 	name = "Redpanda"
 	icon_state = "redpanda"
 
+/datum/sprite_accessory/mam_body_markings/bat
+	name = "Bat"
+	icon_state = "bat"
+
 /datum/sprite_accessory/mam_body_markings/bee
 	name = "Bee"
 	icon_state = "bee"

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

@@ -176,6 +176,10 @@
 	name = "Axolotl"
 	icon_state = "axolotl"
 
+/datum/sprite_accessory/mam_ears/bat
+	name = "Bat"
+	icon_state = "bat"
+
 /datum/sprite_accessory/mam_ears/bear
 	name = "Bear"
 	icon_state = "bear"

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

@@ -194,6 +194,10 @@
 	name = "Mammal, Short ALT"
 	icon_state = "scanidalt"
 
+/datum/sprite_accessory/mam_snouts/scanidalt2
+	name = "Mammal, Short ALT 2"
+	icon_state = "scanidalt2"
+
 /datum/sprite_accessory/mam_snouts/wolf
 	name = "Mammal, Thick"
 	icon_state = "wolf"
@@ -306,6 +310,10 @@
 	name = "Mammal, Short ALT (Top)"
 	icon_state = "fscanidalt"
 
+/datum/sprite_accessory/mam_snouts/fscanidalt2
+	name = "Mammal, Short ALT 2 (Top)"
+	icon_state = "fscanidalt2"
+
 /datum/sprite_accessory/mam_snouts/fwolf
 	name = "Mammal, Thick (Top)"
 	icon_state = "fwolf"

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

@@ -114,6 +114,26 @@
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
 	color_src = MATRIXED
 
+/datum/sprite_accessory/mam_tails/batl
+	name = "Bat (Long)"
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	icon_state = "batl"
+
+/datum/sprite_accessory/mam_tails_animated/batl
+	name = "Bat (Long)"
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	icon_state = "batl"
+
+/datum/sprite_accessory/mam_tails/bats
+	name = "Bat (Short)"
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	icon_state = "bats"
+
+/datum/sprite_accessory/mam_tails_animated/bats
+	name = "Bat (Short)"
+	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	icon_state = "bats"
+
 /datum/sprite_accessory/tails/human/bee
 	name = "Bee"
 	icon_state = "bee"
@@ -469,6 +489,22 @@
 	name = "Axolotl"
 	icon_state = "axolotl"
 
+/datum/sprite_accessory/mam_tails/batl
+	name = "Bat (Long)"
+	icon_state = "batl"
+
+/datum/sprite_accessory/mam_tails_animated/batl
+	name = "Bat (Long)"
+	icon_state = "batl"
+
+/datum/sprite_accessory/mam_tails/bats
+	name = "Bat (Short)"
+	icon_state = "bats"
+
+/datum/sprite_accessory/mam_tails_animated/bats
+	name = "Bat (Short)"
+	icon_state = "bats"
+
 /datum/sprite_accessory/mam_tails/bee
 	name = "Bee"
 	icon_state = "bee"

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

@@ -28,73 +28,14 @@
 	locked = TRUE
 
 // Decorative wings
+
 /datum/sprite_accessory/deco_wings
 	icon = 'icons/mob/wings.dmi'
+	color_src = WINGCOLOR
 
-/datum/sprite_accessory/deco_wings/plain
-	name = "Plain"
-	icon_state = "plain"
-
-/datum/sprite_accessory/deco_wings/monarch
-	name = "Monarch"
-	icon_state = "monarch"
-
-/datum/sprite_accessory/deco_wings/luna
-	name = "Luna"
-	icon_state = "luna"
-
-/datum/sprite_accessory/deco_wings/atlas
-	name = "Atlas"
-	icon_state = "atlas"
-
-/datum/sprite_accessory/deco_wings/reddish
-	name = "Reddish"
-	icon_state = "redish"
-
-/datum/sprite_accessory/deco_wings/royal
-	name = "Royal"
-	icon_state = "royal"
-
-/datum/sprite_accessory/deco_wings/gothic
-	name = "Gothic"
-	icon_state = "gothic"
-
-/datum/sprite_accessory/deco_wings/lovers
-	name = "Lovers"
-	icon_state = "lovers"
-
-/datum/sprite_accessory/deco_wings/whitefly
-	name = "White Fly"
-	icon_state = "whitefly"
-
-/datum/sprite_accessory/deco_wings/punished
-	name = "Burnt Off"
-	icon_state = "punished"
-	locked = TRUE
-
-/datum/sprite_accessory/deco_wings/firewatch
-	name = "Firewatch"
-	icon_state = "firewatch"
-
-/datum/sprite_accessory/deco_wings/deathhead
-	name = "Deathshead"
-	icon_state = "deathhead"
-
-/datum/sprite_accessory/deco_wings/poison
-	name = "Poison"
-	icon_state = "poison"
-
-/datum/sprite_accessory/deco_wings/ragged
-	name = "Ragged"
-	icon_state = "ragged"
-
-/datum/sprite_accessory/deco_wings/moonfly
-	name = "Moon Fly"
-	icon_state = "moonfly"
-
-/datum/sprite_accessory/deco_wings/snow
-	name = "Snow"
-	icon_state = "snow"
+/datum/sprite_accessory/deco_wings/none
+	name = "None"
+	icon_state = "none"
 
 /datum/sprite_accessory/deco_wings/angel
 	name = "Angel"
@@ -104,44 +45,123 @@
 	center = TRUE
 	dimension_y = 34
 
-/datum/sprite_accessory/deco_wings/none
-	name = "None"
-	icon_state = "none"
+/datum/sprite_accessory/deco_wings/bat
+	name = "Bat"
+	icon_state = "bat"
 
+/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/feathery
+	name = "Feathery"
+	icon_state = "feathery"
+
+/datum/sprite_accessory/deco_wings/atlas
+	name = "Atlas"
+	icon_state = "atlas"
+
+/datum/sprite_accessory/deco_wings/deathhead
+	name = "Deathshead"
+	icon_state = "deathhead"
+
+/datum/sprite_accessory/deco_wings/firewatch
+	name = "Firewatch"
+	icon_state = "firewatch"
+
+/datum/sprite_accessory/deco_wings/gothic
+	name = "Gothic"
+	icon_state = "gothic"
+
+/datum/sprite_accessory/deco_wings/lovers
+	name = "Lovers"
+	icon_state = "lovers"
+
+/datum/sprite_accessory/deco_wings/luna
+	name = "Luna"
+	icon_state = "luna"
+
+/datum/sprite_accessory/deco_wings/monarch
+	name = "Monarch"
+	icon_state = "monarch"
+
+/datum/sprite_accessory/deco_wings/moonfly
+	name = "Moon Fly"
+	icon_state = "moonfly"
+
+/datum/sprite_accessory/deco_wings/plain
+	name = "Plain"
+	icon_state = "plain"
+
+/datum/sprite_accessory/deco_wings/poison
+	name = "Poison"
+	icon_state = "poison"
+
+/datum/sprite_accessory/deco_wings/punished
+	name = "Burnt Off"
+	icon_state = "punished"
+
+/datum/sprite_accessory/deco_wings/ragged
+	name = "Ragged"
+	icon_state = "ragged"
+
+/datum/sprite_accessory/deco_wings/reddish
+	name = "Reddish"
+	icon_state = "redish"
+
+/datum/sprite_accessory/deco_wings/royal
+	name = "Royal"
+	icon_state = "royal"
+
+/datum/sprite_accessory/deco_wings/snow
+	name = "Snow"
+	icon_state = "snow"
+
+/datum/sprite_accessory/deco_wings/whitefly
+	name = "White Fly"
+	icon_state = "whitefly"
 
 //INSECT WINGS
 
 /datum/sprite_accessory/insect_wings
 	icon = 'icons/mob/wings.dmi'
-	color_src = null
+	color_src = WINGCOLOR
 
 /datum/sprite_accessory/insect_wings/none
 	name = "None"
 	icon_state = "none"
 
-/datum/sprite_accessory/insect_wings/plain
-	name = "Plain"
-	icon_state = "plain"
+/datum/sprite_accessory/insect_wings/bat
+	name = "Bat"
+	icon_state = "bat"
 
-/datum/sprite_accessory/insect_wings/monarch
-	name = "Monarch"
-	icon_state = "monarch"
+/datum/sprite_accessory/insect_wings/bee
+	name = "Bee"
+	icon_state = "bee"
 
-/datum/sprite_accessory/insect_wings/luna
-	name = "Luna"
-	icon_state = "luna"
+/datum/sprite_accessory/insect_wings/fairy
+	name = "Fairy"
+	icon_state = "fairy"
+
+/datum/sprite_accessory/insect_wings/feathery
+	name = "Feathery"
+	icon_state = "feathery"
 
 /datum/sprite_accessory/insect_wings/atlas
 	name = "Atlas"
 	icon_state = "atlas"
 
-/datum/sprite_accessory/insect_wings/reddish
-	name = "Reddish"
-	icon_state = "redish"
+/datum/sprite_accessory/insect_wings/deathhead
+	name = "Deathshead"
+	icon_state = "deathhead"
 
-/datum/sprite_accessory/insect_wings/royal
-	name = "Royal"
-	icon_state = "royal"
+/datum/sprite_accessory/insect_wings/firewatch
+	name = "Firewatch"
+	icon_state = "firewatch"
 
 /datum/sprite_accessory/insect_wings/gothic
 	name = "Gothic"
@@ -151,75 +171,46 @@
 	name = "Lovers"
 	icon_state = "lovers"
 
-/datum/sprite_accessory/insect_wings/whitefly
-	name = "White Fly"
-	icon_state = "whitefly"
+/datum/sprite_accessory/insect_wings/luna
+	name = "Luna"
+	icon_state = "luna"
 
-/datum/sprite_accessory/insect_wings/punished
-	name = "Burnt Off"
-	icon_state = "punished"
-
-/datum/sprite_accessory/insect_wings/firewatch
-	name = "Firewatch"
-	icon_state = "firewatch"
-
-/datum/sprite_accessory/insect_wings/deathhead
-	name = "Deathshead"
-	icon_state = "deathhead"
-
-/datum/sprite_accessory/insect_wings/poison
-	name = "Poison"
-	icon_state = "poison"
-
-/datum/sprite_accessory/insect_wings/ragged
-	name = "Ragged"
-	icon_state = "ragged"
+/datum/sprite_accessory/insect_wings/monarch
+	name = "Monarch"
+	icon_state = "monarch"
 
 /datum/sprite_accessory/insect_wings/moonfly
 	name = "Moon Fly"
 	icon_state = "moonfly"
 
+/datum/sprite_accessory/insect_wings/plain
+	name = "Plain"
+	icon_state = "plain"
+
+/datum/sprite_accessory/insect_wings/poison
+	name = "Poison"
+	icon_state = "poison"
+
+/datum/sprite_accessory/insect_wings/punished
+	name = "Burnt Off"
+	icon_state = "punished"
+
+/datum/sprite_accessory/insect_wings/ragged
+	name = "Ragged"
+	icon_state = "ragged"
+
+/datum/sprite_accessory/insect_wings/reddish
+	name = "Reddish"
+	icon_state = "redish"
+
+/datum/sprite_accessory/insect_wings/royal
+	name = "Royal"
+	icon_state = "royal"
+
 /datum/sprite_accessory/insect_wings/snow
 	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"
-
-/datum/sprite_accessory/insect_wings/bat
-	name = "Bat"
-	icon_state = "bat"
-
-/datum/sprite_accessory/insect_wings/feathery
-	name = "Feathery"
-	icon_state = "feathery"
+/datum/sprite_accessory/insect_wings/whitefly
+	name = "White Fly"
+	icon_state = "whitefly"