Commit graph

31337 commits

Author SHA1 Message Date
Vigers Ray
c6f12f316f да ебаный рот 2024-12-31 20:53:08 +03:00
KaiserMaus
6f03059174
ERT: Только Люди (#989)
* Only Human

* Update humanoid.yml

---------

Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2024-12-31 20:51:57 +03:00
GayBot
6f12743e6d Automatic changelog update 2024-12-31 20:40:07 +03:00
KaiserMaus
f5f7b3064a
Battery Guns (#987)
* LNT620 Spark

* IK-60 Battery ammo, Fix Emag Protolathe

* Add tech, lathe. Cargo

* LNT620 Spark in ERT Uplink, increased Impulse cost
2024-12-31 20:43:40 +03:00
Vigers Ray
b30c02ba1e блядь каизер 2024-12-31 20:41:54 +03:00
Vigers Ray
1621a6f6b4 война интерфейса х2 2024-12-31 10:31:33 +03:00
Vigers Ray
d4aa4a9b34 фикс итогов разумной болезни. 2024-12-31 10:30:55 +03:00
Vigers Ray
ab3aaca605 Фикс доступа синдиката у карты агента 2024-12-31 10:30:12 +03:00
Vigers Ray
5c9bf52512 война интерфейса 2024-12-31 06:24:39 +03:00
Vigers Ray
2f5c81893d чейнжлог 2024-12-31 06:12:18 +03:00
Vigers Ray
e124be5ac5 допустим 2024-12-31 06:10:44 +03:00
Vigers Ray
0b7e6604cb После падения нету автоподнятия 2024-12-31 05:55:08 +03:00
Vigers Ray
650bc1b33a Фикс действий 2024-12-31 05:54:49 +03:00
Vigers Ray
90cb34a6ae Merge remote-tracking branch 'origin/master' 2024-12-31 04:50:56 +03:00
Vigers Ray
6885e6cf92 фиксы 2024-12-31 04:50:51 +03:00
Babaev
97b877e761
roadmap small update (#979)
* again

* oopsie
2024-12-31 04:45:16 +03:00
Vigers Ray
0531d7d675 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-12-31 04:44:53 +03:00
Booblesnoot42
ff08fb3160
Rename cryobed yml file (#34134)
renamed cryopod.yml to cryogenic_sleep_unit.yml
2024-12-31 02:46:01 +03:00
TytosB
a1c8ac3301
Loop Station Decal and maints additions (#34103)
* many changes

* contentingregrationtests

* serialized invalid removed

* blank

* "Changes and fixes as suggested"

* blank

* blank

* added desk bells

* engi rework rework rework

* added gate to content integration

* tweaks

* aaa

* bbb

* added holopads

* ccc

* Update default.yml

* hotfix

* aaa

* bbb

* many many tweaks and fixes

* aaa

* decals and maints

* aaa

* bbb

* ccc

---------

Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
2024-12-30 13:07:00 -07:00
Southbridge
def73da9f3
Marathon Station - Dechristmassified (#34136)
* dechristmassified

* further dechristmassified
2024-12-30 13:06:04 -07:00
Southbridge
3fb7ee4068
Box Station - Dechristmassified (#34135)
* dechrismassified

* removed camera from shower
2024-12-30 12:48:37 -07:00
Southbridge
4acfec8e36
Amber Station Overhaul (#34113)
* Step 01: Remade arrivals

* Nearly finished, also added new beacons and a holopad

* Wrapped up all changes, also added a beacon for the docking arm
2024-12-30 00:37:05 -07:00
Vigers Ray
65b1b0ed1e хотфикс 2024-12-30 08:54:56 +03:00
Vigers Ray
8456f64509 парашут навалил говна 2024-12-30 08:15:34 +03:00
Vigers Ray
898f633130 ой 2024-12-30 08:01:37 +03:00
Vigers Ray
5109c7805d ы 2024-12-30 07:56:36 +03:00
Vigers Ray
a73985c061 скины для гостов и 1 для меня 2024-12-30 07:52:34 +03:00
GayBot
b1bdb784ac Automatic changelog update 2024-12-30 03:21:02 +03:00
DragonDidlo
5a6c7a8209
Новогоднее настроение 2025 (#975)
* Новогоднее настроение

* Убрана перезапись/фикс png
2024-12-30 03:24:39 +03:00
Vigers Ray
4e14d9369c Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-12-30 01:11:45 +03:00
Vigers Ray
82db85b3ae пропущеные локали 2024-12-30 01:11:20 +03:00
Vigers Ray
3c4b484362 HolidayClothingSwap для новогодних замен спрайтов одежды 2024-12-30 01:11:08 +03:00
Dylan Hunter Whittingham
608b433da4
Added ID entry for captain on Bagel (#34120)
added id for captain

Co-authored-by: dylanhunter <dylan2.whittingham@live.uwe.ac.uk>
2024-12-29 13:23:18 -07:00
GayBot
5c521233d0 Automatic changelog update 2024-12-29 22:47:40 +03:00
KaiserMaus
b9dd80c707
Christmas clothing (#971)
* Christmas труселя

* Рождество

* Fix Sprite

* Fix

* мг
2024-12-29 22:51:18 +03:00
GayBot
274d1fec71 Automatic changelog update 2024-12-29 22:32:06 +03:00
Francus41
d6db1f72ff
полный новый трейн (#974) 2024-12-29 22:35:43 +03:00
Vigers Ray
d485282acc Более нейтральное и стильное лого 2024-12-29 22:34:50 +03:00
Velcroboy
c2ffc25970
Adds kitchen/botany-locked maints airlock (#34116)
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-12-29 21:14:36 +03:00
Vigers Ray
bc3e3ede59 Вернул открытие роадмапа при входе 2024-12-29 19:24:10 +03:00
Vigers Ray
036210f952 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-12-29 19:02:59 +03:00
GayBot
f5e94f769b Automatic changelog update 2024-12-29 18:51:36 +03:00
GayBot
4585f84f61 Automatic changelog update 2024-12-29 18:50:28 +03:00
KaiserMaus
26bf09718b
Cog Update (#970) 2024-12-29 18:55:05 +03:00
Francus41
c038f41bad
БАГЕЛЬ Update map (#969)
* Обновил багель, добавлены шкафы парамедику и атмосу, сделаны спавны ведущих ролей и голопады

* в нормальной новой ветке обновил все изменения
2024-12-29 18:54:00 +03:00
GayBot
d84744fdc3 Automatic changelog update 2024-12-29 18:48:41 +03:00
Babaev
ec084fb5b0
better roadmap ui (#963)
* ага

* вопросы?

* финалочка

* 2

* последний мув
2024-12-29 18:53:22 +03:00
KaiserMaus
580ff8f537
ERT Uplink: Гранаты (#960)
* add Explosives to Uplink

* Fix NVD Icon

* clean
2024-12-29 18:52:15 +03:00
lzk
072b973f3b
fix interdimensional teleporter desc (#34108)
Update hand_teleporter.yml
2024-12-28 22:28:58 -05:00
PJBot
da8bb996b1 Automatic changelog update 2024-12-29 03:26:46 +00:00