squashed commits - ion pistol refactor and away mission emp nerf

This commit is contained in:
Screemonster
2018-02-11 09:27:40 +00:00
parent 9e13e427d6
commit 2cd47f9c80
6 changed files with 42 additions and 3 deletions

View File

@@ -0,0 +1,5 @@
/obj/item/weapon/gun/energy/ionrifle/pistol
projectile_type = /obj/item/projectile/ion/pistol // still packs a punch but no AoE
/obj/item/weapon/gun/energy/ionrifle/weak
projectile_type = /obj/item/projectile/ion/small

View File

@@ -8,15 +8,17 @@
light_range = 2
light_power = 0.5
light_color = "#55AAFF"
var/pulse_range = 1
//var/pulse_range = 1 vorestation removal
/obj/item/projectile/ion/on_hit(var/atom/target, var/blocked = 0)
empulse(target, pulse_range, pulse_range, pulse_range, pulse_range)
empulse(target, sev1_range, sev2_range, sev3_range, sev4_range) // vorestation edit
return 1
/* vorestation removal - moved to vr file
/obj/item/projectile/ion/small
pulse_range = 0
*/
/obj/item/projectile/bullet/gyro
name ="explosive bolt"

View File

@@ -0,0 +1,18 @@
/obj/item/projectile/ion
var/sev1_range = 0
var/sev2_range = 1
var/sev3_range = 1
var/sev4_range = 2
/obj/item/projectile/ion/small
sev1_range = -1
sev2_range = 0
sev3_range = 0
sev4_range = 1
/obj/item/projectile/ion/pistol
sev1_range = 0
sev2_range = 0
sev3_range = 0
sev4_range = 0