Security Sprite Overhaul (#287)

* merc

* add

* hardsuit

* fix

* fix2

Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml

@@ -27,7 +27,6 @@
     contents:
       - id: BoxSurvivalSecurity
       - id: Flash
-      - id: MagazinePistol
 
 - type: entity
   noSpawn: true

Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml

@@ -26,7 +26,6 @@
     contents:
       - id: BoxSurvivalSecurity
       - id: Flash
-      - id: MagazinePistol
 
 - type: entity
   noSpawn: true

Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml

@@ -40,7 +40,6 @@
     contents:
       - id: BoxSurvivalSecurity
       - id: Flash
-      - id: MagazinePistol
 
 - type: entity
   noSpawn: true

Resources/Prototypes/Catalog/Fills/Lockers/security.yml

@@ -54,22 +54,16 @@
     contents:
       - id: FlashlightSeclite
         prob: 0.8
-      - id: ClothingUniformJumpsuitSecGrey
-        prob: 0.3
       - id: ClothingHeadHelmetBasic
       - id: ClothingOuterArmorBasic
-      - id: ClothingBeltSecurityFilled
+      - id: ClothingBeltMercWebbingFilled
       - id: Flash
         prob: 0.5
       - id: ClothingEyesGlassesSunglasses
       - id: ClothingHeadsetSecurity
+      - id: ClothingMaskMercNeckGaiter
       - id: ClothingHandsGlovesColorBlack
       - id: ClothingShoesBootsJack
-      - id: WeaponMeleeNeedle
-        prob: 0.1
-      - id: ClothingEyesHudSecurity
-      - id: HoloprojectorSecurity
-        prob: 0.6
 
 - type: entity
   id: LockerBrigmedicFilled

Resources/Prototypes/Entities/Clothing/Belt/belts.yml

@@ -605,7 +605,7 @@
 - type: entity
   parent: ClothingBeltStorageBase
   id: ClothingBeltMercWebbing
-  name: mercenarie webbing
+  name: mercenary webbing
   description: Ideal for storing everything from ammo to weapons and combat essentials.
   components:
   - type: Sprite

Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml

@@ -125,7 +125,7 @@
 - type: entity
   parent: IDCardStandard
   id: SecurityIDCard
-  name: security ID card
+  name: mercenary ID card
   components:
   - type: Sprite
     layers:

Resources/Prototypes/Entities/Objects/Tools/flashlights.yml

@@ -75,10 +75,10 @@
       - Belt
 
 - type: entity
-  name: seclite
+  name: taclite
   parent: FlashlightLantern
   id: FlashlightSeclite
-  description: A robust flashlight used by security.
+  description: A robust tactical flashlight.
   components:
   - type: Tag
     tags:

Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml

@@ -327,13 +327,13 @@
 - type: entity
   id: LockerSecurity
   parent: LockerBaseSecure
-  name: security officer's locker
+  name: mercenary's locker
   components:
   - type: Appearance
   - type: EntityStorageVisuals
-    stateBaseClosed: sec
-    stateDoorOpen: sec_open
-    stateDoorClosed: sec_door
+    stateBaseClosed: merc
+    stateDoorOpen: merc_open
+    stateDoorClosed: merc_door
   - type: AccessReader
     access: [["Security"]]
 

Resources/Prototypes/Roles/Jobs/Security/security_officer.yml

@@ -34,9 +34,9 @@
     mask: ClothingMaskBandMerc
     gloves: ClothingHandsMercGlovesCombat
     outerClothing: ClothingOuterArmorBasic
-    id: SecurityPDA
+    id: MercenaryPDA
     ears: ClothingHeadsetSecurity
-    belt: ClothingBeltMercWebbing
+    belt: ClothingBeltMercWebbingFilled
     pocket1: RadioHandheldIntercomSecurity
     pocket2: BasicPager
     suitstorage: WeaponShotgunDoubleBarreled

Resources/Prototypes/_FTL/Catalog/Fills/Items/belt.yml

@@ -0,0 +1,12 @@
+- type: entity
+  id: ClothingBeltMercWebbingFilled
+  parent: ClothingBeltMercWebbing
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: GrenadeFlashBang
+      - id: TearGasGrenade
+      - id: Stunbaton
+      - id: Handcuffs
+      - id: Handcuffs

Resources/Prototypes/_FTL/Entities/Clothing/Masks/masks.yml

@@ -0,0 +1,12 @@
+- type: entity
+  parent: ClothingMaskBase
+  id: ClothingMaskMercNeckGaiter
+  name: mercenary neck gaiter
+  description: An olive green neck gaiter.
+  components:
+  - type: Sprite
+    sprite: _FTL/Clothing/Mask/mercneckgaiter.rsi
+  - type: Clothing
+    sprite: _FTL/Clothing/Mask/mercneckgaiter.rsi
+  - type: IdentityBlocker
+    coverage: MOUTH

Resources/Prototypes/_FTL/Entities/Objects/Devices/pda.yml

@@ -9,3 +9,17 @@
       state: pda
     - type: PdaBorderColor
       borderColor: "#717059"
+
+- type: entity
+  parent: BasePDA
+  id: MercenaryPDA
+  name: mercenary PDA
+  description: Rugged and robust.
+  components:
+  - type: Pda
+    id: SecurityIDCard
+    state: pda-bartender
+  - type: PdaBorderColor
+    borderColor: "#141111"
+  - type: Icon
+    state: pda-bartender

Resources/Prototypes/_FTL/Entities/Structures/Wallmounts/Signs/signs.yml

@@ -0,0 +1,10 @@
+
+- type: entity
+  parent: BaseSignDirectional
+  id: SignDirectionalGunner
+  name: gunner sign
+  description: A direction sign, pointing out which way the gunner room is.
+  components:
+  - type: Sprite
+    sprite: _FTL/Structures/Wallmounts/signs.rsi
+    state: direction_gun

Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprite made by Gtheglorious based on the sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e,",
+  "copyright": "Hyenh#6078(313846233099927552)",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprite made by Gtheglorious based on the sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Hyenh#6078(313846233099927552)",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/Structures/Storage/closet.rsi/meta.json

@@ -534,6 +534,15 @@
     },
     {
       "name": "clown_open"
+    },
+	{
+      "name": "merc"
+    },
+    {
+      "name": "merc_door"
+    },
+    {
+      "name": "merc_open"
     },
     {
       "name": "mime"

Resources/Textures/_FTL/Clothing/Mask/mercneckgaiter.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprited by belay5 (Discord), modified by Hyenh",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-MASK",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_FTL/Structures/Wallmounts/signs.rsi/meta.json

@@ -0,0 +1,15 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Hyenh#6078(313846233099927552)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "direction_gun",
+	  "directions": 4
+    }
+  ]
+}