From e9c033888476b5a8d628a10d3a2459cf355852a8 Mon Sep 17 00:00:00 2001 From: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com> Date: Thu, 6 Feb 2025 00:39:26 +1200 Subject: [PATCH] Remove Vector assets and renames Vector SMG magazines (#34603) * 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 --- .../Catalog/Fills/Boxes/ammunition.yml | 9 ++-- .../Guns/Ammunition/Magazines/magnum.yml | 13 ++--- .../Objects/Weapons/Guns/SMGs/smgs.yml | 48 ------------------ .../LootTables/suspicion_loot_table.yml | 3 -- .../Weapons/Guns/SMGs/vector.rsi/base.png | Bin 357 -> 0 bytes .../Guns/SMGs/vector.rsi/bolt-open.png | Bin 346 -> 0 bytes .../SMGs/vector.rsi/equipped-BACKPACK.png | Bin 853 -> 0 bytes .../SMGs/vector.rsi/equipped-SUITSTORAGE.png | Bin 853 -> 0 bytes .../Weapons/Guns/SMGs/vector.rsi/icon.png | Bin 380 -> 0 bytes .../Guns/SMGs/vector.rsi/inhand-left.png | Bin 334 -> 0 bytes .../Guns/SMGs/vector.rsi/inhand-right.png | Bin 339 -> 0 bytes .../Weapons/Guns/SMGs/vector.rsi/mag-0.png | Bin 175 -> 0 bytes .../Weapons/Guns/SMGs/vector.rsi/meta.json | 39 -------------- Resources/migration.yml | 5 +- 14 files changed, 16 insertions(+), 101 deletions(-) delete mode 100644 Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/base.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/bolt-open.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-BACKPACK.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-SUITSTORAGE.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/inhand-left.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/inhand-right.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/mag-0.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml index a9fffddd2a..a42d653d52 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml @@ -56,11 +56,12 @@ - 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: @@ -68,10 +69,10 @@ 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: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml index 4f6f101be4..b7378b9991 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml @@ -16,7 +16,7 @@ - type: entity id: BaseMagazineMagnumSubMachineGun - name: "Vector magazine (.45 magnum)" + name: SMG magazine (.45 magnum) parent: BaseItem abstract: true components: @@ -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: @@ -131,7 +132,7 @@ - type: entity id: MagazineMagnumSubMachineGun - name: "Vector magazine (.45 magnum)" + name: SMG magazine (.45 magnum) parent: BaseMagazineMagnumSubMachineGun components: - type: BallisticAmmoProvider @@ -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 @@ -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 @@ -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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 6d768f67be..2fc2fc41e5 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -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 ] diff --git a/Resources/Prototypes/LootTables/suspicion_loot_table.yml b/Resources/Prototypes/LootTables/suspicion_loot_table.yml index c2b00488a8..58414f3d28 100644 --- a/Resources/Prototypes/LootTables/suspicion_loot_table.yml +++ b/Resources/Prototypes/LootTables/suspicion_loot_table.yml @@ -68,9 +68,6 @@ - id: WeaponSubMachineGunC20r amount: 0 maxAmount: 5 - - id: WeaponSubMachineGunVector - amount: 0 - maxAmount: 5 - id: WeaponSubMachineGunWt550 amount: 0 maxAmount: 5 diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/base.png deleted file mode 100644 index 4545503c5783e087e03759dea7613b671d2d8e13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 357 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9F3 z${@^GvDCf{DCipC6XFV_B_t%&)YN2UWg{aa_4M={9UW&dFmQ2kSz207ojO%YO3KjC zP+m?}Sy|c7&reWLaPs5{J9logHZd;ANf8zn4)*i8_+cXp&>-=WAirRS|5(9>?&AAE zCDS}z978JRyq$2D?~npd>usx7UN`%lYyZ1X6*?gyB`mD}eQLMb^OkQS51y0@{JwtD zWqPt`Y5|*3y!%7h^EvT6o?*kV((X8lHyA+7trjG zOky(3f2okM+Wy)a`{dpSv-n$z?n~bZzZrs& b|0%2YX7gTe~DWM4fVpN3< diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/bolt-open.png deleted file mode 100644 index f616d25f874791042cf4ffe6ea41266dfdc575ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 346 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 RG#lsz22WQ%mvv4FO#qR_eR}`^ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/inhand-right.png deleted file mode 100644 index afb543219fa67f4b8f3b0777b7cc1da392b11ee2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 339 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@3A^6XFV_B_$<|jEwB;>{L}%Q&Lil_4OR>Y?YOjw=LNu1kzg)FVdQ&MBb@08veC8UO$Q diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/mag-0.png deleted file mode 100644 index 6aafc0267003aa46d97f6e54933ef80eceff8aa6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?31 zWe{epSZZGe6yy)^32_C|%F4=VX=#p*j#H;j-9IaN6;Oz^B*-tA;Xe?_Tu=iUui@$9 z7*a7OIYEMznX`o_@Mn)(R|b