From 47ab279b9b634dabce6e84b7c1ed9454980e95df Mon Sep 17 00:00:00 2001 From: woodratt Date: Tue, 12 Jul 2016 17:19:39 -0700 Subject: [PATCH] 1.5.5 Fancy Green Uniforms - Adds, one green suit and formal jacket. - One new military like jacket that can be selected from the loadout. - A new holster type, leg holster. Can be selected from the loadout as well. - Cleaned up a couple of the sprites for outfits that have ties (rolled up sleeve versions on a couple still had the tie sprite). --- .../loadout/loadout_accessories.dm | 4 ++++ .../preference_setup/loadout/loadout_suit.dm | 4 ++++ code/modules/clothing/head/jobs.dm | 4 ++++ code/modules/clothing/suits/miscellaneous.dm | 20 ++++++++++++++++++- .../clothing/under/accessories/accessory.dm | 4 ++++ .../clothing/under/accessories/holster.dm | 6 ++++++ code/modules/clothing/under/miscellaneous.dm | 9 +++++++++ 7 files changed, 50 insertions(+), 1 deletion(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 4a79d5c26b..ba3cb42d89 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -45,6 +45,10 @@ display_name = "holster, hip" path = /obj/item/clothing/accessory/holster/hip +/datum/gear/accessory/holster/leg + display_name = "holster, leg" + path = /obj/item/clothing/accessory/holster/leg + /datum/gear/accessory/holster/waist display_name = "holster, waist" path = /obj/item/clothing/accessory/holster/waist diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 3eb3b50401..1b9329679e 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -54,6 +54,10 @@ display_name = "military jacket, alt" path = /obj/item/clothing/suit/storage/miljacket/alt +/datum/gear/suit/mil/green + display_name = "military jacket, green" + path = /obj/item/clothing/suit/storage/miljacket/green + /datum/gear/suit/hazard_vest display_name = "hazard vest" path = /obj/item/clothing/suit/storage/hazardvest diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 4075a6d4b3..b34025628e 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -101,6 +101,10 @@ name = "captains beret" desc = "A white beret adorned with a blue patch. Worn by NanoTrasen command staff." icon_state = "beret_centcom_captain" +/obj/item/clothing/head/beret/sec/gov + name = "officer beret" + desc = "A black beret with a gold emblem." + icon_state = "beret_corporate_hos" //Medical /obj/item/clothing/head/surgery diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 93a1775e80..496f94fdf9 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -397,6 +397,12 @@ icon_state = "militaryjacket_badge" item_state = "militaryjacket_badge" +/obj/item/clothing/suit/storage/miljacket/green + name = "military jacket" + desc = "A dark green canvas jacket. Feels sturdy, yet comfortable." + icon_state = "militaryjacket_green" + item_state = "militaryjacket_green" + /obj/item/clothing/suit/storage/toggle/bomber name = "bomber jacket" desc = "A thick, well-worn WW2 leather bomber jacket." @@ -796,4 +802,16 @@ /obj/item/clothing/suit/storage/flannel/aqua desc = "A comfy, aqua flannel shirt. Unleash your inner hipster." icon_state = "flannel_aqua" - item_state = "b_suit" \ No newline at end of file + item_state = "b_suit" + +//Green Uniform + +/obj/item/clothing/suit/storage/toggle/greengov + name = "green formal jacket" + desc = "A sleek proper formal jacket with gold buttons." + icon_state = "suitjacket_green_open" + item_state = "suitjacket_green_open" + icon_open = "suitjacket_green_open" + icon_closed = "suitjacket_green" + blood_overlay_type = "coat" + body_parts_covered = UPPER_TORSO|ARMS \ No newline at end of file diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 747f02552d..10f12a74f4 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -102,6 +102,10 @@ name = "black tie" icon_state = "blacktie" +/obj/item/clothing/accessory/darkgreen + name = "dark green tie" + icon_state = "dgreentie" + /obj/item/clothing/accessory/yellow name = "yellow tie" icon_state = "yellowtie" diff --git a/code/modules/clothing/under/accessories/holster.dm b/code/modules/clothing/under/accessories/holster.dm index 9ba4ffa5e3..de7ac20c9a 100644 --- a/code/modules/clothing/under/accessories/holster.dm +++ b/code/modules/clothing/under/accessories/holster.dm @@ -125,3 +125,9 @@ name = "hip holster" desc = "A handgun holster slung low on the hip, draw pardner!" icon_state = "holster_hip" + +/obj/item/clothing/accessory/holster/leg + name = "leg holster" + desc = "A tacticool handgun holster. Worn on the upper leg." + icon_state = "holster_hip" + overlay_state = "holster_leg" \ No newline at end of file diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 4753580272..a81b182108 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -98,6 +98,15 @@ item_state = "bl_suit" worn_state = "ert_uniform" +/obj/item/clothing/under/gov + desc = "A neat proper uniform of someone on offical business. The plain, professional attire of an Internal Affairs Agent. The collar is immaculately starched." + name = "Green formal uniform" + icon_state = "greensuit" + item_state = "greensuit" + worn_state = "greensuit" + rolled_sleeves = 0 + starting_accessories = list(/obj/item/clothing/accessory/darkgreen) + /obj/item/clothing/under/space name = "\improper NASA jumpsuit" desc = "It has a NASA logo on it and is made of space-proofed materials."