Ghost Roles (#6706)

code/datums/outfits/outfit.dm

@@ -29,7 +29,7 @@
 	var/internals_slot = null //ID of slot containing a gas tank
 	var/list/backpack_contents = list() //In the list(path=count,otherpath=count) format
 	var/list/accessory_contents = list()
-	var/list/belt_contents = list()
+	var/list/belt_contents = list() //In the list(path=count,otherpath=count) format
 	var/list/implants = null //A list of implants that should be implanted
 
 /datum/outfit/proc/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -158,6 +158,10 @@
 			var/number = backpack_contents[path]
 			for(var/i in 1 to number)
 				H.equip_or_collect(new path(H), slot_in_backpack)
+		for(var/path in belt_contents)
+			var/number = belt_contents[path]
+			for(var/i in 1 to number)
+				H.equip_or_collect(new path(H), slot_in_belt)
 
 	post_equip(H, visualsOnly)
 

code/datums/outfits/outfit_admin.dm

@@ -313,8 +313,8 @@
 
 	uniform = /obj/item/clothing/under/rank/centcom_commander
 	suit = /obj/item/clothing/suit/storage/vest/heavy/ert/commander
-	shoes = /obj/item/clothing/shoes/swat
-	gloves = /obj/item/clothing/gloves/swat
+	shoes = /obj/item/clothing/shoes/jackboots
+	gloves = /obj/item/clothing/gloves/white
 	l_ear = /obj/item/device/radio/headset/ert
 	glasses = /obj/item/clothing/glasses/sunglasses/sechud
 	head = /obj/item/clothing/head/beret/centcom/commander
@@ -329,6 +329,42 @@
 		/obj/item/weapon/implant/loyalty
 	)
 
+/datum/outfit/admin/nt/tcfl_commander
+	name = "TCFL Commander"
+
+	uniform = /obj/item/clothing/under/legion
+	shoes = /obj/item/clothing/shoes/jackboots
+	l_ear = /obj/item/device/radio/headset/legion
+	head = /obj/item/clothing/head/legion_beret
+	belt = /obj/item/weapon/storage/belt/security/tactical
+
+	backpack_contents = list(
+		/obj/item/weapon/gun/projectile/revolver = 1,
+		/obj/item/clothing/accessory/holster/hip = 1,
+		/obj/item/clothing/accessory/legion = 1,
+		/obj/item/weapon/storage/box/flashbangs = 1
+	)
+
+	belt_contents = list(
+		/obj/item/weapon/melee/baton/loaded = 1,
+		/obj/item/weapon/handcuffs = 2,
+		/obj/item/ammo_magazine/a357 = 2,
+		/obj/item/device/flash = 1
+	)
+
+/datum/outfit/admin/nt/cciaa
+	name = "CCIA Agent"
+
+	uniform = /obj/item/clothing/under/rank/centcom_officer
+	suit = /obj/item/clothing/suit/storage/toggle/internalaffairs/cciaa
+	shoes = /obj/item/clothing/shoes/laceup
+	gloves = /obj/item/clothing/gloves/white
+	l_ear = /obj/item/device/radio/headset/ert/ccia
+	glasses = /obj/item/clothing/glasses/sunglasses/sechud
+	head = /obj/item/clothing/head/beret/centcom/officer
+	l_pocket = /obj/item/weapon/reagent_containers/spray/pepper
+	r_pocket = /obj/item/device/taperecorder/cciaa
+	l_hand = /obj/item/weapon/storage/lockbox/cciaa
 
 /datum/outfit/admin/nt/odinsec
 	name = "NTCC Odin Security Specialist"
@@ -349,6 +385,14 @@
 
 	backpack_contents = null
 
+	belt_contents = list(
+		/obj/item/weapon/reagent_containers/spray/pepper = 1,
+		/obj/item/weapon/melee/baton/loaded = 1,
+		/obj/item/weapon/grenade/chem_grenade/gas = 1,
+		/obj/item/device/flash = 1,
+		/obj/item/ammo_magazine/c45x = 2
+	)
+
 	implants = list(
 		/obj/item/weapon/implant/loyalty
 	)
@@ -364,22 +408,6 @@
 		var/obj/item/clothing/under/rank/U = H.w_uniform
 		U.attach_accessory(null, holster)
 
-	if(H && H.belt)
-
-		var/obj/item/weapon/reagent_containers/spray/pepper/pepperspray = new(H)
-		var/obj/item/weapon/melee/baton/loaded/baton = new(H)
-		var/obj/item/weapon/grenade/chem_grenade/gas/gasgrenade = new(H)
-		var/obj/item/device/flash/flash = new(H)
-		var/obj/item/ammo_magazine/c45x/mag1 = new(H)
-		var/obj/item/ammo_magazine/c45x/mag2 = new(H)
-
-		H.belt.contents += mag1
-		H.belt.contents += mag2
-		H.belt.contents += gasgrenade
-		H.belt.contents += pepperspray
-		H.belt.contents += flash
-		H.belt.contents += baton
-
 /datum/outfit/admin/nt/specops
 	name = "Special Operations Officer"