Merge pull request #3004 from Screemonster/ivegotmyionyou

Ion gun / EMP bugfix and refactor

code/modules/organs/internal/organ_internal_vr.dm

@@ -0,0 +1,11 @@
+/obj/item/organ/internal/eyes/emp_act(severity)
+	if(!(robotic >= ORGAN_ASSISTED))
+		return
+	owner.eye_blurry += (4/severity)
+
+/obj/item/organ/internal/cell/emp_act(severity)
+	owner.nutrition = max(0, owner.nutrition - rand(10/severity, 50/severity))
+
+/obj/item/organ/internal/mmi_holder/emp_act(severity)
+	owner.adjustToxLoss(rand(6/severity, 12/severity))
+

code/modules/projectiles/guns/energy/special_vr.dm

@@ -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

code/modules/projectiles/projectile/special.dm

@@ -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"

code/modules/projectiles/projectile/special_vr.dm

@@ -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
+