From 96e1285686b7d959bf2c820df4186d7d0adb81e8 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Sun, 23 Jun 2024 16:59:31 -0500 Subject: [PATCH] issue with button cleanup.. --- code/datums/action.dm | 7 ++++--- code/modules/projectiles/guns/ballistic/smg.dm | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/code/datums/action.dm b/code/datums/action.dm index de13fc002dde..cdca8729984f 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -86,9 +86,10 @@ if(owner) UnregisterSignal(owner, COMSIG_PARENT_QDELETING) owner = null - button.moved = FALSE //so the button appears in its normal position when given to another owner. - button.locked = FALSE - button.id = null + if(button) + button.moved = FALSE //so the button appears in its normal position when given to another owner. + button.locked = FALSE + button.id = null /datum/action/proc/Trigger() if(!IsAvailable()) diff --git a/code/modules/projectiles/guns/ballistic/smg.dm b/code/modules/projectiles/guns/ballistic/smg.dm index 0f8b90718a18..4b19c98729ff 100644 --- a/code/modules/projectiles/guns/ballistic/smg.dm +++ b/code/modules/projectiles/guns/ballistic/smg.dm @@ -315,7 +315,7 @@ EMPTY_GUN_HELPER(automatic/smg/cm5) ) ) - //default_attachments = list(/obj/item/attachment/foldable_stock) + default_attachments = list(/obj/item/attachment/foldable_stock) /obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq name = "\improper SKM-44v Mongrel" @@ -349,4 +349,4 @@ EMPTY_GUN_HELPER(automatic/smg/cm5) /obj/item/attachment/foldable_stock/inteq ) - //default_attachments = list(/obj/item/attachment/foldable_stock/inteq) + default_attachments = list(/obj/item/attachment/foldable_stock/inteq)