Merge pull request #2118 from Woodratt/1.5.5_fancyuniforms

1.5.5 Fancy Green Uniforms

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

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

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

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"
+	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

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"

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"

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 <i>immaculately</i> 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."