Charlotte Tezuka
69ce0ffffa
Meow
2026-01-15 17:29:19 +02:00
Charlotte Tezuka
b067d6eabc
Merge remote-tracking branch 'nuxs/wall-lockers-fix' into upstream
2026-01-15 16:50:33 +02:00
Charlotte Tezuka
a949ba7ee9
Golem core fix
2026-01-15 16:05:20 +02:00
Nuxs
58fa0c4d69
wall lockers fix
2026-01-15 12:27:37 +07:00
Charlotte Tezuka
cf5d473bb6
YML fixes 4
2026-01-15 00:49:58 +02:00
Charlotte Tezuka
3b289e8245
YML fixes 3
2026-01-15 00:31:39 +02:00
Charlotte Tezuka
eed4694c1e
Fixes yml cisch
2026-01-15 00:24:29 +02:00
Charlotte Tezuka
0cbc076ae5
YML fixes
2026-01-15 00:16:26 +02:00
Charlotte Tezuka
0e3cebdb68
Merge branch 'master' into upstream
2026-01-14 18:18:43 +02:00
Charlotte Tezuka
ea713efb05
Merge remote-tracking branch 'corvax/master' into upstream
2026-01-14 18:15:24 +02:00
Nuxs
1932daf402
skill confirm button rework ( #461 )
2026-01-14 15:34:53 +03:00
Nuxs
2986ed09b4
fix top and bottom markings ( #459 )
2026-01-14 15:34:30 +03:00
tau
87d6e5eff7
Languages v2 ( #462 )
...
* Languages v2
* Fixes
* Fixes 2
* Fixes 3
* Fixes yml
2026-01-14 15:33:46 +03:00
Pok
1cc0f83350
[Wiki] Подгрузка всех ключей локализации ( #3482 )
2026-01-14 12:55:26 +07:00
Nuxs
24d4986e47
fix balaclavas ( #458 )
2026-01-10 23:20:55 +03:00
Nuxs
63d9c28ec7
fuel heals androids ( #456 )
2026-01-10 23:04:13 +03:00
KillanGenifer
aad5613341
playtime flag tweaks ( #3481 )
2026-01-11 02:35:35 +07:00
Litogin
be81cf4b4c
Return color UI WL ( #455 )
...
* add wl tones
* Return color UI WL
2026-01-10 21:34:03 +03:00
Oleshe
3d9c3fa1f0
Обновление CorvaxlWLPaper и CorvaxWLKolter ( #457 )
...
* 14
* 42
2026-01-10 19:12:14 +03:00
KillanGenifer
671eca79c1
Playtime adminflag ( #3480 )
2026-01-10 07:18:03 +07:00
Nuxs
8ec75edfec
fix small handbox ( #454 )
2026-01-09 13:05:25 +03:00
Nuxs
c942940972
cischi accentless fix ( #452 )
2026-01-09 12:47:45 +03:00
Nuxs
3fdac723ef
fix cischi noslip ( #453 )
2026-01-09 12:38:38 +03:00
JrInventor05Next
617680fb87
fix NukeOpsTest ( #3472 )
2026-01-09 01:13:30 +07:00
Dmitry
8ef9ac26e9
Порт локализации ( #3479 )
...
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com >
Co-authored-by: kosticia <kosticia46@gmail.com >
Co-authored-by: cfif126 <94059374+cfif126@users.noreply.github.com >
Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com >
Co-authored-by: lzk228 <alosamarcuk@gmail.com >
2026-01-09 01:11:43 +07:00
Nuxs
86fb639fc9
add sterile mask sprite for moth ( #449 )
2026-01-08 19:33:36 +03:00
Nuxs
3f5a3077bc
Автозамена для пж и спс ( #450 )
...
* add пж and спс to sanitizer
* add wl comments
2026-01-08 19:27:33 +03:00
Nuxs
3b325df7dd
Пивные очки бармену ( #451 )
...
* add bartender eyes loadout
* add wl comments
2026-01-08 19:02:18 +03:00
Dmitry
ad382dcc23
Merge pull request #3478 from DIMMoon1/upstream01.1
...
Upstream01.1
2026-01-08 21:53:23 +07:00
Dmitry
37c4e15d32
0 sourse fix
2026-01-08 20:01:57 +07:00
Dmitry
f9469a5f38
ipcfix
2026-01-08 18:43:20 +07:00
Dmitry
1a9a79cbba
upstream codefix
...
kek
2026-01-08 18:11:46 +07:00
Dmitry
6187a5a7bd
merge remote stable wizden
2026-01-08 10:32:52 +07:00
tau
fe4fe8b23f
Update splash logo path in manifest.yml
2026-01-07 02:55:56 +03:00
Svist666s
68d4cfe53b
Red alert ftl fix ( #3477 )
2026-01-07 05:49:42 +07:00
Princess Cheeseballs
5207c0694a
Fix admin loc spam 2 ( #42265 )
2026-01-06 20:29:10 +01:00
Nuxs
88d83cdbf4
fix some IDs ( #448 )
2026-01-06 15:35:09 +03:00
Oleshe
e1d65f8805
Обновление CorvaxWLPaper ( #447 )
...
* Revert "51345"
This reverts commit 36252c9123 .
* paper update
2026-01-06 07:34:16 +03:00
Nuxs
657b71372a
Locale fix
2026-01-06 05:43:41 +03:00
Centronias
4d9c25098b
Fix localization missing spam from Admin Overlay ( #42244 )
...
playerInfo.StartingJob is already localized
2026-01-05 03:01:00 -08:00
Myra
3ad57230f4
Stable merge 2026-01-03 ( #42237 )
2026-01-04 17:50:01 +01:00
Vasilis The Pikachu
f007c75794
Changelog removal of reverted PRs
2026-01-04 17:30:59 +01:00
Vasilis The Pikachu
0ab3b1a075
Revert "feat: RnD tech research console now have reroll feature ( #32931 )"
...
This reverts commit 1f2d80297c .
Discussed during the maintainer meeting and voted to be reverted at this time.
2026-01-04 17:28:09 +01:00
Vasilis The Pikachu
a5977efab6
Revert "Santa anomaly back! ( #41654 )"
...
This reverts commit 21d039318e .
Christmas, no longer a week away. Unwoo
PS: Please review https://github.com/space-wizards/space-station-14/pull/38940
2026-01-04 17:25:36 +01:00
Vasilis The Pikachu
7c28daf1ed
Revert "Rename LOOC chat to Help chat ( #41933 )"
...
This reverts commit 7750e3ca2e .
This will have another vulture round, it will be reapplied later after stable is merged back into master again
2026-01-04 17:20:13 +01:00
Princess Cheeseballs
3ab84443f9
[STAGING] Staging Chat Fix ( #42206 )
...
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com >
2026-01-04 01:24:18 +01:00
Princess Cheeseballs
e86cc06781
Cherrypick engine 270.1 to staging ( #42226 )
2026-01-03 15:56:54 -08:00
Pieter-Jan Briers
9bd24023a7
Update RT to 270.1.0 ( #42198 )
2026-01-03 20:57:49 +01:00
Princess Cheeseballs
6cefe4299d
[Staging] Let admins ignore the laws of physics again. ( #42221 )
...
admin ignore physics
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com >
2026-01-03 20:39:17 +01:00
Princess Cheeseballs
bbc519c523
[STAGING] Fix Disabler SMG bolts going through walls ( #42195 )
...
* RAH RAH RASPUTIN LOVER OF THE RUSSIAN QUEEN!
* delete if we do 0 damage
* actually change that
* dont get soaped into cleaning things up challenge impossible
---------
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com >
2026-01-03 20:33:28 +01:00