Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Magazine name renamed to be more specific (#3702)

Browse Source 
* Magazine names are more specific

* Fix capitalization on magazine names

* Proper capitalization

Un-capitalized "Machine Pistol" and "Pistol"
This commit is contained in:
BulletGrade
2021-03-28 03:06:20 -03:00
committed by GitHub
parent 776ad7da8e
commit 4939429399
3 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/magazines.yml
View File

@@ -27,7 +27,7 @@
# Magazines
- type: entity
id: MagazineLRifleBox
name: "magazine box (.30 rifle)"
name: "L6 SAW magazine box (.30 rifle)"
parent: MagazineLRifleBase
components:
- type: RangedMagazine

22
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/magazines.yml
View File

@@ -1,7 +1,7 @@
# Empty mags
- type: entity
id: MagazineMagnumBase
name: "magazine (.40 magnum)"
name: "Lamia magazine (.40 magnum)"
parent: BaseItem
abstract: true
components:
@@ -26,7 +26,7 @@
- type: entity
id: MagazineMagnumSmgBase
name: "SMG Magazine (.40 magnum)"
name: "Drozd magazine (.40 magnum)"
parent: BaseItem
abstract: true
components:
@@ -52,7 +52,7 @@
# Magazines
- type: entity
id: MagazineMagnum
name: "magazine (.40 magnum)"
name: "Lamia magazine (.40 magnum)"
parent: MagazineMagnumBase
components:
- type: RangedMagazine
@@ -63,7 +63,7 @@
- type: entity
id: MagazineMagnumFlash
name: "magazine (.40 magnum flash)"
name: "Lamia magazine (.40 magnum flash)"
parent: MagazineMagnumBase
components:
- type: RangedMagazine
@@ -74,7 +74,7 @@
- type: entity
id: MagazineMagnumHV
name: "magazine (.40 magnum high-velocity)"
name: "Lamia magazine (.40 magnum high-velocity)"
parent: MagazineMagnumBase
components:
- type: RangedMagazine
@@ -85,7 +85,7 @@
- type: entity
id: MagazineMagnumPractice
name: "magazine (.40 magnum practice)"
name: "Lamia magazine (.40 magnum practice)"
parent: MagazineMagnumBase
components:
- type: RangedMagazine
@@ -96,7 +96,7 @@
- type: entity
id: MagazineMagnumRubber
name: "magazine (.40 magnum rubber)"
name: "Lamia magazine (.40 magnum rubber)"
parent: MagazineMagnumBase
components:
- type: RangedMagazine
@@ -107,7 +107,7 @@
- type: entity
id: MagazineMagnumSmg
name: "SMG Magazine (.40 magnum)"
name: "Drozd magazine (.40 magnum)"
parent: MagazineMagnumSmgBase
components:
- type: RangedMagazine
@@ -118,7 +118,7 @@
- type: entity
id: MagazineMagnumSmgHV
name: "SMG Magazine (.40 magnum High-Velocity)"
name: "Drozd magazine (.40 magnum High-Velocity)"
parent: MagazineMagnumSmgBase
components:
- type: RangedMagazine
@@ -129,7 +129,7 @@
- type: entity
id: MagazineMagnumSmgPractice
name: "SMG Magazine (.40 magnum practice)"
name: "Drozd magazine (.40 magnum practice)"
parent: MagazineMagnumSmgBase
components:
- type: RangedMagazine
@@ -140,7 +140,7 @@
- type: entity
id: MagazineMagnumSmgRubber
name: "SMG Magazine (.40 magnum rubber)"
name: "Drozd magazine (.40 magnum rubber)"
parent: MagazineMagnumSmgBase
components:
- type: RangedMagazine

37
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/magazines.yml
View File

@@ -1,6 +1,7 @@
# Empty mags
- type: entity
id: MagazinePistolBase
name: magazine (.35 auto)
name: pistol magazine (.35 auto)
parent: BaseItem
abstract: true
components:
@@ -25,7 +26,7 @@
- type: entity
id: MagazinePistolHCBase
name: high-capacity magazine (.35 auto)
name: machine pistol magazine (.35 auto)
parent: BaseItem
abstract: true
components:
@@ -76,7 +77,7 @@
# Magazines
- type: entity
id: MagazinePistolSmgTopMounted
name: SMG magazine (.35 auto top-mounted)
name: WT550 magazine (.35 auto top-mounted)
parent: MagazinePistolSmgBase
components:
- type: RangedMagazine
@@ -101,7 +102,7 @@
- type: entity
id: MagazinePistolCalicoTopMounted
name: Calico Magazine (.35 auto top-mounted)
name: Calico magazine (.35 auto top-mounted)
parent: MagazinePistolSmgBase
components:
- type: RangedMagazine
@@ -126,7 +127,7 @@
- type: entity
id: MagazinePistol
name: magazine (.35 auto)
name: pistol magazine (.35 auto)
parent: MagazinePistolBase
components:
- type: RangedMagazine
@@ -137,7 +138,7 @@
- type: entity
id: MagazinePistolFlash
name: magazine (.35 auto flash)
name: pistol magazine (.35 auto flash)
parent: MagazinePistolBase
components:
- type: RangedMagazine
@@ -148,7 +149,7 @@
- type: entity
id: MagazinePistolHV
name: magazine (.35 auto high-velocity)
name: pistol magazine (.35 auto high-velocity)
parent: MagazinePistolBase
components:
- type: RangedMagazine
@@ -159,7 +160,7 @@
- type: entity
id: MagazinePistolPractice
name: magazine (.35 auto practice)
name: pistol magazine (.35 auto practice)
parent: MagazinePistolBase
components:
- type: RangedMagazine
@@ -170,7 +171,7 @@
- type: entity
id: MagazinePistolRubber
name: magazine (.35 auto rubber)
name: pistol magazine (.35 auto rubber)
parent: MagazinePistolBase
components:
- type: RangedMagazine
@@ -181,7 +182,7 @@
- type: entity
id: MagazineHCPistol
name: high-capacity magazine (.35 auto)
name: machine pistol magazine (.35 auto)
parent: MagazinePistolHCBase
components:
- type: RangedMagazine
@@ -192,7 +193,7 @@
- type: entity
id: MagazineHCPistolHV
name: high-capacity magazine (.35 auto high-velocity)
name: machine pistol magazine (.35 auto high-velocity)
parent: MagazinePistolHCBase
components:
- type: RangedMagazine
@@ -203,7 +204,7 @@
- type: entity
id: MagazineHCPistolPractice
name: high-capacity magazine (.35 auto practice)
name: machine pistol magazine (.35 auto practice)
parent: MagazinePistolHCBase
components:
- type: RangedMagazine
@@ -214,7 +215,7 @@
- type: entity
id: MagazineHCPistolRubber
name: high-capacity magazine (.35 auto rubber)
name: machine pistol magazine (.35 auto rubber)
parent: MagazinePistolHCBase
components:
- type: RangedMagazine
@@ -225,7 +226,7 @@
- type: entity
id: MagazinePistolSmg
name: SMG Magazine (.35 auto)
name: SMG magazine (.35 auto)
parent: MagazinePistolSmgBase
components:
- type: RangedMagazine
@@ -236,7 +237,7 @@
- type: entity
id: MagazinePistolSmgFlash
name: SMG Magazine (.35 auto flash)
name: SMG magazine (.35 auto flash)
parent: MagazinePistolSmgBase
components:
- type: RangedMagazine
@@ -247,7 +248,7 @@
- type: entity
id: MagazinePistolSmgHV
name: SMG Magazine (.35 auto high-velocity)
name: SMG magazine (.35 auto high-velocity)
parent: MagazinePistolSmgBase
components:
- type: RangedMagazine
@@ -258,7 +259,7 @@
- type: entity
id: MagazinePistolSmgPractice
name: SMG Magazine (.35 auto practice)
name: SMG magazine (.35 auto practice)
parent: MagazinePistolSmgBase
components:
- type: RangedMagazine
@@ -269,7 +270,7 @@
- type: entity
id: MagazinePistolSmgRubber
name: SMG Magazine (.35 auto rubber)
name: SMG magazine (.35 auto rubber)
parent: MagazinePistolSmgBase
components:
- type: RangedMagazine