Assorted minor cleanup (and shotgun shell descriptions) in Resources\Prototypes\Entit...

* YAML cleanup of shotgun rounds

* Descriptions for all shotgun ammo types

* YAML cleanup of pistol rounds

* YAML cleanup of magnum rounds (and tweaks to uranium ammo descriptions)

* YAML cleanup of rifle rounds

* YAML cleanup of toy rounds

* YAML cleanup of magnum/pistol/rifle/shotgun projectiles

* YAML cleanup of magnum/pistol/toy speedloaders

* YAML cleanup of light rifle rounds

* Descriptions for anti-materiel rounds and boxes

* YAML cleanup of base_cartridge.yml

* YAML cleanup of caseless rounds (plus minor viper-mag description tweaks)

* YAML cleanup of heavy rifle rounds

* YAML cleanup of grenades and explosives

* machine pistol magazine is now Security contraband

* Practice ammunition description updates

* Missed a magnum ammo description tweak

* Whoops, misspelled the word 'description' a lot

* Practice ammunition description updates 2!

* Better name/description for joke L6 foam dart mag

* Tweak to that last commit

* Fixed practice machine pistol magazines using real bullets

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml
index d571fa85a53475f082098acd109e084085db4ecf..825f37551032c2d4db6f8794c90eebb8b46e2724 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml
@@ -29,6 +29,7 @@
   parent: BaseMagazineBoxAntiMateriel
   id: MagazineBoxAntiMateriel
   name: ammunition box (.60 anti-materiel)
+  description: A cardboard box of .60 anti-materiel rounds.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeAntiMateriel

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml
index bc9cdd68cf1036550fe786f19f1a05abf2bb57b5..47e961bae0c78b508d5f397fb754388fce78a33c 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml
@@ -44,7 +44,7 @@
   parent: BaseMagazineBoxCaselessRifle
   id: MagazineBoxCaselessRiflePractice
   name: ammunition box (.25 caseless practice)
-  description: A cardboard box of .25 caseless rounds. Intended to hold non-harmful chalk ammunition.
+  description: A cardboard box of .25 caseless rounds. Intended to hold harmless practice ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeCaselessRiflePractice

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
index 8c4634561f3dd0bd9e3fb50fd6105a8f6b0a3636..bead9dff0bceeea8b27d6f5f60d50caa4887abdf 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
@@ -60,7 +60,7 @@
   parent: BaseMagazineBoxLightRifle
   id: MagazineBoxLightRiflePractice
   name: ammunition box (.30 rifle practice)
-  description: A cardboard box of .30 rifle rounds. Intended to hold non-harmful chalk ammunition.
+  description: A cardboard box of .30 rifle rounds. Intended to hold harmless practice ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeLightRiflePractice
@@ -73,8 +73,8 @@
     - state: practice
 
 - type: entity
-  id: MagazineBoxLightRifleIncendiary
   parent: BaseMagazineBoxLightRifle
+  id: MagazineBoxLightRifleIncendiary
   name: ammunition box (.30 rifle incendiary)
   description: A cardboard box of .30 rifle rounds. Intended to hold self-igniting incendiary ammunition.
   components:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml
index bee7b337496a40b51ec19d3cd4620d4551fc6f64..af61bb9379e7f85ce788547cc772a87bc24d5995 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml
@@ -43,7 +43,7 @@
   parent: BaseMagazineBoxMagnum
   id: MagazineBoxMagnumPractice
   name: ammunition box (.45 magnum practice)
-  description: A cardboard box of .45 magnum rounds. Intended to hold non-harmful chalk ammunition.
+  description: A cardboard box of .45 magnum rounds. Intended to hold harmless practice ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeMagnumPractice
@@ -91,7 +91,7 @@
   id: MagazineBoxMagnumAP
   parent: BaseMagazineBoxMagnum
   name: ammunition box (.45 magnum armor-piercing)
-  description: A cardboard box of .45 magnum rounds. Intended to hold rare armor-piercing ammunition.
+  description: A cardboard box of .45 magnum rounds. Intended to hold specialized armor-piercing ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeMagnumAP

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml
index 9dad0d5785240c0452a24eaa37c4d0b955bd7d47..f359589177fb2f74086590faa5ad58a4fc7da92c 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml
@@ -44,7 +44,7 @@
   parent: BaseMagazineBoxPistol
   id: MagazineBoxPistolPractice
   name: ammunition box (.35 auto practice)
-  description: A cardboard box of .35 auto rounds. Intended to hold non-harmful chalk ammunition.
+  description: A cardboard box of .35 auto rounds. Intended to hold harmless practice ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgePistolPractice
@@ -73,8 +73,8 @@
     - state: incendiary
 
 - type: entity
-  id: MagazineBoxPistolUranium
   parent: BaseMagazineBoxPistol
+  id: MagazineBoxPistolUranium
   name: ammunition box (.35 auto uranium)
   description: A cardboard box of .35 auto rounds. Intended to hold exotic uranium-core ammunition.
   components:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
index 794192c7e34344f21396faf185debdcefa7be4ec..e079da29319462d16fbac5dd5e26f64c1c3e35f4 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
@@ -64,7 +64,7 @@
   parent: BaseMagazineBoxRifle
   id: MagazineBoxRiflePractice
   name: ammunition box (.20 rifle practice)
-  description: A cardboard box of .20 rifle rounds. Intended to hold non-harmful chalk ammunition.
+  description: A cardboard box of .20 rifle rounds. Intended to hold harmless practice ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeRiflePractice

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
index 049271f998092f936a677b7ef4cfaec6a5816aff..6584058c2548c4724a4e32535d2877962501cbb2 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
@@ -1,7 +1,7 @@
 - type: entity
+  abstract: true
   parent: BaseItem
   id: BaseAmmoProvider
-  abstract: true
   components:
   - type: ContainerContainer
     containers:
@@ -12,9 +12,9 @@
     sprite: Objects/Storage/boxes.rsi
 
 - type: entity
+  abstract: true
   parent: BaseAmmoProvider
   id: AmmoProviderShotgunShell
-  abstract: true
   components:
     - type: Sprite
       sprite: Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi
@@ -35,6 +35,7 @@
   parent: AmmoProviderShotgunShell
   id: BoxBeanbag
   name: ammunition box (.50 beanbag)
+  description: A cardboard box of .50 shotgun shells. Intended to hold less-than-lethal beanbag ammunition.
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunBeanbag
@@ -51,9 +52,10 @@
       - state: beanbag
 
 - type: entity
-  name: ammunition box (.50 pellet)
   parent: AmmoProviderShotgunShell
   id: BoxLethalshot
+  name: ammunition box (.50 pellet)
+  description: A cardboard box of .50 shotgun shells. Intended to hold general-purpose kinetic ammunition.
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgun
@@ -66,9 +68,10 @@
       - state: lethal
 
 - type: entity
-  name: ammunition box (.50 slug)
   parent: AmmoProviderShotgunShell
   id: BoxShotgunSlug
+  name: ammunition box (.50 slug)
+  description: A cardboard box of .50 shotgun shells. Intended to hold long-ranged slug ammunition.
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunSlug
@@ -85,9 +88,10 @@
       - state: slug
 
 - type: entity
-  name: ammunition box (.50 flare)
   parent: AmmoProviderShotgunShell
   id: BoxShotgunFlare
+  name: ammunition box (.50 flare)
+  description: A cardboard box of .50 shotgun shells. Intended to hold illuminating flare ammunition.
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunFlare
@@ -104,9 +108,10 @@
       - state: flare
 
 - type: entity
-  name: ammunition box (.50 incendiary)
   parent: AmmoProviderShotgunShell
   id: BoxShotgunIncendiary
+  name: ammunition box (.50 incendiary)
+  description: A cardboard box of .50 shotgun shells. Intended to hold self-igniting incendiary ammunition.
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunIncendiary
@@ -123,9 +128,10 @@
       - state: incendiary
 
 - type: entity
-  name: ammunition box (.50 uranium)
   parent: AmmoProviderShotgunShell
   id: BoxShotgunUranium
+  name: ammunition box (.50 uranium)
+  description: A cardboard box of .50 shotgun shells. Intended to hold exotic uranium-core ammunition.
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunUranium
@@ -142,9 +148,10 @@
       - state: uranium
 
 - type: entity
-  name: ammunition box (.50 practice)
   parent: AmmoProviderShotgunShell
   id: BoxShotgunPractice
+  name: ammunition box (.50 practice)
+  description: A cardboard box of .50 shotgun shells. Intended to hold harmless practice ammunition.
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunPractice
@@ -161,9 +168,10 @@
       - state: practice
 
 - type: entity
-  name: ammunition box (.50 tranquilizer)
   parent: AmmoProviderShotgunShell
   id: BoxShellTranquilizer
+  name: ammunition box (.50 tranquilizer)
+  description: A cardboard box of .50 shotgun shells. Intended to hold nonlethal tranquilizer ammunition.
   components:
     - type: BallisticAmmoProvider
       proto: ShellTranquilizer

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml
index e91746109533fe1a0e49a317fd0c871a4cff5667..ff0ad0956fb492c57df3a97fdb4d1bf396ee6e6a 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml
@@ -2,7 +2,7 @@
   abstract: true
   parent: BaseItem
   id: BoxDonkSoftBase
-  name: foamdart box
+  name: toy ammunition box
   components:
   - type: BallisticAmmoProvider
     mayTransfer: true
@@ -17,7 +17,8 @@
 - type: entity
   parent: BoxDonkSoftBase
   id: BoxDonkSoftBox
-  name: box of foam darts
+  name: foam dart box
+  description: A cardboard box of foam darts.
   components:
   - type: BallisticAmmoProvider
     whitelist:
@@ -35,6 +36,7 @@
   parent: BaseMagazineBoxMagnum
   id: BoxCartridgeCap
   name: cap gun cartridge box
+  description: A cardboard box of cap gun cartridges.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeCap

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimateriel.yml
index 1fd04ae36f45afed9fea2ef1d4c8ffb5d0b12f84..77fe197201b12edb5cee81bd0ff69d53485d806e 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimateriel.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimateriel.yml
@@ -2,6 +2,7 @@
   parent: [ BaseCartridge, BaseMajorContraband ]
   id: CartridgeAntiMateriel
   name: cartridge (.60 anti-materiel)
+  description: A high-power cartridge used by high-precision rifles.
   components:
   - type: Tag
     tags:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml
index 98f8c6402d71260435ed45f5ed6f135b8eb223c7..e6b42e749e4656c6a9c8033b339e17a5536a6bac 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml
@@ -1,7 +1,7 @@
 - type: entity
-  id: BaseCartridge
-  parent: BaseItem
   abstract: true
+  parent: BaseItem
+  id: BaseCartridge
   components:
   - type: Sprite
     drawdepth: Items

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml
index 8d4e9b8ffc2e01b94a8d202693dac1e8508646c5..6fe89e2684ddabece3457075a9f6912a5f40ccc2 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: [ BaseCartridge, BaseSecurityContraband ]
   id: BaseCartridgeCaselessRifle
   name: cartridge (.25 caseless)
-  parent: [ BaseCartridge, BaseSecurityContraband ]
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -21,19 +21,19 @@
     price: 10
 
 - type: entity
+  parent: BaseCartridgeCaselessRifle
   id: CartridgeCaselessRifle
   name: cartridge (.25 caseless)
-  parent: BaseCartridgeCaselessRifle
   description: A small caliber utilizing caseless technology, omitting conventional brass casing in favor of hardened propellant. Standard kinetic ammunition is common and useful in most situations.
   components:
   - type: CartridgeAmmo
     proto: BulletCaselessRifle
 
 - type: entity
+  parent: BaseCartridgeCaselessRifle
   id: CartridgeCaselessRiflePractice
   name: cartridge (.25 caseless practice)
-  parent: BaseCartridgeCaselessRifle
-  description: A small caliber utilizing caseless technology, omitting conventional brass casing in favor of hardened propellant. Chalk ammunition is generally non-harmful, used for practice.
+  description: A small caliber utilizing caseless technology, omitting conventional brass casing in favor of hardened propellant. Practice ammunition fires a chalk projectile that stings a little, but otherwise causes no lasting damage.
   components:
   - type: CartridgeAmmo
     proto: BulletCaselessRiflePractice

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml
index 4e2db33abc10e5561da3000ffcc1c0adc24bec3e..1a9822d4f4e817bae2d970989355225c930b65e5 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: [ BaseCartridge, BaseSecurityContraband ]
   id: BaseCartridgeHeavyRifle
   name: cartridge (.10 rifle)
-  parent: [ BaseCartridge, BaseSecurityContraband ]
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -20,9 +20,9 @@
     price: 10
 
 - type: entity
+  parent: BaseCartridgeHeavyRifle
   id: CartridgeMinigun
   name: cartridge (.10 rifle)
-  parent: BaseCartridgeHeavyRifle
   components:
   - type: CartridgeAmmo
     proto: BulletMinigun

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml
index b4af7239457bf335463937f83a9d8dd0f2783f05..f3f578f56f9d1249943adcfd9cb49b370412cea8 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: [ BaseCartridge, BaseSecurityContraband ]
   id: BaseCartridgeLightRifle
   name: cartridge (.30 rifle)
-  parent: [ BaseCartridge, BaseSecurityContraband ]
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -18,19 +18,19 @@
   - type: SpentAmmoVisuals
 
 - type: entity
+  parent: BaseCartridgeLightRifle
   id: CartridgeLightRifle
   name: cartridge (.30 rifle)
-  parent: BaseCartridgeLightRifle
   description: A classic intermediate cartridge used by many combat rifles and LMGs. Standard kinetic ammunition is common and useful in most situations.
   components:
   - type: CartridgeAmmo
     proto: BulletLightRifle
 
 - type: entity
+  parent: BaseCartridgeLightRifle
   id: CartridgeLightRiflePractice
   name: cartridge (.30 rifle practice)
-  parent: BaseCartridgeLightRifle
-  description: A classic intermediate cartridge used by many combat rifles and LMGs. Chalk ammunition is generally non-harmful, used for practice.
+  description: A classic intermediate cartridge used by many combat rifles and LMGs. Practice ammunition fires a chalk projectile that stings a little, but otherwise causes no lasting damage.
   components:
   - type: CartridgeAmmo
     proto: BulletLightRiflePractice
@@ -43,10 +43,10 @@
         color: "#dbdbdb"
 
 - type: entity
+  parent: BaseCartridgeLightRifle
   id: CartridgeLightRifleIncendiary
   name: cartridge (.30 rifle incendiary)
-  parent: BaseCartridgeLightRifle
-  description: A classic intermediate cartridge used by many combat rifles and LMGs. Incendiary ammunition contains a self-igniting compound that sets the target ablaze.
+  description: A classic intermediate cartridge used by many combat rifles and LMGs. Incendiary ammunition contains a self-igniting compound that sets targets ablaze.
   components:
   - type: CartridgeAmmo
     proto: BulletLightRifleIncendiary
@@ -59,10 +59,10 @@
         color: "#ff6e52"
 
 - type: entity
+  parent: BaseCartridgeLightRifle
   id: CartridgeLightRifleUranium
   name: cartridge (.30 rifle uranium)
-  parent: BaseCartridgeLightRifle
-  description: A classic intermediate cartridge used by many combat rifles and LMGs. Uranium ammunition replaces the lead core of the bullet with fissile material, irradiating the target from the inside.
+  description: A classic intermediate cartridge used by many combat rifles and LMGs. Uranium ammunition replaces the lead core of the bullet with fissile material, irradiating targets from the inside.
   components:
   - type: CartridgeAmmo
     proto: BulletLightRifleUranium

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
index 58862b99846205fadd83eb836d0f5f41909288ea..7c28aa52bca95a7a0eafbe0618a646b3a60fce0b 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: [ BaseCartridge, BaseSecurityContraband ]
   id: BaseCartridgeMagnum
   name: cartridge (.45 magnum)
-  parent: [ BaseCartridge, BaseSecurityContraband ]
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -18,19 +18,19 @@
   - type: SpentAmmoVisuals
 
 - type: entity
+  parent: BaseCartridgeMagnum
   id: CartridgeMagnum
   name: cartridge (.45 magnum)
-  parent: BaseCartridgeMagnum
   description: Heavy magnum cartridge mostly used by revolvers. Standard kinetic ammunition is common and useful in most situations.
   components:
   - type: CartridgeAmmo
     proto: BulletMagnum
 
 - type: entity
+  parent: BaseCartridgeMagnum
   id: CartridgeMagnumPractice
   name: cartridge (.45 magnum practice)
-  parent: BaseCartridgeMagnum
-  description: Heavy magnum cartridge mostly used by revolvers. Chalk ammunition is generally non-harmful, used for practice.
+  description: Heavy magnum cartridge mostly used by revolvers. Practice ammunition fires a chalk projectile that stings a little, but otherwise causes no lasting damage.
   components:
   - type: CartridgeAmmo
     proto: BulletMagnumPractice
@@ -43,10 +43,10 @@
         color: "#dbdbdb"
 
 - type: entity
+  parent: BaseCartridgeMagnum
   id: CartridgeMagnumIncendiary
   name: cartridge (.45 magnum incendiary)
-  parent: BaseCartridgeMagnum
-  description: Heavy magnum cartridge mostly used by revolvers. Incendiary ammunition contains a self-igniting compound that sets the target ablaze.
+  description: Heavy magnum cartridge mostly used by revolvers. Incendiary ammunition contains a self-igniting compound that sets targets ablaze.
   components:
   - type: CartridgeAmmo
     proto: BulletMagnumIncendiary
@@ -59,10 +59,10 @@
         color: "#ff6e52"
 
 - type: entity
+  parent: BaseCartridgeMagnum
   id: CartridgeMagnumAP
   name: cartridge (.45 magnum armor-piercing)
-  parent: BaseCartridgeMagnum
-  description: Heavy magnum cartridge mostly used by revolvers. Armor piercing ammunition is renowned for its ability to cut straight through body armor.
+  description: Heavy magnum cartridge mostly used by revolvers. Armor-piercing ammunition is renowned for its ability to cut straight through body armor.
   components:
   - type: CartridgeAmmo
     proto: BulletMagnumAP
@@ -75,10 +75,10 @@
         color: "#0a0a0a"
 
 - type: entity
+  parent: BaseCartridgeMagnum
   id: CartridgeMagnumUranium
   name: cartridge (.45 magnum uranium)
-  parent: BaseCartridgeMagnum
-  description: Heavy magnum cartridge mostly used by revolvers. Uranium ammunition replaces the lead core of the bullet with fissile material, irradiating the target from the inside.
+  description: Heavy magnum cartridge mostly used by revolvers. Uranium ammunition replaces the lead core of the bullet with fissile material, irradiating targets from the inside.
   components:
   - type: CartridgeAmmo
     proto: BulletMagnumUranium

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
index 3862918e38a522d0870b80a310c57c113e34deab..64bda7299b7720ac18d46e5e6a1b07afad04c1e6 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: [ BaseCartridge, BaseSecurityContraband ]
   id: BaseCartridgePistol
   name: cartridge (.35 auto)
-  parent: [ BaseCartridge, BaseSecurityContraband ]
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -18,19 +18,19 @@
   - type: SpentAmmoVisuals
 
 - type: entity
+  parent: BaseCartridgePistol
   id: CartridgePistol
   name: cartridge (.35 auto)
   description: Arguably the most popular caliber on the market, used by all manner of pistols and submachine guns. Standard kinetic ammunition is common and useful in most situations.
-  parent: BaseCartridgePistol
   components:
   - type: CartridgeAmmo
     proto: BulletPistol
 
 - type: entity
+  parent: BaseCartridgePistol
   id: CartridgePistolPractice
   name: cartridge (.35 auto practice)
-  description: Arguably the most popular caliber on the market, used by all manner of pistols and submachine guns. Chalk ammunition is generally non-harmful, used for practice.
-  parent: BaseCartridgePistol
+  description: Arguably the most popular caliber on the market, used by all manner of pistols and submachine guns. Practice ammunition fires a chalk projectile that stings a little, but otherwise causes no lasting damage.
   components:
   - type: CartridgeAmmo
     proto: BulletPistolPractice
@@ -43,10 +43,10 @@
          color: "#dbdbdb"
 
 - type: entity
+  parent: BaseCartridgePistol
   id: CartridgePistolIncendiary
   name: cartridge (.35 auto incendiary)
-  description: Arguably the most popular caliber on the market, used by all manner of pistols and submachine guns. Incendiary ammunition contains a self-igniting compound that sets the target ablaze.
-  parent: BaseCartridgePistol
+  description: Arguably the most popular caliber on the market, used by all manner of pistols and submachine guns. Incendiary ammunition contains a self-igniting compound that sets targets ablaze.
   components:
   - type: CartridgeAmmo
     proto: BulletPistolIncendiary
@@ -61,7 +61,7 @@
 - type: entity
   id: CartridgePistolUranium
   name: cartridge (.35 auto uranium)
-  description: Arguably the most popular caliber on the market, used by all manner of pistols and submachine guns. Uranium core ammunition features a load of fissile material, irradiating the target from the inside.
+  description: Arguably the most popular caliber on the market, used by all manner of pistols and submachine guns. Uranium ammunition replaces the lead core of the bullet with fissile material, irradiating targets from the inside.
   parent: BaseCartridgePistol
   components:
   - type: CartridgeAmmo
@@ -75,10 +75,10 @@
         color: "#65fe08"
 
 - type: entity
+  parent: BaseCartridgePistol
   id: CartridgePistolSpent
   name: cartridge (.35 auto)
   suffix: spent
-  parent: BaseCartridgePistol
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
index d4304ef803c1719a72034a3013fc749279419109..d39f907fb07285b774792dd6f08f966f322ecfe0 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: [ BaseCartridge, BaseSecurityContraband ]
   id: BaseCartridgeRifle
   name: cartridge (.20 rifle)
-  parent: [ BaseCartridge, BaseSecurityContraband ]
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -18,19 +18,19 @@
   - type: SpentAmmoVisuals
 
 - type: entity
+  parent: BaseCartridgeRifle
   id: CartridgeRifle
   name: cartridge (.20 rifle)
-  parent: BaseCartridgeRifle
   description: A modern intermediate cartridge for combat rifles. Standard kinetic ammunition is common and useful in most situations.
   components:
   - type: CartridgeAmmo
     proto: BulletRifle
 
 - type: entity
+  parent: BaseCartridgeRifle
   id: CartridgeRiflePractice
   name: cartridge (.20 rifle practice)
-  parent: BaseCartridgeRifle
-  description: A modern intermediate cartridge for combat rifles. Chalk ammunition is generally non-harmful, used for practice.
+  description: A modern intermediate cartridge for combat rifles. Practice ammunition fires a chalk projectile that stings a little, but otherwise causes no lasting damage.
   components:
   - type: CartridgeAmmo
     proto: BulletRiflePractice
@@ -43,10 +43,10 @@
         color: "#dbdbdb"
 
 - type: entity
+  parent: BaseCartridgeRifle
   id: CartridgeRifleIncendiary
   name: cartridge (.20 rifle incendiary)
-  parent: BaseCartridgeRifle
-  description: A modern intermediate cartridge for combat rifles. Incendiary ammunition contains a self-igniting compound that sets the target ablaze.
+  description: A modern intermediate cartridge for combat rifles. Incendiary ammunition contains a self-igniting compound that sets targets ablaze.
   components:
   - type: CartridgeAmmo
     proto: BulletRifleIncendiary
@@ -59,10 +59,10 @@
         color: "#ff6e52"
 
 - type: entity
+  parent: BaseCartridgeRifle
   id: CartridgeRifleUranium
   name: cartridge (.20 rifle uranium)
-  parent: BaseCartridgeRifle
-  description: A modern intermediate cartridge for combat rifles. Uranium ammunition replaces the lead core of the bullet with fissile material, irradiating the target from the inside.
+  description: A modern intermediate cartridge for combat rifles. Uranium ammunition replaces the lead core of the bullet with fissile material, irradiating targets from the inside.
   components:
   - type: CartridgeAmmo
     proto: BulletRifleUranium

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 3dfab5e84a7257baae6a36fd81d5339dac06696f..fe1e7641c4ceecb6531c3fb1c6818e97476f63ef 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: BaseCartridge
   id: BaseShellShotgun
   name: shell (.50)
-  parent: BaseCartridge
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -19,9 +19,10 @@
   - type: SpentAmmoVisuals
 
 - type: entity
+  parent: [ BaseShellShotgun, BaseSecurityBartenderContraband ]
   id: ShellShotgunBeanbag
   name: shell (.50 beanbag)
-  parent: [ BaseShellShotgun, BaseSecurityBartenderContraband ]
+  description: The standard cartridge used by most modern shotguns. Beanbag ammunition contains a single less-than-lethal projectile that can stun targets.
   components:
   - type: Tag
     tags:
@@ -37,9 +38,10 @@
     state: "beanbag"
 
 - type: entity
+  parent: [ BaseShellShotgun, BaseSecurityContraband]
   id: ShellShotgunSlug
   name: shell (.50 slug)
-  parent: [ BaseShellShotgun, BaseSecurityContraband]
+  description: The standard cartridge used by most modern shotguns. Slug ammunition contains a single high-density projectile effective at longer ranges than pellet ammunition.
   components:
   - type: Sprite
     layers:
@@ -51,9 +53,10 @@
     state: "slug"
 
 - type: entity
+  parent: BaseShellShotgun
   id: ShellShotgunFlare
   name: shell (.50 flare)
-  parent: BaseShellShotgun
+  description: The standard cartridge used by most modern shotguns. Flare ammunition contains a single brightly-burning projectile intended for illumination and signalling, rather than combat.
   components:
   - type: Tag
     tags:
@@ -69,9 +72,10 @@
     state: "flare"
 
 - type: entity
+  parent: [ BaseShellShotgun, BaseSecurityContraband ]
   id: ShellShotgun
   name: shell (.50 pellet)
-  parent: [ BaseShellShotgun, BaseSecurityContraband ]
+  description: The standard cartridge used by most modern shotguns. Standard kinetic ammunition is common and useful in most situations.
   components:
   - type: Sprite
     layers:
@@ -81,9 +85,10 @@
     proto: PelletShotgunSpread
 
 - type: entity
+  parent: [ BaseShellShotgun, BaseSecurityContraband ]
   id: ShellShotgunIncendiary
   name: shell (.50 incendiary)
-  parent: [ BaseShellShotgun, BaseSecurityContraband ]
+  description: The standard cartridge used by most modern shotguns. Incendiary ammunition contains a self-igniting compound that sets targets ablaze.
   components:
   - type: Sprite
     layers:
@@ -95,9 +100,10 @@
     state: "incendiary"
 
 - type: entity
+  parent: [ BaseShellShotgun, BaseSecurityContraband ]
   id: ShellShotgunPractice
   name: shell (.50 practice)
-  parent: [ BaseShellShotgun, BaseSecurityContraband ]
+  description: The standard cartridge used by most modern shotguns. Practice ammunition fires chalk pellets that sting a little, but otherwise cause no lasting damage.
   components:
   - type: Sprite
     layers:
@@ -109,9 +115,10 @@
     state: "practice"
 
 - type: entity
+  parent: [ BaseShellShotgun, BaseSecurityContraband ]
   id: ShellTranquilizer
   name: shell (.50 tranquilizer)
-  parent: [ BaseShellShotgun, BaseSecurityContraband ]
+  description: The standard cartridge used by most modern shotguns. Tranquilizer ammunition contains a single ballistic syringe loaded with a strong sedative that harmlessly puts targets to sleep.
   components:
   - type: Tag
     tags:
@@ -136,10 +143,10 @@
     state: "tranquilizer"
 
 - type: entity
+  parent: [ BaseShellShotgun, BaseSecurityContraband ]
   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, BaseSecurityContraband ]
+  description: A homemade shotgun shell loaded with chunks of glass shrapnel. Surprisingly effective, but the spread is so wide that you couldn't hit the broad side of a barn.
   components:
   - type: Tag
     tags:
@@ -158,9 +165,10 @@
     state: "improvised"
 
 - type: entity
+  parent: [ BaseShellShotgun, BaseSecurityContraband ]
   id: ShellShotgunUranium
   name: uranium shotgun shell
-  parent: [ BaseShellShotgun, BaseSecurityContraband ]
+  description: The standard cartridge used by most modern shotguns. Uranium ammunition replaces the lead core of the pellets with fissile material, irradiating targets from the inside.
   components:
     - type: Sprite
       layers:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/toy.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/toy.yml
index 510a8fef3e65ef6a57c9c369f24991c15a378980..3210f2cb4c53a4e87fb8a22aafbdb69d8047da22 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/toy.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/toy.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: BaseCartridge
   id: BaseCartridgeCap
   name: cartridge (cap)
-  parent: BaseCartridge
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -19,9 +19,10 @@
     price: 5
 
 - type: entity
+  parent: BaseCartridgeCap
   id: CartridgeCap
   name: cap gun cartridge
-  parent: BaseCartridgeCap
+  description: A mock pistol cartridge that makes noise and smoke, but has no actual projectile.
   components:
   - type: CartridgeAmmo
     proto: BulletCap

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
index 4c3207b9c523259804045a847537b2d868bcc721..ff26c3c15a3ad60ac9577bde1b4b7c6d0729f9f3 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: [ BaseItem, BaseSecurityContraband ]
   id: BaseMagazineCaselessRifle
   name: "magazine (.25 caseless)"
-  parent: [ BaseItem, BaseSecurityContraband ]
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -33,10 +33,10 @@
   - type: Appearance
 
 - type: entity
+  abstract: true
+  parent: BaseMagazineCaselessRifle
   id: BaseMagazinePistolCaselessRifle
   name: "pistol magazine (.25 caseless)"
-  parent: BaseMagazineCaselessRifle
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -63,9 +63,9 @@
   - type: Appearance
 
 - type: entity
+  parent: BaseMagazinePistolCaselessRifle
   id: MagazinePistolCaselessRifle
   name: "pistol magazine (.25 caseless)"
-  parent: BaseMagazinePistolCaselessRifle
   description: 10-round magazine for the Cobra pistol. Intended to hold general-purpose kinetic ammunition.
   components:
   - type: BallisticAmmoProvider
@@ -91,10 +91,10 @@
       - state: inhand-right-stripe
 
 - type: entity
+  parent: BaseMagazinePistolCaselessRifle
   id: MagazinePistolCaselessRiflePractice
   name: "pistol magazine (.25 caseless practice)"
-  parent: BaseMagazinePistolCaselessRifle
-  description: 10-round magazine for the Cobra pistol. Intended to hold non-harmful chalk ammunition.
+  description: 10-round magazine for the Cobra pistol. Intended to hold harmless practice ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeCaselessRiflePractice
@@ -124,9 +124,9 @@
         color: "#dbdbdb"
 
 - type: entity
+  parent: BaseMagazineCaselessRifle
   id: MagazineCaselessRifle
   name: "magazine (.25 caseless)"
-  parent: BaseMagazineCaselessRifle
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeCaselessRifle
@@ -144,9 +144,9 @@
       - state: inhand-right-mag
 
 - type: entity
+  parent: BaseMagazineCaselessRifle
   id: MagazineCaselessRiflePractice
   name: "magazine (.25 caseless practice)"
-  parent: BaseMagazineCaselessRifle
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeCaselessRiflePractice

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/grenade.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/grenade.yml
index c6f98a870ac1885ba217468e7d8cb8bdc1925f15..9df114bc6bb3e05ab913473600cf74a2a6c7e953 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/grenade.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/grenade.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: [ BaseItem, BaseSecurityContraband ]
   id: BaseMagazineGrenade
   name: grenade cartridge
-  parent: [ BaseItem, BaseSecurityContraband ]
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -40,48 +40,48 @@
   - type: Appearance
 
 - type: entity
+  parent: BaseMagazineGrenade
   id: MagazineGrenadeEmpty
   name: grenade cartridge
-  parent: BaseMagazineGrenade
   components:
   - type: BallisticAmmoProvider
 
 - type: entity
+  parent: BaseMagazineGrenade
   id: MagazineGrenadeFrag
   name: frag grenade cartridge
-  parent: BaseMagazineGrenade
   components:
   - type: BallisticAmmoProvider
     proto: GrenadeFrag
 
 - type: entity
+  parent: BaseMagazineGrenade
   id: MagazineGrenadeEMP
   name: EMP grenade cartridge
-  parent: BaseMagazineGrenade
   components:
   - type: BallisticAmmoProvider
     proto: GrenadeEMP
 
 - type: entity
+  parent: BaseMagazineGrenade
   id: MagazineGrenadeFlash
   name: flash grenade cartridge
-  parent: BaseMagazineGrenade
   components:
   - type: BallisticAmmoProvider
     proto: GrenadeFlash
 
 - type: entity
+  parent: BaseMagazineGrenade
   id: MagazineGrenadeBlast
   name: blast grenade cartridge
-  parent: BaseMagazineGrenade
   components:
   - type: BallisticAmmoProvider
     proto: GrenadeBlast
 
 - type: entity
+  parent: BaseMagazineGrenade
   id: MagazineGrenadeBaton
   name: baton grenade cartridge
-  parent: BaseMagazineGrenade
   components:
   - type: BallisticAmmoProvider
     proto: GrenadeBaton

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml
index 5aa704231dd26edbac586ff2af0f03ea8775ab1c..c3c8e015047216a8b7f89cd39dbec22667c37a3a 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: [ BaseItem, BaseSecurityContraband ]
   id: BaseMagazineHeavyRifle
   name: "magazine (.20 rifle)"
-  parent: [ BaseItem, BaseSecurityContraband ]
-  abstract: true
   components:
   - type: Tag
     tags:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
index c94e819615ca40ff404199fcadbe82159bf1879a..805bde0484cc9d838d30dab89d03cb02d7d0ccc3 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
@@ -1,9 +1,9 @@
 # Empty mags
 - type: entity
+  abstract: true
+  parent: [ BaseItem, BaseSecurityContraband ]
   id: BaseMagazineLightRifle
   name: "magazine (.30 rifle)"
-  parent: [ BaseItem, BaseSecurityContraband ]
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -35,9 +35,9 @@
 
 # Magazines
 - type: entity
+  parent: BaseMagazineLightRifle
   id: MagazineLightRifleBox
   name: "L6 SAW magazine box (.30 rifle)"
-  parent: BaseMagazineLightRifle
   description: Box containing a 100-round belt of linked .30 rifle rounds, used by light machine guns such as the L6. Intended to hold general-purpose kinetic ammunition.
   components:
   - type: Tag
@@ -56,9 +56,9 @@
   - type: Appearance
 
 - type: entity
+  parent: BaseMagazineLightRifle
   id: MagazineLightRifle
   name: "magazine (.30 rifle)"
-  parent: BaseMagazineLightRifle
   description: Curved 30-round double stack magazine for combat rifles. Intended to hold general-purpose kinetic ammunition.
   components:
   - type: BallisticAmmoProvider
@@ -77,10 +77,10 @@
       - state: inhand-right-mag
 
 - type: entity
+  parent: MagazineLightRifle
   id: MagazineLightRifleEmpty
   name: "magazine (.30 rifle any)"
   suffix: empty
-  parent: MagazineLightRifle
   description: Curved 30-round double stack magazine for combat rifles.
   components:
   - type: BallisticAmmoProvider
@@ -99,10 +99,10 @@
       - state: inhand-right-mag
 
 - type: entity
+  parent: BaseMagazineLightRifle
   id: MagazineLightRiflePractice
   name: "magazine (.30 rifle practice)"
-  parent: BaseMagazineLightRifle
-  description: Curved 30-round double stack magazine for combat rifles. Intended to hold non-harmful chalk ammunition.
+  description: Curved 30-round double stack magazine for combat rifles. Intended to hold harmless practice ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeLightRiflePractice
@@ -126,9 +126,9 @@
         color: "#dbdbdb"
 
 - type: entity
+  parent: BaseMagazineLightRifle
   id: MagazineLightRifleUranium
   name: "magazine (.30 rifle uranium)"
-  parent: BaseMagazineLightRifle
   description: Curved 30-round double stack magazine for combat rifles. Intended to hold exotic uranium-core ammunition.
   components:
   - type: BallisticAmmoProvider
@@ -153,9 +153,9 @@
         color: "#00cd42"
 
 - type: entity
+  parent: MagazineLightRifle
   id: MagazineLightRifleIncendiary
   name: "magazine (.30 rifle incendiary)"
-  parent: MagazineLightRifle
   description: Curved 30-round double stack magazine for combat rifles. Intended to hold self-igniting incendiary ammunition.
   components:
   - type: BallisticAmmoProvider

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
index b3b26be0d1e7218c45ea6ed3eb796f6639045e29..bf77714e99654f595f41759a52af69373c0ed9d3 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: [ BaseMagazinePistol, BaseSecurityContraband ]
   id: BaseMagazineMagnum
   name: pistol magazine (.45 magnum)
-  parent: [ BaseMagazinePistol, BaseSecurityContraband ]
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -15,11 +15,11 @@
     capacity: 7
 
 - type: entity
+  parent: BaseMagazineMagnum
   id: MagazineMagnumEmpty
   name: pistol magazine (.45 magnum any)
   suffix: empty
-  parent: BaseMagazineMagnum
-  description: 7-round single stack pistol magazine.
+  description: 7-round single stack magazine for large-caliber pistols.
   components:
   - type: BallisticAmmoProvider
     proto: null
@@ -37,10 +37,10 @@
       - state: inhand-right-mag
 
 - type: entity
+  parent: BaseMagazineMagnum
   id: MagazineMagnum
   name: pistol magazine (.45 magnum)
-  parent: BaseMagazineMagnum
-  description: 7-round single stack pistol magazine. Intended to hold general-purpose kinetic ammunition.
+  description: 7-round single stack magazine for large-caliber pistols. Intended to hold general-purpose kinetic ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeMagnum
@@ -58,10 +58,10 @@
       - state: inhand-right-mag
 
 - type: entity
+  parent: BaseMagazineMagnum
   id: MagazineMagnumPractice
   name: pistol magazine (.45 magnum practice)
-  parent: BaseMagazineMagnum
-  description: 7-round single stack pistol magazine. Intended to hold non-harmful chalk ammunition.
+  description: 7-round single stack magazine for large-caliber pistols. Intended to hold harmless practice ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeMagnumPractice
@@ -85,10 +85,10 @@
         color: "#dbdbdb"
 
 - type: entity
+  parent: BaseMagazineMagnum
   id: MagazineMagnumUranium
   name: pistol magazine (.45 magnum uranium)
-  parent: BaseMagazineMagnum
-  description: 7-round single stack pistol magazine. Intended to hold exotic uranium-core ammunition.
+  description: 7-round single stack magazine for large-caliber pistols. Intended to hold exotic uranium-core ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeMagnumUranium
@@ -112,10 +112,10 @@
         color: "#00cd42"
 
 - type: entity
+  parent: BaseMagazineMagnum
   id: MagazineMagnumAP
   name: pistol magazine (.45 magnum armor-piercing)
-  parent: BaseMagazineMagnum
-  description: 7-round single stack pistol magazine. Intended to hold rare armor-piercing ammunition.
+  description: 7-round single stack magazine for large-caliber pistols. Intended to hold specialized armor-piercing ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeMagnumAP

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
index f2dffa776b149191319ea95d6f06d95081281b94..b57453793e73e3eb8c274fec1b448a4ad7ce1b6a 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: [ BaseItem, BaseSecurityContraband ]
   id: BaseMagazinePistol
   name: pistol magazine (.35 auto)
-  parent: [ BaseItem, BaseSecurityContraband ]
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -32,10 +32,10 @@
   - type: Appearance
 
 - type: entity
+  abstract: true
+  parent: [ BaseItem, BaseSecurityContraband ]
   id: BaseMagazinePistolHighCapacity
   name: machine pistol magazine (.35 auto)
-  parent: BaseItem
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -65,10 +65,10 @@
   - type: Appearance
 
 - type: entity
+  abstract: true
+  parent: [ BaseItem, BaseSecurityContraband ]
   id: BaseMagazinePistolSubMachineGun  # Yeah it's weird but it's pistol caliber
   name: SMG magazine (.35 auto)
-  parent: [ BaseItem, BaseSecurityContraband ]
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -98,9 +98,9 @@
   - type: Appearance
 
 - type: entity
+  parent: [ BaseItem, BaseSecurityContraband ]
   id: MagazinePistolSubMachineGunTopMounted
   name: WT550 magazine (.35 auto top-mounted)
-  parent: [ BaseItem, BaseSecurityContraband ]
   description: Unconventional 30-round top feeding magazine for the WT550 SMG. Intended to hold general-purpose kinetic ammunition.
   components:
   - type: Item
@@ -132,18 +132,19 @@
       ballistic-ammo: !type:Container
 
 - type: entity
+  parent: MagazinePistolSubMachineGunTopMounted
   id: MagazinePistolSubMachineGunTopMountedEmpty
   name: WT550 magazine (.35 auto top-mounted any)
-  parent: MagazinePistolSubMachineGunTopMounted
+  suffix: empty
   description: Unconventional 30-round top feeding magazine for the WT550 SMG.
   components:
   - type: BallisticAmmoProvider
     proto: null
 
 - type: entity
+  parent: BaseMagazinePistol
   id: MagazinePistol
   name: pistol magazine (.35 auto)
-  parent: BaseMagazinePistol
   description: 10-round single-stack magazine for pistols. Intended to hold general-purpose kinetic ammunition.
   components:
   - type: BallisticAmmoProvider
@@ -162,10 +163,10 @@
       - state: inhand-right-mag
 
 - type: entity
+  parent: MagazinePistol
   id: MagazinePistolEmpty
   name: pistol magazine (.35 auto any)
   suffix: empty
-  parent: MagazinePistol
   description: 10-round single-stack magazine for pistols.
   components:
   - type: BallisticAmmoProvider
@@ -184,9 +185,9 @@
       - state: inhand-right-mag
 
 - type: entity
+  parent: MagazinePistol
   id: MagazinePistolIncendiary
   name: pistol magazine (.35 auto incendiary)
-  parent: MagazinePistol
   description: 10-round single-stack magazine for pistols. Intended to hold self-igniting incendiary ammunition.
   components:
   - type: BallisticAmmoProvider
@@ -211,10 +212,10 @@
         color: "#ff6e52"
 
 - type: entity
+  parent: BaseMagazinePistol
   id: MagazinePistolPractice
   name: pistol magazine (.35 auto practice)
-  parent: BaseMagazinePistol
-  description: 10-round single-stack magazine for pistols. Intended to hold non-harmful chalk ammunition.
+  description: 10-round single-stack magazine for pistols. Intended to hold harmless practice ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgePistolPractice
@@ -238,9 +239,9 @@
         color: "#dbdbdb"
 
 - type: entity
+  parent: BaseMagazinePistol
   id: MagazinePistolUranium
   name: pistol magazine (.35 auto uranium)
-  parent: BaseMagazinePistol
   description: 10-round single-stack magazine for pistols. Intended to hold exotic uranium-core ammunition.
   components:
   - type: BallisticAmmoProvider
@@ -265,13 +266,15 @@
         color: "#00cd42"
 
 - type: entity
-  id: MagazinePistolHighCapacityEmpty
-  name: machine pistol magazine (.35 auto any)
-  suffix: empty
-  parent: BaseMagazinePistolHighCapacity
+  parent: BaseMagazinePistolSubMachineGun
+  id: MagazinePistolSubMachineGun
+  name: SMG magazine (.35 auto)
+  description: 30-round double-stack magazine for submachine guns. Intended to hold general-purpose kinetic ammunition.
   components:
   - type: BallisticAmmoProvider
-    proto: null
+    proto: CartridgePistol
+    soundInsert:
+      path: /Audio/Weapons/Guns/MagIn/bullet_insert.ogg
   - type: Sprite
     layers:
     - state: base
@@ -286,12 +289,14 @@
       - state: inhand-right-mag
 
 - type: entity
-  id: MagazinePistolHighCapacity
-  name: machine pistol magazine (.35 auto)
-  parent: BaseMagazinePistolHighCapacity
+  parent: BaseMagazinePistolSubMachineGun
+  id: MagazinePistolSubMachineGunEmpty
+  name: SMG magazine (.35 auto any)
+  suffix: empty
+  description: 30-round double-stack magazine for submachine guns.
   components:
   - type: BallisticAmmoProvider
-    proto: CartridgePistol
+    proto: null
   - type: Sprite
     layers:
     - state: base
@@ -306,12 +311,13 @@
       - state: inhand-right-mag
 
 - type: entity
-  id: MagazinePistolHighCapacityPractice
-  name: machine pistol magazine (.35 auto practice)
-  parent: BaseMagazinePistolHighCapacity
+  parent: BaseMagazinePistolSubMachineGun
+  id: MagazinePistolSubMachineGunPractice
+  name: SMG magazine (.35 auto practice)
+  description: 30-round double-stack magazine for submachine guns. Intended to hold harmless practice ammunition.
   components:
   - type: BallisticAmmoProvider
-    proto: CartridgePistol
+    proto: CartridgePistolPractice
   - type: Sprite
     layers:
     - state: base
@@ -332,112 +338,110 @@
         color: "#dbdbdb"
 
 - type: entity
-  id: MagazinePistolSubMachineGun
-  name: SMG magazine (.35 auto)
   parent: BaseMagazinePistolSubMachineGun
-  description: 30-round double-stack magazine for submachine guns. Intended to hold general-purpose kinetic ammunition.
+  id: MagazinePistolSubMachineGunUranium
+  name: SMG magazine (.35 auto uranium)
+  description: 30-round double-stack magazine for submachine guns. Intended to hold exotic uranium-core ammunition.
   components:
   - type: BallisticAmmoProvider
-    proto: CartridgePistol
-    soundInsert:
-      path: /Audio/Weapons/Guns/MagIn/bullet_insert.ogg
+    proto: CartridgePistolUranium
   - type: Sprite
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#00cd42"
   - type: Item
     inhandVisuals:
       left:
       - state: inhand-left-mag
+      - state: inhand-left-stripe
+        color: "#00cd42"
       right:
       - state: inhand-right-mag
+      - state: inhand-right-stripe
+        color: "#00cd42"
 
 - type: entity
-  id: MagazinePistolSubMachineGunEmpty
-  name: SMG magazine (.35 auto any)
-  suffix: empty
   parent: BaseMagazinePistolSubMachineGun
-  description: 30-round double-stack magazine for submachine guns.
+  id: MagazinePistolSubMachineGunIncendiary
+  name: SMG magazine (.35 auto incendiary)
+  description: 30-round double-stack magazine for submachine guns. Intended to hold self-igniting incendiary ammunition.
   components:
   - type: BallisticAmmoProvider
-    proto: null
+    proto: CartridgePistolIncendiary
   - type: Sprite
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#ff6e52"
   - type: Item
     inhandVisuals:
       left:
       - state: inhand-left-mag
+      - state: inhand-left-stripe
+        color: "#ff6e52"
       right:
       - state: inhand-right-mag
+      - state: inhand-right-stripe
+        color: "#ff6e52"
 
 - type: entity
-  id: MagazinePistolSubMachineGunPractice
-  name: SMG magazine (.35 auto practice)
-  parent: BaseMagazinePistolSubMachineGun
-  description: 30-round double-stack magazine for submachine guns. Intended to hold non-harmful chalk ammunition.
+  parent: BaseMagazinePistolHighCapacity
+  id: MagazinePistolHighCapacityEmpty
+  name: machine pistol magazine (.35 auto any)
+  suffix: empty
+  description: Custom 16-round double-stack magazine for the Viper pistol.
   components:
   - type: BallisticAmmoProvider
-    proto: CartridgePistolPractice
+    proto: null
   - type: Sprite
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
-    - state: stripe
-      color: "#dbdbdb"
   - type: Item
     inhandVisuals:
       left:
       - state: inhand-left-mag
-      - state: inhand-left-stripe
-        color: "#dbdbdb"
       right:
       - state: inhand-right-mag
-      - state: inhand-right-stripe
-        color: "#dbdbdb"
 
 - type: entity
-  id: MagazinePistolSubMachineGunUranium
-  name: SMG magazine (.35 auto uranium)
-  parent: BaseMagazinePistolSubMachineGun
-  description: 30-round double-stack magazine for submachine guns. Intended to hold exotic uranium-core ammunition.
+  parent: BaseMagazinePistolHighCapacity
+  id: MagazinePistolHighCapacity
+  name: machine pistol magazine (.35 auto)
+  description: Custom 16-round double-stack magazine for the Viper pistol. Intended to hold general-purpose kinetic ammunition.
   components:
   - type: BallisticAmmoProvider
-    proto: CartridgePistolUranium
+    proto: CartridgePistol
   - type: Sprite
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
-    - state: stripe
-      color: "#00cd42"
   - type: Item
     inhandVisuals:
       left:
       - state: inhand-left-mag
-      - state: inhand-left-stripe
-        color: "#00cd42"
       right:
       - state: inhand-right-mag
-      - state: inhand-right-stripe
-        color: "#00cd42"
 
 - type: entity
-  parent: BaseMagazinePistolSubMachineGun
-  id: MagazinePistolSubMachineGunIncendiary
-  name: SMG magazine (.35 auto incendiary)
-  description: 30-round double-stack magazine for submachine guns. Intended to hold self-igniting incendiary ammunition.
+  parent: BaseMagazinePistolHighCapacity
+  id: MagazinePistolHighCapacityPractice
+  name: machine pistol magazine (.35 auto practice)
+  description: Custom 16-round double-stack magazine for the Viper pistol. Intended to hold harmless practice ammunition.
   components:
   - type: BallisticAmmoProvider
-    proto: CartridgePistolIncendiary
+    proto: CartridgePistolPractice
   - type: Sprite
     layers:
     - state: base
@@ -445,15 +449,14 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
     - state: stripe
-      color: "#ff6e52"
+      color: "#dbdbdb"
   - type: Item
     inhandVisuals:
       left:
       - state: inhand-left-mag
       - state: inhand-left-stripe
-        color: "#ff6e52"
+        color: "#dbdbdb"
       right:
       - state: inhand-right-mag
       - state: inhand-right-stripe
-        color: "#ff6e52"
-
+        color: "#dbdbdb"

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
index 8e05d114d7c05e0b37811e75d47e0ac5b69261a0..99accaa558470d77a36322bd40c05fd60f5c468d 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: [ BaseItem, BaseSecurityContraband ]
   id: BaseMagazineRifle
   name: "magazine (.20 rifle)"
-  parent: [ BaseItem, BaseSecurityContraband ]
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -32,9 +32,9 @@
   - type: Appearance
 
 - type: entity
+  parent: BaseMagazineRifle
   id: MagazineRifle
   name: "magazine (.20 rifle)"
-  parent: BaseMagazineRifle
   description: 25-round double stack magazine for combat rifles. Intended to hold general-purpose kinetic ammunition.
   components:
   - type: BallisticAmmoProvider
@@ -53,10 +53,10 @@
       - state: inhand-right-mag
 
 - type: entity
+  parent: MagazineRifle
   id: MagazineRifleEmpty
   name: "magazine (.20 rifle any)"
   suffix: empty
-  parent: MagazineRifle
   description: 25-round double stack magazine for combat rifles.
   components:
   - type: BallisticAmmoProvider
@@ -75,9 +75,9 @@
       - state: inhand-right-mag
 
 - type: entity
+  parent: MagazineRifle
   id: MagazineRifleIncendiary
   name: "magazine (.20 rifle incendiary)"
-  parent: MagazineRifle
   description: 25-round double stack magazine for combat rifles. Intended to hold self-igniting incendiary ammunition.
   components:
   - type: BallisticAmmoProvider
@@ -102,10 +102,10 @@
         color: "#ff6e52"
 
 - type: entity
+  parent: BaseMagazineRifle
   id: MagazineRiflePractice
   name: "magazine (.20 rifle practice)"
-  parent: BaseMagazineRifle
-  description: 25-round double stack magazine for combat rifles. Intended to hold non-harmful chalk ammunition.
+  description: 25-round double stack magazine for combat rifles. Intended to hold harmless practice ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeRiflePractice
@@ -129,9 +129,9 @@
         color: "#dbdbdb"
 
 - type: entity
+  parent: BaseMagazineRifle
   id: MagazineRifleUranium
   name: "magazine (.20 rifle uranium)"
-  parent: BaseMagazineRifle
   description: 25-round double stack magazine for combat rifles. Intended to hold exotic uranium-core ammunition.
   components:
   - type: BallisticAmmoProvider

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml
index 241ac1327db8323ba53a10db4c7d958adc07491f..07e32487de81c4a0e3cf54193cebe6882d5126ab 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: [ BaseItem, BaseSecurityContraband ]
   id: BaseMagazineShotgun
   name: ammo drum (.50 shells)
-  parent: [ BaseItem, BaseSecurityContraband ]
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -46,15 +46,17 @@
   id: MagazineShotgunEmpty
   name: ammo drum (.50 shells any)
   suffix: empty
+  description: A large drum magazine used by some military-grade automatic shotguns.
   parent: BaseMagazineShotgun
   components:
   - type: BallisticAmmoProvider
     proto: null
 
 - type: entity
+  parent: BaseMagazineShotgun
   id: MagazineShotgun
   name: ammo drum (.50 pellet)
-  parent: BaseMagazineShotgun
+  description: A large drum magazine used by some military-grade automatic shotguns. Intended to hold general-purpose kinetic ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: ShellShotgun
@@ -76,9 +78,10 @@
         color: "#ba7710"
 
 - type: entity
-  id: MagazineShotgunBeanbag
-  name: ammo drum (.50 beanbags)
   parent: BaseMagazineShotgun
+  id: MagazineShotgunBeanbag
+  name: ammo drum (.50 beanbag)
+  description: A large drum magazine used by some military-grade automatic shotguns. Intended to hold less-than-lethal beanbag ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: ShellShotgunBeanbag
@@ -100,9 +103,10 @@
         color: "#30722d"
 
 - type: entity
+  parent: BaseMagazineShotgun
   id: MagazineShotgunSlug
   name: ammo drum (.50 slug)
-  parent: BaseMagazineShotgun
+  description: A large drum magazine used by some military-grade automatic shotguns. Intended to hold long-ranged slug ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: ShellShotgunSlug
@@ -124,9 +128,10 @@
         color: "#72382d"
 
 - type: entity
+  parent: BaseMagazineShotgun
   id: MagazineShotgunIncendiary
   name: ammo drum (.50 incendiary)
-  parent: BaseMagazineShotgun
+  description: A large drum magazine used by some military-grade automatic shotguns. Intended to hold self-igniting incendiary ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: ShellShotgunIncendiary

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/toy.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/toy.yml
index babbc2648f71aa4021a120fb8313a2b2035f6d1d..2797aa1dd0a10d9ee48e7ae0407f7b88d9513a6b 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/toy.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/toy.yml
@@ -1,7 +1,8 @@
 - type: entity
   parent: MagazineLightRifleBox # It goes in a saw, its funny.
   id: MagazineFoamBox
-  name: ammunition box (foam)
+  name: "L6 SAW magazine box (foam dart)"
+  description: Box containing a 100-round belt of linked... foam darts?
   components:
   - type: BallisticAmmoProvider
     mayTransfer: true
@@ -9,4 +10,4 @@
       tags:
         - BulletFoam
     proto: BulletFoam
-    capacity: 100
\ No newline at end of file
+    capacity: 100

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml
index 83392d07efa4e1eb4b25954189b6166c713487df..566f8579e453632a93e67d9d35b73ef5cece3648 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml
@@ -1,8 +1,8 @@
 - type: entity
-  id: BulletCaselessRifle
-  name: bullet (.25 caseless)
   parent: BaseBullet
+  id: BulletCaselessRifle
   categories: [ HideSpawnMenu ]
+  name: bullet (.25 caseless)
   components:
   - type: Projectile
     damage:
@@ -10,10 +10,10 @@
         Piercing: 19
 
 - type: entity
-  id: BulletCaselessRiflePractice
-  name: bullet (.25 caseless practice)
   parent: BaseBulletPractice
+  id: BulletCaselessRiflePractice
   categories: [ HideSpawnMenu ]
+  name: bullet (.25 caseless practice)
   components:
   - type: Projectile
     damage:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml
index 822c1fea171e8cf14d11a063bb42394f57f4c5fd..dc0794a8bbb7601506fe347d5b6a93f62e490b82 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml
@@ -1,8 +1,8 @@
 - type: entity
+  parent: BaseBullet
   id: PelletClusterRubber
-  name: pellet (ball, rubber)
   categories: [ HideSpawnMenu ]
-  parent: BaseBullet
+  name: pellet (ball, rubber)
   components:
   - type: Projectile
     deleteOnCollide: false
@@ -15,10 +15,10 @@
     lifetime: 0.25
 
 - type: entity
+  parent: BaseBullet
   id: PelletClusterLethal
-  name: pellet (ball, lethal)
   categories: [ HideSpawnMenu ]
-  parent: BaseBullet
+  name: pellet (ball, lethal)
   components:
   - type: Projectile
     deleteOnCollide: false
@@ -29,10 +29,10 @@
     lifetime: 0.25
 
 - type: entity
+  parent: BaseBulletIncendiary
   id: PelletClusterIncendiary
-  name: pellet (ball, incendiary)
   categories: [ HideSpawnMenu ]
-  parent: BaseBulletIncendiary
+  name: pellet (ball, incendiary)
   components:
   - type: Projectile
     deleteOnCollide: false
@@ -47,10 +47,10 @@
     lifetime: 0.25
 
 - type: entity
+  parent: BaseBullet
   id: PelletClusterLessLethal
-  name: pellet (ball, less lethal)
   categories: [ HideSpawnMenu ]
-  parent: BaseBullet
+  name: pellet (ball, less lethal)
   components:
   - type: Projectile
     deleteOnCollide: false

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
index eebccf32a0cf5faf44ac4223f5929e1247040196..91bcac892de13e5635a0a29bb5bac688da39f4f1 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
@@ -1,8 +1,8 @@
 - type: entity
-  id: BulletHeavyRifle
-  name: bullet (.10 rifle)
   parent: BaseBullet
+  id: BulletHeavyRifle
   categories: [ HideSpawnMenu ]
+  name: bullet (.10 rifle)
   components:
   - type: Projectile
     damage:
@@ -10,10 +10,10 @@
         Piercing: 19
 
 - type: entity
-  id: BulletMinigun
-  name: minigun bullet (.10 rifle)
   parent: BulletHeavyRifle
+  id: BulletMinigun
   categories: [ HideSpawnMenu ]
+  name: minigun bullet (.10 rifle)
   components:
   - type: Projectile
     damage:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
index 60640bdd2e453b9256cc969906ae29352c3b0ee5..b102caebc7feee08f2f19977629c65f03d704b19 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
@@ -1,8 +1,8 @@
 - type: entity
-  id: BulletLightRifle
-  name: bullet (.30 rifle)
   parent: BaseBullet
+  id: BulletLightRifle
   categories: [ HideSpawnMenu ]
+  name: bullet (.30 rifle)
   components:
   - type: Projectile
     damage:
@@ -10,10 +10,10 @@
         Piercing: 19
 
 - type: entity
-  id: BulletLightRiflePractice
-  name: bullet (.30 rifle practice)
   parent: BaseBulletPractice
+  id: BulletLightRiflePractice
   categories: [ HideSpawnMenu ]
+  name: bullet (.30 rifle practice)
   components:
   - type: Projectile
     damage:
@@ -21,10 +21,10 @@
         Blunt: 2
 
 - type: entity
-  id: BulletLightRifleIncendiary
   parent: BaseBulletIncendiary
-  name: bullet (.30 rifle incendiary)
+  id: BulletLightRifleIncendiary
   categories: [ HideSpawnMenu ]
+  name: bullet (.30 rifle incendiary)
   components:
   - type: Projectile
     damage:
@@ -33,10 +33,10 @@
         Heat: 5
 
 - type: entity
-  id: BulletLightRifleUranium
   parent: BaseBulletUranium
-  name: bullet (.30 rifle uranium)
+  id: BulletLightRifleUranium
   categories: [ HideSpawnMenu ]
+  name: bullet (.30 rifle uranium)
   components:
   - type: Projectile
     damage:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
index 124fa4a93ec7501c995fcdff16e93987f0a275f1..4dccef3ef7ff8d988cd131a876550359774056f7 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
@@ -1,8 +1,8 @@
 - type: entity
-  id: BulletMagnum
-  name: bullet (.45 magnum)
   parent: BaseBullet
+  id: BulletMagnum
   categories: [ HideSpawnMenu ]
+  name: bullet (.45 magnum)
   components:
   - type: Projectile
     damage:
@@ -10,10 +10,10 @@
         Piercing: 35
 
 - type: entity
-  id: BulletMagnumPractice
-  name: bullet (.45 magnum practice)
   parent: BaseBulletPractice
+  id: BulletMagnumPractice
   categories: [ HideSpawnMenu ]
+  name: bullet (.45 magnum practice)
   components:
   - type: Projectile
     damage:
@@ -21,10 +21,10 @@
         Blunt: 1
 
 - type: entity
-  id: BulletMagnumIncendiary
   parent: BaseBulletIncendiary
-  name: bullet (.45 magnum incendiary)
+  id: BulletMagnumIncendiary
   categories: [ HideSpawnMenu ]
+  name: bullet (.45 magnum incendiary)
   components:
   - type: Projectile
     damage:
@@ -33,10 +33,10 @@
         Heat: 9
 
 - type: entity
-  id: BulletMagnumAP
-  name: bullet (.45 magnum armor-piercing)
   parent: BaseBulletAP
+  id: BulletMagnumAP
   categories: [ HideSpawnMenu ]
+  name: bullet (.45 magnum armor-piercing)
   components:
   - type: Projectile
     damage:
@@ -45,10 +45,10 @@
     ignoreResistances: true
 
 - type: entity
-  id: BulletMagnumUranium
-  name: bullet (.45 magnum uranium)
   parent: BaseBulletUranium
+  id: BulletMagnumUranium
   categories: [ HideSpawnMenu ]
+  name: bullet (.45 magnum uranium)
   components:
   - type: Projectile
     damage:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
index 53917035cbd1ee9f79db05662665561bd1a0b96f..226d22c49a5dbb8eb95b04fc47484f0849a95efe 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
@@ -1,8 +1,8 @@
 - type: entity
-  id: BulletPistol
-  name: bullet (.35 auto)
   parent: BaseBullet
+  id: BulletPistol
   categories: [ HideSpawnMenu ]
+  name: bullet (.35 auto)
   components:
   - type: Projectile
     damage:
@@ -10,10 +10,10 @@
         Piercing: 16
 
 - type: entity
-  id: BulletPistolPractice
-  name: bullet (.35 auto practice)
   parent: BaseBulletPractice
+  id: BulletPistolPractice
   categories: [ HideSpawnMenu ]
+  name: bullet (.35 auto practice)
   components:
   - type: Projectile
     damage:
@@ -21,10 +21,10 @@
         Blunt: 2
 
 - type: entity
-  id: BulletPistolIncendiary
   parent: BaseBulletIncendiary
-  name: bullet (.35 auto incendiary)
+  id: BulletPistolIncendiary
   categories: [ HideSpawnMenu ]
+  name: bullet (.35 auto incendiary)
   components:
   - type: Projectile
     damage:
@@ -33,10 +33,10 @@
         Heat: 4
 
 - type: entity
-  id: BulletPistolUranium
   parent: BaseBulletUranium
-  name: bullet (.35 auto uranium)
+  id: BulletPistolUranium
   categories: [ HideSpawnMenu ]
+  name: bullet (.35 auto uranium)
   components:
   - type: Projectile
     damage:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
index 84506148b470067de497cbfe7bd9cfbc42eb9fe8..f7f635bf90aaa010e3438546f225a8f389d41886 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
@@ -1,8 +1,8 @@
 - type: entity
-  id: BulletRifle
-  name: bullet (.20 rifle)
   parent: BaseBullet
+  id: BulletRifle
   categories: [ HideSpawnMenu ]
+  name: bullet (.20 rifle)
   components:
   - type: Projectile
     damage:
@@ -10,10 +10,10 @@
         Piercing: 17
 
 - type: entity
-  id: BulletRiflePractice
-  name: bullet (.20 rifle practice)
   parent: BaseBulletPractice
+  id: BulletRiflePractice
   categories: [ HideSpawnMenu ]
+  name: bullet (.20 rifle practice)
   components:
   - type: Projectile
     damage:
@@ -21,10 +21,10 @@
         Blunt: 2
 
 - type: entity
-  id: BulletRifleIncendiary
   parent: BaseBulletIncendiary
-  name: bullet (.20 rifle incendiary)
+  id: BulletRifleIncendiary
   categories: [ HideSpawnMenu ]
+  name: bullet (.20 rifle incendiary)
   components:
   - type: Projectile
     damage:
@@ -33,10 +33,10 @@
         Heat: 5
 
 - type: entity
-  id: BulletRifleUranium
   parent: BaseBulletUranium
-  name: bullet (.20 rifle uranium)
+  id: BulletRifleUranium
   categories: [ HideSpawnMenu ]
+  name: bullet (.20 rifle uranium)
   components:
   - type: Projectile
     damage:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
index 070ce21171628fc56e965b16cc56348dbaab3e06..2a4f51365053d5bbf2164f00ccdbaee4479d29a7 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
@@ -1,8 +1,8 @@
 - type: entity
+  parent: BaseBullet
   id: PelletShotgunSlug
-  name: pellet (.50 slug)
   categories: [ HideSpawnMenu ]
-  parent: BaseBullet
+  name: pellet (.50 slug)
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -15,16 +15,15 @@
 
 
 - type: entity
+  parent: BaseBullet
   id: PelletShotgunBeanbag
-  name: beanbag (.50)
   categories: [ HideSpawnMenu ]
-  parent: BaseBullet
+  name: beanbag (.50)
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
     layers:
     - state: bullet #just reapplying to here so it can be shaded
-
   - type: Projectile
     damage:
       types:
@@ -33,10 +32,10 @@
     damage: 40 # 3 hits to stun
 
 - type: entity
+  parent: BaseBullet
   id: PelletShotgun
-  name: pellet (.50)
   categories: [ HideSpawnMenu ]
-  parent: BaseBullet
+  name: pellet (.50)
   components:
   - type: Projectile
     damage:
@@ -44,11 +43,10 @@
         Piercing: 10
         Structural: 15
 
-
 - type: entity
+  parent: PelletShotgun
   id: PelletShotgunSpread
   categories: [ HideSpawnMenu ]
-  parent: PelletShotgun
   components:
   - type: ProjectileSpread
     proto: PelletShotgun
@@ -56,10 +54,10 @@
     spread: 15
 
 - type: entity
+  parent: BaseBulletIncendiary
   id: PelletShotgunIncendiary
-  name: pellet (.50 incendiary)
   categories: [ HideSpawnMenu ]
-  parent: BaseBulletIncendiary
+  name: pellet (.50 incendiary)
   components:
   - type: Projectile
     damage:
@@ -70,9 +68,9 @@
     ignited: true
 
 - type: entity
+  parent: PelletShotgunIncendiary
   id: PelletShotgunIncendiarySpread
   categories: [ HideSpawnMenu ]
-  parent: PelletShotgunIncendiary
   components:
   - type: ProjectileSpread
     proto: PelletShotgunIncendiary
@@ -80,10 +78,10 @@
     spread: 15
 
 - type: entity
+  parent: BaseBulletPractice
   id: PelletShotgunPractice
-  name: pellet (.50 practice)
   categories: [ HideSpawnMenu ]
-  parent: BaseBulletPractice
+  name: pellet (.50 practice)
   components:
   - type: Projectile
     damage:
@@ -91,9 +89,9 @@
         Blunt: 1
 
 - type: entity
+  parent: PelletShotgunPractice
   id: PelletShotgunPracticeSpread
   categories: [ HideSpawnMenu ]
-  parent: PelletShotgunPractice
   components:
   - type: ProjectileSpread
     proto: PelletShotgunPractice
@@ -101,10 +99,10 @@
     spread: 15
 
 - type: entity
+  parent: BaseBullet
   id: PelletShotgunImprovised
-  name: improvised pellet
   categories: [ HideSpawnMenu ]
-  parent: BaseBullet
+  name: improvised pellet
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -118,9 +116,9 @@
         Slash: 3
 
 - type: entity
+  parent: PelletShotgunImprovised
   id: PelletShotgunImprovisedSpread
   categories: [ HideSpawnMenu ]
-  parent: PelletShotgunImprovised
   components:
   - type: ProjectileSpread
     proto: PelletShotgunImprovised
@@ -128,10 +126,10 @@
     spread: 45
 
 - type: entity
+  parent: BaseBulletPractice
   id: PelletShotgunTranquilizer
-  name: pellet (.50 tranquilizer)
   categories: [ HideSpawnMenu ]
-  parent: BaseBulletPractice
+  name: pellet (.50 tranquilizer)
   components:
   - type: Projectile
     damage:
@@ -147,8 +145,8 @@
 
 - type: entity
   id: PelletShotgunFlare
-  name: pellet (.50 flare)
   categories: [ HideSpawnMenu ]
+  name: pellet (.50 flare)
   components:
   - type: Physics
     bodyType: Dynamic
@@ -193,10 +191,10 @@
         Heat: 5
 
 - type: entity
+  parent: BaseBulletUranium
   id: PelletShotgunUranium
-  name: pellet (.50 uranium)
   categories: [ HideSpawnMenu ]
-  parent: BaseBulletUranium
+  name: pellet (.50 uranium)
   components:
   - type: Projectile
     damage:
@@ -205,9 +203,9 @@
         Piercing: 5
 
 - type: entity
+  parent: PelletShotgunUranium
   id: PelletShotgunUraniumSpread
   categories: [ HideSpawnMenu ]
-  parent: PelletShotgunUranium
   components:
   - type: ProjectileSpread
     proto: PelletShotgunUranium
@@ -215,10 +213,10 @@
     spread: 6
 
 - type: entity
+  parent: BaseBullet
   id: PelletGrapeshot #tally fucking ho
-  name: grapeshot pellet
   categories: [ HideSpawnMenu ]
-  parent: BaseBullet
+  name: grapeshot pellet
   components:
   - type: Sprite
     noRot: false
@@ -233,9 +231,9 @@
         Structural: 5
 
 - type: entity
+  parent: PelletGrapeshot
   id: PelletGrapeshotSpread
   categories: [ HideSpawnMenu ]
-  parent: PelletGrapeshot
   components:
   - type: ProjectileSpread
     proto: PelletGrapeshot
@@ -243,10 +241,10 @@
     spread: 40
 
 - type: entity
-  id: PelletGlass
-  name: glass shard
   parent: BaseBullet
+  id: PelletGlass
   categories: [ HideSpawnMenu ]
+  name: glass shard
   components:
   - type: Sprite
     noRot: false
@@ -262,8 +260,8 @@
         Slash: 25
 
 - type: entity
-  id: PelletGlassSpread
   parent: PelletGlass
+  id: PelletGlassSpread
   categories: [ HideSpawnMenu ]
   components:
   - type: ProjectileSpread

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml
index 3e4235f67712d44cf1eab84e852fe095a9684d8c..9f600680c6286991b8825287d45f7cc797990efe 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml
@@ -1,8 +1,8 @@
 - type: entity
+  parent: BaseItem
   id: BulletFoam
-  description: I hope you're wearing eye protection.
   name: foam dart
-  parent: BaseItem
+  description: I hope you're wearing eye protection.
   components:
   - type: Fixtures
     fixtures:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml
index 58ba6326c1a3236d1a87f465d632e297b090d237..de06bc064b572e558faf333991758c8d5a26ff8c 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: [ BaseItem, BaseSecurityContraband ]
   id: BaseSpeedLoaderMagnum
   name: "speed loader (.45 magnum)"
-  parent: [ BaseItem, BaseSecurityContraband ]
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -20,10 +20,10 @@
         ents: []
 
 - type: entity
+  parent: BaseSpeedLoaderMagnum
   id: SpeedLoaderMagnum
   name: "speed loader (.45 magnum)"
-  parent: BaseSpeedLoaderMagnum
-  description: Designed to quickly refill an empty revolver, it fits up to six rounds. Intended to hold general-purpose kinetic ammunition.
+  description: Designed to quickly load up to six rounds of .45 magnum into an empty revolver. Intended to hold general-purpose kinetic ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeMagnum
@@ -49,10 +49,11 @@
       - state: inhand-right-ammo
 
 - type: entity
+  parent: SpeedLoaderMagnum
   id: SpeedLoaderMagnumEmpty
   name: "speed loader (.45 magnum any)"
-  parent: SpeedLoaderMagnum
-  description: Designed to quickly refill an empty revolver, it fits up to six rounds for the big iron on your hip. #Big Iron reference (duh)
+  suffix: empty
+  description: Designed to quickly load up to six rounds of .45 magnum into an empty revolver.
   components:
   - type: BallisticAmmoProvider
     proto: null
@@ -74,19 +75,19 @@
       - state: inhand-right-mag
 
 - type: entity
+  parent: SpeedLoaderMagnum
   id: SpeedLoaderMagnumIncendiary
   name: "speed loader (.45 magnum incendiary)"
-  parent: SpeedLoaderMagnum
-  description: Designed to quickly refill an empty revolver, it fits up to six rounds. Intended to hold self-igniting incendiary ammunition.
+  description: Designed to quickly load up to six rounds of .45 magnum into an empty revolver. Intended to hold self-igniting incendiary ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeMagnumIncendiary
 
 - type: entity
+  parent: BaseSpeedLoaderMagnum
   id: SpeedLoaderMagnumPractice
   name: "speed loader (.45 magnum practice)"
-  parent: BaseSpeedLoaderMagnum
-  description: Designed to quickly refill an empty revolver, it fits up to six rounds. Intended to hold non-harmful chalk ammunition, perfect for practicing your quick draw.
+  description: Designed to quickly load up to six rounds of .45 magnum into an empty revolver. Intended to hold harmless practice ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeMagnumPractice
@@ -116,10 +117,10 @@
         color: "#ea5800"
 
 - type: entity
+  parent: BaseSpeedLoaderMagnum
   id: SpeedLoaderMagnumAP
   name: "speed loader (.45 magnum armor-piercing)"
-  parent: BaseSpeedLoaderMagnum
-  description: Designed to quickly refill an empty revolver, it fits up to six rounds. Intended to hold rare armor-piercing ammunition.
+  description: Designed to quickly load up to six rounds of .45 magnum into an empty revolver. Intended to hold specialized armor-piercing ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeMagnumAP
@@ -149,10 +150,10 @@
         color: "#540000"
 
 - type: entity
+  parent: BaseSpeedLoaderMagnum
   id: SpeedLoaderMagnumUranium
   name: "speed loader (.45 magnum uranium)"
-  parent: BaseSpeedLoaderMagnum
-  description: Designed to quickly refill an empty revolver, it fits up to six rounds. Intended to hold exotic uranium-core ammunition.
+  description: Designed to quickly load up to six rounds of .45 magnum into an empty revolver. Intended to hold exotic uranium-core ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeMagnumUranium

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml
index 512eb88657131b7afdd068fc2282912f57eb7425..5174b6a3b1ed02d9cf72d88d79901a7bd350fa93 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: [ BaseItem, BaseSecurityContraband ]
   id: BaseSpeedLoaderPistol
   name: "speed loader (.35 auto)"
-  parent: [ BaseItem, BaseSecurityContraband ]
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -21,9 +21,9 @@
         ents: []
 
 - type: entity
+  parent: BaseSpeedLoaderPistol
   id: SpeedLoaderPistol
   name: "speed loader (.35 auto)"
-  parent: BaseSpeedLoaderPistol
   components:
   - type: BallisticAmmoProvider
     proto: CartridgePistol
@@ -40,9 +40,9 @@
   - type: Appearance
 
 - type: entity
+  parent: BaseSpeedLoaderPistol
   id: SpeedLoaderPistolPractice
   name: "speed loader (.35 auto practice)"
-  parent: BaseSpeedLoaderPistol
   components:
   - type: BallisticAmmoProvider
     proto: CartridgePistolPractice

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml
index 739f092f6992fbaa4a654bca0a4bd374cebf3fa6..cd1f220c0f1984fc7717d4d567f1e3707069f19c 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml
@@ -1,8 +1,8 @@
 - type: entity
+  parent: [ BaseItem, BaseSecurityContraband ]
   id: SpeedLoaderLightRifle
   name: "speed loader (.30 rifle)"
-  parent: [ BaseItem, BaseSecurityContraband ]
-  description: 5-round 'stripper clip' for quickly reloading the Kardashev-Mosin. Holds 5 rounds of .30 rifle.
+  description: 5-round 'stripper clip' for quickly reloading the Kardashev-Mosin. Intended to hold general-purpose kinetic ammunition.
   components:
   - type: Tag
     tags:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/toy.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/toy.yml
index 51c1037194ca735f0d654f2499fd904382ebfd67..035d66a32eedc45512ce9e6f068814bb0ed79224 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/toy.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/toy.yml
@@ -1,8 +1,8 @@
 - type: entity
+  abstract: true
+  parent: BaseItem
   id: BaseSpeedLoaderCap
   name: "cap gun loader"
-  parent: BaseItem
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -30,9 +30,10 @@
         ents: []
 
 - type: entity
+  parent: BaseSpeedLoaderCap
   id: SpeedLoaderCap
   name: "cap gun loader"
-  parent: BaseSpeedLoaderCap
+  description: Designed to quickly load up to six cartridges into an empty cap gun.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeCap

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml
index 2bd0dfc46d25483baeff1dabf35d183e7daf36d8..24a5320c23036f8f6bd631ce2d65c8e397eeb281 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml
@@ -1,9 +1,9 @@
 # Rockets
 
 - type: entity
+  parent: [BaseItem, BaseMajorContraband]
   id: CartridgeRocket
   name: PG-7VL grenade
-  parent: [BaseItem, BaseMajorContraband]
   description: A 1.5 warhead designed for the RPG-7 launcher. Has tubular shape.
   components:
   - type: Tag
@@ -21,9 +21,9 @@
     price: 20
 
 - type: entity
+  parent: [BaseItem, BaseMajorContraband]
   id: CartridgeRocketSlow
   name: PG-7VL grenade "Snail-Rocket"
-  parent: [BaseItem, BaseMajorContraband]
   description: A 1.5 warhead designed for the RPG-7 launcher. It's unusually slow.
   components:
     - type: Tag
@@ -43,10 +43,10 @@
 # Grenades
 
 - type: entity
+  abstract: true
+  parent: [BaseItem, BaseMajorContraband]
   id: BaseGrenade
   name: base grenade
-  parent: [BaseItem, BaseMajorContraband]
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -56,9 +56,9 @@
   - type: Sprite
 
 - type: entity
+  parent: BaseGrenade
   id: GrenadeBaton
   name: baton grenade
-  parent: BaseGrenade
   components:
   - type: CartridgeAmmo
     proto: BulletGrenadeBaton
@@ -73,9 +73,9 @@
     suffix: false
 
 - type: entity
+  parent: BaseGrenade
   id: GrenadeBlast
   name: blast grenade
-  parent: BaseGrenade
   components:
   - type: CartridgeAmmo
     proto: BulletGrenadeBlast
@@ -90,9 +90,9 @@
     suffix: false
 
 - type: entity
+  parent: BaseGrenade
   id: GrenadeFlash
   name: flash grenade
-  parent: BaseGrenade
   components:
   - type: CartridgeAmmo
     proto: BulletGrenadeFlash
@@ -107,9 +107,9 @@
     suffix: false
 
 - type: entity
+  parent: BaseGrenade
   id: GrenadeFrag
   name: frag grenade
-  parent: BaseGrenade
   components:
   - type: CartridgeAmmo
     proto: BulletGrenadeFrag
@@ -141,9 +141,9 @@
     suffix: false
 
 - type: entity
+  parent: BaseGrenade
   id: GrenadeEMP
   name: EMP grenade
-  parent: BaseGrenade
   components:
   - type: CartridgeAmmo
     proto: BulletGrenadeEMP
@@ -160,10 +160,10 @@
 # Cannon Balls
 
 - type: entity
+  abstract: true
+  parent: [BaseItem, BaseMajorContraband]
   id: BaseCannonBall
   name: base cannon ball
-  parent: [BaseItem, BaseMajorContraband]
-  abstract: true
   components:
   - type: Tag
     tags:
@@ -173,10 +173,10 @@
   - type: Sprite
 
 - type: entity
+  parent: BaseCannonBall
   id: CannonBall
   name: cannonball
   suffix: Pirate
-  parent: BaseCannonBall
   components:
   - type: CartridgeAmmo
     proto: BulletCannonBall
@@ -186,10 +186,10 @@
     state: ball
 
 - type: entity
+  parent: BaseCannonBall
   id: CannonBallGrapeshot
   name: grapeshot
   suffix: Pirate
-  parent: BaseCannonBall
   components:
   - type: CartridgeAmmo
     proto: PelletGrapeshotSpread
@@ -199,10 +199,10 @@
     state: grapeshot
 
 - type: entity
+  parent: BaseCannonBall
   id: CannonBallGlassshot
   name: glassshot
   suffix: Pirate
-  parent: BaseCannonBall
   components:
   - type: CartridgeAmmo
     proto: PelletGlassSpread