Clothes, clothes, clothes!

This commit is contained in:
Schnayy
2020-07-31 03:01:56 -05:00
committed by VirgoBot
parent af4f2db5c2
commit f9c3cf616e
9 changed files with 54 additions and 2 deletions

View File

@@ -279,3 +279,7 @@
/datum/gear/accessory/cowledvest /datum/gear/accessory/cowledvest
display_name = "cowled vest" display_name = "cowled vest"
path = /obj/item/clothing/accessory/cowledvest path = /obj/item/clothing/accessory/cowledvest
/datum/gear/accessory/asymovercoat
display_name = "orange asymmetrical overcoat"
path = /obj/item/clothing/accessory/asymovercoat

View File

@@ -366,4 +366,24 @@
/datum/gear/head/jingasa /datum/gear/head/jingasa
display_name = "jingasa" display_name = "jingasa"
<<<<<<< HEAD
path = /obj/item/clothing/head/jingasa path = /obj/item/clothing/head/jingasa
=======
path = /obj/item/clothing/head/jingasa
/datum/gear/head/sunflower_crown
display_name = "sunflower crown"
path = /obj/item/clothing/head/sunflower_crown
/datum/gear/head/lavender_crown
display_name = "lavender crown"
path = /obj/item/clothing/head/lavender_crown
/datum/gear/head/poppy_crown
display_name = "poppy crown"
path = /obj/item/clothing/head/poppy_crown
/datum/gear/head/rose_crown
display_name = "rose crown"
path = /obj/item/clothing/head/rose_crown
>>>>>>> 7a84236... Adds 2 uniforms, 1 accessory, and flower crowns to loadout (#7385)

View File

@@ -581,3 +581,11 @@
/datum/gear/uniform/yellowswoop /datum/gear/uniform/yellowswoop
display_name = "yellow swooped dress" display_name = "yellow swooped dress"
path = /obj/item/clothing/under/dress/yellowswoop path = /obj/item/clothing/under/dress/yellowswoop
/datum/gear/uniform/greenasym
display_name = "green asymmetrical jumpsuit"
path = /obj/item/clothing/under/greenasym
/datum/gear/uniform/cyberpunkharness
display_name = "cyberpunk strapped harness"
path = /obj/item/clothing/under/cyberpunkharness

View File

@@ -400,3 +400,11 @@
name = "green asymmetrical jacket" name = "green asymmetrical jacket"
desc = "Insultingly avant-garde in aqua." desc = "Insultingly avant-garde in aqua."
icon_state = "asym_green" icon_state = "asym_green"
<<<<<<< HEAD
=======
/obj/item/clothing/accessory/asymovercoat
name = "orange asymmetrical overcoat"
desc = "An asymmetrical orange overcoat in a 2560's fashion."
icon_state = "asymovercoat"
>>>>>>> 7a84236... Adds 2 uniforms, 1 accessory, and flower crowns to loadout (#7385)

View File

@@ -804,6 +804,18 @@ Uniforms and such
icon_state = "rippedpunk" icon_state = "rippedpunk"
index = 1 index = 1
/obj/item/clothing/under/greenasym
name = "green asymmetrical jumpsuit"
desc = "A green futuristic uniform with asymmetrical pants. Trendy!"
icon_state = "greenasym"
index = 1
/obj/item/clothing/under/cyberpunkharness
name = "cyberpunk strapped harness"
desc = "A cyberpunk styled harness and pants. Perfect for your dystopian future."
icon_state = "cyberhell"
index = 1
/* /*
* swimsuit * swimsuit
*/ */

Binary file not shown.

Before

Width:  |  Height:  |  Size: 83 KiB

After

Width:  |  Height:  |  Size: 84 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 57 KiB

After

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB