Merge branch 'master' into tgglassfloors

code/modules/power/apc.dm

@@ -254,6 +254,17 @@
 			else
 				. += "The cover is closed."
 
+/obj/machinery/power/apc/detailed_examine()
+	return "An APC (Area Power Controller) regulates and supplies backup power for the area they are in. Their power channels are divided \
+			out into 'environmental' (Items that manipulate airflow and temperature), 'lighting' (the lights), and 'equipment' (Everything else that consumes power). \
+			Power consumption and backup power cell charge can be seen from the interface, further controls (turning a specific channel on, off or automatic, \
+			toggling the APC's ability to charge the backup cell, or toggling power for the entire area via master breaker) first requires the interface to be unlocked \
+			with an ID with Engineering access or by one of the station's robots or the artificial intelligence."
+
+/obj/machinery/power/apc/detailed_examine_antag()
+	return "This can be emagged to unlock it. It will cause the APC to have a blue error screen. \
+			Wires can be pulsed remotely with a signaler attached to it. A powersink will also drain any APCs connected to the same wire the powersink is on."
+
 // update the APC icon to show the three base states
 // also add overlays for indicator lights
 /obj/machinery/power/apc/update_icon(force_update = FALSE)

code/modules/power/port_gen.dm

@@ -222,7 +222,7 @@
 	//or if it is already above upper_limit, limit the increase to 0.
 	var/inc_limit = max(upper_limit - temperature, 0)
 	var/dec_limit = min(temperature - lower_limit, 0)
-	temperature += between(dec_limit, rand(-7 + bias, 7 + bias), inc_limit)
+	temperature += clamp(rand(-7 + bias, 7 + bias), dec_limit, inc_limit)
 
 	if(temperature > max_temperature)
 		overheat()
@@ -239,7 +239,7 @@
 
 	if(temperature > cooling_temperature)
 		var/temp_loss = (temperature - cooling_temperature)/TEMPERATURE_DIVISOR
-		temp_loss = between(2, round(temp_loss, 1), TEMPERATURE_CHANGE_MAX)
+		temp_loss = clamp(round(temp_loss, 1), 2, TEMPERATURE_CHANGE_MAX)
 		temperature = max(temperature - temp_loss, cooling_temperature)
 		SStgui.update_uis(src)
 

code/modules/power/supermatter/supermatter.dm

@@ -224,6 +224,23 @@
 	if(!immune && (get_dist(user, src) < HALLUCINATION_RANGE(power)))
 		. += "<span class='danger'>You get headaches just from looking at it.</span>"
 
+/obj/machinery/power/supermatter_crystal/detailed_examine()
+	return "When energized by a laser (or something hitting it), it emits radiation and heat. If the heat reaches above 7000 kelvin, it will send an alert and start taking damage. \
+			After integrity falls to zero percent, it will delaminate, causing a massive explosion, station-wide radiation spikes, and hallucinations. \
+			Supermatter reacts badly to oxygen in the atmosphere. It'll also heat up really quick if it is in vacuum.<br>\
+			<br>\
+			Supermatter cores are extremely dangerous to be close to, and requires protection to handle properly. The protection you will need is:<br>\
+			Optical meson scanners on your eyes, to prevent hallucinations when looking at the supermatter.<br>\
+			Radiation helmet and suit, as the supermatter is radioactive.<br>\
+			<br>\
+			Touching the supermatter will result in *instant death*, with no corpse left behind! You can drag the supermatter, but anything else will kill you. \
+			It is advised to obtain a genetic backup before trying to drag it."
+
+/obj/machinery/power/supermatter_crystal/detailed_examine_antag()
+	return "Exposing the supermatter to oxygen or vacuum will cause it to start rapidly heating up. Sabotaging the supermatter and making it explode will \
+			cause a period of lag as the explosion is processed by the server, as well as irradiating the entire station and causing hallucinations to happen. \
+			Wearing radiation equipment will protect you from most of the delamination effects sans explosion."
+
 /obj/machinery/power/supermatter_crystal/proc/get_status()
 	var/turf/T = get_turf(src)
 	if(!T)
@@ -756,6 +773,12 @@
 				suspicion = "last touched by [AM.fingerprintslast]"
 			message_admins("[src] has consumed [AM], [suspicion] [ADMIN_JMP(src)].")
 			investigate_log("has consumed [AM] - [suspicion].", "supermatter")
+			if(istype(AM, /obj/machinery/power/supermatter_crystal))
+				power += 5000//releases A LOT of power
+				matter_power += 500000
+				damage += 180//drops the integrety by 20%
+				AM.visible_message("<span class='danger'>[AM] smacks into [src], rapidly flashing blasts of pure energy. The energy inside [src] undergoes superradiance scattering!</span>", null,\
+				"<span class='italics'>You hear a loud crack as a wave of heat washes over you.</span>")
 		qdel(AM)
 	if(!iseffect(AM) && power_changes)
 		matter_power += 200

code/modules/power/treadmill.dm

@@ -72,9 +72,9 @@
 					if(MOVE_INTENT_RUN)
 						if(M.drowsyness > 0)
 							mob_speed += 6
-						mob_speed += config.run_speed - 1
+						mob_speed += GLOB.configuration.movement.base_run_speed - 1
 					if(MOVE_INTENT_WALK)
-						mob_speed += config.walk_speed - 1
+						mob_speed += GLOB.configuration.movement.base_run_speed - 1
 				mob_speed = BASE_MOVE_DELAY / max(1, BASE_MOVE_DELAY + mob_speed)
 				speed = min(speed + inertia * mob_speed, mob_speed)
 				continue