add

ekrixi-14 · Apr 13, 2024 · 6d5b0c5 · 6d5b0c5
1 parent b51848e
commit 6d5b0c5
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 8 deletions.
diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/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:

diff --git a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml b/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:

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/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"]]
 

diff --git a/Resources/Prototypes/_FTL/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_FTL/Entities/Objects/Devices/pda.yml
@@ -16,7 +16,7 @@
   name: mercenary PDA
   description: Rugged and robust.
   components:
-    - type: Pda
+  - type: Pda
     id: SecurityIDCard
     state: pda-bartender
   - type: PdaBorderColor

diff --git a/Resources/Textures/Structures/Storage/closet.rsi/merc.png b/Resources/Textures/Structures/Storage/closet.rsi/merc.png
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/merc_door.png b/Resources/Textures/Structures/Storage/closet.rsi/merc_door.png
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/merc_open.png b/Resources/Textures/Structures/Storage/closet.rsi/merc_open.png
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/meta.json b/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"