Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Jackets #607

Merged
merged 1 commit into from
Dec 16, 2015
Merged

Jackets #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion code/modules/client/preferences_gear.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
11 changes: 7 additions & 4 deletions code/modules/clothing/suits/miscellaneous.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down