From: Ed <96445749+TheShuEd@users.noreply.github.com>
Date: Tue, 30 Jan 2024 13:28:16 +0000 (+0300)
Subject: Shuttle guns new sounds (#24714)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=60c5797807af4a48e9971dfd7b36b2a9938ea2db;p=space-station-14.git

Shuttle guns new sounds (#24714)

* new sounds

* fix

* fix sound

* some tweak
---

diff --git a/Resources/Audio/Weapons/Guns/Gunshots/attributions.yml b/Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
index 9431ededc2..7c46974818 100644
--- a/Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
+++ b/Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
@@ -21,4 +21,9 @@
 - files: ["rocket-launcher.ogg", "taser2.ogg"]
   license: "CC-BY-SA-3.0"
   copyright: "Taken from tgstation"
-  source: "https://github.com/tgstation/tgstation/tree/88d7dbfc105fbf40284d7b7c4587f8d23c0ac3ac"
\ No newline at end of file
+  source: "https://github.com/tgstation/tgstation/tree/88d7dbfc105fbf40284d7b7c4587f8d23c0ac3ac"
+
+- files: ["ship_duster.ogg", "ship_friendship.ogg", "ship_svalinn.ogg", "ship_perforator.ogg"]
+  license: "CC0-1.0"
+  copyright: "Created by MIXnikita for Space Station 14"
+  source: "https://github.com/MIXnikita"
\ No newline at end of file
diff --git a/Resources/Audio/Weapons/Guns/Gunshots/ship_duster.ogg b/Resources/Audio/Weapons/Guns/Gunshots/ship_duster.ogg
new file mode 100644
index 0000000000..0008849d0e
Binary files /dev/null and b/Resources/Audio/Weapons/Guns/Gunshots/ship_duster.ogg differ
diff --git a/Resources/Audio/Weapons/Guns/Gunshots/ship_friendship.ogg b/Resources/Audio/Weapons/Guns/Gunshots/ship_friendship.ogg
new file mode 100644
index 0000000000..4ba9a2036d
Binary files /dev/null and b/Resources/Audio/Weapons/Guns/Gunshots/ship_friendship.ogg differ
diff --git a/Resources/Audio/Weapons/Guns/Gunshots/ship_perforator.ogg b/Resources/Audio/Weapons/Guns/Gunshots/ship_perforator.ogg
new file mode 100644
index 0000000000..ec434c2b77
Binary files /dev/null and b/Resources/Audio/Weapons/Guns/Gunshots/ship_perforator.ogg differ
diff --git a/Resources/Audio/Weapons/Guns/Gunshots/ship_svalinn.ogg b/Resources/Audio/Weapons/Guns/Gunshots/ship_svalinn.ogg
new file mode 100644
index 0000000000..8ead10ba43
Binary files /dev/null and b/Resources/Audio/Weapons/Guns/Gunshots/ship_svalinn.ogg differ
diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml b/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml
index d3408f54e5..3368e2d7ee 100644
--- a/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml
+++ b/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml
@@ -15,6 +15,9 @@
     bodyType: Static
   - type: ContainerContainer
   - type: Gun
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
   - type: Fixtures
     fixtures:
       fix1:
@@ -82,11 +85,8 @@
   - type: Gun
     fireRate: 5
     useKey: false
-    selectedMode: SemiAuto
-    availableModes:
-      - SemiAuto
     soundGunshot:
-      path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
+      path: /Audio/Weapons/Guns/Gunshots/ship_svalinn.ogg
       params:
         variation: 0.05
   - type: MagazineVisuals
@@ -137,12 +137,8 @@
           acts: ["Destruction"]
   - type: Gun
     fireRate: 1
-    useKey: false
-    selectedMode: SemiAuto
-    availableModes:
-      - SemiAuto
     soundGunshot:
-      path: /Audio/Weapons/Guns/Gunshots/laser_cannon2.ogg
+      path: /Audio/Weapons/Guns/Gunshots/ship_perforator.ogg
       params:
         variation: 0.05
   - type: MagazineVisuals
@@ -195,15 +191,12 @@
           acts: ["Destruction"]
   - type: Gun
     projectileSpeed: 80
-    fireRate: 4
+    fireRate: 1
     angleDecay: 45
     minAngle: 0
     maxAngle: 15
-    selectedMode: FullAuto
-    availableModes:
-    - FullAuto
     soundGunshot:
-      path: /Audio/Items/Mining/fultext_launch.ogg
+      path: /Audio/Weapons/Guns/Gunshots/ship_friendship.ogg
       params:
         pitch: 0.8
     soundEmpty:
@@ -252,11 +245,8 @@
   - type: Gun
     projectileSpeed: 40
     fireRate: 0.3
-    selectedMode: FullAuto
-    availableModes:
-    - FullAuto
     soundGunshot:
-      path: /Audio/Items/Mining/fultext_launch.ogg
+      path: /Audio/Weapons/Guns/Gunshots/ship_duster.ogg
       params:
         variation: 0.05
         pitch: 0.8