diff --git a/Content.Shared/Changeling/ChangelingComponent.cs b/Content.Shared/Changeling/ChangelingComponent.cs index f4ddb6e875..ef3efdfa6c 100644 --- a/Content.Shared/Changeling/ChangelingComponent.cs +++ b/Content.Shared/Changeling/ChangelingComponent.cs @@ -24,7 +24,7 @@ public sealed partial class ChangelingComponent : Component public float Accumulator; [ViewVariables(VVAccess.ReadOnly)] - public float UpdateDelay = 8f; + public float UpdateDelay = 6f; [ViewVariables(VVAccess.ReadOnly)] public bool IsRegenerating; diff --git a/Resources/Locale/ru-RU/white/changeling/changeling-entities.ftl b/Resources/Locale/ru-RU/white/changeling/changeling-entities.ftl index b9c2dfcf64..27f6c1e246 100644 --- a/Resources/Locale/ru-RU/white/changeling/changeling-entities.ftl +++ b/Resources/Locale/ru-RU/white/changeling/changeling-entities.ftl @@ -53,7 +53,7 @@ changeling-ability-changeling-lesser-form = Примитивная форма changeling-ability-changeling-lesser-form-desc = Превращает в самую примитивную форму. Полезно для побега из наручников. Стоит 5 химикатов. changeling-ability-bees = Выпустить пчёл -changeling-ability-bees-desc = Выпускает 6 агрессивных пчёл из улья. +changeling-ability-bees-desc = Выпускает 4 агрессивных пчелы из улья. ent-ActionChangelingShop = Эволюции .desc = Эволюционируйте и развивайтесь. diff --git a/Resources/Prototypes/Actions/changeling.yml b/Resources/Prototypes/Actions/changeling.yml index 282b53f006..15f1271913 100644 --- a/Resources/Prototypes/Actions/changeling.yml +++ b/Resources/Prototypes/Actions/changeling.yml @@ -76,6 +76,9 @@ event: !type:ExtractionStingActionEvent canTargetSelf: false useDelay: 1 + whitelist: + components: + - HumanoidAppearance - type: entity id: ActionTransformSting @@ -89,6 +92,9 @@ event: !type:TransformStingActionEvent canTargetSelf: false useDelay: 1 + whitelist: + components: + - HumanoidAppearance - type: entity id: ActionBlindSting @@ -102,6 +108,10 @@ event: !type:BlindStingActionEvent canTargetSelf: false useDelay: 1 + whitelist: + components: + - HumanoidAppearance + - Blindable - type: entity id: ActionMuteSting @@ -115,6 +125,9 @@ event: !type:MuteStingActionEvent canTargetSelf: false useDelay: 1 + whitelist: + components: + - HumanoidAppearance - type: entity id: ActionHallucinationSting @@ -128,6 +141,9 @@ event: !type:HallucinationStingActionEvent canTargetSelf: false useDelay: 1 + whitelist: + components: + - HumanoidAppearance - type: entity id: ActionCryoSting @@ -141,11 +157,15 @@ event: !type:CryoStingActionEvent canTargetSelf: false useDelay: 1 + whitelist: + components: + - HumanoidAppearance + - Temperature - type: entity id: ActionAdrenalineSacs name: changeling-ability-adrenaline-sacks - description: changeling-ability-adrenaline-sacks.desc + description: changeling-ability-adrenaline-sacks-desc noSpawn: true components: - type: InstantAction @@ -153,6 +173,8 @@ icon: White/Actions/changeling.rsi/adrenaline_sacs.png event: !type:AdrenalineSacsActionEvent useDelay: 1 + checkConsciousness: false + checkCanInteract: false - type: LesserFormRestricted - type: entity @@ -166,6 +188,8 @@ icon: White/Actions/changeling.rsi/fleshmend.png event: !type:FleshmendActionEvent useDelay: 1 + checkConsciousness: false + checkCanInteract: false - type: LesserFormRestricted - type: entity diff --git a/Resources/Prototypes/Alerts/changeling.yml b/Resources/Prototypes/Alerts/changeling.yml index 682e7230d0..eae984518d 100644 --- a/Resources/Prototypes/Alerts/changeling.yml +++ b/Resources/Prototypes/Alerts/changeling.yml @@ -1,6 +1,5 @@ - type: alert id: Chemicals - category: Health #it's like ghostie health icons: - sprite: /Textures/Interface/Alerts/essence_counter.rsi state: essence0 diff --git a/Resources/Prototypes/_White/Entities/Clothing/Head/hive_head.yml b/Resources/Prototypes/_White/Entities/Clothing/Head/hive_head.yml index f4a6fb4d88..c4b5c6ddf6 100644 --- a/Resources/Prototypes/_White/Entities/Clothing/Head/hive_head.yml +++ b/Resources/Prototypes/_White/Entities/Clothing/Head/hive_head.yml @@ -21,7 +21,6 @@ - type: FlashImmunity - type: EyeProtection - type: HiveHead - beesAmount: 6 - type: entity id: ActionReleaseBees