diff --git a/Resources/Locale/en-US/_CP14/reagents/meta/basic-effect-reagent.ftl b/Resources/Locale/en-US/_CP14/reagents/meta/basic-effect-reagent.ftl index 26bcc9a65e..2572789073 100644 --- a/Resources/Locale/en-US/_CP14/reagents/meta/basic-effect-reagent.ftl +++ b/Resources/Locale/en-US/_CP14/reagents/meta/basic-effect-reagent.ftl @@ -1,17 +1,8 @@ cp14-reagent-name-basic-empty = Empty solution cp14-reagent-desc-basic-empty = Natural solvent. Essentially a useless liquid that dilutes useful effects. Getting rid of it will give you much more concentrated solutions. -cp14-reagent-name-basic-heal-blunt = Healing solution for bruises -cp14-reagent-desc-basic-heal-blunt = Effectively treats bones and bruises. - -cp14-reagent-name-basic-heal-piercing = Healing solution for puncture wounds -cp14-reagent-desc-basic-heal-piercing = Effectively heals puncture wounds. - -cp14-reagent-name-basic-heal-slash = Healing solution for cuts. -cp14-reagent-desc-basic-heal-slash = Effectively heals torn tissue. - -cp14-reagent-name-basic-heal-brute = Healing general solution -cp14-reagent-desc-basic-heal-brute = Less efficacious than specialized solutions, but can heal all types of physical damage. +cp14-reagent-name-basic-heal-brute = Healing solution +cp14-reagent-desc-basic-heal-brute = Can heal all types of physical damage. cp14-reagent-name-basic-damage-brute = Ulcer solution cp14-reagent-desc-basic-damage-brute = If ingested, causes flesh eating and other mechanical injuries. @@ -22,7 +13,7 @@ cp14-reagent-desc-basic-damage-poison = Capable of causing extreme indigestion, cp14-reagent-name-basic-heal-poison = Antidote solution cp14-reagent-desc-basic-heal-poison = Effective as a good antidote. -cp14-reagent-name-see-rainbow = Rainbow solution +cp14-reagent-name-see-rainbow = Hallucinogenic solution cp14-reagent-desc-see-rainbow = Causes cheerful hallucinations, colors the whole world in rainbow bright colors. cp14-reagent-name-basic-satiate-hunger = Saturating solution diff --git a/Resources/Locale/ru-RU/_CP14/reagents/meta/basic-effect-reagent.ftl b/Resources/Locale/ru-RU/_CP14/reagents/meta/basic-effect-reagent.ftl index 68accc668e..91bb3e2c97 100644 --- a/Resources/Locale/ru-RU/_CP14/reagents/meta/basic-effect-reagent.ftl +++ b/Resources/Locale/ru-RU/_CP14/reagents/meta/basic-effect-reagent.ftl @@ -1,17 +1,8 @@ cp14-reagent-name-basic-empty = Пустой раствор cp14-reagent-desc-basic-empty = Природный растворитель. По сути бесполезная жидкость, разбавляющая полезные эффекты. Избавившись от нее, вы получите куда более концентрированные растворы. -cp14-reagent-name-basic-heal-blunt = Лечебный раствор от ушибов -cp14-reagent-desc-basic-heal-blunt = Эффективно лечит кости и ушибы. - -cp14-reagent-name-basic-heal-piercing = Лечебный раствор от уколов -cp14-reagent-desc-basic-heal-piercing = Эффективно заращивает колотые раны. - -cp14-reagent-name-basic-heal-slash = Лечебный раствор от порезов -cp14-reagent-desc-basic-heal-slash = Эффективно залечивает разорванные ткани. - -cp14-reagent-name-basic-heal-brute = Общий лечебный раствор -cp14-reagent-desc-basic-heal-brute = Менее эффкетивный, чем специализированные растворы, но способен залечивать все виды физических повреждений. +cp14-reagent-name-basic-heal-brute = Лечебный раствор +cp14-reagent-desc-basic-heal-brute = Способен залечивать все виды физических повреждений. cp14-reagent-name-basic-damage-brute = Раствор язв cp14-reagent-desc-basic-damage-brute = При употреблении внутрь вызывает разъедание плоти и другие механические травмы. @@ -22,7 +13,7 @@ cp14-reagent-desc-basic-damage-poison = Способен вызвать край cp14-reagent-name-basic-heal-poison = Ядовыводящий раствор cp14-reagent-desc-basic-heal-poison = Эффективен как хорошее противоядовое средство. -cp14-reagent-name-see-rainbow = Радужный раствор +cp14-reagent-name-see-rainbow = Галлюциногенный раствор cp14-reagent-desc-see-rainbow = Вызывает веселые галлюцинации, окрашивает весь мир в радужные яркие тона. cp14-reagent-name-basic-satiate-hunger = Насыщающий раствор diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/herbals.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/herbals.yml index 37c7bda8e3..95f07882d7 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/herbals.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/herbals.yml @@ -4,6 +4,7 @@ name: bloodgrass description: The dullest and most common plant to be found in the wild is the dark brown grass. components: + - type: BadFood - type: Item size: Tiny - type: Produce @@ -42,6 +43,7 @@ name: fly agaric description: This poisonous mushroom can often be found near bodies of water or other wet areas. It is not recommended for consumption. components: + - type: BadFood - type: Item size: Tiny - type: Produce @@ -77,6 +79,7 @@ name: chromium slime description: This rare thick substance can be found in a stream of water as if it has a mind of its own. When trying to change the slime itself - the slime changes the reagent it interacts with. components: + - type: BadFood - type: Item size: Tiny - type: Produce diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/floorWater.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/floorWater.yml index cee175b54e..fc3bbb651f 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/floorWater.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/floorWater.yml @@ -62,4 +62,7 @@ - CP14GatherableChromiumSlime2 - CP14GatherableChromiumSlime3 chance: 0.01 - deleteSpawnerAfterSpawn: false \ No newline at end of file + deleteSpawnerAfterSpawn: false + - type: Tag + tags: + - HideContextMenu \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/herbals.yml b/Resources/Prototypes/_CP14/Entities/Structures/Specific/herbals.yml index 8d4813517d..c0e133efee 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/herbals.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/herbals.yml @@ -174,6 +174,9 @@ - Hands loot: All: CP14GatherChromiumSlime + - type: Tag + tags: + - HideContextMenu - type: entity id: CP14GatherableChromiumSlime2 diff --git a/Resources/Prototypes/_CP14/Reagents/basic-effects.yml b/Resources/Prototypes/_CP14/Reagents/basic-effects.yml index 1ddcbcc4db..8a7ab190b2 100644 --- a/Resources/Prototypes/_CP14/Reagents/basic-effects.yml +++ b/Resources/Prototypes/_CP14/Reagents/basic-effects.yml @@ -8,55 +8,7 @@ physicalDesc: cp14-reagent-physical-desc-colorless - type: reagent - id: CP14BasicEffectHealBlunt - name: cp14-reagent-name-basic-heal-blunt - desc: cp14-reagent-desc-basic-heal-blunt - group: CP14BasicEffect - flavor: CP14Metallic - color: "#c71aaa" - physicalDesc: cp14-reagent-physical-desc-scarlet - metabolisms: - Medicine: - effects: - - !type:HealthChange - damage: - types: - Blunt: -10 - -- type: reagent - id: CP14BasicEffectHealPiercing - name: cp14-reagent-name-basic-heal-piercing - desc: cp14-reagent-desc-basic-heal-piercing - group: CP14BasicEffect - flavor: CP14Metallic - color: "#e03895" - physicalDesc: cp14-reagent-physical-desc-scarlet - metabolisms: - Medicine: - effects: - - !type:HealthChange - damage: - types: - Piercing: -10 - -- type: reagent - id: CP14BasicEffectHealSlash - name: cp14-reagent-name-basic-heal-slash - desc: cp14-reagent-desc-basic-heal-slash - group: CP14BasicEffect - flavor: CP14Metallic - color: "#cf153a" - physicalDesc: cp14-reagent-physical-desc-scarlet - metabolisms: - Medicine: - effects: - - !type:HealthChange - damage: - types: - Slash: -10 - -- type: reagent - id: CP14BasicEffectHealBruteGroup + id: CP14BasicEffectHealBrute name: cp14-reagent-name-basic-heal-brute desc: cp14-reagent-desc-basic-heal-brute group: CP14BasicEffect @@ -72,7 +24,7 @@ Brute: -3 - type: reagent - id: CP14BasicEffectDamageBruteGroup + id: CP14BasicEffectDamageBrute name: cp14-reagent-name-basic-damage-brute desc: cp14-reagent-desc-basic-damage-brute group: CP14BasicEffect diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/biological.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/biological.yml index 98dbdc0b82..50dd8e5953 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/biological.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/biological.yml @@ -9,8 +9,7 @@ products: CP14BasicEffectEmpty: 2.7 CP14BasicEffectSatiateHunger: 0.2 - CP14BasicEffectHealSlash: 0.05 - CP14BasicEffectHealPiercing: 0.05 + CP14BasicEffectHealBrute: 0.1 - type: reaction id: CP14AgaricShroomProcessing1 diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/chromium_inverse.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/chromium_inverse.yml index a2a65baa66..d17228b960 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/chromium_inverse.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/chromium_inverse.yml @@ -1,62 +1,14 @@ -- type: reaction - id: CP14ChromiumInverseEffectHealBlunt - minTemp: 350 - conserveEnergy: false - reactants: - CP14BasicEffectHealBlunt: - amount: 1 - CP14ChromiumSlime: - amount: 0.5 - products: - CP14BasicEffectDamageBruteGroup: 0.3 - CP14BasicEffectEmpty: 0.2 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -350 - -- type: reaction - id: CP14ChromiumInverseEffectHealPiercing - minTemp: 350 - conserveEnergy: false - reactants: - CP14BasicEffectHealPiercing: - amount: 1 - CP14ChromiumSlime: - amount: 0.5 - products: - CP14BasicEffectDamageBruteGroup: 0.3 - CP14BasicEffectEmpty: 0.2 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -350 - -- type: reaction - id: CP14ChromiumInverseEffectHealSlash - minTemp: 350 - conserveEnergy: false - reactants: - CP14BasicEffectHealSlash: - amount: 1 - CP14ChromiumSlime: - amount: 0.5 - products: - CP14BasicEffectDamageBruteGroup: 0.3 - CP14BasicEffectEmpty: 0.2 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -350 - - type: reaction id: CP14ChromiumInverseEffectHealBruteGroup minTemp: 350 conserveEnergy: false reactants: - CP14BasicEffectHealBruteGroup: + CP14BasicEffectHealBrute: amount: 1 CP14ChromiumSlime: amount: 0.5 products: - CP14BasicEffectDamageBruteGroup: 0.3 + CP14BasicEffectDamageBrute: 0.3 CP14BasicEffectEmpty: 0.2 effects: - !type:CP14AffectSolutionTemperature @@ -67,12 +19,12 @@ minTemp: 350 conserveEnergy: false reactants: - CP14BasicEffectDamageBruteGroup: + CP14BasicEffectDamageBrute: amount: 0.5 CP14ChromiumSlime: amount: 0.5 products: - CP14BasicEffectHealBruteGroup: 0.3 + CP14BasicEffectHealBrute: 0.3 CP14BasicEffectEmpty: 0.2 effects: - !type:CP14AffectSolutionTemperature