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 |
|
Rinary
|
b6920aec99
|
Рефактор мехов, правки в системе медицины (#507)
* mech system, fix hands, fix fraction
* fix
* fix fake hypo
* fix triple airlocks big sizing
* fix
* upd clown hulk
* xd fix 2
* bigger exit delay
* mechs reflect changes
* guns changes
* draike up
* mechs in another category
* add equipment
* Revert "upd clown hulk"
This reverts commit b8084967040be5d442b2d4770cf7fdece1daa2a8.
* SPIN MY MECH ASS
* mech no rot
* some resprite
* no injections in hardsuits
* some species can not be injectable
* medipans can ignore armor, admeme hypospray ignore armor
* fix
* fix admeme hypo
* mob fraction fix
* rover + nt gygax add
* fix description
* fix id
* some better dome effects
* если пустая гильза в стволе -> Кнопки "казнь" не будет
* phazon added
* fix server crashes
* full rework mechs on mobstates, coils fix mechs, diagnostic hud show health bar for mechs, mechs fastest repair, add mech analyzer
* some fixes
* configure health of all mechs
* upd
* add rover to uplink
* translate bundle
* change price
* phazon construction
* fix
* fix
* Finish phazon construction
* add phazon research and recipes
* phazon construction translate
* fix
* Mech lights
* fix
* translate light action
* Mech sounds, fix damage
* fix
* fix hello sound
* upd
* fix linter
* change damagePercentage
* fix
* fix hello sound
* temp disable damage sounds
* fix battery needed on construct
* some changes
* add mech painting system as DEBUG(in dev)
* Fix yaml, durand paintings
* mech spray cans textures
* change sprite
* fix
* ripley, clarke new textures
* ripley,clarke paints
* fix
* sec pod texture
---------
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
|
2024-10-30 10:53:00 +03:00 |
|
GayBot
|
ca06f79c39
|
Automatic changelog update
|
2024-10-30 10:51:12 +03:00 |
|
AverageNotDoingAnythingEnjoyer
|
f07b4f0e9f
|
₲ɆⱠ₮₳ (#561)
* Проклятие 220
* weh
* weh 2
electric boogaloo
* Уэ
Пупупу
* fixgridatmons and barber
* Добавлен коментарий прототипа в пул
---------
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
|
2024-10-30 10:51:19 +03:00 |
|
GayBot
|
16fe883775
|
Automatic changelog update
|
2024-10-30 10:49:37 +03:00 |
|
AverageNotDoingAnythingEnjoyer
|
42203c57ff
|
Train правки (#557)
* 1
1
* Биогенератор и доступы парикмахера
* Мультитул момент
|
2024-10-30 10:49:47 +03:00 |
|
Rinary
|
de3af810f7
|
init (#556)
|
2024-10-30 10:49:32 +03:00 |
|
GayBot
|
1bb721b309
|
Automatic changelog update
|
2024-10-30 10:47:53 +03:00 |
|
GayBot
|
fb1e5331d6
|
Automatic changelog update
|
2024-10-30 10:46:46 +03:00 |
|
Rinary
|
8f7137e2cd
|
Исправление и доработка голосований (#555)
* init
* откат генокрадов
* from Delay to Update
|
2024-10-30 10:47:59 +03:00 |
|
Rinary
|
1738ea88dd
|
Новый костюм карго (#553)
* init
* fix и
* unathi version
|
2024-10-30 10:46:56 +03:00 |
|
iertis
|
5d5bd2cd4b
|
Обновление ролей (#552)
|
2024-10-30 10:45:59 +03:00 |
|
iertis
|
fe62f008a3
|
Пофиксил халаты (#551)
|
2024-10-30 10:45:26 +03:00 |
|
Rinary
|
2b9a3507f3
|
Новые карты (#549)
* cog + oasis
* upd
|
2024-10-30 10:45:09 +03:00 |
|
haiwwkes
|
8987a12177
|
ban links. (#548)
|
2024-10-30 10:44:32 +03:00 |
|
DragonDidlo
|
f0bde5ea0c
|
Понизил порог выключения вентиляций от давления (#547)
* Понизил порог выключения вентиляций из-за давления
* # Sunrise-Edit
* Update unary.yml
---------
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
|
2024-10-30 10:44:13 +03:00 |
|
PJBot
|
827d00eb18
|
Automatic changelog update
|
2024-10-30 07:42:56 +00:00 |
|
GayBot
|
c90d28135b
|
Automatic changelog update
|
2024-10-30 10:41:51 +03:00 |
|
haiwwkes
|
99851de785
|
ayo (#545)
|
2024-10-30 10:42:02 +03:00 |
|
Alzore
|
6834bc1fbd
|
Add 3 bottle boxes to nanomed plus (#33018)
three bottle boxes in nanomed plus
|
2024-10-30 01:41:51 -06:00 |
|
PJBot
|
0f1e11c356
|
Automatic changelog update
|
2024-10-30 07:41:40 +00:00 |
|
haiwwkes
|
04cd32c960
|
fix phys on shuttles (#543)
|
2024-10-30 10:41:30 +03:00 |
|
Rinary
|
10a97605a1
|
init (#542)
|
2024-10-30 10:41:17 +03:00 |
|
AverageNotDoingAnythingEnjoyer
|
4e2789917b
|
weh (#540)
weh
|
2024-10-30 10:40:42 +03:00 |
|
Alzore
|
010638d0e9
|
Make the security belt contain more useful items by default (#32291)
* replace tear gas and flashbang with holobarrier and sec radio
* holobarrier-belt-fix
|
2024-10-30 01:40:33 -06:00 |
|
haiwwkes
|
66bc5d336f
|
fix (#536)
|
2024-10-30 10:40:28 +03:00 |
|
haiwwkes
|
382918757a
|
fix (#535)
|
2024-10-30 10:40:13 +03:00 |
|