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

37 commits

Author SHA1 Message Date
VigersRay
0a91b468b4 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
#	Content.Client/Voting/UI/VotePopup.xaml.cs
#	Content.Client/Voting/VoteManager.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/Power/EntitySystems/BatterySystem.cs
#	Content.Server/Radio/EntitySystems/RadioSystem.cs
#	Content.Server/VoiceMask/VoiceMaskComponent.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.cs
#	Content.Server/VoiceMask/VoiceMaskerComponent.cs
#	Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
#	Content.Server/Voting/Managers/VoteManager.cs
#	Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
#	Content.Shared/Voting/MsgVoteData.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Recipes/Crafting/crates.yml
#	Resources/Prototypes/Recipes/Crafting/improvised.yml
 2024-09-26 20:17:14 +03:00
SlamBamActionman
eeadc75b0a
Add Votekick functionality (#32005) 2024-09-26 18:32:13 +02:00
VigersRay
0441b8b814 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/Launcher/LauncherConnecting.cs
#	Content.Client/Launcher/LauncherConnectingGui.xaml
#	Content.Client/Launcher/LauncherConnectingGui.xaml.cs
#	Content.Server/Administration/Managers/BanManager.cs
#	Content.Server/Medical/Components/HealthAnalyzerComponent.cs
#	Content.Server/Medical/HealthAnalyzerSystem.cs
#	Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
#	Content.Server/StationEvents/Events/RandomSentienceRule.cs
#	Content.Shared/Interaction/Components/BlockMovementComponent.cs
#	Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs
#	Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Objectives/objectiveGroups.yml
#	Resources/Prototypes/Objectives/stealTargetGroups.yml
#	Resources/Prototypes/Roles/Jobs/Security/detective.yml
#	Resources/Prototypes/Species/human.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
#	Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
#	Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml
#	Resources/migration.yml
 2024-08-22 06:50:04 +03:00
Pieter-Jan Briers
89c59398f1
Word wrap for vote titles (#31248) 2024-08-21 10:50:49 -04:00
VigersRay
b90d87c1c5 Добавил все режимы в голосование, скрыл голоса игроков. 2024-07-25 01:17:34 +03:00
Vigers Ray
eef1472e53
Секрет в голосовании за карту. Автоматическое голосование в конце раунда (#36) 
* Секрет в голосовании за карту

* Автоматическое голосование за карту в конце раунда

* чейнжлог
 2024-06-07 11:25:19 +03:00
metalgearsloth
5578bcc6f8
Fix votes using an audio entity (#27871) 
* Fix votes using an audio entity

Just retains a source around and uses that. I think the audio limit is like 256 sources on the lower end so this is like whatever to persist.

* Restart

* weh
 2024-05-10 21:21:06 -04: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
Visne
c7b21b631b
Remove unused dependencies (#19490) 2023-08-24 09:55:15 -08:00
metalgearsloth
68480af109
Update content vectors to numerics (#17759) 2023-07-08 14:08:32 +10:00
metalgearsloth
4cbd5ef1ca
Fix vote popup (#14940) 2023-03-29 19:36:30 +11:00
Chief-Engineer
a0ea580260
Add vote logs (#14139) 
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
 2023-02-17 01:29:44 +01:00
Kevin Zheng
72e1a5e109
Fix in-game voting (#12932) 
* Fix in-game voting

* Add comment

* Re-enable vote.restart_enabled by default
 2022-12-19 02:13:37 +01:00
Leon Friedrich
6917b0fe17
Misc audio and related changes for replays (#12578) 2022-11-22 11:49:48 +11:00
metalgearsloth
600c0e3255
Fix a few warnings (#11576) 2022-10-04 14:24:19 +11:00
wrexbe
56c2ad6a16
Move/Rename stuff (#11209) 
-     Change namespace, and folder of FancyWindow to Content.Client.UserInterface.Controls
-     Change xaml reference from ui to controls in some places
-     Change ClientAlertsSystem from internal to public
-     Change namespace, and folder of HighDivider to Content.Client.UserInterface.Controls
 2022-09-11 18:56:21 -07:00
keronshb
f7b1bda3e5
Reorders Sound Systems signatures to match Popup Systems. (#8728) 2022-06-13 09:45:47 +10:00
mirrorcult
ec4d4688c7
Seal/abstract/virtual everything (#6739) 2022-02-16 18:23:23 +11:00
Vera Aguilera Puerto
666be08d86
Fix client-only command permissions. (#5899) 2021-12-25 19:53:21 +01:00
20kdc
a2b7982c37
Add variables to prevent voting of various kinds (#5361) 
* Add a way to disable voting for maximum authoritarianism

* Allow disabling specific vote types via cvars

* Migrate standard-vote-to-cvar dictionary to being static
 2021-11-23 10:03:04 -07:00
Mith-randalf
859b7faa61
Plays a little ding when a vote gets called. (#5386) 2021-11-18 10:45:35 +01:00
mirrorcult
03f766577a
Map vote & forcemap command (#5278) 2021-11-11 23:25:57 -07:00
Pieter-Jan Briers
e9af56c7c3 Vote type delay, code comments. 
Added doc comments to server side voting API.
There is now a 4 minute delay between creating votes of the same type.
Shuffled some code around.
Made a StandardVoteType enum instead of string IDs.
 2021-07-21 19:03:10 +02:00
Pieter-Jan Briers
a0a5dcdfde Clean up vote XAML a bit. 
Remove deprecated UI things from it, give vote popup a MinWidth.
 2021-07-21 15:15:02 +02:00
Visne
bf493c39b7
Replace most VBox/HBoxContainers with BoxContainers (#4274) 2021-07-18 18:39:31 +02:00
Visne
b7dc3c81ae
Remove redundant #nullable enable (#4275) 2021-07-16 17:37:09 -07:00
mirrorcult
2ea5aec101
Remove NetMessage deprecated boilerplate (#4196) 2021-06-21 07:43:54 +02:00
Galactic Chimp
392b820796
Removed old Loc.GetString() use instances (#4155) 
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
 2021-06-21 02:13:54 +02:00
DrSmugleaf
f9acdbe5cc
Fix unused and improperly named xaml namespaces (#4172) 2021-06-10 23:09:07 +02:00
DrSmugleaf
ff1a2d97ea
Re-organize all projects (#4166) 2021-06-09 22:19:39 +02:00
Pieter-Jan Briers
f3442845a6 Clear votes on client disconnect. 
They would stay stuck open otherwise.
 2021-02-28 22:51:06 +01:00
Pieter-Jan Briers
245f276f35 Restart vote improvements, voting localization. 
Restart votes now need 80% majority to succeed.
Restart votes now have a 3 minute cooldown on the caller.
Voting stuff has been localized.
 2021-02-28 22:11:53 +01:00
Pieter-Jan Briers
b898443f28
WPF layout (#3346) 2021-02-21 12:38:56 +01:00
Leo
8640f342b5
Change all XAML to use spacestation14.io namespace (#3277) 2021-02-17 15:22:51 +01:00
Pieter-Jan Briers
cea87d6985
Voting (#3185) 
* Basic voting

* Rewrite lobby in XAML.
Working lobby voting.

* Escape menu is now XAML.

* Vote menu works, custom votes, gamemode votes.

* Vote timeouts & administration.

Basically done now.

* I will now pretend I was never planning to code voting hotkeys.

* Make vote call UI a bit... funny.

* Fix exception on round restart.

* Fix some vote command definitions.
 2021-02-17 01:07:17 +11:00