Commit graph

29449 commits

Author SHA1 Message Date
VigersRay
86cec57f9f Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-10-07 08:44:51 +03:00
VigersRay
a2c382d5ba Доработка ПНВ 2024-10-07 08:44:38 +03:00
Scribbles0
6b10e00da4
oasis update (#32679)
sec apcs and ai core wiring
2024-10-06 19:24:44 -06:00
VigersRay
9a5aceab90 фикс StandardNanotrasenStation 2024-10-07 01:58:01 +03:00
VigersRay
94ec10a912 Ограничения на асистентов убраны. 2024-10-07 01:30:29 +03:00
VigersRay
ee38307316 Ассистенты всех отделов теперь могут быть антагонистами. 2024-10-07 01:26:35 +03:00
GayBot
07abec0de5 Automatic changelog update 2024-10-07 01:17:48 +03:00
Rinary
dc40c1404b
Доработка ночного зрения (#455)
* texture upd

* upd and fix color system

* fix

* handcrafted_nvd texture

* add handcraft nvd

* upd color

* add nvd to uplink

* fix loc

* recipe and research

* fix delay system

* fix

* пу-пу-пу

* add recipe to protolathe

* fully fix nvds

* fix layer set visible

* fix

* upd roadmap

* felinids has night vision

* engineering hardsuits has yellow night vision

* upd icon
2024-10-07 01:18:10 +03:00
Rinary
18abfd962a
Апстрим локализации (#460)
* init

* upd

* fix

* fix
2024-10-07 01:17:51 +03:00
pacable
9a37e68869
Мешок с землей (#461)
* Добавил мешок с землей

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* fix тавтологии

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* fix stamina

Signed-off-by: pacable <igor.mamaev1@gmail.com>

---------

Signed-off-by: pacable <igor.mamaev1@gmail.com>
2024-10-07 01:17:24 +03:00
pacable
e1f0818c06
фикс описания способности генокрада (#462)
Signed-off-by: pacable <igor.mamaev1@gmail.com>
2024-10-07 01:16:38 +03:00
GayBot
2b09a06c59 Automatic changelog update 2024-10-07 01:14:06 +03:00
pacable
fa4186726f
плюшевая CatFireBattle (#464)
Signed-off-by: pacable <igor.mamaev1@gmail.com>
2024-10-07 01:14:27 +03:00
VigersRay
461a4d84a2 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	.github/workflows/publish.yml
#	Resources/Prototypes/Entities/Mobs/Player/dragon.yml
#	Resources/Prototypes/Loadouts/loadout_groups.yml
#	Resources/migration.yml
2024-10-07 01:09:20 +03:00
VigersRay
0419589c8c Merge remote-tracking branch 'origin/master'
# Conflicts:
#	Resources/Changelog/ChangelogSunrise.yml
2024-10-07 01:07:42 +03:00
VigersRay
a3f3c539a1 Удаление шаттла СБ и отключение пилота пока не появится под СБ 2024-10-07 01:06:51 +03:00
PJBot
a6c468b697 Automatic changelog update 2024-10-06 13:34:08 +00:00
Golinth
46a2eb545e
Fully Revert Clown Waddling (#32652)
Fully revert Clown Waddling (revival of #29161)

A sad day, see #29156 for discussion
2024-10-06 15:33:02 +02:00
SplikZerys
437e736150
conveyors were deleted from the game (#466) 2024-10-06 16:08:01 +03:00
PJBot
35fc1b4037 Automatic changelog update 2024-10-06 12:49:56 +00:00
Арт
867efe8b5b
Add flowers to loadout (#32097)
* Add_Poppy&Lily

* Add_FlowerWreath

* Add_Headflowers

Sprites, meta, prototype

* Id_Changes

* Changes

* Update_Sprite

* Desc_Change

* Scale_Change

* Sprite_Scaling
2024-10-06 14:48:49 +02:00
Spessmann
126c1786de
Cog update fix (#32657)
* fixes for cog

* ok fixed that
2024-10-05 20:30:10 -06:00
PJBot
386e59b462 Automatic changelog update 2024-10-05 18:45:55 +00:00
slarticodefast
eb4e422cb0
fix light bulbs not fitting into the trash bag (#32452)
fix trash
2024-10-05 12:44:47 -06:00
Spessmann
2287df13bd
Cog engineering DIY update (#32651)
engineers forced to do work, sobbing
2024-10-05 12:08:39 -06:00
GayBot
039287b25e Automatic changelog update 2024-10-05 14:16:26 +03:00
Настя
8ee844d1b5
Изменения (#458) 2024-10-05 14:16:48 +03:00
TakoDragon
db64ad9c4d
Marathon Removed double walls and a wrong cable (#32603)
removed double walls and cable fucks
2024-10-04 17:18:46 -06:00
NotSoDamn
644d7ab682
BaseAdvancedPen migration (#32638)
* Update migration.yml

* Update Resources/migration.yml

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>

---------

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
2024-10-04 23:13:30 +03:00
GayBot
7475b9fbf1 Automatic changelog update 2024-10-04 21:33:38 +03:00
Rinary
08a055a7c2
Обновление энергетических щитов (#425)
* init

* energy dome no more block melee attacks

* return HOS shield

* belt nanotrasen energy shield generator

* fix

* localise

* Revert "return HOS shield"

This reverts commit 3821d1ae51b0a442cc9a551481fe5742e5782bb1.
2024-10-04 21:34:00 +03:00
SplikZerys
79e1becb2b akms sound fix 2024-10-04 20:29:20 +03:00
PJBot
ec4acdebbf Automatic changelog update 2024-10-04 09:35:55 +00:00
Saphire Lattice
94c8018ff3
Change the syndicate charge to start a timer on signal (#32423)
* Change the syndicate charge to start a timer on signal

* Actually add the component in question

* Add default link for TimerStart signal
2024-10-04 11:34:48 +02:00
SplikZerys
87ed4d01e2 changed tts announcer in centcomm console 2024-10-04 12:08:22 +03:00
SplikZerys
57c0a37670 changelog update 2024-10-04 12:07:44 +03:00
SplikZerys
a6bbc44225 added AI tts voice glados 2024-10-04 12:05:21 +03:00
PJBot
fbb6f17add Automatic changelog update 2024-10-04 08:44:51 +00:00
Saphire Lattice
88f060d51a
Make the explosions throw the container/item they originated from (#32428)
Extra fun if it's something that can trigger multiple times
2024-10-04 10:43:45 +02:00
SplikZerys
e59e4aa0a3 atmospheric_tech has mindshield now 2024-10-04 11:29:34 +03:00
PJBot
8b65186bfa Automatic changelog update 2024-10-04 05:40:57 +00:00
SoulFN
9e054c1f9d
Give dragon pull ability (#32568) 2024-10-04 15:39:50 +10:00
PJBot
423d394af1 Automatic changelog update 2024-10-04 02:56:43 +00:00
Plykiya
295e63193c
Two additional checks to prevent FTLing stations (#32558)
Add two additional checks to prevent FTLing
2024-10-04 12:55:36 +10:00
Jezithyr
570c166517
Disable Auto-Publish (#32627)
disable auto publish
2024-10-04 03:16:32 +02:00
PJBot
7edd1c6d52 Automatic changelog update 2024-10-04 01:14:09 +00:00
Southbridge
c0d67429ab
Box Station - Connected Recycler, rerouted power for Singlo Substation, added law boards to AI upload room (#32608)
* Fixed #32443 and #30375

* Fixed duplicate ID issue, and added lawboards to resolve #32581

* Removed Overlord board and added Crewsimov

* Removed invalid UserInterface component
2024-10-03 19:12:59 -06:00
GayBot
3a8fad8459 Automatic changelog update 2024-10-03 22:01:34 +03:00
AverageNotDoingAnythingEnjoyer
2187abfe2d
Фикс Train (#446)
* 1

weh

* weh

weh
2024-10-03 22:01:58 +03:00
Rinary
2fe0f92886
Оптимизация и обновление ночного виденья (#431)
* optimize night vision shader

* upd

* nvd restyle

* upd

* я не знаю почему эта хуйня не работает, я уже здался

* fix

* upd

* fix
2024-10-03 22:01:47 +03:00