From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Mon, 29 Apr 2024 09:54:40 +0000 (+1000)
Subject: Fix snappop (#27264)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=386454706b71bd047dc14abd869b9c0dea2a8e18;p=space-station-14.git

Fix snappop (#27264)

* Fix snappop

Bunch of stuff slipped through.

* name
---

diff --git a/Resources/Prototypes/Entities/Objects/Fun/snap_pops.yml b/Resources/Prototypes/Entities/Objects/Fun/snap_pops.yml
index a39c2f881a..88f0758874 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/snap_pops.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/snap_pops.yml
@@ -33,15 +33,12 @@
     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!
+  description: Contains snap pops for a few minutes of popping fun!
   components:
   - type: Item
     size: Normal
@@ -56,6 +53,6 @@
   - type: StorageFill
     contents:
       - id: SnapPop
-        amount: 20
+        amount: 5
   - type: Dumpable
 
diff --git a/Resources/Prototypes/Entities/Objects/Tools/decoys.yml b/Resources/Prototypes/Entities/Objects/Tools/decoys.yml
index 0074fe517d..d399b77d02 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/decoys.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/decoys.yml
@@ -48,6 +48,15 @@
   - type: ContainerContainer
     containers:
       cell_slot: !type:ContainerSlot
+  - type: HandheldLight
+    addPrefix: false
+  - type: PointLight # Just like the real thing...
+    autoRot: true
+    radius: 1.5
+    energy: 2.3
+    offset: 0, -1
+    color: green
+    netsync: false
   - type: Tag
     tags:
     - Balloon
@@ -59,8 +68,6 @@
   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:
@@ -69,13 +76,6 @@
     - 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
@@ -83,8 +83,6 @@
   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:
@@ -93,12 +91,6 @@
     - 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
@@ -106,8 +98,6 @@
   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:
@@ -117,11 +107,7 @@
       map: ["foldedLayer"]
       visible: false
   - type: PointLight
-    radius: 1.5
-    energy: 2.3
-    offset: 0, -1
     color: red
-    netsync: false
 
 - type: entity
   parent: BaseDecoy
@@ -129,8 +115,6 @@
   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:
@@ -139,11 +123,6 @@
     - 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
@@ -151,8 +130,6 @@
   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:
@@ -161,9 +138,3 @@
     - 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/tags.yml b/Resources/Prototypes/tags.yml
index f4477a8c85..f947332764 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -1128,9 +1128,6 @@
 - type: Tag
   id: Smokable
 
-- type: Tag
-  id: SnapPop
-
 - type: Tag
   id: SnowyLabs