Fixes

code/modules/admin/verbs/honksquad.dm

@@ -120,8 +120,8 @@ var/global/sent_honksquad = 0
 	equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/spray/waterflower(src), slot_in_backpack)
 	if(prob(50))
 		equip_to_slot_or_del(new /obj/item/weapon/gun/energy/clown(src), slot_in_backpack)
-	//else
-		//equip_to_slot_or_del(new /obj/item/weapon/gun/grenadelauncher/piecannon(src), slot_in_backpack)
+	else
+		equip_to_slot_or_del(new /obj/item/weapon/gun/throw/piecannon(src), slot_in_backpack)
 	src.mutations.Add(CLUMSY)
 
 

code/modules/admin/verbs/vox_raiders.dm

@@ -18,8 +18,8 @@ var/global/vox_tick = 1
 			equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/monocle(src), slot_glasses) // REPLACE WITH CODED VOX ALTERNATIVE.
 			equip_to_slot_or_del(new /obj/item/device/chameleon(src), slot_l_store)
 
-			//var/obj/item/weapon/gun/launcher/spikethrower/W = new(src)
-			//equip_to_slot_or_del(W, slot_r_hand)
+			var/obj/item/weapon/gun/projectile/automatic/spikethrower/W = new(src)
+			equip_to_slot_or_del(W, slot_r_hand)
 
 
 		if(2) // Vox engineer!

code/modules/projectiles/guns/energy.dm

@@ -51,16 +51,16 @@
 	if(selfcharge) //Every [recharge_time] ticks, recharge a shot for the cyborg
 		charge_tick++
 		if(charge_tick < charge_delay)
-			return 0
+			return
 		charge_tick = 0
 		if(!power_supply)
-			return 0 // check if we actually need to recharge
+			return // check if we actually need to recharge
 		var/obj/item/ammo_casing/energy/E = ammo_type[select]
 		if(use_external_power)
 			var/obj/item/weapon/stock_parts/cell/external = get_external_power_supply()
 			if(!external || !external.use((E.e_cost)/10)) //Take power from the borg...
-				return 0								//Note, uses /10 because of shitty mods to the cell system
-		power_supply.give(E.e_cost) //... to recharge the shot
+				return								//Note, uses /10 because of shitty mods to the cell system
+		power_supply.give(1000) //... to recharge the shot
 		update_icon()
 
 /obj/item/weapon/gun/energy/attack_self(mob/living/user as mob)
@@ -122,12 +122,9 @@
 	else
 		if(!shaded_charge)
 			for(var/i = ratio, i >= 1, i--)
-				overlays += image(icon = icon, icon_state = icon_state, pixel_x = ammo_x_offset * (i -1))
-		else
-			if(modifystate)
-				overlays += image(icon = icon, icon_state = "[icon_state]_[shot.select_name]_charge[ratio]")
-			else
-				overlays += image(icon = icon, icon_state = "[icon_state]_charge[ratio]")
+				overlays += image(icon = icon, icon_state = iconState, pixel_x = ammo_x_offset * (i -1))
+		else
+			overlays += image(icon = icon, icon_state = "[icon_state]_[modifystate ? "[shot.select_name]_" : ""]charge[ratio]")
 	if(F && can_flashlight)
 		var/iconF = "flight"
 		if(F.on)

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

@@ -44,6 +44,7 @@
 /obj/item/weapon/gun/energy/laser/cyborg
 	can_charge = 0
 	desc = "An energy-based laser gun that draws power from the cyborg's internal energy cell directly. So this is what freedom looks like?"
+	origin_tech = null
 
 /obj/item/weapon/gun/energy/laser/cyborg/newshot()
 	..()

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

@@ -92,6 +92,7 @@
 	ammo_type = list(/obj/item/ammo_casing/energy/kinetic)
 	cell_type = /obj/item/weapon/stock_parts/cell/emproof
 	// Apparently these are safe to carry? I'm sure goliaths would disagree.
+	needs_permit = 0
 	var/overheat_time = 16
 	unique_rename = 1
 	weapon_weight = WEAPON_LIGHT
@@ -271,6 +272,7 @@
 	modifystate = "adv_plasmacutter"
 	origin_tech = "combat=3;materials=4;magnets=3;plasmatech=3;engineering=2"
 	ammo_type = list(/obj/item/ammo_casing/energy/plasma/adv)
+	force = 15
 
 /obj/item/weapon/gun/energy/wormhole_projector
 	name = "bluespace wormhole projector"

code/modules/projectiles/projectile.dm

@@ -79,7 +79,6 @@
 				playsound(loc, hitsound, volume, 1, -1)
 			L.visible_message("<span class='danger'>[L] is hit by \a [src][organ_hit_text]!</span>", \
 								"<span class='userdanger'>[L] is hit by \a [src][organ_hit_text]!</span>")	//X has fired Y is now given by the guns so you cant tell who shot you if you could not see the shooter
-		L.apply_effects(stun, weaken, paralyze, irradiate, slur, stutter, eyeblur, drowsy, blocked, stamina, jitter)
 
 	var/reagent_note
 	if(reagents && reagents.reagent_list)

code/modules/projectiles/projectile/beams.dm

@@ -32,6 +32,7 @@
 	damage = 15
 	irradiate = 30
 	forcedodge = 1
+	range = 15
 
 /obj/item/projectile/beam/disabler
 	name = "disabler beam"