From 1617ac4627f192a5be1799b380270c868742ae59 Mon Sep 17 00:00:00 2001
From: LunarFleet <66186750+LunarFleet@users.noreply.github.com>
Date: Mon, 17 Aug 2020 10:58:14 -0400
Subject: [PATCH 1/2] Flechette merc nerfs

Praise
---
 .../mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm | 5 ++++-
 code/modules/projectiles/projectile/magnetic.dm            | 7 +++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm
index 5bdddb9542..68eb6d40ea 100644
--- a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm
@@ -195,9 +195,12 @@
 
 /mob/living/simple_mob/humanoid/merc/ranged/rifle/mag
 	loot_list = list(/obj/item/weapon/gun/magnetic/railgun/flechette = 100)
-	projectiletype = /obj/item/projectile/bullet/magnetic/flechette
+	projectiletype = /obj/item/projectile/bullet/magnetic/flechette/rapid // Who thought rapid fire 20 damage with 100% armor pen was a good idea? CH edit
 
 	projectilesound = 'sound/weapons/rapidslice.ogg'
+	projectile_dispersion = 5
+	projectile_accuracy = -20
+	base_attack_cooldown = 15
 	reload_max = 10
 
 // Laser Rifle
diff --git a/code/modules/projectiles/projectile/magnetic.dm b/code/modules/projectiles/projectile/magnetic.dm
index c79afc76ca..1fa55afb96 100644
--- a/code/modules/projectiles/projectile/magnetic.dm
+++ b/code/modules/projectiles/projectile/magnetic.dm
@@ -30,6 +30,13 @@
 	damage = 12
 	armor_penetration = 100
 
+/obj/item/projectile/bullet/magnetic/flechette/rapid
+	name = "rapid flechette"
+	icon_state = "flechette"
+	fire_sound = 'sound/weapons/rapidslice.ogg'
+	damage = 10
+	armor_penetration = 35
+
 /obj/item/projectile/bullet/magnetic/flechette/hunting
 	name = "shredder slug"
 	armor_penetration = 30

From 843e2f36d4ec7cb6cb88bc0033007af429fdeb41 Mon Sep 17 00:00:00 2001
From: LunarFleet <66186750+LunarFleet@users.noreply.github.com>
Date: Tue, 18 Aug 2020 08:19:33 -0400
Subject: [PATCH 2/2] Fixes my own stupidity

---
 code/modules/projectiles/projectile/magnetic.dm    | 7 -------
 code/modules/projectiles/projectile/magnetic_ch.dm | 6 ++++++
 vorestation.dme                                    | 1 +
 3 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 code/modules/projectiles/projectile/magnetic_ch.dm

diff --git a/code/modules/projectiles/projectile/magnetic.dm b/code/modules/projectiles/projectile/magnetic.dm
index 1fa55afb96..c79afc76ca 100644
--- a/code/modules/projectiles/projectile/magnetic.dm
+++ b/code/modules/projectiles/projectile/magnetic.dm
@@ -30,13 +30,6 @@
 	damage = 12
 	armor_penetration = 100
 
-/obj/item/projectile/bullet/magnetic/flechette/rapid
-	name = "rapid flechette"
-	icon_state = "flechette"
-	fire_sound = 'sound/weapons/rapidslice.ogg'
-	damage = 10
-	armor_penetration = 35
-
 /obj/item/projectile/bullet/magnetic/flechette/hunting
 	name = "shredder slug"
 	armor_penetration = 30
diff --git a/code/modules/projectiles/projectile/magnetic_ch.dm b/code/modules/projectiles/projectile/magnetic_ch.dm
new file mode 100644
index 0000000000..e86fc19557
--- /dev/null
+++ b/code/modules/projectiles/projectile/magnetic_ch.dm
@@ -0,0 +1,6 @@
+/obj/item/projectile/bullet/magnetic/flechette/rapid
+	name = "rapid flechette"
+	icon_state = "flechette"
+	fire_sound = 'sound/weapons/rapidslice.ogg'
+	damage = 10
+	armor_penetration = 35
\ No newline at end of file
diff --git a/vorestation.dme b/vorestation.dme
index 4535cc5546..e9e3d81da0 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -3378,6 +3378,7 @@
 #include "code\modules\projectiles\projectile\force.dm"
 #include "code\modules\projectiles\projectile\hook.dm"
 #include "code\modules\projectiles\projectile\magnetic.dm"
+#include "code\modules\projectiles\projectile\magnetic_ch.dm"
 #include "code\modules\projectiles\projectile\pellets.dm"
 #include "code\modules\projectiles\projectile\scatter.dm"
 #include "code\modules\projectiles\projectile\special.dm"