cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-25 21:19:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds Clothes, Hair, clothes fixes, and hair fixes.

Browse Source
This commit is contained in:
SinTwo
2015-12-16 16:19:57 -05:00
parent 523d12584b
commit a1a286cccb
11 changed files with 167 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences_gear.dm
+78 -9
View File
@@ -1137,13 +1137,7 @@ var/global/list/gear_datums = list()
/datum/gear/mil
display_name = "military jacket"
path = /obj/item/clothing/suit/jacket/miljacket
cost = 2
slot = slot_wear_suit
/datum/gear/mil_alt
display_name = "military jacket, alt"
path = /obj/item/clothing/suit/jacket/miljacket2
path = /obj/item/clothing/suit/storage/vest/miljacket
cost = 2
slot = slot_wear_suit
@@ -1193,6 +1187,25 @@ var/global/list/gear_datums = list()
display_name = "hoodie, black"
path = /obj/item/clothing/suit/storage/toggle/hoodie/black
cost = 2
slot = slot_wear_suit
/datum/gear/hoodie/cti
display_name = "hoodie, CTI"
path = /obj/item/clothing/suit/storage/toggle/hoodie/cti
cost = 2
slot = slot_wear_suit
/datum/gear/hoodie/mu
display_name = "hoodie, MU"
path = /obj/item/clothing/suit/storage/toggle/hoodie/mu
cost = 2
slot = slot_wear_suit
/datum/gear/hoodie/nt
display_name = "hoodie, NT"
path = /obj/item/clothing/suit/storage/toggle/hoodie/nt
cost = 2
slot = slot_wear_suit
/datum/gear/unathi_mantle
display_name = "hide mantle (Unathi)"
@@ -1755,15 +1768,71 @@ var/global/list/gear_datums = list()
whitelisted = "Skrell"
/datum/gear/skrell_cloth_male
display_name = "skrell headtail-wear, male, cloth"
display_name = "skrell headtail-wear, male, red, cloth"
path = /obj/item/clothing/ears/skrell/cloth_male
cost = 1
sort_category = "ears"
whitelisted = "Skrell"
/datum/gear/skrell_cloth_male/black
display_name = "skrell headtail-wear, male, black, cloth"
path = /obj/item/clothing/ears/skrell/cloth_male/black
cost = 1
sort_category = "ears"
whitelisted = "Skrell"
/datum/gear/skrell_cloth_male/blue
display_name = "skrell headtail-wear, male, blue, cloth"
path = /obj/item/clothing/ears/skrell/cloth_male/blue
cost = 1
sort_category = "ears"
whitelisted = "Skrell"
/datum/gear/skrell_cloth_male/green
display_name = "skrell headtail-wear, male, green, cloth"
path = /obj/item/clothing/ears/skrell/cloth_male/green
cost = 1
sort_category = "ears"
whitelisted = "Skrell"
/datum/gear/skrell_cloth_male/pink
display_name = "skrell headtail-wear, male, pink, cloth"
path = /obj/item/clothing/ears/skrell/cloth_male/pink
cost = 1
sort_category = "ears"
whitelisted = "Skrell"
/datum/gear/skrell_cloth_female
display_name = "skrell headtail-wear, female, cloth"
display_name = "skrell headtail-wear, female, red, cloth"
path = /obj/item/clothing/ears/skrell/cloth_female
cost = 1
sort_category = "ears"
whitelisted = "Skrell"
/datum/gear/skrell_cloth_female/black
display_name = "skrell headtail-wear, female, black, cloth"
path = /obj/item/clothing/ears/skrell/cloth_female/black
cost = 1
sort_category = "ears"
whitelisted = "Skrell"
/datum/gear/skrell_cloth_female/blue
display_name = "skrell headtail-wear, female, blue, cloth"
path = /obj/item/clothing/ears/skrell/cloth_female/blue
cost = 1
sort_category = "ears"
whitelisted = "Skrell"
/datum/gear/skrell_cloth_female/green
display_name = "skrell headtail-wear, female, green, cloth"
path = /obj/item/clothing/ears/skrell/cloth_female/green
cost = 1
sort_category = "ears"
whitelisted = "Skrell"
/datum/gear/skrell_cloth_female/pink
display_name = "skrell headtail-wear, female, pink, cloth"
path = /obj/item/clothing/ears/skrell/cloth_female/pink
cost = 1
sort_category = "ears"
whitelisted = "Skrell"
code/modules/clothing/ears/skrell.dm
+49 -1
View File
@@ -28,8 +28,56 @@
icon_state = "skrell_cloth_female"
item_state = "skrell_cloth_female"
/obj/item/clothing/ears/skrell/cloth_female/black
name = "skrell headtail cloth"
desc = "A cloth shawl worn by female skrell draped around their head tails."
icon_state = "skrell_cloth_black_female"
item_state = "skrell_cloth_black_female"
/obj/item/clothing/ears/skrell/cloth_female/blue
name = "skrell headtail cloth"
desc = "A cloth shawl worn by female skrell draped around their head tails."
icon_state = "skrell_cloth_blue_female"
item_state = "skrell_cloth_blue_female"
/obj/item/clothing/ears/skrell/cloth_female/green
name = "skrell headtail cloth"
desc = "A cloth shawl worn by female skrell draped around their head tails."
icon_state = "skrell_cloth_green_female"
item_state = "skrell_cloth_green_female"
/obj/item/clothing/ears/skrell/cloth_female/pink
name = "skrell headtail cloth"
desc = "A cloth shawl worn by female skrell draped around their head tails."
icon_state = "skrell_cloth_pink_female"
item_state = "skrell_cloth_pink_female"
/obj/item/clothing/ears/skrell/cloth_male
name = "skrell headtail cloth"
desc = "A cloth band worn by male skrell around their head tails."
icon_state = "skrell_cloth_male"
item_state = "skrell_cloth_male"
item_state = "skrell_cloth_male"
/obj/item/clothing/ears/skrell/cloth_male/black
name = "skrell headtail cloth"
desc = "A cloth band worn by male skrell around their head tails."
icon_state = "skrell_cloth_black_male"
item_state = "skrell_cloth_black_male"
/obj/item/clothing/ears/skrell/cloth_male/blue
name = "skrell headtail cloth"
desc = "A cloth band worn by male skrell around their head tails."
icon_state = "skrell_cloth_blue_male"
item_state = "skrell_cloth_blue_male"
/obj/item/clothing/ears/skrell/cloth_male/green
name = "skrell headtail cloth"
desc = "A cloth band worn by male skrell around their head tails."
icon_state = "skrell_cloth_green_male"
item_state = "skrell_cloth_green_male"
/obj/item/clothing/ears/skrell/cloth_male/pink
name = "skrell headtail cloth"
desc = "A cloth band worn by male skrell around their head tails."
icon_state = "skrell_cloth_pink_male"
item_state = "skrell_cloth_pink_male"
code/modules/clothing/suits/miscellaneous.dm
+31 -11
View File
@@ -355,17 +355,14 @@
icon_state = "puffervest"
item_state = "puffervest"
/obj/item/clothing/suit/jacket/miljacket
/obj/item/clothing/suit/storage/vest/miljacket //a horrid bastardization... but this is to reduce snowflake code.
name = "military jacket"
desc = "A canvas jacket styled after classical American military garb. Feels sturdy, yet comfortable."
icon_state = "militaryjacket"
item_state = "militaryjacket"
/obj/item/clothing/suit/jacket/miljacket2
name = "military jacket"
desc = "A canvas jacket styled after classical American military garb. Feels sturdy, yet comfortable."
icon_state = "militaryjacket2"
item_state = "militaryjacket2"
icon_state = "militaryjacket_nobadge"
item_state = "militaryjacket_nobadge"
icon_badge = "militaryjacket_badge"
icon_nobadge = "militaryjacket_nobadge"
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/suit/storage/toggle/bomber
name = "bomber jacket"
@@ -478,6 +475,29 @@
icon_open = "yellow_hoodie_open"
icon_closed = "yellow_hoodie"
/obj/item/clothing/suit/storage/toggle/hoodie/cti
name = "CTI hoodie"
desc = "A warm, black sweatshirt. It bears the letters ‘CTI’ on the back, a lettering to the prestigious university in Tau Ceti, Ceti Technical Institute. There is a blue supernova embroidered on the front, the emblem of CTI."
icon_state = "cti_hoodie"
item_state = "cti_hoodie"
icon_open = "cti_hoodie_open"
icon_closed = "cti_hoodie"
/obj/item/clothing/suit/storage/toggle/hoodie/mu
name = "mars university hoodie"
desc = "A warm, gray sweatshirt. It bears the letters ‘MU’ on the front, a lettering to the well-known public college, Mars University."
icon_state = "mu_hoodie"
item_state = "mu_hoodie"
icon_open = "mu_hoodie_open"
icon_closed = "mu_hoodie"
/obj/item/clothing/suit/storage/toggle/hoodie/nt
name = "NT hoodie"
desc = "A warm, blue sweatshirt. It proudly bears the silver NanoTrasen insignia lettering on the back. The edges are trimmed with silver."
icon_state = "nt_hoodie"
item_state = "nt_hoodie"
icon_open = "nt_hoodie_open"
icon_closed = "nt_hoodie"
// FUN!
@@ -557,12 +577,12 @@
/obj/item/clothing/suit/storage/hooded/wintercoat/captain
name = "captain's winter coat"
icon_state = "coatcaptain"
armor = list(melee = 25, bullet = 30, laser = 30, energy = 10, bomb = 25, bio = 0, rad = 0)
armor = list(melee = 20, bullet = 15, laser = 20, energy = 10, bomb = 15, bio = 0, rad = 0)
/obj/item/clothing/suit/storage/hooded/wintercoat/security
name = "security winter coat"
icon_state = "coatsecurity"
armor = list(melee = 25, bullet = 15, laser = 30, energy = 10, bomb = 25, bio = 0, rad = 0)
armor = list(melee = 25, bullet = 20, laser = 20, energy = 15, bomb = 20, bio = 0, rad = 0)
/obj/item/clothing/suit/storage/hooded/wintercoat/medical
name = "medical winter coat"
code/modules/clothing/suits/storage.dm
+1 -1
View File
@@ -98,7 +98,7 @@
icon_state = icon_badge
usr << "You reveal \the [src]'s badge."
else
usr << "\The [src] does not have a vest badge."
usr << "\The [src] does not have a badge."
return
update_clothing_icon()
code/modules/mob/new_player/sprite_accessories.dm
+8
View File
@@ -152,6 +152,10 @@
name = "Side Ponytail"
icon_state = "hair_stail"
sideponytail4 //Not happy about this... but it's for the save files.
name = "Side Ponytail 2"
icon_state = "hair_ponytailf"
sideponytail2
name = "One Shoulder"
icon_state = "hair_oneshoulder"
@@ -160,6 +164,10 @@
name = "Tress Shoulder"
icon_state = "hair_tressshoulder"
wisp
name = "Wisp"
icon_state = "hair_wisp"
parted
name = "Parted"
icon_state = "hair_parted"