From 584bb8dc64c8daf7b74cfba04a2e2a0f39b4ab22 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Mon, 11 Sep 2017 18:27:04 -0500
Subject: [PATCH] Update holder2.dm

---
 code/modules/admin/holder2.dm | 109 +---------------------------------
 1 file changed, 1 insertion(+), 108 deletions(-)

diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm
index d9c5b88364..153fb2d8c2 100644
--- a/code/modules/admin/holder2.dm
+++ b/code/modules/admin/holder2.dm
@@ -1,109 +1,3 @@
-<<<<<<< HEAD
-GLOBAL_LIST_EMPTY(admin_datums)
-GLOBAL_PROTECT(admin_datums)
-
-/datum/admins
-	var/datum/admin_rank/rank
-
-	var/client/owner	= null
-	var/fakekey			= null
-
-	var/datum/marked_datum
-
-	var/spamcooldown = 0
-
-	var/admincaster_screen = 0	//TODO: remove all these 5 variables, they are completly unacceptable
-	var/datum/newscaster/feed_message/admincaster_feed_message = new /datum/newscaster/feed_message
-	var/datum/newscaster/wanted_message/admincaster_wanted_message = new /datum/newscaster/wanted_message
-	var/datum/newscaster/feed_channel/admincaster_feed_channel = new /datum/newscaster/feed_channel
-	var/admin_signature
-
-/datum/admins/New(datum/admin_rank/R, ckey)
-	if(!ckey)
-		QDEL_IN(src, 0)
-		throw EXCEPTION("Admin datum created without a ckey")
-		return
-	if(!istype(R))
-		QDEL_IN(src, 0)
-		throw EXCEPTION("Admin datum created without a rank")
-		return
-	rank = R
-	admin_signature = "Nanotrasen Officer #[rand(0,9)][rand(0,9)][rand(0,9)]"
-	GLOB.admin_datums[ckey] = src
-
-/datum/admins/proc/associate(client/C)
-	if(IsAdminAdvancedProcCall())
-		var/msg = " has tried to elevate permissions!"
-		message_admins("[key_name_admin(usr)][msg]")
-		log_admin_private("[key_name(usr)][msg]")
-		return
-	if(istype(C))
-		owner = C
-		owner.holder = src
-		owner.add_admin_verbs()	//TODO
-		owner.verbs -= /client/proc/readmin
-		GLOB.admins |= C
-
-/datum/admins/proc/disassociate()
-	if(owner)
-		GLOB.admins -= owner
-		owner.remove_admin_verbs()
-		owner.holder = null
-		owner = null
-
-/datum/admins/proc/check_if_greater_rights_than_holder(datum/admins/other)
-	if(!other)
-		return 1 //they have no rights
-	if(rank.rights == 65535)
-		return 1 //we have all the rights
-	if(src == other)
-		return 1 //you always have more rights than yourself
-	if(rank.rights != other.rank.rights)
-		if( (rank.rights & other.rank.rights) == other.rank.rights )
-			return 1 //we have all the rights they have and more
-	return 0
-
-/datum/admins/vv_edit_var(var_name, var_value)
-	return FALSE //nice try trialmin
-
-/*
-checks if usr is an admin with at least ONE of the flags_1 in rights_required. (Note, they don't need all the flags_1)
-if rights_required == 0, then it simply checks if they are an admin.
-if it doesn't return 1 and show_msg=1 it will prints a message explaining why the check has failed
-generally it would be used like so:
-
-/proc/admin_proc()
-	if(!check_rights(R_ADMIN)) return
-	to_chat(world, "you have enough rights!")
-
-NOTE: it checks usr! not src! So if you're checking somebody's rank in a proc which they did not call
-you will have to do something like if(client.rights & R_ADMIN) yourself.
-*/
-/proc/check_rights(rights_required, show_msg=1)
-	if(usr && usr.client)
-		if (check_rights_for(usr.client, rights_required))
-			return 1
-		else
-			if(show_msg)
-				to_chat(usr, "<font color='red'>Error: You do not have sufficient rights to do that. You require one of the following flags_1:[rights2text(rights_required," ")].</font>")
-	return 0
-
-//probably a bit iffy - will hopefully figure out a better solution
-/proc/check_if_greater_rights_than(client/other)
-	if(usr && usr.client)
-		if(usr.client.holder)
-			if(!other || !other.holder)
-				return 1
-			return usr.client.holder.check_if_greater_rights_than_holder(other.holder)
-	return 0
-
-//This proc checks whether subject has at least ONE of the rights specified in rights_required.
-/proc/check_rights_for(client/subject, rights_required)
-	if(subject && subject.holder && subject.holder.rank)
-		if(rights_required && !(rights_required & subject.holder.rank.rights))
-			return 0
-		return 1
-=======
 GLOBAL_LIST_EMPTY(admin_datums)
 GLOBAL_PROTECT(admin_datums)
 
@@ -229,5 +123,4 @@ you will have to do something like if(client.rights & R_ADMIN) yourself.
 		if(rights_required && !(rights_required & subject.holder.rank.rights))
 			return 0
 		return 1
->>>>>>> 84b1e3d... [s] Adds a security token to all admin hrefs (#29839)
-	return 0
\ No newline at end of file
+	return 0