Upstream Merge the Squeakquel #195
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
* tbd * Update anchor.dm * more stuff * even more stuff * Update choice_beacon.dm * almost forgot * Stuff for runners to barricade themselves with * Update choice_beacon.dm * i forgot to push stuff again * Update disks.dm * Apply suggestions from code review Co-authored-by: Bloop <[email protected]> * Update disks.dm --------- Co-authored-by: Bloop <[email protected]>
Fixes hash grinding
* Create disabled-experiments.dm * Update tgstation.dme * fixing this while i got the second * moving this over * Update disabled-experiments.dm * Update disabled-experiments.dm * Update modular_nova/modules/research/techweb/nodes/disabled-experiments.dm * Update modular_nova/modules/research/techweb/nodes/disabled-experiments.dm --------- Co-authored-by: Bloop <[email protected]>
* Adds donator item for bonkaitheroris: plushie edition * Update modular_nova/modules/customization/game/objects/items/donator_plushies.dm Co-authored-by: Bloop <[email protected]> * Update modular_nova/modules/customization/game/objects/items/donator_plushies.dm Co-authored-by: Bloop <[email protected]> * Update modular_nova/modules/customization/game/objects/items/donator_plushies.dm Co-authored-by: Bloop <[email protected]> * Update modular_nova/modules/customization/game/objects/items/donator_plushies.dm Co-authored-by: Bloop <[email protected]> * Update modular_nova/modules/customization/game/objects/items/donator_plushies.dm --------- Co-authored-by: Bloop <[email protected]> Co-authored-by: GoldenAlpharex <[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 Pull Request
I got nagged at to merge upstream.
Why it's Good for the Game
I don't know.
Proof of Testing
Compiled