From: Smugman <85798843+Smugman@users.noreply.github.com>
Date: Mon, 7 Jul 2025 18:53:17 +0000 (+0200)
Subject: Branded lighters addition (#35514)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=f1902ad0e2e9b9026594b6a95d8d0697432f9772;p=space-station-14.git

Branded lighters addition (#35514)

* newlighters

* port complete

* donk pocket box addition

* should fix test fail, proper credit

* captalisation issue

* fixed

* typo corrected

* removed accidental change to combat bakery

* fixed lock message, made NT flippo start fueled.

* Requested changes

* fixed discount dan

* moved matchbox

* requested changes, discount dan more broken than ever (somehow)

* unbungle

* uhhhhh

* maybe fixes?

* changed inheritance

* fixed enum?

* nevermind

* finally fixed

* breaking changes

* inheritance unbungled
---

diff --git a/Content.Shared/Lock/ItemToggleRequiresLockComponent.cs b/Content.Shared/Lock/ItemToggleRequiresLockComponent.cs
new file mode 100644
index 0000000000..94b8729476
--- /dev/null
+++ b/Content.Shared/Lock/ItemToggleRequiresLockComponent.cs
@@ -0,0 +1,17 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Lock;
+
+/// <summary>
+/// This is used for toggleable items that require the entity to have a lock in a certain state.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(LockSystem))]
+public sealed partial class ItemToggleRequiresLockComponent : Component
+{
+    /// <summary>
+    /// TRUE: the lock must be locked to toggle the item.
+    /// FALSE: the lock must be unlocked to toggle the item.
+    /// </summary>
+    [DataField]
+    public bool RequireLocked;
+}
diff --git a/Content.Shared/Lock/LockSystem.cs b/Content.Shared/Lock/LockSystem.cs
index 16d676954e..f7ebf21535 100644
--- a/Content.Shared/Lock/LockSystem.cs
+++ b/Content.Shared/Lock/LockSystem.cs
@@ -13,6 +13,7 @@ using Content.Shared.Storage.Components;
 using Content.Shared.UserInterface;
 using Content.Shared.Verbs;
 using Content.Shared.Wires;
+using Content.Shared.Item.ItemToggle.Components;
 using JetBrains.Annotations;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Utility;
@@ -55,6 +56,8 @@ public sealed class LockSystem : EntitySystem
 
         SubscribeLocalEvent<ActivatableUIRequiresLockComponent, ActivatableUIOpenAttemptEvent>(OnUIOpenAttempt);
         SubscribeLocalEvent<ActivatableUIRequiresLockComponent, LockToggledEvent>(LockToggled);
+
+        SubscribeLocalEvent<ItemToggleRequiresLockComponent, ItemToggleActivateAttemptEvent>(OnActivateAttempt);
     }
 
     private void OnStartup(EntityUid uid, LockComponent lockComp, ComponentStartup args)
@@ -413,4 +416,19 @@ public sealed class LockSystem : EntitySystem
 
         _activatableUI.CloseAll(uid);
     }
+    private void OnActivateAttempt(EntityUid uid, ItemToggleRequiresLockComponent component, ref ItemToggleActivateAttemptEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        if (TryComp<LockComponent>(uid, out var lockComp) && lockComp.Locked != component.RequireLocked)
+        {
+            args.Cancelled = true;
+            if (lockComp.Locked)
+                _sharedPopupSystem.PopupClient(Loc.GetString("lock-comp-generic-fail",
+                ("target", Identity.Entity(uid, EntityManager))),
+                uid,
+                args.User);
+        }
+    }
 }
diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index 3c7218b69c..066ac4376d 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -487,5 +487,8 @@ uplink-business-card-desc = A business card that you can give to someone to demo
 uplink-fake-mindshield-name = Fake Mindshield
 uplink-fake-mindshield-desc = A togglable implant capable of mimicking the same transmissions a real mindshield puts out when on, tricking capable Heads-up displays into thinking you have a mindshield (Nanotrasen brand implanter not provided.)
 
+uplink-contraband-lighter-name = Contraband Lighter box
+uplink-contraband-lighter-desc = A mystery box guaranteed to contain a syndicate branded lighter. No fuel required
+
 uplink-smuggler-satchel-name = Smuggler's Satchel
 uplink-smuggler-satchel-desc = A handy, suspicious looking satchel. Just flat enough to fit underneath floor tiles.
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml
index 9708373dbf..fe397ea8cf 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml
@@ -8,6 +8,7 @@
     FoodSnackPopcorn: 3
     FoodSnackEnergy: 3
     CigPackMixed: 2
+    DiscountDanLighter: 1
   contrabandInventory:
     FoodSnackDanDanNoodles: 3
     FoodBakedBunHoney: 3
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 2095edabff..c94306cdc1 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -2233,6 +2233,17 @@
     - Chef
     - Mime
 
+- type: listing
+  id: UplinkContrabandLighter
+  name: uplink-contraband-lighter-name
+  description: uplink-contraband-lighter-desc
+  icon: { sprite:  Objects/Tools/Lighters/syndielighter.rsi, state: icon}
+  productEntity: UplinkLighterBox
+  cost:
+    Telecrystal: 1
+  categories:
+  - UplinkPointless
+
 - type: listing
   id: UplinkSmugglerSatchel
   name: uplink-smuggler-satchel-name
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
index b1a1c60497..c223efe1a0 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -172,6 +172,7 @@
       - id: ClothingUniformJumpsuitFamilyGuy
       - id: WristwatchGold
       - id: RubberStampGreytide
+      - id: MysteryLighterBox
       - id: GoldenPersonalAI
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
index 00df6b5b68..a0cc580118 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
@@ -277,7 +277,7 @@
       prob: 0.05
       orGroup: Pizza
     - id: KnifePlastic
-  
+
 - type: entity
   name: pizza box
   parent: FoodBoxPizzaFilled
@@ -372,6 +372,9 @@
     contents:
     - id: FoodDonkpocket
       amount: 6
+    - id: DonkcoLighter
+      amount: 1
+      prob: 0.10
 
 - type: entity
   parent: FoodBoxDonkpocket
diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml b/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml
index dbbe86678f..6c466ea7c0 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml
@@ -133,3 +133,62 @@
       - id: ToyFigurineHamlet
         prob: 0.20
         orGroup: SpacemenFig
+
+- type: entity
+  parent: BaseItem
+  id: MysteryLighterBox
+  name: Novelty lighter mystery box
+  suffix: Filled
+  description: A box of discontinued promotional lighters, many of which have since been declared "contraband".
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/figurines.rsi
+    layers:
+    - state: fig_box
+  - type: SpawnItemsOnUse
+    items:
+      - id: MysteryFigureBoxTrash
+      - id: CybersunFlippo
+        orGroup: Lighterbox
+        weight: 0.15
+      - id: InterdyneFlippo
+        orGroup: Lighterbox
+        weight: 0.15
+      - id: NanotrasenFlippo
+        orGroup: Lighterbox
+        weight: 0.25
+      - id: WaffleCoFlippo
+        orGroup: Lighterbox
+        weight: 0.35
+      - id: HonkCoFlippo
+        orGroup: Lighterbox
+      - id: GorlexMatchbox
+        orGroup: Lighterbox
+        weight: 0.15
+      - id: DonkcoLighter
+        orGroup: Lighterbox
+        weight: 0.25
+      - id: SyndicateFlippo
+        orGroup: Lighterbox
+        weight: 0.15
+
+- type: entity
+  parent: MysteryLighterBox
+  id: UplinkLighterBox
+  suffix: Uplink
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: MysteryFigureBoxTrash
+      - id: CybersunFlippo
+        orGroup: Lighterbox
+      - id: InterdyneFlippo
+        orGroup: Lighterbox
+      - id: WaffleCoFlippo
+        orGroup: Lighterbox
+      - id: GorlexMatchbox
+        orGroup: Lighterbox
+      - id: DonkcoLighter
+        orGroup: Lighterbox
+      - id: SyndicateFlippo
+        orGroup: Lighterbox
diff --git a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
index a5e0afbc7f..a55c020825 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
@@ -20,7 +20,7 @@
     activatedSize: Small
   - type: ItemToggleHot
   - type: Sprite
-    sprite: Objects/Tools/lighters.rsi
+    sprite: Objects/Tools/Lighters/lighters.rsi
     layers:
     - state: icon_map
     - state: cheap_icon_base
@@ -62,7 +62,7 @@
         shader: unshaded
   - type: Item
     size: Tiny
-    sprite: Objects/Tools/lighters.rsi
+    sprite: Objects/Tools/Lighters/lighters.rsi
   - type: UseDelay
   - type: RefillableSolution
     solution: Welder
@@ -97,7 +97,7 @@
   description: "A dangerously inexpensive plastic lighter, don't burn your thumb!"
   components:
   - type: Sprite
-    sprite: Objects/Tools/lighters.rsi
+    sprite: Objects/Tools/Lighters/lighters.rsi
     layers:
     - state: icon_map
     - state: cheap_icon_base
@@ -126,7 +126,7 @@
   description: "A rugged metal lighter, lasts quite a while."
   components:
   - type: Sprite
-    sprite: Objects/Tools/lighters.rsi
+    sprite: Objects/Tools/Lighters/lighters.rsi
     layers:
     - state: zippo_icon_base
       map: ["base"]
@@ -159,7 +159,7 @@
   - type: ItemToggleHot
   - type: Item
     size: Tiny
-    sprite: Objects/Tools/lighters.rsi
+    sprite: Objects/Tools/Lighters/lighters.rsi
     heldPrefix: zippo
   - type: Appearance
   - type: GenericVisualizer
@@ -219,7 +219,7 @@
   description: "A rugged golden lighter, lasts quite a while. Engravings serve no tactical advantage whatsoever."
   components:
   - type: Sprite
-    sprite: Objects/Tools/lighters.rsi
+    sprite: Objects/Tools/Lighters/lighters.rsi
     layers:
     - state: zippo_engraved_icon_base
       map: ["base"]
@@ -235,3 +235,404 @@
       shader: unshaded
   - type: StealTarget
     stealGroup: FlippoEngravedLighter
+
+- type: entity
+  abstract: true
+  parent: BaseItem
+  id: BaseBrandedLighter
+  components:
+  - type: ItemToggle
+    predictable: false
+    soundActivate:
+      path: /Audio/Items/Lighters/zippo_open.ogg
+      params:
+        volume: -5
+    soundDeactivate:
+      path: /Audio/Items/Lighters/zippo_close.ogg
+      params:
+        volume: -5
+  - type: ItemToggleMeleeWeapon
+    activatedDamage:
+        types:
+            Heat: 1
+  - type: ItemToggleSize
+    activatedSize: Small
+  - type: ItemToggleHot
+  - type: Item
+    size: Tiny
+  - type: Appearance
+  - type: SolutionContainerManager
+    solutions:
+      Welder:
+        reagents:
+        - ReagentId: WeldingFuel
+          Quantity: 12
+        maxVol: 12
+  - type: Sprite
+    layers:
+    - state: icon
+      map: [ "base" ]
+    - state: top
+      map: [ "top" ]
+      visible: false
+    - state: open
+      map: [ "open" ]
+      visible: false
+    - state: flame
+      map: [ "flame" ]
+      visible: false
+      shader: unshaded
+  - type: GenericVisualizer
+    visuals:
+      enum.ToggleableVisuals.Enabled:
+        flame:
+          True: { visible: true }
+          False: { visible: false }
+        open:
+          True: { visible: true }
+          False: { visible: false }
+        top:
+          True: { visible: true }
+          False: { visible: false }
+        base:
+          True: { visible: false }
+          False: { visible: true }
+  - type: ToggleableVisuals
+    spriteLayer: lighter_flame
+    inhandVisuals:
+      left:
+      - state: inhand-left-lit
+        shader: unshaded
+      right:
+      - state: inhand-right-lit
+        shader: unshaded
+  - type: ItemTogglePointLight
+  - type: UseDelay
+  - type: IgnitionSource
+    ignited: false
+
+- type: entity
+  parent: [BaseBrandedLighter, BaseSyndicateContraband]
+  id: SyndicateFlippo
+  name: Blood-red flippo
+  description: "A 'Valid' choice in lighters. Contains no copper."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/syndielighter.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/syndielighter.rsi
+  - type: Welder
+    fuelConsumption: 0.005
+    fuelLitCost: 0.01
+    tankSafe: true
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 2
+    color: green
+
+- type: entity
+  parent: Lighter
+  id: DiscountDanLighter
+  name: Discount Dan's lighter
+  description: "The worst lighter ever produced, lighterburn is inevitable, do not refuel while lit."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/lighters.rsi
+    layers:
+    - state: icon_map
+    - state: discount_icon_base
+      map: [ "skin" ]
+    - state: basic_icon_top
+    - state: lighter_flame
+      visible: false
+      shader: unshaded
+      map: [ "flame" ]
+  - type: Welder # the single worst lighter invented by mankind
+    fuelConsumption: 0.2
+    fuelLitCost: 0.1
+    tankSafe: false
+  - type: Item
+    sprite: Objects/Tools/Lighters/lighters.rsi
+  - type: ToggleableVisuals
+    spriteLayer: lighter_flame
+    inhandVisuals:
+      left:
+      - state: inhand-left-flame
+        shader: unshaded
+      right:
+      - state: inhand-right-flame
+        shader: unshaded
+  - type: RandomSprite
+    available:
+      - skin:
+          discount_icon_base: ""
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 1.5
+    color: yellow
+  - type: ComponentToggler
+    components:
+    - type: DamageOnHolding
+      damage:
+        types:
+          Heat: 2
+  - type: SolutionContainerManager
+    solutions:
+      Welder:
+        reagents:
+        - ReagentId: WeldingFuel
+          Quantity: 3
+        maxVol: 3
+
+- type: entity
+  parent: [BaseBrandedLighter, BaseSyndicateContraband]
+  id: CybersunFlippo
+  name: CyberSun Flippo
+  description: "A Sleek black and magenta flippo lighter, bearing the logo and iconography of CyberSun Industries."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/cybersun.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/cybersun.rsi
+  - type: Welder #
+    fuelConsumption: 0.005
+    fuelLitCost: 0.01
+    tankSafe: true
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 2
+    color: magenta
+
+- type: entity
+  parent: [BaseBrandedLighter, BaseSyndicateContraband]
+  id: InterdyneFlippo
+  name: Interdyne Flippo
+  description: "A deep blue flippo lighter, decorated with the logo of Interdyne Pharmaceuticals' 'Gene Clean' clinics. Become the master of your own cigarette."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/interdyne.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/interdyne.rsi
+  - type: Welder #
+    fuelConsumption: 0.005
+    fuelLitCost: 0.01
+    tankSafe: true
+  - type: ItemToggleMeleeWeapon
+    activatedDamage:
+        types:
+          Radiation: 1
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 2
+    color: cyan
+
+- type: entity
+  parent: [BaseBrandedLighter]
+  id: NanotrasenFlippo
+  name: Nanotrasen Flippo
+  description: "A navy blue luxury flippo, generally handed out to loyal heads of staff instead of a payraise. Fueled with liquid plasma"
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/nanotrasen.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/nanotrasen.rsi
+  - type: Welder #
+    fuelConsumption: 0.005
+    fuelLitCost: 1
+    fuelReagent: Plasma
+    tankSafe: true
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 2
+    color: blue
+  - type: RefillableSolution
+    solution: Welder
+  - type: SolutionContainerManager
+    solutions:
+      Welder:
+        reagents:
+        - ReagentId: Plasma
+          Quantity: 10
+        maxVol: 10
+
+- type: entity
+  parent: [BaseBrandedLighter, BaseCentcommContraband]
+  id: CentCommFlippo
+  name: Gilded CentComm Flippo
+  description: "An Ornate, jade embossed and gilded flippo frame containing a bluespace powered jet. The latch is secured by a miniature access reader that only responds to CentComm officials. The nicest lighter known to man."
+  suffix: DO NOT MAP
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/centcomm.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/centcomm.rsi
+  - type: ItemToggleRequiresLock
+    requireLocked: false
+  - type: Welder #
+    fuelConsumption: 0.0
+    fuelLitCost: 10
+    fuelReagent: Plasma
+    tankSafe: true
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 4 #Excessively powerful
+    color: Gold
+  - type: RefillableSolution
+    solution: Welder
+  - type: SolutionContainerManager
+    solutions:
+      Welder:
+        reagents:
+        - ReagentId: Plasma
+          Quantity: 999
+        maxVol: 999
+  - type: Tool
+    useSound:
+      collection: Welder
+    qualities: Welding
+  - type: SolutionRegeneration
+    solution: Welder
+    generated:
+      reagents:
+      - ReagentId: Plasma
+        Quantity: 0.1
+  - type: Lock
+  - type: AccessReader
+    access: [["CentralCommand"]]
+
+- type: entity
+  parent: [BaseBrandedLighter, BaseMajorContraband]
+  id: SpiderclanFlippo
+  name: Spider-Clan lighter
+  description: "A high tech jet lighter, engineered to function even in deep space. Runs on a tiny microfusion cell."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/spiderclan.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/spiderclan.rsi
+  - type: Welder #
+    fuelConsumption: 0
+    fuelLitCost: 0
+    tankSafe: true
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 2
+    color: green
+
+- type: entity
+  parent: [BaseBrandedLighter, BaseSyndicateContraband]
+  id: WaffleCoFlippo
+  name: Waffle Co. flippo
+  description: "A robust mass produced lighter. The Waffle Co. logo turns the spark wheel when pushed up, minimising risk of lighter burns for even the most inept user."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/waffleco.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/waffleco.rsi
+  - type: Welder #
+    fuelConsumption: 0.005
+    fuelLitCost: 0.05
+    tankSafe: true
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 2
+    color: brown
+
+- type: entity
+  parent: [BaseBrandedLighter]
+  id: HonkCoFlippo
+  name: Honk Co. flippo
+  description: "A slippery gag lighter produced by Honk Co. hidden inside of a real banana peel."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/honkco.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/honkco.rsi
+  - type: ComponentToggler
+    components:
+    - type: Slippery
+    - type: StepTrigger
+      intersectRatio: 0.2
+    - type: CollisionWake
+      enabled: false
+    - type: Physics
+      bodyType: Dynamic
+    - type: Fixtures
+      fixtures:
+        slips:
+          shape:
+            !type:PhysShapeAabb
+            bounds: "-0.4,-0.3,0.4,0.3"
+          layer:
+          - SlipLayer
+          hard: false
+        fix1:
+          shape:
+            !type:PhysShapeAabb
+            bounds: "-0.4,-0.3,0.4,0.3"
+          density: 10
+          mask:
+          - ItemMask
+  - type: Welder #
+    fuelConsumption: 0.1
+    fuelLitCost: 1
+    tankSafe: true
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 2
+    color: yellow
+
+- type: entity
+  parent: [BaseBrandedLighter]
+  id: DonkcoLighter
+  name: Donk Co. flippo
+  description: "The flippo of choice for the seasoned traitor. A Breaded novelty lighter made by Donk Co. Somehow edible while lit."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/donkco.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/donkco.rsi
+  - type: Welder #
+    fuelConsumption: 0.02
+    fuelLitCost: 0.1
+    tankSafe: true
+  - type: Tag
+    tags:
+    - DonkPocket
+    - Meat
+  - type: SolutionContainerManager
+    solutions:
+      Welder:
+        reagents:
+        - ReagentId: WeldingFuel
+          Quantity: 12
+        maxVol: 12
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+        - ReagentId: Omnizine
+          Quantity: 10
+  - type: FlavorProfile
+    flavors:
+      - bread
+      - meaty
+      - cheap
+  - type: ComponentToggler
+    components:
+    - type: Food
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 2
+    color: orange
diff --git a/Resources/Prototypes/Entities/Objects/Tools/matches.yml b/Resources/Prototypes/Entities/Objects/Tools/matches.yml
index ee5100c999..c701a400d5 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/matches.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/matches.yml
@@ -108,3 +108,43 @@
     tags:
     - Trash
   - type: SpaceGarbage
+
+- type: entity
+  parent: [Matchbox, BaseSyndicateContraband]
+  id: GorlexMatchbox
+  name: Gorlex match box
+  description: "A pneumatic match box styled after the Gorlex Marauders' equipment. Contains 24 matches."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/gorlex.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/gorlex.rsi
+  - type: Storage
+    grid:
+    - 0,0,11,1
+  - type: StorageFill
+    contents:
+      - id: GorlexMatchstick
+        amount: 24
+  - type: Matchbox
+
+- type: entity
+  name: match stick
+  parent: [Matchstick, BaseSyndicateContraband]
+  id: GorlexMatchstick
+  description: A military grade match stick, used for lighting fine smokables and noncombatants alike.
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/gorlexmatch.rsi
+    layers:
+      - state: match_unlit
+  - type: Item
+    sprite: Objects/Tools/Lighters/gorlexmatch.rsi
+    heldPrefix: unlit
+    size: Tiny
+  - type: PointLight
+    enabled: false
+    radius: 3
+    color: green
+  - type: Matchstick
+    duration: 30
diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml
index 93a946df4a..c687c52a46 100644
--- a/Resources/Prototypes/Objectives/stealTargetGroups.yml
+++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml
@@ -169,7 +169,7 @@
   id: FlippoEngravedLighter
   name: steal-target-groups-flippo-engraved-lighter
   sprite:
-    sprite: Objects/Tools/lighters.rsi
+    sprite: Objects/Tools/Lighters/lighters.rsi
     state: zippo_engraved_icon_base
 
 - type: stealTargetGroup
diff --git a/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/flame.png b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/flame.png
new file mode 100644
index 0000000000..8cbb46a486
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/flame.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/icon.png b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/icon.png
new file mode 100644
index 0000000000..522e824444
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-left-lit.png b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-left-lit.png
new file mode 100644
index 0000000000..06ba07691a
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-left-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-left.png
new file mode 100644
index 0000000000..9ab79bd56c
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-right-lit.png b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-right-lit.png
new file mode 100644
index 0000000000..0b00575beb
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-right-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-right.png
new file mode 100644
index 0000000000..b377a18e30
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/meta.json
new file mode 100644
index 0000000000..06feadad57
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/meta.json
@@ -0,0 +1,45 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites Created by Smugman",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "flame",
+            "delays": [
+                [
+                    0.2,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "open"
+        },
+        {
+            "name": "top"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-lit",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-lit",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/open.png b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/open.png
new file mode 100644
index 0000000000..f880edd1ba
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/open.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/top.png b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/top.png
new file mode 100644
index 0000000000..bd2ed7245d
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/top.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/flame.png b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/flame.png
new file mode 100644
index 0000000000..09c049be71
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/flame.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/icon.png b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/icon.png
new file mode 100644
index 0000000000..7e42de6708
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-left-lit.png b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-left-lit.png
new file mode 100644
index 0000000000..fa7ec883cc
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-left-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-left.png
new file mode 100644
index 0000000000..b5d1bf1dca
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-right-lit.png b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-right-lit.png
new file mode 100644
index 0000000000..a68c0a2700
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-right-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-right.png
new file mode 100644
index 0000000000..e0d0523d19
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/meta.json
new file mode 100644
index 0000000000..06feadad57
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/meta.json
@@ -0,0 +1,45 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites Created by Smugman",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "flame",
+            "delays": [
+                [
+                    0.2,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "open"
+        },
+        {
+            "name": "top"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-lit",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-lit",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/open.png b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/open.png
new file mode 100644
index 0000000000..3feed530a0
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/open.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/top.png b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/top.png
new file mode 100644
index 0000000000..c85c170e41
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/top.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/flame.png b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/flame.png
new file mode 100644
index 0000000000..f51100448d
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/flame.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/icon.png b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/icon.png
new file mode 100644
index 0000000000..c71349d413
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-left-lit.png b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-left-lit.png
new file mode 100644
index 0000000000..9278dc5dff
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-left-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-left.png
new file mode 100644
index 0000000000..757145f7d3
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-right-lit.png b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-right-lit.png
new file mode 100644
index 0000000000..a187ed00a6
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-right-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-right.png
new file mode 100644
index 0000000000..3b562db5d8
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/meta.json
new file mode 100644
index 0000000000..06feadad57
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/meta.json
@@ -0,0 +1,45 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites Created by Smugman",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "flame",
+            "delays": [
+                [
+                    0.2,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "open"
+        },
+        {
+            "name": "top"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-lit",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-lit",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/open.png b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/open.png
new file mode 100644
index 0000000000..d6c974dc13
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/open.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/top.png b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/top.png
new file mode 100644
index 0000000000..d13c017afc
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/top.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox-open.png b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox-open.png
new file mode 100644
index 0000000000..2e0163da82
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox-open.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox.png b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox.png
new file mode 100644
index 0000000000..c7a5e3adc8
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox1.png b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox1.png
new file mode 100644
index 0000000000..c405eefdc1
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox1.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox2.png b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox2.png
new file mode 100644
index 0000000000..4de5da1a84
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox2.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox3.png b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox3.png
new file mode 100644
index 0000000000..2988c62f20
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox3.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/meta.json
new file mode 100644
index 0000000000..680ad98afd
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8 and modified by Swept, modified again my Smugman",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "matchbox"
+        },
+        {
+            "name": "matchbox-open"
+        },
+        {
+            "name": "matchbox1"
+        },
+        {
+            "name": "matchbox2"
+        },
+        {
+            "name": "matchbox3"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/lit-inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/lit-inhand-left.png
new file mode 100644
index 0000000000..b96ee2798b
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/lit-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/lit-inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/lit-inhand-right.png
new file mode 100644
index 0000000000..0b95e021ea
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/lit-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/match_burnt.png b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/match_burnt.png
new file mode 100644
index 0000000000..6ad8d07b4f
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/match_burnt.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/match_lit.png b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/match_lit.png
new file mode 100644
index 0000000000..fc9082ef63
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/match_lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/match_unlit.png b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/match_unlit.png
new file mode 100644
index 0000000000..03cf76dc95
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/match_unlit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/meta.json
new file mode 100644
index 0000000000..21146fe6f7
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/meta.json
@@ -0,0 +1,87 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8 and modified by Swept, modified again my Smugman",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "match_burnt"
+    },
+    {
+      "name": "match_lit",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "match_unlit"
+    },
+    {
+      "name": "unlit-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "unlit-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "lit-inhand-left",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "lit-inhand-right",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/unlit-inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/unlit-inhand-left.png
new file mode 100644
index 0000000000..c44c1aa92f
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/unlit-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/unlit-inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/unlit-inhand-right.png
new file mode 100644
index 0000000000..93f169c701
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/unlit-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/flame.png b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/flame.png
new file mode 100644
index 0000000000..a1d8633d37
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/flame.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/icon.png b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/icon.png
new file mode 100644
index 0000000000..b63dbcf1e6
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-left-lit.png b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-left-lit.png
new file mode 100644
index 0000000000..933b7799c6
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-left-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-left.png
new file mode 100644
index 0000000000..2136e54995
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-right-lit.png b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-right-lit.png
new file mode 100644
index 0000000000..b83092589f
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-right-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-right.png
new file mode 100644
index 0000000000..2ef4b94da3
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/meta.json
new file mode 100644
index 0000000000..131fb44e54
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/meta.json
@@ -0,0 +1,45 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Banana sprites Taken from tgstation at https://github.com/tgstation/tgstation/commit/6be7633abca9f1a51cab1020500cf0776ce78e5c, modified by smugman",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "flame",
+            "delays": [
+                [
+                    0.2,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "open"
+        },
+        {
+            "name": "top"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-lit",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-lit",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/open.png b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/open.png
new file mode 100644
index 0000000000..6cdfc629af
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/open.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/top.png b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/top.png
new file mode 100644
index 0000000000..c512c689ff
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/top.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/flame.png b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/flame.png
new file mode 100644
index 0000000000..07ca237d2f
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/flame.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/icon.png b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/icon.png
new file mode 100644
index 0000000000..24e9fd559f
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-left-lit.png b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-left-lit.png
new file mode 100644
index 0000000000..b3ce960417
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-left-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-left.png
new file mode 100644
index 0000000000..be1974a6ad
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-right-lit.png b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-right-lit.png
new file mode 100644
index 0000000000..d1fb5e1cbd
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-right-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-right.png
new file mode 100644
index 0000000000..6067152323
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/meta.json
new file mode 100644
index 0000000000..06feadad57
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/meta.json
@@ -0,0 +1,45 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites Created by Smugman",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "flame",
+            "delays": [
+                [
+                    0.2,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "open"
+        },
+        {
+            "name": "top"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-lit",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-lit",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/open.png b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/open.png
new file mode 100644
index 0000000000..c4129e2d54
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/open.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/top.png b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/top.png
new file mode 100644
index 0000000000..635a525fd0
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/top.png differ
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-1.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-1.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-1.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-1.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-10.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-10.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-10.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-10.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-11.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-11.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-11.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-11.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-2.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-2.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-2.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-2.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-3.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-3.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-3.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-3.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-4.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-4.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-4.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-4.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-5.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-5.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-5.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-5.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-6.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-6.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-6.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-6.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-7.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-7.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-7.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-7.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-8.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-8.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-8.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-8.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-9.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-9.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-9.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-9.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_top.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_top.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_top.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_top.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/cheap_icon_base.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/cheap_icon_base.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/cheap_icon_base.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/cheap_icon_base.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/cheap_icon_top.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/cheap_icon_top.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/cheap_icon_top.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/cheap_icon_top.png
diff --git a/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/discount_icon_base.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/discount_icon_base.png
new file mode 100644
index 0000000000..43c9a0d692
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/discount_icon_base.png differ
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/icon_map.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/icon_map.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/icon_map.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/icon_map.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/inhand-left-flame.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/inhand-left-flame.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/inhand-left-flame.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/inhand-left-flame.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/inhand-left.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/inhand-left.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/inhand-right-flame.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/inhand-right-flame.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/inhand-right-flame.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/inhand-right-flame.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/inhand-right.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/inhand-right.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/lighter_flame.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/lighter_flame.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/lighter_flame.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/lighter_flame.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/meta.json
similarity index 97%
rename from Resources/Textures/Objects/Tools/lighters.rsi/meta.json
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/meta.json
index dc7218c024..acda832cd7 100644
--- a/Resources/Textures/Objects/Tools/lighters.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/meta.json
@@ -55,6 +55,9 @@
     {
       "name": "basic_icon_base-11"
     },
+    {
+      "name": "discount_icon_base"
+    },
     {
       "name": "basic_icon_top"
     },
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/zippo-inhand-left-flame.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo-inhand-left-flame.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/zippo-inhand-left-flame.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo-inhand-left-flame.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/zippo-inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo-inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/zippo-inhand-left.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo-inhand-left.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/zippo-inhand-right-flame.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo-inhand-right-flame.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/zippo-inhand-right-flame.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo-inhand-right-flame.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/zippo-inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo-inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/zippo-inhand-right.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo-inhand-right.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/zippo_engraved_icon_base.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo_engraved_icon_base.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/zippo_engraved_icon_base.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo_engraved_icon_base.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/zippo_engraved_open.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo_engraved_open.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/zippo_engraved_open.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo_engraved_open.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/zippo_icon_base.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo_icon_base.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/zippo_icon_base.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo_icon_base.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/zippo_open.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo_open.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/zippo_open.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo_open.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/zippo_top.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo_top.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/zippo_top.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo_top.png
diff --git a/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/flame.png b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/flame.png
new file mode 100644
index 0000000000..672b227a33
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/flame.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/icon.png b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/icon.png
new file mode 100644
index 0000000000..69bc5a430d
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-left-lit.png b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-left-lit.png
new file mode 100644
index 0000000000..1e7ac493e6
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-left-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-left.png
new file mode 100644
index 0000000000..fc020ae679
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-right-lit.png b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-right-lit.png
new file mode 100644
index 0000000000..764a11d2e7
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-right-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-right.png
new file mode 100644
index 0000000000..a0fd6c89fa
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/meta.json
new file mode 100644
index 0000000000..06feadad57
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/meta.json
@@ -0,0 +1,45 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites Created by Smugman",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "flame",
+            "delays": [
+                [
+                    0.2,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "open"
+        },
+        {
+            "name": "top"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-lit",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-lit",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/open.png b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/open.png
new file mode 100644
index 0000000000..ba402299de
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/open.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/top.png b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/top.png
new file mode 100644
index 0000000000..b077dc0c54
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/top.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/flame.png b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/flame.png
new file mode 100644
index 0000000000..d5fcd20d70
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/flame.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/icon.png b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/icon.png
new file mode 100644
index 0000000000..fb49555576
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-left-lit.png b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-left-lit.png
new file mode 100644
index 0000000000..6e6684d3bb
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-left-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-left.png
new file mode 100644
index 0000000000..469e7cbbc2
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-right-lit.png b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-right-lit.png
new file mode 100644
index 0000000000..98d43ac3ab
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-right-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-right.png
new file mode 100644
index 0000000000..64d1228a53
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/meta.json
new file mode 100644
index 0000000000..8eae2b3c96
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/meta.json
@@ -0,0 +1,47 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites Created by JustAnOrange",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "flame",
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "open"
+        },
+        {
+            "name": "top"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-lit",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-lit",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/open.png b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/open.png
new file mode 100644
index 0000000000..e8fa3c5384
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/open.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/top.png b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/top.png
new file mode 100644
index 0000000000..bec9ed6658
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/top.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/flame.png b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/flame.png
new file mode 100644
index 0000000000..5470befe66
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/flame.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/icon.png b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/icon.png
new file mode 100644
index 0000000000..ada45562e8
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-left-lit.png b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-left-lit.png
new file mode 100644
index 0000000000..6133b7ee91
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-left-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-left.png
new file mode 100644
index 0000000000..eac5453ddc
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-right-lit.png b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-right-lit.png
new file mode 100644
index 0000000000..5803b6ac4d
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-right-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-right.png
new file mode 100644
index 0000000000..87f8e02641
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/meta.json
new file mode 100644
index 0000000000..3956e09beb
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/meta.json
@@ -0,0 +1,45 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites Created by JustAnOrange",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "flame",
+            "delays": [
+                [
+                    0.2,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "open"
+        },
+        {
+            "name": "top"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-lit",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-lit",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/open.png b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/open.png
new file mode 100644
index 0000000000..2a080a846d
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/open.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/top.png b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/top.png
new file mode 100644
index 0000000000..0afe86a673
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/top.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/flame.png b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/flame.png
new file mode 100644
index 0000000000..a1d8633d37
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/flame.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/icon.png b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/icon.png
new file mode 100644
index 0000000000..d2f7da1054
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-left-lit.png b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-left-lit.png
new file mode 100644
index 0000000000..babefd898d
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-left-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-left.png
new file mode 100644
index 0000000000..1377b2b5f0
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-right-lit.png b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-right-lit.png
new file mode 100644
index 0000000000..b3c4fee202
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-right-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-right.png
new file mode 100644
index 0000000000..d65d20864c
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/meta.json
new file mode 100644
index 0000000000..06feadad57
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/meta.json
@@ -0,0 +1,45 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites Created by Smugman",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "flame",
+            "delays": [
+                [
+                    0.2,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "open"
+        },
+        {
+            "name": "top"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-lit",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-lit",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/open.png b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/open.png
new file mode 100644
index 0000000000..908575e640
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/open.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/top.png b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/top.png
new file mode 100644
index 0000000000..ba0bae895a
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/top.png differ