cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tackling (#30636)

Browse Source 
* Evolution of Combat

* Tackling some problems

* Football alert

Co-authored-by: Rubylips <Questionfrog@gmail.com>
This commit is contained in:
GreatBigFailure
2021-09-12 00:29:34 -04:00
committed by GitHub
parent 44a160884d
commit 5c058b4ce2
11 changed files with 203 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/_onclick/click.dm
View File

@@ -118,7 +118,10 @@
return
if(in_throw_mode)
throw_item(A)
if(!get_active_hand() && (a_intent == I_GRAB || a_intent == I_DISARM))
doTackle(A)
else
throw_item(A)
return
var/obj/item/held_item = get_active_hand()