de-shittifies the sniper and dualtube

cmss13-devs · Jul 26, 2023 · 9e241b9 · 9e241b9
1 parent d4a5545
commit 9e241b9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/code/modules/projectiles/guns/shotguns.dm b/code/modules/projectiles/guns/shotguns.dm
@@ -1221,7 +1221,12 @@ can cause issues with ammo types getting mixed up during the burst.
 	playsound(src, 'sound/machines/switch.ogg', 15, TRUE)
 	return TRUE
 
-/obj/item/weapon/gun/shotgun/pump/dual_tube/set_bursting()
+/obj/item/weapon/gun/shotgun/pump/dual_tube/verb/toggle_tube()
+	set category = "Weapons"
+	set name = "Toggle Shotgun Tube"
+	set desc = "Toggles which shotgun tube your gun loads from."
+	set src = usr.contents
+
 	var/obj/item/weapon/gun/shotgun/pump/dual_tube/shotgun = get_active_firearm(usr)
 	if(shotgun == src)
 		swap_tube(usr)

diff --git a/code/modules/projectiles/guns/specialist.dm b/code/modules/projectiles/guns/specialist.dm
@@ -267,11 +267,15 @@
 	if(toggling_action)
 		toggling_action.update_button_icon()
 
-/obj/item/weapon/gun/rifle/sniper/set_bursting(mob/user)
-	if(has_aimed_shot)
+/obj/item/weapon/gun/rifle/sniper/verb/toggle_laser()
+	set category = "Weapons"
+	set name = "Toggle Laser"
+	set desc = "Toggles your laser on or off."
+	set src = usr.contents
+
+	var/obj/item/weapon/gun/rifle/sniper/sniper = get_active_firearm(usr)
+	if((sniper == src) && has_aimed_shot)
 		toggle_laser(user)
-	else
-		..()
 
 //Pow! Headshot.
 /obj/item/weapon/gun/rifle/sniper/M42A