From 2cd47f9c80f26c07d56598c46ce67832605e8b54 Mon Sep 17 00:00:00 2001
From: Screemonster <michael.s.edwards@gmail.com>
Date: Sun, 11 Feb 2018 09:27:40 +0000
Subject: [PATCH] squashed commits - ion pistol refactor and away mission emp
 nerf

---
 .../organs/internal/organ_internal_vr.dm       | 11 +++++++++++
 .../projectiles/guns/energy/special_vr.dm      |  5 +++++
 code/modules/projectiles/projectile/special.dm |  6 ++++--
 .../projectiles/projectile/special_vr.dm       | 18 ++++++++++++++++++
 maps/tether/submaps/alienship/_alienship.dm    |  2 +-
 vorestation.dme                                |  3 +++
 6 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 code/modules/organs/internal/organ_internal_vr.dm
 create mode 100644 code/modules/projectiles/guns/energy/special_vr.dm
 create mode 100644 code/modules/projectiles/projectile/special_vr.dm

diff --git a/code/modules/organs/internal/organ_internal_vr.dm b/code/modules/organs/internal/organ_internal_vr.dm
new file mode 100644
index 00000000000..66df7193f0b
--- /dev/null
+++ b/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))
+
diff --git a/code/modules/projectiles/guns/energy/special_vr.dm b/code/modules/projectiles/guns/energy/special_vr.dm
new file mode 100644
index 00000000000..e1cfcaf5c93
--- /dev/null
+++ b/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
\ No newline at end of file
diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm
index 7a6ecd6c1cd..0f1b0abbc67 100644
--- a/code/modules/projectiles/projectile/special.dm
+++ b/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"
diff --git a/code/modules/projectiles/projectile/special_vr.dm b/code/modules/projectiles/projectile/special_vr.dm
new file mode 100644
index 00000000000..959d7997dff
--- /dev/null
+++ b/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
+
diff --git a/maps/tether/submaps/alienship/_alienship.dm b/maps/tether/submaps/alienship/_alienship.dm
index 8203de4f20d..999419d3545 100644
--- a/maps/tether/submaps/alienship/_alienship.dm
+++ b/maps/tether/submaps/alienship/_alienship.dm
@@ -61,7 +61,7 @@
 /obj/machinery/porta_turret/alien/ion
 	name = "interior anti-boarding turret"
 	desc = "A very tough looking turret made by alien hands."
-	installation = /obj/item/weapon/gun/energy/ionrifle/pistol
+	installation = /obj/item/weapon/gun/energy/ionrifle/weak
 	enabled = TRUE
 	lethal = TRUE
 	ailock = TRUE
diff --git a/vorestation.dme b/vorestation.dme
index 284923f1230..06ab4fdec88 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -2225,6 +2225,7 @@
 #include "code\modules\organs\internal\liver.dm"
 #include "code\modules\organs\internal\lungs.dm"
 #include "code\modules\organs\internal\organ_internal.dm"
+#include "code\modules\organs\internal\organ_internal_vr.dm"
 #include "code\modules\organs\subtypes\diona.dm"
 #include "code\modules\organs\subtypes\machine.dm"
 #include "code\modules\organs\subtypes\seromi.dm"
@@ -2350,6 +2351,7 @@
 #include "code\modules\projectiles\guns\energy\particle.dm"
 #include "code\modules\projectiles\guns\energy\pulse.dm"
 #include "code\modules\projectiles\guns\energy\special.dm"
+#include "code\modules\projectiles\guns\energy\special_vr.dm"
 #include "code\modules\projectiles\guns\energy\stun.dm"
 #include "code\modules\projectiles\guns\energy\stun_vr.dm"
 #include "code\modules\projectiles\guns\energy\temperature.dm"
@@ -2384,6 +2386,7 @@
 #include "code\modules\projectiles\projectile\force.dm"
 #include "code\modules\projectiles\projectile\magnetic.dm"
 #include "code\modules\projectiles\projectile\special.dm"
+#include "code\modules\projectiles\projectile\special_vr.dm"
 #include "code\modules\projectiles\targeting\targeting_client.dm"
 #include "code\modules\projectiles\targeting\targeting_gun.dm"
 #include "code\modules\projectiles\targeting\targeting_mob.dm"