Merge branch 'master' into upstream-merge-8298

code/modules/admin/admin_verb_lists_vr.dm

@@ -132,7 +132,8 @@ var/list/admin_verbs_ban = list(
 var/list/admin_verbs_sounds = list(
 	/client/proc/play_local_sound,
 	/client/proc/play_sound,
-	/client/proc/play_server_sound
+	/client/proc/play_server_sound,
+	/client/proc/play_z_sound
 	)
 
 var/list/admin_verbs_fun = list(

code/modules/admin/verbs/playsound.dm

@@ -31,6 +31,27 @@ var/list/sounds_cache = list()
 	playsound(src.mob, S, 50, 0, 0)
 	feedback_add_details("admin_verb","PLS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
+/client/proc/play_z_sound(S as sound)
+	set category = "Fun"
+	set name = "Play Z Sound"
+	if(!check_rights(R_SOUNDS))	return
+	var/target_z = mob.z
+	var/sound/uploaded_sound = sound(S, repeat = 0, wait = 1, channel = 777)
+	uploaded_sound.priority = 250
+
+	sounds_cache += S
+
+	if(tgui_alert(usr, "Do you ready?\nSong: [S]\nNow you can also play this sound using \"Play Server Sound\".", "Confirmation request", list("Play","Cancel")) == "Cancel")
+		return
+
+	log_admin("[key_name(src)] played sound [S] on Z[target_z]")
+	message_admins("[key_name_admin(src)] played sound [S] on Z[target_z]", 1)
+	for(var/mob/M in player_list)
+		if(M.is_preference_enabled(/datum/client_preference/play_admin_midis) && M.z == target_z)
+			M << uploaded_sound
+
+	feedback_add_details("admin_verb","PZS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
 
 /client/proc/play_server_sound()
 	set category = "Fun"

code/modules/admin/verbs/resize.dm

@@ -9,7 +9,7 @@
     if(!size_multiplier)
         return //cancelled
 
-    size_multiplier = clamp(size_multiplier, 0.01, 1000)
+    size_multiplier = clamp(size_multiplier, -50, 50)   //VOREStation Edit - being able to make people upside down is fun. Also 1000 is way, WAY too big. Honestly 50 is too big but at least you can see 50 and it doesn't break the rendering.
     var/can_be_big = L.has_large_resize_bounds()
     var/very_big = is_extreme_size(size_multiplier)
 

code/modules/admin/verbs/smite_vr.dm

@@ -34,7 +34,7 @@
 			if(!Ts)
 				return //Didn't find shadekin spawn turf
 
-			var/mob/living/simple_mob/shadekin/red/ai/shadekin = new(Ts)
+			var/mob/living/simple_mob/shadekin/red/shadekin = new(Ts)
 			//Abuse of shadekin
 			shadekin.real_name = shadekin.name
 			shadekin.init_vore()

code/modules/admin/view_variables/admin_delete.dm

@@ -19,6 +19,13 @@
 			T.ScrapeAway()
 		else*/
 		vv_update_display(D, "deleted", VV_MSG_DELETED)
-		qdel(D)
+
+		// turfs are special snowflakes that'll explode if qdel'd outside ChangeTurf
+		if (isturf(D))
+			var/turf/T = D
+			T.ChangeTurf(world.turf)
+		else
+			qdel(D)
+
 		if(!QDELETED(D))
 			vv_update_display(D, "deleted", "")