From b1b39cebdb0d51832ba09553c403bfea3b174c17 Mon Sep 17 00:00:00 2001 From: BlueHNT <79374236+BlueHNT@users.noreply.github.com> Date: Fri, 12 Jul 2024 19:44:36 +0200 Subject: [PATCH 01/13] Aluminium --- .../Locale/en-US/_Nuclear14/reagents.ftl | 6 +- .../Entities/Objects/Materials/metals.yml | 48 +++++++++++++++ .../_Nuclear14/Reagents/materials.yml | 57 ++++++++++++++---- .../_Nuclear14/Stacks/material_stacks.yml | 58 +++++++++++-------- 4 files changed, 131 insertions(+), 38 deletions(-) diff --git a/Resources/Locale/en-US/_Nuclear14/reagents.ftl b/Resources/Locale/en-US/_Nuclear14/reagents.ftl index 47e33f5bedf..04c7e490a4d 100644 --- a/Resources/Locale/en-US/_Nuclear14/reagents.ftl +++ b/Resources/Locale/en-US/_Nuclear14/reagents.ftl @@ -250,11 +250,15 @@ reagent-desc-antiseptic = A cleaning solution made from Abraxo Cleaner and some # Ores, Metals, Materials materials-gunpowder = gunpowder materials-lead = lead +materials-aluminium = aluminium materials-sulfur = sulfur materials-raw-lead = raw lead +materials-raw-aluminium = raw aluminium materials-raw-sulfur = raw sulfur reagent-name-gunpowder = gunpowder reagent-desc-gunpowder = Small pellet gunpowder. Now just add lead. +reagent-name-aluminium = aluminium +reagent-desc-aluminium = Ground aluminium in a small almost powder like form. reagent-name-fertilizer = fertilizer reagent-desc-fertilizer = Ground fertilizer. Perfect for your plants! reagent-name-dung = dung @@ -268,4 +272,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..8661250ec78 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: Aluminium +- type: entity + parent: IngotBase + id: IngotAluminium + name: aluminium bar + suffix: Full + components: + - type: Material + - type: PhysicalComposition + materialComposition: + Aluminium: 100 + - type: Stack + stackType: Aluminium + baseLayer: base + layerStates: + - ingot_aluminium + - ingot_aluminium + - ingot_aluminium + - type: Sprite + sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi + state: ingot_aluminium + layers: + - state: ingot_aluminium + map: ["base"] + - type: Item + heldPrefix: ingot_aluminium + - type: Appearance + - type: Extractable + grindableSolutionName: aluminium + - type: SolutionContainerManager + solutions: + aluminium: + reagents: + - ReagentId: Aluminium + Quantity: 10 + +- type: entity + parent: IngotAluminium + id: IngotAluminium1 + name: aluminium bar + suffix: Single + components: + - type: Sprite + state: ingot_aluminium + - type: Stack + count: 1 diff --git a/Resources/Prototypes/_Nuclear14/Reagents/materials.yml b/Resources/Prototypes/_Nuclear14/Reagents/materials.yml index e743a4dee36..fe44bd8690c 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,32 @@ color: "#FDD805" price: 0.15 +- type: material + id: Aluminium + stackEntity: IngotAluminium1 + name: materials-aluminium + unit: materials-unit-bar + icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: ingot_aluminium } + color: "#C0C0C0" + price: 0.15 + +- type: reagent + id: Aluminium + name: reagent-name-aluminium + desc: reagent-desc-aluminium + physicalDesc: reagent-physical-desc-powdery + color: "#3E201D" + boilingPoint: 2743.0 + meltingPoint: 933.5 + metabolisms: + Poison: + metabolismRate: 0.03 # Effectively once every 30 seconds. + effects: + - !type:HealthChange + damage: + types: + Poison: 0.3 + # Materials - type: material id: Gunpowder @@ -33,17 +59,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: 0.7 + - type: material id: Charcoal stackEntity: Charcoal @@ -51,7 +84,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 +92,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 @@ -89,7 +122,7 @@ Caustic: 1 - !type:ChemVomit probability: 0.45 - + - type: reagent id: Dung name: reagent-name-dung @@ -107,11 +140,11 @@ Caustic: 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/Stacks/material_stacks.yml b/Resources/Prototypes/_Nuclear14/Stacks/material_stacks.yml index b4cd975b2b9..8e97f51fe3a 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 - + +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: FertilizerOre # name: fertilizer ore @@ -78,11 +78,19 @@ spawn: IngotLead1 maxCount: 30 itemSize: 1 - + +- type: stack + id: Aluminium + name: aluminium + icon: { sprite: "/Textures/_Nuclear14/Objects/Misc/materials.rsi", state: ingot_aluminium } + spawn: IngotLead1 + 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 From d379a2cabf49ede7b07b90326a5f868264e64aef Mon Sep 17 00:00:00 2001 From: BlueHNT <79374236+BlueHNT@users.noreply.github.com> Date: Fri, 12 Jul 2024 22:59:47 +0200 Subject: [PATCH 02/13] Stimpaks are dangerous, Alum reagent purge, Ore stacks --- .../_Nuclear14/Reagents/materials.yml | 17 ----- .../_Nuclear14/Reagents/medicine.yml | 69 +++++++++++++++---- .../_Nuclear14/Stacks/material_stacks.yml | 2 +- 3 files changed, 57 insertions(+), 31 deletions(-) diff --git a/Resources/Prototypes/_Nuclear14/Reagents/materials.yml b/Resources/Prototypes/_Nuclear14/Reagents/materials.yml index fe44bd8690c..9de966882c8 100644 --- a/Resources/Prototypes/_Nuclear14/Reagents/materials.yml +++ b/Resources/Prototypes/_Nuclear14/Reagents/materials.yml @@ -34,23 +34,6 @@ color: "#C0C0C0" price: 0.15 -- type: reagent - id: Aluminium - name: reagent-name-aluminium - desc: reagent-desc-aluminium - physicalDesc: reagent-physical-desc-powdery - color: "#3E201D" - boilingPoint: 2743.0 - meltingPoint: 933.5 - metabolisms: - Poison: - metabolismRate: 0.03 # Effectively once every 30 seconds. - effects: - - !type:HealthChange - damage: - types: - Poison: 0.3 - # Materials - type: material id: Gunpowder diff --git a/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml b/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml index 566c7031ee6..cce74933719 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,20 @@ Burn: -2.0 Brute: -2.0 Airloss: -2.0 + - !type:HealthChange # to prevent doping + conditions: + - !type:ReagentThreshold + min: 30 + damage: + types: + Poison: 0.2 + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 50 + damage: + types: + Poison: 1 - type: reagent id: DirtyStimpak @@ -34,6 +48,20 @@ Airloss: -1.5 types: Radiation: 0.1 + - !type:HealthChange # to prevent doping + conditions: + - !type:ReagentThreshold + min: 30 + damage: + types: + Poison: 0.2 + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 50 + damage: + types: + Poison: 1 - type: reagent id: HealingPowder @@ -44,6 +72,7 @@ color: "#00e5ff" metabolisms: Medicine: + metabolismRate: 0.1 # Slow effects: - !type:HealthChange damage: @@ -63,6 +92,7 @@ color: "#D41244" metabolisms: Medicine: + metabolismRate: 0.1 effects: - !type:HealthChange damage: @@ -103,23 +133,24 @@ 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: 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 +162,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 +178,13 @@ color: "#00e5ff" metabolisms: Medicine: + metabolismRate: 0.1 # Effectively once every 10 seconds. 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 +207,7 @@ color: "#00e5ff" metabolisms: Medicine: + metabolismRate: 0.1 # Effectively once every 10 seconds. effects: - !type:Drunk @@ -187,6 +220,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 +233,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 +246,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 +259,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 +272,7 @@ color: "#00e5ff" metabolisms: Medicine: + metabolismRate: 0.1 # Effectively once every 10 seconds. effects: - !type:Drunk - !type:Jitter @@ -248,6 +286,7 @@ color: "#00e5ff" metabolisms: Medicine: + metabolismRate: 0.1 # Effectively once every 10 seconds. effects: - !type:Jitter @@ -260,6 +299,7 @@ color: "#00e5ff" metabolisms: Poison: + metabolismRate: 0.1 # Effectively once every 10 seconds. effects: - !type:GenericStatusEffect key: SeeingRainbows @@ -281,6 +321,7 @@ color: "#e1f5f4" metabolisms: Medicine: + metabolismRate: 5 # Effectively 5 ticks per second effects: - !type:HealthChange damage: @@ -299,6 +340,7 @@ color: "#24b530" metabolisms: Medicine: + metabolismRate: 0.1 # Effectively once every 10 seconds. effects: - !type:HealthChange damage: @@ -322,6 +364,7 @@ color: "#ba67f5" metabolisms: Medicine: + metabolismRate: 0.1 # Effectively once every 10 seconds. effects: - !type:HealthChange damage: @@ -342,6 +385,7 @@ color: "#1d3d22" metabolisms: Medicine: + metabolismRate: 0.1 # Effectively once every 10 seconds. effects: - !type:HealthChange damage: @@ -378,16 +422,15 @@ Burn: -10 Brute: -10 Airloss: -10 - Toxin: 1 - types: - Radiation: 0.2 + Toxin: 0.2 - !type:HealthChange conditions: - !type:ReagentThreshold - min: 35 + min: 30 damage: types: - Cellular: 0.8 + Poison: 5 + Cellular: 2 # Impressive, you found 2 and injected both. Congratulations. - !type:MovespeedModifier walkSpeedModifier: 0.40 sprintSpeedModifier: 0.40 diff --git a/Resources/Prototypes/_Nuclear14/Stacks/material_stacks.yml b/Resources/Prototypes/_Nuclear14/Stacks/material_stacks.yml index 8e97f51fe3a..4b75ea6f919 100644 --- a/Resources/Prototypes/_Nuclear14/Stacks/material_stacks.yml +++ b/Resources/Prototypes/_Nuclear14/Stacks/material_stacks.yml @@ -44,7 +44,7 @@ maxCount: 5 itemSize: 1 -Ores +# Ores - type: stack id: LeadOre name: lead ore From 3893e2a63ac514cdd9e4f6af6a2525547b2a0840 Mon Sep 17 00:00:00 2001 From: BlueHNT <79374236+BlueHNT@users.noreply.github.com> Date: Fri, 12 Jul 2024 23:34:43 +0200 Subject: [PATCH 03/13] obsolete reagent --- Resources/Locale/en-US/_Nuclear14/reagents.ftl | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Locale/en-US/_Nuclear14/reagents.ftl b/Resources/Locale/en-US/_Nuclear14/reagents.ftl index 04c7e490a4d..e27e8896573 100644 --- a/Resources/Locale/en-US/_Nuclear14/reagents.ftl +++ b/Resources/Locale/en-US/_Nuclear14/reagents.ftl @@ -257,8 +257,6 @@ materials-raw-aluminium = raw aluminium materials-raw-sulfur = raw sulfur reagent-name-gunpowder = gunpowder reagent-desc-gunpowder = Small pellet gunpowder. Now just add lead. -reagent-name-aluminium = aluminium -reagent-desc-aluminium = Ground aluminium in a small almost powder like form. reagent-name-fertilizer = fertilizer reagent-desc-fertilizer = Ground fertilizer. Perfect for your plants! reagent-name-dung = dung From 6a4b0fde3c0fb71b8a934483a2cad956d1f13412 Mon Sep 17 00:00:00 2001 From: BlueHNT <79374236+BlueHNT@users.noreply.github.com> Date: Sat, 13 Jul 2024 00:33:54 +0200 Subject: [PATCH 04/13] Poison --- .../_Nuclear14/Reagents/materials.yml | 6 ++--- .../_Nuclear14/Reagents/products.yml | 26 ++++++++++++++++--- .../Prototypes/_Nuclear14/Reagents/toxins.yml | 4 +-- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/Resources/Prototypes/_Nuclear14/Reagents/materials.yml b/Resources/Prototypes/_Nuclear14/Reagents/materials.yml index 9de966882c8..87548761c8a 100644 --- a/Resources/Prototypes/_Nuclear14/Reagents/materials.yml +++ b/Resources/Prototypes/_Nuclear14/Reagents/materials.yml @@ -58,7 +58,7 @@ - !type:HealthChange damage: types: - Poison: 0.7 + Poison: 1 - type: material id: Charcoal @@ -102,7 +102,7 @@ - !type:HealthChange damage: types: - Caustic: 1 + Poison: 0.5 - !type:ChemVomit probability: 0.45 @@ -120,7 +120,7 @@ - !type:HealthChange damage: types: - Caustic: 1 + Poison: 1 - !type:ChemVomit probability: 0.80 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 From fa8013b61e814d468c9d7a9406d37540fc1cfb10 Mon Sep 17 00:00:00 2001 From: BlueHNT <79374236+BlueHNT@users.noreply.github.com> Date: Sat, 13 Jul 2024 00:34:44 +0200 Subject: [PATCH 05/13] Fixes Issue: Crafting stimpaks eats all bloodpack stacks #257 --- .../_Nuclear14/Recipes/Crafting/medical.yml | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) 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 From f99fa408b559ac0e2e02aee5bce9dd5a4508856a Mon Sep 17 00:00:00 2001 From: BlueHNT <79374236+BlueHNT@users.noreply.github.com> Date: Sat, 13 Jul 2024 01:23:43 +0200 Subject: [PATCH 06/13] More medical items Adds new sprites Adds traumpack Adds ethanol bottle Fixes typo --- .../Objects/Specific/Medical/chemicals.yml | 64 +++++++++++++++++- .../_Nuclear14/Reagents/medicine.yml | 20 ++++++ .../_Nuclear14/Stacks/medical_stacks.yml | 7 ++ .../Specific/Medical/drugs.rsi/bandage.png | Bin 0 -> 427 bytes .../Specific/Medical/drugs.rsi/ethanol.png | Bin 0 -> 382 bytes .../Specific/Medical/drugs.rsi/meta.json | 8 ++- .../Specific/Medical/drugs.rsi/psycho0.png | Bin 577 -> 635 bytes 7 files changed, 95 insertions(+), 4 deletions(-) create mode 100644 Resources/Prototypes/_Nuclear14/Stacks/medical_stacks.yml create mode 100644 Resources/Textures/_Nuclear14/Objects/Specific/Medical/drugs.rsi/bandage.png create mode 100644 Resources/Textures/_Nuclear14/Objects/Specific/Medical/drugs.rsi/ethanol.png diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml index 89625d85cb1..93595cda558 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,59 @@ 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 + thresholds: + - trigger: + !type:DamageTrigger + damage: 10 + behaviors: + - !type:SpillBehavior + solution: food + transferForensics: true + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: UseDelay + delay: 1 + +- 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/medicine.yml b/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml index cce74933719..69f91ccff2a 100644 --- a/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml +++ b/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml @@ -82,6 +82,26 @@ - !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 + Poison: -1 + Airloss: -2 + # Poison - type: reagent id: AntidoteMixture 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 0000000000000000000000000000000000000000..6b9f1b1c6ccf3019d759bdd88faccccf8440aeaf GIT binary patch literal 427 zcmV;c0aX5pP)VQ!Pj5=V{0izC}$N_eCcK@-7A3Ai1k){rS zS)7uZic86VVjV)V13;F;EWUp28kjzM^eC9Nwzg(KbJ%}Ej-WUVz$}NcVU8dckn8}c zkKj?DsilRXX3p%{$ZDzQfUWbI;EC?t$1e=Cp%$To)IbY{*upNN5+YF!fLW|0Cyfw% z^ps&rWh4VLD-Qz~7YA7A_m8g(KYo5^c>Me|1F-ex(p1jt}ze;FdTr-a_^)%ux~)Y3(9h^{QmY0R5LJ2K!BoL0I~$+ z2rUghtd^r0Oq-$@<_I%mV+_m5wTL7KAUgt=<ZUq2&l@!2@iG)8rKNAU2--%LUP`O_VUYSyr&BI!Vtm^yz3E+p9MmF1>>-R&?D#5RAoy172Mq;2m(xo zj|dkT1ku~;HXcS_#RH6=-mr{g%(s?Pm02zYaCy;99r$QeDvH>35Z-2FR_j1@|wj_xVQkzG{ zT6!(_&n?A;QvvY%{Z@K8BDob8I@?t<63zhEt{`iqaY6IgnuOccGNQ-itf&RI+2-xH zWJJP1L!FLQ6lxN(W2VNcki)ZnpY`@#0^b%F|EfgU0OM10`%ilwz;{F9_f3~PkVFxe zwJNT!dQ~Wj41dGO;AgE5OEVuquoEGzXugsGsQkfTP}HWw^e3ZpXU3Xfn$=QVhh>`(_o)T2KWQf>DEVgX>@-uK) zylxkdsjt7zfE2z)&;BW8wIEM_ucO&&Y`lqRe4Ve;EKupG|C**^HId@$Z(av_2VOi6 z5D1Gki$@(u6`cbwN5%wpk=e&Ci;U3h0{3lv{%Xh3hT{*P8&vor58 z|2MxjrSS+qejs_}q(~%!;^GppN;Lo( zJ2Ff-edV#RIJ@U|yPe7L%gb|2jE?t6zrBV4kajr`Pja3i0Hne! z3$7ksevF^pF!{3q@X|pnuv(y}m;fy4`d4n%GaiMb!0z#{c`P@82_P1W<1G?L*qj5O z&$s9Cc$~ptP&T7VC{;m}l{qli+`;0n9w1-(l*;FFxqrk^D3n;~%=Bark2uy> z1VADaGA^p9f#2`vlEqQA9Wgig{_S?qSZUjEtuyk4*7E!PD=Po)4-0G}z( Wy5eg_BMnCY0000 Date: Sat, 13 Jul 2024 01:55:46 +0200 Subject: [PATCH 07/13] a little more --- .../_Nuclear14/Reagents/medicine.yml | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml b/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml index 69f91ccff2a..abb0d94b947 100644 --- a/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml +++ b/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml @@ -21,6 +21,9 @@ min: 30 damage: types: + Burn: -2.5 + Brute: -2.5 + Airloss: -2.5 Poison: 0.2 - !type:HealthChange conditions: @@ -54,6 +57,9 @@ min: 30 damage: types: + Burn: -2.0 + Brute: -2.0 + Airloss: -2.0 Poison: 0.2 - !type:HealthChange conditions: @@ -112,7 +118,7 @@ color: "#D41244" metabolisms: Medicine: - metabolismRate: 0.1 + metabolismRate: 0.1 # Slow effects: - !type:HealthChange damage: @@ -131,6 +137,7 @@ color: "#D41244" metabolisms: Medicine: + metabolismRate: 0.5 # Medium effects: - !type:HealthChange damage: @@ -159,6 +166,9 @@ min: 30 damage: types: + Burn: -6 + Brute: -6 + Airloss: -6 Poison: 3 Cellular: 0.5 # permanent damage, be glad you aint dead - !type:MovespeedModifier @@ -198,7 +208,7 @@ color: "#00e5ff" metabolisms: Medicine: - metabolismRate: 0.1 # Effectively once every 10 seconds. + metabolismRate: 0.1 # Slow effects: - !type:HealthChange damage: @@ -371,7 +381,7 @@ - !type:ChemVomit probability: 0.05 - !type:Drunk - min: 25 + min: 15 - !type:Jitter min: 25 @@ -442,15 +452,18 @@ Burn: -10 Brute: -10 Airloss: -10 - Toxin: 0.2 + Toxin: 0.5 - !type:HealthChange conditions: - !type:ReagentThreshold min: 30 damage: types: - Poison: 5 - Cellular: 2 # Impressive, you found 2 and injected both. Congratulations. + Burn: -20 # Temporary invincibility more or less + Brute: -20 + Airloss: -20 + Poison: 3 + Cellular: 2 # Congratulations. Still revivable, but permanently fucked - !type:MovespeedModifier walkSpeedModifier: 0.40 sprintSpeedModifier: 0.40 From 77ce361f9a9690d6191800fa0d281a2de680a06c Mon Sep 17 00:00:00 2001 From: BlueHNT <79374236+BlueHNT@users.noreply.github.com> Date: Sat, 13 Jul 2024 14:03:46 +0200 Subject: [PATCH 08/13] doesn't do anything --- .../_Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml index 93595cda558..0251879d01a 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml @@ -518,8 +518,6 @@ transferForensics: true - !type:DoActsBehavior acts: [ "Destruction" ] - - type: UseDelay - delay: 1 - type: entity parent: Gauze From f4cc7b811435f5be6e4a5f42901788c5371637d0 Mon Sep 17 00:00:00 2001 From: BlueHNT <79374236+BlueHNT@users.noreply.github.com> Date: Sat, 13 Jul 2024 14:41:26 +0200 Subject: [PATCH 09/13] Lowers numbers Turns out it's Add not Replace when adding another modifier. --- .../_Nuclear14/Reagents/medicine.yml | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml b/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml index abb0d94b947..f690830bd71 100644 --- a/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml +++ b/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml @@ -15,17 +15,17 @@ Burn: -2.0 Brute: -2.0 Airloss: -2.0 - - !type:HealthChange # to prevent doping + - !type:HealthChange # Bonus for poison conditions: - !type:ReagentThreshold min: 30 damage: types: - Burn: -2.5 - Brute: -2.5 - Airloss: -2.5 + Burn: -1.0 + Brute: -1.0 + Airloss: -1.0 Poison: 0.2 - - !type:HealthChange + - !type:HealthChange # to prevent doping conditions: - !type:ReagentThreshold min: 50 @@ -57,9 +57,9 @@ min: 30 damage: types: - Burn: -2.0 - Brute: -2.0 - Airloss: -2.0 + Burn: -1.0 + Brute: -1.0 + Airloss: -1.0 Poison: 0.2 - !type:HealthChange conditions: @@ -166,9 +166,9 @@ min: 30 damage: types: - Burn: -6 - Brute: -6 - Airloss: -6 + Burn: -2.0 + Brute: -2.0 + Airloss: -2.0 Poison: 3 Cellular: 0.5 # permanent damage, be glad you aint dead - !type:MovespeedModifier @@ -459,9 +459,9 @@ min: 30 damage: types: - Burn: -20 # Temporary invincibility more or less - Brute: -20 - Airloss: -20 + Burn: -10 # Temporary invincibility more or less + Brute: -10 + Airloss: -10 Poison: 3 Cellular: 2 # Congratulations. Still revivable, but permanently fucked - !type:MovespeedModifier From f24c7fcebedb9e8c9d5747f11e2df2c0748aab6d Mon Sep 17 00:00:00 2001 From: BlueHNT <79374236+BlueHNT@users.noreply.github.com> Date: Sat, 13 Jul 2024 14:48:56 +0200 Subject: [PATCH 10/13] aluminium -> aluminum --- .../Locale/en-US/_Nuclear14/reagents.ftl | 4 +-- .../Entities/Objects/Materials/metals.yml | 36 +++++++++---------- .../_Nuclear14/Reagents/materials.yml | 8 ++--- .../_Nuclear14/Stacks/material_stacks.yml | 8 ++--- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Resources/Locale/en-US/_Nuclear14/reagents.ftl b/Resources/Locale/en-US/_Nuclear14/reagents.ftl index e27e8896573..69b2a782af5 100644 --- a/Resources/Locale/en-US/_Nuclear14/reagents.ftl +++ b/Resources/Locale/en-US/_Nuclear14/reagents.ftl @@ -250,10 +250,10 @@ reagent-desc-antiseptic = A cleaning solution made from Abraxo Cleaner and some # Ores, Metals, Materials materials-gunpowder = gunpowder materials-lead = lead -materials-aluminium = aluminium +materials-aluminum = aluminum materials-sulfur = sulfur materials-raw-lead = raw lead -materials-raw-aluminium = raw aluminium +materials-raw-aluminum = raw aluminum materials-raw-sulfur = raw sulfur reagent-name-gunpowder = gunpowder reagent-desc-gunpowder = Small pellet gunpowder. Now just add lead. diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/metals.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/metals.yml index 8661250ec78..b6e12de57e9 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/metals.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/metals.yml @@ -45,49 +45,49 @@ - type: Stack count: 1 -#MARK: Aluminium +#MARK: Aluminum - type: entity parent: IngotBase - id: IngotAluminium - name: aluminium bar + id: IngotAluminum + name: aluminum bar suffix: Full components: - type: Material - type: PhysicalComposition materialComposition: - Aluminium: 100 + Aluminum: 100 - type: Stack - stackType: Aluminium + stackType: Aluminum baseLayer: base layerStates: - - ingot_aluminium - - ingot_aluminium - - ingot_aluminium + - ingot_aluminum + - ingot_aluminum + - ingot_aluminum - type: Sprite sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi - state: ingot_aluminium + state: ingot_aluminum layers: - - state: ingot_aluminium + - state: ingot_aluminum map: ["base"] - type: Item - heldPrefix: ingot_aluminium + heldPrefix: ingot_aluminum - type: Appearance - type: Extractable - grindableSolutionName: aluminium + grindableSolutionName: aluminum - type: SolutionContainerManager solutions: - aluminium: + aluminum: reagents: - - ReagentId: Aluminium + - ReagentId: Aluminum Quantity: 10 - type: entity - parent: IngotAluminium - id: IngotAluminium1 - name: aluminium bar + parent: IngotAluminum + id: IngotAluminum1 + name: aluminum bar suffix: Single components: - type: Sprite - state: ingot_aluminium + state: ingot_aluminum - type: Stack count: 1 diff --git a/Resources/Prototypes/_Nuclear14/Reagents/materials.yml b/Resources/Prototypes/_Nuclear14/Reagents/materials.yml index 87548761c8a..dc285780cd6 100644 --- a/Resources/Prototypes/_Nuclear14/Reagents/materials.yml +++ b/Resources/Prototypes/_Nuclear14/Reagents/materials.yml @@ -26,11 +26,11 @@ price: 0.15 - type: material - id: Aluminium - stackEntity: IngotAluminium1 - name: materials-aluminium + id: Aluminum + stackEntity: IngotAluminum1 + name: materials-aluminum unit: materials-unit-bar - icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: ingot_aluminium } + icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: ingot_aluminum } color: "#C0C0C0" price: 0.15 diff --git a/Resources/Prototypes/_Nuclear14/Stacks/material_stacks.yml b/Resources/Prototypes/_Nuclear14/Stacks/material_stacks.yml index 4b75ea6f919..73a94d75fcd 100644 --- a/Resources/Prototypes/_Nuclear14/Stacks/material_stacks.yml +++ b/Resources/Prototypes/_Nuclear14/Stacks/material_stacks.yml @@ -80,10 +80,10 @@ itemSize: 1 - type: stack - id: Aluminium - name: aluminium - icon: { sprite: "/Textures/_Nuclear14/Objects/Misc/materials.rsi", state: ingot_aluminium } - spawn: IngotLead1 + id: Aluminum + name: aluminum + icon: { sprite: "/Textures/_Nuclear14/Objects/Misc/materials.rsi", state: ingot_aluminum } + spawn: IngotAluminum1 maxCount: 30 itemSize: 1 From b4bd79bb6db255be557b7736728192c19e072f32 Mon Sep 17 00:00:00 2001 From: BlueHNT <79374236+BlueHNT@users.noreply.github.com> Date: Sat, 13 Jul 2024 14:58:14 +0200 Subject: [PATCH 11/13] groups and types --- .../Prototypes/_Nuclear14/Reagents/medicine.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml b/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml index f690830bd71..acba20e731f 100644 --- a/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml +++ b/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml @@ -20,10 +20,11 @@ - !type:ReagentThreshold min: 30 damage: - types: + groups: Burn: -1.0 Brute: -1.0 Airloss: -1.0 + types: Poison: 0.2 - !type:HealthChange # to prevent doping conditions: @@ -56,10 +57,11 @@ - !type:ReagentThreshold min: 30 damage: - types: + groups: Burn: -1.0 Brute: -1.0 Airloss: -1.0 + types: Poison: 0.2 - !type:HealthChange conditions: @@ -105,8 +107,9 @@ groups: Burn: -1 Brute: -1 - Poison: -1 Airloss: -2 + types: + Poison: -1 # Poison - type: reagent @@ -165,10 +168,11 @@ - !type:ReagentThreshold min: 30 damage: - types: + groups: Burn: -2.0 Brute: -2.0 Airloss: -2.0 + types: Poison: 3 Cellular: 0.5 # permanent damage, be glad you aint dead - !type:MovespeedModifier @@ -458,10 +462,11 @@ - !type:ReagentThreshold min: 30 damage: - types: + groups: Burn: -10 # Temporary invincibility more or less Brute: -10 Airloss: -10 + types: Poison: 3 Cellular: 2 # Congratulations. Still revivable, but permanently fucked - !type:MovespeedModifier From 1b963acf9c93a15dd1579064bf6bb3fec948f3ee Mon Sep 17 00:00:00 2001 From: BlueHNT <79374236+BlueHNT@users.noreply.github.com> Date: Sat, 13 Jul 2024 15:08:45 +0200 Subject: [PATCH 12/13] - type: Desctructible and aluminum --- .../_Nuclear14/Entities/Objects/Materials/metals.yml | 4 ++-- .../Entities/Objects/Specific/Medical/chemicals.yml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/metals.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/metals.yml index b6e12de57e9..b50d2fc05b9 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/metals.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/metals.yml @@ -55,7 +55,7 @@ - type: Material - type: PhysicalComposition materialComposition: - Aluminum: 100 + Aluminium: 100 - type: Stack stackType: Aluminum baseLayer: base @@ -78,7 +78,7 @@ solutions: aluminum: reagents: - - ReagentId: Aluminum + - ReagentId: Aluminium Quantity: 10 - type: entity diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml index 0251879d01a..f33947ea98e 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml @@ -508,6 +508,7 @@ reagents: - ReagentId: TraumaPowder Quantity: 30 + - type: Destructible thresholds: - trigger: !type:DamageTrigger From d0cdd5144d3af3cb32c497066c13f43d1ed69c4e Mon Sep 17 00:00:00 2001 From: BlueHNT <79374236+BlueHNT@users.noreply.github.com> Date: Sat, 13 Jul 2024 15:19:22 +0200 Subject: [PATCH 13/13] where the heck do I get materialComposition --- .../Prototypes/_Nuclear14/Entities/Objects/Materials/metals.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/metals.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/metals.yml index b50d2fc05b9..7fc357b3f14 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/metals.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/metals.yml @@ -55,7 +55,7 @@ - type: Material - type: PhysicalComposition materialComposition: - Aluminium: 100 + Aluminum: 100 - type: Stack stackType: Aluminum baseLayer: base