From: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com> Date: Wed, 5 Feb 2025 12:39:26 +0000 (+1200) Subject: Remove Vector assets and renames Vector SMG magazines (#34603) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=e9c033888476b5a8d628a10d3a2459cf355852a8;p=space-station-14.git 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 --- 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 4545503c57..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/base.png and /dev/null differ 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 f616d25f87..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/bolt-open.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-BACKPACK.png deleted file mode 100644 index 061f8bdae9..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-BACKPACK.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-SUITSTORAGE.png deleted file mode 100644 index 061f8bdae9..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-SUITSTORAGE.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/icon.png deleted file mode 100644 index f728a5df1d..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/inhand-left.png deleted file mode 100644 index 9dfe592de8..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/inhand-left.png and /dev/null differ 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 afb543219f..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/inhand-right.png and /dev/null differ 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 6aafc02670..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/mag-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/meta.json deleted file mode 100644 index 02ba281891..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/meta.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified vgstation at https://github.com/vgstation-coders/vgstation13/pull/20330/commits/1604c9cc61a48585e25b5f9eba3e179c06362372, backpack sprite by Peptide (copy of Atreides), backpack sling sprite edited by Boaz1111", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-open" - }, - { - "name": "mag-0" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-BACKPACK", - "directions": 4 - }, - { - "name": "equipped-SUITSTORAGE", - "directions": 4 - } - ] -} diff --git a/Resources/migration.yml b/Resources/migration.yml index 4a402de2dc..f53dc9fd32 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -326,7 +326,6 @@ BoxMagazineCaselessRifleRubber: BoxMagazinePistolCaselessRifle BoxMagazineMagnumSubMachineGunRubber: BoxMagazineMagnumSubMachineGun WeaponPistolMk58Nonlethal: WeaponPistolMk58 WeaponPistolN1984Nonlethal: WeaponPistolN1984 -WeaponSubMachineGunVectorRubber: WeaponSubMachineGunVector WeaponSubMachineGunDrozdRubber: WeaponSubMachineGunDrozd WeaponRifleLecterRubber: WeaponRifleLecter @@ -546,3 +545,7 @@ ClothingMaskSexyMime: ClothingMaskBlushingMime # 2025-01-27 FoodCondimentPacketFrostoil: FoodCondimentPacketColdsauce + +#2025-02-05 +WeaponSubMachineGunVector: null +WeaponSubMachineGunVectorRubber: null