Merge pull request #3396 from CHOMPStation2/upstream-merge-11776

[MIRROR] the christmas clothing pr no one asked for

code/modules/clothing/head/hood.dm

@@ -164,6 +164,16 @@
 	desc = "A starry winter hood."
 	icon_state = "winterhood_cosmic"
 
+/obj/item/clothing/head/hood/winter/christmasred
+	name = "red christmas winter hood"
+	desc = "A red festive winter hood."
+	icon_state = "winterhood_christmasr"
+
+/obj/item/clothing/head/hood/winter/christmasgreen
+	name = "green christmas winter hood"
+	desc = "A green festive winter hood."
+	icon_state = "winterhood_christmasg"
+
 // Explorer gear
 /obj/item/clothing/head/hood/explorer
 	name = "explorer hood"

code/modules/clothing/shoes/boots.dm

@@ -174,6 +174,16 @@
 	icon_state = "explorer"
 	armor = list(melee = 30, bullet = 10, laser = 10, energy = 15, bomb = 20, bio = 0, rad = 0)
 
+/obj/item/clothing/shoes/boots/winter/christmasred
+	name = "red christmas boots"
+	desc = "A pair of fluffy red christmas boots!"
+	icon_state = "winterboots_christmasr"
+
+/obj/item/clothing/shoes/boots/winter/christmasgreen
+	name = "green christmas boots"
+	desc = "A pair of fluffy green christmas boots!"
+	icon_state = "winterboots_christmasg"
+
 // Allows the wearer to climb cliffs, which could allow for shortcuts or sequence-breaking.
 /obj/item/clothing/shoes/boots/winter/climbing
 	name = "climbing winter boots"

code/modules/clothing/suits/hooded.dm

@@ -344,6 +344,18 @@
 	light_power = 1.8
 	light_range = 1.2
 	light_on = TRUE
+	
+/obj/item/clothing/suit/storage/hooded/wintercoat/christmasred
+	name = "red christmas winter coat"
+	desc = "A festive red Christmas coat! Smells like Candy Cane!"
+	icon_state = "coatchristmasr"
+	hoodtype = /obj/item/clothing/head/hood/winter/christmasred
+
+/obj/item/clothing/suit/storage/hooded/wintercoat/christmasgreen
+	name = "green christmas winter coat"
+	desc = "A festive green Christmas coat! Smells like Candy Cane!"
+	icon_state = "coatchristmasg"
+	hoodtype = /obj/item/clothing/head/hood/winter/christmasgreen
 
 // winter coats end here
 

code/modules/clothing/under/miscellaneous.dm

@@ -1420,4 +1420,25 @@
 	icon_state = "hedberg_tech"
 	worn_state = "hedberg_tech"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10) // Equivalent to engineer's jumpsuit.
-	rolled_sleeves = 0
+	rolled_sleeves = 0
+	
+//christmas stuff
+/obj/item/clothing/under/christmas/red
+	name = "red christmas suit"
+	desc = "A simple red christmas suit that looks close to Santa's!"
+	icon_state = "christmasred"
+
+/obj/item/clothing/under/christmas/green
+	name = "green christmas suit"
+	desc = "A simple green christmas suit. Smells minty!"
+	icon_state = "christmasgreen"
+
+/obj/item/clothing/under/christmas/croptop/red
+	name = "red crop-top christmas suit"
+	desc = "A simple red christmas suit that doesn't quite looks like Mrs Claus'."
+	icon_state = "christmascroppedred"
+
+/obj/item/clothing/under/christmas/croptop/green
+	name = "green crop-top christmas suit"
+	desc = "A simple green christmas suit that doesn't quite looks like Mrs Claus'. Smells minty!"
+	icon_state = "christmascroppedgreen"