Upstream #333
Closed
Upstream #333
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
# Conflicts: # Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml # Resources/Prototypes/Entities/Objects/Misc/books.yml # Resources/Prototypes/Maps/cog.yml # Resources/Textures/Objects/Storage/boxes.rsi/meta.json # Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
Co-authored-by: Mota <[email protected]>
* Extend shuttle dock time if the shuttle doesn't dock at evac. If the shuttle can't dock at evac for *some reason*, it will instead try to dock at another port on the station. And if that fails it goes somewhere random on the station. Because of the chaos and confusion caused by this, many people will frequently not get to the shuttle in time under these circumstances. This sucks for everybody. To alleviate this, the shuttle launch timer will now be extended if the station doesn't dock at its ideal spot. The default values (controlled via CVar) are 1.667x and 2x respectively for "wrong dock" and "no dock at all" scenarios. The code around here was a mess, so I fixed that too. "CallEmergencyShuttle" has been renamed to "DockEmergencyShuttle", the overload that did the actual docking has been renamed to DockSingleEmergencyShuttle. Code has been split into separate dock -> announce methods so we can calculate shuttle delay in between the case of multiple stations. Also made the "shuttle couldn't find a dock" text announce the time until it launches and fix the shuttle timers not triggering for it. * Minor review ---------
* Revert "make cables more visible" This reverts commit b2defdfd06652138c4f9be3f6b35f20fe3e8c596. * offset cable sprite * :-) * one more pixel for mv
pacifist can use
Allow all bots to use for chameleon projector
* Adds entities, sprites, and loadout accessibility * Fixing Uniform file issues
* spawn dragon rule at station edge * 2 * stuff * fix round end summary not showing * no invalid euid
several surv camera related fixes Co-authored-by: YourUsername <[email protected]>
* uhhh a lot of window stuff, mainly easy upgrades * buff plasma/uranium rwindows so you actually want them * fix uranium number, correct construction descriptions * fix tinted window price * frosted windo
* Nuke Now Requires the Disk to be Inserted to Toggle Anchor * message stating you need the disk to toggle floor bolts
* Properly credit contributors who were truncated by GitHub's 500 email limit * update list oops forgot my origin was so out of date * another
* clean up electronics lathe recipes * result * make door and firelock cheap * engin --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: Velcroboy <[email protected]>
* Fix some contraband issues * Flaming fire axe to Syndie contraband * Add Central Command department and contraband group * Restricted encryption keys * ERT gas mask * Thieving beacon * Bladed flatcaps * Advanced circular saw and thief toolbox * Acolyte armor * Magazines and cartridges * SMG magazines * Grenades * Mercenary clothing and combat gloves * ERT, Deathsquad and Central Command Official items * Update * Who the fuck putted ERT into fun?! * Fix * Yeah * I forgot
* Add draft saving to news consoles * fix after bui changes * comments + rename vars * no
Убрано наше пластитановое окно и добавлено в миграцию
Upstream sync
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
added
Changes: Localization
Changes: UI
Changes: Sprites
Changes: Map
labels
Измененные карты:
|
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.
upstream