Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit afbe681

Browse files
wwwhy
1 parent d04c9f6 commit afbe681

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

code/_onclick/click.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
UnarmedAttack(A, FALSE, modifiers)
121121
return
122122

123-
if(grab_mode && pulled(A))
123+
if(grab_mode && pulled(A) && !in_throw_mode)
124124
return
125125

126126
if(in_throw_mode)

code/modules/mob/living/living.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@
366366

367367
if(istype(AM) && Adjacent(AM))
368368
start_pulling(AM)
369-
else if(!combat_mode)
369+
else if(!in_throw_mode)
370370
stop_pulling()
371371
return TRUE
372372

0 commit comments

Comments
 (0)