Make Hugging/Petting Interactions Affect Mood#823
Merged
VMSolidus merged 2 commits intoSimple-Station:masterfrom Sep 8, 2024
Merged
Make Hugging/Petting Interactions Affect Mood#823VMSolidus merged 2 commits intoSimple-Station:masterfrom
VMSolidus merged 2 commits intoSimple-Station:masterfrom
Conversation
github-actions
bot
added
Changes: C#
SimpleStation14
changed the title
DEATHB4DEFEAT
requested changes
Sep 3, 2024
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Signed-off-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com>
DEATHB4DEFEAT
approved these changes
Sep 5, 2024
VMSolidus
approved these changes
Sep 8, 2024
IsNotAcceptable
pushed a commit
to IsNotAcceptable/VIBE-PROJECT
that referenced
this pull request
Feb 8, 2026
* test * test * test * fix * Update Content.Server/Weapons/Melee/MeleeWeaponSystem.cs * Update Resources/Locale/en-US/_white/game-tiking/game-rules/xenomorphs.ftl
firfaronde
pushed a commit
to BohdanNovikov0207/Orehum-Project
that referenced
this pull request
Feb 11, 2026
* [Feature] Xenomorphs Part 1 (Simple-Station#716) * init commit * xenomorph: part 1 * weed heal * fix Rsi * fix Yaml linter * fix * Xenomorphs: part 2 (Simple-Station#744) * rebalance * oh * looks better * Finally * [Fix] Xenomotphs: part 2.5 (Simple-Station#759) fixs * Xenomorphs: Part 3 (Simple-Station#815) * this is definitely one of the commits * 1 * new facehuggers * suffix * Burst egg * some fix * Update Content.Server/_White/Xenomorphs/Queen/XenomorphQueenSystem.cs Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update Content.Server/_White/Xenomorphs/Queen/XenomorphQueenSystem.cs Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update Resources/Locale/en-US/_white/objectives/conditions/steal-target-groups.ftl Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update Content.Server/_White/Xenomorphs/FaceHugger/FaceHuggerSystem.cs * Update Content.Server/_White/Xenomorphs/FaceHugger/FaceHuggerSystem.cs * Update Resources/Locale/ru-RU/_white/prototypes/entities/mobs/player/pets.ftl * Update Resources/Locale/ru-RU/WWDP_TRANSLATION/_white/prototypes/entities/structures/storage/glass_box.ftl * Update Resources/Locale/ru-RU/_white/objectives/conditions/steal-target-groups.ftl * Update Content.Server/_White/Xenomorphs/FaceHugger/FaceHuggerSystem.cs * some fix * SelfUnBuckleDelay * Neurotoxin now stun * PlasmaAmmoProvider * some fix * fix * some number --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * [Fix] Xenomorphs (Simple-Station#823) * test * test * test * fix * Update Content.Server/Weapons/Melee/MeleeWeaponSystem.cs * Update Resources/Locale/en-US/_white/game-tiking/game-rules/xenomorphs.ftl * Fix typos in Russian localization for xenomorphs Signed-off-by: Bogdan Novikov <150541068+BohdanNovikov0207@users.noreply.github.com> * any fix with dependency * - add: Bark (Simple-Station#827) * - add: bark * - tweak: Bark now in client side * - add: bark config in options * - add: migration prepare * - add: Migrations * - add: more barks * - add: bark preference in character profile * - add: knob * - add: change value by mouse wheel * - tweak: optimise WWDP thinks * - tweak: improve NeoTabContainer optimisation * - add: limit of barks * - fix: кролькины фиксы * - fix: change things in tab id * Update Content.Client/_White/TTS/TTSSystem.cs Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * - fix: спатисон дурак блин ты сломал что то.. * - fix: спатисонов фиксы * Update Content.Server/_White/Bark/BarkSystem.cs * - fix: буковки * Apply suggestions from code review --------- Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * fix!!! not yet * [Feature] Body Types (#180) * feature: body types * feature: body types: 2 * add: loc * fix: rsi validate * tweak: displasment jumpsuit * tweak: clean up * tweak: displasment shoes * tweak: displasment gloves * tweak: clean up * tweak: displasment outerClothing * Revert "tweak: displasment outerClothing" This reverts commit 698fd688591a6c00a4cd19eebac7a204dce18e98. * fix * fix * fix * fix * tweak: dwarf, Oni and Felenid now can choose slim body type * add: outer displacement * some fix * some fix * no more tags shitcode * Reptilian body type * harpy body type * some fix * rsi validator fix * Update ClientClothingSystem.cs * Update Model.cs * Update MarkingManager.cs * Update ClientClothingSystem.cs * Update reptilian.yml * maybe fix? * add dependc * boring * build building * до бд падения * СС * locale delete * trash * reprilian fix * CombatMode * fix sponsor and texture * linter dinahu * fix movemnet? --------- Signed-off-by: Bogdan Novikov <150541068+BohdanNovikov0207@users.noreply.github.com> Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: Bogdan Novikov <150541068+BohdanNovikov0207@users.noreply.github.com> Co-authored-by: Cinkafox <70429757+Cinkafox@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Something that was omitted in #733. Hugging and petting now give positive moodlets.
The petting interaction was split into two: one for animals and one for humanoids. The one for animals improves both your own mood and the mood of the animal, whereas petting a humanoid only improves their own mood. In addition to all that, being hugged and being pet do not stack.
Media
8mb.video-qp3-W6FszNUs.mp4
Changelog
🆑