Add the Syndicate Delivery Console + Corpsman Medicine Bundle (#41201)

* Initial commit

* Add a note to not abuse the darrrrn machine

* Remove nukie planet (hopefully) and fix duffelbag

* jug solution name

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>

diff --git a/Resources/Locale/en-US/store/categories.ftl b/Resources/Locale/en-US/store/categories.ftl
index 64ed0b5c637aa3ab178f9dce9544d4c42239b971..4469a576cd87262beb2aa2da35124931bd8eb6c2 100644 (file)
--- a/Resources/Locale/en-US/store/categories.ftl
+++ b/Resources/Locale/en-US/store/categories.ftl
@@ -24,3 +24,5 @@ store-caregory-spellbook-utility = Utility Spells
 store-caregory-spellbook-equipment = Wizard Equipment
 store-caregory-spellbook-events = Event Spells
 
+# Nukie Delivery
+store-category-nukie-delivery = Offers

diff --git a/Resources/Locale/en-US/store/nukie-delivery.ftl b/Resources/Locale/en-US/store/nukie-delivery.ftl
new file mode 100644 (file)
index 0000000..4c5f4bf
--- /dev/null
+++ b/Resources/Locale/en-US/store/nukie-delivery.ftl
@@ -0,0 +1,3 @@
+nukie-delivery-medicine-bundle-name = Corpsman Medicine Bundle
+nukie-delivery-medicine-bundle-desc = Contains jugs of basic medicine that are essential for any Nuclear Operation:
+  Bicaridine, Puncturase, Dermaline, Dylovene, Hyronalin, Saline, Dexalin Plus and Tranexamic Acid.

diff --git a/Resources/Locale/en-US/store/store.ftl b/Resources/Locale/en-US/store/store.ftl
index 9a9d75f4c05c974e20b08ebe040b2ae62c463100..209e1439342d0c24fc968b70f23fe1a279067e41 100644 (file)
--- a/Resources/Locale/en-US/store/store.ftl
+++ b/Resources/Locale/en-US/store/store.ftl
@@ -14,4 +14,5 @@ store-not-account-owner = This {$store} is not bound to you!
 
 store-preset-name-uplink = Uplink
 store-preset-name-spellbook = Spellbook
+store-preset-name-nukie-delivery = NukeOps Bluespace Delivery
 store-preset-name-changeling = DNA Store

diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
index 7d7c4385a19915a9920a5586a1e42c6b1f413cdc..a39576eafee80e1e8f56ef34d93e889724531e38 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -34,6 +34,25 @@
         - id: ClothingHandsGlovesNitrile
         - id: EmergencyRollerBedSpawnFolded
 
+- type: entity
+  parent: ClothingBackpackDuffelSyndicateMedicalBundle
+  id: ClothingBackpackDuffelSyndicateFilledMedicine
+  name: syndicate medicine duffel bag
+  description: A large duffel bag containing essential medicinal reagents.
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:AllSelector
+        children:
+        - id: JugBicaridine
+        - id: JugPuncturase
+        - id: JugDermaline
+        - id: JugDylovene
+        - id: JugHyronalin
+        - id: JugSaline
+        - id: JugDexalinPlus
+        - id: JugTranexamicAcid
+
 - type: entity
   parent: ClothingBackpackDuffelSyndicateBundle
   id: ClothingBackpackDuffelSyndicateFilledShotgun

diff --git a/Resources/Prototypes/Catalog/nukie_delivery_catalog.yml b/Resources/Prototypes/Catalog/nukie_delivery_catalog.yml
new file mode 100644 (file)
index 0000000..400724b
--- /dev/null
+++ b/Resources/Prototypes/Catalog/nukie_delivery_catalog.yml
@@ -0,0 +1,19 @@
+# The Nukie Catalog is -not- meant to be a "here's free equipment lmao" shop.
+# Anything listed in here should aim to leverage the actual benefits of the console:
+# 1. Equipment that should only be available in -limited numbers- for the Nukie team as a whole.
+# 2. Equipment that should be timegated/locked to the Nukie planet.
+# 3. Equipment that benefit from the team knowing it's been purchased/claimed.
+# If you can't justify these benefits, consider other options: Uplinks, Starting Loadouts & Mapping on the planet/shuttle.
+# NOTE: At the moment of writing the store doesn't take TC, but if you can find a scenario where pooling TC works with the above benefits, that could be changed.
+
+- type: listing
+  id: NukieDeliveryMedicineBundle
+  name: nukie-delivery-medicine-bundle-name
+  description: nukie-delivery-medicine-bundle-desc
+  productEntity: ClothingBackpackDuffelSyndicateFilledMedicine
+  categories:
+  - NukieDelivery
+  restockTime: 1200
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemical-containers.yml b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemical-containers.yml
index 8c2199c04a323a51ef4c70473f20ef1748846148..34868ac653bc83e911ff1bbb6041a1f99ecb85f4 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemical-containers.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemical-containers.yml
@@ -473,3 +473,123 @@
         reagents:
         - ReagentId: WeldingFuel
           Quantity: 200
+
+- type: entity
+  parent: Jug
+  suffix: bicaridine
+  id: JugBicaridine
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Label
+    currentLabel: reagent-name-bicaridine
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: Bicaridine
+          Quantity: 200
+
+- type: entity
+  parent: Jug
+  suffix: puncturase
+  id: JugPuncturase
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Label
+    currentLabel: reagent-name-puncturase
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: Puncturase
+          Quantity: 200
+
+- type: entity
+  parent: Jug
+  suffix: dermaline
+  id: JugDermaline
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Label
+    currentLabel: reagent-name-dermaline
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: Dermaline
+          Quantity: 200
+
+- type: entity
+  parent: Jug
+  suffix: dylovene
+  id: JugDylovene
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Label
+    currentLabel: reagent-name-dylovene
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: Dylovene
+          Quantity: 200
+
+- type: entity
+  parent: Jug
+  suffix: tranexamic acid
+  id: JugTranexamicAcid
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Label
+    currentLabel: reagent-name-tranexamic-acid
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: TranexamicAcid
+          Quantity: 200
+
+- type: entity
+  parent: Jug
+  suffix: hyronalin
+  id: JugHyronalin
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Label
+    currentLabel: reagent-name-hyronalin
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: Hyronalin
+          Quantity: 200
+
+- type: entity
+  parent: Jug
+  suffix: saline
+  id: JugSaline
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Label
+    currentLabel: reagent-name-saline
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: Saline
+          Quantity: 200
+
+- type: entity
+  parent: Jug
+  suffix: dexalin plus
+  id: JugDexalinPlus
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Label
+    currentLabel: reagent-name-dexalin-plus
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: DexalinPlus
+          Quantity: 200

diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
index 0bc3e0487e5457fdad9aeb450b59398174ae6cd0..d73ae2c660c885f747f5627a7887474921e72bf5 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -1726,3 +1726,38 @@
         type: StationAiFixerConsoleBoundUserInterface
       enum.WiresUiKey.Key:
         type: WiresBoundUserInterface
+
+- type: entity
+  parent: BaseComputer
+  id: ComputerNukieDelivery
+  name: syndicate delivery computer
+  description: "A computer that can bluespace in certain equipment for Nuclear Operations. \nThe circuitboard is integrated into the frame and can't be recovered if deconstructed."
+  components:
+  - type: Sprite
+    layers:
+    - map: ["computerLayerBody"]
+      state: computer
+    - map: ["computerLayerKeyboard"]
+      state: generic_keyboard
+    - map: ["computerLayerScreen"]
+      state: request-syndie
+    - map: ["computerLayerKeys"]
+      state: syndie_generic_keys
+    - map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
+      state: generic_panel_open
+  # - type: Computer
+  #   board: SyndicateCommsComputerCircuitboard
+  - type: PointLight
+    radius: 1.5
+    energy: 1.6
+    color: "#f71713"
+  - type: UserInterface
+    interfaces:
+      enum.StoreUiKey.Key:
+        type: StoreBoundUserInterface
+  - type: ActivatableUI
+    key: enum.StoreUiKey.Key
+  - type: Store
+    name: store-preset-name-nukie-delivery
+    categories:
+    - NukieDelivery

diff --git a/Resources/Prototypes/Store/categories.yml b/Resources/Prototypes/Store/categories.yml
index cb11de7848f5fd6b9dcb40849512a25506068f2b..ccdb349d9c153e684557d1f23dde854f308c148e 100644 (file)
--- a/Resources/Prototypes/Store/categories.yml
+++ b/Resources/Prototypes/Store/categories.yml
@@ -89,6 +89,12 @@
   name: store-category-pointless
   priority: 10
 
+#nukie delivery
+
+- type: storeCategory
+  id: NukieDelivery
+  name: store-category-nukie-delivery
+
 #revenant
 - type: storeCategory
   id: RevenantAbilities

diff --git a/Resources/Textures/Structures/Machines/computers.rsi/meta.json b/Resources/Textures/Structures/Machines/computers.rsi/meta.json
index ebb9a875dd477ddff0dc1a85285dee15c1e890e1..43be310a95cd3bb99db6d719f9b6d4db94f00cf8 100644 (file)
--- a/Resources/Textures/Structures/Machines/computers.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/computers.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bd6873fd4dd6a61d7e46f1d75cd4d90f64c40894. comm_syndie made by Veritius, based on comm. generic_panel_open made by Errant, commit https://github.com/space-wizards/space-station-14/pull/32273, comms_wizard and wizard_key by ScarKy0, request- variants transfer made by EmoGarbage404 (github), xenorobot by Samuka-C (github), ai-fixer-progress and -purge sprites made by chromiumboy",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bd6873fd4dd6a61d7e46f1d75cd4d90f64c40894. comm_syndie made by Veritius, based on comm. generic_panel_open made by Errant, commit https://github.com/space-wizards/space-station-14/pull/32273, comms_wizard and wizard_key by ScarKy0, request- variants transfer made by EmoGarbage404 (github), xenorobot by Samuka-C (github), ai-fixer-progress and -purge sprites made by chromiumboy, generic_syndie_keys and request-syndie modified from generic_keys and request by SlamBamActionman",
   "size": {
     "x": 32,
     "y": 32
@@ -1908,6 +1908,44 @@
                 ]
             ]
         },
+        {
+            "name": "request-syndie",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
         {
             "name": "robot",
             "directions": 4
@@ -2048,6 +2086,10 @@
             "name": "syndie_key",
             "directions": 4
         },
+        {
+            "name": "syndie_generic_keys",
+            "directions": 4
+        },
         {
             "name": "syndie_key_off",
             "directions": 4

diff --git a/Resources/Textures/Structures/Machines/computers.rsi/request-syndie.png b/Resources/Textures/Structures/Machines/computers.rsi/request-syndie.png
new file mode 100644 (file)
index 0000000..b2befe7
Binary files /dev/null and b/Resources/Textures/Structures/Machines/computers.rsi/request-syndie.png differ

diff --git a/Resources/Textures/Structures/Machines/computers.rsi/syndie_generic_keys.png b/Resources/Textures/Structures/Machines/computers.rsi/syndie_generic_keys.png
new file mode 100644 (file)
index 0000000..e5b0de3
Binary files /dev/null and b/Resources/Textures/Structures/Machines/computers.rsi/syndie_generic_keys.png differ