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.

Sign up for GitHub

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

Jump to bottom

Upstream1406 #751

Closed
wants to merge 1,866 commits into from
Closed

Upstream1406 #751

wants to merge 1,866 commits into from

Conversation

Schrodinger71
Copy link
Collaborator

Описание PR

Проверки

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

Изменения

🆑

  • add: Добавлено веселье!
  • remove: Убрано веселье!
  • tweak: Изменено веселье!
  • fix: Исправлено веселье!

PJBot and others added 30 commits June 2, 2024 17:31
@PJBot
Automatic changelog update
0541187
@UBlueberry
Drawl capitalization coldfix (part 2: rise of accidentally commiting …
c591864 
…to master) (#26639)

fixed finally yay
@Killerqu00
fix typos in bonfire descriptions (#28515)
4eadbbc 
* fix typo

* a
@stellar-novas
Update to nixpkgs 24.05 (#28529)
81821e8
@Voomra
fix: localize PraySystem UI (#28535)
504208c 
tweak: localize PraySystem UI
@PJBot
Automatic changelog update
947ed7b
@PJB3005
Shut up a child throwing a tantrum (#28538)
307a042
@QuietlyWhisper
Rename admin cloak to weh cloak (#28540)
9dbdacd
@PJBot
Automatic changelog update
7ecff3e
@AJCM-git
RespawnRuleSystem tweaks. (#28528)
509e3ae
@Vermidia
Welding tweaks (#27959)
31eb3ed
@AJCM-git
Strip Items From Things Before Biomassing Them (#28544)
91875e9
@PJBot
Automatic changelog update
0a8167f
@PJBot
Automatic changelog update
4221707
@AJCM-git
Header of Gas tank UI screen now fetched from Entity name and local (…
be35a5d 
…#28545)
@PJBot
Automatic changelog update
39481fb
@Tayrtahn
Add support for HeldPrefix to SolutionContainerVisualsSystem (#28532)
0d864d3
@ElectroJr
Add PrototypeUploadTest (#28522)
d36ff56
@Vermidia
Changes SyndiCat spawner to a radio (#28492)
36396e3
@PJBot
Automatic changelog update
ba5af33
@Cojoke-dot
Gives Medibots Random Lines(not a good title) (#28543)
eb026c9
@PJBot
Automatic changelog update
64ff992
@Cojoke-dot
Adds Chat Triggers to the Gasp Emote (#28466)
a0b4911
@PJBot
Automatic changelog update
f8f55de
@deltanedas
prevent nukie kidnapping (#28387)
50f8de0
@deltanedas
make GameRule use entity category (#28294)
977bd5a
@Cojoke-dot
Make projectiles not hit crates unless clicked on (#28072)
e784f2c
@PJBot
Automatic changelog update
33d963a
@deltanedas
make objectives use entityCategory (#28269)
8d78b74
@DrSmugleaf
Add more info to GettingAttackedAttemptEvent (#28548)
def04cd
PJBot and others added 23 commits June 14, 2024 02:05
@PJBot
Automatic changelog update
af11bc3
@Titian3
Add trailing comments on multiline lists - editorconfig. (#28922)
f40267e 
Add trailing comments on multiline lists.
@Scruq445
Remove Rat King from MouseMigration and add it to it's own Event (#28…
c79849a 
…872)
@Tayrtahn
Move SleepingSystem to Shared & cleanup (#28672)
6c343dd 
* Move SleepingSystem to Shared & cleanup

* Remove empty OnShutdown handler
@Boaz1111
makes PKA able to mine rocks in one hit (#27476)
8059028 
gives it gatheringprojectile
@PJBot
Automatic changelog update
bcf8594
@KyuPolaris
Add chicken speech sound (#28948)
c52073f
@PJBot
Automatic changelog update
39d7afe
@IProduceWidgets
Evac shuttle for Oasis (#27998)
df2c3ec 
* Add robo control comp, also de-reinforce a lot of walls.

* Add Accordia Evac shuttle for Oasis.

* Revert "Add robo control comp, also de-reinforce a lot of walls."

This reverts commit b6be6b616aa9732b81e02bed76e3c9ae103cf7cb.
@Killerqu00
uncuffCooldown *= 5 (#28095)
4c18229
@PJBot
Automatic changelog update
e7a3fd5
@Moomoobeef
cargo can now order fax machines (#28968)
adad6b2 
* cargo can now order fax machines

* removed fax manual
@PJBot
Automatic changelog update
0d869a3
@UbaserB
Lighten throwing knive's border (#28977)
e70131e 
add
@FairlySadPanda
SS-28662 Add cvars to support forcing people to departures and making…
3b3163c 
… those at departures invincible (#28765)

* SS-28662 Add cvar to force spawn everyone at departures

This cvar means everyone must spawn at departures. This
could be handy for an admin event? But mostly it's so the
tutorial departures terminal can be seen by all newbies on
gateway servers.

* Small fix to ArrivalsSystem flow

* Remove incorrect todo

* Add godmode arrivals cvar
@Vermidia
Resprite rodent inhands + add hamlet inhands (#28955)
24e7653 
* Resprite rodent inhands + add hamlet inhands

* Small ham adjustment
@Schrodinger71
no merge
6e90d86
@Ratyyy @Schrodinger71
eee fixes
4bdfb89
@Schrodinger71
fix
a603913
@Ratyyy @Schrodinger71
Revert "Machine-code cleanup (#28489)"
25ea331 
This reverts commit 729e67a.
@Schrodinger71
mm
5a62f36
@Ratyyy @Schrodinger71
ERP status removed
8fcc94b
@Ratyyy @Schrodinger71
maybe db fix
28a8b30
@github-actions GitHub Actions
Copy link
Contributor

RSI Diff Bot; head commit 28a8b30 merging into 9a95663
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

@Schrodinger71
Copy link
Collaborator Author

-_-

@Schrodinger71 Schrodinger71 deleted the upstream1406 branch June 27, 2024 22:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Changes: Localization Changes: Map Changes: UI
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.