From c3c3f14a8da79aa09c7cc4fa599790dcedc212c1 Mon Sep 17 00:00:00 2001 From: Mechoid Date: Sun, 1 Mar 2020 15:30:10 -0800 Subject: [PATCH 1/2] Tweak Station-Railguns --- .../projectiles/guns/magnetic/magnetic_railgun.dm | 14 +++++++------- code/modules/projectiles/projectile/magnetic.dm | 5 ++++- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm b/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm index 0117e16be5..0668f9327c 100644 --- a/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm +++ b/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm @@ -136,8 +136,8 @@ empty_sound = 'sound/weapons/smg_empty_alarm.ogg' firemodes = list( - list(mode_name="high power", power_cost = 400, projectile_type = /obj/item/projectile/bullet/magnetic/heated, burst=1, fire_delay=8, move_delay=null, one_handed_penalty=15), - list(mode_name="low power", power_cost = 150, projectile_type = /obj/item/projectile/bullet/magnetic/heated/weak, burst=1, fire_delay=5, move_delay=null, one_handed_penalty=15), + list(mode_name="high power", power_cost = 600, projectile_type = /obj/item/projectile/bullet/magnetic/heated, burst=1, fire_delay=8, move_delay=null, one_handed_penalty=15), + list(mode_name="low power", power_cost = 300, projectile_type = /obj/item/projectile/bullet/magnetic/heated/weak, burst=1, fire_delay=5, move_delay=null, one_handed_penalty=15), ) /obj/item/weapon/gun/magnetic/railgun/heater/pistol @@ -150,7 +150,7 @@ w_class = ITEMSIZE_NORMAL - slowdown_held = 0 + slowdown_held = 0.1 initial_cell_type = /obj/item/weapon/cell/device/weapon initial_capacitor_type = /obj/item/weapon/stock_parts/capacitor @@ -158,8 +158,8 @@ slot_flags = SLOT_BELT|SLOT_HOLSTER firemodes = list( - 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), + list(mode_name="lethal", power_cost = 800, 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 = 480, 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 @@ -170,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 = 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), + list(mode_name="lethal", power_cost = 600, 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 = 400, 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 diff --git a/code/modules/projectiles/projectile/magnetic.dm b/code/modules/projectiles/projectile/magnetic.dm index 9e76c3551f..4c36476ddb 100644 --- a/code/modules/projectiles/projectile/magnetic.dm +++ b/code/modules/projectiles/projectile/magnetic.dm @@ -36,13 +36,16 @@ damage = 30 damage_type = SEARING embed_chance = 0 + armor_penetration = 40 + penetrating = 1 /obj/item/projectile/bullet/magnetic/heated/weak icon_state = "gauss_silenced" damage = 15 agony = 5 embed_chance = 0 - armor_penetration = 50 + armor_penetration = 30 + penetrating = 0 /obj/item/projectile/bullet/magnetic/fuelrod name = "fuel rod" From fe3125b56d53e20a52dc3b8b096212d08ea0fb67 Mon Sep 17 00:00:00 2001 From: Mechoid Date: Sun, 8 Mar 2020 22:23:57 -0700 Subject: [PATCH 2/2] Update magnetic_railgun.dm --- .../projectiles/guns/magnetic/magnetic_railgun.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm b/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm index 0668f9327c..158ed31f67 100644 --- a/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm +++ b/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm @@ -136,8 +136,8 @@ empty_sound = 'sound/weapons/smg_empty_alarm.ogg' firemodes = list( - list(mode_name="high power", power_cost = 600, projectile_type = /obj/item/projectile/bullet/magnetic/heated, burst=1, fire_delay=8, move_delay=null, one_handed_penalty=15), - list(mode_name="low power", power_cost = 300, projectile_type = /obj/item/projectile/bullet/magnetic/heated/weak, burst=1, fire_delay=5, move_delay=null, one_handed_penalty=15), + list(mode_name="high power", power_cost = 400, projectile_type = /obj/item/projectile/bullet/magnetic/heated, burst=1, fire_delay=8, move_delay=null, one_handed_penalty=15), + list(mode_name="low power", power_cost = 150, projectile_type = /obj/item/projectile/bullet/magnetic/heated/weak, burst=1, fire_delay=5, move_delay=null, one_handed_penalty=15), ) /obj/item/weapon/gun/magnetic/railgun/heater/pistol @@ -158,8 +158,8 @@ slot_flags = SLOT_BELT|SLOT_HOLSTER firemodes = list( - list(mode_name="lethal", power_cost = 800, 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 = 480, projectile_type = /obj/item/projectile/energy/electrode/stunshot, burst=1, fire_delay=7, 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/strong, burst=1, fire_delay=7, move_delay=null, one_handed_penalty=0), ) /obj/item/weapon/gun/magnetic/railgun/heater/pistol/hos @@ -170,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 = 600, 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 = 400, 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/strong, burst=1, fire_delay=5, move_delay=null, one_handed_penalty=0), ) /obj/item/weapon/gun/magnetic/railgun/flechette/sif