More fixes. Need to check over merging math.

code/modules/projectiles/ammunition/special/syringe.dm

@@ -61,7 +61,7 @@
 	..()
 
 /obj/item/ammo_casing/syringegun/dart
-	name = "dart gun air canister"
+	name = "used air canister"
 	desc = "A small canister of compressed gas."
 	projectile_type = /obj/item/projectile/bullet/dart/syringe/dart
 	firing_effect_type = null

code/modules/projectiles/projectile/bullets/dart_syringe.dm

@@ -64,20 +64,21 @@
 							if(R.overdose_threshold == 0) //Is there a possible OD?
 								M.reagents.add_reagent(R.id, R.volume)
 							else
-								var/transVol = CLAMP(R.volume, 0, (R.overdose_threshold - Rm.volume) -1)
+								var/transVol = CLAMP(R.volume, 0, (R.overdose_threshold - Rm.volume) -1) //Doesn't work
+								message_admins("Merge: Adding [transVol], OD: [R.overdose_threshold], curvol [Rm.volume]")
 								M.reagents.add_reagent(R.id, transVol)
-							target.visible_message("<span class='notice'>\The [src] beeps!</span>")
-							return TRUE
 						else
 							if(!R.overdose_threshold == 0)
 								var/transVol = CLAMP(R.volume, 0, R.overdose_threshold-1)
 								M.reagents.add_reagent(R.id, transVol)
 							else
 								M.reagents.add_reagent(R.id, R.volume)
-							target.visible_message("<span class='notice'>\The [src] beeps!</span>")
-							to_chat("<span class='notice'><i>You feel a tiny prick, and turn around to see a smartdart embedded in your butt.</i.</span>")
-							return TRUE
 
+
+
+				target.visible_message("<span class='notice'>\The [src] beeps!</span>")
+				to_chat("<span class='notice'><i>You feel a tiny prick, and turn around to see a smartdart embedded in your butt.</i></span>")
+				return TRUE
 			else
 				blocked = 100
 				target.visible_message("<span class='danger'>\The [src] was deflected!</span>", \

code/modules/reagents/reagent_containers/syringes.dm

@@ -265,12 +265,12 @@
 
 /obj/item/reagent_containers/syringe/dart
 	name = "medicinal smartdart"
-	desc = "A non-harmful dart that can administer medication from a range. Once it hits a patient, only medicines are administered to the patient using a smart nanofilter and capillary action."
+	desc = "A non-harmful dart that can administer medication from a range. Once it hits a patient, only medicines are administered to the patient using a smart nanofilter and capillary action with a built in safety for OD."
 	volume = 20
 	amount_per_transfer_from_this = 20
-	icon = 'icons/obj/dart.dmi'
+	//icon = 'icons/obj/dart.dmi'
-	item_state = "dart_0"
+	icon_state = "empty"
-	//harmful = FALSE
+	item_state = "syringe_empty"
 
 /obj/item/reagent_containers/syringe/dart/afterattack(atom/target, mob/user , proximity)
 
@@ -320,9 +320,30 @@
 /obj/item/reagent_containers/syringe/dart/attack_self(mob/user)
 	return
 
+/obj/item/reagent_containers/syringe/update_icon()
+	cut_overlays()
+	var/rounded_vol
+
+	rounded_vol = "empty"
+	if(reagents && reagents.total_volume)
+		if(volume/reagents.total_volume == 1)
+			rounded_vol="full"
+
+	icon_state = "[rounded_vol]"
+	item_state = "syringe_[rounded_vol]"
+	if(ismob(loc))
+		var/mob/M = loc
+		var/injoverlay
+		switch(mode)
+			if (SYRINGE_DRAW)
+				injoverlay = "draw"
+			if (SYRINGE_INJECT)
+				injoverlay = "ready"
+		add_overlay(injoverlay)
+		M.update_inv_hands()
+
 /obj/item/reagent_containers/syringe/dart/bluespace
 	name = "bluespace smartdart"
-	desc = "A non-harmful dart that can administer medication from a range, with extended 60u capacity. Unable to hold any caustic or toxic chemicals without disintegrating"
+	desc = "A non-harmful dart that can administer medication from a range. Once it hits a patient, only medicines are administered to the patient using a smart nanofilter and capillary action with a built in safety for OD. Has an extended volume capacity thanks to bluespace foam."
-	amount_per_transfer_from_this = 20
+	amount_per_transfer_from_this = 50
-	volume = 60
+	volume = 50
-	//harmful = FALSE