From da83eb27ef8a113816a5e0cc824d29953d159ec2 Mon Sep 17 00:00:00 2001
From: Intigracy <intigracy@gmail.com>
Date: Thu, 11 Aug 2016 20:01:16 -0700
Subject: [PATCH] removed polling from +PERMISSIONS, is now its own flag

---
 code/__HELPERS/type2type.dm       |  1 +
 code/modules/admin/admin_ranks.dm |  1 +
 code/modules/admin/admin_verbs.dm | 10 ++++++----
 code/modules/admin/create_poll.dm |  3 ++-
 code/setup.dm                     |  8 +++++---
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm
index 8c8a836bb7c..3af2086fa98 100644
--- a/code/__HELPERS/type2type.dm
+++ b/code/__HELPERS/type2type.dm
@@ -174,6 +174,7 @@ proc/tg_jointext(list/list, glue = ",")
 	if(rights & R_DEBUG)		. += "[seperator]+DEBUG"
 	if(rights & R_POSSESS)		. += "[seperator]+POSSESS"
 	if(rights & R_PERMISSIONS)	. += "[seperator]+PERMISSIONS"
+	if(rights & R_POLLING)		. += "[seperator]+POLLING"
 	if(rights & R_STEALTH)		. += "[seperator]+STEALTH"
 	if(rights & R_REJUVINATE)	. += "[seperator]+REJUVINATE"
 	if(rights & R_VAREDIT)		. += "[seperator]+VAREDIT"
diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm
index 273e3810e3d..62fd2c12b9c 100644
--- a/code/modules/admin/admin_ranks.dm
+++ b/code/modules/admin/admin_ranks.dm
@@ -33,6 +33,7 @@ var/list/admin_ranks = list()								//list of all ranks with associated rights
 				if("server")					rights |= R_SERVER
 				if("debug")						rights |= R_DEBUG
 				if("permissions","rights")		rights |= R_PERMISSIONS
+				if("polling", "poll")			rights |= R_POLLING
 				if("possess")					rights |= R_POSSESS
 				if("stealth")					rights |= R_STEALTH
 				if("rejuv","rejuvinate")		rights |= R_REJUVINATE
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index a6151dee018..169126e8c51 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -206,13 +206,14 @@ var/list/admin_verbs_possess = list(
 	/proc/release
 	)
 var/list/admin_verbs_permissions = list(
-	/client/proc/edit_admin_permissions,
-	/client/proc/create_poll
+	/client/proc/edit_admin_permissions
 	)
 var/list/admin_verbs_rejuv = list(
 	/client/proc/respawn_character
 	)
-
+var/list/admin_verbs_polling = list(
+	/client/proc/create_poll
+	)
 //verbs which can be hidden - needs work
 var/list/admin_verbs_hideable = list(
 	/client/proc/set_ooc,
@@ -315,6 +316,7 @@ var/list/admin_verbs_mod = list(
 		if(holder.rights & R_DEBUG)			verbs += admin_verbs_debug
 		if(holder.rights & R_POSSESS)		verbs += admin_verbs_possess
 		if(holder.rights & R_PERMISSIONS)	verbs += admin_verbs_permissions
+		if(holder.rights & R_POLLING)		verbs += admin_verbs_polling
 		if(holder.rights & R_STEALTH)		verbs += /client/proc/stealth
 		if(holder.rights & R_REJUVINATE)	verbs += admin_verbs_rejuv
 		if(holder.rights & R_SOUNDS)		verbs += admin_verbs_sounds
@@ -1223,7 +1225,7 @@ var/list/admin_verbs_mod = list(
 	set category = "Special Verbs"
 	set desc = "Sends a message as voice to all players"
 	set popup_menu = 0
-	
+
 	if(!check_rights(R_DEBUG)) return 0
 
 	var/msg
diff --git a/code/modules/admin/create_poll.dm b/code/modules/admin/create_poll.dm
index bc7a1987af3..e3f46bb0234 100644
--- a/code/modules/admin/create_poll.dm
+++ b/code/modules/admin/create_poll.dm
@@ -1,7 +1,8 @@
 /client/proc/create_poll()
 	set name = "Create Poll"
 	set category = "Special Verbs"
-	if(!check_rights(R_PERMISSIONS))	return
+	if(!check_rights(R_POLLING))
+		return
 	if(!dbcon.IsConnected())
 		src << "<span class='danger'>Failed to establish database connection.</span>"
 		return
diff --git a/code/setup.dm b/code/setup.dm
index e552ce041b2..0ae6d310531 100644
--- a/code/setup.dm
+++ b/code/setup.dm
@@ -1108,9 +1108,10 @@ SEE_PIXELS	256
 #define MAT_PLASTIC		"$plastic"
 #define MAT_CARDBOARD   "$cardboard"
 
-
-//Please don't edit these values without speaking to Errorage first	~Carn
 //Admin Permissions
+//Please don't edit these values without speaking to [current /vg/ host here] first
+//Currently at the limit for rank bitflags, if any are needed to be added in the future then consider replacement of R_MOD as we don't use it at time of writing, or merge R_STEALTH into R_ADMIN.
+
 #define R_BUILDMODE		1
 #define R_ADMIN			2
 #define R_BAN			4
@@ -1126,8 +1127,9 @@ SEE_PIXELS	256
 #define R_SPAWN			4096
 #define R_MOD			8192
 #define R_ADMINBUS		16384
+#define R_POLLING		32768
 
-#define R_MAXPERMISSION 16384 //This holds the maximum value for a permission. It is used in iteration, so keep it updated.
+#define R_MAXPERMISSION 32768 //This holds the maximum value for a permission. It is used in iteration, so keep it updated.
 
 #define R_HOST			65535