From 519acf0235bbd8143a08e4e236b09f51350fcb5f Mon Sep 17 00:00:00 2001 From: NR <66198468+withoutcode333@users.noreply.github.com> Date: Sun, 16 Mar 2025 19:04:19 +0500 Subject: [PATCH 1/5] fix --- .../Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml index 1abc8736e2..b39d48e9c2 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml @@ -3,10 +3,6 @@ name: ружейный патрон (.49 резиновая дробь) parent: BaseShellShotgun components: - - type: Tag - tags: - - ShellRubberShotgun - - Cartridge - type: Sprite layers: - state: rubber From 9edd4954cda9db5ed0ef5638e3675a9c962a6784 Mon Sep 17 00:00:00 2001 From: NR <66198468+withoutcode333@users.noreply.github.com> Date: Sun, 16 Mar 2025 19:49:32 +0500 Subject: [PATCH 2/5] =?UTF-8?q?=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20?= =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BD=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml index b39d48e9c2..d223286b33 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml @@ -9,5 +9,6 @@ map: [ "enum.AmmoVisualLayers.Base" ] - type: CartridgeAmmo proto: PelletShotgunRubberShot + count: 1 - type: SpentAmmoVisuals state: rubber From 53cf24e7df570b6f332aa964b0998ead2140ea23 Mon Sep 17 00:00:00 2001 From: NR <66198468+withoutcode333@users.noreply.github.com> Date: Fri, 21 Mar 2025 00:56:43 +0500 Subject: [PATCH 3/5] fix --- .../Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml index d223286b33..b39d48e9c2 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml @@ -9,6 +9,5 @@ map: [ "enum.AmmoVisualLayers.Base" ] - type: CartridgeAmmo proto: PelletShotgunRubberShot - count: 1 - type: SpentAmmoVisuals state: rubber From ddae79a49dfdd5731d76435c15718a4e5f7db6a6 Mon Sep 17 00:00:00 2001 From: NR <66198468+withoutcode333@users.noreply.github.com> Date: Fri, 21 Mar 2025 01:14:56 +0500 Subject: [PATCH 4/5] =?UTF-8?q?=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20?= =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BD=D0=BE=202.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml index b39d48e9c2..a577b9ac25 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml @@ -3,6 +3,10 @@ name: ружейный патрон (.49 резиновая дробь) parent: BaseShellShotgun components: + - type: Tag + tags: + - ShellRubberShotgun + - ShellShotgun - type: Sprite layers: - state: rubber From 578a2c2300bb1a18a20527290d5a4b08e9d64079 Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Fri, 21 Mar 2025 21:02:22 +0300 Subject: [PATCH 5/5] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml index a577b9ac25..b37ce05f96 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml @@ -6,6 +6,7 @@ - type: Tag tags: - ShellRubberShotgun + - Cartridge - ShellShotgun - type: Sprite layers: