Medical Scrubs Expansion! #129
Merged
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
|
RSI Diff Bot; head commit 3aec5ea merging into 930710c Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_black.rsi
Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cyan.rsi
Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cybersun.rsi
Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_pink.rsi
Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_rainbow.rsi
Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_white.rsi
Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunwindbreaker.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/black.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/cyan.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/cybersun.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/pink.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/rainbow.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/white.rsi
|
Signed-off-by: VMSolidus <[email protected]>
Signed-off-by: VMSolidus <[email protected]>
Colin-Tel
approved these changes
Oct 8, 2023
DeltaV-Bot
pushed a commit
that referenced
this pull request
Oct 8, 2023
revsys413
referenced
this pull request
in revsys413/Horizon-Station
Apr 3, 2024
* Implement records saving. (please god let me not have fucked up the merge resolution) Add an additional column to the database that stores records as JSON. Currently the serialization logic is not very robust so a future commit should improve it so it can deal with missing and extra fields in the database. * Record editor gui Implements a record editor tab for HumanoidProfileEditor. In addition, this improves the robustness of the CharacterRecords deserializer. * Add imperial units to record editor. * Remove SecurityClearance from CharacterRecords * Add up and down buttons to the record entry editor This lets you select the order that records will appear in game. * Add system for managing records in game * Initial viewer UI Add the record console UI, currently it does not display entries. * Add entries to the record console * Clarify record computers. * Add records viewer to aghost * Add admin modification ui for character records * Improve record entry viewer * Remove contact number record * Character Records Guidebook Entry * Change from DefaultWindow to FancyWindow * Fix compile errors relating to rebase * Add rich text to record viewer We support all tags except the heading tag. This is because it looks very ugly. In addition, we also add a view button to the editor GUI so you can make sure your rich text works without going into a game. * Integrate wanted status into security records * Correctly subscribe to Bui events * Add comments to records and fix a few minor issues
revsys413
referenced
this pull request
in revsys413/Horizon-Station
Apr 4, 2024
* Implement records saving. Add an additional column to the database that stores records as JSON. Currently the serialization logic is not very robust so a future commit should improve it so it can deal with missing and extra fields in the database. * Record editor gui Implements a record editor tab for HumanoidProfileEditor. In addition, this improves the robustness of the CharacterRecords deserializer. * Add imperial units to record editor. * Remove SecurityClearance from CharacterRecords * Add up and down buttons to the record entry editor This lets you select the order that records will appear in game. * Add system for managing records in game * Initial viewer UI Add the record console UI, currently it does not display entries. * Add entries to the record console * Clarify record computers. * Add records viewer to aghost * Add admin modification ui for character records * Improve record entry viewer * Remove contact number record * Character Records Guidebook Entry * Change from DefaultWindow to FancyWindow * Fix compile errors relating to rebase * Add rich text to record viewer We support all tags except the heading tag. This is because it looks very ugly. In addition, we also add a view button to the editor GUI so you can make sure your rich text works without going into a game. * Integrate wanted status into security records * Correctly subscribe to Bui events * Add comments to records and fix a few minor issues
LaryNevesPR
pushed a commit
to LaryNevesPR/Estacao-Andromeda
that referenced
this pull request
Jan 3, 2025
…-Station#129) ## Mirror of PR #25881: [Syringes that spawn with content start in inject mode](space-wizards/space-station-14#25881) from <img src="https://avatars.githubusercontent.com/u/10567778?v=4" alt="space-wizards" width="22"/> [space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14) ###### `5cb48c922fa7236d07b463f0c38ada2d5805e54b` PR opened by <img src="https://avatars.githubusercontent.com/u/58439124?v=4" width="16"/><a href="https://github.com/Plykiya"> Plykiya</a> at 2024-03-06 13:43:59 UTC PR merged by <img src="https://avatars.githubusercontent.com/u/19864447?v=4" width="16"/><a href="https://github.com/web-flow"> web-flow</a> at 2024-03-09 10:19:03 UTC --- PR changed 3 files with 25 additions and 23 deletions. The PR had the following labels: - Status: Needs Review --- <details open="true"><summary><h1>Original Body</h1></summary> > <!-- Please read these guidelines before opening your PR: https://docs.spacestation14.io/en/getting-started/pr-guideline --> > <!-- The text between the arrows are comments - they will not be visible on your PR. --> > > ## About the PR > <!-- What did you change in this PR? --> > Made it so that syringes that spawn with content start out in inject mode rather than draw mode. Also got rid of unnecessary DataField names if they matched. > > ## Why / Balance > <!-- Why was it changed? Link any discussions or issues here. Please discuss how this would affect game balance. --> > Grab bic syringe from medkit, use it on patient, it's in draw mode by default, cry. > > ## Technical details > <!-- If this is a code change, summarize at high level how your new code works. This makes it easier to review. --> > I added a new yml entity for prefilled syringes that starts in inject mode. > > I attempted to do it the "smart way" by changing the ComponentInit code to check for the solution amount and toggle based on that, but for some reason the solution was returning false on the server-side but not on the client-side so there was a desync in the Inject state. Couldn't really figure out how to fix it, so I just went with the dumb simple method instead. > > ## Media > <!-- > PRs which make ingame changes (adding clothing, items, new features, etc) are required to have media attached that showcase the changes. > Small fixes/refactors are exempt. > Any media may be used in SS14 progress reports, with clear credit given. > > If you're unsure whether your PR will require media, ask a maintainer. > > Check the box below to confirm that you have in fact seen this (put an X in the brackets, like [X]): > --> > > - [ X ] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase > > ## Breaking changes > <!-- > List any breaking changes, including namespace, public class/method/field changes, prototype renames; and provide instructions for fixing them. This will be pasted in #codebase-changes. > --> > None > > **Changelog** > <!-- > Make players aware of new features and changes that could affect how they play the game by adding a Changelog entry. Please read the Changelog guidelines located at: https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog > --> > > <!-- > Make sure to take this Changelog template out of the comment block in order for it to show up. > 🆑 > - add: Added fun! > - remove: Removed fun! > - tweak: Changed fun! > - fix: Fixed fun! > --> > 🆑 > - tweak: Pre-filled syringes start in inject mode now. </details> Signed-off-by: VMSolidus <[email protected]> Co-authored-by: Plykiya <[email protected]> Co-authored-by: VMSolidus <[email protected]>
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.
About the PR
This is adding six new scrub colors to the game for Medical mains to express themselves. One of which requires an Emag to access. They can be found in Medical Scrub cates, order some from Cargo! Or maybe station medbays might start getting stocked with them!
Media
Changelog
🆑 VMSolidus