From: Firewatch <54725557+musicmanvr@users.noreply.github.com>
Date: Wed, 28 Feb 2024 21:53:46 +0000 (-0500)
Subject: Syndicate Decoy Bundle + Snap Pops (#25333)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=93d820f315c015eca17444bb8459f96f57381acd;p=space-station-14.git

Syndicate Decoy Bundle + Snap Pops (#25333)

* it works

halilujeah

* toggleable lights

removes a redundant flashlight since you can turn on the balloons to cast light

* final touches

syndicate decoys :trollface:

* touches

it works now

* minor spelling mistake

:star:

* minor spelling mistake 2

darn

* adds whistle

commanders now spawn with a whistle around their neck

* yaml linter

luv you linter baby

* smallify the whistle

it was way too big, this has been addressed

* sprite fix

am dummy :+1:

* netsync errors

wouldn't compile properly

* forgor

* i suck at yaml

smh

* decoys for all

now both syndicate and traitors can use the decoys, yippee!

* Update meta.json

credit my discord username

* Update uplink-catalog.ftl

* Update decoys.yml

base decoy no longer shows in the entity browser

* immortal gone

balloons have gained mortality
---

diff --git a/Resources/Audio/Items/Whistle/attributions.yml b/Resources/Audio/Items/Whistle/attributions.yml
index 25a3da9174..b9d92d698a 100644
--- a/Resources/Audio/Items/Whistle/attributions.yml
+++ b/Resources/Audio/Items/Whistle/attributions.yml
@@ -1,4 +1,4 @@
-- files: 
+- files:
   - "whistle_1.ogg"
   - "whistle_2.ogg"
   - "whistle_3.ogg"
@@ -8,4 +8,12 @@
   - "whistle_7.ogg"
   license: "CC0-1.0"
   copyright: "User strongbot on freesound.org. Modified by Fahasor on github"
-  source: "https://freesound.org/people/strongbot/sounds/568995/"
\ No newline at end of file
+  source: "https://freesound.org/people/strongbot/sounds/568995/"
+
+- files:
+  - "trench_whistle_1.ogg"
+  - "trench_whistle_2.ogg"
+  - "trench_whistle_3.ogg"
+  license: "CC0-1.0"
+  copyright: "Deleted user on freesound.org."
+  source: "https://freesound.org/people/deleted_user_2104797/sounds/324539/"
diff --git a/Resources/Audio/Items/Whistle/trench_whistle_1.ogg b/Resources/Audio/Items/Whistle/trench_whistle_1.ogg
new file mode 100644
index 0000000000..6bed4c5aab
Binary files /dev/null and b/Resources/Audio/Items/Whistle/trench_whistle_1.ogg differ
diff --git a/Resources/Audio/Items/Whistle/trench_whistle_2.ogg b/Resources/Audio/Items/Whistle/trench_whistle_2.ogg
new file mode 100644
index 0000000000..030ef354ac
Binary files /dev/null and b/Resources/Audio/Items/Whistle/trench_whistle_2.ogg differ
diff --git a/Resources/Audio/Items/Whistle/trench_whistle_3.ogg b/Resources/Audio/Items/Whistle/trench_whistle_3.ogg
new file mode 100644
index 0000000000..745132c2b9
Binary files /dev/null and b/Resources/Audio/Items/Whistle/trench_whistle_3.ogg differ
diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index 199bedb2d3..20ad9f6a6b 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -192,6 +192,9 @@ uplink-observation-kit-desc = Includes surveillance camera monitor board and sec
 uplink-emp-kit-name = Electrical Disruptor Kit
 uplink-emp-kit-desc = The ultimate reversal on energy-based weaponry: Disables disablers, stuns stunbatons, discharges laser guns! Contains 3 EMP grenades and an EMP implanter. Note: Does not disrupt actual firearms.
 
+uplink-decoy-kit-name = Decoy Kit
+uplink-decoy-kit-desc = State-of-the-art distraction technology straight from RND. Comes with five realistic balloons, four decoy grenades, and some snap poppers!
+
 uplink-chemistry-kit-name = Chemical Synthesis Kit
 uplink-chemistry-kit-desc = A starter kit for the aspiring chemist, includes toxin and vestine for all your criminal needs!
 
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
index f3347acafe..d599511052 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -366,3 +366,22 @@
       - id: ClothingHandsGlovesNitrile
       - id: SyringeTranexamicAcid
       - id: SyringeHyronalin
+
+- type: entity
+  parent: ClothingBackpackDuffelSyndicateBundle
+  id: ClothingBackpackDuffelSyndicateDecoyKitFilled
+  name: decoy bundle
+  description: "Contains distractions, both auditory and visual. Smell coming soon."
+  components:
+  - type: StorageFill
+    contents:
+      - id: BalloonOperative
+      - id: BalloonAgent
+      - id: BalloonElite
+      - id: BalloonJuggernaut
+      - id: BalloonCommander
+      - id: SnapPopBox
+      - id: GrenadeDummy
+        amount: 2
+      - id: SyndieTrickyBomb
+        amount: 2
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
index f41d5282f3..72cf6c447c 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -288,6 +288,7 @@
   components:
   - type: StorageFill
     contents:
+      - id: SnapPopBox
       - id: CrazyGlue
         amount: 2
       - id: PlasticBanana
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 134ffe38a0..585d792265 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -525,7 +525,7 @@
   description: uplink-binary-translator-key-desc
   icon: { sprite: /Textures/Objects/Devices/encryption_keys.rsi, state: rd_label }
   productEntity: EncryptionKeyBinary
-  cost: 
+  cost:
     Telecrystal: 1
 
   categories:
@@ -792,6 +792,17 @@
   categories:
   - UplinkBundles
 
+- type: listing
+  id: UplinkDecoyKit
+  name: uplink-decoy-kit-name
+  description: uplink-decoy-kit-desc
+  icon: { sprite: /Textures/Objects/Tools/Decoys/operative_decoy.rsi, state: folded }
+  productEntity: ClothingBackpackDuffelSyndicateDecoyKitFilled
+  cost:
+    Telecrystal: 6
+  categories:
+  - UplinkBundles
+
 - type: listing
   id: UplinkMedsBundle
   name: uplink-meds-bundle-name
diff --git a/Resources/Prototypes/Entities/Objects/Fun/snap_pops.yml b/Resources/Prototypes/Entities/Objects/Fun/snap_pops.yml
new file mode 100644
index 0000000000..a39c2f881a
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Fun/snap_pops.yml
@@ -0,0 +1,61 @@
+- type: entity
+  parent: BaseItem
+  id: SnapPop
+  name: snap pop
+  description: Throw it at the floor and listen to it POP!
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/toys.rsi
+    state: snappop
+  - type: Item
+    size: Tiny
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 1
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          path: /Audio/Effects/snap.ogg
+      - !type:ExplodeBehavior
+  - type: DamageOnLand
+    damage:
+      types:
+        Blunt: 3
+  - type: Explosive
+    explosionType: Default
+    # Cosmetic explosion :tf:
+    maxIntensity: 0.01
+    intensitySlope: 1
+    totalIntensity: 0.01
+  - type: Tag
+    tags:
+      - SnapPop
+
+- type: entity
+  parent: BaseStorageItem
+  id: SnapPopBox
+  name: snap pop box
+  description: Contains twenty snap pops for a few minutes of popping fun!
+  components:
+  - type: Item
+    size: Normal
+  - type: Sprite
+    sprite: Objects/Fun/toys.rsi
+    state: spbox
+  - type: Storage
+    grid:
+    - 0,0,4,3
+    areaInsert: true
+    maxItemSize: Tiny
+  - type: StorageFill
+    contents:
+      - id: SnapPop
+        amount: 20
+  - type: Dumpable
+
diff --git a/Resources/Prototypes/Entities/Objects/Fun/whistles.yml b/Resources/Prototypes/Entities/Objects/Fun/whistles.yml
index 4281f0c4d4..10c41efc54 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/whistles.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/whistles.yml
@@ -13,7 +13,7 @@
   - type: UseDelay
     delay: 3
   - type: EmitSoundOnUse
-    sound: 
+    sound:
       collection: BaseWhistle
   - type: Whistle
     distance: 5
@@ -27,4 +27,24 @@
     sprite: Objects/Fun/whistle.rsi
     state: securityWhistle
   - type: Item
-    sprite: Objects/Fun/whistle.rsi
\ No newline at end of file
+    sprite: Objects/Fun/whistle.rsi
+
+- type: entity
+  parent: BaseWhistle
+  id: SyndicateWhistle
+  name: trench whistle
+  description: A whistle used by Syndicate commanders to draw attention. Avanti!
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Misc/whistles.rsi
+    state: icon
+  - type: Clothing
+    sprite: Clothing/Neck/Misc/whistles.rsi
+    quickEquip: False
+    slots:
+    - neck
+  - type: EmitSoundOnUse
+    sound:
+      collection: TrenchWhistle
+  - type: Whistle
+    distance: 15 # Let your enemies hear the sound of death approaching
diff --git a/Resources/Prototypes/Entities/Objects/Tools/decoys.yml b/Resources/Prototypes/Entities/Objects/Tools/decoys.yml
new file mode 100644
index 0000000000..0074fe517d
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Tools/decoys.yml
@@ -0,0 +1,169 @@
+
+# Operative Balloons, looks just like the real thing!
+
+- type: entity
+  parent: [BaseItem, BaseFoldable]
+  id: BaseDecoy
+  abstract: true
+  components:
+  - type: Rotatable
+  - type: Sprite
+    sprite: Objects/Tools/Decoys/operative_decoy.rsi
+    layers:
+    - state: oballoon
+      map: ["unfoldedLayer"]
+    - state: folded
+      map: ["foldedLayer"]
+      visible: false
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+        - !type:PlaySoundBehavior
+          sound:
+            path: /Audio/Effects/pop_high.ogg
+  - type: Appearance
+  - type: Item
+    size: Normal
+  - type: RandomMetadata # No metagaming these, jimbo.
+    nameSegments:
+    - SyndicateNamesPrefix
+    - SyndicateNamesNormal
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: ToggleableLightVisuals
+  - type: Foldable
+    folded: true
+  - type: PowerCellSlot
+    cellSlotId: cell_slot
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellHigh
+  - type: ContainerContainer
+    containers:
+      cell_slot: !type:ContainerSlot
+  - type: Tag
+    tags:
+    - Balloon
+    - Flashlight
+
+- type: entity
+  parent: BaseDecoy
+  id: BalloonOperative
+  name: operative balloon
+  description: Upon closer inspection, this Syndicate operative is actually a balloon.
+  components:
+  - type: HandheldLight
+    addPrefix: false
+  - type: Sprite
+    sprite: Objects/Tools/Decoys/operative_decoy.rsi
+    layers:
+    - state: oballoon
+      map: ["unfoldedLayer"]
+    - state: folded
+      map: ["foldedLayer"]
+      visible: false
+  - type: PointLight # Just like the real thing...
+    autoRot: true
+    radius: 1.5
+    energy: 2.3
+    offset: 0, -1
+    color: green
+    netsync: false
+
+- type: entity
+  parent: BaseDecoy
+  id: BalloonAgent
+  name: agent balloon
+  description: Upon closer inspection, this Syndicate agent is actually a balloon.
+  components:
+  - type: HandheldLight
+    addPrefix: false
+  - type: Sprite
+    sprite: Objects/Tools/Decoys/agent_decoy.rsi
+    layers:
+    - state: aballoon
+      map: ["unfoldedLayer"]
+    - state: folded
+      map: ["foldedLayer"]
+      visible: false
+  - type: PointLight
+    radius: 1.5
+    energy: 2.3
+    offset: 0, -1
+    color: green
+    netsync: false
+
+- type: entity
+  parent: BaseDecoy
+  id: BalloonElite
+  name: elite operative balloon
+  description: Upon closer inspection, this Syndicate elite operative is actually a balloon.
+  components:
+  - type: HandheldLight
+    addPrefix: false
+  - type: Sprite
+    sprite: Objects/Tools/Decoys/elite_decoy.rsi
+    layers:
+    - state: eballoon
+      map: ["unfoldedLayer"]
+    - state: folded
+      map: ["foldedLayer"]
+      visible: false
+  - type: PointLight
+    radius: 1.5
+    energy: 2.3
+    offset: 0, -1
+    color: red
+    netsync: false
+
+- type: entity
+  parent: BaseDecoy
+  id: BalloonJuggernaut
+  name: juggernaut balloon
+  description: Upon closer inspection, this Syndicate juggernaut is actually a balloon.
+  components:
+  - type: HandheldLight
+    addPrefix: false
+  - type: Sprite
+    sprite: Objects/Tools/Decoys/juggernaut_decoy.rsi
+    layers:
+    - state: jballoon
+      map: ["unfoldedLayer"]
+    - state: folded
+      map: ["foldedLayer"]
+      visible: false
+  - type: PointLight # Inbuilt flashlight, I guess?
+    radius: 1.5
+    energy: 2.3
+    offset: 0, -1
+    netsync: false
+
+- type: entity
+  parent: BaseDecoy
+  id: BalloonCommander
+  name: commander balloon
+  description: Upon closer inspection, this Syndicate commander is actually a balloon.
+  components:
+  - type: HandheldLight
+    addPrefix: false
+  - type: Sprite
+    sprite: Objects/Tools/Decoys/commander_decoy.rsi
+    layers:
+    - state: cballoon
+      map: ["unfoldedLayer"]
+    - state: folded
+      map: ["foldedLayer"]
+      visible: false
+  - type: PointLight
+    radius: 1.5
+    energy: 2.3
+    offset: 0, -1
+    color: green
+    netsync: false
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
index 0b1a7ecb77..326fd41aca 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -379,3 +379,42 @@
       reagents:
       - ReagentId: TearGas
         Quantity: 50
+
+# Non-explosive "dummy" grenades to use as a distraction.
+
+- type: entity
+  name: trick grenade
+  description: All the grenade without any of the boom.
+  parent: GrenadeBase
+  id: GrenadeDummy
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Grenades/grenade.rsi
+  - type: DeleteOnTrigger
+  - type: SpawnOnTrigger
+    proto: GrenadeFlashEffect
+  - type: SoundOnTrigger
+    sound:
+      path: /Audio/Effects/Emotes/parp1.ogg
+  - type: Appearance
+  - type: TimerTriggerVisuals
+    primingSound:
+      path: /Audio/Effects/countdown.ogg
+
+- type: entity
+  name: syndicate trickybomb
+  description: A syndicate-manufactured explosive used to make an excellent distraction.
+  parent: GrenadeDummy
+  id: SyndieTrickyBomb
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Grenades/syndgrenade.rsi
+  - type: SoundOnTrigger
+    sound:
+      path: /Audio/Effects/Emotes/parp1.ogg
+  - type: Appearance
+  - type: TimerTriggerVisuals
+    primingSound:
+      path: /Audio/Effects/minibombcountdown.ogg
+      params:
+        volume: 12
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
index 8f7d8aee19..1273149f7c 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
@@ -123,6 +123,7 @@
     mask: ClothingMaskGasSyndicate
     eyes: ClothingEyesHudSyndicate
     ears: ClothingHeadsetAltSyndicate
+    neck: SyndicateWhistle
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitSyndieCommander
     shoes: ClothingShoesBootsCombatFilled
diff --git a/Resources/Prototypes/SoundCollections/whistle.yml b/Resources/Prototypes/SoundCollections/whistle.yml
index f7d0dc9a1d..4cc3188d7c 100644
--- a/Resources/Prototypes/SoundCollections/whistle.yml
+++ b/Resources/Prototypes/SoundCollections/whistle.yml
@@ -8,3 +8,10 @@
     - /Audio/Items/Whistle/whistle_5.ogg
     - /Audio/Items/Whistle/whistle_6.ogg
     - /Audio/Items/Whistle/whistle_7.ogg
+
+- type: soundCollection
+  id: TrenchWhistle
+  files:
+    - /Audio/Items/Whistle/trench_whistle_1.ogg
+    - /Audio/Items/Whistle/trench_whistle_2.ogg
+    - /Audio/Items/Whistle/trench_whistle_3.ogg
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index e2d08042b5..ec5a1aa2a6 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -1067,6 +1067,9 @@
 - type: Tag
   id: SmallMech
 
+- type: Tag
+  id: SnapPop
+
 - type: Tag
   id: Smokable
 
diff --git a/Resources/Textures/Clothing/Neck/Misc/whistles.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Misc/whistles.rsi/equipped-NECK.png
new file mode 100644
index 0000000000..570ef9cdf2
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/whistles.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/Clothing/Neck/Misc/whistles.rsi/icon.png b/Resources/Textures/Clothing/Neck/Misc/whistles.rsi/icon.png
new file mode 100644
index 0000000000..9d0bc82e2b
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/whistles.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Neck/Misc/whistles.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/whistles.rsi/meta.json
new file mode 100644
index 0000000000..31cda14261
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Misc/whistles.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Drawn by Firewatchin on Discord.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+
+  "states": [
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Tools/Decoys/agent_decoy.rsi/aballoon.png b/Resources/Textures/Objects/Tools/Decoys/agent_decoy.rsi/aballoon.png
new file mode 100644
index 0000000000..dcb06d09ca
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Decoys/agent_decoy.rsi/aballoon.png differ
diff --git a/Resources/Textures/Objects/Tools/Decoys/agent_decoy.rsi/folded.png b/Resources/Textures/Objects/Tools/Decoys/agent_decoy.rsi/folded.png
new file mode 100644
index 0000000000..44580a1226
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Decoys/agent_decoy.rsi/folded.png differ
diff --git a/Resources/Textures/Objects/Tools/Decoys/agent_decoy.rsi/meta.json b/Resources/Textures/Objects/Tools/Decoys/agent_decoy.rsi/meta.json
new file mode 100644
index 0000000000..81b7d5f2c3
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Decoys/agent_decoy.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Modified from existing sprites.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+        "name": "folded"
+        },
+        {
+        "name": "aballoon",
+        "directions": 4
+        }
+]
+}
diff --git a/Resources/Textures/Objects/Tools/Decoys/commander_decoy.rsi/cballoon.png b/Resources/Textures/Objects/Tools/Decoys/commander_decoy.rsi/cballoon.png
new file mode 100644
index 0000000000..da63d127c4
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Decoys/commander_decoy.rsi/cballoon.png differ
diff --git a/Resources/Textures/Objects/Tools/Decoys/commander_decoy.rsi/folded.png b/Resources/Textures/Objects/Tools/Decoys/commander_decoy.rsi/folded.png
new file mode 100644
index 0000000000..f16130ef38
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Decoys/commander_decoy.rsi/folded.png differ
diff --git a/Resources/Textures/Objects/Tools/Decoys/commander_decoy.rsi/meta.json b/Resources/Textures/Objects/Tools/Decoys/commander_decoy.rsi/meta.json
new file mode 100644
index 0000000000..4eceaa987a
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Decoys/commander_decoy.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Modified from existing sprites.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+        "name": "folded"
+        },
+        {
+        "name": "cballoon",
+        "directions": 4
+        }
+]
+}
diff --git a/Resources/Textures/Objects/Tools/Decoys/elite_decoy.rsi/eballoon.png b/Resources/Textures/Objects/Tools/Decoys/elite_decoy.rsi/eballoon.png
new file mode 100644
index 0000000000..1f5b6d4c25
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Decoys/elite_decoy.rsi/eballoon.png differ
diff --git a/Resources/Textures/Objects/Tools/Decoys/elite_decoy.rsi/folded.png b/Resources/Textures/Objects/Tools/Decoys/elite_decoy.rsi/folded.png
new file mode 100644
index 0000000000..c335a79daa
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Decoys/elite_decoy.rsi/folded.png differ
diff --git a/Resources/Textures/Objects/Tools/Decoys/elite_decoy.rsi/meta.json b/Resources/Textures/Objects/Tools/Decoys/elite_decoy.rsi/meta.json
new file mode 100644
index 0000000000..7a7d60a805
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Decoys/elite_decoy.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Modified from existing sprites.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+        "name": "folded"
+        },
+        {
+        "name": "eballoon",
+        "directions": 4
+        }
+]
+}
diff --git a/Resources/Textures/Objects/Tools/Decoys/juggernaut_decoy.rsi/folded.png b/Resources/Textures/Objects/Tools/Decoys/juggernaut_decoy.rsi/folded.png
new file mode 100644
index 0000000000..7b3b7b9846
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Decoys/juggernaut_decoy.rsi/folded.png differ
diff --git a/Resources/Textures/Objects/Tools/Decoys/juggernaut_decoy.rsi/jballoon.png b/Resources/Textures/Objects/Tools/Decoys/juggernaut_decoy.rsi/jballoon.png
new file mode 100644
index 0000000000..7edcc12a1f
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Decoys/juggernaut_decoy.rsi/jballoon.png differ
diff --git a/Resources/Textures/Objects/Tools/Decoys/juggernaut_decoy.rsi/meta.json b/Resources/Textures/Objects/Tools/Decoys/juggernaut_decoy.rsi/meta.json
new file mode 100644
index 0000000000..f43b25335b
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Decoys/juggernaut_decoy.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Modified from existing sprites.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+        "name": "folded"
+        },
+        {
+        "name": "jballoon",
+        "directions": 4
+        }
+]
+}
diff --git a/Resources/Textures/Objects/Tools/Decoys/operative_decoy.rsi/folded.png b/Resources/Textures/Objects/Tools/Decoys/operative_decoy.rsi/folded.png
new file mode 100644
index 0000000000..ba4af386a3
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Decoys/operative_decoy.rsi/folded.png differ
diff --git a/Resources/Textures/Objects/Tools/Decoys/operative_decoy.rsi/meta.json b/Resources/Textures/Objects/Tools/Decoys/operative_decoy.rsi/meta.json
new file mode 100644
index 0000000000..7956c00980
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Decoys/operative_decoy.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Modified from existing sprites.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+        "name": "folded"
+        },
+        {
+        "name": "oballoon",
+        "directions": 4
+        }
+]
+}
diff --git a/Resources/Textures/Objects/Tools/Decoys/operative_decoy.rsi/oballoon.png b/Resources/Textures/Objects/Tools/Decoys/operative_decoy.rsi/oballoon.png
new file mode 100644
index 0000000000..ecdde4162a
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Decoys/operative_decoy.rsi/oballoon.png differ
diff --git a/Resources/Textures/Objects/Tools/greenlight.rsi/equipped-BELT.png b/Resources/Textures/Objects/Tools/greenlight.rsi/equipped-BELT.png
new file mode 100644
index 0000000000..ca7c75907d
Binary files /dev/null and b/Resources/Textures/Objects/Tools/greenlight.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/Objects/Tools/greenlight.rsi/flashlight-on.png b/Resources/Textures/Objects/Tools/greenlight.rsi/flashlight-on.png
new file mode 100644
index 0000000000..c8bd0f9b46
Binary files /dev/null and b/Resources/Textures/Objects/Tools/greenlight.rsi/flashlight-on.png differ
diff --git a/Resources/Textures/Objects/Tools/greenlight.rsi/flashlight-overlay.png b/Resources/Textures/Objects/Tools/greenlight.rsi/flashlight-overlay.png
new file mode 100644
index 0000000000..afd8f80fe2
Binary files /dev/null and b/Resources/Textures/Objects/Tools/greenlight.rsi/flashlight-overlay.png differ
diff --git a/Resources/Textures/Objects/Tools/greenlight.rsi/flashlight.png b/Resources/Textures/Objects/Tools/greenlight.rsi/flashlight.png
new file mode 100644
index 0000000000..b2a0eaa270
Binary files /dev/null and b/Resources/Textures/Objects/Tools/greenlight.rsi/flashlight.png differ
diff --git a/Resources/Textures/Objects/Tools/greenlight.rsi/inhand-left-light.png b/Resources/Textures/Objects/Tools/greenlight.rsi/inhand-left-light.png
new file mode 100644
index 0000000000..cb42c3eb65
Binary files /dev/null and b/Resources/Textures/Objects/Tools/greenlight.rsi/inhand-left-light.png differ
diff --git a/Resources/Textures/Objects/Tools/greenlight.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/greenlight.rsi/inhand-left.png
new file mode 100644
index 0000000000..e4e6b42252
Binary files /dev/null and b/Resources/Textures/Objects/Tools/greenlight.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/greenlight.rsi/inhand-right-light.png b/Resources/Textures/Objects/Tools/greenlight.rsi/inhand-right-light.png
new file mode 100644
index 0000000000..eea2533dfa
Binary files /dev/null and b/Resources/Textures/Objects/Tools/greenlight.rsi/inhand-right-light.png differ
diff --git a/Resources/Textures/Objects/Tools/greenlight.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/greenlight.rsi/inhand-right.png
new file mode 100644
index 0000000000..42c9ca0060
Binary files /dev/null and b/Resources/Textures/Objects/Tools/greenlight.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/greenlight.rsi/meta.json b/Resources/Textures/Objects/Tools/greenlight.rsi/meta.json
new file mode 100644
index 0000000000..41d6756d63
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/greenlight.rsi/meta.json
@@ -0,0 +1,40 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from vgstation and modified by Swept at https://github.com/vgstation-coders/vgstation13/blob/Bleeding-Edge/icons/obj/lighting.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "flashlight"
+    },
+    {
+      "name": "flashlight-on"
+    },
+    {
+      "name": "flashlight-overlay"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left-light",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right-light",
+      "directions": 4
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    }
+  ]
+}