Merge branch 'master' into upstream-merge-33498

code/game/machinery/PDApainter.dm

@@ -134,7 +134,7 @@
 		return
 
 	if(storedpda)
-		storedpda.loc = get_turf(src.loc)
+		storedpda.forceMove(drop_location())
 		storedpda = null
 		update_icon()
 	else

code/game/machinery/computer/telecrystalconsoles.dm

@@ -51,7 +51,7 @@ GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","E
 
 /obj/machinery/computer/telecrystals/uplinker/proc/ejectuplink()
 	if(uplinkholder)
-		uplinkholder.loc = get_turf(src.loc)
+		uplinkholder.forceMove(drop_location())
 		uplinkholder = null
 		update_icon()
 

code/game/machinery/constructable_frame.dm

@@ -157,15 +157,15 @@
 			if(istype(P, /obj/item/crowbar))
 				playsound(src.loc, P.usesound, 50, 1)
 				state = 2
-				circuit.loc = src.loc
+				circuit.forceMove(drop_location())
 				components.Remove(circuit)
 				circuit = null
 				if(components.len == 0)
 					to_chat(user, "<span class='notice'>You remove the circuit board.</span>")
 				else
 					to_chat(user, "<span class='notice'>You remove the circuit board and other components.</span>")
-					for(var/atom/movable/A in components)
-						A.loc = src.loc
+					for(var/atom/movable/AM in components)
+						AM.forceMove(drop_location())
 				desc = initial(desc)
 				req_components = null
 				components = null
@@ -186,9 +186,9 @@
 						qdel(O)
 					new_machine.component_parts = list()
 					for(var/obj/O in src)
-						O.loc = null
+						O.moveToNullspace()
 						new_machine.component_parts += O
-					circuit.loc = null
+					circuit.moveToNullspace()
 					new_machine.RefreshParts()
 					qdel(src)
 				return

code/game/machinery/dance_machine.dm

@@ -459,6 +459,8 @@
 		var/sound/song_played = sound(selection.song_path)
 
 		for(var/mob/M in range(10,src))
+			if(!M.client || !(M.client.prefs.toggles & SOUND_INSTRUMENTS))
+				continue
 			if(!(M in rangers))
 				rangers[M] = TRUE
 				M.playsound_local(get_turf(M), null, 100, channel = CHANNEL_JUKEBOX, S = song_played)

code/game/machinery/doors/airlock.dm

@@ -1036,7 +1036,7 @@
 		panel_open = TRUE
 		update_icon(AIRLOCK_OPENING)
 		visible_message("<span class='warning'>[src]'s panel is blown off in a spray of deadly shrapnel!</span>")
-		charge.loc = get_turf(src)
+		charge.forceMove(drop_location())
 		charge.ex_act(EXPLODE_DEVASTATE)
 		detonated = 1
 		charge = null
@@ -1340,7 +1340,7 @@
 			else
 				ae = electronics
 				electronics = null
-				ae.loc = src.loc
+				ae.forceMove(drop_location())
 	qdel(src)
 
 /obj/machinery/door/airlock/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)

code/game/machinery/doors/windowdoor.dm

@@ -275,7 +275,7 @@
 						else
 							ae = electronics
 							electronics = null
-							ae.loc = src.loc
+							ae.forceMove(drop_location())
 
 						qdel(src)
 				return
@@ -495,4 +495,4 @@
 /obj/machinery/door/window/brigdoor/security/holding/southright
 	dir = SOUTH
 	icon_state = "rightsecure"
-	base_state = "rightsecure"
+	base_state = "rightsecure"

code/game/machinery/hologram.dm

@@ -75,7 +75,7 @@ Possible to do for anyone motivated enough:
 		replay_stop()
 	if(record_mode)
 		record_stop()
-	
+
 	QDEL_NULL(disk)
 
 	holopads -= src
@@ -256,12 +256,12 @@ Possible to do for anyone motivated enough:
 		temp = ""
 		if(outgoing_call)
 			outgoing_call.Disconnect()
-	
+
 	else if(href_list["disk_eject"])
 		if(disk && !replay_mode)
 			disk.forceMove(drop_location())
 			disk = null
-	
+
 	else if(href_list["replay_stop"])
 		replay_stop()
 	else if(href_list["replay_start"])
@@ -424,7 +424,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 	if(masters[user])
 		var/obj/effect/overlay/holo_pad_hologram/H = masters[user]
 		step_to(H, new_turf)
-		H.loc = new_turf
+		H.forceMove(new_turf)
 		var/area/holo_area = get_area(src)
 		var/area/eye_area = new_turf.loc
 
@@ -505,7 +505,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 		current_delay += entry[2]
 
 	var/time_delta = world.time - record_start - current_delay
-	
+
 	if(time_delta >= 1)
 		disk.record.entries += list(list(HOLORECORD_DELAY,time_delta))
 	disk.record.entries += list(list(HOLORECORD_SAY,message))

code/game/machinery/newscaster.dm

@@ -780,7 +780,7 @@ GLOBAL_LIST_EMPTY(allCasters)
 /obj/machinery/newscaster/proc/AttachPhoto(mob/user)
 	if(photo)
 		if(!photo.sillynewscastervar)
-			photo.loc = loc
+			photo.forceMove(drop_location())
 			if(!issilicon(user))
 				user.put_in_inactive_hand(photo)
 		else
@@ -856,7 +856,7 @@ GLOBAL_LIST_EMPTY(allCasters)
 		NEWSPAPER.wantedBody = GLOB.news_network.wanted_issue.body
 		if(GLOB.news_network.wanted_issue.img)
 			NEWSPAPER.wantedPhoto = GLOB.news_network.wanted_issue.img
-	NEWSPAPER.loc = get_turf(src)
+	NEWSPAPER.forceMove(drop_location())
 	NEWSPAPER.creationTime = GLOB.news_network.lastAction
 	paper_remaining--
 

code/game/machinery/robot_fabricator.dm

@@ -137,7 +137,7 @@ Please wait until completion...</TT><BR>
 
 					spawn (build_time)
 						if (!isnull(src.being_built))
-							src.being_built.loc = get_turf(src)
+							src.being_built.forceMove(drop_location())
 							src.being_built = null
 						src.use_power = IDLE_POWER_USE
 						operating = FALSE

code/game/machinery/spaceheater.dm

@@ -228,7 +228,7 @@
 					settableTemperatureMedian + settableTemperatureRange)
 		if("eject")
 			if(panel_open && cell)
-				cell.loc = get_turf(src)
+				cell.forceMove(drop_location())
 				cell = null
 				. = TRUE
 

code/game/machinery/transformer.dm

@@ -57,7 +57,7 @@
 		var/move_dir = get_dir(loc, AM.loc)
 		var/mob/living/carbon/human/H = AM
 		if((transform_standing || H.lying) && move_dir == EAST)// || move_dir == WEST)
-			AM.loc = src.loc
+			AM.forceMove(drop_location())
 			do_transform(AM)
 
 /obj/machinery/transformer/CanPass(atom/movable/mover, turf/target)