rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
40610 commits 1 branch 0 tags 1.2 GiB
Commit graph

28447 commits

Author SHA1 Message Date
KaiserMaus
a04bd9a754
Linter (#210) 2026-02-19 12:46:33 +00:00
TiFeRi
666d926914
1 (#206) 2026-02-12 16:21:35 +02:00
VladSukr
cbee809cd7
Small Remapp and Fix (#205) 
* Small Remapp and Fix

* Fix linter

---------

Co-authored-by: VladSukr <VladSukr@gmmail.com>
 2026-02-08 05:02:27 +02:00
Vigers Ray
e521cac521 Merge remote-tracking branch 'space-sunrise/master' 
# Conflicts:
#	Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml
#	Resources/migration.yml
 2026-02-01 05:35:23 +01:00
Sunrise-Bot
e74668f73b Automatic changelog update 2026-02-01 04:02:43 +00:00
Vigers Ray
bf135fe706
Спам в мессенжере (#3835) 2026-02-01 07:01:38 +03:00
Sunrise-Bot
ae2bda663a Automatic changelog update 2026-02-01 00:56:52 +00:00
Vigers Ray
d4cf0a13ae
Доработка Мессенжера, фотоапарата. (#3833) 2026-02-01 03:55:47 +03:00
KaiserMaus
72fa1f6abb
Фиксы фиксов всякого (#3834) 2026-02-01 00:21:22 +00:00
Sunrise-Bot
5ea82a2b85 Automatic changelog update 2026-01-31 22:28:55 +00:00
KaiserMaus
5c0b0716fd
Фиксы всякого (#3832) 2026-02-01 01:27:45 +03:00
Sunrise-Bot
59586b04a8 Automatic changelog update 2026-01-31 08:41:15 +00:00
Daniel
73c75f7951
Tweak: Ручной мониторинг. (#3799) 2026-01-31 11:40:10 +03:00
Sunrise-Bot
5a3be45880 Automatic changelog update 2026-01-30 14:07:50 +00:00
Зюзя
8afa2896de
Vending machine minor buff (#3777) 2026-01-30 17:06:45 +03:00
TiFeRi
658c8f9243
1 (#195) 2026-01-30 09:31:46 +03:00
TiFeRi
a64feef920
[MAPS] Hot fix maps (#202) 
* 1

* 2
 2026-01-30 09:31:26 +03:00
A-Mironov
eb44502825
Откат новых иконок. Это пофиксит линтер, да и иконки решено было оставить старые (#199) 
* Замена спрайтов от Ерикунделя

* Мелкие правки

* Revert "Мелкие правки"

This reverts commit f21f9ac4a044a924819da1e76996df86285e5318.

* Revert "Замена спрайтов от Ерикунделя"

This reverts commit 312605c2ff3e7014bab31b8305de19c464f31415.

* Update job.yml
 2026-01-30 09:08:07 +03:00
Sunrise-Bot
50a1b60c68 Automatic changelog update 2026-01-30 05:57:01 +00:00
Daniel
62dfcd3463
Fix: Удаленный контроллер управления шаттлом (#3812) 2026-01-30 06:55:56 +01:00
Vigers Ray
fc453a88c3 Merge remote-tracking branch 'space-sunrise/master' 2026-01-30 06:30:28 +01:00
Vigers Ray
fcc2b10df5 Фотоапарат в КПК 2026-01-30 06:28:52 +01:00
Vigers Ray
416c0ed8bd Revert "фотоапарат и доработка месенжера" 
This reverts commit 5f3f836fe5.
 2026-01-30 06:27:41 +01:00
Vigers Ray
e154d5b410 Revert "Локализация фотоаппарата и выделение системы PhotoOverlay." 
This reverts commit 0000e6a222.
 2026-01-30 06:27:40 +01:00
Sunrise-Bot
c0d8cb8ece Automatic changelog update 2026-01-30 05:27:11 +00:00
Vigers Ray
277e573a3d
Merge pull request #3819 from space-sunrise/photo_cartridge 
фотоапарат и доработка месенжера
 2026-01-30 06:26:06 +01:00
Vigers Ray
0000e6a222 Локализация фотоаппарата и выделение системы PhotoOverlay. 2026-01-30 06:22:34 +01:00
Vigers Ray
5f3f836fe5 фотоапарат и доработка месенжера 2026-01-30 05:09:10 +01:00
Sunrise-Bot
35c198b0f8 Automatic changelog update 2026-01-29 18:14:02 +00:00
Daniel
412f48257a
Fix: Ксено шлюз (#3809) 2026-01-29 19:12:57 +01:00
Vigers Ray
f10452e9d7
Merge pull request #3816 from KaiserMaus/KM-Tweaks-and-Fix-v1 
Km tweaks and fix v1
 2026-01-29 16:14:45 +01:00
Vigers Ray
8c4edcddd0
Revert "Черипик части апстрима вручную: Аплинк" (#3815) 2026-01-29 18:03:51 +03:00
Sunrise-Bot
796db09c61 Automatic changelog update 2026-01-29 15:03:31 +00:00
KaiserMaus
867e941747
Черипик части апстрима вручную: Аплинк (#3813) 
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
Co-authored-by: SnappingOpossum <snappingopossum@outlook.com>
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
 2026-01-29 18:02:23 +03:00
KaiserMaus
4d7887aede Update catalogs and Fix 
Locale and Linter fix
 2026-01-29 15:00:19 +00:00
Princess Cheeseballs
a1fde2baca Tweak Traitor Uplink - The Rest of the Uplink (#42582) 
* jaws of death

* I hate YAML

* open the gate

* I forgot about this one

* I forgor

* Fix croissant

* this didn't work actually rip

* made lights look better and undo on the boxing gloves

* small change

* Update Resources/Prototypes/Entities/Clothing/Hands/gloves.yml

Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>

* baguette contraband, eat your evidence.

* suffix

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
 2026-01-29 15:00:18 +00:00
ArtisticRoomba
e761d42543 Tweak traitor deception items (#42510) 
tweak
 2026-01-29 15:00:18 +00:00
Princess Cheeseballs
d82ad75dec Syndicate Wearables Category Rebalances (#42482) 
* wearables

* oopdate

* sdasadsads

* the great reparenting

* fucked it up a little bit

* try this

* probably smarter to do this tbqh.

* better-er

* ok should work for real now

* slightly less woke idea

* just need to stack cleaner and faster

* this should resolve the test fails I think

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
 2026-01-29 15:00:18 +00:00
Princess Cheeseballs
612296365f Syndicate Weapons/Ammo rebalances + Weapons Case (#42468) 
* working commit

* final batch of changes

* reviw

Co-authored-by: SnappingOpossum <snappingopossum@outlook.com>

* lower china lake projectile speed

* hnnnnnnnnnnnnnng

* omelette joke back at popular request.

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: SnappingOpossum <snappingopossum@outlook.com>
 2026-01-29 15:00:18 +00:00
Princess Cheeseballs
4be7f9ca58 Traitor Chemicals Rebalance (#42484) 
very small list of changes overall

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
 2026-01-29 15:00:17 +00:00
ArtisticRoomba
2e97ffcc93 Adjust various traitor explosives (#42477) 
* adj explosions

* yuuup

* next release

* cleanup and EMP changes

* minibomb revert, wait until gib experiment

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
 2026-01-29 15:00:17 +00:00
Drokt
a3f8bbd50a
New toy (#196) 
* Added PlushieIssacLow without sprite and sounds

* toy add
 2026-01-28 18:33:59 +02:00
Sunrise-Bot
bfdeed99ec Automatic changelog update 2026-01-28 05:26:22 +00:00
Vigers Ray
a15bed16d1 Merge remote-tracking branch 'space-sunrise/master' 2026-01-28 04:02:52 +01:00
Vigers Ray
5a72fbd4a0 Добавлена поддержка закрепления чатов и отображения иконок ролей пользователей в мессенджере. 2026-01-28 03:09:53 +01:00
A-Mironov
faacf99832
Пустой мета файл ронял сервак, реально??? (#200) 2026-01-28 03:23:21 +03:00
Vigers Ray
19274a2d49 ченйжлог 2026-01-28 00:27:22 +01:00
Sunrise-Bot
bd567e05c2 Automatic changelog update 2026-01-28 00:21:33 +01:00
Зюзя
3b048934f5 Больше пива для дворфов (#3778) 2026-01-28 00:21:33 +01:00
Vigers Ray
1fabbbb504 Доработка мессенжера 2026-01-28 00:21:30 +01:00