diff --git a/Resources/Locale/en-US/_CP14/reagents/meta/backlog-extracts.ftl b/Resources/Locale/en-US/_CP14/reagents/meta/backlog-extracts.ftl deleted file mode 100644 index e36b7fbf0a..0000000000 --- a/Resources/Locale/en-US/_CP14/reagents/meta/backlog-extracts.ftl +++ /dev/null @@ -1,8 +0,0 @@ -cp14-reagent-name-vital-extract = vital extract -cp14-reagent-desc-vital-extract = Liquid, unprocessed embodiment of the desire for life. In small doses can be used as a weak medicine, but in large doses can have irreversible effects on the body. - -cp14-reagent-vital-extract-feeling-1 = You feel your heart begin to beat more often. -cp14-reagent-vital-extract-feeling-2 = You feel your whole body tingle. -cp14-reagent-vital-extract-feeling-3 = Your whole body starts to pinch and scratch. -cp14-reagent-vital-extract-feeling-4 = You feel strange... -cp14-reagent-vital-extract-feeling-5 = You feel as if something inside you is growing and dying... 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 42cf900621..3764fc641e 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 @@ -13,6 +13,9 @@ 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. +cp14-reagent-name-basic-damage-heat = Incendiary solution +cp14-reagent-desc-basic-damage-heat = Causes severe fire burns and even sets fire. + cp14-reagent-name-basic-heal-heat = Soothing Solution cp14-reagent-desc-basic-heal-heat = Capable of healing most burns. diff --git a/Resources/Locale/en-US/_CP14/reagents/meta/precurser.ftl b/Resources/Locale/en-US/_CP14/reagents/meta/precurser.ftl index 75ee6503a9..0687c25d0d 100644 --- a/Resources/Locale/en-US/_CP14/reagents/meta/precurser.ftl +++ b/Resources/Locale/en-US/_CP14/reagents/meta/precurser.ftl @@ -1,14 +1,14 @@ cp14-reagent-name-alchemizedblood = Alchemized Blood -cp14-reagent-desc-alchemizedblood = The reduced spirits of a living warm-blooded creatures. +cp14-reagent-desc-alchemizedblood = The reduced blood of a living warm-blooded creatures. cp14-reagent-name-alchemizedblood-tiefling = Alchemized Tiefling blood -cp14-reagent-desc-alchemizedblood-tiefling = The reduced spirits of a fire-blooded creature. +cp14-reagent-desc-alchemizedblood-tiefling = The reduced blood of a fire-blooded creature. cp14-reagent-name-alchemizedblood-elf = Alchemized Elf blood -cp14-reagent-desc-alchemizedblood-elf = The reduced spirits of a magical creature. +cp14-reagent-desc-alchemizedblood-elf = The reduced blood of a magical creature. cp14-reagent-name-alchemizedblood-goblin = Alchemized Goblin blood -cp14-reagent-desc-alchemizedblood-goblin = The reduced spirits of green-skinned creatures. +cp14-reagent-desc-alchemizedblood-goblin = The reduced blood of green-skinned creatures. cp14-reagent-name-essence = Essence cp14-reagent-desc-essence = An alchemically pure extract of warm-blooded creatures. diff --git a/Resources/Locale/ru-RU/_CP14/reagents/meta/backlog-extracts.ftl b/Resources/Locale/ru-RU/_CP14/reagents/meta/backlog-extracts.ftl deleted file mode 100644 index cfdf1b19ef..0000000000 --- a/Resources/Locale/ru-RU/_CP14/reagents/meta/backlog-extracts.ftl +++ /dev/null @@ -1,8 +0,0 @@ -cp14-reagent-name-vital-extract = живительный экстракт -cp14-reagent-desc-vital-extract = Жидкое, необработанное воплощение стремления к жизни. В малых дозах может использоваться как слабое лекарство, но при больших дозах может оказать необратимые последствия на организм. - -cp14-reagent-vital-extract-feeling-1 = Вы чувствуете, как ваше сердце начинает биться чаще -cp14-reagent-vital-extract-feeling-2 = Вы чувствуете дрожь во всем теле -cp14-reagent-vital-extract-feeling-3 = Все ваше тело начинает щипать и почесывать -cp14-reagent-vital-extract-feeling-4 = Вы чувствуете себя странно... -cp14-reagent-vital-extract-feeling-5 = Вы чувствуете словно внутри вам что-то растет и умирает... 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 d242cb3e85..72c6983fea 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 @@ -13,7 +13,10 @@ cp14-reagent-desc-basic-heal-brute = Способен залечивать вс cp14-reagent-name-basic-damage-brute = Раствор язв cp14-reagent-desc-basic-damage-brute = При употреблении внутрь вызывает разъедание плоти и другие механические травмы. -cp14-reagent-name-basic-heal-heat = Успокаивающий раствор +cp14-reagent-name-basic-damage-heat = Поджигающий раствор +cp14-reagent-desc-basic-damage-heat = Вызывает сильные огненные ожоги и даже поджигает. + +cp14-reagent-name-basic-heal-heat = Охлаждающий раствор cp14-reagent-desc-basic-heal-heat = Способен излечить большинство ожогов. cp14-reagent-name-basic-heal-cold = Согревающий раствор diff --git a/Resources/Locale/ru-RU/_CP14/reagents/meta/precurser.ftl b/Resources/Locale/ru-RU/_CP14/reagents/meta/precurser.ftl index 779b0cde4b..16ad1b6d4b 100644 --- a/Resources/Locale/ru-RU/_CP14/reagents/meta/precurser.ftl +++ b/Resources/Locale/ru-RU/_CP14/reagents/meta/precurser.ftl @@ -1,24 +1,24 @@ cp14-reagent-name-alchemizedblood = Алхимизированная кровь -cp14-reagent-desc-alchemizedblood = Обработанные духи живых теплокровных существ. +cp14-reagent-desc-alchemizedblood = Обработанная кровь живых теплокровных существ. cp14-reagent-name-alchemizedblood-tiefling = Алхимизированная кровь тифлинга -cp14-reagent-desc-alchemizedblood-tiefling = Обработанные духи огненнокровного существа. +cp14-reagent-desc-alchemizedblood-tiefling = Обработанная кровь огненнокровного существа. cp14-reagent-name-alchemizedblood-elf = Алхимизированная эльфийская кровь -cp14-reagent-desc-alchemizedblood-elf = Обработанные духи магического существа. +cp14-reagent-desc-alchemizedblood-elf = Обработанная кровь магического существа. cp14-reagent-name-alchemizedblood-goblin = Алхимизированная кровь гоблинов -cp14-reagent-desc-alchemizedblood-goblin = Обработанные духи зеленокожих существ. +cp14-reagent-desc-alchemizedblood-goblin = Обработанная кровь зеленокожих существ. -cp14-reagent-name-essence = Сущность +cp14-reagent-name-essence = Чистая эссенция жизни cp14-reagent-desc-essence = Алхимически чистый экстракт теплокровных существ. cp14-reagent-name-essence-tiefling = Эссенция Тифлинга -cp14-reagent-desc-essence-tiefling = An alchemically pure extract of fire-blooded creatures. +cp14-reagent-desc-essence-tiefling = Алхимически чистый экстракт огненных существ. cp14-reagent-name-essence-elf = Эссенция Эльфа -cp14-reagent-desc-essence-elf = An alchemically pure extract of magical creatures. +cp14-reagent-desc-essence-elf = Алхимически чистый экстракт магических существ. cp14-reagent-name-essence-goblin = Эссенция Гоблина -cp14-reagent-desc-essence-goblin = An alchemically pure extract of green-skinned creatures. +cp14-reagent-desc-essence-goblin = Алхимически чистый экстракт зеленокожих существ. diff --git a/Resources/Prototypes/_CP14/Reagents/backlog-extracts.yml b/Resources/Prototypes/_CP14/Reagents/backlog-extracts.yml deleted file mode 100644 index 81efd024e0..0000000000 --- a/Resources/Prototypes/_CP14/Reagents/backlog-extracts.yml +++ /dev/null @@ -1,65 +0,0 @@ -# 13-1 rule -# There should be 12 basic alchemical extracts, and 1 forbidden one, for antagonists only -# 1) Vital extract -# 2) Death extract -# 3) Fire extract -# 4) Ice extract -# 5) Light extract -# 6) Void/Dark extract -# 7) Air extract -# 8) Earth extract -# 9) Lightning extract -# 10) -# 11) -# 12) -# 13) - -- type: reagent - id: CP14VitalExtract - group: CP14BasicAlchemy - name: cp14-reagent-name-vital-extract - desc: cp14-reagent-desc-vital-extract - flavor: CP14Invigorating - color: "#db2a2a" - physicalDesc: cp14-reagent-physical-desc-scarlet - footstepSound: - collection: FootstepBlood - params: - volume: 6 - metabolisms: - Medicine: - effects: - - !type:HealthChange - conditions: - - !type:ReagentThreshold - min: 0 - max: 7 - damage: - groups: - Burn: -0.1 - Toxin: -0.1 - Brute: -0.1 - - !type:HealthChange - conditions: - - !type:ReagentThreshold - min: 7 - damage: - groups: - Burn: -0.2 - Toxin: -0.2 - Brute: -0.2 - types: - Cellular: 0.25 - - !type:PopupMessage - conditions: - - !type:ReagentThreshold - min: 10 - visualType: Medium - messages: - - cp14-reagent-vital-extract-feeling-1 - - cp14-reagent-vital-extract-feeling-2 - - cp14-reagent-vital-extract-feeling-3 - - cp14-reagent-vital-extract-feeling-4 - - cp14-reagent-vital-extract-feeling-5 - type: Local - probability: 0.05 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Reagents/basic-effects.yml b/Resources/Prototypes/_CP14/Reagents/basic-effects.yml index 17fc944f97..64b57a8905 100644 --- a/Resources/Prototypes/_CP14/Reagents/basic-effects.yml +++ b/Resources/Prototypes/_CP14/Reagents/basic-effects.yml @@ -50,15 +50,17 @@ flavor: CP14Metallic color: "#e31010" physicalDesc: cp14-reagent-physical-desc-scarlet + worksOnTheDead: true metabolisms: Medicine: + metabolismRate: 0.05 effects: - !type:ModifyBleedAmount amount: -2 - !type:HealthChange damage: groups: - Brute: -3 + Brute: -6 - type: reagent id: CP14BasicEffectDamageBrute @@ -68,8 +70,10 @@ flavor: CP14Stinging color: "#633223" physicalDesc: cp14-reagent-physical-desc-ferrous + worksOnTheDead: true metabolisms: Poison: + metabolismRate: 0.05 effects: - !type:HealthChange damage: @@ -84,13 +88,37 @@ flavor: CP14Stinging color: "#BF361E" physicalDesc: cp14-reagent-physical-desc-sparkling + worksOnTheDead: true metabolisms: Medicine: + metabolismRate: 0.05 effects: - !type:HealthChange damage: types: - Heat: -5 + Heat: -10 + +- type: reagent + id: CP14BasicEffectDamageHeat + name: cp14-reagent-name-basic-damage-heat + desc: cp14-reagent-desc-basic-damage-heat + group: CP14BasicEffect + flavor: CP14Stinging + color: "#d4772a" + tileReactions: + - !type:CreateEntityTileReaction + entity: CP14Fire + physicalDesc: cp14-reagent-physical-desc-sparkling + worksOnTheDead: true + metabolisms: + Medicine: + metabolismRate: 0.05 + effects: + - !type:FlammableReaction + multiplier: 1.5 + - !type:AdjustTemperature + amount: 2000 + - !type:Ignite - type: reagent id: CP14BasicEffectHealCold @@ -100,13 +128,15 @@ flavor: CP14Stinging color: "#a3511a" physicalDesc: cp14-reagent-physical-desc-sparkling + worksOnTheDead: true metabolisms: Medicine: + metabolismRate: 0.05 effects: - !type:HealthChange damage: types: - Cold: -5 + Cold: -10 - type: reagent id: CP14BasicEffectDamageCold @@ -116,13 +146,15 @@ flavor: CP14Stinging color: "#1a95a3" physicalDesc: cp14-reagent-physical-desc-sparkling + worksOnTheDead: true metabolisms: Poison: + metabolismRate: 0.05 effects: - !type:HealthChange damage: types: - Cold: 5 + Cold: 3 - type: reagent id: CP14BasicEffectHealPoison @@ -132,13 +164,15 @@ flavor: CP14Bitterly color: "#82ba3d" physicalDesc: cp14-reagent-physical-desc-viscous + worksOnTheDead: true metabolisms: Medicine: + metabolismRate: 0.05 effects: - !type:HealthChange damage: types: - Poison: -6 + Poison: -10 - type: reagent id: CP14BasicEffectDamagePoison @@ -148,13 +182,15 @@ flavor: CP14Bitterly color: "#768551" physicalDesc: cp14-reagent-physical-desc-viscous + worksOnTheDead: true metabolisms: Poison: + metabolismRate: 0.05 effects: - !type:HealthChange damage: types: - Poison: 6 + Poison: 3 - type: reagent id: CP14BasicEffectPurification @@ -164,13 +200,15 @@ flavor: CP14Salty color: "#977CB2" physicalDesc: cp14-reagent-physical-desc-grainy + worksOnTheDead: true metabolisms: Medicine: + metabolismRate: 0.05 effects: - !type:HealthChange damage: types: - Poison: -3 + Poison: -4 - !type:SatiateThirst factor: -2 @@ -181,15 +219,16 @@ group: CP14BasicEffect flavor: fizzy color: "#e6f4f5" + worksOnTheDead: true physicalDesc: reagent-physical-desc-milky metabolisms: Medicine: + metabolismRate: 0.05 effects: - !type:HealthChange damage: types: - Asphyxiation: -8 - Bloodloss: -2 + Asphyxiation: -10 - type: reagent id: CP14BasicEffectDamageAirloss @@ -198,14 +237,16 @@ group: CP14BasicEffect flavor: horrible color: "#73091e" + worksOnTheDead: true physicalDesc: reagent-physical-desc-viscous metabolisms: Poison: + metabolismRate: 0.05 effects: - !type:HealthChange damage: types: - Asphyxiation: 10 + Asphyxiation: 3 - type: reagent id: CP14BasicEffectBloodRestore @@ -214,12 +255,14 @@ group: CP14BasicEffect flavor: CP14Metallic color: "#e31010" + worksOnTheDead: true physicalDesc: cp14-reagent-physical-desc-scarlet metabolisms: Poison: + metabolismRate: 0.05 effects: - !type:ModifyBloodLevel - amount: 10 + amount: 20 - type: reagent id: CP14BasicEffectBloodAbsorption @@ -228,9 +271,11 @@ group: CP14BasicEffect flavor: CP14Metallic color: "#2b0e0b" + worksOnTheDead: true physicalDesc: cp14-reagent-physical-desc-scarlet metabolisms: Poison: + metabolismRate: 0.05 effects: - !type:ModifyBloodLevel amount: -10 @@ -245,9 +290,10 @@ physicalDesc: cp14-reagent-physical-desc-viscous metabolisms: Food: + metabolismRate: 0.05 effects: - !type:SatiateHunger - factor: 6 + factor: 15 - type: reagent id: CP14BasicEffectSatiateThirst @@ -259,9 +305,10 @@ physicalDesc: cp14-reagent-physical-desc-colorless metabolisms: Drink: + metabolismRate: 0.05 effects: - !type:SatiateThirst - factor: 6 + factor: 15 - type: reagent id: CP14BasicEffectHealMana @@ -273,9 +320,10 @@ physicalDesc: cp14-reagent-physical-desc-iridescent metabolisms: Medicine: + metabolismRate: 0.05 effects: - !type:CP14ManaChange - manaDelta: 10 + manaDelta: 20 - type: reagent id: CP14BasicEffectDamageMana @@ -287,9 +335,10 @@ physicalDesc: cp14-reagent-physical-desc-iridescent metabolisms: Poison: + metabolismRate: 0.05 effects: - !type:CP14ManaChange - manaDelta: -10 + manaDelta: -20 - type: reagent id: CP14BasicEffectUnstable @@ -301,6 +350,7 @@ physicalDesc: cp14-reagent-physical-desc-viscous metabolisms: Poison: + metabolismRate: 0.05 effects: - !type:HealthChange damage: @@ -317,10 +367,12 @@ physicalDesc: cp14-reagent-physical-desc-viscous metabolisms: Poison: + metabolismRate: 0.1 effects: - !type:MovespeedModifier walkSpeedModifier: 1.35 sprintSpeedModifier: 1.35 + statusLifetime: 1.5 - !type:GenericStatusEffect key: Stutter component: StutteringAccent @@ -335,10 +387,12 @@ physicalDesc: cp14-reagent-physical-desc-viscous metabolisms: Poison: + metabolismRate: 0.1 effects: - !type:MovespeedModifier walkSpeedModifier: 0.65 sprintSpeedModifier: 0.65 + statusLifetime: 1.5 - !type:GenericStatusEffect key: Stutter component: StutteringAccent @@ -355,6 +409,7 @@ physicalDesc: cp14-reagent-physical-desc-colorless metabolisms: Narcotic: + metabolismRate: 0.05 effects: - !type:GenericStatusEffect key: SeeingRainbows @@ -373,6 +428,7 @@ physicalDesc: cp14-reagent-physical-desc-colorless metabolisms: Medicine: + metabolismRate: 0.05 effects: - !type:Emote showInChat: false @@ -389,6 +445,7 @@ physicalDesc: cp14-reagent-physical-desc-colorless metabolisms: Food: + metabolismRate: 0.05 effects: - !type:ChemVomit probability: 0.25 @@ -403,6 +460,7 @@ physicalDesc: cp14-reagent-physical-desc-colorless metabolisms: Food: + metabolismRate: 0.05 effects: - !type:Drunk boozePower: 15 @@ -417,5 +475,6 @@ physicalDesc: cp14-reagent-physical-desc-colorless metabolisms: Food: + metabolismRate: 0.05 effects: - !type:Jitter \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/bloodflower.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/bloodflower.yml index a40ae6a17c..ad8f254754 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/bloodflower.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/bloodflower.yml @@ -73,7 +73,7 @@ products: CP14BasicEffectImpurity: 0.75 CP14BasicEffectHealCold: 0.5 - CP14BasicEffectHealHeat: 0.25 + CP14BasicEffectDamageHeat: 0.25 effects: - !type:CP14AffectSolutionTemperature addTemperature: -270 diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/chromium_slime.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/chromium_slime.yml index 3a5179b24a..9552947a74 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/chromium_slime.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/chromium_slime.yml @@ -23,6 +23,9 @@ CP14BasicEffectHealPoison: CP14BasicEffectDamagePoison CP14BasicEffectDamagePoison: CP14BasicEffectHealPoison # + CP14BasicEffectDamageHeat: CP14BasicEffectHealHeat + CP14BasicEffectHealHeat: CP14BasicEffectDamageHeat + # CP14BasicEffectDamageCold: CP14BasicEffectHealCold CP14BasicEffectHealCold: CP14BasicEffectDamageCold # diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/dayflin.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/dayflin.yml index 0dafa3f30d..6115a8e3ed 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/dayflin.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/dayflin.yml @@ -36,4 +36,5 @@ - CP14BasicEffectUnstable: 0.5 - CP14BasicEffectDamageMana: 0.5 - CP14BasicEffectHealCold: 0.5 - - CP14BasicEffectSatiateThirst: 0.5 \ No newline at end of file + - CP14BasicEffectSatiateThirst: 0.5 + - CP14BasicEffectDamageHeat: 0.5 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/wild_sage.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/wild_sage.yml index 6c1a92a2ce..dae138fdfe 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/wild_sage.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/wild_sage.yml @@ -22,6 +22,8 @@ CP14BasicEffectHealPoison: 0.25 - CP14BasicEffectImpurity: 0.25 CP14BasicEffectEmpty: 0.25 + - CP14BasicEffectImpurity: 0.25 + CP14BasicEffectDamageHeat: 0.25 effects: - !type:CP14AffectSolutionTemperature addTemperature: -250