Skip to content

Commit

Permalink
Remove Vector assets and renames Vector SMG magazines (#34603)
Browse files Browse the repository at this point in the history
* remove vector and assets

* reverts vector magazine removal; vector magazines renamed to SMG magazine (.45 magnum)

* remove vector from suspicion loot table

* vector migration set to null
  • Loading branch information
K-Dynamic authored Feb 5, 2025
1 parent 16b91ce commit e9c0338
Show file tree
Hide file tree
Showing 14 changed files with 16 additions and 101 deletions.
9 changes: 5 additions & 4 deletions Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,22 +56,23 @@
- id: MagazineLightRiflePractice
amount: 4

# Magnum
- type: entity
name: box of Vector magazines
name: box of SMG .45 magnum magazines
parent: BoxMagazine
id: BoxMagazineMagnumSubMachineGun
description: A box full of Vector magazines.
description: A box full of SMG .45 magnum magazines.
components:
- type: StorageFill
contents:
- id: MagazineMagnumSubMachineGun
amount: 3

- type: entity
name: box of Vector (practice) magazines
name: box of SMG .45 magnum (practice) magazines
parent: BoxMagazine
id: BoxMagazineMagnumSubMachineGunPractice
description: A box full of Vector (practice) magazines.
description: A box full of SMG .45 magnum (practice) magazines.
components:
- type: StorageFill
contents:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

- type: entity
id: BaseMagazineMagnumSubMachineGun
name: "Vector magazine (.45 magnum)"
name: SMG magazine (.45 magnum)
parent: BaseItem
abstract: true
components:
Expand Down Expand Up @@ -116,9 +116,10 @@
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]


- type: entity
id: MagazineMagnumSubMachineGunEmpty
name: "Vector magazine (.45 magnum any)"
name: SMG magazine (.45 magnum any)
suffix: empty
parent: BaseMagazineMagnumSubMachineGun
components:
Expand All @@ -131,7 +132,7 @@

- type: entity
id: MagazineMagnumSubMachineGun
name: "Vector magazine (.45 magnum)"
name: SMG magazine (.45 magnum)
parent: BaseMagazineMagnumSubMachineGun
components:
- type: BallisticAmmoProvider
Expand All @@ -145,7 +146,7 @@

- type: entity
id: MagazineMagnumSubMachineGunPractice
name: "Vector magazine (.45 magnum practice)"
name: SMG magazine (.45 magnum practice)
parent: BaseMagazineMagnumSubMachineGun
components:
- type: BallisticAmmoProvider
Expand All @@ -159,7 +160,7 @@

- type: entity
id: MagazineMagnumSubMachineGunUranium
name: "Vector magazine (.45 magnum uranium)"
name: SMG magazine (.45 magnum uranium)
parent: BaseMagazineMagnumSubMachineGun
components:
- type: BallisticAmmoProvider
Expand All @@ -173,7 +174,7 @@

- type: entity
id: MagazineMagnumSubMachineGunPiercing
name: "Vector magazine (.45 magnum armor-piercing)"
name: SMG magazine (.45 magnum armour-piercing)
parent: BaseMagazineMagnumSubMachineGun
components:
- type: BallisticAmmoProvider
Expand Down
48 changes: 0 additions & 48 deletions Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -177,54 +177,6 @@
zeroVisible: true
- type: Appearance

- type: entity
name: Vector
parent: BaseWeaponSubMachineGun
id: WeaponSubMachineGunVector
suffix: Deprecated use Drozd
description: An excellent fully automatic Heavy SMG. Uses .45 magnum ammo.
components:
- type: Sprite
sprite: Objects/Weapons/Guns/SMGs/vector.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-0
map: ["enum.GunVisualLayers.Mag"]
- type: Clothing
sprite: Objects/Weapons/Guns/SMGs/vector.rsi
- type: Gun
fireRate: 6
selectedMode: FullAuto
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
availableModes:
- FullAuto
- type: ItemSlots
slots:
gun_magazine:
name: Magazine
startingItem: MagazineMagnumSubMachineGun
insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
priority: 2
whitelist:
tags:
- MagazineMagnumSubMachineGun
gun_chamber:
name: Chamber
startingItem: CartridgeMagnum
priority: 1
whitelist:
tags:
- CartridgeMagnum
whitelistFailPopup: gun-magazine-whitelist-fail
- type: MagazineVisuals
magState: mag
steps: 1
zeroVisible: true
- type: Appearance

- type: entity
name: WT550
parent: [ BaseWeaponSubMachineGun, BaseRestrictedContraband ]
Expand Down
3 changes: 0 additions & 3 deletions Resources/Prototypes/LootTables/suspicion_loot_table.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,6 @@
- id: WeaponSubMachineGunC20r
amount: 0
maxAmount: 5
- id: WeaponSubMachineGunVector
amount: 0
maxAmount: 5
- id: WeaponSubMachineGunWt550
amount: 0
maxAmount: 5
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
39 changes: 0 additions & 39 deletions Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/meta.json

This file was deleted.

5 changes: 4 additions & 1 deletion Resources/migration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,6 @@ BoxMagazineCaselessRifleRubber: BoxMagazinePistolCaselessRifle
BoxMagazineMagnumSubMachineGunRubber: BoxMagazineMagnumSubMachineGun
WeaponPistolMk58Nonlethal: WeaponPistolMk58
WeaponPistolN1984Nonlethal: WeaponPistolN1984
WeaponSubMachineGunVectorRubber: WeaponSubMachineGunVector
WeaponSubMachineGunDrozdRubber: WeaponSubMachineGunDrozd
WeaponRifleLecterRubber: WeaponRifleLecter

Expand Down Expand Up @@ -546,3 +545,7 @@ ClothingMaskSexyMime: ClothingMaskBlushingMime

# 2025-01-27
FoodCondimentPacketFrostoil: FoodCondimentPacketColdsauce

#2025-02-05
WeaponSubMachineGunVector: null
WeaponSubMachineGunVectorRubber: null

0 comments on commit e9c0338

Please sign in to comment.