cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Holding people at gunpoint is FIXED (#68361)

Browse Source
This commit is contained in:
itseasytosee
2022-07-17 00:45:55 -07:00
committed by GitHub
parent e0ad104620
commit 71c273a01a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/gunpoint.dm
+1 -1
View File
@@ -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
code/modules/projectiles/gun.dm
+1 -1
View File
@@ -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