Fixes jani items not being storable on jani trolley (#21836)

* Fixes jani items not being storable on jani trolley

* Let's see if it likes this better

* Ok, then, that'll do

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index d865dd172f1c76158b91bd32471b66eb305bc483..7b0d992f13564c7e6e469267a964f93a8851fa0d 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -295,6 +295,49 @@
             tags:
               - Mop
           insertOnInteract: false # or it conflicts with bucket logic
+          priority: 9 # Higher than bucket slot
+        plunger_slot:
+          name: Plunger
+          whitelist:
+            tags:
+              - Plunger
+          priority: 8
+        wetfloorsign_slot4:
+          name: WetFloorSign
+          whitelist:
+            tags:
+              - WetFloorSign
+          priority: 7
+        wetfloorsign_slot3:
+          name: WetFloorSign
+          whitelist:
+            tags:
+              - WetFloorSign
+          priority: 7
+        wetfloorsign_slot2:
+          name: WetFloorSign
+          whitelist:
+            tags:
+              - WetFloorSign
+          priority: 7
+        wetfloorsign_slot1:
+          name: WetFloorSign
+          whitelist:
+            tags:
+              - WetFloorSign
+          priority: 7
+        lightreplacer_slot:
+          name: LightReplacer
+          whitelist:
+            tags:
+              - LightReplacer
+          priority: 6
+        spraybottle_slot:
+          name: Spray
+          whitelist:
+            tags:
+              - Spray
+          insertOnInteract: false # or it conflicts with bucket logic
           priority: 5 # Higher than bucket slot
         bucket_slot:
           name: Bucket
@@ -428,6 +471,13 @@
         mop_slot: !type:ContainerSlot {}
         trashbag_slot: !type:ContainerSlot {}
         bucket_slot: !type:ContainerSlot {}
+        plunger_slot: !type:ContainerSlot {}
+        wetfloorsign_slot4: !type:ContainerSlot {}
+        wetfloorsign_slot3: !type:ContainerSlot {}
+        wetfloorsign_slot2: !type:ContainerSlot {}
+        wetfloorsign_slot1: !type:ContainerSlot {}
+        lightreplacer_slot: !type:ContainerSlot {}
+        spraybottle_slot:  !type:ContainerSlot {}
     - type: GuideHelp
       guides:
       - Janitorial

diff --git a/Resources/Prototypes/Entities/Objects/Tools/light_replacer.yml b/Resources/Prototypes/Entities/Objects/Tools/light_replacer.yml
index 442e939d42370333daee74bbc1130f7c68c01f36..d834d1ab520b37106f20b5a0f840272f0625d6cc 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Tools/light_replacer.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/light_replacer.yml
@@ -17,6 +17,7 @@
       amount: 5
   - type: Tag
     tags:
+      - LightReplacer
       - DroneUsable
   - type: StaticPrice
     price: 100

diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 33e2e376fe44018cc08723e0e9479be98c887b71..5bb9a3a29ab7e7986929d448cab6b8cc01e41a85 100644 (file)
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -647,6 +647,9 @@
 - type: Tag
   id: Lemon
 
+- type: Tag
+  id: LightReplacer
+
 - type: Tag
   id: Lime