diff --git a/Resources/Locale/ru-RU/corvax/species/species.ftl b/Resources/Locale/ru-RU/corvax/species/species.ftl index 3bf77fd2a02..b5d18cfa1fa 100644 --- a/Resources/Locale/ru-RU/corvax/species/species.ftl +++ b/Resources/Locale/ru-RU/corvax/species/species.ftl @@ -1 +1,2 @@ species-name-xenoslime = Ксенослайм +species-name-elzuosa = Эльзуос \ No newline at end of file diff --git a/Resources/Locale/ru-RU/interaction/interaction-popup-component.ftl b/Resources/Locale/ru-RU/interaction/interaction-popup-component.ftl index e4c17dd5be3..fa6d03a2dca 100644 --- a/Resources/Locale/ru-RU/interaction/interaction-popup-component.ftl +++ b/Resources/Locale/ru-RU/interaction/interaction-popup-component.ftl @@ -74,3 +74,6 @@ petting-failure-tesla = Вы тянетесь погладить { $target }, н pat-success-generic = Вы гладите { $target } по пушистой голове. pat-success-generic-others = { CAPITALIZE($user) } гладит { $target } по пушистой голове. pat-success-generic-target = { CAPITALIZE($user) } гладит вашу пушистую голову. +pat-success-elzuosa = вы обнимаете { $target }, чувствуя, как по вам проходит высоковольтный ток. +pat-success-elzuosa-others = { CAPITALIZE($user) } обнимает { $target }, наэлектризовываясь. +pat-success-elzuosa-target = { CAPITALIZE($user) } обнимает вас. \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Damage/modifier_sets.yml b/Resources/Prototypes/Corvax/Damage/modifier_sets.yml index e6ada079303..0ba74453a70 100644 --- a/Resources/Prototypes/Corvax/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Corvax/Damage/modifier_sets.yml @@ -3,3 +3,8 @@ coefficients: Cold: 0.5 Heat: 1.5 + +- type: damageModifierSet + id: Elzuosa + coefficients: + Shock: 0.0 diff --git a/Resources/Prototypes/Corvax/Entities/Mobs/Species/xenoslime.yml b/Resources/Prototypes/Corvax/Entities/Mobs/Species/xenoslime.yml index 277b7e7578c..1cd2cef9470 100644 --- a/Resources/Prototypes/Corvax/Entities/Mobs/Species/xenoslime.yml +++ b/Resources/Prototypes/Corvax/Entities/Mobs/Species/xenoslime.yml @@ -33,6 +33,11 @@ - type: Damageable damageContainer: Biological damageModifierSet: Slime + - type: DamageVisuals + damageOverlayGroups: + Brute: + sprite: Mobs/Effects/brute_damage.rsi + color: "#2cf274" - type: Bloodstream bloodReagent: Slime # TODO Color Xenoslime blood based on their Xenoslime color or smth - type: Barotrauma diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml index abb4b4dd869..b66dd628b27 100644 --- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml @@ -16,12 +16,17 @@ sprite: Objects/Power/power_cells.rsi - type: SolutionContainerManager solutions: - battery: + food: maxVol: 5 + reagents: + - ReagentId: Zinc + Quantity: 5 - type: InjectableSolution solution: battery - type: DrawableSolution solution: battery + - type: Food # Corvax-Frontier + requiresSpecialDigestion: true - type: Extractable juiceSolution: reagents: diff --git a/Resources/Prototypes/Reagents/elements.yml b/Resources/Prototypes/Reagents/elements.yml index e47335b1b4a..d5a8f8ea7b6 100644 --- a/Resources/Prototypes/Reagents/elements.yml +++ b/Resources/Prototypes/Reagents/elements.yml @@ -354,3 +354,10 @@ color: "#bababa" meltingPoint: 419.5 boilingPoint: 907.0 + metabolisms: # Corvax-Frontier + Food: + effects: + - !type:SatiateHunger + conditions: + - !type:OrganType + type: Elzuosa