* Reuploading PR, it is readie
* Some convention fixes
* Rename the file again
Signed-off-by: Vape <76235372+Vapetastic-Gaming@users.noreply.github.com>
---------
Signed-off-by: Vape <76235372+Vapetastic-Gaming@users.noreply.github.com>
* Testing phase 1
* Official ready for review
* Fixed the mapping oopsie
* Map Fixes, and cleanup
* 123
* Evac Shuttle updated
* Updated YML of the protothingy
* Fixed fails, cried a few times
* More Fixes. I've ran out of tears
* Revert "More Fixes. I've ran out of tears"
This reverts commit afeefedf3a.
* Had to revert. I feel as though I am going bald, send help, or rogaine
* Subfloor PT1, Many Fixes, Multiple Crying Sessions
* Fixes / Changes / tweaks
* Changes requested
* I broke it
* notepad savior
* mrrp
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* jetpackening
* sprites
* proper descriptioning
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* touch ups
* messy
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* spacing
* permalink
* fixes.....finally
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Fix Standing up when Exiting Critical State (#1612)
<!-- Guidelines:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
<!-- NOTE: All code submitted to this repository is ALWAYS licensed
under the AGPL-3.0-or-later license.
The REUSE Specification headers or separate .license files indicate a
secondary license (e.g., MPL or MIT) solely to facilitate
integration for projects that do not use the AGPL license. This
secondary license does not replace the fact that AGPL-3.0-or-later
remains the primary and binding license.
Uncomment and modify the following line if you wish to change the
license from the default of AGPL.-->
<!--- LICENSE: AGPL -->
<!-- What did you change? -->
Made buckled Entities not stand up when recovering from critical state.
<!-- Discuss how this would affect game balance or explain why it was
changed. Link any relevant discussions or issues. -->
Just generally annoying having to buckle your patient again - Or have
them unbuckle from your rollerbed as you ferry them.
<!-- Summary of code changes for easier review. -->
Removed redunancies and inserted a check for being buckled before
calling the method to stand up when entering the Alive state.
<!-- Attach media if the PR makes ingame changes (clothing, items,
features, etc).
Small fixes/refactors are exempt. Media may be used in SS14 progress
reports with credit. -->
<img width="104" height="148" alt="grafik"
src="https://github.com/user-attachments/assets/c26009f1-e46e-46ae-bd2e-f89f7431dc07"
/>
<!-- Confirm the following by placing an X in the brackets [X]: -->
- [X] I have read and am following the [Pull Request and Changelog
Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html).
- [X] I have added media to this PR or it does not require an ingame
showcase.
- [X] I have tested any changes or additions.
- [X] I can confirm this PR contains no AI-generated content, and did
not use any AI-generated content.
<!-- You should understand that not following the above may get your PR
closed at maintainer’s discretion -->
<!-- List any breaking changes, including namespaces, public
class/method/field changes, prototype renames; and provide instructions
for fixing them.
This will be posted in #codebase-changes. -->
**Changelog**
<!-- Add a Changelog entry to make players aware of new features or
changes that could affect gameplay.
Make sure to read the guidelines and take this Changelog template out of
the comment block in order for it to show up.
Changelog must have a 🆑 symbol, so the bot recognizes the changes and
adds them to the game's changelog. -->
🆑
- fix: Fixed buckled patients standing up when recovering from crit. Now
they'll stay seated.
* Small fix
* Add Comments
Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>
* Fix comment?
* Returned Useless Import
* Update Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs
Co-authored-by: Quanteey <61941975+Quanteey@users.noreply.github.com>
Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>
* Update Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs
Co-authored-by: Quanteey <61941975+Quanteey@users.noreply.github.com>
Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>
* Update Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs
Co-authored-by: Quanteey <61941975+Quanteey@users.noreply.github.com>
Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>
---------
Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>
Co-authored-by: Quanteey <61941975+Quanteey@users.noreply.github.com>
* Extend EvenHealing & Buff Cryochems
* Extend Evenhealing to Specialchems
* Extend to Trinoxadone
* Extend to Pyrogenics
* Update Cryogenics.xml
* Fix Prometheum
* Please the Maintainer Deities
Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>
* The great Comment of 86
---------
Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>
* swords are cool
* remove unused tag
* build and test debug is yelling at me about this. presumably it's because of RevealRevenantOnCollide
* just remove both it's too late to deal with right now
* alright try 2 to get the build and debug to not yell at me about it. I dunno why the bible can just have the component but not the sword
* fix merge conflict before syncing branch because this is genuinely just easier for me to do it this way
* aaaaa
* i need merge conflicts to stop yelling at me aaaaaaa
* merge conflict fix pt. 1
* fix merge conflict pt. 2
* nukeops haunts me at night
* ITS ALL C# GOOD LORD
BORN TO PORT
WORLD IS A PR
鬼神 Merge Em All 2025
I am yaml man
410,757,864,530 UPSTREAM MERGE CONFLICTS
* that was, uh. too easy.
* very small tweak
* comment and reuse fixes
* forgot the guidebook Oops
* the guidebookening
* the reusening
* Create grappling system
* Add grappling to Laika and other sec dogs
* Allow grapplers to also throw themselves prone
* Apply prone on grapple to laika
* Add layingdown component to laika
* Ensure grapplers entering crit release their grapples
* Ensure IPCs can be grappled
* Fix typo
* Remove system suffix for fields
* Simplifiy returns for CanGrapple
* Use magic dotnet syntax
* Fix usages of ViewVariables over DataFields
* Swap to using marker component over tags
* Remove errant new lines
* Remove redundant brackets
* port les paintinges
* adds paintings to spawner
* Update Resources/Prototypes/Entities/Markers/Spawners/Random/paintings.yml
Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
Signed-off-by: leo <136020119+leonardo-dabepis@users.noreply.github.com>
* Update Resources/Textures/_DEN/Structures/Wallmounts/paintings.rsi/meta.json
Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
Signed-off-by: leo <136020119+leonardo-dabepis@users.noreply.github.com>
* relocates to _den (i forgor)
i forgor to not put it upstrem, plx forgib me :pleading:
* untouched
* Update paintings.yml
---------
Signed-off-by: leo <136020119+leonardo-dabepis@users.noreply.github.com>
Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
* Initial Fractured Form Pass
* Cleanup
* AAAAAAAAAAAAAAAAAAA
* I forgor
* Sometimes naked
* Untouch and touch where applikcable
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Better optional pattern
* Unbreak it
* Minor Spelling Mistake
* Filthy test fix hack
* Filthy hack to appease the test gods
* A normal number of post-PR commits
* AAAAAAA
* Don't know why I didn't do this in the first place
* Some cleanup
* Damn how did I miss this
* Delta Mandated Cleanup
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* pluh 🗣️🔥
* signs and final PR preparations
collect my signs
* curse of the invalids
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* guh??
* genuinely not sure how this one happened
* ugh
* three fish dancing in a pot
wowza. three of them?
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Evil Ass Perma Maints Doors
* Update elegance.yml
* holy shit
* Update elegance.yml
* curse of the spaces and other miscellaneous issues + plasma tank-ening
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* h
* Merge branch 'Elegance-Rework-But-Stable' of https://github.com/IAmNotGray/Delta-v into Elegance-Rework-But-Stable
* Update elegance.yml
* Update floors.yml
---------
Signed-off-by: This_Is_Gray <167829864+IAmNotGray@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Delta-V bot
AeraAulin
github-actions[bot]
Vape
Stop-Signs
Sir Warock
This_Is_Gray
William Lemon
KOTOB
BarryNorfolk
leo
Field Command
EmberAstra
Spielern