shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9971 from Xantholne/xantholne-christmas01

Browse Source 
Adds the Christmas Clothes you never knew you wanted.
This commit is contained in:
kevinz000
2019-12-15 20:11:09 -07:00
committed by GitHub
parent 74cc1ec547 ad88481f3e
commit ba7a3f5fd2
19 changed files with 202 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/head/misc.dm
+12
View File
@@ -380,3 +380,15 @@
icon_state = "colour"
item_color = "colour"
dog_fashion = /datum/dog_fashion/head/colour
/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"
code/modules/clothing/shoes/miscellaneous.dm
+15
View File
@@ -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."
code/modules/clothing/suits/miscellaneous.dm
+30
View File
@@ -828,3 +828,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"
code/modules/clothing/under/miscellaneous.dm
+33 -1
View File
@@ -820,4 +820,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)
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
code/modules/mob/dead/new_player/sprite_accessories/socks.dm
+36
View File
@@ -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/vending/clothesmate.dm
+13 -1
View File
@@ -114,7 +114,19 @@
/obj/item/clothing/suit/jacket/letterman_red = 3,
/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/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)
contraband = list(/obj/item/clothing/under/syndicate/tacticool = 3,
/obj/item/clothing/under/syndicate/tacticool/skirt = 3,
/obj/item/clothing/mask/balaclava = 3,
icons/mob/feet.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 19 KiB

icons/mob/feet_digi.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 26 KiB

icons/mob/head.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 206 KiB

After

Width:  |  Height:  |  Size: 208 KiB

icons/mob/suit.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 390 KiB

After

Width:  |  Height:  |  Size: 394 KiB

icons/mob/underwear.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 61 KiB

icons/mob/uniform.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 330 KiB

After

Width:  |  Height:  |  Size: 333 KiB

icons/obj/clothing/hats.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 101 KiB

After

Width:  |  Height:  |  Size: 102 KiB

icons/obj/clothing/shoes.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

icons/obj/clothing/uniforms.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 96 KiB

After

Width:  |  Height:  |  Size: 96 KiB

modular_citadel/code/modules/client/loadout/head.dm
+11 -1
View File
@@ -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")
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
modular_citadel/code/modules/client/loadout/shoes.dm
+16 -1
View File
@@ -56,4 +56,19 @@
/datum/gear/bluecuffs
name = "Blue leg wraps"
category = SLOT_SHOES
path= /obj/item/clothing/shoes/wraps/blue
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
modular_citadel/code/modules/client/loadout/suit.dm
+15
View File
@@ -204,3 +204,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
modular_citadel/code/modules/client/loadout/uniform.dm
+21
View File
@@ -330,6 +330,27 @@
category = SLOT_W_UNIFORM
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
/datum/gear/pinkstripper
name = "Pink stripper outfit"
category = SLOT_W_UNIFORM