From 8a050c6ea883cfbb49e45b5233e95212560fc4f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=97=D1=8E=D0=B7=D1=8F?= <151495015+Kinar7@users.noreply.github.com> Date: Wed, 25 Jun 2025 20:08:39 +0500 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B0=D1=81=D1=88=D0=B8=D1=80=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BB=D0=BE=D0=B4=D0=B0=D1=83=D1=82=20=D0=BE=D1=80?= =?UTF-8?q?=D1=83=D0=B6=D0=B8=D1=8F=20=D0=A1=D0=91=D1=83=D1=85=20(#2355)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: be quieti Co-authored-by: KaiserMaus --- .../entities/objects/misc/glockbox.ftl | 2 + .../entities/objects/misc/glockbox.ftl | 4 +- .../Entities/Objects/Misc/glockbox.yml | 14 ++++ .../Loadouts/Jobs/Security/security.yml | 64 ++++++++++++++++++- .../_Sunrise/Loadouts/loadout_groups.yml | 8 ++- 5 files changed, 87 insertions(+), 5 deletions(-) diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/misc/glockbox.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/misc/glockbox.ftl index 4cadd442a1..f6c3b0e9e5 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/misc/glockbox.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/misc/glockbox.ftl @@ -1,2 +1,4 @@ ent-GlockBox = glock box .desc = It contains a Glock22 and a magazine for it. Did you want something else? +ent-ACP14Box = ACP14 box + .desc = It contains a ACP14 and a magazine for it. Did you want something else? diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/misc/glockbox.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/misc/glockbox.ftl index 199f7b9cd7..16a247094a 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/misc/glockbox.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/misc/glockbox.ftl @@ -1,2 +1,4 @@ -ent-GlockBox = коробока с глоком +ent-GlockBox = коробка с глоком .desc = Содержит Glock22 и магазин к нему. Вы хотели что-то другое? +ent-ACP14Box = коробка с ACP14 + .desc = Содержит ACP14 и магазин к нему. Вы хотели что-то другое? diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/glockbox.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/glockbox.yml index fb74090205..9dd6027ce7 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/glockbox.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/glockbox.yml @@ -23,3 +23,17 @@ amount: 1 - id: WeaponPistolG22 amount: 1 + +- type: entity + parent: GlockBox + id: ACP14Box + name: ACP14 box + description: It contains a ACP14 and a magazine for it. Did you want something else? + components: + - type: StorageFill + contents: + - id: MagazineACP14 + amount: 1 + - id: WeaponPistolACP14 + amount: 1 + diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Security/security.yml b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Security/security.yml index de08e52946..cce4829ec7 100644 --- a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Security/security.yml +++ b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Security/security.yml @@ -1,4 +1,13 @@ -- type: loadout +- type: loadoutEffectGroup + id: MasterSecurity + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobSecurityOfficer + time: 72000 #20 hrs + +- type: loadout id: SecurityBodycam startingGear: SecurityBodycam @@ -97,3 +106,56 @@ storage: back: - HoloprojectorSecurity + +- type: loadout + id: GlockBox + startingGear: GlockBox + +- type: startingGear + id: GlockBox + storage: + back: + - GlockBox + +- type: loadout + id: ACP14Box + startingGear: ACP14Box + effects: + - !type:GroupLoadoutEffect + proto: MasterSecurity + +- type: startingGear + id: ACP14Box + storage: + back: + - ACP14Box + +- type: loadout + id: WeaponEnergyGunPistolSecurity + startingGear: WeaponEnergyGunPistolSecurity + +- type: startingGear + id: WeaponEnergyGunPistolSecurity + storage: + back: + - WeaponEnergyGunPistolSecurity + +- type: loadout + id: WeaponDisabler + startingGear: WeaponDisabler + +- type: startingGear + id: WeaponDisabler + storage: + back: + - WeaponDisabler + +- type: loadout + id: WeaponTaser + startingGear: WeaponTaser + +- type: startingGear + id: WeaponTaser + storage: + back: + - WeaponTaser diff --git a/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml b/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml index edadebc2b4..bd90e7eb57 100644 --- a/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml @@ -221,9 +221,11 @@ minLimit: 1 maxLimit: 1 loadouts: - #- SunriseWeaponPistolG22 - - SunriseWeaponEnergyGun - - SunriseWeaponTaser + - GlockBox + - ACP14Box + - WeaponEnergyGunPistolSecurity + - WeaponDisabler + - WeaponTaser # Security Detective - type: loadoutGroup