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>
This commit is contained in:
@@ -481,6 +481,7 @@
|
|||||||
- MagazineMagnum
|
- MagazineMagnum
|
||||||
- CombatKnife
|
- CombatKnife
|
||||||
- Truncheon
|
- Truncheon
|
||||||
|
- HandGrenade
|
||||||
components:
|
components:
|
||||||
- Stunbaton
|
- Stunbaton
|
||||||
- FlashOnTrigger
|
- FlashOnTrigger
|
||||||
|
|||||||
@@ -35,6 +35,9 @@
|
|||||||
enum.ConstructionVisuals.Layer:
|
enum.ConstructionVisuals.Layer:
|
||||||
Primed: { state: primed }
|
Primed: { state: primed }
|
||||||
Unprimed: { state: icon }
|
Unprimed: { state: icon }
|
||||||
|
- type: Tag
|
||||||
|
tags:
|
||||||
|
- HandGrenade
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
name: explosive grenade
|
name: explosive grenade
|
||||||
@@ -83,6 +86,7 @@
|
|||||||
- Antagonists
|
- Antagonists
|
||||||
- type: Tag
|
- type: Tag
|
||||||
tags:
|
tags:
|
||||||
|
- HandGrenade
|
||||||
- GrenadeFlashBang
|
- GrenadeFlashBang
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
@@ -312,6 +316,9 @@
|
|||||||
map: [ "enum.ConstructionVisuals.Layer" ]
|
map: [ "enum.ConstructionVisuals.Layer" ]
|
||||||
- type: Item
|
- type: Item
|
||||||
size: Small
|
size: Small
|
||||||
|
- type: Tag
|
||||||
|
tags:
|
||||||
|
- HandGrenade
|
||||||
- type: PayloadCase
|
- type: PayloadCase
|
||||||
- type: Construction
|
- type: Construction
|
||||||
graph: ModularGrenadeGraph
|
graph: ModularGrenadeGraph
|
||||||
|
|||||||
@@ -25,6 +25,9 @@
|
|||||||
enum.ConstructionVisuals.Layer:
|
enum.ConstructionVisuals.Layer:
|
||||||
Primed: { state: primed }
|
Primed: { state: primed }
|
||||||
Unprimed: { state: icon }
|
Unprimed: { state: icon }
|
||||||
|
- type: Tag
|
||||||
|
tags:
|
||||||
|
- HandGrenade
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
parent: [ProjectileGrenadeBase, BaseSecurityContraband]
|
parent: [ProjectileGrenadeBase, BaseSecurityContraband]
|
||||||
|
|||||||
@@ -18,6 +18,9 @@
|
|||||||
behaviors:
|
behaviors:
|
||||||
- !type:TriggerBehavior
|
- !type:TriggerBehavior
|
||||||
- type: ScatteringGrenade
|
- type: ScatteringGrenade
|
||||||
|
- type: Tag
|
||||||
|
tags:
|
||||||
|
- HandGrenade
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
parent: [ScatteringGrenadeBase, BaseSecurityContraband]
|
parent: [ScatteringGrenadeBase, BaseSecurityContraband]
|
||||||
|
|||||||
@@ -641,6 +641,9 @@
|
|||||||
- type: Tag
|
- type: Tag
|
||||||
id: Handcuffs
|
id: Handcuffs
|
||||||
|
|
||||||
|
- type: Tag
|
||||||
|
id: HandGrenade
|
||||||
|
|
||||||
- type: Tag
|
- type: Tag
|
||||||
id: HappyHonk
|
id: HappyHonk
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user