Release Update

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

# Conflicts:
#	code/__defines/machinery.dm
#	code/controllers/configuration.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/doors/blast_door.dm
#	code/game/machinery/pipe/pipe_recipes.dm
#	code/game/objects/items/devices/radio/radio_vr.dm
#	code/modules/client/preferences_vr.dm
#	code/modules/clothing/glasses/hud_vr.dm
#	code/modules/clothing/under/accessories/accessory_vr.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/gamemaster/actions/planet_weather_change.dm
#	code/modules/projectiles/guns/energy/netgun_vr.dm
#	code/modules/projectiles/guns/energy/protector_vr.dm
#	code/modules/vore/appearance/sprite_accessories_taur_vr.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm
#	icons/obj/power.dmi
#	vorestation.dme

code/modules/admin/verbs/adminhelp_vr.dm

@@ -25,7 +25,7 @@
 		to_chat(usr, "<span class='danger'>Error: You cannot request spice (muted from adminhelps).</span>")
 		return
 
-	if(alert(usr, "Are you sure you want to request the admins spice things up for you? You accept the consequences if you do.",,"No","Yes") != "No")
+	if(alert(usr, "Are you sure you want to request the admins spice things up for you? You accept the consequences if you do.",,"Yes","No") != "No")
 		message_admins("[ADMIN_FULLMONTY(usr)] has requested the round be spiced up a little.")
 		to_chat(usr, "<span class='notice'>You have requested some more spice in your round.</span>")
 	else

code/modules/admin/verbs/adminjump.dm

@@ -13,7 +13,7 @@
 
 	if(config.allow_admin_jump)
 		usr.on_mob_jump()
-		usr.loc = pick(get_area_turfs(A))
+		usr.forceMove(pick(get_area_turfs(A)))
 
 		log_admin("[key_name(usr)] jumped to [A]")
 		message_admins("[key_name_admin(usr)] jumped to [A]", 1)
@@ -30,7 +30,7 @@
 		log_admin("[key_name(usr)] jumped to [T.x],[T.y],[T.z] in [T.loc]")
 		message_admins("[key_name_admin(usr)] jumped to [T.x],[T.y],[T.z] in [T.loc]", 1)
 		usr.on_mob_jump()
-		usr.loc = T
+		usr.forceMove(T)
 		feedback_add_details("admin_verb","JT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	else
 		alert("Admin jumping disabled")
@@ -53,7 +53,7 @@
 			if(T && isturf(T))
 				feedback_add_details("admin_verb","JM") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 				A.on_mob_jump()
-				A.loc = T
+				A.forceMove(T)
 			else
 				to_chat(A, "This mob is not located in the game world.")
 	else
@@ -70,9 +70,11 @@
 		if(src.mob)
 			var/mob/A = src.mob
 			A.on_mob_jump()
-			A.x = tx
-			A.y = ty
-			A.z = tz
+			var/turf/T = locate(tx, ty, tz)
+			if(!T)
+				to_chat(usr, "<span class='warning'>Those coordinates are outside the boundaries of the map.</span>")
+				return
+			A.forceMove(T)			
 			feedback_add_details("admin_verb","JC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 		message_admins("[key_name_admin(usr)] jumped to coordinates [tx], [ty], [tz]")
 
@@ -98,7 +100,7 @@
 		log_admin("[key_name(usr)] jumped to [key_name(M)]")
 		message_admins("[key_name_admin(usr)] jumped to [key_name_admin(M)]", 1)
 		usr.on_mob_jump()
-		usr.loc = M.loc
+		usr.forceMove(get_turf(M))
 		feedback_add_details("admin_verb","JK") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	else
 		alert("Admin jumping disabled")
@@ -115,7 +117,7 @@
 		message_admins(msg)
 		admin_ticket_log(M, msg)
 		M.on_mob_jump()
-		M.loc = get_turf(usr)
+		M.forceMove(get_turf(usr))
 		feedback_add_details("admin_verb","GM") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	else
 		alert("Admin jumping disabled")
@@ -145,7 +147,7 @@
 		admin_ticket_log(M, msg)
 		if(M)
 			M.on_mob_jump()
-			M.loc = get_turf(usr)
+			M.forceMove(get_turf(usr))
 			feedback_add_details("admin_verb","GK") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	else
 		alert("Admin jumping disabled")
@@ -159,7 +161,7 @@
 	if(A)
 		if(config.allow_admin_jump)
 			M.on_mob_jump()
-			M.loc = pick(get_area_turfs(A))
+			M.forceMove(pick(get_area_turfs(A)))
 			feedback_add_details("admin_verb","SMOB") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 			log_admin("[key_name(usr)] teleported [key_name(M)]")

code/modules/admin/verbs/debug.dm

@@ -341,7 +341,7 @@
 	var/list/areas_with_intercom = list()
 	var/list/areas_with_camera = list()
 
-	for(var/area/A in all_areas)
+	for(var/area/A in world)
 		if(!(A.type in areas_all))
 			areas_all.Add(A.type)
 

code/modules/admin/verbs/mapping.dm

@@ -164,7 +164,6 @@ var/list/debug_verbs = list (
         ,/datum/admins/proc/setup_supermatter
 		,/client/proc/atmos_toggle_debug
 		,/client/proc/spawn_tanktransferbomb
-		,/client/proc/debug_process_scheduler // VOREStation Edit - Nice
 		,/client/proc/take_picture
 	)
 

code/modules/admin/verbs/randomverbs.dm

@@ -525,7 +525,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 
 	//If we're announcing their arrival
 	if(announce)
-		AnnounceArrival(new_character, new_character.mind.assigned_role)
+		AnnounceArrival(new_character, new_character.mind.assigned_role, "Common", new_character.z)
 
 	log_admin("[admin] has spawned [player_key]'s character [new_character.real_name].")
 	message_admins("[admin] has spawned [player_key]'s character [new_character.real_name].", 1)

code/modules/admin/verbs/smite_vr.dm

@@ -8,7 +8,7 @@
 	if(!istype(target))
 		return
 
-	var/list/smite_types = list(SMITE_SHADEKIN_ATTACK,SMITE_SHADEKIN_NOMF,SMITE_REDSPACE_ABDUCT)
+	var/list/smite_types = list(SMITE_SHADEKIN_ATTACK,SMITE_SHADEKIN_NOMF,SMITE_REDSPACE_ABDUCT,SMITE_AUTOSAVE,SMITE_AUTOSAVE_WIDE)
 
 	var/smite_choice = input("Select the type of SMITE for [target]","SMITE Type Choice") as null|anything in smite_types
 	if(!smite_choice)
@@ -50,7 +50,7 @@
 					shadekin.death()
 
 		if(SMITE_SHADEKIN_NOMF)
-			var/list/kin_types = list(
+			var/static/list/kin_types = list(
 				"Red Eyes (Dark)" =	/mob/living/simple_mob/shadekin/red/dark,
 				"Red Eyes (Light)" = /mob/living/simple_mob/shadekin/red/white,
 				"Red Eyes (Brown)" = /mob/living/simple_mob/shadekin/red/brown,
@@ -122,6 +122,12 @@
 		if(SMITE_REDSPACE_ABDUCT)
 			redspace_abduction(target, src)
 
+		if(SMITE_AUTOSAVE)
+			fake_autosave(target, src)
+
+		if(SMITE_AUTOSAVE_WIDE)
+			fake_autosave(target, src, TRUE)
+
 		else
 			return //Injection? Don't print any messages.
 
@@ -211,3 +217,47 @@ var/redspace_abduction_z
 	to_chat(user,"<span class='notice'>The mob has been moved. ([admin_jump_link(target,usr.client.holder)])</span>")
 
 	target.transforming = FALSE
+
+/proc/fake_autosave(var/mob/living/target, var/client/user, var/wide)
+	if(!istype(target) || !target.client)
+		to_chat(user, "<span class='warning'>Skipping [target] because they are not a /mob/living or have no client.</span>")
+		return
+
+	if(wide)
+		for(var/mob/living/L in orange(user.view, user.mob))
+			fake_autosave(L, user)
+		return
+
+	target.move_delay = 99999999
+
+	to_chat(target, "<span class='notice' style='font: small-caps bold large monospace!important'>Autosaving your progress, please wait...</span>")
+	target << 'sound/effects/ding.ogg'
+	
+	var/static/list/bad_tips = list(
+		"Did you know that black shoes protect you from electrocution while hacking?",
+		"Did you know that airlocks always have a wire that disables ID checks?",
+		"You can always find at least 3 pairs of glowing purple gloves in maint!",
+		"Phoron is not toxic if you've had a soda within 30 seconds of exposure!",
+		"Space Mountain Wind makes you immune to damage from space for 30 seconds!",
+		"A mask and air tank are all you need to be safe in space!",
+		"When exploring maintenance, wearing no shoes makes you move faster!",
+		"Did you know that the bartender's shotgun is loaded with harmless ammo?",
+		"Did you know that the tesla and singulo only need containment for 5 minutes?")
+
+	var/tip = pick(bad_tips)
+	to_chat(target, "<span class='notice' style='font: small-caps bold large monospace!important'>Tip of the day:</span><br><span class='notice'>[tip]</span>")
+
+	var/obj/screen/loader = new(target)
+	loader.name = "Autosaving..."
+	loader.desc = "A disc icon that represents your game autosaving. Please wait."
+	loader.icon = 'icons/obj/discs_vr.dmi'
+	loader.icon_state = "quicksave"
+	loader.screen_loc = "NORTH-1, EAST-1"
+	target.client.screen += loader
+
+	spawn(10 SECONDS)
+		if(target)
+			target.move_delay = 0
+			to_chat(target, "<span class='notice' style='font: small-caps bold large monospace!important'>Autosave complete!</span>")
+		if(target.client)
+			target.client.screen -= loader