From c281ee7b77028cc0668cc0bd789d4fb252539fc4 Mon Sep 17 00:00:00 2001
From: tigercat2000 <nick.pilant2@gmail.com>
Date: Mon, 28 Aug 2017 21:35:18 -0700
Subject: [PATCH] Revert "Buffs the HoP Door remote"

---
 code/__DEFINES/misc.dm                            | 15 +++++++--------
 code/game/jobs/access.dm                          |  2 --
 code/game/objects/items/control_wand.dm           |  9 ++-------
 .../crates_lockers/closets/secure/security.dm     |  2 +-
 4 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm
index 942bc5405f5..a488d39f836 100644
--- a/code/__DEFINES/misc.dm
+++ b/code/__DEFINES/misc.dm
@@ -246,14 +246,13 @@
 ///Access Region Codes///
 #define REGION_ALL			0
 #define REGION_GENERAL		1
-#define REGION_HOP 2
-#define REGION_SECURITY		3
-#define REGION_MEDBAY		4
-#define REGION_RESEARCH		5
-#define REGION_ENGINEERING	6
-#define REGION_SUPPLY		7
-#define REGION_COMMAND		8
-#define REGION_CENTCOMM		9
+#define REGION_SECURITY		2
+#define REGION_MEDBAY		3
+#define REGION_RESEARCH		4
+#define REGION_ENGINEERING	5
+#define REGION_SUPPLY		6
+#define REGION_COMMAND		7
+#define REGION_CENTCOMM		8
 
 //used for maploader
 #define MAP_MINX 1
diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm
index 8fee497d4c8..39e9451ac22 100644
--- a/code/game/jobs/access.dm
+++ b/code/game/jobs/access.dm
@@ -263,8 +263,6 @@ var/const/access_trade_sol = 160
 			return get_all_accesses()
 		if(REGION_GENERAL) //station general
 			return list(access_kitchen, access_bar, access_hydroponics, access_janitor, access_chapel_office, access_crematorium, access_library, access_theatre, access_lawyer, access_magistrate, access_clown, access_mime)
-		if(REGION_HOP)
-			return list(access_kitchen, access_bar, access_hydroponics, access_janitor, access_chapel_office, access_crematorium, access_library, access_theatre, access_clown, access_mime, access_mailsorting, access_mining, access_mining_station, access_mineral_storeroom, access_cargo, access_qm, access_hop)
 		if(REGION_SECURITY) //security
 			return list(access_sec_doors, access_weapons, access_security, access_brig, access_armory, access_forensics_lockers, access_court, access_pilot, access_hos)
 		if(REGION_MEDBAY) //medbay
diff --git a/code/game/objects/items/control_wand.dm b/code/game/objects/items/control_wand.dm
index 84205785a2d..0fe6cf48631 100644
--- a/code/game/objects/items/control_wand.dm
+++ b/code/game/objects/items/control_wand.dm
@@ -101,16 +101,11 @@
 	icon_state = "gangtool-blue"
 	region_access = REGION_MEDBAY
 
-/obj/item/weapon/door_remote/civilian
-	name = "civilian door remote"
+/obj/item/weapon/door_remote/civillian
+	name = "civillian door remote"
 	icon_state = "gangtool-white"
 	region_access = REGION_GENERAL
 
-/obj/item/weapon/door_remote/head_of_personnel
-	name = "personnel door remote"
-	icon_state ="gangtool-white"
-	region_access = REGION_HOP
-
 /obj/item/weapon/door_remote/centcomm
 	name = "centcomm door remote"
 	desc = "High-ranking NT officials only."
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index e1c9df6b2a3..ed2599e91dd 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -56,7 +56,7 @@
 		new /obj/item/weapon/gun/energy/gun(src)
 		new /obj/item/device/flash(src)
 		new /obj/item/clothing/accessory/petcollar(src)
-		new /obj/item/weapon/door_remote/head_of_personnel(src)
+		new /obj/item/weapon/door_remote/civillian(src)
 
 /obj/structure/closet/secure_closet/hop2
 	name = "head of personnel's attire"