Merge branch 'master' into upstream-merge-10028

code/modules/admin/admin_vr.dm

@@ -0,0 +1,12 @@
+/datum/admins/proc/set_uplink(mob/living/carbon/human/H as mob)
+	set category = "Debug"
+	set name = "Set Uplink"
+	set desc = "Allows admins to set up an uplink on a character. This will be required for a character to use telecrystals."
+	set popup_menu = FALSE
+
+	if(check_rights(R_ADMIN|R_DEBUG))
+		traitors.spawn_uplink(H)
+		H.mind.tcrystals = DEFAULT_TELECRYSTAL_AMOUNT
+		H.mind.accept_tcrystals = 1
+	else
+		to_chat(usr, "You do not have access to this command.")

code/modules/admin/verbs/adminsay.dm

@@ -1,8 +1,8 @@
 /client/proc/cmd_admin_say(msg as text)
 	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 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
-	if(!check_rights(R_ADMIN|R_STEALTH)) //VOREStation Edit
+	if(!check_rights(R_ADMIN)) //VOREStation Edit //CHOMPEdit meh, our stuff was conflicting so just removed the stealth thingamabobber
 		return
 
 	msg = sanitize(msg)
@@ -11,9 +11,9 @@
 
 	log_adminsay(msg,src)
 
-	//VOREStation Edit Start - Adds R_EVENT
+	//VOREStation Edit Start - Adds R_STEALTH //CHOMPEdit meh, our stuff was conflicting so just removed the stealth thingamabobber
 	for(var/client/C in GLOB.admins)
-		if(check_rights(R_ADMIN|R_EVENT))
+		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>")
 	//VOREStation Edit End
 

code/modules/admin/verbs/randomverbs.dm

@@ -515,6 +515,12 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	if(new_character.mind)
 		new_character.mind.loaded_from_ckey = picked_ckey
 		new_character.mind.loaded_from_slot = picked_slot
+
+	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)
 	//VOREStation Add End
 
 	for(var/lang in picked_client.prefs.alternate_languages)
@@ -527,6 +533,8 @@ 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)
+			new_character.mind.assigned_role = charjob
+			new_character.mind.role_alt_title = job_master.GetPlayerAltTitle(new_character, charjob)
 		equip_custom_items(new_character)	//CHOMPEdit readded to enable custom_item.txt
 
 	//If desired, add records.
@@ -534,7 +542,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		data_core.manifest_inject(new_character)
 
 	//A redraw for good measure
-	new_character.update_icons_all()
+	new_character.regenerate_icons()
 
 	//If we're announcing their arrival
 	if(announce)

code/modules/admin/verbs/randomverbs_vr.dm

@@ -71,36 +71,6 @@
 
 	feedback_add_details("admin_verb","SCAM") //heh
 
-<<<<<<< HEAD
-	return new_mob
-||||||| parent of d24af2eb43... Merge pull request #10028 from Meghan-Rossi/eventhud
-	return new_mob
-
-/client/proc/cmd_admin_z_narrate() // Allows administrators to fluff events a little easier -- TLE
-	set category = "Special Verbs"
-	set name = "Z Narrate"
-	set desc = "Narrates to your Z level."
-
-	if (!holder)
-		return
-
-	var/msg = input("Message:", text("Enter the text you wish to appear to everyone:")) as text
-	if(!(msg[1] == "<" && msg[length(msg)] == ">")) //You can use HTML but only if the whole thing is HTML. Tries to prevent admin 'accidents'.
-		msg = sanitize(msg)
-
-	if (!msg)
-		return
-
-	var/pos_z = get_z(src.mob)
-	if (!pos_z)
-		return
-	for(var/mob/M in player_list)
-		if(M.z == pos_z)
-			to_chat(M, msg)
-	log_admin("ZNarrate: [key_name(usr)] : [msg]")
-	message_admins("<font color='blue'><B> ZNarrate: [key_name_admin(usr)] : [msg]<BR></B></font>", 1)
-	feedback_add_details("admin_verb","GLNA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-=======
 	return new_mob
 
 /client/proc/cmd_admin_z_narrate() // Allows administrators to fluff events a little easier -- TLE
@@ -143,5 +113,4 @@
 		target.recalculate_vis()
 		to_chat(src, "You gave the event HUD to [key_name(target)].")
 		to_chat(target, "You now have the event HUD.  Icons will appear next to characters indicating if they prefer to be killed(red crosshairs), devoured(belly), or kidnapped(blue crosshairs) by event characters.")	
-	feedback_add_details("admin_verb","GREHud") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
->>>>>>> d24af2eb43... Merge pull request #10028 from Meghan-Rossi/eventhud
+	feedback_add_details("admin_verb","GREHud") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!