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

[MIRROR] Some associated move fixes (#5977)

Browse Source 
* Some associated move fixes (#59299)

* Moves the loc assignment for null doMove target locations to before exited() is called, making it consistent with other uses of the proc, and fixing a harddel caused by deleting something inside of an open storage component. The component assumes that the removed object has already exited its contents, and so readds it to the screen, causing PAIN

Co-authored-by: Kylerace <kylerlumpkin1@ gmail.com>

* Some associated move fixes

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Kylerace <kylerlumpkin1@ gmail.com>
This commit is contained in:
SkyratBot
2021-05-26 23:59:40 +01:00
committed by GitHub
co-authored by Kylerace LemonInTheDark
parent e763b62f2f
commit bd6290a493
6 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/tables_racks.dm
+2
View File
@@ -293,6 +293,8 @@
/obj/structure/table/rolling/Moved(atom/OldLoc, Dir)
. = ..()
if(!loc)
return
for(var/mob/living/living_mob in OldLoc.contents)//Kidnap everyone on top
living_mob.forceMove(loc)
for(var/x in attached_items)