Skip to content

Commit

Permalink
Merge pull request #2585 from xXPawnStarrXx/Export
Browse files Browse the repository at this point in the history
Totally nothing that Tox would be interested in, for sure.
  • Loading branch information
Tk420634 committed Jun 30, 2023
2 parents 765004c + dbb7759 commit 406a9ef
Show file tree
Hide file tree
Showing 11 changed files with 41 additions and 0 deletions.
14 changes: 14 additions & 0 deletions code/modules/projectiles/boxes_magazines/external/smg.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
27 changes: 27 additions & 0 deletions code/modules/projectiles/guns/ballistic/automatic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified icons/fallout/objects/guns/ammo.dmi
Binary file not shown.
Binary file modified icons/fallout/objects/guns/ballistic.dmi
Binary file not shown.
Binary file modified icons/fallout/onmob/backslot_weapon.dmi
Binary file not shown.
Binary file modified icons/fallout/onmob/weapons/guns_lefthand.dmi
Binary file not shown.
Binary file modified icons/fallout/onmob/weapons/guns_righthand.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/back.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/weapons/guns_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/weapons/guns_righthand.dmi
Binary file not shown.
Binary file modified icons/obj/guns/projectile.dmi
Binary file not shown.

0 comments on commit 406a9ef

Please sign in to comment.