Let it rip

Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsdarmory.yml

@@ -93,21 +93,21 @@
     - id: WeaponRevolverInspector
       amount: 4
 
-# - type: entity # Frontier - TODO: Restore this later
-  # id: CrateArmoryNonLethalNfsd
-  # parent: CrateNfsdSecure1
-  # name: nfsd non-lethal armory crate
-  # description: Contains a standard armory stock kit.
-  # components:
-  # - type: StorageFill
-    # contents:
-    # - id: WeaponDisabler
-      # amount: 5
-    # - id: WeaponPistolMk58Nonlethal
-      # amount: 4
-    # - id: WeaponDisablerSMG
-      # amount: 5
-    # - id: WeaponRifleLecterRubber
-      # amount: 4
-    # - id: WeaponShotgunEnforcerRubber
-      # amount: 4
+- type: entity
+  id: CrateArmoryNonLethalNfsd
+  parent: CrateNfsdSecure1
+  name: nfsd non-lethal armory crate
+  description: Contains a standard armory stock kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponDisabler
+      amount: 5
+    - id: WeaponPistolMk58Nonlethal
+      amount: 4
+    - id: WeaponDisablerSMG
+      amount: 5
+    - id: WeaponRifleLecterRubber
+      amount: 4
+    - id: WeaponShotgunEnforcerRubber
+      amount: 4

Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/contravend.yml

@@ -22,3 +22,4 @@
     BoxHoloparasite: 2
     VestineChemistryVial: 2
     HoverbikeSyndicateFlatpack: 3
+    SpaceBladeContra: 1

Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml

@@ -1,19 +1,3 @@
-- type: listing
-  id: UplinkReinforcementRadioSyndicateCyborgAssault1
-  name:  uplink-reinforcement-radio-cyborg-assault-name
-  description: uplink-reinforcement-radio-cyborg-assault-desc
-  productEntity: ReinforcementRadioSyndicateCyborgAssault
-  icon: { sprite: Mobs/Silicon/chassis.rsi, state: synd_sec }
-  cost:
-    FrontierUplinkCoin: 1
-  categories:
-    - UplinkSecurityBundles
-  conditions:
-    - !type:StoreWhitelistCondition
-      whitelist:
-        tags:
-          - SecurityUplink
-
 - type: listing
   id: UplinkSecurityHardsuit
   name:  uplink-security-hardsuit-name
@@ -437,7 +421,6 @@
       whitelist:
         - Sheriff
 
-
 - type: listing
   id: UplinkSecurityHolo
   name:  uplink-security-holo-name
@@ -1207,23 +1190,23 @@
         - SeniorOfficer
         - Sheriff
 
-# - type: listing
-  # id: UplinkSecurityNonLethalArmory
-  # name:  uplink-security-nonlethalarmory-name
-  # description: uplink-security-nonlethalarmory-desc
-  # productEntity: CrateArmoryNonLethalNfsd
-  # icon: { sprite: _NF/Structures/Storage/Crates/nfsd_secure1.rsi, state: icon }
-  # cost:
-    # FrontierUplinkCoin: 10
-  # categories:
-    # - UplinkSecurityUtility
-  # conditions:
-    # - !type:StoreWhitelistCondition
-      # whitelist:
-        # tags:
-          # - SecurityUplink
-    # - !type:BuyerJobCondition
-      # whitelist:
-        # - Bailiff
-        # - SeniorOfficer
-        # - Sheriff
+- type: listing
+  id: UplinkSecurityNonLethalArmory
+  name:  uplink-security-nonlethalarmory-name
+  description: uplink-security-nonlethalarmory-desc
+  productEntity: CrateArmoryNonLethalNfsd
+  icon: { sprite: _NF/Structures/Storage/Crates/nfsd_secure1.rsi, state: icon }
+  cost:
+    FrontierUplinkCoin: 10
+  categories:
+    - UplinkSecurityUtility
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - SecurityUplink
+    - !type:BuyerJobCondition
+      whitelist:
+        - Bailiff
+        - SeniorOfficer
+        - Sheriff

Resources/Prototypes/_NF/Entities/Objects/Fun/spaceblade.yml

@@ -153,6 +153,8 @@
     enabled: true
     radius: 5
     color: "#3db83b"
+  - type: StaticPrice
+    price: 100
 
 - type: entity
   id: SpaceBladeMoff

Resources/Prototypes/_NF/Entities/Objects/Fun/spaceblade_boxes.yml

@@ -0,0 +1,59 @@
+- type: entity
+  id: SpaceBladeBoxTrash
+  parent: MysteryFigureBoxTrash
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Fun/spaceblade.rsi
+    state: sb_box_unfolded
+
+- type: entity
+  parent: MysteryFigureBox
+  id: MysterySpaceBladeBox
+  name: mystery space blade box
+  description: A box containing a mystery space blade. The side of the box depicts a few blacked-out 'rare' space blades.
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Fun/spaceblade.rsi
+    layers:
+      - state: sb_box
+  - type: SpawnItemsOnUse
+    items:
+      - id: SpaceBladeBoxTrash
+      - id: SpaceBlade
+        orGroup: SB
+      - id: SpaceBladeRedBlue
+        orGroup: SB
+      - id: SpaceBladeFrontier
+        orGroup: SB
+      - id: TSpaceBladeGoldBlue
+        orGroup: SB
+      - id: SpaceBladeMail
+        orGroup: SB
+      - id: SpaceBladeEyeball
+        orGroup: SB
+      - id: SpaceBladeBlade
+        orGroup: SB
+      - id: SpaceBladeCheck
+        orGroup: SB
+        prob: 0.20
+      - id: SpaceBladeRune
+        orGroup: SB
+        prob: 0.20
+      - id: SpaceBladeMoff
+        orGroup: SB
+        prob: 0.20
+      - id: SpaceBladePizza
+        orGroup: SB
+        prob: 0.20
+      - id: SpaceBladeWeh
+        orGroup: SB
+        prob: 0.20
+      - id: SpaceBladeClown
+        orGroup: SB
+        prob: 0.10
+      - id: SpaceBladeTesla
+        orGroup: SB
+        prob: 0.10
+      - id: SpaceBladeSingularity
+        orGroup: SB
+        prob: 0.10

Resources/Textures/_NF/Objects/Fun/spaceblade.rsi/meta.json

@@ -7,6 +7,12 @@
     "y": 32
   },
     "states": [
+        {
+            "name": "sb_box"
+        },
+        {
+            "name": "sb_box_unfolded"
+        },
         {
             "name": "redorange"
         },