Merge branch 'master' into upstream-merge-9632

code/modules/admin/verbs/adminhelp.dm

@@ -1,6 +1,25 @@
 /client/var/datum/admin_help/current_ticket	//the current ticket the (usually) not-admin client is dealing with
 
-//
+//CHOMPEdit Begin
+/proc/get_ahelp_channel()
+	var/datum/tgs_api/v5/api = TGS_READ_GLOBAL(tgs)
+	if(istype(api) && config.ahelp_channel_tag)
+		for(var/datum/tgs_chat_channel/channel in api.chat_channels)
+			if(channel.custom_tag == config.ahelp_channel_tag)
+				return list(channel)
+	return 0
+
+/proc/ahelp_discord_message(var/message)
+	if(!message)
+		return
+	if(config.discord_ahelps_disabled)
+		return
+	var/datum/tgs_chat_channel/ahelp_channel = get_ahelp_channel()
+	if(ahelp_channel)
+		world.TgsChatBroadcast(message,ahelp_channel)
+	else
+		world.TgsTargetedChatBroadcast(message,TRUE)
+//CHOMPEdit End
 //TICKET MANAGER
 //
 
@@ -190,9 +209,9 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 	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)
+		ahelp_discord_message("ADMINHELP: FROM: [key_name_admin(usr)] TO [initiator_ckey]/[initiator_key_name] - MSG: **[msg]** - Heard by [activeMins] NON-AFK staff members.") //CHOMPEdit
 	else
-		world.TgsTargetedChatBroadcast("ADMINHELP: FROM: [initiator_ckey]/[initiator_key_name] - MSG: **[msg]** - Heard by [activeMins] NON-AFK staff members.", TRUE)
+		ahelp_discord_message("ADMINHELP: FROM: [initiator_ckey]/[initiator_key_name] - MSG: **[msg]** - Heard by [activeMins] NON-AFK staff members.") //CHOMPEdit
 	//YW EDIT END
 	GLOB.ahelp_tickets.active_tickets += src
 
@@ -203,7 +222,10 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 	return ..()
 
 /datum/admin_help/proc/AddInteraction(formatted_message)
-	_interactions += "[gameTimestamp()]: [formatted_message]"
+	var/curinteraction = "[gameTimestamp()]: [formatted_message]"
+	if(config.discord_ahelps_all)	//CHOMPEdit
+		ahelp_discord_message("ADMINHELP: TICKETID:[id] [strip_html_properly(curinteraction)]") //CHOMPEdit
+	_interactions += curinteraction
 
 //private
 /datum/admin_help/proc/FullMonty(ref_src)

code/modules/admin/verbs/change_appearance.dm

@@ -92,15 +92,7 @@
 
 	var/new_gender = alert(usr, "Please select gender.", "Character Generation", "Male", "Female", "Neuter")
 	if (new_gender)
-		if(new_gender == "Male")
-			M.gender = MALE
-			M.dna.SetUIState(DNA_UI_GENDER, FALSE)
-		else if (new_gender == "Female")
-			M.gender = FEMALE
-			M.dna.SetUIState(DNA_UI_GENDER, TRUE)
-		else
-			M.gender = NEUTER
-			M.dna.SetUIState(DNA_UI_GENDER, FALSE)
+		M.set_gender(new_gender)
 
 	M.update_dna(M)
 	M.update_hair(FALSE)

code/modules/admin/verbs/debug_ch.dm

@@ -1,32 +0,0 @@
-/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/randomverbs.dm

@@ -523,6 +523,12 @@ Traitors and the like can also be revived with the previous role mostly intact.
 				new_character.add_language(lang)
 	//VOREStation Add End
 
+	for(var/lang in picked_client.prefs.alternate_languages)
+		var/datum/language/chosen_language = GLOB.all_languages[lang]
+		if(chosen_language)
+			if(is_lang_whitelisted(src,chosen_language) || (new_character.species && (chosen_language.name in new_character.species.secondary_langs)))
+				new_character.add_language(lang)
+
 	//If desired, apply equipment.
 	if(equipment)
 		if(charjob)
@@ -629,7 +635,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	message_admins("[key_name_admin(src)] has created a command report", 1)
 	feedback_add_details("admin_verb","CCR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
-/client/proc/cmd_admin_delete(atom/O as obj|mob|turf in admin_atom_validate(O)) // I don't understand precisely how this fixes the string matching against a substring, but it does - Ater
+/client/proc/cmd_admin_delete(atom/O as obj|mob|turf in _validate_atom(O)) // I don't understand precisely how this fixes the string matching against a substring, but it does - Ater
 	set category = "Admin"
 	set name = "Delete"