[Port] Lying Down System / Система Лежания #2
Conversation
This file contains 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
1 task
Spatison
changed the title
Remuchi
requested changes
Aug 22, 2024
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Remuchi
approved these changes
Aug 23, 2024
riddleridou
added a commit
that referenced
this pull request
Aug 23, 2024
1 task
VMSolidus
added a commit
to Simple-Station/Einstein-Engines
that referenced
this pull request
Sep 19, 2024
# Description Port of WWhiteDreamProject/wwdpublic#2 And now also WWhiteDreamProject/wwdpublic#8 Because Lying Down System is dependent on the Telescope System. # TODO - [x] 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 :cl: 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 / Теперь можно прицеливаться из Христова --------- Signed-off-by: VMSolidus <[email protected]> Co-authored-by: Spatison <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]>
Remuchi
added a commit
that referenced
this pull request
Oct 19, 2024
This reverts commit 58f3ff4. # Conflicts: # Content.Shared/_White/Standing/SharedLayingDownSystem.cs
Remuchi
pushed a commit
that referenced
this pull request
Oct 19, 2024
# Description Port of #2 And now also #8 Because Lying Down System is dependent on the Telescope System. # TODO - [x] 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 :cl: 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 / Теперь можно прицеливаться из Христова --------- Signed-off-by: VMSolidus <[email protected]> Co-authored-by: Spatison <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]> # Conflicts: # Content.Client/Input/ContentContexts.cs # Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs # Content.Shared/Input/ContentKeyFunctions.cs # Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml # Resources/keybinds.yml
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Описание PR
Совмещения системы лежания ремучи и ЕЕ.
Медиа
Список
Изменения
🆑 Spatison