cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-19 20:06:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes bodybag examine text (#9066)

Browse Source 
It was incorrectly using closet examine code and it incorrectly kept displaying it as empty.

This should resolve that issue.

Also tides up code here and there and some cleanup.

PR'd again, in an attempt to stop travis cloning itself.

Also makes a proc out of the examine to make things cleaner I guess
This commit is contained in:
Wowzewow (Wezzy)
2020-06-10 14:03:13 +08:00
committed by GitHub
parent 953d87df0c
commit f882fc0762
4 changed files with 84 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets.dm
+13 -10
View File
@@ -51,22 +51,25 @@
// Fill lockers with this.
/obj/structure/closet/proc/fill()
/obj/structure/closet/proc/content_info(mob/user, content_size)
if(!content_size)
to_chat(user, "\The [src] is empty.")
else if(storage_capacity > content_size*4)
to_chat(user, "\The [src] is barely filled.")
else if(storage_capacity > content_size*2)
to_chat(user, "\The [src] is less than half full.")
else if(storage_capacity > content_size)
to_chat(user, "\The [src] still has some free space.")
else
to_chat(user, "\The [src] is full.")
/obj/structure/closet/examine(mob/user)
if(..(user, 1) && !opened)
var/content_size = 0
for(var/obj/item/I in contents)
if(!I.anchored)
content_size += Ceiling(I.w_class/2)
if(!content_size)
to_chat(user, "It is empty.")
else if(storage_capacity > content_size*4)
to_chat(user, "It is barely filled.")
else if(storage_capacity > content_size*2)
to_chat(user, "It is less than half full.")
else if(storage_capacity > content_size)
to_chat(user, "There is still some free space.")
else
to_chat(user, "It is full.")
content_info(user, content_size)
/obj/structure/closet/proc/stored_weight()
var/content_size = 0