cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up two-way merge

Browse Source
This commit is contained in:
Aronai Sieyes
2018-10-16 12:08:31 -04:00
committed by GitHub
parent 6e5a5f5edc
commit 9dc2f288a0
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/admin/verbs/adminhelp.dm
View File

@@ -550,11 +550,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
. = list("total" = list(), "noflags" = list(), "afk" = list(), "stealth" = list(), "present" = list())
for(var/client/X in admins)
.["total"] += X
<<<<<<< HEAD
if(requiredflags != 0 && !check_rights(rights_required = requiredflags, show_msg = FALSE, C = X)) //VOREStation Edit
=======
if(requiredflags != 0 && !check_rights(rights_required = requiredflags, show_msg = FALSE, C = X))
>>>>>>> 7b1db0e... Merge pull request #5670 from VOREStation/pol-ticketpriv
.["noflags"] += X
else if(X.is_afk())
.["afk"] += X
@@ -663,4 +659,4 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
else
return founds
return msg
return msg