From 39935255e4b54ff9ced932d4e8dfec5ffc45551b Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Thu, 28 May 2020 16:47:50 -0400 Subject: [PATCH] VS: KHI rail pistol --- code/modules/projectiles/ammunition/magazines_vr.dm | 8 +++++++- .../projectiles/guns/magnetic/magnetic_railgun_vr.dm | 11 +++++++++++ code/modules/projectiles/projectile/bullets_vr.dm | 10 +++++++++- 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 code/modules/projectiles/guns/magnetic/magnetic_railgun_vr.dm diff --git a/code/modules/projectiles/ammunition/magazines_vr.dm b/code/modules/projectiles/ammunition/magazines_vr.dm index 56221e2dde..0050ae7d47 100644 --- a/code/modules/projectiles/ammunition/magazines_vr.dm +++ b/code/modules/projectiles/ammunition/magazines_vr.dm @@ -1,3 +1,9 @@ /obj/item/ammo_magazine/m9mm/large/preban/hp // Hollow Point Version name = "magazine (9mm hollow-point)" - ammo_type = /obj/item/ammo_casing/a9mm/hp \ No newline at end of file + ammo_type = /obj/item/ammo_casing/a9mm/hp + +/obj/item/weapon/magnetic_ammo/pistol/khi + name = "flechette magazine (small, khi)" + desc = "A magazine containing smaller carbyne flechettes, intended for a pistol." + icon_state = "caseless-mag-short-alt" + remaining = 12 \ No newline at end of file diff --git a/code/modules/projectiles/guns/magnetic/magnetic_railgun_vr.dm b/code/modules/projectiles/guns/magnetic/magnetic_railgun_vr.dm new file mode 100644 index 0000000000..8cbc4ac7c2 --- /dev/null +++ b/code/modules/projectiles/guns/magnetic/magnetic_railgun_vr.dm @@ -0,0 +1,11 @@ +/obj/item/weapon/gun/magnetic/railgun/flechette/pistol/khi + name = "kitsuhana flechette pistol" + desc = "This rail pistol appears to have been 'tampered with', improving it's power storage and efficiency." + + cell = /obj/item/weapon/cell/hyper + capacitor = /obj/item/weapon/stock_parts/capacitor/hyper + + projectile_type = /obj/item/projectile/bullet/magnetic/flechette/small/khi + + load_type = /obj/item/weapon/magnetic_ammo/pistol/khi + loaded = /obj/item/weapon/magnetic_ammo/pistol/khi \ No newline at end of file diff --git a/code/modules/projectiles/projectile/bullets_vr.dm b/code/modules/projectiles/projectile/bullets_vr.dm index adcdf465b5..7b27a08942 100644 --- a/code/modules/projectiles/projectile/bullets_vr.dm +++ b/code/modules/projectiles/projectile/bullets_vr.dm @@ -18,4 +18,12 @@ icon_state = "bullet" damage = 10 taser_effect = 1 - agony = 100 \ No newline at end of file + agony = 100 + +/obj/item/projectile/bullet/magnetic/flechette/small/khi + name = "small carbyne flechette" + icon_state = "flechette" + fire_sound = 'sound/weapons/rapidslice.ogg' + damage = 18 + armor_penetration = 100 + penetrating = 10