From e881af1fb6aeb378e64a2506c313540531f31185 Mon Sep 17 00:00:00 2001
From: Farrellka <104170263+Farrellka-dev@users.noreply.github.com>
Date: Fri, 1 Nov 2024 02:54:31 +0300
Subject: [PATCH] =?UTF-8?q?=D0=91=D0=B0=D1=84=D1=84=20=D0=98=D0=BD=D0=B6?=
=?UTF-8?q?=D0=B5=D0=B9=20=D0=B8=20=D0=BD=D0=B5=20=D1=82=D0=BE=D0=BB=D1=8C?=
=?UTF-8?q?=D0=BA=D0=BE=20(#310)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Газоанлазиатор инженерам, суперматерия в инженерный чат, программы СБ
* Баффы
* ПИ
* Фикс мезонок
* Фиксы
* Фикс
* Фигня
* Фикс тупости моей
* И ещё фиксы
* Трусы и ручки
* Фикс лодаута СИ
* У СИ нет рюкзака...
* Фикс теста, мб
---
.../Systems/SupermatterSystem.Processing.cs | 21 ++++++++
.../entities/objects/devices/pda.ftl | 6 +--
.../entities/objects/misc/papers/pen.ftl | 2 +-
.../entities/clothing/ears/headsets.ftl | 8 ++--
.../generation/supermatter/supermatter.ftl | 2 +-
.../Catalog/Fills/Lockers/engineer.yml | 2 +
.../Catalog/Fills/Lockers/heads.yml | 17 +++++++
.../Catalog/Fills/Lockers/security.yml | 2 +
.../Catalog/Fills/Lockers/suit_storage.yml | 1 +
.../Entities/Clothing/Ears/headsets.yml | 8 +---
.../Clothing/Head/hardsuit-helmets.yml | 7 ++-
.../Entities/Objects/Devices/pda.yml | 41 ++++++++++++++--
.../Loadouts/Jobs/Heads/chiefEngineer.yml | 48 +++++++++++++++++++
.../Prototypes/Loadouts/Jobs/engineering.yml | 7 ++-
.../Engineering/atmospheric_technician.yml | 1 +
.../Jobs/Engineering/senior_engineer.yml | 1 +
.../Roles/Jobs/Medical/senior_physician.yml | 1 +
.../Roles/Jobs/Science/senior_researcher.yml | 1 +
Resources/Prototypes/Traits/physical.yml | 4 +-
.../CharacterItemGroups/bsGroups.yml | 15 ++++++
.../Entities/Clothing/Eyes/Hud/hud.yml | 1 +
.../Entities/Objects/Devices/pda.yml | 16 ++++++-
.../Loadouts/Jobs/blueshield.yml | 32 +++++++++++++
23 files changed, 219 insertions(+), 25 deletions(-)
create mode 100644 Resources/Prototypes/_LostParadise/CharacterItemGroups/bsGroups.yml
diff --git a/Content.Server/Supermatter/Systems/SupermatterSystem.Processing.cs b/Content.Server/Supermatter/Systems/SupermatterSystem.Processing.cs
index 81995ed1be0..3d6fd80cf65 100644
--- a/Content.Server/Supermatter/Systems/SupermatterSystem.Processing.cs
+++ b/Content.Server/Supermatter/Systems/SupermatterSystem.Processing.cs
@@ -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!;
///
/// Handle power and radiation output depending on atmospheric things.
///
@@ -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(channelName);
+ _radioSystem.SendRadioMessage(source, message, radioChannel, source);
+ }
+
/// If true, sends a station announcement
/// Localisation string for a custom announcer name
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);
+ }
}
///
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/devices/pda.ftl
index a5fd83cb390..e6ad1597d1f 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/devices/pda.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/devices/pda.ftl
@@ -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 = Выглядит новеньким и пахнет космосом.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/misc/papers/pen.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/misc/papers/pen.ftl
index cef767073b8..a58378ec727 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/misc/papers/pen.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/misc/papers/pen.ftl
@@ -2,7 +2,7 @@ ent-LPPHosPen = Ручка Главы Службы Безопасности
.desc = { ent-Pen.desc }
ent-LPPCEPen = Ручка Старшего Инженера
.desc = { ent-Pen.desc }
-ent-LPPQMPen = Ручка Квартир Мейстера
+ent-LPPQMPen = Ручка Квартирмейстера
.desc = { ent-Pen.desc }
ent-LPPCMOPen = Ручка Главного Врача
.desc = { ent-Pen.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/clothing/ears/headsets.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/clothing/ears/headsets.ftl
index 252d42dec7d..572c4e6302b 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/clothing/ears/headsets.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/clothing/ears/headsets.ftl
@@ -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 = Тюремная гарнитура
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/power/generation/supermatter/supermatter.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/power/generation/supermatter/supermatter.ftl
index d3d971cf4dd..396d16dd2a5 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/power/generation/supermatter/supermatter.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/power/generation/supermatter/supermatter.ftl
@@ -1,2 +1,2 @@
-ent-Supermatter = Кристал суперматерии
+ent-Supermatter = Кристалл суперматерии
.desc = Странно прозрачный и переливающийся кристалл.
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
index 860d2c65986..a82ff257dc3 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
@@ -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!
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index 6fb85280e72..1af851df17e 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -23,6 +23,7 @@
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
- id: WeaponEnergyGunMini #LPP
+ - id: LPPQMPanties #LPP
- type: entity
id: LockerCaptainFilledHardsuit
@@ -56,6 +57,7 @@
- id: MedalCase
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
+ - id: LPPCapPanties #LPP
- type: entity
id: LockerCaptainFilled
@@ -89,6 +91,7 @@
- id: ClothingHeadHatBeretCap # Nyanotrasen - Captain's Beret
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
+ - id: LPPCapPanties #LPP
- type: entity
id: LockerCaptainFilledNoLaser
@@ -121,6 +124,7 @@
- id: ClothingHeadHatBeretCap # Nyanotrasen - Captain's Beret
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
+ - id: LPPCapPanties #LPP
- type: entity
id: LockerHeadOfPersonnelFilled
@@ -156,6 +160,7 @@
- id: LPPBoxFolderSecretBlue
prob: 0.6
# - >
+ - id: LPPHOPPanties #LPP
- type: entity
id: LockerChiefEngineerFilledHardsuit
@@ -181,9 +186,12 @@
- id: BoxPDAEngineering # Delta-V
- id: RCD
- id: RCDAmmo
+ - id: LPPRCDFAPDevice
+ - id: LPPRCDFAPAmmo
- id: CEIDCard # Delta-V
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
+ - id: LPPCEPanties #LPP
- type: entity
id: LockerChiefEngineerFilled
@@ -206,8 +214,11 @@
- id: CEIDCard # Delta-V
- id: RCD
- id: RCDAmmo
+ - id: LPPRCDFAPDevice
+ - id: LPPRCDFAPAmmo
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
+ - id: LPPCEPanties #LPP
- type: entity
id: LockerChiefMedicalOfficerFilledHardsuit
@@ -236,6 +247,7 @@
- id: CMOIDCard # Delta-V
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
+ - id: LPPCMOPanties #LPP
- type: entity
id: LockerChiefMedicalOfficerFilled
@@ -260,6 +272,7 @@
- id: CMOIDCard # Delta-V
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
+ - id: LPPCMOPanties #LPP
- type: entity
id: LockerResearchDirectorFilledHardsuit
@@ -283,6 +296,7 @@
- id: EncryptionKeyBinary
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
+ - id: LPPRDPanties #LPP
- type: entity
id: LockerResearchDirectorFilled
@@ -305,6 +319,7 @@
- id: EncryptionKeyBinary
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
+ - id: LPPRDPanties #LPP
- type: entity
id: LockerHeadOfSecurityFilledHardsuit
@@ -338,6 +353,7 @@
prob: 0.3
#LPP
- id: LPPBoxArmband
+ - id: LPPHOSPanties
- type: entity
id: LockerHeadOfSecurityFilled
@@ -369,6 +385,7 @@
prob: 0.3
#LPP
- id: LPPBoxArmband
+ - id: LPPHOSPanties
- type: entity
id: LockerFreezerVaultFilled
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index 3f71c11641d..adc0ec6dd3c 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -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
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
index c22577f748c..c6a22775734 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
@@ -125,6 +125,7 @@
- type: StorageFill
contents:
- id: OxygenTankFilled
+ - id: ClothingShoesBootsMag
- id: ClothingOuterHardsuitAtmos
- id: ClothingMaskBreath
- type: AccessReader
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml
index b32cab7b21a..9c0176e9174 100644
--- a/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml
@@ -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
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
index a03c432d91c..cf9bb597189 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -40,6 +40,7 @@
lowPressureMultiplier: 1000
- type: TemperatureProtection
coefficient: 0.005
+ - type: EyeProtection
#Engineering Hardsuit
- type: entity
@@ -58,6 +59,7 @@
- type: PressureProtection
highPressureMultiplier: 0.1
lowPressureMultiplier: 1000
+ - type: EyeProtection
#Spationaut Hardsuit
- type: entity
@@ -249,6 +251,7 @@
- type: PressureProtection
highPressureMultiplier: 0.08
lowPressureMultiplier: 1000
+ - type: EyeProtection
#Chief Medical Officer's Hardsuit
- type: entity
@@ -590,7 +593,9 @@
Slash: 0.9
Piercing: 0.9
Heat: 0.9
-
+ - type: FlashImmunity
+ - type: EyeProtection
+
#ERT Medical Hardsuit
- type: entity
parent: ClothingHeadHelmetHardsuitSyndieElite
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 484052e4048..aa9d5c9153b 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -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?
@@ -353,6 +362,12 @@
- type: Pda
id: QuartermasterIDCard
state: pda-qm
+ penSlot:
+ startingItem: LPPQMPen
+ priority: -1
+ whitelist:
+ tags:
+ - Write
- type: PdaBorderColor
borderColor: "#e39751"
accentVColor: "#a23e3e"
@@ -517,7 +532,7 @@
state: pda-hop
- type: entity
- parent: BasePDA
+ parent: BaseEngineerPDA
id: CEPDA
name: chief engineer PDA
description: Looks like it's barely been used.
@@ -525,6 +540,12 @@
- type: Pda
id: CEIDCard
state: pda-ce
+ penSlot:
+ startingItem: LPPCEPen
+ priority: -1
+ whitelist:
+ tags:
+ - Write
- type: PdaBorderColor
borderColor: "#949137"
accentHColor: "#447987"
@@ -532,7 +553,7 @@
state: pda-ce
- type: entity
- parent: BasePDA
+ parent: BaseEngineerPDA
id: EngineerPDA
name: engineer PDA
description: Rugged and well-worn.
@@ -643,6 +664,12 @@
- type: Pda
id: RDIDCard
state: pda-rd
+ penSlot:
+ startingItem: LPPRDPen
+ priority: -1
+ whitelist:
+ tags:
+ - Write
- type: PdaBorderColor
borderColor: "#d7d7d0"
accentHColor: "#447987"
@@ -701,6 +728,12 @@
- type: Pda
id: HoSIDCard
state: pda-hos
+ penSlot:
+ startingItem: LPPHosPen
+ priority: -1
+ whitelist:
+ tags:
+ - Write
- type: PdaBorderColor
borderColor: "#A32D26"
accentHColor: "#447987"
@@ -830,7 +863,7 @@
program: 2
- type: entity
- parent: BasePDA
+ parent: BaseEngineerPDA
id: AtmosPDA
name: atmos PDA
description: Still smells like plasma.
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml
index bfddc6e383e..e13b0ba8816 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml
@@ -44,3 +44,51 @@
- ChiefEngineer
items:
- ClothingShoesBootsWinterChiefEngineer
+
+- type: loadout
+ id: LoadoutCommandCEUniformJumpskirt
+ category: JobsCommand
+ cost: 0
+ exclusive: true
+ requirements:
+ - !type:CharacterJobRequirement
+ jobs:
+ - ChiefEngineer
+ items:
+ - ClothingUniformJumpskirtChiefEngineer
+
+- type: loadout
+ id: LoadoutCommandCEUniformJumpskirtTurtle
+ category: JobsCommand
+ cost: 0
+ exclusive: true
+ requirements:
+ - !type:CharacterJobRequirement
+ jobs:
+ - ChiefEngineer
+ items:
+ - ClothingUniformJumpskirtChiefEngineerTurtle
+
+- type: loadout
+ id: LoadoutCommandCEUniformJumpsuit
+ category: JobsCommand
+ cost: 0
+ exclusive: true
+ requirements:
+ - !type:CharacterJobRequirement
+ jobs:
+ - ChiefEngineer
+ items:
+ - ClothingUniformJumpsuitChiefEngineer
+
+- type: loadout
+ id: LoadoutCommandCEUniformJumpsuitTurtle
+ category: JobsCommand
+ cost: 0
+ exclusive: true
+ requirements:
+ - !type:CharacterJobRequirement
+ jobs:
+ - ChiefEngineer
+ items:
+ - ClothingUniformJumpsuitChiefEngineerTurtle
diff --git a/Resources/Prototypes/Loadouts/Jobs/engineering.yml b/Resources/Prototypes/Loadouts/Jobs/engineering.yml
index beef8a9bb5d..6fe1f0e2e5c 100644
--- a/Resources/Prototypes/Loadouts/Jobs/engineering.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/engineering.yml
@@ -84,6 +84,7 @@
jobs:
- StationEngineer
- AtmosphericTechnician
+ - ChiefEngineer
items:
- ClothingHeadHatHardhatBlue
@@ -99,6 +100,7 @@
jobs:
- StationEngineer
- AtmosphericTechnician
+ - ChiefEngineer
items:
- ClothingHeadHatHardhatOrange
@@ -114,6 +116,7 @@
jobs:
- StationEngineer
- AtmosphericTechnician
+ - ChiefEngineer
items:
- ClothingHeadHatHardhatYellow
@@ -127,8 +130,7 @@
group: LoadoutHeadEngineering
- !type:CharacterJobRequirement
jobs:
- - StationEngineer
- - AtmosphericTechnician
+ - ChiefEngineer
items:
- ClothingHeadHatHardhatWhite
@@ -144,5 +146,6 @@
jobs:
- StationEngineer
- AtmosphericTechnician
+ - ChiefEngineer
items:
- ClothingHeadHatHardhatRed
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
index b9acd247aa2..8a7aeabda5d 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
@@ -11,6 +11,7 @@
startingGear: AtmosphericTechnicianGear
icon: "JobIconAtmosphericTechnician"
supervisors: job-supervisors-ce
+ canBeAntag: false
access:
- Maintenance
- Engineering
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml
index 6856f12a715..3669bddb7ce 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml
@@ -17,6 +17,7 @@
startingGear: SeniorEngineerGear
icon: "JobIconSeniorEngineer"
supervisors: job-supervisors-ce
+ canBeAntag: false
access:
- Maintenance
- Engineering
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml
index 3482afab312..8ab9e32d75f 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml
@@ -17,6 +17,7 @@
startingGear: SeniorPhysicianGear
icon: "JobIconSeniorPhysician"
supervisors: job-supervisors-cmo
+ canBeAntag: false
access:
- Medical
- Maintenance
diff --git a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml
index 279f525b0dc..f29eb10c82b 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml
@@ -11,6 +11,7 @@
startingGear: SeniorResearcherGear
icon: "JobIconSeniorResearcher"
supervisors: job-supervisors-rd
+ canBeAntag: false
access:
- Research
# - Robotics
diff --git a/Resources/Prototypes/Traits/physical.yml b/Resources/Prototypes/Traits/physical.yml
index 7bfb620fa8c..ce2e88bc6bb 100644
--- a/Resources/Prototypes/Traits/physical.yml
+++ b/Resources/Prototypes/Traits/physical.yml
@@ -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
diff --git a/Resources/Prototypes/_LostParadise/CharacterItemGroups/bsGroups.yml b/Resources/Prototypes/_LostParadise/CharacterItemGroups/bsGroups.yml
new file mode 100644
index 00000000000..872ca6c748e
--- /dev/null
+++ b/Resources/Prototypes/_LostParadise/CharacterItemGroups/bsGroups.yml
@@ -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
diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Eyes/Hud/hud.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Eyes/Hud/hud.yml
index e6b4a401399..754fd195560 100644
--- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Eyes/Hud/hud.yml
+++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Eyes/Hud/hud.yml
@@ -75,6 +75,7 @@
- type: Clothing
sprite: _LostParadise/Clothing/Eyes/HUD/SecEngHUD.rsi
- type: EyeProtection
+ - type: FlashImmunity
- type: Tag
tags:
- HudSecurity
diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/pda.yml
index d2518925b7d..b2f01e85bdf 100644
--- a/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/pda.yml
@@ -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
\ No newline at end of file
diff --git a/Resources/Prototypes/_LostParadise/Loadouts/Jobs/blueshield.yml b/Resources/Prototypes/_LostParadise/Loadouts/Jobs/blueshield.yml
index daba38900c5..81d74172117 100644
--- a/Resources/Prototypes/_LostParadise/Loadouts/Jobs/blueshield.yml
+++ b/Resources/Prototypes/_LostParadise/Loadouts/Jobs/blueshield.yml
@@ -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