From 41a9b8868077f2b7cb811b082273032c397088be Mon Sep 17 00:00:00 2001 From: Vasilis Date: Tue, 24 Oct 2023 10:35:39 +0200 Subject: [PATCH] Make it a lil easier to restrict what can go in a cannon (#21093) --- .../Entities/Objects/Weapons/Guns/Projectiles/arrows.yml | 1 + .../Entities/Objects/Weapons/Guns/pneumatic_cannon.yml | 2 +- Resources/Prototypes/tags.yml | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml index 7dd6360a40..32a2ea4623 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml @@ -35,6 +35,7 @@ - type: Tag tags: - Arrow + - CannonRestrict - type: Projectile deleteOnCollide: false onlyCollideWhenShot: true diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml index f9413d6c67..9f3aec5c39 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml @@ -35,7 +35,7 @@ capacity: 30 blacklist: tags: - - Arrow + - CannonRestrict - type: Appearance - type: ItemMapper containerWhitelist: [gas_tank] diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index d7397d483c..a74fde7710 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -3,7 +3,7 @@ - type: Tag id: AirAlarmElectronics - + - type: Tag id: Airlock @@ -234,6 +234,9 @@ - type: Tag id: CanPilot + +- type: Tag + id: CannonRestrict - type: Tag id: CannotSuicide @@ -493,7 +496,7 @@ - type: Tag id: GeigerCounter - + - type: Tag id: GlassAirlock @@ -562,7 +565,7 @@ - type: Tag id: HighRiskItem - + - type: Tag id: HighSecDoor -- 2.51.2