From 96bd2131c37ce869bb097f3fff583227b57ff53b Mon Sep 17 00:00:00 2001
From: Razgriz <razgriz1032@gmail.com>
Date: Sun, 12 Feb 2023 18:26:25 -0700
Subject: [PATCH] powder that makes you say yes

---
 code/modules/admin/verbs/adminsay.dm | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm
index 77d7a9f641..84ba8e1c37 100644
--- a/code/modules/admin/verbs/adminsay.dm
+++ b/code/modules/admin/verbs/adminsay.dm
@@ -2,11 +2,7 @@
 	set category = "Special Verbs"
 	set name = "Asay" //Gave this shit a shorter name so you only have to time out "asay" rather than "admin say" to use it --NeoFite 
 	set hidden = 1
-<<<<<<< HEAD
-	if(!check_rights(R_ADMIN)) //VOREStation Edit //CHOMPEdit meh, our stuff was conflicting so just removed the stealth thingamabobber
-=======
 	if(!check_rights(R_ADMIN)) //VOREStation Edit
->>>>>>> 8be06b127b... Merge pull request #14474 from VOREStation/Staff-Viewing_Patch
 		return
 
 	msg = sanitize(msg)
@@ -15,10 +11,6 @@
 
 	log_adminsay(msg,src)
 
-<<<<<<< HEAD
-	//VOREStation Edit Start - Adds R_STEALTH //CHOMPEdit meh, our stuff was conflicting so just removed the stealth thingamabobber
-=======
->>>>>>> 8be06b127b... Merge pull request #14474 from VOREStation/Staff-Viewing_Patch
 	for(var/client/C in GLOB.admins)
 		if(check_rights(R_ADMIN))
 			to_chat(C, "<span class='admin_channel'>" + create_text_tag("admin", "ADMIN:", C) + " <span class='name'>[key_name(usr, 1)]</span>([admin_jump_link(mob, src)]): <span class='message'>[msg]</span></span>")
@@ -30,11 +22,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.
-=======
-	if(!check_rights(R_ADMIN|R_MOD|R_SERVER)) //VOREStation Edit
->>>>>>> 8be06b127b... Merge pull request #14474 from VOREStation/Staff-Viewing_Patch
 		return
 
 	msg = sanitize(msg)
@@ -57,11 +45,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.
-=======
-	if(!check_rights(R_ADMIN|R_MOD|R_EVENT|R_SERVER)) //VOREStation Edit
->>>>>>> 8be06b127b... Merge pull request #14474 from VOREStation/Staff-Viewing_Patch
 		return
 
 	msg = sanitize(msg)