Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxmos-2

code/modules/antagonists/nukeop/equipment/nuclearbomb.dm

@@ -664,7 +664,7 @@ This is here to make the tiles around the station mininuke change when it's arme
 		if(disk_comfort_level >= 2) //Sleep tight, disky.
 			if(!(process_tick % 30))
 				visible_message("<span class='notice'>[src] sleeps soundly. Sleep tight, disky.</span>")
-		if(last_disk_move < world.time - 5000 && prob((world.time - 5000 - last_disk_move)*0.0001))
+		if(last_disk_move < world.time - 5000 && prob((world.time - 5000 - last_disk_move)*0.0001 / max(disk_comfort_level,1)))
 			var/datum/round_event_control/operative/loneop = locate(/datum/round_event_control/operative) in SSevents.control
 			if(istype(loneop) && loneop.occurrences < loneop.max_occurrences)
 				loneop.weight += 1

code/modules/arousal/arousal.dm

@@ -117,7 +117,8 @@
 		if(!do_after(src, mb_time, target = src) || !in_range(src, container) || !G.climaxable(src, TRUE))
 			return
 	to_chat(src,"<span class='userlove'>You used your [G.name] to fill [container].</span>")
-	message_admins("[src] used their [G.name] to fill [container].")
+	message_admins("[ADMIN_LOOKUPFLW(src)] used their [G.name] to fill [container].")
+	log_consent("[key_name(src)] used their [G.name] to fill [container].")
 	do_climax(fluid_source, container, G, FALSE)
 
 /mob/living/carbon/human/proc/pick_climax_genitals(silent = FALSE)
@@ -159,8 +160,8 @@
 		if(consenting == "Yes")
 			return target
 		else
-			message_admins("[src] tried to climax with [target], but [target] did not consent.")
-			log_consent("[src] tried to climax with [target], but [target] did not consent.")
+			message_admins("[ADMIN_LOOKUPFLW(src)] tried to climax with [target], but [target] did not consent.")
+			log_consent("[key_name(src)] tried to climax with [target], but [target] did not consent.")
 
 /mob/living/carbon/human/proc/pick_climax_container(silent = FALSE)
 	var/list/containers_list = list()

code/modules/atmospherics/gasmixtures/gas_mixture.dm

@@ -280,11 +280,7 @@ we use a hook instead
 	parse_gas_string(model.initial_gas_mix)
 	return 1
 
-/datum/gas_mixture/proc/__auxtools_parse_gas_string(gas_string)
-
 /datum/gas_mixture/parse_gas_string(gas_string)
-	__auxtools_parse_gas_string(gas_string)
-	/*
 	gas_string = SSair.preprocess_gas_string(gas_string)
 
 	var/list/gas = params2list(gas_string)
@@ -298,7 +294,6 @@ we use a hook instead
 	for(var/id in gas)
 		set_moles(id, text2num(gas[id]))
 	archive()
-	*/
 	return 1
 /*
 /datum/gas_mixture/react(datum/holder)

code/modules/atmospherics/gasmixtures/reactions.dm

@@ -69,8 +69,6 @@
 
 // no test cause it's entirely based on location
 
-GLOBAL_VAR_INIT(condensation_priority, 0)
-
 /datum/gas_reaction/condensation
 	priority = 0
 	name = "Condensation"
@@ -89,8 +87,6 @@ GLOBAL_VAR_INIT(condensation_priority, 0)
 	name = "[R.name] condensation"
 	id = "[R.type] condensation"
 	condensing_reagent = GLOB.chemical_reagents_list[R.type]
-	GLOB.condensation_priority += 0.000000000001
-	priority = GLOB.condensation_priority
 	exclude = FALSE
 
 /datum/gas_reaction/condensation/react(datum/gas_mixture/air, datum/holder)

code/modules/cargo/exports/engineering.dm

@@ -0,0 +1,4 @@
+/datum/export/plutonium_rod
+	cost = 20000
+	unit_name = "Plutonium Rod"
+	export_types = list(/obj/item/fuel_rod/plutonium)

code/modules/cargo/packs/emergency.dm

@@ -158,6 +158,14 @@
 					/obj/item/clothing/head/hardhat/red)
 	crate_name = "firefighting crate"
 
+/datum/supply_pack/emergency/Flexiseal
+	name = "Flexi Seal Crate"
+	desc = "Flexi Seal, the perfect stuff for fixing a nuclear reactor safely!"
+	cost = 1000
+	contains = list(/obj/item/sealant)
+	crate_name = "Flexi Seal Crate"
+	crate_type = /obj/structure/closet/crate/radiation
+
 /datum/supply_pack/emergency/atmostank
 	name = "Firefighting Tank Backpack"
 	desc = "Mow down fires with this high-capacity fire fighting tank backpack. Requires Atmospherics access to open."

code/modules/cargo/packs/engine.dm

@@ -166,3 +166,40 @@
 	cost = 7000
 	contains = list(/obj/machinery/the_singularitygen/tesla)
 	crate_name = "tesla generator crate"
+/datum/supply_pack/engine/fuel_rod
+	name = "Uranium Fuel Rod crate"
+	desc = "Two additional fuel rods for use in a reactor, requires CE access to open. Caution: Radioactive"
+	cost = 3000
+	access = ACCESS_CE
+	contains = list(/obj/item/fuel_rod,
+					/obj/item/fuel_rod)
+	crate_name = "Uranium-235 Fuel Rod crate"
+	crate_type = /obj/structure/closet/crate/secure/engineering
+	dangerous = TRUE
+
+/datum/supply_pack/engine/bananium_fuel_rod
+	name = "Bananium Fuel Rod crate"
+	desc = "Two fuel rods designed to utilize and multiply bananium in a reactor, requires CE access to open. Caution: Radioactive"
+	cost = 4000
+	access = ACCESS_CE // Nag your local CE
+	contains = list(/obj/item/fuel_rod/material/bananium,
+					/obj/item/fuel_rod/material/bananium)
+	crate_name = "Bluespace Crystal Fuel Rod crate"
+	crate_type = /obj/structure/closet/crate/secure/engineering
+	dangerous = TRUE
+	contraband = TRUE
+
+/datum/supply_pack/engine/reactor
+	name = "RMBK Nuclear Reactor Kit" // (not) a toy
+	desc = "Contains a reactor beacon and 3 reactor consoles. Uranium rods not included."
+	cost = 12000
+	access = ACCESS_CE
+	contains = list(/obj/item/survivalcapsule/reactor,
+					/obj/machinery/computer/reactor/control_rods/cargo,
+					/obj/machinery/computer/reactor/stats/cargo,
+					/obj/machinery/computer/reactor/fuel_rods/cargo,
+					/obj/item/paper/fluff/rbmkcargo,
+					/obj/item/book/manual/wiki/rbmk)
+	crate_name = "Build Your Own Reactor Kit"
+	crate_type = /obj/structure/closet/crate/secure/engineering
+	dangerous = TRUE

code/modules/client/preferences.dm

@@ -1005,11 +1005,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 				dat += "<font color=red><b>You are banned from antagonist roles.</b></font>"
 				src.be_special = list()
 
+			dat += "<b>DISABLE ALL ANTAGONISM</b> <a href='?_src_=prefs;preference=disable_antag'>[(toggles & NO_ANTAG) ? "YES" : "NO"]</a><br>"
 
 			for (var/i in GLOB.special_roles)
-				if(i == ROLE_NO_ANTAGONISM)
-					dat += "<b>DISABLE ALL ANTAGONISM</b> <a href='?_src_=prefs;preference=be_special;be_special_type=[i]'>[(i in be_special) ? "YES" : "NO"]</a><br>"
-					continue
 				if(jobban_isbanned(user, i))
 					dat += "<b>Be [capitalize(i)]:</b> <a href='?_src_=prefs;jobbancheck=[i]'>BANNED</a><br>"
 				else
@@ -1022,7 +1020,15 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					if(days_remaining)
 						dat += "<b>Be [capitalize(i)]:</b> <font color=red> \[IN [days_remaining] DAYS]</font><br>"
 					else
-						dat += "<b>Be [capitalize(i)]:</b> <a href='?_src_=prefs;preference=be_special;be_special_type=[i]'>[(i in be_special) ? "Enabled" : "Disabled"]</a><br>"
+						var/enabled_text = ""
+						if(i in be_special)
+							if(be_special[i] >= 1)
+								enabled_text = "Enabled"
+							else
+								enabled_text = "Low"
+						else
+							enabled_text = "Disabled"
+						dat += "<b>Be [capitalize(i)]:</b> <a href='?_src_=prefs;preference=be_special;be_special_type=[i]'>[enabled_text]</a><br>"
 			dat += "<b>Midround Antagonist:</b> <a href='?_src_=prefs;preference=allow_midround_antag'>[(toggles & MIDROUND_ANTAG) ? "Enabled" : "Disabled"]</a><br>"
 
 			dat += "<br>"
@@ -2936,12 +2942,19 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					deadmin ^= DEADMIN_POSITION_SILICON
 				//
 
+				if("disable_antag")
+					toggles ^= NO_ANTAG
+
 				if("be_special")
 					var/be_special_type = href_list["be_special_type"]
 					if(be_special_type in be_special)
-						be_special -= be_special_type
+						if(be_special[be_special_type] >= 1)
+							be_special -= be_special_type
+						else
+							be_special[be_special_type] = 1
 					else
 						be_special += be_special_type
+						be_special[be_special_type] = 0
 
 				if("name")
 					be_random_name = !be_random_name

code/modules/client/preferences_savefile.dm

@@ -5,7 +5,7 @@
 //	You do not need to raise this if you are adding new values that have sane defaults.
 //	Only raise this value when changing the meaning/format/name/layout of an existing value
 //	where you would want the updater procs below to run
-#define SAVEFILE_VERSION_MAX	55
+#define SAVEFILE_VERSION_MAX	56
 
 /*
 SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Carn
@@ -42,14 +42,20 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 //if your savefile is 3 months out of date, then 'tough shit'.
 
 /datum/preferences/proc/update_preferences(current_version, savefile/S)
-	if(current_version < 55) //Bitflag toggles don't set their defaults when they're added, always defaulting to off instead.
-		toggles |= SOUND_BARK
-	if(current_version < 46)	//If you remove this, remove force_reset_keybindings() too.
-		force_reset_keybindings_direct(TRUE)
-		addtimer(CALLBACK(src, .proc/force_reset_keybindings), 30)	//No mob available when this is run, timer allows user choice.
 	if(current_version < 30)
 		outline_enabled = TRUE
 		outline_color = COLOR_THEME_MIDNIGHT
+	if(current_version < 46)	//If you remove this, remove force_reset_keybindings() too.
+		force_reset_keybindings_direct(TRUE)
+		addtimer(CALLBACK(src, .proc/force_reset_keybindings), 30)	//No mob available when this is run, timer allows user choice.
+	if(current_version < 55) //Bitflag toggles don't set their defaults when they're added, always defaulting to off instead.
+		toggles |= SOUND_BARK
+	if(current_version < 56)
+		if("NO_ANTAGS" in be_special)
+			toggles |= NO_ANTAG
+			be_special -= "NO_ANTAGS"
+		for(var/be_special_type in be_special)
+			be_special[be_special_type] = 1
 
 /datum/preferences/proc/update_character(current_version, savefile/S)
 	if(current_version < 19)

code/modules/events/alien_infestation.dm

@@ -32,7 +32,7 @@
 
 /datum/round_event/ghost_role/alien_infestation/announce(fake)
 	if(successSpawn || fake)
-		priority_announce("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert", "aliens")
+		priority_announce("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert", "aliens", has_important_message = TRUE)
 
 
 /datum/round_event/ghost_role/alien_infestation/spawn_role()

code/modules/events/anomaly.dm

@@ -45,7 +45,7 @@
 		CRASH("Anomaly : No valid turfs found for [impact_area] - [impact_area.type]")
 
 /datum/round_event/anomaly/announce(fake)
-	priority_announce("Localized energetic flux wave detected on long range scanners. Expected location of impact: [impact_area.name].", "Anomaly Alert")
+	priority_announce("Localized energetic flux wave detected on long range scanners. Expected location of impact: [impact_area.name].", "Anomaly Alert", has_important_message = TRUE)
 
 /datum/round_event/anomaly/start()
 	var/list/turf/valid = list()

code/modules/events/anomaly_bluespace.dm

@@ -11,4 +11,4 @@
 	anomaly_path = /obj/effect/anomaly/bluespace
 
 /datum/round_event/anomaly/anomaly_bluespace/announce(fake)
-	priority_announce("Unstable bluespace anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert")
+	priority_announce("Unstable bluespace anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert", has_important_message = TRUE)

code/modules/events/anomaly_flux.dm

@@ -11,5 +11,5 @@
 	anomaly_path = /obj/effect/anomaly/flux
 
 /datum/round_event/anomaly/anomaly_flux/announce(fake)
-	priority_announce("Localized hyper-energetic flux wave detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert")
+	priority_announce("Localized hyper-energetic flux wave detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert", has_important_message = TRUE)
 

code/modules/events/anomaly_grav.dm

@@ -12,4 +12,4 @@
 	anomaly_path = /obj/effect/anomaly/grav
 
 /datum/round_event/anomaly/anomaly_grav/announce(fake)
-	priority_announce("Gravitational anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert")
+	priority_announce("Gravitational anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert", has_important_message = TRUE)

code/modules/events/anomaly_pyro.dm

@@ -12,4 +12,4 @@
 	anomaly_path = /obj/effect/anomaly/pyro
 
 /datum/round_event/anomaly/anomaly_pyro/announce(fake)
-	priority_announce("Pyroclastic anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert")
+	priority_announce("Pyroclastic anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert", has_important_message = TRUE)

code/modules/events/anomaly_vortex.dm

@@ -12,4 +12,4 @@
 	anomaly_path = /obj/effect/anomaly/bhole
 
 /datum/round_event/anomaly/anomaly_vortex/announce(fake)
-	priority_announce("Localized high-intensity vortex anomaly detected on long range scanners. Expected location: [impact_area.name]", "Anomaly Alert")
+	priority_announce("Localized high-intensity vortex anomaly detected on long range scanners. Expected location: [impact_area.name]", "Anomaly Alert", has_important_message = TRUE)

code/modules/events/blob.dm

@@ -15,7 +15,7 @@
 
 /datum/round_event/ghost_role/blob/announce(fake)
 	if(prob(75))
-		priority_announce("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", "outbreak5")
+		priority_announce("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", "outbreak5", has_important_message = TRUE)
 	else
 		print_command_report("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "level 5 biohazard")
 

code/modules/events/brand_intelligence.dm

@@ -35,7 +35,7 @@
 		source = initial(example.name)
 	else if(originMachine)
 		source = originMachine.name
-	priority_announce("Rampant brand intelligence has been detected aboard [station_name()]. Please stand by. The origin is believed to be \a [source].", "Machine Learning Alert")
+	priority_announce("Rampant brand intelligence has been detected aboard [station_name()]. Please stand by. The origin is believed to be \a [source].", "Machine Learning Alert", has_important_message = TRUE)
 
 /datum/round_event/brand_intelligence/start()
 	for(var/obj/machinery/vending/V in GLOB.machines)

code/modules/events/cat_surgeon.dm

@@ -6,7 +6,7 @@
 
 /datum/round_event/cat_surgeon/announce(fake)
 	priority_announce("One of our... ahem... 'special' cases has escaped. As it happens their last known location before their tracker went dead is your station so keep an eye out for them. On an unrelated note, has anyone seen our cats?",
-	sender_override = "Nanotrasen Psych Ward")
+	sender_override = "Nanotrasen Psych Ward", has_important_message = TRUE)
 
 /datum/round_event/cat_surgeon/start()
     var/list/spawn_locs = list()

code/modules/events/dust.dm

@@ -29,7 +29,7 @@
 	fakeable = FALSE
 
 /datum/round_event/sandstorm/announce(fake)
-	priority_announce("The station is passing through a heavy debris cloud. Watch out for breaches.", "Collision Alert")
+	priority_announce("The station is passing through a heavy debris cloud. Watch out for breaches.", "Collision Alert", has_important_message = TRUE)
 
 /datum/round_event/sandstorm/tick()
 	spawn_meteors(rand(6,10), GLOB.meteorsC)

code/modules/events/immovable_rod.dm

@@ -27,7 +27,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
 	announceWhen = 5
 
 /datum/round_event/immovable_rod/announce(fake)
-	priority_announce("What the fuck was that?!", "General Alert")
+	priority_announce("What the fuck was that?!", "General Alert", has_important_message = TRUE)
 
 /datum/round_event/immovable_rod/start()
 	var/datum/round_event_control/immovable_rod/C = control

code/modules/events/ion_storm.dm

@@ -26,7 +26,7 @@
 
 /datum/round_event/ion_storm/announce(fake)
 	if(announceEvent == ION_ANNOUNCE || (announceEvent == ION_RANDOM && prob(ionAnnounceChance)) || fake)
-		priority_announce("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert", "ionstorm")
+		priority_announce("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert", "ionstorm", has_important_message = prob(80))
 
 
 /datum/round_event/ion_storm/start()

code/modules/events/major_dust.dm

@@ -17,6 +17,6 @@
 		"A neighbouring station is throwing rocks at you. (Perhaps they've \
 		grown tired of your messages.)")
 	if(prob(50))
-		priority_announce(pick(reason), "Collision Alert")
+		priority_announce(pick(reason), "Collision Alert", has_important_message = prob(75))
 	else
 		print_command_report("[pick(reason)]", "Collision Alert")

code/modules/events/meateor_wave.dm

@@ -8,4 +8,4 @@
 	wave_name = "meaty"
 
 /datum/round_event/meteor_wave/meaty/announce(fake)
-	priority_announce("Meaty ores have been detected on collision course with the station.", "Oh crap, get the mop.", "meteors")
+	priority_announce("Meaty ores have been detected on collision course with the station.", "Oh crap, get the mop.", "meteors", has_important_message = TRUE)

code/modules/events/meteor_wave.dm

@@ -61,7 +61,7 @@
 			kill()
 
 /datum/round_event/meteor_wave/announce(fake)
-	priority_announce(generateMeteorString(startWhen,TRUE,direction), "Meteor Alert", "meteors")
+	priority_announce(generateMeteorString(startWhen,TRUE,direction), "Meteor Alert", "meteors", has_important_message = TRUE)
 
 /proc/generateMeteorString(startWhen,syndiealert,direction)
 	var/directionstring

code/modules/events/pirates.dm

@@ -37,7 +37,7 @@
 		// if(PIRATES_DUTCHMAN)
 		// 	ship_name = "Flying Dutchman"
 
-	priority_announce("Incoming subspace communication. Secure channel opened at all communication consoles.", "Incoming Message", SSstation.announcer.get_rand_report_sound())
+	priority_announce("Incoming subspace communication. Secure channel opened at all communication consoles.", "Incoming Message", SSstation.announcer.get_rand_report_sound(), has_important_message = TRUE)
 	var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
 	if(D)
 		payoff = max(payoff_min, FLOOR(D.account_balance * 0.80, 1000))
@@ -63,16 +63,16 @@
 
 /proc/pirates_answered(datum/comm_message/threat_msg, payoff, ship_name, initial_send_time, response_max_time, ship_template)
 	if(world.time > initial_send_time + response_max_time)
-		priority_announce("Too late to beg for mercy!",sender_override = ship_name)
+		priority_announce("Too late to beg for mercy!",sender_override = ship_name, has_important_message = TRUE)
 		return
 	if(threat_msg && threat_msg.answered == 1)
 		var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
 		if(D)
 			if(D.adjust_money(-payoff))
-				priority_announce("Thanks for the credits, landlubbers.",sender_override = ship_name)
+				priority_announce("Thanks for the credits, landlubbers.",sender_override = ship_name, has_important_message = TRUE)
 				return
 			else
-				priority_announce("Trying to cheat us? You'll regret this!",sender_override = ship_name)
+				priority_announce("Trying to cheat us? You'll regret this!",sender_override = ship_name, has_important_message = TRUE)
 				spawn_pirates(threat_msg, ship_template, TRUE)
 
 /proc/spawn_pirates(datum/comm_message/threat_msg, ship_template, skip_answer_check)

code/modules/events/radiation_storm.dm

@@ -12,7 +12,7 @@
 	announceWhen	= 1
 
 /datum/round_event/radiation_storm/announce(fake)
-	priority_announce("High levels of radiation detected near the station. Maintenance is best shielded from radiation.", "Anomaly Alert", "radiation")
+	priority_announce("High levels of radiation detected near the station. Maintenance is best shielded from radiation.", "Anomaly Alert", "radiation", has_important_message = TRUE)
 	//sound not longer matches the text, but an audible warning is probably good
 
 /datum/round_event/radiation_storm/start()

code/modules/events/space_dragon.dm

@@ -12,8 +12,8 @@
 	announceWhen = 10
 
 /datum/round_event/ghost_role/space_dragon/announce(fake)
-	priority_announce("A large organic energy flux has been recorded near of [station_name()], please stand-by.", "Lifesign Alert")
-	
+	priority_announce("A large organic energy flux has been recorded near of [station_name()], please stand-by.", "Lifesign Alert", has_important_message = TRUE)
+
 /datum/round_event/ghost_role/space_dragon/spawn_role()
 	var/list/spawn_locs = list()
 	for(var/obj/effect/landmark/carpspawn/carp_spawn in GLOB.landmarks_list)
@@ -24,11 +24,11 @@
 	if(!spawn_locs.len)
 		message_admins("No valid spawn locations found, aborting...")
 		return MAP_ERROR
-	
+
 	var/list/candidates = get_candidates(ROLE_SPACE_DRAGON, null, ROLE_SPACE_DRAGON)
 	if(!candidates.len)
 		return NOT_ENOUGH_PLAYERS
-	
+
 	var/mob/dead/selected = pick_n_take(candidates)
 
 	var/datum/mind/player_mind = new /datum/mind(selected.key)

code/modules/events/stray_cargo.dm

@@ -13,7 +13,7 @@
 	var/static/list/stray_spawnable_supply_packs = list() ///List of default spawnable supply packs, filtered from the cargo list
 
 /datum/round_event/stray_cargo/announce(fake)
-	priority_announce("Stray cargo pod detected on long-range scanners. Expected location of impact: [impact_area.name].", "Collision Alert")
+	priority_announce("Stray cargo pod detected on long-range scanners. Expected location of impact: [impact_area.name].", "Collision Alert", has_important_message = TRUE)
 
 /**
 * Tries to find a valid area, throws an error if none are found

code/modules/events/supermatter_surge.dm

@@ -20,6 +20,7 @@
 
 /datum/round_event/supermatter_surge/announce()
 	var/severity = ""
+	var/important = FALSE
 	switch(power)
 		if(-INFINITY to 100000)
 			var/low_threat_perc = 100-round(100*((power-200)/(100000-200)))
@@ -30,10 +31,12 @@
 					severity = "medium; the supermatter should return to normal operation, but regardless, check if the emitters may need to be turned off temporarily."
 			else
 				severity = "high; the emitters likely need to be turned off, and if the supermatter's cooling loop is not fortified, pre-cooled gas may need to be added."
+				important = TRUE
 		if(100000 to INFINITY)
 			severity = "extreme; emergency action is likely to be required even if coolant loop is fine. Turn off the emitters and make sure the loop is properly cooling gases."
+			important = TRUE
 	if(power > 20000 || prob(round(power/200)))
-		priority_announce("Supermatter surge detected. Estimated severity is [severity]", "Anomaly Alert")
+		priority_announce("Supermatter surge detected. Estimated severity is [severity]", "Anomaly Alert", has_important_message = important)
 
 /datum/round_event/supermatter_surge/start()
 	var/obj/machinery/power/supermatter_crystal/supermatter = GLOB.main_supermatter_engine

code/modules/events/supernova.dm

@@ -33,7 +33,7 @@
 /datum/round_event/supernova/announce()
 	var/message = "[station_name()]: Our tachyon-doppler array has detected a supernova in your vicinity. Peak flux from the supernova estimated to be [round(power,0.1)] times current solar flux; if the supernova is close to your sun in the sky, your solars may receive this as a power boost.[power > 1 ? " Short burts of radiation may be possible, so please prepare accordingly." : "We expect no radiation bursts from this one."] We hope you enjoy the light."
 	if(prob(power * 25))
-		priority_announce(message, sender_override = "Nanotrasen Meteorology Division")
+		priority_announce(message, sender_override = "Nanotrasen Meteorology Division", has_important_message = TRUE)
 		announced = TRUE
 	else
 		print_command_report(message)

code/modules/events/travelling_trader.dm

@@ -28,7 +28,7 @@
 	trader.visible_message("<b>[trader]</b> suddenly appears in a puff of smoke!")
 
 /datum/round_event/travelling_trader/announce(fake)
-	priority_announce("A mysterious figure has been detected on sensors at [get_area(spawn_location)]", "Mysterious Figure")
+	priority_announce("A mysterious figure has been detected on sensors at [get_area(spawn_location)]", "Mysterious Figure", has_important_message = !fake)
 
 /datum/round_event/travelling_trader/end()
 	if(trader) // the /datum/round_event/travelling_trader has given up on waiting!

code/modules/events/untie_shoes.dm

@@ -1,8 +1,8 @@
 /datum/round_event_control/untied_shoes
 	name = "Untied Shoes"
 	typepath = /datum/round_event/untied_shoes
-	weight = 100
-	max_occurrences = 20
+	weight = 50
+	max_occurrences = 10
 	alert_observers = FALSE
 
 /datum/round_event/untied_shoes

code/modules/events/vent_clog.dm

@@ -59,7 +59,7 @@
 	//needs to be chemid unit checked at some point
 
 /datum/round_event/vent_clog/announce()
-	priority_announce("The scrubbers network is experiencing a backpressure surge. Some ejection of contents may occur.", "Atmospherics alert")
+	priority_announce("The scrubbers network is experiencing a backpressure surge. Some ejection of contents may occur.", "Atmospherics alert", has_important_message = TRUE)
 
 /datum/round_event/vent_clog/setup()
 	endWhen = rand(120, 180)

code/modules/events/wormholes.dm

@@ -32,7 +32,7 @@
 		wormholes += new /obj/effect/portal/wormhole(T, 0, null, FALSE)
 
 /datum/round_event/wormholes/announce(fake)
-	priority_announce("Space-time anomalies detected on the station. There is no additional data.", "Anomaly Alert", "spanomalies")
+	priority_announce("Space-time anomalies detected on the station. There is no additional data.", "Anomaly Alert", "spanomalies", has_important_message = TRUE)
 
 /datum/round_event/wormholes/tick()
 	if(activeFor % shift_frequency == 0)

code/modules/jobs/job_types/ai.dm

@@ -27,7 +27,7 @@
 		CRASH("dynamic preview is unsupported")
 	. = H.AIize(latejoin,preference_source)
 
-/datum/job/ai/after_spawn(mob/H, mob/M, latejoin)
+/datum/job/ai/after_spawn(mob/H, client/C, latejoin)
 	. = ..()
 	if(latejoin)
 		var/obj/structure/AIcore/latejoin_inactive/lateJoinCore
@@ -41,8 +41,8 @@
 			H.forceMove(lateJoinCore.loc)
 			qdel(lateJoinCore)
 	var/mob/living/silicon/ai/AI = H
-	AI.apply_pref_name("ai", M.client)			//If this runtimes oh well jobcode is fucked.
-	AI.set_core_display_icon(null, M.client)
+	AI.apply_pref_name("ai", C)			//If this runtimes oh well jobcode is fucked.
+	AI.set_core_display_icon(null, C)
 
 	//we may have been created after our borg
 	if(SSticker.current_state == GAME_STATE_SETTING_UP)

code/modules/jobs/job_types/bartender.dm

@@ -32,7 +32,7 @@
 	backpack_contents = list(/obj/item/storage/box/beanbag=1,/obj/item/book/granter/action/drink_fling=1)
 	shoes = /obj/item/clothing/shoes/laceup
 
-/datum/job/bartender/after_spawn(mob/living/H, mob/M, latejoin = FALSE)
+/datum/job/bartender/after_spawn(mob/living/H, client/C, latejoin = FALSE)
 	. = ..()
 	var/datum/action/innate/drink_fling/D = new
 	D.Grant(H)

code/modules/jobs/job_types/chaplain.dm

@@ -21,7 +21,7 @@
 	threat = 0.5
 
 
-/datum/job/chaplain/after_spawn(mob/living/H, mob/M)
+/datum/job/chaplain/after_spawn(mob/living/H, client/C)
 	. = ..()
 	if(H.mind)
 		H.mind.isholy = TRUE
@@ -41,12 +41,12 @@
 		return
 
 	var/new_religion = DEFAULT_RELIGION
-	if(M.client && M.client.prefs.custom_names["religion"])
-		new_religion = M.client.prefs.custom_names["religion"]
+	if(C && C.prefs.custom_names["religion"])
+		new_religion = C.prefs.custom_names["religion"]
 
 	var/new_deity = DEFAULT_DEITY
-	if(M.client && M.client.prefs.custom_names["deity"])
-		new_deity = M.client.prefs.custom_names["deity"]
+	if(C && C.prefs.custom_names["deity"])
+		new_deity = C.prefs.custom_names["deity"]
 
 	B.deity_name = new_deity
 

code/modules/jobs/job_types/mime.dm

@@ -21,9 +21,9 @@
 
 	threat = 0
 
-/datum/job/mime/after_spawn(mob/living/carbon/human/H, mob/M)
+/datum/job/mime/after_spawn(mob/living/carbon/human/H, client/C)
 	. = ..()
-	H.apply_pref_name("mime", M.client)
+	H.apply_pref_name("mime", C)
 
 /datum/outfit/job/mime
 	name = "Mime"

code/modules/jobs/job_types/prisoner.dm

@@ -17,12 +17,12 @@
 /datum/job/prisoner/get_latejoin_spawn_point()
 	return get_roundstart_spawn_point()
 
-/datum/job/prisoner/after_spawn(mob/living/carbon/human/H, mob/M)
+/datum/job/prisoner/after_spawn(mob/living/carbon/human/H, client/C)
 	. = ..()
 	var/list/policies = CONFIG_GET(keyed_list/policy)
 	var/policy = policies[POLICYCONFIG_JOB_PRISONER]
 	if(policy)
-		var/mob/found = (M?.client && M) || (H?.client && H)
+		var/mob/found = (H?.client && H)
 		to_chat(found, "<br><span class='userdanger'>!!READ THIS!!</span><br><span class='warning'>The following is server-specific policy configuration and overrides anything said above if conflicting.</span>")
 		to_chat(found, "<br><br>")
 		to_chat(found, "<span class='boldnotice'>[policy]</span>")

code/modules/mining/equipment/survival_pod.dm

@@ -98,6 +98,16 @@
 	name = "garden & kitchen bluespace shelter capsule"
 	desc = "Everything someone needs to make a home cooked meal while surviving the depths of hell... or space."
 	template_id = "shelter_zeta"
+
+// RBMK reactor beacon so people can create the engine
+
+/obj/item/survivalcapsule/reactor // the not-so-survival capsule
+	name = "RMBK Reactor Beacon"
+	desc = "A special bluespace beacon designed to implement a reactor into the hull of the ship or station that it is activated on."
+	icon = 'icons/obj/device.dmi'
+	icon_state = "beacon"
+	template_id = "reactor"
+	
 //Pod objects
 
 //Window

code/modules/mining/lavaland/ruins/gym.dm

@@ -1,7 +1,7 @@
 /obj/structure/punching_bag
 	name = "punching bag"
 	desc = "A punching bag. Can you get to speed level 4???"
-	icon = 'goon/icons/obj/fitness.dmi'
+	icon = 'icons/obj/fitness.dmi'
 	icon_state = "punchingbag"
 	anchored = TRUE
 	layer = WALL_OBJ_LAYER
@@ -12,7 +12,7 @@
 	. = ..()
 	if(.)
 		return
-	flick("[icon_state]2", src)
+	flick("[icon_state]-punch", src)
 	playsound(loc, pick(hit_sounds), 25, 1, -1)
 	if(isliving(user))
 		var/mob/living/L = user
@@ -20,15 +20,24 @@
 		L.apply_status_effect(STATUS_EFFECT_EXERCISED)
 
 /obj/structure/weightmachine
-	name = "Weight Machine"
 	desc = "Just looking at this thing makes you feel tired."
+	icon = 'icons/obj/fitness.dmi'
 	density = TRUE
 	anchored = TRUE
-	var/icon_state_inuse
 
 /obj/structure/weightmachine/proc/AnimateMachine(mob/living/user)
 	return
 
+/obj/structure/weightmachine/update_icon_state()
+	. = ..()
+	icon_state = (obj_flags & IN_USE) ? "[base_icon_state]-u" : base_icon_state
+
+/obj/structure/weightmachine/update_overlays()
+	. = ..()
+
+	if(obj_flags & IN_USE)
+		. += mutable_appearance(icon, "[base_icon_state]-o", layer = ABOVE_MOB_LAYER, alpha = src.alpha)
+
 /obj/structure/weightmachine/on_attack_hand(mob/living/user, act_intent = user.a_intent, unarmed_attack_flags)
 	. = ..()
 	if(.)
@@ -38,7 +47,7 @@
 		return
 	else
 		obj_flags |= IN_USE
-		icon_state = icon_state_inuse
+		update_appearance()
 		user.setDir(SOUTH)
 		user.Stun(80)
 		user.forceMove(src.loc)
@@ -48,17 +57,17 @@
 
 		playsound(user, 'sound/machines/click.ogg', 60, 1)
 		obj_flags &= ~IN_USE
+		update_appearance()
 		user.pixel_y = 0
 		var/finishmessage = pick("You feel stronger!","You feel like you can take on the world!","You feel robust!","You feel indestructible!")
 		SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "exercise", /datum/mood_event/exercise)
-		icon_state = initial(icon_state)
 		to_chat(user, finishmessage)
 		user.apply_status_effect(STATUS_EFFECT_EXERCISED)
 
 /obj/structure/weightmachine/stacklifter
-	icon = 'goon/icons/obj/fitness.dmi'
-	icon_state = "fitnesslifter"
-	icon_state_inuse = "fitnesslifter2"
+	name = "chest press machine"
+	icon_state = "stacklifter"
+	base_icon_state = "stacklifter"
 
 /obj/structure/weightmachine/stacklifter/AnimateMachine(mob/living/user)
 	var/lifts = 0
@@ -69,27 +78,24 @@
 		animate(user, pixel_y = -2, time = 3)
 		sleep(3)
 		animate(user, pixel_y = -4, time = 3)
-		sleep(3)
-		playsound(user, 'goon/sound/effects/spring.ogg', 60, 1)
+		sleep(2)
+		playsound(user, 'sound/machines/creak.ogg', 60, 1)
 
 /obj/structure/weightmachine/weightlifter
-	icon = 'goon/icons/obj/fitness.dmi'
-	icon_state = "fitnessweight"
-	icon_state_inuse = "fitnessweight-c"
+	name = "inline bench press"
+	icon_state = "benchpress"
+	base_icon_state = "benchpress"
 
 /obj/structure/weightmachine/weightlifter/AnimateMachine(mob/living/user)
-	var/mutable_appearance/swole_overlay = mutable_appearance(icon, "fitnessweight-w", WALL_OBJ_LAYER)
-	add_overlay(swole_overlay)
 	var/reps = 0
 	user.pixel_y = 5
 	while (reps++ < 6)
 		if (user.loc != src.loc)
 			break
 		for (var/innerReps = max(reps, 1), innerReps > 0, innerReps--)
-			sleep(3)
+			sleep(4)
 			animate(user, pixel_y = (user.pixel_y == 3) ? 5 : 3, time = 3)
-		playsound(user, 'goon/sound/effects/spring.ogg', 60, 1)
+		playsound(user, 'sound/machines/creak.ogg', 60, 1)
 	sleep(3)
 	animate(user, pixel_y = 2, time = 3)
 	sleep(3)
-	cut_overlay(swole_overlay)

code/modules/mining/shelters.dm

@@ -107,3 +107,11 @@
 	. = ..()
 	whitelisted_turfs = typecacheof(/turf/closed/mineral)
 	banned_objects = typecacheof(/obj/structure/stone_tile)
+
+// yes, I COULD make it a seperate object from the surv capsule but the code needed is indeticle soo...
+
+/datum/map_template/shelter/reactor
+	name = "RBMK Reactor"
+	shelter_id = "reactor"
+	description = "A reactor core, coolant and moderator loop not included."
+	mappath = "_maps/templates/reactor_1.dmm"

code/modules/mob/dead/new_player/sprite_accessories/wings.dm

@@ -216,6 +216,26 @@
 	icon_state = "harpywings"
 	upgrade_to = SPECIES_WINGS_ANGEL
 
+/datum/sprite_accessory/deco_wings/harpywingsalt
+	name = "Harpy (Alt)"
+	icon_state = "harpywingsalt"
+	upgrade_to = SPECIES_WINGS_ANGEL
+
+/datum/sprite_accessory/deco_wings/harpywingsaltcollar
+	name = "Harpy (Alt Collar)"
+	icon_state = "harpywingsaltcollar"
+	upgrade_to = SPECIES_WINGS_ANGEL
+
+/datum/sprite_accessory/deco_wings/harpywingsbat
+	name = "Harpy (Bat)"
+	icon_state = "harpywingsbat"
+	upgrade_to = SPECIES_WINGS_ANGEL
+
+/datum/sprite_accessory/deco_wings/harpywingsbatcollar
+	name = "Harpy (Bat Collar)"
+	icon_state = "harpywingsbatcollar"
+	upgrade_to = SPECIES_WINGS_ANGEL
+
 /datum/sprite_accessory/deco_wings/roboticwing
 	name = "Robotic"
 	icon_state = "drago"
@@ -420,6 +440,26 @@
 	icon_state = "harpywings"
 	upgrade_to = SPECIES_WINGS_ANGEL
 
+/datum/sprite_accessory/insect_wings/harpywingsalt
+	name = "Harpy (Alt)"
+	icon_state = "harpywingsalt"
+	upgrade_to = SPECIES_WINGS_ANGEL
+
+/datum/sprite_accessory/insect_wings/harpywingsaltcollar
+	name = "Harpy (Alt Collar)"
+	icon_state = "harpywingsaltcollar"
+	upgrade_to = SPECIES_WINGS_ANGEL
+
+/datum/sprite_accessory/insect_wings/harpywingsbat
+	name = "Harpy (Bat)"
+	icon_state = "harpywingsbat"
+	upgrade_to = SPECIES_WINGS_ANGEL
+
+/datum/sprite_accessory/insect_wings/harpywingsbatcollar
+	name = "Harpy (Bat Collar)"
+	icon_state = "harpywingsbatcollar"
+	upgrade_to = SPECIES_WINGS_ANGEL
+
 /datum/sprite_accessory/insect_wings/roboticwing
 	name = "Robotic"
 	icon_state = "drago"

code/modules/mob/living/carbon/human/species_types/xeno.dm

@@ -14,7 +14,7 @@
 	skinned_type = /obj/item/stack/sheet/animalhide/xeno
 	exotic_bloodtype = "X*"
 	damage_overlay_type = "xeno"
-	disliked_food = JUNKFOOD
+	disliked_food = null
 	liked_food = GROSS | MEAT
 	species_category = SPECIES_CATEGORY_ALIEN
 	wings_icons = SPECIES_WINGS_DRAGON //most depictions of xenomorphs with wings are closest to this.

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

@@ -322,6 +322,30 @@
 	else
 		to_chat(user, "Encryption Key ports not configured.")
 
+/obj/item/paicard/attack_ghost(mob/dead/observer/user)
+	if(pai)
+		to_chat(user, "<span class='warning'>This pAI is already in use!</span>")
+		return
+
+	var/area/A = get_area(get_turf(src))
+	if(A.type in SSpai.restricted_areas) // set in subsystem/pai.dm on initialize of the subsystem
+		to_chat(user, "<span class='warning'>You can't download yourself into a restricted area!</span>")
+		return
+
+	var/pai_name = reject_bad_name(stripped_input(usr, "Enter a name for your pAI", "pAI Name", user.name, MAX_NAME_LEN), TRUE)
+	if(!pai_name)
+		to_chat(user, "<span class='warning'>Entered name is not valid.</span>")
+		return
+
+	var/mob/living/silicon/pai/new_pai = new(src)
+	new_pai.name = pai_name
+	new_pai.real_name = new_pai.name
+	new_pai.key = user.key
+
+	setPersonality(new_pai)
+
+	SSticker.mode.update_cult_icons_removed(pai.mind)
+
 /obj/item/paicard/emag_act(mob/user) // Emag to wipe the master DNA and supplemental directive
 	. = ..()
 	if(!pai)

code/modules/modular_computers/computers/machinery/console_presets.dm

@@ -37,6 +37,7 @@
 	hard_drive.store_file(new/datum/computer_file/program/power_monitor())
 	hard_drive.store_file(new/datum/computer_file/program/alarm_monitor())
 	hard_drive.store_file(new/datum/computer_file/program/supermatter_monitor())
+	hard_drive.store_file(new/datum/computer_file/program/nuclear_monitor())
 
 // ===== RESEARCH CONSOLE =====
 /obj/machinery/modular_computer/console/preset/research

code/modules/power/reactor/fuel_rods.dm

@@ -0,0 +1,251 @@
+/obj/item/fuel_rod
+	name = "Uranium-235 Fuel Rod"
+	desc = "A titanium sheathed rod containing a measure of enriched uranium-dioxide powder inside, and a breeding blanket of uranium-238 around it, used to kick off a fission reaction and breed plutonium fuel respectivly."
+	icon = 'icons/obj/control_rod.dmi'
+	icon_state = "irradiated"
+	w_class = WEIGHT_CLASS_BULKY
+	var/depletion = 0 //Each fuel rod will deplete in around 30 minutes.
+	var/fuel_power = 0.10
+	var/rad_strength = 500
+	var/half_life = 2000 // how many depletion ticks are needed to half the fuel_power (1 tick = 1 second)
+	var/time_created = 0
+	var/og_fuel_power = 0.20 //the original fuel power value
+	var/process = FALSE
+	// The depletion where depletion_final() will be called (and does something)
+	var/depletion_threshold = 100
+	// How fast this rod will deplete
+	var/depletion_speed_modifier = 1
+	var/depleted_final = FALSE // depletion_final should run only once
+	var/depletion_conversion_type = "plutonium"
+
+/obj/item/fuel_rod/ComponentInitialize()
+	. = ..()
+	AddComponent(/datum/component/two_handed, require_twohands = TRUE)
+
+/obj/item/fuel_rod/Initialize()
+	. = ..()
+	time_created = world.time
+	AddComponent(/datum/component/radioactive, rad_strength, src) // This should be temporary for it won't make rads go lower than 350
+	if(process)
+		START_PROCESSING(SSobj, src)
+
+/obj/item/fuel_rod/Destroy()
+	if(process)
+		STOP_PROCESSING(SSobj, src)
+	var/obj/machinery/atmospherics/components/trinary/nuclear_reactor/N = loc
+	if(istype(N))
+		N.fuel_rods -= src
+	. = ..()
+
+// This proc will try to convert your fuel rod if you don't override this proc
+// So, ideally, you should write an override of this for every fuel rod you want to create
+/obj/item/fuel_rod/proc/depletion_final(result_rod)
+	if(!result_rod)
+		return
+	var/obj/machinery/atmospherics/components/trinary/nuclear_reactor/N = loc
+	// Rod conversion is moot when you can't find the reactor
+	if(istype(N))
+		var/obj/item/fuel_rod/R
+
+		// You can add your own depletion scheme and not override this proc if you are going to convert a fuel rod into another type
+		switch(result_rod)
+			if("plutonium")
+				R = new /obj/item/fuel_rod/plutonium(loc)
+				R.depletion = depletion
+				if(prob(1))
+					R.name = "Plush-239 Fuel Rod"
+					R.desc = "NanoTrasen would like to remind you that it is not liable for any permanent radioactive damage done to its employees."
+					R.icon = 'icons/obj/plushes.dmi'
+					R.icon_state = "romanian"
+					R.fuel_power = 0.25 //Funny easter egg, slightly more powerful too.
+			if("depleted")
+				if(fuel_power < 10)
+					fuel_power = 0
+					playsound(loc, 'sound/effects/supermatter.ogg', 100, TRUE)
+					R = new /obj/item/fuel_rod/depleted(loc)
+					R.depletion = depletion
+
+		// Finalization of conversion
+		if(istype(R))
+			N.fuel_rods += R
+			qdel(src)
+	else
+		depleted_final = FALSE // Maybe try again later?
+
+/obj/item/fuel_rod/proc/deplete(amount=0.035)
+	depletion += amount * depletion_speed_modifier
+	if(depletion >= depletion_threshold && !depleted_final)
+		depleted_final = TRUE
+		depletion_final(depletion_conversion_type)
+
+/obj/item/fuel_rod/plutonium
+	fuel_power = 0.20
+	name = "Plutonium-239 Fuel Rod"
+	desc = "A highly energetic titanium sheathed rod containing a sizeable measure of weapons grade plutonium, it's highly efficient as nuclear fuel, but will cause the reaction to get out of control if not properly utilised."
+	icon_state = "inferior"
+	rad_strength = 1500
+	process = TRUE // for half life code
+	depletion_threshold = 300
+	depletion_conversion_type = "depleted"
+
+/obj/item/fuel_rod/process()
+	fuel_power = og_fuel_power * 0.5**((world.time - time_created) / half_life SECONDS) // halves the fuel power every half life (33 minutes)
+
+/obj/item/fuel_rod/depleted
+	fuel_power = 0.05
+	name = "Depleted Fuel Rod"
+	desc = "A highly radioactive fuel rod which has expended most of it's useful energy."
+	icon_state = "normal"
+	rad_strength = 6000 // smelly
+	depletion_conversion_type = null // It means that it won't turn into anything
+	process = TRUE
+
+// Master type for material optional (or requiring, wyci) and/or producing rods
+/obj/item/fuel_rod/material
+	// Whether the rod has been harvested. Should be set in expend().
+	var/expended = FALSE
+	// The material that will be inserted and then multiplied (or not). Should be some sort of /obj/item/stack
+	var/material_type
+	// The name of material that'll be used for texts
+	var/material_name
+	var/material_name_singular
+	var/initial_amount = 0
+	// The maximum amount of material the rod can hold
+	var/max_initial_amount = 10
+	var/grown_amount = 0
+	// The multiplier for growth. 1 for the same 2 for double etc etc
+	var/multiplier = 2
+	// After this depletion, you won't be able to add new materials
+	var/material_input_deadline = 25
+	// Material fuel rods generally don't get converted into another fuel object
+	depletion_conversion_type = null
+
+// Called when the rod is fully harvested
+/obj/item/fuel_rod/material/proc/expend()
+	expended = TRUE
+
+// Basic checks for material rods
+/obj/item/fuel_rod/material/proc/check_material_input(mob/user)
+	if(depletion >= material_input_deadline)
+		to_chat(user, "<span class='warning'>The sample slots have sealed themselves shut, it's too late to add [material_name] now!</span>") // no cheesing in crystals at 100%
+		return FALSE
+	if(expended)
+		to_chat(user, "<span class='warning'>\The [src]'s material slots have already been used.</span>")
+		return FALSE
+	return TRUE
+
+// The actual growth
+/obj/item/fuel_rod/material/depletion_final(result_rod)
+	if(result_rod)
+		..() // So if you put anything into depletion_conversion_type then your fuel rod will be converted (or not) and *won't grow*
+	else
+		grown_amount = initial_amount * multiplier
+
+/obj/item/fuel_rod/material/attackby(obj/item/W, mob/user, params)
+	var/obj/item/stack/M = W
+	if(istype(M, material_type))
+		if(!check_material_input(user))
+			return
+		if(initial_amount < max_initial_amount)
+			var/adding = min((max_initial_amount - initial_amount), M.amount)
+			M.amount -= adding
+			initial_amount += adding
+			if (adding == 1)
+				to_chat(user, "<span class='notice'>You insert [adding] [material_name_singular] into \the [src].</span>")
+			else
+				to_chat(user, "<span class='notice'>You insert [adding] [material_name] into \the [src].</span>")
+			M.zero_amount()
+		else
+			to_chat(user, "<span class='warning'>\The [src]'s material slots are full!</span>")
+			return
+	else
+		return ..()
+
+/obj/item/fuel_rod/material/attack_self(mob/user)
+	if(expended)
+		to_chat(user, "<span class='notice'>You have already removed [material_name] from \the [src].</span>")
+		return
+
+	if(depleted_final)
+		new material_type(user.loc, grown_amount)
+		if (grown_amount == 1)
+			to_chat(user, "<span class='notice'>You harvest [grown_amount] [material_name_singular] from \the [src].</span>") // Unlikely
+		else
+			to_chat(user, "<span class='notice'>You harvest [grown_amount] [material_name] from \the [src].</span>")
+		playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 50, 1)
+		grown_amount = 0
+		expend()
+	else if(depletion)
+		to_chat(user, "<span class='warning'>\The [src] has not fissiled enough to fully grow the sample. The progress bar shows it is [min(depletion/depletion_threshold*100,100)]% complete.</span>")
+		playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0)
+	else if(initial_amount)
+		new material_type(user.loc, initial_amount)
+		if (initial_amount == 1)
+			to_chat(user, "<span class='notice'>You remove [initial_amount] [material_name_singular] from \the [src].</span>")
+		else
+			to_chat(user, "<span class='notice'>You remove [initial_amount] [material_name] from \the [src].</span>")
+		playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 50, 1)
+		initial_amount = 0
+
+/obj/item/fuel_rod/material/examine(mob/user)
+	. = ..()
+	if(expended)
+		. += "<span class='warning'>The material slots have been slagged by the extreme heat, you can't grow [material_name] in this rod again...</span>"
+		return
+	else if(depleted_final)
+		. += "<span class='warning'>This fuel rod's [material_name] are now fully grown, and it currently bears [grown_amount] harvestable [material_name_singular]\s.</span>"
+		return
+	if(depletion)
+		. += "<span class='danger'>The sample is [min(depletion/depletion_threshold*100,100)]% fissiled.</span>"
+	. += "<span class='disarm'>[initial_amount]/[max_initial_amount] of the slots for [material_name] are full.</span>"
+
+/obj/item/fuel_rod/material/telecrystal
+	name = "Telecrystal Fuel Rod"
+	desc = "A disguised titanium sheathed rod containing several small slots infused with uranium dioxide. Permits the insertion of telecrystals to grow more. Fissiles much faster than its standard counterpart"
+	icon_state = "telecrystal"
+	fuel_power = 0.30 // twice as powerful as a normal rod, you're going to need some engineering autism if you plan to mass produce TC
+	depletion_speed_modifier = 3 // headstart, otherwise it takes two hours
+	rad_strength = 1500
+	max_initial_amount = 8
+	multiplier = 3
+	material_type = /obj/item/stack/telecrystal
+	material_name = "telecrystals"
+	material_name_singular = "telecrystal"
+
+/obj/item/fuel_rod/material/telecrystal/depletion_final(result_rod)
+	..()
+	if(result_rod)
+		return
+	fuel_power = 0.60 // thrice as powerful as plutonium, you'll want to get this one out quick!
+	name = "Exhausted Telecrystal Fuel Rod"
+	desc = "A highly energetic, disguised titanium sheathed rod containing a number of slots filled with greatly expanded telecrystals which can be removed by hand. It's extremely efficient as nuclear fuel, but will cause the reaction to get out of control if not properly utilised."
+	icon_state = "telecrystal_used"
+	AddComponent(/datum/component/radioactive, 3000, src)
+
+/obj/item/fuel_rod/material/bananium
+	name = "Bananium Fuel Rod"
+	desc = "A hilarious heavy-duty fuel rod which fissiles a bit slower than its cowardly counterparts. However, its cutting-edge cosmic clown technology allows rooms for extraordinarily exhilarating extraterrestrial element called bananium to menacingly multiply."
+	icon_state = "bananium"
+	fuel_power = 0.15
+	depletion_speed_modifier = 3
+	rad_strength = 350
+	max_initial_amount = 10
+	multiplier = 3
+	material_type = /obj/item/stack/sheet/mineral/bananium
+	material_name = "sheets of bananium"
+	material_name_singular = "sheet of bananium"
+
+/obj/item/fuel_rod/material/bananium/deplete(amount=0.035)
+	..()
+	if(initial_amount == max_initial_amount && prob(10))
+		playsound(src, pick('sound/items/bikehorn.ogg', 'sound/misc/bikehorn_creepy.ogg'), 50) // HONK
+
+/obj/item/fuel_rod/material/bananium/depletion_final(result_rod)
+	..()
+	if(result_rod)
+		return
+	fuel_power = 0.3 // Be warned
+	name = "Fully Grown Bananium Fuel Rod"
+	desc = "A hilarious heavy-duty fuel rod which fissiles a bit slower than it cowardly counterparts. Its greatly grimacing grwoth stage is now over, and bananium outgrowth hums as if it's blatantly honking bike horns."
+	icon_state = "bananium_used"
+	AddComponent(/datum/component/radioactive, 1250, src)

code/modules/power/reactor/reactor_cargo.dm

@@ -0,0 +1,37 @@
+// modular shitcode but it works:tm:
+
+/obj/machinery/atmospherics/components/trinary/nuclear_reactor/multitool_act(mob/living/user, obj/item/multitool/I)
+	if(istype(I))
+		to_chat(user, "<span class='notice'>You add \the [src]'s ID into the multitool's buffer.</span>")
+		I.buffer = src.id
+		return TRUE
+/obj/machinery/computer/reactor/multitool_act(mob/living/user, obj/item/multitool/I)
+	if(istype(I))
+		to_chat(user, "<span class='notice'>You add the reactor's ID to \the [src]>")
+		src.id = I.buffer
+		link_to_reactor()
+		return TRUE
+
+/obj/machinery/atmospherics/components/trinary/nuclear_reactor/cargo // easier on the brain
+
+/obj/machinery/atmospherics/components/trinary/nuclear_reactor/cargo/New()
+	. = ..()
+	id = rand(1, 9999999) // cmon, what are the chances? The chances are... Very low friend... But maybe we can make this a bit better.
+
+// Cargo variants can be wrenched down and don't start linked to the default RMBK reactor
+
+/obj/machinery/computer/reactor/control_rods/cargo
+	anchored = FALSE
+	id = null
+
+/obj/machinery/computer/reactor/stats/cargo
+	anchored = FALSE
+	id = null
+
+/obj/machinery/computer/reactor/fuel_rods/cargo
+	anchored = FALSE
+	id = null
+
+/obj/item/paper/fluff/rbmkcargo
+	name = "Nuclear Reactor Instructions"
+	info = "Make sure a 5x5 area is completely clear of pipes, cables and machinery when using the beacon. Those will be provided automatically with the beacon's bluespace decompression. Use a multitool on the reactor then on the computers provided to link them together. Also make sure the reactor has a proper pipeline filled with cooling gas before inserting fuel rods. Good luck!"

code/modules/power/singularity/field_generator.dm

@@ -34,6 +34,7 @@ field_generator power level display
 	max_integrity = 500
 	//100% immune to lasers and energy projectiles since it absorbs their energy.
 	armor = list(MELEE = 25, BULLET = 10, LASER = 100, ENERGY = 100, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 70)
+	var/obj/item/radio/radio
 	var/const/num_power_levels = 6	// Total number of power level icon has
 	var/power_level = 0
 	var/active = FG_OFFLINE
@@ -58,6 +59,9 @@ field_generator power level display
 	. = ..()
 	fields = list()
 	connected_gens = list()
+	radio = new(src)
+	radio.listening = 0
+	radio.recalculateChannels()
 
 /obj/machinery/field/generator/ComponentInitialize()
 	. = ..()
@@ -166,6 +170,7 @@ field_generator power level display
 
 /obj/machinery/field/generator/Destroy()
 	cleanup()
+	QDEL_NULL(radio)
 	return ..()
 
 
@@ -333,6 +338,7 @@ field_generator power level display
 				if((world.time - O.last_warning) > 50) //to stop message-spam
 					temp = 0
 					var/turf/T = get_turf(src)
+					radio.talk_into(src, "A containment field has failed in [get_area_name(src, TRUE)] while a singularity exists.", null, language = get_selected_language())
 					message_admins("A singulo exists and a containment field has failed at [ADMIN_VERBOSEJMP(T)].")
 					investigate_log("has <font color='red'>failed</font> whilst a singulo exists at [AREACOORD(T)].", INVESTIGATE_SINGULO)
 			O.last_warning = world.time

code/modules/power/singularity/singularity.dm

@@ -415,17 +415,13 @@
 
 /obj/singularity/proc/mezzer()
 	for(var/mob/living/carbon/M in oviewers(8, src))
-		if(isbrain(M)) //Ignore brains
-			continue
-
-		if(M.stat == CONSCIOUS)
-			if (ishuman(M))
-				var/mob/living/carbon/human/H = M
-				if(istype(H.glasses, /obj/item/clothing/glasses/meson))
-					var/obj/item/clothing/glasses/meson/MS = H.glasses
-					if(MS.vision_flags == SEE_TURFS)
-						to_chat(H, "<span class='notice'>You look directly into the [src.name], good thing you had your protective eyewear on!</span>")
-						return
+		if(M.stat == CONSCIOUS && ishuman(M))
+			var/mob/living/carbon/human/H = M
+			if(istype(H.glasses, /obj/item/clothing/glasses/meson))
+				var/obj/item/clothing/glasses/meson/MS = H.glasses
+				if(MS.vision_flags == SEE_TURFS)
+					to_chat(H, "<span class='notice'>You look directly into the [src.name], good thing you had your protective eyewear on!</span>")
+					return
 
 		M.apply_effect(60, EFFECT_STUN)
 		M.visible_message("<span class='danger'>[M] stares blankly at the [src.name]!</span>", \

code/modules/reagents/chemistry/reagents/alcohol_reagents.dm

@@ -1686,14 +1686,14 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	var/heal_points = 10
 	if(L.health <= 0)
 		heal_points = 20 //heal more if we're in softcrit
-	for(var/i in 1 to min(volume, heal_points)) //only heals 1 point of damage per unit on add, for balance reasons
-		L.adjustBruteLoss(-1)
-		L.adjustFireLoss(-1)
-		L.adjustToxLoss(-1)
-		L.adjustOxyLoss(-1)
-		L.adjustStaminaLoss(-1)
+	heal_points = min(volume, heal_points)
+	L.adjustBruteLoss(-heal_points)
+	L.adjustFireLoss(-heal_points)
+	L.adjustToxLoss(-heal_points)
+	L.adjustOxyLoss(-heal_points)
+	L.adjustStaminaLoss(-heal_points)
 	L.visible_message("<span class='warning'>[L] shivers with renewed vigor!</span>", "<span class='notice'>One taste of [lowertext(name)] fills you with energy!</span>")
-	if(!L.stat && heal_points == 20) //brought us out of softcrit
+	if(!L.stat && L.health > 0) //brought us out of softcrit
 		L.visible_message("<span class='danger'>[L] lurches to [L.p_their()] feet!</span>", "<span class='boldnotice'>Up and at 'em, kid.</span>")
 
 /datum/reagent/consumable/ethanol/bastion_bourbon/on_mob_life(mob/living/L)

code/modules/research/designs/bluespace_designs.dm

@@ -115,3 +115,13 @@
 	build_path = /obj/item/pipe/bluespace
 	category = list("Bluespace Designs")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
+
+/datum/design/swapper //ported from TG, credit to XDTM
+	name = "Quantum Spin Inverter"
+	desc = "An experimental device that is able to swap the locations of two entities by switching their particles' spin values. Must be linked to another device to function."
+	id = "swapper"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 500, /datum/material/diamond = 1500, /datum/material/glass = 1000, /datum/material/bluespace = 2000, /datum/material/silver=1000)
+	build_path = /obj/item/swapper
+	category = list("Bluespace Designs")
+	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE

code/modules/research/destructive_analyzer.dm

@@ -84,15 +84,7 @@ Note: Must be placed within 3 tiles of the R&D Console
 	reclaim_materials_from(thing)
 	for(var/mob/M in thing)
 		M.death()
-	if(istype(thing, /obj/item/stack/sheet))
-		var/obj/item/stack/sheet/S = thing
-		if(S.amount > 1 && !innermode)
-			S.amount--
-			loaded_item = S
-		else
-			qdel(S)
-	else
-		qdel(thing)
+	qdel(thing)
 	if (!innermode)
 		update_icon()
 	return TRUE

code/modules/research/techweb/nodes/bluespace_nodes.dm

@@ -61,7 +61,7 @@
 	display_name = "Bluespace Travel"
 	description = "Application of Bluespace for static teleportation technology."
 	prereq_ids = list("adv_power", "adv_bluespace")
-	design_ids = list("tele_station", "tele_hub", "quantumpad", "quantum_keycard", "launchpad", "launchpad_console", "teleconsole", "roastingstick", "bluespace_pipe")
+	design_ids = list("tele_station", "tele_hub", "quantumpad", "quantum_keycard", "launchpad", "launchpad_console", "teleconsole", "roastingstick", "bluespace_pipe","swapper")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
 
 /datum/techweb_node/unregulated_bluespace

code/modules/surgery/organs/tongue.dm

@@ -15,6 +15,7 @@
 	var/list/accents = list() //done in order of priority (please always apply abductor accent and stuttering last)
 	var/static/list/languages_possible_base = typecacheof(list(
 		/datum/language/common,
+		/datum/language/machine,
 		/datum/language/draconic,
 		/datum/language/codespeak,
 		/datum/language/monkey,
@@ -142,7 +143,7 @@
 	icon_state = "tonguexeno"
 	say_mod = "hisses"
 	taste_sensitivity = 10 // LIZARDS ARE ALIENS CONFIRMED
-	maxHealth = 500 //They've a little mouth for a tongue, so it's pretty rhobust
+	maxHealth = 500 //They've a little mouth for a tongue, so it's pretty robust
 	initial_accents = list(/datum/accent/alien)
 	var/static/list/languages_possible_alien = typecacheof(list(
 		/datum/language/xenocommon,
@@ -155,6 +156,13 @@
 	. = ..()
 	languages_possible = languages_possible_alien
 
+/obj/item/organ/tongue/alien/hybrid
+	name = "xenohybrid tongue"
+
+/obj/item/organ/tongue/alien/hybrid/Initialize(mapload)
+	. = ..()
+	languages_possible = languages_possible_base
+
 /obj/item/organ/tongue/bone
 	name = "bone \"tongue\""
 	desc = "Apparently skeletons alter the sounds they produce through oscillation of their teeth, hence their characteristic rattling."
@@ -248,6 +256,7 @@
 	taste_sensitivity = 101 // Not a tongue, they can't taste shit
 	var/static/list/languages_possible_ethereal = typecacheof(list(
 		/datum/language/common,
+		/datum/language/machine,
 		/datum/language/draconic,
 		/datum/language/codespeak,
 		/datum/language/monkey,
@@ -269,6 +278,7 @@
 	say_mod = "chitters"
 	var/static/list/languages_possible_arachnid = typecacheof(list(
 		/datum/language/common,
+		/datum/language/machine,
 		/datum/language/draconic,
 		/datum/language/codespeak,
 		/datum/language/monkey,

code/modules/uplink/uplink_items/uplink_devices.dm

@@ -275,6 +275,18 @@
 	purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
 	restricted = TRUE
 
+//this seems like a terrible idea to me, so commenting it out for now. -Shell
+/*
+/datum/uplink_item/device_tools/tc_rod
+	name = "Telecrystal Fuel Rod"
+	desc = "This special fuel rod has eight material slots that can be inserted with telecrystals, \
+			once the rod has been fully depleted, you will be able to harvest the extra telecrystals. \
+			Please note: This Rod fissiles much faster than it's regular counterpart, it doesn't take \
+			much to overload the reactor with these..."
+	item = /obj/item/twohanded/required/fuel_rod/material/telecrystal
+	cost = 7
+*/
+
 /* for now
 /datum/uplink_item/device_tools/suspiciousphone
 	name = "Protocol CRAB-17 Phone"