Vigers Ray
ee9aaa25ed
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
2025-02-14 03:19:19 +03:00
nikthechampiongr
562a41c00e
Vote kicks now ban the target's ip ( #35131 )
...
* Make vote kicks ban the target's ip address
* Make it stop crashing my game
2025-02-13 23:03:55 +01:00
Vigers Ray
53711110c3
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Server/Chemistry/EntitySystems/HypospraySystem.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Locale/en-US/_strings/administration/commands/announce-command.ftl
# Resources/Prototypes/Catalog/uplink_catalog.yml
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/meta.json
2025-02-12 18:46:28 +03:00
SpaceManiac
4122310735
Fix 38 non-obsolete warnings ( #33794 )
2025-02-11 20:59:50 +11:00
Babaev
67316d6138
Фикс голосования о выборе карт ( #1299 )
2025-02-10 05:00:01 +03:00
Vigers Ray
5ed863e68f
Сделал голосование тише
2025-01-18 06:52:52 +03:00
Vigers Ray
fe8ca2f277
ГОЛОСОВАНИЕ
2025-01-11 04:26:56 +03:00
Vigers Ray
08d15d459c
Фикс возможность узнать геймрул через хаб и вебхук. Добавил 3 выбора попимо секрета в геймрул
2024-12-02 03:26:33 +03:00
Vigers Ray
667987a86c
details textedit for votekick
2024-11-29 00:16:31 +03:00
Vigers Ray
8c77fcdd1b
Revert "фикс RoundstartFtlTarget"
...
This reverts commit a3b12c17af
2024-11-28 23:50:35 +03:00
Vigers Ray
a3b12c17af
фикс RoundstartFtlTarget
2024-11-27 05:03:42 +03:00
Vigers Ray
ccec00cd7a
фикс
2024-11-13 11:16:28 +03:00
Vigers Ray
1570312909
Фикс
2024-11-13 11:01:33 +03:00
Vigers Ray
f4c428b848
пу-пу-пу
2024-11-13 10:52:45 +03:00
Vigers Ray
38889342ad
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs
# Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
# Content.Shared/Weapons/Ranged/Components/GunComponent.cs
# Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
# Resources/Audio/Machines/attributions.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
# Resources/Prototypes/Recipes/Lathes/medical.yml
# Resources/Prototypes/Roles/Jobs/Civilian/service_worker.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/Thieves.xml
# Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/meta.json
# Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png
# Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png
# Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json
# Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png
# Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png
# Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json
2024-11-13 04:35:52 +03:00
DrSmugleaf
8f87bad83c
Fix DisplayVotes doing nothing for a vote ( #33170 )
2024-11-05 01:12:29 +01:00
Vasilis
957b8de89b
Add cvars to votekick to customize requirements for the initiator. ( #32490 )
2024-11-01 21:34:23 -04:00
Rinary
c2713aa731
Полная доработка системы голосований ( #592 )
...
* init
* fix
2024-11-02 01:24:06 +03:00
SlamBamActionman
06da4fcc60
Allow votekicks to be initiated in the lobby ( #32528 )
...
Initial commit
2024-10-31 21:52:55 -04:00
Rinary
8f7137e2cd
Исправление и доработка голосований ( #555 )
...
* init
* откат генокрадов
* from Delay to Update
2024-10-30 10:47:59 +03:00
VigersRay
e79763d20f
цвары на скрытия голосований
2024-10-08 08:53:40 +03:00
VigersRay
b1cac7e781
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Chat/Managers/IChatManager.cs
# Content.Client/IoC/ClientContentIoC.cs
# Content.Server/Administration/Systems/BwoinkSystem.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/GameTicking/GameTicker.Player.cs
# Resources/Audio/Machines/attributions.yml
# Resources/Locale/en-US/_strings/administration/commands/custom-vote-command.ftl
# Resources/Locale/en-US/_strings/discord/vote-notifications.ftl
# Resources/Locale/en-US/_strings/npc/firebot.ftl
# Resources/Locale/en-US/_strings/paper/syndicate-business-card.ftl
# Resources/Locale/en-US/_strings/store/uplink-catalog.ftl
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
# Resources/Prototypes/Recipes/Crafting/bots.yml
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
2024-10-02 06:45:10 +03:00
SlamBamActionman
d0c4d5a93a
Add webhook for votekicks ( #32513 )
...
* Initial commit
* Localization
2024-09-29 15:23:53 +02:00
VigersRay
1b104845e5
Фикс голосовой маски
2024-09-26 21:38:22 +03:00
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
aa38c32b65
upstream
2024-09-16 12:40:23 +03:00
Pieter-Jan Briers
582a644c24
I have spent more time today cleaning up garbage than coding new shit, and I am mad ( #31246 )
...
* Fix logging of GetWebhook errors
Yeah let's just not log the error only stack trace.
* I have spent more time today cleaning up garbage than coding new shit, and I am mad
Cleans up the custom vote Discord webhook code because I *happened* to lay my eyes on how completely terrible it was and immediately found an obvious bug with it.
Also did basic QA because jesus christ: it more clearly reports pending votes, properly indicates cancelled votes, improves footer formatting, better error logging, all the usual shit.
Requires https://github.com/space-wizards/RobustToolbox/pull/5375 to avoid test failures
2024-09-06 20:00:57 +10:00
VigersRay
b90d87c1c5
Добавил все режимы в голосование, скрыл голоса игроков.
2024-07-25 01:17:34 +03:00
Vigers Ray
eef1472e53
Секрет в голосовании за карту. Автоматическое голосование в конце раунда ( #36 )
...
* Секрет в голосовании за карту
* Автоматическое голосование за карту в конце раунда
* чейнжлог
2024-06-07 11:25:19 +03:00
Nemanja
68992735d8
Clean up command perms ( #28451 )
...
* Change BanExemption command to AdminFlags.Ban permissions
* Change LOOC to check for Moderator permission
* Change ListVerbs from Admin to Debug AdminFlags
* Change RunVerbAs from Admin to Fun AdminFlags
* More permission changes
* Change GhostKick to Moderator perm
* Clean up command perms
* fuck
---------
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
2024-06-01 01:14:43 -07:00
LordCarve
05a2e6b3a2
Obsolete refactor - ConnectedClient to Channel ( #24409 )
2024-01-23 09:14:13 +11:00
Repo
7bf62f1d19
Restart votes check player count and ghost levels ( #23453 )
...
* Restarts have max player count
* Now counts ingame ghosts to determine if restart can be called
* consistant cvar name
* Added a player count with state conditional
2024-01-19 18:10:05 +11:00
Pancake
2f4204c2e1
Fix Vote Relay ( #23670 )
...
Update VoteCommands.cs
Pretty sure this is it.
2024-01-07 16:38:16 -06:00
LankLTE
82ddf451e6
change the restart vote to have no effect with admins online ( #22945 )
...
* Change the vote and cvar
* Only denies successful votes
* Add comments because I'm a good coder, I swear
* I added a space to the first line of ccvars it's so over
2023-12-24 23:55:56 -08:00
LankLTE
94628d6ab1
Relay custom votes to a webhook ( #18561 )
...
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
2023-12-14 20:03:32 -08:00
Leon Friedrich
e685cb626b
Un-revert IPlayerManager refactor ( #21244 )
2023-10-28 09:59:53 +11:00
metalgearsloth
a2bbda43cc
Revert "Update submodule to 172.0.0 ( #21222 )" ( #21225 )
2023-10-24 21:55:20 +11:00
Leon Friedrich
7ba0ea2926
IPlayerManager refactor ( #21215 )
2023-10-24 20:19:08 +11:00
Nemanja
27231420bc
Allow gamemodes to specify custom map pools ( #18429 )
...
* Allow game presets to require certain maps
* make preset maps ignore the game map pool
* make it use a map pool prototype
* Typo
---------
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
2023-08-01 16:11:50 -05:00
alexkar598
babe032575
Fixes map vote localisation issue ( #16904 )
2023-05-28 13:19:08 -05:00
metalgearsloth
f3a06a0696
Add arrivals ( #14755 )
...
* Arrivals
* More arrivals and shitty uhh preload
* cvar
* a
* clockin + maps
* shitter prevention
* Placement
* a
* cvar for tests and dev
* weh
2023-03-22 04:29:55 -05: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
Mervill
40b556d206
Refactor GameMapManager a bit (nukes mapforced) ( #11513 )
...
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Closes https://github.com/space-wizards/space-station-14/issues/7192
Closes https://github.com/space-wizards/space-station-14/issues/6537
Closes https://github.com/space-wizards/space-station-14/issues/9579
2022-11-08 13:18:21 +11:00
corentt
4159638300
Disable gamemode vote if only one available ( #11915 )
...
* disable vote on condition
* move to new method
* still allow vote if current mode is different from available
2022-10-14 23:10:10 -05:00
Moony
efdc3bc7e0
Gimps the restart vote. ( #9327 )
...
* Disables the restart vote when admins are online.
* Gimps the restart vote so it requires 85% agreement.
* address rebiew
2022-07-01 02:52:20 -05:00
Pieter-Jan Briers
5142df1d87
Vote commands completions. ( #8758 )
2022-06-12 16:52:23 -07:00
Pancake
ab860c04b6
Update VoteCommands.cs ( #8729 )
2022-06-12 12:57:47 +10:00
Putnam3145
29bc6bf552
Allow game presets to have min/max players ( #8327 )
...
Co-authored-by: Vera Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
2022-05-21 20:55:19 -07:00
metalgearsloth
bb09d0ddc4
Restart vote is now actually passable ( #8194 )
2022-05-16 13:33:14 +10:00
