Merge branch 'master' into development

SQL/migrate/V022__cargo_schemafix.sql

@@ -0,0 +1,7 @@
+--
+-- Allow null in path_old and set the default to null for suppliers_old and path_old
+--
+ALTER TABLE `ss13_cargo_items`
+	CHANGE COLUMN `suppliers_old` `suppliers_old` TEXT NULL DEFAULT NULL COMMENT 'JSON list of suppliers' AFTER `deleted_at`,
+	CHANGE COLUMN `path_old` `path_old` VARCHAR(150) NULL DEFAULT NULL AFTER `suppliers_old`;
+

code/controllers/subsystems/statistics.dm

@@ -167,8 +167,6 @@
 		var/DBQuery/query_insert = dbcon.NewQuery(sql)
 		query_insert.Execute()
 
-	log_all_tickets()
-
 // Sanitize inputs to avoid SQL injection attacks
 /proc/sql_sanitize_text(var/text)
 	text = replacetext(text, "'", "''")

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

@@ -364,7 +364,7 @@
 
 /obj/item/robot_parts/chest/synthskin
 	name = "Human synthskin torso"
-	linked_frame = "Hephaestus G1 Industrial Frame"
+	linked_frame = "Shell Frame"
 
 /obj/item/robot_parts/chest/xion
 	name = "Xion manufacturing group torso"
@@ -376,4 +376,4 @@
 
 /obj/item/robot_parts/chest/industrial
 	name = "Hephaestus industrial torso"
-	linked_frame = "Bishop Accessory Frame"
+	linked_frame = "Hephaestus G1 Industrial Frame"

code/game/turfs/turf.dm

@@ -207,9 +207,11 @@ var/const/enterloopsanity = 100
 			objects++
 
 			if (oAM.simulated)
-				addtimer(CALLBACK(AM, /atom/movable/.proc/proximity_callback, oAM), 0)
+				AM.proximity_callback(oAM)
 
 /atom/movable/proc/proximity_callback(atom/movable/AM)
+	set waitfor = FALSE
+	sleep(0)
 	HasProximity(AM, TRUE)
 	if (!QDELETED(AM) && !QDELETED(src) && (AM.flags & PROXMOVE))
 		AM.HasProximity(src, TRUE)

code/modules/admin/ticket.dm

@@ -57,6 +57,8 @@ var/global/list/ticket_panels = list()
 	if (reminder_timer)
 		deltimer(reminder_timer)
 
+	log_to_db()
+
 	return 1
 
 /datum/ticket/proc/take(var/client/assigned_admin)
@@ -144,12 +146,6 @@ var/global/list/ticket_panels = list()
 
 	update_ticket_panels()
 
-// Referenced in the statistics controller.
-/proc/log_all_tickets()
-	for (var/t in tickets)
-		var/datum/ticket/T = t
-		T.log_to_db()
-
 /datum/ticket_msg
 	var/msg_from
 	var/msg_to