Merge pull request #14256 from Adelphon/ppantsg

Polychromic Pants & Jacket
This commit is contained in:
silicons
2021-02-18 17:41:51 -07:00
committed by GitHub
10 changed files with 28 additions and 3 deletions

View File

@@ -487,13 +487,17 @@
item_state = "militaryjacket"
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/revolver, /obj/item/radio)
/obj/item/clothing/suit/jacket/urbanjacket
/obj/item/clothing/suit/jacket/urbanjacket/polychromic
name = "urban jacket"
desc = "A canvas jacket styled with a fur neck piece, stylish."
icon_state = "urbanjacket"
item_state = "urbanjacket"
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/revolver, /obj/item/radio)
/obj/item/clothing/suit/jacket/urbanjacket/polychromic/ComponentInitialize()
. = ..()
AddElement(/datum/element/polychromic, list("#26321D", "#CBBDAF", "#292929"), 3)
/obj/item/clothing/suit/jacket/letterman
name = "letterman jacket"
desc = "A classic brown letterman jacket. Looks pretty hot and heavy."

View File

@@ -46,6 +46,17 @@
desc = "Some tan pants. You look like a white collar worker with these on."
icon_state = "tanpants"
/obj/item/clothing/under/pants/polypants/polychromic
name = "polychromic pants"
desc = "Some stylish pair of pants made from polychrome."
icon_state = "polypants"
item_state = "polypants"
var/list/poly_colors = list("#75634F", "#3D3D3D", "#575757")
/obj/item/clothing/under/pants/polypants/polychromic/ComponentInitialize()
. = ..()
AddElement(/datum/element/polychromic, poly_colors, 3)
/obj/item/clothing/under/pants/track
name = "track pants"
desc = "A pair of track pants, for the athletic."

View File

@@ -68,13 +68,14 @@
/obj/item/clothing/under/pants/black = 4,
/obj/item/clothing/under/pants/tan = 4,
/obj/item/clothing/under/pants/track = 3,
/obj/item/clothing/under/pants/polypants = 4,
/obj/item/clothing/accessory/suitjacket = 2,
/obj/item/clothing/accessory/suitjacket/charcoal = 2,
/obj/item/clothing/accessory/suitjacket/navy = 2,
/obj/item/clothing/accessory/suitjacket/burgundy = 2,
/obj/item/clothing/accessory/suitjacket/checkered = 2,
/obj/item/clothing/suit/jacket/miljacket = 5,
/obj/item/clothing/suit/jacket/urbanjacket = 5,
/obj/item/clothing/suit/jacket/urbanjacket/polychromic = 5,
/obj/item/clothing/under/suit/white_on_white/skirt = 2,
/obj/item/clothing/under/rank/captain/suit/skirt = 2,
/obj/item/clothing/under/rank/civilian/head_of_personnel/suit/skirt = 2,

Binary file not shown.

Before

Width:  |  Height:  |  Size: 462 KiB

After

Width:  |  Height:  |  Size: 470 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 455 KiB

After

Width:  |  Height:  |  Size: 456 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 313 KiB

After

Width:  |  Height:  |  Size: 312 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 167 KiB

After

Width:  |  Height:  |  Size: 169 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 130 KiB

After

Width:  |  Height:  |  Size: 132 KiB

View File

@@ -168,8 +168,10 @@
/datum/gear/suit/urbanjacket
name = "Urban Jacket"
path = /obj/item/clothing/suit/jacket/urbanjacket
path = /obj/item/clothing/suit/jacket/urbanjacket/polychromic
subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
loadout_initial_colors = list("#26321D", "#CBBDAF", "#292929")
/datum/gear/suit/ianshirt
name = "Ian Shirt"

View File

@@ -170,6 +170,13 @@
name = "Tan Pants"
path = /obj/item/clothing/under/pants/tan
/datum/gear/uniform/pants/polypants
name = "Polychromic Pants"
path = /obj/item/clothing/under/pants/polypants/polychromic
cost = 2
loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
loadout_initial_colors = list("#75634F", "#3D3D3D", "#575757")
/datum/gear/uniform/pants/track
name = "Track Pants"
path = /obj/item/clothing/under/pants/track