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
Rinary
5c82638cdb
Удаление дублей в файлах локализации ( #39 )
...
* Vulpkanin Lang Fix
* Remove Double Added Strings in Locale(It's bad)
* More
* Food
* Organs
* End
* Merge?
2024-06-09 00:46:26 +03:00
GimmyPick
af626ce89b
Revert "Prevent stacking pipes ( #28308 )" ( #43 )
...
This reverts commit 44b93e68ee
2024-06-09 00:37:14 +03:00
VigersRay
46ebf102ce
фикс ттса
2024-06-09 00:27:16 +03:00
Tayrtahn
7f686a6ae5
Fix null ref exception in PrayerSystem ( #28712 )
...
* Fix null ref exception in PrayerSystem
* Also check that prayable ent/comp still exist
2024-06-08 14:50:20 -04:00
Nemanja
4089d6a664
fix singulo decay ( #28743 )
2024-06-09 00:36:47 +10:00
nikthechampiongr
8cf9037273
Make freeze, freeze & mute, and unmute verbs work on disconnected players. ( #28664 )
2024-06-08 20:40:33 +10:00
Leon Friedrich
2c7598fd5b
Fix flatpacker ( #28736 )
...
* Fix flatpacker
* a
2024-06-08 18:48:23 +10:00
DrSmugleaf
a7c7cd74ec
Fix DamageOtherOnHit.OnDoHit when the target is terminating or deleted ( #28690 )
2024-06-08 15:53:54 +10:00
Lyndomen
1584a50a1d
Dropping Corpses Devoured by Space Dragons on Gib/Butcher. ( #28709 )
...
* Update DevourSystem.cs
* Update DevourSystem.cs
* Update Content.Server/Devour/DevourSystem.cs
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-06-08 15:49:42 +10:00
DrSmugleaf
7f1933169e
Add DoPopup data field to OnUseTimerTrigger ( #28691 )
2024-06-07 22:36:29 -07:00
Flareguy
f37060fc1b
Ports the singularity's values from vgstation ( #28720 )
...
* ports the singularity values from vgstation
* guidebook fix
* 5000 energy level 6 singulo
2024-06-07 22:15:13 -04: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
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
d600e36278
Паралакс из станции корвакса
2024-06-07 11:43:34 +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
Vigers Ray
eef1472e53
Секрет в голосовании за карту. Автоматическое голосование в конце раунда ( #36 )
...
* Секрет в голосовании за карту
* Автоматическое голосование за карту в конце раунда
* чейнжлог
2024-06-07 11:25:19 +03:00
Vigers Ray
72affc5f7a
Очередь озвучки анонсов, фиксы багов и оптимизация генерации ттсов. ( #35 )
...
* Очередь на озвучку оповещений
* Фикс ошибок клиента и оптимизация ттса
* Укоротил сообщения о кодах
* чейнжлог
2024-06-07 11:04:08 +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
Plykiya
dec1c281a8
Internals are kept on as long as any breathing tool is on ( #28595 )
2024-06-06 03:01:45 -04:00
Tayrtahn
d71b88a747
Add support for LocalizedDatasets to RandomMetadata ( #28601 )
2024-06-06 02:37:49 -04:00
Nemanja
729e67af7f
Machine-code cleanup ( #28489 )
2024-06-05 16:23:23 -04: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
ShadowCommander
f933922c9e
Add logs that provide session to player admin logs ( #28628 )
2024-06-06 00:19:54 +10: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
3fffebca49
Merge remote-tracking branch 'refs/remotes/wizards/master'
2024-06-05 13:15:24 +03:00
VigersRay
72021fb4d9
КПБ больше не задыхаются
2024-06-05 12:26:14 +03:00
Vigers Ray
e838e56ca8
AlwaysUseSpawner и фикс спавна ролей без спавнеров ( #20 )
2024-06-05 12:08:54 +03:00
Plykiya
41549db282
Remove obsolete VisibilitySystem functions ( #28610 )
...
Remove obsolete visibility functions
Co-authored-by: plykiya <plykiya@protonmail.com>
2024-06-05 17:04:31 +10:00
VigersRay
650b5a8164
фиксы апстрима
2024-06-04 23:32:53 +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
blueDev2
0e93d13cb7
Microwave recipes now uses stacktype id instead of entity prototype id for stacked entities ( #28225 )
2024-06-04 13:12:01 -04:00
icekot8
627187988e
hand teleport portals now may start in the same grid. ( #28556 )
2024-06-04 12:34:07 -04:00
Moony
71a6e60818
Revert "Buff the AME until somebody fixes engineering" ( #28419 )
2024-06-04 07:59:33 -08:00
Kevin Zheng
d5019cee96
Add CVar to disable pow3r parallel processing ( #28488 )
...
* Add CVar to disable pow3r parallel processing
* Cache CVar value
* Fix pointyhat
* Move all CVar-ing to Content.Server
2024-06-04 16:54:22 +02:00
Hannah Giovanna Dawson
d4fe7eda51
SS14-26964 Clown Waddling Replicates, etc ( #26983 )
2024-06-04 09:23:09 -04:00
deltanedas
a3a1538d32
move gamerule components to shared ( #28572 )
...
* move MinMax to shared
* cleanup MinMax
* move other ticking components to shared just because
* remove unused prototype file
* update everything to use shared components
* test
* test 2
* test 3
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-06-04 21:53:24 +10: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
1196e55256
Фиксы апстрима
2024-06-04 09:52:26 +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
deltanedas
16b3fb1204
LoadMapRule grid storage rework ( #28210 )
...
*
2024-06-03 20:04:19 -04:00
Mr. 27
7d22897d02
Job starting gear is now defined in the starting gear rather than backpack prototypes ( #27605 )
...
*
2024-06-03 19:52:15 -04:00
Verm
2ae5c953de
Humans can no longer honk on command ( #28566 )
...
* Humans can no longer honk on command
* Undo change it emote file
* I hate tabs
* Some comments
2024-06-04 01:45:00 +02:00
