rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ы

Browse source
This commit is contained in:
Vigers Ray 2025-07-13 04:53:37 +03:00
parent 84214b1107
commit 876a532a38
7 changed files with 327 additions and 20476 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Content.Shared/CCVar/CCVars.Shuttle.cs
View file

@ -43,7 +43,7 @@ public sealed partial class CCVars
/// Cooldown between arrivals departures. This should be longer than the FTL time or it will double cycle.
/// </summary>
public static readonly CVarDef<float> ArrivalsCooldown =
CVarDef.Create("shuttle.arrivals_cooldown", 100f, CVar.SERVERONLY); // Sunrise-Edit
CVarDef.Create("shuttle.arrivals_cooldown", 30f, CVar.SERVERONLY); // Sunrise-Edit
/// <summary>
/// Are players allowed to return on the arrivals shuttle.

25
Resources/Changelog/ChangelogSunrise.yml
View file

@ -18532,3 +18532,28 @@
type: Fix
id: 1250
time: '2025-07-12T18:05:35.371361+00:00'
- author: VigersRay
changes:
- message: "\u0422\u043E\u0447\u043A\u0438 \u0441\u043F\u0430\u0432\u043D\u0430\
\ \u0432 \u043A\u043E\u0441\u043C\u043E\u043F\u043E\u0440\u0442\u0435 \u0442\
\u0435\u043F\u0435\u0440\u044C \u043D\u0430\u0445\u043E\u0434\u044F\u0442\u0441\
\u044F \u0442\u043E\u043B\u044C\u043A\u043E \u0432\u043E\u0437\u043B\u0435 \u0434\
\u043E\u043A\u043E\u0432 \u0448\u0430\u0442\u0442\u043B\u0430 \u043F\u0440\u0438\
\u0431\u044B\u0442\u0438\u044F."
type: Fix
- message: "\u0428\u0430\u0442\u0442\u043B \u043F\u0440\u0438\u0431\u044B\u0442\u0438\
\u044F \u0442\u0435\u043F\u0435\u0440\u044C \u043A\u0443\u0440\u0441\u0438\u0440\
\u0443\u0435\u0442 \u043C\u0435\u0436\u0434\u0443 \u043A\u043E\u0441\u043C\u043E\
\u043F\u043E\u0440\u0442\u043E\u043C \u0438 \u0441\u0442\u0430\u043D\u0446\u0438\
\u0435\u0439 \u043A\u0430\u0436\u0434\u044B\u0435 30 \u0441\u0435\u043A\u0443\
\u043D\u0434."
type: Tweak
- message: "\u0421\u043F\u0430\u0432\u043D\u0435\u0440 \u044E\u0440\u0438\u0441\u0442\
\u0430 \u0442\u0435\u043F\u0435\u0440\u044C \u0438\u0441\u043F\u043E\u043B\u044C\
\u0437\u0443\u0435\u0442\u0441\u044F \u0434\u043B\u044F \u044E\u0440\u0438\u0441\
\u0442\u0430. \u0414\u043B\u044F \u0410\u0412\u0414 \u0434\u043E\u0431\u0430\
\u0432\u043B\u0435\u043D \u043E\u0442\u0434\u0435\u043B\u044C\u043D\u044B\u0439\
\ \u0441\u043F\u0430\u0432\u043D\u0435\u0440."
type: Fix
id: 1251
time: '2025-07-13T01:53:27.301069+00:00'

18671
Resources/Maps/Nonstations/transit_hub.yml
View file

File diff suppressed because it is too large Load diff

1851
Resources/Maps/_Sunrise/Nonstations/transit_hub.yml
View file

File diff suppressed because it is too large Load diff

240
Resources/Maps/_Sunrise/Station/delta.yml
View file

@ -4,8 +4,8 @@ meta:
engineVersion: 262.0.0
forkId: ""
forkVersion: ""
time: 06/20/2025 18:09:20
entityCount: 38443
time: 07/13/2025 01:47:15
entityCount: 38465
maps:
- 1
grids:
@ -26468,7 +26468,7 @@ entities:
pos: 53.5,3.5
parent: 2
- type: Door
secondsUntilStateChange: -190995.69
secondsUntilStateChange: -191246.81
state: Opening
- type: DeviceLinkSource
lastSignals:
@ -26534,7 +26534,7 @@ entities:
pos: 8.5,4.5
parent: 2
- type: Door
secondsUntilStateChange: -75217.66
secondsUntilStateChange: -75468.78
state: Opening
- type: DeviceLinkSource
lastSignals:
@ -115712,6 +115712,8 @@ entities:
- type: Transform
pos: -118.5,33.5
parent: 2
- type: NavMapBeacon
text: Спутник ИИ
- type: WarpPoint
location: Спутник ИИ
- proto: DefaultStationBeaconAME
@ -115721,6 +115723,8 @@ entities:
- type: Transform
pos: -69.5,-0.5
parent: 2
- type: NavMapBeacon
text: Генераторная
- type: WarpPoint
location: Инженерный - Генераторная
- proto: DefaultStationBeaconAnomalyGenerator
@ -115730,6 +115734,8 @@ entities:
- type: Transform
pos: -17.5,-57.5
parent: 2
- type: NavMapBeacon
text: Аномалистика
- type: WarpPoint
location: РнД - Аномалии
- proto: DefaultStationBeaconArmory
@ -115739,6 +115745,8 @@ entities:
- type: Transform
pos: 64.5,12.5
parent: 2
- type: NavMapBeacon
text: Оружейная
- type: WarpPoint
location: Оружейная
- proto: DefaultStationBeaconArrivals
@ -115748,6 +115756,8 @@ entities:
- type: Transform
pos: -11.5,69.5
parent: 2
- type: NavMapBeacon
text: Прибытие
- type: WarpPoint
location: Прибытие
- proto: DefaultStationBeaconArtifactLab
@ -115757,6 +115767,8 @@ entities:
- type: Transform
pos: -28.5,-41.5
parent: 2
- type: NavMapBeacon
text: Артефакты
- type: WarpPoint
location: Научный - Артефакты
- proto: DefaultStationBeaconAtmospherics
@ -115766,6 +115778,8 @@ entities:
- type: Transform
pos: -59.5,28.5
parent: 2
- type: NavMapBeacon
text: Атмосферный отсек
- type: WarpPoint
location: Атмос - Юг
- proto: DefaultStationBeaconBar
@ -115775,6 +115789,8 @@ entities:
- type: Transform
pos: -10.5,41.5
parent: 2
- type: NavMapBeacon
text: Бар
- type: WarpPoint
location: Сервис - Бар
- proto: DefaultStationBeaconBlueShield
@ -115784,6 +115800,8 @@ entities:
- type: Transform
pos: 9.5,-14.5
parent: 2
- type: NavMapBeacon
text: Синий щит
- type: WarpPoint
location: Синий щит
- proto: DefaultStationBeaconBotany
@ -115793,6 +115811,8 @@ entities:
- type: Transform
pos: -29.5,50.5
parent: 2
- type: NavMapBeacon
text: Гидропоника
- type: WarpPoint
location: Сервис - Гидропоника
- proto: DefaultStationBeaconBridge
@ -115802,6 +115822,8 @@ entities:
- type: Transform
pos: -0.5,16.5
parent: 2
- type: NavMapBeacon
text: Мостик
- type: WarpPoint
location: Мостик
- proto: DefaultStationBeaconBrig
@ -115811,6 +115833,8 @@ entities:
- type: Transform
pos: 50.5,13.5
parent: 2
- type: NavMapBeacon
text: Бриг
- type: WarpPoint
location: Бриг
- proto: DefaultStationBeaconCaptainsQuarters
@ -115820,6 +115844,8 @@ entities:
- type: Transform
pos: 9.5,3.5
parent: 2
- type: NavMapBeacon
text: Каюта капитана
- type: WarpPoint
location: Мостик - Комната капитана
- proto: DefaultStationBeaconCERoom
@ -115829,6 +115855,8 @@ entities:
- type: Transform
pos: -63.5,7.5
parent: 2
- type: NavMapBeacon
text: СИ
- type: WarpPoint
location: Инженерный - Офис старшего инженера
- proto: DefaultStationBeaconChapel
@ -115838,6 +115866,8 @@ entities:
- type: Transform
pos: -16.5,-70.5
parent: 2
- type: NavMapBeacon
text: Церковь
- type: WarpPoint
location: Сервис - Церковь
- proto: DefaultStationBeaconChemistry
@ -115847,6 +115877,8 @@ entities:
- type: Transform
pos: 5.5,-32.5
parent: 2
- type: NavMapBeacon
text: Химия
- type: WarpPoint
location: Медотсек - Химия
- proto: DefaultStationBeaconCMORoom
@ -115856,6 +115888,8 @@ entities:
- type: Transform
pos: 22.5,-45.5
parent: 2
- type: NavMapBeacon
text: ГВ
- type: WarpPoint
location: Медотсек - Кабинет главрача
- proto: DefaultStationBeaconCourtroom
@ -115865,6 +115899,8 @@ entities:
- type: Transform
pos: 26.5,-1.5
parent: 2
- type: NavMapBeacon
text: Суд
- type: WarpPoint
location: Зал суда
- proto: DefaultStationBeaconCryonics
@ -115874,6 +115910,8 @@ entities:
- type: Transform
pos: 22.5,-39.5
parent: 2
- type: NavMapBeacon
text: Крио
- type: WarpPoint
location: Медотсек - криогеника
- proto: DefaultStationBeaconCryosleep
@ -115892,6 +115930,8 @@ entities:
- type: Transform
pos: 35.5,11.5
parent: 2
- type: NavMapBeacon
text: Детектив
- type: WarpPoint
location: Детектив
- proto: DefaultStationBeaconDisposals
@ -115901,6 +115941,8 @@ entities:
- type: Transform
pos: 28.5,59.5
parent: 2
- type: NavMapBeacon
text: Мусорка
- type: WarpPoint
location: Мусоросброс
- proto: DefaultStationBeaconEngineering
@ -115910,6 +115952,8 @@ entities:
- type: Transform
pos: -53.5,11.5
parent: 2
- type: NavMapBeacon
text: Инженерный отдел
- type: WarpPoint
location: Инженерный отдел
- uid: 16602
@ -115917,6 +115961,8 @@ entities:
- type: Transform
pos: 25.5,78.5
parent: 2
- type: NavMapBeacon
text: Доки
- type: WarpPoint
location: Доки
- proto: DefaultStationBeaconEvac
@ -115926,6 +115972,8 @@ entities:
- type: Transform
pos: -4.5,-72.5
parent: 2
- type: NavMapBeacon
text: Отбытие
- type: WarpPoint
location: Отбытие
- proto: DefaultStationBeaconEVAStorage
@ -115935,6 +115983,8 @@ entities:
- type: Transform
pos: -11.5,-13.5
parent: 2
- type: NavMapBeacon
text: Хранилище EVA
- type: WarpPoint
location: Командование - Хранение EVA
- proto: DefaultStationBeaconGravGen
@ -115944,6 +115994,8 @@ entities:
- type: Transform
pos: -71.5,7.5
parent: 2
- type: NavMapBeacon
text: Генератор гравитации
- type: WarpPoint
location: Инженерный - Гравитационный генератор
- proto: DefaultStationBeaconHOPOffice
@ -115953,6 +116005,8 @@ entities:
- type: Transform
pos: -10.5,1.5
parent: 2
- type: NavMapBeacon
text: ГП
- type: WarpPoint
location: Мостик - Глава персонала
- proto: DefaultStationBeaconKitchen
@ -115962,6 +116016,8 @@ entities:
- type: Transform
pos: -30.5,35.5
parent: 2
- type: NavMapBeacon
text: Кухня
- type: WarpPoint
location: Сервис - Кухня
- proto: DefaultStationBeaconLibrary
@ -115971,6 +116027,8 @@ entities:
- type: Transform
pos: -28.5,-3.5
parent: 2
- type: NavMapBeacon
text: Библиотека
- type: WarpPoint
location: Библиотека - Центральный зал
- proto: DefaultStationBeaconMedbay
@ -115980,6 +116038,8 @@ entities:
- type: Transform
pos: 8.5,-25.5
parent: 2
- type: NavMapBeacon
text: Медбей
- type: WarpPoint
location: Медотсек - Лобби
- proto: DefaultStationBeaconMorgue
@ -115989,6 +116049,8 @@ entities:
- type: Transform
pos: 7.5,-50.5
parent: 2
- type: NavMapBeacon
text: Морг
- type: WarpPoint
location: Медотсек - Морг
- proto: DefaultStationBeaconQMRoom
@ -115998,6 +116060,8 @@ entities:
- type: Transform
pos: 26.5,36.5
parent: 2
- type: NavMapBeacon
text: КМ
- type: WarpPoint
location: Снабжение - Офис квартирмейстер
- proto: DefaultStationBeaconRDRoom
@ -116007,6 +116071,8 @@ entities:
- type: Transform
pos: -18.5,-40.5
parent: 2
- type: NavMapBeacon
text: НР
- type: WarpPoint
location: Научный - Офис научного руководителя
- proto: DefaultStationBeaconSalvage
@ -116016,6 +116082,8 @@ entities:
- type: Transform
pos: 29.5,49.5
parent: 2
- type: NavMapBeacon
text: Утилизаторская
- type: WarpPoint
location: Утилизаторская
- proto: DefaultStationBeaconScience
@ -116025,6 +116093,8 @@ entities:
- type: Transform
pos: -6.5,-32.5
parent: 2
- type: NavMapBeacon
text: Научный
- type: WarpPoint
location: Научный - РНД
- proto: DefaultStationBeaconSecurity
@ -116034,6 +116104,8 @@ entities:
- type: Transform
pos: 54.5,6.5
parent: 2
- type: NavMapBeacon
text: Служба безопасности
- type: WarpPoint
location: Служба безопасности
- uid: 16616
@ -116041,11 +116113,15 @@ entities:
- type: Transform
pos: 42.5,29.5
parent: 2
- type: NavMapBeacon
text: Склад вещдоков
- uid: 16617
components:
- type: Transform
pos: 50.5,25.5
parent: 2
- type: NavMapBeacon
text: Процедурная
- proto: DefaultStationBeaconSecurityCheckpoint
entities:
- uid: 16618
@ -116053,6 +116129,8 @@ entities:
- type: Transform
pos: 6.5,-59.5
parent: 2
- type: NavMapBeacon
text: КПП
- type: WarpPoint
location: Отбытие - КПП
- uid: 16619
@ -116060,6 +116138,8 @@ entities:
- type: Transform
pos: 46.5,10.5
parent: 2
- type: NavMapBeacon
text: КПП СБ
- type: WarpPoint
location: КПП СБ
- proto: DefaultStationBeaconServerRoom
@ -116069,6 +116149,8 @@ entities:
- type: Transform
pos: -19.5,-52.5
parent: 2
- type: NavMapBeacon
text: Серверная
- type: WarpPoint
location: Научный - серверная
- proto: DefaultStationBeaconService
@ -116078,6 +116160,8 @@ entities:
- type: Transform
pos: 25.5,70.5
parent: 2
- type: NavMapBeacon
text: Закусочная
- type: WarpPoint
location: Закусочная
- proto: DefaultStationBeaconSolars
@ -116087,6 +116171,8 @@ entities:
- type: Transform
pos: -75.5,73.5
parent: 2
- type: NavMapBeacon
text: С-З Соляры
- type: WarpPoint
location: С-З Соляры
- uid: 16623
@ -116094,6 +116180,8 @@ entities:
- type: Transform
pos: -51.5,-85.5
parent: 2
- type: NavMapBeacon
text: Ю-З Соляры
- type: WarpPoint
location: Ю-З Соляры
- uid: 16624
@ -116101,6 +116189,8 @@ entities:
- type: Transform
pos: 42.5,95.5
parent: 2
- type: NavMapBeacon
text: С-В Соляры
- type: WarpPoint
location: С-В Соляры
- proto: DefaultStationBeaconSupply
@ -116110,6 +116200,8 @@ entities:
- type: Transform
pos: 6.5,30.5
parent: 2
- type: NavMapBeacon
text: Снабжение
- type: WarpPoint
location: Снабжение - Холл
- proto: DefaultStationBeaconSurgery
@ -116119,6 +116211,8 @@ entities:
- type: Transform
pos: 32.5,-48.5
parent: 2
- type: NavMapBeacon
text: Хирургия
- type: WarpPoint
location: Медбей - операционная
- proto: DefaultStationBeaconTEG
@ -116128,6 +116222,8 @@ entities:
- type: Transform
pos: -51.5,50.5
parent: 2
- type: NavMapBeacon
text: ТЭГ
- type: WarpPoint
location: Атмос ТЭГ
- proto: DefaultStationBeaconTheater
@ -116137,6 +116233,8 @@ entities:
- type: Transform
pos: -11.5,30.5
parent: 2
- type: NavMapBeacon
text: Театр
- type: WarpPoint
location: Сервис - Театр
- proto: DefaultStationBeaconToolRoom
@ -116146,6 +116244,8 @@ entities:
- type: Transform
pos: -26.5,12.5
parent: 2
- type: NavMapBeacon
text: Инструменты
- type: WarpPoint
location: Инженерный - Основное хранилище инструментов
- proto: DefaultStationBeaconWardensOffice
@ -116155,6 +116255,8 @@ entities:
- type: Transform
pos: 46.5,16.5
parent: 2
- type: NavMapBeacon
text: Смотритель
- type: WarpPoint
location: Смотритель
- uid: 16631
@ -116162,6 +116264,8 @@ entities:
- type: Transform
pos: 55.5,14.5
parent: 2
- type: NavMapBeacon
text: Смотритель
- type: WarpPoint
location: Смотритель
- proto: DefibrillatorCabinetFilled
@ -199097,12 +199201,24 @@ entities:
rot: -1.5707963267948966 rad
pos: -64.5,52.5
parent: 2
- type: ContainerContainer
containers:
machine_board: !type:Container
ents: []
machine_parts: !type:Container
ents: []
- uid: 28632
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -65.5,52.5
parent: 2
- type: ContainerContainer
containers:
machine_board: !type:Container
ents: []
machine_parts: !type:Container
ents: []
- proto: ReinforcedPlasmaWindow
entities:
- uid: 28633
@ -212779,6 +212895,13 @@ entities:
- type: Transform
pos: 79.5,-0.5
parent: 2
- proto: SpawnPointIAA
entities:
- uid: 38465
components:
- type: Transform
pos: -0.5,13.5
parent: 2
- proto: SpawnPointJanitor
entities:
- uid: 30900
@ -212798,6 +212921,98 @@ entities:
- type: Transform
pos: -6.5,-41.5
parent: 2
- proto: SpawnPointLatejoin
entities:
- uid: 38447
components:
- type: Transform
pos: -37.5,69.5
parent: 2
- uid: 38448
components:
- type: Transform
pos: -36.5,69.5
parent: 2
- uid: 38449
components:
- type: Transform
pos: -35.5,69.5
parent: 2
- uid: 38450
components:
- type: Transform
pos: -27.5,69.5
parent: 2
- uid: 38451
components:
- type: Transform
pos: -28.5,67.5
parent: 2
- uid: 38452
components:
- type: Transform
pos: -27.5,67.5
parent: 2
- uid: 38453
components:
- type: Transform
pos: -26.5,67.5
parent: 2
- uid: 38454
components:
- type: Transform
pos: -25.5,67.5
parent: 2
- uid: 38455
components:
- type: Transform
pos: -23.5,67.5
parent: 2
- uid: 38456
components:
- type: Transform
pos: -25.5,69.5
parent: 2
- uid: 38457
components:
- type: Transform
pos: -24.5,69.5
parent: 2
- uid: 38458
components:
- type: Transform
pos: -23.5,69.5
parent: 2
- uid: 38459
components:
- type: Transform
pos: -21.5,67.5
parent: 2
- uid: 38460
components:
- type: Transform
pos: -16.5,69.5
parent: 2
- uid: 38461
components:
- type: Transform
pos: -15.5,69.5
parent: 2
- uid: 38462
components:
- type: Transform
pos: -8.5,69.5
parent: 2
- uid: 38463
components:
- type: Transform
pos: 13.5,69.5
parent: 2
- uid: 38464
components:
- type: Transform
pos: 15.5,69.5
parent: 2
- proto: SpawnPointLawyer
entities:
- uid: 30903
@ -213196,6 +213411,23 @@ entities:
- type: Transform
pos: -16.5,-46.5
parent: 2
- proto: SpawnPointSalvageSpecialist
entities:
- uid: 38444
components:
- type: Transform
pos: 30.5,48.5
parent: 2
- uid: 38445
components:
- type: Transform
pos: 30.5,49.5
parent: 2
- uid: 38446
components:
- type: Transform
pos: 30.5,50.5
parent: 2
- proto: SpawnPointScientist
entities:
- uid: 30975

2
Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
View file

@ -239,7 +239,7 @@
name: lawyer
components:
- type: SpawnPoint
job_id: IAA # Lawyer replaced with IAA
job_id: Lawyer
- type: Sprite
layers:
- state: green

12
Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml
View file

@ -404,3 +404,15 @@
state: service
- sprite: Mobs/Silicon/chassis.rsi
state: service_e
- type: entity
id: SpawnPointIAA
parent: SpawnPointJobBase
name: iaa
components:
- type: SpawnPoint
job_id: IAA
- type: Sprite
layers:
- state: green
- state: lawyer