Hard forking weapons part 5 (ammunition and projectiles) (impstation#3890)

* Projectile Organization part 1

I have always hated having 2 projectile folders.

* more work done

still not done

* more projectile work

it's a lot

* I'm sorry this one got too big

uuuuhhh ummmm

* More touches

Everything double checked, moving on to reverting upstream files

* Final Push Maybe

Jeepers...

* some fixes

but something is broken

* FINAL fix.

I figured it out.

* tag fixes

fixin those tags

* resolving the merge conflict part one

wait warmly

* part two of that

* Delete projectiles.yml

Kill it.

Author: DVDPlayerOfDiscordFame

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml

@@ -1,9 +1,8 @@
 - type: entity
-  abstract: true
   parent: [ BaseItem, BaseSecurityContraband ]
-  id: BaseMagazineBoxAntiMateriel
+  id: BaseMagazineBoxAntiMaterielWizden #imp - see the _Impstation directory for the version we use
+  abstract: true
   name: ammunition box (.60 anti-materiel)
-  description: A box made for 10 rounds of .60 anti-materiel ammunition. #imp
   components:
   - type: BallisticAmmoProvider
     mayTransfer: true
@@ -18,7 +17,7 @@
     containers:
       ballistic-ammo: !type:Container
   - type: Sprite
-    sprite: _Impstation/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi # imp
+    sprite: Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi
   - type: MagazineVisuals
     magState: mag
     steps: 4
@@ -28,30 +27,9 @@
 # Boxes
 - type: entity
   parent: BaseMagazineBoxAntiMateriel
-  id: MagazineBoxAntiMaterielBig
-  name: ammunition box (.60 anti-materiel)
-  description: A large box made for 30 rounds of .60 anti-materiel ammunition. #imp
-  components:
-  - type: BallisticAmmoProvider
-    capacity: 30
-    proto: CartridgeAntiMateriel
-  - type: Sprite
-    layers:
-    - state: base-b
-      map: ["enum.GunVisualLayers.Base"]
-    - state: magb-1
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: MagazineVisuals
-    magState: magb
-    steps: 4
-    zeroVisible: false
-  - type: Appearance
-
-- type: entity
-  parent: BaseMagazineBoxAntiMateriel
-  id: MagazineBoxAntiMateriel
+  id: MagazineBoxAntiMaterielWizden #imp - see the _Impstation directory for the version we use
+  abstract: true
   name: ammunition box (.60 anti-materiel)
-  description: A box made for 10 rounds of .60 anti-materiel ammunition. #imp
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeAntiMateriel

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml

@@ -1,24 +1,23 @@
 - type: entity
-  abstract: true
   parent: BaseItem
-  id: BaseMagazineBoxCaselessRifle
+  id: BaseMagazineBoxCaselessRifleWizden #imp - see the _Impstation directory for the version we use
+  abstract: true
   name: ammunition box (.25 caseless)
-  description: A box made for 50 rounds of .25 caseless ammunition. #imp
   components:
   - type: BallisticAmmoProvider
     mayTransfer: true
     whitelist:
       tags:
         - CartridgeCaselessRifle
     proto: CartridgeCaselessRifle
-    capacity: 50 #imp
+    capacity: 60
   - type: Item
     size: Small
   - type: ContainerContainer
     containers:
       ballistic-ammo: !type:Container
   - type: Sprite
-    sprite: _Impstation/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi # imp
+    sprite: Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi
   - type: MagazineVisuals
     magState: mag
     steps: 4
@@ -28,51 +27,10 @@
 # Boxes
 - type: entity
   parent: BaseMagazineBoxCaselessRifle
-  id: MagazineBoxCaselessRifle10x24
-  name: ammunition box (.25 caseless)
-  description: A large box made for 200 rounds of .25 caseless ammunition, labeled as live-fire bullets. #imp
-  components:
-  - type: BallisticAmmoProvider
-    capacity: 200
-    proto: CartridgeCaselessRifle
-  - type: Sprite
-    layers:
-    - state: base-10x24
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag10-1
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: MagazineVisuals
-    magState: mag10
-    steps: 4
-    zeroVisible: false
-  - type: Appearance
-
-- type: entity
-  parent: BaseMagazineBoxCaselessRifle
-  id: MagazineBoxCaselessRifleBig
-  name: ammunition box (.25 caseless)
-  description: A large box made for 200 rounds of .25 caseless ammunition, labeled as live-fire bullets. #imp
-  components:
-  - type: BallisticAmmoProvider
-    capacity: 200
-    proto: CartridgeCaselessRifle
-  - type: Sprite
-    layers:
-    - state: base-b
-      map: ["enum.GunVisualLayers.Base"]
-    - state: magb-1
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: MagazineVisuals
-    magState: magb
-    steps: 4
-    zeroVisible: false
-  - type: Appearance
-
-- type: entity
-  parent: BaseMagazineBoxCaselessRifle
-  id: MagazineBoxCaselessRifle
+  id: MagazineBoxCaselessRifleWizden #imp - see the _Impstation directory for the version we use
+  abstract: true
   name: ammunition box (.25 caseless)
-  description: A box made for 50 rounds of .25 caseless ammunition, labeled as live-fire bullets. #imp
+  description: A cardboard box of .25 caseless rounds. Intended to hold general-purpose kinetic ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeCaselessRifle
@@ -85,9 +43,10 @@
 
 - type: entity
   parent: BaseMagazineBoxCaselessRifle
-  id: MagazineBoxCaselessRiflePractice
+  id: MagazineBoxCaselessRiflePracticeWizden #imp - see the _Impstation directory for the version we use
+  abstract: true
   name: ammunition box (.25 caseless practice)
-  description: A box made for 50 rounds of .25 caseless ammunition, labeled as practice bullets. #imp
+  description: A cardboard box of .25 caseless rounds. Intended to hold non-harmful chalk ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeCaselessRiflePractice

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml

@@ -1,9 +1,8 @@
 - type: entity
-  abstract: true
   parent: BaseItem
-  id: BaseMagazineBoxLightRifle
+  id: BaseMagazineBoxLightRifleWizden #imp - see the _Impstation directory for the version we use
+  abstract: true
   name: ammunition box (.30 rifle)
-  description: A box made for 60 rounds of .30 rifle ammunition. #imp
   components:
   - type: BallisticAmmoProvider
     mayTransfer: true
@@ -18,7 +17,7 @@
     containers:
       ballistic-ammo: !type:Container
   - type: Sprite
-    sprite: _Impstation/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi # imp
+    sprite: Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi
   - type: MagazineVisuals
     magState: mag
     steps: 4
@@ -27,32 +26,28 @@
 
 # Boxes
 - type: entity
-  parent: BaseMagazineBoxLightRifle
-  id: MagazineBoxLightRifleBig
+  parent: BaseMagazineBoxLightRifleWizden #imp
+  id: MagazineBoxLightRifleBigWizden #imp - see the _Impstation directory for the version we use
+  abstract: true
   name: ammunition box (.30 rifle)
   suffix: Big
-  description: A large box made for 200 rounds of .30 rifle ammunition, labeled as live-fire bullets. #imp
   components:
   - type: BallisticAmmoProvider
     capacity: 200
     proto: CartridgeLightRifle
   - type: Sprite
     layers:
-    - state: base-b #imp
+    - state: base
       map: ["enum.GunVisualLayers.Base"]
-    - state: magb-1 #imp
+    - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
-  - type: MagazineVisuals #imp
-    magState: magb
-    steps: 4
-    zeroVisible: false
-  - type: Appearance # imp
 
 - type: entity
-  parent: BaseMagazineBoxLightRifle
-  id: MagazineBoxLightRifle
+  parent: BaseMagazineBoxLightRifleWizden #imp
+  id: MagazineBoxLightRifleWizden #imp - see the _Impstation directory for the version we use
+  abstract: true
   name: ammunition box (.30 rifle)
-  description: A box made for 60 rounds of .30 rifle ammunition, labeled as live-fire bullets. #imp
+  description: A cardboard box of .30 rifle rounds. Intended to hold general-purpose kinetic ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeLightRifle
@@ -64,10 +59,11 @@
       map: ["enum.GunVisualLayers.Mag"]
 
 - type: entity
-  parent: BaseMagazineBoxLightRifle
-  id: MagazineBoxLightRiflePractice
+  parent: BaseMagazineBoxLightRifleWizden #imp
+  id: MagazineBoxLightRiflePracticeWizden #imp - see the _Impstation directory for the version we use
+  abstract: true
   name: ammunition box (.30 rifle practice)
-  description: A box made for 60 rounds of .30 rifle ammunition, labeled as practice bullets. #imp
+  description: A cardboard box of .30 rifle rounds. Intended to hold non-harmful chalk ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeLightRiflePractice
@@ -80,10 +76,11 @@
     - state: practice
 
 - type: entity
-  id: MagazineBoxLightRifleIncendiary
-  parent: BaseMagazineBoxLightRifle
-  description: A box made for 60 rounds of .30 rifle ammunition, labeled as incendiary bullets. #imp
+  id: MagazineBoxLightRifleIncendiaryWizden #imp - see the _Impstation directory for the version we use
+  abstract: true
+  parent: BaseMagazineBoxLightRifleWizden #imp
   name: ammunition box (.30 rifle incendiary)
+  description: A cardboard box of .30 rifle rounds. Intended to hold self-igniting incendiary ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeLightRifleIncendiary
@@ -96,10 +93,11 @@
     - state: incendiary
 
 - type: entity
-  parent: BaseMagazineBoxLightRifle
-  id: MagazineBoxLightRifleUranium
+  parent: BaseMagazineBoxLightRifleWizden #imp
+  id: MagazineBoxLightRifleUraniumWizden #imp - see the _Impstation directory for the version we use
+  abstract: true
   name: ammunition box (.30 rifle uranium)
-  description: A box made for 60 rounds of .30 rifle ammunition, labeled as uranium bullets. #imp
+  description: A cardboard box of .30 rifle rounds. Intended to hold exotic uranium-core ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeLightRifleUranium

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml

@@ -1,9 +1,7 @@
 - type: entity
-  abstract: true
   parent: BaseItem
-  id: BaseMagazineBoxMagnum
-  name: ammunition box (.45 magnum) #imp
-  description: A box made for 12 rounds of .45 magnum ammunition. #imp
+  id: BaseMagazineBoxMagnumWizden #imp - see the _Impstation directory for the version we use
+  abstract: true
   components:
   - type: BallisticAmmoProvider
     mayTransfer: true
@@ -18,7 +16,7 @@
     containers:
       ballistic-ammo: !type:Container
   - type: Sprite
-    sprite: _Impstation/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi # imp
+    sprite: Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi
   - type: MagazineVisuals
     magState: mag
     steps: 4
@@ -28,9 +26,10 @@
 # Boxes
 - type: entity
   parent: BaseMagazineBoxMagnum
-  id: MagazineBoxMagnum
+  id: MagazineBoxMagnumWizden #imp - see the _Impstation directory for the version we use
+  abstract: true
   name: ammunition box (.45 magnum)
-  description: A box made for 12 rounds of .45 magnum ammunition, labeled as live-fire bullets. #imp
+  description: A cardboard box of .45 magnum rounds. Intended to hold general-purpose kinetic ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeMagnum
@@ -43,9 +42,10 @@
 
 - type: entity
   parent: BaseMagazineBoxMagnum
-  id: MagazineBoxMagnumPractice
+  id: MagazineBoxMagnumPracticeWizden #imp - see the _Impstation directory for the version we use
+  abstract: true
   name: ammunition box (.45 magnum practice)
-  description: A box made for 12 rounds of .45 magnum ammunition, labeled as practice bullets. #imp
+  description: A cardboard box of .45 magnum rounds. Intended to hold non-harmful chalk ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeMagnumPractice
@@ -58,10 +58,11 @@
     - state: practice
 
 - type: entity
-  id: MagazineBoxMagnumIncendiary
+  id: MagazineBoxMagnumIncendiaryWizden #imp - see the _Impstation directory for the version we use
+  abstract: true
   parent: BaseMagazineBoxMagnum
   name: ammunition box (.45 magnum incendiary)
-  description: A box made for 12 rounds of .45 magnum ammunition, labeled as incendiary bullets. #imp
+  description: A cardboard box of .45 magnum rounds. Intended to hold self-igniting incendiary ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeMagnumIncendiary
@@ -74,10 +75,11 @@
     - state: incendiary
 
 - type: entity
-  id: MagazineBoxMagnumUranium
+  id: MagazineBoxMagnumUraniumWizden #imp - see the _Impstation directory for the version we use
+  abstract: true
   parent: BaseMagazineBoxMagnum
   name: ammunition box (.45 magnum uranium)
-  description: A box made for 12 rounds of .45 magnum ammunition, labeled as uranium bullets. #imp
+  description: A cardboard box of .45 magnum rounds. Intended to hold exotic uranium-core ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeMagnumUranium
@@ -90,10 +92,11 @@
     - state: uranium
 
 - type: entity
-  id: MagazineBoxMagnumAP
+  id: MagazineBoxMagnumAPWizden #imp - see the _Impstation directory for the version we use
+  abstract: true
   parent: BaseMagazineBoxMagnum
   name: ammunition box (.45 magnum armor-piercing)
-  description: A box made for 12 rounds of .45 magnum ammunition, labeled as armor-piercing bullets. #imp
+  description: A cardboard box of .45 magnum rounds. Intended to hold rare armor-piercing ammunition.
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeMagnumAP