Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

Апстрим #173

Merged
merged 731 commits into from
May 15, 2024
Merged

Апстрим #173

merged 731 commits into from
May 15, 2024

Conversation

Vonsant
Copy link
Collaborator

@Vonsant Vonsant commented May 15, 2024

About the PR

Why / Balance

How to test

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

Tayrtahn and others added 30 commits May 2, 2024 22:16
Make UseDelay.SetLength do EnsureComp
* Disarm throws item in random direction

* Slightly increased offset

* Return the return

---------

Co-authored-by: Plykiya <[email protected]>
* cheese

* Update disease_emotes.yml
* fuck it we ball

* added recommended copyright information

* revised copyright license

* revised copyright license x2

* finalized the fops

# reduced the number of audio clips
# adjusted the volume of all fox sounds to be consistent with each other

* added new sounds to the overall fox parent mob because we forgot oopsie
This Aims at balancing the viability of the CMO's lab coat compared to his other available options, those being his winter coat (which is just a straight up upgrade) and his hardsuit.

and also its suppose to level him with RD since RD's lab coat has special rad protection

Co-authored-by: Michael <[email protected]>
They are meant to be mapping only items.
* small SpawnItemsOnUse cleanup

* that one was not needed
Co-authored-by: deltanedas <@deltanedas:kde.org>
Made SpamItemsOnUse play sound at entity coordinates instead of parenting
* Adjust blast grenade recipe

* Move blast grenades into tier 2 research

* Move blast grenades to dynamic recipes for secfab and autolathe

---------

Co-authored-by: Plykiya <[email protected]>
* Add EntityWhitelistSystem

* Sandbox fix

* update test
* Intercept rule (#10)

* add

* b

* add this back lol

* fix test fails (alert levels dont have prototypes)

* tweaks
* fix engine version

* actually fix engine version

* Automatically activated breathing masks

* weh

* who needed that component anyway

* check if internals are already running

* Update Content.Server/Atmos/Components/BreathToolComponent.cs

Co-authored-by: metalgearsloth <[email protected]>

* Update Content.Server/Body/Systems/InternalsSystem.cs

Co-authored-by: metalgearsloth <[email protected]>

* prediction

* record struct event

* remove delayed activation, instead ensure that masks spawn last

* leftover

* engine version

* re-implement

---------

Co-authored-by: metalgearsloth <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>
Fixes the grammar on the captain's supervisor
* the meat and potatoes

yuh yuh yuh

* what the hell is a copyright?

am I right?
@Vonsant Vonsant merged commit 5690462 into master May 15, 2024
8 of 12 checks passed
@Sh1ntra Sh1ntra deleted the sh1ntra-backup-MayUpstream branch May 19, 2024 15:18
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.