TG_Port_2

Conflicts:
	code/game/objects/items/weapons/storage/backpack.dm
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
	code/modules/client/preferences_gear.dm
	code/modules/clothing/under/accessories/accessory.dm
This commit is contained in:
SinTwo
2015-10-11 00:36:13 -04:00
committed by Neerti
parent 8eac3f8b9b
commit a2b24d64b7
13 changed files with 557 additions and 7 deletions
@@ -72,6 +72,10 @@
name = "red tie"
icon_state = "redtie"
/obj/item/clothing/accessory/black
name = "black tie"
icon_state = "blacktie"
/obj/item/clothing/accessory/horrible
name = "horrible tie"
desc = "A neosilk clip-on tie. This one is disgusting."
@@ -30,6 +30,18 @@
worn_state = "qmf"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
/obj/item/clothing/under/rank/cargo/jeans
name = "quartermaster's jumpjeans"
desc = "Jeeeaaans! They're comfy!"
icon_state = "qmj"
worn_state = "qmj"
/obj/item/clothing/under/rank/cargo/jeans/female
name = "quartermaster's jumpjeans"
desc = "Jeeeaaans! They're comfy!"
icon_state = "qmjf"
worn_state = "qmjf"
/obj/item/clothing/under/rank/cargotech
name = "cargo technician's jumpsuit"
desc = "Shooooorts! They're comfy and easy to wear!"
@@ -44,6 +56,18 @@
icon_state = "cargof"
worn_state = "cargof"
/obj/item/clothing/under/rank/cargotech/jeans
name = "cargo technician's jumpjeans"
desc = "Jeeeaaans! They're comfy!"
icon_state = "cargoj"
worn_state = "cargoj"
/obj/item/clothing/under/rank/cargotech/jeans/female
name = "cargo technician's jumpjeans"
desc = "Jeeeaaans! They're comfy!"
icon_state = "cargojf"
worn_state = "cargojf"
/obj/item/clothing/under/rank/chaplain
desc = "It's a black jumpsuit, often worn by religious folk."