Added restrictions for what can be inserted into most belts (#4367)

* Belts now restrict what can be inserted into them

* Bandolier now only holds shotgun shells

* Tiny typo

* Another tiny typo

Resources/Prototypes/Entities/Clothing/Belt/belts.yml

@@ -13,23 +13,25 @@
   - type: Storage
     capacity: 40
     # TODO: Fill this out more.
-    # whitelist:
+    whitelist:
-    #   tags:
+      tags:
-    #     - Wirecutter
+        - Wirecutter
-    #     - Crowbar
+        - Crowbar
-    #     - CrowbarRed
+        - Screwdriver
-    #     - Screwdriver
+        - Flashlight
-    #     - Flashlight
+        - Wrench
-    #     - Welder
+#        - Painter
-    #     - Wrench
+#        - GeigerCounter
-    #     - Painter
+        - Flare
-    #     - GeigerCounter
+        - CableCoil
-    #     - Flare
+        - CigPack
-    #     - Coilsofwire
+      components:
-    #     -
+        - SignalLinker
-    #     -
+        - RCD
-    #   components:
+        - RCDAmmo
-    #     - SignalLinker
+        - Welder
+        - Radio
+        - PowerCell
   - type: ItemCounter
     mapLayers:
       cutters_red:
@@ -72,25 +74,31 @@
   - type: Clothing
     sprite: Clothing/Belt/ce.rsi
   - type: Storage
-    # TODO: Fill this out more.
-    # whitelist:
-    #   tags:
-    #     - Wirecutter
-    #     - Crowbar
-    #     - CrowbarRed
-    #     - Screwdriver
-    #     - Flashlight
-    #     - Welder
-    #     - Wrench
-    #     - Painter
-    #     - GeigerCounter
-    #     - Flare
-    #     - Coilsofwire
-    #     -
-    #     -
-    #   components:
-    #     - SignalLinker
     capacity: 100
+    # TODO: Fill this out more.
+    whitelist:
+      tags:
+        - Wirecutter
+        - Crowbar
+        - Screwdriver
+        - Flashlight
+        - Wrench
+#        - Painter
+#        - GeigerCounter
+        - Flare
+        - CableCoil
+        - Powerdrill
+        - JawsOfLife
+        - CigPack
+      components:
+        - SignalLinker
+        - RCD
+        - RCDAmmo
+        - Welder
+        - Flash
+        - Radio
+        - Handcuff
+        - PowerCell
   - type: ItemCounter
     mapLayers:
       drill:
@@ -142,6 +150,17 @@
     sprite: Clothing/Belt/assault.rsi
   - type: Storage
     capacity: 40
+    whitelist:
+      tags:
+        - CigPack
+        - Taser
+      components:
+        - Stunbaton
+        - FlashOnTrigger
+        - Flash
+        - Handcuff
+        - RangedMagazine
+        - Ammo
   - type: ItemCounter
     mapLayers:
       flashbang:
@@ -169,6 +188,14 @@
     sprite: Clothing/Belt/janitor.rsi
   - type: Storage
     capacity: 40
+    whitelist:
+      tags:
+        - Wrench
+        - Bottle
+        - Spray
+        - Soap
+        - Flashlight
+        - CigPack
   - type: ItemCounter
     mapLayers:
       bottle:
@@ -179,6 +206,10 @@
         whitelist:
           tags:
           - Spray
+      wrench:
+        whitelist:
+          tags:
+          - Wrench
   - type: Appearance
     visuals:
     - type: MappedItemVisualizer
@@ -196,6 +227,20 @@
     sprite: Clothing/Belt/medical.rsi
   - type: Storage
     capacity: 40
+    whitelist:
+      tags:
+        - Wrench
+        - Bottle
+        - Spray
+        - Brutepack
+        - Gauze
+        - Ointment
+        - CigPack
+      components:
+        - Hypospray
+        - Pill
+        - SurgeryTool
+        - Radio
   - type: ItemCounter
     mapLayers:
       bottle:
@@ -242,27 +287,29 @@
   - type: Clothing
     sprite: Clothing/Belt/plant.rsi
   - type: Storage
-    # whitelist:
-    #   tags:
-    #     - BotanyHoe
-    #     - PlantAnalyzer
-    #     - BotanyHoe
-    #     - BotanyShovel
-    #     - PlantBGone
-    #     - Bottle
-    #   components:
-    #     - Seed
     capacity: 40
+    whitelist:
+      tags:
+        - BotanyHoe
+        # - PlantAnalyzer
+        - BotanyHoe
+        - BotanyShovel
+        - PlantBGone
+        - Bottle
+        - CigPack
+      components:
+        - Seed
+        - Smoking
   - type: ItemCounter
     mapLayers:
       hatchet:
         whitelist:
           tags:
           - BotanyHatchet
-      hydro:
+      # hydro:
-        whitelist:
+      #   whitelist:
-          tags:
+      #     tags:
-          - PlantAnalyzer # Dunno what to put here, should be aight.
+      #     - PlantAnalyzer # Dunno what to put here, should be aight.
       hoe:
         whitelist:
           tags:
@@ -296,6 +343,15 @@
     sprite: Clothing/Belt/security.rsi
   - type: Storage
     capacity: 40
+    whitelist:
+      tags:
+        - CigPack
+        - Taser
+      components:
+        - Stunbaton
+        - FlashOnTrigger
+        - Flash
+        - Handcuff
   - type: ItemCounter
     mapLayers:
       flashbang:
@@ -324,11 +380,58 @@
     sprite: Clothing/Belt/sheath.rsi
   - type: Storage
     capacity: 15
+    whitelist:
+      tags:
+        - CaptainSabre
+        - Baguette
+        - Carrot
+        - Crowbar
+        - Katana
+        - Machete
+        - CombatKnife
+        - RodMetal1
+        - Spear
+      components:
+        - Mop
   - type: StorageFill
     contents:
       - id: CaptainSabre
   - type: ItemCounter
     mapLayers:
+      sheath-bag:
+        whitelist:
+          tags:
+          - Baguette
+      sheath-carrot:
+        whitelist:
+          tags:
+          - Carrot
+      sheath-crowbar:
+        whitelist:
+          tags:
+          - Crowbar
+      sheath-crowbarr:
+        whitelist:
+          tags:
+          - CrowbarRed
+      sheath-katana:
+        whitelist:
+          tags:
+          - Katana
+      sheath-knife:
+        whitelist:
+          tags:
+          - Machete
+          - CombatKnife
+      sheath-mop:
+        whitelist:
+          components:
+          - Mop
+      sheath-rod:
+        whitelist:
+          tags:
+          - RodMetal1
+          - Spear
       sheath-sabre:
         whitelist:
           tags:
@@ -350,7 +453,10 @@
   - type: Clothing
     sprite: Clothing/Belt/bandolier.rsi
   - type: Storage
-    capacity: 40
+    capacity: 60
+    whitelist:
+      tags:
+        - ShotgunShell
 
 - type: entity
   parent: ClothingBeltBase

Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml

@@ -317,6 +317,9 @@
   id: FoodBreadBaguette
   description: Bon appétit!
   components:
+  - type: Tag
+    tags:
+    - Baguette
   - type: Sprite
     state: baguette
 # Tastes like France.

Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml

@@ -142,6 +142,9 @@
   id: FoodCarrot
   description: It's good for the eyes!
   components:
+  - type: Tag
+    tags:
+    - Carrot
   - type: Food
   - type: SolutionContainer
     contents:

Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml

@@ -4,87 +4,90 @@
   name: cigarette pack
   abstract: true
   components:
-    - type: Storage
+  - type: Tag
-      capacity: 6
+    tags:
-    - type: Item
+    - CigPack
-      size: 6
+  - type: Storage
-    - type: StorageFill
+    capacity: 6
-      contents:
+  - type: Item
-        - id: Cigarette
+    size: 6
-          amount: 6
+  - type: StorageFill
-    - type: StorageCounter
+    contents:
-      countTag: Cigarette
+      - id: Cigarette
-    - type: Appearance
+        amount: 6
-      visuals:
+  - type: StorageCounter
-        - type: BagOpenCloseVisualizer
+    countTag: Cigarette
-          openIcon: open
+  - type: Appearance
-        - type: StackVisualizer
+    visuals:
-          sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
+      - type: BagOpenCloseVisualizer
-          composite: true
+        openIcon: open
-          stackLayers:
+      - type: StackVisualizer
-            - cig1
+        sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
-            - cig2
+        composite: true
-            - cig3
+        stackLayers:
-            - cig4
+          - cig1
-            - cig5
+          - cig2
-            - cig6
+          - cig3
+          - cig4
+          - cig5
+          - cig6
 
 - type: entity
   id: CigPackGreen
   parent: CigPackBase
   name: Spessman's Smokes packet
-  description: "A label on the packaging reads, 'Wouldn't a slow death make a change?'"
+  description: A label on the packaging reads, Wouldn't a slow death make a change?
   components:
-    - type: Sprite
+  - type: Sprite
-      netsync: false
+    netsync: false
-      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi
+    sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi
-      layers:
+    layers:
-        - state: closed
+      - state: closed
-    - type: Item
+  - type: Item
-      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi
+    sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi
-      size: 6
+    size: 6
 
 - type: entity
   id: CigPackRed
   parent: CigPackBase
   name: DromedaryCo packet
-  description: "The most popular brand of Space Cigarettes, sponsors of the Space Olympics."
+  description: The most popular brand of Space Cigarettes, sponsors of the Space Olympics.
   components:
-    - type: Sprite
+  - type: Sprite
-      netsync: false
+    netsync: false
-      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi
+    sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi
-      layers:
+    layers:
-        - state: closed
+      - state: closed
-    - type: Item
+  - type: Item
-      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi
+    sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi
-      size: 6
+    size: 6
 
 - type: entity
   id: CigPackBlue
   parent: CigPackBase
   name: AcmeCo packet
-  description: "For those who somehow want to obtain the record for the most amount of cancerous tumors."
+  description: For those who somehow want to obtain the record for the most amount of cancerous tumors.
   components:
-    - type: Sprite
+  - type: Sprite
-      netsync: false
+    netsync: false
-      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi
+    sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi
-      layers:
+    layers:
-        - state: closed
+      - state: closed
-    - type: Item
+  - type: Item
-      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi
+    sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi
-      size: 6
+    size: 6
 
 - type: entity
   id: CigPackBlack
   parent: CigPackBase
   name: Nomads packet
-  description: "Nomads's extra strong, for when your life is more extra hard."
+  description: Nomads's extra strong, for when your life is more extra hard.
   components:
-    - type: Sprite
+  - type: Sprite
-      netsync: false
+    netsync: false
-      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi
+    sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi
-      layers:
+    layers:
-        - state: closed
+      - state: closed
-    - type: Item
+  - type: Item
-      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi
+    sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi
-      size: 6
+    size: 6

Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml

@@ -7,20 +7,20 @@
   name: cigar
   description: "A brown roll of tobacco and... well, you're not quite sure."
   components:
-    - type: Smoking
+  - type: Smoking
-      duration: 70
+    duration: 70
-    - type: Sprite
+  - type: Sprite
-      sprite: Objects/Consumable/Smokeables/Cigars/cigar.rsi
+    sprite: Objects/Consumable/Smokeables/Cigars/cigar.rsi
-      netsync: false
+    netsync: false
-      state: unlit-icon
+    state: unlit-icon
-    - type: Tag
+  - type: Tag
-      tags:
+    tags:
-        - Cigar
+      - Cigar
-    - type: Clothing
+  - type: Clothing
-      sprite: Objects/Consumable/Smokeables/Cigars/cigar.rsi
+    sprite: Objects/Consumable/Smokeables/Cigars/cigar.rsi
-      Slots: [ mask ]
+    Slots: [ mask ]
-      HeldPrefix: unlit
+    HeldPrefix: unlit
-      size: 1
+    size: 1
 
 - type: entity
   id: CigarGold
@@ -28,12 +28,12 @@
   name: premium Havanian cigar
   description: "A cigar fit for only the best of the best."
   components:
-    - type: Sprite
+  - type: Sprite
-      sprite: Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi
+    sprite: Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi
-      netsync: false
+    netsync: false
-      state: unlit-icon
+    state: unlit-icon
-    - type: Clothing
+  - type: Clothing
-      sprite: Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi
+    sprite: Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi
-      Slots: [ mask ]
+    Slots: [ mask ]
-      HeldPrefix: unlit
+    HeldPrefix: unlit
-      size: 1
+    size: 1

Resources/Prototypes/Entities/Objects/Materials/parts.yml

@@ -46,6 +46,9 @@
   name: metal rod
   suffix: Single
   components:
+  - type: Tag
+    tags:
+    - RodMetal1
   - type: Sprite
     state: rods
   - type: Stack

Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml

@@ -14,7 +14,6 @@
   - type: Sprite
     sprite: Objects/Misc/handcuffs.rsi
     state: handcuff
-
   - type: Clothing
     sprite: Objects/Misc/handcuffs.rsi
     Slots: [belt]

Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml

@@ -4,6 +4,9 @@
   parent: BaseItem
   description: A cheap bar of soap. Doesn't smell.
   components:
+  - type: Tag
+    tags:
+    - Soap
   - type: Sprite
     sprite: Objects/Specific/Janitorial/soap.rsi
     state: soap

Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml

@@ -1,9 +1,12 @@
 - type: entity
   name: ointment
-  description: "Used to treat those nasty burns."
+  description: Used to treat those nasty burns.
   parent: BaseItem
   id: Ointment
   components:
+  - type: Tag
+    tags:
+    - Ointment
   - type: Sprite
     sprite: Objects/Specific/Medical/medical.rsi
     state: ointment
@@ -17,24 +20,30 @@
 
 - type: entity
   name: bruise pack
-  description: "A therapeutic gel pack and bandages designed to treat blunt-force trauma."
+  description: A therapeutic gel pack and bandages designed to treat blunt-force trauma.
   parent: Ointment
   id: Brutepack
   components:
-    - type: Sprite
+  - type: Tag
-      state: brutepack
+    tags:
-    - type: Healing
+    - Brutepack
-      heal:
+  - type: Sprite
-        Blunt: 10
+    state: brutepack
-    - type: Stack
+  - type: Healing
-      stackType: Brutepack
+    heal:
+      Blunt: 10
+  - type: Stack
+    stackType: Brutepack
 
 - type: entity
   name: roll of gauze
-  description: "Some sterile gauze to wrap around bloody stumps."
+  description: Some sterile gauze to wrap around bloody stumps.
   parent: Ointment
   id: Gauze
   components:
+  - type: Tag
+    tags:
+    - Gauze
   - type: Sprite
     state: gauze
   - type: Healing

Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml

@@ -9,16 +9,18 @@
   name: cable stack
   suffix: Full
   components:
-    - type: Stack
+  - type: Tag
-      stackType: Cable
+    tags:
-    - type: Sprite
+    - CableCoil
-      sprite: Objects/Tools/cable-coils.rsi
+  - type: Stack
-      netsync: false
+    stackType: Cable
-    - type: Item
+  - type: Sprite
-      sprite: Objects/Tools/cable-coils.rsi
+    sprite: Objects/Tools/cable-coils.rsi
-    - type: CablePlacer
+    netsync: false
-    - type: Clickable
+  - type: Item
-
+    sprite: Objects/Tools/cable-coils.rsi
+  - type: CablePlacer
+  - type: Clickable
 
 - type: entity
   id: CableHVStack
@@ -26,35 +28,35 @@
   name: HV cable coil
   suffix: Full
   components:
-    - type: Stack
+  - type: Stack
-      stackType: CableHV
+    stackType: CableHV
-    - type: Sprite
+  - type: Sprite
-      state: coilhv-30
+    state: coilhv-30
-    - type: Item
+  - type: Item
-      size: 10
+    size: 10
-      HeldPrefix: coilhv
+    HeldPrefix: coilhv
-    - type: CablePlacer
+  - type: CablePlacer
-      cablePrototypeID: CableHV
+    cablePrototypeID: CableHV
-      blockingCableType: HighVoltage
+    blockingCableType: HighVoltage
-    - type: Appearance
+  - type: Appearance
-      visuals:
+    visuals:
-        - type: StackVisualizer
+      - type: StackVisualizer
-          stackLayers:
+        stackLayers:
-            - coilhv-10
+          - coilhv-10
-            - coilhv-20
+          - coilhv-20
-            - coilhv-30
+          - coilhv-30
 
 - type: entity
   parent: CableHVStack
   id: CableHVStack1
   suffix: 1
   components:
-    - type: Sprite
+  - type: Sprite
-      state: coilhv-10
+    state: coilhv-10
-    - type: Item
+  - type: Item
-      size: 3
+    size: 3
-    - type: Stack
+  - type: Stack
-      count: 1
+    count: 1
 
 - type: entity
   parent: CableStack
@@ -63,33 +65,33 @@
   description: Low-Voltage stack of wires for connecting APCs to machines and other purposes.
   suffix: Full
   components:
-    - type: Sprite
+  - type: Sprite
-      state: coillv-30
+    state: coillv-30
-    - type: Item
+  - type: Item
-      size: 10
+    size: 10
-      HeldPrefix: coillv
+    HeldPrefix: coillv
-    - type: CablePlacer
+  - type: CablePlacer
-      cablePrototypeID: CableApcExtension
+    cablePrototypeID: CableApcExtension
-      blockingCableType: Apc
+    blockingCableType: Apc
-    - type: Appearance
+  - type: Appearance
-      visuals:
+    visuals:
-        - type: StackVisualizer
+      - type: StackVisualizer
-          stackLayers:
+        stackLayers:
-            - coillv-10
+          - coillv-10
-            - coillv-20
+          - coillv-20
-            - coillv-30
+          - coillv-30
 
 - type: entity
   parent: CableApcStack
   id: CableApcStack1
   suffix: 1
   components:
-    - type: Sprite
+  - type: Sprite
-      state: coillv-10
+    state: coillv-10
-    - type: Item
+  - type: Item
-      size: 3
+    size: 3
-    - type: Stack
+  - type: Stack
-      count: 1
+    count: 1
 
 - type: entity
   parent: CableStack
@@ -97,32 +99,32 @@
   name: MV cable coil
   suffix: Full
   components:
-    - type: Stack
+  - type: Stack
-      stackType: CableMV
+    stackType: CableMV
-    - type: Sprite
+  - type: Sprite
-      state: coilmv-30
+    state: coilmv-30
-    - type: Item
+  - type: Item
-      size: 10
+    size: 10
-      HeldPrefix: coilmv
+    HeldPrefix: coilmv
-    - type: CablePlacer
+  - type: CablePlacer
-      cablePrototypeID: CableMV
+    cablePrototypeID: CableMV
-      blockingCableType: MediumVoltage
+    blockingCableType: MediumVoltage
-    - type: Appearance
+  - type: Appearance
-      visuals:
+    visuals:
-        - type: StackVisualizer
+      - type: StackVisualizer
-          stackLayers:
+        stackLayers:
-            - coilmv-10
+          - coilmv-10
-            - coilmv-20
+          - coilmv-20
-            - coilmv-30
+          - coilmv-30
 
 - type: entity
   parent: CableMVStack
   id: CableMVStack1
   suffix: 1
   components:
-    - type: Sprite
+  - type: Sprite
-      state: coilmv-10
+    state: coilmv-10
-    - type: Item
+  - type: Item
-      size: 3
+    size: 3
-    - type: Stack
+  - type: Stack
-      count: 1
+    count: 1

Resources/Prototypes/Entities/Objects/Tools/flare.yml

@@ -1,76 +1,79 @@
 - type: entity
   name: emergency flare # todo: we need some sort of IgnitionSourceComponent we can add to this, so when it's lit it will cause fires when touching fuel
   parent: BaseItem
-  id: FlareBase
+  id: Flare
   description: A flare that produces a very bright light for a short while. Point the flame away from yourself.
   components:
-    - type: ExpendableLight
+  - type: Tag
-      spentName: spent flare
+    tags:
-      spentDesc: It looks like this flare has burnt out. What a bummer.
+    - Flare
-      glowDuration: 150
+  - type: ExpendableLight
-      fadeOutDuration: 4
+    spentName: spent flare
-      iconStateOn: flare_unlit
+    spentDesc: It looks like this flare has burnt out. What a bummer.
-      iconStateSpent: flare_spent
+    glowDuration: 150
-      turnOnBehaviourID: turn_on
+    fadeOutDuration: 4
-      fadeOutBehaviourID: fade_out
+    iconStateOn: flare_unlit
-      litSound: /Audio/Items/Flare/flare_on.ogg
+    iconStateSpent: flare_spent
-      loopedSound: /Audio/Items/Flare/flare_burn.ogg
+    turnOnBehaviourID: turn_on
-    - type: Sprite
+    fadeOutBehaviourID: fade_out
-      sprite: Objects/Misc/flare.rsi
+    litSound: /Audio/Items/Flare/flare_on.ogg
-      layers:
+    loopedSound: /Audio/Items/Flare/flare_burn.ogg
-        - state: flare_base
+  - type: Sprite
-        - state: flare_burn
+    sprite: Objects/Misc/flare.rsi
-          color: "#FFFFFF"
+    layers:
-          visible: false
+      - state: flare_base
-          shader: unshaded
+      - state: flare_burn
-        - state: flare_unlit
+        color: "#FFFFFF"
-          color: "#FF0000"
+        visible: false
-    - type: Icon
+        shader: unshaded
-      sprite: Objects/Misc/flare.rsi
+      - state: flare_unlit
-      state: icon
+        color: "#FF0000"
-    - type: Item
+  - type: Icon
-      sprite: Objects/Misc/flare.rsi
+    sprite: Objects/Misc/flare.rsi
-      color: "#FF0000"
+    state: icon
-      HeldPrefix: unlit
+  - type: Item
-    - type: Appearance
+    sprite: Objects/Misc/flare.rsi
-      visuals:
+    color: "#FF0000"
-        - type: ExpendableLightVisualizer
+    HeldPrefix: unlit
-    - type: PointLight
+  - type: Appearance
-      enabled: false
+    visuals:
-      color: "#FF8080"
+      - type: ExpendableLightVisualizer
-      radius: 1.0
+  - type: PointLight
-      energy: 9.0
+    enabled: false
-    - type: LightBehaviour
+    color: "#FF8080"
-      behaviours:
+    radius: 1.0
-        - !type:RandomizeBehaviour # immediately make it bright and flickery
+    energy: 9.0
-          id: turn_on
+  - type: LightBehaviour
-          interpolate: Nearest
+    behaviours:
-          minDuration: 0.02
+      - !type:RandomizeBehaviour # immediately make it bright and flickery
-          maxDuration: 0.06
+        id: turn_on
-          startValue: 6.0
+        interpolate: Nearest
-          endValue: 9.0
+        minDuration: 0.02
-          property: Energy
+        maxDuration: 0.06
-          isLooped: true
+        startValue: 6.0
-        - !type:FadeBehaviour # have the radius start small and get larger as it starts to burn
+        endValue: 9.0
-          id: turn_on
+        property: Energy
-          interpolate: Linear
+        isLooped: true
-          maxDuration: 8.0
+      - !type:FadeBehaviour # have the radius start small and get larger as it starts to burn
-          startValue: 1.0
+        id: turn_on
-          endValue: 6.0
+        interpolate: Linear
-          property: Radius
+        maxDuration: 8.0
-        - !type:RandomizeBehaviour # weaker flicker as it fades out
+        startValue: 1.0
-          id: fade_out
+        endValue: 6.0
-          interpolate: Nearest
+        property: Radius
-          minDuration: 0.02
+      - !type:RandomizeBehaviour # weaker flicker as it fades out
-          maxDuration: 0.06
+        id: fade_out
-          startValue: 4.0
+        interpolate: Nearest
-          endValue: 8.0
+        minDuration: 0.02
-          property: Energy
+        maxDuration: 0.06
-          isLooped: true
+        startValue: 4.0
-        - !type:FadeBehaviour # fade out radius as it burns out
+        endValue: 8.0
-          id: fade_out
+        property: Energy
-          interpolate: Linear
+        isLooped: true
-          maxDuration: 4.0
+      - !type:FadeBehaviour # fade out radius as it burns out
-          startValue: 6.0
+        id: fade_out
-          endValue: 1.0
+        interpolate: Linear
-          property: Radius
+        maxDuration: 4.0
+        startValue: 6.0
+        endValue: 1.0
+        property: Radius

Resources/Prototypes/Entities/Objects/Tools/flashlight.yml

@@ -4,25 +4,28 @@
   id: FlashlightLantern
   description: It lights the way to freedom.
   components:
-    - type: HandheldLight
+  - type: Tag
-    - type: ItemActions
+    tags:
-      actions:
+    - Flashlight
-        - actionType: ToggleLight
+  - type: HandheldLight
-    - type: PowerCellSlot
+  - type: ItemActions
-      startingCellType: PowerCellSmallHigh
+    actions:
-    - type: Sprite
+      - actionType: ToggleLight
-      sprite: Objects/Tools/flashlight.rsi
+  - type: PowerCellSlot
-      layers:
+    startingCellType: PowerCellSmallHigh
-        - state: lantern_off
+  - type: Sprite
-        - state: HandheldLightOnOverlay
+    sprite: Objects/Tools/flashlight.rsi
-          shader: unshaded
+    layers:
-          visible: false
+      - state: lantern_off
-    - type: Item
+      - state: HandheldLightOnOverlay
-      sprite: Objects/Tools/flashlight.rsi
+        shader: unshaded
-      HeldPrefix: off
+        visible: false
-    - type: PointLight
+  - type: Item
-      enabled: false
+    sprite: Objects/Tools/flashlight.rsi
-      radius: 3
+    HeldPrefix: off
-    - type: Appearance
+  - type: PointLight
-      visuals:
+    enabled: false
-        - type: FlashLightVisualizer
+    radius: 3
+  - type: Appearance
+    visuals:
+      - type: FlashLightVisualizer

Resources/Prototypes/Entities/Objects/Tools/tools.yml

@@ -119,6 +119,7 @@
   components:
   - type: Tag
     tags:
+    - Crowbar
     - CrowbarRed
   - type: Sprite
     sprite: Objects/Tools/crowbar_red.rsi

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml

@@ -4,6 +4,9 @@
   parent: BaseItem
   abstract: true
   components:
+  - type: Tag
+    tags:
+    - ShotgunShell
   - type: Ammo
     caliber: Shotgun
     ammoSpread: 40

Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

@@ -123,6 +123,9 @@
   id: TaserGun
   description: A low-capacity, energy-based stun gun used by security teams to subdue targets at range.
   components:
+  - type: Tag
+    tags:
+    - Taser
   - type: Sprite
     netsync: false
     sprite: Objects/Weapons/Guns/Battery/taser.rsi

Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml

@@ -3,6 +3,9 @@
   id: BaseKnife
   abstract: true
   components:
+  - type: Tag
+    tags:
+    - Knife
   - type: Utensil
     types:
       - Knife
@@ -20,11 +23,13 @@
   id: KitchenKnife
   description: A general purpose Chef's Knife made by Asters Merchant Guild. Guaranteed to stay sharp for years to come..
   components:
+  - type: Tag
+    tags:
+    - Knife
   - type: Sprite
     sprite: Objects/Weapons/Melee/kitchen_knife.rsi
     size: 2
     state: icon
-
   - type: Item
     size: 10
     sprite: Objects/Weapons/Melee/kitchen_knife.rsi
@@ -37,11 +42,13 @@
   id: ButchCleaver
   description: A huge blade used for chopping and chopping up meat. This includes clowns and clown-by-products.
   components:
+  - type: Tag
+    tags:
+    - Knife
   - type: Sprite
     sprite: Objects/Weapons/Melee/cleaver.rsi
     size: 4
     state: butch
-
   - type: MeleeWeapon
     damage: 15
   - type: Item
@@ -55,6 +62,10 @@
   id: CombatKnife
   description: A deadly knife intended for melee confrontations.
   components:
+  - type: Tag
+    tags:
+    - CombatKnife
+    - Knife
   - type: Sprite
     sprite: Objects/Weapons/Melee/combat_knife.rsi
     size: 2

Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml

@@ -4,6 +4,9 @@
   id: Spear
   description: Definition of a Classic. Keeping murder affordable since 200,000 BCE.
   components:
+  - type: Tag
+    tags:
+    - Spear
   - type: Sprite
     sprite: Objects/Weapons/Melee/spear.rsi
     state: spear

Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml

@@ -23,6 +23,9 @@
   id: Katana
   description: Ancient craftwork made with not so ancient plasteel.
   components:
+  - type: Tag
+    tags:
+    - Katana
   - type: Sprite
     sprite: Objects/Weapons/Melee/katana.rsi
     state: icon
@@ -39,6 +42,9 @@
   id: Machete
   description: A large, vicious looking blade.
   components:
+  - type: Tag
+    tags:
+    - Machete
   - type: Sprite
     sprite: Objects/Weapons/Melee/machete.rsi
     state: icon

Resources/Prototypes/Recipes/Lathes/misc.yml

@@ -34,9 +34,9 @@
     Plastic: 50
 
 - type: latheRecipe
-  id: FlareBase
+  id: Flare
   icon: Objects/Misc/flare.rsi
-  result: FlareBase
+  result: Flare
   completetime: 500
   materials:
     Plastic: 50

Resources/Prototypes/tags.yml

@@ -1,3 +1,9 @@
+- type: Tag
+  id: Baguette
+
+- type: Tag
+  id: Brutepack
+
 - type: Tag
   id: BotanyHatchet
 
@@ -13,12 +19,21 @@
 - type: Tag
   id: Bottle
 
+- type: Tag
+  id: CableCoil
+
+- type: Tag
+  id: Carrot
+
 - type: Tag
   id: CanPilot
 
 - type: Tag
   id: CaptainSabre
 
+- type: Tag
+  id: CigPack
+
 - type: Tag
   id: Crayon
 
@@ -55,6 +70,9 @@
 - type: Tag
   id: ConveyorAssembly
 
+- type: Tag
+  id: CombatKnife
+
 - type: Tag
   id: DoorElectronics
 
@@ -73,9 +91,18 @@
 - type: Tag
   id: FirelockElectronics
 
+- type: Tag
+  id: Flare
+
+- type: Tag
+  id: Flashlight
+
 - type: Tag
   id: FootstepSound
 
+- type: Tag
+  id: Gauze
+
 - type: Tag
   id: GlassBeaker
 
@@ -91,12 +118,24 @@
 - type: Tag
   id: JawsOfLife
 
+- type: Tag
+  id: Katana
+
+- type: Tag
+  id: Knife
+
+- type: Tag
+  id: Machete
+
 - type: Tag
   id: MonkeyCube
 
 - type: Tag
   id: NoSpinOnThrow
 
+- type: Tag
+  id: Ointment
+
 - type: Tag
   id: Ore
 
@@ -115,6 +154,9 @@
 - type: Tag
   id: Powerdrill
 
+- type: Tag
+  id: RodMetal1
+
 - type: Tag
   id: RollingPaper
 
@@ -124,12 +166,24 @@
 - type: Tag
   id: Sheet
 
+- type: Tag
+  id: ShotgunShell
+
 - type: Tag
   id: Shovel
 
+- type: Tag
+  id: Soap
+
 - type: Tag
   id: Spray
 
+- type: Tag
+  id: Spear
+
+- type: Tag
+  id: Taser
+
 - type: Tag
   id: Wall
 

Resources/Textures/Clothing/Belt/sheath.rsi/meta.json

@@ -15,6 +15,30 @@
         "name": "sheath-sabre-equipped-BELT",
         "directions": 4
     },
+    {
+        "name": "sheath-bag"
+    },
+    {
+        "name": "sheath-carrot"
+    },
+    {
+        "name": "sheath-crowbar"
+    },
+    {
+        "name": "sheath-crowbarr"
+    },
+    {
+        "name": "sheath-katana"
+    },
+    {
+        "name": "sheath-knife"
+    },
+    {
+        "name": "sheath-mop"
+    },
+    {
+        "name": "sheath-rod"
+    },
     {
         "name": "sheath-sabre"
     },