Merge pull request #12421 from GhostActual/Donk-Co.-Toys

Foam Dart Fix

code/modules/projectiles/ammunition/ammo_boxes.dm

@@ -40,6 +40,7 @@
 	name = "\improper Donk-Soft riot ammo box"
 	desc = "Contains Donk-Soft riot darts. It's Donk or Don't! Ages 18 and up."
 	icon_state = "foambox_riot"
+	ammo_type = /obj/item/ammo_casing/afoam_dart/riot
 	matter = list(MAT_STEEL = 5040, MAT_PLASTIC = 1800)
 
 /*

code/modules/projectiles/ammunition/rounds.dm

@@ -36,6 +36,7 @@
 /obj/item/ammo_casing/afoam_dart/riot
 	name = "riot foam dart"
 	desc = "Whose smart idea was it to use toys as crowd control? Ages 18 and up."
+	projectile_type = /obj/item/projectile/bullet/foam_dart_riot
 	matter = list(MAT_STEEL = 210, MAT_PLASTIC = 60)
 	icon_state = "foamdart_riot"
 

code/modules/projectiles/projectile/bullets.dm

@@ -386,8 +386,30 @@
 	if(istype(T))
 		new /obj/item/ammo_casing/afoam_dart(get_turf(loc))
 
-/obj/item/projectile/bullet/foam_dart/riot
+/obj/item/projectile/bullet/foam_dart_riot
 	name = "riot foam dart"
 	desc = "Whose smart idea was it to use toys as crowd control? Ages 18 and up."
-	agony = 50
-	icon_state = "foamdart_riot_proj"
+	damage = 0 // It's a damn toy.
+	embed_chance = 0
+	agony = 50 // The riot part of the riot dart
+	nodamage = TRUE
+	sharp = FALSE
+	damage_type = HALLOSS
+	impact_effect_type = null
+	fire_sound = 'sound/items/syringeproj.ogg'
+	combustion = FALSE
+	icon = 'icons/obj/gun_toy.dmi'
+	icon_state = "foamdart_riot_proj"
+	range = 15
+
+/obj/item/projectile/bullet/foam_dart_riot/on_impact(var/atom/A)
+	. = ..()
+	var/turf/T = get_turf(loc)
+	if(istype(T))
+		new /obj/item/ammo_casing/afoam_dart/riot(get_turf(loc))
+
+/obj/item/projectile/bullet/foam_dart_riot/on_range(var/atom/A)
+	. = ..()
+	var/turf/T = get_turf(loc)
+	if(istype(T))
+		new /obj/item/ammo_casing/afoam_dart/riot(get_turf(loc))