forked from new-frontiers-14/frontier-station-14
-
Notifications
You must be signed in to change notification settings - Fork 42
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
up #382
Open
Vonsant
wants to merge
2,085
commits into
Corvax-Frontier:master
Choose a base branch
from
new-frontiers-14:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
up #382
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
FTL
C#
Map-Shuttle
Docs
Sprites
Map-POI
Map-Dungeon
Map-Bluespace
UI
Map-Outpost
labels
Jul 17, 2024
vox voices v2
Cherry-pick: Vox voices revamp (#31679)
…-station-14 into aug24-upstream-merge
* Allow for selective tool disabling * OnToolsUseComponent: restore VVAccess to fields * Fixup * DisableAnchoring use * Update base_structure.yml * a million booleans * missed base_structure entities * OnToolsUse to DisableToolUse * always anchored * Missed an indent level * remove unnecessary anchor parents * NonLethalVend: POI version is anchored * PTech: movable, not screwable * no screwing * comment ptech --------- Co-authored-by: Dvir <[email protected]>
…-station-14 into aug24-upstream-merge
* update piecrust.yml * added another sink * pricing * Replaced kitchen tinyfan, air mixer 79 / 21 --------- Co-authored-by: Dvir <[email protected]> Co-authored-by: Dvir <[email protected]>
* Prospector tiny fan update * SignShipDock->NFSignDock pending a better sign --------- Co-authored-by: Whatstone <[email protected]>
* Garden Directional Fan Update * Updates garden main room air sensors * Garden: remove invalid configurators --------- Co-authored-by: Whatstone <[email protected]>
Co-authored-by: Maxtone <[email protected]>
* Comet Directional Fan Update * Minor cleanup: AME, pump, paper * Replace waste pump with max version (consistency) * add floor tile to dock --------- Co-authored-by: Whatstone <[email protected]> Co-authored-by: Maxtone <[email protected]>
* Bocadillo Directional Fan Update * Fix invalid entity references --------- Co-authored-by: Whatstone <[email protected]>
* Spirit Directional Fan Update * Rotate NanoMed, remove invalid ents, attrib --------- Co-authored-by: Whatstone <[email protected]>
* Pathfinder directional fans update Replaced all tiny fans with directional fans Also added coloured decals for the O2 and N2 connector ports and gave them names. * Removed custom connector port names Also changed gas mix to 79/21 from 78/22 per request. * Remove whitespace --------- Co-authored-by: Whatstone <[email protected]>
* Sprinter directional fans update Replaced tiny fans with directional fans. Named O2 and N2 ports and added decals. Replaced medical doctor's locker with wallmount. Added dirt where the locker used to be. * Fixed uid conflict Fixed conflicting uids that prevented the map from loading. Fixed rotation on two directional fans. * Removed redundant whitespace * Replaced AME fuel rack with wall locker. Moved gyroscope into engineering, using the space vacated by the fuel rack. * Revert gyroscope change I missed the matching gyroscope on the other side, and the fact that the LV cables were required for the thrusters, not just the gyroscope. * Requested changes Removed custom named from connector ports. Removed mapped coat.
* updated bottleneck * adjust generator again * Add security button to cond. illegal matches --------- Co-authored-by: Whatstone <[email protected]> Co-authored-by: Dvir <[email protected]> Co-authored-by: Maxtone <[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
Why / Balance
How to test
Media
Breaking changes
Changelog