This repository has been archived by the owner on Sep 17, 2022. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 12
Update to latest WhiteSands #80
Draft
KubeRoot
wants to merge
343
commits into
SinguloStation13:master
Choose a base branch
from
KubeRoot:whitesands-update
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.
Draft
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
…ng area. (#752) * Delta Maintanance. * Minor fixes. e * Fixed some misplaced doors in meta rec area, plus grounding rods. e * Fixes misplaced lightswitch * Revert "Fixes misplaced lightswitch" This reverts commit c71a1640e5f771c07edbbb61627b6112c795302e. * Revert "Revert "Fixes misplaced lightswitch"" This reverts commit fa729bad6d5632eb2f4af08ded8263e44c95f169.
* mower mows now * lawnmower in cargo order
* Main commit * Revert "Main commit" This reverts commit 6e6fb25c0faaee40e16ee17d95a6231e5dfe47d7. * Update TGS DMAPI * Update TGS DMAPI * Adds mothra wings Wing sprites accreddited to Papaporo Paprito from Fulpstation * Revert "Adds mothra wings" This reverts commit 029dacc2f977d0e63aa9656937f6ef0cfb4e11d4. * Revert "Revert "Adds mothra wings"" This reverts commit fe51f19ed305d671ae74a3b0a56b6d62f3b12f9f. * Revert "Revert "Revert "Adds mothra wings""" This reverts commit 559d967b72c6e68b795f1468a227c5ecf60497ee. * Revert "Revert "Revert "Revert "Adds mothra wings"""" This reverts commit 5820fead86d1d235bcc2fae743216f5d95fb04b7. * Revert "Revert "Revert "Revert "Revert "Adds mothra wings""""" This reverts commit e24995221d28bbf76cef40cdd6c92211f13efba9. * that was so easy it's sus, but it tests out perfectly fine so /shrug Co-authored-by: Whitesands-Bot <[email protected]>
* ai dorf translation * dof * adds in AI translation and in chat icons for all white sands races * leg * apparently you have to read the files you edit or summin * hnggggh hardcoded runtime hgnhhhh
* add shuttle components to cargo crates under engineering * money money money motherfucker * fuck you zanos * a capitalized letter * more things Co-authored-by: Shayne Fitzgerald <[email protected]>
* IPC Parts Tech * Update mechfabricator_designs.dm
* Update dbconfig.txt * Update TGS DMAPI * no * Main commit * Revert "Main commit" This reverts commit 6e6fb25c0faaee40e16ee17d95a6231e5dfe47d7. * Update TGS DMAPI * Update TGS DMAPI * Adds mothra wings Wing sprites accreddited to Papaporo Paprito from Fulpstation * Revert "Adds mothra wings" This reverts commit 029dacc2f977d0e63aa9656937f6ef0cfb4e11d4. * Revert "Revert "Adds mothra wings"" This reverts commit fe51f19ed305d671ae74a3b0a56b6d62f3b12f9f. * Revert "Revert "Revert "Adds mothra wings""" This reverts commit 559d967b72c6e68b795f1468a227c5ecf60497ee. * Revert "Revert "Revert "Revert "Adds mothra wings"""" This reverts commit 5820fead86d1d235bcc2fae743216f5d95fb04b7. * Main commit * Revert "Main commit" This reverts commit 6e6fb25c0faaee40e16ee17d95a6231e5dfe47d7. * Update TGS DMAPI * Update TGS DMAPI * Adds mothra wings Wing sprites accreddited to Papaporo Paprito from Fulpstation * Revert "Adds mothra wings" This reverts commit 029dacc2f977d0e63aa9656937f6ef0cfb4e11d4. * Revert "Revert "Adds mothra wings"" This reverts commit fe51f19ed305d671ae74a3b0a56b6d62f3b12f9f. * Revert "Revert "Revert "Adds mothra wings""" This reverts commit 559d967b72c6e68b795f1468a227c5ecf60497ee. * Revert "Revert "Revert "Revert "Adds mothra wings"""" This reverts commit 5820fead86d1d235bcc2fae743216f5d95fb04b7. * Revert "Revert "Revert "Revert "Revert "Adds mothra wings""""" This reverts commit e24995221d28bbf76cef40cdd6c92211f13efba9. * Adds rosy and plasmafire wing variants * Some fixes to wings * Update sprite_accessories.dm * new Ai screen! * newline? * two more wings! Co-authored-by: WaspStation-Bot <[email protected]> Co-authored-by: Whitesands-Bot <[email protected]>
* An Update to the Space Russian Arsenal: The AK-47 * AK-47 Update 1.1 * AK-47 v1.2: fixes bugs from 1.1 * AK-47 v1.3: Rebalanced the 74U and the 47 Co-authored-by: cml9988 <[email protected]>
* fixed gateways * changed Research gateway from calibrated to uncalibrated * moved Research awaystarts back Co-authored-by: Untrius <[email protected]>
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.1.1 to 8.2.0. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst) - [Commits](python-pillow/Pillow@8.1.1...8.2.0) --- updated-dependencies: - dependency-name: pillow dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [ws](https://github.com/websockets/ws) from 7.4.2 to 7.4.6. - [Release notes](https://github.com/websockets/ws/releases) - [Commits](websockets/ws@7.4.2...7.4.6) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* boofed up * holy shit i sold my soul for pixel art cigarettes * lung recession * map linters * improper and cleaning up * holy shit this will literally save the game * 13 loko mindbreaker gamer cigs * shawty ok * Update whitesands/code/game/objects/items/cigs_cigars.dm Co-authored-by: AsciiSquid <[email protected]> * Update whitesands/code/modules/uplink/uplink_items.dm Co-authored-by: AsciiSquid <[email protected]> * Update cigs_cigars.dm * pipe fix * guh * fixed donk-co pockets, random reagents, secret sauce, and max bullet overlay Co-authored-by: scar <[email protected]> Co-authored-by: scar <[email protected]> Co-authored-by: AsciiSquid <[email protected]> Co-authored-by: Untrius <[email protected]>
Co-authored-by: Whitesands-Bot <[email protected]>
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
added
Admin
Config
Dependencies
DME Edit
Map Change
Sound
Sprites
tgui
labels
Jun 23, 2021
When the merge conflict is sus |
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.
About The Pull Request
Merges WS master into our codebase
Incomplete list of changes:
mob_overlay_state
, whatever that issolar_system
by default - with a star in the center and other stuff in orbitsWhy It's Good For The Game
We get some minor changes from what WS did, like making solar assemblies printable.
Changelog
🆑
code: Updated to latest whitesands (22.06.2021)
/:cl: