fix mounted guns and a message typo

tgstation · Jun 30, 2024 · d3f7271 · d3f7271
1 parent 370e548
commit d3f7271
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/code/modules/projectiles/gun_system.dm b/code/modules/projectiles/gun_system.dm
@@ -723,6 +723,8 @@
 		if(gun_user.get_active_held_item() == src)
 			active_attachable?.start_fire(source, object, location, control, params, bypass_checks)
 			return
+		if(gun_user.get_inactive_held_item() != src)
+			return
 		if(gun_user.Adjacent(object))
 			return
 		bypass_checks = TRUE

diff --git a/code/modules/projectiles/mounted.dm b/code/modules/projectiles/mounted.dm
@@ -277,7 +277,7 @@
 	setDir(angle)
 	user.set_interaction(src)
 	playsound(loc, 'sound/items/ratchet.ogg', 25, 1)
-	operator.visible_message("[operator] rotates the [src].","You rotate the [src].")
+	operator.visible_message("[operator] rotates the [src].","You rotate [src].")
 	update_pixels(user, TRUE)
 
 	if(current_scope?.deployed_scope_rezoom)