diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index efae094765..27cd2921b8 100644 --- 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 8be5b5f8aa..ebfdf184f7 100644 --- 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 6a111ef1c8..41fad224c4 100644 --- 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 38fde5c540..a3087f1f9e 100644 --- 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 bd3644d53c..910c24b303 100644 --- 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