Merge pull request #261 from Pinkbat5/dionachirp

Diona chirping, Nymph vocals, & Double Eyepatch
impstation · Sep 16, 2024 · d632e01 · d632e01
2 parents 87edb43 + 8528b48
commit d632e01
Show file tree

Hide file tree

Showing 11 changed files with 91 additions and 3 deletions.
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml b/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml
@@ -16,6 +16,22 @@
     node: blindfold
   - type: FlashImmunity
 
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesDoubleEyepatch
+  name: double eyepatch
+  description: Signature wear of the dread pirate Blindbeard.
+  components:
+  - type: Sprite
+    sprite: Clothing/Eyes/Misc/doubleeyepatch.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Misc/doubleeyepatch.rsi
+  - type: Blindfold
+  - type: Construction
+    graph: DoubleEyepatch
+    node: doubleeyepatch
+  - type: FlashImmunity
+
 - type: entity
   parent: ClothingHeadEyeBaseFlippable
   id: ClothingEyesEyepatch
@@ -28,6 +44,9 @@
     sprite: Clothing/Eyes/Misc/eyepatch.rsi
   - type: EyeProtection
     protectionTime: 5
+  - type: Tag
+    tags:
+      - Eyepatch
 
 - type: entity
   parent: [ClothingEyesEyepatch, ClothingHeadEyeBaseFlipped]

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -3581,6 +3581,13 @@
       gender: epicene
   - type: Speech
     speechVerb: Plant
+    speechSounds: Alto
+    allowedEmotes: ['Chirp']
+  - type: Vocal
+    sounds:
+      Male: UnisexDiona
+      Female: UnisexDiona
+      Unsexed: UnisexDiona
   - type: Tag
     tags:
     - DoorBumpOpener

diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
@@ -87,6 +87,7 @@
           - MobLayer
   - type: Speech
     speechVerb: Plant
+    allowedEmotes: ['Chirp']
   - type: Vocal
     sounds:
       Male: UnisexDiona

diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/double_eyepatch.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/double_eyepatch.yml
@@ -0,0 +1,21 @@
+- type: constructionGraph
+  id: DoubleEyepatch
+  start: start
+  graph:
+    - node: start
+      edges:
+      - to: doubleeyepatch
+        steps:
+        - tag: Eyepatch
+          name: eyepatch
+          icon:
+            sprite: Clothing/Eyes/Misc/eyepatch.rsi
+            state: icon
+        - tag: Eyepatch
+          name: eyepatch
+          icon:
+            sprite: Clothing/Eyes/Misc/eyepatch.rsi
+            state: icon
+          doAfter: 1
+    - node: doubleeyepatch
+      entity: ClothingEyesDoubleEyepatch
diff --git a/Resources/Prototypes/Recipes/Crafting/improvised.yml b/Resources/Prototypes/Recipes/Crafting/improvised.yml
@@ -98,6 +98,19 @@
     sprite: Clothing/Eyes/Misc/blindfold.rsi
     state: icon
 
+- type: construction
+  name: double eyepatch
+  id: doubleeyepatch
+  graph: DoubleEyepatch
+  startNode: start
+  targetNode: doubleeyepatch
+  category: construction-category-tools
+  objectType: Item
+  description: Two eyepatches, for twice the swashbuckling.
+  icon:
+    sprite: Clothing/Eyes/Misc/doubleeyepatch.rsi
+    state: icon
+
 - type: construction
   name: flower wreath
   id: flowerwreath

diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml
@@ -225,6 +225,8 @@
       path: /Audio/Voice/Diona/diona_scream.ogg
     Laugh:
       collection: DionaLaugh
+    Chirp:
+      path: /Audio/Animals/nymph_chirp.ogg
     Honk:
       collection: BikeHorn
     Weh:

diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml
@@ -315,11 +315,15 @@
   id: Chirp
   name: chat-emote-name-chirp
   category: Vocal
+  available: false
   icon: Interface/Emotes/chirp.png
   whitelist:
-    requireAll: true
     components:
     - Nymph
+    - Vocal
+  blacklist:
+    components:
+    - BorgChassis
   chatMessages: ["chat-emote-msg-chirp"]
   chatTriggers:
     - chirp

diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
@@ -89,7 +89,7 @@
 
 - type: Tag
   id: BorgCargoTorso
-  
+
 - type: Tag
   id: BorgEngineerHead
 
@@ -626,6 +626,9 @@
 - type: Tag
   id: ExplosivePassable
 
+- type: Tag
+  id: Eyepatch
+
 - type: Tag
   id: Figurine
 
@@ -1204,7 +1207,7 @@
 - type: Tag
   id: SecureWindoor
 
-- type: Tag  
+- type: Tag
   id: SecurityHelmet
 
 - type: Tag

diff --git a/Resources/Textures/Clothing/Eyes/Misc/doubleeyepatch.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Misc/doubleeyepatch.rsi/equipped-EYES.png
diff --git a/Resources/Textures/Clothing/Eyes/Misc/doubleeyepatch.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Misc/doubleeyepatch.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Eyes/Misc/doubleeyepatch.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Misc/doubleeyepatch.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-EYES",
+      "directions": 4
+    }
+  ]
+}