From: lapatison <100279397+lapatison@users.noreply.github.com> Date: Sun, 24 Dec 2023 19:35:40 +0000 (+0300) Subject: Janitor equipment slot locale, vehicle slot (Keys) locale (#22859) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=beb1a4c4a496bbfa9d5fdb0c2557d5e2dca05df6;p=space-station-14.git 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 index 0000000000..b722116587 --- /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 3aa5def1e7..0fb99d28c7 100644 --- 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 be823f2b65..8774dbf60e 100644 --- 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 ccb5d36a0a..916aa068ae 100644 --- 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: