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

merge upstream #854

Merged
merged 18 commits into from
Dec 13, 2023
Merged

merge upstream #854

merged 18 commits into from
Dec 13, 2023

Conversation

Legendaxe
Copy link

Что этот PR делает

Почему это хорошо для игры

Изображения изменений

Тестирование

Changelog

🆑
add: В аплинк добавлена портативная турель за 20 тк, поставляется в виде гранаты которая на "взрыве" спавнит турель. Турель атакует всех кроме того кто ее установил.
add: Генокрадам добавили новую способность "Apex Predator"(генокрадский пинпоинтер на людей).
tweak: Теперь у пристегивания нету дилея если цель в стане/наручниках/мертва.
add: Теперь некоторыми объектами можно угрожающе прицеливаться на людей(например бананом)
tweak: Теперь моли могут носить носки
/:cl:

Arthri and others added 18 commits December 12, 2023 19:26
* Add sortable table

* Add IndexedTable

* refactor MedicalRecords to use IndexedTable

* Reorganize children

* Finish conversion

* rename SearchFlex to Toolbar

* import IndexedTable.scss

* Deduplicate CSS

* Make margins look in toolbar better

* Rename IndexedTable to RecordsTable

* Remove redundant classes

* Unselect sort by clicking on icon rather than double click

* Fix premature scrollbar

* Revert field searching

* Implement number sort

* Implement compare for undefined, null, bigint, and boolean

* simplify sorting

* Remove redundant class

* Add documentation

* Fix med records

* copy paste error

* consistency fixes

* Allow null as prop.sortId

* document all

* Remove redundant compute

* Remove redundant usings

* restore missing commas

* fix missing hashtag in account number

* Document column order

* Build and update tgui

* Prettier format

* Reorganize props

* [ci skip]

---------

Co-authored-by: Arthri <[email protected]>
Co-authored-by: tgui <41898282+github-actions[bot]@users.noreply.github.com>
…rounding error (ParadiseSS13#23299)

* Fix slider misconfiguration

* Parse input numbers before passing on

* Convert to origin-based code

* Apply dragmatrix to other offset components

* Remove size-based code

* Use state to track original value instead of using props

* Build and update tgui

* Remove reliance of offset on window position

* Fix Knob usage

* Build and update tgui

* ci rerun

* ci rerun

* ci rerun

* ci rerun

* ci rerun

* ci rerun

* ci rerun

* ci rerun

* ci rerun

* ci rerun

* ci rerun

* ci rerun

* ci rerun

---------

Co-authored-by: Arthri <[email protected]>
Co-authored-by: tgui <41898282+github-actions[bot]@users.noreply.github.com>
…aradiseSS13#23318)

* Fix objects copied via `/area/copy_contents_to()` not smoothing properly

* Spring cleaning

* Good riddance

* Summer cleaning

* Fix holodeck stools facing the wrong way

* `var/list = list()` over `new`

* Lewcc review

* DGamerL review; cleanup and spacing jesus fuck

* DGamerL + Contrabang wombo combo review; minor cleanup
* ah fuck there we go

* Added new wall type, so its destroyable

* Update lavaland file with new wall and helper.

* Add new rock type.

* Add missing rock

* Added new rock to surround arena:
- Its now for visual enchancement just to make it look "older" than it is.

* Added more no_lava helper outside outpost

* changed walls to be destroyable by world gen.
* shed

* Update code/modules/antagonists/changeling/powers/stalkingpresence.dm

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

* Update code/modules/antagonists/changeling/powers/stalkingpresence.dm

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

* Update code/modules/antagonists/changeling/powers/stalkingpresence.dm

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

* Update code/modules/antagonists/changeling/powers/stalkingpresence.dm

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

* Update code/modules/antagonists/changeling/powers/stalkingpresence.dm

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

* jimkil review

* Update code/modules/antagonists/changeling/powers/apex_predator.dm

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

* Update code/modules/antagonists/changeling/powers/apex_predator.dm

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

* review

* Update code/modules/antagonists/changeling/powers/apex_predator.dm

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

* Update code/modules/antagonists/changeling/powers/apex_predator.dm

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

* cthhulhu phtagn

---------

Co-authored-by: JimKil3 <[email protected]>
Co-authored-by: Contrabang <[email protected]>
Co-authored-by: DGamerL <[email protected]>
* adds a new tot item, the syndicate pop-up turret

* Update code/datums/uplink_items/uplink_general.dm

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

* Update code/game/machinery/portable_turret.dm

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

---------

Co-authored-by: Luc <[email protected]>
)

* Fix crayon refs not being nulled when opening "empty" washing machines

* all my homies hate magic numbers

* why was this a thing

* all my homies hate using 0|1 as bools

* ever heard of personal space

* `locate()` cleanup

* Spring cleaning

* Remove unused washing machine state

* whoops

* DGamerL review

* Typecache is the way

* Remove extraneous string initialization

* Negative feedback message consistency

* Documentation my beloved
* fixes lavaproof rods, adds to rnd

* Update code/game/turfs/simulated/floor/lava.dm

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

* moves return

* returns early

* Update code/game/turfs/simulated/floor/lava.dm

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

* Update code/game/turfs/simulated/floor/lava.dm

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

---------

Co-authored-by: DGamerL <[email protected]>
* bucking incapacitated is fast

* trait hands blocked

* Update code/game/objects/buckling.dm

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

* Update code/game/objects/buckling.dm

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

---------

Co-authored-by: Ryan <[email protected]>
Co-authored-by: Contrabang <[email protected]>
…23494)

add pointy banana, among other non-gun pointies.

Co-authored-by: Scribble-Sheep <[email protected]>
* Fixes Lichdom preventing proper wizard round end

* move stuff around

* tab

* Update code/datums/spells/lichdom.dm

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

---------

Co-authored-by: Ryan <[email protected]>
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](actions/setup-python@v4...v5)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@github-actions github-actions bot added :neckbeard: Документация Улучшения и дополнения в документации 🗺️ Изменение Карты В этом ПРе затронут файл не станционной карты. Может и не один. 🖌️ Спрайты Вы заработали свою миска-рис и кошко-жена. Партия гордится вами! TGUI Кто-то решил потрогать интерфейсы. labels Dec 13, 2023
@Legendaxe Legendaxe merged commit 477b6cc into ss220club:master Dec 13, 2023
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
:neckbeard: Документация Улучшения и дополнения в документации 🖌️ Спрайты Вы заработали свою миска-рис и кошко-жена. Партия гордится вами! 📜 CL валиден TGUI Кто-то решил потрогать интерфейсы. 🗺️ Изменение Карты В этом ПРе затронут файл не станционной карты. Может и не один.
Projects
None yet
Development

Successfully merging this pull request may close these issues.