cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes runtime when trying to pull a turf (#96420)

Browse Source 
## About The Pull Request

No type check prior

## Why It's Good For The Game

Runtime

## Changelog
🆑

fix: fixed a runtime when trying to pull a turf

/🆑
This commit is contained in:
Leland Kemble
2026-06-11 03:16:33 +02:00
committed by GitHub
parent f01956eca1
commit ab9397ebd2
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/click_ctrl.dm
+1 -1
View File
@@ -34,7 +34,7 @@
SHOULD_NOT_OVERRIDE(TRUE)
. = ..()
if(. || world.time < next_move || !can_perform_action(target, NOT_INSIDE_TARGET | SILENT_ADJACENCY | ALLOW_RESTING | FORBID_TELEKINESIS_REACH))
if(. || !ismovable(target) || world.time < next_move || !can_perform_action(target, NOT_INSIDE_TARGET | SILENT_ADJACENCY | ALLOW_RESTING | FORBID_TELEKINESIS_REACH))
return
. = TRUE
code/modules/mob/living/living.dm
+2 -1
View File
@@ -374,8 +374,9 @@
now_pushing = FALSE
/mob/living/start_pulling(atom/movable/AM, state, force = pull_force, supress_message = FALSE)
if(!AM || !src)
if(!src)
return FALSE
ASSERT(ismovable(AM), "[src] attempted to pull [AM ? "[AM], a nonmovable atom" : "a null object"]")
if(!(AM.can_be_pulled(src, force)))
return FALSE
if(throwing || !(mobility_flags & MOBILITY_PULL))