Zekins3366
af2b237cbf
linterbleat
2026-02-12 01:17:08 +03:00
Zekins3366
3cdad35d40
linterfix
2026-02-11 23:48:39 +03:00
Zekins3366
b64c3135d7
sponsorsghosts
2026-02-11 23:39:38 +03:00
Gamewar360
755d823b7b
Изменение боргов...опять... ( #307 )
...
* Revert "commit2"
This reverts commit 47e4a1291e .
# Conflicts:
# Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml
* Revert "fix-translate"
This reverts commit 65cd54a703 .
* Reapply "fix-translate"
This reverts commit ab4df3441e .
* Reapply "commit2"
This reverts commit caaab7eb62 .
* tweakborgs-again
* fix
* coolfix
* fix2
2026-02-08 14:35:33 +03:00
Zekins3366
df9d1cc8a2
Merge remote-tracking branch 'upstream/master'
2026-02-08 00:42:32 +03:00
Jerry
49794858f2
Fix Content.Packaging doesn't include secrets into a final server package ( #3502 )
2026-02-07 22:06:45 +05:00
Pok
66d45285fe
Фикс СРП ( #3501 )
2026-02-07 23:32:33 +07:00
Pok
d2ee564b8f
Перенос СРП в Guidebook ( #3499 )
2026-02-06 15:03:25 +07:00
Svist666s
333bc80458
paper fix ( #3492 )
2026-02-05 07:07:16 +07:00
Svist666s
35aebb7de3
Nodecision fix ( #3496 )
2026-02-05 07:05:11 +07:00
Zekins3366
2fc024a47a
da
2026-02-04 19:31:30 +03:00
Zekins3366
479d35387f
novogogodanebydit
2026-02-04 19:25:25 +03:00
Gamewar360
6bf176f889
Чейнжлоги Wega ( #305 )
...
* fix-translate
* commit2
* Revert "commit2"
This reverts commit 47e4a1291e .
* Revert "fix-translate"
This reverts commit 65cd54a703 .
* Reapply "fix-translate"
This reverts commit ab4df3441e .
* Reapply "commit2"
This reverts commit caaab7eb62 .
* changelogwega
2026-02-01 01:59:02 +03:00
MartynDew
347f21e7f5
Merge pull request #294 from MartynDew/fixes
...
небольшие фиксы и изменения
2026-01-31 19:47:14 +03:00
Zekins
f73a8156e9
Merge pull request #299 from MartynDew/glasses
...
Мед и СБ-Мед очки
2026-01-31 19:44:51 +03:00
Zekins
5e1e552712
Merge pull request #304 from wega-team/upstream
...
Upstream sync
2026-01-31 16:06:33 +03:00
Zekins3366
a2c4dcbe9c
linter
2026-01-31 15:46:54 +03:00
MartynDew
3e10e22580
resprite
2026-01-31 15:34:37 +03:00
Zekins3366
38be9a956c
buildfixes
2026-01-31 15:24:36 +03:00
Zekins3366
4b6f7d13f9
Merge remote-tracking branch 'upstream/master'
2026-01-31 14:58:49 +03:00
MartynDew
d6d8489c45
Фикс мелка ( #297 )
...
* фикс
* math
Математика второй класс
---------
Co-authored-by: Zekins <136648667+Zekins3366@users.noreply.github.com >
2026-01-31 14:14:33 +03:00
Gamewar360
fb66455eb3
Боты, чу-чуть про ботов и бейджики доступа ( #303 )
...
* fix-translate
* commit2
* Revert "commit2"
This reverts commit 47e4a1291e .
* Revert "fix-translate"
This reverts commit 65cd54a703 .
* Reapply "fix-translate"
This reverts commit ab4df3441e .
* Reapply "commit2"
This reverts commit caaab7eb62 .
* coolpr
2026-01-31 14:14:20 +03:00
MishaUnity
883362a8d1
Кастомизация андроидов ( #300 )
...
* Новая кастомизация и исправления
* Дебаф стана от воды
* Последний штрих
* Update comment formatting for ShockDamage field
---------
Co-authored-by: Zekins <136648667+Zekins3366@users.noreply.github.com >
2026-01-31 14:11:59 +03:00
Gamewar360
4500ecab1e
Бафф ЭмБэ культ ( #287 )
...
* fix-translate
* commit2
* Revert "commit2"
This reverts commit 47e4a1291e .
* Revert "fix-translate"
This reverts commit 65cd54a703 .
* buffcult
* buff cult
* microbaff
* fix_plusmicrobaff
* Ed
Слишком много для игровой меты
---------
Co-authored-by: Zekins <136648667+Zekins3366@users.noreply.github.com >
2026-01-31 13:49:09 +03:00
Gamewar360
793f0280a9
Реворк интерфейса ОБР, ОБР и тп и тч, кд ( #292 )
...
* fix-translate
* commit2
* Revert "commit2"
This reverts commit 47e4a1291e .
* Revert "fix-translate"
This reverts commit 65cd54a703 .
* Reapply "fix-translate"
This reverts commit ab4df3441e .
* Reapply "commit2"
This reverts commit caaab7eb62 .
* base-rework-obr
* coolpr
* fix
2026-01-31 13:42:53 +03:00
_ffka__
8a7f602b21
Кадет ( #269 )
...
* SBmainerMe
* Update security_cadet.yml
* Corvax formatting
---------
Co-authored-by: younotFFKA <fggrt7494@gmail.com >
Co-authored-by: Zekins <136648667+Zekins3366@users.noreply.github.com >
2026-01-31 13:40:43 +03:00
HappyRoach
08baea27c3
Заточка оружия ( #271 )
...
* sharpening
* Delete On Sharpening
* Fix delete
2026-01-31 13:31:15 +03:00
Pok
80acc36543
[Wiki] workflows ( #3490 )
2026-01-21 10:55:32 +07:00
Dmitry
18d2ddac70
Минор апдейт ( #3489 )
2026-01-20 21:20:10 +07:00
Голубь
ee8c0beff2
Мапперские штуки дрюки ( #3438 )
2026-01-20 20:35:33 +07:00
kosticia
cf6469fb62
lobby art update( #3485 )
2026-01-20 20:26:08 +07:00
lzk
c1282f2e5e
paper interface translate ( #3312 )
2026-01-20 13:13:57 +07:00
JrInventor05Next
1c771c6709
tweak NukeOpstTest.cs ( #3486 )
2026-01-20 13:08:56 +07:00
Dmitry
7ee4e66e77
Merge pull request #3488 from DIMMoon1/upstream01.2
...
Upstream01.2
2026-01-20 12:46:48 +07:00
Pok
b462533f82
[Wiki] Подгрузка ВСЕГО на вики ( #3487 )
2026-01-20 03:28:44 +07:00
Dmitry
e88b41e637
ok
2026-01-19 06:26:19 +07:00
Dmitry
bd135d7604
merge remote wizden/stable
2026-01-19 05:58:27 +07:00
Myra
a9e4370d25
Stable merge ( #42505 )
2026-01-18 22:28:07 +01:00
Vasilis The Pikachu
7b73811d47
Revert final changelogs for reverted prs
2026-01-18 21:53:21 +01:00
Vasilis The Pikachu
ca07d6be49
Revert "Allow station tiles to be placed on solid ground and other platings. ( #38898 )"
...
This reverts commit 418b2b70b0 .
Maintainer vote decided to vote this out due to code quality issues. The original contributor is aware and will get help from a maintainer to reintroduce it
2026-01-18 21:53:21 +01:00
Vasilis The Pikachu
e247ea5850
Revert "Fix RCD light spam, bypass of indestructible tiles and some plating fixes ( #42432 )"
...
This reverts commit 7d58e42ade .
Required to revert 418b2b70b0 via maintainer vote due to code quality issues.
2026-01-18 21:53:21 +01:00
ScarKy0
1a5d13fcac
[Hotfix] Delivery console unanchorable ( #42499 )
2026-01-18 16:30:55 +01:00
Vasilis The Pikachu
9d3f2219b9
Remove changelog for https://github.com/space-wizards/space-station-14/pull/42390
2026-01-17 21:17:13 +01:00
MartynDew
feb4f160ae
da
2026-01-17 21:01:15 +03:00
Dmitry
09db1f5b77
upstreamfix
...
1
2026-01-17 02:43:19 +07:00
Dmitry
f501ebec66
merge remote master wizden
2026-01-16 14:30:48 +07:00
PJBot
ab9cf3b5cc
Automatic changelog update
2026-01-16 02:10:08 +00:00
pathetic meowmeow
0d75154385
Fix core pinpointer pieces having a 5-pointer recipe ( #42446 )
2026-01-16 01:53:25 +00:00
PJBot
57e9a64d27
Automatic changelog update
2026-01-16 00:53:43 +00:00
Nemanja
d2ac15c76f
Fix flatpacker exploit ignoring board costs ( #42445 )
...
Fix flatpacks ignoring costs and board requirements
2026-01-16 00:22:24 +00:00