cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 09:31:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6992 from PsiOmegaDelta/BodyBag

Browse Source 
Shapely body bags.
This commit is contained in:
Chinsky
2014-11-12 23:45:36 +03:00
parent dab47ad163 e6a9e08886
commit f322a6af5e
2 changed files with 63 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
code/game/objects/structures/crates_lockers/closets.dm
View File

@@ -85,11 +85,11 @@
var/stored_units = 0
if(store_misc)
stored_units = store_misc(stored_units)
stored_units += store_misc(stored_units)
if(store_items)
stored_units = store_items(stored_units)
stored_units += store_items(stored_units)
if(store_mobs)
stored_units = store_mobs(stored_units)
stored_units += store_mobs(stored_units)
src.icon_state = src.icon_closed
src.opened = 0
@@ -100,26 +100,29 @@
//Cham Projector Exception
/obj/structure/closet/proc/store_misc(var/stored_units)
var/added_units = 0
for(var/obj/effect/dummy/chameleon/AD in src.loc)
if(stored_units > storage_capacity)
if((stored_units + added_units) > storage_capacity)
break
AD.loc = src
stored_units++
return stored_units
added_units++
return added_units
/obj/structure/closet/proc/store_items(var/stored_units)
var/added_units = 0
for(var/obj/item/I in src.loc)
var/item_size = Ceiling(I.w_class / 2)
if(stored_units + item_size > storage_capacity)
if(stored_units + added_units + item_size > storage_capacity)
continue
if(!I.anchored)
I.loc = src
stored_units += item_size
return stored_units
added_units += item_size
return added_units
/obj/structure/closet/proc/store_mobs(var/stored_units)
var/added_units = 0
for(var/mob/M in src.loc)
if(stored_units + mob_size > storage_capacity)
if(stored_units + added_units + mob_size > storage_capacity)
break
if(istype (M, /mob/dead/observer))
continue
@@ -131,13 +134,14 @@
M.client.eye = src
M.loc = src
stored_units += mob_size
return stored_units
added_units += mob_size
return added_units
/obj/structure/closet/proc/toggle(mob/user as mob)
if(!(src.opened ? src.close() : src.open()))
user << "<span class='notice'>It won't budge!</span>"
return
return
update_icon()
// this should probably use dump_contents()
/obj/structure/closet/ex_act(severity)