Merge remote-tracking branch 'upstream/master' into Railgun

DeltaV-Station · Mar 8, 2024 · 1b29618 · 1b29618
2 parents 1d8c5e5 + d8f0821
commit 1b29618
Show file tree

Hide file tree

Showing 14 changed files with 108 additions and 10 deletions.
diff --git a/Resources/Audio/DeltaV/Voice/Vulpkanin/attributions.yml b/Resources/Audio/DeltaV/Voice/Vulpkanin/attributions.yml
@@ -1,29 +1,49 @@
 - files: ["dog_bark1.ogg", "dog_bark2.ogg", "dog_bark3.ogg"]
   license: "CC0-1.0"
-  copyright: "Original sound by https://freesound.org/people/abhisheky948/sounds/625497/"
+  copyright: "Original sound by abhisheky948 at https://freesound.org/people/abhisheky948/sounds/625497/"
   source: "https://freesound.org/people/abhisheky948/sounds/625497/"
 
-  files: ["dog_bark2.ogg"]
+- files: ["dog_bark2.ogg"]
   license: "CC0-1.0"
-  copyright: "Original sound by https://freesound.org/people/michael_grinnell/sounds/464400/"
+  copyright: "Original sound by michael_grinnell at https://freesound.org/people/michael_grinnell/sounds/464400/"
   source: "https://freesound.org/people/michael_grinnell/sounds/464400/"
 
-  files: ["dog_bark3.ogg"]
+- files: ["dog_bark3.ogg"]
   license: "CC0-1.0"
-  copyright: "Original sound by https://freesound.org/people/Geoff-Bremner-Audio/sounds/688201/"
+  copyright: "Original sound by Geoff-Bremner-Audio at https://freesound.org/people/Geoff-Bremner-Audio/sounds/688201/"
   source: "https://freesound.org/people/Geoff-Bremner-Audio/sounds/688201/"
 
 - files: ["dog_growl1.ogg", "dog_growl2.ogg", "dog_growl3.ogg"]
   license: "CC0-1.0"
-  copyright: "Original sound by https://freesound.org/people/Glitchedtones/sounds/372533/ - cut out three clips of dog growling, cleaned up, converted to ogg"
+  copyright: "Original sound by GlitchedTones at https://freesound.org/people/Glitchedtones/sounds/372533/ - cut out three clips of dog growling, cleaned up, converted to ogg"
   source: "https://freesound.org/people/Glitchedtones/sounds/372533/"  
 
+- files: ["dog_growl4.ogg"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "Original sound taken from Paradise Station. Renamed to dog_growl4.ogg"
+  source: "https://github.com/ParadiseSS13/Paradise/blob/master/sound/goonstation/voice/growl1.ogg"
+
+- files: ["dog_growl5.ogg"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "Original sound taken from Paradise Station. Renamed to dog_growl5.ogg"
+  source: "https://github.com/ParadiseSS13/Paradise/blob/master/sound/goonstation/voice/growl2.ogg"
+
+- files: ["dog_growl6.ogg"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "Original sound taken from Paradise Station. Renamed to dog_growl6.ogg"
+  source: "https://github.com/ParadiseSS13/Paradise/blob/master/sound/goonstation/voice/growl3.ogg"
+
 - files: ["dog_snarl1.ogg", "dog_snarl2.ogg", "dog_snarl3.ogg"]
   license: "CC0-1.0"
-  copyright: "Original sound by https://freesound.org/people/strongbot/sounds/341090/ - cut out three clips of dog snarling, cleaned up, converted to ogg"
+  copyright: "Original sound by strongbot at https://freesound.org/people/strongbot/sounds/341090/ - cut out three clips of dog snarling, cleaned up, converted to ogg"
   source: "https://freesound.org/people/strongbot/sounds/341090/"
 
-  files: ["dog_whine.ogg"]
+- files: ["dog_whine.ogg"]
   license: "CC0-1.0"
-  copyright: "Original sound by https://freesound.org/people/Sruddi1/sounds/34878/ - cleaned up, converted to ogg"
+  copyright: "Original sound by Sruddi1 at https://freesound.org/people/Sruddi1/sounds/34878/ - cleaned up, converted to ogg"
   source: "https://freesound.org/people/Sruddi1/sounds/34878/"
+
+- files: ["howl.ogg"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "Original sound taken from Goonstation. Renamed to howl.ogg"
+  source: "https://github.com/goonstation/goonstation/blob/master/sound/voice/animal/werewolf_howl.ogg"
diff --git a/Resources/Audio/DeltaV/Voice/Vulpkanin/dog_growl4.ogg b/Resources/Audio/DeltaV/Voice/Vulpkanin/dog_growl4.ogg
diff --git a/Resources/Audio/DeltaV/Voice/Vulpkanin/dog_growl5.ogg b/Resources/Audio/DeltaV/Voice/Vulpkanin/dog_growl5.ogg
diff --git a/Resources/Audio/DeltaV/Voice/Vulpkanin/dog_growl6.ogg b/Resources/Audio/DeltaV/Voice/Vulpkanin/dog_growl6.ogg
diff --git a/Resources/Audio/DeltaV/Voice/Vulpkanin/howl.ogg b/Resources/Audio/DeltaV/Voice/Vulpkanin/howl.ogg
diff --git a/Resources/Audio/DeltaV/Voice/Vulpkanin/license.txt b/Resources/Audio/DeltaV/Voice/Vulpkanin/license.txt
@@ -4,7 +4,11 @@ dog_bark3.ogg licensed under CC0 1.0 taken from Geoff-Bremner-Audio at https://f
 dog_growl1.ogg licensed under CC0 1.0 taken from GlitchedTones at https://freesound.org/people/Glitchedtones/sounds/372533/
 dog_growl2.ogg licensed under CC0 1.0 taken from GlitchedTones at https://freesound.org/people/Glitchedtones/sounds/372533/
 dog_growl3.ogg licensed under CC0 1.0 taken from GlitchedTones at https://freesound.org/people/Glitchedtones/sounds/372533/
+dog_growl4.ogg licensed under CC-BY-NC-SA 3.0 taken from Paradise Station at https://github.com/ParadiseSS13/Paradise/blob/master/sound/goonstation/voice/growl1.ogg
+dog_growl5.ogg licensed under CC-BY-NC-SA 3.0 taken from Paradise Station at https://github.com/ParadiseSS13/Paradise/blob/master/sound/goonstation/voice/growl2.ogg
+dog_growl6.ogg licensed under CC-BY-NC-SA 3.0 taken from Paradise Station at https://github.com/ParadiseSS13/Paradise/blob/master/sound/goonstation/voice/growl3.ogg
 dog_snarl1.ogg licensed under CC0 1.0 taken from strongbot at https://freesound.org/people/strongbot/sounds/341090/
 dog_snarl2.ogg licensed under CC0 1.0 taken from strongbot at https://freesound.org/people/strongbot/sounds/341090/
 dog_snarl3.ogg licensed under CC0 1.0 taken from strongbot at https://freesound.org/people/strongbot/sounds/341090/
-dog_whine.ogg licensed under CC SAMPLING+ 1.0 DEED taken from Sruddil at https://freesound.org/people/Sruddi1/sounds/34878/
+dog_whine.ogg licensed under CC SAMPLING+ 1.0 DEED taken from Sruddil at https://freesound.org/people/Sruddi1/sounds/34878/
+howl.ogg taken from goonstation at https://github.com/goonstation/goonstation/blob/master/sound/voice/animal/werewolf_howl.ogg which is licensed under the CC BY-NC-SA 3.0. 
diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -1827,3 +1827,17 @@ Entries:
         in-VMSolidus
   id: 269
   time: '2024-03-08T03:35:45.0000000+00:00'
+- author: dge21
+  changes:
+    - type: Add
+      message: Added a new crate to delight all the clowns and mimes.
+  id: 270
+  time: '2024-03-08T03:46:37.0000000+00:00'
+- author: adeinitas
+  changes:
+    - type: Add
+      message: >-
+        Vulpkanin can howl now. They also have deeper growling noises, and
+        Harpies have learned to mimic these growls.
+  id: 271
+  time: '2024-03-08T03:49:28.0000000+00:00'
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -108,6 +108,10 @@
       - id: RubberStampCaptain
       - id: JetpackCaptainFilled
       - id: MedalCase
+      - id: ClothingHeadHatBeretCap # Nyanotrasen - Captain's Beret
+      - id: ClothingShoesLeather # DeltaV - add fancy shoes for HoP and cap
+      - id: ClothingShoesMiscWhite # DeltaV - add fancy shoes for HoP and cap
+      - id: ClothingShoesBootsWinterCap #Delta V: Add departmental winter boots
 
 - type: entity
   id: LockerHeadOfPersonnelFilled

diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml
@@ -7,3 +7,13 @@
   cost: 1000
   category: Fun
   group: market
+
+- type: cargoProduct
+  id: CapGunSet
+  icon:
+    sprite: Objects/Fun/caps.rsi
+    state: icon
+  product: CrateCapGunSet
+  cost: 1000
+  category: Fun
+  group: market
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/fun.yml
@@ -8,3 +8,18 @@
         amount: 1
       - id: BoxCartridgeBB
         amount: 2
+
+- type: entity
+  name: cap gun box set
+  description: A box filled with fun, harmless cap guns that are sure to keep security entertained and the air smelling of sulfur.
+  id: CrateCapGunSet
+  parent: CratePlastic
+  components:
+  - type: StorageFill
+    contents:
+      - id: RevolverCapGun
+        amount: 1
+      - id: SpeedLoaderCap
+        amount: 2
+      - id: BoxCartridgeCap
+        amount: 2
diff --git a/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml b/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml
@@ -92,6 +92,12 @@
   files:
     - /Audio/Nyanotrasen/Voice/Felinid/cat_growl1.ogg
     - /Audio/Animals/bear.ogg
+    - /Audio/DeltaV/Voice/Vulpkanin/dog_growl1.ogg
+    - /Audio/DeltaV/Voice/Vulpkanin/dog_growl2.ogg
+    - /Audio/DeltaV/Voice/Vulpkanin/dog_growl3.ogg
+    - /Audio/DeltaV/Voice/Vulpkanin/dog_growl4.ogg
+    - /Audio/DeltaV/Voice/Vulpkanin/dog_growl5.ogg
+    - /Audio/DeltaV/Voice/Vulpkanin/dog_growl6.ogg
 
 - type: soundCollection
   id: HarpyPurrs

diff --git a/Resources/Prototypes/DeltaV/SoundCollections/vulpkanin.yml b/Resources/Prototypes/DeltaV/SoundCollections/vulpkanin.yml
@@ -11,6 +11,9 @@
   - /Audio/DeltaV/Voice/Vulpkanin/dog_growl1.ogg
   - /Audio/DeltaV/Voice/Vulpkanin/dog_growl2.ogg
   - /Audio/DeltaV/Voice/Vulpkanin/dog_growl3.ogg
+  - /Audio/DeltaV/Voice/Vulpkanin/dog_growl4.ogg
+  - /Audio/DeltaV/Voice/Vulpkanin/dog_growl5.ogg
+  - /Audio/DeltaV/Voice/Vulpkanin/dog_growl6.ogg
 
 - type: soundCollection
   id: VulpkaninSnarls
@@ -24,3 +27,7 @@
   files:
   - /Audio/DeltaV/Voice/Vulpkanin/dog_whine.ogg
 
+- type: soundCollection
+  id: VulpkaninHowls
+  files:
+  - /Audio/DeltaV/Voice/Vulpkanin/howl.ogg
diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
@@ -56,6 +56,8 @@
       collection: VulpkaninBarks
     Whine:
       collection: VulpkaninWhines
+    Howl:
+      collection: VulpkaninHowls
 
 - type: emoteSounds
   id: MaleVulpkanin
@@ -84,6 +86,8 @@
       collection: VulpkaninBarks
     Whine:
       collection: VulpkaninWhines
+    Howl:
+      collection: VulpkaninHowls
 
 - type: emoteSounds
   id: FemaleVulpkanin
@@ -112,3 +116,5 @@
       collection: VulpkaninBarks
     Whine:
       collection: VulpkaninWhines
+    Howl:
+      collection: VulpkaninHowls
diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml
@@ -124,3 +124,15 @@
     - whined.
     - whined!
     - whining.
+
+- type: emote
+  id: Howl
+  category: Vocal
+  chatMessages: [howls.]
+  chatTriggers:
+    - howl.
+    - howl!
+    - howls.
+    - howls!
+    - howling.
+    - howled.