diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml index afbeff6b080629..59f0e7df7e7e06 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml @@ -8,6 +8,7 @@ ClusterBangFull: 2 GrenadeStinger: 4 Flash: 5 + ClothingNeckProtectBundle: 4 #ss220 tacsec update Tourniquet: 5 FlashlightSeclite: 5 ClothingEyesGlassesSunglasses: 2 diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index dd4b8a984d0e95..8f4093251d98d9 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -1056,6 +1056,7 @@ - SecurityBeret - SecurityHat - HatCowboyBlack #ss220 sec loadout update + - HelmetTacSec #ss220 tacsec update #SS220 neck loadout begin - type: loadoutGroup @@ -1065,6 +1066,7 @@ loadouts: - SecurityHolster #SS220 holster loadout - Headphones #SS220 sec loadout update + - ProtectGear #ss220 tacsec update #SS220 neck loadout end - type: loadoutGroup @@ -1080,6 +1082,7 @@ - SecurityJumpsuitTurtleneck #SS220-MoreTurtleneck-Begin - SecurityJumpskirtTurtleneck #SS220-MoreTurtleneck-End - JumpsuitSecBlue #ss220 sec loadout update + - JumpsuitTacSec #ss220 tacsec update - type: loadoutGroup id: SecurityBackpack diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Head/tacsec_helmet.yml b/Resources/Prototypes/SS220/Entities/Clothing/Head/tacsec_helmet.yml new file mode 100644 index 00000000000000..6bfab984928743 --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Clothing/Head/tacsec_helmet.yml @@ -0,0 +1,10 @@ +- type: entity + parent: ClothingHeadHelmetBasic + id: ClothingHeadHelmetTactical + name: тактический шлем СБ + description: Тактический шлем для самых элитных офицеров службы безопасности НТ. + components: + - type: Sprite + sprite: SS220/Clothing/Head/Helmets/opscore.rsi + - type: Clothing + sprite: SS220/Clothing/Head/Helmets/opscore.rsi diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Neck/security_protectgear.yml b/Resources/Prototypes/SS220/Entities/Clothing/Neck/security_protectgear.yml new file mode 100644 index 00000000000000..251da1607812c9 --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Clothing/Neck/security_protectgear.yml @@ -0,0 +1,15 @@ +- type: entity + parent: ClothingNeckBase + id: ClothingNeckProtectBundle + name: защитный комплект СБ + description: Защитный комплект состоящий из пары наколенников и налокотников идеально впишутся в ваш рабочий процесс по устранению беспорядков! + components: + - type: Sprite + sprite: SS220/Clothing/Neck/Misc/tactical.rsi + - type: Clothing + sprite: SS220/Clothing/Neck/Misc/tactical.rsi + - type: Armor # perfect + modifiers: + coefficients: + Blunt: 0.90 + Slash: 0.90 diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/tacsec.yml b/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/tacsec.yml new file mode 100644 index 00000000000000..b79441df34d07e --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/tacsec.yml @@ -0,0 +1,10 @@ +- type: entity + parent: ClothingUniformBase + id: ClothingUniformTacticalSecurity + name: тактическая униформа СБ + description: Боевая рубаха для самых элитных офицеров СБ. Индивидуальный пошив! + components: + - type: Sprite + sprite: SS220/Clothing/Uniforms/tacuniform.rsi + - type: Clothing + sprite: SS220/Clothing/Uniforms/tacuniform.rsi diff --git a/Resources/Prototypes/SS220/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/SS220/Loadouts/Jobs/Security/security_officer.yml index d41b9e23962b01..e795872c5ae493 100644 --- a/Resources/Prototypes/SS220/Loadouts/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/SS220/Loadouts/Jobs/Security/security_officer.yml @@ -7,6 +7,15 @@ !type:RoleTimeRequirement role: JobSecurityOfficer time: 108000 # 30 hrs +# TacSec Time +- type: loadoutEffectGroup + id: TacSec + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobSecurityOfficer + time: 360000 # 100 hrs # Jumpsuit - type: loadout @@ -30,18 +39,39 @@ equipment: jumpsuit: ClothingUniformJumpsuitSecBlue +- type: loadout + id: JumpsuitTacSec + effects: + - !type:GroupLoadoutEffect + proto: TacSec + equipment: + jumpsuit: ClothingUniformTacticalSecurity + # Head - type: loadout id: HatCowboyBlack equipment: head: ClothingHeadHatCowboyBlack +- type: loadout + id: HelmetTacSec + effects: + - !type:GroupLoadoutEffect + proto: TacSec + equipment: + head: ClothingHeadHelmetTactical + # Neck - type: loadout id: Headphones equipment: neck: ClothingNeckHeadphones +- type: loadout + id: ProtectGear + equipment: + neck: ClothingNeckProtectBundle + #Outer - type: loadout id: VestArmorSec diff --git a/Resources/Textures/SS220/Clothing/Head/Helmets/opscore.rsi/equipped-HELMET.png b/Resources/Textures/SS220/Clothing/Head/Helmets/opscore.rsi/equipped-HELMET.png new file mode 100644 index 00000000000000..f18cd409ec356c Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Helmets/opscore.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Helmets/opscore.rsi/icon.png b/Resources/Textures/SS220/Clothing/Head/Helmets/opscore.rsi/icon.png new file mode 100644 index 00000000000000..7a08d3361dfd37 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Helmets/opscore.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Helmets/opscore.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/Head/Helmets/opscore.rsi/inhand-left.png new file mode 100644 index 00000000000000..29c1a1c77e2349 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Helmets/opscore.rsi/inhand-left.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Helmets/opscore.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/Head/Helmets/opscore.rsi/inhand-right.png new file mode 100644 index 00000000000000..39f4ff717d6878 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Helmets/opscore.rsi/inhand-right.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Helmets/opscore.rsi/meta.json b/Resources/Textures/SS220/Clothing/Head/Helmets/opscore.rsi/meta.json new file mode 100644 index 00000000000000..427c10d28e399d --- /dev/null +++ b/Resources/Textures/SS220/Clothing/Head/Helmets/opscore.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", + "copyright": "Made by vimenant2 (discord) for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] + } diff --git a/Resources/Textures/SS220/Clothing/Neck/Misc/tactical.rsi/equipped-NECK.png b/Resources/Textures/SS220/Clothing/Neck/Misc/tactical.rsi/equipped-NECK.png new file mode 100644 index 00000000000000..e6b5c66974dcf8 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Neck/Misc/tactical.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/SS220/Clothing/Neck/Misc/tactical.rsi/icon.png b/Resources/Textures/SS220/Clothing/Neck/Misc/tactical.rsi/icon.png new file mode 100644 index 00000000000000..1e146ade760225 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Neck/Misc/tactical.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Clothing/Neck/Misc/tactical.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/Neck/Misc/tactical.rsi/inhand-left.png new file mode 100644 index 00000000000000..4086949500692b Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Neck/Misc/tactical.rsi/inhand-left.png differ diff --git a/Resources/Textures/SS220/Clothing/Neck/Misc/tactical.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/Neck/Misc/tactical.rsi/inhand-right.png new file mode 100644 index 00000000000000..dd4e3f8b2b77f4 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Neck/Misc/tactical.rsi/inhand-right.png differ diff --git a/Resources/Textures/SS220/Clothing/Neck/Misc/tactical.rsi/meta.json b/Resources/Textures/SS220/Clothing/Neck/Misc/tactical.rsi/meta.json new file mode 100644 index 00000000000000..2dbd14d81eac1a --- /dev/null +++ b/Resources/Textures/SS220/Clothing/Neck/Misc/tactical.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", + "copyright": "Made by vimenant2 (discord) for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SS220/Clothing/Uniforms/tacuniform.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/SS220/Clothing/Uniforms/tacuniform.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 00000000000000..3e09a91ff1d444 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Uniforms/tacuniform.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/SS220/Clothing/Uniforms/tacuniform.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/SS220/Clothing/Uniforms/tacuniform.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000000..4aa5f044353eb7 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Uniforms/tacuniform.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/SS220/Clothing/Uniforms/tacuniform.rsi/icon.png b/Resources/Textures/SS220/Clothing/Uniforms/tacuniform.rsi/icon.png new file mode 100644 index 00000000000000..f7db162f5f14b3 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Uniforms/tacuniform.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Clothing/Uniforms/tacuniform.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/Uniforms/tacuniform.rsi/inhand-left.png new file mode 100644 index 00000000000000..06eb36c5118195 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Uniforms/tacuniform.rsi/inhand-left.png differ diff --git a/Resources/Textures/SS220/Clothing/Uniforms/tacuniform.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/Uniforms/tacuniform.rsi/inhand-right.png new file mode 100644 index 00000000000000..9b306fa7bd754a Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Uniforms/tacuniform.rsi/inhand-right.png differ diff --git a/Resources/Textures/SS220/Clothing/Uniforms/tacuniform.rsi/meta.json b/Resources/Textures/SS220/Clothing/Uniforms/tacuniform.rsi/meta.json new file mode 100644 index 00000000000000..1fe52da63701bf --- /dev/null +++ b/Resources/Textures/SS220/Clothing/Uniforms/tacuniform.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", + "copyright": "by Okroshka for 220 with love", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}