From 1bb35a43efd7b7e39a855e5e42fd602edada8f2c Mon Sep 17 00:00:00 2001 From: Mark van Alphen Date: Tue, 23 Apr 2019 15:13:33 +0200 Subject: [PATCH 1/2] SQL fix --- code/modules/client/preference/preferences_mysql.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/client/preference/preferences_mysql.dm b/code/modules/client/preference/preferences_mysql.dm index 3483a4c77d3..731bf06496e 100644 --- a/code/modules/client/preference/preferences_mysql.dm +++ b/code/modules/client/preference/preferences_mysql.dm @@ -18,7 +18,7 @@ ghost_anonsay, exp, clientfps, - atklog, + atklog FROM [format_table_name("player")] WHERE ckey='[C.ckey]'"} ) From 429dd20ded7791a5eab2784773d87d2b34fb8eb4 Mon Sep 17 00:00:00 2001 From: Mark van Alphen Date: Tue, 23 Apr 2019 20:08:04 +0200 Subject: [PATCH 2/2] Button plane fix --- code/datums/action.dm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/datums/action.dm b/code/datums/action.dm index d316bd29b41..08c92a37bad 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -107,6 +107,7 @@ /datum/action/item_action check_flags = AB_CHECK_RESTRAINED|AB_CHECK_STUNNED|AB_CHECK_LYING|AB_CHECK_CONSCIOUS var/use_itemicon = TRUE + /datum/action/item_action/New(Target, custom_icon, custom_icon_state) ..() var/obj/item/I = target @@ -136,9 +137,10 @@ var/obj/item/I = target var/old_layer = I.layer var/old_plane = I.plane - I.layer = HUD_LAYER_SCREEN + 1 - I.plane = HUD_PLANE - current_button.overlays += I + I.layer = FLOAT_LAYER //AAAH + I.plane = FLOAT_PLANE //^ what that guy said + current_button.cut_overlays() + current_button.add_overlay(I) I.layer = old_layer I.plane = old_plane else