From 013550f42a4d41a0db98cd957ce008a0f57e57d0 Mon Sep 17 00:00:00 2001 From: router Date: Mon, 19 Aug 2024 13:28:04 +0300 Subject: [PATCH] Revert 'Remove Hugging Interaction Popup From Humanoids' (EE#710) --- .../en-US/interaction/interaction-popup-component.ftl | 6 ++++++ .../Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml | 5 +++++ Resources/Prototypes/Entities/Mobs/Player/arachne.yml | 5 +++++ Resources/Prototypes/Entities/Mobs/Player/harpy.yml | 5 +++++ Resources/Prototypes/Entities/Mobs/Player/skeleton.yml | 6 ++++++ Resources/Prototypes/Entities/Mobs/Species/base.yml | 5 +++++ .../Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml | 5 +++++ .../Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml | 5 +++++ 8 files changed, 42 insertions(+) diff --git a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl index a6eacf13c5..bb56233ff1 100644 --- a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl +++ b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl @@ -77,6 +77,12 @@ comp-window-knock = *knock knock* fence-rattle-success = *rattle* +## Hugging players + +hugging-success-generic = You hug {THE($target)}. +hugging-success-generic-others = { CAPITALIZE(THE($user)) } hugs {THE($target)}. +hugging-success-generic-target = { CAPITALIZE(THE($user)) } hugs you. + ## Other petting-success-tesla = You pet {THE($target)}, violating the laws of nature and physics. diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml index d5dbb5f7ee..ea2357a5c0 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml @@ -5,6 +5,11 @@ id: MobVulpkanin components: - type: CombatMode + - type: InteractionPopup + successChance: 1 + interactSuccessString: hugging-success-generic + interactSuccessSound: /Audio/Effects/thudswoosh.ogg + messagePerceivedByOthers: hugging-success-generic-others - type: MindContainer showExamineInfo: true - type: Input diff --git a/Resources/Prototypes/Entities/Mobs/Player/arachne.yml b/Resources/Prototypes/Entities/Mobs/Player/arachne.yml index cd4123fa80..bebf42f31b 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/arachne.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/arachne.yml @@ -5,6 +5,11 @@ id: MobArachne components: - type: CombatMode + - type: InteractionPopup + successChance: 1 + interactSuccessString: hugging-success-generic + interactSuccessSound: /Audio/Effects/thudswoosh.ogg + messagePerceivedByOthers: hugging-success-generic-others - type: MindContainer showExamineInfo: true - type: Input diff --git a/Resources/Prototypes/Entities/Mobs/Player/harpy.yml b/Resources/Prototypes/Entities/Mobs/Player/harpy.yml index 12df7ff103..e2541def03 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/harpy.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/harpy.yml @@ -5,6 +5,11 @@ id: MobHarpy components: - type: CombatMode + - type: InteractionPopup + successChance: 1 + interactSuccessString: hugging-success-generic + interactSuccessSound: /Audio/Effects/thudswoosh.ogg + messagePerceivedByOthers: hugging-success-generic-others - type: MindContainer showExamineInfo: true - type: Input diff --git a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml index 5c2a88c106..f9132ce0ea 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml @@ -2,6 +2,12 @@ save: false parent: BaseMobSkeletonPerson id: MobSkeletonPerson + components: + - type: InteractionPopup + successChance: 1 + interactSuccessString: hugging-success-generic + interactSuccessSound: /Audio/Effects/thudswoosh.ogg + messagePerceivedByOthers: hugging-success-generic-others - type: entity name: skeleton pirate diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index 9fb241c40d..c4906f6f97 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml @@ -180,6 +180,11 @@ - type: Dna - type: MindContainer showExamineInfo: true + - type: InteractionPopup + successChance: 1 + interactSuccessString: hugging-success-generic + interactSuccessSound: /Audio/Effects/thudswoosh.ogg + messagePerceivedByOthers: hugging-success-generic-others - type: CanHostGuardian - type: NpcFactionMember factions: diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml index 8e9e2c62df..1166d8a29f 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml @@ -5,6 +5,11 @@ id: MobOni components: - type: CombatMode + - type: InteractionPopup + successChance: 1 + interactSuccessString: hugging-success-generic + interactSuccessSound: /Audio/Effects/thudswoosh.ogg + messagePerceivedByOthers: hugging-success-generic-others - type: MindContainer showExamineInfo: true - type: Input diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml index f3dbd396e5..94ac8403ad 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml @@ -5,6 +5,11 @@ id: MobFelinid components: - type: CombatMode + - type: InteractionPopup + successChance: 1 + interactSuccessString: hugging-success-generic + interactSuccessSound: /Audio/Effects/thudswoosh.ogg + messagePerceivedByOthers: hugging-success-generic-others - type: MindContainer showExamineInfo: true - type: Input