Card update whoops

code/game/machinery/cloning.dm

@@ -3,7 +3,7 @@
 /obj/item/disk/data
 	name = "Cloning Data Disk"
 	icon_state = "datadisk0" //Gosh I hope syndies don't mistake them for the nuke disk.
-	item_state = "card-id"
+	item_state = "red-id"
 	w_class = SIZE_TINY
 	var/read_only = 0 //Well,it's still a floppy disk
 

code/game/objects/items/cards_ids.dm

@@ -60,7 +60,7 @@
 	name = "identification holo-badge"
 	desc = "A slice of encoded compressed fiber glass. Used for identification and access control."
 	icon_state = "id"
-	item_state = "card-id"
+	item_state = "red-id"
 	var/list/access
 	var/faction = FACTION_NEUTRAL
 	var/list/faction_group
@@ -445,12 +445,12 @@
 	name = "CORSAT administration code"
 	desc = "A disk of data containing one of the CORSAT administration authentication codes necessary to lift the biohazard lockdown."
 	icon_state = "data"
-	item_state = "card-id"
+	item_state = "red-id"
 	unacidable = 1
 
 /obj/item/card/data/prison
 	name = "prison lockdown administration code"
 	desc = "A disk of data containing one of the prison station administration authentication codes necessary to lift the security lockdown."
 	icon_state = "data"
-	item_state = "card-id"
+	item_state = "red-id"
 	unacidable = 1

code/game/objects/items/disks.dm

@@ -2,7 +2,7 @@
 	name = "disk"
 	icon = 'icons/obj/items/disk.dmi'
 	icon_state = "datadisk0"
-	item_state = "card-id"
+	item_state = "red-id"
 
 /obj/item/disk/nuclear
 	name = "nuclear authentication disk"

code/game/objects/items/storage/belt.dm

@@ -428,11 +428,11 @@
 
 /obj/item/storage/belt/security/MP/UPP/full/fill_preset_inventory()
 	new /obj/item/weapon/gun/energy/taser(src)
-	new /obj/item/device/flash(src)
 	new /obj/item/weapon/baton(src)
 	new /obj/item/handcuffs(src)
 	new /obj/item/reagent_container/spray/pepper(src)
-	new /obj/item/ammo_magazine/revolver/upp/shrapnel(src)
+	new /obj/item/ammo_magazine/revolver/upp(src)
+	new /obj/item/ammo_magazine/revolver/upp(src)
 
 /obj/item/storage/belt/security/MP/CMB
 	name = "\improper CMB duty belt"

code/modules/clothing/head/helmet.dm

@@ -1162,7 +1162,6 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
 	flags_inventory = BLOCKSHARPOBJ
 	flags_inv_hide = HIDEEARS
 
-
 /obj/item/clothing/head/uppcap/boonie
 	name = "\improper UL3 UPP hat"
 	desc = "UPP headgear issued to soldiers when they're not expected to face combat, and may be requested by officers and above."
@@ -1189,6 +1188,11 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
 	desc = "UPP headgear issued to Kapitans and above. It is made of high-quality materials, and has the officers rank in gold placed upon the front of the cap."
 	icon_state = "upp_peaked"
 
+/obj/item/clothing/head/uppcap/peaked/police
+	name = "\improper UL3 PaP peaked cap"
+	desc = "UPP headgear issued to constables of the People's Police."
+	icon_state = "upp_peaked_police"
+
 /obj/item/clothing/head/uppcap/ushanka
 	name = "\improper UL8 UPP ushanka"
 	icon_state = "upp_ushanka"

code/modules/clothing/suits/marine_coat.dm

@@ -31,7 +31,7 @@
 		/obj/item/storage/belt/gun/m44,
 		/obj/item/storage/belt/gun/mateba,
 		/obj/item/storage/belt/gun/smartpistol,
-
+		/obj/item/storage/belt/gun/type47,
 		/obj/item/device/flashlight,
 		/obj/item/device/healthanalyzer,
 		/obj/item/device/radio,
@@ -369,3 +369,10 @@
 	icon_state = "jacket_grey"
 	item_state = "jacket_grey"
 	has_buttons = FALSE
+
+/obj/item/clothing/suit/storage/jacket/marine/bomber/grey/upp
+	name = "People's Police bomber jacket"
+	desc = "A blue-grey bomber jacket worn by People's Police constables."
+	icon_state = "jacket_grey"
+	item_state = "jacket_grey"
+	has_buttons = FALSE

code/modules/gear_presets/upp.dm

@@ -705,17 +705,19 @@
 	rank = JOB_UPP_POLICE
 	role_comm_title = "CONST"
 	paygrade = "UC1"
-	idtype = /obj/item/card/id/data
+	idtype = /obj/item/card/id/silver
 
 /datum/equipment_preset/upp/security/load_gear(mob/living/carbon/human/new_human)
+
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/peaked/police, WEAR_HEAD)
 	//back
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black, WEAR_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR)
 	//uniform
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/black, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/black, WEAR_ACCESSORY)
 	//jacket
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/bomber/grey, WEAR_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/bomber/grey/upp, WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/revolver, WEAR_J_STORE)
 	//waist
 	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/UPP/full, WEAR_WAIST)