KaiserMaus
a04bd9a754
Linter ( #210 )
2026-02-19 12:46:33 +00: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
Vigers Ray
bf135fe706
Спам в мессенжере ( #3835 )
2026-02-01 07:01:38 +03:00
Vigers Ray
d4cf0a13ae
Доработка Мессенжера, фотоапарата. ( #3833 )
2026-02-01 03:55:47 +03:00
KaiserMaus
72fa1f6abb
Фиксы фиксов всякого ( #3834 )
2026-02-01 00:21:22 +00:00
KaiserMaus
5c0b0716fd
Фиксы всякого ( #3832 )
2026-02-01 01:27:45 +03:00
Daniel
73c75f7951
Tweak: Ручной мониторинг. ( #3799 )
2026-01-31 11:40:10 +03:00
Зюзя
8afa2896de
Vending machine minor buff ( #3777 )
2026-01-30 17:06:45 +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
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
277e573a3d
Merge pull request #3819 from space-sunrise/photo_cartridge
...
фотоапарат и доработка месенжера
2026-01-30 06:26:06 +01:00
Vigers Ray
5f3f836fe5
фотоапарат и доработка месенжера
2026-01-30 05:09:10 +01: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
Vigers Ray
a15bed16d1
Merge remote-tracking branch 'space-sunrise/master'
2026-01-28 04:02:52 +01:00
Зюзя
3b048934f5
Больше пива для дворфов ( #3778 )
2026-01-28 00:21:33 +01:00
KaiserMaus
d4989a6645
Убрал в шкаф до следущего нового года, лобби арты ( #3794 )
2026-01-27 11:08:09 +00:00
Vigers Ray
ce86bdb8ad
Merge remote-tracking branch 'space-sunrise/master'
...
# Conflicts:
# Content.Server/_Sunrise/StationGoal/StationGoalPaperSystem.cs
# Resources/Prototypes/GameRules/roundstart.yml
# Resources/Prototypes/Guidebook/species.yml
# Resources/Prototypes/_Sunrise/AssaultOps/ghost_roles.yml
# Resources/Prototypes/_Sunrise/Entities/Customization/Markings/human_tails.yml
# Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml
2026-01-27 02:54:35 +01:00
Vigers Ray
3db0c9ee12
Добавлен NavigatorCartridge в прототипы PDA для расширения функциональности устройства.
2026-01-27 02:39:08 +01:00
Vigers Ray
7517064588
Merge remote-tracking branch 'origin/master'
2026-01-27 02:29:06 +01:00
KAVALDi
139b5ce1b2
ПТ | добавил для НПТ лодаут "Рабочая униформа" + сразу доступна в лодауете "водолазка ГСБ" ClothingUniformJumpsuitHoSAlt ( #3790 )
2026-01-27 02:09:54 +03:00
Vigers Ray
4b3627a900
Merge remote-tracking branch 'origin/master'
2026-01-26 23:40:38 +01:00
Daniel
1885a75f05
Add: Броня капитана ( #3793 )
2026-01-26 22:20:37 +00:00
Vigers Ray
8595a41e2a
Merge remote-tracking branch 'origin/master'
2026-01-26 21:32:47 +01:00
Vigers Ray
e8140548fa
ихихяхя
2026-01-26 21:32:33 +01:00
KaiserMaus
89516ad756
Переводы и додел ( #3792 )
2026-01-26 20:27:51 +00:00
Daniel
8a2e13cb0a
CrewMonitoring ( #3788 )
2026-01-26 23:00:52 +03:00
KaiserMaus
677b20ca4d
Доработка Ниндзи после copilot ( #3787 )
2026-01-26 19:51:04 +00:00
Vigers Ray
95d7d4d348
ыыыыы, месенжер макс, ихихяхя ( #3789 )
...
Co-authored-by: Daniel <77834935+Orvex07@users.noreply.github.com>
2026-01-26 22:44:54 +03:00
KaiserMaus
3e60eaac1f
КПК Ведущ. Ученого/Грузчика имеют льготы ( #3785 )
2026-01-26 14:22:35 +00:00
Зюзя
772371c839
fix mail & box drobes ( #3781 )
...
Co-authored-by: be quieti <be quieti@DESKTOP-2H3SMSL>
2026-01-26 13:09:57 +03:00
KaiserMaus
1da60a30ad
XL-магазины на бульдог ( #3780 )
2026-01-24 18:36:51 +00:00
KaiserMaus
fddfa35af4
Респрайт некоторых рудокрабов, добавлены остальные виды пород ( #3771 )
2026-01-23 11:39:07 +00:00
KAVALDi
ea4c9da7da
ПТ | заменил Glock-22 Metus на Glock-22 Prison и обновил описание ( #3774 )
2026-01-22 21:23:05 +03:00
KAVALDi
b5de2f29a2
ПТ | fix пропажи ПДА после спавна на Инженере и Стажёре + убрал дубликаты в лодауте "Головной убор" и "ПДА" ( #3773 )
2026-01-22 20:51:20 +03:00
KaiserMaus
2593bba77d
ДНК манипуляции в изучение РНД ( #3772 )
2026-01-22 20:50:58 +03:00
Fooksy2304
ebae2c5999
Guts ( #3762 )
...
Co-authored-by: Daniel <77834935+Orvex07@users.noreply.github.com>
Co-authored-by: ThereDrD <88589686+ThereDrD0@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
2026-01-22 20:47:37 +03:00
KAVALDi
9709f06b32
ПТ | рефакторинг Тюремного принтера униформы: заменил Metus на Prison во всех рецептах + добавил в рецепты его одеяло культа ( #3740 )
2026-01-22 02:34:48 +03:00
KaiserMaus
266c9c48fc
Фикс Взвода мин, детонации взрыв-штуна, снятие С4 со стены ( #3767 )
2026-01-22 00:33:03 +03:00
KAVALDi
e840f116fa
ПТ | убрал окончание Metus у айдишников прототипов головного убора ( #3738 )
2026-01-22 00:00:34 +03:00
