]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Make it a lil easier to restrict what can go in a cannon (#21093)
authorVasilis <vasilis@pikachu.systems>
Tue, 24 Oct 2023 08:35:39 +0000 (10:35 +0200)
committerGitHub <noreply@github.com>
Tue, 24 Oct 2023 08:35:39 +0000 (19:35 +1100)
Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml
Resources/Prototypes/tags.yml

index 7dd6360a4059a22745bfd7da454818d9c124dca0..32a2ea4623f3ad78686b1b904e1d4e45738f1664 100644 (file)
@@ -35,6 +35,7 @@
   - type: Tag
     tags:
     - Arrow
+    - CannonRestrict
   - type: Projectile
     deleteOnCollide: false
     onlyCollideWhenShot: true
index f9413d6c673ced0b1fb569b107485ee7e103794a..9f3aec5c39bcbb717b95953c87ffd39bc424c00c 100644 (file)
@@ -35,7 +35,7 @@
     capacity: 30
     blacklist:
       tags:
-        - Arrow
+        - CannonRestrict
   - type: Appearance
   - type: ItemMapper
     containerWhitelist: [gas_tank]
index d7397d483c0899efb5b64f0ce40d1af5497092b6..a74fde7710ea01ca1c26c4eae744785bc2892134 100644 (file)
@@ -3,7 +3,7 @@
 
 - type: Tag
   id: AirAlarmElectronics
-  
+
 - type: Tag
   id: Airlock
 
 
 - type: Tag
   id: CanPilot
+  
+- type: Tag
+  id: CannonRestrict
 
 - type: Tag
   id: CannotSuicide
 
 - type: Tag
   id: GeigerCounter
-  
+
 - type: Tag
   id: GlassAirlock
 
 
 - type: Tag
   id: HighRiskItem
-  
+
 - type: Tag
   id: HighSecDoor