Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

code/modules/admin/admin_verb_lists_vr.dm

@@ -19,6 +19,7 @@ var/list/admin_verbs_default = list(
 	)
 
 var/list/admin_verbs_admin = list(
+	/client/proc/toggle_vantag_hud,
 	/datum/admins/proc/set_tcrystals,
 	/datum/admins/proc/add_tcrystals,
 	/client/proc/invisimin,				//allows our mob to go invisible/visible,
@@ -393,6 +394,7 @@ var/list/admin_verbs_mod = list(
 )
 
 var/list/admin_verbs_event_manager = list(
+	/client/proc/toggle_vantag_hud,
 	/client/proc/cmd_event_say,
 	/client/proc/cmd_admin_pm_context,
 	/client/proc/cmd_admin_pm_panel,

code/modules/admin/verbs/randomverbs.dm

@@ -527,6 +527,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)	//VOREStation Removal
 
 	//If desired, add records.
@@ -534,7 +536,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

@@ -97,3 +97,20 @@
 	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!
+
+/client/proc/toggle_vantag_hud(var/mob/target as mob)
+	set category = "Fun"
+	set name = "Give/Remove Event HUD"
+	set desc = "Give a mob the event hud, which shows them other people's event preferences, or remove it from them"
+
+	if(target.vantag_hud)
+		target.vantag_hud = FALSE
+		target.recalculate_vis()
+		to_chat(src, "You removed the event HUD from [key_name(target)].")
+		to_chat(target, "You no longer have the event HUD.")	
+	else
+		target.vantag_hud = TRUE
+		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!