diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Pistols/pistols.yml deleted file mode 100644 index 708cba519e..0000000000 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ /dev/null @@ -1,43 +0,0 @@ -- type: entity - name: Mk32 "Universal" # DeltaV - update Mk32 - parent: BaseWeaponPistol - id: WeaponPistolUniversal - description: The Mark 32 Offensive Handgun, produced by NanoTrasen's Small Arms Division. Uses .45 magnum ammo. # DeltaV - update Mk32 - components: - - type: Sprite - sprite: _DV/Objects/Weapons/Guns/Pistols/universal.rsi # DeltaV - update Mk32 - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-0 - map: ["enum.GunVisualLayers.Mag"] - - type: Clothing - sprite: _DV/Objects/Weapons/Guns/Pistols/universal.rsi # DeltaV - update Mk32 - - type: Gun - fireRate: 3 - availableModes: - - SemiAuto - soundGunshot: - path: /Audio/_DV/Weapons/Guns/Gunshots/universal.ogg - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: MagazineUniversalMagnum - insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg - priority: 2 - whitelist: - tags: - - MagazineUniversalMagnum - gun_chamber: - name: Chamber - startingItem: CartridgeMagnum - priority: 1 - whitelist: - tags: - - CartridgeMagnum - - type: ContainerContainer - containers: - gun_magazine: !type:ContainerSlot - gun_chamber: !type:ContainerSlot diff --git a/Resources/Prototypes/_DV/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/_DV/Catalog/Cargo/cargo_armory.yml index 9aa6dae69b..2b276fa434 100644 --- a/Resources/Prototypes/_DV/Catalog/Cargo/cargo_armory.yml +++ b/Resources/Prototypes/_DV/Catalog/Cargo/cargo_armory.yml @@ -14,7 +14,7 @@ sprite: Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi state: icon product: CrateArmoryUniversal - cost: 16500 + cost: 10500 category: Armory group: market diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index bfca1d17e0..d29dc56ecd 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -262,3 +262,38 @@ whitelist: tags: - CartridgePistol + +- type: entity + parent: BaseWeaponPistol + name: Mk32 "Universal" + id: WeaponPistolUniversal + description: The Mark 32 Offensive Handgun, produced by NanoTrasen's Small Arms Division. Uses .45 magnum ammo. + components: + - type: Sprite + sprite: _DV/Objects/Weapons/Guns/Pistols/universal.rsi + - type: Clothing + sprite: _DV/Objects/Weapons/Guns/Pistols/universal.rsi + - type: Gun + fireRate: 1.5 + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/_DV/Weapons/Guns/Gunshots/universal.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineUniversalMagnum + insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineUniversalMagnum + gun_chamber: + name: Chamber + startingItem: CartridgeMagnum + priority: 1 + whitelist: + tags: + - CartridgeMagnum