diff --git a/code/modules/projectiles/boxes_magazines/external/smg.dm b/code/modules/projectiles/boxes_magazines/external/smg.dm index 53bf3ef45a5..9d1fa75a241 100644 --- a/code/modules/projectiles/boxes_magazines/external/smg.dm +++ b/code/modules/projectiles/boxes_magazines/external/smg.dm @@ -17,6 +17,20 @@ /obj/item/ammo_box/magazine/cg45/empty start_empty = TRUE +/obj/item/ammo_box/magazine/vss + name = "Vss magazine (9mm)" + icon = 'icons/fallout/objects/guns/ammo.dmi' + icon_state = "vss" + ammo_type = /obj/item/ammo_casing/c9mm + caliber = list(CALIBER_9MM) + max_ammo = 30 + multiple_sprites = 2 + custom_materials = list(/datum/material/iron = MATS_SMG) + w_class = WEIGHT_CLASS_SMALL + +/obj/item/ammo_box/magazine/vss + start_empty = TRUE + /obj/item/ammo_box/magazine/greasegun name = "Grease gun magazine (.45ACP)" icon = 'icons/fallout/objects/guns/ammo.dmi' diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index db9bc6f9778..9bb7914fa38 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -155,6 +155,33 @@ extra_mag_types = /obj/item/ammo_box/magazine/m22smg //lets you use it as a standard .22 when you run out of unobtainable bees. init_mag_type = /obj/item/ammo_box/magazine/b180 +/* * * * * * * * * * * + * VSS Vintorez + * 9mm + * suppressed + * two handed + * fast shooting + * * * * * * * * * * */ + +/obj/item/gun/ballistic/automatic/smg/vss + name = "VSS" + desc = "An integrally suppressed compact chambered in the rare 9x39. Where did you even GET this?!" + icon_state = "vss" + item_state = "vss" + mob_overlay_icon = 'icons/fallout/onmob/backslot_weapon.dmi' + mag_type = /obj/item/ammo_box/magazine/vss + init_mag_type = /obj/item/ammo_box/magazine/vss + weapon_class = WEAPON_CLASS_CARBINE + weapon_weight = GUN_ONE_HAND_ONLY + damage_multiplier = GUN_EXTRA_DAMAGE_0 + init_recoil = AUTOCARBINE_RECOIL(1, 1) + init_firemodes = list( + /datum/firemode/automatic/rpm300, + /datum/firemode/semi_auto/faster + ) + silenced = TRUE + fire_sound_silenced = 'sound/f13weapons/american180.ogg' + /* * * * * * * * * * * * 14mm SMG * Heavy SMG diff --git a/icons/fallout/objects/guns/ammo.dmi b/icons/fallout/objects/guns/ammo.dmi index 4d447e3d0db..d01220414d9 100644 Binary files a/icons/fallout/objects/guns/ammo.dmi and b/icons/fallout/objects/guns/ammo.dmi differ diff --git a/icons/fallout/objects/guns/ballistic.dmi b/icons/fallout/objects/guns/ballistic.dmi index a75bc6c118c..2e62f13b68d 100644 Binary files a/icons/fallout/objects/guns/ballistic.dmi and b/icons/fallout/objects/guns/ballistic.dmi differ diff --git a/icons/fallout/onmob/backslot_weapon.dmi b/icons/fallout/onmob/backslot_weapon.dmi index c9e9b0cbe04..506a03dc445 100644 Binary files a/icons/fallout/onmob/backslot_weapon.dmi and b/icons/fallout/onmob/backslot_weapon.dmi differ diff --git a/icons/fallout/onmob/weapons/guns_lefthand.dmi b/icons/fallout/onmob/weapons/guns_lefthand.dmi index 9fe67d5c6cf..d9e34c9d69c 100644 Binary files a/icons/fallout/onmob/weapons/guns_lefthand.dmi and b/icons/fallout/onmob/weapons/guns_lefthand.dmi differ diff --git a/icons/fallout/onmob/weapons/guns_righthand.dmi b/icons/fallout/onmob/weapons/guns_righthand.dmi index e3814979159..4429c3bf67f 100644 Binary files a/icons/fallout/onmob/weapons/guns_righthand.dmi and b/icons/fallout/onmob/weapons/guns_righthand.dmi differ diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index 58564c77635..cdcf50493d3 100644 Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ diff --git a/icons/mob/inhands/weapons/guns_lefthand.dmi b/icons/mob/inhands/weapons/guns_lefthand.dmi index fcbe474ee4c..36ed60b496d 100644 Binary files a/icons/mob/inhands/weapons/guns_lefthand.dmi and b/icons/mob/inhands/weapons/guns_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/guns_righthand.dmi b/icons/mob/inhands/weapons/guns_righthand.dmi index a9d63bacb00..6dcd66e01df 100644 Binary files a/icons/mob/inhands/weapons/guns_righthand.dmi and b/icons/mob/inhands/weapons/guns_righthand.dmi differ diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi index 04a2cc05fde..f502ac38478 100644 Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ