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

Prevent a source of MC failures. (#28169)

Browse Source
This commit is contained in:
Charlie Nolan
2025-01-28 23:12:19 -08:00
committed by GitHub
parent 85d60b6c64
commit 73c94dbc83
4 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/mob_grab.dm
+5 -4
View File
@@ -47,7 +47,7 @@
affecting.grabbed_by += src
RegisterSignal(affecting, COMSIG_MOVABLE_MOVED, PROC_REF(grab_moved))
RegisterSignal(assailant, COMSIG_MOVABLE_MOVED, PROC_REF(pull_grabbed))
RegisterSignal(assailant, COMSIG_MOVABLE_UPDATE_GLIDE_SIZE, PROC_REF(on_update_glide_size))
RegisterSignal(assailant, COMSIG_MOVABLE_UPDATED_GLIDE_SIZE, PROC_REF(on_updated_glide_size))
hud = new /atom/movable/screen/grab(src)
hud.icon_state = "reinforce"
@@ -77,7 +77,7 @@
if(assailant)
UnregisterSignal(assailant, list(
COMSIG_MOVABLE_MOVED,
COMSIG_MOVABLE_UPDATE_GLIDE_SIZE,
COMSIG_MOVABLE_UPDATED_GLIDE_SIZE,
))
if(assailant.client)
assailant.client.screen -= hud
@@ -86,9 +86,10 @@
QDEL_NULL(hud)
return ..()
/obj/item/grab/proc/on_update_glide_size(mob/living/grabber, new_size)
/obj/item/grab/proc/on_updated_glide_size(mob/living/grabber, old_size)
SIGNAL_HANDLER // COMSIG_MOVABLE_UPDATED_GLIDE_SIZE
if(affecting && grabber == assailant && affecting != assailant)
affecting.set_glide_size(new_size)
affecting.set_glide_size(grabber.glide_size)
/obj/item/grab/proc/pull_grabbed(mob/user, turf/old_turf, direct, forced)
SIGNAL_HANDLER