Merge pull request #397 from Aurorastation/development

Development
2026-08-24 05:06:16 +01:00 · 2015-02-23 04:36:51 +00:00
parent 0739b281a9 04761a0791
commit 72500c4472
2 changed files with 3 additions and 3 deletions
@@ -318,9 +318,9 @@ datum/controller/vote
 		if(C.holder)
 			if(C.holder.rights & R_ADMIN)
 				trialmin = 1
-			else if(C.holder.rights & R_FUN)
+			if(C.holder.rights & R_FUN)
 				funmin = 1
-			else if(C.holder.rights & R_MOD)
+			if(C.holder.rights & R_MOD)
 				modmin = 1
 		voting |= C

@@ -380,7 +380,7 @@ datum/controller/vote
 				usr << browse(null, "window=vote")
 				return
 			if("cancel")
-				if(usr.client.holder & (R_ADMIN|R_MOD))
+				if(usr.client.holder)
 					reset()
 			if("toggle_restart")
 				if(usr.client.holder)