Skip to content

ну теперь точно fix #5

Merged
BohdanNovikov0207 merged 4 commits intoBohdanNovikov0207:masterfrom
BadRyuner:fixfix
Aug 17, 2025
Merged

ну теперь точно fix #5
BohdanNovikov0207 merged 4 commits intoBohdanNovikov0207:masterfrom
BadRyuner:fixfix

Conversation

@BadRyuner
Copy link
Copy Markdown
Collaborator

Description


TODO


Media

Example Media Embed


Changelog

🆑

@BadRyuner
Copy link
Copy Markdown
Collaborator Author

В идеале TileFrictionContoller привести к тому виду, как он сейчас у визардов, но вродеб и так все работает хорошо ¯⁠\⁠_⁠(⁠ツ⁠)⁠_⁠/⁠¯

@BohdanNovikov0207 BohdanNovikov0207 merged commit 9369faf into BohdanNovikov0207:master Aug 17, 2025
@BadRyuner BadRyuner deleted the fixfix branch August 17, 2025 07:16
BohdanNovikov0207 pushed a commit that referenced this pull request Apr 11, 2026
* Merge pull request #4 from KillanGenifer/goals

[CORVAX PORT] Station goals

* Merge pull request #5 from KillanGenifer/cyrilliccrayons

[CORVAX PORT] Cyrillic crayons

* Merge pull request #14 from corus-station/abductor-accent

Glorp Accent

* Merge pull request #34 from JrInventor05Next/adminabuse

[NEXT PORT] Мелочи для админов by Vonsant

* Merge pull request #72 from KillanGenifer/autoemoteondamage

Auto emotes on damage system

* chore: Automatically update REUSE headers

* IFF upgrade and remote shuttle system (#116)

* PR : IFF improves and remote shuttle system

* chore: Automatically update REUSE headers

* [PORT] Передача предметов в руки (Simple-Station#264)

* take files from original PR

* it works somehow?

* rebase everything to corvaxgoob

* resolving conflict

* IPC and skeleton fix

* chore: Automatically update REUSE headers

* Anonymous radios (Simple-Station#290)

* added anonymous radios

* check for short names to prevent crashing

* yaml

* custom instructions for alert level in PDA (#334)

Also it add TryGetString for alert name

* Shadowkin eyes (Simple-Station#460)

* Shadowkin Eyes Workaround

Later

* Locale

* Changes

* Locale(reposition)

* Фикс подстанции Т.Р.А.Н.З.И.Т.  (Simple-Station#461)

* Фикс подстанции (ТРАНЗИТ) из комплекта БСХ

Было 2 проблемы в прототипе:
1. Если тронуть слайдер мощности подстанции, то её значения слетали до родительской базовой подстанции
2. Ёмкость подстанции также имела родительское значение обыкновенной подстанции, что для ТРАНЗИТа сущие копейки. В связи с механикой PowerNet любые электрогенераторы, даже если могут выдать 20 МВт, не могут достигнуть этих значений из-за медленного разгона фактической мощности. Поэтому нужна большая ёмкость подстанции, чтоб перед запуском БСХ генераторы успели набрать фактическую мощность.

* Crash YAML test fix

---------

Co-authored-by: HOME-PC\admin <test@awd.wd>

* Heretic robes sprites (Simple-Station#542)

* ogo

* Re-sprite programs icons (#601)

* Remove medsec (Simple-Station#633)

* Изменение смеха для женщин тенекинов (Simple-Station#643)

* Update speech_emote_sounds.yml

* Update speech_emote_sounds.yml

* [Add][Port]Pathfinding decals (Simple-Station#654)

* FloorSign

* Pathfinding decals, take 2  (#2914)

* better decals yup

* chore: Automatically update REUSE headers

---------

Co-authored-by: funkystationbot <funky@funkystation.org>

* fix

* pereezd

---------

Co-authored-by: willow <willowzeta632146@proton.me>
Co-authored-by: funkystationbot <funky@funkystation.org>

* Госты могут просматривать интерфейсы (Simple-Station#675)

* Переработка консоли заказа грузов (Simple-Station#698)

* metaEB

* Update speech_emote_sounds.yml (Simple-Station#702)

* Dragon-faction (Simple-Station#707)

* Toolbelt QOL (#6373)

* Eta tuff

* ooops

* hmmmm

* okay fuck you

* why are you this way

* Okay!

* small Heretic Icons Resprite (#6368)

cool

(cherry picked from commit b327212)

* fix rsi 1

* fix 2

* !

* фиксы и порт с бакмена (#98)

* fix footprints

* port sponsorsystem from backmen

* fix ~~orehum~~ backmen pass

* return martial artist

---------

Co-authored-by: KillanGenifer <157119956+KillanGenifer@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: nukkuminen <90336027+oldschoolotaku@users.noreply.github.com>
Co-authored-by: JrInventor05Next <205915704+JrInventor05Next@users.noreply.github.com>
Co-authored-by: Elusive <elusivedrake@gmail.com>
Co-authored-by: Naxel <46362288+Naxel11@users.noreply.github.com>
Co-authored-by: HOME-PC\admin <test@awd.wd>
Co-authored-by: Aviu00 <93730715+Aviu00@users.noreply.github.com>
Co-authored-by: Ko4ergaPunk <62609550+Ko4ergaPunk@users.noreply.github.com>
Co-authored-by: RomiGur <gurilevroman@gmail.com>
Co-authored-by: Mefedronov <49251114+Metasux@users.noreply.github.com>
Co-authored-by: ArZarLordOfMango <96249677+ArZarLordOfMango@users.noreply.github.com>
Co-authored-by: willow <willowzeta632146@proton.me>
Co-authored-by: funkystationbot <funky@funkystation.org>
Co-authored-by: BeanyBoi69 <92493635+BeanyBoi69@users.noreply.github.com>
Co-authored-by: RedTerror <37833085+RedTerrorDark@users.noreply.github.com>
Co-authored-by: Andrey <54708336+BadRyuner@users.noreply.github.com>
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.

2 participants