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

test3 #97

Closed
wants to merge 2,479 commits into from
Closed

test3 #97

wants to merge 2,479 commits into from

Conversation

Yuoko
Copy link

@Yuoko Yuoko commented Feb 5, 2024

Описание PR

Цель / Баланс

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

Медиа

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

Рефактор

Проверки

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

Изменения

🆑

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

SlamBamActionman and others added 30 commits February 26, 2024 13:41
* Initial commit

* Remove damage from cuffs entirely

* Changed from Action uncuffing cooldown to UseDelay cooldown

* Minor merge conflict fix

* Edit the actual correct line

* Submodule fix
Also includes some (non critical) changes to the solution file to re-organize the Roslyn components.
Injector status UI cached values

Co-authored-by: Plykiya <plykiya@protonmail.com>
swapped icons for crates
* Cleans up base crates for mapping clarity

* migration

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
Co-authored-by: Jeff <velcroboy333@hotmail.com>
Co-authored-by: Jeff <velcroboy333@hotmail.com>
Co-authored-by: botanySupremist <definitelyrealBotSupremist@gmail.com>
* Add weh to: Anomalies, Artifacts, random puddles

* also change weh to wehs!
* Nerf/Buff Gases cost

* Nerf/Buff Gases cost

* Nerf/Buff Gases cost

---------

Co-authored-by: CyberDuck <tsyaslovscky.dima@yandex.by>
meat and potatoes

ayup
Update uplink_catalog.yml
makeshift handcuffs are easier to escape from
* Behonker Lobby

* Change to WebP

* More PostProcessing!
* blue

* others

* add white table

* add crafting carpets

* finish carpets

* tags

* crafting

* pip

* finish
nt balloon

surprised one didn't exist already
* handheld

* Update meta.json

* Update meta.json

* Update cargo.yml

* research

* add to borg

* bruh

* borg to T2

* fix
Brandon-Huu and others added 29 commits March 6, 2024 05:03
bald update

Co-authored-by: Kadeo64 <108914677+Kadeo64@users.noreply.github.com>
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 <plykiya@protonmail.com>
* 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 <beck3629@uw.edu>
* 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
@Yuoko Yuoko closed this Mar 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.