Fork sync to latest Wizden updates minus reclaimer removal #44
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
* cog update * woopsie, fixed that
fix energy shield visuals
* Fixed Minor Mistake * Fixed the NEW sprite and added Jumpskirt Fix
* Makes meteor swarms spawn meteorite walls with 1/10 health of an asteroid wall. * Changed MeteorRock prototype base - Rebased MeteorRock to AsteroidRock from Basewall - MeteorRock now only changes the Destructible damage value * Tried to fix comments
fix revenant being blocked by walls
* Fix broken tests directly mutating entities from wrong thread. * fix build * gundam * stuff --------- Co-authored-by: metalgearsloth <[email protected]>
* weh * Fix broken tests directly mutating entities from wrong thread. * fix build * gundam * weher * WHY --------- Co-authored-by: Pieter-Jan Briers <[email protected]>
Make suicide logs include the username, as well as the character(where possible)
more ItemTogglePointLight fixes
…minor rewrite on respawn command and new erase command (#30433) * Localize respawn command, allow for it to use userids, and make it use [Dependency] attributes * Make respawn verb available for offline players * Make erase available for offline players A thousand admins rejoice * Reorder verbs in code * Add erase command * Fix localisation for erase command * Address reviews and add completion to respawn command * Complete reviews which I forgor
* Work on abstracting out chargeup functionality/ui from grav gen * Work on station anchor * Finish implementing station anchors * uhh yeah * ok. * fix tests * whoops * Get the last extraneous yaml fail * PJB review * beast mode... ACTIVATE! --------- Co-authored-by: Ed <[email protected]> Co-authored-by: EmoGarbage404 <[email protected]>
* Remove fake centcom stuff * forgor * bruh * FUCK TOOLBOX * weh??
make trading outposty stationary
* fixes #31469 * removed medbelts from lockers. Empty belts found in vending machine now.
bingus
* add snails * scuffix * migrate * mo-grate * oopsied the ftls * Revert "oopsied the ftls" This reverts commit 0d3c6c1. * the curse of staging the wrong file, resolved. * Snoth * fix my dumbs * reviews 1 * anti space technology * salt hurty * spelling * Its a slotherhouse out here * sequencing * cooked snail * volfix * speed reversal
… is radio-ed too (#31170) * feat: now when research is unlocked in console, approver of reasearch is radio-ed too * refactor: now most of events that require actor name to be radio-ed or logged use TryGetIdentityShortInfoEvent which is subscibed by id-card system and borg system (to work for both carbon and synthetic life-forms) * refactor: moved TryGetIdentityShortInfoEvent on id card system to shared, fixed cargo cent-com-originated orders * remove unused check * refactor: decoupled systems from IdCardSystem (those that are not dependent on it anymore) * refactor: removed unuseed usings * feat: emagged cargo/research consoles wont radio messages on buy/research confirm anymore --------- Co-authored-by: pa.pecherskij <[email protected]>
* Initial pH nodes, and description changes to indicate pH * Psychoactive and stimulant nodes, Medical foundation, bioreactive hint * Added medical reagents to medical node. Added norepinephric acid to acidic and made up a pH * Added pyrotechnic chem node, and corresponding hint * spelled psychedelic correctly * Fixed capitalisation skill issue * fixed indentation skill issue * fixed a further indentation skill issue * Removed extraneous whitespace * Replaced bioreactive with theraputic and psychoactive. Also fixed typo skill issue. * removed unnecessary comment * Replaced heartbreaker with THC for psychadelic * removed artifexium from acidic * added tran acid to acidic * added more medical chems * removed pH values * removed all but medical
* Red Neck Gaiter Added to SecDrobe * Removes Gaiter From TheaterDrobe
* fland update * ore boxes cuz tstalker wantrs them
* marathon update * ore boxes for tstalker
* Station AI has their name displayed in announcements now. * I'm so sorry * Corrections * part 2 * part 3 :| * part 4 * Whitespace * Fixing whitespace part 1 * No more whitespace * PLEASE NO MORE WHITESPACE
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
added
the
Merge Conflict
|
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: UI
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
Synced the fork to all of the latest updates made by Wizden
Why / Balance
They're Wizden updates, nuff said