rej cleanup

2017-05-17 03:50:34 -05:00
parent 3516852582
commit f978e3d56e
20 changed files with 0 additions and 531 deletions
@@ -1,55 +0,0 @@
-diff a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm	(rejected hunks)
-@@ -67,7 +67,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
- 	for(var/I in l2b)
- 		var/datum/admin_help/AH = I
- 		dat += "<span class='adminnotice'><span class='adminhelp'>Ticket #[AH.id]</span>: <A HREF='?_src_=holder;ahelp=\ref[AH];ahelp_action=ticket'>[AH.initiator_key_name]: [AH.name]</A></span><br>"
-		
-+
- 	usr << browse(dat.Join(), "window=ahelp_list[state];size=600x480")
- 
- //Tickets statpanel
-@@ -253,7 +253,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
- 	if(state == AHELP_ACTIVE)
- 		to_chat(usr, "<span class='warning'>This ticket is already open.</span>")
- 		return
-	
-+
- 	if(GLOB.ahelp_tickets.CKey2ActiveTicket(initiator_ckey))
- 		to_chat(usr, "<span class='warning'>This user already has an active ticket, cannot reopen this one.</span>")
- 		return
-@@ -310,7 +310,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
- 	RemoveActive()
- 	state = AHELP_RESOLVED
- 	GLOB.ahelp_tickets.ListInsert(src)
-	
-+
- 	if(initiator)
- 		initiator.giveadminhelpverb()
- 
-@@ -325,7 +325,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
- /datum/admin_help/proc/Reject(key_name = key_name_admin(usr))
- 	if(state != AHELP_ACTIVE)
- 		return
-	
-+
- 	if(initiator)
- 		initiator.giveadminhelpverb()
- 
-@@ -494,7 +494,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
- 
- 	if(!check_rights(R_ADMIN, TRUE))
- 		return
-	
-+
- 	var/browse_to
- 
- 	switch(input("Display which ticket list?") as null|anything in list("Active Tickets", "Closed Tickets", "Resolved Tickets"))
-@@ -506,7 +506,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
- 			browse_to = AHELP_RESOLVED
- 		else
- 			return
-	
-+
- 	GLOB.ahelp_tickets.BrowseTickets(browse_to)
- 
- //
@@ -1,12 +0,0 @@
-diff a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm	(rejected hunks)
-@@ -108,8 +108,8 @@
- 	for(var/mob/M in view(range,A))
- 		to_chat(M, msg)
- 
-	log_admin("LocalNarrate: [key_name(usr)] at ([get_area(A)]): [msg]")
-	message_admins("<span class='adminnotice'><b> LocalNarrate: [key_name_admin(usr)] at (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[A.x];Y=[A.y];Z=[A.z]'>[get_area(A)]</a>):</b> [msg]<BR></span>")
-+	log_admin("LocalNarrate: [key_name(usr)] at [get_area(A)][COORD(A)]: [msg]")
-+	message_admins("<span class='adminnotice'><b> LocalNarrate: [key_name_admin(usr)] at [get_area(A)][ADMIN_JMP(A)]:</b> [msg]<BR></span>")
- 	SSblackbox.add_details("admin_verb","Local Narrate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
- 
- /client/proc/cmd_admin_godmode(mob/M in GLOB.mob_list)