Lost-Paradise-Project · Evgencheg · Oct 31, 2024 · Oct 28, 2024 · Oct 29, 2024 · Oct 29, 2024
@@ -6,11 +6,16 @@
 using System.Linq;
 using Content.Shared.Audio;
 using Content.Shared.CCVar;
+using Content.Shared.Radio;
+using Content.Server.Radio.EntitySystems;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Supermatter.Systems;
 
 public sealed partial class SupermatterSystem
 {
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly RadioSystem _radioSystem = default!;
     /// <summary>
     ///     Handle power and radiation output depending on atmospheric things.
     /// </summary>
@@ -293,6 +298,17 @@ private void AnnounceCoreDamage(EntityUid uid, SupermatterComponent sm)
         SendSupermatterAnnouncement(uid, message, global);
     }
 
+    private void Report(EntityUid source, string channelName, string messageKey, params (string, object)[] args)
+    {
+        var message = args.Length == 0 ? Loc.GetString(messageKey) : Loc.GetString(messageKey, args);
+
+        if (string.IsNullOrWhiteSpace(message))
+            return;
+
+        var radioChannel = _prototypeManager.Index<RadioChannelPrototype>(channelName);
+        _radioSystem.SendRadioMessage(source, message, radioChannel, source);
+    }
+
     /// <param name="global">If true, sends a station announcement</param>
     /// <param name="customSender">Localisation string for a custom announcer name</param>
     public void SendSupermatterAnnouncement(EntityUid uid, string message, bool global = false, string? customSender = null)
@@ -305,6 +321,11 @@ public void SendSupermatterAnnouncement(EntityUid uid, string message, bool glob
         }
 
         _chat.TrySendInGameICMessage(uid, message, InGameICChatType.Speak, hideChat: false, checkRadioPrefix: true);
+
+        if (!string.IsNullOrWhiteSpace(message))
+        {
+            Report(uid, "Engineering", message);
+        }
     }
 
     /// <summary>

@@ -2,9 +2,9 @@ ent-LPPSecurityEngineerPDA = КПК полевого инженера
     .desc = Красный, чтобы скрыть пятна крови пассажиров.
 ent-LPPBlueShieldOfficerPDA = КПК офицера "Синий Щит"
     .desc = Пахнет защитой.
-ent-LPPAdjutantPDA = КПК Адъютанта
+ent-LPPAdjutantPDA = КПК адъютанта
     .desc = Пора почувствовать себя крутым.
-ent-LPPExpeditorPDA = КПК Исследователя
+ent-LPPExpeditorPDA = КПК исследователя
     .desc = Потёртый, поцарапанный, но все еще работает.
-ent-LPPSecPilotPDA = КПК Пилота СБ
+ent-LPPSecPilotPDA = КПК пилота СБ
     .desc = Выглядит новеньким и пахнет космосом.
@@ -2,10 +2,10 @@ ent-ClothingHeadsetHoP = Гарнитура главы персонала
     .desc = Гарнитура используемая Главой Персонала.
 ent-ClothingHeadsetAltService = Полноразмерная гарнитура главы персонала
     .desc = { ent-ClothingHeadsetAlt.desc }
-ent-ClothingHeadsetAltSyndicateListening = Кроваво-красная полнаразмерная гарнитура перехвата
-    .desc = Улудшенное, модульное устройство перехвата, которое помещаеться на голову.
-ent-ClothingHeadsetJustice = Гарнитура Юридического отдела
-    .desc = Гарнитура, используемая Юридическим отделом.
+ent-ClothingHeadsetAltSyndicateListening = Кроваво-красная полноразмерная гарнитура перехвата
+    .desc = Улучшенное, модульное устройство перехвата, которое помещается на голову.
+ent-ClothingHeadsetJustice = Гарнитура юридического отдела
+    .desc = Гарнитура, используемая юридическим отделом.
 ent-ClothingHeadsetAltJustice = Гарнитура главного судьи
     .desc = Гарнитура, используемая главным судьей.
 ent-ClothingHeadsetPrison = Тюремная гарнитура

@@ -1,2 +1,2 @@
-ent-Supermatter = Кристал суперматерии
+ent-Supermatter = Кристалл суперматерии
     .desc = Странно прозрачный и переливающийся кристалл.
@@ -88,7 +88,9 @@
       - id: MedkitOxygenFilled
       - id: HolofanProjector
       - id: DoorRemoteFirefight
+      - id: ClothingShoesBootsMag
       - id: RCD
+      - id: RCDAmmo
       - id: LPPRCDFAPDevice
       - id: LPPRCDFAPAmmo
       - id: LunchboxEngineeringFilledRandom # Delta-V Lunchboxes!

@@ -181,6 +181,8 @@
       - id: BoxPDAEngineering # Delta-V
       - id: RCD
       - id: RCDAmmo
+      - id: LPPRCDFAPDevice
+      - id: LPPRCDFAPAmmo
       - id: CEIDCard # Delta-V
       - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
         prob: 0.3
@@ -206,6 +208,8 @@
       - id: CEIDCard # Delta-V
       - id: RCD
       - id: RCDAmmo
+      - id: LPPRCDFAPDevice
+      - id: LPPRCDFAPAmmo
       - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
         prob: 0.3
 

@@ -170,6 +170,7 @@
         prob: 0.7
 ##      - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse # DeltaV - why
 ##        prob: 0.15
+      - id: LPPCombatHypospray
       - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
         prob: 0.3
 
@@ -203,6 +204,7 @@
         prob: 0.3
       - id: MedkitBurnFilled
         prob: 0.7
+      - id: LPPCombatHypospray
       - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
         prob: 0.3
 

@@ -125,6 +125,7 @@
   - type: StorageFill
     contents:
         - id: OxygenTankFilled
+        - id: ClothingShoesBootsMag
         - id: ClothingOuterHardsuitAtmos
         - id: ClothingMaskBreath
   - type: AccessReader

@@ -7,9 +7,7 @@
   - type: ContainerFill
     containers:
       key_slots:
-      - EncryptionKeyService
-      - EncryptionKeyCommand
-      - EncryptionKeyCommon
+      - EncryptionKeyStationMaster
 
 - type: entity
   parent: ClothingHeadsetAlt
@@ -19,9 +17,7 @@
   - type: ContainerFill
     containers:
       key_slots:
-      - EncryptionKeyService
-      - EncryptionKeyCommand
-      - EncryptionKeyCommon
+      - EncryptionKeyStationMaster
   - type: Sprite
     sprite: DeltaV/Clothing/Ears/Headsets/service.rsi
   - type: Clothing

@@ -40,6 +40,8 @@
     lowPressureMultiplier: 1000
   - type: TemperatureProtection
     coefficient: 0.005
+  - type: FlashImmunity
+  - type: EyeProtection
 
 #Engineering Hardsuit
 - type: entity
@@ -58,6 +60,8 @@
   - type: PressureProtection
     highPressureMultiplier: 0.1
     lowPressureMultiplier: 1000
+  - type: FlashImmunity
+  - type: EyeProtection
 
 #Spationaut Hardsuit
 - type: entity
@@ -249,6 +253,8 @@
   - type: PressureProtection
     highPressureMultiplier: 0.08
     lowPressureMultiplier: 1000
+  - type: FlashImmunity
+  - type: EyeProtection
 
 #Chief Medical Officer's Hardsuit
 - type: entity
@@ -590,7 +596,9 @@
         Slash: 0.9
         Piercing: 0.9
         Heat: 0.9
-
+  - type: FlashImmunity
+  - type: EyeProtection
+
 #ERT Medical Hardsuit
 - type: entity
   parent: ClothingHeadHelmetHardsuitSyndieElite

@@ -99,6 +99,8 @@
       type: InstrumentBoundUserInterface
     - key: enum.HealthAnalyzerUiKey.Key
       type: HealthAnalyzerBoundUserInterface
+    - key: enum.GasAnalyzerUiKey.Key
+      type: GasAnalyzerBoundUserInterface
   - type: Tag
     tags:
     - DoorBumpOpener
@@ -115,6 +117,13 @@
     scanningEndSound:
       path: "/Audio/Items/Medical/healthscanner.ogg"
 
+- type: entity
+  parent: BasePDA
+  id: BaseEngineerPDA
+  abstract: true
+  components:
+  - type: GasAnalyzer
+
 - type: entity
   parent: BasePDA
   id: PassengerPDA
@@ -128,7 +137,7 @@
     borderColor: "#717059"
 
 - type: entity
-  parent: BasePDA
+  parent: BaseEngineerPDA
   id: TechnicalAssistantPDA
   name: technical assistant PDA
   description: Why isn't it yellow?
@@ -517,7 +526,7 @@
     state: pda-hop
 
 - type: entity
-  parent: BasePDA
+  parent: BaseEngineerPDA
   id: CEPDA
   name: chief engineer PDA
   description: Looks like it's barely been used.
@@ -532,7 +541,7 @@
     state: pda-ce
 
 - type: entity
-  parent: BasePDA
+  parent: BaseEngineerPDA
   id: EngineerPDA
   name: engineer PDA
   description: Rugged and well-worn.
@@ -830,7 +839,7 @@
     program: 2
 
 - type: entity
-  parent: BasePDA
+  parent: BaseEngineerPDA
   id: AtmosPDA
   name: atmos PDA
   description: Still smells like plasma.

@@ -11,6 +11,7 @@
   startingGear: AtmosphericTechnicianGear
   icon: "JobIconAtmosphericTechnician"
   supervisors: job-supervisors-ce
+  canBeAntag: false
   access:
   - Maintenance
   - Engineering

@@ -414,7 +414,7 @@
 - type: trait
   id: BionicArm
   category: Physical
-  points: -9
+  points: -4
   requirements:
     - !type:CharacterJobRequirement
       inverted: true
@@ -423,7 +423,7 @@
   components:
     - type: Prying
       speedModifier: 1
-      pryPowered: true
+      pryPowered: false
       force: true
 
 - type: trait

@@ -0,0 +1,15 @@
+- type: characterItemGroup
+  id: LoadoutWeaponBS
+  items:
+    - type: loadout
+      id: LoadoutCommandBSWeaponPistolN1984
+    - type: loadout
+      id: LoadoutCommandBSWeaponPistolUniversal
+
+- type: characterItemGroup
+  id: LoadoutMagazineBS
+  items:
+    - type: loadout
+      id: LoadoutCommandBSMagazineUniversalMagnum
+    - type: loadout
+      id: LoadoutCommandBSMagazineMagnum
@@ -75,6 +75,7 @@
   - type: Clothing
     sprite: _LostParadise/Clothing/Eyes/HUD/SecEngHUD.rsi
   - type: EyeProtection
+  - type: FlashImmunity
   - type: Tag
     tags:
     - HudSecurity

@@ -1,5 +1,5 @@
 - type: entity
-  parent: BasePDA
+  parent: BaseEngineerPDA
   id: LPPSecurityEngineerPDA
   name: security PDA
   description: Red to hide the stains of passenger blood.
@@ -11,6 +11,13 @@
     borderColor: "#9b2b2a"
   - type: Icon
     state: pda-security
+  - type: CartridgeLoader
+    preinstalled:
+      - CrewManifestCartridge
+      - NotekeeperCartridge
+      - NewsReaderCartridge
+      - CrimeAssistCartridge
+      - SecWatchCartridge
 
 - type: entity
   parent: BasePDA
@@ -70,3 +77,10 @@
     accentVColor: "#DFDFDF"
   - type: Icon
     state: pda-seniorofficer
+  - type: CartridgeLoader
+    preinstalled:
+      - CrewManifestCartridge
+      - NotekeeperCartridge
+      - NewsReaderCartridge
+      - CrimeAssistCartridge
+      - SecWatchCartridge
@@ -10,11 +10,37 @@
   items:
     - ClothingBeltKatanaSheathFilledHoS
 
+- type: loadout
+  id: LoadoutCommandBSMedkitCombat
+  category: JobsCommand
+  cost: 2
+  exclusive: true
+  requirements: 
+    - !type:CharacterJobRequirement
+      jobs:
+        - LPPBlueShieldOfficer
+  items:
+    - MedkitCombatFilled
+
+- type: loadout
+  id: LoadoutCommandBSCombatHypospray
+  category: JobsCommand
+  cost: 4
+  exclusive: true
+  requirements: 
+    - !type:CharacterJobRequirement
+      jobs:
+        - LPPBlueShieldOfficer
+  items:
+    - LPPCombatHypospray
+
 - type: loadout
   id: LoadoutCommandBSWeaponPistolN1984
   category: JobsCommand
   cost: 2
   requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutWeaponBS
     - !type:CharacterJobRequirement
       jobs:
         - LPPBlueShieldOfficer
@@ -26,6 +52,8 @@
   category: JobsCommand
   cost: 2
   requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutWeaponBS
     - !type:CharacterJobRequirement
       jobs:
         - LPPBlueShieldOfficer
@@ -37,6 +65,8 @@
   category: JobsCommand
   cost: 1
   requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutMagazineBS
     - !type:CharacterJobRequirement
       jobs:
         - LPPBlueShieldOfficer
@@ -48,6 +78,8 @@
   category: JobsCommand
   cost: 1
   requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutMagazineBS
     - !type:CharacterJobRequirement
       jobs:
         - LPPBlueShieldOfficer