Hard upstream sync (#6951)

* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath

code/modules/projectiles/projectile/energy/tesla.dm

@@ -3,12 +3,20 @@
 	icon_state = "tesla_projectile"
 	impact_effect_type = /obj/effect/temp_visual/impact_effect/blue_laser
 	var/chain
+	var/tesla_flags = TESLA_MOB_DAMAGE | TESLA_OBJ_DAMAGE
+	var/zap_range = 3
+	var/power = 10000
 
 /obj/item/projectile/energy/tesla/fire(setAngle)
 	if(firer)
 		chain = firer.Beam(src, icon_state = "lightning[rand(1, 12)]", time = INFINITY, maxdistance = INFINITY)
 	..()
 
+/obj/item/projectile/energy/tesla/on_hit(atom/target)
+	. = ..()
+	tesla_zap(target, zap_range, power, tesla_flags)
+	qdel(src)
+
 /obj/item/projectile/energy/tesla/Destroy()
 	qdel(chain)
 	return ..()
@@ -16,16 +24,6 @@
 /obj/item/projectile/energy/tesla/revolver
 	name = "energy orb"
 
-/obj/item/projectile/energy/tesla/revolver/on_hit(atom/target)
-	. = ..()
-	if(isliving(target))
-		tesla_zap(target, 3, 10000)
-	qdel(src)
-
 /obj/item/projectile/energy/tesla/cannon
 	name = "tesla orb"
-
-/obj/item/projectile/energy/tesla/cannon/on_hit(atom/target)
-	. = ..()
-	tesla_zap(target, 3, 10000, explosive = FALSE, stun_mobs = FALSE)
-	qdel(src)
+	power = 20000

code/modules/projectiles/projectile/magic.dm

@@ -360,7 +360,7 @@
 
 	var/tesla_power = 20000
 	var/tesla_range = 15
-	var/tesla_boom = FALSE
+	var/tesla_flags = TESLA_MOB_DAMAGE | TESLA_MOB_STUN | TESLA_OBJ_DAMAGE
 	var/chain
 	var/mob/living/caster
 
@@ -377,7 +377,7 @@
 			visible_message("<span class='warning'>[src] fizzles on contact with [target]!</span>")
 			qdel(src)
 			return
-	tesla_zap(src, tesla_range, tesla_power, tesla_boom)
+	tesla_zap(src, tesla_range, tesla_power, tesla_flags)
 	qdel(src)
 
 /obj/item/projectile/magic/aoe/lightning/Destroy()