Commit graph

31137 commits

Author SHA1 Message Date
Vigers Ray
8a7dc1d8d2 Увы 2024-12-23 20:58:07 +03:00
Vigers Ray
9a0f28e893 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
2024-12-23 20:56:04 +03:00
GayBot
637109780e Automatic changelog update 2024-12-23 20:42:50 +03:00
KaiserMaus
d44bda4be7
Ert uplink (#901)
* ERT Amber

* Краски в техи и доработка Визора ОБР

* Update

* Debuff mech

* Mech Fix. Chang Fix

* Change

* Debuff

* 1st Phase

* Hmmm

* New Icons

* ERT

* Heat to SecHard + Raid-Amber Suit Eva

* Few Locale + fix EVA Amber

* Fix

* merge

* EVA Engi head

* Locale 02

* Locale 3

* ERT Borg

* Fix

* fix 1984

* Ha ha..No

* Fix Cringe

* Update
2024-12-23 20:46:29 +03:00
Vigers Ray
b56448c3b6
Обновление спонсорской системы (#905)
* Апдейт спонсорки

* Доработка апдейта

* упс
2024-12-23 20:45:39 +03:00
PJBot
38bd2e5c1c Automatic changelog update 2024-12-23 14:25:20 +00:00
mubururu_
4ddd7d3c5f
silent footsteps for ninja (#33280)
* waow

* nice suggestion

* nullable sound

* fix stuff

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-12-23 15:24:09 +01:00
slarticodefast
c873f90f6b
Train: fix problematic atmos setup (#34018)
fix atmos setup
2024-12-22 13:41:35 -07:00
ScarKy0
f28c8127e2
Localized holopads for Box (#34011)
I love holopads
2024-12-22 12:56:30 -07:00
GayBot
1da8f170d0 Automatic changelog update 2024-12-22 22:10:36 +03:00
Babaev
a52a2ad48c
фикс лимита (#903) 2024-12-22 22:14:11 +03:00
Odleer
eafe35294e
BOOOOX (#904) 2024-12-22 22:14:02 +03:00
Pieter-Jan Briers
1450c4cade
Specify privacy policy for Wizard's Den (#34013) 2024-12-22 17:12:37 +01:00
slarticodefast
2ff8238030
Merge stable into master (#34008) 2024-12-22 14:38:39 +01:00
Errant
3358801b42
2024-12-20 Release "HoLoopad Holiday" (#34007) 2024-12-22 09:21:53 +01:00
Errant
58181c3412
adjust eshotgun recharge delay (#33996) 2024-12-22 09:02:55 +01:00
AverageNotDoingAnythingEnjoyer
c71c9bc2aa
boom (#900) 2024-12-22 01:54:27 +03:00
Vigers Ray
d03dbf43fb фикс пвн и визора ниндзи 2024-12-22 01:52:00 +03:00
Vigers Ray
9720362f3e чажелог 2024-12-21 20:14:52 +03:00
Vigers Ray
23b00ae5a2 фикс меты 2024-12-21 20:13:46 +03:00
Vigers Ray
0e0aa04d11 Фикс IsCommandStaff 2024-12-21 20:12:38 +03:00
AverageNotDoingAnythingEnjoyer
d9edd558f1
Real (#897) 2024-12-21 19:51:08 +03:00
Vigers Ray
6bd2ed8d33 фиксы апстрима 2024-12-21 19:38:17 +03:00
Vigers Ray
0619ac9206 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	.github/workflows/build-test-debug.yml
#	Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs
#	Content.Server/Zombies/ZombieSystem.cs
#	Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
#	Resources/Locale/en-US/_strings/atmos/gases.ftl
#	Resources/Locale/en-US/_strings/components/atmos-monitoring-component.ftl
#	Resources/Locale/en-US/_strings/tools/components/tool-component.ftl
#	Resources/Prototypes/Entities/Mobs/Player/silicon.yml
#	Resources/Prototypes/Research/industrial.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/Prototypes/ai_factions.yml
#	Resources/toolshedEngineCommandPerms.yml
2024-12-21 18:51:37 +03:00
GayBot
3f2f9653d7 Automatic changelog update 2024-12-21 18:24:36 +03:00
AverageNotDoingAnythingEnjoyer
9503ae48c7
Lawyer moment (#898) 2024-12-21 18:28:18 +03:00
GayBot
d6d90ed901 Automatic changelog update 2024-12-21 18:19:58 +03:00
AverageNotDoingAnythingEnjoyer
80627d1697
Пау (#896)
* Пау

* О, вы из англии
2024-12-21 18:23:40 +03:00
GayBot
a5c55397ed Automatic changelog update 2024-12-21 18:14:27 +03:00
GayBot
3bf7610742 Automatic changelog update 2024-12-21 18:13:20 +03:00
AverageNotDoingAnythingEnjoyer
90dc36f704
бум (#895) 2024-12-21 18:18:04 +03:00
AverageNotDoingAnythingEnjoyer
93e4400126
begone [ ] (#894) 2024-12-21 18:17:02 +03:00
Babaev
28641c657b
Фикс Ночного зрения и ПНВ (#893)
* отсоси

* Update NightVisionDeviceSystem.cs
2024-12-21 18:15:58 +03:00
GayBot
cce7e23dac Automatic changelog update 2024-12-21 18:10:49 +03:00
haiwwkes
be1efa2a81
a (#892) 2024-12-21 18:15:24 +03:00
DragonDidlo
cc21d66904
IdConsole_add_roles (#890) 2024-12-21 18:14:30 +03:00
Babaev
c8926e230e
Update GameTicker.GamePreset.cs (#888) 2024-12-21 18:12:21 +03:00
Babaev
3fc9fcf62a
Update LobbyUIController.cs (#886) 2024-12-21 18:09:56 +03:00
Babaev
05810f9aa6
fix (#885) 2024-12-21 18:09:29 +03:00
GayBot
dbe00fab3c Automatic changelog update 2024-12-21 18:02:52 +03:00
DragonDidlo
9118217bce
Доступы для Мехов и Патрульный Под (#883)
* Mech Access and Sec Pod

* fix shit
2024-12-21 18:06:32 +03:00
KaiserMaus
3b13850036
Роли СССП для Ивентов, и их вещи. (#882)
* USSP

* Fix

* AAAa

* AK514

* Трусы!

* No Doc

* Buff USSP armour & Fix

* Elite suit Tweaks

* Change

* Nerf Chainsaw & nerf Cell ERT\Nuke
2024-12-21 18:06:05 +03:00
GayBot
5ce75fbee5 Automatic changelog update 2024-12-21 18:01:05 +03:00
Focstor
8c05a52fdd
Фикс спрайта телескопички (#877)
* fix-telebaton

* fix
2024-12-21 18:04:47 +03:00
GayBot
197b443231 Automatic changelog update 2024-12-21 17:59:49 +03:00
Focstor
43de5e6abc
Фикс рук фелинидов (#876)
* fix_hand_felinid

* fix_hand_demon

* fix

* fix2
2024-12-21 18:03:28 +03:00
KaiserMaus
42d4193372
Охранно-Диагностический Визор (#872)
* ERT Amber

* Краски в техи и доработка Визора ОБР

* Update

* Debuff mech

* Mech Fix. Chang Fix

* Change
2024-12-21 18:02:38 +03:00
PJBot
1abe9db99c Automatic changelog update 2024-12-21 07:03:11 +00:00
Leon Friedrich
7baa1ae070
Update engine to v238.0.0 (#33980) 2024-12-21 18:02:04 +11:00
PJBot
b3551fb000 Automatic changelog update 2024-12-21 06:46:54 +00:00