Upstream #23
Closed
Upstream #23
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
Signed-off-by: NullWanderer <[email protected]>
Signed-off-by: NullWanderer <[email protected]>
Signed-off-by: NullWanderer <[email protected]>
Signed-off-by: NullWanderer <[email protected]>
Signed-off-by: NullWanderer <[email protected]>
Slight blunder on the loadout prototype being used and all the names aligning means playtesting didn't catch it earlier. Ideally player spawning code wouldn't have sucked so I could add tests like I wanted but it is what it is. (cherry picked from commit 9bc3e07)
* remove senior backpacks * fix ID cards * Update atmospheric_technician.yml (cherry picked from commit e2be85b)
add autism pins to loadout (cherry picked from commit d5b7e4b)
Signed-off-by: NullWanderer <[email protected]>
* LobbyUI fixes I have no idea which were bugs prior but anyway fix stuff. * More fixes * Test moment (cherry picked from commit fcd6c25) Signed-off-by: NullWanderer <[email protected]>
Adds Nun Hood to starting Chaplain loadout options (cherry picked from commit 7114b19)
inital (cherry picked from commit 5742dee)
(cherry picked from commit e2341c0) Signed-off-by: NullWanderer <[email protected]>
(cherry picked from commit a95fc86)
* inital * George orwell (cherry picked from commit 06ecf2a)
* Add hardhats to loadout. * Update Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml * Update Resources/Prototypes/Loadouts/loadout_groups.yml --------- Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit 3c1ec9a)
I love lobby code. Refreshing the entire jobs UI doesn't seem to cause issues. At least jobpriorityselector was my fault when I was far fucking stupider writing this shit. (cherry picked from commit 9b1a8b0)
I love lobby code :3 (cherry picked from commit f9f204a)
* inital * yes * g * death * DEATH (cherry picked from commit c8202dd) Signed-off-by: NullWanderer <[email protected]>
* Add medical gloves to loadouts * Realize I don't need to duplicate them * Re-add extra lines * I did it wrong... * Format it back to how it was this time for sure * For real this time * ... * Add sterile masks too * I can't spell officer apparently * Standardize order of where gloves are * Add Nurse Hat to doctors * Remove duplication of gloves and masks * Remove extra space * Name glove protos similiar to other ones * Remove latex gloves proto from medical (sci has it) (cherry picked from commit 58e21a8) Signed-off-by: NullWanderer <[email protected]>
* Add all colored jumpsuits to passenger loadout * onlyrainbowiguess (cherry picked from commit fb8dcfe) Signed-off-by: NullWanderer <[email protected]>
Signed-off-by: NullWanderer <[email protected]>
Signed-off-by: NullWanderer <[email protected]>
* inital * Update loadout-groups.ftl * fix order * add winter boots * fix test fails Signed-off-by: NullWanderer <[email protected]>
…(#27189) * added filled security webbing * moved sec belt to loadout * added webbing for head of security and warden (cherry picked from commit b6d751e) Signed-off-by: NullWanderer <[email protected]>
Signed-off-by: NullWanderer <[email protected]>
Signed-off-by: NullWanderer <[email protected]>
…/04/21-loadouts # Conflicts: # Content.Server/IoC/ServerContentIoC.cs # Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
Signed-off-by: NullWanderer <[email protected]>
Signed-off-by: NullWanderer <[email protected]>
Co-authored-by: deltanedas <@deltanedas:kde.org>
fix: unflip hands for Felinid, Vulpkanin, Harpy
* Updated Asterisk * additional changes
Signed-off-by: Colin-Tel <[email protected]>
Co-authored-by: DeltaV-Bot <[email protected]>
* feat: add makeup markings Adds the following makeup markings: - Lipstick - Blush - Nail Polish (Left) - Nail Polish (Right) * feat: rename `lipstick` marking to `lips` * refactor(makeup): add comment for harpies * feat(makeup): improve nail polish sprite * feat(makeup): improve default colors * feat(makeup): add lips and blush for moths * refactor(makeup): remove metadata from `blush.png`
* Signatures! * Fix typo * Suggestions implemented
Its code that frequently breaks, and while I could fix it, I don't think its needed currently.
Testing my beloved
* add shipyard code * add shipyard preferred dock * shipyard locale * add the computer itself * add all the pre rebase shuttles * name the shuttle * tweak all shuttle maps + fix test * add some categories for future use * rename nanotrasen to civilian * update for new ui system and move remaining yaml into deltav folder * good * write tests * wow * helix price hike * fix dirty dispose * use deltav cvar file * s Signed-off-by: deltanedas <[email protected]> --------- Signed-off-by: deltanedas <[email protected]> Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: Null <[email protected]>
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
Thank you for contributing to the Space Station 14 repository. Unfortunately, it looks like you submitted your pull request from the master branch. We suggest you follow our git usage documentation You can move your current work from the master branch to another branch by doing |
github-actions
bot
added
Changes: C#
Changes: Localization
Changes: Map
Changes: Sprite
Changes: YML
Changes: UI
and removed
Status: Merge Conflict
labels
|
RSI Diff Bot; head commit f9ec70d merging into 75fc19e Resources/Textures/DeltaV/Mobs/Species/Harpy/displacement.rsi
Resources/Textures/Mobs/Customization/makeup.rsi
Resources/Textures/Objects/Misc/bureaucracy.rsi
|
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
Upstream
Почему
Технические детали
Медиа