Merge branch 'master' into tgglassfloors

This commit is contained in:
S34N
2021-06-20 16:32:22 +01:00
committed by GitHub
511 changed files with 14637 additions and 20387 deletions
+1 -1
View File
@@ -403,7 +403,7 @@ GLOBAL_LIST_EMPTY(safes)
for(var/safe in GLOB.safes)
var/obj/structure/safe/S = safe
if(owner in S.known_by)
info += "<br> The combination for the safe located in the [get_area(S).name] is: [S.get_combination()]<br>"
info += "<br> The combination for the safe located in the [get_area_name(S, TRUE)] is: [S.get_combination()]<br>"
info_links = info
update_icon()