Commit graph

30912 commits

Author SHA1 Message Date
Vigers Ray
16d87dbfdc убрал славную смерть 2024-12-15 16:27:01 +03:00
Vigers Ray
273746cb38 Максимум 1 глава предатель и фикс нулевых зомби 2024-12-15 16:26:24 +03:00
GayBot
3b19816550 Automatic changelog update 2024-12-15 16:01:40 +03:00
RaMbUt878
072ee5e0f8
Глава Персонала, КМ, НР, ГВ, СИ - Могут стать антагонистами (#858) 2024-12-15 16:05:24 +03:00
GayBot
55c490f9bb Automatic changelog update 2024-12-15 15:23:42 +03:00
KaiserMaus
638201e1ce
Убрал Оазис из маппула (#848) 2024-12-15 15:27:25 +03:00
haiwwkes
b9d5f934aa
fix hiss spam in chat (#857) 2024-12-15 15:27:07 +03:00
Vigers Ray
46ba4fbc5f Казуальные разгермы 2024-12-15 14:58:57 +03:00
Vigers Ray
b7b2ead88e Merge remote-tracking branch 'origin/master'
# Conflicts:
#	Resources/Changelog/ChangelogSunrise.yml
2024-12-15 13:59:07 +03:00
Vigers Ray
8bee9142ee Хиллиум и БЗ в фильтры скрубберов 2024-12-15 13:49:55 +03:00
GayBot
8162d85f4d Automatic changelog update 2024-12-15 13:20:59 +03:00
Odleer
c3e4d387ac
Корона Сингуло (#849) 2024-12-15 13:24:43 +03:00
haiwwkes
9cbb3c3d14
уже не надо (#856) 2024-12-15 13:24:30 +03:00
GayBot
8112b49978 Automatic changelog update 2024-12-15 13:19:19 +03:00
Vigers Ray
9c462faeb7
Merge pull request #855 from space-sunrise/alt-reagent-switch
alt-switching for borgs
2024-12-15 13:23:04 +03:00
lunarica
00dc0382f9 alt-switching 2024-12-15 14:28:04 +05:00
Vigers Ray
40d318cd2b Merge remote-tracking branch 'origin/master' 2024-12-15 10:55:52 +03:00
GayBot
e2224cb5d5 Automatic changelog update 2024-12-15 10:45:55 +03:00
Vigers Ray
84bfe8cda6
Merge pull request #246 from space-sunrise/casual
Оказуаливание геймплея
2024-12-15 10:49:39 +03:00
Vigers Ray
dee33c81aa Вернул стандартное значение блокировки вентиляции 2024-12-15 10:41:21 +03:00
Vigers Ray
4fac0d3ff1 фикс дублирования дохлых ролей 2024-12-14 21:25:55 +03:00
Vigers Ray
6f1366814f Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Resources/Prototypes/Entities/Mobs/Player/silicon.yml
2024-12-14 21:22:31 +03:00
GayBot
f26c497709 Automatic changelog update 2024-12-14 21:01:02 +03:00
Vigers Ray
dd97b529bb
Merge pull request #837 from KaiserMaus/Changelings
Made Changeling Greate Again!
2024-12-14 21:04:46 +03:00
GayBot
206b455dc1 Automatic changelog update 2024-12-14 20:56:03 +03:00
Vigers Ray
07f09504cb
Merge pull request #835 from KaiserMaus/Mech-Paint
Mech Tweaks, Weapons Tweaks, Ressearch Tweaks.
2024-12-14 20:59:46 +03:00
PJBot
102d4fbc95 Automatic changelog update 2024-12-14 16:04:27 +00:00
Nim
df7b9d1e04
Other colour of the binary channel (#33841)
* radio

* color 2

* console-announcement

* 5ed7aa
2024-12-14 17:03:18 +01:00
Southbridge
7d82d2d5da
Amber station updates (#33845)
* Fixed various issued identified during playtests.

* Fixed a firelock stuck closed

* Added more cameras and moved others

* Fixed an issue with disposals

* Modified the map a bit after watching some matches and listening to feedback

* Reworked sec some more. Moved perma out into its own separate ship (another design from Frontier) Also performed various improvements to the station.

* Added final touches, ready to PR
2024-12-14 16:59:43 +01:00
KaiserMaus
c889065cf1 No Festive state 2024-12-14 10:21:16 +00:00
Vigers Ray
617e2eac4d АААААСУЖДАЮ 2024-12-14 10:04:36 +03:00
PJBot
744b105fc6 Automatic changelog update 2024-12-13 23:01:52 +00:00
godisdeadLOL
06071a5d8a
Secret stash wrench anchoring fix (#31779)
* secret stash wrench fix

* fix

* cleanup

---------

Co-authored-by: YourUsername <you@example.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-12-14 00:00:45 +01:00
PJBot
2c00abbcae Automatic changelog update 2024-12-13 14:25:41 +00:00
Southbridge
7eb714d38f
Monospace Support for Rich Text (#33830)
* Initial Commit

* Moved all this to SS14 on it's own

* Added prototype validation
2024-12-13 15:24:34 +01:00
KaiserMaus
61de9a62e9 Линтер иди от сюдова 2024-12-13 14:23:32 +00:00
KaiserMaus
faddf99f48 Special for Nuke 2024-12-13 14:17:36 +00:00
KaiserMaus
5180fe4097 NT cell in NT Dome 2024-12-13 14:15:21 +00:00
KaiserMaus
a3a9da4788 Уэээ Линтер 2024-12-13 13:56:50 +00:00
PJBot
e704f4e9a8 Automatic changelog update 2024-12-13 13:55:04 +00:00
LevitatingTree
b46f487503
Add meat tag to Five Alarm Burger (#33848)
* Add meat tag to Five Alarm Burger

* Revert "Add meat tag to Five Alarm Burger"

This reverts commit e483b5effe63a8cbdcce81eeddc622f5555ae240.

* Re-add tag, but in notepad

* Move tag down to follow hierarchy

---------

Co-authored-by: LevitatingTree <None>
2024-12-13 14:53:56 +01:00
KaiserMaus
db72c8a03c Changeling 2024-12-13 13:40:03 +00:00
KaiserMaus
6244d18f8c
Merge branch 'space-sunrise:master' into Mech-Paint 2024-12-13 11:21:58 +00:00
KaiserMaus
8b8f88037e Fix desc 2024-12-13 11:08:07 +00:00
KaiserMaus
a905de4e1a Мяулер! 2024-12-13 11:01:04 +00:00
KaiserMaus
a3efab22f4 Cell 2024-12-13 10:51:05 +00:00
KaiserMaus
aea1b05c61 Fix Linter 2024-12-13 10:27:35 +00:00
PJBot
9329fcf32e Automatic changelog update 2024-12-13 03:11:29 +00:00
lzk
115b3e0519
Increase war ops evac time (#33628) 2024-12-12 21:10:20 -06:00
Vigers Ray
da19a63c83 Фикс спавна за нежелаемые роли 2024-12-13 03:36:48 +03:00