diff --git a/code/modules/projectiles/gun_system.dm b/code/modules/projectiles/gun_system.dm index e115b4717e0..29f309cfbb3 100644 --- a/code/modules/projectiles/gun_system.dm +++ b/code/modules/projectiles/gun_system.dm @@ -700,8 +700,14 @@ if(modifiers["right"]) modifiers -= "right" params = list2params(modifiers) - active_attachable?.start_fire(source, object, location, control, params, bypass_checks) - return + 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 if(gun_on_cooldown(gun_user)) return if(!bypass_checks) diff --git a/code/modules/projectiles/mounted.dm b/code/modules/projectiles/mounted.dm index 501cbde1121..95d1ae520f6 100644 --- a/code/modules/projectiles/mounted.dm +++ b/code/modules/projectiles/mounted.dm @@ -275,7 +275,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)