cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-06 07:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds Closet Open/Close Sounds (#15627)

Browse Source
This commit is contained in:
Fox McCloud
2021-03-02 04:27:02 -05:00
committed by GitHub
parent 439505cd25
commit 403e44e25a
20 changed files with 53 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,10 @@
var/can_be_emaged = FALSE
var/wall_mounted = 0 //never solid (You can always pass over it)
var/lastbang
var/sound = 'sound/machines/click.ogg'
var/open_sound = 'sound/machines/closet_open.ogg'
var/close_sound = 'sound/machines/closet_close.ogg'
var/open_sound_volume = 35
var/close_sound_volume = 50
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.
var/material_drop = /obj/item/stack/sheet/metal
var/material_drop_amount = 2
@@ -90,10 +93,7 @@
icon_state = icon_opened
opened = TRUE
if(sound)
playsound(loc, sound, 15, 1, -3)
else
playsound(loc, 'sound/machines/click.ogg', 15, 1, -3)
playsound(loc, open_sound, open_sound_volume, TRUE, -3)
density = 0
return TRUE
@@ -136,10 +136,7 @@
icon_state = icon_closed
opened = FALSE
if(sound)
playsound(loc, sound, 15, 1, -3)
else
playsound(loc, 'sound/machines/click.ogg', 15, 1, -3)
playsound(loc, close_sound, close_sound_volume, TRUE, -3)
density = 1
return TRUE

5
code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
View File

@@ -8,7 +8,10 @@
resistance_flags = FLAMMABLE
max_integrity = 70
integrity_failure = 0
sound = 'sound/effects/rustle2.ogg'
open_sound = 'sound/machines/cardboard_box.ogg'
close_sound = 'sound/machines/cardboard_box.ogg'
open_sound_volume = 35
close_sound_volume = 35
material_drop = /obj/item/stack/sheet/cardboard
var/amt = 4
var/move_delay = 0

7
code/game/objects/structures/crates_lockers/closets/coffin.dm
View File

@@ -7,6 +7,10 @@
resistance_flags = FLAMMABLE
max_integrity = 70
material_drop = /obj/item/stack/sheet/wood
open_sound = 'sound/machines/wooden_closet_open.ogg'
close_sound = 'sound/machines/wooden_closet_close.ogg'
open_sound_volume = 25
close_sound_volume = 50
/obj/structure/closet/coffin/update_icon()
if(!opened)
@@ -19,5 +23,6 @@
icon_state = "sarc"
icon_closed = "sarc"
icon_opened = "sarc_open"
sound = 'sound/effects/stonedoor_openclose.ogg'
open_sound = 'sound/effects/stonedoor_openclose.ogg'
close_sound = 'sound/effects/stonedoor_openclose.ogg'
material_drop = /obj/item/stack/sheet/mineral/sandstone

4
code/game/objects/structures/crates_lockers/closets/gimmick.dm
View File

@@ -5,6 +5,10 @@
icon_closed = "cabinet_closed"
icon_opened = "cabinet_open"
resistance_flags = FLAMMABLE
open_sound = 'sound/machines/wooden_closet_open.ogg'
close_sound = 'sound/machines/wooden_closet_close.ogg'
open_sound_volume = 25
close_sound_volume = 50
max_integrity = 70
/obj/structure/closet/cabinet/update_icon()

4
code/game/objects/structures/crates_lockers/closets/secure/bar.dm
View File

@@ -9,6 +9,10 @@
icon_off = "cabinetdetective_broken"
resistance_flags = FLAMMABLE
max_integrity = 70
open_sound = 'sound/machines/wooden_closet_open.ogg'
close_sound = 'sound/machines/wooden_closet_close.ogg'
open_sound_volume = 25
close_sound_volume = 50
/obj/structure/closet/secure_closet/bar/populate_contents()
new /obj/item/reagent_containers/food/drinks/cans/beer(src)

4
code/game/objects/structures/crates_lockers/closets/secure/personal.dm
View File

@@ -32,6 +32,10 @@
icon_off = "cabinetdetective_broken"
resistance_flags = FLAMMABLE
max_integrity = 70
open_sound = 'sound/machines/wooden_closet_open.ogg'
close_sound = 'sound/machines/wooden_closet_close.ogg'
open_sound_volume = 25
close_sound_volume = 50
/obj/structure/closet/secure_closet/personal/cabinet/update_icon()
if(broken)

1
code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
View File

@@ -60,7 +60,6 @@
return
if(allowed(user))
locked = !locked
playsound(loc, 'sound/machines/click.ogg', 15, 1, -3)
visible_message("<span class='notice'>The locker has been [locked ? null : "un"]locked by [user].</span>")
update_icon()
else

2
code/game/objects/structures/crates_lockers/closets/secure/security.dm
View File

@@ -323,6 +323,8 @@
icon_off = "cabinetdetective_broken"
resistance_flags = FLAMMABLE
max_integrity = 70
open_sound = 'sound/machines/wooden_closet_open.ogg'
close_sound = 'sound/machines/wooden_closet_close.ogg'
/obj/structure/closet/secure_closet/detective/populate_contents()
new /obj/item/clothing/under/det(src)

15
code/game/objects/structures/crates_lockers/crates.dm
View File

@@ -6,8 +6,11 @@
icon_opened = "crateopen"
icon_closed = "crate"
climbable = TRUE
// mouse_drag_pointer = MOUSE_ACTIVE_POINTER //???
var/rigged = FALSE
open_sound = 'sound/machines/crate_open.ogg'
close_sound = 'sound/machines/crate_close.ogg'
open_sound_volume = 35
close_sound_volume = 50
var/obj/item/paper/manifest/manifest
// A list of beacon names that the crate will announce the arrival of, when delivered.
var/list/announce_beacons = list()
@@ -45,7 +48,7 @@
do_sparks(5, 1, src)
return 2
playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3)
playsound(loc, open_sound, open_sound_volume, TRUE, -3)
for(var/obj/O in src) //Objects
O.forceMove(loc)
for(var/mob/M in src) //Mobs
@@ -64,7 +67,7 @@
if(!src.can_close())
return FALSE
playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3)
playsound(loc, close_sound, close_sound_volume, TRUE, -3)
var/itemcount = 0
for(var/obj/O in get_turf(src))
if(itemcount >= storage_capacity)
@@ -269,7 +272,7 @@
else
overlays += sparks
spawn(6) overlays -= sparks //Tried lots of stuff but nothing works right. so i have to use this *sadface*
playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
playsound(src, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
src.locked = 0
update_icon()
if(!opened && prob(20/severity))
@@ -371,6 +374,8 @@
icon_opened = "largebinopen"
icon_closed = "largebin"
anchored = TRUE
open_sound = 'sound/effects/bin_open.ogg'
close_sound = 'sound/effects/bin_close.ogg'
/obj/structure/closet/crate/can/wrench_act(mob/user, obj/item/I)
. = TRUE
@@ -423,6 +428,8 @@
greenlight = "largebing"
sparks = "largebinsparks"
emag = "largebinemag"
open_sound = 'sound/effects/bin_open.ogg'
close_sound = 'sound/effects/bin_close.ogg'
/obj/structure/closet/crate/large
name = "large crate"

4
code/game/objects/structures/crates_lockers/crittercrate.dm
View File

@@ -7,6 +7,10 @@
var/already_opened = 0
var/content_mob = null
var/amount = 1
open_sound = 'sound/machines/wooden_closet_open.ogg'
close_sound = 'sound/machines/wooden_closet_close.ogg'
open_sound_volume = 25
close_sound_volume = 50
/obj/structure/closet/critter/can_open()
if(welded)