Focstor
a44e6669f9
Шаттл РХБЗЗ ( #521 )
...
* dobavil shuttle rxbzz
* fix
* fix
2024-10-30 10:23:58 +03:00
AverageNotDoingAnythingEnjoyer
09a278eddd
Meta Суперматерия ( #513 )
...
* 1
1
* Гамма
Удалена решётка мешающая стыковке гамма оружейной
* Интеликарта не была предателем
Из загрузочной ИИ удалены интеликарты, немного улучшена загрузочная ИИ
* Удалён стул мешавший авар. шлюзу
2024-10-30 10:18:35 +03:00
imskyhappy
c6cc07d0b7
Добавлен переделанный шатл ОБРовцов ( #495 )
...
* Добавлен переделанный шатл ОБРовцов
* Доработал
---------
Co-authored-by: ChappyChokolate-org <63551838+ChappyChokolate-org@users.noreply.github.com>
2024-10-30 10:03:53 +03:00
VigersRay
6423086773
Merge remote-tracking branch 'refs/remotes/wizards/master'
2024-10-12 00:26:07 +03:00
AverageNotDoingAnythingEnjoyer
4ad1ffa9c4
Fix ( #493 )
...
M16A4 magazine
SunriseMeta Ai fix
2024-10-11 23:27:45 +03:00
AverageNotDoingAnythingEnjoyer
92d16ccc09
Bagel upd ( #487 )
...
* 1
Вентиляторы в карго
Зона воксов, знак
Турели в ИИ и платы
fixgridatmos
Хохохонкерсвенд
* Биогенератор
Добавлен биогенератор в гидропонику
* Синди-двери
Повёрнуты шлюзы синди-шаттла станции.
2024-10-11 14:45:17 +03:00
Saphire Lattice
729de28844
Fix Centcom cloning scanner ( #32746 )
...
* Fix Centcom cloning scanner
* Fix uid conflict
2024-10-11 03:00:54 -06:00
lzk
7a4cefa8ac
update fland ( #32747 )
...
add captain id card
2024-10-11 02:35:46 -06:00
Rinary
18640aef4f
upd bagel ( #473 )
...
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2024-10-10 20:11:01 +03:00
AverageNotDoingAnythingEnjoyer
ba64c822ae
Meta Station ( #433 )
...
* Weh
Сейфы в оружейке
Шлюзы
Спавны магистрата, ПНТ, адъютанта
Хохохонкерсвенд
Шкаф бригмеда
Карта добавлена в пул, добавлены роли и слоты
* Цели
Добавлены цели
* мгм..
ну и где эта ошибка спряталась
* Begone merge conflict!
weh
* weh 2
electric boogaloo
* SMES
SMES
* Юр
Юр. канала ключ
* weh 3
* weh 4
electric wehoogaloo
* Пока ОСЩ
* Суперматерия
вех
* Fixgridatmos
Fixgridatmos
- Fixgridatmos
* Revert "Суперматерия"
This reverts commit 4fdd3c60008611f898dc578efc2261aabde1dd8f.
2024-10-10 20:08:52 +03:00
VigersRay
8207cfc8dd
Merge remote-tracking branch 'refs/remotes/wizards/master'
2024-10-08 10:32:08 +03:00
Ubaser
38fd54a1bf
Update Core ( #32665 )
...
* add
* remove invalids
* fix
* yes
2024-10-07 19:59:06 -06:00
haiwwkes
b8032baa9d
tweaks. ( #465 )
...
* tweaks.
* aaaaaa
* aaaaa
* Revert "aaaaa"
This reverts commit d95c6d6cedeac70d9c882533f115c229a69ee38a.
* yes
* AlwaysPoweredMap, remove biomes.
* forget..
* sky
* Updated map
* Update PlanetPrisonStationSystem.cs
* Update EmergencyShuttleSystem.cs
---------
Co-authored-by: SplikZerys <tronezero700@yandex.ru>
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2024-10-07 08:45:23 +03:00
VigersRay
86cec57f9f
Merge remote-tracking branch 'refs/remotes/wizards/master'
2024-10-07 08:44:51 +03:00
Scribbles0
6b10e00da4
oasis update ( #32679 )
...
sec apcs and ai core wiring
2024-10-06 19:24:44 -06: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
Spessmann
126c1786de
Cog update fix ( #32657 )
...
* fixes for cog
* ok fixed that
2024-10-05 20:30:10 -06:00
Spessmann
2287df13bd
Cog engineering DIY update ( #32651 )
...
engineers forced to do work, sobbing
2024-10-05 12:08:39 -06: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
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
AverageNotDoingAnythingEnjoyer
2187abfe2d
Фикс Train ( #446 )
...
* 1
weh
* weh
weh
2024-10-03 22:01:58 +03:00
AverageNotDoingAnythingEnjoyer
aa0639664c
weh ( #452 )
...
weh
2024-10-03 22:00:08 +03:00
SplikZerys
325cb92ca2
fixgridatmos box.yml ( #444 )
2024-10-03 02:24:57 +03:00
SplikZerys
4f2bd141c2
Merge remote-tracking branch 'sunrise-station-public/master' into sunrise-public-master
2024-10-02 18:27:37 +03:00
SplikZerys
ca104cf0cb
fixed all our maps
2024-10-02 18:26:47 +03:00
VigersRay
940710da9e
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Textures/Tiles/attributions.yml
# Resources/Textures/Tiles/green_circuit.png
# Resources/Textures/Tiles/steel.png
2024-10-02 15:50:00 +03:00
SplikZerys
6630824fd2
fixed atmos on delta station
2024-10-02 15:34:31 +03:00
SplikZerys
37ab24f8f5
fixed delta and replaced SMESBasic with SMESExtended
2024-10-02 13:33:03 +03:00
SplikZerys
40696fbe1a
fixed delta.yml
2024-10-02 12:03:23 +03:00
Preston Smith
2df61e4e71
Added LV cables to Marathon SMES room ( #32574 )
...
Added LV cables to SMES room, powering light and computers.
2024-10-01 23:30:58 -06:00
VigersRay
b1cac7e781
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Chat/Managers/IChatManager.cs
# Content.Client/IoC/ClientContentIoC.cs
# Content.Server/Administration/Systems/BwoinkSystem.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/GameTicking/GameTicker.Player.cs
# Resources/Audio/Machines/attributions.yml
# Resources/Locale/en-US/_strings/administration/commands/custom-vote-command.ftl
# Resources/Locale/en-US/_strings/discord/vote-notifications.ftl
# Resources/Locale/en-US/_strings/npc/firebot.ftl
# Resources/Locale/en-US/_strings/paper/syndicate-business-card.ftl
# Resources/Locale/en-US/_strings/store/uplink-catalog.ftl
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
# Resources/Prototypes/Recipes/Crafting/bots.yml
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
2024-10-02 06:45:10 +03:00
Scribbles0
20aa14e4f7
Cog update ( #32585 )
...
* ai core upgrades
* fix distro color
2024-10-01 19:45:54 -06:00
SplikZerys
0edcb49885
centcomm outpost from parashut ( #432 )
2024-10-02 02:28:52 +03:00
AverageNotDoingAnythingEnjoyer
ccd0c275cb
Train ( #418 )
...
* weh
weh
* Ведущие и БМ
Добавлены точки спавна ведущих ролей и Бригмеда
* weh 2
Исправлены проблемы из предыдщуго комента. Заменён шлюз на входе в церковь на тройной
* Weh 3
Поправки с учётом коментариев
* Парикмахер
Добавлена парикмахерская
* Правки
Изменён перевод точек телепорта. Добавлен знак Барбера, расширены столики в вагоне парикмахера
* Ведущие
Добавлены спавны ведущих ролей...опять...
2024-09-30 16:18:34 +03:00
pacable
a8d5d973ad
planet prison remap by Keli ( #355 )
...
* planet prison remap by Keli
* keli map update
Signed-off-by: pacable <igor.mamaev1@gmail.com>
* fixgridatmos
Signed-off-by: pacable <igor.mamaev1@gmail.com>
---------
Signed-off-by: pacable <igor.mamaev1@gmail.com>
2024-09-30 16:13:14 +03:00
Spessmann
af3ea5253a
Cog update (power fix/grav) ( #32475 )
...
* became real
* fixed 32456
2024-09-26 23:20:47 -06:00
VigersRay
0a91b468b4
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
# Content.Client/Voting/UI/VotePopup.xaml.cs
# Content.Client/Voting/VoteManager.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Power/EntitySystems/BatterySystem.cs
# Content.Server/Radio/EntitySystems/RadioSystem.cs
# Content.Server/VoiceMask/VoiceMaskComponent.cs
# Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Content.Server/VoiceMask/VoiceMaskerComponent.cs
# Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
# Content.Server/Voting/Managers/VoteManager.cs
# Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
# Content.Shared/Voting/MsgVoteData.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Recipes/Crafting/crates.yml
# Resources/Prototypes/Recipes/Crafting/improvised.yml
2024-09-26 20:17:14 +03:00
Настя
2bacc38900
Изменения ( #400 )
2024-09-26 20:09:36 +03:00
spanky-spanky
9d75a228c0
Add missing LV cables in Omega atmos ( #32417 )
...
Adds missing LV wire in atmos burn chambers.
2024-09-23 22:48:14 -06:00
spanky-spanky
5e9a0c9d9d
Omega Minor Sec Update ( #32410 )
...
* Updated Omega armory and Warden office.
* Adjusted walls, a decal, and an air sensor.
2024-09-23 10:17:45 -06:00
IProduceWidgets
5e162e776d
Add the Syndicate Instigator Shuttle ( #32083 )
...
* Instigator
* sustenance
2024-09-22 17:27:48 -07:00
Killerqu00
8a2c69d18d
reach update :3 ( #32387 )
2024-09-22 14:08:56 -06:00
VigersRay
73c323bd9a
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Lobby/UI/LobbyGui.xaml
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png
2024-09-21 06:29:09 +03:00
AverageNotDoingAnythingEnjoyer
b2c096b24b
Фикс Reach ( #396 )
...
* Фикс
Добавлена консоль продажи заказов в карго, передвинута консоль запросов
* Изыди ошибка!
2024-09-21 06:27:11 +03:00
spanky-spanky
fba67979c8
Modifications to bring Omega up to date. ( #32317 )
2024-09-19 22:07:49 -06:00
Spessmann
2d42a6bf98
Cog update (Mail) ( #32315 )
...
make mailing better
2024-09-19 21:55:48 -06:00
Saphire Lattice
3e1c067c41
Fland change - Add glasslocks to the Contiguous Fland Hallway Volume ( #32264 )
...
* Add glasslocks to the Contiguous Fland Hallway Volume
* Fix up the firelocks, hopefully!
2024-09-19 13:17:18 -06:00
