Merge remote-tracking branch 'citadel/master' into combat_v7

code/_onclick/cyborg.dm

@@ -169,5 +169,9 @@
 	A.attack_robot(src)
 
 /atom/proc/attack_robot(mob/user)
+	if((isturf(src) || istype(src, /obj/structure/table) || istype(src, /obj/machinery/conveyor)) && get_dist(user, src) <= 1)
+		user.Move_Pulled(src)
+		return
+
 	attack_ai(user)
 	return

code/_onclick/hud/screen_objects.dm

@@ -361,7 +361,7 @@
 /obj/screen/mov_intent/update_icon_state()
 	switch(hud?.mymob?.m_intent)
 		if(MOVE_INTENT_WALK)
-			icon_state = "walking"
+			icon_state = CONFIG_GET(flag/sprint_enabled)? "walking" : "walking_nosprint"
 		if(MOVE_INTENT_RUN)
 			icon_state = CONFIG_GET(flag/sprint_enabled)? "running" : "running_nosprint"
 

code/_onclick/hud/screen_objects/storage.dm

@@ -85,21 +85,16 @@
 	makeItemInactive()
 
 /obj/screen/storage/volumetric_box/proc/makeItemInactive()
-	if(!our_item)
-		return
-	our_item.layer = VOLUMETRIC_STORAGE_ITEM_LAYER
-	our_item.plane = VOLUMETRIC_STORAGE_ITEM_PLANE
+	return
 
 /obj/screen/storage/volumetric_box/proc/makeItemActive()
-	if(!our_item)
-		return
-	our_item.layer = VOLUMETRIC_STORAGE_ACTIVE_ITEM_LAYER		//make sure we display infront of the others!
-	our_item.plane = VOLUMETRIC_STORAGE_ACTIVE_ITEM_PLANE
+	return
 
 /obj/screen/storage/volumetric_box/center
 	icon_state = "stored_continue"
 	var/obj/screen/storage/volumetric_edge/stored_left/left
 	var/obj/screen/storage/volumetric_edge/stored_right/right
+	var/obj/screen/storage/item_holder/holder
 	var/pixel_size
 
 /obj/screen/storage/volumetric_box/center/Initialize(mapload, new_master, our_item)
@@ -110,6 +105,9 @@
 /obj/screen/storage/volumetric_box/center/Destroy()
 	QDEL_NULL(left)
 	QDEL_NULL(right)
+	vis_contents.Cut()
+	if(holder)
+		QDEL_NULL(holder)
 	return ..()
 
 /obj/screen/storage/volumetric_box/center/proc/on_screen_objects()
@@ -123,13 +121,36 @@
 		return
 	pixel_size = pixels
 	cut_overlays()
+	vis_contents.Cut()
 	//our icon size is 32 pixels.
-	transform = matrix((pixels - (VOLUMETRIC_STORAGE_BOX_BORDER_SIZE * 2)) / VOLUMETRIC_STORAGE_BOX_ICON_SIZE, 0, 0, 0, 1, 0)
+	var/multiplier = (pixels - (VOLUMETRIC_STORAGE_BOX_BORDER_SIZE * 2)) / VOLUMETRIC_STORAGE_BOX_ICON_SIZE
+	transform = matrix(multiplier, 0, 0, 0, 1, 0)
+	if(our_item)
+		if(holder)
+			qdel(holder)
+		holder = new(null, src, our_item)
+		holder.transform = matrix(1 / multiplier, 0, 0, 0, 1, 0)
+		holder.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+		holder.appearance_flags &= ~RESET_TRANSFORM
+		makeItemInactive()
+	vis_contents += holder
 	left.pixel_x = -((pixels - VOLUMETRIC_STORAGE_BOX_ICON_SIZE) * 0.5) - VOLUMETRIC_STORAGE_BOX_BORDER_SIZE
 	right.pixel_x = ((pixels - VOLUMETRIC_STORAGE_BOX_ICON_SIZE) * 0.5) + VOLUMETRIC_STORAGE_BOX_BORDER_SIZE
 	add_overlay(left)
 	add_overlay(right)
 
+/obj/screen/storage/volumetric_box/center/makeItemInactive()
+	if(!holder)
+		return
+	holder.layer = VOLUMETRIC_STORAGE_ITEM_LAYER
+	holder.plane = VOLUMETRIC_STORAGE_ITEM_PLANE
+
+/obj/screen/storage/volumetric_box/center/makeItemActive()
+	if(!holder)
+		return
+	holder.our_item.layer = VOLUMETRIC_STORAGE_ACTIVE_ITEM_LAYER		//make sure we display infront of the others!
+	holder.our_item.plane = VOLUMETRIC_STORAGE_ACTIVE_ITEM_PLANE
+
 /obj/screen/storage/volumetric_edge
 	layer = VOLUMETRIC_STORAGE_BOX_LAYER
 	plane = VOLUMETRIC_STORAGE_BOX_PLANE
@@ -157,3 +178,20 @@
 /obj/screen/storage/volumetric_edge/stored_right
 	icon_state = "stored_end"
 	appearance_flags = APPEARANCE_UI | KEEP_APART | RESET_TRANSFORM
+
+/obj/screen/storage/item_holder
+	var/obj/item/our_item
+	vis_flags = NONE
+
+/obj/screen/storage/item_holder/Initialize(mapload, new_master, obj/item/I)
+	. = ..()
+	our_item = I
+	vis_contents += I
+
+/obj/screen/storage/item_holder/Destroy()
+	vis_contents.Cut()
+	our_item = null
+	return ..()
+
+/obj/screen/storage/item_holder/Click(location, control, params)
+	return our_item.Click(location, control, params)

code/_onclick/item_attack.dm

@@ -94,8 +94,7 @@
 	else if(hitsound)
 		playsound(loc, hitsound, get_clamped_volume(), 1, -1)
 
-	M.lastattacker = user.real_name
-	M.lastattackerckey = user.ckey
+	M.set_last_attacker(user)
 
 	if(force && M == user && user.client)
 		user.client.give_award(/datum/award/achievement/misc/selfouch, user)