Fixing conflicts

code/modules/admin/admin.dm

@@ -938,10 +938,12 @@ var/datum/announcement/minor/admin_min_announcer = new
 	set desc="Whether persistent data will be saved from now on."
 	set name="Toggle Persistent Data"
 	config.persistence_disabled = !(config.persistence_disabled)
+/* CHOMP Edit: the entire world doesn't need to know.
 	if(!config.persistence_disabled)
 		to_world("<B>Persistence is now enabled..</B>")
 	else
 		to_world("<B>Persistence is no longer enabled.</B>")
+*/
 	message_admins("<font color='blue'>[key_name_admin(usr)] toggled persistence to [config.persistence_disabled ? "Off" : "On"].</font>", 1)
 	log_admin("[key_name(usr)] toggled persistence to [config.persistence_disabled ? "Off" : "On"].")
 	world.update_status()

code/modules/admin/admin_ranks.dm

@@ -71,6 +71,9 @@ var/list/admin_ranks = list()								//list of all ranks with associated rights
 
 	if(config.admin_legacy_system)
 		load_admin_ranks()
+		//Clear profile access
+		for(var/A in world.GetConfig("admin"))
+			world.SetConfig("APP/admin", A, null)
 
 		//load text from file
 		var/list/Lines = file2list("config/admins.txt")
@@ -99,6 +102,9 @@ var/list/admin_ranks = list()								//list of all ranks with associated rights
 			//create the admin datum and store it for later use
 			var/datum/admins/D = new /datum/admins(rank, rights, ckey)
 
+			if(D.rights & R_DEBUG) //grant profile access
+				world.SetConfig("APP/admin", ckey, "role=admin")
+
 			//find the client for a ckey if they are connected and associate them with the new admin datum
 			D.associate(GLOB.directory[ckey])
 
@@ -124,6 +130,9 @@ var/list/admin_ranks = list()								//list of all ranks with associated rights
 			if(istext(rights))	rights = text2num(rights)
 			var/datum/admins/D = new /datum/admins(rank, rights, ckey)
 
+			if(D.rights & R_DEBUG) //grant profile access
+				world.SetConfig("APP/admin", ckey, "role=admin")
+
 			//find the client for a ckey if they are connected and associate them with the new admin datum
 			D.associate(GLOB.directory[ckey])
 		if(!admin_datums)

code/modules/admin/admin_verb_lists.dm

@@ -105,9 +105,11 @@ var/list/admin_verbs_admin = list(
 	/datum/admins/proc/paralyze_mob,
 	/client/proc/fixatmos,
 	/datum/admins/proc/quick_nif, //VOREStation Add,
+	/datum/admins/proc/quick_authentic_nif, //CHOMPStation add
 	/datum/admins/proc/sendFax,
 	/client/proc/despawn_player,
-	/datum/admins/proc/view_feedback
+	/datum/admins/proc/view_feedback,
+	/client/proc/setckey //YW add - readds SetCkey proc
 	)
 
 var/list/admin_verbs_ban = list(

code/modules/admin/ckey_vr.dm

@@ -1,5 +1,5 @@
 // Command to set the ckey of a mob without requiring VV permission
-/client/proc/SetCKey(var/mob/M in mob_list)
+/client/proc/setckey(var/mob/M in mob_list) //YW modif, removed caps from setckey
 	set category = "Admin"
 	set name = "Set CKey"
 	set desc = "Mob to teleport"

code/modules/admin/topic.dm

@@ -1806,7 +1806,7 @@
 					WANTED.backup_author = src.admincaster_signature                  //Submitted by
 					WANTED.is_admin_message = 1
 					news_network.wanted_issue = WANTED
-					for(var/obj/machinery/newscaster/NEWSCASTER in allCasters)
+					for(var/obj/machinery/newscaster/NEWSCASTER in GLOB.allCasters)
 						NEWSCASTER.newsAlert()
 						NEWSCASTER.update_icon()
 					src.admincaster_screen = 15
@@ -1822,7 +1822,7 @@
 		var/choice = alert("Please confirm Wanted Issue removal","Network Security Handler","Confirm","Cancel")
 		if(choice=="Confirm")
 			news_network.wanted_issue = null
-			for(var/obj/machinery/newscaster/NEWSCASTER in allCasters)
+			for(var/obj/machinery/newscaster/NEWSCASTER in GLOB.allCasters)
 				NEWSCASTER.update_icon()
 			src.admincaster_screen=17
 		src.access_news_network()

code/modules/admin/verbs/adminhelp.dm

@@ -184,6 +184,16 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 		log_admin("Ticket #[id]: [key_name(initiator)]: [name] - heard by [admin_number_present] non-AFK admins who have +BAN.")
 		if(admin_number_present <= 0)
 			to_chat(C, "<span class='notice'>No active admins are online, your adminhelp was sent to the admin discord.</span>")		//VOREStation Edit
+	send2adminchat() //VOREStation Add
+	//YW EDIT START
+	var/list/adm = get_admin_counts()
+	var/list/activemins = adm["present"]
+	var activeMins = activemins.len
+	if(is_bwoink)
+		world.TgsTargetedChatBroadcast("ADMINHELP: FROM: [key_name_admin(usr)] TO [initiator_ckey]/[initiator_key_name] - MSG: **[msg]** - Heard by [activeMins] NON-AFK staff members.", TRUE)
+	else
+		world.TgsTargetedChatBroadcast("ADMINHELP: FROM: [initiator_ckey]/[initiator_key_name] - MSG: **[msg]** - Heard by [activeMins] NON-AFK staff members.", TRUE)
+	//YW EDIT END
 	GLOB.ahelp_tickets.active_tickets += src
 
 /datum/admin_help/Destroy()

code/modules/admin/verbs/adminsay.dm

@@ -24,7 +24,7 @@
 	set name = "Msay"
 	set hidden = 1
 
-	if(!check_rights(R_ADMIN|R_MOD|R_SERVER|R_EVENT)) //VOREStation Edit
+	if(!check_rights(R_ADMIN|R_MOD|R_EVENT)) //VOREStation Edit //CHOMP Removal: Removed R_SERVER because it wasn't necessary.
 		return
 
 	msg = sanitize(msg)
@@ -47,7 +47,7 @@
 	set name = "Esay"
 	set hidden = 1
 
-	if(!check_rights(R_ADMIN|R_MOD|R_EVENT|R_SERVER|R_EVENT))
+	if(!check_rights(R_ADMIN|R_MOD|R_EVENT|R_EVENT)) //CHOMP Removal: Removed R_SERVER because it wasn't necessary.
 		return
 
 	msg = sanitize(msg)
@@ -62,4 +62,4 @@
 	for(var/client/C in GLOB.admins)
 		to_chat(C, "<span class='event_channel'>" + create_text_tag("event", "EVENT:", C) + " <span class='name'>[sender_name]</span>([admin_jump_link(mob, C.holder)]): <span class='message'>[msg]</span></span>")
 
-	feedback_add_details("admin_verb","GS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	feedback_add_details("admin_verb","GS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

code/modules/admin/verbs/deadsay.dm

@@ -15,6 +15,9 @@
 		to_chat(src, "<span class='warning'>You have deadchat muted.</span>")
 		return
 
+	if (src.handle_spam_prevention(msg,MUTE_DEADCHAT))
+		return
+
 	var/stafftype = uppertext(holder.rank)
 
 	msg = sanitize(msg)

code/modules/admin/verbs/debug_ch.dm

@@ -0,0 +1,32 @@
+/datum/admins/proc/quick_authentic_nif()
+	set category = "Fun"
+	set name = "Quick Auth NIF"
+	set desc = "Spawns an authentic NIF into someone in quick-implant mode."
+
+	if(!check_rights(R_ADMIN|R_EVENT|R_DEBUG))	//CHOMPStation Edit TFF 24/4/19: Allow Devs to use Quick-NIF verb.
+		return
+
+	var/mob/living/carbon/human/H = input("Pick a mob with a player","Quick Authentic NIF") as null|anything in player_list
+
+	if(!H)
+		return
+
+	if(!istype(H))
+		to_chat(usr,"<span class='warning'>That mob type ([H.type]) doesn't support NIFs, sorry.</span>")
+		return
+
+	if(!H.get_organ(BP_HEAD))
+		to_chat(usr,"<span class='warning'>Target is unsuitable.</span>")
+		return
+
+	if(H.nif)
+		to_chat(usr,"<span class='warning'>Target already has a NIF.</span>")
+		return
+
+	if(H.species.flags & NO_SCAN)
+		new /obj/item/device/nif/authenticbio(H)
+	else
+		new /obj/item/device/nif/authentic(H)
+
+	log_and_message_admins("[key_name(src)] Quick Authentic NIF'd [H.real_name].")
+	feedback_add_details("admin_verb","QANIF") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

code/modules/admin/verbs/debug_vr.dm

@@ -5,7 +5,7 @@
 	
 	var/input_NIF
 
-	if(!check_rights(R_ADMIN))
+	if(!check_rights(R_ADMIN|R_EVENT|R_DEBUG))	//CHOMPStation Edit TFF 24/4/19: Allow Devs to use Quick-NIF verb.
 		return
 
 	var/mob/living/carbon/human/H = input("Pick a mob with a player","Quick NIF") as null|anything in player_list

code/modules/admin/verbs/mapping.dm

@@ -56,7 +56,7 @@ GLOBAL_LIST_BOILERPLATE(all_debugging_effects, /obj/effect/debugging)
 
 
 
-	for(var/obj/effect/debugging/camera_range/C in all_debugging_effects)
+	for(var/obj/effect/debugging/camera_range/C in GLOB.all_debugging_effects)
 		qdel(C)
 
 	if(camera_range_display_status)
@@ -115,7 +115,7 @@ GLOBAL_LIST_BOILERPLATE(all_debugging_effects, /obj/effect/debugging)
 	else
 		intercom_range_display_status = 1
 
-	for(var/obj/effect/debugging/marker/M in all_debugging_effects)
+	for(var/obj/effect/debugging/marker/M in GLOB.all_debugging_effects)
 		qdel(M)
 
 	if(intercom_range_display_status)

code/modules/admin/verbs/playsound.dm

@@ -5,7 +5,7 @@ var/list/sounds_cache = list()
 	set name = "Play Global Sound"
 	if(!check_rights(R_SOUNDS))	return
 
-	var/sound/uploaded_sound = sound(S, repeat = 0, wait = 1, channel = 777)
+	var/sound/uploaded_sound = sound(S, volume = 50, repeat = 0, wait = 1, channel = 777)
 	uploaded_sound.priority = 250
 
 	sounds_cache += S

code/modules/admin/verbs/randomverbs.dm

@@ -521,7 +521,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	if(equipment)
 		if(charjob)
 			job_master.EquipRank(new_character, charjob, 1)
-		//equip_custom_items(new_character)	//VOREStation Removal
+		equip_custom_items(new_character)	//CHOMPEdit readded to enable custom_item.txt
 
 	//If desired, add records.
 	if(records)