diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 3051265a911..b797c2bbe85 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -109,20 +109,20 @@
 	icon_action_button = "action_blank"
 	action_button_name = "Wield rifle"
 
-	can_wield()
-		return 1
-
-	ui_action_click()
-		if(src in usr)
-			toggle_wield(usr)
-
-	verb/wield_rifle()
-		set name = "Wield rifle"
-		set category = "Object"
-		set src in usr
+/obj/item/weapon/gun/projectile/automatic/rifle/can_wield()
+	return 1
 
+/obj/item/weapon/gun/projectile/automatic/rifle/ui_action_click()
+	if(src in usr)
 		toggle_wield(usr)
 
+/obj/item/weapon/gun/projectile/automatic/rifle/verb/wield_rifle()
+	set name = "Wield rifle"
+	set category = "Object"
+	set src in usr
+
+	toggle_wield(usr)
+
 /obj/item/weapon/gun/projectile/automatic/rifle/sts35
 	name = "\improper STS-35 automatic rifle"
 	desc = "A durable, rugged looking automatic weapon of a make popular on the frontier worlds. Uses 7.62mm rounds. It is unmarked."
@@ -263,4 +263,4 @@
 	if(!cover_open)
 		user << "<span class='warning'>You need to open the cover to unload [src].</span>"
 		return
-	..()
\ No newline at end of file
+	..()