Merge branch 'master' into upstream-merge-33498

code/game/atoms_movable.dm

@@ -414,7 +414,7 @@
 	for(var/m in buckled_mobs)
 		var/mob/living/buckled_mob = m
 		if(!buckled_mob.Move(newloc, direct))
-			loc = buckled_mob.loc
+			forceMove(buckled_mob.loc)
 			last_move = buckled_mob.last_move
 			inertia_dir = last_move
 			buckled_mob.inertia_dir = last_move

code/game/data_huds.dm

@@ -60,6 +60,9 @@
 /datum/atom_hud/data/bot_path
 	hud_icons = list(DIAG_PATH_HUD)
 
+/datum/atom_hud/abductor
+	hud_icons = list(GLAND_HUD)
+
 /* MED/SEC/DIAG HUD HOOKS */
 
 /*

code/game/gamemodes/blob/overmind.dm

@@ -215,12 +215,12 @@ GLOBAL_LIST_EMPTY(blob_nodes)
 	if(placed)
 		var/obj/structure/blob/B = locate() in range("3x3", NewLoc)
 		if(B)
-			loc = NewLoc
+			forceMove(NewLoc)
 		else
 			return 0
 	else
 		var/area/A = get_area(NewLoc)
 		if(isspaceturf(NewLoc) || istype(A, /area/shuttle)) //if unplaced, can't go on shuttles or space tiles
 			return 0
-		loc = NewLoc
+		forceMove(NewLoc)
 		return 1

code/game/gamemodes/blob/powers.dm

@@ -42,7 +42,7 @@
 			return 0
 	else if(placement_override == 1)
 		var/turf/T = pick(GLOB.blobstart)
-		loc = T //got overrided? you're somewhere random, motherfucker
+		forceMove(T) //got overrided? you're somewhere random, motherfucker
 	if(placed && blob_core)
 		blob_core.forceMove(loc)
 	else
@@ -74,7 +74,7 @@
 		var/node_name = input(src, "Choose a node to jump to.", "Node Jump") in nodes
 		var/obj/structure/blob/node/chosen_node = nodes[node_name]
 		if(chosen_node)
-			loc = chosen_node.loc
+			forceMove(chosen_node.loc)
 
 /mob/camera/blob/proc/createSpecial(price, blobType, nearEquals, needsNode, turf/T)
 	if(!T)

code/game/gamemodes/clock_cult/clock_helpers/power_helpers.dm

@@ -10,12 +10,15 @@
 	for(var/obj/effect/clockwork/sigil/transmission/T in GLOB.all_clockwork_objects)
 		T.update_icon()
 	var/power_overwhelming = GLOB.clockwork_power
+	var/unlock_message
 	if(power_overwhelming >= SCRIPT_UNLOCK_THRESHOLD && !GLOB.script_scripture_unlocked)
 		GLOB.script_scripture_unlocked = TRUE
-		hierophant_message("<span class='large_brass bold'>The Ark swells as a key power threshold is reached. Script scriptures are now available.</span>")
+		unlock_message = "<span class='large_brass bold'>The Ark swells as a key power threshold is reached. Script scriptures are now available.</span>"
 	if(power_overwhelming >= APPLICATION_UNLOCK_THRESHOLD && !GLOB.application_scripture_unlocked)
 		GLOB.application_scripture_unlocked = TRUE
-		hierophant_message("<span class='large_brass bold'>The Ark surges as a key power threshold is reached. Application scriptures are now available.</span>")
+		unlock_message = "<span class='large_brass bold'>The Ark surges as a key power threshold is reached. Application scriptures are now available.</span>"
+	if(GLOB.servants_active)
+		hierophant_message(unlock_message)
 	return TRUE
 
 /proc/can_access_clockwork_power(atom/movable/access_point, amount) //Returns true if the access point has access to clockwork power (and optionally, a number of watts for it)

code/game/gamemodes/clock_cult/clock_helpers/scripture_checks.dm

@@ -11,6 +11,8 @@
 
 //reports to servants when scripture is locked or unlocked
 /proc/scripture_unlock_alert(list/previous_states)
+	if(!GLOB.servants_active)
+		return
 	. = scripture_unlock_check()
 	for(var/i in .)
 		if(.[i] != previous_states[i])

code/game/gamemodes/clock_cult/clock_mobs/clockwork_marauder.dm

@@ -1,13 +1,13 @@
 #define MARAUDER_SLOWDOWN_PERCENTAGE 0.40 //Below this percentage of health, marauders will become slower
-#define MARAUDER_SHIELD_REGEN_TIME 100 //In deciseconds, how long it takes for shields to regenerate after breaking
+#define MARAUDER_SHIELD_REGEN_TIME 200 //In deciseconds, how long it takes for shields to regenerate after breaking
 
 //Clockwork marauder: A well-rounded frontline construct. Only one can exist for every two human servants.
 /mob/living/simple_animal/hostile/clockwork/marauder
 	name = "clockwork marauder"
 	desc = "The stalwart apparition of a soldier, blazing with crimson flames. It's armed with a gladius and shield."
 	icon_state = "clockwork_marauder"
-	health = 150
-	maxHealth = 150
+	health = 120
+	maxHealth = 120
 	force_threshold = 8
 	speed = 0
 	obj_damage = 40
@@ -39,10 +39,11 @@
 		speed = initial(speed) + 1 //Yes, this slows them down
 	else
 		speed = initial(speed)
-	if(shield_health != max_shield_health && world.time >= shield_health_regen)
-		to_chat(src, "<span class='neovgre'>Your shield has recovered. <b>[max_shield_health]</b> blocks remaining!</span>")
+	if(shield_health < max_shield_health && world.time >= shield_health_regen)
+		shield_health_regen = world.time + MARAUDER_SHIELD_REGEN_TIME
+		to_chat(src, "<span class='neovgre'>Your shield has recovered, <b>[shield_health]</b> blocks remaining!</span>")
 		playsound_local(src, "shatter", 75, TRUE, frequency = -1)
-		shield_health = max_shield_health
+		shield_health++
 
 /mob/living/simple_animal/hostile/clockwork/marauder/update_values()
 	if(GLOB.ratvar_awakens) //Massive attack damage bonuses and health increase, because Ratvar

code/game/gamemodes/miniantags/abduction/abduction_gear.dm

@@ -2,6 +2,8 @@
 #define VEST_COMBAT 2
 #define GIZMO_SCAN 1
 #define GIZMO_MARK 2
+#define MIND_DEVICE_MESSAGE 1
+#define MIND_DEVICE_CONTROL 2
 
 //AGENT VEST
 /obj/item/clothing/suit/armor/abductor/vest
@@ -278,6 +280,84 @@
 			if(!istype(I, /obj/item/device/radio/headset))
 				r.broadcasting = 0 //goddamned headset hacks
 
+/obj/item/device/abductor/mind_device
+	name = "mental interface device"
+	desc = "A dual-mode tool for directly communicating with sentient brains. It can be used to send a direct message to a target, \
+			or to send a command to a test subject with a charged gland."
+	icon_state = "mind_device_message"
+	item_state = "silencer"
+	lefthand_file = 'icons/mob/inhands/antag/abductor_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/antag/abductor_righthand.dmi'
+	var/mode = MIND_DEVICE_MESSAGE
+
+/obj/item/device/abductor/mind_device/attack_self(mob/user)
+	if(!ScientistCheck(user))
+		return
+
+	if(mode == MIND_DEVICE_MESSAGE)
+		mode = MIND_DEVICE_CONTROL
+		icon_state = "mind_device_control"
+	else
+		mode = MIND_DEVICE_MESSAGE
+		icon_state = "mind_device_message"
+	to_chat(user, "<span class='notice'>You switch the device to [mode==MIND_DEVICE_MESSAGE? "TRANSMISSION": "COMMAND"] MODE</span>")
+
+/obj/item/device/abductor/mind_device/afterattack(atom/target, mob/living/user, flag, params)
+	if(!ScientistCheck(user))
+		return
+
+	switch(mode)
+		if(MIND_DEVICE_CONTROL)
+			mind_control(target, user)
+		if(MIND_DEVICE_MESSAGE)
+			mind_message(target, user)
+
+/obj/item/device/abductor/mind_device/proc/mind_control(atom/target, mob/living/user)
+	if(iscarbon(target))
+		var/mob/living/carbon/C = target
+		var/obj/item/organ/heart/gland/G = C.getorganslot("heart")
+		if(!istype(G))
+			to_chat(user, "<span class='warning'>Your target does not have an experimental gland!</span>")
+			return
+		if(!G.mind_control_uses)
+			to_chat(user, "<span class='warning'>Your target's gland is spent!</span>")
+			return
+		if(G.active_mind_control)
+			to_chat(user, "<span class='warning'>Your target is already under a mind-controlling influence!</span>")
+			return
+
+		var/command = stripped_input(user, "Enter the command for your target to follow.\
+											Uses Left: [G.mind_control_uses], Duration: [G.mind_control_duration / 10] seconds","Enter command")
+
+		if(!command)
+			return
+
+		if(QDELETED(user) || user.get_active_held_item() != src || loc != user)
+			return
+
+		if(QDELETED(G))
+			return
+
+		G.mind_control(command, user)
+		to_chat(user, "<span class='notice'>You send the command to your target.</span>")
+
+/obj/item/device/abductor/mind_device/proc/mind_message(atom/target, mob/living/user)
+	if(isliving(target))
+		var/mob/living/L = target
+		if(L.stat == DEAD)
+			to_chat(user, "<span class='warning'>Your target is dead!</span>")
+			return
+		var/message = stripped_input(user, "Write a message to send to your target's brain.","Enter message")
+		if(!message)
+			return
+		if(QDELETED(L) || L.stat == DEAD)
+			return
+
+		to_chat(L, "<span class='italics'>You hear a voice in your head saying: </span><span class='abductor'>[message]</span>")
+		to_chat(user, "<span class='notice'>You send the message to your target.</span>")
+		log_talk(user,"[key_name(user)] sent an abductor mind message to [L]/[L.ckey]: '[message]'", LOGSAY)
+
+
 /obj/item/device/firing_pin/abductor
 	name = "alien firing pin"
 	icon_state = "firing_pin_ayy"

code/game/gamemodes/miniantags/abduction/gland.dm

@@ -12,28 +12,68 @@
 	var/human_only = 0
 	var/active = 0
 
+	var/mind_control_uses = 1
+	var/mind_control_duration = 1800
+	var/active_mind_control = FALSE
+
 /obj/item/organ/heart/gland/proc/ownerCheck()
 	if(ishuman(owner))
-		return 1
+		return TRUE
 	if(!human_only && iscarbon(owner))
-		return 1
-	return 0
+		return TRUE
+	return FALSE
 
 /obj/item/organ/heart/gland/proc/Start()
 	active = 1
 	next_activation = world.time + rand(cooldown_low,cooldown_high)
 
+/obj/item/organ/heart/gland/proc/update_gland_hud()
+	if(!owner)
+		return
+	var/image/holder = owner.hud_list[GLAND_HUD]
+	var/icon/I = icon(owner.icon, owner.icon_state, owner.dir)
+	holder.pixel_y = I.Height() - world.icon_size
+	if(active_mind_control)
+		holder.icon_state = "hudgland_active"
+	else if(mind_control_uses)
+		holder.icon_state = "hudgland_ready"
+	else
+		holder.icon_state = "hudgland_spent"
 
-/obj/item/organ/heart/gland/Remove(var/mob/living/carbon/M, special = 0)
+/obj/item/organ/heart/gland/proc/mind_control(command, mob/living/user)
+	if(!ownerCheck() || !mind_control_uses || active_mind_control)
+		return
+	mind_control_uses--
+	to_chat(owner, "<span class='userdanger'>You suddenly feel an irresistible compulsion to follow an order...</span>")
+	to_chat(owner, "<span class='mind_control'>[command]</span>")
+	active_mind_control = TRUE
+	log_admin("[key_name(user)] sent an abductor mind control message to [key_name(owner)]: [command]")
+	update_gland_hud()
+
+	addtimer(CALLBACK(src, .proc/clear_mind_control), mind_control_duration)
+
+/obj/item/organ/heart/gland/proc/clear_mind_control()
+	if(!ownerCheck() || !active_mind_control)
+		return
+	to_chat(owner, "<span class='userdanger'>You feel the compulsion fade, and you completely forget about your previous orders.</span>")
+	active_mind_control = FALSE
+
+/obj/item/organ/heart/gland/Remove(mob/living/carbon/M, special = 0)
 	active = 0
 	if(initial(uses) == 1)
 		uses = initial(uses)
+	var/datum/atom_hud/abductor/hud = GLOB.huds[DATA_HUD_ABDUCTOR]
+	hud.remove_from_hud(owner)
+	clear_mind_control()
 	..()
 
-/obj/item/organ/heart/gland/Insert(var/mob/living/carbon/M, special = 0)
+/obj/item/organ/heart/gland/Insert(mob/living/carbon/M, special = 0)
 	..()
 	if(special != 2 && uses) // Special 2 means abductor surgery
 		Start()
+	var/datum/atom_hud/abductor/hud = GLOB.huds[DATA_HUD_ABDUCTOR]
+	hud.add_to_hud(owner)
+	update_gland_hud()
 
 /obj/item/organ/heart/gland/on_life()
 	if(!beating)
@@ -59,6 +99,8 @@
 	cooldown_high = 400
 	uses = -1
 	icon_state = "health"
+	mind_control_uses = 3
+	mind_control_duration = 3000
 
 /obj/item/organ/heart/gland/heals/activate()
 	to_chat(owner, "<span class='notice'>You feel curiously revitalized.</span>")
@@ -71,6 +113,8 @@
 	cooldown_high = 1200
 	uses = -1
 	icon_state = "slime"
+	mind_control_uses = 1
+	mind_control_duration = 2400
 
 /obj/item/organ/heart/gland/slime/activate()
 	to_chat(owner, "<span class='warning'>You feel nauseous!</span>")
@@ -86,6 +130,8 @@
 	cooldown_high = 300
 	uses = -1
 	icon_state = "mindshock"
+	mind_control_uses = 1
+	mind_control_duration = 6000
 
 /obj/item/organ/heart/gland/mindshock/activate()
 	to_chat(owner, "<span class='notice'>You get a headache.</span>")
@@ -103,6 +149,8 @@
 	uses = -1
 	human_only = 1
 	icon_state = "species"
+	mind_control_uses = 5
+	mind_control_duration = 300
 
 /obj/item/organ/heart/gland/pop/activate()
 	to_chat(owner, "<span class='notice'>You feel unlike yourself.</span>")
@@ -114,6 +162,8 @@
 	cooldown_high = 2400
 	uses = 1
 	icon_state = "vent"
+	mind_control_uses = 4
+	mind_control_duration = 1800
 
 /obj/item/organ/heart/gland/ventcrawling/activate()
 	to_chat(owner, "<span class='notice'>You feel very stretchy.</span>")
@@ -125,6 +175,8 @@
 	cooldown_high = 2400
 	uses = 1
 	icon_state = "viral"
+	mind_control_uses = 1
+	mind_control_duration = 1800
 
 /obj/item/organ/heart/gland/viral/activate()
 	to_chat(owner, "<span class='warning'>You feel sick.</span>")
@@ -141,6 +193,8 @@
 	cooldown_high = 1600
 	uses = 10
 	icon_state = "emp"
+	mind_control_uses = 1
+	mind_control_duration = 1800
 
 /obj/item/organ/heart/gland/emp/activate()
 	to_chat(owner, "<span class='warning'>You feel a spike of pain in your head.</span>")
@@ -151,6 +205,8 @@
 	cooldown_high = 900
 	uses = 10
 	icon_state = "spider"
+	mind_control_uses = 2
+	mind_control_duration = 2400
 
 /obj/item/organ/heart/gland/spiderman/activate()
 	to_chat(owner, "<span class='warning'>You feel something crawling in your skin.</span>")
@@ -164,6 +220,8 @@
 	icon_state = "egg"
 	lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi'
+	mind_control_uses = 2
+	mind_control_duration = 1800
 
 /obj/item/organ/heart/gland/egg/activate()
 	to_chat(owner, "<span class='boldannounce'>You lay an egg!</span>")
@@ -175,6 +233,8 @@
 	cooldown_low = 200
 	cooldown_high = 400
 	uses = -1
+	mind_control_uses = 1
+	mind_control_duration = 450
 
 /obj/item/organ/heart/gland/bloody/activate()
 	owner.blood_volume -= 20
@@ -192,6 +252,8 @@
 	cooldown_high = 600
 	human_only = 1
 	uses = 1
+	mind_control_uses = 1
+	mind_control_duration = 600
 
 /obj/item/organ/heart/gland/bodysnatch/activate()
 	to_chat(owner, "<span class='warning'>You feel something moving around inside you...</span>")
@@ -233,6 +295,8 @@
 	cooldown_low = 1200
 	cooldown_high = 1800
 	uses = -1
+	mind_control_uses = 1
+	mind_control_duration = 800
 
 /obj/item/organ/heart/gland/plasma/activate()
 	to_chat(owner, "<span class='warning'>You feel bloated.</span>")

code/game/gamemodes/miniantags/abduction/machinery/console.dm

@@ -48,6 +48,7 @@
 		dat += "<a href='?src=[REF(src)];dispense=vest'>Agent Vest</A><br>"
 		dat += "<a href='?src=[REF(src)];dispense=silencer'>Radio Silencer</A><br>"
 		dat += "<a href='?src=[REF(src)];dispense=tool'>Science Tool</A><br>"
+		dat += "<a href='?src=[REF(src)];dispense=mind_device'>Mental Interface Device</A><br>"
 	else
 		dat += "<span class='bad'>NO EXPERIMENT MACHINE DETECTED</span> <br>"
 
@@ -109,6 +110,8 @@
 				Dispense(/obj/item/device/abductor/gizmo)
 			if("vest")
 				Dispense(/obj/item/clothing/suit/armor/abductor/vest)
+			if("mind_device")
+				Dispense(/obj/item/device/abductor/mind_device,cost=2)
 	updateUsrDialog()
 
 /obj/machinery/abductor/console/proc/TeleporterRetrieve()

code/game/gamemodes/miniantags/revenant/revenant.dm

@@ -374,7 +374,7 @@
 		return
 	var/key_of_revenant
 	message_admins("Revenant ectoplasm was left undestroyed for 1 minute and is reforming into a new revenant.")
-	loc = get_turf(src) //In case it's in a backpack or someone's hand
+	forceMove(drop_location()) //In case it's in a backpack or someone's hand
 	revenant.forceMove(loc)
 	if(client_to_revive)
 		for(var/mob/M in GLOB.dead_mob_list)

code/game/gamemodes/wizard/artefact.dm

@@ -213,7 +213,7 @@
 	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
 	var/mob/living/carbon/human/target = null
 	var/list/mob/living/carbon/human/possible = list()
-	var/obj/item/link = null
+	var/obj/item/linked_item = null
 	var/cooldown_time = 30 //3s
 	var/cooldown = 0
 	max_integrity = 10
@@ -237,10 +237,10 @@
 		cooldown = world.time +cooldown_time
 		return
 
-	if(!link)
+	if(!linked_item)
 		if(I.loc == user && istype(I) && I.w_class <= WEIGHT_CLASS_SMALL)
 			if (user.transferItemToLoc(I,src))
-				link = I
+				linked_item = I
 				to_chat(user, "You attach [I] to the doll.")
 				update_targets()
 
@@ -255,11 +255,11 @@
 		return
 
 	if(user.zone_selected == "chest")
-		if(link)
+		if(linked_item)
 			target = null
-			link.loc = get_turf(src)
-			to_chat(user, "<span class='notice'>You remove the [link] from the doll.</span>")
-			link = null
+			linked_item.forceMove(drop_location())
+			to_chat(user, "<span class='notice'>You remove the [linked_item] from the doll.</span>")
+			linked_item = null
 			update_targets()
 			return
 
@@ -291,10 +291,10 @@
 
 /obj/item/voodoo/proc/update_targets()
 	possible = list()
-	if(!link)
+	if(!linked_item)
 		return
 	for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)
-		if(md5(H.dna.uni_identity) in link.fingerprints)
+		if(md5(H.dna.uni_identity) in linked_item.fingerprints)
 			possible |= H
 
 /obj/item/voodoo/proc/GiveHint(mob/victim,force=0)

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)

code/game/mecha/equipment/mecha_equipment.dm

@@ -104,7 +104,7 @@
 /obj/item/mecha_parts/mecha_equipment/proc/attach(obj/mecha/M)
 	M.equipment += src
 	chassis = M
-	src.loc = M
+	forceMove(M)
 	M.log_message("[src] initialized.")
 	if(!M.selected && selectable)
 		M.selected = src

code/game/mecha/equipment/tools/work_tools.dm

@@ -39,7 +39,7 @@
 				O.anchored = TRUE
 				if(do_after_cooldown(target))
 					cargo_holder.cargo += O
-					O.loc = chassis
+					O.forceMove(chassis)
 					O.anchored = FALSE
 					occupant_message("<span class='notice'>[target] successfully loaded.</span>")
 					log_message("Loaded [O]. Cargo compartment capacity: [cargo_holder.cargo_capacity - cargo_holder.cargo.len]")
@@ -91,7 +91,7 @@
 				O.anchored = TRUE
 				if(do_after_cooldown(target))
 					cargo_holder.cargo += O
-					O.loc = chassis
+					O.forceMove(chassis)
 					O.anchored = FALSE
 					occupant_message("<span class='notice'>[target] successfully loaded.</span>")
 					log_message("Loaded [O]. Cargo compartment capacity: [cargo_holder.cargo_capacity - cargo_holder.cargo.len]")

code/game/mecha/mecha.dm

@@ -24,7 +24,7 @@
 	infra_luminosity = 15 //byond implementation is bugged.
 	force = 5
 	flags_1 = HEAR_1
-	var/can_move = 1
+	var/can_move = 0 //time of next allowed movement
 	var/mob/living/carbon/occupant = null
 	var/step_in = 10 //make a step in step_in/10 sec.
 	var/dir_in = 2//What direction will the mech face when entered/powered on? Defaults to South.
@@ -502,7 +502,7 @@
 	return domove(direction)
 
 /obj/mecha/proc/domove(direction)
-	if(!can_move)
+	if(can_move >= world.time)
 		return 0
 	if(!Process_Spacemove(direction))
 		return 0
@@ -520,21 +520,19 @@
 		return 0
 
 	var/move_result = 0
+	var/oldloc = loc
 	if(internal_damage & MECHA_INT_CONTROL_LOST)
 		move_result = mechsteprand()
 	else if(dir != direction && !strafe)
 		move_result = mechturn(direction)
 	else
 		move_result = mechstep(direction)
-	if(move_result)
+	if(move_result || loc != oldloc)// halfway done diagonal move still returns false
 		use_power(step_energy_drain)
-		can_move = 0
-		spawn(step_in)
-			can_move = 1
+		can_move = world.time + step_in
 		return 1
 	return 0
 
-
 /obj/mecha/proc/mechturn(direction)
 	setDir(direction)
 	if(turnsound)

code/game/mecha/mecha_construction_paths.dm

@@ -542,7 +542,7 @@
 			else
 				user.visible_message("[user] removes the  capacitor from the [holder].", "<span class='notice'>You remove the capacitor from the [holder].</span>")
 				var/obj/item/I = locate(/obj/item/stock_parts/capacitor) in holder
-				I.loc = get_turf(holder)
+				I.forceMove(holder.drop_location())
 				holder.icon_state = "gygax12"
 		if(9)
 			if(diff==FORWARD)
@@ -1155,7 +1155,7 @@
 			else
 				user.visible_message("[user] removes the scanner module from the [holder].", "<span class='notice'>You remove the scanner module from the [holder].</span>")
 				var/obj/item/I = locate(/obj/item/stock_parts/scanning_module) in holder
-				I.loc = get_turf(holder)
+				I.forceMove(holder.drop_location())
 				holder.icon_state = "durand10"
 		if(11)
 			if(diff==FORWARD)
@@ -1173,7 +1173,7 @@
 			else
 				user.visible_message("[user] removes the super capacitor from the [holder].", "<span class='notice'>You remove the capacitor from the [holder].</span>")
 				var/obj/item/I = locate(/obj/item/stock_parts/capacitor) in holder
-				I.loc = get_turf(holder)
+				I.forceMove(holder.drop_location())
 				holder.icon_state = "durand12"
 		if(9)
 			if(diff==FORWARD)
@@ -1480,7 +1480,7 @@
 			else
 				user.visible_message("[user] removes the phasic scanner module from the [holder].", "<span class='notice'>You remove the scanner module from the [holder].</span>")
 				var/obj/item/I = locate(/obj/item/stock_parts/scanning_module) in holder
-				I.loc = get_turf(holder)
+				I.forceMove(holder.drop_location())
 				holder.icon_state = "phazon10"
 		if(15)
 			if(diff==FORWARD)
@@ -1498,7 +1498,7 @@
 			else
 				user.visible_message("[user] removes the super capacitor from the [holder].", "<span class='notice'>You remove the capacitor from the [holder].</span>")
 				var/obj/item/I = locate(/obj/item/stock_parts/capacitor) in holder
-				I.loc = get_turf(holder)
+				I.forceMove(holder.drop_location())
 				holder.icon_state = "phazon12"
 		if(13)
 			if(diff==FORWARD)

code/game/mecha/mecha_wreckage.dm

@@ -68,7 +68,7 @@
 		if(crowbar_salvage && crowbar_salvage.len)
 			var/obj/S = pick(crowbar_salvage)
 			if(S)
-				S.loc = get_turf(user)
+				S.forceMove(user.drop_location())
 				crowbar_salvage -= S
 				user.visible_message("[user] pries [S] from [src].", "<span class='notice'>You pry [S] from [src].</span>")
 			return

code/game/objects/effects/spiders.dm

@@ -150,7 +150,7 @@
 				spawn(travel_time)
 
 					if(!exit_vent || exit_vent.welded)
-						loc = entry_vent
+						forceMove(entry_vent)
 						entry_vent = null
 						return
 
@@ -162,7 +162,7 @@
 						forceMove(entry_vent)
 						entry_vent = null
 						return
-					loc = exit_vent.loc
+					forceMove(exit_vent.loc)
 					entry_vent = null
 					var/area/new_area = get_area(loc)
 					if(new_area)

code/game/objects/items.dm

@@ -119,6 +119,10 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 
 	var/icon_override = null
 
+	//Grinder vars
+	var/list/grind_results //A reagent list containing the reagents this item produces when ground up in a grinder - this can be an empty list to allow for reagent transferring only
+	var/list/juice_results //A reagent list containing blah blah... but when JUICED in a grinder!
+
 /obj/item/Initialize()
 	if (!materials)
 		materials = list()
@@ -282,7 +286,6 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 	if(!user.put_in_active_hand(src))
 		dropped(user)
 
-
 /obj/item/attack_paw(mob/user)
 	if(!user)
 		return
@@ -396,6 +399,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 	return ITALICS | REDUCE_RANGE
 
 /obj/item/proc/dropped(mob/user)
+	SendSignal(COMSIG_ITEM_DROPPED, user)
 	for(var/X in actions)
 		var/datum/action/A = X
 		A.Remove(user)
@@ -427,6 +431,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 // for items that can be placed in multiple slots
 // note this isn't called during the initial dressing of a player
 /obj/item/proc/equipped(mob/user, slot)
+	SendSignal(COMSIG_ITEM_EQUIPPED, user, slot)
 	for(var/X in actions)
 		var/datum/action/A = X
 		if(item_action_slot_check(slot, user)) //some items only give their actions buttons when in a specific slot.
@@ -678,6 +683,15 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 
 /obj/item/proc/on_mob_death(mob/living/L, gibbed)
 
+/obj/item/proc/grind_requirements(obj/machinery/reagentgrinder/R) //Used to check for extra requirements for grinding an object
+	return TRUE
+
+ //Called BEFORE the object is ground up - use this to change grind results based on conditions
+ //Use "return -1" to prevent the grinding from occurring
+/obj/item/proc/on_grind()
+
+/obj/item/proc/on_juice()
+
 /obj/item/proc/set_force_string()
 	switch(force)
 		if(0 to 4)
@@ -713,4 +727,3 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 /obj/item/MouseExited()
 	deltimer(tip_timer)//delete any in-progress timer if the mouse is moved off the item before it finishes
 	closeToolTip(usr)
-

code/game/objects/items/apc_frame.dm

@@ -120,4 +120,5 @@
 	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
 	flags_1 = CONDUCT_1
 	w_class = WEIGHT_CLASS_SMALL
-	materials = list(MAT_METAL=50, MAT_GLASS=50)
+	materials = list(MAT_METAL=50, MAT_GLASS=50)
+	grind_results = list("iron" = 10, "silicon" = 10)

code/game/objects/items/chrono_eraser.dm

@@ -163,7 +163,7 @@
 
 /obj/effect/chrono_field/New(loc, var/mob/living/target, var/obj/item/gun/energy/chrono_gun/G)
 	if(target && isliving(target) && G)
-		target.loc = src
+		target.forceMove(src)
 		src.captured = target
 		var/icon/mob_snapshot = getFlatIcon(target)
 		var/icon/cached_icon = new()
@@ -198,7 +198,7 @@
 	if(captured)
 		if(tickstokill > initial(tickstokill))
 			for(var/atom/movable/AM in contents)
-				AM.loc = loc
+				AM.forceMove(drop_location())
 			qdel(src)
 		else if(tickstokill <= 0)
 			to_chat(captured, "<span class='boldnotice'>As the last essence of your being is erased from time, you begin to re-experience your most enjoyable memory. You feel happy...</span>")
@@ -213,7 +213,7 @@
 		else
 			captured.Unconscious(80)
 			if(captured.loc != src)
-				captured.loc = src
+				captured.forceMove(src)
 			update_icon()
 			if(gun)
 				if(gun.field_check(src))

code/game/objects/items/cigs_lighters.dm

@@ -25,6 +25,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	var/smoketime = 5
 	w_class = WEIGHT_CLASS_TINY
 	heat = 1000
+	grind_results = list("phosphorus" = 2)
 
 /obj/item/match/process()
 	smoketime--
@@ -104,6 +105,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	container_type = INJECTABLE_1
 	w_class = WEIGHT_CLASS_TINY
 	body_parts_covered = null
+	grind_results = list()
 	var/lit = FALSE
 	var/starts_lit = FALSE
 	var/icon_on = "cigon"  //Note - these are in masks.dmi not in cigarette.dmi
@@ -363,6 +365,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	icon_state = "cigbutt"
 	w_class = WEIGHT_CLASS_TINY
 	throwforce = 0
+	grind_results = list("carbon" = 2)
 
 /obj/item/cigbutt/cigarbutt
 	name = "cigar butt"
@@ -484,6 +487,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	heat = 1500
 	resistance_flags = FIRE_PROOF
 	light_color = LIGHT_COLOR_FIRE
+	grind_results = list("iron" = 1, "welding_fuel" = 5, "oil" = 5)
 
 /obj/item/lighter/update_icon()
 	if(lit)

code/game/objects/items/circuitboards/circuitboard.dm

@@ -12,6 +12,7 @@
 	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
 	materials = list(MAT_GLASS=1000)
 	w_class = WEIGHT_CLASS_SMALL
+	grind_results = list("silicon" = 20, "sacid" = 0.5) //Retrieving acid this way is extremely inefficient
 	var/build_path = null
 
 /obj/item/circuitboard/proc/apply_default_parts(obj/machinery/M)

code/game/objects/items/clown_items.dm

@@ -21,6 +21,7 @@
 	throwforce = 0
 	throw_speed = 3
 	throw_range = 7
+	grind_results = list("lye" = 10)
 	var/cleanspeed = 50 //slower than mop
 	force_string = "robust... against germs"
 

code/game/objects/items/crayons.dm

@@ -26,6 +26,7 @@
 	item_color = "red"
 	w_class = WEIGHT_CLASS_TINY
 	attack_verb = list("attacked", "coloured")
+	grind_results = list()
 	var/paint_color = "#FF0000" //RGB
 
 	var/drawtype

code/game/objects/items/defib.dm

@@ -328,7 +328,7 @@
 			O.unwield()
 		to_chat(user, "<span class='notice'>The paddles snap back into the main unit.</span>")
 		defib.on = 0
-		loc = defib
+		forceMove(defib)
 		defib.update_icon()
 	return unwield(user)
 

code/game/objects/items/devices/PDA/PDA.dm

@@ -543,7 +543,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 					if("2")		// Eject pAI device
 						var/turf/T = get_turf(src.loc)
 						if(T)
-							pai.loc = T
+							pai.forceMove(T)
 
 //LINK FUNCTIONS===================================
 
@@ -578,7 +578,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 			M.put_in_hands(id)
 			to_chat(usr, "<span class='notice'>You remove the ID from the [name].</span>")
 		else
-			id.loc = get_turf(src)
+			id.forceMove(drop_location())
 		id = null
 		update_icon()
 

code/game/objects/items/devices/chameleonproj.dm

@@ -85,7 +85,7 @@
 
 /obj/item/device/chameleon/proc/eject_all()
 	for(var/atom/movable/A in active_dummy)
-		A.loc = active_dummy.loc
+		A.forceMove(active_dummy.loc)
 		if(ismob(A))
 			var/mob/M = A
 			M.reset_perspective(null)
@@ -106,7 +106,7 @@
 			VRD.force_dismount(M)
 		else
 			V.unbuckle_mob(M, force = TRUE)
-	M.loc = src
+	M.forceMove(src)
 	master = C
 	master.active_dummy = src
 

code/game/objects/items/devices/flashlight.dm

@@ -256,6 +256,7 @@
 	var/produce_heat = 1500
 	heat = 1000
 	light_color = LIGHT_COLOR_FLARE
+	grind_results = list("sulfur" = 15)
 
 /obj/item/device/flashlight/flare/New()
 	fuel = rand(800, 1000) // Sorry for changing this so much but I keep under-estimating how long X number of ticks last in seconds.
@@ -404,6 +405,7 @@
 	color = LIGHT_COLOR_GREEN
 	icon_state = "glowstick"
 	item_state = "glowstick"
+	grind_results = list("phenol" = 15, "hydrogen" = 10, "oxygen" = 5) //Meth-in-a-stick
 	var/fuel = 0
 
 /obj/item/device/flashlight/glowstick/Initialize()

code/game/objects/items/devices/laserpointer.dm

@@ -50,7 +50,7 @@
 	else if(istype(W, /obj/item/screwdriver))
 		if(diode)
 			to_chat(user, "<span class='notice'>You remove the [diode.name] from \the [src].</span>")
-			diode.loc = get_turf(src.loc)
+			diode.forceMove(drop_location())
 			diode = null
 	else
 		return ..()

code/game/objects/items/devices/radio/headset.dm

@@ -227,7 +227,7 @@
 			if(keyslot)
 				var/turf/T = get_turf(user)
 				if(T)
-					keyslot.loc = T
+					keyslot.forceMove(T)
 					keyslot = null
 
 
@@ -235,7 +235,7 @@
 			if(keyslot2)
 				var/turf/T = get_turf(user)
 				if(T)
-					keyslot2.loc = T
+					keyslot2.forceMove(T)
 					keyslot2 = null
 
 			recalculateChannels()

code/game/objects/items/devices/radio/radio.dm

@@ -569,7 +569,7 @@
 			if(keyslot)
 				var/turf/T = get_turf(user)
 				if(T)
-					keyslot.loc = T
+					keyslot.forceMove(T)
 					keyslot = null
 
 			recalculateChannels()

code/game/objects/items/devices/scanners.dm

@@ -335,6 +335,7 @@ GAS ANALYZER
 	throw_speed = 3
 	throw_range = 7
 	materials = list(MAT_METAL=30, MAT_GLASS=20)
+	grind_results = list("mercury" = 5, "iron" = 5, "silicon" = 5)
 
 /obj/item/device/analyzer/attack_self(mob/user)
 

code/game/objects/items/grenades/chem_grenade.dm

@@ -110,12 +110,12 @@
 	else if(stage == WIRED && istype(I, /obj/item/wrench))
 		if(beakers.len)
 			for(var/obj/O in beakers)
-				O.loc = get_turf(src)
+				O.forceMove(drop_location())
 			beakers = list()
 			to_chat(user, "<span class='notice'>You open the [initial(name)] assembly and remove the payload.</span>")
 			return // First use of the wrench remove beakers, then use the wrench to remove the activation mechanism.
 		if(nadeassembly)
-			nadeassembly.loc = get_turf(src)
+			nadeassembly.forceMove(drop_location())
 			nadeassembly.master = null
 			nadeassembly = null
 		else // If "nadeassembly = null && stage == WIRED", then it most have been cable_coil that was used.
@@ -167,7 +167,7 @@
 		playsound(loc, 'sound/items/screwdriver2.ogg', 50, 1)
 		if(beakers.len)
 			for(var/obj/O in beakers)
-				O.loc = get_turf(src)
+				O.forceMove(drop_location())
 			beakers = list()
 		stage_change(EMPTY)
 		return

code/game/objects/items/implants/implantcase.dm

@@ -1,79 +1,80 @@
-/obj/item/implantcase
-	name = "implant case"
-	desc = "A glass case containing an implant."
-	icon = 'icons/obj/items_and_weapons.dmi'
-	icon_state = "implantcase-0"
-	item_state = "implantcase"
-	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
-	throw_speed = 2
-	throw_range = 5
-	w_class = WEIGHT_CLASS_TINY
-	materials = list(MAT_GLASS=500)
-	var/obj/item/implant/imp = null
-	var/imp_type
-
-/obj/item/implantcase/update_icon()
-	if(imp)
-		icon_state = "implantcase-[imp.item_color]"
-		reagents = imp.reagents
-	else
-		icon_state = "implantcase-0"
-		reagents = null
-
-
-/obj/item/implantcase/attackby(obj/item/W, mob/user, params)
-	if(istype(W, /obj/item/pen))
-		var/t = stripped_input(user, "What would you like the label to be?", name, null)
-		if(user.get_active_held_item() != W)
-			return
-		if(!in_range(src, user) && loc != user)
-			return
-		if(t)
-			name = "implant case - '[t]'"
-		else
-			name = "implant case"
-	else if(istype(W, /obj/item/implanter))
-		var/obj/item/implanter/I = W
-		if(I.imp)
-			if(imp || I.imp.imp_in)
-				return
-			I.imp.loc = src
-			imp = I.imp
-			I.imp = null
-			update_icon()
-			I.update_icon()
-		else
-			if(imp)
-				if(I.imp)
-					return
-				imp.loc = I
-				I.imp = imp
-				imp = null
-				update_icon()
-			I.update_icon()
-
-	else
-		return ..()
-
-/obj/item/implantcase/Initialize(mapload)
-	. = ..()
-	if(imp_type)
-		imp = new imp_type(src)
-	update_icon()
-
-
-/obj/item/implantcase/tracking
-	name = "implant case - 'Tracking'"
-	desc = "A glass case containing a tracking implant."
-	imp_type = /obj/item/implant/tracking
-
-/obj/item/implantcase/weapons_auth
-	name = "implant case - 'Firearms Authentication'"
-	desc = "A glass case containing a firearms authentication implant."
-	imp_type = /obj/item/implant/weapons_auth
-
-/obj/item/implantcase/adrenaline
-	name = "implant case - 'Adrenaline'"
-	desc = "A glass case containing an adrenaline implant."
-	imp_type = /obj/item/implant/adrenalin
+/obj/item/implantcase
+	name = "implant case"
+	desc = "A glass case containing an implant."
+	icon = 'icons/obj/items_and_weapons.dmi'
+	icon_state = "implantcase-0"
+	item_state = "implantcase"
+	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
+	throw_speed = 2
+	throw_range = 5
+	w_class = WEIGHT_CLASS_TINY
+	materials = list(MAT_GLASS=500)
+	var/obj/item/implant/imp = null
+	var/imp_type
+
+
+/obj/item/implantcase/update_icon()
+	if(imp)
+		icon_state = "implantcase-[imp.item_color]"
+		reagents = imp.reagents
+	else
+		icon_state = "implantcase-0"
+		reagents = null
+
+
+/obj/item/implantcase/attackby(obj/item/W, mob/user, params)
+	if(istype(W, /obj/item/pen))
+		var/t = stripped_input(user, "What would you like the label to be?", name, null)
+		if(user.get_active_held_item() != W)
+			return
+		if(!in_range(src, user) && loc != user)
+			return
+		if(t)
+			name = "implant case - '[t]'"
+		else
+			name = "implant case"
+	else if(istype(W, /obj/item/implanter))
+		var/obj/item/implanter/I = W
+		if(I.imp)
+			if(imp || I.imp.imp_in)
+				return
+			I.imp.forceMove(src)
+			imp = I.imp
+			I.imp = null
+			update_icon()
+			I.update_icon()
+		else
+			if(imp)
+				if(I.imp)
+					return
+				imp.forceMove(I)
+				I.imp = imp
+				imp = null
+				update_icon()
+			I.update_icon()
+
+	else
+		return ..()
+
+/obj/item/implantcase/Initialize(mapload)
+	. = ..()
+	if(imp_type)
+		imp = new imp_type(src)
+	update_icon()
+
+
+/obj/item/implantcase/tracking
+	name = "implant case - 'Tracking'"
+	desc = "A glass case containing a tracking implant."
+	imp_type = /obj/item/implant/tracking
+
+/obj/item/implantcase/weapons_auth
+	name = "implant case - 'Firearms Authentication'"
+	desc = "A glass case containing a firearms authentication implant."
+	imp_type = /obj/item/implant/weapons_auth
+
+/obj/item/implantcase/adrenaline
+	name = "implant case - 'Adrenaline'"
+	desc = "A glass case containing an adrenaline implant."
+	imp_type = /obj/item/implant/adrenalin

code/game/objects/items/robot/robot_items.dm

@@ -33,7 +33,7 @@
 	add_logs(user, M, "stunned", src, "(INTENT: [uppertext(user.a_intent)])")
 
 /obj/item/borg/cyborghug
-	name = "Hugging Module"
+	name = "hugging module"
 	icon_state = "hugmodule"
 	desc = "For when a someone really needs a hug."
 	var/mode = 0 //0 = Hugs 1 = "Hug" 2 = Shock 3 = CRUSH
@@ -336,6 +336,10 @@
 		cooldown = world.time + 600
 		log_game("[user.ckey]([user]) used an emagged Cyborg Harm Alarm in ([user.x],[user.y],[user.z])")
 
+#define DISPENSE_LOLLIPOP_MODE 1
+#define THROW_LOLLIPOP_MODE 2
+#define THROW_GUMBALL_MODE 3
+
 /obj/item/borg/lollipop
 	name = "lollipop fabricator"
 	desc = "Reward good humans with this. Toggle in-module to switch between dispensing and high velocity ejection modes."
@@ -343,8 +347,9 @@
 	var/candy = 30
 	var/candymax = 30
 	var/charge_delay = 10
-	var/charging = 0
-	var/mode = 1
+	var/charging = FALSE
+	var/mode = DISPENSE_LOLLIPOP_MODE
+
 	var/firedelay = 0
 	var/hitspeed = 2
 	var/hitdamage = 0
@@ -379,10 +384,22 @@
 		var/obj/O = A
 		if(O.density)
 			return FALSE
-	new /obj/item/reagent_containers/food/snacks/lollipop(T)
+
+	var/obj/item/reagent_containers/food/snacks/lollipop/L = new(T)
+
+	var/into_hands = FALSE
+	if(ismob(A))
+		var/mob/M = A
+		into_hands = M.put_in_hands(L)
+
 	candy--
 	check_amount()
-	to_chat(user, "<span class='notice'>Dispensing lollipop...</span>")
+
+	if(into_hands)
+		user.visible_message("<span class='notice'>[user] dispenses a lollipop into the hands of [A].</span>", "<span class='notice'>You dispense a lollipop into the hands of [A].</span>", "<span class='italics'>You hear a click.</span>")
+	else
+		user.visible_message("<span class='notice'>[user] dispenses a lollipop.</span>", "<span class='notice'>You dispense a lollipop.</span>", "<span class='italics'>You hear a click.</span>")
+
 	playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
 	return TRUE
 
@@ -427,29 +444,33 @@
 		if(R.emagged)
 			hitdamage = emaggedhitdamage
 	switch(mode)
-		if(1)
+		if(DISPENSE_LOLLIPOP_MODE)
 			if(!proximity)
 				return FALSE
 			dispense(target, user)
-		if(2)
+		if(THROW_LOLLIPOP_MODE)
 			shootL(target, user, click_params)
-		if(3)
+		if(THROW_GUMBALL_MODE)
 			shootG(target, user, click_params)
 	hitdamage = initial(hitdamage)
 
 /obj/item/borg/lollipop/attack_self(mob/living/user)
 	switch(mode)
-		if(1)
-			mode++
+		if(DISPENSE_LOLLIPOP_MODE)
+			mode = THROW_LOLLIPOP_MODE
 			to_chat(user, "<span class='notice'>Module is now throwing lollipops.</span>")
-		if(2)
-			mode++
+		if(THROW_LOLLIPOP_MODE)
+			mode = THROW_GUMBALL_MODE
 			to_chat(user, "<span class='notice'>Module is now blasting gumballs.</span>")
-		if(3)
-			mode = 1
+		if(THROW_GUMBALL_MODE)
+			mode = DISPENSE_LOLLIPOP_MODE
 			to_chat(user, "<span class='notice'>Module is now dispensing lollipops.</span>")
 	..()
 
+#undef DISPENSE_LOLLIPOP_MODE
+#undef THROW_LOLLIPOP_MODE
+#undef THROW_GUMBALL_MODE
+
 /obj/item/ammo_casing/caseless/gumball
 	name = "Gumball"
 	desc = "Why are you seeing this?!"
@@ -655,7 +676,7 @@
 
 
 /obj/item/borg/sight/xray
-	name = "\proper x-ray Vision"
+	name = "\proper x-ray vision"
 	icon = 'icons/obj/decals.dmi'
 	icon_state = "securearea"
 	sight_mode = BORGXRAY

code/game/objects/items/robot/robot_parts.dm

@@ -69,7 +69,7 @@
 		if(!l_arm && !r_arm && !l_leg && !r_leg && !chest && !head)
 			if (M.use(1))
 				var/obj/item/ed209_assembly/B = new /obj/item/ed209_assembly
-				B.loc = get_turf(src)
+				B.forceMove(drop_location())
 				to_chat(user, "<span class='notice'>You arm the robot frame.</span>")
 				var/holding_this = user.get_inactive_held_item()==src
 				qdel(src)
@@ -227,7 +227,7 @@
 			O.job = "Cyborg"
 
 			O.cell = chest.cell
-			chest.cell.loc = O
+			chest.cell.forceMove(O)
 			chest.cell = null
 			W.forceMove(O)//Should fix cybros run time erroring when blown up. It got deleted before, along with the frame.
 			if(O.mmi) //we delete the mmi created by robot/New()
@@ -271,7 +271,7 @@
 
 
 			O.cell = chest.cell
-			chest.cell.loc = O
+			chest.cell.forceMove(O)
 			chest.cell = null
 			O.locked = panel_locked
 			O.job = "Cyborg"

code/game/objects/items/stacks/bscrystal.dm

@@ -9,6 +9,7 @@
 	points = 50
 	var/blink_range = 8 // The teleport range when crushed/thrown at someone.
 	refined_type = /obj/item/stack/sheet/bluespace_crystal
+	grind_results = list("bluespace" = 2)
 
 /obj/item/ore/bluespace_crystal/refined
 	name = "refined bluespace crystal"
@@ -48,6 +49,7 @@
 	blink_range = 4 // Not as good as the organic stuff!
 	points = 0 //nice try
 	refined_type = null
+	grind_results = list("bluespace" = 1, "silicon" = 2)
 
 //Polycrystals, aka stacks
 /obj/item/stack/sheet/bluespace_crystal
@@ -58,6 +60,7 @@
 	materials = list(MAT_BLUESPACE=MINERAL_MATERIAL_AMOUNT)
 	attack_verb = list("bluespace polybashed", "bluespace polybattered", "bluespace polybludgeoned", "bluespace polythrashed", "bluespace polysmashed")
 	novariants = TRUE
+	grind_results = list("bluespace" = 2)
 	var/crystal_type = /obj/item/ore/bluespace_crystal/refined
 
 /obj/item/stack/sheet/bluespace_crystal/attack_self(mob/user)// to prevent the construction menu from ever happening

code/game/objects/items/stacks/medical.dm

@@ -111,6 +111,7 @@
 	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
 	heal_brute = 40
 	self_delay = 20
+	grind_results = list("styptic_powder" = 1)
 
 /obj/item/stack/medical/bruise_pack/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is bludgeoning [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -147,3 +148,4 @@
 	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
 	heal_burn = 40
 	self_delay = 20
+	grind_results = list("silver_sulfadiazine" = 1)

code/game/objects/items/stacks/sheets/glass.dm

@@ -22,6 +22,7 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 100)
 	resistance_flags = ACID_PROOF
 	merge_type = /obj/item/stack/sheet/glass
+	grind_results = list("silicon" = 1)
 
 /obj/item/stack/sheet/glass/cyborg
 	materials = list()
@@ -79,6 +80,7 @@ GLOBAL_LIST_INIT(pglass_recipes, list ( \
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 75, "acid" = 100)
 	resistance_flags = ACID_PROOF
 	merge_type = /obj/item/stack/sheet/plasmaglass
+	grind_results = list("silicon" = 1, "plasma" = 1)
 
 /obj/item/stack/sheet/plasmaglass/fifty
 	amount = 50
@@ -128,6 +130,7 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 70, acid = 100)
 	resistance_flags = ACID_PROOF
 	merge_type = /obj/item/stack/sheet/rglass
+	grind_results = list("silicon" = 1, "iron" = 1)
 
 /obj/item/stack/sheet/rglass/attackby(obj/item/W, mob/user, params)
 	add_fingerprint(user)
@@ -168,6 +171,7 @@ GLOBAL_LIST_INIT(prglass_recipes, list ( \
 	armor = list("melee" = 20, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100)
 	resistance_flags = ACID_PROOF
 	merge_type = /obj/item/stack/sheet/plasmarglass
+	grind_results = list("silicon" = 1, "plasma" = 1, "iron" = 1)
 
 /obj/item/stack/sheet/plasmarglass/Initialize(mapload, new_amount, merge = TRUE)
 	recipes = GLOB.prglass_recipes

code/game/objects/items/stacks/sheets/light.dm

@@ -1,37 +1,38 @@
-/obj/item/stack/light_w
-	name = "wired glass tile"
-	singular_name = "wired glass floor tile"
-	desc = "A glass tile, which is wired, somehow."
-	icon = 'icons/obj/tiles.dmi'
-	icon_state = "glass_wire"
-	w_class = WEIGHT_CLASS_NORMAL
-	force = 3
-	throwforce = 5
-	throw_speed = 3
-	throw_range = 7
+/obj/item/stack/light_w
+	name = "wired glass tile"
+	singular_name = "wired glass floor tile"
+	desc = "A glass tile, which is wired, somehow."
+	icon = 'icons/obj/tiles.dmi'
+	icon_state = "glass_wire"
+	w_class = WEIGHT_CLASS_NORMAL
+	force = 3
+	throwforce = 5
+	throw_speed = 3
+	throw_range = 7
 	flags_1 = CONDUCT_1
-	max_amount = 60
-
-/obj/item/stack/light_w/attackby(obj/item/O, mob/user, params)
-
+	max_amount = 60
+	grind_results = list("silicon" = 1, "copper" = 1)
+
+/obj/item/stack/light_w/attackby(obj/item/O, mob/user, params)
+
 	if(istype(O, /obj/item/wirecutters))
-		var/obj/item/stack/cable_coil/CC = new (user.loc)
-		CC.amount = 5
-		CC.add_fingerprint(user)
-		amount--
-		var/obj/item/stack/sheet/glass/G = new (user.loc)
-		G.add_fingerprint(user)
-		if(amount <= 0)
-			qdel(src)
-
-	else if(istype(O, /obj/item/stack/sheet/metal))
-		var/obj/item/stack/sheet/metal/M = O
-		if (M.use(1))
-			use(1)
-			var/obj/item/L = new /obj/item/stack/tile/light(user.loc)
-			to_chat(user, "<span class='notice'>You make a light tile.</span>")
-			L.add_fingerprint(user)
-		else
-			to_chat(user, "<span class='warning'>You need one metal sheet to finish the light tile!</span>")
-	else
-		return ..()
+		var/obj/item/stack/cable_coil/CC = new (user.loc)
+		CC.amount = 5
+		CC.add_fingerprint(user)
+		amount--
+		var/obj/item/stack/sheet/glass/G = new (user.loc)
+		G.add_fingerprint(user)
+		if(amount <= 0)
+			qdel(src)
+
+	else if(istype(O, /obj/item/stack/sheet/metal))
+		var/obj/item/stack/sheet/metal/M = O
+		if (M.use(1))
+			use(1)
+			var/obj/item/L = new /obj/item/stack/tile/light(user.loc)
+			to_chat(user, "<span class='notice'>You make a light tile.</span>")
+			L.add_fingerprint(user)
+		else
+			to_chat(user, "<span class='warning'>You need one metal sheet to finish the light tile!</span>")
+	else
+		return ..()

code/game/objects/items/stacks/sheets/mineral.dm

@@ -126,6 +126,7 @@ GLOBAL_LIST_INIT(diamond_recipes, list ( \
 	sheettype = "uranium"
 	materials = list(MAT_URANIUM=MINERAL_MATERIAL_AMOUNT)
 	novariants = TRUE
+	grind_results = list("uranium" = 20)
 
 GLOBAL_LIST_INIT(uranium_recipes, list ( \
 	new/datum/stack_recipe("uranium door", /obj/structure/mineral_door/uranium, 10, one_per_turf = 1, on_floor = 1), \
@@ -149,6 +150,7 @@ GLOBAL_LIST_INIT(uranium_recipes, list ( \
 	resistance_flags = FLAMMABLE
 	max_integrity = 100
 	materials = list(MAT_PLASMA=MINERAL_MATERIAL_AMOUNT)
+	grind_results = list("plasma" = 20)
 
 GLOBAL_LIST_INIT(plasma_recipes, list ( \
 	new/datum/stack_recipe("plasma door", /obj/structure/mineral_door/transparent/plasma, 10, one_per_turf = 1, on_floor = 1), \
@@ -182,6 +184,7 @@ GLOBAL_LIST_INIT(plasma_recipes, list ( \
 	singular_name = "gold bar"
 	sheettype = "gold"
 	materials = list(MAT_GOLD=MINERAL_MATERIAL_AMOUNT)
+	grind_results = list("gold" = 20)
 
 GLOBAL_LIST_INIT(gold_recipes, list ( \
 	new/datum/stack_recipe("golden door", /obj/structure/mineral_door/gold, 10, one_per_turf = 1, on_floor = 1), \
@@ -207,6 +210,7 @@ GLOBAL_LIST_INIT(gold_recipes, list ( \
 	singular_name = "silver bar"
 	sheettype = "silver"
 	materials = list(MAT_SILVER=MINERAL_MATERIAL_AMOUNT)
+	grind_results = list("silver" = 20)
 
 GLOBAL_LIST_INIT(silver_recipes, list ( \
 	new/datum/stack_recipe("silver door", /obj/structure/mineral_door/silver, 10, one_per_turf = 1, on_floor = 1), \
@@ -232,6 +236,7 @@ GLOBAL_LIST_INIT(silver_recipes, list ( \
 	sheettype = "clown"
 	materials = list(MAT_BANANIUM=MINERAL_MATERIAL_AMOUNT)
 	novariants = TRUE
+	grind_results = list("banana" = 20)
 
 GLOBAL_LIST_INIT(clown_recipes, list ( \
 	new/datum/stack_recipe("bananium tile", /obj/item/stack/tile/mineral/bananium, 1, 4, 20), \
@@ -302,6 +307,7 @@ GLOBAL_LIST_INIT(plastitanium_recipes, list ( \
 	singular_name = "snow block"
 	force = 1
 	throwforce = 2
+	grind_results = list("ice" = 20)
 
 GLOBAL_LIST_INIT(snow_recipes, list ( \
 	new/datum/stack_recipe("Snow Wall", /turf/closed/wall/mineral/snow, 5, one_per_turf = 1, on_floor = 1), \

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -99,6 +99,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
 	flags_1 = CONDUCT_1
 	resistance_flags = FIRE_PROOF
 	merge_type = /obj/item/stack/sheet/metal
+	grind_results = list("iron" = 20)
 
 /obj/item/stack/sheet/metal/ratvar_act()
 	new /obj/item/stack/tile/brass(loc, amount)
@@ -151,6 +152,7 @@ GLOBAL_LIST_INIT(plasteel_recipes, list ( \
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 80)
 	resistance_flags = FIRE_PROOF
 	merge_type = /obj/item/stack/sheet/plasteel
+	grind_results = list("iron" = 20, "plasma" = 20)
 
 /obj/item/stack/sheet/plasteel/Initialize(mapload, new_amount, merge = TRUE)
 	recipes = GLOB.plasteel_recipes
@@ -202,6 +204,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
 	resistance_flags = FLAMMABLE
 	merge_type = /obj/item/stack/sheet/mineral/wood
 	novariants = TRUE
+	grind_results = list("carbon" = 20)
 
 /obj/item/stack/sheet/mineral/wood/Initialize(mapload, new_amount, merge = TRUE)
 	recipes = GLOB.wood_recipes
@@ -322,6 +325,7 @@ GLOBAL_LIST_INIT(runed_metal_recipes, list ( \
 	sheettype = "runed"
 	merge_type = /obj/item/stack/sheet/runed_metal
 	novariants = TRUE
+	grind_results = list("iron" = 0.5, "blood" = 1.5)
 
 /obj/item/stack/sheet/runed_metal/ratvar_act()
 	new /obj/item/stack/tile/brass(loc, amount)
@@ -385,6 +389,7 @@ GLOBAL_LIST_INIT(brass_recipes, list ( \
 	throw_range = 3
 	turf_type = /turf/open/floor/clockwork
 	novariants = FALSE
+	grind_results = list("iron" = 0.5, "teslium" = 1.5)
 
 /obj/item/stack/tile/brass/narsie_act()
 	new /obj/item/stack/sheet/runed_metal(loc, amount)
@@ -435,6 +440,7 @@ GLOBAL_LIST_INIT(brass_recipes, list ( \
 	w_class = WEIGHT_CLASS_NORMAL
 	throw_speed = 1
 	throw_range = 3
+	grind_results = list("carbon" = 1)
 
 GLOBAL_LIST_INIT(plastic_recipes, list(
 	new /datum/stack_recipe("plastic flaps", /obj/structure/plasticflaps, 5, one_per_turf = TRUE, on_floor = TRUE, time = 40), \

code/game/objects/items/stacks/stack.dm

@@ -21,6 +21,17 @@
 	var/merge_type = null // This path and its children should merge with this stack, defaults to src.type
 	var/full_w_class = WEIGHT_CLASS_NORMAL //The weight class the stack should have at amount > 2/3rds max_amount
 	var/novariants = TRUE //Determines whether the item should update it's sprites based on amount.
+	//NOTE: When adding grind_results, the amounts should be for an INDIVIDUAL ITEM - these amounts will be multiplied by the stack size in on_grind()
+
+/obj/item/stack/on_grind()
+	for(var/i in 1 to grind_results.len) //This should only call if it's ground, so no need to check if grind_results exists
+		grind_results[grind_results[i]] *= amount //Gets the key at position i, then the reagent amount of that key, then multiplies it by stack size
+
+/obj/item/stack/grind_requirements()
+	if(is_cyborg)
+		to_chat(usr, "<span class='danger'>[src] is electronically synthesized in your chassis and can't be ground up!</span>")
+		return
+	return TRUE
 
 /obj/item/stack/Initialize(mapload, new_amount=null , merge = TRUE)
 	. = ..()

code/game/objects/items/tanks/watertank.dm

@@ -131,7 +131,7 @@
 	..()
 	to_chat(user, "<span class='notice'>The mister snaps back onto the watertank.</span>")
 	tank.on = 0
-	loc = tank
+	forceMove(tank)
 
 /obj/item/reagent_containers/spray/mister/attack_self()
 	return
@@ -236,13 +236,13 @@
 		tank = parent_tank
 		reagents = tank.reagents
 		max_water = tank.volume
-		loc = tank
+		forceMove(tank)
 
 
 /obj/item/extinguisher/mini/nozzle/Move()
 	..()
 	if(loc != tank.loc)
-		loc = tank
+		forceMove(tank)
 	return
 
 /obj/item/extinguisher/mini/nozzle/attack_self(mob/user)
@@ -268,7 +268,7 @@
 	..()
 	to_chat(user, "<span class='notice'>The nozzle snaps back onto the tank!</span>")
 	tank.on = 0
-	loc = tank
+	forceMove(tank)
 
 /obj/item/extinguisher/mini/nozzle/afterattack(atom/target, mob/user)
 	if(nozzle_mode == EXTINGUISHER)

code/game/objects/items/toys.dm

@@ -182,7 +182,7 @@
 	src.add_fingerprint(user)
 	if (src.bullets < 1)
 		user.show_message("<span class='warning'>*click*</span>", 2)
-		playsound(src, "gun_dry_fire", 50, 1)
+		playsound(src, "gun_dry_fire", 60, 1)
 		return
 	playsound(user, 'sound/weapons/gunshot.ogg', 100, 1)
 	src.bullets--

code/game/objects/items/trash.dm

@@ -66,6 +66,7 @@
 	name = "crushed can"
 	icon_state = "cola"
 	resistance_flags = NONE
+	grind_results = list("aluminum" = 10)
 
 /obj/item/trash/attack(mob/M, mob/living/user)
 	return
@@ -75,6 +76,7 @@
 	icon = 'icons/obj/mining.dmi'
 	icon_state = "slag"
 	desc = "Someone's gotten on the naughty list."
+	grind_results = list("carbon" = 20)
 
 /obj/item/trash/coal/burn()
 	visible_message("[src] fuses into a diamond! Someone wasn't so naughty after all...")

code/game/objects/items/twohanded.dm

@@ -429,6 +429,10 @@
 	var/obj/item/grenade/explosive = null
 	var/war_cry = "AAAAARGH!!!"
 
+/obj/item/twohanded/spear/Initialize()
+	. = ..()
+	AddComponent(/datum/component/jousting)
+
 /obj/item/twohanded/spear/examine(mob/user)
 	..()
 	if(explosive)
@@ -447,7 +451,7 @@
 		return
 	if(explosive && wielded)
 		user.say("[war_cry]")
-		explosive.loc = AM
+		explosive.forceMove(AM)
 		explosive.prime()
 		qdel(src)
 

code/game/objects/structures/artstuff.dm

@@ -20,7 +20,7 @@
 		var/obj/item/canvas/C = I
 		user.dropItemToGround(C)
 		painting = C
-		C.loc = get_turf(src)
+		C.forceMove(get_turf(src))
 		C.layer = layer+0.1
 		user.visible_message("<span class='notice'>[user] puts \the [C] on \the [src].</span>","<span class='notice'>You place \the [C] on \the [src].</span>")
 	else
@@ -32,7 +32,7 @@
 	var/turf/T = get_turf(src)
 	..()
 	if(painting && painting.loc == T) //Only move if it's near us.
-		painting.loc = get_turf(src)
+		painting.forceMove(get_turf(src))
 	else
 		painting = null
 

code/game/objects/structures/displaycase.dm

@@ -224,7 +224,7 @@
 			G.use(10)
 			var/obj/structure/displaycase/display = new(src.loc)
 			if(electronics)
-				electronics.loc = display
+				electronics.forceMove(display)
 				display.electronics = electronics
 				if(electronics.one_access)
 					display.req_one_access = electronics.accesses

code/game/objects/structures/electricchair.dm

@@ -15,7 +15,7 @@
 		var/obj/structure/chair/C = new /obj/structure/chair(loc)
 		playsound(loc, W.usesound, 50, 1)
 		C.setDir(dir)
-		part.loc = loc
+		part.forceMove(loc)
 		part.master = null
 		part = null
 		qdel(src)

code/game/objects/structures/kitchen_spike.dm

@@ -81,7 +81,7 @@
 				return
 			playsound(src.loc, 'sound/effects/splat.ogg', 25, 1)
 			L.visible_message("<span class='danger'>[user] slams [L] onto the meat spike!</span>", "<span class='userdanger'>[user] slams you onto the meat spike!</span>", "<span class='italics'>You hear a squishy wet noise.</span>")
-			L.loc = src.loc
+			L.forceMove(drop_location())
 			L.emote("scream")
 			L.add_splatter_floor()
 			L.adjustBruteLoss(30)

code/game/objects/structures/noticeboard.dm

@@ -18,7 +18,7 @@
 		if(notices > 4)
 			break
 		if(istype(I, /obj/item/paper))
-			I.loc = src
+			I.forceMove(src)
 			notices++
 	icon_state = "nboard0[notices]"
 
@@ -58,7 +58,7 @@
 			return
 		var/obj/item/I = locate(href_list["remove"]) in contents
 		if(istype(I) && I.loc == src)
-			I.loc = usr.loc
+			I.forceMove(usr.loc)
 			usr.put_in_hands(I)
 			notices--
 			icon_state = "nboard0[notices]"

code/game/objects/structures/tables_racks.dm

@@ -121,7 +121,7 @@
 			T.quick_empty()
 
 			for(var/obj/item/C in oldContents)
-				C.loc = src.loc
+				C.forceMove(drop_location())
 
 			user.visible_message("[user] empties [I] on [src].")
 			return

code/game/objects/structures/target_stake.dm

@@ -18,7 +18,7 @@
 /obj/structure/target_stake/Move()
 	..()
 	if(pinned_target)
-		pinned_target.loc = loc
+		pinned_target.forceMove(loc)
 
 /obj/structure/target_stake/attackby(obj/item/target/T, mob/user)
 	if(pinned_target)
@@ -36,7 +36,7 @@
 
 /obj/structure/target_stake/proc/removeTarget(mob/user)
 	pinned_target.layer = OBJ_LAYER
-	pinned_target.loc = user.loc
+	pinned_target.forceMove(user.loc)
 	pinned_target.nullPinnedLoc()
 	nullPinnedTarget()
 	if(ishuman(user))
@@ -44,7 +44,7 @@
 			user.put_in_hands(pinned_target)
 			to_chat(user, "<span class='notice'>You take the target out of the stake.</span>")
 	else
-		pinned_target.loc = get_turf(user)
+		pinned_target.forceMove(user.drop_location())
 		to_chat(user, "<span class='notice'>You take the target out of the stake.</span>")
 
 /obj/structure/target_stake/bullet_act(obj/item/projectile/P)

code/game/objects/structures/windoor_assembly.dm

@@ -216,13 +216,13 @@
 
 				if(do_after(user, 40, target = src))
 					if(!src || electronics)
-						W.loc = src.loc
+						W.forceMove(drop_location())
 						return
 					to_chat(user, "<span class='notice'>You install the airlock electronics.</span>")
 					name = "near finished windoor assembly"
 					electronics = W
 				else
-					W.loc = loc
+					W.forceMove(drop_location())
 
 			//Screwdriver to remove airlock electronics. Step 6 undone.
 			else if(istype(W, /obj/item/screwdriver))
@@ -240,7 +240,7 @@
 					var/obj/item/electronics/airlock/ae
 					ae = electronics
 					electronics = null
-					ae.loc = loc
+					ae.forceMove(drop_location())
 
 			else if(istype(W, /obj/item/pen))
 				var/t = stripped_input(user, "Enter the name for the door.", name, created_name,MAX_NAME_LEN)
@@ -285,7 +285,7 @@
 							else
 								windoor.req_access = electronics.accesses
 							windoor.electronics = electronics
-							electronics.loc = windoor
+							electronics.forceMove(windoor)
 							if(created_name)
 								windoor.name = created_name
 							qdel(src)

code/game/objects/structures/window.dm

@@ -283,11 +283,10 @@
 		return
 	if(!disassembled)
 		playsound(src, breaksound, 70, 1)
-		var/turf/T = loc
 		if(!(flags_1 & NODECONSTRUCT_1))
 			for(var/i in debris)
 				var/obj/item/I = i
-				I.loc = T
+				I.forceMove(drop_location())
 				transfer_fingerprints_to(I)
 	qdel(src)
 	update_nearby_icons()

code/game/sound.dm

@@ -182,7 +182,15 @@
 			if("bullet_miss")
 				soundin = pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg')
 			if("gun_dry_fire")
-				soundin = pick('sound/weapons/dry_fire_1.ogg', 'sound/weapons/dry_fire_2.ogg', 'sound/weapons/dry_fire_3.ogg', 'sound/weapons/dry_fire_4.ogg')
+				soundin = pick('sound/weapons/gun_dry_fire_1.ogg', 'sound/weapons/gun_dry_fire_2.ogg', 'sound/weapons/gun_dry_fire_3.ogg', 'sound/weapons/gun_dry_fire_4.ogg')
+			if("gun_insert_empty_magazine")
+				soundin = pick('sound/weapons/gun_magazine_insert_empty_1.ogg', 'sound/weapons/gun_magazine_insert_empty_2.ogg', 'sound/weapons/gun_magazine_insert_empty_3.ogg', 'sound/weapons/gun_magazine_insert_empty_4.ogg')
+			if("gun_insert_full_magazine")
+				soundin = pick('sound/weapons/gun_magazine_insert_full_1.ogg', 'sound/weapons/gun_magazine_insert_full_2.ogg', 'sound/weapons/gun_magazine_insert_full_3.ogg', 'sound/weapons/gun_magazine_insert_full_4.ogg', 'sound/weapons/gun_magazine_insert_full_5.ogg')
+			if("gun_remove_empty_magazine")
+				soundin = pick('sound/weapons/gun_magazine_remove_empty_1.ogg', 'sound/weapons/gun_magazine_remove_empty_2.ogg', 'sound/weapons/gun_magazine_remove_empty_3.ogg', 'sound/weapons/gun_magazine_remove_empty_4.ogg')
+			if("gun_slide_lock")
+				soundin = pick('sound/weapons/gun_slide_lock_1.ogg', 'sound/weapons/gun_slide_lock_2.ogg', 'sound/weapons/gun_slide_lock_3.ogg', 'sound/weapons/gun_slide_lock_4.ogg', 'sound/weapons/gun_slide_lock_5.ogg')		
 			if("law")
 				soundin = pick('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/binsult.ogg', 'sound/voice/bcreep.ogg')
 			if("honkbot_e")

code/game/turfs/space/space.dm

@@ -141,7 +141,7 @@
 			var/mob/living/L = A
 			if(L.pulling)
 				var/turf/T = get_step(L.loc,turn(A.dir, 180))
-				L.pulling.loc = T
+				L.pulling.forceMove(T)
 
 		//now we're on the new z_level, proceed the space drifting
 		stoplag()//Let a diagonal move finish, if necessary
@@ -202,4 +202,3 @@
 	destination_x = dest_x
 	destination_y = dest_y
 	destination_z = dest_z
-