From 55f0ac34da7fdd1a45cb8c0d2afd59733b176f78 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Mon, 16 Apr 2018 14:24:00 -0300 Subject: [PATCH 1/4] Fixes branded robotic torsos (#4624) Corrects the wrong linked_frame vars. --- code/game/objects/items/robot/robot_parts.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index b92c55f5a58..9d59022c403 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/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" From ad1833815cf766256b42a15cc9d375fb03a06402 Mon Sep 17 00:00:00 2001 From: Werner Date: Mon, 16 Apr 2018 22:01:03 +0200 Subject: [PATCH 2/4] Adds a SQL migration to fix a oversight (#4623) Adds a SQL migration to allow the path_old and suppliers_old in the cargo_items table to be nulled. Sets their default to null aswell --- SQL/migrate/V022__cargo_schemafix.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 SQL/migrate/V022__cargo_schemafix.sql diff --git a/SQL/migrate/V022__cargo_schemafix.sql b/SQL/migrate/V022__cargo_schemafix.sql new file mode 100644 index 00000000000..9d508c23445 --- /dev/null +++ b/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`; + From a6410d75ade9185704a2e59f5a606d1b0b18d2c6 Mon Sep 17 00:00:00 2001 From: Erki Date: Tue, 17 Apr 2018 23:02:34 +0300 Subject: [PATCH 3/4] Fixes timer spam from proximity_callback (#4635) --- code/game/turfs/turf.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index ffbdbba0e2d..930416470c8 100644 --- a/code/game/turfs/turf.dm +++ b/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) From 32b47e409ffa33c6e8125340fd490b947b6bfd6b Mon Sep 17 00:00:00 2001 From: Erki Date: Wed, 18 Apr 2018 00:19:47 +0300 Subject: [PATCH 4/4] Fixes tickets not logging (#4636) Since tickets can't ever be reopened, this is fine. Also more data-proof. --- code/controllers/subsystems/statistics.dm | 2 -- code/modules/admin/ticket.dm | 8 ++------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/code/controllers/subsystems/statistics.dm b/code/controllers/subsystems/statistics.dm index e762e341e97..f1ac077d968 100644 --- a/code/controllers/subsystems/statistics.dm +++ b/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, "'", "''") diff --git a/code/modules/admin/ticket.dm b/code/modules/admin/ticket.dm index 23e58195552..17dee02e3de 100644 --- a/code/modules/admin/ticket.dm +++ b/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