From 41dcee7d0e85d1dd13ff1d80438f6dd15711cd49 Mon Sep 17 00:00:00 2001 From: SinTwo Date: Wed, 16 Dec 2015 17:36:48 -0500 Subject: [PATCH] Jackets --- code/modules/client/preferences_gear.dm | 8 +++++++- code/modules/clothing/suits/miscellaneous.dm | 11 +++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index 95c325b732..85518d33ef 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -1137,7 +1137,13 @@ var/global/list/gear_datums = list() /datum/gear/mil display_name = "military jacket" - path = /obj/item/clothing/suit/storage/vest/miljacket + path = /obj/item/clothing/suit/storage/miljacket + cost = 2 + slot = slot_wear_suit + +/datum/gear/mil/alt + display_name = "military jacket, alt" + path = /obj/item/clothing/suit/storage/miljacket/alt cost = 2 slot = slot_wear_suit diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index eba261ab10..4a1a0c72eb 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -355,14 +355,17 @@ icon_state = "puffervest" item_state = "puffervest" -/obj/item/clothing/suit/storage/vest/miljacket //a horrid bastardization... but this is to reduce snowflake code. +/obj/item/clothing/suit/storage/miljacket name = "military jacket" desc = "A canvas jacket styled after classical American military garb. Feels sturdy, yet comfortable." 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/miljacket/alt + name = "military jacket" + desc = "A canvas jacket styled after classical American military garb. Feels sturdy, yet comfortable." + icon_state = "militaryjacket_badge" + item_state = "militaryjacket_badge" /obj/item/clothing/suit/storage/toggle/bomber name = "bomber jacket"