merc

ekrixi-14 · Apr 13, 2024 · b51848e · b51848e
1 parent 44a8768
commit b51848e
Show file tree

Hide file tree

Showing 16 changed files with 68 additions and 13 deletions.
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -27,7 +27,6 @@
     contents:
       - id: BoxSurvivalSecurity
       - id: Flash
-      - id: MagazinePistol
 
 - type: entity
   noSpawn: true

diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -26,7 +26,6 @@
     contents:
       - id: BoxSurvivalSecurity
       - id: Flash
-      - id: MagazinePistol
 
 - type: entity
   noSpawn: true

diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -40,7 +40,6 @@
     contents:
       - id: BoxSurvivalSecurity
       - id: Flash
-      - id: MagazinePistol
 
 - type: entity
   noSpawn: true

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/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

diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/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

diff --git a/Resources/Prototypes/_FTL/Catalog/Fills/Items/belt.yml b/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
diff --git a/Resources/Prototypes/_FTL/Entities/Clothing/Masks/masks.yml b/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
diff --git a/Resources/Prototypes/_FTL/Entities/Objects/Devices/pda.yml b/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
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/default.png b/Resources/Textures/Objects/Misc/id_cards.rsi/default.png
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idsecurityofficer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idsecurityofficer.png
diff --git a/Resources/Textures/_FTL/Clothing/Mask/mercneckgaiter.rsi/equipped-MASK.png b/Resources/Textures/_FTL/Clothing/Mask/mercneckgaiter.rsi/equipped-MASK.png
diff --git a/Resources/Textures/_FTL/Clothing/Mask/mercneckgaiter.rsi/icon.png b/Resources/Textures/_FTL/Clothing/Mask/mercneckgaiter.rsi/icon.png
diff --git a/Resources/Textures/_FTL/Clothing/Mask/mercneckgaiter.rsi/inhand-left.png b/Resources/Textures/_FTL/Clothing/Mask/mercneckgaiter.rsi/inhand-left.png
diff --git a/Resources/Textures/_FTL/Clothing/Mask/mercneckgaiter.rsi/inhand-right.png b/Resources/Textures/_FTL/Clothing/Mask/mercneckgaiter.rsi/inhand-right.png
diff --git a/Resources/Textures/_FTL/Clothing/Mask/mercneckgaiter.rsi/meta.json b/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
+    }
+  ]
+}
diff --git a/Resources/Textures/_FTL/Structures/Wallmounts/signs.rsi/direction_gun.png b/Resources/Textures/_FTL/Structures/Wallmounts/signs.rsi/direction_gun.png