Upstream merge 70 #2498
Open
Upstream merge 70 #2498
+476,442
−127,802
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
…rds#34150) Added the holopad circuit board to the AV Communication technology and circuit imprinter lathe.
* Fix disposal signal routers sprites * Remove old shitcode
* added mail, moved some things around, and fixed a lot of APCs * fixed my mistakes * Fixed a few mistakes and AI camera names * Redid south medbay and more wiring * Finished sci overhaul, and fixed all issues that I could find. * rebuilt botany, removed vox box, fixed all known issues. * Overhauled security * Minor commit as I prepare to update my copy * Rebalanced role counts * Final changes, ready for review! * Emisse and other people fixed issues with the station * Finalized changes (for real this time)!
shotgun ammo changes
* Made a couple fixes to various decals, cleaned up some entities, gave the clown their bag and the bartender a handlabeler * Several changes, more cameras, lighting fixes, adjusted hydro a bit, gave sec a bunch of shutters * Added new random spawners for science and added them to Amber * fixed the science spawners and modified amber slightly * Fixed the random instrument entry
Swapped order of parents for MobGiantSpiderAngry
* Corrected all ghost role names to title case. * Removes full stop from Hamlet's title. * Updated ghost role names not in the main ghost roles .ftl * Two capitals corrections
* Packed update (remove christmas, new shuttle) * Fix invalid * the voices
* Renamed "Irish Car Bomb" drink to "Irish Slammer", due to concerns over insensitivity. * Fixing some missed references * Added prototype id changes to migration.yml. Removed any reference to the troubles (and corrected ale to stout for flavour text). * Corrected description back to "Irish Cream" * Removed non-entities from migration.yml
…interrupted (space-wizards#34093) Initial commit
* Initial commit * Corrected a field attribute
Make 3.png a PNG
* Remove Undesirable Laws * empty
* added basic admin logs for PDA notekeeper notes * formatting * added new LogType 'PdaInteract' and changed PDA notekeeper logs to it --------- Co-authored-by: dylanhunter <[email protected]>
github-actions
bot
added
Status: Needs Review
Changes: Sprites
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.
Описание PR
Список конфликтующих файлов оставил в описании мерж коммита.
Медиа
Проверки
Изменения
no cl