From 04b71c0e72b0eb17c7cb1e8fee122ce7867372b6 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sun, 17 Jul 2022 20:58:05 +0200 Subject: [PATCH] [MIRROR] Holding people at gunpoint is FIXED [MDB IGNORE] (#14954) * Holding people at gunpoint is FIXED (#68361) * Holding people at gunpoint is FIXED * mirror changes to modular file Co-authored-by: itseasytosee <55666666+itseasytosee@users.noreply.github.com> Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com> --- code/datums/components/gunpoint.dm | 2 +- code/modules/projectiles/gun.dm | 2 +- .../master_files/code/modules/projectiles/guns/gun.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/datums/components/gunpoint.dm b/code/datums/components/gunpoint.dm index 9dbce3f879a..a73af8d2249 100644 --- a/code/datums/components/gunpoint.dm +++ b/code/datums/components/gunpoint.dm @@ -1,5 +1,5 @@ /// How many tiles around the target the shooter can roam without losing their shot -#define GUNPOINT_SHOOTER_STRAY_RANGE 2 +#define GUNPOINT_SHOOTER_STRAY_RANGE 3 /// How long it takes from the gunpoint is initiated to reach stage 2 #define GUNPOINT_DELAY_STAGE_2 2.5 SECONDS /// How long it takes from stage 2 starting to move up to stage 3 diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index c8752954a4b..aeec34761b1 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -189,7 +189,7 @@ for(var/obj/O in contents) O.emp_act(severity) -/obj/item/gun/attack_secondary(mob/living/victim, mob/living/user, params) +/obj/item/gun/afterattack_secondary(mob/living/victim, mob/living/user, params) if (user.GetComponent(/datum/component/gunpoint)) to_chat(user, span_warning("You are already holding someone up!")) return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN diff --git a/modular_skyrat/master_files/code/modules/projectiles/guns/gun.dm b/modular_skyrat/master_files/code/modules/projectiles/guns/gun.dm index 620cd6744a5..873e45cf126 100644 --- a/modular_skyrat/master_files/code/modules/projectiles/guns/gun.dm +++ b/modular_skyrat/master_files/code/modules/projectiles/guns/gun.dm @@ -313,7 +313,7 @@ for(var/obj/iterated_object in contents) iterated_object.emp_act(severity) -/obj/item/gun/attack_secondary(mob/living/victim, mob/living/user, params) +/obj/item/gun/afterattack_secondary(mob/living/victim, mob/living/user, params) if(user.GetComponent(/datum/component/gunpoint)) balloon_alert(user, "already holding someone up!") return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN