Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream fix? #2501

Merged
merged 343 commits into from
Jan 20, 2025
Merged

Upstream fix? #2501

merged 343 commits into from
Jan 20, 2025

Conversation

UrPrice
Copy link
Collaborator

@UrPrice UrPrice commented Jan 20, 2025

Описание PR

Фикс коммитов, я полагаю

Проверки

  • PR полностью завершён и мне не нужна помощь чтобы его закончить.
  • Я ознакомился с наставлениями по работе с репозиторием и следовал им при создании PR'а.
  • Я внимательно просмотрел все свои изменения и багов в них не нашёл.
  • Я запускал локальный сервер со своими изменениями и всё протестировал.
  • Я добавил скриншот/видео демонстрации PR в игре, или этот PR этого не требует.

Изменения

no cl no fun

amatwiedle and others added 30 commits December 31, 2024 08:20
…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)!
* 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
* Initial commit

* Corrected a field attribute
* 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]>
…ate computer board sprite. (space-wizards#34104)

* Defined sprites for non-generic computer boards. Added new syndicate computer board sprite.

* Added new sprite to meta.json and updated attribution.

* Reformatted module.rsi meta.json to match other meta file styles.

* Syndicate board sprite made less yellow/gold, changed outer chips to black. Using grey/silver for CPU centre, akin to syndie agent PDA theme, and to keep distinctive from security board.

* Corrected indentation spacing for currently edited entities.

* Update Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml

* add pr link to attribution

---------

Co-authored-by: slarticodefast <[email protected]>
Co-authored-by: Errant <[email protected]>
@github-actions github-actions bot added Changes: Sprites Изменение затронуло файлы ".rsu / .png" Changes: Map Изменение затронуло файлы ".yml" в неймспейсе "maps" Changes: UI Изменение затронуло файлы ".xaml" Changes: Localization Изменение затронуло файлы ".ftl" Changes: Prototypes Изменение затронуло файлы ".yml" кроме неймспейса "maps" Changes: C# Изменение затронуло файлы ".cs" labels Jan 20, 2025
@stalengd stalengd merged commit 2dab2a1 into SerbiaStrong-220:master Jan 20, 2025
11 of 12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Изменение затронуло файлы ".cs" Changes: Localization Изменение затронуло файлы ".ftl" Changes: Map Изменение затронуло файлы ".yml" в неймспейсе "maps" Changes: Prototypes Изменение затронуло файлы ".yml" кроме неймспейса "maps" Changes: Sprites Изменение затронуло файлы ".rsu / .png" Changes: UI Изменение затронуло файлы ".xaml"
Projects
None yet
Development

Successfully merging this pull request may close these issues.