Fuck you *Ungreens your Peacekeepers*

code/game/objects/items/stunbaton.dm

@@ -293,8 +293,18 @@
 /obj/item/melee/baton/cattleprod/tactical
 	name = "tactical stunprod"
 	desc = "A cost-effective, mass-produced, tactical stun prod."
+	icon_state = "tacprod"
+	item_state = "tacprod"
 	preload_cell_type = /obj/item/stock_parts/cell/high/plus // comes with a cell
-	color = "#aeb08c" // super tactical
+
+/obj/item/melee/baton/cattleprod/tactical/update_icon_state()
+	. = ..()
+	if(status)
+		item_state = "[initial(item_state)]_active"
+	else if(!cell)
+		item_state = "[initial(item_state)]_nocell"
+	else
+		item_state = "[initial(item_state)]"
 
 /obj/item/batonupgrade
 	name = "baton power upgrade"

code/modules/clothing/head/helmet.dm

@@ -93,6 +93,8 @@
 /obj/item/clothing/head/helmet/sec/occupying
 	name = "occupying force helmet"
 	desc = "Standard deployment gear. Protects the head from impacts and has a built in mounted light."
+	icon_state = "occhelm"
+	item_state = "occhelm"
 
 /obj/item/clothing/head/helmet/sec/occupying/Initialize(mapload, mob/user)
 	attached_light = new /obj/item/flashlight/seclite(null)

code/modules/clothing/masks/breath.dm

@@ -17,8 +17,9 @@
 
 /obj/item/clothing/mask/breath/tactical
 	name = "tactical breath mask"
-	desc = "A close-fitting 'tactical' mask that can be connected to an air supply. This model is not translucent for anonymity."
-	color = "#736e35"
+	desc = "A close-fitting 'tactical' mask that can be connected to an air supply."
+	icon_state = "tacmask"
+	item_state = "sechailer"
 	visor_flags_inv = HIDEFACE
 
 /obj/item/clothing/mask/breath/tactical/Initialize(mapload)

code/modules/clothing/outfits/occupying.dm

@@ -1,7 +1,15 @@
 // Peacekeeping force clothing
 /obj/item/clothing/under/rank/security/grey/amber/occupying
-	name = "peacekeeping force jumpsuit"
-	color = "#55ff9b"
+	name = "peacekeeping officer jumpsuit"
+	desc = "A Peacekeeper uniform with red marking denoting officers and heavies."
+	icon_state = "occuniformofficer"
+	item_state = "occuniformofficer"
+
+/obj/item/clothing/under/rank/security/grey/amber/occupying/commander
+	name = "peacekeeping commander jumpsuit"
+	desc = "A Peacekeeper uniform with blue markings denoting commanders"
+	icon_state = "occuniformcommander"
+	item_state = "occuniformcommander"
 
 /obj/item/clothing/under/rank/security/grey/amber/occupying/Initialize(mapload, mob/user)
 	. = ..()
@@ -10,23 +18,38 @@
 
 /obj/item/clothing/head/beret/sec/centcom/occupying
 	name = "peacekeeping force beret"
-	desc = "A special green beret for the mundane life of an Peacekeeper force commander."
-	color = "#55ff9b"
+	desc = "A special white beret for the mundane life of a Peacekeeper force commander."
+	icon_state = "occberet"
+	item_state = "occberet"
+
+/obj/item/clothing/suit/armor/vest/alt/occupying
+	name = "peacekeeping force vest"
+	desc = "A blue armored vest worn by Peacekeeper officers."
+	icon_state = "occvest"
+	item_state = "occvest"
 
 /obj/item/clothing/suit/armor/riot/occupying
 	armor = list(MELEE = 40, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 0, BIO = 0, RAD = 0, FIRE = 40, ACID = 40)
 	name = "peacekeeping force riot suit"
-	desc = "A mass produced semi-flexible polycarbonate body armor with decent padding to protect against melee attacks. Not as strong as riot suits typically issued to NT stations."
-	color = "#55ff9b"
+	desc = "A reinforced version of the standard Peacekeeper vest with extra padding to protect against melee attacks. Not as strong as riot suits typically issued to NT stations."
+	icon_state = "occriotsuit"
+	item_state = "occriotsuit"
 
 /obj/item/clothing/head/helmet/riot/raised/occupying
 	name = "peacekeeping force riot helmet"
-	desc = "It's a helmet specifically designed for the Peacekeeping force to protect against close range attacks."
-	color = "#55ff9b"
+	desc = "A blue helmet specifically designed for the Peacekeeping force to protect against close range attacks."
+	icon_state = "occriothelm"
+	item_state = "occriothelm"
+
+/obj/item/storage/belt/military/occbelt
+	name = "peacekeeping force belt"
+	desc = "A blue belt used by Peacekeepers to store their gear."
+	icon_state = "occbelt"
+	item_state = "occbelt"
 
 // Peacekeeping force vest loadouts
 // To note: each vest has 7 normal slots - Hopek
-/obj/item/storage/belt/military/occupying_officer/Initialize(mapload) // Occupying Officer
+/obj/item/storage/belt/military/occbelt/occupying_officer/Initialize(mapload) // Occupying Officer
 	. = ..()
 	new /obj/item/ammo_box/magazine/wt550m9/wtr(src)
 	new /obj/item/ammo_box/magazine/wt550m9/wtr(src)
@@ -37,7 +60,7 @@
 	new /obj/item/jawsoflife/jimmy(src)
 
 
-/obj/item/storage/belt/military/occupying_commander/Initialize(mapload) // Occupying force Commander
+/obj/item/storage/belt/military/occbelt/occupying_commander/Initialize(mapload) // Occupying force Commander
 	. = ..()
 	new /obj/item/ammo_box/magazine/wt550m9/wtr(src)
 	new /obj/item/ammo_box/magazine/wt550m9/wtr(src)
@@ -47,10 +70,8 @@
 	new /obj/item/restraints/handcuffs/cable/zipties(src)
 	new /obj/item/jawsoflife/jimmy(src)
 
-/obj/item/storage/belt/military/occupying_heavy
-	color = "#55ff9b"
 
-/obj/item/storage/belt/military/occupying_heavy/Initialize(mapload) // Occupying Riot Officer
+/obj/item/storage/belt/military/occbelt/occupying_heavy/Initialize(mapload) // Occupying Riot Officer
 	. = ..()
 	new /obj/item/restraints/legcuffs/bola/energy(src)
 	new /obj/item/restraints/legcuffs/bola/energy(src)
@@ -64,12 +85,12 @@
 /datum/outfit/occupying
 	name = "Peacekeeping Officer"
 	uniform = /obj/item/clothing/under/rank/security/grey/amber/occupying
-	suit = /obj/item/clothing/suit/armor/vest/alt
+	suit = /obj/item/clothing/suit/armor/vest/alt/occupying
 	shoes = /obj/item/clothing/shoes/jackboots
 	gloves = /obj/item/clothing/gloves/color/black
 	ears = /obj/item/radio/headset/headset_cent/alt
 	mask = /obj/item/clothing/mask/cigarette/lit
-	belt = /obj/item/storage/belt/military/occupying_officer
+	belt = /obj/item/storage/belt/military/occbelt/occupying_officer
 	suit_store = /obj/item/gun/ballistic/automatic/wt550/armory
 	back = /obj/item/melee/baton/cattleprod/tactical
 	head = /obj/item/clothing/head/helmet/sec/occupying
@@ -102,16 +123,17 @@
 
 /datum/outfit/occupying/commander
 	name = "Peacekeeping force Commander"
+	uniform = /obj/item/clothing/under/rank/security/grey/amber/occupying/commander
 	head = /obj/item/clothing/head/beret/sec/centcom/occupying
-	belt = /obj/item/storage/belt/military/occupying_commander
+	belt = /obj/item/storage/belt/military/occbelt/occupying_commander
 	l_pocket = /obj/item/pinpointer/nuke
 	r_pocket = /obj/item/lighter/greyscale // everyone has ciggies, only commander has a lighter
 	mask = /obj/item/clothing/mask/cigarette/cigar/cohiba
 	glasses = /obj/item/clothing/glasses/hud/security
 
 /datum/outfit/occupying/heavy
 	name = "Peacekeeping Riot Officer"
-	belt = /obj/item/storage/belt/military/occupying_heavy
+	belt = /obj/item/storage/belt/military/occbelt/occupying_heavy
 	back = /obj/item/shield/riot
 	l_pocket = /obj/item/clothing/ears/earmuffs
 	r_pocket = /obj/item/tank/internals/emergency_oxygen/engi