Merge remote-tracking branch 'upstream/master' into attack-animation-improvements

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -198,7 +198,7 @@
 	modules += new /obj/item/multitool/cyborg(src)
 	modules += new /obj/item/t_scanner(src)
 	modules += new /obj/item/analyzer(src)
-	modules += new /obj/item/taperoll/engineering(src)
+	modules += new /obj/item/holosign_creator/engineering(src)
 	modules += new /obj/item/gripper(src)
 	modules += new /obj/item/matter_decompiler(src)
 	modules += new /obj/item/floor_painter(src)
@@ -222,7 +222,7 @@
 	modules += new /obj/item/restraints/handcuffs/cable/zipties/cyborg(src)
 	modules += new /obj/item/melee/baton/loaded(src)
 	modules += new /obj/item/gun/energy/disabler/cyborg(src)
-	modules += new /obj/item/taperoll/police(src)
+	modules += new /obj/item/holosign_creator/security(src)
 	modules += new /obj/item/clothing/mask/gas/sechailer/cyborg(src)
 	emag = new /obj/item/gun/energy/laser/cyborg(src)
 

code/modules/mob/living/simple_animal/bot/construction.dm

@@ -30,9 +30,10 @@
 		var/t = stripped_input(user, "Enter new robot name", name, created_name,MAX_NAME_LEN)
 		if(!t)
 			return
-		if(!in_range(src, usr) && loc != usr)
+		if(!in_range(src, user) && loc != user)
 			return
 		created_name = t
+		log_game("[key_name(user)] has renamed a robot to [t]")
 
 //Edbot Assembly
 
@@ -53,9 +54,10 @@
 		var/t = stripped_input(user, "Enter new robot name", name, created_name,MAX_NAME_LEN)
 		if(!t)
 			return
-		if(!in_range(src, usr) && loc != usr)
+		if(!in_range(src, user) && loc != user)
 			return
 		created_name = t
+		log_game("[key_name(user)] has renamed a robot to [t]")
 		return
 
 	switch(build_step)
@@ -253,10 +255,11 @@
 		var/t = stripped_input(user, "Enter new robot name", name, created_name,MAX_NAME_LEN)
 		if(!t)
 			return
-		if(!in_range(src, usr) && loc != usr)
+		if(!in_range(src, user) && loc != user)
 			return
 
 		created_name = t
+		log_game("[key_name(user)] has renamed a robot to [t]")
 
 /obj/item/toolbox_tiles_sensor/attackby(obj/item/W, mob/user, params)
 	..()
@@ -272,10 +275,11 @@
 		var/t = stripped_input(user, "Enter new robot name", name, created_name,MAX_NAME_LEN)
 		if(!t)
 			return
-		if(!in_range(src, usr) && loc != usr)
+		if(!in_range(src, user) && loc != user)
 			return
 
 		created_name = t
+		log_game("[key_name(user)] has renamed a robot to [t]")
 
 //Medbot Assembly
 /obj/item/firstaid_arm_assembly
@@ -347,9 +351,10 @@
 		var/t = stripped_input(user, "Enter new robot name", name, created_name,MAX_NAME_LEN)
 		if(!t)
 			return
-		if(!in_range(src, usr) && loc != usr)
+		if(!in_range(src, user) && loc != user)
 			return
 		created_name = t
+		log_game("[key_name(user)] has renamed a robot to [t]")
 	else
 		switch(build_step)
 			if(0)
@@ -457,9 +462,10 @@
 		var/t = stripped_input(user, "Enter new robot name", name, created_name,MAX_NAME_LEN)
 		if(!t)
 			return
-		if(!in_range(src, usr) && loc != usr)
+		if(!in_range(src, user) && loc != user)
 			return
 		created_name = t
+		log_game("[key_name(user)] has renamed a robot to [t]")
 
 	else if(istype(I, /obj/item/screwdriver))
 		if(!build_step)

code/modules/mob/mob.dm

@@ -170,6 +170,16 @@
 	return 0
 
 /mob/proc/Life(seconds, times_fired)
+	if(forced_look)
+		if(!isnum(forced_look))
+			var/atom/A = locateUID(forced_look)
+			if(istype(A))
+				var/view = client ? client.view : world.view
+				if(get_dist(src, A) > view || !(src in viewers(view, A)))
+					forced_look = null
+					to_chat(src, "<span class='notice'>Your direction target has left your view, you are no longer facing anything.</span>")
+					return
+		setDir()
 //	handle_typing_indicator()
 	return
 
@@ -533,6 +543,17 @@ var/list/slot_equipment_priority = list( \
 			client.screen = list()
 			hud_used.show_hud(hud_used.hud_version)
 
+/mob/setDir(new_dir)	
+	if(forced_look)
+		if(isnum(forced_look))
+			dir = forced_look
+		else 
+			var/atom/A = locateUID(forced_look)
+			if(istype(A))
+				dir = get_cardinal_dir(src, A)
+		return
+	. = ..()
+
 /mob/proc/show_inv(mob/user)
 	user.set_machine(src)
 	var/dat = {"<table>
@@ -1308,4 +1329,4 @@ var/list/slot_equipment_priority = list( \
 			if(WEST)
 				D = NORTH
 		setDir(D)
-		spintime -= speed
+		spintime -= speed

code/modules/mob/mob_defines.dm

@@ -198,3 +198,5 @@
 	var/list/progressbars = null	//for stacking do_after bars
 
 	var/list/tkgrabbed_objects = list() // Assoc list of items to TK grabs
+
+	var/forced_look = null // This can either be a numerical direction or a soft object reference (UID). It makes the mob always face towards the selected thing.

code/modules/mob/mob_movement.dm

@@ -268,6 +268,8 @@
 	else
 		. = ..()
 
+	mob.setDir(direct)
+
 	for(var/obj/item/grab/G in mob)
 		if(G.state == GRAB_NECK)
 			mob.setDir(reverse_dir[direct])