From: Nikovnik <116634167+nkokic@users.noreply.github.com>
Date: Fri, 13 Jun 2025 13:53:44 +0000 (+0200)
Subject: Transparent tear gas (#36440)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=685e7028d2ae238ca4a4d18c0d2107551d244a59;p=space-station-14.git

Transparent tear gas (#36440)

* tweaked tear gas

* changed color of tear gas

* sped up metabolism rate of tear gas

* sped up tear gas passing more

* reduced tear gas content in grenades

* added threshold for better effect end timing

* removed clickable component from foams

* Suggestion changes

* Hide in spawn menu

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
---

diff --git a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
index 650179d182..1bf3d351b3 100644
--- a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
+++ b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
@@ -9,7 +9,6 @@
   - type: SmokeVisuals
   - type: Transform
     anchored: true
-  - type: Clickable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -48,6 +47,29 @@
     tags:
     - HideContextMenu
 
+- type: entity
+  parent: BaseFoam
+  id: TearGasSmoke
+  name: tear gas
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: Effects/chemsmoke.rsi
+    state: chemsmoke
+  - type: TimedDespawn
+    lifetime: 10
+  - type: Tag
+    tags:
+    - HideContextMenu
+
+- type: entity
+  parent: TearGasSmoke
+  id: TearGasSmokeWhite
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    state: chemsmoke_white
+
 - type: entity
   parent: Smoke
   id: WizardSmoke
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
index eab8838d4e..fbc7bc74ea 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -449,10 +449,11 @@
   - type: SmokeOnTrigger
     duration: 10
     spreadAmount: 30
+    smokePrototype: TearGasSmokeWhite
     solution:
       reagents:
       - ReagentId: TearGas
-        Quantity: 50
+        Quantity: 20
 
 - type: entity
   parent: [ BaseEngineeringContraband, SmokeGrenade ]
diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml
index 3f2daa98c9..6e159278e9 100644
--- a/Resources/Prototypes/Reagents/narcotics.yml
+++ b/Resources/Prototypes/Reagents/narcotics.yml
@@ -376,7 +376,7 @@
   desc: reagent-desc-tear-gas
   physicalDesc: reagent-physical-desc-milky
   flavor: salty
-  color: "#96a8b5"
+  color: "#ffffff4d"
   boilingPoint: 255.0
   meltingPoint: 36.0
   metabolisms:
@@ -402,18 +402,28 @@
         - norepinephricacid-effect-eye-pain
         - norepinephricacid-effect-darkness
         - norepinephricacid-effect-blindness
+      - !type:Emote
+        emote: Scream
+        probability: 0.08
         conditions:
         - !type:ReagentThreshold
-          min: 15
+          min: 4
       - !type:Emote
-        emote: Scream
+        emote: Cough
         probability: 0.08
       - !type:GenericStatusEffect
         key: TemporaryBlindness
         component: TemporaryBlindness
         conditions:
         - !type:ReagentThreshold
-          min: 20
+          min: 4
+      - !type:MovespeedModifier
+        walkSpeedModifier: 0.65
+        sprintSpeedModifier: 0.65
+        statusLifetime: 1.5
+        conditions: # because of the remainding after effect, threshold is given so the effects ends simultaniously
+        - !type:ReagentThreshold
+          min: 4
 
 - type: reagent
   id: Happiness
diff --git a/Resources/Textures/Effects/chemsmoke.rsi/chemsmoke_white.png b/Resources/Textures/Effects/chemsmoke.rsi/chemsmoke_white.png
new file mode 100644
index 0000000000..a0d0c4debb
Binary files /dev/null and b/Resources/Textures/Effects/chemsmoke.rsi/chemsmoke_white.png differ
diff --git a/Resources/Textures/Effects/chemsmoke.rsi/meta.json b/Resources/Textures/Effects/chemsmoke.rsi/meta.json
index 62514d1c2a..47c04a0ff9 100644
--- a/Resources/Textures/Effects/chemsmoke.rsi/meta.json
+++ b/Resources/Textures/Effects/chemsmoke.rsi/meta.json
@@ -1 +1,35 @@
-{"version": 1, "size": {"x": 96, "y": 96}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/81b3a082ccdfb425f36bbed6e5bc1f0faed346ec/icons/effects/chemsmoke.dmi", "states": [{"name": "chemsmoke", "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]]}]}
\ No newline at end of file
+{
+    "version": 1,
+    "size":
+    {
+        "x": 96,
+        "y": 96
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/81b3a082ccdfb425f36bbed6e5bc1f0faed346ec/icons/effects/chemsmoke.dmi",
+    "states":
+    [
+        {
+            "name": "chemsmoke",
+            "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": "chemsmoke_white",
+            "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]
+            ]
+        }
+    ]
+}