[Resprite] Chairs #887
Merged
[Resprite] Chairs #887
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
github-actions
bot
added
Changes: Localization
|
RSI Diff Bot; head commit 293aec7 merging into d1c37e4 Resources/Textures/Structures/Furniture/chairs.rsi
Resources/Textures/Corvax/Structures/Furniture/chairs.rsi
|
TokenStyle
pushed a commit
to TokenStyle/space-station-14-next
that referenced
this pull request
Nov 3, 2024
AwareFoxy
added a commit
to space-syndicate/space-station-14-next
that referenced
this pull request
Nov 22, 2024
* The ShitMed * Fixes fix locale * Delete redudant systems * fix components * fix error, update system * Update BodyPartComponent.cs * fix max health, fix test legs * fix test * Port fixes from EE (space-syndicate#875) * [Fix] Healing Fixes (space-syndicate#874) * Targeting & Healing Fixes * Update Content.Server/Medical/HealingSystem.cs Co-authored-by: gluesniffler <[email protected]> * Fix Vital Damage * Update BodyPartComponent.cs * fix --------- Co-authored-by: gluesniffler <[email protected]> * [Port] Surgery fixes: Part 2 (space-syndicate#876) * Fix a ton of shitmed Fixed a buncho crap * Guidebook * Russian Locale * fix * hotfix added Rxup/space-station-14@e92f013 --------- Co-authored-by: gluesniffler <[email protected]> Co-authored-by: Zack Backmen <[email protected]> Co-authored-by: Token <github.com/TokenStyle> * remove backmen ccvar * Body doll in the Health Analyzer menu (space-syndicate#877) * fixes and fix guidebook paths (space-syndicate#887) * fixes * Added some experimental lag fixes to surgery. Might have crashes * russian locale * Revert "Added some experimental lag fixes to surgery. Might have crashes" This reverts commit de95d85. * [Port] Surgery fixes: Part 3 (space-syndicate#892) * Added some experimental lag fixes to surgery. Might have crashes * Fix * migrate and add comments to shit * fix --------- Co-authored-by: gluesniffler <[email protected]> * [Tweak] Rework BodyPartComponent to use DamageSpecifier (space-syndicate#890) * Rework BodyPart to use DamageSpecifier * Fix that shit * Update Content.Shared/Backmen/Surgery/Body/SharedBodySystem.Integrity.cs Co-authored-by: gluesniffler <[email protected]> * Uh? * Update HealthAnalyzerWindow.xaml.cs * balanced a buncho crap --------- Co-authored-by: gluesniffler <[email protected]> * [Port] Surgery fixes: Part 4 (space-syndicate#909) * defelinization almost real * fix? * Corvax next fix that surgery doesn't work with fatal error --------- Co-authored-by: gluesniffler <[email protected]> Roudenn: Rxup/space-station-14#909 * [Fix] surgery emergency fix * Fixed mechanics of attaching body parts to Body. (now taken from prototypes, not generated at random) --------- Co-authored-by: gluesniffler <[email protected]> KayzelW: Rxup/space-station-14#912 * [Balance] Surgery healing tweaks (space-syndicate#911) * Balance surgery * Fix Severing parts --------- Co-authored-by: gluesniffler <[email protected]> Roudenn: Rxup/space-station-14#911 * [Port] Surgery Update V: The Phantom Gib (space-syndicate#919) * Megasquached Surgery Updates Megasquached Surgery Updates Quick patch to see if tests shut up Refactored body parts to use damageablecomponent newmed health analyzer real, also refactors and some bugfixes * added solidus's comments, pending removal of namespace thingies for this repo, also fixed some healing thingies * fixes? * fix gib torso * fix prototypes * oops --------- Co-authored-by: gluesniffler <[email protected]> Co-authored-by: Zack Backmen <[email protected]> Roudenn: Rxup/space-station-14#919 * let me pass tests * let me pass test pls * let me pass test pls * let me pass tests * chief medical officer pass tests * no felinid ears no fun pass tests * [Port] Surgery Fixes: Popup Walker (space-syndicate#923) * Megasquached Surgery Updates Megasquached Surgery Updates Quick patch to see if tests shut up Please do not cherrypick this one yet. Refactored body parts to use damageablecomponent newmed health analyzer real, also refactors and some bugfixes * added solidus's comments, pending removal of namespace thingies for this repo, also fixed some healing thingies * fixes? * fix gib torso * fix prototypes * oops * Shitmed Update 1 (space-syndicate#1240) First in a series of PRs to introduce bugfixes and updates to Shitmed, this will generally feature PRs from Goobstation or Backmen as well since they are actively helping me maintain the code. Usual Shoutouts: Deltanedas: Goob-Station/Goob-Station#882 --- :cl: Mocho, Deltanedas - add: You can now perform surgery as a monke. Rejoice. - add: You can perform surgery on a lot of animals now, I missed a lot of them so just ask if you want any particular critter to get it. - tweak: Entities now perish after 60 seconds of losing their heart and/or brain. - fix: Entities properly take asphyxiation damage after losing their brain. - fix: Torsos being gibbable, which would break surgery or just about anything. - fix: Items not being removed from their respective slots if the parts were gibbed rather than dropped. - fix: Animal organs not being usable properly in surgeries - fix: Cyborg limbs are now usable as pseudo-peg arm/legs. --------- Signed-off-by: gluesniffler <[email protected]> Co-authored-by: FoxxoTrystan <[email protected]> Co-authored-by: goet <[email protected]> Co-authored-by: Saphire Lattice <[email protected]> Co-authored-by: Roudenn <[email protected]> * Shitmed Surgery Popups (space-syndicate#1241) Adds popups for surgery steps in Shitmed that every player within PVS range can see. This allows other players to see if the correct procedure is being performed. This PR also includes locale text for the new procedures and steps in space-syndicate#1240. **Remove Brain / Insert Brain** https://github.com/user-attachments/assets/ac20afa1-df74-48ab-b1d5-2e9a273dfba2 <details><summary>See more</summary> **Amputate Right Arm** https://github.com/user-attachments/assets/17f78683-6d3b-44ee-aea3-bb6987844fdc **Attach Right Arm** https://github.com/user-attachments/assets/584d4da2-d8b0-4c82-a323-26636e7fa4b8 </details> :cl: Skubman - add: Surgery step descriptions (like making an incision, removing/attaching limbs and organs) are now shown as popups to everyone in range upon the start of the step. This makes it clear which surgical procedure is being done and to which body part. No more stealthy brain-stealing in front of everyone! * fix the things + locale --------- Signed-off-by: gluesniffler <[email protected]> Co-authored-by: gluesniffler <[email protected]> Co-authored-by: Zack Backmen <[email protected]> Co-authored-by: gluesniffler <[email protected]> Co-authored-by: FoxxoTrystan <[email protected]> Co-authored-by: goet <[email protected]> Co-authored-by: Saphire Lattice <[email protected]> Co-authored-by: Skubman <[email protected]> * [PORT]Health Analyzer update (space-syndicate#925) Add amazing Health analyzer UI. Rxup/space-station-14#925 * Update HealthAnalyzerSystem.cs * Update medical-scanner-component.ftl * Update HealthAnalyzerWindow.xaml.cs * Update health-analyzer-component.ftl * fix --------- Co-authored-by: trest100 <[email protected]> * let me pass tests * remove shadowkin let tests pass * first commit * Revert "first commit" formatting changes Reverted only formats though, being saved moves everythin to appropriate folders, and nice and clean This reverts commit e66b04b. * add corvax next comments for changes for easier upstreams Be aware though, that everything that related to BodySystem, OrganComponent, DamageSystem etc was changed completely - add comments _CorvaxNext - moved .ftl files and cvars to appropriate Corvax Next folders - removed unnecessary felinids and silicon_base * namespaces changes for everythin * Revert "namespaces changes for everythin" This reverts commit 221ee3e. * [Fix] Surgery Hotfix: Head and Limbs dissapears --------- Signed-off-by: gluesniffler <[email protected]> Co-authored-by: gluesniffler <[email protected]> Co-authored-by: Roudenn <[email protected]> Co-authored-by: Zack Backmen <[email protected]> Co-authored-by: Rouden <[email protected]> Co-authored-by: gluesniffler <[email protected]> Co-authored-by: FoxxoTrystan <[email protected]> Co-authored-by: goet <[email protected]> Co-authored-by: Saphire Lattice <[email protected]> Co-authored-by: Skubman <[email protected]> Co-authored-by: Trest <[email protected]> Co-authored-by: AwareFoxy <[email protected]> Co-authored-by: AwareFoxy <[email protected]>
KommissarRed
pushed a commit
to KommissarRed/space-station-14-next-komred
that referenced
this pull request
Jan 19, 2025
Fixes bridge button and adds sink to chemistry.
KommissarRed
pushed a commit
to KommissarRed/space-station-14-next-komred
that referenced
this pull request
Jan 19, 2025
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
ТГ спрайты
Медиа
Проверки
Изменения
🆑 Morty