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

69 commits

Author SHA1 Message Date
Vigers Ray
fffada0d68 Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Content.Client/Launcher/LauncherConnectingGui.xaml
#	Content.Client/Parallax/ParallaxControl.cs
#	Content.Server/Cargo/Components/CargoPalletConsoleComponent.cs
#	Content.Server/Cargo/Components/StationBankAccountComponent.cs
#	Content.Server/Cargo/Systems/CargoSystem.Orders.cs
#	Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
#	Content.Shared/Weapons/Reflect/ReflectSystem.cs
#	Resources/Locale/en-US/_strings/cargo/cargo-accounts.ftl
 2025-04-13 17:18:35 +03:00
Ed
5f78b72763
ParallaxControl UI Dehardcode (#36071) 
* Parallax Control Improve

* Update MainMenuControl.xaml

* PJBControl.cs
 2025-04-13 22:44:44 +10:00
Vigers Ray
0c1e15e516 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/Info/LinkBanner.cs
#	Resources/Locale/en-US/_strings/atmos/gas-pipe-sensor.ftl
#	Resources/Locale/en-US/_strings/station-events/events/greytide-virus.ftl
#	Resources/Prototypes/Datasets/Names/diona.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
 2024-11-26 17:50:59 +03:00
c4llv07e
646d41d3a7
Add telegram to the server info-links (#33459) 2024-11-22 16:38:41 +01:00
Vigers Ray
8cf5db66b4 Перенес ссылку на телеграм 2024-11-14 04:39:08 +03:00
Vigers Ray
4082ffc4bc
Анимации в лобби. Кастомный выбор фона в лобби. (#562) 
* Анимации в лобби

* анимации сущностями

* прототипы анимаций
 2024-10-30 20:14:26 +03:00
Vigers Ray
389ed704e1 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/Entry/EntryPoint.cs
#	Content.Client/IoC/ClientContentIoC.cs
#	Content.Server/Administration/Managers/BanManager.cs
#	Content.Server/Chat/Managers/ChatSanitizationManager.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/Traitor/Uplink/UplinkSystem.cs
#	Content.Shared/Interaction/SharedInteractionSystem.cs
#	Content.Shared/Localizations/ContentLocalizationManager.cs
#	Content.Shared/Roles/JobRequirement/DepartmentTimeRequirement.cs
#	Content.Shared/Roles/JobRequirement/OverallPlaytimeRequirement.cs
#	Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs
#	Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
#	Resources/Audio/Ambience/Antag/attributions.yml
#	Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
#	Resources/Locale/en-US/_strings/advertisements/other/firebot.ftl
#	Resources/Locale/en-US/_strings/shuttles/commands.ftl
#	Resources/Prototypes/Datasets/Names/last.yml
#	Resources/Prototypes/Entities/Mobs/Player/silicon.yml
#	Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Roles/Jobs/Science/borg.yml
#	Resources/Prototypes/Shuttles/shuttle_incoming_event.yml
#	Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
#	Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json
#	Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
#	RobustToolbox
 2024-10-30 13:26:32 +03:00
Stalen
24f79c3ecc
Fix playtime formatting (#32974) 2024-10-28 19:00:00 +01:00
slarticodefast
1518dc94a3
fix playtime stats window (#32856) 2024-10-17 23:32:59 +02:00
metalgearsloth
71c9894903
Jobreq format (#32806) 
* Format job requirements as hours and minutes

* Use TimeSpan.ToString for playtime instead of custom method

* wehflicts

---------

Co-authored-by: jmcb <joelsgp@protonmail.com>
 2024-10-14 14:54:31 +11:00
VigersRay
9df0369159 Фиксы и локализация профиля лобби 2024-10-12 17:43:21 +03:00
VigersRay
839257dba8 Провиль и привязка через лобби. 2024-10-11 23:44:48 +03:00
VigersRay
aa38c32b65 upstream 2024-09-16 12:40:23 +03:00
Winkarst
88dcc831c1
Remove calls to FormattedMessage obsolete methods (#31706) 
* Remove FormattedMessage obsolete methods

* Oops
 2024-09-01 13:00:53 +02:00
Vigers Ray
1d7a75070c
Roadmap (#188) 
* Копипаст смуглефа

* Дорожная карта санрайза

* Мелкие фиксы

* Небольшие фиксы

---------

Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
 2024-07-12 04:13:29 +03:00
VigersRay
cdf4e8dae0 Редизайн лобби 3 2024-07-05 20:02:44 +03:00
VigersRay
8420fd6ad2 Редизайн лобби 2 2024-07-05 10:22:18 +03:00
Vigers Ray
ff592a6963
Обнова лобби (#171) 
* Обнова лобби

* Небольшой фикс

* Убрал YouTubeWindow
 2024-07-04 09:44:28 +03:00
VigersRay
7d0476aab0 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Shared/Roles/JobPrototype.cs
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
#	Resources/Prototypes/Roles/Antags/nukeops.yml
#	Resources/Prototypes/Roles/Antags/revolutionary.yml
#	Resources/Prototypes/Roles/Antags/traitor.yml
#	Resources/Prototypes/Roles/Antags/zombie.yml
 2024-06-07 11:28:58 +03:00
Leon Friedrich
e7f2ae52ab
Give jobs & antags prototypes a guide field (#28614) 
* Give jobs & antags prototypes a guide field

* A

* space

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

* Add todo

* Fix merge errors

---------

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2024-06-06 05:05:58 -07:00
Nemanja
1333b48747
Convert rules to use guidebook parsing (#28647) 2024-06-06 03:11:26 -04:00
VigersRay
43c17f5bce Добавить кнопку гитхаба в лобби 2024-06-01 17:22:05 +03:00
Vigers Ray
5775d4cdef
Merge sunrise build (#2) 
* commit
 2024-05-31 02:16:18 +03:00
LordCarve
aafe815122
Obsolete Logger cleanup for EntitySystems (#25941) 
* Small obsolete Logger cleanup

* Fixed three EntitySystem logs that weren't doing it right.
 2024-03-10 01:15:13 +01:00
Pieter-Jan Briers
16bd6802df
More UI fixes (#22431) 
* Fix chat filter button

Oh look, the popup code was copy pasted between chat filter and channel selector.

Hilarious.

Anyways same stuff as 995f506aaf. I pulled it all out into a base class so NO MORE COPY PASTE.

Fixes #22360

* Remove all further EnableAllKeybinds buttons.

Fixes #22346

Yeah none of these are valid use cases, why is this set...
 2023-12-12 19:02:19 -07:00
metalgearsloth
269c93245d
Unrevert audio (#21330) 
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
 2023-11-27 22:12:34 +11:00
metalgearsloth
5b8f3c48c4
Revert "Update submodule to 175.0.0 (#21318)" (#21319) 2023-10-29 15:29:30 +11:00
metalgearsloth
9b1b3e03ed
Content audio (#20862) 2023-10-29 14:58:23 +11:00
Repo
e0f3bf0a06
User accessible playtime (#21242) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2023-10-28 12:01:11 +00:00
Riggle
579913b617
Better notes and bans (#14228) 
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
 2023-07-21 13:38:52 +02:00
metalgearsloth
68480af109
Update content vectors to numerics (#17759) 2023-07-08 14:08:32 +10:00
Leon Friedrich
116670ae8a
Rename "Server Info" to ServerInfo (#15436) 2023-04-16 10:55:59 +10:00
AJCM-git
7a6fddce4f
Moves guidebook UI logic to a UI Controller, some tweaks (#14601) 2023-03-22 23:41:43 -04:00
Pieter-Jan Briers
f57204b872
Fix LinkBanner for replicated CVar values. (#12845) 
Fixes #12843
 2022-12-04 06:47:25 -06:00
Pieter-Jan Briers
a6045e4538
Launcher info links. (#12781) 2022-12-02 17:23:43 -08:00
Júlio César Ueti
85866eaeda
Changes target window parent on rules ui (#12165) 2022-10-23 17:27:37 +02:00
metalgearsloth
5373fec641
Fix a bunch of warnings (#11965) 
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
 2022-10-16 08:44:23 -07:00
Jezithyr
571dd4e6d5
Hud refactor (#7202) 
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: Jezithyr <jmaster9999@gmail.com>
Co-authored-by: Jezithyr <Jezithyr@gmail.com>
Co-authored-by: Visne <39844191+Visne@users.noreply.github.com>
Co-authored-by: wrexbe <wrexbe@protonmail.com>
Co-authored-by: wrexbe <81056464+wrexbe@users.noreply.github.com>
 2022-10-12 10:16:23 +02:00
Pieter-Jan Briers
49e2c2e05a
Fix rules window (#11796) 2022-10-09 11:16:24 -07:00
Pieter-Jan Briers
7131b4fba0
Oops (#11698) 2022-10-04 00:28:48 -07:00
Pieter-Jan Briers
c5cfbd1d1a
Fuck da rules (#11584) 2022-10-03 23:43:42 +02:00
wrexbe
018a96ee88
Merge more UI refactor stuff (#11277) 
* Changelog+options ui controller
* Sandbox UI controller
* Escape menu UI controller
 2022-09-14 14:34:48 -07:00
wrexbe
35b90736b7
Minor UI refactor (#11212) 2022-09-11 20:42:12 -07:00
wrexbe
c55a015b77
Small UI refactor pieces (#11026) 
* ActionType rename Name to DisplayName

* Gameplay State rename+move
 2022-09-04 17:21:14 -07:00
Kevin Zheng
4813a719ba
Fix reading rules multiple times (#10925) 2022-08-29 22:00:06 -07:00
Kevin Zheng
b84d19e702
Send server rules over the network (#10847) 
Add a new InfoSystem that sends SharedInfo from the server to client
when requested. Currently, only the rule header and rule text is sent.

Previously, the rule header and rule text was bundled in the client,
which means that the client would only display rules that it was built
with, even if the server has different rules.

This allows servers all running the same build to send different rules.
This could be useful, for example, for servers running the official
builds to send different rulesets without a client rebuild.
 2022-08-29 21:38:56 -05:00
Visne
58769634c7
Fix a bunch of compiler warnings (#10518) 2022-08-13 22:28:34 -07:00
Kara
1eb4dfb13f
Rules header cvar + RP server rules header (#10450) 2022-08-08 16:20:01 -07:00
Pieter-Jan Briers
4c1b0b87fb
Fix rules popup (#8485) 
* CVar to show rules popup for localhost.

For testing purposes.

* Fix rules popup being broken and throwing.

😐
 2022-05-27 14:50:11 -07:00
ike709
0b15db1120
Adds a cvar for server rules (#8365) 
Co-authored-by: Veritius <veritiusgaming@gmail.com>
Co-authored-by: ike709 <ike709@github.com>
 2022-05-23 12:43:09 -07:00