Merge branch 'master' into 2024-11-22-AjustedMerc

new-frontiers-14 · Dec 26, 2024 · d9dc7a8 · d9dc7a8
2 parents e52035a + ecd0e54
commit d9dc7a8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
@@ -6116,3 +6116,9 @@ Entries:
       message: Spesos and spessos now support custom split amounts.
   id: 5613
   time: '2024-12-26T20:21:42.0000000+00:00'
+- author: Bonaout
+  changes:
+    - type: Tweak
+      message: Pirate PDAs now have the AstroNav program
+  id: 5614
+  time: '2024-12-26T21:07:18.0000000+00:00'
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -379,8 +379,8 @@
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.90
-        Slash: 0.90
+        Blunt: 0.95 # Frontier 0.90<0.95
+        Slash: 0.95 # Frontier 0.90<0.95
         Piercing: 0.95
         Heat: 0.95
 

diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -889,6 +889,7 @@
     uiKey: enum.PdaUiKey.Key
     preinstalled:
       - NotekeeperCartridge
+      - AstroNavCartridge # Frontier
 
 - type: entity
   parent: BaseSecurityPDA