cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-11 07:03:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improvised Garrote nerf, tweaks to grab resisting. (#23485)

Browse Source 
* Update garrote.dm

* augghhhhhhhhhhhhhhhhhhhhhh
This commit is contained in:
Qwertytoforty
2023-12-11 12:06:50 -05:00
committed by GitHub
parent 2415dc5d02
commit 338a9257f2
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species/_species.dm
+1 -1
View File
@@ -642,7 +642,7 @@
target.Stun(0.5 SECONDS)
else
var/obj/item/active_hand = target.get_active_hand()
if(target.IsSlowed() && active_hand && !IS_HORIZONTAL(user) && !HAS_TRAIT(active_hand, TRAIT_WIELDED))
if(target.IsSlowed() && active_hand && !IS_HORIZONTAL(user) && !HAS_TRAIT(active_hand, TRAIT_WIELDED) && !istype(active_hand, /obj/item/grab))
target.drop_item()
add_attack_logs(user, target, "Disarmed object out of hand", ATKLOG_ALL)
else
code/modules/mob/living/living.dm
+2
View File
@@ -778,6 +778,8 @@
*/////////////////////
/mob/living/proc/resist_grab()
var/resisting = 0
if(HAS_TRAIT(src, TRAIT_IMMOBILIZED))
return TRUE //You can't move, so you can't resist
for(var/X in grabbed_by)
var/obj/item/grab/G = X
resisting++
code/modules/mob/mob_movement.dm
+2
View File
@@ -206,6 +206,8 @@
if(mob.grabbed_by.len)
if(mob.incapacitated(FALSE, TRUE)) // Can't break out of grabs if you're incapacitated
return TRUE
if(HAS_TRAIT(mob, TRAIT_IMMOBILIZED))
return TRUE //You can't move, so you can't break it by trying to move.
var/list/grabbing = list()
if(istype(mob.l_hand, /obj/item/grab))