From 026ce5dec40117c950ea7f76fbd7c295285e4a51 Mon Sep 17 00:00:00 2001
From: shellspeed1 <omegashellspeed1@gmail.com>
Date: Sun, 31 Oct 2021 04:18:15 -0700
Subject: [PATCH] tiny bit more polish, some number tweaks, and research.

---
 .../projectiles/ammunition/special/syringe.dm | 23 ++++++++++---------
 .../modules/projectiles/guns/misc/chem_gun.dm | 10 ++++----
 .../research/designs/medical_designs.dm       | 13 ++++++++++-
 .../research/techweb/nodes/weaponry_nodes.dm  |  2 +-
 4 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/code/modules/projectiles/ammunition/special/syringe.dm b/code/modules/projectiles/ammunition/special/syringe.dm
index 02178f3bee..67d1dbe137 100644
--- a/code/modules/projectiles/ammunition/special/syringe.dm
+++ b/code/modules/projectiles/ammunition/special/syringe.dm
@@ -35,11 +35,10 @@
 		var/obj/item/gun/chem/CG = loc
 		if(CG.syringes_left <= 0)
 			return
-		//vial.reagents.trans_to(target, vial.amount_per_transfer_from_this, log = "hypospray fill")
-		//CG.reagents.trans_to(BB, 10)
 		if (CG.vial == null)
+			CG.syringes_left--
 			return
-		CG.vial.reagents.trans_to(BB,10)
+		CG.vial.reagents.trans_to(BB, 10)
 		BB.name = "chemical dart"
 		CG.syringes_left--
 	..()
@@ -49,19 +48,21 @@
 	name = "smartdart synthesiser"
 	desc = "A high-power spring, linked to an energy-based smartdart synthesiser."
 	projectile_type = /obj/item/projectile/bullet/dart/syringe/dart
-	firing_effect_type = null
 	harmful = FALSE
 
-/obj/item/ammo_casing/chemgun/smart/ready_proj(atom/target, mob/living/user, quiet, zone_override = "")
+/obj/item/ammo_casing/chemgun/ready_proj(atom/target, mob/living/user, quiet, zone_override = "")
 	if(!BB)
 		return
-	if(istype(loc, /obj/item/gun/chem/smart))
-		var/obj/item/gun/chem/smart/SG = loc
-		if(SG.syringes_left <= 0)
+	if(istype(loc, /obj/item/gun/chem))
+		var/obj/item/gun/chem/CG = loc
+		if(CG.syringes_left <= 0)
 			return
-		SG.reagents.trans_to(BB, 20) //change to set syringe transfer
-		BB.name = "Smart chemical dart"
-		SG.syringes_left--
+		if (CG.vial == null)
+			CG.syringes_left--
+			return
+		CG.vial.reagents.trans_to(BB, 20)
+		BB.name = "smart chemical dart"
+		CG.syringes_left--
 	..()
 
 /obj/item/ammo_casing/dnainjector
diff --git a/code/modules/projectiles/guns/misc/chem_gun.dm b/code/modules/projectiles/guns/misc/chem_gun.dm
index a23d534ca1..d9ac2a7064 100644
--- a/code/modules/projectiles/guns/misc/chem_gun.dm
+++ b/code/modules/projectiles/guns/misc/chem_gun.dm
@@ -13,15 +13,13 @@
 	custom_materials = list(/datum/material/iron=2000)
 	clumsy_check = FALSE
 	fire_sound = 'sound/items/syringeproj.ogg'
-	var/time_per_syringe = 300
-	var/syringes_left = 5
-	var/max_syringes = 5
+	var/time_per_syringe = 200
+	var/syringes_left = 3
+	var/max_syringes = 6
 	var/last_synth = 0
 	var/obj/item/reagent_containers/glass/bottle/vial/vial
 	var/list/allowed_containers = list(/obj/item/reagent_containers/glass/bottle/vial/small, /obj/item/reagent_containers/glass/bottle/vial/large)
-	var/spawnwithvial = TRUE
-	var/start_vial = null
-	var/quickload = FALSE
+	var/quickload = TRUE //
 
 /obj/item/gun/chem/Initialize()
 	. = ..()
diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index 88c37ce2a2..f8967df07c 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -122,6 +122,17 @@
 	category = list("Medical Designs")
 	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
 
+/datum/design/smartdartrepeater
+	name = "smartdart repeater"
+	desc = "An experimental smart dart rifle, it can make its own smart darts and is instead loaded with a hypovial.."
+	id = "smartdartrepeater"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/glass = 2000, /datum/material/plastic = 1000, /datum/material/iron = 2000,/datum/material/titanium = 1000 )
+	build_path = /obj/item/gun/chem/smart
+	category = list("Medical Designs")
+	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
+
+
 /datum/design/plasmarefiller
 	name = "Plasma-Man Jumpsuit Refill"
 	desc = "A refill pack for the auto-extinguisher on Plasma-man suits."
@@ -201,7 +212,7 @@
 	build_path = /obj/item/storage/hypospraykit // let's not summon new hyposprays thanks
 	category = list("Medical Designs")
 	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE
-	
+
 /datum/design/hypospray/mkii
 	name = "Hypospray Mk. II"
 	id = "hypospray_mkii"
diff --git a/code/modules/research/techweb/nodes/weaponry_nodes.dm b/code/modules/research/techweb/nodes/weaponry_nodes.dm
index e17d7e1e7b..999000c57b 100644
--- a/code/modules/research/techweb/nodes/weaponry_nodes.dm
+++ b/code/modules/research/techweb/nodes/weaponry_nodes.dm
@@ -45,7 +45,7 @@
 	display_name = "Medical Weaponry"
 	description = "Weapons using medical technology."
 	prereq_ids = list("adv_biotech", "adv_weaponry")
-	design_ids = list("rapidsyringe", "shotgundartcryostatis")
+	design_ids = list("rapidsyringe", "shotgundartcryostatis","smartdartrepeater")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2000)
 
 /datum/techweb_node/beam_weapons