diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 071e52b46d..72afd32dfc 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -377,3 +377,15 @@ item_state = "assu_helmet" desc = "A cheap replica of old riot helmet without visor. It has \"D.A.B.\" written on the front." flags_inv = HIDEHAIR + +/obj/item/clothing/head/christmashat + name = "red santa hat" + desc = "A red Christmas Hat! How festive!" + icon_state = "christmashat" + item_state = "christmashat" + +/obj/item/clothing/head/christmashatg + name = "green santa hat" + desc = "A green Christmas Hat! How festive!" + icon_state = "christmashatg" + item_state = "christmashatg" diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 080d9281cf..3d318db761 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -129,6 +129,21 @@ max_heat_protection_temperature = SHOES_MAX_TEMP_PROTECT pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes +/obj/item/clothing/shoes/winterboots/christmasbootsr + name = "red christmas boots" + desc = "A pair of fluffy red christmas boots!" + icon_state = "christmasbootsr" + +/obj/item/clothing/shoes/winterboots/christmasbootsg + name = "green christmas boots" + desc = "A pair of fluffy green christmas boots!" + icon_state = "christmasbootsg" + +/obj/item/clothing/shoes/winterboots/santaboots + name = "santa boots" + desc = "A pair of santa boots! How traditional!!" + icon_state = "santaboots" + /obj/item/clothing/shoes/workboots name = "work boots" desc = "Nanotrasen-issue Engineering lace-up work boots for the especially blue-collar." diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 53800615e9..e8ffc977b7 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -772,3 +772,33 @@ body_parts_covered = CHEST|GROIN|ARMS|LEGS flags_inv = HIDEJUMPSUIT resistance_flags = NONE + +/obj/item/clothing/suit/hooded/wintercoat/christmascoatr + name = "red christmas coat" + desc = "A festive red Christmas coat! Smells like Candy Cane!" + icon_state = "christmascoatr" + item_state = "christmascoatr" + hoodtype = /obj/item/clothing/head/hooded/winterhood/christmashoodr + +/obj/item/clothing/head/hooded/winterhood/christmashoodr + icon_state = "christmashoodr" + +/obj/item/clothing/suit/hooded/wintercoat/christmascoatg + name = "green christmas coat" + desc = "A festive green Christmas coat! Smells like Candy Cane!" + icon_state = "christmascoatg" + item_state = "christmascoatg" + hoodtype = /obj/item/clothing/head/hooded/winterhood/christmashoodg + +/obj/item/clothing/head/hooded/winterhood/christmashoodg + icon_state = "christmashoodg" + +/obj/item/clothing/suit/hooded/wintercoat/christmascoatrg + name = "red and green christmas coat" + desc = "A festive red and green Christmas coat! Smells like Candy Cane!" + icon_state = "christmascoatrg" + item_state = "christmascoatrg" + hoodtype = /obj/item/clothing/head/hooded/winterhood/christmashoodrg + +/obj/item/clothing/head/hooded/winterhood/christmashoodrg + icon_state = "christmashoodrg" diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index b4ad844f4d..905e06e299 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -737,4 +737,36 @@ item_color = "durathread" can_adjust = FALSE body_parts_covered = CHEST|GROIN|ARMS - armor = list("melee" = 10, "laser" = 10, "fire" = 40, "acid" = 10, "bomb" = 5) \ No newline at end of file + armor = list("melee" = 10, "laser" = 10, "fire" = 40, "acid" = 10, "bomb" = 5) + +/obj/item/clothing/under/christmas/christmasmaler + name = "red masculine christmas suit" + desc = "A simple red christmas suit that looks close to Santa's!" + icon_state = "christmasmaler" + item_state = "christmasmaler" + body_parts_covered = CHEST|GROIN + can_adjust = FALSE + +/obj/item/clothing/under/christmas/christmasmaleg + name = "green masculine christmas suit" + desc = "A simple green christmas suit that smells minty!" + icon_state = "christmasmaleg" + item_state = "christmasmaleg" + body_parts_covered = CHEST|GROIN + can_adjust = FALSE + +/obj/item/clothing/under/christmas/christmasfemaler + name = "red feminine christmas suit" + desc = "A simple red christmas suit that looks like Mrs Claus!" + icon_state = "christmasfemaler" + item_state = "christmasfemaler" + body_parts_covered = CHEST|GROIN + can_adjust = FALSE + +/obj/item/clothing/under/christmas/christmasfemaleg + name = "green feminine christmas suit" + desc = "A simple green christmas suit that smells minty!" + icon_state = "christmasfemaleg" + item_state = "christmasfemaleg" + body_parts_covered = CHEST|GROIN + can_adjust = FALSE \ No newline at end of file diff --git a/code/modules/mob/dead/new_player/sprite_accessories/socks.dm b/code/modules/mob/dead/new_player/sprite_accessories/socks.dm index 524c1f0f13..0a35f0cd26 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/socks.dm +++ b/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" \ No newline at end of file diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index 0d1fe7f047..fcead00dd2 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -104,6 +104,18 @@ /obj/item/clothing/ears/headphones = 10, /obj/item/clothing/suit/apron/purple_bartender = 4, /obj/item/clothing/under/rank/bartender/purple = 4, + /obj/item/clothing/under/christmas/christmasmaler = 3, + /obj/item/clothing/under/christmas/christmasmaleg = 3, + /obj/item/clothing/under/christmas/christmasfemaler = 3, + /obj/item/clothing/under/christmas/christmasfemaleg = 3, + /obj/item/clothing/suit/hooded/wintercoat/christmascoatr = 3, + /obj/item/clothing/suit/hooded/wintercoat/christmascoatg = 3, + /obj/item/clothing/suit/hooded/wintercoat/christmascoatrg = 3, + /obj/item/clothing/head/christmashat = 3, + /obj/item/clothing/head/christmashatg = 3, + /obj/item/clothing/shoes/winterboots/christmasbootsr = 3, + /obj/item/clothing/shoes/winterboots/christmasbootsg = 3, + /obj/item/clothing/shoes/winterboots/santaboots = 3, /obj/item/clothing/accessory/attrocious_pokadots = 8, /obj/item/clothing/accessory/black_white_pokadots = 8) contraband = list(/obj/item/clothing/under/syndicate/tacticool = 3, diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi index c57a7cc112..2188952740 100644 Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ diff --git a/icons/mob/feet_digi.dmi b/icons/mob/feet_digi.dmi index a8e6c49423..e0a9cd462d 100644 Binary files a/icons/mob/feet_digi.dmi and b/icons/mob/feet_digi.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 1ae6abed66..bdc3efaaf5 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 07467f9770..de901d5abb 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/underwear.dmi b/icons/mob/underwear.dmi index 3174397b54..bf0df371eb 100644 Binary files a/icons/mob/underwear.dmi and b/icons/mob/underwear.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 072511b444..c8cd3a2e7a 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index dbfa71226b..57bb729c03 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi index e3a9f6d84e..728d244b5f 100644 Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 42f85bb69e..f7fcb05744 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 50f9e0a207..857a6f0b23 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm index 2d65f093bb..3e7eb39823 100644 --- a/modular_citadel/code/modules/client/loadout/head.dm +++ b/modular_citadel/code/modules/client/loadout/head.dm @@ -91,4 +91,14 @@ category = SLOT_HEAD path = /obj/item/clothing/head/caphat/formal/fedcover/sec restricted_desc = "Engineering, Security, and Cargo" - restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster") \ No newline at end of file + restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster") + +/datum/gear/santahatr + name = "Red Santa Hat" + category = SLOT_HEAD + path = /obj/item/clothing/head/christmashat + +/datum/gear/santahatg + name = "Green Santa Hat" + category = SLOT_HEAD + path = /obj/item/clothing/head/christmashatg \ No newline at end of file diff --git a/modular_citadel/code/modules/client/loadout/shoes.dm b/modular_citadel/code/modules/client/loadout/shoes.dm index 6688529c73..7b3bee6638 100644 --- a/modular_citadel/code/modules/client/loadout/shoes.dm +++ b/modular_citadel/code/modules/client/loadout/shoes.dm @@ -56,4 +56,19 @@ /datum/gear/bluecuffs name = "Blue leg wraps" category = SLOT_SHOES - path= /obj/item/clothing/shoes/wraps/blue \ No newline at end of file + path= /obj/item/clothing/shoes/wraps/blue + +/datum/gear/christmasbootsr + name = "Red Christmas Boots" + category = SLOT_SHOES + path= /obj/item/clothing/shoes/winterboots/christmasbootsr + +/datum/gear/christmasbootsg + name = "Green Christmas Boots" + category = SLOT_SHOES + path= /obj/item/clothing/shoes/winterboots/christmasbootsg + +/datum/gear/santaboots + name = "Santa Boots" + category = SLOT_SHOES + path= /obj/item/clothing/shoes/winterboots/santaboots \ No newline at end of file diff --git a/modular_citadel/code/modules/client/loadout/suit.dm b/modular_citadel/code/modules/client/loadout/suit.dm index d3a8258fc0..ac6f6985a9 100644 --- a/modular_citadel/code/modules/client/loadout/suit.dm +++ b/modular_citadel/code/modules/client/loadout/suit.dm @@ -77,45 +77,45 @@ category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/hooded/wintercoat/medical restricted_roles = list("Chief Medical Officer", "Medical Doctor") // Reserve it to Medical Doctors and their boss, the Chief Medical Officer - + /* Commented out until there is a Chemistry Winter Coat /datum/gear/coat/med/chem name = "Chemistry winter coat" category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/hooded/wintercoat/medical/chemistry restricted_roles = list("Chief Medical Officer", "Chemist") // Reserve it to Chemists and their boss, the Chief Medical Officer -*/ +*/ /datum/gear/coat/sci name = "Science winter coat" category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/hooded/wintercoat/science restricted_roles = list("Research Director", "Scientist", "Roboticist") // Reserve it to the Science Departement - + /datum/gear/coat/eng name = "Engineering winter coat" category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/hooded/wintercoat/engineering restricted_roles = list("Chief Engineer", "Station Engineer") // Reserve it to Station Engineers and their boss, the Chief Engineer - + /datum/gear/coat/eng/atmos name = "Atmospherics winter coat" category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos restricted_roles = list("Chief Engineer", "Atmospheric Technician") // Reserve it to Atmos Techs and their boss, the Chief Engineer - + /datum/gear/coat/hydro name = "Hydroponics winter coat" category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/hooded/wintercoat/hydro restricted_roles = list("Head of Personnel", "Botanist") // Reserve it to Botanists and their boss, the Head of Personnel - + /datum/gear/coat/cargo name = "Cargo winter coat" category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/hooded/wintercoat/cargo restricted_roles = list("Quartermaster", "Cargo Technician") // Reserve it to Cargo Techs and their boss, the Quartermaster - + /datum/gear/coat/miner name = "Mining winter coat" category = SLOT_WEAR_SUIT @@ -201,3 +201,18 @@ path = /obj/item/clothing/suit/storage/fluff/modernfedcoat/eng restricted_desc = "Engineering and Cargo" restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Cargo Technician", "Shaft Miner", "Quartermaster") + +/datum/gear/christmascoatr + name = "Red Christmas Coat" + category = SLOT_WEAR_SUIT + path = /obj/item/clothing/suit/hooded/wintercoat/christmascoatr + +/datum/gear/christmascoatg + name = "Green Christmas Coat" + category = SLOT_WEAR_SUIT + path = /obj/item/clothing/suit/hooded/wintercoat/christmascoatg + +/datum/gear/christmascoatrg + name = "Red and Green Christmas Coat" + category = SLOT_WEAR_SUIT + path = /obj/item/clothing/suit/hooded/wintercoat/christmascoatrg \ No newline at end of file diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index abdf8e3a24..d497a4bc44 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -313,4 +313,25 @@ /datum/gear/gear_harnesses name = "Gear Harness" category = SLOT_W_UNIFORM - path = /obj/item/clothing/under/gear_harness \ No newline at end of file + path = /obj/item/clothing/under/gear_harness + +//Christmas +/datum/gear/christmasmaler + name = "Red Masculine Christmas Suit" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/christmas/christmasmaler + +/datum/gear/christmasmaleg + name = "Green Masculine Christmas Suit" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/christmas/christmasmaleg + +/datum/gear/christmasfemaler + name = "Red Feminine Christmas Suit" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/christmas/christmasfemaler + +/datum/gear/christmasfemaleg + name = "Green Feminine Christmas Suit" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/christmas/christmasfemaleg \ No newline at end of file