shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9867 from Ghommie/Ghommie-cit375

Browse Source 
Ports "examine-code refactor"
This commit is contained in:
BlackMajor
2019-11-25 11:31:03 +13:00
committed by GitHub
parent 315082fc91 6a0bd7c925
commit c81d1fe7a3
332 changed files with 1296 additions and 1350 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets.dm
+7 -7
View File
@@ -84,22 +84,22 @@
add_overlay("unlocked")
/obj/structure/closet/examine(mob/user)
..()
. = ..()
if(welded)
to_chat(user, "<span class='notice'>It's <b>welded</b> shut.</span>")
. += "<span class='notice'>It's <b>welded</b> shut.</span>"
if(anchored)
to_chat(user, "<span class='notice'>It is <b>bolted</b> to the ground.</span>")
. += "<span class='notice'>It is <b>bolted</b> to the ground.</span>"
if(opened)
to_chat(user, "<span class='notice'>The parts are <b>welded</b> together.</span>")
. += "<span class='notice'>The parts are <b>welded</b> together.</span>"
else if(secure && !opened)
else if(broken)
to_chat(user, "<span class='notice'>The lock is <b>screwed</b> in.</span>")
. += "<span class='notice'>The lock is <b>screwed</b> in.</span>"
else if(secure)
to_chat(user, "<span class='notice'>Alt-click to [locked ? "unlock" : "lock"].</span>")
. += "<span class='notice'>Alt-click to [locked ? "unlock" : "lock"].</span>"
if(isliving(user))
var/mob/living/L = user
if(HAS_TRAIT(L, TRAIT_SKITTISH))
to_chat(user, "<span class='notice'>Ctrl-Shift-click [src] to jump inside.</span>")
. += "<span class='notice'>Ctrl-Shift-click [src] to jump inside.</span>"
/obj/structure/closet/CanPass(atom/movable/mover, turf/target)
if(wall_mounted)
code/game/objects/structures/crates_lockers/closets/secure/personal.dm
+2 -2
View File
@@ -5,9 +5,9 @@
var/registered_name = null
/obj/structure/closet/secure_closet/personal/examine(mob/user)
..()
. = ..()
if(registered_name)
to_chat(user, "<span class='notice'>The display reads, \"Owned by [registered_name]\".</span>")
. += "<span class='notice'>The display reads, \"Owned by [registered_name]\".</span>"
/obj/structure/closet/secure_closet/personal/check_access(obj/item/card/id/I)
. = ..()