tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Operation Remove Gun Bloat (#38104)

Browse Source 
* Remove long-unused magazines

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Not sure why that failed, going to rerun tests real quick

* Testing if this resolves the tests. Anyone know how to run tests locally, without waiting for github?

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fully removed boxes of vector ammo and the vector ammo tag

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* This might fix the tests

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Nulled more =

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Nulled more migrations

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

---------

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
This commit is contained in:
Nox
2025-07-10 05:36:18 -07:00
committed by GitHub
parent 3896dbb375
commit 5a3368b0fa
6 changed files with 22 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
View File

@@ -57,27 +57,6 @@
amount: 4 amount: 4
# Magnum # Magnum
- type: entity
name: box of SMG .45 magnum magazines
parent: BoxMagazine
id: BoxMagazineMagnumSubMachineGun
description: A box full of SMG .45 magnum magazines.
components:
- type: StorageFill
contents:
- id: MagazineMagnumSubMachineGun
amount: 3
- type: entity
name: box of SMG .45 magnum (practice) magazines
parent: BoxMagazine
id: BoxMagazineMagnumSubMachineGunPractice
description: A box full of SMG .45 magnum (practice) magazines.
components:
- type: StorageFill
contents:
- id: MagazineMagnumSubMachineGunPractice
amount: 3
# Pistol # Pistol
- type: entity - type: entity

82
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
View File

@@ -32,25 +32,6 @@
zeroVisible: false zeroVisible: false
- type: Appearance - type: Appearance
- type: entity
id: BaseMagazineCaselessRifleShort
name: "caseless rifle short magazine (.25 caseless)"
parent: BaseMagazineCaselessRifle
abstract: true
components:
- type: BallisticAmmoProvider
proto: CartridgeCaselessRifle
capacity: 10
- type: Item
size: Tiny
- type: Sprite
sprite: Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- type: entity - type: entity
id: BaseMagazinePistolCaselessRifle id: BaseMagazinePistolCaselessRifle
name: "pistol magazine (.25 caseless)" name: "pistol magazine (.25 caseless)"
@@ -81,21 +62,6 @@
zeroVisible: false zeroVisible: false
- type: Appearance - type: Appearance
- type: entity
id: MagazineCaselessRifle10x24
name: "box magazine (.25 caseless)"
parent: BaseMagazineCaselessRifle
components:
- type: BallisticAmmoProvider
proto: CartridgeCaselessRifle
capacity: 99
- type: Sprite
sprite: Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi
- type: MagazineVisuals
magState: mag
steps: 8
zeroVisible: false
- type: entity - type: entity
id: MagazinePistolCaselessRifle id: MagazinePistolCaselessRifle
name: "pistol magazine (.25 caseless)" name: "pistol magazine (.25 caseless)"
@@ -202,51 +168,3 @@
- state: inhand-right-mag - state: inhand-right-mag
- state: inhand-right-stripe - state: inhand-right-stripe
color: "#dbdbdb" color: "#dbdbdb"
- type: entity
id: MagazineCaselessRifleShort
name: "short magazine (.25 caseless)"
parent: BaseMagazineCaselessRifleShort
components:
- type: BallisticAmmoProvider
proto: CartridgeCaselessRifle
capacity: 20
- type: Sprite
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- type: Item
inhandVisuals:
left:
- state: inhand-left-mag
right:
- state: inhand-right-mag
- type: entity
id: MagazineCaselessRifleShortPractice
name: "short magazine (.25 caseless practice)"
parent: BaseMagazineCaselessRifleShort
components:
- type: BallisticAmmoProvider
proto: CartridgeCaselessRiflePractice
capacity: 20
- 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"

33
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
View File

@@ -178,36 +178,3 @@
- state: inhand-right-mag - state: inhand-right-mag
- state: inhand-right-stripe - state: inhand-right-stripe
color: "#ff6e52" color: "#ff6e52"
- type: entity
id: MagazineLightRifleMaxim
name: "pan magazine (.30 rifle)"
parent: BaseMagazineLightRifle
components:
- type: Tag
tags:
- MagazineLightRiflePan
- type: BallisticAmmoProvider
proto: CartridgeLightRifle
capacity: 96
- type: Sprite
sprite: Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/maxim.rsi
- type: entity
id: MagazineLightRiflePkBox
name: "PK munitions box (.30 rifle)"
parent: BaseMagazineLightRifle
components:
- type: Tag
tags:
- MagazineLightRifleBox
- type: BallisticAmmoProvider
proto: CartridgeLightRifle
capacity: 80
- type: Sprite
sprite: Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/pk_box.rsi
- type: MagazineVisuals
magState: mag
steps: 8
zeroVisible: false
- type: Appearance

152
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
View File

@@ -14,39 +14,6 @@
- CartridgeMagnum - CartridgeMagnum
capacity: 7 capacity: 7
- type: entity
id: BaseMagazineMagnumSubMachineGun
name: SMG magazine (.45 magnum)
parent: BaseItem
abstract: true
components:
- type: Tag
tags:
- MagazineMagnumSubMachineGun
- type: BallisticAmmoProvider
mayTransfer: true
whitelist:
tags:
- CartridgeMagnum
capacity: 25
- type: Item
size: Small
- type: ContainerContainer
containers:
ballistic-ammo: !type:Container
- type: Sprite
sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- type: MagazineVisuals
magState: mag
steps: 2
zeroVisible: false
- type: Appearance
- type: entity - type: entity
id: MagazineMagnumEmpty id: MagazineMagnumEmpty
name: pistol magazine (.45 magnum any) name: pistol magazine (.45 magnum any)
@@ -170,122 +137,3 @@
- state: inhand-right-mag - state: inhand-right-mag
- state: inhand-right-stripe - state: inhand-right-stripe
color: "#540000" color: "#540000"
- type: entity
id: MagazineMagnumSubMachineGunEmpty
name: SMG magazine (.45 magnum any)
suffix: empty
parent: BaseMagazineMagnumSubMachineGun
components:
- type: BallisticAmmoProvider
proto: null
- type: Sprite
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- type: Item
inhandVisuals:
left:
- state: inhand-left-mag
right:
- state: inhand-right-mag
- type: entity
id: MagazineMagnumSubMachineGun
name: SMG magazine (.45 magnum)
parent: BaseMagazineMagnumSubMachineGun
components:
- type: BallisticAmmoProvider
proto: CartridgeMagnum
- type: Sprite
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- type: Item
inhandVisuals:
left:
- state: inhand-left-mag
right:
- state: inhand-right-mag
- type: entity
id: MagazineMagnumSubMachineGunPractice
name: SMG magazine (.45 magnum practice)
parent: BaseMagazineMagnumSubMachineGun
components:
- type: BallisticAmmoProvider
proto: CartridgeMagnumPractice
- 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: MagazineMagnumSubMachineGunUranium
name: SMG magazine (.45 magnum uranium)
parent: BaseMagazineMagnumSubMachineGun
components:
- type: BallisticAmmoProvider
proto: CartridgeMagnumUranium
- 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: MagazineMagnumSubMachineGunPiercing
name: SMG magazine (.45 magnum armour-piercing)
parent: BaseMagazineMagnumSubMachineGun
components:
- type: BallisticAmmoProvider
proto: CartridgeMagnumAP
- type: Sprite
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#540000"
- type: Item
inhandVisuals:
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#540000"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#540000"

3
Resources/Prototypes/tags.yml
View File

@@ -890,9 +890,6 @@
- type: Tag - type: Tag
id: MagazineShotgun id: MagazineShotgun
- type: Tag
id: MagazineMagnumSubMachineGun
- type: Tag - type: Tag
id: MagazinePistolSubMachineGun id: MagazinePistolSubMachineGun

28
Resources/migration.yml
View File

@@ -34,7 +34,7 @@ lanternextrabright: LanternFlash
# 2023-08-04 # 2023-08-04
BoxMagazineLightRifleHighVelocity: BoxMagazineLightRifle BoxMagazineLightRifleHighVelocity: BoxMagazineLightRifle
BoxMagazineMagnumSubMachineGunHighVelocity: BoxMagazineMagnumSubMachineGun BoxMagazineMagnumSubMachineGunHighVelocity: null
BoxMagazinePistolCaselessRifleHighVelocity: BoxMagazinePistolCaselessRifle BoxMagazinePistolCaselessRifleHighVelocity: BoxMagazinePistolCaselessRifle
BoxMagazinePistolHighCapacityHighVelocity: BoxMagazinePistolHighCapacity BoxMagazinePistolHighCapacityHighVelocity: BoxMagazinePistolHighCapacity
BoxMagazinePistolHighVelocity: BoxMagazinePistol BoxMagazinePistolHighVelocity: BoxMagazinePistol
@@ -56,9 +56,9 @@ MagazineBoxMagnumHighVelocity: MagazineBoxMagnum
MagazineBoxPistolHighVelocity: MagazineBoxPistol MagazineBoxPistolHighVelocity: MagazineBoxPistol
MagazineBoxRifleHighVelocity: MagazineBoxRifle MagazineBoxRifleHighVelocity: MagazineBoxRifle
MagazineCaselessRifleHighVelocity: MagazineCaselessRifle MagazineCaselessRifleHighVelocity: MagazineCaselessRifle
MagazineCaselessRifleShortHighVelocity: MagazineCaselessRifleShort MagazineCaselessRifleShortHighVelocity: null
MagazineLightRifleHighVelocity: MagazineLightRifle MagazineLightRifleHighVelocity: MagazineLightRifle
MagazineMagnumSubMachineGunHighVelocity: MagazineMagnumSubMachineGun MagazineMagnumSubMachineGunHighVelocity: null
MagazinePistolCaselessRifleHighVelocity: MagazinePistolCaselessRifle MagazinePistolCaselessRifleHighVelocity: MagazinePistolCaselessRifle
MagazinePistolHighCapacityHighVelocity: MagazinePistolHighCapacity MagazinePistolHighCapacityHighVelocity: MagazinePistolHighCapacity
MagazinePistolHighVelocity: MagazinePistol MagazinePistolHighVelocity: MagazinePistol
@@ -302,11 +302,11 @@ MagazinePistolRubber: MagazinePistol
MagazinePistolSubMachineGunRubber: MagazinePistolSubMachineGun MagazinePistolSubMachineGunRubber: MagazinePistolSubMachineGun
MagazinePistolCaselessRifleRubber: MagazinePistolCaselessRifle MagazinePistolCaselessRifleRubber: MagazinePistolCaselessRifle
MagazineMagnumRubber: MagazineMagnum MagazineMagnumRubber: MagazineMagnum
MagazineMagnumSubMachineGunRubber: MagazineMagnumSubMachineGun MagazineMagnumSubMachineGunRubber: null
MagazineLightRifleRubber: MagazineLightRifle MagazineLightRifleRubber: MagazineLightRifle
MagazineRifleRubber: MagazineRifle MagazineRifleRubber: MagazineRifle
MagazineCaselessRifleRubber: MagazineCaselessRifle MagazineCaselessRifleRubber: MagazineCaselessRifle
MagazineCaselessRifleShortRubber: MagazineCaselessRifleShort MagazineCaselessRifleShortRubber: null
SpeedLoaderPistolRubber: SpeedLoaderPistol SpeedLoaderPistolRubber: SpeedLoaderPistol
SpeedLoaderMagnumRubber: SpeedLoaderMagnum SpeedLoaderMagnumRubber: SpeedLoaderMagnum
MagazineBoxPistolRubber: MagazineBoxPistol MagazineBoxPistolRubber: MagazineBoxPistol
@@ -322,7 +322,7 @@ BoxMagazinePistolSubMachineGunRubber: BoxMagazinePistolSubMachineGun
BoxMagazineLightRifleRubber: BoxMagazineLightRifle BoxMagazineLightRifleRubber: BoxMagazineLightRifle
BoxMagazineRifleRubber: BoxMagazineRifle BoxMagazineRifleRubber: BoxMagazineRifle
BoxMagazineCaselessRifleRubber: BoxMagazinePistolCaselessRifle BoxMagazineCaselessRifleRubber: BoxMagazinePistolCaselessRifle
BoxMagazineMagnumSubMachineGunRubber: BoxMagazineMagnumSubMachineGun BoxMagazineMagnumSubMachineGunRubber: null
WeaponPistolMk58Nonlethal: WeaponPistolMk58 WeaponPistolMk58Nonlethal: WeaponPistolMk58
WeaponPistolN1984Nonlethal: WeaponPistolN1984 WeaponPistolN1984Nonlethal: WeaponPistolN1984
WeaponSubMachineGunDrozdRubber: WeaponSubMachineGunDrozd WeaponSubMachineGunDrozdRubber: WeaponSubMachineGunDrozd
@@ -654,6 +654,22 @@ SpawnHonkBot: SpawnMobHonkBot
CrateFoodPizzaLarge: CrateFoodPizza CrateFoodPizzaLarge: CrateFoodPizza
CrateFoodSoftdrinksLarge: CrateFoodSoftdrinks CrateFoodSoftdrinksLarge: CrateFoodSoftdrinks
# 2025-06-06
MagazineLightRifleMaxim: null
MagazineLightRiflePkBox: null
MagazineCaselessRifle10x24: null
BaseMagazineCaselessRifleShort: null
MagazineCaselessRifleShort: null
MagazineCaselessRifleShortPractice: null
BaseMagazineMagnumSubMachineGun: null
MagazineMagnumSubMachineGunEmpty: null
MagazineMagnumSubMachineGun: null
MagazineMagnumSubMachineGunPractice: null
MagazineMagnumSubMachineGunUranium: null
MagazineMagnumSubMachineGunPiercing: null
BoxMagazineMagnumSubMachineGun: null
BoxMagazineMagnumSubMachineGunPractice: null
# 2025-06-09 # 2025-06-09
BarSignAlignTile: BarSign BarSignAlignTile: BarSign
BarSignComboCafeAlignTile: BarSignComboCafe BarSignComboCafeAlignTile: BarSignComboCafe