Merge branch 'master' into upstream-merge-26129

This commit is contained in:
LetterJay
2017-04-29 11:45:37 -05:00
committed by GitHub
131 changed files with 1020 additions and 743 deletions
+3 -3
View File
@@ -115,7 +115,7 @@
update_icon()
return
if(locked)
user <<"<span class='warning'> The [name] won't budge!</span>"
to_chat(user, "<span class='warning'>The [name] won't budge!</span>")
return
else
open = !open
@@ -131,7 +131,7 @@
/obj/structure/fireaxecabinet/attack_tk(mob/user)
if(locked)
user <<"<span class='warning'> The [name] won't budge!</span>"
to_chat(user, "<span class='warning'>The [name] won't budge!</span>")
return
else
open = !open
@@ -177,7 +177,7 @@
set src in oview(1)
if(locked)
usr <<"<span class='warning'> The [name] won't budge!</span>"
to_chat(usr, "<span class='warning'>The [name] won't budge!</span>")
return
else
open = !open
+4 -7
View File
@@ -14,18 +14,15 @@
/obj/structure/ladder/Initialize(mapload)
if(!initialized)
GLOB.ladders += src
..()
if(mapload)
return TRUE
update_link()
GLOB.ladders += src
..()
return INITIALIZE_HINT_LATELOAD
/obj/structure/ladder/Destroy()
GLOB.ladders -= src
. = ..()
/obj/structure/ladder/proc/update_link()
/obj/structure/ladder/LateInitialize()
for(var/obj/structure/ladder/L in GLOB.ladders)
if(L.id == id)
if(L.height == (height - 1))