Janitor equipment slot locale, vehicle slot (Keys) locale (#22859)

* stuff

* fixes

* vehicle locale

diff --git a/Resources/Locale/en-US/janitorial/janitorial-slot-component.ftl b/Resources/Locale/en-US/janitorial/janitorial-slot-component.ftl
new file mode 100644 (file)
index 0000000..b722116
--- /dev/null
+++ b/Resources/Locale/en-US/janitorial/janitorial-slot-component.ftl
@@ -0,0 +1,10 @@
+# mop bucket
+mop-bucket-slot-component-slot-name-shark = Shark
+# janitorial trolley
+janitorial-trolley-slot-component-slot-name-plunger = Plunger
+janitorial-trolley-slot-component-slot-name-sign = Sign
+janitorial-trolley-slot-component-slot-name-lightreplacer = Light Replacer
+janitorial-trolley-slot-component-slot-name-spray = Spray
+janitorial-trolley-slot-component-slot-name-bucket = Bucket
+janitorial-trolley-slot-component-slot-name-trashbag = Trash Bag
+janitorial-trolley-slot-component-slot-name-mop = Mop

diff --git a/Resources/Locale/en-US/vehicle/vehicle.ftl b/Resources/Locale/en-US/vehicle/vehicle.ftl
index 3aa5def1e72e24b96e029d991715b2392d315976..0fb99d28c7d9ddaff1fec05b1794c99093b9f86e 100644 (file)
--- a/Resources/Locale/en-US/vehicle/vehicle.ftl
+++ b/Resources/Locale/en-US/vehicle/vehicle.ftl
@@ -1 +1,3 @@
 vehicle-use-key = You use {THE($keys)} to start {THE($vehicle)}.
+
+vehicle-slot-component-slot-name-keys = Keys

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index be823f2b653768d6f907d9e406a773406e67e8e0..8774dbf60e09d49a7cfe41c66b03c24f365c0b8e 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -1,4 +1,3 @@
-# TODO: Add description (1)
 - type: entity
   parent: BaseItem
   name: mop
@@ -140,7 +139,7 @@
   - type: ItemSlots
     slots:
       shark_slot:
-        name: Shark
+        name: mop-bucket-slot-component-slot-name-shark
         whitelist:
           tags:
             - PlushieSharkBlue
@@ -290,64 +289,64 @@
     - type: ItemSlots
       slots:
         mop_slot:
-          name: Mop
+          name: janitorial-trolley-slot-component-slot-name-mop
           whitelist:
             tags:
               - Mop
           insertOnInteract: false # or it conflicts with bucket logic
           priority: 9 # Higher than bucket slot
         plunger_slot:
-          name: Plunger
+          name: janitorial-trolley-slot-component-slot-name-plunger
           whitelist:
             tags:
               - Plunger
           priority: 8
         wetfloorsign_slot4:
-          name: WetFloorSign
+          name: janitorial-trolley-slot-component-slot-name-sign
           whitelist:
             tags:
               - WetFloorSign
           priority: 7
         wetfloorsign_slot3:
-          name: WetFloorSign
+          name: janitorial-trolley-slot-component-slot-name-sign
           whitelist:
             tags:
               - WetFloorSign
           priority: 7
         wetfloorsign_slot2:
-          name: WetFloorSign
+          name: janitorial-trolley-slot-component-slot-name-sign
           whitelist:
             tags:
               - WetFloorSign
           priority: 7
         wetfloorsign_slot1:
-          name: WetFloorSign
+          name: janitorial-trolley-slot-component-slot-name-sign
           whitelist:
             tags:
               - WetFloorSign
           priority: 7
         lightreplacer_slot:
-          name: LightReplacer
+          name: janitorial-trolley-slot-component-slot-name-lightreplacer
           whitelist:
             tags:
               - LightReplacer
           priority: 6
         spraybottle_slot:
-          name: Spray
+          name: janitorial-trolley-slot-component-slot-name-spray
           whitelist:
             tags:
               - Spray
           insertOnInteract: false # or it conflicts with bucket logic
           priority: 5 # Higher than bucket slot
         bucket_slot:
-          name: Bucket
+          name: janitorial-trolley-slot-component-slot-name-bucket
           whitelist:
             tags:
               - Bucket
           insertOnInteract: false # or it also conflicts with bucket logic
           priority: 4 # Higher than trash bag slot
         trashbag_slot:
-          name: Bag
+          name: janitorial-trolley-slot-component-slot-name-trashbag
           whitelist:
             tags:
               - TrashBag

diff --git a/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml b/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml
index ccb5d36a0afa2a67c083119d09f8e7dc5f178a98..916aa068aea3b2603782806a5c334b372415f8cb 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml
+++ b/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml
@@ -72,7 +72,7 @@
   - type: ItemSlots
     slots:
       key_slot: #this slot name is important
-        name: Keys
+        name: vehicle-slot-component-slot-name-keys
         whitelist:
           requireAll: true
           tags:
@@ -135,7 +135,7 @@
   - type: ItemSlots
     slots:
       key_slot:
-        name: Keys
+        name: vehicle-slot-component-slot-name-keys
         whitelist:
           requireAll: true
           tags:
@@ -146,7 +146,7 @@
           params:
             volume: -3
       trashbag_slot:
-        name: Bag
+        name: janitorial-trolley-slot-component-slot-name-trashbag
         whitelist:
           tags:
             - TrashBag
@@ -205,7 +205,7 @@
   - type: ItemSlots
     slots:
       key_slot:
-        name: Keys
+        name: vehicle-slot-component-slot-name-keys
         whitelist:
           requireAll: true
           tags:
@@ -255,7 +255,7 @@
   - type: ItemSlots
     slots:
       key_slot:
-        name: Keys
+        name: vehicle-slot-component-slot-name-keys
         whitelist:
           requireAll: true
           tags:
@@ -298,7 +298,7 @@
     - type: ItemSlots
       slots:
         key_slot:
-          name: Keys
+          name: vehicle-slot-component-slot-name-keys
           whitelist:
             requireAll: true
             tags:
@@ -344,7 +344,7 @@
     - type: ItemSlots
       slots:
         key_slot:
-          name: Keys
+          name: vehicle-slot-component-slot-name-keys
           whitelist:
             requireAll: true
             tags: