diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/boxes.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/boxes.yml index 24cf7532d4..2a340a32a2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/boxes.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/boxes.yml @@ -13,13 +13,24 @@ # Boxes - type: entity id: BoxDonkSoftBox - name: "foamdart box" + name: "foam dart box" parent: BoxDonkSoftBase components: - type: AmmoBox capacity: 40 fillPrototype: BulletDonkSoft - - type: Sprite sprite: Objects/Fun/toys.rsi state: foambox + +- type: entity + id: BoxCartridgeCap + name: "cap gun cartridge box" + parent: BoxDonkSoftBase + components: + - type: AmmoBox + capacity: 20 + fillPrototype: CartridgeCap + - type: Sprite + sprite: Objects\Storage\boxes.rsi + state: box diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/cartridges.yml index 2e6c5cf3b7..c6be701c77 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/cartridges.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/cartridges.yml @@ -8,8 +8,8 @@ caliber: Cap - type: Sprite netsync: false - noRot: true - sprite: Objects/Consumable/Trash/ash.rsi + directional: true + sprite: Objects\Weapons\Guns\Ammunition\Casings\ammo_casing.rsi layers: - state: base map: ["enum.AmmoVisualLayers.Base"] @@ -17,8 +17,8 @@ - type: entity id: CartridgeCap - name: cartridge (cap) + name: cap gun cartridge parent: CartridgeCapBase components: - type: Ammo - projectile: BulletCap + projectile: BulletCap \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/speedloaders.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/speedloaders.yml index 99cd30370c..d9a030dcb8 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/speedloaders.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/speedloaders.yml @@ -1,6 +1,6 @@ - type: entity id: CapAmmoBase - name: "cap loader" + name: "cap gun loader" parent: BaseItem abstract: true components: @@ -23,7 +23,7 @@ - type: entity id: CapLoader - name: "capgun loader" + name: "cap gun loader" parent: CapAmmoBase components: - type: SpeedLoader diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index e753cf16a9..bd3d175dea 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -229,3 +229,5 @@ state: capbullet - type: Projectile deleteOnCollide: true + damages: + Piercing: 0