Fix merge conflict #4
Closed
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
Slight blunder on the loadout prototype being used and all the names aligning means playtesting didn't catch it earlier. Ideally player spawning code wouldn't have sucked so I could add tests like I wanted but it is what it is.
* reduced gain by 25dB * changed volume again --------- Co-authored-by: Martin Petkovski <[email protected]>
* remove senior backpacks * fix ID cards * Update atmospheric_technician.yml
…27028) This was removed in space-wizards#25280 as the relevant DB entities didn't go outside the DB layer anymore. SS14.Admin however still uses them directly (as it only supports Postgres), so the interface is still useful there.
add autism pins to loadout
* inital * Update loadout-groups.ftl * fix order * add winter boots * fix test fails
* LobbyUI fixes I have no idea which were bugs prior but anyway fix stuff. * More fixes * Test moment
…7036) Update roundstart.yml
Adds Nun Hood to starting Chaplain loadout options
* Added ClothingGotEquipped/ClothingGotUnequipped events * Better version * Implemented in a few places * More implementations * Add ClothingDidEquipped/ClothingDidUnequipped events
…#27209) cleaned pallet descriptions
…pace-wizards#26545) * SS14-26480 Roll Traversal Distorter into regular Artifact Analyzers Bit of a grab-bag of cleanup of Xenoarchaeology prompted by space-wizards#26480. 1. Traversal distortion biases are now "up" and "down" instead of "in" and "out". 2. Node generation has been tidied up to make it a little clearer how it works. 3. Traversal Distorters have been removed from the game along with their board. 4. Traversal distortion is now done by the artifact analyzers by default. 5. Some loc strings have been made clearer. 6. The Abnormal Artifact Manipulation tech has been made slightly cheaper. 7. The aformentioned tech is now localized as Artifact Recycling, given all it does is unlock the crusher. 8. The Xenoarchaeology guidebook entry has been given a bit of a rewrite, putting all information into one page and making sure to cover the basics that otherwise would require someone typing "Liltenhead artifact tutorial" into Youtube. * Fix references to deleted guidebook entry * Add fancy button to console because @EmoGarbage404 asked me to * migration comprete * Fixed a goober comment * maint fails to resolve conflicts: more at 11 * Resolve PR comments * Make UI nice --------- Co-authored-by: Nemanja <[email protected]>
* Escape markup for in-game chat, and labeler * different way * remove a using --------- Co-authored-by: wrexbe <[email protected]>
This minorly annoyed me because breath masks are tiny too, so if I swapped them I may run out of inventory space.
changes polymorph spawn to use angle
* make fire spreading scale with mass * realer --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
* heat your bombs * Removing comment
* reagents * Update Resources/Locale/en-US/reagents/meta/narcotics.ftl --------- Co-authored-by: Kara <[email protected]>
* RTG page update * old commits from space-wizards#22272 * Small fixes over most pages * TEG tweaks * Fixed a thing in airlock security * fixed an italics tag * singularity page now includes tesla * Added a burn chamber to TEG page * Prettyprinted TEG page, fixed some more issues with details * Moved ONE singular comma * Change Singularity page heading to include tesla * Singularity page pretty printing + fixes * TIL its [italic] NOT [italics] * RTG Prettyprinting * Access Config Prettyprinting + Netconfig tweak * Atmospherics prettyprinting * Construction keybind fix * Apply suggestions from code review --------- Co-authored-by: Kara <[email protected]>
* General slime improvements * Finish morphing * oops 2x2 not 3x3 * actually lets ball - 2x3 inventory * Last two things on the todo list * .\RobustToolbox\ * JUST COMPILE * fix tests 2.0 * fix tests 3.0 * Do reviews * minor change * guideboob * more --------- Co-authored-by: Kara <[email protected]>
* Syndicat Price 10 -> 6 * Update animals.yml * Update animals.yml * Update uplink_catalog.yml * Update uplink_catalog.yml * Update animals.yml
|
ah wait nope |
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
I be a vox enjoyer. I think I did this right.
Why / Balance
Technical details
Media
Breaking changes
Changelog