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

Adds a huge amount of Christmas clothes

Browse Source
This commit is contained in:
Unknown
2019-11-27 20:07:39 -07:00
parent 8cec8fa506
commit 33854e8fd8
20 changed files with 209 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/head/misc.dm
+12
View File
@@ -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"
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
@@ -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"
code/modules/clothing/under/miscellaneous.dm
+33 -1
View File
@@ -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)
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
+12
View File
@@ -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,