Merge branch 'master' into upsteam-merge

Fansana · Jul 27, 2024 · 321ae64 · 321ae64
2 parents 556605f + 5833e6e
commit 321ae64
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 13 deletions.
diff --git a/Resources/Changelog/Floof.yml b/Resources/Changelog/Floof.yml
@@ -229,3 +229,27 @@ Entries:
         cryopods!
   id: 33
   time: '2024-07-26T01:07:22.0000000+00:00'
+- author: Fansana
+  changes:
+    - type: Remove
+      message: ability for felinids to speak sol common
+  id: 34
+  time: '2024-07-27T08:34:31.0000000+00:00'
+- author: Fansana
+  changes:
+    - type: Remove
+      message: thieving from felinids
+  id: 35
+  time: '2024-07-27T08:41:38.0000000+00:00'
+- author: Fansana
+  changes:
+    - type: Add
+      message: add thieving trait back to felinids
+  id: 36
+  time: '2024-07-27T08:51:07.0000000+00:00'
+- author: Fansana
+  changes:
+    - type: Add
+      message: N2 are available for everybody now
+  id: 37
+  time: '2024-07-27T09:03:57.0000000+00:00'
diff --git a/Resources/Prototypes/Loadouts/items.yml b/Resources/Prototypes/Loadouts/items.yml
@@ -204,3 +204,24 @@
   cost: 3
   items:
     - SolCommonTranslator
+    -
+- type: loadout
+  id: LoadoutEmergencyNitrogenTank
+  category: Items
+  cost: 1
+  items:
+  - EmergencyNitrogenTankFilled
+
+- type: loadout
+  id: LoadoutExtendedEmergencyNitrogenTank
+  category: Items
+  cost: 2
+  items:
+  - ExtendedEmergencyNitrogenTankFilled
+
+- type: loadout
+  id: LoadoutDoubleEmergencyNitrogenTank
+  category: Items
+  cost: 3
+  items:
+  - DoubleEmergencyNitrogenTankFilled
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
@@ -68,17 +68,10 @@
   - type: LanguageKnowledge
     speaks:
     - GalacticCommon
-    - SolCommon
     - Nekomimetic
     understands:
     - GalacticCommon
-    - SolCommon
     - Nekomimetic
-  - type: Thieving
-    ignoreStripHidden: true
-    stealth: Subtle
-    stripTimeReduction: 0
-    stripTimeMultiplier: 0.667
 
 - type: entity
   save: false

diff --git a/Resources/Prototypes/Traits/skills.yml b/Resources/Prototypes/Traits/skills.yml
@@ -25,9 +25,4 @@
       ignoreStripHidden: true
       stealth: Subtle
       stripTimeReduction: 0
-      stripTimeMultiplier: 0.667
-  requirements:
-    - !type:CharacterSpeciesRequirement
-      inverted: true
-      species:
-        - Felinid
+      stripTimeMultiplier: 0.667