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/assembly/flash.dm

@@ -153,11 +153,13 @@
 	to_chat(user, "<span class='danger'>[src] emits a blinding light!</span>")
 
 /obj/item/assembly/flash/emp_act(severity)
+	. = ..()
+	if(. & EMP_PROTECT_SELF)
+		return
 	if(!try_use_flash())
-		return FALSE
+		return
 	AOE_flash()
 	burn_out()
-	. = ..()
 
 /obj/item/assembly/flash/activate()//AOE flash on signal recieved
 	if(!..())

code/modules/assembly/helpers.dm

@@ -13,4 +13,4 @@ Name:	IsAssemblyHolder
 Desc:	If true is an object that can hold an assemblyholder object
 */
 /obj/proc/IsAssemblyHolder()
-	return FALSE
+	return FALSE

code/modules/assembly/proximity.dm

@@ -34,27 +34,35 @@
 	update_icon()
 	return TRUE
 
+/obj/item/assembly/prox_sensor/on_detach()
+	. = ..()
+	if(!.)
+		return
+	else
+		proximity_monitor.SetHost(src,src)
+
+
 /obj/item/assembly/prox_sensor/toggle_secure()
 	secured = !secured
 	if(!secured)
 		if(scanning)
 			toggle_scan()
-			proximity_monitor.host = src
+			proximity_monitor.SetHost(src,src)
 		timing = FALSE
 		STOP_PROCESSING(SSobj, src)
 	else
 		START_PROCESSING(SSobj, src)
-		proximity_monitor.host = loc
+		proximity_monitor.SetHost(loc,src)
 	update_icon()
 	return secured
 
 
+
 /obj/item/assembly/prox_sensor/HasProximity(atom/movable/AM as mob|obj)
 	if (istype(AM, /obj/effect/beam))
 		return
 	sense()
 
-
 /obj/item/assembly/prox_sensor/proc/sense()
 	if(!scanning || !secured || next_activate > world.time)
 		return FALSE