Upstream1201 #977
Merged
Upstream1201 #977
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
added id for captain Co-authored-by: dylanhunter <[email protected]>
* Step 01: Remade arrivals * Nearly finished, also added new beacons and a holopad * Wrapped up all changes, also added a beacon for the docking arm
* dechrismassified * removed camera from shower
* dechristmassified * further dechristmassified
* many changes * contentingregrationtests * serialized invalid removed * blank * "Changes and fixes as suggested" * blank * blank * added desk bells * engi rework rework rework * added gate to content integration * tweaks * aaa * bbb * added holopads * ccc * Update default.yml * hotfix * aaa * bbb * many many tweaks and fixes * aaa * decals and maints * aaa * bbb * ccc --------- Co-authored-by: Emisse <[email protected]>
renamed cryopod.yml to cryogenic_sleep_unit.yml
removed christmas merry
* add sprite pulato * update * add pulato hair * add pulato hair * add pulato hair * update meta "pulato"
* Initial commit * Update * Comment correction * Minor margin increase
…114) Initial commit
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
…pace_station_ADT into local_upstream1201
…tation_ADT into local_upstream1201
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Schrodinger71
removed
the
Ожидает Тестирования(QA Engineer)
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
Апстрим от 13.01.25
Почему / Баланс
ПЁТР ПРИКАЗАЛ
Ссылка на публикацию в Discord
Техническая информация
Многое добавили, многое убавили
Медиа
Требования
Важно
no cl, no fun
Чейнджлог
KashRas2 & Шрёдька