cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-09 23:21:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

clothing

Browse Source
This commit is contained in:
shellspeed1
2019-12-21 02:38:06 -08:00
parent 756cebd8fd
commit 87c59c8ec6
22 changed files with 260 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/head/misc.dm
+12
View File
@@ -309,6 +309,18 @@
icon_state = "drfreeze_hat"
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"
/obj/item/clothing/head/pharaoh
name = "pharaoh hat"
desc = "Walk like an Egyptian."
code/modules/clothing/shoes/miscellaneous.dm
+16 -1
View File
@@ -332,4 +332,19 @@
/obj/item/clothing/shoes/wraps/blue
name = "blue leg wraps"
desc = "Ankle coverings. Hang ten, brother."
icon_state = "bluecuffs"
icon_state = "bluecuffs"
/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"
code/modules/clothing/suits/miscellaneous.dm
+30
View File
@@ -475,6 +475,36 @@
icon_state = "pharoah"
body_parts_covered = CHEST|GROIN
/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"
//WINTER COATS
/obj/item/clothing/suit/hooded/wintercoat
code/modules/clothing/under/miscellaneous.dm
+33 -1
View File
@@ -723,4 +723,36 @@
desc = "A simple, inconspicuous harness replacement for a jumpsuit."
icon_state = "gear_harness"
item_state = "gear_harness" //We dont use golem do to being a item, item without faces making it default to error suit sprites.
body_parts_covered = CHEST|GROIN
body_parts_covered = CHEST|GROIN
/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
+14 -1
View File
@@ -99,7 +99,20 @@
/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/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,