The Uniformity : The Confluence of Conformity (#13773)

code/game/objects/items/weapons/cards_ids.dm

@@ -523,7 +523,7 @@ var/const/NO_EMAG_ACT = -50
 /obj/item/card/id/distress/ap_eridani
 	name = "\improper Eridani identification card"
 	desc = "A high-tech holobadge, identifying the owner as a contractor from one of the many PMCs from the Eridani Corporate Federation."
-	assignment = "EPMC Asset Protection"
+	assignment = "PMCG Asset Protection"
 	icon_state = "erisec_card"
 	overlay_state = "erisec_card"
 
@@ -574,8 +574,8 @@ var/const/NO_EMAG_ACT = -50
 /obj/item/card/id/pmc
 	name = "\improper PMCG identification card"
 	desc = "A high-tech holobadge, identifying the owner as a contractor from one of the many PMCs from the Private Military Contracting Group."
-	icon_state = "erisec_card"
-	overlay_state = "erisec_card"
+	icon_state = "pmc_card"
+	overlay_state = "pmc_card"
 
 /obj/item/card/id/zeng_hu
 	name = "\improper Zeng-Hu Pharmaceuticals identification card"
@@ -607,6 +607,12 @@ var/const/NO_EMAG_ACT = -50
 	overlay_state = "einstein_card"
 	iff_faction = IFF_EE
 
+/obj/item/card/id/orion
+	name = "\improper Orion Express identification card"
+	desc = "A well-worn identification pass, retrofitted with wireless transmission technology."
+	icon_state = "orion_card"
+	overlay_state = "orion_card"
+
 /obj/item/card/id/bluespace
 	name = "bluespace identification card"
 	desc = "A bizarre imitation of Nanotrasen identification cards. It seems to function normally as well."
@@ -630,4 +636,4 @@ var/const/NO_EMAG_ACT = -50
 		..()
 
 /obj/item/card/id/away_site
-	access = list(access_generic_away_site, access_external_airlocks)
+	access = list(access_generic_away_site, access_external_airlocks)

code/game/objects/items/weapons/gift_wrappaper.dm

@@ -310,7 +310,6 @@
 		/obj/item/inflatable_duck,
 		/obj/item/beach_ball,
 		/obj/item/clothing/under/syndicate/tracksuit,
-		/obj/item/clothing/under/mime,
 		/obj/item/clothing/under/rank/fatigues/marine,
 		/obj/item/clothing/under/rank/dress/marine,
 		/obj/random/hoodie,

code/game/objects/items/weapons/storage/backpack.dm

@@ -122,14 +122,6 @@
 	icon_state = "medicalpack"
 	item_state_slots = null
 
-/obj/item/storage/backpack/medic/first_responder
-	name = "first responder backpack"
-	desc = "A bulky easy-clean backpack specially designed to carry a First Responder's equipment."
-	icon = 'icons/clothing/kit/first_responder.dmi'
-	icon_state = "firstresponderbackpack"
-	item_state = "firstresponderbackpack"
-	contained_sprite = TRUE
-
 /obj/item/storage/backpack/security
 	name = "security backpack"
 	desc = "It's a very robust backpack."
@@ -667,7 +659,7 @@
 	set src in usr
 	if(use_check_and_message(usr))
 		return 0
-	hooded = !hooded 
+	hooded = !hooded
 	to_chat(usr, "You [hooded ? "raise" : "lower"] \the [src] hood.")
 	icon_state = "[initial(icon_state)][hooded ? "_up" : ""]"
 	item_state = "icon_state"
@@ -687,7 +679,7 @@
 	icon_state = "medcape"
 	item_state = "medcape"
 
-/obj/item/storage/backpack/cloak/engi 
+/obj/item/storage/backpack/cloak/engi
 	name = "engineering tunnel cloak"
 	desc = "A Vaurca cloak with storage pockets. This one has the engineering department design."
 	icon_state = "engicape"
@@ -715,4 +707,4 @@
 	name = "security tunnel cloak"
 	desc = "A Vaurca cloak with storage pockets. This one has the security department design."
 	icon_state = "seccape"
-	item_state = "seccape"
+	item_state = "seccape"