Skip to content

Commit

Permalink
Revert "Better airlock sounds QOL" (Bubberstation#1101)
Browse files Browse the repository at this point in the history
Reverts Bubberstation#1054

These are some of the most grating sounds I've ever heard added to the
game. If it was something we only heard a few times for round it'd be
fine, but it's EVERY AIRLOCK, one of the devices we interact with THE
MOST as players. Some sounds are extremely oud, some are quiet, some are
fine and some are grating like nails on a chalkboard. There's also a lot
of ones that are obscenely long for how simple and quick of an action
airlock opening and closing is.

It's an extremely inconsistent PR and should have been TM'd longer
before changing stuff players touch so often. None of the feedback from
the one TM was allowed to be acted on.


___________________________________________________________________________________________

:cl:
del: Door sounds from Citrp
qol: better door sounds
sound: changed sound back to better original airlock sound
code: re enables skyrat's door sound override
/:cl:
  • Loading branch information
Swiftfeather authored Feb 2, 2024
1 parent fe93421 commit ef67b67
Show file tree
Hide file tree
Showing 42 changed files with 2 additions and 132 deletions.
4 changes: 2 additions & 2 deletions code/game/machinery/doors/airlock.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1283,8 +1283,8 @@
return TRUE

if(BYPASS_DOOR_CHECKS) // No power usage, special sound, get it open.
playsound(src, 'sound/machines/airlockforced.ogg', 30, TRUE)// - ORIGINAL - BUBBER REVERT
//playsound(src, forcedOpen, 30, TRUE) //SKYRAT EDIT CHANGE - AESTHETICS
//playsound(src, 'sound/machines/airlockforced.ogg', 30, TRUE) - ORIGINAL
playsound(src, forcedOpen, 30, TRUE) //SKYRAT EDIT CHANGE - AESTHETICS
return TRUE

else
Expand Down
3 changes: 0 additions & 3 deletions modular_skyrat/modules/aesthetics/airlock/code/airlock.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@
boltUp = 'modular_skyrat/modules/aesthetics/airlock/sound/bolts_up.ogg'
boltDown = 'modular_skyrat/modules/aesthetics/airlock/sound/bolts_down.ogg'
//noPower = 'sound/machines/doorclick.ogg'
// Bubber edit - better door sounds
/*
var/forcedOpen = 'modular_skyrat/modules/aesthetics/airlock/sound/open_force.ogg' //Come on guys, why aren't all the sound files like this.
var/forcedClosed = 'modular_skyrat/modules/aesthetics/airlock/sound/close_force.ogg'
*/

/// For those airlocks you might want to have varying "fillings" for, without having to
/// have an icon file per door with a different filling.
Expand Down
126 changes: 0 additions & 126 deletions modular_zubbers/modules/aesthetics/airlock/code/airlock.dm

This file was deleted.

Binary file removed modular_zubbers/sound/machines/door/WideClose.ogg
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/WideOpen.ogg
Binary file not shown.
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/boltsdown.ogg
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/boltsup.ogg
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/cgo1c.ogg
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/cgo1o.ogg
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/cmd1c.ogg
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/cmd1o.ogg
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/cmd3c.ogg
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/cmd3o.ogg
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/covert1c.ogg
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/covert1o.ogg
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/door2c.ogg
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/door2o.ogg
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/eng1c.ogg
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/eng1o.ogg
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/hall1c.ogg
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/hall1o.ogg
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/hall3c.ogg
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/hall3o.ogg
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/hatchclose.ogg
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/hatchforced.ogg
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/hatchopen.ogg
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/med1c.ogg
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/med1o.ogg
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/sci1c.ogg
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/sci1o.ogg
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/sec1c.ogg
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/sec1o.ogg
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/secure1c.ogg
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/secure1o.ogg
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/shuttle1c.ogg
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/shuttle1o.ogg
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/space1c.ogg
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/space1o.ogg
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/vault1c.ogg
Binary file not shown.
Binary file removed modular_zubbers/sound/machines/door/vault1o.ogg
Binary file not shown.
1 change: 0 additions & 1 deletion tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -8425,7 +8425,6 @@
#include "modular_zubbers\master_files\skyrat\modules\cortical_borer\code\cortical_borer_antag.dm"
#include "modular_zubbers\master_files\skyrat\modules\opposing_force\code\opposing_force_subsystem.dm"
#include "modular_zubbers\master_files\skyrat\modules\verbs\code\subtle.dm"
#include "modular_zubbers\modules\aesthetics\airlock\code\airlock.dm"
#include "modular_zubbers\modules\antagonists\sentient_disease\code\disease_abilities.dm"
#include "modular_zubbers\modules\arcades\code\overrides\spawners.dm"
#include "modular_zubbers\modules\ashwalkers\code\effects\ash_rituals.dm"
Expand Down

0 comments on commit ef67b67

Please sign in to comment.