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/mob/living/silicon/ai/ai_defense.dm

@@ -22,6 +22,9 @@
 	return 0
 
 /mob/living/silicon/ai/emp_act(severity)
+	. = ..()
+	if(. & EMP_PROTECT_SELF)
+		return
 	disconnect_shell()
 	if (prob(30))
 		switch(pick(1,2))
@@ -29,7 +32,6 @@
 				view_core()
 			if(2)
 				SSshuttle.requestEvac(src,"ALERT: Energy surge detected in AI core! Station integrity may be compromised! Initiati--%m091#ar-BZZT")
-	..()
 
 /mob/living/silicon/ai/ex_act(severity, target)
 	switch(severity)

code/modules/mob/living/silicon/pai/pai_defense.dm

@@ -3,6 +3,9 @@
 	return FALSE
 
 /mob/living/silicon/pai/emp_act(severity)
+	. = ..()
+	if(. & EMP_PROTECT_SELF)
+		return
 	take_holo_damage(50/severity)
 	Knockdown(400/severity)
 	silent = max(30/severity, silent)

code/modules/mob/living/silicon/robot/robot.dm

@@ -90,7 +90,7 @@
 	/obj/item/clothing/head/wizard,
 	/obj/item/clothing/head/nursehat,
 	/obj/item/clothing/head/sombrero,
-	/obj/item/clothing/head/witchunter_hat)
+	/obj/item/clothing/head/helmet/chaplain/witchunter_hat)
 
 	can_buckle = TRUE
 	buckle_lying = FALSE
@@ -388,16 +388,11 @@
 		user.changeNext_move(CLICK_CD_MELEE)
 		var/obj/item/stack/cable_coil/coil = W
 		if (getFireLoss() > 0 || getToxLoss() > 0)
-			if(src == user && coil.use(1))
+			if(src == user)
 				to_chat(user, "<span class='notice'>You start fixing yourself...</span>")
 				if(!do_after(user, 50, target = src))
 					return
-				adjustFireLoss(-10)
-				adjustToxLoss(-10)
 			if (coil.use(1))
-				to_chat(user, "<span class='notice'>You start fixing [src]...</span>")
-				if(!do_after(user, 30, target = src))
-					return
 				adjustFireLoss(-30)
 				adjustToxLoss(-30)
 				updatehealth()

code/modules/mob/living/silicon/robot/robot_defense.dm

@@ -77,12 +77,14 @@
 
 
 /mob/living/silicon/robot/emp_act(severity)
+	. = ..()
+	if(. & EMP_PROTECT_SELF)
+		return
 	switch(severity)
 		if(1)
 			Stun(160)
 		if(2)
 			Stun(60)
-	..()
 
 
 /mob/living/silicon/robot/emag_act(mob/user)

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -58,6 +58,9 @@
 	return ..()
 
 /obj/item/robot_module/emp_act(severity)
+	. = ..()
+	if(. & EMP_PROTECT_CONTENTS)
+		return
 	for(var/obj/O in modules)
 		O.emp_act(severity)
 	..()

code/modules/mob/living/silicon/silicon_defense.dm

@@ -91,20 +91,22 @@
 	return 0 //So borgs they don't die trying to fix wiring
 
 /mob/living/silicon/emp_act(severity)
+	. = ..()
+	to_chat(src, "<span class='danger'>Warning: Electromagnetic pulse detected.</span>")
+	if(. & EMP_PROTECT_SELF)
+		return
 	switch(severity)
 		if(1)
 			src.take_bodypart_damage(20)
 		if(2)
 			src.take_bodypart_damage(10)
 	to_chat(src, "<span class='userdanger'>*BZZZT*</span>")
-	to_chat(src, "<span class='danger'>Warning: Electromagnetic pulse detected.</span>")
 	for(var/mob/living/M in buckled_mobs)
 		if(prob(severity*50))
 			unbuckle_mob(M)
 			M.Knockdown(40)
 			M.visible_message("<span class='boldwarning'>[M] is thrown off of [src]!</span>")
 	flash_act(affect_silicon = 1)
-	..()
 
 /mob/living/silicon/bullet_act(obj/item/projectile/Proj)
 	if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))