Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Locker open-close sound change #262

Merged
merged 1 commit into from Feb 8, 2015
Merged

Locker open-close sound change #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions code/game/objects/items/bodybag.dm
View file
Open in desktop
Expand Up @@ -35,6 +35,7 @@
icon_state = "bodybag_closed"
icon_closed = "bodybag_closed"
icon_opened = "bodybag_open"
sound = 'sound/items/zip.ogg'
var/item_path = /obj/item/bodybag
density = 0

Expand Down
13 changes: 5 additions & 8 deletions code/game/objects/structures/crates_lockers/closets.dm
View file
Open in desktop
Expand Up @@ -12,6 +12,7 @@
var/wall_mounted = 0 //never solid (You can always pass over it)
var/health = 100
var/lastbang
var/sound = 'sound/machines/click.ogg'
var/storage_capacity = 30 //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.

Expand Down Expand Up @@ -71,10 +72,8 @@

src.icon_state = src.icon_opened
src.opened = 1
if(istype(src, /obj/structure/closet/body_bag))
playsound(src.loc, 'sound/items/zip.ogg', 15, 1, -3)
if(istype(src,/obj/structure/closet/coffin/sarcophagus))
playsound(src.loc, 'sound/effects/stonedoor_openclose.ogg', 15, 1, -3)
if(sound)
playsound(src.loc, src.sound, 15, 1, -3)
else
playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3)
density = 0
Expand Down Expand Up @@ -119,10 +118,8 @@

src.icon_state = src.icon_closed
src.opened = 0
if(istype(src, /obj/structure/closet/body_bag))
playsound(src.loc, 'sound/items/zip.ogg', 15, 1, -3)
if(istype(src,/obj/structure/closet/coffin/sarcophagus))
playsound(src.loc, 'sound/effects/stonedoor_openclose.ogg', 15, 1, -3)
if(sound)
playsound(src.loc, src.sound, 15, 1, -3)
else
playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3)
density = 1
Expand Down
1 change: 1 addition & 0 deletions code/game/objects/structures/crates_lockers/closets/coffin.dm
View file
Open in desktop
Expand Up @@ -16,3 +16,4 @@
icon_state = "sarc"
icon_closed = "sarc"
icon_opened = "sarc_open"
sound = 'sound/effects/stonedoor_openclose.ogg'