From 1455af865c6e7043f9f623567a3bbad1c5cc7be2 Mon Sep 17 00:00:00 2001 From: AurSka Date: Sun, 1 Oct 2023 06:50:40 +0300 Subject: [PATCH] Update _box_magazine.dm --- code/modules/projectiles/boxes_magazines/_box_magazine.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm index baa5c50c019c..c3989e7a4952 100644 --- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm +++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm @@ -163,7 +163,7 @@ /obj/item/ammo_box/AltClick(mob/user) if(ishuman(user)) var/mob/living/carbon/human/H = user - if((H.l_store == src || H.r_store == src) && !(caliber || istype(src, /obj/item/ammo_box/magazine) || instant_load)) //caliber because boxes have none, instant load because speedloaders use the base ammo box type with instant load on, and magazine for the obvious. + if((user.is_holding(src) ||H.l_store == src || H.r_store == src) && !(caliber || istype(src, /obj/item/ammo_box/magazine) || instant_load)) //caliber because boxes have none, instant load because speedloaders use the base ammo box type with instant load on, and magazine for the obvious. attack_self(user) return ..() @@ -171,7 +171,7 @@ /obj/item/ammo_box/examine(mob/user) . = ..() if(!(caliber || istype(src, /obj/item/ammo_box/magazine) || instant_load)) - . += "Alt-click on [src] while it in a pocket to take out a round while it is in your pocket." + . += "Alt-click on [src] while it in a pocket or your off-hand to take out a round while it is there." /obj/item/ammo_box/magazine w_class = WEIGHT_CLASS_SMALL //Default magazine weight, only differs for tiny mags and drums