diff --git a/Resources/Locale/en-US/Goobstation/store/uplink-catalog.ftl b/Resources/Locale/en-US/Goobstation/store/uplink-catalog.ftl index b4792b4135b..256970bb502 100644 --- a/Resources/Locale/en-US/Goobstation/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/Goobstation/store/uplink-catalog.ftl @@ -13,3 +13,6 @@ uplink-pie-cannon-desc = A pie cannon that automatically regenerates pies, one e uplink-mobroach-microbomb-name = SyndiRoach Teleporter uplink-mobroach-microbomb-desc = Call in a handy mothroach equipped with a microbomb implant. Explodes when seriously injured. + +uplink-advanced-combat-medipen-name = Advanced Combat Medipen +uplink-advanced-combat-medipen-desc = An advanced single-use medipen containing chemicals that will rapidly heal most types of damage taken in a fight. diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 7d3ac468b2f..026ad59b921 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -594,7 +594,7 @@ productEntity: CombatMedipen cost: # Goobstation - Telecrystal rework - Telecrystal: 20 + Telecrystal: 12 # Goobstation - Combat pen rebalance categories: - UplinkChemicals diff --git a/Resources/Prototypes/Goobstation/Catalog/uplink_catalog.yml b/Resources/Prototypes/Goobstation/Catalog/uplink_catalog.yml index d63495a00fe..4ab2351fd3c 100644 --- a/Resources/Prototypes/Goobstation/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Goobstation/Catalog/uplink_catalog.yml @@ -100,3 +100,15 @@ Telecrystal: 30 categories: - UplinkAllies + +# chemicals + +- type: listing + id: UplinkAdvancedCombatMedipen + name: uplink-advanced-combat-medipen-name + description: uplink-advanced-combat-medipen-desc + productEntity: AdvancedCombatMedipen + cost: + Telecrystal: 28 + categories: + - UplinkChemicals diff --git a/Resources/Prototypes/Goobstation/Entities/Specific/Medical/medkits.yml b/Resources/Prototypes/Goobstation/Entities/Specific/Medical/medkits.yml new file mode 100644 index 00000000000..1f5eb3dee0a --- /dev/null +++ b/Resources/Prototypes/Goobstation/Entities/Specific/Medical/medkits.yml @@ -0,0 +1,33 @@ +- type: entity + name: advanced combat medipen + parent: ChemicalMedipen + id: AdvancedCombatMedipen + description: A single-use advanced medipen containing chemicals extracted from eldritch beasts. # ethically sourced space dragon blood + components: + - type: Sprite + sprite: Objects/Specific/Medical/medipen.rsi + layers: + - state: advcombatpen + map: ["enum.SolutionContainerLayers.Fill"] + - type: SolutionContainerVisuals + maxFillLevels: 1 + changeColor: false + emptySpriteName: advcombatpen_empty + - type: SolutionContainerManager + solutions: + pen: + maxVol: 40 + reagents: + - ReagentId: Ichor + Quantity: 35 + - ReagentId: TranexamicAcid + Quantity: 5 + - type: Hypospray + solutionName: pen + transferAmount: 40 + onlyAffectsMobs: false + injectOnly: true + - type: StaticPrice + price: 500 + - type: Tag + tags: [] diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/advcombatpen.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/advcombatpen.png new file mode 100644 index 00000000000..4ddeff6e980 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/advcombatpen.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/advcombatpen_empty.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/advcombatpen_empty.png new file mode 100644 index 00000000000..0fd56b0538c Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/advcombatpen_empty.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json index 8e9f54f1d06..7fff34522ad 100644 --- a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json @@ -96,6 +96,12 @@ }, { "name": "medipen-inhand-right" + }, + { + "name": "advcombatpen" + }, + { + "name": "advcombatpen_empty" } ] }