From: FungiFellow <151778459+FungiFellow@users.noreply.github.com>
Date: Thu, 20 Feb 2025 00:27:34 +0000 (-0600)
Subject: Removed Contraband Status from Flares (#34705)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=f189bdcf6e858f0e87477b8a69733bb3ab0435c8;p=space-station-14.git

Removed Contraband Status from Flares (#34705)

* Update shotgun.yml

* Update shotgun.yml

* Update shotgun.yml
---

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
index fd6f2b8c3c..3870b872a6 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: BaseShellShotgun
   name: shell (.50)
-  parent: [ BaseCartridge, BaseSecurityContraband ]
+  parent: BaseCartridge
   abstract: true
   components:
   - type: Tag
@@ -41,7 +41,7 @@
 - type: entity
   id: ShellShotgunSlug
   name: shell (.50 slug)
-  parent: BaseShellShotgun
+  parent: [ BaseShellShotgun, BaseSecurityContraband]
   components:
   - type: Sprite
     layers:
@@ -55,7 +55,7 @@
 - type: entity
   id: ShellShotgunFlare
   name: shell (.50 flare)
-  parent: [ BaseShellShotgun, BaseSecurityBartenderContraband ]
+  parent: BaseShellShotgun
   components:
   - type: Tag
     tags:
@@ -74,7 +74,7 @@
 - type: entity
   id: ShellShotgun
   name: shell (.50)
-  parent: BaseShellShotgun
+  parent: [ BaseShellShotgun, BaseSecurityContraband ]
   components:
   - type: Sprite
     layers:
@@ -86,7 +86,7 @@
 - type: entity
   id: ShellShotgunIncendiary
   name: shell (.50 incendiary)
-  parent: BaseShellShotgun
+  parent: [ BaseShellShotgun, BaseSecurityContraband ]
   components:
   - type: Sprite
     layers:
@@ -100,7 +100,7 @@
 - type: entity
   id: ShellShotgunPractice
   name: shell (.50 practice)
-  parent: BaseShellShotgun
+  parent: [ BaseShellShotgun, BaseSecurityContraband ]
   components:
   - type: Sprite
     layers:
@@ -114,7 +114,7 @@
 - type: entity
   id: ShellTranquilizer
   name: shell (.50 tranquilizer)
-  parent: BaseShellShotgun
+  parent: [ BaseShellShotgun, BaseSecurityContraband ]
   components:
   - type: Tag
     tags:
@@ -143,7 +143,7 @@
   id: ShellShotgunImprovised
   name: improvised shotgun shell
   description: A homemade shotgun shell that shoots painful glass shrapnel. The spread is so wide that it couldn't hit the broad side of a barn.
-  parent: BaseShellShotgun
+  parent: [ BaseShellShotgun, BaseSecurityContraband ]
   components:
   - type: Tag
     tags:
@@ -165,7 +165,7 @@
 - type: entity
   id: ShellShotgunUranium
   name: uranium shotgun shell
-  parent: BaseShellShotgun
+  parent: [ BaseShellShotgun, BaseSecurityContraband ]
   components:
     - type: Sprite
       layers: