cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 21:18:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Holding people at gunpoint is FIXED [MDB IGNORE] (#14954)

Browse Source 
* 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>
This commit is contained in:
SkyratBot
2022-07-17 14:58:05 -04:00
committed by GitHub
co-authored by itseasytosee jjpark-kb
parent ea83b1444c
commit 04b71c0e72
3 changed files with 3 additions and 3 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
modular_skyrat/master_files/code/modules/projectiles/guns/gun.dm
+1 -1
View File
@@ -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