From c2b89869f7abcba2a61e05cb941ee48a35dac74e Mon Sep 17 00:00:00 2001
From: SplinterGP <isseisanloverias@gmail.com>
Date: Wed, 20 May 2020 19:58:25 -0300
Subject: [PATCH] Adds olds style net gun back as a new one

---
 .../projectiles/guns/energy/netgun_vr.dm      |  4 +--
 .../projectiles/guns/energy/netgun_yw.dm      | 36 +++++++++++++++++++
 code/modules/research/designs/weapons_vr.dm   |  2 +-
 code/modules/research/designs/weapons_yw.dm   |  7 ++++
 vorestation.dme                               |  2 ++
 5 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 code/modules/projectiles/guns/energy/netgun_yw.dm
 create mode 100644 code/modules/research/designs/weapons_yw.dm

diff --git a/code/modules/projectiles/guns/energy/netgun_vr.dm b/code/modules/projectiles/guns/energy/netgun_vr.dm
index c4246f69c9..007b55cd5f 100644
--- a/code/modules/projectiles/guns/energy/netgun_vr.dm
+++ b/code/modules/projectiles/guns/energy/netgun_vr.dm
@@ -1,7 +1,7 @@
 /obj/item/weapon/gun/energy/netgun
 	name = "energy net gun"
-	desc = "A Hephaestus-designed, usually dubbed 'Hunter' or 'non-lethal capture device' stunner and energy net launcher, \
-			for when you want criminals to stop acting like they're on a 20th century British comedy sketch show."
+	desc = "A Hephaestus-designed, usually dubbed 'non-lethal capture device' energy net launcher, \
+			for when you wanna capture feracious predators." //YW edit - small change to description
 	catalogue_data = list(/datum/category_item/catalogue/information/organization/hephaestus)
 	icon = 'icons/obj/gun_vr.dmi'
 	icon_state = "netgun"
diff --git a/code/modules/projectiles/guns/energy/netgun_yw.dm b/code/modules/projectiles/guns/energy/netgun_yw.dm
new file mode 100644
index 0000000000..11aba2d8fa
--- /dev/null
+++ b/code/modules/projectiles/guns/energy/netgun_yw.dm
@@ -0,0 +1,36 @@
+
+/obj/item/weapon/gun/energy/hunter
+	name = "Hybrid 'Hunter' net gun"
+	desc = "A Hephaestus-designed hybrid of a taser and the energy net gun, usually dubbed 'Hunter' stunner and energy net launcher, \
+			for when you want criminals to stop acting like they're on a 20th century British comedy sketch show."
+	catalogue_data = list(/datum/category_item/catalogue/information/organization/hephaestus)
+	icon = 'icons/obj/gun_vr.dmi'
+	icon_state = "hunter"
+	item_state = "gun" // Placeholder
+	mode_name = "stun"
+
+	fire_sound = 'sound/weapons/eluger.ogg'
+	origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 6, TECH_MAGNET = 4)
+	projectile_type = /obj/item/projectile/beam/stun/blue
+	charge_cost = 240
+	fire_delay = 5
+
+	firemodes = list(
+		list(mode_name="stun", projectile_type=/obj/item/projectile/beam/stun/blue, fire_sound='sound/weapons/Taser.ogg', charge_cost=240, fire_delay=5),
+		list(mode_name="capture", projectile_type=/obj/item/projectile/beam/energy_net, fire_sound = 'sound/weapons/eluger.ogg', charge_cost=1200, fire_delay=50)
+	)
+
+/obj/item/weapon/gun/energy/hunter/update_icon()
+	overlays.Cut()
+
+	if(power_supply)
+		var/ratio = power_supply.charge / power_supply.maxcharge
+
+		if(power_supply.charge < charge_cost)
+			ratio = 0
+		else
+			ratio = max(round(ratio, 0.25) * 100, 25)
+
+		overlays += "[initial(icon_state)]_cell"
+		overlays += "[initial(icon_state)]_[ratio]"
+		overlays += "[initial(icon_state)]_[mode_name]"
\ No newline at end of file
diff --git a/code/modules/research/designs/weapons_vr.dm b/code/modules/research/designs/weapons_vr.dm
index c31db780d0..9ee227dfcf 100644
--- a/code/modules/research/designs/weapons_vr.dm
+++ b/code/modules/research/designs/weapons_vr.dm
@@ -26,7 +26,7 @@
 	sort_string = "MAAVB"
 
 /datum/design/item/weapon/energy/netgun
-	name = "\'Hunter\' capture gun"
+	name = "Energy net gun" //ywedit - hunter is the hybrid one
 	id = "netgun"
 	req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 5, TECH_MAGNET = 3)
 	materials = list(DEFAULT_WALL_MATERIAL = 6000, "glass" = 3000)
diff --git a/code/modules/research/designs/weapons_yw.dm b/code/modules/research/designs/weapons_yw.dm
new file mode 100644
index 0000000000..8e79cee53e
--- /dev/null
+++ b/code/modules/research/designs/weapons_yw.dm
@@ -0,0 +1,7 @@
+/datum/design/item/weapon/energy/hunter
+	name = "Hybrid 'Hunter' net gun"
+	id = "huntergun"
+	req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 6, TECH_MAGNET = 4)
+	materials = list(DEFAULT_WALL_MATERIAL = 6000, "glass" = 3000)
+	build_path = /obj/item/weapon/gun/energy/hunter
+	sort_string = "MAAVC"
\ No newline at end of file
diff --git a/vorestation.dme b/vorestation.dme
index ad7d578fa4..b5727d5638 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -3192,6 +3192,7 @@
 #include "code\modules\projectiles\guns\energy\laser_vr.dm"
 #include "code\modules\projectiles\guns\energy\laser_yw.dm"
 #include "code\modules\projectiles\guns\energy\netgun_vr.dm"
+#include "code\modules\projectiles\guns\energy\netgun_yw.dm"
 #include "code\modules\projectiles\guns\energy\nuclear.dm"
 #include "code\modules\projectiles\guns\energy\nuclear_yw.dm"
 #include "code\modules\projectiles\guns\energy\particle.dm"
@@ -3379,6 +3380,7 @@
 #include "code\modules\research\designs\tech_disks.dm"
 #include "code\modules\research\designs\weapons.dm"
 #include "code\modules\research\designs\weapons_vr.dm"
+#include "code\modules\research\designs\weapons_yw.dm"
 #include "code\modules\research\designs\xenoarch_toys.dm"
 #include "code\modules\research\designs\xenobio_toys.dm"
 #include "code\modules\research\designs\circuits\ai_modules.dm"