cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-22 16:12:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes syndicate force glove grabs having no reinforce timer (#6607)

Browse Source 
Force gloves allowed you do the first upgrade instantly, meaning you skip both passive and blue. According to the code, this is unintentional behavior and leads to further bugs, such as being stun-locked when this happens repeatedly.
This commit is contained in:
Geeves
2019-06-27 20:49:01 +02:00
committed by Erki
parent 12632c2f7f
commit 637171bd16
3 changed files with 45 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/living/carbon/human/human_attackhand.dm
View File

@@ -178,6 +178,8 @@
if(H.gloves && istype(H.gloves,/obj/item/clothing/gloves/force/syndicate)) //only antag gloves can do this for now
G.state = GRAB_AGGRESSIVE
G.icon_state = "grabbed1"
G.hud.icon_state = "reinforce1"
G.last_action = world.time
visible_message("<span class='warning'>[M] gets a strong grip on [src]!</span>")
return 1
visible_message("<span class='warning'>[M] has grabbed [src] passively!</span>")

2
code/modules/mob/living/carbon/human/human_defense.dm
View File

@@ -551,6 +551,8 @@ emp_act
if(user.gloves && istype(user.gloves,/obj/item/clothing/gloves/force/syndicate)) //only antag gloves can do this for now
G.state = GRAB_AGGRESSIVE
G.icon_state = "grabbed1"
G.hud.icon_state = "reinforce1"
G.last_action = world.time
visible_message("<span class='warning'>[user] gets a strong grip on [src]!</span>")
return 1
visible_message("<span class='warning'>[user] has grabbed [src] passively!</span>")