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

conflicts reee

Browse Source
This commit is contained in:
cadyn
2021-02-04 23:45:01 -08:00
committed by GitHub
parent 0c8572347a
commit 72a19514f5
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/admin/verbs/adminsay.dm
View File

@@ -24,13 +24,7 @@
set name = "Msay"
set hidden = 1
<<<<<<< HEAD
if(!check_rights(R_ADMIN|R_MOD|R_EVENT)) //VOREStation Edit //CHOMP Removal: Removed R_SERVER because it wasn't necessary.
||||||| parent of 43ed9b5c9a... Merge pull request #9632 from Novacat/nova-basicfixes
if(!check_rights(R_ADMIN|R_MOD|R_SERVER|R_EVENT)) //VOREStation Edit
=======
if(!check_rights(R_ADMIN|R_MOD|R_SERVER|R_STEALTH)) //VOREStation Edit
>>>>>>> 43ed9b5c9a... Merge pull request #9632 from Novacat/nova-basicfixes
return
msg = sanitize(msg)
@@ -53,13 +47,7 @@
set name = "Esay"
set hidden = 1
<<<<<<< HEAD
if(!check_rights(R_ADMIN|R_MOD|R_EVENT|R_EVENT)) //CHOMP Removal: Removed R_SERVER because it wasn't necessary.
||||||| parent of 43ed9b5c9a... Merge pull request #9632 from Novacat/nova-basicfixes
if(!check_rights(R_ADMIN|R_MOD|R_EVENT|R_SERVER|R_EVENT))
=======
if(!check_rights(R_ADMIN|R_MOD|R_EVENT|R_SERVER|R_STEALTH)) //VOREStation Edit
>>>>>>> 43ed9b5c9a... Merge pull request #9632 from Novacat/nova-basicfixes
return
msg = sanitize(msg)