Bug round up: emote fixes, no value for interdyne cigs (new-frontiers…

…-14#1974) * emote fixes, no value for interdyne cigs * Protolathe<BaseLatheLube * Update lathe.yml --------- Co-authored-by: Dvir <[email protected]>
whatston3 · Sep 10, 2024 · 9bd195d · 9bd195d
1 parent ef64e3e
commit 9bd195d
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 91 deletions.
diff --git a/Resources/Audio/DeltaV/Voice/Vulpkanin/attributions.yml b/Resources/Audio/DeltaV/Voice/Vulpkanin/attributions.yml
@@ -1,4 +1,4 @@
-- files: ["dog_bark1.ogg", "dog_bark2.ogg", "dog_bark3.ogg"]
+- files: ["dog_bark1.ogg"]
   license: "CC0-1.0"
   copyright: "Original sound by abhisheky948 at https://freesound.org/people/abhisheky948/sounds/625497/"
   source: "https://freesound.org/people/abhisheky948/sounds/625497/"

diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml
@@ -113,9 +113,8 @@
     - BorgChassis
   chatMessages: ["caws."]
   chatTriggers:
-    - caws.
-    - caw.
-    - caw!
+    - caws
+    - caw
     - cawing
     - cawed
 
@@ -134,13 +133,10 @@
     - BorgChassis
   chatMessages: ["barks."]
   chatTriggers:
-    - bark.
-    - bark!
-    - barks.
-    - barks!
-    - barked.
-    - barked!
-    - barking.
+    - bark
+    - barks
+    - barked
+    - barking
 
 - type: emote
   id: Snarl
@@ -156,13 +152,10 @@
     - BorgChassis
   chatMessages: ["snarls."]
   chatTriggers:
-    - snarl.
-    - snarl!
-    - snarls.
-    - snarls!
-    - snarled.
-    - snarled!
-    - snarling.
+    - snarl
+    - snarls
+    - snarled
+    - snarling
 
 - type: emote
   id: Whine
@@ -178,13 +171,10 @@
     - BorgChassis
   chatMessages: ["whines."]
   chatTriggers:
-    - whine.
-    - whine!
-    - whines.
-    - whines!
-    - whined.
-    - whined!
-    - whining.
+    - whine
+    - whines
+    - whined
+    - whining
 
 - type: emote
   id: Howl
@@ -200,12 +190,10 @@
     - BorgChassis
   chatMessages: ["howls."]
   chatTriggers:
-    - howl.
-    - howl!
-    - howls.
-    - howls!
-    - howling.
-    - howled.
+    - howl
+    - howls
+    - howling
+    - howled
 
 - type: emote
   id: Awoo
@@ -221,9 +209,7 @@
     - BorgChassis
   chatMessages: ["awoos."]
   chatTriggers:
-    - awoo.
-    - awoo!
-    - awoos.
-    - awoos!
-    - awooing.
-    - awooed.
+    - awoo
+    - awoos
+    - awooing
+    - awooed
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
@@ -180,7 +180,7 @@
 
 - type: entity
   id: CigPackSyndicate
-  parent: [CigPackBase, BaseC3SyndicateContraband] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband
+  parent: [CigPackBase, BaseC3SyndicateContrabandNoValue] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband
   name: Interdyne herbals packet
   description: Elite cigarettes for elite syndicate agents. Infused with medicine for when you need to do more than calm your nerves.
   components:

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: Protolathe
+  parent: BaseLatheLube # Frontier: Protolathe<BaseLatheLube
   id: ScienceTechFab
   name: science techfab
   description: Prints equipment for use by the epistemics department.
@@ -108,7 +108,7 @@
         - Ingot
 
 - type: entity
-  parent: Protolathe
+  parent: BaseLatheLube # Frontier: Protolathe<BaseLatheLube
   id: ServiceTechFab
   name: service techfab
   description: Prints equipment for service staff.
@@ -266,7 +266,7 @@
         - Ingot
 
 - type: entity
-  parent: Protolathe
+  parent: BaseLatheLube # Frontier: Protolathe<BaseLatheLube
   id: EngineeringTechFab
   name: engineering techfab
   description: Prints equipment for engineers.

diff --git a/Resources/Prototypes/Nyanotrasen/Voice/speech_emotes.yml b/Resources/Prototypes/Nyanotrasen/Voice/speech_emotes.yml
@@ -81,16 +81,8 @@
   chatTriggers:
     - mew
     - mews
-    - mew.
-    - mew!
-    - mew~
-    - mews.
-    - mews!
     - mewing
     - mewed
-    - mews~
-    - mewing.
-    - mewed.
 
 - type: emote
   id: Growl
@@ -108,13 +100,8 @@
   chatTriggers:
     - growl
     - growls
-    - growl.
-    - growls.
-    - growls!
     - growling
     - growled
-    - growling.
-    - growled.
 
 - type: emote
   id: Purr
@@ -132,11 +119,5 @@
   chatTriggers:
     - purr
     - purrs
-    - purr.
-    - purrs.
-    - purrs~
-    - purrs!
     - purring
     - purred
-    - purring.
-    - purred.
diff --git a/Resources/Prototypes/_NF/Entities/Objects/base_contraband.yml b/Resources/Prototypes/_NF/Entities/Objects/base_contraband.yml
@@ -138,6 +138,14 @@
     severity: Class3Syndicate
     turnInValues: {} # TODO: pirate values?
 
+- type: entity
+  parent: BaseC3SyndicateContrabandUnredeemable
+  id: BaseC3SyndicateContrabandNoValue
+  abstract: true
+  components:
+  - type: Contraband
+    turnInValues: *noFUCs
+
 - type: entity
   parent: BaseC3SyndicateContrabandUnredeemable
   id: BaseC3SyndicateContraband

diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
@@ -137,7 +137,7 @@
         - PrizeTicket
 
 - type: entity
-  parent: Protolathe
+  parent: BaseLatheLube
   id: SalvageTechfabNF
   name: salvage techfab
   description: Prints equipment for salvagers.
@@ -260,7 +260,7 @@
        - MagazineBoxMagnum
        - MagazineBoxRifle
        - MagazineBoxLightRifle
-       - GrenadeBlast
+#       - GrenadeBlast
        - ClothingHeadHelmetCosmonaut
   - type: MaterialStorage
     whitelist:
@@ -704,4 +704,4 @@
       - MagazineBoxLightRifleUranium
       - MagazineBoxMagnumUranium
       - MagazineBoxPistolUranium
-      - MagazineBoxRifleUranium
+      - MagazineBoxRifleUranium
diff --git a/Resources/Prototypes/_NF/Voice/speech_emotes.yml b/Resources/Prototypes/_NF/Voice/speech_emotes.yml
@@ -13,17 +13,9 @@
   chatMessages: ["chat-emote-msg-goblin-muttering"]
   chatTriggers:
     - mutter
-    - mutter.
-    - mutter!
     - mutters
-    - mutters.
-    - mutters!
     - muttered
-    - muttered.
-    - muttered!
     - muttering
-    - muttering.
-    - muttering!
 
 - type: emote
   id: GoblinThroatSinging
@@ -40,20 +32,10 @@
   chatMessages: ["chat-emote-msg-goblin-throat-singing"]
   chatTriggers:
     - sing
-    - sing.
-    - sing!
     - sings
-    - sings.
-    - sings!
     - sang
-    - sang.
-    - sang!
     - sung
-    - sung.
-    - sung!
     - singing
-    - singing.
-    - singing!
 
 - type: emote
   id: Belch
@@ -70,17 +52,7 @@
   chatMessages: ["chat-emote-msg-belch"]
   chatTriggers:
     - belch
-    - belch.
-    - belch!
     - burp
-    - burp.
-    - burp!
     - belchs
-    - belchs.
-    - belchs!
     - burps
-    - burps.
-    - burps!
     - belches
-    - belches.
-    - belches!