Merge remote-tracking branch 'citadel/master' into michael_labs

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

@@ -275,6 +275,18 @@
 	name = "Snow"
 	icon_state = "snow"
 
+/datum/sprite_accessory/insect_fluff/oakworm
+	name = "Oak Worm"
+	icon_state = "oakworm"
+
+/datum/sprite_accessory/insect_fluff/jungle
+	name = "Jungle"
+	icon_state = "jungle"
+
+/datum/sprite_accessory/insect_fluff/witchwing
+	name = "Witch Wing"
+	icon_state = "witchwing"
+
 /datum/sprite_accessory/insect_fluff/colored
 	name = "Colored (Hair)"
 	icon_state = "snow"

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

@@ -43,6 +43,18 @@
 	name = "Knee-High - UK"
 	icon_state = "uk_knee"
 
+/datum/sprite_accessory/underwear/socks/christmas_knee
+	name = "Knee-High - Christmas"
+	icon_state = "christmas_knee"
+
+/datum/sprite_accessory/underwear/socks/candycaner_knee
+	name = "Knee-High - Red Candy Cane"
+	icon_state = "candycaner_knee"
+
+/datum/sprite_accessory/underwear/socks/candycaneg_knee
+	name = "Knee-High - Green Candy Cane"
+	icon_state = "candycaneg_knee"
+
 /datum/sprite_accessory/underwear/socks/socks_norm
 	name = "Normal"
 	icon_state = "socks_norm"
@@ -52,6 +64,18 @@
 	name = "Normal - Bee"
 	icon_state = "bee_norm"
 
+/datum/sprite_accessory/underwear/socks/christmas_norm
+	name = "Normal - Christmas"
+	icon_state = "christmas_norm"
+
+/datum/sprite_accessory/underwear/socks/candycaner_norm
+	name = "Normal - Red Candy Cane"
+	icon_state = "candycaner_norm"
+
+/datum/sprite_accessory/underwear/socks/candycaneg_norm
+	name = "Normal - Green Candy Cane"
+	icon_state = "candycaneg_norm"
+
 /datum/sprite_accessory/underwear/socks/pantyhose
 	name = "Pantyhose"
 	icon_state = "pantyhose"
@@ -131,3 +155,15 @@
 /datum/sprite_accessory/underwear/socks/uk_thigh
 	name = "Thigh-high - UK"
 	icon_state = "uk_thigh"
+
+/datum/sprite_accessory/underwear/socks/christmas_thigh
+	name = "Thigh-high - Christmas"
+	icon_state = "christmas_thigh"
+
+/datum/sprite_accessory/underwear/socks/candycaner_thigh
+	name = "Thigh-high - Red Candy Cane"
+	icon_state = "candycaner_thigh"
+
+/datum/sprite_accessory/underwear/socks/candycaneg_thigh
+	name = "Thigh-high - Green Candy Cane"
+	icon_state = "candycaneg_thigh"

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

@@ -213,4 +213,81 @@
 
 /datum/sprite_accessory/insect_wings/whitefly
 	name = "White Fly"
-	icon_state = "whitefly"
+	icon_state = "whitefly"
+
+/datum/sprite_accessory/insect_wings/oakworm
+	name = "Oak Worm"
+	icon_state = "oakworm"
+
+/datum/sprite_accessory/insect_wings/jungle
+	name = "Jungle"
+	icon_state = "jungle"
+
+/datum/sprite_accessory/insect_wings/witchwing
+	name = "Witch Wing"
+	icon_state = "witchwing"
+
+//insect markings
+/datum/sprite_accessory/insect_markings // Extra markings for insects ported from tg.
+	icon = 'icons/mob/insect_markings.dmi'
+	color_src = null
+
+/datum/sprite_accessory/insect_markings/none
+	name = "None"
+	icon_state = "none"
+
+/datum/sprite_accessory/insect_markings/reddish
+	name = "Reddish"
+	icon_state = "reddish"
+
+/datum/sprite_accessory/insect_markings/royal
+	name = "Royal"
+	icon_state = "royal"
+
+/datum/sprite_accessory/insect_markings/gothic
+	name = "Gothic"
+	icon_state = "gothic"
+
+/datum/sprite_accessory/insect_markings/whitefly
+	name = "White Fly"
+	icon_state = "whitefly"
+
+/datum/sprite_accessory/insect_markings/lovers
+	name = "Lovers"
+	icon_state = "lovers"
+
+/datum/sprite_accessory/insect_markings/punished
+	name = "Punished"
+	icon_state = "punished"
+
+/datum/sprite_accessory/insect_markings/firewatch
+	name = "Firewatch"
+	icon_state = "firewatch"
+
+/datum/sprite_accessory/insect_markings/deathhead
+	name = "Deathshead"
+	icon_state = "deathhead"
+
+/datum/sprite_accessory/insect_markings/poison
+	name = "Poison"
+	icon_state = "poison"
+
+/datum/sprite_accessory/insect_markings/ragged
+	name = "Ragged"
+	icon_state = "ragged"
+
+/datum/sprite_accessory/insect_markings/moonfly
+	name = "Moon Fly"
+	icon_state = "moonfly"
+
+/datum/sprite_accessory/insect_markings/oakworm
+	name = "Oak Worm"
+	icon_state = "oakworm"
+
+/datum/sprite_accessory/insect_markings/jungle
+	name = "Jungle"
+	icon_state = "jungle"
+
+/datum/sprite_accessory/insect_markings/witchwing
+	name = "Witch Wing"
+	icon_state = "witchwing"