Merge pull request #6484 from DravenPeace1/Branch-2

Branch 2

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

@@ -39,6 +39,18 @@
 	color_src = 0
 	icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
 
+/datum/sprite_accessory/ears/axolotl
+	name = "Axolotl"
+	icon_state = "axolotl"
+
+/datum/sprite_accessory/tails/axolotl
+	name = "Axolotl"
+	icon_state = "axolotl"
+
+/datum/sprite_accessory/tails_animated/axolotl
+	name = "Axolotl"
+	icon_state = "axolotl"
+
 /datum/sprite_accessory/ears/human/bear
 	name = "Bear"
 	icon_state = "bear"
@@ -80,6 +92,11 @@
 	icon_state = "cow"
 	icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
 
+/datum/sprite_accessory/ears/human/curled
+	name = "Curled Horn"
+	icon_state = "curled"
+	icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
+
 /datum/sprite_accessory/tails/human/eevee
 	name = "Eevee"
 	icon_state = "eevee"
@@ -97,6 +114,11 @@
 	extra = TRUE
 	icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
 
+/datum/sprite_accessory/ears/human/elephant
+	name = "Elephant"
+	icon_state = "elephant"
+	icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
+
 //datum/sprite_accessory/ears/elf
 //	name = "Elf"
 //	icon_state = "elf"
@@ -119,6 +141,26 @@
 	icon_state = "fennec"
 	icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
 
+/datum/sprite_accessory/ears/fish
+	name = "Fish"
+	icon_state = "fish"
+	icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
+	color_src = MUTCOLORS3
+
+/datum/sprite_accessory/tails/human/fish
+	name = "Fish"
+	icon_state = "fish"
+	icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
+	extra = TRUE
+	extra_color_src = MUTCOLORS3
+
+/datum/sprite_accessory/tails_animated/human/fish
+	name = "Fish"
+	icon_state = "fish"
+	icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
+	extra = TRUE
+	extra_color_src = MUTCOLORS3
+
 /datum/sprite_accessory/ears/fox
 	name = "Fox"
 	icon_state = "fox"
@@ -161,6 +203,11 @@
 	icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
 	extra = TRUE
 
+/datum/sprite_accessory/ears/human/jellyfish
+	name = "Jellyfish"
+	icon_state = "jellyfish"
+	color_src = HAIR
+
 /datum/sprite_accessory/tails/human/kitsune
 	name = "Kitsune"
 	icon_state = "kitsune"
@@ -214,6 +261,16 @@
 	icon_state = "otie"
 	icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
 
+/datum/sprite_accessory/tails/orca
+	name = "Orca"
+	icon_state = "orca"
+	extra = TRUE
+
+/datum/sprite_accessory/tails_animated/orca
+	name = "Orca"
+	icon_state = "orca"
+	extra = TRUE
+
 /datum/sprite_accessory/ears/human/rabbit
     name = "Rabbit"
     icon_state = "rabbit"
@@ -342,6 +399,19 @@
 	icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
 	color_src = MUTCOLORS3
 
+/datum/sprite_accessory/snouts/bigbeak
+	name = "Big Beak"
+	icon_state = "bigbeak"
+	icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
+	color_src = MUTCOLORS3
+
+/datum/sprite_accessory/snouts/elephant
+	name = "Elephant"
+	icon_state = "elephant"
+	icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
+	extra = TRUE
+	extra_color_src = MUTCOLORS3
+
 /datum/sprite_accessory/snouts/lcanid
 	name = "Fox, Long"
 	icon_state = "lcanid"
@@ -360,6 +430,13 @@
 	icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
 	extra = TRUE
 
+/datum/sprite_accessory/snouts/rhino
+	name = "Horn"
+	icon_state = "rhino"
+	icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
+	extra = TRUE
+	extra = MUTCOLORS3
+
 /datum/sprite_accessory/snouts/husky
 	name = "Husky"
 	icon_state = "husky"
@@ -378,6 +455,18 @@
 	icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
 	color_src = MUTCOLORS2
 
+/datum/sprite_accessory/snouts/toucan
+	name = "Toucan"
+	icon_state = "toucan"
+	icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
+	color_src = MUTCOLORS3
+
+/datum/sprite_accessory/snouts/tusk
+	name = "Tusk"
+	icon_state = "tusk"
+	icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
+	color_src = MUTCOLORS3
+
 /******************************************
 ************ Actual Species ***************
 *******************************************/
@@ -392,6 +481,18 @@
 	icon_state = "ailurus"
 	extra = TRUE
 
+/datum/sprite_accessory/mam_ears/axolotl
+	name = "Axolotl"
+	icon_state = "axolotl"
+
+/datum/sprite_accessory/mam_tails/axolotl
+	name = "Axolotl"
+	icon_state = "axolotl"
+
+/datum/sprite_accessory/mam_tails_animated/axolotl
+	name = "Axolotl"
+	icon_state = "axolotl"
+
 /datum/sprite_accessory/mam_ears/bear
 	name = "Bear"
 	icon_state = "bear"
@@ -430,6 +531,10 @@
 	name = "Cow"
 	icon_state = "cow"
 
+/datum/sprite_accessory/mam_ears/curled
+	name = "Curled Horn"
+	icon_state = "curled"
+
 /datum/sprite_accessory/mam_ears/deer
 	name = "Deer"
 	icon_state = "deer"
@@ -448,6 +553,10 @@
 	icon_state = "eevee"
 	extra = TRUE
 
+/datum/sprite_accessory/mam_ears/elephant
+	name = "Elephant"
+	icon_state = "elephant"
+
 /datum/sprite_accessory/mam_ears/fennec
 	name = "Fennec"
 	icon_state = "fennec"
@@ -461,6 +570,26 @@
 	name = "Fennec"
 	icon_state = "fennec"
 
+//datum/sprite_accessory/ears/fish
+	name = "Fish"
+	icon_state = "fish"
+	icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
+	color_src = MUTCOLORS3
+
+/datum/sprite_accessory/tails/human/fish
+	name = "Fish"
+	icon_state = "fish"
+	icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
+	extra = TRUE
+	extra_color_src = MUTCOLORS3
+
+/datum/sprite_accessory/tails_animated/human/fish
+	name = "Fish"
+	icon_state = "fish"
+	icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
+	extra = TRUE
+	extra_color_src = MUTCOLORS3
+
 /datum/sprite_accessory/mam_ears/fox
 	name = "Fox"
 	icon_state = "fox"
@@ -523,6 +652,11 @@
 	name = "kangaroo"
 	icon_state = "kangaroo"
 
+/datum/sprite_accessory/mam_ears/kangaroo
+	name = "Jellyfish"
+	icon_state = "jellyfish"
+	color_src = HAIR
+
 /datum/sprite_accessory/mam_tails/kitsune
 	name = "Kitsune"
 	icon_state = "kitsune"
@@ -591,6 +725,16 @@
 	name = "Otusian"
 	icon_state = "otie"
 
+/datum/sprite_accessory/mam_tails/orca
+	name = "Orca"
+	icon_state = "orca"
+	extra = TRUE
+
+/datum/sprite_accessory/mam_tails_animated/orca
+	name = "Orca"
+	icon_state = "orca"
+	extra = TRUE
+
 /datum/sprite_accessory/mam_ears/rabbit
     name = "Rabbit"
     icon_state = "rabbit"
@@ -767,6 +911,11 @@
 	icon_state = "otie"
 	gender_specific = 1
 
+/datum/sprite_accessory/mam_body_markings/orca
+	name = "Orca"
+	icon_state = "orca"
+	extra = TRUE
+
 /datum/sprite_accessory/mam_body_markings/shark
 	name = "Shark"
 	icon_state = "shark"