CatStation/Resources/Audio/Effects/Shuttle
Morb0 b70efe1fa8 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Client/Audio/ContentAudioSystem.cs
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/security.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
#	Resources/Prototypes/Datasets/Names/first_male.yml
#	Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
#	Resources/Prototypes/GameRules/roundstart.yml
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json
#	Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNESW.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNWSE.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal_checker_a.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal_checker_b.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/fulltile_overlay.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_180.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_270.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_90.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/herringbone.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/meta.json
#	Resources/Textures/Decals/Overlays/greyscale.rsi/minitile.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_checker_a.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_checker_b.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal_a.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal_b.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/mono.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/offset.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/offset_checker_a.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/offset_checker_b.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/pavement.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_checker_a.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_checker_b.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_a.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_b.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_180.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_270.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_90.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_180.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_270.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_90.png
#	Resources/Textures/Objects/Materials/Sheets/glass.rsi/meta.json
#	Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
#	Resources/Textures/Structures/Windows/directional.rsi/meta.json
2024-03-08 16:05:59 +03:00
..
attributions.yml Merge remote-tracking branch 'upstream/master' into upstream-sync 2024-03-08 16:05:59 +03:00
hyperspace_begin.ogg Revert "fuckyou (#14960)" (#15006) 2023-03-30 22:44:39 -06:00
hyperspace_end.ogg Revert "fuckyou (#14960)" (#15006) 2023-03-30 22:44:39 -06:00
hyperspace_progress.ogg Add FTL destinations (#9685) 2022-07-15 14:11:41 +10:00
radar_ping.ogg Shuttle console + FTL rework (#24430) 2024-03-03 18:39:19 +11:00
shuttle_impact1.ogg Shuttle impact sounds (#11099) 2022-10-04 16:00:44 +11:00
shuttle_impact2.ogg Shuttle impact sounds (#11099) 2022-10-04 16:00:44 +11:00
shuttle_impact3.ogg Shuttle impact sounds (#11099) 2022-10-04 16:00:44 +11:00