Modular Grenades now fit in security belts/carriers (#34169)

* Added PayloadCase component to secbelt whitelist

* Replaced PayloadCase type whitelist with a tag

* fucking hell

* Add HandGrenade tag to all grenades
Grenades are so unbelievably cooked right now. I've counted about 4 separate baseitems that they inherit from whenever they feel like it. Why? They're all the same.

---------

Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index efae0947658479ac1659127898a0e169993459c9..27cd2921b8a02792183f59cb1e1f719604650774 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -481,6 +481,7 @@
         - MagazineMagnum
         - CombatKnife
         - Truncheon
+        - HandGrenade
       components:
         - Stunbaton
         - FlashOnTrigger

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
index 8be5b5f8aa061e471f2f0215ad657e150a0f4553..ebfdf184f7ee572fc828968fecc468157b2f3943 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -35,6 +35,9 @@
         enum.ConstructionVisuals.Layer:
           Primed: { state: primed }
           Unprimed: { state: icon }
+  - type: Tag
+    tags:
+    - HandGrenade
 
 - type: entity
   name: explosive grenade
@@ -83,6 +86,7 @@
     - Antagonists
   - type: Tag
     tags:
+    - HandGrenade
     - GrenadeFlashBang
 
 - type: entity
@@ -312,6 +316,9 @@
       map: [ "enum.ConstructionVisuals.Layer" ]
   - type: Item
     size: Small
+  - type: Tag
+    tags:
+    - HandGrenade
   - type: PayloadCase
   - type: Construction
     graph: ModularGrenadeGraph

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml
index 6a111ef1c8b81e29fea6753b9fe9c195fd23c359..41fad224c475c8be19485aecf4f010f8f959c5e5 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml
@@ -25,6 +25,9 @@
         enum.ConstructionVisuals.Layer:
           Primed: { state: primed }
           Unprimed: { state: icon }
+  - type: Tag
+    tags:
+    - HandGrenade
 
 - type: entity
   parent: [ProjectileGrenadeBase, BaseSecurityContraband]

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml
index 38fde5c54042c6c42b368540ee66fc7d3cb44d5f..a3087f1f9e8a52eed9e964a329b532b900f494b9 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml
@@ -18,6 +18,9 @@
       behaviors:
       - !type:TriggerBehavior
   - type: ScatteringGrenade
+  - type: Tag
+    tags:
+    - HandGrenade
 
 - type: entity
   parent: [ScatteringGrenadeBase, BaseSecurityContraband]

diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index bd3644d53c7b2fd558ff2e330165d965275db74b..910c24b303d1896f32c370804c79df3d84e00028 100644 (file)
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -641,6 +641,9 @@
 - type: Tag
   id: Handcuffs
 
+- type: Tag
+  id: HandGrenade
+
 - type: Tag
   id: HappyHonk