From d82736a3c3b05bcb2ef007225931e991d0f244c6 Mon Sep 17 00:00:00 2001
From: Steelpoint <alexander.henley@hotmail.com>
Date: Fri, 23 Jan 2015 02:19:17 +0800
Subject: [PATCH] MoreRefinment

---
 code/game/objects/items/weapons/cards_ids.dm  | 26 ++++---------------
 .../crates_lockers/closets/syndicate.dm       |  8 +++---
 code/modules/admin/verbs/debug.dm             |  2 +-
 3 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index e9760176193..f232c647fe8 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -190,41 +190,25 @@ update_label("John Doe", "Clowny")
 	New()
 		access = get_all_centcom_access()
 		..()
-/obj/item/weapon/card/id/ertsCommand
+/obj/item/weapon/card/id/ert
 	name = "\improper Centcom ID"
 	desc = "A ERT ID card"
 	icon_state = "centcom"
 	registered_name = "Emergency Response Team Commander"
 	assignment = "Emergency Response Team Commander"
-	New()
-		access = get_all_accesses()
+	New() access = get_all_accesses()
 
-/obj/item/weapon/card/id/ertsSecurity
-	name = "\improper Centcom ID"
-	desc = "A ERT ID card"
-	icon_state = "centcom"
+/obj/item/weapon/card/id/ert/Security
 	registered_name = "Security Response Officer"
 	assignment = "Security Response Officer"
-	New()
-		access = get_all_accesses()
 
-/obj/item/weapon/card/id/ertsEngineer
-	name = "\improper Centcom ID"
-	desc = "A ERT ID card"
-	icon_state = "centcom"
+/obj/item/weapon/card/id/ert/Engineer
 	registered_name = "Engineer Response Officer"
 	assignment = "Engineer Response Officer"
-	New()
-		access = get_all_accesses()
 
-/obj/item/weapon/card/id/ertsMedical
-	name = "\improper Centcom ID"
-	desc = "A ERT ID card"
-	icon_state = "centcom"
+/obj/item/weapon/card/id/ert/Medical
 	registered_name = "Medical Response Officer"
 	assignment = "Medical Response Officer"
-	New()
-		access = get_all_accesses()
 
 /obj/item/weapon/card/id/prisoner
 	name = "prisoner ID card"
diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
index 9fb12b6b5c4..05e39c8784f 100644
--- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm
+++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
@@ -11,7 +11,7 @@
 	icon_state = "capsecureoff"
 	icon_closed = "capsecureoff"
 	icon_opened = "capsecureopen"
-//	new /obj/item/weapon/card/id/ertsCommand(src)
+//	new /obj/item/weapon/card/id/ert(src)
 	new /obj/item/weapon/storage/backpack/captain(src)
 	return
 
@@ -22,7 +22,7 @@
 	icon_closed = "secoff"
 	icon_opened = "secopen"
 	new /obj/item/weapon/gun/energy/pulse_rifle/pulse_pistol/loyalpin(src)
-	new /obj/item/weapon/card/id/ertsSecurity(src)
+	new /obj/item/weapon/card/id/ert/Security(src)
 	new /obj/item/weapon/storage/backpack/security(src)
 	return
 
@@ -33,7 +33,7 @@
 	icon_closed = "securemedoff"
 	icon_opened = "securemedopen"
 	new /obj/item/weapon/gun/energy/pulse_rifle/pulse_pistol/loyalpin(src)
-	new /obj/item/weapon/card/id/ertsMedical(src)
+	new /obj/item/weapon/card/id/ert/Medical(src)
 	new /obj/item/weapon/storage/backpack/medic(src)
 	return
 
@@ -44,7 +44,7 @@
 	icon_closed = "secureengoff"
 	icon_opened = "secureengopen"
 	new /obj/item/weapon/gun/energy/pulse_rifle/pulse_pistol/loyalpin(src)
-	new /obj/item/weapon/card/id/ertsEngineer(src)
+	new /obj/item/weapon/card/id/ert/Engineer(src)
 	new /obj/item/weapon/storage/backpack/industrial(src)
 	return
 
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 3ab331c26f3..8644ac28ff2 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -1117,7 +1117,7 @@ var/global/list/g_fancy_list_of_types = null
 		M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat/swat(M), slot_shoes)
 		M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves)
 //		M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/captain(M), slot_back)
-		M.equip_to_slot_or_del(new /obj/item/weapon/card/id/ertsCommand(M), slot_wear_id)
+		M.equip_to_slot_or_del(new /obj/item/weapon/card/id/ert(M), slot_wear_id)
 	else
 		M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(M), slot_w_uniform)
 		M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat/swat(M), slot_shoes)