Revert "Merge pull request #1045 from CapnMachaddish/door-sounds-2.0"

This reverts commit 43a0ce2b0a, reversing
changes made to 9594a65526.
This commit is contained in:
QuoteFox
2021-03-23 18:56:27 +00:00
parent 35d4666715
commit 92f281373d
16 changed files with 8 additions and 12 deletions
+4 -4
View File
@@ -260,7 +260,7 @@
if(locked)
return
locked = TRUE
playsound(src,boltDown,50,0,3)
playsound(src,boltDown,30,0,3)
audible_message("<span class='italics'>You hear a click from the bottom of the door.</span>", null, 1)
update_icon()
@@ -271,7 +271,7 @@
if(!locked)
return
locked = FALSE
playsound(src,boltUp,50,0,3)
playsound(src,boltUp,30,0,3)
audible_message("<span class='italics'>You hear a click from the bottom of the door.</span>", null, 1)
update_icon()
@@ -1155,7 +1155,7 @@
if(obj_flags & EMAGGED)
return FALSE
use_power(50)
playsound(src, doorOpen, 50, 0)
playsound(src, doorOpen, 30, 1)
if(src.closeOther != null && istype(src.closeOther, /obj/machinery/door/airlock/) && !src.closeOther.density)
src.closeOther.close()
else
@@ -1202,7 +1202,7 @@
if(obj_flags & EMAGGED)
return
use_power(50)
playsound(src.loc, doorClose, 50, 0)
playsound(src.loc, doorClose, 30, 1)
else
playsound(src.loc, 'sound/machines/airlockforced.ogg', 30, 1)
+2 -4
View File
@@ -15,8 +15,6 @@
resistance_flags = FIRE_PROOF
damage_deflection = 70
poddoor = TRUE
var/openSound = 'hyperstation/sound/doors/blastDoorOpen.ogg'
var/closeSound = 'hyperstation/sound/doors/blastDoorClose.ogg'
/obj/machinery/door/poddoor/preopen
icon_state = "open"
@@ -74,10 +72,10 @@
switch(animation)
if("opening")
flick("opening", src)
playsound(src, openSound, 25, 0)
playsound(src, 'sound/machines/blastdoor.ogg', 30, 1)
if("closing")
flick("closing", src)
playsound(src, closeSound, 25, 0)
playsound(src, 'sound/machines/blastdoor.ogg', 30, 1)
/obj/machinery/door/poddoor/update_icon()
if(density)
-2
View File
@@ -8,8 +8,6 @@
armor = list("melee" = 20, "bullet" = 20, "laser" = 20, "energy" = 75, "bomb" = 25, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 70)
damage_deflection = 20
max_integrity = 100
openSound = 'hyperstation/sound/doors/shutter.ogg'
closeSound = 'hyperstation/sound/doors/shutter.ogg'
/obj/machinery/door/poddoor/shutters/preopen
icon_state = "open"
+2 -2
View File
@@ -141,7 +141,7 @@
if(!src.operating) //in case of emag
operating = TRUE
do_animate("opening")
playsound(src.loc, 'sound/machines/windowdoor.ogg', 100, 0)
playsound(src.loc, 'sound/machines/windowdoor.ogg', 100, 1)
src.icon_state ="[src.base_state]open"
sleep(10)
@@ -165,7 +165,7 @@
return 0
operating = TRUE
do_animate("closing")
playsound(src.loc, 'sound/machines/windowdoor.ogg', 100, 0)
playsound(src.loc, 'sound/machines/windowdoor.ogg', 100, 1)
src.icon_state = src.base_state
density = TRUE
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.