Fixes to Rnd MkII (#653)

Fixes #648

code/modules/projectiles/guns/energy/special.dm

@@ -110,7 +110,7 @@
 	icon_state = "bfg"
 	item_state = "bfg"
 	charge_meter = 0
-	w_class = 3
+	w_class = 4
 	fire_sound = 'sound/magic/LightningShock.ogg'
 	force = 30
 	projectile_type = /obj/item/projectile/energy/sonic
@@ -130,7 +130,7 @@
 	origin_tech = "combat=5;materials=2"
 	charge_meter = 0
 	slot_flags = SLOT_BACK
-	w_class = 3
+	w_class = 4
 	force = 10
 	projectile_type = /obj/item/projectile/beam/gatlinglaser
 	max_shots = 80
@@ -146,7 +146,7 @@
 	icon_state = "blaster"
 	item_state = "blaster"
 	fire_sound = 'sound/weapons/Laser.ogg'
-	slot_flags = SLOT_BACK
+	slot_flags = SLOT_BACK | SLOT_HOLSTER | SLOT_BELT
 	w_class = 3
 	force = 10
 	projectile_type = /obj/item/projectile/energy/blaster

code/modules/projectiles/guns/projectile/automatic.dm

@@ -265,7 +265,7 @@
 		user << "<span class='warning'>You need to open the cover to unload [src].</span>"
 		return
 	..()
-	
+
 /obj/item/weapon/gun/projectile/automatic/tommygun
 	name = "\improper Tommygun"
 	desc = "A classic among criminals. Uses .45 rounds."
@@ -288,7 +288,7 @@
 	desc = "An advanced rifle that magnetically propels hyperdense rods at breakneck speeds to devastating effect."
 	icon_state = "railgun"
 	item_state = "arifle"
-	w_class = 3
+	w_class = 4
 	force = 10
 	caliber = "trod"
 	origin_tech = "combat=5;materials=2"

code/modules/projectiles/projectile/energy.dm

@@ -114,13 +114,15 @@
 	weaken = 5
 	stun = 5
 
-/obj/item/projectile/energy/sonic/on_hit(var/atom/target, var/blocked = 0)
-	var/mob/M = target
-	if(isturf(target))
+/obj/item/projectile/energy/sonic/on_impact(var/atom/A)
+	if(isturf(A))
 		target.ex_act(0)
-	if(ismob(target))
+	if(ismob(A))
+		var/mob/M = A
 		explosion(target, -1, 0, 2)
 		M.gib()
+	if(!(isturf(A)) & !(ismob(A)))
+		explosion(A, -1, 0, 2)
 	..()
 
 /obj/item/projectile/energy/blaster

code/modules/projectiles/projectile/special.dm

@@ -20,9 +20,9 @@
 	sharp = 1
 	edge = 1
 
-	on_hit(var/atom/target, var/blocked = 0)
-		explosion(target, -1, 0, 2)
-		return 1
+	on_impact(var/atom/A)
+		explosion(A, -1, 0, 2)
+		..()
 
 /obj/item/projectile/bullet/gyro/law
 	name ="high-ex round"
@@ -159,6 +159,6 @@
 	sharp = 1
 	edge = 1
 
-	on_hit(var/atom/target, var/blocked = 0)
-		explosion(target, 0, 0, 4)
-		return 1
+	on_impact(var/atom/A)
+		explosion(A, 0, 0, 4)
+		..()