Merge resolution, master into dev.

code/WorkInProgress/Wrongnumber/weldbackpack.dm

@@ -34,13 +34,15 @@
 	user << "\blue The tank scoffs at your insolence.  It only provides services to welders."
 	return
 
-/obj/item/weapon/weldpack/afterattack(obj/O as obj, mob/user as mob)
-	if (istype(O, /obj/structure/reagent_dispensers/fueltank) && get_dist(src,O) <= 1 && src.reagents.total_volume < max_fuel)
+/obj/item/weapon/weldpack/afterattack(obj/O as obj, mob/user as mob, proximity)
+	if(!proximity) // this replaces and improves the get_dist(src,O) <= 1 checks used previously
+		return
+	if (istype(O, /obj/structure/reagent_dispensers/fueltank) && src.reagents.total_volume < max_fuel)
 		O.reagents.trans_to(src, max_fuel)
 		user << "\blue You crack the cap off the top of the pack and fill it back up again from the tank."
 		playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6)
 		return
-	else if (istype(O, /obj/structure/reagent_dispensers/fueltank) && get_dist(src,O) <= 1 && src.reagents.total_volume == max_fuel)
+	else if (istype(O, /obj/structure/reagent_dispensers/fueltank) && src.reagents.total_volume == max_fuel)
 		user << "\blue The pack is already full!"
 		return
 

code/WorkInProgress/computer3/computers/crew.dm

@@ -47,7 +47,7 @@
 							log += "<td width='20%'>[life_status] [damage_report]</td><td width='40%'>Not Available</td></tr>"
 						if(3)
 							var/area/player_area = get_area(H)
-							log += "<td width='20%'>[life_status] [damage_report]</td><td width='40%'>[player_area.name] ([pos.x], [pos.y])</td></tr>"
+							log += "<td width='20%'>[life_status] [damage_report]</td><td width='40%'>[sanitize(player_area.name)] ([pos.x], [pos.y])</td></tr>"
 			logs += log
 		logs = sortList(logs)
 		for(var/log in logs)
@@ -75,4 +75,4 @@
 		if(href_list["update"])
 			interact()
 			//src.updateUsrDialog()
-			return
+			return

code/WorkInProgress/computer3/laptop.dm

@@ -55,15 +55,20 @@
 				del src
 			return
 
+		if(!stored_computer.manipulating)
+			stored_computer.manipulating = 1
+			stored_computer.loc = loc
+			stored_computer.stat &= ~MAINT
+			stored_computer.update_icon()
+			loc = null
+			usr << "You open \the [src]."
 
-		stored_computer.loc = loc
-		stored_computer.stat &= ~MAINT
-		stored_computer.update_icon()
-		loc = null
-		usr << "You open \the [src]."
+			spawn(5)
+				stored_computer.manipulating = 0
+				del src
+		else
+			usr << "\red You are already opening the computer!"
 
-		spawn(5)
-			del src
 
 	AltClick()
 		if(Adjacent(usr))
@@ -112,6 +117,7 @@
 	pixel_y			= -3
 	show_keyboard	= 0
 
+	var/manipulating = 0 // To prevent disappearing bug
 	var/obj/item/device/laptop/portable = null
 
 	New(var/L, var/built = 0)
@@ -147,10 +153,11 @@
 			portable=new
 			portable.stored_computer = src
 
-		portable.loc = loc
-		loc = portable
-		stat |= MAINT
-		usr << "You close \the [src]."
+		if(!manipulating)
+			portable.loc = loc
+			loc = portable
+			stat |= MAINT
+			usr << "You close \the [src]."
 
 	auto_use_power()
 		if(stat&MAINT)