Commit graph

29835 commits

Author SHA1 Message Date
GayBot
db5fc4a292 Automatic changelog update 2024-10-31 18:52:58 +03:00
AverageNotDoingAnythingEnjoyer
7963bb5b41
Обновление карт (#579)
* буп

вех

* Ведущий

1
2024-10-31 18:54:10 +03:00
iertis
c94824dd64
Мини ребаланс цен (#578)
* Мини ребаланс цен

* mp5 15000
2024-10-31 18:53:06 +03:00
SplikZerys
8ee4efeaec Added Halloween maps in mappool 2024-10-31 14:04:52 +03:00
Vigers Ray
850e1774fe фикс дубля центкома 2024-10-31 01:45:16 +03:00
Vigers Ray
f067d25a5b фикс теста для ленивых 2024-10-31 01:45:02 +03:00
Vigers Ray
daf1c5683a Фикс требований для ИИ 2024-10-31 01:35:59 +03:00
Vigers Ray
4684a47a6c фикс PostMapInitTest.cs 2024-10-31 01:35:49 +03:00
Pieter-Jan Briers
ec465a2160 HOTFIX submodule update (#32897)
Update submodule

This fixes an important memory leak.

(cherry picked from commit 73a82d5615)
2024-10-30 21:57:26 +03:00
Vigers Ray
0b08a72b20 попытка 2 2024-10-30 21:13:31 +03:00
Vigers Ray
23606034d2 вупси-пупси 2024-10-30 21:06:04 +03:00
Vigers Ray
fdc4c8c60c Merge remote-tracking branch 'origin/master' 2024-10-30 20:32:34 +03:00
Vigers Ray
0c8a09ce51 Фикс выдачи целей нашим антагам 2024-10-30 20:32:22 +03:00
Rinary
c79517ba71
Исправляет краш сервера при двойной выдаче генокрада. (#574) 2024-10-30 20:26:37 +03:00
GayBot
e5ef1df427 Automatic changelog update 2024-10-30 20:23:46 +03:00
Vigers Ray
4082ffc4bc
Анимации в лобби. Кастомный выбор фона в лобби. (#562)
* Анимации в лобби

* анимации сущностями

* прототипы анимаций
2024-10-30 20:14:26 +03:00
Vigers Ray
91ea0710f3 ладно 2024-10-30 20:10:45 +03:00
Vigers Ray
8e134f6be0 Реворк чайны 2024-10-30 20:10:24 +03:00
Vigers Ray
87b8d5ca87 Правил нет 2024-10-30 18:09:09 +03:00
Vigers Ray
43ae68d795 Эпсилон - конечная 2024-10-30 18:09:02 +03:00
AverageNotDoingAnythingEnjoyer
3f7ad1cf6a
Фиксы обновы (#573)
* 1

1

* валидатор

буп

* Локаль момент

* Reach

* Н-32

* блюмп
2024-10-30 17:33:27 +03:00
Vigers Ray
3851ceaabe Merge remote-tracking branch 'origin/master' 2024-10-30 16:28:54 +03:00
Vigers Ray
482f764be8 брух 2024-10-30 16:28:14 +03:00
Rinary
946fa9a440
fix (#572) 2024-10-30 14:14:38 +03:00
Vigers Ray
4d99e87c62 движок не еби мне мозги 2024-10-30 14:01:04 +03:00
Vigers Ray
34f46ac80c фиксы говцена 2024-10-30 14:00:28 +03:00
Vigers Ray
27827398b9 Merge remote-tracking branch 'origin/master' 2024-10-30 13:28:02 +03:00
Vigers Ray
389ed704e1 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Client/Entry/EntryPoint.cs
#	Content.Client/IoC/ClientContentIoC.cs
#	Content.Server/Administration/Managers/BanManager.cs
#	Content.Server/Chat/Managers/ChatSanitizationManager.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/Traitor/Uplink/UplinkSystem.cs
#	Content.Shared/Interaction/SharedInteractionSystem.cs
#	Content.Shared/Localizations/ContentLocalizationManager.cs
#	Content.Shared/Roles/JobRequirement/DepartmentTimeRequirement.cs
#	Content.Shared/Roles/JobRequirement/OverallPlaytimeRequirement.cs
#	Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs
#	Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
#	Resources/Audio/Ambience/Antag/attributions.yml
#	Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
#	Resources/Locale/en-US/_strings/advertisements/other/firebot.ftl
#	Resources/Locale/en-US/_strings/shuttles/commands.ftl
#	Resources/Prototypes/Datasets/Names/last.yml
#	Resources/Prototypes/Entities/Mobs/Player/silicon.yml
#	Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Roles/Jobs/Science/borg.yml
#	Resources/Prototypes/Shuttles/shuttle_incoming_event.yml
#	Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
#	Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json
#	Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
#	RobustToolbox
2024-10-30 13:26:32 +03:00
SplikZerys
9fb5e51c18
tts corrections (#571) 2024-10-30 13:16:42 +03:00
Vigers Ray
7456d4c48c выключил Crysis2AICostume 2024-10-30 13:11:00 +03:00
Vigers Ray
76ba5b0726 Merge remote-tracking branch 'origin/master' 2024-10-30 13:09:12 +03:00
Vigers Ray
c9fa80e00e фиксы мержа ПРов 2024-10-30 13:08:03 +03:00
GayBot
fbf3f626b8 Automatic changelog update 2024-10-30 12:45:30 +03:00
SplikZerys
cb3d45e12d
TTS VOICES (#570)
* 1

* new tts voices

* correction
2024-10-30 12:45:38 +03:00
Vigers Ray
7e22082d6f Нет страшнее саранчи, старый бог теперь в ыы14 2024-10-30 12:18:49 +03:00
PJBot
fdd713a0f0 Automatic changelog update 2024-10-30 09:16:36 +00:00
Vigers Ray
9883ac2299 +1 трек 2024-10-30 12:16:06 +03:00
Alzore
4b467685b2
Nukie med bundle now costs 24 tc and contains a unique defibrillator (#32720)
* a-few-injectors

* comment

* defib-ops-when
2024-10-30 10:15:30 +01:00
Rinary
b7f5401c91
init (#569) 2024-10-30 11:53:54 +03:00
GayBot
c19481949c Automatic changelog update 2024-10-30 11:45:31 +03:00
Rinary
a65c01471a
Плюшки (#568)
* plushie lu + no PAPICH

* agata

* плюшевый милос-танка

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* locale

---------

Signed-off-by: pacable <igor.mamaev1@gmail.com>
Co-authored-by: pacable <igor.mamaev1@gmail.com>
2024-10-30 11:45:42 +03:00
GayBot
c89653c61d Automatic changelog update 2024-10-30 11:18:11 +03:00
Rinary
3f142392b5
Взрывной ошейник (#567)
* part 1

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* реверт проводки, доработка ошейника, наведение красоты.

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* добавил букет в аплинк отдельно
почистил код

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* review changes

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* review fixes

---------

Signed-off-by: pacable <igor.mamaev1@gmail.com>
Co-authored-by: pacable <igor.mamaev1@gmail.com>
2024-10-30 11:18:20 +03:00
GayBot
adc768477d Automatic changelog update 2024-10-30 11:16:33 +03:00
Rinary
ef4b4ade04
init (#566) 2024-10-30 11:16:56 +03:00
Rinary
fce6f7dc98
Рапира синдиката (#565)
* rapirasyndie

* fix

* fix2

* fix3

* fix4

---------

Co-authored-by: Focstor <111702496+Focstor@users.noreply.github.com>
2024-10-30 11:16:44 +03:00
Rinary
a257fe11aa
init (#564) 2024-10-30 11:06:05 +03:00
GayBot
29ee3b42ab Automatic changelog update 2024-10-30 10:54:40 +03:00
ds_swanson
cc9f091c9d
new reach (#457)
* new reach

* reach.yml

* reach.yml

* reach.yml

* reach.yml

* reach.yml

* Add files via upload

---------

Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2024-10-30 10:54:50 +03:00
GayBot
2a71f67129 Automatic changelog update 2024-10-30 10:52:50 +03:00