diff --git a/Resources/Locale/en-US/_Nuclear14/reagents.ftl b/Resources/Locale/en-US/_Nuclear14/reagents.ftl index 47e33f5bedf..69b2a782af5 100644 --- a/Resources/Locale/en-US/_Nuclear14/reagents.ftl +++ b/Resources/Locale/en-US/_Nuclear14/reagents.ftl @@ -250,8 +250,10 @@ reagent-desc-antiseptic = A cleaning solution made from Abraxo Cleaner and some # Ores, Metals, Materials materials-gunpowder = gunpowder materials-lead = lead +materials-aluminum = aluminum materials-sulfur = sulfur materials-raw-lead = raw lead +materials-raw-aluminum = raw aluminum materials-raw-sulfur = raw sulfur reagent-name-gunpowder = gunpowder reagent-desc-gunpowder = Small pellet gunpowder. Now just add lead. @@ -268,4 +270,4 @@ reagent-name-scorpiontail = scorpion tail reagent-desc-scorpiontail = scorpion tail. Stingy. compost-mixing-success = compost mixed -mixing-verb-composting = mix compost \ No newline at end of file +mixing-verb-composting = mix compost diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/metals.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/metals.yml index 40a565ad1a9..7fc357b3f14 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/metals.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/metals.yml @@ -1,3 +1,4 @@ +#MARK: Lead - type: entity parent: IngotBase id: IngotLead @@ -43,3 +44,50 @@ state: ingot_lead - type: Stack count: 1 + +#MARK: Aluminum +- type: entity + parent: IngotBase + id: IngotAluminum + name: aluminum bar + suffix: Full + components: + - type: Material + - type: PhysicalComposition + materialComposition: + Aluminum: 100 + - type: Stack + stackType: Aluminum + baseLayer: base + layerStates: + - ingot_aluminum + - ingot_aluminum + - ingot_aluminum + - type: Sprite + sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi + state: ingot_aluminum + layers: + - state: ingot_aluminum + map: ["base"] + - type: Item + heldPrefix: ingot_aluminum + - type: Appearance + - type: Extractable + grindableSolutionName: aluminum + - type: SolutionContainerManager + solutions: + aluminum: + reagents: + - ReagentId: Aluminium + Quantity: 10 + +- type: entity + parent: IngotAluminum + id: IngotAluminum1 + name: aluminum bar + suffix: Single + components: + - type: Sprite + state: ingot_aluminum + - type: Stack + count: 1 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml index 89625d85cb1..f33947ea98e 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml @@ -402,14 +402,16 @@ emptySpriteName: smellingsalts0 - type: Hypospray solutionName: pen - transferAmount: 25 + transferAmount: 10 - type: SolutionContainerManager solutions: pen: - maxVol: 10 + maxVol: 15 reagents: - ReagentId: SmellingSalts Quantity: 10 + - ReagentId: Epinephrine + Quantity: 5 - type: entity parent: N14HealingPowder @@ -478,7 +480,7 @@ - type: SolutionContainerVisuals maxFillLevels: 1 changeColor: false - emptySpriteName: ultrarstimpak0 + emptySpriteName: ultrastimpak0 - type: Hypospray solutionName: pen transferAmount: 25 @@ -489,3 +491,58 @@ reagents: - ReagentId: UltraRobustHealingMixture Quantity: 25 + +- type: entity + parent: N14HealingPowder + id: N14Traumapack + name: traumapack + description: A backpack filled with a blend of healing chemicals that inject automatically upon the wearer being hurt. + components: + - type: Sprite + sprite: _Nuclear14/Objects/Specific/Medical/drugs.rsi + state: traumapack + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: TraumaPowder + Quantity: 30 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 10 + behaviors: + - !type:SpillBehavior + solution: food + transferForensics: true + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + parent: Gauze + id: N14Bandage + name: bandage + description: A long strip cloth which can stop bleeding. Mostly sterile. + components: + - type: Sprite + sprite: _Nuclear14/Objects/Specific/Medical/drugs.rsi + state: bandage + +- type: entity + parent: DrinkBottleGlassBaseFull + id: N14Ethanol + name: ethanol bottle + description: A small brownish bottle containing ethanol. Great for disinfecting wounds. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Ethanol + Quantity: 50 + - type: Sprite + sprite: _Nuclear14/Objects/Specific/Medical/drugs.rsi + state: ethanol diff --git a/Resources/Prototypes/_Nuclear14/Reagents/materials.yml b/Resources/Prototypes/_Nuclear14/Reagents/materials.yml index e743a4dee36..dc285780cd6 100644 --- a/Resources/Prototypes/_Nuclear14/Reagents/materials.yml +++ b/Resources/Prototypes/_Nuclear14/Reagents/materials.yml @@ -5,7 +5,7 @@ icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: circuits_3 } color: "#8A9A5B" price: 0.1 - + # Metals - type: material id: Lead @@ -15,7 +15,7 @@ icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: ingot_lead } color: "#C0C0C0" price: 0.15 - + - type: material id: Sulfur stackEntity: SulfurPowder1 @@ -25,6 +25,15 @@ color: "#FDD805" price: 0.15 +- type: material + id: Aluminum + stackEntity: IngotAluminum1 + name: materials-aluminum + unit: materials-unit-bar + icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: ingot_aluminum } + color: "#C0C0C0" + price: 0.15 + # Materials - type: material id: Gunpowder @@ -33,17 +42,24 @@ icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: powder_lead } color: "#3E201D" price: 0.15 - + - type: reagent id: Gunpowder name: reagent-name-gunpowder desc: reagent-desc-gunpowder physicalDesc: reagent-physical-desc-powdery - flavor: bitter color: "#3E201D" - boilingPoint: 100.0 - meltingPoint: 100.0 - + boilingPoint: 673.0 + meltingPoint: 607.0 + metabolisms: + Poison: + metabolismRate: 0.05 + effects: + - !type:HealthChange + damage: + types: + Poison: 1 + - type: material id: Charcoal stackEntity: Charcoal @@ -51,7 +67,7 @@ icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: powder_lead } color: "#1D3B3E" price: 0.15 - + - type: material id: Fertilizer stackEntity: FertilizerOre1 @@ -59,7 +75,7 @@ icon: { sprite: /Textures/_Nuclear14/Objects/Specific/Hydroponics/equipment.rsi, state: daesack2 } color: "#1D3B3E" price: 0.15 - + - type: reagent id: Fertilizer name: reagent-name-fertilizer @@ -86,10 +102,10 @@ - !type:HealthChange damage: types: - Caustic: 1 + Poison: 0.5 - !type:ChemVomit probability: 0.45 - + - type: reagent id: Dung name: reagent-name-dung @@ -104,14 +120,14 @@ - !type:HealthChange damage: types: - Caustic: 1 + Poison: 1 - !type:ChemVomit probability: 0.80 - + - type: material id: N14Timber stackEntity: N14FloraLogTimber name: materials-timber icon: { sprite: _Nuclear14/Structures/Decoration/flora.rsi, state: tree_timber } color: "#1D3B3E" - price: 0.15 \ No newline at end of file + price: 0.15 diff --git a/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml b/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml index 566c7031ee6..acba20e731f 100644 --- a/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml +++ b/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml @@ -1,4 +1,4 @@ -# Healing +#MARK: Healing - type: reagent id: HealingMixture #used in regular stimpacks name: reagent-name-healing-mixture @@ -15,6 +15,24 @@ Burn: -2.0 Brute: -2.0 Airloss: -2.0 + - !type:HealthChange # Bonus for poison + conditions: + - !type:ReagentThreshold + min: 30 + damage: + groups: + Burn: -1.0 + Brute: -1.0 + Airloss: -1.0 + types: + Poison: 0.2 + - !type:HealthChange # to prevent doping + conditions: + - !type:ReagentThreshold + min: 50 + damage: + types: + Poison: 1 - type: reagent id: DirtyStimpak @@ -34,6 +52,24 @@ Airloss: -1.5 types: Radiation: 0.1 + - !type:HealthChange # to prevent doping + conditions: + - !type:ReagentThreshold + min: 30 + damage: + groups: + Burn: -1.0 + Brute: -1.0 + Airloss: -1.0 + types: + Poison: 0.2 + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 50 + damage: + types: + Poison: 1 - type: reagent id: HealingPowder @@ -44,6 +80,7 @@ color: "#00e5ff" metabolisms: Medicine: + metabolismRate: 0.1 # Slow effects: - !type:HealthChange damage: @@ -53,6 +90,27 @@ - !type:ChemVomit probability: 0.05 +# Strong overtime healing +- type: reagent + id: TraumaPowder + name: reagent-name-healing-powder + group: Medicine + desc: reagent-desc-healing-powder + physicalDesc: reagent-physical-desc-soothing + color: "#00e5ff" + metabolisms: + Medicine: + metabolismRate: 0.1 # Slow + effects: + - !type:HealthChange + damage: + groups: + Burn: -1 + Brute: -1 + Airloss: -2 + types: + Poison: -1 + # Poison - type: reagent id: AntidoteMixture @@ -63,6 +121,7 @@ color: "#D41244" metabolisms: Medicine: + metabolismRate: 0.1 # Slow effects: - !type:HealthChange damage: @@ -81,6 +140,7 @@ color: "#D41244" metabolisms: Medicine: + metabolismRate: 0.5 # Medium effects: - !type:HealthChange damage: @@ -103,23 +163,28 @@ Burn: -5 Brute: -5 Airloss: -5 - - !type:HealthChange + - !type:HealthChange # Taking 2 is more or less a guaranteed death conditions: - !type:ReagentThreshold - min: 35 + min: 30 damage: + groups: + Burn: -2.0 + Brute: -2.0 + Airloss: -2.0 types: - Cellular: 0.3 + Poison: 3 + Cellular: 0.5 # permanent damage, be glad you aint dead - !type:MovespeedModifier walkSpeedModifier: 0.50 sprintSpeedModifier: 0.50 conditions: - !type:ReagentThreshold - min: 35 + min: 30 - !type:Drunk conditions: - !type:ReagentThreshold - min: 35 + min: 30 # Radiation - type: reagent @@ -131,11 +196,12 @@ color: "#00e5ff" metabolisms: Medicine: + metabolismRate: 0.2 # Effectively once every 5 seconds. effects: - !type:HealthChange damage: types: - Radiation: -2.5 + Radiation: -5 - type: reagent id: RadX @@ -146,13 +212,13 @@ color: "#00e5ff" metabolisms: Medicine: + metabolismRate: 0.1 # Slow effects: - !type:HealthChange damage: types: Radiation: -2.5 - # Other - type: reagent id: DamageResistMixture #used in med-x. TODO: figure out how to make a reagent give you dmg resistance @@ -175,6 +241,7 @@ color: "#00e5ff" metabolisms: Medicine: + metabolismRate: 0.1 # Effectively once every 10 seconds. effects: - !type:Drunk @@ -187,6 +254,7 @@ color: "#00e5ff" metabolisms: Medicine: + metabolismRate: 0.1 # Effectively once every 10 seconds. effects: - !type:Drunk #TODO: when we get SPECIAL, make this increase Int, Chr, and remove this effect @@ -199,6 +267,7 @@ color: "#2E0071" metabolisms: Medicine: + metabolismRate: 0.1 # Effectively once every 10 seconds. effects: - !type:Drunk #TODO: when we get SPECIAL, make this increase Int, Chr, and remove this effect @@ -211,6 +280,7 @@ color: "#9932a4" metabolisms: Medicine: + metabolismRate: 0.1 # Effectively once every 10 seconds. effects: - !type:Drunk #TODO: when we get SPECIAL, make this increase Int, Chr, and remove this effect @@ -223,6 +293,7 @@ color: "#ffb82e" metabolisms: Medicine: + metabolismRate: 0.1 # Effectively once every 10 seconds. effects: - !type:Drunk #TODO: when we get SPECIAL, make this increase Int, Chr, and remove this effect @@ -235,6 +306,7 @@ color: "#00e5ff" metabolisms: Medicine: + metabolismRate: 0.1 # Effectively once every 10 seconds. effects: - !type:Drunk - !type:Jitter @@ -248,6 +320,7 @@ color: "#00e5ff" metabolisms: Medicine: + metabolismRate: 0.1 # Effectively once every 10 seconds. effects: - !type:Jitter @@ -260,6 +333,7 @@ color: "#00e5ff" metabolisms: Poison: + metabolismRate: 0.1 # Effectively once every 10 seconds. effects: - !type:GenericStatusEffect key: SeeingRainbows @@ -281,6 +355,7 @@ color: "#e1f5f4" metabolisms: Medicine: + metabolismRate: 5 # Effectively 5 ticks per second effects: - !type:HealthChange damage: @@ -299,6 +374,7 @@ color: "#24b530" metabolisms: Medicine: + metabolismRate: 0.1 # Effectively once every 10 seconds. effects: - !type:HealthChange damage: @@ -309,7 +385,7 @@ - !type:ChemVomit probability: 0.05 - !type:Drunk - min: 25 + min: 15 - !type:Jitter min: 25 @@ -322,6 +398,7 @@ color: "#ba67f5" metabolisms: Medicine: + metabolismRate: 0.1 # Effectively once every 10 seconds. effects: - !type:HealthChange damage: @@ -342,6 +419,7 @@ color: "#1d3d22" metabolisms: Medicine: + metabolismRate: 0.1 # Effectively once every 10 seconds. effects: - !type:HealthChange damage: @@ -378,16 +456,19 @@ Burn: -10 Brute: -10 Airloss: -10 - Toxin: 1 - types: - Radiation: 0.2 + Toxin: 0.5 - !type:HealthChange conditions: - !type:ReagentThreshold - min: 35 + min: 30 damage: + groups: + Burn: -10 # Temporary invincibility more or less + Brute: -10 + Airloss: -10 types: - Cellular: 0.8 + Poison: 3 + Cellular: 2 # Congratulations. Still revivable, but permanently fucked - !type:MovespeedModifier walkSpeedModifier: 0.40 sprintSpeedModifier: 0.40 diff --git a/Resources/Prototypes/_Nuclear14/Reagents/products.yml b/Resources/Prototypes/_Nuclear14/Reagents/products.yml index ee91a34ca38..a044382916e 100644 --- a/Resources/Prototypes/_Nuclear14/Reagents/products.yml +++ b/Resources/Prototypes/_Nuclear14/Reagents/products.yml @@ -6,7 +6,7 @@ physicalDesc: reagent-physical-desc-abrasive color: "#e0dbd1" metabolisms: - Medicine: # TODO: Add negative effects + Poison: # TODO: Add negative effects effects: - !type:GenericStatusEffect key: SeeingRainbows @@ -15,6 +15,11 @@ time: 5 refresh: false - !type:Jitter + - !type:HealthChange + damage: + types: + Poison: 0.5 + Caustic: 1 - type: reagent id: Wonderglue @@ -24,7 +29,7 @@ physicalDesc: reagent-physical-desc-gloopy color: "#edf0f2" metabolisms: - Medicine: # TODO: Add negative effects + Poison: # TODO: Add negative effects effects: - !type:GenericStatusEffect key: SeeingRainbows @@ -33,6 +38,11 @@ time: 5 refresh: false - !type:Jitter + - !type:HealthChange + damage: + types: + Poison: 0.2 + Caustic: 0.5 - type: reagent id: Turpentine @@ -42,7 +52,7 @@ physicalDesc: reagent-physical-desc-acrid color: "#f0f1f3" metabolisms: - Medicine: + Poison: effects: # TODO: Add negative effects - !type:GenericStatusEffect key: SeeingRainbows @@ -51,6 +61,10 @@ time: 5 refresh: false - !type:Jitter + - !type:HealthChange + damage: + types: + Poison: 0.5 - type: reagent id: Antiseptic @@ -60,7 +74,7 @@ physicalDesc: reagent-physical-desc-strong-smelling color: "#98cbf5" metabolisms: - Medicine: + Poison: effects: # TODO: Add negative effects - !type:GenericStatusEffect key: SeeingRainbows @@ -69,3 +83,7 @@ time: 5 refresh: false - !type:Jitter + - !type:HealthChange + damage: + types: + Poison: 0.5 diff --git a/Resources/Prototypes/_Nuclear14/Reagents/toxins.yml b/Resources/Prototypes/_Nuclear14/Reagents/toxins.yml index 33e9ea1f72f..49b1f95549f 100644 --- a/Resources/Prototypes/_Nuclear14/Reagents/toxins.yml +++ b/Resources/Prototypes/_Nuclear14/Reagents/toxins.yml @@ -17,5 +17,5 @@ - !type:HealthChange damage: types: - Heat: 1 - Poison: 1 \ No newline at end of file + Heat: 3 + Poison: 2 diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/medical.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/medical.yml index 149da0838f9..e0775d11e21 100644 --- a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/medical.yml +++ b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/medical.yml @@ -12,7 +12,7 @@ sprite: _Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi state: mortar objectType: Item - + - type: constructionGraph id: N14MortarPestle start: start @@ -24,7 +24,7 @@ - material: WoodPlank amount: 2 doAfter: 5 - + - node: mortarpestle entity: N14MortarpestleGrinder @@ -43,7 +43,7 @@ sprite: _Nuclear14/Objects/Specific/Medical/drugs.rsi state: healingpowder objectType: Item - + - type: constructionGraph id: N14HealingPowder start: start @@ -54,7 +54,7 @@ steps: - material: BrocFlower - material: XanderRoot # TODO: Find out if we can add a tool step for crushing. Tests fail for now with it in. Slap crafting doesn't like tool steps. - + - node: healingpowder entity: N14HealingPowder @@ -72,7 +72,7 @@ sprite: _Nuclear14/Objects/Specific/Medical/drugs.rsi state: stimpak objectType: Item - + - type: constructionGraph id: N14Stimpak start: start @@ -82,23 +82,19 @@ - to: stimpak steps: - material: BrocFlower - - material: XanderRoot + - material: XanderRoot - tag: Syringe name: a syringe icon: sprite: _Nuclear14/Objects/Specific/Medical/drugs.rsi state: stimpak doAfter: 1 - - tag: Bloodpack - name: a bloodpack - icon: - sprite: Objects/Specific/Medical/medical.rsi - state: bloodpack + - material: Bloodpack doAfter: 1 - + - node: stimpak entity: N14Stimpak - + # Jet - type: construction name: jet inhaler @@ -113,7 +109,7 @@ sprite: _Nuclear14/Objects/Specific/Medical/drugs.rsi state: jet objectType: Item - + - type: constructionGraph id: N14JetInhaler start: start @@ -123,6 +119,6 @@ - to: jet steps: - material: Plastic - + - node: jet - entity: N14JetInhaler \ No newline at end of file + entity: N14JetInhaler diff --git a/Resources/Prototypes/_Nuclear14/Stacks/material_stacks.yml b/Resources/Prototypes/_Nuclear14/Stacks/material_stacks.yml index b4cd975b2b9..73a94d75fcd 100644 --- a/Resources/Prototypes/_Nuclear14/Stacks/material_stacks.yml +++ b/Resources/Prototypes/_Nuclear14/Stacks/material_stacks.yml @@ -4,14 +4,14 @@ icon: { sprite: _Nuclear14/Objects/Misc/materials.rsi, state: circuits_3 } spawn: N14MaterialCircuitry1 maxCount: 15 - + - type: stack id: BrahminHide name: brahmin hides icon: { sprite: _Nuclear14/Objects/Misc/mob_drops.rsi, state: hide_brahmin_2 } spawn: N14MaterialBrahminHide maxCount: 3 - + - type: stack id: Gunpowder name: gunpowder @@ -19,7 +19,7 @@ spawn: Gunpowder1 maxCount: 100 itemSize: 1 - + - type: stack id: N14Paper name: paper @@ -27,7 +27,7 @@ spawn: N14Paper1 maxCount: 10 itemSize: 1 - + - type: stack id: N14Timber name: timber @@ -35,7 +35,7 @@ spawn: N14FloraLogTimber maxCount: 5 itemSize: 1 - + - type: stack id: Compost name: compost @@ -43,24 +43,24 @@ spawn: N14CompostRotted maxCount: 5 itemSize: 1 - + # Ores -# - type: stack - # id: LeadOre - # name: lead ore - # icon: { sprite: "/Textures/_Nuclear14/Objects/Misc/materials.rsi", state: lead } - # spawn: LeadOre1 - # maxCount: 10 - # itemSize: 1 - -# - type: stack - # id: SulfurOre - # name: sulfur ore - # icon: { sprite: "/Textures/_Nuclear14/Objects/Misc/materials.rsi", state: sulfur } - # spawn: SulfurOre1 - # maxCount: 10 - # itemSize: 1 - +- type: stack + id: LeadOre + name: lead ore + icon: { sprite: "/Textures/_Nuclear14/Objects/Misc/materials.rsi", state: lead } + spawn: LeadOre1 + maxCount: 10 + itemSize: 1 + +- type: stack + id: SulfurOre + name: sulfur ore + icon: { sprite: "/Textures/_Nuclear14/Objects/Misc/materials.rsi", state: sulfur } + spawn: SulfurOre1 + maxCount: 10 + itemSize: 1 + # - type: stack # id: FertilizerOre # name: fertilizer ore @@ -78,11 +78,19 @@ spawn: IngotLead1 maxCount: 30 itemSize: 1 - + +- type: stack + id: Aluminum + name: aluminum + icon: { sprite: "/Textures/_Nuclear14/Objects/Misc/materials.rsi", state: ingot_aluminum } + spawn: IngotAluminum1 + maxCount: 30 + itemSize: 1 + - type: stack id: Sulfur name: sulfur icon: { sprite: "/Textures/_Nuclear14/Objects/Misc/materials.rsi", state: powder_brass } spawn: SulfurPowder1 maxCount: 30 - itemSize: 1 \ No newline at end of file + itemSize: 1 diff --git a/Resources/Prototypes/_Nuclear14/Stacks/medical_stacks.yml b/Resources/Prototypes/_Nuclear14/Stacks/medical_stacks.yml new file mode 100644 index 00000000000..3c4036f4e12 --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Stacks/medical_stacks.yml @@ -0,0 +1,7 @@ +- type: stack + id: N14Traumapack + name: traumapack + icon: { sprite: "_Nuclear14/Objects/Specific/Medical/drugs.rsi", state: traumapack } + spawn: N14Traumapack + maxCount: 10 + itemSize: 1 diff --git a/Resources/Textures/_Nuclear14/Objects/Specific/Medical/drugs.rsi/bandage.png b/Resources/Textures/_Nuclear14/Objects/Specific/Medical/drugs.rsi/bandage.png new file mode 100644 index 00000000000..6b9f1b1c6cc Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Specific/Medical/drugs.rsi/bandage.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Specific/Medical/drugs.rsi/ethanol.png b/Resources/Textures/_Nuclear14/Objects/Specific/Medical/drugs.rsi/ethanol.png new file mode 100644 index 00000000000..c9f05ab01f5 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Specific/Medical/drugs.rsi/ethanol.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Specific/Medical/drugs.rsi/meta.json b/Resources/Textures/_Nuclear14/Objects/Specific/Medical/drugs.rsi/meta.json index f27f90d92cc..1962843d045 100644 --- a/Resources/Textures/_Nuclear14/Objects/Specific/Medical/drugs.rsi/meta.json +++ b/Resources/Textures/_Nuclear14/Objects/Specific/Medical/drugs.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/FortunaSS13/Fortuna/commit/63ef76e8a17f8ad0fbb082fb5da1297d61951226", + "copyright": "https://github.com/FortunaSS13/Fortuna/commit/63ef76e8a17f8ad0fbb082fb5da1297d61951226, taken from BigIron github", "size": { "x": 32, "y": 32 @@ -75,6 +75,12 @@ }, { "name": "smellingsalts0" + }, + { + "name": "bandage" + }, + { + "name": "ethanol" } ] } \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Objects/Specific/Medical/drugs.rsi/psycho0.png b/Resources/Textures/_Nuclear14/Objects/Specific/Medical/drugs.rsi/psycho0.png index 812472e6c62..4f281a927f9 100644 Binary files a/Resources/Textures/_Nuclear14/Objects/Specific/Medical/drugs.rsi/psycho0.png and b/Resources/Textures/_Nuclear14/Objects/Specific/Medical/drugs.rsi/psycho0.png differ