mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-12 19:22:56 +00:00
Merge with dev.
This commit is contained in:
@@ -43,7 +43,7 @@ var/global/list/facial_hair_styles_female_list = list()
|
|||||||
var/global/list/skin_styles_female_list = list() //unused
|
var/global/list/skin_styles_female_list = list() //unused
|
||||||
//Underwear
|
//Underwear
|
||||||
var/global/list/underwear_m = list("White", "Grey", "Green", "Blue", "Black", "Mankini", "None") //Curse whoever made male/female underwear diffrent colours
|
var/global/list/underwear_m = list("White", "Grey", "Green", "Blue", "Black", "Mankini", "None") //Curse whoever made male/female underwear diffrent colours
|
||||||
var/global/list/underwear_f = list("Red", "White", "Yellow", "Blue", "Black", "Thong", "None")
|
var/global/list/underwear_f = list("Red", "White", "Yellow", "Blue", "Black", "Thong", "Black Sports","White Sports","None")
|
||||||
//undershirt
|
//undershirt
|
||||||
var/global/list/undershirt_t = list("Black Tank top", "White Tank top", "Black shirt", "White shirt", "None")
|
var/global/list/undershirt_t = list("Black Tank top", "White Tank top", "Black shirt", "White shirt", "None")
|
||||||
//Backpacks
|
//Backpacks
|
||||||
|
|||||||
@@ -470,7 +470,7 @@ var/global/list/gear_datums = list()
|
|||||||
|
|
||||||
/datum/gear/bomber
|
/datum/gear/bomber
|
||||||
display_name = "bomber jacket"
|
display_name = "bomber jacket"
|
||||||
path = /obj/item/clothing/suit/storage/bomber
|
path = /obj/item/clothing/suit/storage/toggle/bomber
|
||||||
cost = 4
|
cost = 4
|
||||||
slot = slot_wear_suit
|
slot = slot_wear_suit
|
||||||
|
|
||||||
@@ -506,10 +506,14 @@ var/global/list/gear_datums = list()
|
|||||||
|
|
||||||
/datum/gear/hoodie
|
/datum/gear/hoodie
|
||||||
display_name = "hoodie, grey"
|
display_name = "hoodie, grey"
|
||||||
path = /obj/item/clothing/suit/hoodie
|
path = /obj/item/clothing/suit/storage/toggle/hoodie
|
||||||
cost = 2
|
cost = 2
|
||||||
slot = slot_wear_suit
|
slot = slot_wear_suit
|
||||||
|
|
||||||
|
/datum/gear/hoodie/black
|
||||||
|
display_name = "hoodie, black"
|
||||||
|
path = /obj/item/clothing/suit/storage/toggle/hoodie/black
|
||||||
|
|
||||||
/datum/gear/unathi_mantle
|
/datum/gear/unathi_mantle
|
||||||
display_name = "hide mantle (Unathi)"
|
display_name = "hide mantle (Unathi)"
|
||||||
path = /obj/item/clothing/suit/unathi/mantle
|
path = /obj/item/clothing/suit/unathi/mantle
|
||||||
|
|||||||
@@ -346,11 +346,13 @@
|
|||||||
icon_state = "blueponcho"
|
icon_state = "blueponcho"
|
||||||
item_state = "blueponcho"
|
item_state = "blueponcho"
|
||||||
|
|
||||||
/obj/item/clothing/suit/storage/bomber
|
/obj/item/clothing/suit/storage/toggle/bomber
|
||||||
name = "bomber jacket"
|
name = "bomber jacket"
|
||||||
desc = "A thick, well-worn WW2 leather bomber jacket."
|
desc = "A thick, well-worn WW2 leather bomber jacket."
|
||||||
icon_state = "bomber"
|
icon_state = "bomber"
|
||||||
item_state = "bomber"
|
item_state = "bomber"
|
||||||
|
icon_open = "bomber_open"
|
||||||
|
icon_closed = "bomber"
|
||||||
body_parts_covered = UPPER_TORSO|ARMS
|
body_parts_covered = UPPER_TORSO|ARMS
|
||||||
cold_protection = UPPER_TORSO|ARMS
|
cold_protection = UPPER_TORSO|ARMS
|
||||||
min_cold_protection_temperature = T0C - 20
|
min_cold_protection_temperature = T0C - 20
|
||||||
@@ -383,10 +385,20 @@
|
|||||||
icon_open = "brown_jacket_nt_open"
|
icon_open = "brown_jacket_nt_open"
|
||||||
icon_closed = "brown_jacket_nt"
|
icon_closed = "brown_jacket_nt"
|
||||||
|
|
||||||
/obj/item/clothing/suit/hoodie
|
/obj/item/clothing/suit/storage/toggle/hoodie
|
||||||
name = "grey hoodie"
|
name = "grey hoodie"
|
||||||
desc = "A warm, grey sweatshirt."
|
desc = "A warm, grey sweatshirt."
|
||||||
icon_state = "grey_hoodie"
|
icon_state = "grey_hoodie"
|
||||||
item_state = "grey_hoodie"
|
item_state = "grey_hoodie"
|
||||||
|
icon_open = "grey_hoodie_open"
|
||||||
|
icon_closed = "grey_hoodie"
|
||||||
min_cold_protection_temperature = T0C - 20
|
min_cold_protection_temperature = T0C - 20
|
||||||
cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
|
cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
|
||||||
|
|
||||||
|
/obj/item/clothing/suit/storage/toggle/hoodie/black
|
||||||
|
name = "black hoodie"
|
||||||
|
desc = "A warm, black sweatshirt."
|
||||||
|
icon_state = "black_hoodie"
|
||||||
|
item_state = "black_hoodie"
|
||||||
|
icon_open = "black_hoodie_open"
|
||||||
|
icon_closed = "black_hoodie"
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 271 KiB After Width: | Height: | Size: 270 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 98 KiB After Width: | Height: | Size: 100 KiB |
Reference in New Issue
Block a user