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 #500

Merged
merged 796 commits into from
Apr 12, 2024
Merged

Upstream #500

merged 796 commits into from
Apr 12, 2024

Conversation

xEnlil
Copy link
Collaborator

@xEnlil xEnlil commented Mar 16, 2024

Куча проблем yaml не мержить до устранения

PJBot and others added 30 commits March 6, 2024 02:04
Removed all obsolete, non-ECS method calls to BatteryComponent
Added FitsInDispenser to FlaskBase
* fix(emag): Emagging a lock properly unlocks the component

Fixes #24860

* fix(emag): Emagging a lock no longer duplicates the unlock sound
Syringe requires hands and breaks on change

Co-authored-by: Plykiya <[email protected]>
* Delete Resources/Textures/Objects/Vehicles/atv.rsi/vehicle.png

* Add files via upload

* Delete Resources/Textures/Objects/Vehicles/atv.rsi/Vehicle.png.png

* Add files via upload

* Update meta.json

* Update meta.json

* .
* Minor lawdrobe changes

* Updates to advertisements, thank you messages, and emaged / contraband inventory

* Removed the 9th lawdrobe advertisement as it was unused

* Removed soap

---------

Co-authored-by: beck <[email protected]>
* veganmeatball

* testedthis

* moreplant
* fourteenloko

* inverse
green alert shuttle time change
* Buff zombie resists

Tweaks zombies to be tankier but still have a similar damage grouping for a specific weakness

* Removed unnecessary values of 1
Atmospherics thermomachines now properly invalidate tiles they add heat to.
* Update thief.yml

* Update stealTargetGroups.yml

* Update objectiveGroups.yml

* Update pets.yml
scissors

uplink catalog localization and just catalog update, with adding scissors to the chameleon set
@Schrodinger71
Copy link
Collaborator

В Тестере Дебаг ошибка на tag которого нет

В релизном всё окей

@Schrodinger71 Schrodinger71 added Status: Needs Review and removed DO NOT MERGE Не мерджить labels Apr 11, 2024
@PyotrIgn PyotrIgn merged commit 20d6924 into master Apr 12, 2024
9 of 11 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.