Merge branch 'master' into shielded-cables

new-frontiers-14 · Sep 17, 2024 · 45d8c52 · 45d8c52
2 parents f506636 + 28c27e2
commit 45d8c52
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -7020,3 +7020,9 @@ Entries:
       message: Added 9 NFSD themed signs!
   id: 5278
   time: '2024-09-16T21:37:35.0000000+00:00'
+- author: RealJoesphStalin
+  changes:
+    - type: Tweak
+      message: Added encryption keys to the astrovend.
+  id: 5279
+  time: '2024-09-16T22:28:49.0000000+00:00'
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/astrovend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/astrovend.yml
@@ -12,8 +12,14 @@
     ClothingMaskGas: 10
     JetpackMiniFilled: 10
     JetpackBlue: 10
-    EncryptionKeyTraffic: 30
     HandHeldMassScanner: 10
+# Keys
+    EncryptionKeyCommon: 3
+    EncryptionKeyTraffic: 3
+    EncryptionKeyMedical: 3
+    EncryptionKeyCargo: 3
+    EncryptionKeyEngineering: 3
+    EncryptionKeyScience: 3
 # Pilot drip
     ClothingBackpackPilot: 3
     ClothingBackpackDuffelPilot: 3
@@ -46,8 +52,14 @@
     ClothingMaskGas: 4294967295 # Infinite
     JetpackMiniFilled: 4294967295 # Infinite
     JetpackBlue: 4294967295 # Infinite
-    EncryptionKeyTraffic: 4294967295 # Infinite
     HandHeldMassScanner: 4294967295 # Infinite
+# Keys
+    EncryptionKeyCommon: 4294967295 # Infinite
+    EncryptionKeyTraffic: 4294967295 # Infinite
+    EncryptionKeyMedical: 4294967295 # Infinite
+    EncryptionKeyCargo: 4294967295 # Infinite
+    EncryptionKeyEngineering: 4294967295 # Infinite
+    EncryptionKeyScience: 4294967295 # Infinite
 # Pilot drip
     ClothingBackpackPilot: 3
     ClothingBackpackDuffelPilot: 3

diff --git a/Resources/Prototypes/_NF/Entities/Mobs/Species/goblin.yml b/Resources/Prototypes/_NF/Entities/Mobs/Species/goblin.yml
@@ -45,7 +45,7 @@
         Blunt: 1
   - type: Stamina
   - type: PseudoItem
-    shape: # Parallelogram, 16 squares (vs. 26 for felinid bean)
+    shape: # Parallelogram, 16 squares (vs. 26 for felinid bean) - TODO: fix odd rotation, swapped X/Y values.
       - 0,0,0,3
       - 1,1,1,4
       - 2,2,2,5

diff --git a/Resources/Prototypes/_NF/Mail/Items/misc.yml b/Resources/Prototypes/_NF/Mail/Items/misc.yml
@@ -169,7 +169,7 @@
   - type: Storage
     maxItemSize: Ginormous
     grid:
-    - 0,0,3,3
+    - 0,0,6,4
     whitelist:
       components:
         - HumanoidAppearance