Commit graph

32246 commits

Author SHA1 Message Date
Vigers Ray
94fc2beffa долбоеб 2025-02-08 02:39:02 +03:00
Vigers Ray
3097bdc507 Merge remote-tracking branch 'origin/master' 2025-02-06 22:25:59 +03:00
Vigers Ray
2e9eb2f9d6 ыыыыы 2025-02-06 22:21:58 +03:00
Vigers Ray
f457dab365
Update issue templates 2025-02-06 21:36:43 +03:00
Vigers Ray
579543a354
Create FUNDING.yml 2025-02-06 19:52:58 +03:00
Vigers Ray
d2ebb07147 Merge remote-tracking branch 'origin/master' 2025-02-06 19:46:32 +03:00
Vigers Ray
13ef6c3178 ы 2025-02-06 19:43:38 +03:00
Vigers Ray
edbf9bba65
Update issue_report.md (#1293) 2025-02-06 19:23:43 +03:00
Vigers Ray
eef3a716b6
Update toolshed-feature-request.md 2025-02-06 19:21:56 +03:00
GayBot
59f04699c3 Automatic changelog update 2025-02-05 21:57:44 +03:00
KaiserMaus
6bdf04cc09
Большой Ребаланс Огнестрела (#1280)
* Size 2

* Fix

* Nerf This!

* На потом хи хи

* SIze 2

* ERT uplink rebalance | Fix

* Prepare to hell Antimat Cannon

* 100%  Щастя СБ

* fix locale

* Магнумы ребаланс

* Fix linter

* 127  BOLT rifle now Semi

* Больше Пиу Пиу Нюкерам, больше весёлья
2025-02-05 22:01:04 +03:00
Vigers Ray
f3cc86b895 Скрывать департаменты без ролей 2025-02-05 20:15:06 +03:00
Vigers Ray
2fd40bd115 нерф милиардов на хилиуме 2025-02-05 19:04:32 +03:00
Vigers Ray
ad05977eba ы 2025-02-05 18:42:02 +03:00
GayBot
6682cfafe3 Automatic changelog update 2025-02-05 18:14:59 +03:00
KaiserMaus
a8492af0c3
Хитскан Пули имеют ниже урон (#1279)
* Hit Scan Bullet

* Magnum
2025-02-05 18:18:20 +03:00
Odleer
89ee4f13c7
Update box.yml (#1277) 2025-02-05 18:05:03 +03:00
Vigers Ray
92199e3df7 фиксы апстрима 2025-02-05 05:27:15 +03:00
Vigers Ray
a96927db77 ыыы 2025-02-05 05:16:49 +03:00
Vigers Ray
4546b7d257 Наворотили оффы говна с коробками патронов 2025-02-05 05:16:16 +03:00
Vigers Ray
2e3945004b Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Server/Traitor/Uplink/UplinkSystem.cs
#	Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/icon.png
#	Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/meta.json
#	Resources/Textures/Objects/Storage/boxes.rsi/beaker.png
#	Resources/Textures/Objects/Storage/boxes.rsi/bodybags.png
#	Resources/Textures/Objects/Storage/boxes.rsi/bottle.png
#	Resources/Textures/Objects/Storage/boxes.rsi/box.png
#	Resources/Textures/Objects/Storage/boxes.rsi/box_hug.png
#	Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom.png
#	Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom_big.png
#	Resources/Textures/Objects/Storage/boxes.rsi/box_olive.png
#	Resources/Textures/Objects/Storage/boxes.rsi/box_science.png
#	Resources/Textures/Objects/Storage/boxes.rsi/box_security.png
#	Resources/Textures/Objects/Storage/boxes.rsi/boxwide.png
#	Resources/Textures/Objects/Storage/boxes.rsi/boxwidetoy.png
#	Resources/Textures/Objects/Storage/boxes.rsi/candle.png
#	Resources/Textures/Objects/Storage/boxes.rsi/circuit.png
#	Resources/Textures/Objects/Storage/boxes.rsi/clown.png
#	Resources/Textures/Objects/Storage/boxes.rsi/darts.png
#	Resources/Textures/Objects/Storage/boxes.rsi/disk.png
#	Resources/Textures/Objects/Storage/boxes.rsi/emergencytank.png
#	Resources/Textures/Objects/Storage/boxes.rsi/encryptokey.png
#	Resources/Textures/Objects/Storage/boxes.rsi/evidence_markers.png
#	Resources/Textures/Objects/Storage/boxes.rsi/extendedtank.png
#	Resources/Textures/Objects/Storage/boxes.rsi/flare.png
#	Resources/Textures/Objects/Storage/boxes.rsi/flashbang.png
#	Resources/Textures/Objects/Storage/boxes.rsi/forensic.png
#	Resources/Textures/Objects/Storage/boxes.rsi/glasses.png
#	Resources/Textures/Objects/Storage/boxes.rsi/handcuff.png
#	Resources/Textures/Objects/Storage/boxes.rsi/headset.png
#	Resources/Textures/Objects/Storage/boxes.rsi/heart.png
#	Resources/Textures/Objects/Storage/boxes.rsi/holo.png
#	Resources/Textures/Objects/Storage/boxes.rsi/implant.png
#	Resources/Textures/Objects/Storage/boxes.rsi/inflatable.png
#	Resources/Textures/Objects/Storage/boxes.rsi/internals.png
#	Resources/Textures/Objects/Storage/boxes.rsi/latex.png
#	Resources/Textures/Objects/Storage/boxes.rsi/light.png
#	Resources/Textures/Objects/Storage/boxes.rsi/lightmixed.png
#	Resources/Textures/Objects/Storage/boxes.rsi/lighttube.png
#	Resources/Textures/Objects/Storage/boxes.rsi/magazine.png
#	Resources/Textures/Objects/Storage/boxes.rsi/meson.png
#	Resources/Textures/Objects/Storage/boxes.rsi/meta.json
#	Resources/Textures/Objects/Storage/boxes.rsi/mousetraps.png
#	Resources/Textures/Objects/Storage/boxes.rsi/nitrile.png
#	Resources/Textures/Objects/Storage/boxes.rsi/omegacart.png
#	Resources/Textures/Objects/Storage/boxes.rsi/pda.png
#	Resources/Textures/Objects/Storage/boxes.rsi/pillbox.png
#	Resources/Textures/Objects/Storage/boxes.rsi/sechud.png
#	Resources/Textures/Objects/Storage/boxes.rsi/shellbeanbag.png
#	Resources/Textures/Objects/Storage/boxes.rsi/shellflare.png
#	Resources/Textures/Objects/Storage/boxes.rsi/shellflash.png
#	Resources/Textures/Objects/Storage/boxes.rsi/shellincendiary.png
#	Resources/Textures/Objects/Storage/boxes.rsi/shelllethal.png
#	Resources/Textures/Objects/Storage/boxes.rsi/shellpractice.png
#	Resources/Textures/Objects/Storage/boxes.rsi/shellslug.png
#	Resources/Textures/Objects/Storage/boxes.rsi/shelltoy.png
#	Resources/Textures/Objects/Storage/boxes.rsi/solution_trays.png
#	Resources/Textures/Objects/Storage/boxes.rsi/sterile.png
#	Resources/Textures/Objects/Storage/boxes.rsi/swab.png
#	Resources/Textures/Objects/Storage/boxes.rsi/syringe.png
#	Resources/Textures/Objects/Storage/boxes.rsi/trashbag.png
#	Resources/Textures/Objects/Storage/boxes.rsi/vials.png
#	Resources/Textures/Objects/Storage/boxes.rsi/writing.png
#	Resources/Textures/Objects/Storage/boxes.rsi/writing_of_doom.png
#	Resources/Textures/Objects/Storage/boxes.rsi/ziptie.png
#	Resources/migration.yml
2025-02-05 04:48:05 +03:00
Vigers Ray
8546ebf720 ы 2025-02-05 04:45:07 +03:00
Vigers Ray
a901adcab1 ы 2025-02-05 04:44:47 +03:00
Vigers Ray
23845557bc ы 2025-02-05 04:02:41 +03:00
GayBot
93bfc1c1bc Automatic changelog update 2025-02-05 03:56:05 +03:00
Odleer
0852b97c8e
БОКС (#1208)
* БОКС

* Update box.yml

* Update box.yml

---------

Co-authored-by: Vigers Ray <vigersray@gmail.com>
2025-02-05 03:59:27 +03:00
Vigers Ray
220c97cd95 полезные и не очень скрипты 2025-02-05 03:55:44 +03:00
Vigers Ray
0354baf6c0 фикс паблиша 2025-02-05 03:55:23 +03:00
GayBot
f5bf9e7361 Automatic changelog update 2025-02-05 03:41:21 +03:00
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
ActiveMammmoth
6a017ef17b
Mind Swap Fix (#33553)
* Stores owned by mind instead of body

* Requested changes, traitor uplink fixed

* Store, listings fixed and now use Entity<MindComponent>

* Removed duplicate code

* test change

* test change 2

* back to mind entityuid

* MilonPL requested minor changes

* ScarKy0 requested changes
2025-02-04 17:25:54 +01:00