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/research/server.dm

@@ -41,10 +41,12 @@
 		working = TRUE
 
 /obj/machinery/rnd/server/emp_act()
+	. = ..()
+	if(. & EMP_PROTECT_SELF)
+		return
 	stat |= EMPED
 	addtimer(CALLBACK(src, .proc/unemp), 600)
 	refresh_working()
-	return ..()
 
 /obj/machinery/rnd/server/proc/unemp()
 	stat &= ~EMPED