Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates

# Conflicts:
#	icons/obj/objects.dmi

code/modules/projectiles/guns/energy.dm

@@ -163,6 +163,14 @@
 		playsound(loc, 'sound/weapons/empty.ogg', 50, 1, -1)
 		return (OXYLOSS)
 
+/obj/item/weapon/gun/energy/on_varedit(modified_var)
+	if(modified_var == "selfcharge")
+		if(selfcharge)
+			processing_objects.Add(src)
+		else
+			processing_objects.Remove(src)
+	..()
+
 /obj/item/weapon/gun/energy/proc/robocharge()
 	if(isrobot(loc))
 		var/mob/living/silicon/robot/R = loc