Better Lying Down System (From White Dream) by VMSolidus · Pull Request #815 · Simple-Station/Einstein-Engines

VMSolidus · 2024-08-29T01:17:26Z

Description

Port of WWhiteDreamProject/wwdpublic#2
And now also WWhiteDreamProject/wwdpublic#8
Because Lying Down System is dependent on the Telescope System.

TODO

Reconcile the code with core code, do code cleanup. I'll undraft this when I'm done. Probably not going to be tonight, because I will have to get some sleep soon to get up early for my calculus classes.

Changelog

🆑 Spatison (White Dream)

add: Added lying down system / Добавлена система лежания
tweak: Lying down now uses do-afters that are visible to other people to indicate what is going on.
add: Added telescope system / Добавлена система прицеливания
tweak: Now you can aim from Hristov / Теперь можно прицеливаться из Христова

Content.Client/_White/Standing/LayingDownSystem.cs

github-actions · 2024-08-30T05:47:40Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Signed-off-by: VMSolidus <evilexecutive@gmail.com>

…Solidus/Einstein-Engines into Port-Better-Lying-Down-System

VMSolidus · 2024-09-01T22:34:26Z

This is ready to go.

ShatteredSwords · 2024-09-01T22:46:11Z

Have you checked if this affects the traits like lethargy, parkour training, etc and the way they work?

VMSolidus · 2024-09-01T22:46:41Z

Apparently this isn't ready because it's now dependent on WWhiteDreamProject/wwdpublic#8

* add: TelescopeSystem * fix * add: RU loc

VMSolidus · 2024-09-01T23:09:12Z

Have you checked if this affects the traits like lethargy, parkour training, etc and the way they work?

Yes, the code used by these traits is still in use by the newly updated LayingDownSystem.

ShadesMars

I just run a dev eviroment, press R...
Gliches happened.

After laying down and doing up when walking my character is back on the laying animation.

Intercations System may need to be looked as i forced someone down but the game still think their up.

(By the way in the screenshot im down even tho im up, normal walkspeed and all.)

I checkout, Build and test it 2 times, same results, so il not approve or request changes as well il be gone soon but im leaving a comment here.

VMSolidus · 2024-09-02T21:53:53Z

I just run a dev eviroment, press R... Gliches happened.

After laying down and doing up when walking my character is back on the laying animation.

Intercations System may need to be looked as i forced someone down but the game still think their up.

(By the way in the screenshot im down even tho im up, normal walkspeed and all.)

I checkout, Build and test it 2 times, same results, so il not approve or request changes as well il be gone soon but im leaving a comment here.

Thanks a bunch for testing it(I am usually severely behind in testing things). I'll take a look when I get a chance and see about getting the interaction system to play nice with the lying down system

github-actions · 2024-09-08T15:18:23Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Signed-off-by: VMSolidus <evilexecutive@gmail.com>

github-actions · 2024-09-14T05:49:09Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Signed-off-by: VMSolidus <evilexecutive@gmail.com>

DEATHB4DEFEAT

Why is telescope a part of this?

Content.Shared/Input/ContentKeyFunctions.cs

Resources/Locale/en-US/escape-menu/ui/options-menu.ftl

Resources/Locale/ru-RU/Escape-Menu/options-menu.ftl

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Signed-off-by: VMSolidus <evilexecutive@gmail.com>

* 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>

* [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>

Cherry-Pick Lying Down System

2f179d3

github-actions bot added Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: UI Changes any XAML files labels Aug 29, 2024

VMSolidus marked this pull request as draft August 29, 2024 01:19

Cleanup

bb20169

Mnemotechnician reviewed Aug 29, 2024

View reviewed changes

Content.Client/_White/Standing/LayingDownSystem.cs Outdated Show resolved Hide resolved

github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Aug 30, 2024

Merge branch 'master' into Port-Better-Lying-Down-System

6af7bce

Signed-off-by: VMSolidus <evilexecutive@gmail.com>

github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Sep 1, 2024

VMSolidus added 3 commits September 1, 2024 18:28

Moving more things

b9fcf5a

Merge branch 'Port-Better-Lying-Down-System' of https://github.com/VM…

839b1ce

…Solidus/Einstein-Engines into Port-Better-Lying-Down-System

Small fixes.

54960b7

VMSolidus marked this pull request as ready for review September 1, 2024 22:34

VMSolidus marked this pull request as draft September 1, 2024 22:46

VMSolidus and others added 2 commits September 1, 2024 18:48

aaaaaaaaaaa

09e1bc3

[Port] Telescope System / Система Прицеливания (Simple-Station#8)

8560c3d

* add: TelescopeSystem * fix * add: RU loc

github-actions bot added the Changes: YML Changes any yml files label Sep 1, 2024

VMSolidus added 2 commits September 1, 2024 18:57

aaaaaaaaaa

c4e7545

Little cleanup

2b87187

VMSolidus marked this pull request as ready for review September 1, 2024 23:05

OldDanceJacket approved these changes Sep 1, 2024

View reviewed changes

ShadesMars self-requested a review September 2, 2024 19:38

github-actions bot added the Status: Needs Review Someone please review this label Sep 2, 2024

ShadesMars reviewed Sep 2, 2024

View reviewed changes

github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Sep 8, 2024

Merge branch 'master' into Port-Better-Lying-Down-System

5b98cde

Signed-off-by: VMSolidus <evilexecutive@gmail.com>

github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Sep 10, 2024

github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Sep 14, 2024

ShadesMars requested review from Mnemotechnician and ShadesMars September 17, 2024 19:12

ShadesMars assigned VMSolidus Sep 17, 2024

ShadesMars added Size: 3-Medium For medium issues/PRs Priority: 3-Medium Needs to be resolved at some point Type: Port Brings something to here from another codebase labels Sep 17, 2024

Merge branch 'master' into Port-Better-Lying-Down-System

68fcd8c

Signed-off-by: VMSolidus <evilexecutive@gmail.com>

github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Sep 17, 2024

DEATHB4DEFEAT approved these changes Sep 18, 2024

View reviewed changes

Content.Shared/Input/ContentKeyFunctions.cs Outdated Show resolved Hide resolved

Resources/Locale/en-US/escape-menu/ui/options-menu.ftl Outdated Show resolved Hide resolved

Resources/Locale/ru-RU/Escape-Menu/options-menu.ftl Outdated Show resolved Hide resolved

Apply suggestions from code review

4847961

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Signed-off-by: VMSolidus <evilexecutive@gmail.com>

VMSolidus merged commit d5f0c55 into Simple-Station:master Sep 19, 2024

SimpleStation14 added a commit that referenced this pull request Sep 19, 2024

Automatic Changelog Update (#815)

a8e435c

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Better Lying Down System (From White Dream)#815

Better Lying Down System (From White Dream)#815
VMSolidus merged 13 commits intoSimple-Station:masterfrom
VMSolidus:Port-Better-Lying-Down-System

VMSolidus commented Aug 29, 2024 •

edited

Loading

Uh oh!

Uh oh!

github-actions bot commented Aug 30, 2024

Uh oh!

VMSolidus commented Sep 1, 2024

Uh oh!

ShatteredSwords commented Sep 1, 2024

Uh oh!

VMSolidus commented Sep 1, 2024

Uh oh!

VMSolidus commented Sep 1, 2024

Uh oh!

ShadesMars left a comment

Uh oh!

VMSolidus commented Sep 2, 2024

Uh oh!

github-actions bot commented Sep 8, 2024

Uh oh!

github-actions bot commented Sep 14, 2024

Uh oh!

DEATHB4DEFEAT left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Conversation

VMSolidus commented Aug 29, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

TODO

Changelog

Uh oh!

Uh oh!

github-actions bot commented Aug 30, 2024

Uh oh!

VMSolidus commented Sep 1, 2024

Uh oh!

ShatteredSwords commented Sep 1, 2024

Uh oh!

VMSolidus commented Sep 1, 2024

Uh oh!

VMSolidus commented Sep 1, 2024

Uh oh!

ShadesMars left a comment

Choose a reason for hiding this comment

Uh oh!

VMSolidus commented Sep 2, 2024

Uh oh!

github-actions bot commented Sep 8, 2024

Uh oh!

github-actions bot commented Sep 14, 2024

Uh oh!

DEATHB4DEFEAT left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

VMSolidus commented Aug 29, 2024 •

edited

Loading