cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

wwwhy (#22869)

Browse Source
This commit is contained in:
Bop
2024-12-27 09:29:42 +07:00
committed by GitHub
parent b4ca3f2b31
commit 0f2a646b21
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/_onclick/click.dm
View File

@@ -120,7 +120,7 @@
UnarmedAttack(A, FALSE, modifiers) UnarmedAttack(A, FALSE, modifiers)
return return
if(grab_mode && pulled(A)) if(grab_mode && pulled(A) && !in_throw_mode)
return return
if(in_throw_mode) if(in_throw_mode)

2
code/modules/mob/living/living.dm
View File

@@ -366,7 +366,7 @@
if(istype(AM) && Adjacent(AM)) if(istype(AM) && Adjacent(AM))
start_pulling(AM) start_pulling(AM)
else if(!combat_mode) else if(!in_throw_mode)
stop_pulling() stop_pulling()
return TRUE return TRUE