issue with button cleanup..

shiptest-ss13 · Jun 23, 2024 · 96e1285 · 96e1285
1 parent fe272e4
commit 96e1285
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -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)