Commit graph

32212 commits

Author SHA1 Message Date
KaiserMaus
77efaf282d
Update victory_mine.yml (#1265) 2025-02-05 03:44:50 +03:00
banumbas
244a6f13d8
сас со с арта форбицы (#1266) 2025-02-05 03:44:41 +03:00
Perl404
1614643fda
Исправление перевода взломщика доступа (#1267)
* Исправлен перевод взломщика доступа

* Исправлен перевод взломщика доступа

* Добавлен файл перевода access_breaker
2025-02-05 03:44:31 +03:00
KaiserMaus
045b11b677
HotFix (#1270) 2025-02-05 03:44:22 +03:00
Vigers Ray
22933ed984 фикс ClusterSyndyFlashGrenade и SyndyClusterGrenade 2025-02-05 03:43:36 +03:00
Vigers Ray
044f74822f ы 2025-02-05 03:40:42 +03:00
Vigers Ray
cfbd768f53 ы 2025-02-05 03:40:19 +03:00
Vigers Ray
a9be9f194f ы 2025-02-05 03:11:10 +03:00
Vigers Ray
68b6999a15 ы 2025-02-05 02:44:42 +03:00
Vigers Ray
d4f7edec2c ы 2025-02-05 02:43:01 +03:00
Vigers Ray
0b263f2df9 ы 2025-02-05 02:41:24 +03:00
Vigers Ray
6ae0593dfa ы 2025-02-05 02:30:58 +03:00
Vigers Ray
1902c9ac8f ы 2025-02-05 02:20:20 +03:00
Vigers Ray
5652ab0746 ы 2025-02-05 02:14:49 +03:00
Vigers Ray
626f076072 ы 2025-02-05 02:12:07 +03:00
Vigers Ray
89a90478ba ы 2025-02-05 02:10:07 +03:00
Vigers Ray
519dd00108 ы 2025-02-05 02:04:28 +03:00
Vigers Ray
6132b73682 ы 2025-02-05 02:00:22 +03:00
Vigers Ray
9b1d7aec0f упс 2025-02-05 01:56:52 +03:00
Vigers Ray
74761b9309 Попытка не пытка 2025-02-05 01:39:11 +03:00
Vigers Ray
6bf41664ba красота 2025-02-04 05:40:07 +03:00
Vigers Ray
5173fce419 ы 2025-02-04 05:07:53 +03:00
KaiserMaus
7cfc49447f
авто замена WT550 на Skorpion VZ-61 (#1188)
* Return WT550

* Skorpion VZ-61

* Change M16 to VZ-61

---------

Co-authored-by: Vigers Ray <vigersray@gmail.com>
2025-02-04 05:05:14 +03:00
GayBot
fbb999b54f Automatic changelog update 2025-02-04 04:56:12 +03:00
KaiserMaus
24fde584ba
[HOTFIX] PlasmaStation + Fix Cog Evac (#1237)
* Fix Plasma Spawn

* Fix Emergency Evac Timer

* Fix Cog Timer and APC

---------

Co-authored-by: Vigers Ray <vigersray@gmail.com>
2025-02-04 04:59:32 +03:00
Vigers Ray
2efb92ec22 фиксы линтера 2025-02-04 04:52:12 +03:00
Vigers Ray
4c5854ea7b Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
#	Resources/Audio/Machines/attributions.yml
#	Resources/Locale/en-US/_strings/administration/smites.ftl
#	Resources/Locale/en-US/_strings/reagents/frostoil.ftl
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
#	Resources/migration.yml
2025-02-04 04:18:31 +03:00
Vigers Ray
8de23c502f камбек бедных предателей 2025-02-04 04:13:54 +03:00
Odleer
f9cd5eb60a
Blyazdec (#1196)
* Ибо нехуй

* Дополнил

* Update sunrise_map_attributions.txt

---------

Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2025-02-04 04:09:17 +03:00
GayBot
8bae15e962 Automatic changelog update 2025-02-04 04:03:38 +03:00
KaiserMaus
a8fe366b3f
Случайное Событие Малый Шаттл Пиратов (#1238)
* UnknownPirateShuttle Init

* Пластитан вместо шахтерских
2025-02-04 04:07:00 +03:00
GayBot
fac778db5c Automatic changelog update 2025-02-04 03:59:32 +03:00
banumbas
a956751091
Дарвиний (#1210)
* Был добавлен дарвиний

* мелкие фиксы

* ааа наконец та

* Исправил ошибки, добавил вульп и фелинидов.

* багфикс ошибки в консоли

* фикс перевода и линтера

* заебало чё то

* фелиниды ликвидированы.

* Update cargo_medical.yml

---------

Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2025-02-04 04:02:55 +03:00
GayBot
6494ddeac4 Automatic changelog update 2025-02-04 03:57:02 +03:00
KaiserMaus
b096a56de0
Fix Texture Triple (#1227) 2025-02-04 04:00:24 +03:00
Kendrick
4cf9109476
BSKendrick (#1228) 2025-02-04 04:00:05 +03:00
Shiranuy
736244a95a
Кластерная минибомба и кластерная флешка под видом связки минибомб синдиката (#1230)
* Add Cluster SyndyFlash Grenade

* Add Cluster SyndyFlash grenade 'Godkiss'

* Добавил настоящую кластерку в аплинк

* описания перепутал

---------

Co-authored-by: Shiranuy <yudochkin987@mail.ru>
2025-02-04 03:59:49 +03:00
Kendrick
003ef31104
ImplantFix (#1231) 2025-02-04 03:59:26 +03:00
GayBot
bc411de570 Automatic changelog update 2025-02-04 03:54:19 +03:00
GayBot
53e0d903b8 Automatic changelog update 2025-02-04 03:53:11 +03:00
KaiserMaus
578fdbbea3
[Балансировка] Дробовики (#1232)
* ShotGun Tweaks

* Sawn TrenchGun

* forgen about 1014

* Тренчган в шкафчиках вместо Каммера

* Fix
2025-02-04 03:57:32 +03:00
KaiserMaus
2ab5b28c27
Пиратский Мех и Баллончик краски под него (#1234)
* Pirate

* Event

* Revert Hardsuit and Fix Locale

* Pirate Mech Big Yarrk

* Revert "Event"

This reverts commit 1030415db9a59bf18d6f77547c1f95186c4de49c.

* Revert "Pirate"

This reverts commit 062238d6fe49f4cfc735977cf325f0b850a978b0.

* Revert "Revert Hardsuit and Fix Locale"

This reverts commit 2f546cdd7ab3f9814889d89172d97574556d35a9.

* Лишнее

* Locale

* Fix WhiteList Guns

* Oops

* Spawner
2025-02-04 03:56:28 +03:00
Kendrick
3322bb06ad
KendrickTurtleneck (#1239) 2025-02-04 03:55:33 +03:00
KaiserMaus
6564e74a48
Fix and Tweaks (#1243) 2025-02-04 03:55:24 +03:00
KaiserMaus
8a3a60a247
Lathe MechPaint (#1244) 2025-02-04 03:55:11 +03:00
Kendrick
a45cb8e2d6
GaloshesKendrick (#1245) 2025-02-04 03:54:43 +03:00
KaiserMaus
eb4f1b0085
Low Pop edition (#1253) 2025-02-04 03:54:23 +03:00
GayBot
76df730776 Automatic changelog update 2025-02-04 03:43:51 +03:00
KaiserMaus
165d42acd1
Nerf Incendiary and Rubber (#1255) 2025-02-04 03:47:12 +03:00
GayBot
4b36ef0e21 Automatic changelog update 2025-02-04 03:40:41 +03:00