]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Allow flashlights on belts (#23256)
authorthemias <89101928+themias@users.noreply.github.com>
Sun, 31 Dec 2023 02:06:27 +0000 (21:06 -0500)
committerGitHub <noreply@github.com>
Sun, 31 Dec 2023 02:06:27 +0000 (19:06 -0700)
Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
Resources/Prototypes/Entities/Objects/Tools/lantern.yml
Resources/Textures/Objects/Tools/lantern.rsi/meta.json
Resources/Textures/Objects/Tools/lantern.rsi/off-equipped-BELT.png [new file with mode: 0644]
Resources/Textures/Objects/Tools/lantern.rsi/off-inhand-left.png
Resources/Textures/Objects/Tools/lantern.rsi/off-inhand-right.png
Resources/Textures/Objects/Tools/lantern.rsi/on-equipped-BELT.png [new file with mode: 0644]

index 5764aabd10ea2b359a32e4faf1069bcc257e6bec..e7ea80830b905d484a32d77bb57dcbded5783c6f 100644 (file)
     price: 40
   - type: StealTarget
     stealGroup: LAMP
+  - type: Clothing
+    sprite: Objects/Tools/flashlight.rsi
+    quickEquip: false
+    slots:
+      - Belt
 
 - type: entity
   name: seclite
   - type: PointLight
     enabled: false
     radius: 8
+  - type: Clothing
+    sprite: Objects/Tools/seclite.rsi
+    quickEquip: false
+    slots:
+      - Belt
 
 - type: entity
   parent: FlashlightLantern
index f4d6ea8364f34e07b0f6823892906c397eaa74f0..71b27ed31e4a16a24d5d7cfc8b0e294dfc756f7d 100644 (file)
         cell_slot: !type:ContainerSlot {}
     - type: StealTarget
       stealGroup: LAMP
+    - type: Clothing
+      sprite: Objects/Tools/lantern.rsi
+      equippedPrefix: off
+      quickEquip: false
+      slots:
+        - Belt
 
 - type: entity
   parent: Lantern
index 4f60017e73c542421a77e9592be182d267a2e3a2..3749373de1700d02b48583b1019263895959644a 100644 (file)
     {
       "name": "on-inhand-right",
       "directions": 4
-    }
+    },
+       {
+         "name": "on-equipped-BELT",
+         "directions": 4
+       },
+       {
+         "name": "off-equipped-BELT",
+         "directions": 4
+       }
   ]
 }
diff --git a/Resources/Textures/Objects/Tools/lantern.rsi/off-equipped-BELT.png b/Resources/Textures/Objects/Tools/lantern.rsi/off-equipped-BELT.png
new file mode 100644 (file)
index 0000000..7076d6e
Binary files /dev/null and b/Resources/Textures/Objects/Tools/lantern.rsi/off-equipped-BELT.png differ
index d38b5e8c641bed3d62cca1d8171c59a33a7ed3de..cfbfd39b9ea7388ac857535fde257a9cb3987dc5 100644 (file)
Binary files a/Resources/Textures/Objects/Tools/lantern.rsi/off-inhand-left.png and b/Resources/Textures/Objects/Tools/lantern.rsi/off-inhand-left.png differ
index de8ce0ad507a0f180306f1d7c907c14fabfc95d6..550ad12d319b780893ad47ae17c0ec63ef1eb09a 100644 (file)
Binary files a/Resources/Textures/Objects/Tools/lantern.rsi/off-inhand-right.png and b/Resources/Textures/Objects/Tools/lantern.rsi/off-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/lantern.rsi/on-equipped-BELT.png b/Resources/Textures/Objects/Tools/lantern.rsi/on-equipped-BELT.png
new file mode 100644 (file)
index 0000000..0ffc32f
Binary files /dev/null and b/Resources/Textures/Objects/Tools/lantern.rsi/on-equipped-BELT.png differ