From: Dawid Bla <46636558+DawBla@users.noreply.github.com>
Date: Mon, 1 May 2023 03:44:58 +0000 (+0200)
Subject: [fix] ammo typo(#15954)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=449689e6ae98e9ed75c8d7d555a066686ea0c625;p=space-station-14.git

[fix] ammo typo(#15954)
---

diff --git a/Resources/Maps/Dungeon/lava_brig.yml b/Resources/Maps/Dungeon/lava_brig.yml
index d4130f13a6..7ef333b953 100644
--- a/Resources/Maps/Dungeon/lava_brig.yml
+++ b/Resources/Maps/Dungeon/lava_brig.yml
@@ -10010,7 +10010,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 1160
-  type: MagazineBoxAntiMaterial
+  type: MagazineBoxAntiMateriel
   components:
   - pos: 30.58447,8.638441
     parent: 0
diff --git a/Resources/Maps/Salvage/medium-pirate.yml b/Resources/Maps/Salvage/medium-pirate.yml
index 1d88343432..60dda387d2 100644
--- a/Resources/Maps/Salvage/medium-pirate.yml
+++ b/Resources/Maps/Salvage/medium-pirate.yml
@@ -221,7 +221,7 @@ entities:
     parent: 52
     type: Transform
 - uid: 21
-  type: CartridgeAntiMaterial
+  type: CartridgeAntiMateriel
   components:
   - rot: 3.141592653589793 rad
     pos: 0.5569155,2.492195
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimaterial.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml
similarity index 74%
rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimaterial.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml
index a9661ba943..c8a3994658 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimaterial.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml
@@ -1,15 +1,15 @@
 - type: entity
   parent: BaseItem
-  id: MagazineBoxAntiMaterial
-  name: ammunition box (.60 anti-material)
+  id: MagazineBoxAntiMateriel
+  name: ammunition box (.60 anti-materiel)
   components:
   - type: BallisticAmmoProvider
     mayTransfer: true
     capacity: 30
-    proto: CartridgeAntiMaterial
+    proto: CartridgeAntiMateriel
   - type: Sprite
     netsync: false
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/anti_material.rsi
+    sprite: Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimaterial.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimateriel.yml
similarity index 74%
rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimaterial.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimateriel.yml
index 57612048d1..0d8775f37a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimaterial.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimateriel.yml
@@ -1,14 +1,14 @@
 - type: entity
   parent: BaseCartridge
-  id: CartridgeAntiMaterial
-  name: cartridge (.60 anti-material)
+  id: CartridgeAntiMateriel
+  name: cartridge (.60 anti-materiel)
   components:
   - type: Tag
     tags:
     - Cartridge
-    - CartridgeAntiMaterial
+    - CartridgeAntiMateriel
   - type: CartridgeAmmo
-    proto: BulletAntiMaterial
+    proto: BulletAntiMateriel
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Casings/large_casing.rsi
     layers:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimaterial.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml
similarity index 70%
rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimaterial.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml
index 5c9e7a8434..02157e3bb8 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimaterial.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml
@@ -1,8 +1,8 @@
 - type: entity
   noSpawn: true
   parent: BaseBulletHighVelocity
-  id: BulletAntiMaterial
-  name: bullet (.60 anti-material)
+  id: BulletAntiMateriel
+  name: bullet (.60 anti-materiel)
   components:
   - type: Projectile
     damage:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
index e1156ce4e8..9f911c0e06 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -52,7 +52,7 @@
   name: Hristov
   parent: BaseWeaponSniper
   id: WeaponSniperHristov
-  description: A portable anti-armour rifle. Fires armor piercing 14.5mm shells. Uses .60 anti-material ammo.
+  description: A portable anti-materiel rifle. Fires armor piercing 14.5mm shells. Uses .60 anti-materiel ammo.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Snipers/heavy_sniper.rsi
@@ -61,15 +61,15 @@
   - type: BallisticAmmoProvider
     whitelist:
       tags:
-      - CartridgeAntiMaterial
+      - CartridgeAntiMateriel
     capacity: 5
-    proto: CartridgeAntiMaterial
+    proto: CartridgeAntiMateriel
 
 - type: entity
   name: musket
   parent: BaseWeaponSniper
   id: Musket
-  description: This should've been in a museum long before you were born. Uses .60 anti-material ammo.
+  description: This should've been in a museum long before you were born. Uses .60 anti-materiel ammo.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Snipers/musket.rsi
@@ -82,15 +82,15 @@
   - type: BallisticAmmoProvider
     whitelist:
       tags:
-      - CartridgeAntiMaterial
+      - CartridgeAntiMateriel
     capacity: 1
-    proto: CartridgeAntiMaterial
+    proto: CartridgeAntiMateriel
 
 - type: entity
   name: flintlock pistol
   parent: BaseWeaponSniper
   id: WeaponPistolFlintlock
-  description: A pirate's companion. Yarrr! Uses .60 anti-material ammo.
+  description: A pirate's companion. Yarrr! Uses .60 anti-materiel ammo.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Snipers/flintlock.rsi
@@ -99,6 +99,6 @@
   - type: BallisticAmmoProvider
     whitelist:
       tags:
-        - CartridgeAntiMaterial
+        - CartridgeAntiMateriel
     capacity: 1
-    proto: CartridgeAntiMaterial
+    proto: CartridgeAntiMateriel
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 46fa7a7c9b..813b1404eb 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -95,7 +95,7 @@
   id: Cartridge
 
 - type: Tag
-  id: CartridgeAntiMaterial
+  id: CartridgeAntiMateriel
 
 - type: Tag
   id: CartridgeCap
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_material.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/base.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_material.rsi/base.png
rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/base.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_material.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-1.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_material.rsi/mag-1.png
rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-1.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_material.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_material.rsi/meta.json
rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/meta.json