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 stable 14.11.2024 !!!!!!!!! #272

Merged
merged 160 commits into from
Nov 14, 2024
Merged

Upstream stable 14.11.2024 !!!!!!!!! #272

merged 160 commits into from
Nov 14, 2024

Conversation

doublechest0
Copy link
Contributor

О PR

Почему / Баланс

Технические детали

Медиа

  • Я добавил к этому PR скриншоты/видео, демонстрирующие его изменения в игре, или этот PR не требует демонстрации в игре

Changelog

slarticodefast and others added 30 commits October 26, 2024 00:47
add flash reaction effect
…tem. (#32942)

Fix loneop spawnrate by reverting it to not use the custom shuttle event system.
* Add health analyzer unrevivability warning

* Remove errornous comment
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
* adjusted minimum timers in meteorswarms.yml

* Updated timer minimum from 20 to 15 minutes

* Reduced minimum timer to 10 minutes as a result of other meteor changes

---------

Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
* added vox beacon

* changed name to vox break room

* added vox box station beacon
* added vox beacon

* changed name to vox break room

* added vox box station beacon
* added vox beacon

* changed name to vox break room

* added voxbox station beacon
* added vox beacon

* changed name to vox break room

* added vox box station beacon
* added vox beacon

* changed name to vox break room

* added vox box station beacon

* fixes messed up diff
* add StartDelay bool to actions

* forgot summary
changed the synth sprite used in the icon for the instrumentify smite out for the more accurate supersynth sprite
Co-authored-by: deltanedas <@deltanedas:kde.org>
I don't really understand why RecordedSplitContainer exists but removing it looks identical and fixes the panel bumping occasionally.
SlamBamActionman and others added 25 commits November 6, 2024 15:39
* Initial commit

* Change burst fire variable to be a set value rather than a multiplier
…unds (#32981)

remove chair + changed maints db to rubber
* fix

* oops, used savemap instead of savegrid
* Fix reserach disk crash

* remove extra whitespace

* removed args.handled where args are not handled
* One line fix

* Removed redundant using

* Allocation improvement
* pass Actor to cartridge messages

* NonSerialized gaming

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
* cant disguise to thing in a container

* copy cigarette visualiser

* prevent aghost throwing an error

* make disguises die in space

* fuck it rewrite it to not use polymorph

* fix action troll

* oop

* add vebr

* add access to the components

* 2/3

* fix

* relay damage from disguise to user

* fix integrity

* :trollface:

* :trollface:

* m

* kill integrity

* fix a bug

* review

* remove them from component

* relay flash effect to the disguise

* fix icon being weird

* change method since multiple systems cant handle same network event

* :trollface:

* actually network Disguise real

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
* Sec Shell Gun Craftability Hotfix

* Capital Fix
Copy link
Contributor

RSI Diff Bot; head commit 42693ca merging into 80fb7fb
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi

State Old New Status
muffin-berry Modified
muffin-cherry Modified
muffin-banana Added

Resources/Textures/Interface/Actions/actions_ai.rsi

State Old New Status
job_view Removed

@doublechest0 doublechest0 merged commit 2cbeab7 into master Nov 14, 2024
12 of 13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.