cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-06 07:22:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'upstream-master' into development-upstream

Browse Source
This commit is contained in:
Werner
2018-09-01 22:45:34 +02:00
parent d3061116e8 8e6aae7027
commit 6fdd325736
37 changed files with 12079 additions and 11914 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
code/modules/customitems/item_defines.dm
View File

@@ -1529,14 +1529,14 @@ All custom items with worn sprites must follow the contained sprite system: http
contained_sprite = TRUE
/obj/item/clothing/suit/storage/toggle/det_trench/fluff/blessing_jacket //Armored Detective Jacket - Nelson Blessing - seniorscore
/obj/item/clothing/suit/storage/toggle/det_trench/fluff/nelson_jacket //Armored Detective Jacket - Nelson Okafor - seniorscore
name = "armored detective jacket"
desc = "A white suit jacket, has a badge hanging out of a breast pocket. Touching it gives a feeling of working on a case for months."
icon = 'icons/obj/custom_items/blessing_jacket.dmi'
icon_state = "blessing_jacket"
item_state = "blessing_jacket"
icon_open = "blessing_jacket_open"
icon_closed = "blessing_jacket"
icon = 'icons/obj/custom_items/nelson_jacket.dmi'
icon_state = "nelson_jacket"
item_state = "nelson_jacket"
icon_open = "nelson_jacket_open"
icon_closed = "nelson_jacket"
contained_sprite = TRUE
@@ -2371,4 +2371,15 @@ obj/item/clothing/suit/storage/hooded/fluff/make_poncho //Raincoat Poncho - M.A.
item_state = "faysaljr"
icon_living = "faysaljr"
icon_dead = "faysaljr_dead"
can_nap = 0
can_nap = 0
/obj/item/clothing/suit/storage/toggle/fluff/talon_coat //Embroidered Coat - Talon Hatfield - dronztheWolf
name = "embroidered coat"
desc = " Martian long coat, made to fend off dust storms and other unpleasantries. This one has a few patches sewn into it depicting: A Solarian flag, a Batallion number, and a large sun."
icon = 'icons/obj/custom_items/ryan_jacket.dmi'
icon_state = "talon_coat"
item_state = "talon_coat"
icon_open = "talon_coat_open"
icon_closed = "talon_coat"
contained_sprite = TRUE