Merge branch 'master' into Wizmerge-18/02

DeltaV-Station · Feb 18, 2024 · 438c71c · 438c71c
2 parents 89383ab + fe94160
commit 438c71c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 42 deletions.
diff --git a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml
@@ -9,26 +9,6 @@
   categories:
   - UplinkUtility
 
-#- type: listing
-#  id: UplinkCyborgBeaconSyndicate
-#  name: uplink-borg-beacon-name
-#  description: uplink-borg-beacon-desc
-#  productEntity: CyborgBeaconSyndicate
-#  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio }
-#  cost:
-#    Telecrystal: 65
-#  categories:
-#    - UplinkUtility
-#  conditions:
-#    - !type:StoreWhitelistCondition
-#      whitelist:
-#        tags:
-#          - NukeOpsUplink
-#    - !type:BuyerWhitelistCondition
-#      blacklist:
-#        components:
-#          - SurplusBundle
-
 - type: listing
   id: UplinkBionicSyrinxImplanter
   name: uplink-bionic-syrinx-implanter-name
@@ -45,4 +25,4 @@
   - !type:BuyerWhitelistCondition
     blacklist:
       components:
-      - SurplusBundle
+      - SurplusBundle
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Syndicate_Gadgets/borg_beacon.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Syndicate_Gadgets/borg_beacon.yml