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/power/antimatter/control.dm

@@ -100,6 +100,9 @@
 
 
 /obj/machinery/power/am_control_unit/emp_act(severity)
+	. = ..()
+	if(. & EMP_PROTECT_SELF)
+		return
 	switch(severity)
 		if(1)
 			if(active)
@@ -109,9 +112,6 @@
 			if(active)
 				toggle_power()
 			stability -= rand(10,20)
-	..()
-	return 0
-
 
 /obj/machinery/power/am_control_unit/blob_act()
 	stability -= 20

code/modules/power/antimatter/shielding.dm

@@ -93,7 +93,7 @@
 
 
 /obj/machinery/am_shielding/emp_act()//Immune due to not really much in the way of electronics.
-	return 0
+	return
 
 /obj/machinery/am_shielding/ex_act(severity, target)
 	stability -= (80 - (severity * 20))

code/modules/power/apc.dm

@@ -1257,17 +1257,20 @@
 
 // damage and destruction acts
 /obj/machinery/power/apc/emp_act(severity)
-	if(cell)
-		cell.emp_act(severity)
-	if(occupier)
-		occupier.emp_act(severity)
+	. = ..()
+	if (!(. & EMP_PROTECT_CONTENTS))
+		if(cell)
+			cell.emp_act(severity)
+		if(occupier)
+			occupier.emp_act(severity)
+	if(. & EMP_PROTECT_SELF)
+		return
 	lighting = 0
 	equipment = 0
 	environ = 0
 	update_icon()
 	update()
 	addtimer(CALLBACK(src, .proc/reset, APC_RESET_EMP), 600)
-	..()
 
 /obj/machinery/power/apc/blob_act(obj/structure/blob/B)
 	set_broken()

code/modules/power/cell.dm

@@ -131,10 +131,12 @@
 		rigged = TRUE //broken batterys are dangerous
 
 /obj/item/stock_parts/cell/emp_act(severity)
+	. = ..()
+	if(. & EMP_PROTECT_SELF)
+		return
 	charge -= 1000 / severity
 	if (charge < 0)
 		charge = 0
-	..()
 
 /obj/item/stock_parts/cell/ex_act(severity, target)
 	..()
@@ -320,8 +322,9 @@
 	charge = 0
 	update_icon()
 
-/obj/item/stock_parts/cell/emproof/emp_act(severity)
-	return
+/obj/item/stock_parts/cell/emproof/empty/ComponentInitialize()
+	. = ..()
+	AddComponent(/datum/component/empprotection, EMP_PROTECT_SELF)
 
 /obj/item/stock_parts/cell/emproof/corrupt()
 	return
@@ -336,6 +339,9 @@
 	return
 
 /obj/item/stock_parts/cell/beam_rifle/emp_act(severity)
+	. = ..()
+	if(. & EMP_PROTECT_SELF)
+		return
 	charge = CLAMP((charge-(10000/severity)),0,maxcharge)
 
 /obj/item/stock_parts/cell/emergency_light

code/modules/power/gravitygenerator.dm

@@ -39,9 +39,9 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
 	if(prob(20))
 		set_broken()
 
-/obj/machinery/gravity_generator/tesla_act(power, explosive)
+/obj/machinery/gravity_generator/tesla_act(power, tesla_flags)
 	..()
-	if(explosive)
+	if(tesla_flags & TESLA_MACHINE_EXPLOSIVE)
 		qdel(src)//like the singulo, tesla deletes it. stops it from exploding over and over
 
 /obj/machinery/gravity_generator/update_icon()

code/modules/power/lighting.dm

@@ -662,10 +662,12 @@
 	on = TRUE
 	update()
 
-/obj/machinery/light/tesla_act(power, explosive = FALSE)
-	if(explosive)
-		explosion(src.loc,0,0,0,flame_range = 5, adminlog = 0)
-	qdel(src)
+/obj/machinery/light/tesla_act(power, tesla_flags)
+	if(tesla_flags & TESLA_MACHINE_EXPLOSIVE)
+		explosion(src,0,0,0,flame_range = 5, adminlog = 0)
+		qdel(src)
+	else
+		return ..()
 
 // called when area power state changes
 /obj/machinery/light/power_change()

code/modules/power/monitor.dm

@@ -1,3 +1,5 @@
+//modular computer program version is located in code\modules\modular_computers\file_system\programs\powermonitor.dm, /datum/computer_file/program/power_monitor
+
 /obj/machinery/computer/monitor
 	name = "power monitoring console"
 	desc = "It monitors power levels across the station."
@@ -9,12 +11,24 @@
 	active_power_usage = 100
 	circuit = /obj/item/circuitboard/computer/powermonitor
 
-	var/obj/structure/cable/attached
+	var/obj/structure/cable/attached_wire
+	var/obj/machinery/power/apc/local_apc
 
 	var/list/history = list()
 	var/record_size = 60
 	var/record_interval = 50
 	var/next_record = 0
+	var/is_secret_monitor = FALSE
+
+/obj/machinery/computer/monitor/secret //Hides the power monitor (such as ones on ruins & CentCom) from PDA's to prevent metagaming.
+	name = "outdated power monitoring console"
+	desc = "It monitors power levels across the local powernet."
+	circuit = /obj/item/circuitboard/computer/powermonitor/secret
+	is_secret_monitor = TRUE
+
+/obj/machinery/computer/monitor/secret/examine(mob/user)
+	..()
+	to_chat(user, "<span class='notice'>It's operating system seems quite outdated... It doesn't seem like it'd be compatible with the latest remote NTOS monitoring systems.</span>")
 
 /obj/machinery/computer/monitor/Initialize()
 	. = ..()
@@ -23,30 +37,47 @@
 	history["demand"] = list()
 
 /obj/machinery/computer/monitor/process()
-	if(!attached)
+	if(!get_powernet())
 		use_power = IDLE_POWER_USE
 		search()
 	else
 		use_power = ACTIVE_POWER_USE
 		record()
 
-/obj/machinery/computer/monitor/proc/search()
+/obj/machinery/computer/monitor/proc/search() //keep in sync with /datum/computer_file/program/power_monitor's version
 	var/turf/T = get_turf(src)
-	attached = locate() in T
+	attached_wire = locate(/obj/structure/cable) in T
+	if(attached_wire)
+		return
+	var/area/A = get_area(src) //if the computer isn't directly connected to a wire, attempt to find the APC powering it to pull it's powernet instead
+	if(!A)
+		return
+	local_apc = A.get_apc()
+	if(!local_apc)
+		return
+	if(!local_apc.terminal) //this really shouldn't happen without badminnery.
+		local_apc = null
 
-/obj/machinery/computer/monitor/proc/record()
+/obj/machinery/computer/monitor/proc/get_powernet() //keep in sync with /datum/computer_file/program/power_monitor's version
+	if(attached_wire || (local_apc && local_apc.terminal))
+		return attached_wire ? attached_wire.powernet : local_apc.terminal.powernet
+	return FALSE
+
+/obj/machinery/computer/monitor/proc/record() //keep in sync with /datum/computer_file/program/power_monitor's version
 	if(world.time >= next_record)
 		next_record = world.time + record_interval
 
+		var/datum/powernet/connected_powernet = get_powernet()
+
 		var/list/supply = history["supply"]
-		if(attached.powernet)
-			supply += attached.powernet.viewavail
+		if(connected_powernet)
+			supply += connected_powernet.viewavail
 		if(supply.len > record_size)
 			supply.Cut(1, 2)
 
 		var/list/demand = history["demand"]
-		if(attached.powernet)
-			demand += attached.powernet.viewload
+		if(connected_powernet)
+			demand += connected_powernet.viewload
 		if(demand.len > record_size)
 			demand.Cut(1, 2)
 
@@ -58,17 +89,18 @@
 		ui.open()
 
 /obj/machinery/computer/monitor/ui_data()
+	var/datum/powernet/connected_powernet = get_powernet()
 	var/list/data = list()
 	data["stored"] = record_size
 	data["interval"] = record_interval / 10
-	data["attached"] = attached ? TRUE : FALSE
+	data["attached"] = connected_powernet ? TRUE : FALSE
 	data["history"] = history
 	data["areas"] = list()
 
-	if(attached)
-		data["supply"] = DisplayPower(attached.powernet.viewavail)
-		data["demand"] = DisplayPower(attached.powernet.viewload)
-		for(var/obj/machinery/power/terminal/term in attached.powernet.nodes)
+	if(connected_powernet)
+		data["supply"] = DisplayPower(connected_powernet.viewavail)
+		data["demand"] = DisplayPower(connected_powernet.viewload)
+		for(var/obj/machinery/power/terminal/term in connected_powernet.nodes)
 			var/obj/machinery/power/apc/A = term.master
 			if(istype(A))
 				var/cell_charge

code/modules/power/singularity/collector.dm

@@ -1,8 +1,9 @@
-// last_power += (pulse_strength-RAD_COLLECTOR_EFFICIENCY)*RAD_COLLECTOR_COEFFICIENT
+// stored_power += (pulse_strength-RAD_COLLECTOR_EFFICIENCY)*RAD_COLLECTOR_COEFFICIENT
 #define RAD_COLLECTOR_EFFICIENCY 80 	// radiation needs to be over this amount to get power
 #define RAD_COLLECTOR_COEFFICIENT 100
 #define RAD_COLLECTOR_STORED_OUT 0.04	// (this*100)% of stored power outputted per tick. Doesn't actualy change output total, lower numbers just means collectors output for longer in absence of a source
 #define RAD_COLLECTOR_MINING_CONVERSION_RATE 0.00001 //This is gonna need a lot of tweaking to get right. This is the number used to calculate the conversion of watts to research points per process()
+#define RAD_COLLECTOR_OUTPUT min(stored_power, (stored_power*RAD_COLLECTOR_STORED_OUT)+1000) //Produces at least 1000 watts if it has more than that stored
 
 /obj/machinery/power/rad_collector
 	name = "Radiation Collector Array"
@@ -17,7 +18,7 @@
 	integrity_failure = 80
 	circuit = /obj/item/circuitboard/machine/rad_collector
 	var/obj/item/tank/internals/plasma/loaded_tank = null
-	var/last_power = 0
+	var/stored_power = 0
 	var/active = 0
 	var/locked = FALSE
 	var/drainratio = 1
@@ -51,9 +52,9 @@
 			loaded_tank.air_contents.gases[/datum/gas/tritium][MOLES] += gasdrained
 			loaded_tank.air_contents.garbage_collect()
 
-			var/power_produced = min(last_power, (last_power*RAD_COLLECTOR_STORED_OUT)+1000) //Produces at least 1000 watts if it has more than that stored
+			var/power_produced = RAD_COLLECTOR_OUTPUT
 			add_avail(power_produced)
-			last_power-=power_produced
+			stored_power-=power_produced
 	else if(is_station_level(z) && SSresearch.science_tech)
 		if(!loaded_tank.air_contents.gases[/datum/gas/tritium] || !loaded_tank.air_contents.gases[/datum/gas/oxygen])
 			playsound(src, 'sound/machines/ding.ogg', 50, 1)
@@ -65,9 +66,9 @@
 			loaded_tank.air_contents.assert_gas(/datum/gas/carbon_dioxide)
 			loaded_tank.air_contents.gases[/datum/gas/carbon_dioxide][MOLES] += gasdrained*2
 			loaded_tank.air_contents.garbage_collect()
-			var/bitcoins_mined = min(last_power, (last_power*RAD_COLLECTOR_STORED_OUT)+1000)
+			var/bitcoins_mined = RAD_COLLECTOR_OUTPUT
 			SSresearch.science_tech.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, bitcoins_mined*RAD_COLLECTOR_MINING_CONVERSION_RATE)
-			last_power-=bitcoins_mined
+			stored_power-=bitcoins_mined
 
 /obj/machinery/power/rad_collector/interact(mob/user)
 	if(anchored)
@@ -173,9 +174,9 @@
 	. = ..()
 	if(active)
 		if(!bitcoinmining)
-			to_chat(user, "<span class='notice'>[src]'s display states that it is processing <b>[DisplayPower(last_power)]</b>.</span>")
+			to_chat(user, "<span class='notice'>[src]'s display states that it has stored <b>[DisplayPower(stored_power)]</b>, and processing <b>[DisplayPower(RAD_COLLECTOR_OUTPUT)]</b>.</span>")
 		else
-			to_chat(user, "<span class='notice'>[src]'s display states that it is producing a total of <b>[last_power*RAD_COLLECTOR_MINING_CONVERSION_RATE]</b> research points per minute.</span>")
+			to_chat(user, "<span class='notice'>[src]'s display states that it has stored a total of <b>[stored_power*RAD_COLLECTOR_MINING_CONVERSION_RATE]</b>, and producing [RAD_COLLECTOR_OUTPUT*RAD_COLLECTOR_MINING_CONVERSION_RATE] research points per minute.</span>")
 	else
 		if(!bitcoinmining)
 			to_chat(user,"<span class='notice'><b>[src]'s display displays the words:</b> \"Power production mode. Please insert <b>Plasma</b>. Use a multitool to change production modes.\"</span>")
@@ -204,7 +205,7 @@
 /obj/machinery/power/rad_collector/rad_act(pulse_strength)
 	. = ..()
 	if(loaded_tank && active && pulse_strength > RAD_COLLECTOR_EFFICIENCY)
-		last_power += (pulse_strength-RAD_COLLECTOR_EFFICIENCY)*RAD_COLLECTOR_COEFFICIENT
+		stored_power += (pulse_strength-RAD_COLLECTOR_EFFICIENCY)*RAD_COLLECTOR_COEFFICIENT
 
 /obj/machinery/power/rad_collector/proc/update_icons()
 	cut_overlays()
@@ -230,3 +231,5 @@
 #undef RAD_COLLECTOR_EFFICIENCY
 #undef RAD_COLLECTOR_COEFFICIENT
 #undef RAD_COLLECTOR_STORED_OUT
+#undef RAD_COLLECTOR_MINING_CONVERSION_RATE
+#undef RAD_COLLECTOR_OUTPUT

code/modules/power/singularity/emitter.dm

@@ -60,6 +60,10 @@
 	sparks.attach(src)
 	sparks.set_up(5, TRUE, src)
 
+/obj/machinery/power/emitter/ComponentInitialize()
+	. = ..()
+	AddComponent(/datum/component/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES)
+
 /obj/machinery/power/emitter/RefreshParts()
 	var/max_firedelay = 120
 	var/firedelay = 120
@@ -138,11 +142,6 @@
 	if(!anchored)
 		step(src, get_dir(M, src))
 
-
-/obj/machinery/power/emitter/emp_act(severity)//Emitters are hardened but still might have issues
-	return 1
-
-
 /obj/machinery/power/emitter/process()
 	if(stat & (BROKEN))
 		return

code/modules/power/singularity/field_generator.dm

@@ -59,6 +59,9 @@ field_generator power level display
 	fields = list()
 	connected_gens = list()
 
+/obj/machinery/field/generator/ComponentInitialize()
+	. = ..()
+	AddComponent(/datum/component/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES)
 
 /obj/machinery/field/generator/process()
 	if(active == FG_ONLINE)
@@ -148,10 +151,6 @@ field_generator power level display
 	if(!anchored)
 		step(src, get_dir(M, src))
 
-/obj/machinery/field/generator/emp_act()
-	return 0
-
-
 /obj/machinery/field/generator/blob_act(obj/structure/blob/B)
 	if(active)
 		return 0

code/modules/power/smes.dm

@@ -408,6 +408,9 @@
 
 
 /obj/machinery/power/smes/emp_act(severity)
+	. = ..()
+	if(. & EMP_PROTECT_SELF)
+		return
 	input_attempt = rand(0,1)
 	inputting = input_attempt
 	output_attempt = rand(0,1)
@@ -419,7 +422,6 @@
 		charge = 0
 	update_icon()
 	log_smes("an emp")
-	..()
 
 /obj/machinery/power/smes/engineering
 	charge = 1.5e6 // Engineering starts with some charge for singulo

code/modules/power/tesla/coil.dm

@@ -73,7 +73,7 @@
 	if(user.a_intent == INTENT_GRAB && user_buckle_mob(user.pulling, user, check_loc = 0))
 		return ..()
 
-/obj/machinery/power/tesla_coil/tesla_act(var/power)
+/obj/machinery/power/tesla_coil/tesla_act(power, tesla_flags, shocked_targets)
 	if(anchored && !panel_open)
 		obj_flags |= BEING_SHOCKED
 		//don't lose arc power when it's not connected to anything
@@ -82,7 +82,7 @@
 		add_avail(power_produced*input_power_multiplier)
 		flick("coilhit", src)
 		playsound(src.loc, 'sound/magic/lightningshock.ogg', 100, 1, extrarange = 5)
-		tesla_zap(src, 5, power_produced)
+		tesla_zap(src, 5, power_produced, tesla_flags, shocked_targets)
 		if(istype(linked_techweb))
 			linked_techweb.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, min(power_produced, 1)) // x4 coils = ~240/m point bonus for R&D
 		addtimer(CALLBACK(src, .proc/reset_shocked), 10)
@@ -110,14 +110,14 @@
 	circuit = /obj/item/circuitboard/machine/tesla_coil/research
 	power_loss = 20 // something something, high voltage + resistance
 
-/obj/machinery/power/tesla_coil/research/tesla_act(var/power)
+/obj/machinery/power/tesla_coil/research/tesla_act(power, tesla_flags, shocked_things)
 	if(anchored && !panel_open)
 		obj_flags |= BEING_SHOCKED
 		var/power_produced = powernet ? power / power_loss : power
 		add_avail(power_produced*input_power_multiplier)
 		flick("rpcoilhit", src)
 		playsound(src.loc, 'sound/magic/lightningshock.ogg', 100, 1, extrarange = 5)
-		tesla_zap(src, 5, power_produced)
+		tesla_zap(src, 5, power_produced, tesla_flags, shocked_things)
 		if(istype(linked_techweb))
 			linked_techweb.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, min(power_produced, 3)) // x4 coils with a pulse per second or so = ~720/m point bonus for R&D
 		addtimer(CALLBACK(src, .proc/reset_shocked), 10)

code/modules/power/tesla/energy_ball.dm

@@ -66,7 +66,7 @@
 		pixel_y = -32
 		for (var/ball in orbiting_balls)
 			var/range = rand(1, CLAMP(orbiting_balls.len, 3, 7))
-			tesla_zap(ball, range, TESLA_MINI_POWER/7*range, TRUE)
+			tesla_zap(ball, range, TESLA_MINI_POWER/7*range)
 	else
 		energy = 0 // ensure we dont have miniballs of miniballs
 
@@ -159,7 +159,7 @@
 	var/mob/living/carbon/C = A
 	C.dust()
 
-/proc/tesla_zap(atom/source, zap_range = 3, power, explosive = FALSE, stun_mobs = TRUE)
+/proc/tesla_zap(atom/source, zap_range = 3, power, tesla_flags = TESLA_DEFAULT_FLAGS, list/shocked_targets)
 	. = source.dir
 	if(power < 1000)
 		return
@@ -193,6 +193,9 @@
 										/obj/machinery/the_singularitygen/tesla))
 
 	for(var/A in typecache_filter_multi_list_exclusion(oview(source, zap_range+2), things_to_shock, blacklisted_tesla_types))
+		if(!(tesla_flags & TESLA_ALLOW_DUPLICATES) && LAZYACCESS(shocked_targets, A))
+			continue
+
 		if(istype(A, /obj/machinery/power/tesla_coil))
 			var/dist = get_dist(source, A)
 			var/obj/machinery/power/tesla_coil/C = A
@@ -263,33 +266,35 @@
 	if(closest_atom)
 		//common stuff
 		source.Beam(closest_atom, icon_state="lightning[rand(1,12)]", time=5, maxdistance = INFINITY)
+		if(!(tesla_flags & TESLA_ALLOW_DUPLICATES))
+			LAZYSET(shocked_targets, closest_atom, TRUE)
 		var/zapdir = get_dir(source, closest_atom)
 		if(zapdir)
 			. = zapdir
 
 	//per type stuff:
 	if(closest_tesla_coil)
-		closest_tesla_coil.tesla_act(power, explosive, stun_mobs)
+		closest_tesla_coil.tesla_act(power, tesla_flags, shocked_targets)
 
 	else if(closest_grounding_rod)
-		closest_grounding_rod.tesla_act(power, explosive, stun_mobs)
+		closest_grounding_rod.tesla_act(power, tesla_flags, shocked_targets)
 
 	else if(closest_mob)
-		var/shock_damage = CLAMP(round(power/400), 10, 90) + rand(-5, 5)
-		closest_mob.electrocute_act(shock_damage, source, 1, tesla_shock = 1, stun = stun_mobs)
+		var/shock_damage = (tesla_flags & TESLA_MOB_DAMAGE)? (min(round(power/600), 90) + rand(-5, 5)) : 0
+		closest_mob.electrocute_act(shock_damage, source, 1, tesla_shock = 1, stun = (tesla_flags & TESLA_MOB_STUN))
 		if(issilicon(closest_mob))
 			var/mob/living/silicon/S = closest_mob
-			if(stun_mobs)
+			if((tesla_flags & TESLA_MOB_STUN) && (tesla_flags & TESLA_MOB_DAMAGE))
 				S.emp_act(EMP_LIGHT)
-			tesla_zap(S, 7, power / 1.5, explosive, stun_mobs) // metallic folks bounce it further
+			tesla_zap(S, 7, power / 1.5, tesla_flags, shocked_targets) // metallic folks bounce it further
 		else
-			tesla_zap(closest_mob, 5, power / 1.5, explosive, stun_mobs)
+			tesla_zap(closest_mob, 5, power / 1.5, tesla_flags, shocked_targets)
 
 	else if(closest_machine)
-		closest_machine.tesla_act(power, explosive, stun_mobs)
+		closest_machine.tesla_act(power, tesla_flags, shocked_targets)
 
 	else if(closest_blob)
-		closest_blob.tesla_act(power, explosive, stun_mobs)
+		closest_blob.tesla_act(power, tesla_flags, shocked_targets)
 
 	else if(closest_structure)
-		closest_structure.tesla_act(power, explosive, stun_mobs)
+		closest_structure.tesla_act(power, tesla_flags, shocked_targets)

code/modules/power/tesla/generator.dm

@@ -5,6 +5,6 @@
 	icon_state = "TheSingGen"
 	creation_type = /obj/singularity/energy_ball
 
-/obj/machinery/the_singularitygen/tesla/tesla_act(power, explosive = FALSE)
-	if(explosive)
+/obj/machinery/the_singularitygen/tesla/tesla_act(power, tesla_flags)
+	if(tesla_flags & TESLA_MACHINE_EXPLOSIVE)
 		energy += power