diff --git a/code/datums/supplypacks/costumes_vr.dm b/code/datums/supplypacks/costumes_vr.dm index 482f0242906..951f58fc8b9 100644 --- a/code/datums/supplypacks/costumes_vr.dm +++ b/code/datums/supplypacks/costumes_vr.dm @@ -394,4 +394,22 @@ ) cost = 10 containertype = /obj/structure/closet/crate - containername = "Knights Gear Crate" \ No newline at end of file + containername = "Knights Gear Crate" + +/datum/supply_pack/costumes/christmas + name = "Christmas costume pack" + contains = list( + /obj/item/clothing/head/santa, + /obj/item/clothing/head/santa/green, + /obj/item/clothing/suit/storage/hooded/wintercoat/christmasred, + /obj/item/clothing/suit/storage/hooded/wintercoat/christmasgreen, + /obj/item/clothing/under/christmas/red, + /obj/item/clothing/under/christmas/green, + /obj/item/clothing/under/christmas/croptop/red, + /obj/item/clothing/under/christmas/croptop/green, + /obj/item/clothing/shoes/boots/winter/christmasred, + /obj/item/clothing/shoes/boots/winter/christmasgreen + ) + cost = 20 + containertype = /obj/structure/closet/crate + containername = "Christmas costume pack" \ No newline at end of file diff --git a/code/modules/clothing/head/hood.dm b/code/modules/clothing/head/hood.dm index a6bef8b838b..8f7f752ee01 100644 --- a/code/modules/clothing/head/hood.dm +++ b/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" diff --git a/code/modules/clothing/shoes/boots.dm b/code/modules/clothing/shoes/boots.dm index acdc9f84dd1..4ee43951093 100644 --- a/code/modules/clothing/shoes/boots.dm +++ b/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" diff --git a/code/modules/clothing/suits/hooded.dm b/code/modules/clothing/suits/hooded.dm index cd5fb97d1fc..f1eb67dc03d 100644 --- a/code/modules/clothing/suits/hooded.dm +++ b/code/modules/clothing/suits/hooded.dm @@ -345,6 +345,18 @@ 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 /obj/item/clothing/suit/storage/hooded/explorer diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index e358ed25748..16f39f167d4 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/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 \ No newline at end of file + 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" \ No newline at end of file diff --git a/icons/inventory/feet/item.dmi b/icons/inventory/feet/item.dmi index 94c360ec2fd..5da36d908a6 100644 Binary files a/icons/inventory/feet/item.dmi and b/icons/inventory/feet/item.dmi differ diff --git a/icons/inventory/feet/mob.dmi b/icons/inventory/feet/mob.dmi index 702111404fc..f89178cc908 100644 Binary files a/icons/inventory/feet/mob.dmi and b/icons/inventory/feet/mob.dmi differ diff --git a/icons/inventory/head/item.dmi b/icons/inventory/head/item.dmi index 3d4ec811211..d91aa7369f8 100644 Binary files a/icons/inventory/head/item.dmi and b/icons/inventory/head/item.dmi differ diff --git a/icons/inventory/head/mob.dmi b/icons/inventory/head/mob.dmi index 045b311269a..01b97296d59 100644 Binary files a/icons/inventory/head/mob.dmi and b/icons/inventory/head/mob.dmi differ diff --git a/icons/inventory/suit/item.dmi b/icons/inventory/suit/item.dmi index beb1f9c3a76..8d399661f4f 100644 Binary files a/icons/inventory/suit/item.dmi and b/icons/inventory/suit/item.dmi differ diff --git a/icons/inventory/suit/mob.dmi b/icons/inventory/suit/mob.dmi index a313002203b..871e254583d 100644 Binary files a/icons/inventory/suit/mob.dmi and b/icons/inventory/suit/mob.dmi differ diff --git a/icons/inventory/uniform/item.dmi b/icons/inventory/uniform/item.dmi index 9f468496087..14761a73e0f 100644 Binary files a/icons/inventory/uniform/item.dmi and b/icons/inventory/uniform/item.dmi differ diff --git a/icons/inventory/uniform/mob.dmi b/icons/inventory/uniform/mob.dmi index a6bb42e1d77..d0670504d0a 100644 Binary files a/icons/inventory/uniform/mob.dmi and b/icons/inventory/uniform/mob.dmi differ