cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-14 17:54:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #500 from LunarFleet/Lun-Merc

Browse Source 
Flechette merc nerfs
This commit is contained in:
Nadyr
2020-08-19 05:29:53 -04:00
committed by GitHub
parent 54e67b7af8 843e2f36d4
commit af1e935ae7
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm
+4 -1
View File
@@ -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
code/modules/projectiles/projectile/magnetic_ch.dm
+6
View File
@@ -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