Finishing touches on outfit code

code/datums/outfits/jobs/civilian.dm

@@ -21,11 +21,11 @@
 	uniform = /obj/item/clothing/under/rank/bartender
 	id_type = /obj/item/weapon/card/id/civilian/bartender
 	pda_type = /obj/item/device/pda/bar
-	backpack_contents = list(/obj/item/weapon/permit/gun/bar = 1)
+	backpack_contents = list(/obj/item/clothing/accessory/permit/gun/bar = 1)
 
 /decl/hierarchy/outfit/job/service/bartender/post_equip(mob/living/carbon/human/H)
 	..()
-	for(var/obj/item/weapon/permit/gun/bar/permit in H.back.contents)
+	for(var/obj/item/clothing/accessory/permit/gun/bar/permit in H.back.contents)
 		permit.set_name(H.real_name)
 
 /decl/hierarchy/outfit/job/service/bartender/barista

code/datums/outfits/jobs/medical.dm

@@ -57,7 +57,6 @@
 		head = /obj/item/clothing/head/nursehat
 	else
 		uniform = /obj/item/clothing/under/rank/medical/scrubs/purple
-		head = /obj/item/clothing/head/nursehat
 	..()
 
 /decl/hierarchy/outfit/job/medical/chemist

code/datums/outfits/military/fleet.dm

@@ -0,0 +1,22 @@
+/decl/hierarchy/outfit/military/fleet/pt
+	name = "Fleet Uniform - PT"
+	uniform = /obj/item/clothing/under/pt/fleet
+	shoes = /obj/item/clothing/shoes/black
+
+/decl/hierarchy/outfit/military/fleet/utility
+	name = "Fleet Uniform - Utility"
+	uniform = /obj/item/clothing/under/utility/fleet
+	shoes = /obj/item/clothing/shoes/boots/jackboots
+
+/decl/hierarchy/outfit/military/fleet/service
+	name = "Fleet Uniform - Service"
+	uniform = /obj/item/clothing/under/service/fleet
+	shoes = /obj/item/clothing/shoes/dress/white
+
+/decl/hierarchy/outfit/military/fleet/dress
+	name = "Fleet Uniform - Dress"
+	uniform = /obj/item/clothing/under/service/fleet
+	shoes = /obj/item/clothing/shoes/dress/white
+	suit = /obj/item/clothing/suit/storage/toggle/dress/fleet
+	gloves = /obj/item/clothing/gloves/white
+	head = /obj/item/clothing/head/dress/fleet

code/datums/outfits/military/marines.dm

@@ -0,0 +1,23 @@
+/decl/hierarchy/outfit/military/marine/pt
+	name = "Marine Uniform - PT"
+	uniform = /obj/item/clothing/under/pt/marine
+	shoes = /obj/item/clothing/shoes/black
+
+/decl/hierarchy/outfit/military/marine/utility
+	name = "Marine Uniform - Utility"
+	uniform = /obj/item/clothing/under/utility/marine
+	shoes = /obj/item/clothing/shoes/boots/jungle
+
+/decl/hierarchy/outfit/military/marine/service
+	name = "Marine Uniform - Service"
+	uniform = /obj/item/clothing/under/service/marine
+	shoes = /obj/item/clothing/shoes/dress
+	suit = /obj/item/clothing/suit/storage/service/marine
+
+/decl/hierarchy/outfit/military/marine/dress
+	name = "Marine Uniform - Dress"
+	uniform = /obj/item/clothing/under/mildress/marine
+	shoes = /obj/item/clothing/shoes/dress/white
+	suit = /obj/item/clothing/suit/dress/marine
+	gloves = /obj/item/clothing/gloves/white
+	head = /obj/item/clothing/head/dress/marine

code/datums/outfits/military/military.dm

@@ -0,0 +1,5 @@
+/decl/hierarchy/outfit/military
+	name = "Military Uniform"
+	hierarchy_type = /decl/hierarchy/outfit/military
+
+	l_ear = /obj/item/device/radio/headset

code/datums/outfits/military/sifguard.dm

@@ -0,0 +1,23 @@
+/decl/hierarchy/outfit/military/sifguard/pt
+	name = "SifGuard Uniform - PT"
+	uniform = /obj/item/clothing/under/pt/expeditionary
+	shoes = /obj/item/clothing/shoes/black
+
+/decl/hierarchy/outfit/military/sifguard/utility
+	name = "SifGuard Uniform - Utility"
+	uniform = /obj/item/clothing/under/utility/expeditionary
+	shoes = /obj/item/clothing/shoes/boots/jackboots
+
+/decl/hierarchy/outfit/military/sifguard/service
+	name = "SifGuard Uniform - Service"
+	uniform = /obj/item/clothing/under/utility/expeditionary
+	shoes = /obj/item/clothing/shoes/boots/jackboots
+	suit = /obj/item/clothing/suit/storage/service/expeditionary
+
+/decl/hierarchy/outfit/military/sifguard/dress
+	name = "SifGuard Uniform - Dress"
+	uniform = /obj/item/clothing/under/mildress/expeditionary
+	shoes = /obj/item/clothing/shoes/dress
+	suit = /obj/item/clothing/suit/dress/expedition
+	gloves = /obj/item/clothing/gloves/white
+	head = /obj/item/clothing/head/dress/expedition