Commit graph

4051 commits

Author SHA1 Message Date
Vigers Ray
6dd8e2c326 фикс ширины названий в окне выбора антагонистов 2024-06-09 01:26:58 +03:00
Vigers Ray
d7b054c032 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
2024-06-09 00:50:47 +03:00
VigersRay
46ebf102ce фикс ттса 2024-06-09 00:27:16 +03:00
Leon Friedrich
7ef7fe6761
Try fix RGBee (#28741) 2024-06-08 20:27:21 +10:00
Leon Friedrich
2c7598fd5b
Fix flatpacker (#28736)
* Fix flatpacker

* a
2024-06-08 18:48:23 +10:00
DrSmugleaf
0762f9da17
Fix action icons when dragging an active action to another slot (#28692) 2024-06-07 22:34:48 -07:00
Plykiya
d19b430a92
Swap some InRangeUnobstructed for InRangeUnoccluded (#28706)
Swap InRangeUnobstructed to InRangeUnoccluded

Co-authored-by: plykiya <plykiya@protonmail.com>
2024-06-07 20:57:07 -04:00
AJCM-git
63e0ee08cb
Fixes client having authority over rules popup cvars (#28655)
* Fixes client having authority over rules popup cvars

* Delete duplicate migration

* Pre-update

* Post-update
2024-06-07 21:53:20 +02:00
VigersRay
c01034d336 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
2024-06-07 20:16:41 +03:00
Vigers Ray
f0e4dca059
Нижнее белье (#42)
* Нижнее белье

* упс

* ограничение на пол для белья

* чейнжлог
2024-06-07 20:12:45 +03:00
Leon Friedrich
b632a65385
Add JobRequirementOverride prototypes (#28607)
* Add JobRequirementOverride prototypes

* a

* invert if

* Add override that takes in prototypes directly
2024-06-07 09:43:02 -07:00
VigersRay
f5911d8eac Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-06-07 16:37:58 +03:00
AJCM-git
accf8adf97
Fixed the guidebook listing every single rule (#28680)
* Well i tried this way

* New approach (start)

* Did it

* makes spacelaw available, put it under sec
2024-06-07 06:28:55 -05: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
Vigers Ray
eef1472e53
Секрет в голосовании за карту. Автоматическое голосование в конце раунда (#36)
* Секрет в голосовании за карту

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

* чейнжлог
2024-06-07 11:25:19 +03:00
pacable
a731e5016c
Собачье зрение и его трейт (#32)
* Adds dogvision to game

* Added DogVision to vulps, corgi, walter and mcgriff

* changelog

* locale fix + added category

* Buffed vulps

* Removed dog vision from vulps, nerfed eyesight

---------

Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2024-06-07 11:14:54 +03:00
Vigers Ray
72affc5f7a
Очередь озвучки анонсов, фиксы багов и оптимизация генерации ттсов. (#35)
* Очередь на озвучку оповещений

* Фикс ошибок клиента и оптимизация ттса

* Укоротил сообщения о кодах

* чейнжлог
2024-06-07 11:04:08 +03:00
Nemanja
b317fa4ccf
Flatpacker fixes (#28417) 2024-06-06 20:55:35 -04: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
Repo
039fd932b2
Fix Admin Object tab sorting and search (#28609) 2024-06-06 02:41:11 -04:00
Chief-Engineer
fea2bc9422
Update rules (#28452) 2024-06-05 19:59:22 -04:00
Nemanja
729e67af7f
Machine-code cleanup (#28489) 2024-06-05 16:23:23 -04:00
VigersRay
5137a7f93c фиксы апстрима 2024-06-05 19:42:05 +03:00
VigersRay
6a29776e4f Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Resources/Prototypes/Maps/oasis.yml
2024-06-05 19:28:35 +03:00
Vigers Ray
ad4b3a2c2c
Удобный монитор камер и портативный мониторинг для детектива. (#25)
* Улучшение мониторинга камер

* Портативный монитор камер для дека

* чейнжлог
2024-06-05 19:27:15 +03:00
Leon Friedrich
adeed705e6
Add Job preference tests (#28625)
* Misc Job related changes

* Add JobTest

* A

* Aa

* Lets not confuse the yaml linter

* fixes

* a
2024-06-06 00:19:24 +10:00
Vigers Ray
21465c02c0
Отображение времени к прибытию эвак шаттла в КПК (#22) 2024-06-05 14:34:36 +03:00
VigersRay
d712594c90 фикс пустого хаба при подключении 2024-06-05 00:00:31 +03:00
c4llv07e
bb6df06823
Add client TTS disable button (#18) 2024-06-04 23:13:11 +03:00
c4llv07e
555ca4110d
Add option to disable sending TTS events to client (#16) 2024-06-04 21:50:59 +03:00
VigersRay
1a359203ce Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Resources/Prototypes/Accents/word_replacements.yml
2024-06-04 21:49:35 +03:00
Hannah Giovanna Dawson
d4fe7eda51
SS14-26964 Clown Waddling Replicates, etc (#26983) 2024-06-04 09:23:09 -04:00
VigersRay
211d39b98b Небольшой скейл окнаServersHub 2024-06-04 11:47:49 +03:00
VigersRay
144ee3c489 Servers Hub Fixes 2024-06-04 10:54:08 +03:00
Vigers Ray
e0566ffa3e
Хаб серверов (#13)
* Хаб серверов внутри игры

* чейнжлог
2024-06-04 10:03:48 +03:00
VigersRay
5f10d21fa6 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Server/Administration/Commands/PlayTimeCommands.cs
#	Content.Server/Preferences/Managers/ServerPreferencesManager.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Content.Server/StationEvents/Events/BreakerFlipRule.cs
#	Content.Shared/Roles/JobPrototype.cs
#	Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
#	Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
#	Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
#	Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
#	Resources/Prototypes/Entities/Mobs/base.yml
#	Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
#	Resources/Prototypes/GameRules/events.yml
#	Resources/Prototypes/Roles/Antags/traitor.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
#	Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
#	Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
#	Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
#	Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
#	Resources/Prototypes/Roles/Jobs/Science/research_director.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
2024-06-04 09:41:27 +03:00
Plykiya
c5ff647ca6
Replace obsolete EntityWhitelist IsValid usages part 2 (#28506) 2024-06-03 17:40:03 -04:00
Ed
a4d1601758
Accent trait limit (#28046) 2024-06-03 14:47:06 -04:00
AJCM-git
619d82ed42
Small code cleanup to health bar (#28554) 2024-06-03 12:22:26 -04:00
AJCM-git
8c10581010
Cleans up StatusIconSystem and fixing some bugs (#28270) 2024-06-03 12:12:21 -04:00
Tayrtahn
0d864d324c
Add support for HeldPrefix to SolutionContainerVisualsSystem (#28532) 2024-06-03 01:12:13 -04:00
AJCM-git
be35a5d369
Header of Gas tank UI screen now fetched from Entity name and local (#28545) 2024-06-02 23:33:30 -04:00
slarticodefast
1283989346
Flash overlay rework and bugfixes (#27369) 2024-06-02 00:17:53 -04:00
eoineoineoin
b44b159431
Replace Matrix3 with System.Numerics.Matrix3x2 (#27443)
Replace Matrix3 with Matrix3x2
2024-06-02 14:07:41 +10:00
Nemanja
21d0b1fd55
Guidebook Tables (#28484)
* PJB's cool table control (it probably doesn't work)

* ok wait wrong file

* Guidebook Tables
2024-06-01 20:58:33 -07:00
Plykiya
d6ba166d3b
Replace obsolete EntityWhitelist IsValid usages (#28465)
* Replace obsolete whitelist is valid with whitelist system

* Consistency

* Fix logic

* Bork

* I figured out how to get whitelists on the client lol

* test fail

* woops

* HELP ME FUNCTIONS

* Fix errors

* simplify

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
2024-06-01 23:10:24 -04:00
DrSmugleaf
29e34cae35
Disable rainbow overlay when reduced motion is enabled (#28496)
Disable rainbow ovelray when reduced motion is enabled
2024-06-01 18:41:06 -07:00
Tornado Tech
21bc3bfa22
Cleans up tag system (#28272)
* Updated tag system

* Added params methods

* Fixed tag integration tests

* Fixed params methods recursion

* Revert has All/Any tag one argument realisation

* Updated tag integration tests

* Shit happens

* Added individual List/HashSet methods, docs, tests
2024-06-02 11:11:19 +10:00
Tornado Tech
07dfefc4a2
Hiding and clearing department prototype code (#28114) 2024-06-01 19:49:34 -04:00