Merge pull request #3083 from Echopsychotic/Fire-hazard

Guilmon horns and markings - Skyrat markings

code/modules/mob/new_player/sprite_accessories_ear_ch.dm

@@ -1,57 +1,65 @@
-/datum/sprite_accessory/ears/alien_slug
-	name = "Alien slug ears"
-	desc = "The ears of a slug from space"
-	icon = 'icons/mob/vore/ears_ch.dmi'
-	icon_state = "alien_slug"
-	do_colouration = 1
-	color_blend_mode = ICON_MULTIPLY
-
-/datum/sprite_accessory/ears/zorgoia
-	name = "Zorgoia"
-	desc = "Ears only the slinkiest of noodles can have!"
-	icon = 'icons/mob/vore/ears_ch.dmi'
-	icon_state = "zorgoia"
-	do_colouration = 1
-	color_blend_mode = ICON_MULTIPLY
-
-/datum/sprite_accessory/ears/vale
-	name = "VALE Model Ear Coloring"
-	desc = ""
-	icon = 'icons/mob/vore/ears_ch.dmi'
-	icon_state = "valeears"
-	do_colouration = 1
-	color_blend_mode = ICON_MULTIPLY
-
-/datum/sprite_accessory/ears/dragonforward
-	name = "Dragon horns (Forward)"
-	icon = 'icons/mob/vore/ears_ch.dmi'
-	icon_state = "dragonforward"
-	do_colouration = 1
-	color_blend_mode = ICON_MULTIPLY
-
-/datum/sprite_accessory/ears/dragonforwardears
-	name = "Dragon horns w/Ears (Forward)"
-	icon = 'icons/mob/vore/ears_ch.dmi'
-	icon_state = "dhornsears"
-	extra_overlay = "dhornsears_inner"
-	do_colouration = 1
-	color_blend_mode = ICON_MULTIPLY
-
-/datum/sprite_accessory/ears/teshbeeantenna
-	name = "Teshari bee antenna"
-	icon = 'icons/mob/vore/ears_ch.dmi'
-	icon_state = "teshbee"
-
-/datum/sprite_accessory/ears/teshantenna
-	name = "Teshari antenna, colorable"
-	icon = 'icons/mob/vore/ears_ch.dmi'
-	icon_state = "teshantenna"
-	do_colouration = 1
-	color_blend_mode = ICON_MULTIPLY
-
-/datum/sprite_accessory/ears/curlyteshantenna
-	name = "Teshari curly antenna, colorable"
-	icon = 'icons/mob/vore/ears_ch.dmi'
-	icon_state = "curly_bug_tesh"
-	do_colouration = 1
-	color_blend_mode = ICON_MULTIPLY
+/datum/sprite_accessory/ears/alien_slug
+	name = "Alien slug ears"
+	desc = "The ears of a slug from space"
+	icon = 'icons/mob/vore/ears_ch.dmi'
+	icon_state = "alien_slug"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+
+/datum/sprite_accessory/ears/zorgoia
+	name = "Zorgoia"
+	desc = "Ears only the slinkiest of noodles can have!"
+	icon = 'icons/mob/vore/ears_ch.dmi'
+	icon_state = "zorgoia"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+
+/datum/sprite_accessory/ears/vale
+	name = "VALE Model Ear Coloring"
+	desc = ""
+	icon = 'icons/mob/vore/ears_ch.dmi'
+	icon_state = "valeears"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+
+/datum/sprite_accessory/ears/dragonforward
+	name = "Dragon horns (Forward)"
+	icon = 'icons/mob/vore/ears_ch.dmi'
+	icon_state = "dragonforward"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+
+/datum/sprite_accessory/ears/dragonforwardears
+	name = "Dragon horns w/Ears (Forward)"
+	icon = 'icons/mob/vore/ears_ch.dmi'
+	icon_state = "dhornsears"
+	extra_overlay = "dhornsears_inner"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+
+/datum/sprite_accessory/ears/teshbeeantenna
+	name = "Teshari bee antenna"
+	icon = 'icons/mob/vore/ears_ch.dmi'
+	icon_state = "teshbee"
+
+/datum/sprite_accessory/ears/teshantenna
+	name = "Teshari antenna, colorable"
+	icon = 'icons/mob/vore/ears_ch.dmi'
+	icon_state = "teshantenna"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+
+/datum/sprite_accessory/ears/curlyteshantenna
+	name = "Teshari curly antenna, colorable"
+	icon = 'icons/mob/vore/ears_ch.dmi'
+	icon_state = "curly_bug_tesh"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+
+/datum/sprite_accessory/ears/guilmonhorns
+	name = "Guilmon Horns"
+	icon = 'icons/mob/vore/ears_ch.dmi'
+	icon_state = "Guilmon_Horns"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+	

code/modules/mob/new_player/sprite_accessories_extra_ch.dm

@@ -142,6 +142,67 @@
 	color_blend_mode = ICON_MULTIPLY
 	body_parts = list(BP_R_ARM,BP_L_ARM,BP_R_HAND,BP_L_HAND,BP_R_LEG,BP_L_LEG,BP_R_FOOT,BP_L_FOOT)
 
+	guilmonhead
+		name = "Guilmon head"
+		icon_state = "guilmon_head"
+		color_blend_mode = ICON_MULTIPLY
+		body_parts = list(BP_HEAD)
+
+	guilmonchest
+		name = "Guilmon Chest"
+		icon_state = "guilmon_chest"
+		color_blend_mode = ICON_MULTIPLY
+		body_parts = list(BP_TORSO)
+
+	guilmonchestmarking
+		name = "Guilmon Chest Markings"
+		icon_state = "guilmon_marking"
+		color_blend_mode = ICON_MULTIPLY
+		body_parts = list(BP_TORSO)
+
+	guilmonarms
+		name = "Guilmon arms"
+		icon_state = "guilmon"
+		color_blend_mode = ICON_MULTIPLY
+		body_parts = list(BP_R_ARM,BP_L_ARM,BP_R_HAND,BP_L_HAND)
+
+	guilmonRLeg
+		name = "Guilmon Right leg"
+		icon_state = "guilmon"
+		color_blend_mode = ICON_MULTIPLY
+		body_parts = list(BP_R_LEG)
+
+	guilmonLleg
+		name = "Guilmon Left leg"
+		icon_state = "guilmon"
+		color_blend_mode = ICON_MULTIPLY
+		body_parts = list(BP_L_LEG)
+
+	guilmondigiRleg1
+		name = "Guilmon digigrade right leg 1"
+		icon_state = "guilmon_digitigrade_1"
+		color_blend_mode = ICON_MULTIPLY
+		body_parts = list(BP_R_LEG)
+
+	guilmondigiLleg1
+		name = "Guilmon digigrade left leg 1"
+		icon_state = "guilmon_digitigrade_1"
+		color_blend_mode = ICON_MULTIPLY
+		body_parts = list(BP_L_LEG)
+
+	guilmondigiRleg2
+		name = "Guilmon digigrade right leg 2"
+		icon_state = "guilmon_digitigrade_2"
+		color_blend_mode = ICON_MULTIPLY
+		body_parts = list(BP_R_LEG)
+
+	guilmondigiLleg2
+		name = "Guilmon digigrade left leg 2"
+		icon_state = "guilmon_digitigrade_2"
+		color_blend_mode = ICON_MULTIPLY
+		body_parts = list(BP_L_LEG)
+
+
 /datum/sprite_accessory/tail/special/orca_tail
 	name = "Orca Tail"
 	desc = ""