From: superjj18 <gagnonjake@gmail.com>
Date: Fri, 19 Apr 2024 23:22:36 +0000 (-0400)
Subject: Reduced Pneumatic Cannon inventory space by 75%, removed cannon blacklist (#26878)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=fdf04c277996c559b28f3afbfaeaa522cb5d9cfc;p=space-station-14.git

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 52c5dc8a9d..6f925139fb 100644
--- 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 ae1f5df3c1..1251172946 100644
--- 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 9cd1bb2940..afe4644517 100644
--- 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 021427014c..f6cedeb937 100644
--- 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