Merge branch 'master' into feature/ship-rcd

new-frontiers-14 · Mar 18, 2024 · d110bfb · d110bfb
2 parents 0edb95c + 8dcb88a
commit d110bfb
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 26 deletions.
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -3737,3 +3737,9 @@ Entries:
   changes: []
   id: 4875
   time: '2024-03-18T16:46:12.0000000+00:00'
+- author: ThatOneGoblin25
+  changes:
+    - type: Add
+      message: Liberation Station now offers slug rounds.
+  id: 4876
+  time: '2024-03-18T18:39:07.0000000+00:00'
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml
@@ -8,6 +8,7 @@
     MagazineBoxLightRiflePractice: 15
     MagazineBoxLightRifleRubber: 15
     WeaponShotgunDoubleBarreled: 15
+    BoxShotgunSlug: 15
     BoxLethalshot: 15
     BoxBeanbag: 15
     BoxShellTranquilizer: 15

diff --git a/Resources/Prototypes/_NF/Shipyard/Security/opportunity.yml b/Resources/Prototypes/_NF/Shipyard/Security/opportunity.yml
@@ -1,27 +1,27 @@
-- type: vessel
-  id: Opportunity
-  name: NSF Opportunity
-  description: A medium expeditionary prison vessel capable of incarcerating up to 4 criminals. The ship is capable of planetfall and mining operations. Find a reliable crew of prison guards to help you keep your prisoners in line.
-  price: 70000
-  category: Medium
-  group: Disabled
-  shuttlePath: /Maps/_NF/Shuttles/Security/opportunity.yml
+# - type: vessel
+  # id: Opportunity
+  # name: NSF Opportunity
+  # description: A medium expeditionary prison vessel capable of incarcerating up to 4 criminals. The ship is capable of planetfall and mining operations. Find a reliable crew of prison guards to help you keep your prisoners in line.
+  # price: 70000
+  # category: Medium
+  # group: Security
+  # shuttlePath: /Maps/_NF/Shuttles/Security/opportunity.yml
 
-- type: gameMap
-  id: Opportunity
-  mapName: 'NSF Opportunity'
-  mapPath: /Maps/_NF/Shuttles/Security/opportunity.yml
-  minPlayers: 0
-  stations:
-    Opportunity:
-      stationProto: StandardFrontierSecurityExpeditionVessel
-      components:
-        - type: StationNameSetup
-          mapNameTemplate: 'Opportunity {1}'
-          nameGenerator:
-            !type:NanotrasenNameGenerator
-            prefixCreator: '14'
-        - type: StationJobs
-          overflowJobs: []
-          availableJobs:
-            Prisoner: [ 0, 0 ]
+# - type: gameMap
+  # id: Opportunity
+  # mapName: 'NSF Opportunity'
+  # mapPath: /Maps/_NF/Shuttles/Security/opportunity.yml
+  # minPlayers: 0
+  # stations:
+    # Opportunity:
+      # stationProto: StandardFrontierSecurityExpeditionVessel
+      # components:
+        # - type: StationNameSetup
+          # mapNameTemplate: 'Opportunity {1}'
+          # nameGenerator:
+            # !type:NanotrasenNameGenerator
+            # prefixCreator: '14'
+        # - type: StationJobs
+          # overflowJobs: []
+          # availableJobs:
+            # Prisoner: [ 0, 0 ]