Переработка системы спавна и стыковки шаттлов к станциям, Офицер Внутреннего Надзора, Офицер Специальных Операций, добавление музыки в лобби, добавление наших шаттлов ОБР, РХБЗЗ в билд (#21)

* Перемещение определения работы BlueShieldEnsign и BlueShieldOfficer в закомментированный блок

* Обновление URL для книги корпоративного права

* Update README.md

* Добавление новых плюшевых игрушек CE vulpa и Engie xeno

* fix(maps): update centcomm map path and name template

Update map path to use _Fish variant and modify station name template to include special operations HQ

* add IAA job assets and uniform variants

add new job icons, law department badge, and centcom officer uniform variants
include localization files and prototype configurations for new assets
modify IAA role loadout to use new badge and uniform

* fix(localization): correct jumpskirts uniform file path and content

Move jumpskirts uniform localization file to correct directory and ensure content is properly formatted

* New Ghosts

Add a new ghosts from the old fish station

* Добавление новых ролей и загрузок для CentComm и BlueShield, включая описание и иконки.

* Оперативник «Синий щит» (гост-роль сопровождения ПЦК и тд) и исправления локализации «Синий щит» и ИСН (#2608)

* ERT Uplink Tweaks (#2600)

* Automatic changelog update

* Печать штаба спецопераций (#2599)

* Имплант "Жуткий Смех" в набор вора (#2607)

* Респрайт Мехов (#2617)

* Automatic changelog update

* Очередной фикс маркингов (#2635)

* fix editor (#2641)

* dispacement-drawing-fix (#2642)

* reset pos on client restart (#2643)

* save pos when closing by button (#2644)

* Добавлены новые роли: шеф и врач. Обновлены иконки для новых ролей.

* Updated centcom map

* Добавлены описания и названия для новых ролей Центкома и «Синий Щит» в английском и русском языках.

* add turtle ghost theme and update ghost assets

- Add new turtle ghost theme with animations and localization
- Replace default ghost assets with custom _Fish variants
- Update logo manifest and references to use new ghost sprites
- Remove old _Sunrise ghost assets and consolidate under _Fish

* update splash logo comment in manifest.yml

* remove slippery component from honkbot and update descriptions

The slippery component was causing unintended behavior with honkbot movement. Also updated the bot's description in both English and Russian locales to better reflect its nature.

* Добавлены новые роли для СЦК и печать Секторального судьи и прочие изменение.

* Refactor Centcom Blue Shield identifiers and update job configurations

- Changed SpawnPointCentcomBlueShield to SpawnPointCentcommBlueShield for consistency.
- Updated centcom_blueshield_officer.yml to change icon from JobIconBlueShield to JobIconNanotrasen.
- Adjusted delta.yml to maintain consistent naming conventions for BlueShield roles and added NtrOfficer.
- Cleaned up migration.yml by removing unused references to BlueShield lockers and suits.

* Обновлены роли в дельте. Изменено количество роли на дельте.

* Удалены устаревшие имя роли Центком и добавлены новые имя роли для английского и русского языков

* moved duplicate ghost theme file and consolidate strings

* Изменено название роли "Офицер Синего Щита Центком" на "оперативник «Синий щит»" для улучшения точности перевода.

* Обновлены роли и идентификаторы Центком для улучшения точности и актуальности

* update ghost theme sprite path and localization

* remove extra blank line in ghost_themes.yml

* add von Valantius painting and related assets

Add new painting texture, localization files, and prototype for Centcomm von Valantius painting. Includes English and Russian translations. Also reorganize some existing localization files for sectoral judge items.

* minor update elizabeth von valantius painting texture

* add new audio, textures, and prototypes, major changes in grid spawning and docking system

- Add new lobby music tracks and sound effects with proper licensing
- Implement new job roles: Oversight Officer and SpecOps Officer
- Add new shuttle docking system for special operations teams
- Include localization files for new content
- Update station maps and job configurations
- Add new equipment and weapons for special operations personnel
- Implemented updated automatic grid spawning and docking system

* update centcom oversight equipment to use correct headset

Change headset from Magistrate to FishCentCom variant to match intended equipment specification

* update logo-fish-splash.png texture

---------

Co-authored-by: VladSukr <vladsukr@gmail.com>
Co-authored-by: ReWAFFlution <153686236+ReWAFFlution@users.noreply.github.com>
Co-authored-by: SplikZerys <tronezero700@yandex.ru>
Co-authored-by: pixarF <sadfrogisfrog@gmail.com>
Co-authored-by: KaiserMaus <kaiser.ratte@gmail.com>
Co-authored-by: Sunrise-Bot <sunrise.project.top@gmail.com>
Co-authored-by: Kendrick <133131761+Kendrick15@users.noreply.github.com>
Co-authored-by: haiwwkes <49613070+rhailrake@users.noreply.github.com>

Content.Server/Chat/Systems/ChatSystem.cs

@@ -66,7 +66,7 @@ public sealed partial class ChatSystem : SharedChatSystem
     [Dependency] private readonly ExamineSystemShared _examineSystem = default!;
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
 
-    public const string DefaultAnnouncementSound = "/Audio/_Sunrise/Announcements/announce_dig.ogg"; // Sunrise-edit
+    public const string DefaultAnnouncementSound = "/Audio/Announcements/announce.ogg"; // Fish-edit
 
     private bool _loocEnabled = true;
     private bool _deadLoocEnabled;

Content.Server/StationEvents/Components/MeteorSwarmComponent.cs

@@ -33,7 +33,7 @@ public sealed partial class MeteorSwarmComponent : Component
     public LocId? Announcement = "station-event-meteor-swarm-start-announcement";
 
     [DataField]
-    public SoundSpecifier? AnnouncementSound = new SoundPathSpecifier("/Audio/_Sunrise/Announcements/announce_dig.ogg") // Sunrise-edit
+    public SoundSpecifier? AnnouncementSound = new SoundPathSpecifier("/Audio/Announcements/announce.ogg") // Fish-edit
     {
         Params = new()
         {

Content.Server/_Sunrise/GridDock/GridDockSystem.cs

@@ -14,10 +14,15 @@ public sealed class GridDockSystem : EntitySystem
     [Dependency] private readonly MapLoaderSystem _loader = default!;
     [Dependency] private readonly ShuttleSystem _shuttles = default!;
     [Dependency] private readonly StationSystem _station = default!;
+    private Vector2 _nextSpawnOffset;
+    private const float GridSeparation = 300f;
+    // Fish-end
 
     public override void Initialize()
     {
+        _nextSpawnOffset = new Vector2(500, 500); // Fish-edit
         SubscribeLocalEvent<SpawnGridAndDockToStationComponent, StationPostInitEvent>(OnStationPostInit);
+        SubscribeLocalEvent<SpawnAdditionalGridsAndDockToStationComponent, StationPostInitEvent>(OnStationPostInitMultiple); // Fish-edit
     }
 
     private void OnStationPostInit(EntityUid uid, SpawnGridAndDockToStationComponent component, StationPostInitEvent args)
@@ -27,25 +32,34 @@ public sealed class GridDockSystem : EntitySystem
 
         var ftlMap = _shuttles.EnsureFTLMap();
         var xformMap = Transform(ftlMap);
+        // Fish-start
+        var spawnPosition = _nextSpawnOffset;
+        _nextSpawnOffset.X += GridSeparation;
+        // Fish-end
         if (!_loader.TryLoadGrid(xformMap.MapID,
                 component.GridPath.Value,
                 out var rootUid,
-                offset: new Vector2(500, 500)))
+                offset: spawnPosition)) // Fish-edit
             return;
 
-        if (!TryComp<ShuttleComponent>(rootUid.Value.Owner, out var shuttleComp))
+        // Fish-start
+        if (rootUid == null)
+            return;
+
+        if (!TryComp<ShuttleComponent>(rootUid.Value, out var shuttleComp))
+            // Fish-end
             return;
 
         var target = _station.GetLargestGrid(Comp<StationDataComponent>(uid));
 
         if (target == null)
         {
-            Log.Error($"GridDockSystem: No target grid found for {ToPrettyString(uid)}");
+            Log.Error($"GridDockSystem: No target station grid found for {ToPrettyString(uid)}"); // Fish-edit
             return;
         }
 
         _shuttles.FTLToDock(
-            rootUid.Value.Owner,
+            rootUid.Value, // Fish-edit
             shuttleComp,
             target.Value,
             5f,
@@ -53,4 +67,55 @@ public sealed class GridDockSystem : EntitySystem
             priorityTag: component.PriorityTag,
             ignored: true);
     }
+
+    // Fish-start
+    private void OnStationPostInitMultiple(EntityUid uid, SpawnAdditionalGridsAndDockToStationComponent component, StationPostInitEvent args)
+    {
+        var target = _station.GetLargestGrid(Comp<StationDataComponent>(uid));
+        if (target == null)
+        {
+            Log.Error($"GridDockSystem: No target station grid found for {ToPrettyString(uid)}. Aborting.");
+            return;
+        }
+
+        var ftlMap = _shuttles.EnsureFTLMap();
+        var xformMap = Transform(ftlMap);
+
+        foreach (var spawnEntry in component.Spawns)
+        {
+            var spawnPosition = _nextSpawnOffset;
+            _nextSpawnOffset.X += GridSeparation;
+
+            if (!_loader.TryLoadGrid(xformMap.MapID,
+                    spawnEntry.GridPath,
+                    out var gridUid,
+                    offset: spawnPosition))
+            {
+                Log.Warning($"Failed to load grid from path: {spawnEntry.GridPath}");
+                continue;
+            }
+
+            if (gridUid == null)
+            {
+                Log.Warning($"Loaded grid from {spawnEntry.GridPath}, but it was empty.");
+                continue;
+            }
+
+            if (!TryComp<ShuttleComponent>(gridUid.Value, out var shuttleComp))
+            {
+                Log.Warning($"Spawned grid {ToPrettyString(gridUid.Value)} from {spawnEntry.GridPath} has no ShuttleComponent. Skipping docking.");
+                continue;
+            }
+
+            _shuttles.FTLToDock(
+                gridUid.Value,
+                shuttleComp,
+                target.Value,
+                5f,
+                5f,
+                priorityTag: spawnEntry.PriorityTag,
+                ignored: true);
+        }
+    }
+    // Fish-end
 }

Content.Server/_Sunrise/GridDock/SpawnAdditionalGridsAndDockToStationComponent.cs

@@ -0,0 +1,26 @@
+using Robust.Shared.Utility;
+
+namespace Content.Server._Sunrise.RoundStartFtl;
+
+/// <summary>
+/// Spawns a list of grids and docks them to the parent station on round start.
+/// </summary>
+[RegisterComponent]
+public sealed partial class SpawnAdditionalGridsAndDockToStationComponent : Component
+{
+    [DataField("spawns", required: true)]
+    public List<GridSpawnEntry> Spawns = new();
+}
+
+/// <summary>
+/// Defines a single grid to be spawned.
+/// </summary>
+[DataDefinition]
+public sealed partial class GridSpawnEntry
+{
+    [DataField("gridPath", required: true)]
+    public ResPath GridPath { get; private set; }
+
+    [DataField("priorityTag", required: true)]
+    public string PriorityTag { get; private set; } = string.Empty;
+}

Resources/Audio/_Fish/Lobby/attributions.yml

@@ -0,0 +1,34 @@
+- files: ["title2.ogg"]
+  license: "Custom"
+  copyright: "Originally composed by Jonathan Dunn for Robocop 2 Gameboy published by Ocean Software. Remixed by Eric Shumaker for his video Dilbert 3. As of October 9th, 2008 nobody owns the rights to this song and copyright action has never been taken against anyone using this song in their projects."
+  source: "https://www.youtube.com/watch?v=4o6_8Unj2mQ"
+
+- files: ["title3.ogg"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "Title3 by Cuboos. It is a remix of the song 'Tintin on the Moon'. Converted from MP3 to OGG."
+  source: "https://www.youtube.com/watch?v=YKVmXn-Gv0M"
+
+- files: ["title3.ogg"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "Title3 by Cuboos. It is a remix of the song 'Tintin on the Moon'. Converted from MP3 to OGG."
+  source: "https://www.youtube.com/watch?v=YKVmXn-Gv0M"
+
+- files: ["mod.flip-flap.ogg"]
+  license: "Custom"
+  copyright: "Flip Flap by X-ceed is licensed under a short but clear license (see flip-flap.txt in this directory) and is free for non-commercial use. It was converted from MOD to WAV using Schism Tracker, in 16 Bit, Non-Interpolated mode, no output equalizer settings, Ramp volume at start of sample enabled. From there it was converted to OGG Vorbis with `ffmpeg -i flip-flap.wav -q 2.9 flip-flap-renc.ogg` (quality scale chosen to match size of the OGG file being replaced). Non-interpolated mode was chosen as the module has a high enough sample rate to balance it out, but seems muffled in other interpolation modes. If 'Ramp volume at start of sample' is not enabled, a clicking phenomenon results."
+  source: "http://aminet.net/package/mods/xceed/Flipflap"
+
+- files: ["every_light_is_blinking_at_once.ogg"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "every light is blinking at once by Sunbeamstress/Lauren Loveless."
+  source: "https://soundcloud.com/sunbeamstress/every-light-is-blinking-at-once"
+
+- files: ["neon.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "Created by QAntum for SS220"
+  source: "https://github.com/SerbiaStrong-220"
+
+- files: ["double-u.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "Created by QAntum for SS220"
+  source: "https://github.com/SerbiaStrong-220"

Resources/Audio/_Fish/Lobby/flip-flap.txt

@@ -0,0 +1,42 @@
+Short:        FASt sWINNGy - jAZZy mODULe         [PT]
+Author:       X-CEED / eNDZEIt (x-ceed@union.org.pl)
+Uploader:     X-CEED / eNDZEIt (x-ceed union org pl)
+Type:         mods/xceed
+Architecture: generic
+
+
+   ..ooOO(()) aLl yOu nEEd iZ dA mUsIc bY X-cEEd! (())OOoo..
+ _______                                      _______      
+x\----- \  ____)\            X-[EE[)          \----- \  ____)\ 
+ c\      \/     /                              \      \/     /
+  e\           /         the musician of        \           /
+   e\ /       /                                  \ /       /
+    d/       /         eNDZEIt & aPPeNDIx         /       /x
+    /       / \                                  /       / \c
+   / ____      \   e-mail: x-ceed@union.org.pl  / ____      \e 
+   )/    \      \   phone:  +48 (o22)7749849    )/    \      \e
+          \______\  irc: #amisia, #amigascne           \______\d
+          
+   ..ooOO(()) aLl yOu nEEd iZ dA mUsIc bY X-cEEd! (())OOoo..
+
+      
+                          /X/ fLIP-fLAP \X\
+
+                                 bY
+
+                    X-CEED of eNDZEIt & aPPeNDIx
+
+
+ATTENTION - ATTENTION - ATTENTION - ATTENTION - ATTENTION - ATTENTION
+---------------------------------------------------------------------
+
+                    This music is copyrighted by 
+                  Wojciech ("X-CEED") Panufnik and 
+          MAY NOT be sold  without my personal permision. 
+            You can distribute and spread it as long as 
+                  you don't take money for that. If
+                 you want to make any profit on it, 
+                         please contact me.
+
+---------------------------------------------------------------------
+ATTENTION---ATTENTION---ATTENTION---ATTENTION---ATTENTION---ATTENTION

Resources/Locale/en-US/_fish/_sunrise/preferences/loadout-groups.ftl

@@ -0,0 +1 @@
+loadout-group-specops-jumpsuit = Uniform of the Special Operations Officer

Resources/Locale/en-US/_prototypes/_fish/entities/clothing/head/hats.yml

@@ -0,0 +1,2 @@
+ent-ClothingHeadCapBlueShield = blueshield's commander cap
+    .desc = Special blue uniform cap with gold NanoTrasen engraving.

Resources/Locale/en-US/_prototypes/_fish/entities/objects/weapons/guns/battery/battery_guns.ftl

@@ -0,0 +1,2 @@
+ent-WeaponEnergyGunMultiphaseImproved = x-01-a improved multiphase energy gun
+    .desc = This is an expensive, modern recreation of an antique laser gun. This gun has several unique firemodes. It doesn't lack the ability to recharge over time.

Resources/Locale/en-US/_prototypes/_fish/entities/stations/base.ftl

@@ -0,0 +1,2 @@
+ent-BaseStationFishShuttles = { "" }
+    .desc = { "" }

Resources/Locale/en-US/_prototypes/_fish/entities/structures/doors/airlocks/access.ftl

@@ -0,0 +1,6 @@
+ent-AirlockExternalGlassFishSecurityShuttle = { ent-AirlockGlassShuttle }
+    .suffix = External, Security, Glass, Docking
+ent-AirlockExternalGlassFishERTShuttle = { ent-AirlockGlassShuttle }
+    .suffix = External, ERT, Glass, Docking
+ent-AirlockExternalGlassFishCBURNShuttle = { ent-AirlockGlassShuttle }
+    .suffix = External, CBURN, Glass, Docking

Resources/Locale/en-US/_strings/_fish/job/job-desc.ftl

@@ -2,3 +2,5 @@ job-description-centcomm-sectoral-judge = Вы само правосудие с
 job-description-centcomofficer = Не одобряйте эвакуацию. Не одобряйте ОБР. Делите зарплату экипажа станций на 0.
 job-description-centcomtrainee = Вы стажер! Ваша задача это учится и ещё раз учится у старших по званию!
 job-description-centcom-blueshield = Ваша главная задача - выполнять задачи по охране особо важных лиц.
+job-description-centcom-oversightofficer = Отвечает за справедливость и законность в интересах Nanotrasen.
+job-description-specopsofficer = Вы офицер специальных операций, отвечающий за стратегическую безопасность сектора.

Resources/Locale/en-US/_strings/_fish/job/job-names.ftl

@@ -2,8 +2,13 @@ job-name-centcomm-sectoral-judge = секторальный судья
 job-name-centcomofficer = офицер Центком
 job-name-centcomtr = стажер Центком
 job-name-centcom-blueshield = оперативник «Синий щит»
+job-name-oversightofficer = офицер внутреннего надзора
+job-name-specopsofficer = офицер специальных операций
 # Перевод трекеров времени
 JobCentcommSectoralJudge = секторальный судья
 jobCentCommOfficer = офицер Центком
 JobCentCommTrainee = стажер Центком
 JobCentcomBlueShield = оперативник «Синий щит»
+JobRepresentativeBlueShield = оперативник «Синий щит»
+JobOversightOfficer = оперативник «Синий щит»
+JobSpecOpsOfficer = special operations officer

Resources/Locale/en-US/_strings/_fish/job/job-supervisors.ftl

@@ -0,0 +1,7 @@
+job-supervisors-oversight = Internal Oversight Officer
+job-supervisors-specops = Special Operations Officer
+job-supervisors-ertleader = Emergency Response Team Leader
+job-supervisors-centcomhead = Central Command Headquarters Chief
+job-supervisors-specopshead = Special Operations Director
+job-supervisors-supremecourt = Nanotrasen Supreme Court
+job-supervisors-representative = Nanotrasen Representative

Resources/Locale/ru-RU/_fish/_sunrise/preferences/loadout-groups.ftl

@@ -0,0 +1 @@
+loadout-group-specops-jumpsuit = Униформа ОСО

Resources/Locale/ru-RU/_prototypes/_fish/entities/clothing/head/hats.yml

@@ -0,0 +1,2 @@
+ent-ClothingHeadCapBlueShield = фуражка командира «Синий щит»
+    .desc = Особая синяя форменная фуражка с золотой гравировкой Nanotrasen.

Resources/Locale/ru-RU/_prototypes/_fish/entities/objects/weapons/guns/battery/battery_guns.ftl

@@ -0,0 +1,3 @@
+
+ent-WeaponEnergyGunMultiphaseImproved = X-01-A мультифазный самозарядный энергетический карабин
+    .desc = Это дорогая современная реконструкция старинного лазерного пистолета. Пистолет имеет несколько уникальных режимов стрельбы. Не лишен возможности перезаряжаться со временем.

Resources/Locale/ru-RU/_prototypes/_fish/entities/stations/base.ftl

@@ -0,0 +1,2 @@
+ent-BaseStationFishShuttles = { "" }
+    .desc = { "" }

Resources/Locale/ru-RU/_prototypes/_fish/entities/structures/doors/airlocks/access.ftl

@@ -0,0 +1,6 @@
+ent-AirlockExternalGlassFishSecurityShuttle = { ent-AirlockGlassShuttle }
+    .suffix = Внешний, СБ, Стеклянный, Стыковочный
+ent-AirlockExternalGlassFishERTShuttle = { ent-AirlockGlassShuttle }
+    .suffix = Внешний, ОБР, Стеклянный, Стыковочный
+ent-AirlockExternalGlassFishCBURNShuttle = { ent-AirlockGlassShuttle }
+    .suffix = Внешний, РХБЗЗ, Стеклянный, Стыковочный

Resources/Locale/ru-RU/_strings/_fish/job/department.ftl

@@ -1 +1,4 @@
 department-BlueShield = Спецподразделение «Синий щит»
+department-SpecialOperationsAlt = Департамент специальных операций
+department-LawAlt = Департамент внутреннего надзора
+department-Court = Судебная система Nanotrasen

Resources/Locale/ru-RU/_strings/_fish/job/job-desc.ftl

@@ -2,3 +2,5 @@ job-description-centcomm-sectoral-judge = Вы само правосудие с
 job-description-centcomofficer = Не одобряйте эвакуацию. Не одобряйте ОБР. Делите зарплату экипажа станций на 0.
 job-description-centcomtrainee = Вы стажер! Ваша задача это учится и ещё раз учится у старших по званию!
 job-description-centcom-blueshield = Ваша главная задача - выполнять задачи по охране особо важных лиц.
+job-description-centcom-oversightofficer = Отвечает за справедливость и законность в интересах Nanotrasen.
+job-description-specopsofficer = Вы офицер специальных операций, отвечающий за стратегическую безопасность сектора.

Resources/Locale/ru-RU/_strings/_fish/job/job-names.ftl

@@ -2,9 +2,14 @@ job-name-centcomm-sectoral-judge = секторальный судья
 job-name-centcomofficer = офицер Центком
 job-name-centcomtr = стажер Центком
 job-name-centcom-blueshield = оперативник «Синий щит»
+job-name-oversightofficer = офицер внутреннего надзора
+job-name-specopsofficer = офицер специальных операций
 # Перевод трекеров времени
 JobCentcommSectoralJudge = секторальный судья
 JobCentcomBlueShield = оперативник «Синий щит»
 jobCentCommOfficer = офицер Центком
 JobCentCommTrainee = стажер Центком
+JobRepresentativeBlueShield = оперативник «Синий щит»
+JobOversightOfficer = офицер внутреннего надщора
+JobSpecOpsOfficer = офицер специальных операций
 

Resources/Locale/ru-RU/_strings/_fish/job/job-supervisors.ftl

@@ -0,0 +1,8 @@
+job-supervisors-oversight = Офицеру Внутреннего Надзора
+job-supervisors-oversightdep = Департаменту внутреннего надзора
+job-supervisors-specops = Офицеру Специальных Операций
+job-supervisors-ertleader = Лидеру Отряда Сил Специальных Операций
+job-supervisors-centcomhead = Начальнику штаба Центрального Командования
+job-supervisors-specopshead = Директору Специальных Операций
+job-supervisors-supremecourt = Верховному суду Nanotrasen
+job-supervisors-representative = Представителю Nanotrasen

Resources/Locale/ru-RU/_strings/_sunrise/job/department.ftl

@@ -1,4 +1,4 @@
 department-Law = Юридический отдел
-department-Blueshield = Синий Щит
+department-Blueshield = Спецподразделение «Синий щит»
 department-PlanetPrison = Планетарная тюрьма
-department-SpecialOperations = Специальные Операции
+department-SpecialOperations = Департамент специальных операций

Resources/Maps/_Fish/empty_map.yml

@@ -0,0 +1,28 @@
+meta:
+  format: 7
+  category: Map
+  engineVersion: 262.0.0
+  forkId: ""
+  forkVersion: ""
+  time: 07/28/2025 08:43:38
+  entityCount: 1
+maps:
+- 1
+grids: []
+orphans: []
+nullspace: []
+tilemap: {}
+entities:
+- proto: ""
+  entities:
+  - uid: 1
+    components:
+    - type: MetaData
+      name: Empty Map
+    - type: Transform
+    - type: Map
+      mapPaused: True
+    - type: GridTree
+    - type: Broadphase
+    - type: OccluderTree
+...

Resources/Prototypes/Entities/Mobs/Player/silicon.yml

@@ -73,7 +73,7 @@
     title: comms-console-announcement-title-station-ai
     color: "#5ed7aa"
     announceVoice: PortalGlados # Sunrise-Edit
-    sound: /Audio/_Sunrise/Announcements/announce_dig.ogg # Sunrise-Edit
+    sound: /Audio/Announcements/announce.ogg # Fish-Edit
   - type: ShowJobIcons
   # Sunrise-Start
   - type: ShowThirstIcons

Resources/Prototypes/Entities/Stations/nanotrasen.yml

@@ -38,6 +38,7 @@
     - BaseStationMeteorSwarmTarget
     - BaseStationRandomXenoArtifact
   # Sunrise-End
+    - BaseStationFishShuttles
   components:
     - type: Transform
 
@@ -56,6 +57,7 @@
     - BaseStationDontSelling
     - BaseStationCryoTeleport
     # Sunrise-End
+    - BaseStationFishSpecOpsShuttles #Fish-edit
   components:
     - type: Transform
     # - type: ProtectedGrid #Fish-edit

Resources/Prototypes/GameRules/cargo_gifts.yml

@@ -30,7 +30,7 @@
   - type: StationEvent
     startColor: "#18abf5"
     startAudio:
-      path: /Audio/_Sunrise/Announcements/announce_dig.ogg
+      path: /Audio/Announcements/announce.ogg # Fish-edit
   - type: CargoGiftsRule
     sender: cargo-gift-default-sender
 

Resources/Prototypes/GameRules/events.yml

@@ -81,7 +81,7 @@
   - type: StationEvent
     startAnnouncementColor: "#18abf5"
     startAudio:
-      path: /Audio/_Sunrise/Announcements/announce_dig.ogg # Sunrise-edit
+      path: /Audio/Announcements/announce.ogg # Fish-edit
     weight: 8
     duration: 35
   - type: AnomalySpawnRule
@@ -97,7 +97,7 @@
   - type: StationEvent
     startAnnouncementColor: "#18abf5"
     startAudio:
-      path: /Audio/_Sunrise/Announcements/announce_dig.ogg # Sunrise-edit
+      path: /Audio/Announcements/announce.ogg # Fish-edit
     weight: 8
     duration: 35
   - type: BluespaceArtifactRule
@@ -130,7 +130,7 @@
   - type: StationEvent
     startAnnouncement: station-event-bureaucratic-error-announcement
     startAudio:
-      path: /Audio/_Sunrise/Announcements/announce_dig.ogg # Sunrise-edit
+      path: /Audio/Announcements/announce.ogg # Fish-edit
     minimumPlayers: 25
     weight: 3
     duration: 1
@@ -145,7 +145,7 @@
   - type: StationEvent
     startAnnouncement: station-event-clerical-error-announcement
     startAudio:
-      path: /Audio/_Sunrise/Announcements/announce_dig.ogg # Sunrise-edit
+      path: /Audio/Announcements/announce.ogg # Fish-edit
     minimumPlayers: 15
     weight: 5
     duration: 1
@@ -351,11 +351,11 @@
   - type: StationEvent
     startAnnouncement: station-event-gas-leak-start-announcement
     startAudio:
-      path: /Audio/_Sunrise/Announcements/announce_dig.ogg # Sunrise-edit
+      path: /Audio/Announcements/announce.ogg # Fish-edit
     endAnnouncement: station-event-gas-leak-end-announcement
     weight: 8
     endAudio:
-      path: /Audio/_Sunrise/Announcements/announce_dig.ogg # Sunrise-edit
+      path: /Audio/Announcements/announce.ogg # Fish-edit
   - type: GasLeakRule
 
 - type: entity
@@ -378,7 +378,7 @@
     startAnnouncement: station-event-power-grid-check-start-announcement
     endAnnouncement: station-event-power-grid-check-end-announcement
     startAudio:
-      path: /Audio/_Sunrise/Announcements/announce_dig.ogg # Sunrise-edit
+      path: /Audio/Announcements/announce.ogg # Fish-edit
     duration: 60
     maxDuration: 120
   - type: PowerGridCheckRule
@@ -392,7 +392,7 @@
     startAnnouncement: station-event-solar-flare-start-announcement
     endAnnouncement: station-event-solar-flare-end-announcement
     startAudio:
-      path: /Audio/_Sunrise/Announcements/announce_dig.ogg # Sunrise-edit
+      path: /Audio/Announcements/announce.ogg # Fish-edit
     duration: 120
     maxDuration: 240
   - type: SolarFlareRule
@@ -418,7 +418,7 @@
   - type: StationEvent
     startAnnouncement: station-event-vent-clog-start-announcement
     startAudio:
-      path: /Audio/_Sunrise/Announcements/announce_dig.ogg # Sunrise-edit
+      path: /Audio/Announcements/announce.ogg # Fish-edit
     earliestStart: 15
     minimumPlayers: 15
     weight: 5
@@ -432,7 +432,7 @@
   - type: StationEvent
     startAnnouncement: station-event-vent-creatures-start-announcement
     startAudio:
-      path: /Audio/_Sunrise/Announcements/announce_dig.ogg # Sunrise-edit
+      path: /Audio/Announcements/announce.ogg # Fish-edit
     earliestStart: 20
     minimumPlayers: 15
     weight: 5
@@ -474,7 +474,7 @@
   - type: StationEvent
     startAnnouncement: station-event-vent-creatures-start-announcement
     startAudio:
-      path: /Audio/_Sunrise/Announcements/announce_dig.ogg # Sunrise-edit
+      path: /Audio/Announcements/announce.ogg # Fish-edit
     earliestStart: 20
     minimumPlayers: 15
     weight: 5
@@ -491,7 +491,7 @@
   - type: StationEvent
     startAnnouncement: station-event-vent-creatures-start-announcement
     startAudio:
-      path: /Audio/_Sunrise/Announcements/announce_dig.ogg # Sunrise-edit
+      path: /Audio/Announcements/announce.ogg # Fish-edit
     earliestStart: 20
     minimumPlayers: 20
     weight: 1.5
@@ -588,7 +588,7 @@
     maxOccurrences: 1 # can only happen once per round
     startAnnouncement: station-event-communication-interception
     startAudio:
-      path: /Audio/_Sunrise/Announcements/announce_dig.ogg # Sunrise-edit
+      path: /Audio/Announcements/announce.ogg # Fish-edit
     duration: null # the rule has to last the whole round not 1 second
     occursDuringRoundEnd: false
   - type: AlertLevelInterceptionRule

Resources/Prototypes/GameRules/meteorswarms.yml

@@ -134,7 +134,7 @@
     minimumPlayers: 0
   - type: MeteorSwarm
     announcement: station-event-space-dust-start-announcement
-    announcementSound: /Audio/_Sunrise/Announcements/announce_dig.ogg # Sunrise-edit
+    announcementSound: /Audio/Announcements/announce.ogg # Fish-edit
     nonDirectional: true
     meteors:
       MeteorSpaceDust: 1
@@ -156,9 +156,9 @@
     startAnnouncement: station-event-meteor-swarm-start-announcement
     endAnnouncement: station-event-meteor-swarm-end-announcement
     startAudio:
-      path: /Audio/_Sunrise/Announcements/announce_dig.ogg
+      path: /Audio/Announcements/announce.ogg # Fish-edit
     endAudio:
-      path: /Audio/_Sunrise/Announcements/announce_dig.ogg
+      path: /Audio/Announcements/announce.ogg # Fish-edit
     # Sunrise-End
   - type: MeteorSwarm
     meteors:
@@ -176,9 +176,9 @@
     startAnnouncement: station-event-meteor-swarm-start-announcement
     endAnnouncement: station-event-meteor-swarm-end-announcement
     startAudio:
-      path: /Audio/_Sunrise/Announcements/announce_dig.ogg
+      path: /Audio/Announcements/announce.ogg # Fish-edit
     endAudio:
-      path: /Audio/_Sunrise/Announcements/announce_dig.ogg
+      path: /Audio/Announcements/announce.ogg # Fish-edit
     # Sunrise-End
   - type: MeteorSwarm
     meteors:
@@ -197,9 +197,9 @@
     startAnnouncement: station-event-meteor-swarm-start-announcement
     endAnnouncement: station-event-meteor-swarm-end-announcement
     startAudio:
-      path: /Audio/_Sunrise/Announcements/announce_dig.ogg
+      path: /Audio/Announcements/announce.ogg # Fish-edit
     endAudio:
-      path: /Audio/_Sunrise/Announcements/announce_dig.ogg
+      path: /Audio/Announcements/announce.ogg # Fish-edit
     # Sunrise-End
   - type: MeteorSwarm
     meteors:
@@ -215,7 +215,7 @@
     weight: 0.05
   - type: MeteorSwarm
     announcement: station-event-meteor-urist-start-announcement
-    announcementSound: /Audio/_Sunrise/Announcements/announce_dig.ogg # Sunrise-edit
+    announcementSound: /Audio/Announcements/announce.ogg # Fish-edit
     meteors:
       MeteorUrist: 1
     waves:

Resources/Prototypes/GameRules/unknown_shuttles.yml

@@ -47,7 +47,7 @@
   - type: StationEvent
     startAnnouncement: station-event-unknown-shuttle-incoming
     startAudio:
-      path: /Audio/_Sunrise/Announcements/announce_dig.ogg # Sunrise-edit
+      path: /Audio/Announcements/announce.ogg # Fish-edit
     weight: 5
     reoccurrenceDelay: 30
     duration: 1

Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml

@@ -8,7 +8,7 @@
   startingGear: ERTLeaderGearEVA
   icon: "JobIconNanotrasen"
   overrideConsoleVisibility: false # Sunrise added
-  supervisors: job-supervisors-centcom
+  supervisors: job-supervisors-specops #Fish-edit
   canBeAntag: false
   requirements:
     - !type:DepartmentTimeRequirement
@@ -123,7 +123,7 @@
   startingGear: ERTChaplainGear
   icon: "JobIconNanotrasen"
   overrideConsoleVisibility: false # Sunrise added
-  supervisors: job-supervisors-centcom
+  supervisors: job-supervisors-specops #Fish-edit
   canBeAntag: false
   accessGroups:
   - AllAccess
@@ -218,7 +218,7 @@
   startingGear: ERTEngineerGearEVA
   icon: "JobIconNanotrasen"
   overrideConsoleVisibility: false # Sunrise added
-  supervisors: job-supervisors-centcom
+  supervisors: job-supervisors-specops #Fish-edit
   canBeAntag: false
   requirements:
     - !type:DepartmentTimeRequirement
@@ -309,7 +309,7 @@
   startingGear: ERTSecurityGearEVA
   icon: "JobIconNanotrasen"
   overrideConsoleVisibility: false # Sunrise added
-  supervisors: job-supervisors-centcom
+  supervisors: job-supervisors-specops #Fish-edit
   canBeAntag: false
   requirements:
     - !type:DepartmentTimeRequirement
@@ -415,7 +415,7 @@
   startingGear: ERTMedicalGearEVA
   icon: "JobIconNanotrasen"
   overrideConsoleVisibility: false # Sunrise added
-  supervisors: job-supervisors-centcom
+  supervisors: job-supervisors-specops #Fish-edit
   canBeAntag: false
   requirements:
     - !type:DepartmentTimeRequirement
@@ -498,7 +498,7 @@
   startingGear: ERTJanitorGearEVA
   icon: "JobIconNanotrasen"
   overrideConsoleVisibility: false # Sunrise added
-  supervisors: job-supervisors-centcom
+  supervisors: job-supervisors-specops #Fish-edit
   canBeAntag: false
   accessGroups:
   - AllAccess
@@ -572,7 +572,7 @@
   startingGear: ERTLeaderGearEVA
   icon: "JobIconNanotrasen"
   overrideConsoleVisibility: false # Sunrise added
-  supervisors: job-supervisors-centcom
+  supervisors: job-supervisors-specops #Fish-edit
   canBeAntag: false
   requirements:
     - !type:DepartmentTimeRequirement
@@ -604,7 +604,7 @@
   startingGear: ERTChaplainGear
   icon: "JobIconNanotrasen"
   overrideConsoleVisibility: false # Sunrise added
-  supervisors: job-supervisors-centcom
+  supervisors: job-supervisors-specops #Fish-edit
   canBeAntag: false
   requirements:
     - !type:DepartmentTimeRequirement
@@ -630,7 +630,7 @@
   startingGear: ERTEngineerGearEVA
   icon: "JobIconNanotrasen"
   overrideConsoleVisibility: false # Sunrise added
-  supervisors: job-supervisors-centcom
+  supervisors: job-supervisors-specops #Fish-edit
   canBeAntag: false
   requirements:
     - !type:DepartmentTimeRequirement
@@ -656,7 +656,7 @@
   startingGear: ERTSecurityGearEVA
   icon: "JobIconNanotrasen"
   overrideConsoleVisibility: false # Sunrise added
-  supervisors: job-supervisors-centcom
+  supervisors: job-supervisors-specops #Fish-edit
   canBeAntag: false
   requirements:
     - !type:DepartmentTimeRequirement
@@ -679,7 +679,7 @@
   startingGear: ERTMedicalGearEVA
   icon: "JobIconNanotrasen"
   overrideConsoleVisibility: false # Sunrise added
-  supervisors: job-supervisors-centcom
+  supervisors: job-supervisors-specops #Fish-edit
   canBeAntag: false
   requirements:
     - !type:DepartmentTimeRequirement
@@ -705,7 +705,7 @@
   startingGear: ERTJanitorGearEVA
   icon: "JobIconNanotrasen"
   overrideConsoleVisibility: false # Sunrise added
-  supervisors: job-supervisors-centcom
+  supervisors: job-supervisors-specops #Fish-edit
   canBeAntag: false
   requirements:
     - !type:DepartmentTimeRequirement
@@ -727,7 +727,7 @@
   setPreference: false
   startingGear: CBURNGear
   icon: "JobIconNanotrasen"
-  supervisors: job-supervisors-centcom
+  supervisors: job-supervisors-specops #Fish-edit
   canBeAntag: false
   requirements:
     - !type:DepartmentTimeRequirement

Resources/Prototypes/SoundCollections/lobby.yml

@@ -10,3 +10,9 @@
     - /Audio/_Sunrise/Lobby/Chikoi The Maid - Winterholic.ogg
     - /Audio/_Sunrise/Lobby/Chikoi The Maid - parametric.ogg
     - /Audio/_Sunrise/Lobby/Chikoi The Maid - Beholder.ogg
+    - /Audio/_Fish/Lobby/title2.ogg #Fish-edit
+    - /Audio/_Fish/Lobby/title3.ogg #Fish-edit
+    - /Audio/_Fish/Lobby/mod.flip-flap.ogg #Fish-edit
+    - /Audio/_Fish/Lobby/every_light_is_blinking_at_once.ogg #Fish-edit
+    - /Audio/_Fish/Lobby/double-u.ogg #Fish-edit
+    - /Audio/_Fish/Lobby/neon.ogg #Fish-edit

Resources/Prototypes/_Fish/Entities/Clothing/Head/hats.yml

@@ -0,0 +1,17 @@
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadCapBlueShield
+  name: blueshield's commander cap
+  description: Special blue uniform cap with gold NanoTrasen engraving.
+  components:
+  - type: Sprite
+    sprite: _Fish/Clothing/Head/Hats/blueshield_hat.rsi
+  - type: Clothing
+    sprite: _Fish/Clothing/Head/Hats/blueshield_hat.rsi
+  # SUNRISE EDIT
+  - type: Tag
+    tags:
+    - ClothMade
+    - TopCovered # INTERACTIONS
+    - WhitelistChameleon
+  # SUNRISE EDIT

Resources/Prototypes/_Fish/Entities/Markers/Spawners/jobs.yml

@@ -27,7 +27,7 @@
 - type: entity
   id: SpawnPointCentcommBlueShield
   parent: SpawnPointJobBase
-  name: blue shield operative
+  name: blue shield operative for centcom
   components:
   - type: SpawnPoint
     job_id: CentcommBlueShield
@@ -87,3 +87,46 @@
       - state: green
       - state: magistrat
       - state: jobicon
+
+- type: entity
+  id: SpawnPointRepresentativeBlueShield
+  parent: SpawnPointJobBase
+  name: blue shield operative for nanotrasen representative
+  components:
+  - type: SpawnPoint
+    job_id: RepresentativeBlueShield
+  - type: Sprite
+    sprite: _Sunrise/Markers/jobs.rsi
+    layers:
+      - state: green
+      - state: blueshield
+      - state: jobicon
+
+- type: entity
+  id: SpawnPointOversightOfficer
+  parent: SpawnPointJobBase
+  name: Oversight Officer
+  components:
+  - type: SpawnPoint
+    job_id: OversightOfficer
+  - type: Sprite
+    sprite: _Sunrise/Markers/jobs.rsi
+    layers:
+      - state: green
+      - state: IAA
+      - state: jobicon
+
+
+- type: entity
+  id: SpawnPointSpecOpsOfficer
+  parent: SpawnPointJobBase
+  name: SpecOPs Officer
+  components:
+  - type: SpawnPoint
+    job_id: SpecOpsOfficer
+  - type: Sprite
+    sprite: _Sunrise/Markers/jobs.rsi
+    layers:
+      - state: green
+      - state: IAA
+      - state: jobicon

Resources/Prototypes/_Fish/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

@@ -0,0 +1,73 @@
+- type: entity
+  name: x-01-a improved multiphase energy gun
+  parent: BaseWeaponBatterySmall
+  id: WeaponEnergyGunMultiphaseImproved
+  description: This is an expensive, modern recreation of an antique laser gun. This gun has several unique firemodes. It doesn't lack the ability to recharge over time.
+  components:
+  - type: Item
+    size: Small
+    shape:
+    - 0,0,1,1
+  - type: Sprite
+    sprite: _Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mode-disabler
+      shader: unshaded
+      map: [ "Firemode" ]
+    - state: mag-unshaded-4
+      map: ["enum.GunVisualLayers.MagUnshaded"]
+      shader: unshaded
+  - type: Clothing
+    sprite: _Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi
+  - type: Gun
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser.ogg
+    soundEmpty:
+      path: /Audio/Weapons/Guns/Empty/empty.ogg
+  - type: Battery
+    maxCharge: 1000
+    startingCharge: 1000
+  - type: BatterySelfRecharger
+    autoRecharge: true
+    autoRechargeRate: 35
+    autoRechargePause: true
+    autoRechargePauseTime: 20
+  - type: EnergyGunFireModes
+    fireModes:
+    - hitscanProto: BulletDisabler
+      fireCost: 50
+      name: energy-gun-disable
+      state: disabler
+      shotType: Hitscan
+    - hitscanProto: BulletEnergyGunLaser
+      fireCost: 100
+      name: energy-gun-lethal
+      state: lethal
+      shotType: Hitscan
+    # - projectileProto: BulletEnergyGunIon
+    #   fireCost: 250
+    #   name: ion
+    #   state: special
+    #  shotType: Projectile
+  - type: MagazineVisuals
+    magState: mag
+    steps: 5
+    zeroVisible: true
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.EnergyGunFireModeVisuals.State:
+        Firemode:
+          Disabler: { state: mode-disabler }
+          Lethal: { state: mode-lethal }
+          Special: { state: mode-ion }
+  - type: Tag
+    tags:
+    - HighRiskItem
+    - Sidearm
+  - type: StaticPrice
+    price: 750
+  - type: StealTarget
+    stealGroup: WeaponEnergyGunMultiphase

Resources/Prototypes/_Fish/Entities/Stations/base.yml

@@ -0,0 +1,19 @@
+- type: entity
+  id: BaseStationFishShuttles
+  abstract: true
+  components:
+  - type: SpawnAdditionalGridsAndDockToStation
+    spawns:
+    - gridPath: /Maps/_Sunrise/Shuttles/security.yml
+      priorityTag: DockFishSecurity
+
+- type: entity
+  id: BaseStationFishSpecOpsShuttles
+  abstract: true
+  components:
+  - type: SpawnAdditionalGridsAndDockToStation
+    spawns:
+    - gridPath: /Maps/_Fish/Shuttles/SpecialOperations/ert_shuttle_medium.yml
+      priorityTag: DockFishERT
+    - gridPath: /Maps/_Fish/Shuttles/SpecialOperations/cburn_shuttle_large.yml
+      priorityTag: DockFishCBURN

Resources/Prototypes/_Fish/Entities/Structures/Doors/Airlocks/access.yml

@@ -0,0 +1,23 @@
+- type: entity
+  parent: AirlockGlassShuttle
+  id: AirlockExternalGlassFishSecurityShuttle
+  suffix: External, Security, Glass, Docking, AutoDock
+  components:
+  - type: PriorityDock
+    tag: DockFishSecurity
+
+- type: entity
+  parent: AirlockGlassShuttle
+  id: AirlockExternalGlassFishERTShuttle
+  suffix: External, ERT, Glass, Docking, AutoDock
+  components:
+  - type: PriorityDock
+    tag: DockFishERT
+
+- type: entity
+  parent: AirlockGlassShuttle
+  id: AirlockExternalGlassFishCBURNShuttle
+  suffix: External, Security, Glass, Docking, AutoDock
+  components:
+  - type: PriorityDock
+    tag: DockFishCBURN

Resources/Prototypes/_Fish/Loadouts/SpecialOperations/specops_officer.yml

@@ -0,0 +1,10 @@
+
+- type: loadout
+  id: SpecOpsOfficerUniformMale
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitCentcomOfficerBlack
+
+- type: loadout
+  id: SpecOpsOfficerUniformFemale
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtCentcomOfficerBlack

Resources/Prototypes/_Fish/Loadouts/loadout_groups.yml

@@ -3,3 +3,10 @@
 #   name: loadout-group-centcomm-trainee-outerclothing-vest
 #   loadouts:
 #   - ArmorVestSlim
+
+- type: loadoutGroup
+  id: SpecOpsOfficerJumpsuit
+  name: loadout-group-specops-jumpsuit
+  loadouts:
+  - SpecOpsOfficerUniformMale
+  - SpecOpsOfficerUniformFemale

Resources/Prototypes/_Fish/Loadouts/role_loadouts.yml

@@ -107,3 +107,41 @@
   - Bra
   - Pants
   - Socks
+
+- type: roleLoadout
+  id: JobRepresentativeBlueShield
+  groups:
+  - BlueShieldJumpsuit
+  - BlueShieldBackpack
+  - BlueShieldBelt
+  - BlueShieldNeck
+  - Trinkets
+  - SurvivalSecurity
+  - GroupSpeciesBreathTool
+  - Bra
+  - Pants
+  - Socks
+
+- type: roleLoadout
+  id: JobOversightOfficer
+  groups:
+  - LawyerJumpsuit
+  - CommonBackpack
+  - Trinkets
+  - Survival
+  - GroupSpeciesBreathTool
+  - Bra
+  - Pants
+  - Socks
+
+- type: roleLoadout
+  id: JobSpecOpsOfficer
+  groups:
+  - SpecOpsOfficerJumpsuit
+  - CommonBackpack
+  - Trinkets
+  - Survival
+  - GroupSpeciesBreathTool
+  - Bra
+  - Pants
+  - Socks

Resources/Prototypes/_Fish/Roles/Jobs/Blueshield/blueshield_ensign.yml

@@ -46,11 +46,11 @@
   equipment:
    shoes: ClothingShoesBootsBlueShieldFilled
    eyes: ClothingEyesGlassesBlueShield
-   head: ClothingHeadHatBeretBlueShield
+   head: ClothingHeadCapBlueShield
    outerClothing: ClothingOuterArmorBlueShield
    id: BlueShieldEnsignPDA
    ears: ClothingHeadsetBlueShieldEnsign
-  #  belt: ClothingBeltBlueShieldWebbingFilled У синего щита уже есть в наборе РПС при старте #fish-edit
+  #  belt: ClothingBeltBlueShieldWebbingFilled У синего щита уже есть в наборе РПС при старте
    gloves: ClothingHandsGlovesCombat
   storage:
    back:

Resources/Prototypes/_Fish/Roles/Jobs/Blueshield/blueshield_officer.yml

@@ -42,6 +42,7 @@
   equipment:
    shoes: ClothingShoesBootsBlueShieldFilled
    eyes: ClothingEyesGlassesBlueShield
+   head: ClothingHeadHatBeretBlueShield
    outerClothing: ClothingOuterArmorBlueShield
    id: BlueShieldOfficerPDA
    ears: ClothingHeadsetBlueShield

Resources/Prototypes/_Fish/Roles/Jobs/Blueshield/representative_blueshield.yml

@@ -0,0 +1,43 @@
+- type: job
+  id: RepresentativeBlueShield
+  name: job-name-blueshield-operative
+  description: job-description-blueshield-operative
+  playTimeTracker: JobRepresentativeBlueShield
+  requirements:
+   - !type:DepartmentTimeRequirement
+     department: BlueShield
+     time: 62000 # 20 hrs
+   - !type:DepartmentTimeRequirement
+     department: Command
+     time: 62000 # 20 hrs
+   - !type:AgeRequirement
+     requiredAge: 25
+  startingGear: CentcomBlueShieldGear
+  icon: JobIconNanotrasen
+  supervisors: job-supervisors-representative
+  canBeAntag: false
+  access:
+   - Command
+   - Bar
+   - Service
+   - Maintenance
+   - Janitor
+   - Theatre
+   - Kitchen
+   - Chapel
+   - Hydroponics
+   - External
+   - Chemistry
+   - Engineering
+   - Research
+   - Salvage
+   - Cargo
+   - Atmospherics
+   - Cargo
+   - Medical
+   - BlueShield
+   - BlueShieldEnsign
+   - Ntrep
+  special:
+   - !type:AddImplantSpecial
+     implants: [ MindShieldImplant ]

Resources/Prototypes/_Fish/Roles/Jobs/CentralCommand/centcom_blueshield_officer.yml

@@ -29,6 +29,7 @@
   equipment:
    shoes: ClothingShoesBootsBlueShieldFilled
    eyes: ClothingEyesGlassesBlueShield
+   head: ClothingHeadHatBeretBlueShield
    outerClothing: ClothingOuterArmorBlueShield
    id: BlueShieldOperativePDA
    ears: ClothingHeadsetFishCentCom

Resources/Prototypes/_Fish/Roles/Jobs/CentralCommand/centcom_officer.yml

@@ -25,7 +25,7 @@
   startingGear: CentCommOfficerGear
   icon: "JobIconNanotrasen"
   overrideConsoleVisibility: false # Sunrise added
-  supervisors: job-supervisors-centcom
+  supervisors: job-supervisors-centcomhead
   radioBold: true
   canBeAntag: false
   alwaysUseSpawner: true
@@ -41,7 +41,7 @@
   id: CentCommOfficerGear
   equipment:
     # jumpsuit: ClothingUniformJumpsuitCentcomOfficial #Fish-Edit
-    shoes: ClothingShoesBootsCombatFilled
+    shoes: ClothingShoesBootsLaceup
     # head: ClothingHeadHatCentcom  #Fish-Edit
     eyes: ClothingEyesGlassesSunglasses
     gloves: ClothingHandsGlovesColorBlack

Resources/Prototypes/_Fish/Roles/Jobs/CentralCommand/centcom_oversight.yml

@@ -0,0 +1,49 @@
+- type: job
+  id: OversightOfficer
+  name: job-name-oversightofficer
+  description: job-description-oversightofficer
+  playTimeTracker: JobOversightOfficer
+  requirements:
+    - !type:DiscordRoleRequirement
+    - !type:DepartmentTimeRequirement
+      department: Security
+      time: 54000 # 15 hrs
+    - !type:DepartmentTimeRequirement
+      department: Command
+      time: 18000 # 5 hrs
+    - !type:DepartmentTimeRequirement
+      department: Law
+      time: 18000 # 5 hrs
+  startingGear: OversightOfficerGear
+  icon: JobIconOversightOfficer
+  overrideConsoleVisibility: false # Sunrise added
+  supervisors: job-supervisors-oversightdep
+  radioBold: true
+  canBeAntag: false
+  alwaysUseSpawner: true
+  accessGroups:
+  - AllAccess
+  access:
+  - CentralCommand
+  special:
+  - !type:AddImplantSpecial
+    implants: [ MindShieldImplant, TrackingImplant, DeathRattleImplantBlueShield ]
+
+- type: startingGear
+  id: OversightOfficerGear
+  equipment:
+    neck: ClothingNeckLawDepbadge
+    shoes: ClothingShoesBootsLaceup
+    head: ClothingHeadCapNTGR
+    eyes: ClothingEyesGlassesHiddenSecurity
+    gloves: ClothingHandsGlovesColorWhite
+    outerClothing: ClothingOuterArmorNTRGLeadOpened
+    id: NtrLeadGuardPDA
+    ears: ClothingHeadsetFishCentCom
+    belt: BoxFolderCentComClipboard
+    pocket1: WeaponEnergyGunPulseRevolver
+    pocket2: PenCentcom
+  storage:
+    back:
+    # - ClothingOuterHardsuitNTRG
+    - CrowbarRed

Resources/Prototypes/_Fish/Roles/Jobs/CentralCommand/centcom_sectoral_judge.yml

@@ -11,7 +11,7 @@
   startingGear: CentcommSectoralJudgeGear
   icon: "JobIconCentcommSectoralJudge"
   overrideConsoleVisibility: false
-  supervisors: job-supervisors-centcom
+  supervisors: job-supervisors-supremecourt
   canBeAntag: false
   setPreference: true
   radioBold: true

Resources/Prototypes/_Fish/Roles/Jobs/CentralCommand/centcom_trainee.yml

@@ -25,7 +25,7 @@
 - type: startingGear
   id: CentCommTraineeGear
   equipment:
-    shoes: ClothingShoesBootsCombatFilled
+    shoes: ClothingShoesBootsLaceup
     gloves: ClothingHandsGlovesColorWhite
     outerClothing: ClothingOuterArmorBasicSlim
     id: CentcomPDA

Resources/Prototypes/_Fish/Roles/Jobs/CentralCommand/specops_officer.yml

@@ -0,0 +1,45 @@
+- type: job
+  id: SpecOpsOfficer
+  name: job-name-specopsofficer
+  description: job-description-specopsofficer
+  playTimeTracker: JobSpecOpsOfficer
+  requirements:
+    - !type:DiscordRoleRequirement
+    - !type:DepartmentTimeRequirement
+      department: Security
+      time: 14400 # 4 hours
+    - !type:DepartmentTimeRequirement
+      department: Command
+      time: 14400 # 4 hours
+  weight: 30
+  setPreference: true
+  startingGear: SpecOpsOfficerGear
+  icon: "JobIconSpecOpsOfficer"
+  overrideConsoleVisibility: false # Sunrise added
+  supervisors: job-supervisors-specopshead
+  radioBold: true
+  canBeAntag: false
+  alwaysUseSpawner: true
+  accessGroups:
+  - AllAccess
+  access:
+  - CentralCommand
+  special:
+  - !type:AddImplantSpecial
+    implants: [ MindShieldImplant, TrackingImplant, DeathRattleImplantCentcomm ]
+
+- type: startingGear
+  id: SpecOpsOfficerGear
+  equipment:
+    shoes: ClothingShoesCentcomBlack
+    head: ClothingHeadCapCentcomBlack  #Fish-Edit
+    eyes: ClothingEyesGlassesSunglasses
+    gloves: ClothingHandsGlovesCombat
+#    outerClothing: ClothingOuterArmorBasicSlim
+    id: DeathsquadPDA
+    ears: ClothingHeadsetFishCentCom
+    belt: WeaponPistolN1984
+  storage:
+    back:
+    - PenCentcom
+    - BoxFolderBlack

Resources/Prototypes/_Fish/Roles/Jobs/departments.yml

@@ -7,5 +7,37 @@
    - BlueShieldEnsign
    - BlueShieldOfficer
   #  - BlueShieldOperative
+   - RepresentativeBlueShield
   primary: false
-  weight: 50
+  weight: 60
+
+
+- type: department
+  id: SpecialOperationsAlt
+  name: department-SpecialOperations
+  description: department-SpecialOperations-description
+  color: "#0c344d"
+  roles:
+  - SpecOpsOfficer #Fish-edit
+  weight: 57
+
+- type: department
+  id: Court
+  name: department-Court
+  description: department-Court-description
+  color: "#0c344d"
+  roles:
+  - CentcommSectoralJudge #Fish-edit
+  weight: 55
+
+- type: department
+  id: LawAlt
+  name: department-LawAlt
+  description: department-LawAlt-description
+  color: "#FF5297"
+  roles:
+  - OversightOfficer
+  - IAA
+  - Lawyer
+  - NtrOfficer
+  weight: 52

Resources/Prototypes/_Fish/Roles/play_time_trackers.yml

@@ -18,3 +18,12 @@
 
 - type: playTimeTracker
   id: JobCentcommSectoralJudge
+
+- type: playTimeTracker
+  id: JobRepresentativeBlueShield
+
+- type: playTimeTracker
+  id: JobOversightOfficer
+
+- type: playTimeTracker
+  id: JobSpecOpsOfficer

Resources/Prototypes/_Fish/StatusIcon/job.yml

@@ -37,3 +37,20 @@
     sprite: /Textures/_Fish/Interface/Misc/job_icons.rsi
     state: SectoralJudge
   jobName: job-name-centcomm-sectoral-judge
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconOversightOfficer
+  icon:
+    sprite: /Textures/_Fish/Interface/Misc/job_icons.rsi
+    state: OversightOfficer
+  jobName: job-name-centcomm-sectoral-judge
+
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconSpecOpsOfficer
+  icon:
+    sprite: /Textures/_Fish/Interface/Misc/job_icons.rsi
+    state: SpecOpsOfficer
+  jobName: job-name-specopsofficer

Resources/Prototypes/_Fish/tags.yml

@@ -0,0 +1,8 @@
+- type: Tag
+  id: DockFishSecurity
+
+- type: Tag
+  id: DockFishERT
+
+- type: Tag
+  id: DockFishCBURN

Resources/Prototypes/_Sunrise/AlertLevels/alert_levels.yml

@@ -4,31 +4,31 @@
   levels:
     rollcall:
       announcement: alert-level-rollcall-announcement
-      sound: /Audio/_Sunrise/Announcements/announce_dig.ogg
+      sound: /Audio/Announcements/announce.ogg #Fish-edit
       color: Green
     breakfast:
       announcement: alert-level-breakfast-announcement
-      sound: /Audio/_Sunrise/Announcements/announce_dig.ogg
+      sound: /Audio/Announcements/announce.ogg #Fish-edit
       color: Green
     work:
       announcement: alert-level-work-announcement
-      sound: /Audio/_Sunrise/Announcements/announce_dig.ogg
+      sound: /Audio/Announcements/announce.ogg #Fish-edit
       color: Green
     exercise:
       announcement: alert-level-exercise-announcement
-      sound: /Audio/_Sunrise/Announcements/announce_dig.ogg
+      sound: /Audio/Announcements/announce.ogg #Fish-edit
       color: Green
     rest:
       announcement: alert-level-rest-announcement
-      sound: /Audio/_Sunrise/Announcements/announce_dig.ogg
+      sound: /Audio/Announcements/announce.ogg #Fish-edit
       color: Green
     shower:
       announcement: alert-level-shower-announcement
-      sound: /Audio/_Sunrise/Announcements/announce_dig.ogg
+      sound: /Audio/Announcements/announce.ogg #Fish-edit
       color: Green
     lightsout:
       announcement: alert-level-lightsout-announcement
-      sound: /Audio/_Sunrise/Announcements/announce_dig.ogg
+      sound: /Audio/Announcements/announce.ogg #Fish-edit
       color: Green
     lockdown:
       announcement: alert-level-lockdown-announcement

Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/socks.yml

@@ -1,4 +1,15 @@
 # Для тяночек
+
+#Fish-start
+- type: loadout
+  id: ThighDarkSocks
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: WomanMoment
+  equipment:
+    socks: ClothingThighThin
+#Fish-end
+
 - type: loadout
   id: ThighWhiteSocks
   effects:

Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml

@@ -3,6 +3,7 @@
   name: loadout-group-socks
   minLimit: 1
   loadouts:
+  - ThighDarkSocks
   - ThighWhiteSocks
   - ShortWhiteSocks
   - FishnetTights

Resources/Prototypes/_Sunrise/Maps/centcomm.yml

@@ -2,6 +2,7 @@
   id: SunriseCentComm
   mapName: 'Central Command'
   mapPath: /Maps/_Fish/Station/centcomm.yml #Fish-edit
+  mapPath: /Maps/_Fish/Station/centcomm.yml #Fish-edit
   maxRandomOffset: 0
   randomRotation: false
   minPlayers: 10
@@ -10,10 +11,11 @@
       stationProto: NanotrasenCentralCommand
       components:
         - type: StationNameSetup
-          mapNameTemplate: '{0} Центком и Штаб спецопераций {1}' #Fish-edit
+          mapNameTemplate: '{0} Врата Эдема {1}' #Fish-edit
           nameGenerator:
             !type:NanotrasenNameGenerator
             prefixCreator: '-AHQ' #Fish-edit
+            prefixCreator: '-AHQ' #Fish-edit
         - type: StationJobs
           availableJobs:
             # CentCommOperator: [ 1, 1 ] #Fish-edit
@@ -24,3 +26,5 @@
             CentcommChef: [ 1, 1 ] #Fish-edit
             CentcommBartender: [ 1, 1 ] #Fish-edit
             CentcommSectoralJudge: [ 1, 1 ] #Fish-edit
+            OversightOfficer: [ 1, 1 ] #Fish-edit
+            SpecOpsOfficer: [ 1, 1 ] #Fish-edit

Resources/Prototypes/_Sunrise/Maps/delta.yml

@@ -1,7 +1,7 @@
 - type: gameMap
   id: SunriseDelta
   mapName: 'Delta'
-  mapPath: /Maps/_Sunrise/Station/delta.yml
+  mapPath: /Maps/_Fish/Station/delta.yml #Fish-edit
   maxRandomOffset: 0
   randomRotation: false
   minPlayers: 0
@@ -13,7 +13,7 @@
           mapNameTemplate: '{0} Дельта {1}'
           nameGenerator:
             !type:NanotrasenNameGenerator
-            prefixCreator: 'TG'
+            prefixCreator: '-RS' #Fish-edit
         - type: StationEmergencyShuttle
           emergencyShuttlePath: /Maps/_Sunrise/Shuttles/emergency.yml
         - type: StationJobs
@@ -58,10 +58,12 @@
             #security
             HeadOfSecurity: [ 1, 1 ]
             Warden: [ 1, 1 ]
+            Warden: [ 1, 1 ]
             SeniorOfficer: [ 1, 1 ]
             Detective: [ 2, 2 ]
+            Detective: [ 2, 2 ]
             Brigmedic: [ 1, 1 ]
-            SecurityPilot: [ 1, 1 ]
+            SecurityPilot: [ 2, 2 ]
             SecurityOfficer: [ 5, 5 ]
             SecurityCadet: [ 5, 5 ]
             #supply
@@ -76,11 +78,13 @@
             Musician: [ 1, 1 ]
             #blueshield
             BlueShieldEnsign: [ 1, 1 ] #Fish-edit
-            BlueShieldOfficer: [ 3, 3 ] #Fish-edit
+            BlueShieldOfficer: [ 2, 2 ] #Fish-edit
+            RepresentativeBlueShield: [ 1, 1 ] #Fish-edit
             #law
             IAA: [ 1, 1 ]
             Lawyer: [ 3, 3 ]
             NtrOfficer: [ 3, 3 ] #Fish-edit
+            NtrOfficer: [ 3, 3 ] #Fish-edit
             # silicon
             StationAi: [ 1, 1 ]
             Borg: [ 2, 2 ]

Resources/Prototypes/_Sunrise/Roles/Jobs/CentralCommand/ntr_guard.yml

@@ -17,7 +17,7 @@
       requiredAge: 25
   startingGear: NtrLeaderGear
   icon: JobIconNtrLeader
-  supervisors: job-supervisors-ntrg
+  supervisors: job-supervisors-oversightdep #Fish-edit
   canBeAntag: false
   access:
     - Command
@@ -55,7 +55,7 @@
     mask: ClothingMaskGasNTRGLead
     shoes: ClothingShoesBootsCombatFilled
     head: ClothingHeadCapNTGR
-    eyes: ClothingEyesGlassesSecurity
+    eyes: ClothingEyesGlassesBlueShield #Fish-edit
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterArmorNTRG
     id: NtrLeadGuardPDA
@@ -88,7 +88,7 @@
       requiredAge: 25
   startingGear: NtrLeaderGear
   icon: JobIconNtrGuard
-  supervisors: job-supervisors-ntrg
+  supervisors: job-supervisors-oversightdep #Fish-edit
   canBeAntag: false
   access:
     - Command
@@ -125,7 +125,7 @@
     shoes: ClothingShoesBootsCombatFilled
     mask: ClothingMaskGasNTRG
     head: ClothingHeadCapNTGR
-    eyes: ClothingEyesGlassesSecurity
+    eyes: ClothingEyesGlassesBlueShield #Fish-edit
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterArmorNTRG
     id: NtrGuardPDA

Resources/Prototypes/_Sunrise/Roles/Jobs/Command/nanotrasen_representative.yml

@@ -11,31 +11,12 @@
   radioBold: true
   supervisors: job-supervisors-centcom
   canBeAntag: false
+  #Fish-start
+  accessGroups:
+  - AllAccess
   access:
-    - Cryogenics
-    - Lawyer
-    - Command
-    - Bar
-    - Service
-    - Maintenance
-    - Janitor
-    - Theatre
-    - Kitchen
-    - Chapel
-    - Hydroponics
-    - External
-    - Chemistry
-    - Engineering
-    - Research
-    - Detective
-    - Salvage
-    - Security
-    - Brig
-    - Cargo
-    - Atmospherics
-    - Cargo
-    - Medical
-    - Ntrep
+  - CentralCommand
+  #Fish-end
   special:
     - !type:AddImplantSpecial
       implants: [ MindShieldImplant, TrackingImplant, DeathRattleImplantBlueShield ]

Resources/Prototypes/_Sunrise/Roles/Jobs/Law/NtrOfficer.yml

@@ -12,7 +12,7 @@
       time: 36000 # 10h Sunrise-RoleTime
   startingGear: NtrOfficerGear
   icon: "JobIconNtrGuard"
-  supervisors: job-supervisors-ntrg
+  supervisors: job-supervisors-oversightdep #Fish-edit
   canBeAntag: false
   displayWeight: 40
   access:
@@ -36,6 +36,7 @@
   - Cargo
   - Atmospherics
   - Medical
+  - Lawyer #Fish-edit
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant ]
@@ -49,7 +50,7 @@
     mask: ClothingMaskGasNTRGLead
     shoes: ClothingShoesBootsCombatFilled
     head: ClothingHeadCapNTGR
-    eyes: ClothingEyesGlassesSecurity
+    eyes: ClothingEyesGlassesBlueShield #Fish-edit
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterArmorNTRGLead
     id: NtrGuardPDA

Resources/Prototypes/_Sunrise/Roles/Jobs/Law/iaa.yml

@@ -10,9 +10,15 @@
     - !type:DepartmentTimeRequirement
       department: Security
       time: 36000 # 10h Sunrise-RoleTime #Fish-edit
+    - !type:DepartmentTimeRequirement
+      department: Command
+      time: 54000 # 15h Sunrise-RoleTime #Fish-edit
+    - !type:DepartmentTimeRequirement
+      department: Security
+      time: 36000 # 10h Sunrise-RoleTime #Fish-edit
   startingGear: IAAGear
   icon: "JobIconFishIAA" #Fish-edit
-  supervisors: job-supervisors-magistrate
+  supervisors: job-supervisors-oversight #Fish-edit
   canBeAntag: false
   displayWeight: 40
   access:
@@ -22,6 +28,24 @@
   - Maintenance
   - External
   - Lawyer
+  #Fish-start
+  - Cryogenics
+  - Bar
+  - Janitor
+  - Theatre
+  - Kitchen
+  - Chapel
+  - Hydroponics
+  - Chemistry
+  - Engineering
+  - Research
+  - Detective
+  - Salvage
+  - Security
+  - Cargo
+  - Atmospherics
+  - Medical
+  #Fish-end
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant ]
@@ -29,11 +53,11 @@
 - type: startingGear
   id: IAAGear
   equipment:
-    shoes: ClothingShoesColorBlack
+    shoes: ClothingShoesBootsLaceup #Fish-edit
     id: IAAPDA
     neck: ClothingNeckLawDepbadge #Fish-edit
     eyes: ClothingEyesGlassesHiddenSecurity #Fish-edit
-    ears: ClothingHeadsetIAA
+    ears: ClothingHeadsetMagistrate #Fish-edit
     pocket2: HyperLinkBookCorporateLaw
   inhand:
     - BriefcaseIAAFilled

Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml

@@ -6,10 +6,16 @@
   weight: 80
   roles:
     - Magistrat
-    - IAA
-    - Lawyer
-    - NtrOfficer
+    # - IAA
+    # - Lawyer
+    # - NtrOfficer
 
+# - type: department # Surnise-Blueshield
+#   id: BlueShield
+#   name: department-Blueshield
+#   description: department-Blueshield-description
+#   color: "#0f4e81"
+#   roles:
 # - type: department # Surnise-Blueshield
 #   id: BlueShield
 #   name: department-Blueshield
@@ -21,6 +27,8 @@
 #    - BlueShieldOperative
 #   primary: false
 #   weight: 50
+#   primary: false
+#   weight: 50
 
 - type: department
   id: PlanetPrison
@@ -44,6 +52,7 @@
   color: "#0d4f1d"
   roles:
   # - CentCommOperator #Fish-edit
+  # - CentCommOperator #Fish-edit
   - CentCommOfficial
   - CentCommOfficer #Fish-edit
   - CentCommTrainee #Fish-edit
@@ -51,7 +60,6 @@
   - CentcommChef #Fish-edit
   - CentcommMedicalDoctor #Fish-edit
   - CentcommBartender #Fish-edit
-  - CentcommSectoralJudge #Fish-edit
   weight: 120
 
 - type: department

Resources/Textures/_Fish/Clothing/Head/Hats/blueshield_hat.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "vinogradgarden",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_Fish/Interface/Misc/job_icons.rsi/meta.json

@@ -24,7 +24,12 @@
         },
         {
             "name": "SectoralJudge"
+        },
+        {
+            "name": "OversightOfficer"
+        },
+        {
+            "name": "SpecOpsOfficer"
         }
-
     ]
 }

Resources/Textures/_Fish/Paper/license.txt

@@ -0,0 +1 @@
+nanotrasen_form_header_specops.png CC-BY-NC-SA-3.0 Based on Sprite that was originally taken from Paradise build of SS13 (ParadiseSS13/Paradise on GitHub) at commit 548161c4ec3bdff455ba7a972b079780d74641bf. Author is vinogradgarden (vinogradgarden on GitHub).