Merge #45
Merged
Merge #45
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
* THICKMATERIAL fix * THICKMATERIAL fix 2 * Removed commented code * Typo Typo2
* Based * Shakes the screens of everyone in the game * Target becomminga clockie counts as being sacced * Update code/modules/antagonists/clock_cult/clockwork_massive.dm * Update code/modules/power/singularity/narsie.dm Co-authored-by: PowerfulBacon <> Co-authored-by: ike709 <ike709@users.noreply.github.com>
* fix * good_idea * Update code/datums/status_effects/debuffs.dm Co-authored-by: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> Co-authored-by: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com>
* Auto stash before rebase of "origin/master" * adds temp holding map * adds 16 new maintenance rooms * removes template map, whoops * removes actual tesla ball gen * Removes brown tiles from some random maints map idk Co-authored-by: Triiodinegb <garryrobinson@freemail.com>
…3018) * Update all_nodes.dm * Removes linkify * Revert "Update all_nodes.dm" This reverts commit 1af4cfdeb2e5dad994518e31ae703ebb50552fc8. Co-authored-by: PowerfulBacon <>
* oh damn * E * E * E * E E * e * fixes bluepsace * rainbows now also relay their thingy * E * E * E * Update code/modules/research/xenobiology/crossbreeding/_structures.dm Co-authored-by: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> * Update code/modules/research/xenobiology/crossbreeding/crystalized.dm Co-authored-by: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> * Update code/modules/research/xenobiology/crossbreeding/_structures.dm Co-authored-by: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> * E * E * E * E * Apply suggestions from code review Co-authored-by: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> * Update code/modules/research/xenobiology/crossbreeding/_structures.dm Co-authored-by: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> Co-authored-by: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com>
…n the config, all rank changes would instead always go to the db, even bypassing DBRANK checks. (#3139)
* Ports tgstation/tgstation#51453 real quick * Fixes turf atmos getting deleted. * Moves the gas transfer procs to the gas mixture. * Fixes emp act to behave like before * Fixes tanks exploding * prevents pipenet related warnings Co-authored-by: nemvar <47324920+nemvar@users.noreply.github.com>
… is still very good. (#3067) * Automatic changelog compile [ci skip] * Fixes a damn CL change gggg Co-authored-by: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
* ye * gives the scanner to ce
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.
No description provided.