Closets now pick up all items on the tile they're created on, the same as crates. This makes it easier for mappers to put things in lockers without making new locker types or var-editing them.

Moved snowflake telecomm ambient sound code that only half worked into the switch that's designed to handle it.

Committing for Aranclanos:
- Toggle ambience should now properly work. Fixes issue 992.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4880 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
johnsonmt88@gmail.com
2012-10-15 01:28:06 +00:00
parent a48519f105
commit 757410d487
4 changed files with 25 additions and 14 deletions
@@ -15,6 +15,14 @@
var/storage_capacity = 20 //This is so that someone can't pack hundreds of items in a locker/crate
//then open it in a populated area to crash clients.
/obj/structure/closet/New()
..()
spawn(1)
if(!opened) // if closed, any item at the crate's loc is put in the contents
for(var/obj/item/I in src.loc)
if(I.density || I.anchored || I == src) continue
I.loc = src
/obj/structure/closet/alter_health()
return get_turf(src)
@@ -197,13 +197,6 @@
// new /obj/item/weapon/pestspray(src)
// new /obj/item/weapon/pestspray(src)
/obj/structure/closet/crate/New()
..()
spawn(1)
if(!opened) // if closed, any item at the crate's loc is put in the contents
for(var/obj/item/I in src.loc)
if(I.density || I.anchored || I == src) continue
I.loc = src
/obj/structure/closet/crate/secure/New()
..()