From 55704e0760dee2d71c5e5a4726919e541a7b872c Mon Sep 17 00:00:00 2001 From: Atermonera Date: Mon, 24 Feb 2020 13:14:28 -0800 Subject: [PATCH] Merge pull request #6729 from Mechoid/RailgunFixxo Fix and tweak station Railguns. --- code/datums/supplypacks/munitions.dm | 8 ++++++++ .../objects/items/weapons/storage/belt.dm | 1 + .../crates_lockers/closets/secure/security.dm | 1 + .../guns/magnetic/magnetic_railgun.dm | 20 ++++++++++--------- code/modules/research/designs/weapons.dm | 7 +++++++ 5 files changed, 28 insertions(+), 9 deletions(-) diff --git a/code/datums/supplypacks/munitions.dm b/code/datums/supplypacks/munitions.dm index 1889c58cfb..45fa6ae3f4 100644 --- a/code/datums/supplypacks/munitions.dm +++ b/code/datums/supplypacks/munitions.dm @@ -168,6 +168,14 @@ containername = "Magnetic weapon crate" access = access_security +/datum/supply_pack/munitions/mshells + name = "Weapons - Magnetic Shells" + contains = list(/obj/item/weapon/magnetic_ammo = 3) + cost = 100 + containertype = /obj/structure/closet/crate/secure/weapon + containername = "Magnetic ammunition crate" + access = access_security + /datum/supply_pack/munitions/shotgunammo name = "Ammunition - Shotgun shells" contains = list( diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 1ab9f67459..8a564be25f 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -162,6 +162,7 @@ /obj/item/weapon/melee/baton, /obj/item/weapon/gun/energy/taser, /obj/item/weapon/gun/energy/stunrevolver, + /obj/item/weapon/gun/magnetic/railgun/heater/pistol, /obj/item/weapon/gun/energy/gun, /obj/item/weapon/flame/lighter, /obj/item/device/flashlight, diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index b4162c6ac8..d9fbfefd87 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -114,6 +114,7 @@ /obj/item/device/flash, /obj/item/weapon/melee/baton/loaded, /obj/item/weapon/gun/magnetic/railgun/heater/pistol/hos, + /obj/item/weapon/rcd_ammo/large, /obj/item/weapon/cell/device/weapon, /obj/item/clothing/accessory/holster/waist, /obj/item/weapon/melee/telebaton, diff --git a/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm b/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm index a2934d29e1..0117e16be5 100644 --- a/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm +++ b/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm @@ -119,7 +119,7 @@ removable_components = TRUE - initial_cell_type = /obj/item/weapon/cell/high + initial_cell_type = /obj/item/weapon/cell/device/weapon initial_capacitor_type = /obj/item/weapon/stock_parts/capacitor fire_delay = 8 @@ -127,7 +127,7 @@ slot_flags = SLOT_BACK slowdown = 0 - slowdown_held = 0 + slowdown_held = 0.3 slowdown_worn = 0 power_cost = 400 @@ -150,14 +150,16 @@ w_class = ITEMSIZE_NORMAL - initial_cell_type = /obj/item/weapon/cell/high + slowdown_held = 0 + + initial_cell_type = /obj/item/weapon/cell/device/weapon initial_capacitor_type = /obj/item/weapon/stock_parts/capacitor slot_flags = SLOT_BELT|SLOT_HOLSTER firemodes = list( - list(mode_name="lethal", power_cost = 2000, projectile_type = /obj/item/projectile/bullet/magnetic/heated, burst=1, fire_delay=8, move_delay=null, one_handed_penalty=0), - list(mode_name="stun", power_cost = 1500, projectile_type = /obj/item/projectile/energy/electrode/stunshot, burst=1, fire_delay=5, move_delay=null, one_handed_penalty=0), + list(mode_name="lethal", power_cost = 500, projectile_type = /obj/item/projectile/bullet/magnetic/heated, burst=1, fire_delay=10, move_delay=null, one_handed_penalty=0), + list(mode_name="stun", power_cost = 350, projectile_type = /obj/item/projectile/energy/electrode/stunshot, burst=1, fire_delay=7, move_delay=null, one_handed_penalty=0), ) /obj/item/weapon/gun/magnetic/railgun/heater/pistol/hos @@ -168,8 +170,8 @@ description_antag = "This weapon starts with a DNA locking chip attached. Using an EMAG on the weapon will disarm it, and allow you to use the chip as your own." firemodes = list( - list(mode_name="lethal", power_cost = 1500, projectile_type = /obj/item/projectile/bullet/magnetic/heated, burst=1, fire_delay=8, move_delay=null, one_handed_penalty=0), - list(mode_name="stun", power_cost = 1200, projectile_type = /obj/item/projectile/energy/electrode/stunshot, burst=1, fire_delay=5, move_delay=null, one_handed_penalty=0), + list(mode_name="lethal", power_cost = 400, projectile_type = /obj/item/projectile/bullet/magnetic/heated, burst=1, fire_delay=8, move_delay=null, one_handed_penalty=0), + list(mode_name="stun", power_cost = 300, projectile_type = /obj/item/projectile/energy/electrode/stunshot, burst=1, fire_delay=5, move_delay=null, one_handed_penalty=0), ) /obj/item/weapon/gun/magnetic/railgun/flechette/sif @@ -184,9 +186,9 @@ slot_flags = SLOT_BACK - slowdown = 0.3 + slowdown_held = 0.3 - power_cost = 200 + power_cost = 300 projectile_type = /obj/item/projectile/bullet/magnetic/flechette/hunting empty_sound = 'sound/weapons/smg_empty_alarm.ogg' diff --git a/code/modules/research/designs/weapons.dm b/code/modules/research/designs/weapons.dm index 81a2bd57d9..13d6036edd 100644 --- a/code/modules/research/designs/weapons.dm +++ b/code/modules/research/designs/weapons.dm @@ -206,6 +206,13 @@ build_path = /obj/item/ammo_casing/chemdart sort_string = "MADBD" +/datum/design/item/weapon/ammo/flechette + id = "magnetic_ammo" + req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 4, TECH_MAGNET = 4) + materials = list(DEFAULT_WALL_MATERIAL = 500, "gold" = 300, "glass" = 150, MAT_PHORON = 100) + build_path = /obj/item/weapon/magnetic_ammo + sort_string = "MADBE" + // Melee weapons /datum/design/item/weapon/melee/AssembleDesignName()