Merge branch 'master' into glassware

modular_citadel/code/modules/projectiles/guns/ballistic/spinfusor.dm

@@ -5,7 +5,6 @@
 	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state= "spinner"
 	damage = 30
-	dismemberment = 25
 
 /obj/item/projectile/bullet/spinfusor/on_hit(atom/target, blocked = FALSE) //explosion to emulate the spinfusor's AOE
 	..()
@@ -14,22 +13,16 @@
 
 /obj/item/ammo_casing/caseless/spinfusor
 	name = "spinfusor disk"
-	desc = "A magnetic disk designed specifically for the Stormhammer magnetic cannon. Warning: extremely volatile!"
+	desc = "A magnetic disk designed specifically for the Stormhammer magnetic cannon. Packs a punch."
 	projectile_type = /obj/item/projectile/bullet/spinfusor
 	caliber = "spinfusor"
 	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "disk"
+	w_class = WEIGHT_CLASS_SMALL
 	throwforce = 15 //still deadly when thrown
+	force = 5
 	throw_speed = 3
 
-/obj/item/ammo_casing/caseless/spinfusor/throw_impact(atom/target) //disks detonate when thrown
-	if(!..()) // not caught in mid-air
-		visible_message("<span class='notice'>[src] detonates!</span>")
-		playsound(src.loc, "sparks", 50, 1)
-		explosion(target, -1, -1, 1, 1, -1)
-		qdel(src)
-		return 1
-
 /obj/item/ammo_box/magazine/internal/spinfusor
 	name = "spinfusor internal magazine"
 	ammo_type = /obj/item/ammo_casing/caseless/spinfusor
@@ -71,4 +64,5 @@
 	icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
 	icon_state = "spinfusorbox"
 	ammo_type = /obj/item/ammo_casing/caseless/spinfusor
-	max_ammo = 8
+	w_class = WEIGHT_CLASS_NORMAL
+	max_ammo = 4