Skip to content

Commit

Permalink
Бафф Инжей и не только (#310)
Browse files Browse the repository at this point in the history
* Газоанлазиатор инженерам, суперматерия в инженерный чат, программы СБ

* Баффы

* ПИ

* Фикс мезонок

* Фиксы

* Фикс

* Фигня

* Фикс тупости моей

* И ещё фиксы

* Трусы и ручки

* Фикс лодаута СИ

* У СИ нет рюкзака...

* Фикс теста, мб
  • Loading branch information
Farrellka-dev authored Oct 31, 2024
1 parent f873d5d commit e881af1
Show file tree
Hide file tree
Showing 23 changed files with 219 additions and 25 deletions.
21 changes: 21 additions & 0 deletions Content.Server/Supermatter/Systems/SupermatterSystem.Processing.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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)
Expand All @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = Выглядит новеньким и пахнет космосом.
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = Тюремная гарнитура
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ent-Supermatter = Кристал суперматерии
ent-Supermatter = Кристалл суперматерии
.desc = Странно прозрачный и переливающийся кристалл.
2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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!
Expand Down
17 changes: 17 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
- id: WeaponEnergyGunMini #LPP
- id: LPPQMPanties #LPP

- type: entity
id: LockerCaptainFilledHardsuit
Expand Down Expand Up @@ -56,6 +57,7 @@
- id: MedalCase
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
- id: LPPCapPanties #LPP

- type: entity
id: LockerCaptainFilled
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -156,6 +160,7 @@
- id: LPPBoxFolderSecretBlue
prob: 0.6
# - >
- id: LPPHOPPanties #LPP

- type: entity
id: LockerChiefEngineerFilledHardsuit
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -236,6 +247,7 @@
- id: CMOIDCard # Delta-V
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
- id: LPPCMOPanties #LPP

- type: entity
id: LockerChiefMedicalOfficerFilled
Expand All @@ -260,6 +272,7 @@
- id: CMOIDCard # Delta-V
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
- id: LPPCMOPanties #LPP

- type: entity
id: LockerResearchDirectorFilledHardsuit
Expand All @@ -283,6 +296,7 @@
- id: EncryptionKeyBinary
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
- id: LPPRDPanties #LPP

- type: entity
id: LockerResearchDirectorFilled
Expand All @@ -305,6 +319,7 @@
- id: EncryptionKeyBinary
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
- id: LPPRDPanties #LPP

- type: entity
id: LockerHeadOfSecurityFilledHardsuit
Expand Down Expand Up @@ -338,6 +353,7 @@
prob: 0.3
#LPP
- id: LPPBoxArmband
- id: LPPHOSPanties

- type: entity
id: LockerHeadOfSecurityFilled
Expand Down Expand Up @@ -369,6 +385,7 @@
prob: 0.3
#LPP
- id: LPPBoxArmband
- id: LPPHOSPanties

- type: entity
id: LockerFreezerVaultFilled
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -203,6 +204,7 @@
prob: 0.3
- id: MedkitBurnFilled
prob: 0.7
- id: LPPCombatHypospray
- id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
prob: 0.3

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@
- type: StorageFill
contents:
- id: OxygenTankFilled
- id: ClothingShoesBootsMag
- id: ClothingOuterHardsuitAtmos
- id: ClothingMaskBreath
- type: AccessReader
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
- type: ContainerFill
containers:
key_slots:
- EncryptionKeyService
- EncryptionKeyCommand
- EncryptionKeyCommon
- EncryptionKeyStationMaster

- type: entity
parent: ClothingHeadsetAlt
Expand All @@ -19,9 +17,7 @@
- type: ContainerFill
containers:
key_slots:
- EncryptionKeyService
- EncryptionKeyCommand
- EncryptionKeyCommon
- EncryptionKeyStationMaster
- type: Sprite
sprite: DeltaV/Clothing/Ears/Headsets/service.rsi
- type: Clothing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
lowPressureMultiplier: 1000
- type: TemperatureProtection
coefficient: 0.005
- type: EyeProtection

#Engineering Hardsuit
- type: entity
Expand All @@ -58,6 +59,7 @@
- type: PressureProtection
highPressureMultiplier: 0.1
lowPressureMultiplier: 1000
- type: EyeProtection

#Spationaut Hardsuit
- type: entity
Expand Down Expand Up @@ -249,6 +251,7 @@
- type: PressureProtection
highPressureMultiplier: 0.08
lowPressureMultiplier: 1000
- type: EyeProtection

#Chief Medical Officer's Hardsuit
- type: entity
Expand Down Expand Up @@ -590,7 +593,9 @@
Slash: 0.9
Piercing: 0.9
Heat: 0.9

- type: FlashImmunity
- type: EyeProtection

#ERT Medical Hardsuit
- type: entity
parent: ClothingHeadHelmetHardsuitSyndieElite
Expand Down
Loading

0 comments on commit e881af1

Please sign in to comment.