Vigers Ray
041663e3fc
Пацификатор ( #58 )
...
* Пацификатор
* перевод
2024-06-11 04:02:15 +03:00
Vigers Ray
26123b34e1
Фикс TtsMultiplier
2024-06-10 16:56:58 +03:00
Vigers Ray
95e12f45e1
фикс SRLateJoinGui
2024-06-10 16:41:57 +03:00
Vigers Ray
41bdc13a16
Убрал ненужный логгинг
2024-06-10 15:05:23 +03:00
Vigers Ray
b660580cd7
Переименовал лейтджоин фронтира на лейтджоин СР для избежания конфликтов
2024-06-10 14:53:15 +03:00
Vigers Ray
33e91b2512
Merge remote-tracking branch 'refs/remotes/wizards/master'
2024-06-10 01:17:06 +03:00
Vigers Ray
d734c85266
Окно позднего присоединения с фронтира
2024-06-10 01:14:24 +03:00
Hannah Giovanna Dawson
1bb9d9451f
Panic Bunker uses minutes not hours ( #28805 )
...
* Panic Bunker uses minutes not hours
* Fixing an instance of hours
2024-06-09 22:45:47 +02:00
Nemanja
50d83b9360
Cap scramble tag ( #28804 )
2024-06-09 16:01:05 -04:00
Vigers Ray
19ff7831b6
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Server/Connection/ConnectionManager.cs
# Resources/ServerInfo/Guidebook/Cargo/Cargo.xml
# Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml
# Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
# Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml
# Resources/ServerInfo/Guidebook/SpaceStation14.xml
2024-06-09 22:32:37 +03:00
Julian Giebel
de07c291de
Implement map text ( #28705 )
2024-06-09 15:18:54 -04:00
Hannah Giovanna Dawson
3ceb92a0c4
SS14-28662 Add Baby Jail: a Jail for Babies (inverse panic bunker) ( #28763 )
2024-06-09 14:58:10 -04:00
Vigers Ray
48312aa29b
фикс ползунков ТТСа (очередной)
2024-06-09 20:24:37 +03:00
AJCM-git
346ac44a28
Open the guidebook when people with less than an hour playing join the round ( #28774 )
...
* Open the guidebook when people with less than an hour playing join the round
* Filter for gameplayState
* Fix tests
* tweaks
* saltern update (#28773 )
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Fix admin menu objects list (#28787 )
* Make `MakeAntag()` log errors instead of throwing exceptions (#28771 )
Make `MakeAntag()` log errors instead of throw
* add default page support for the guidebook (#28772 )
* Probably a better way to handle this
---------
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2024-06-09 12:26:48 -04:00
Nemanja
c549573f7a
add default page support for the guidebook ( #28772 )
2024-06-09 11:55:21 -04:00
Vigers Ray
de1e769c75
Merge remote-tracking branch 'refs/remotes/wizards/master'
2024-06-09 17:20:07 +03:00
Leon Friedrich
8d52f6b617
Fix admin menu objects list ( #28787 )
2024-06-09 09:51:02 -04:00
Vigers Ray
cd9c52d3b4
чейнжлог и еще фикс ттс
2024-06-09 06:29:43 +03:00
Vigers Ray
ccf8bd6d1f
фикс спонсорских лоадаутов
2024-06-09 05:38:24 +03:00
Vigers Ray
b851589937
фикс громкости ТТС
2024-06-09 05:26:37 +03:00
Vigers Ray
7c9680e7a2
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
# Resources/ServerInfo/Guidebook/Cargo/Cargo.xml
# Resources/ServerInfo/Guidebook/Controls/Radio.xml
# Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
# Resources/ServerInfo/Guidebook/Jobs.xml
# Resources/ServerInfo/Guidebook/Medical/Chemist.xml
# Resources/ServerInfo/Guidebook/Medical/Medical.xml
# Resources/ServerInfo/Guidebook/Medical/MedicalDoctor.xml
# Resources/ServerInfo/Guidebook/Science/Science.xml
# Resources/ServerInfo/Guidebook/Security/Security.xml
# Resources/ServerInfo/Guidebook/Service/Bartender.xml
# Resources/ServerInfo/Guidebook/Service/Chef.xml
# Resources/ServerInfo/Guidebook/SpaceStation14.xml
# Resources/ServerInfo/Guidebook/Survival.xml
2024-06-09 03:03:59 +03:00
Rinary
5d34b76518
Отображение даты в КПК ( #47 )
...
* Vulpkanin Lang Fix
* Date time add
* Time System
* Something fixes
2024-06-09 02:59:06 +03:00
Tayrtahn
5f91c3f27f
Strip markdown from silicon laws before saying them ( #28596 )
2024-06-09 09:57:07 +10:00
Vigers Ray
c1e35df808
Поддержка спонсорских лоадаутов
2024-06-09 02:42:34 +03:00
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
