diff --git a/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm b/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm index 0117e16be5..158ed31f67 100644 --- a/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm +++ b/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm @@ -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 @@ -159,7 +159,7 @@ 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="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 @@ -171,7 +171,7 @@ 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="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 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"