Merge pull request #7117 from Citadel-Station-13/upstream-merge-38477

[MIRROR] [s] Prevent unbreakable ladders from being moved by shuttles
This commit is contained in:
LetterJay
2018-06-16 16:17:45 -05:00
committed by GitHub
2 changed files with 25 additions and 7 deletions
+10 -7
View File
@@ -23,13 +23,7 @@
/obj/structure/ladder/Destroy(force)
if ((resistance_flags & INDESTRUCTIBLE) && !force)
return QDEL_HINT_LETMELIVE
if(up && up.down == src)
up.down = null
up.update_icon()
if(down && down.up == src)
down.up = null
down.update_icon()
disconnect()
return ..()
/obj/structure/ladder/LateInitialize()
@@ -52,6 +46,15 @@
update_icon()
/obj/structure/ladder/proc/disconnect()
if(up && up.down == src)
up.down = null
up.update_icon()
if(down && down.up == src)
down.up = null
down.update_icon()
up = down = null
/obj/structure/ladder/update_icon()
if(up && down)
icon_state = "ladder11"