]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Nukie med bundle now costs 24 tc and contains a unique defibrillator (#32720)
authorAlzore <140123969+Blackern5000@users.noreply.github.com>
Wed, 30 Oct 2024 09:15:30 +0000 (04:15 -0500)
committerGitHub <noreply@github.com>
Wed, 30 Oct 2024 09:15:30 +0000 (10:15 +0100)
* a-few-injectors

* comment

* defib-ops-when

24 files changed:
Resources/Locale/en-US/store/uplink-catalog.ftl
Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
Resources/Prototypes/Catalog/uplink_catalog.yml
Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml
Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/ready.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/screen.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/ready.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/screen.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Medical/medipen.rsi/dexpen.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Medical/medipen.rsi/dexpen_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json
Resources/Textures/Objects/Specific/Medical/medipen.rsi/punctpen.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Medical/medipen.rsi/punctpen_empty.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Medical/medipen.rsi/pyrapen.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Medical/medipen.rsi/pyrapen_empty.png [new file with mode: 0644]

index b3ea4b7251294f714ba40d1c7e1a83df7725ea3f..a78f39d5696f07a6c12d26ae96ee701056ff2dc7 100644 (file)
@@ -216,8 +216,8 @@ uplink-chemistry-kit-desc = A starter kit for the aspiring chemist, includes tox
 uplink-knives-kit-name = Throwing Knives Kit
 uplink-knives-kit-desc = A set of 4 syndicate branded throwing knives, perfect for embedding into the body of your victims.
 
-uplink-meds-bundle-name = Medical Bundle
-uplink-meds-bundle-desc = All you need to get your comrades back in the fight: mainly a combat medkit, a defibrillator and three combat medipens.
+uplink-meds-bundle-name = Interdyne Medical Bundle
+uplink-meds-bundle-desc = An assortment of autoinjectors and premium medical equipment to cover for every possible situation. Contains an elite compact defibrillator that can be used as a weapon.
 
 uplink-ammo-bundle-name = Ammo Bundle
 uplink-ammo-bundle-desc = Reloading! Contains 4 magazines for the C-20r, 4 drums for the Bulldog, and 2 ammo boxes for the L6 SAW.
index c059f095e1db009f96a59924acd6ebda6f9246ee..75b3a290659cec85339db7a83126a63ff6811775 100644 (file)
   components:
   - type: StorageFill
     contents:
+      - id: DefibrillatorSyndicate
       - id: MedkitCombatFilled
-      - id: Defibrillator
+        amount: 4
+      - id: Tourniquet
+        amount: 4
       - id: CombatMedipen
-        amount: 3
-      - id: ClothingHandsGlovesNitrile
-      - id: SyringeTranexamicAcid
-      - id: SyringeHyronalin
+        amount: 4
+      - id: PunctAutoInjector
+        amount: 4
+      - id: PyraAutoInjector
+        amount: 4
+      - id: AirlossAutoInjector
+        amount: 4
 
 - type: entity
   parent: ClothingBackpackDuffelSyndicateBundle
index 748a65b761a28fc4b66c07e8754356bef3dfc63b..f31d85414d47f106c531fa84c51be93fc2804104 100644 (file)
   productEntity: ClothingBackpackDuffelSyndicateMedicalBundleFilled
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 12
+    Telecrystal: 16
   cost:
-    Telecrystal: 20
+    Telecrystal: 24
   categories:
   - UplinkChemicals
   conditions:
index 69c106efab133d96f24bad0c6eaaa0af223a0716..fb0f3d52c681bcc4f6d718fdd6a084aaa7b5415d 100644 (file)
   id: DefibrillatorOneHandedUnpowered
   parent: BaseDefibrillator
   suffix: One-Handed, Unpowered
+
+- type: entity
+  id: DefibrillatorCompact # This should be a research item at some point
+  parent: [ BaseDefibrillator, PowerCellSlotMediumItem ]
+  name: compact defibrillator
+  description: Now in fun size!
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/defibsmall.rsi
+    layers:
+      - state: icon
+      - state: screen
+        map: [ "enum.ToggleVisuals.Layer" ]
+        visible: false
+        shader: unshaded
+      - state: ready
+        map: ["enum.PowerDeviceVisualLayers.Powered"]
+        shader: unshaded
+  - type: Item
+    size: Normal
+  - type: ToggleCellDraw
+  - type: PowerCellDraw
+    useRate: 100
+  - type: Defibrillator
+    zapHeal:
+      types:
+        Asphyxiation: -40
+    doAfterDuration: 6
+  - type: DoAfter
+  - type: UseDelay
+
+- type: entity
+  id: DefibrillatorSyndicate
+  parent: DefibrillatorCompact
+  name: interdyne defibrillator
+  description: Doubles as a self-defense weapon against war-crime inclined tiders.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/defibsyndi.rsi
+    layers:
+      - state: icon
+      - state: screen
+        map: [ "enum.ToggleVisuals.Layer" ]
+        visible: false
+        shader: unshaded
+      - state: ready
+        map: ["enum.PowerDeviceVisualLayers.Powered"]
+        shader: unshaded
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 8
+  - type: ItemToggleMeleeWeapon
+    activatedSoundOnHit:
+      path: /Audio/Items/Defib/defib_zap.ogg
+      params:
+        variation: 0.250
+    activatedSoundOnHitNoDamage:
+      path: /Audio/Items/Defib/defib_zap.ogg
+      params:
+        variation: 0.250
+        volume: -10
+    activatedDamage:
+      types:
+        Blunt: 8
+        Shock: 16
index c81af6e12801305ae78184be3a261a73af6f7e0a..93eeef2073c6a6400ef4be788a9ed850a8c4b9ad 100644 (file)
     transferAmount: 20
     onlyAffectsMobs: false
     injectOnly: true
-
   - type: SolutionContainerManager
     solutions:
       pen:
   - type: Tag
     tags: []
 
+- type: entity
+  name: puncturase auto-injector
+  parent: ChemicalMedipen
+  id: PunctAutoInjector
+  description: A rapid dose of puncturase and tranexamic acid, intended for combat applications.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/medipen.rsi
+    layers:
+    - state: punctpen
+      map: ["enum.SolutionContainerLayers.Fill"]
+  - type: SolutionContainerVisuals
+    maxFillLevels: 1
+    changeColor: false
+    emptySpriteName: punctpen_empty
+  - type: Hypospray
+    solutionName: pen
+    transferAmount: 15
+    onlyAffectsMobs: false
+    injectOnly: true
+  - type: SolutionContainerManager
+    solutions:
+      pen:
+        maxVol: 15
+        reagents:
+        - ReagentId: Puncturase
+          Quantity: 10
+        - ReagentId: TranexamicAcid
+          Quantity: 5
+  - type: Tag
+    tags: []
+
+- type: entity
+  name: pyrazine auto-injector
+  parent: ChemicalMedipen
+  id: PyraAutoInjector
+  description: A rapid dose of pyrazine and dermaline, intended for combat applications.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/medipen.rsi
+    layers:
+    - state: pyrapen
+      map: ["enum.SolutionContainerLayers.Fill"]
+  - type: SolutionContainerVisuals
+    maxFillLevels: 1
+    changeColor: false
+    emptySpriteName: pyrapen_empty
+  - type: Hypospray
+    solutionName: pen
+    transferAmount: 20
+    onlyAffectsMobs: false
+    injectOnly: true
+  - type: SolutionContainerManager
+    solutions:
+      pen:
+        maxVol: 20
+        reagents:
+        - ReagentId: Pyrazine
+          Quantity: 10
+        - ReagentId: Dermaline
+          Quantity: 10
+  - type: Tag
+    tags: []
+
+- type: entity
+  name: airloss auto-injector
+  parent: ChemicalMedipen
+  id: AirlossAutoInjector
+  description: A rapid dose of saline and dexalin plus, intended to get someone up quickly.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/medipen.rsi
+    layers:
+    - state: dexpen
+      map: ["enum.SolutionContainerLayers.Fill"]
+  - type: SolutionContainerVisuals
+    maxFillLevels: 1
+    changeColor: false
+    emptySpriteName: dexpen_empty
+  - type: Hypospray
+    solutionName: pen
+    transferAmount: 40
+    onlyAffectsMobs: false
+    injectOnly: true
+  - type: SolutionContainerManager
+    solutions:
+      pen:
+        maxVol: 40
+        reagents:
+        - ReagentId: Saline
+          Quantity: 20
+        - ReagentId: DexalinPlus
+          Quantity: 20
+  - type: Tag
+    tags: []
+
 - type: entity
   name: space medipen
   parent: ChemicalMedipen
diff --git a/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/icon.png b/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/icon.png
new file mode 100644 (file)
index 0000000..99a1508
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..42d3198
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..a2317f7
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/meta.json
new file mode 100644 (file)
index 0000000..441fd4f
--- /dev/null
@@ -0,0 +1,28 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Created by EmoGarbage404 (github) for Space Staiton 14 and modified by alzore_(Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "ready"
+    },
+    {
+      "name": "screen"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/ready.png b/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/ready.png
new file mode 100644 (file)
index 0000000..cc4b274
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/ready.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/screen.png b/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/screen.png
new file mode 100644 (file)
index 0000000..1a2ac1c
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/screen.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/icon.png b/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/icon.png
new file mode 100644 (file)
index 0000000..69c4e44
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..ac0c8d6
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..c30877c
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/meta.json
new file mode 100644 (file)
index 0000000..441fd4f
--- /dev/null
@@ -0,0 +1,28 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Created by EmoGarbage404 (github) for Space Staiton 14 and modified by alzore_(Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "ready"
+    },
+    {
+      "name": "screen"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/ready.png b/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/ready.png
new file mode 100644 (file)
index 0000000..e5a8065
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/ready.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/screen.png b/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/screen.png
new file mode 100644 (file)
index 0000000..0c7a26a
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/screen.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/dexpen.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/dexpen.png
new file mode 100644 (file)
index 0000000..7a8ebfe
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/dexpen.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/dexpen_empty.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/dexpen_empty.png
new file mode 100644 (file)
index 0000000..28c0b3c
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/dexpen_empty.png differ
index 8e9f54f1d0689b42b307f4ac996bf763ae1f4086..8872f25f52c68a2684bdccf6ee4822847ccc3689 100644 (file)
     },
     {
       "name": "medipen-inhand-right"
+    },
+    {
+      "name": "punctpen"
+    },
+    {
+      "name": "punctpen_empty"
+    },
+    {
+      "name": "pyrapen"
+    },
+    {
+      "name": "pyrapen_empty"
+    },
+    {
+      "name": "dexpen"
+    },
+    {
+      "name": "dexpen_empty"
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/punctpen.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/punctpen.png
new file mode 100644 (file)
index 0000000..fa529e8
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/punctpen.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/punctpen_empty.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/punctpen_empty.png
new file mode 100644 (file)
index 0000000..4bd9cd4
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/punctpen_empty.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/pyrapen.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/pyrapen.png
new file mode 100644 (file)
index 0000000..fee075c
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/pyrapen.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/pyrapen_empty.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/pyrapen_empty.png
new file mode 100644 (file)
index 0000000..02dfcae
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/pyrapen_empty.png differ