TacSec 2

Resources/Locale/en-US/ss220/preferences/loadout-groups.ftl

@@ -1,4 +1,7 @@
 # Security
 loadout-group-security-mask = Security mask
+loadout-group-security-gloves = Security gloves
+
 # Janitor
 loadout-group-janitor-belt = Janitor belt
+

Resources/Locale/ru-RU/ss220/clothing/Eyes/glasses.ftl

@@ -9,3 +9,6 @@ ent-ThermalVisorRND = термальный визор
 
 ent-ClothingEyesThermalGlassesSecurity = термальные очки охраны
     .desc = Модернизированные солнцезащитные очки с функцией защиты от вспышек, визором СБ и термальными визорами.
+
+ent-ClothingEyesGlassesBallistic = баллистические очки
+    .desc = Эти очки не защитят ваши глаза от осколков, но дополнят ваш тактический образ. Имеют функции стандартных очков СБ.

Resources/Locale/ru-RU/ss220/clothing/Hands/gloves.ftl

@@ -2,10 +2,15 @@ ent-ClothingHandsGlovesCentcom = перчатки Центком
     .desc = Пара высококачественных плотных перчаток Центком, украшенных золотым шитьём.
 ent-ClothingHandsGlovesNanotrasenDiplomat = белые перчатки Центком
     .desc = Пара высококачественных белых плотных перчаток, украшенных золотым шитьём, которые выдаются дипломату Nanotrasen.
+
+ent-ClothingHandsGlovesSecTactical = тактические перчатки охраны
+    .desc = Пара чёрных перчаток с красными элементами, что дополнят ваш тактический образ. Не путать с боевыми.
+
 ent-ClothingHandsGlovesJanitorJR = черные резиновые перчатки
     .suffix = JR, За время в игре
     .desc = Уборочные перчатки с дополнительным защитным покрытием. Они видели столь много...
 
 ent-ClothingHandsGlovesDQ = боевые перчатки Эскадрона Смерти
     .suffix = Эскадрон Смерти, dq
     .desc = Силовые перчатки, значительно усиливающие силу удара.
+

Resources/Locale/ru-RU/ss220/loadout-groups/security-officer.ftl

@@ -1,2 +1,3 @@
 loadout-group-security-mask = Офицер СБ, маска
 loadout-group-security-glasses = Офицер СБ, очки
+loadout-group-security-gloves = Офицер СБ, перчатки

Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml

@@ -170,9 +170,9 @@
   description: Upgraded sunglasses that provide flash immunity and a security HUD.
   components:
   - type: Sprite
-    sprite: Clothing/Eyes/Glasses/secglasses.rsi
+    sprite: SS220/Clothing/Eyes/Glasses/secglasses.rsi #SS220-updated
   - type: Clothing
-    sprite: Clothing/Eyes/Glasses/secglasses.rsi
+    sprite: SS220/Clothing/Eyes/Glasses/secglasses.rsi #SS220-updated
   - type: FlashImmunity
   - type: EyeProtection
     protectionTime: 5

Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml

@@ -31,9 +31,9 @@
   description: A slim Type I armored vest that provides decent protection against most types of damage.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/Armor/security_slim.rsi
+    sprite: SS220/Clothing/OuterClothing/Armor/security_slim.rsi #SS220-updated
   - type: Clothing
-    sprite: Clothing/OuterClothing/Armor/security_slim.rsi
+    sprite: SS220/Clothing/OuterClothing/Armor/security_slim.rsi #SS220-updated
 
 - type: entity
   parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing]

Resources/Prototypes/Loadouts/role_loadouts.yml

@@ -420,6 +420,7 @@
   - SecurityJumpsuit
   - SecurityBackpack
   - SecurityOuterClothing
+  - SecurityGloves #SS220-tacsec loadout
   - SecurityShoes
   - SecurityPDA
   - SecurityBelt

Resources/Prototypes/SS220/Entities/Clothing/Eyes/glasses.yml

@@ -31,3 +31,31 @@
     - HamsterWearable
     - WhitelistChameleon
     - SecDogWearable
+
+- type: entity
+  parent: [ClothingEyesBase, ShowSecurityIcons]
+  id: ClothingEyesGlassesBallistic
+  name: ballistic glasses
+  description: Tactical security element
+  components:
+  - type: Sprite
+    sprite: SS220/Clothing/Eyes/Glasses/secballistic.rsi
+  - type: Clothing
+    sprite: SS220/Clothing/Eyes/Glasses/secballistic.rsi 
+  - type: FlashImmunity
+  - type: EyeProtection
+    protectionTime: 5
+  - type: Construction
+    graph: GlassesSecHUD
+    node: glassesSec
+  - type: Tag
+    tags:
+    - HamsterWearable
+    - WhitelistChameleon
+    - SecDogWearable # Roxi
+  - type: GuideHelp
+    guides:
+    - Security
+    - Antagonists
+  - type: IdentityBlocker
+    coverage: EYES

Resources/Prototypes/SS220/Entities/Clothing/Hand/hands.yml

@@ -56,6 +56,17 @@
   - type: Clothing
     sprite: SS220/Clothing/Hands/Gloves/orangejanitor.rsi
 
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsGlovesSecTactical
+  name: security tactical gloves
+  description: tactical security element
+  components:
+  - type: Sprite
+    sprite: SS220/Clothing/Hands/Gloves/sectactical.rsi
+  - type: Clothing
+    sprite: SS220/Clothing/Hands/Gloves/sectactical.rsi
+
 - type: entity
   parent: ClothingHandsGlovesJanitor
   id: ClothingHandsGlovesJanitorJR
@@ -88,3 +99,4 @@
   - type: Fiber
     fiberMaterial: fibers-insulative
   - type: FingerprintMask
+

Resources/Prototypes/SS220/Loadouts/Jobs/Security/security_officer.yml

@@ -40,6 +40,14 @@
   equipment:
     eyes: ClothingSponsorCyberSecVisor
 
+- type: loadout
+  id: GlassesBallistic
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: TacSec
+  equipment:
+    eyes: ClothingEyesGlassesBallistic
+
 # Jumpsuit
 - type: loadout
   id: SecurityJumpsuitTurtleneck
@@ -132,4 +140,11 @@
   equipment:
     shoes: ClothingShoesBootsJackSecFilled
 
-
+# Gloves
+- type: loadout
+  id: GlovesSecTactical
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: TacSec
+  equipment:
+    gloves: ClothingHandsGlovesSecTactical

Resources/Prototypes/SS220/Loadouts/loadout_groups.yml

@@ -191,6 +191,7 @@
   loadouts:
   - GlassesSecurity
   - CyberGlassesSecurity
+  - GlassesBallistic
 
 - type: loadoutGroup
   id: DetectiveSecBackpack
@@ -200,6 +201,13 @@
     - SecuritySatchel
     - SecurityDuffel
     - DetectiveNoirSatchel
+
+- type: loadoutGroup
+  id: SecurityGloves
+  name: loadout-group-security-gloves
+  minLimit: 0
+  loadouts:
+  - GlovesSecTactical
   # Офицер СБ (Конец)
 
   # Инструктор СБ (Начало)

Resources/Textures/SS220/Clothing/Eyes/Glasses/secballistic.rsi/meta.json

@@ -0,0 +1,34 @@
+{
+  "version": 1,
+  "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
+  "copyright": "Drawn by vimenant2(discord) for SS220",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-EYES",
+      "directions": 4
+    },
+	{
+      "name": "equipped-EYES-secdog",
+      "directions": 4
+    },
+    {
+      "name": "equipped-EYES-hamster",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/SS220/Clothing/Eyes/Glasses/secglasses.rsi/meta.json

@@ -0,0 +1,34 @@
+{
+  "version": 1,
+  "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
+  "copyright": "Drawn by vimenant2(discord) for SS220",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-EYES",
+      "directions": 4
+    },
+	{
+      "name": "equipped-EYES-secdog",
+      "directions": 4
+    },
+    {
+      "name": "equipped-EYES-hamster",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/SS220/Clothing/Hands/Gloves/sectactical.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Drawn by vimenant2(discord) for SS220 . Icon by Skyrat.tg resprited.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HAND",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/SS220/Clothing/Neck/Misc/tactical.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-NECK",
       "directions": 4
     },
+    {
+      "name": "equipped-NECK-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/SS220/Clothing/OuterClothing/Armor/security_slim.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": "Made by vimenant2 (discord) for SS220",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}