Reduced Pneumatic Cannon inventory space by 75%, removed cannon blacklist (#26878)

Reduced Pneumatic Cannon inventory space by 75%, removed cannon whitelist.

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml
index 52c5dc8a9dbdd2db2fc23df90bda0bce73658981..6f925139fb1bd80082a074d2b07063fb72a2350e 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: BaseItem
   id: BaseArrow
   abstract: true
@@ -35,7 +35,6 @@
   - 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 ae1f5df3c154f84a81c770b686fa630f52f3e587..1251172946080a5e19e6a6e27cd8f71c62124052 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml
@@ -22,7 +22,6 @@
     selectedMode: SemiAuto
     availableModes:
     - SemiAuto
-    - FullAuto
     soundGunshot:
       path: /Audio/Effects/thunk.ogg
     soundEmpty:
@@ -34,10 +33,7 @@
   - type: Storage
     maxItemSize: Normal
     grid:
-    - 0,0,3,3
-    blacklist:
-      tags:
-        - CannonRestrict
+    - 0,0,1,1
   - type: Appearance
   - type: ItemMapper
     containerWhitelist: [gas_tank]

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
index 9cd1bb294082955921a1ea07e65017a107e2a815..afe4644517c8ee07212e42e4f018423589558c82 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -263,7 +263,6 @@
     tags:
     - CombatKnife
     - Knife
-    - CannonRestrict
   - type: Sprite
     sprite: Objects/Weapons/Melee/throwing_knife.rsi
     state: icon

diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 021427014c3917422bf9765c1004e0115ab002c1..f6cedeb937759d03440745e4b087186d2c4f9213 100644 (file)
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -261,9 +261,6 @@
 - type: Tag
   id: CannonBall
 
-- type: Tag
-  id: CannonRestrict
-
 - type: Tag
   id: CannotSuicide