Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into DWI

code/datums/cargoprofile.dm

@@ -643,9 +643,7 @@
 			//this is necessarily damaging
 			var/damage = rand(1,5)
 			to_chat(M, "<span class='danger'>The unloading machine grabs you with a hard metallic claw!</span>")
-			if(M.client)
-				M.client.eye = master
-				M.client.perspective = EYE_PERSPECTIVE
+			M.reset_perspective(master)
 			M.loc = master
 			master.types[M.type] = src
 			M.apply_damage(damage) // todo: ugly
@@ -699,10 +697,7 @@
 			//this is necessarily damaging
 			var/damage = rand(1,5)
 			to_chat(M, "<span class='danger'>The unloading machine grabs you with a hard metallic claw!</span>")
-			if(M.client)
-				M.client.eye = master
-				M.client.perspective = EYE_PERSPECTIVE
-			M.loc = master
+			M.forceMove(master)
 			master.types[M.type] = src
 			M.apply_damage(damage) // todo: ugly
 			M.visible_message("\red [M.name] gets pulled into the machine!")
@@ -710,11 +705,8 @@
 
 	outlet_reaction(var/atom/W,var/turf/D)
 		var/mob/living/M = W
-		M.loc = master.loc
+		M.forceMove(master.loc)
 		M.dir = master.outdir
-		if(M.client)
-			M.client.eye = M.client.mob
-			M.client.perspective = MOB_PERSPECTIVE
 
 		D = get_step(D,master.outdir) // throw attempt
 		eject_speed = rand(0,4)
@@ -796,4 +788,4 @@
 		var/punches = punch(M,remaining / PUNCH_WORK)
 		if(punches>1)master.sleep++
 		return punches * PUNCH_WORK
-#undef MAXCOIL
+#undef MAXCOIL

code/datums/datumvars.dm

@@ -1028,7 +1028,7 @@ body
 			to_chat(usr, "Mob doesn't exist anymore")
 			return
 
-		if(!(locateUID(rem_organ) in M.internal_organs))
+		if(!(rem_organ in M.internal_organs))
 			to_chat(usr, "Mob does not have that organ.")
 			return
 

code/datums/spell.dm

@@ -64,7 +64,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
 		var/mob/living/carbon/human/caster = user
 		if(caster.remoteview_target)
 			caster.remoteview_target = null
-			caster.reset_view(0)
+			caster.reset_perspective(0)
 			return 0
 
 	if(is_admin_level(user.z) && (!centcom_cancast || ticker.mode.name == "ragin' mages")) //Certain spells are not allowed on the centcom zlevel

code/datums/uplink_item.dm

@@ -207,6 +207,7 @@ var/list/uplink_items = list()
 	item = /obj/item/weapon/caution/proximity_sign
 	cost = 4
 	job = list("Janitor")
+	surplus = 0
 
 //Medical