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

31491 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vigers Ray
c8e2d052d9 Merge remote-tracking branch 'refs/remotes/wizards/master' 2025-01-06 23:55:50 +03:00
Vigers Ray
234d4700ba фиксы 2025-01-06 23:55:12 +03:00
Vigers Ray
ee21d08199 Нерф и фикс баннихопа 2025-01-06 23:48:07 +03:00
Vigers Ray
4c9c6988b8 Кнопка просмотра целей антагов в админ панель 2025-01-06 23:42:18 +03:00
Vigers Ray
00d970264d Убрал автозамену сленга, добавил украинский и сс13 акценты. Сделал доступным руский акцент, 2025-01-06 20:28:33 +03:00
Vigers Ray
a1b51fc5da Паралакс бокса в в лобби 2025-01-06 16:26:27 +03:00
GayBot
03501c54d6 Automatic changelog update 2025-01-06 16:12:57 +03:00
SplikZerys
92e48b7184
New sponsor ghost sprites (#1018) 
* new ghost sprites

* Update meta.json

* Update meta.json

* Update meta.json

---------

Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
 2025-01-06 16:16:33 +03:00
GayBot
b09ef1e798 Automatic changelog update 2025-01-06 16:10:10 +03:00
KaiserMaus
4e556b68a7
Шприцемёты! (#1035) 
* Syringe Gun

* Fix Linter?

* Now fix?
 2025-01-06 16:13:45 +03:00
Babaev
353c002ce2
увы (#1036) 2025-01-06 16:13:27 +03:00
GayBot
04fa3ce4a8 Automatic changelog update 2025-01-06 16:07:00 +03:00
Odleer
a3d4718789
Хочу быть Box (#1037) 2025-01-06 16:10:33 +03:00
SplikZerys
c5fe6aa923
revert eng-command (#1038) 
* revert eng-command

* Update ChatSystem.cs

---------

Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
 2025-01-06 16:02:51 +03:00
PJBot
4882ba2274 Automatic changelog update 2025-01-06 12:33:49 +00:00
ArtisticRoomba
ea9954221c
Make station anchor hitbox less insufferable (#34217) 2025-01-06 23:32:42 +11:00
Southbridge
8083f88f4b
Amber Station - Minor Fixes (#34246) 
* Moved the stand clear decal in front of the janitor's shutters up two pixels

* added tech maints under most maints doors, fixed power issues in cargo, and fixed a couple minor issues
 2025-01-06 00:41:26 -07:00
IProduceWidgets
87d1ed9258
Oasis Update (#34245) 
santa is keel.
 2025-01-06 00:24:12 -07:00
PJBot
eecdd82779 Automatic changelog update 2025-01-05 22:12:07 +00:00
SpaceRox1244
6b674e73d6
Adds bullet collision to station lights (#34070) 
Adds collision with bullets to lights
 2025-01-05 23:11:01 +01:00
Vigers Ray
6055ef2623 фиксы апстрима 2025-01-06 00:18:08 +03:00
Vigers Ray
692edc0baf Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/Lobby/LobbyState.cs
#	Content.Client/Lobby/UI/LobbyGui.xaml
#	Content.Shared/Wieldable/WieldableSystem.cs
 2025-01-06 00:14:06 +03:00
Vigers Ray
668b4fdc9a Фикс половины тестов 2025-01-06 00:09:27 +03:00
PJBot
c536094c17 Automatic changelog update 2025-01-05 20:57:09 +00:00
Errant
a55dc4d3bb
Lobby chat width and custom lobby titles (#33783) 
* lobby name cvar

* panel width

* skrek

* server name localization fix

* comment format fix

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* remove redundant newline

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* string.empty

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* use SetWidth

* Update Resources/Locale/en-US/lobby/lobby-gui.ftl

---------

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-01-05 21:56:01 +01:00
PJBot
6f16291557 Automatic changelog update 2025-01-05 19:07:19 +00:00
deltanedas
0aebc76feb
wielding refactor/fixes (#32188) 
* refactor wieldable events

* fix inconsitency with wielding and use updated events

* wieldable cosmetic refactoring

* Update Content.Shared/Wieldable/Events.cs

Co-authored-by: Centronias <charlie.t.santos@gmail.com>

* real

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: Centronias <charlie.t.santos@gmail.com>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
 2025-01-05 20:06:10 +01:00
GayBot
3bb4d6e098 Automatic changelog update 2025-01-05 19:06:02 +03:00
SplikZerys
4e937d6986
new tts voice (#1032) 2025-01-05 19:09:37 +03:00
GayBot
57340011d6 Automatic changelog update 2025-01-05 16:27:26 +03:00
KaiserMaus
7021631f71
Фикс целей генокрадов (#1026) 
* Вроде фиксанул и работает

* #Sunrise-edit

* Resolves
 2025-01-05 16:31:01 +03:00
GayBot
f92eda04d7 Automatic changelog update 2025-01-05 14:50:19 +03:00
KaiserMaus
0d31ffc9ee
Малая балансировка вооружения, Лазерные Мечи для Оперативников (#1017) 
* 1st state

* Split Branch

* Forget

* №2

* уже есть

* aha

* No ass pain for Station

* ION rifle Tweaks
 2025-01-05 14:53:52 +03:00
GayBot
ff32e71eb5 Automatic changelog update 2025-01-05 14:47:45 +03:00
ThereDrD
d07cbcda6e
Красивые циферки урона (#993) 
* damage overlay refactor: new visuals and ignored damage types feature

* remove unused popup types

* add horizontal direction movement

* fix default popup type

* fix fix

* fix fix fix

* add damage overlay to structures

* comments + better implementation

* add ui dropdown option

* better values

* fix missing disabled sessions check

* asdasdadasd new commit on my pr

* ЧЕ БЛЯДЬ СЛОЖНО ДА

* ы

---------

Co-authored-by: Vigers Ray <vigersray@gmail.com>
 2025-01-05 14:51:20 +03:00
GayBot
35bed94089 Automatic changelog update 2025-01-05 13:11:53 +03:00
KaiserMaus
100c97a35a
Тех Фаб СБ: Упрощение (#1019) 
* 1st state

* Split

* Fix

* Split

* Fix Doublicate
 2025-01-05 13:15:26 +03:00
Francus41
411a866d53
окончательно фиксанул багель(точно на этот раз) (#1022) 
* окончательно фиксанул багель(точно на этот раз)

* суперматерия на багеле!
 2025-01-05 13:14:46 +03:00
KaiserMaus
df4695679e
Фикс очков ОСЩ (#1023) 2025-01-05 13:14:30 +03:00
Зюзя
65d315993f
Повышение количества проводов в тулбоксах (#1027) 
Так от данных тулбоксов будет больше пользы для инженеров. ХЗ зачем антагам НВ, МВ и ХВ провода, а вот инженерам они понадобятся.
 2025-01-05 13:13:47 +03:00
Vigers Ray
4b82d9064d Merge remote-tracking branch 'refs/remotes/wizards/master' 2025-01-05 13:12:51 +03:00
Vigers Ray
d1b609910c фикс YAML RGA schema validator 2025-01-05 13:10:35 +03:00
ArtisticRoomba
0639a49390
Fix rainbow lizard plushie inhands (#34128) 
* fix rainbow plushie inhands

* address requested changes

* attribute sprites
 2025-01-05 02:34:51 +01:00
github-actions[bot]
9532b613e0
Update Credits (#34220) 
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
 2025-01-05 01:32:19 +01:00
PJBot
41bcdd7c36 Automatic changelog update 2025-01-04 13:42:52 +00:00
themias
b2b3b22a04
Apply forensics when loading with an ammo box (#32280) 2025-01-04 14:41:45 +01:00
Spanky
357d365724
Packed Update (#34208) 
Packed Update (decals mostly)
 2025-01-04 01:05:20 -07:00
Vigers Ray
73ea9ecca5 Вырубил с пула мелкие карты 2025-01-04 11:04:44 +03:00
Vigers Ray
fda5f30a1d Фикс описания, надеюсь последний 2025-01-04 09:52:46 +03:00
Vigers Ray
f7e7f70c82 Фиксы ДО 2025-01-04 09:09:00 +03:00