Merge branch 'Fansana:master' into Ghost-Role-Bar

Fansana · Sep 6, 2024 · 886574f · 886574f
2 parents 237ff14 + e542c39
commit 886574f
Show file tree

Hide file tree

Showing 13 changed files with 116 additions and 3 deletions.
diff --git a/Resources/Changelog/Floof.yml b/Resources/Changelog/Floof.yml
@@ -845,3 +845,15 @@ Entries:
       message: metabolism restrictions
   id: 115
   time: '2024-09-04T05:12:40.0000000+00:00'
+- author: Memeji
+  changes:
+    - type: Fix
+      message: Survival not creating events.
+  id: 116
+  time: '2024-09-05T04:20:01.0000000+00:00'
+- author: Xavier and Satchmo
+  changes:
+    - type: Add
+      message: Spider Language, with translators and implants!
+  id: 117
+  time: '2024-09-05T04:21:07.0000000+00:00'
diff --git a/Resources/ConfigPresets/Build/debug.toml b/Resources/ConfigPresets/Build/debug.toml
@@ -1,6 +1,6 @@
 [events]
-# Annoying
-enabled = false
+# Annoying - setting to false disabled all events.
+enabled = true
 
 [shuttle]
 auto_call_time = 0
diff --git a/Resources/Fonts/StrawSerifRegular.ttf b/Resources/Fonts/StrawSerifRegular.ttf
diff --git a/Resources/Locale/en-US/language/languages.ftl b/Resources/Locale/en-US/language/languages.ftl
@@ -80,4 +80,7 @@ language-Hissing-name = Hissing
 language-Hissing-description = Hiss!
 
 language-ScugSign-name = ScugSign
-language-ScugSign-description = Wawa! The secret ScugSign making you able to understand your fellows scug!
+language-ScugSign-description = Wawa! The secret ScugSign making you able to understand your fellows scug!
+
+language-Arachnic-name = Arachnic
+language-Arachnic-description = The language of arachnids is composed of mostly clicks and hisses, it almost has a rhythmic character to it at times.
diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
@@ -66,6 +66,13 @@
   - type: Speech
     speechVerb: Arachnid
     speechSounds: Arachnid
+  - type: LanguageKnowledge
+    speaks:
+    - GalacticCommon
+    - Arachnic 
+    understands:
+    - GalacticCommon
+    - Arachnic
   - type: Vocal
     sounds:
       Male: UnisexArachnid

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -359,6 +359,8 @@
       - AnimalTranslator
       - MofficTranslatorImplanter
       - MofficTranslator
+      - ArachnicTranslatorImplanter
+      - ArachnicTranslator
   - type: EmagLatheRecipes
     emagDynamicRecipes:
       - ExplosivePayload

diff --git a/Resources/Prototypes/Floof/Entities/Objects/Devices/translator_implants.yml b/Resources/Prototypes/Floof/Entities/Objects/Devices/translator_implants.yml
@@ -0,0 +1,14 @@
+- type: entity
+  parent: BaseSubdermalImplant
+  id: ArachnicTranslatorImplant
+  name: Arachnic translator implant
+  description: A translator implant that sadly doesn't help you communicate with space spiders. It does allow you to communicate with Arachnid people!
+  noSpawn: true
+  components:
+  - type: TranslatorImplant
+    understood:
+    - Arachnic
+    spoken:
+    - Arachnic
+    requires:
+    - GalacticCommon
diff --git a/Resources/Prototypes/Floof/Entities/Objects/Devices/translators.yml b/Resources/Prototypes/Floof/Entities/Objects/Devices/translators.yml
@@ -0,0 +1,16 @@
+- type: entity
+  id: ArachnicTranslator
+  parent: [ TranslatorPoweredBase ]
+  name: Arachnic translator
+  description: Translates speech between Arachnic and Galactic Common, which won't get through to spiders that walk on more than 2 legs.
+  components:
+  - type: HandheldTranslator
+    spoken:
+    - GalacticCommon
+    - Arachnic
+    understood:
+    - GalacticCommon
+    - Arachnic
+    requires:
+    - GalacticCommon
+    - Arachnic
diff --git a/Resources/Prototypes/Floof/Entities/Objects/Misc/translator_implanters.yml b/Resources/Prototypes/Floof/Entities/Objects/Misc/translator_implanters.yml
@@ -0,0 +1,7 @@
+- type: entity
+  id: ArachnicTranslatorImplanter
+  parent: [ BaseTranslatorImplanter ]
+  name: arachnic translator implant
+  components:
+  - type: Implanter
+    implant: ArachnicTranslatorImplant
diff --git a/Resources/Prototypes/Floof/Language/languages.yml b/Resources/Prototypes/Floof/Language/languages.yml
@@ -0,0 +1,26 @@
+# Spoken by Arachnids.
+- type: language
+  id: Arachnic
+  speech:
+    color: "#909090"
+    fontId: StrawSerif
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 3
+    replacement:
+    - cl'
+    - cl'
+    - tc'h
+    - tc'h
+    - ixl
+    - ch'itl
+    - iztla
+    - xiti
+    - tztli
+    - ztic'a
+    - tzi
+    - h'ss
+    - h'ss
+    - tzz
+    - tzz
diff --git a/Resources/Prototypes/Floof/Recipes/Lathes/language.yml b/Resources/Prototypes/Floof/Recipes/Lathes/language.yml
@@ -0,0 +1,20 @@
+- type: latheRecipe
+  id: ArachnicTranslator
+  result: ArachnicTranslator
+  completetime: 2
+  materials:
+    Steel: 500
+    Glass: 100
+    Plastic: 50
+    Gold: 50
+
+- type: latheRecipe
+  id: ArachnicTranslatorImplanter
+  result: ArachnicTranslatorImplanter
+  completetime: 2
+  materials:
+    Steel: 500
+    Glass: 500
+    Plastic: 100
+    Gold: 50
+    Silver: 50
diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml
@@ -247,6 +247,7 @@
   - RootSpeakTranslator
   - BasicGalaticCommonTranslatorImplanter
   - MofficTranslator
+  - ArachnicTranslator
 
 - type: technology
   id: AdvancedTranslation
@@ -268,3 +269,4 @@
   - RootSpeakTranslatorImplanter
   - AnimalTranslator
   - MofficTranslatorImplanter
+  - ArachnicTranslatorImplanter
diff --git a/Resources/Prototypes/fonts.yml b/Resources/Prototypes/fonts.yml
@@ -61,3 +61,7 @@
 - type: font
   id: Noganas
   path: /Fonts/Noganas.ttf
+
+- type: font
+  id: StrawSerif
+  path: /Fonts/StrawSerifRegular.ttf