This repository has been archived by the owner on Dec 24, 2024. It is now read-only.
Обновление ветки #1
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
dont forget to set the airtights when the tights are aired
…-wizards#30316) adds shader label to git labeller
Fix pancakes
…-wizards#29215) * tweak(geras): Add a confirmation popup for gera transformation * remove abstract parent
Co-authored-by: plykiya <plykiya@protonmail.com>
…ner (space-wizards#29927) * Update stomach removal and lung removal smite * New function makes things simple --------- Co-authored-by: plykiya <plykiya@protonmail.com>
…0429) * Update Marathon * Update 2 * Update 3 * Update 5 * Update 5 (actually this time)
* OH DEAR LORD I WASTED 2 HOURS ON THIS STUPID SHIT!!! * change some logic
…30439) fix punctuation in anchored / unachored examine text
… bind it to F9 (space-wizards#30438) Change unused OpenScoreboardWindow to ToggleRoundEndSummaryWindow
…0441) * Make the powered examine text fully client predicted * switch to using the Entity<T> API for the examine event
* First attempt at adding crate * Changed loose candles to candle boxes * Corrected minor typo * Removed a change to the development preset * Buffed crate to 2 of each box * Hopefully removes strange not-change in the repo * Updated description to be clearer. --------- Co-authored-by: elee-github <elee2020@yahoo.com>
add a space Co-authored-by: thecopbennet <bennetgood@gmail.com>
…-wizards#29230) * 201 asphyxiation damage * A bit less oxygen
* train update * train
Smug doesn't seem to have time to fix mapping state and I don't want to dump more time into it so.
* bagel update * remove invalid
…zards#30711) * AntagSelectionSystemFix * readded the stuff that shouldn've been deleted in the first place * re-arrange * undo indentation --------- Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
vox medical mask
* Replace IAlertClick with events * whoop * eek!
* added flash immunity component to Space Dragon * Changed use of component to use of whitelist
big gas miners
* Deploy foldable * Add NetworkedComponent and access to the component * Add handled to afterinteract * Use drop target location instead of setcoordinates * Put back in hand after failed deploy This prevents dropping the bed when clicking while inside a locker. * Created BaseDeployFoldable for folding chairs, body bags, and rollerbeds * Add dragdrop to fold rollerbed to hand
* LoadoutSystem change, deathsquad species loadout * survival gear loadouts for disaster victims * skrek * centcom * syndicate agent * cburn * ERT * syndicates * Is it ever gonna be enough? * Take what you can * Move startingGearEquippedEvent after Loadouts are spawned * skreee * even more formatting * Unbreak auto internals activation * undo AddAllRoleLoadouts change * syndicate reinforcement survival loadouts * re-enable vox ghostroles
|
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 |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
No description provided.