Merge remote-tracking branch 'refs/remotes/origin/master' into changelog-memes

code/modules/atmospherics/environmental/LINDA_turf_tile.dm

@@ -223,9 +223,7 @@
 			our_air.share(G, adjacent_turfs_length)
 			LAST_SHARE_CHECK
 
-	our_air.react(src)
-
-	update_visuals()
+	SSair.add_to_react_queue(src)
 
 	if((!our_excited_group && !(our_air.temperature > MINIMUM_TEMPERATURE_START_SUPERCONDUCTION && consider_superconductivity(starting = TRUE))) \
 	  || (cached_atmos_cooldown > (EXCITED_GROUP_DISMANTLE_CYCLES * 2)))
@@ -233,6 +231,15 @@
 
 	atmos_cooldown = cached_atmos_cooldown
 
+/turf/proc/process_cell_reaction()
+	SSair.remove_from_react_queue(src)
+
+/turf/open/process_cell_reaction()
+	air.react(src)
+	update_visuals()
+	SSair.remove_from_react_queue(src)
+	return
+
 //////////////////////////SPACEWIND/////////////////////////////
 
 /turf/open/proc/consider_pressure_difference(turf/T, difference)

code/modules/atmospherics/gasmixtures/gas_mixture.dm

@@ -28,6 +28,7 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
 	var/volume = CELL_VOLUME //liters
 	var/last_share = 0
 	var/list/reaction_results
+	var/list/analyzer_results //used for analyzer feedback - not initialized until its used
 
 /datum/gas_mixture/New(volume)
 	gases = new
@@ -427,14 +428,14 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
 		for(var/r in SSair.gas_reactions)
 			var/datum/gas_reaction/reaction = r
 
-			var/list/min_reqs = reaction.min_requirements.Copy()
+			var/list/min_reqs = reaction.min_requirements
 			if((min_reqs["TEMP"] && temp < min_reqs["TEMP"]) \
 			|| (min_reqs["ENER"] && ener < min_reqs["ENER"]))
 				continue
-			min_reqs -= "TEMP"
-			min_reqs -= "ENER"
 
 			for(var/id in min_reqs)
+				if (id == "TEMP" || id == "ENER")
+					continue
 				if(!cached_gases[id] || cached_gases[id][MOLES] < min_reqs[id])
 					continue reaction_loop
 			//at this point, all minimum requirements for the reaction are satisfied.

code/modules/atmospherics/gasmixtures/gas_types.dm

@@ -74,7 +74,7 @@ GLOBAL_LIST_INIT(nonreactive_gases, typecacheof(list(/datum/gas/oxygen, /datum/g
 	name = "Water Vapor"
 	gas_overlay = "water_vapor"
 	moles_visible = MOLES_GAS_VISIBLE
-	fusion_power = 4
+	fusion_power = 8
 
 /datum/gas/hypernoblium
 	id = "nob"
@@ -99,7 +99,7 @@ GLOBAL_LIST_INIT(nonreactive_gases, typecacheof(list(/datum/gas/oxygen, /datum/g
 	gas_overlay = "nitryl"
 	moles_visible = MOLES_GAS_VISIBLE
 	dangerous = TRUE
-	fusion_power = 10
+	fusion_power = 15
 
 /datum/gas/tritium
 	id = "tritium"
@@ -115,7 +115,7 @@ GLOBAL_LIST_INIT(nonreactive_gases, typecacheof(list(/datum/gas/oxygen, /datum/g
 	specific_heat = 20
 	name = "BZ"
 	dangerous = TRUE
-	fusion_power = 15
+	fusion_power = 8
 
 /datum/gas/stimulum
 	id = "stim"

code/modules/atmospherics/gasmixtures/reactions.dm

@@ -1,57 +1,4 @@
-//Plasma fire properties
-#define OXYGEN_BURN_RATE_BASE				1.4
-#define PLASMA_BURN_RATE_DELTA				9
-#define PLASMA_MINIMUM_OXYGEN_NEEDED		2
-#define PLASMA_MINIMUM_OXYGEN_PLASMA_RATIO	30
-#define FIRE_CARBON_ENERGY_RELEASED			100000	//Amount of heat released per mole of burnt carbon into the tile
-#define FIRE_HYDROGEN_ENERGY_RELEASED		280000  //Amount of heat released per mole of burnt hydrogen and/or tritium(hydrogen isotope)
-#define FIRE_PLASMA_ENERGY_RELEASED			3000000	//Amount of heat released per mole of burnt plasma into the tile
-//General assmos defines.
-#define WATER_VAPOR_FREEZE					200
-#define NITRYL_FORMATION_ENERGY				100000
-#define TRITIUM_BURN_OXY_FACTOR				100
-#define TRITIUM_BURN_TRIT_FACTOR			10
-#define TRITIUM_BURN_RADIOACTIVITY_FACTOR	50000 	//The neutrons gotta go somewhere. Completely arbitrary number.
-#define TRITIUM_MINIMUM_RADIATION_ENERGY	0.1  	//minimum 0.01 moles trit or 10 moles oxygen to start producing rads
-#define SUPER_SATURATION_THRESHOLD			96
-#define STIMULUM_HEAT_SCALE					100000
-#define STIMULUM_FIRST_RISE					0.65
-#define STIMULUM_FIRST_DROP					0.065
-#define STIMULUM_SECOND_RISE				0.0009
-#define STIMULUM_ABSOLUTE_DROP				0.00000335
-#define REACTION_OPPRESSION_THRESHOLD		5
-#define NOBLIUM_FORMATION_ENERGY			2e9 	//1 Mole of Noblium takes the planck energy to condense.
-//Plasma fusion properties
-#define FUSION_ENERGY_THRESHOLD				3e9 	//Amount of energy it takes to start a fusion reaction
-#define FUSION_TEMPERATURE_THRESHOLD		1000 	//Temperature required to start a fusion reaction
-#define FUSION_MOLE_THRESHOLD				250 	//Mole count required (tritium/plasma) to start a fusion reaction
-#define FUSION_RELEASE_ENERGY_SUPER			3e9 	//Amount of energy released in the fusion process, super tier
-#define FUSION_RELEASE_ENERGY_HIGH			1e9 	//Amount of energy released in the fusion process, high tier
-#define FUSION_RELEASE_ENERGY_MID			5e8 	//Amount of energy released in the fusion process, mid tier
-#define FUSION_RELEASE_ENERGY_LOW			1e8 	//Amount of energy released in the fusion process, low tier
-#define FUSION_MEDIATION_FACTOR				80 		//Arbitrary
-#define FUSION_SUPER_TIER					50 		//anything above this is super tier
-#define FUSION_HIGH_TIER					20 		//anything above this and below 50 is high tier
-#define FUSION_MID_TIER						5 		//anything above this and below 20 is mid tier - below this is low tier, but that doesnt need a define
-#define FUSION_ENERGY_DIVISOR_SUPER			25
-#define FUSION_ENERGY_DIVISOR_HIGH			20
-#define FUSION_ENERGY_DIVISOR_MID			10
-#define FUSION_ENERGY_DIVISOR_LOW			2
-#define FUSION_GAS_CREATION_FACTOR_SUPER	0.20	//stimulum and pluoxium - 40% in total
-#define FUSION_GAS_CREATION_FACTOR_HIGH		0.60 	//trit - one gas, so its higher than the other two - 60% in total
-#define FUSION_GAS_CREATION_FACTOR_MID		0.45 	//BZ and N2O - 90% in total
-#define FUSION_GAS_CREATION_FACTOR_LOW		0.48 	//O2 and CO2 - 96% in total
-#define FUSION_MID_TIER_RAD_PROB_FACTOR		2		//probability of radpulse is power ratio * this for whatever tier
-#define FUSION_LOW_TIER_RAD_PROB_FACTOR		5
-#define FUSION_EFFICIENCY_BASE				60		//used in the fusion efficiency calculations
-#define FUSION_EFFICIENCY_DIVISOR			0.6		//ditto
-#define FUSION_RADIATION_FACTOR				15000	//horizontal asymptote
-#define FUSION_RADIATION_CONSTANT			30		//equation is form of (ax) / (x + b), where a = radiation factor and b = radiation constant (https://www.desmos.com/calculator/4i1f296phl)
-#define FUSION_VOLUME_SUPER					100		//volume of the sound the fusion noises make
-#define FUSION_VOLUME_HIGH					50
-#define FUSION_VOLUME_MID					25
-#define FUSION_VOLUME_LOW					10
-
+//All defines used in reactions are located in ..\__DEFINES\reactions.dm
 
 /proc/init_gas_reactions()
 	var/list/reaction_types = list()
@@ -249,7 +196,10 @@
 
 	return cached_results["fire"] ? REACTING : NO_REACTION
 
-//fusion: a terrible idea that was fun but broken. Now reworked to be less broken and more interesting. Again (and again).
+//fusion: a terrible idea that was fun but broken. Now reworked to be less broken and more interesting. Again (and again, and again)
+//Fusion Rework Counter: Please increment this if you make a major overhaul to this system again.
+//5 reworks
+
 /datum/gas_reaction/fusion
 	exclude = FALSE
 	priority = 2
@@ -268,6 +218,9 @@
 /datum/gas_reaction/fusion/react(datum/gas_mixture/air, datum/holder)
 	var/list/cached_gases = air.gases
 	var/temperature = air.temperature
+	if(!air.analyzer_results)
+		air.analyzer_results = new
+	var/list/cached_scan_results = air.analyzer_results
 	var/turf/open/location
 	if (istype(holder,/datum/pipeline)) //Find the tile the reaction is occuring on, or a random part of the network if it's a pipenet.
 		var/datum/pipeline/fusion_pipenet = holder
@@ -280,70 +233,70 @@
 
 	var/mediation = FUSION_MEDIATION_FACTOR*(air.heat_capacity()-(cached_gases[/datum/gas/plasma][MOLES]*cached_gases[/datum/gas/plasma][GAS_META][META_GAS_SPECIFIC_HEAT]))/(air.total_moles()-cached_gases[/datum/gas/plasma][MOLES]) //This is the average specific heat of the mixture,not including plasma.
 
-	var/moles_excluding_plasma = air.total_moles() - cached_gases[/datum/gas/plasma][MOLES]
-	var/plasma_differential = (cached_gases[/datum/gas/plasma][MOLES] - moles_excluding_plasma) / air.total_moles()
+	var/gases_fused = air.total_moles() - cached_gases[/datum/gas/plasma][MOLES]
+	var/plasma_differential = (cached_gases[/datum/gas/plasma][MOLES] - gases_fused) / air.total_moles()
 	var/reaction_efficiency = FUSION_EFFICIENCY_BASE ** -((plasma_differential ** 2) / FUSION_EFFICIENCY_DIVISOR) //https://www.desmos.com/calculator/6jjx3vdrvx
-	var/gases_fused = air.total_moles()
 
 	var/gas_power = 0
-	for (var/id in cached_gases)
-		gas_power += reaction_efficiency * (cached_gases[id][GAS_META][META_GAS_FUSION_POWER]*cached_gases[id][MOLES])
+	for (var/gas_id in cached_gases)
+		gas_power += reaction_efficiency * (cached_gases[gas_id][GAS_META][META_GAS_FUSION_POWER]*cached_gases[gas_id][MOLES])
 
 	var/power_ratio = gas_power/mediation
+	cached_scan_results[id] = power_ratio //used for analyzer feedback
+
+	for (var/gas_id in cached_gases) //and now we fuse
+		cached_gases[gas_id][MOLES] = 0
+
 	var/radiation_power = (FUSION_RADIATION_FACTOR * power_ratio) / (power_ratio + FUSION_RADIATION_CONSTANT) //https://www.desmos.com/calculator/4i1f296phl
+	var/zap_power = ((FUSION_ZAP_POWER_ASYMPTOTE * power_ratio) / (power_ratio + FUSION_ZAP_POWER_CONSTANT)) + FUSION_ZAP_POWER_BASE //https://www.desmos.com/calculator/n0zkdpxnrr
+	var/do_explosion = FALSE
+	var/zap_range //these ones are set later
+	var/fusion_prepare_to_die_edition_rng
 
-	if (power_ratio > FUSION_SUPER_TIER) //power ratio 50+: SUPER TIER. The gases become so energized that they fuse into stimulum and pluoxium, which is pretty nice! IF you can salvage them, which is going to be hard because this reaction is ridiculously dangerous.
+	if (power_ratio > FUSION_SUPER_TIER_THRESHOLD) //power ratio 50+: SUPER TIER. The gases become so energized that they fuse into a ton of tritium, which is pretty nice! Until you consider the fact that everything just exploded, the canister is probably going to break and you're irradiated.
 		reaction_energy += gases_fused * FUSION_RELEASE_ENERGY_SUPER * (power_ratio / FUSION_ENERGY_DIVISOR_SUPER)
-		for (var/id in cached_gases)
-			cached_gases[id][MOLES] = 0
-		air.assert_gases(/datum/gas/stimulum,/datum/gas/pluoxium)
-		cached_gases[/datum/gas/stimulum][MOLES] += gases_fused * FUSION_GAS_CREATION_FACTOR_SUPER //60% of the gas is converted to energy, 40% to stimulum and pluoxium
-		cached_gases[/datum/gas/pluoxium][MOLES] += gases_fused * FUSION_GAS_CREATION_FACTOR_SUPER
-		if (location) //It's going to happen regardless of whether you want it to or not
-			radiation_pulse(location, radiation_power * 2)
-			explosion(location,0,0,10,power_ratio,TRUE,TRUE)//A decent explosion with a huge shockwave. People WILL know you're doing fusion.
-			playsound(location, "sound/effects/supermatter.ogg", FUSION_VOLUME_SUPER, 0)
+		cached_gases[/datum/gas/tritium][MOLES] += gases_fused * FUSION_GAS_CREATION_FACTOR_TRITIUM //60% of the gas is converted to energy, 40% to trit
+		fusion_prepare_to_die_edition_rng = 100 //Wait a minute..
+		do_explosion = TRUE
+		zap_range = FUSION_ZAP_RANGE_SUPER
 
-	else if (power_ratio > FUSION_HIGH_TIER) //power ratio 20-50; High tier. Fuses into one big atom which then turns to tritium instantly. Very dangerous, but super cool.
+	else if (power_ratio > FUSION_HIGH_TIER_THRESHOLD) //power ratio 20-50; High tier. The reaction is so energized that it fuses into a small amount of stimulum, and some pluoxium. Very dangerous, but super cool and super useful.
 		reaction_energy += gases_fused * FUSION_RELEASE_ENERGY_HIGH * (power_ratio / FUSION_ENERGY_DIVISOR_HIGH)
-		for (var/id in cached_gases)
-			cached_gases[id][MOLES] = 0
-		cached_gases[/datum/gas/tritium][MOLES] += gases_fused * FUSION_GAS_CREATION_FACTOR_HIGH //40% of the gas is converted to energy, 60% to tritium
-		if (location)
-			if(prob(power_ratio)) //You really don't want this to happen.
-				radiation_pulse(location, radiation_power)
-				explosion(location,0,0,3,power_ratio * 0.5,TRUE,TRUE)//A tiny explosion with a large shockwave. People will know you're doing fusion.
-				playsound(location, "sound/effects/supermatter.ogg", FUSION_VOLUME_HIGH, 0)
-			else
-				playsound(location, "sound/effects/phasein.ogg", FUSION_VOLUME_HIGH, 0)
+		air.assert_gases(/datum/gas/stimulum, /datum/gas/pluoxium)
+		cached_gases[/datum/gas/stimulum][MOLES] += gases_fused * FUSION_GAS_CREATION_FACTOR_STIM //40% of the gas is converted to energy, 60% to stim and pluox
+		cached_gases[/datum/gas/pluoxium][MOLES] += gases_fused * FUSION_GAS_CREATION_FACTOR_PLUOX
+		fusion_prepare_to_die_edition_rng = power_ratio //Now we're getting into dangerous territory
+		do_explosion = TRUE
+		zap_range = FUSION_ZAP_RANGE_HIGH
 
-	else if (power_ratio > FUSION_MID_TIER) //power_ratio 5 to 20; Mediation is overpowered, fusion reaction starts to break down.
+	else if (power_ratio > FUSION_MID_TIER_THRESHOLD) //power_ratio 5 to 20; Mediation is overpowered, fusion reaction starts to break down.
 		reaction_energy += gases_fused * FUSION_RELEASE_ENERGY_MID * (power_ratio / FUSION_ENERGY_DIVISOR_MID)
-		for (var/id in cached_gases)
-			cached_gases[id][MOLES] = 0
-		air.assert_gases(/datum/gas/bz,/datum/gas/nitrous_oxide)
-		cached_gases[/datum/gas/bz][MOLES] += gases_fused * FUSION_GAS_CREATION_FACTOR_MID //10% of the gas is converted to energy, 90% to BZ and N2O
-		cached_gases[/datum/gas/nitrous_oxide][MOLES] += gases_fused * FUSION_GAS_CREATION_FACTOR_MID
-		if (location)
-			if(prob(power_ratio * FUSION_MID_TIER_RAD_PROB_FACTOR)) //Still weak, but don't stand next to it unprotected
-				radiation_pulse(location, radiation_power * 0.5)
-				playsound(location, "sound/effects/supermatter.ogg", FUSION_VOLUME_MID, 0)
-			else
-				playsound(location, "sound/effects/phasein.ogg", FUSION_VOLUME_MID, 0)
+		air.assert_gases(/datum/gas/nitryl,/datum/gas/nitrous_oxide)
+		cached_gases[/datum/gas/nitryl][MOLES] += gases_fused * FUSION_GAS_CREATION_FACTOR_NITRYL //20% of the gas is converted to energy, 80% to nitryl and N2O
+		cached_gases[/datum/gas/nitrous_oxide][MOLES] += gases_fused * FUSION_GAS_CREATION_FACTOR_N2O
+		fusion_prepare_to_die_edition_rng = power_ratio * FUSION_MID_TIER_RAD_PROB_FACTOR //Still unlikely, but don't stand next to the reaction unprotected
+		zap_range = FUSION_ZAP_RANGE_MID
 
 	else //power ratio 0 to 5; Gas power is overpowered. Fusion isn't nearly as powerful.
 		reaction_energy += gases_fused * FUSION_RELEASE_ENERGY_LOW * (power_ratio / FUSION_ENERGY_DIVISOR_LOW)
-		for (var/gas in cached_gases)
-			cached_gases[gas][MOLES] = 0
-		air.assert_gases(/datum/gas/oxygen, /datum/gas/carbon_dioxide)
-		cached_gases[/datum/gas/oxygen][MOLES] += gases_fused * FUSION_GAS_CREATION_FACTOR_LOW //4% of the gas is converted to energy, 94% to oxygen and CO2
-		cached_gases[/datum/gas/carbon_dioxide][MOLES] += gases_fused * FUSION_GAS_CREATION_FACTOR_LOW
-		if (location)
-			if(prob(power_ratio * FUSION_LOW_TIER_RAD_PROB_FACTOR)) //Weak, but still something to look out for
-				radiation_pulse(location, radiation_power * 0.25)
-				playsound(location, "sound/effects/supermatter.ogg", FUSION_VOLUME_LOW, 0)
-			else
-				playsound(location, "sound/effects/phasein.ogg", FUSION_VOLUME_LOW, 0)
+		air.assert_gases(/datum/gas/bz, /datum/gas/carbon_dioxide)
+		cached_gases[/datum/gas/bz][MOLES] += gases_fused * FUSION_GAS_CREATION_FACTOR_BZ //10% of the gas is converted to energy, 90% to BZ and CO2
+		cached_gases[/datum/gas/carbon_dioxide][MOLES] += gases_fused * FUSION_GAS_CREATION_FACTOR_CO2
+		fusion_prepare_to_die_edition_rng = power_ratio * FUSION_LOW_TIER_RAD_PROB_FACTOR //Low, but still something to look out for
+		zap_range = FUSION_ZAP_RANGE_LOW
+
+	//All the deadly consequences of fusion, consolidated for your viewing pleasure
+	if (location)
+		if(prob(fusion_prepare_to_die_edition_rng)) //Some.. permanent effects
+			if(do_explosion)
+				explosion(location, 0, 0, 5, power_ratio, TRUE, TRUE) //large shockwave, the actual radius is quite small - people will recognize that you're doing fusion
+			radiation_pulse(location, radiation_power) //You mean causing a super-tier fusion reaction in the halls is a bad idea?
+			playsound(location, 'sound/effects/supermatter.ogg', 100, 0)
+		else
+			playsound(location, 'sound/effects/phasein.ogg', 75, 0)
+		//These will always happen, so be prepared
+		tesla_zap(location, zap_range, zap_power, TESLA_FUSION_FLAGS) //larpers beware
+		location.fire_nuclear_particles(power_ratio) //see code/modules/projectile/energy/nuclear_particle.dm
 
 	if(reaction_energy > 0)
 		var/new_heat_capacity = air.heat_capacity()
@@ -480,21 +433,3 @@
 		var/new_heat_capacity = air.heat_capacity()
 		if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
 			air.temperature = max(((air.temperature*old_heat_capacity - energy_taken)/new_heat_capacity),TCMB)
-
-#undef OXYGEN_BURN_RATE_BASE
-#undef PLASMA_BURN_RATE_DELTA
-#undef PLASMA_MINIMUM_OXYGEN_NEEDED
-#undef PLASMA_MINIMUM_OXYGEN_PLASMA_RATIO
-#undef FIRE_CARBON_ENERGY_RELEASED
-#undef FIRE_PLASMA_ENERGY_RELEASED
-#undef WATER_VAPOR_FREEZE
-#undef NITRYL_FORMATION_ENERGY
-#undef TRITIUM_BURN_OXY_FACTOR
-#undef SUPER_SATURATION_THRESHOLD
-#undef STIMULUM_HEAT_SCALE
-#undef STIMULUM_FIRST_RISE
-#undef STIMULUM_FIRST_DROP
-#undef STIMULUM_SECOND_RISE
-#undef STIMULUM_ABSOLUTE_DROP
-#undef REACTION_OPPRESSION_THRESHOLD
-#undef NOBLIUM_FORMATION_ENERGY

code/modules/jobs/job_types/cargo_service.dm

@@ -71,6 +71,7 @@ Shaft Miner
 	spawn_positions = 3
 	supervisors = "the quartermaster and the head of personnel"
 	selection_color = "#dcba97"
+	custom_spawn_text = "Remember, you are a miner, not a hunter. Hunting monsters is not a requirement of your job, the only requirement of your job is to provide materials for the station. Don't be afraid to run away if you're inexperienced with fighting the mining area's locals."
 
 	outfit = /datum/outfit/job/miner
 

code/modules/jobs/job_types/job.dm

@@ -38,6 +38,9 @@
 	//If this is set to 1, a text is printed to the player when jobs are assigned, telling him that he should let admins know that he has to disconnect.
 	var/req_admin_notify
 
+	//Allows defining arbitrary spawn text for the job
+	var/custom_spawn_text
+
 	//If you have the use_age_restriction_for_jobs config option enabled and the database set up, this option will add a requirement for players to be at least minimal_player_age days old. (meaning they first signed in at least that many days before.)
 	var/minimal_player_age = 0
 

code/modules/mob/living/carbon/human/species.dm

@@ -1381,6 +1381,9 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 		target.visible_message("<span class='danger'>[user] has [atk_verb]ed [target]!</span>", \
 					"<span class='userdanger'>[user] has [atk_verb]ed [target]!</span>", null, COMBAT_MESSAGE_RANGE)
 
+		target.lastattacker = user.real_name
+		target.lastattackerckey = user.ckey
+
 		if(user.limb_destroyer)
 			target.dismembering_strike(user, affecting.body_zone)
 		target.apply_damage(damage, BRUTE, affecting, armor_block)

code/modules/mob/living/simple_animal/friendly/drone/_drone.dm

@@ -69,7 +69,7 @@
 	var/visualAppearence = MAINTDRONE //What we appear as
 	var/hacked = FALSE //If we have laws to destroy the station
 	var/flavortext = \
-	"\n<big><span class='warning'>DO NOT INTERFERE WITH THE ROUND AS A DRONE OR YOU WILL BE DRONE BANNED</span></big>\n"+\
+	"\n<big><span class='warning'>UNLESS YOU ARE A FREE DRONE, DO NOT INTERFERE WITH THE ROUND AS A DRONE OR YOU WILL BE DRONE BANNED</span></big>\n"+\
 	"<span class='notify'>Drones are a ghost role that are allowed to fix the station and build things. Interfering with the round as a drone is against the rules.</span>\n"+\
 	"<span class='notify'>Actions that constitute interference include, but are not limited to:</span>\n"+\
 	"<span class='notify'>     - Interacting with round critical objects (IDs, weapons, contraband, powersinks, bombs, etc.)</span>\n"+\

code/modules/mob/living/simple_animal/hostile/hivebot.dm

@@ -48,7 +48,7 @@
 	icon_living = "ranged"
 	icon_dead = "ranged"
 	ranged = 1
-	rapid = 1
+	rapid = 3
 	retreat_distance = 5
 	minimum_distance = 5
 

code/modules/mob/living/simple_animal/hostile/hostile.dm

@@ -5,7 +5,8 @@
 	environment_smash = ENVIRONMENT_SMASH_STRUCTURES //Bitflags. Set to ENVIRONMENT_SMASH_STRUCTURES to break closets,tables,racks, etc; ENVIRONMENT_SMASH_WALLS for walls; ENVIRONMENT_SMASH_RWALLS for rwalls
 	var/atom/target
 	var/ranged = 0
-	var/rapid = 0
+	var/rapid = 0 //How many shots per volley.
+	var/rapid_fire_delay = 2 //Time between rapid fire shots
 	var/projectiletype	//set ONLY it and NULLIFY casingtype var, if we have ONLY projectile
 	var/projectilesound
 	var/casingtype		//set ONLY it and NULLIFY projectiletype, if we have projectile IN CASING
@@ -330,11 +331,10 @@
 		return
 	visible_message("<span class='danger'><b>[src]</b> [ranged_message] at [A]!</span>")
 
-	if(rapid)
+	if(rapid > 1)
 		var/datum/callback/cb = CALLBACK(src, .proc/Shoot, A)
-		addtimer(cb, 1)
-		addtimer(cb, 4)
-		addtimer(cb, 6)
+		for(var/i in 1 to rapid)
+			addtimer(cb, (i - 1)*rapid_fire_delay)
 	else
 		Shoot(A)
 	ranged_cooldown = world.time + ranged_cooldown_time

code/modules/mob/living/simple_animal/hostile/nanotrasen.dm

@@ -53,7 +53,7 @@
 /mob/living/simple_animal/hostile/nanotrasen/ranged/smg
 	icon_state = "nanotrasenrangedsmg"
 	icon_living = "nanotrasenrangedsmg"
-	rapid = 1
+	rapid = 3
 	casingtype = /obj/item/ammo_casing/c46x30mm
 	projectilesound = 'sound/weapons/gunshot_smg.ogg'
 	loot = list(/obj/item/gun/ballistic/automatic/wt550,

code/modules/mob/living/simple_animal/hostile/pirate.dm

@@ -47,7 +47,7 @@
 	icon_dead = "piratemelee_dead"
 	projectilesound = 'sound/weapons/laser.ogg'
 	ranged = 1
-	rapid = 1
+	rapid = 3
 	retreat_distance = 5
 	minimum_distance = 5
 	projectiletype = /obj/item/projectile/beam/laser
@@ -72,7 +72,7 @@
 	icon_living = "piratespaceranged"
 	projectilesound = 'sound/weapons/laser.ogg'
 	ranged = 1
-	rapid = 1
+	rapid = 3
 	retreat_distance = 5
 	minimum_distance = 5
 	projectiletype = /obj/item/projectile/beam/laser

code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm

@@ -64,7 +64,7 @@
 	icon_state = "nanotrasenrangedsmg"
 	icon_living = "nanotrasenrangedsmg"
 	vision_range = 9
-	rapid = 1
+	rapid = 3
 	ranged = 1
 	retreat_distance = 3
 	minimum_distance = 5

code/modules/mob/living/simple_animal/hostile/russian.dm

@@ -62,7 +62,7 @@
 	icon_living = "russianofficer"
 	maxHealth = 65
 	health = 65
-	rapid = 1
+	rapid = 3
 	casingtype = /obj/item/ammo_casing/c9mm
 	loot = list(/obj/effect/mob_spawn/human/corpse/russian/ranged/officer,
 				/obj/item/gun/ballistic/automatic/pistol/APS)

code/modules/mob/living/simple_animal/hostile/syndicate.dm

@@ -109,7 +109,7 @@
 
 /mob/living/simple_animal/hostile/syndicate/ranged
 	ranged = 1
-	rapid = 1
+	rapid = 3
 	retreat_distance = 5
 	minimum_distance = 5
 	icon_state = "syndicateranged"

code/modules/mob/living/ventcrawling.dm

@@ -57,7 +57,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, typecacheof(list(
 
 			if(iscarbon(src) && ventcrawler < 2)//It must have atleast been 1 to get this far
 				var/failed = 0
-				var/list/items_list = get_equipped_items()
+				var/list/items_list = get_equipped_items(include_pockets = TRUE)
 				if(items_list.len)
 					failed = 1
 				for(var/obj/item/I in held_items)
@@ -120,4 +120,3 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, typecacheof(list(
 		. = new_loc
 	remove_ventcrawl()
 	add_ventcrawl(.)
-

code/modules/mob/status_procs.dm

@@ -256,5 +256,5 @@
 /////////////////////////////////// TEMPERATURE ////////////////////////////////////
 
 /mob/proc/adjust_bodytemperature(amount,min_temp=0,max_temp=INFINITY)
-	if(bodytemperature > min_temp && bodytemperature < max_temp)
+	if(bodytemperature >= min_temp && bodytemperature <= max_temp)
 		bodytemperature = CLAMP(bodytemperature + amount,min_temp,max_temp)

code/modules/paperwork/photocopier.dm

@@ -135,6 +135,8 @@
 					p.pixel_x = rand(-10, 10)
 					p.pixel_y = rand(-10, 10)
 					p.picture = new(null, "You see [ass]'s ass on the photo.", temp_img)
+					p.picture.psize_x = 128
+					p.picture.psize_y = 128
 					p.update_icon()
 					toner -= 5
 					busy = TRUE

code/modules/projectiles/ammunition/ballistic/smg.dm

@@ -26,3 +26,7 @@
 
 /obj/item/ammo_casing/c45/nostamina
 	projectile_type = /obj/item/projectile/bullet/c45_nostamina
+
+/obj/item/ammo_casing/c45/kitchengun
+	desc = "A .45 bullet casing. It has a small sponge attached to it."
+	projectile_type = /obj/item/projectile/bullet/c45_cleaning

code/modules/projectiles/boxes_magazines/external/pistol.dm

@@ -36,6 +36,11 @@
 	..()
 	icon_state = "45-[ammo_count() ? "8" : "0"]"
 
+/obj/item/ammo_box/magazine/m45/kitchengun
+	name = "handgun magazine (.45 cleaning)"
+	desc = "BANG! BANG! BANG!"
+	ammo_type = /obj/item/ammo_casing/c45/kitchengun
+
 /obj/item/ammo_box/magazine/pistolm9mm
 	name = "pistol magazine (9mm)"
 	icon_state = "9x19p-8"

code/modules/projectiles/guns/ballistic/pistol.dm

@@ -26,6 +26,12 @@
 	mag_type = /obj/item/ammo_box/magazine/m45
 	can_suppress = FALSE
 
+/obj/item/gun/ballistic/automatic/pistol/m1911/kitchengun
+	name = "\improper Kitchen Gun (TM)"
+	desc = "Say goodbye to dirt with Kitchen Gun (TM)! Laser sight and night vision accessories sold separately."
+	icon_state = "kitchengun"
+	mag_type = /obj/item/ammo_box/magazine/m45/kitchengun
+
 /obj/item/gun/ballistic/automatic/pistol/deagle
 	name = "\improper Desert Eagle"
 	desc = "A robust .50 AE handgun."
@@ -78,4 +84,3 @@
 	else
 		to_chat(user, "<span class='notice'>..and falls into view. Whew, that was a close one.</span>")
 		user.dropItemToGround(src)
-

code/modules/projectiles/guns/energy.dm

@@ -135,7 +135,7 @@
 	..()
 	if(!automatic_charge_overlays)
 		return
-	var/ratio = CEILING((cell.charge / cell.maxcharge) * charge_sections, 1)
+	var/ratio = CEILING(CLAMP(cell.charge / cell.maxcharge, 0, 1) * charge_sections, 1)
 	if(ratio == old_ratio && !force_update)
 		return
 	old_ratio = ratio

code/modules/projectiles/guns/misc/beam_rifle.dm

@@ -539,7 +539,7 @@
 	if(check_pierce(target))
 		permutated += target
 		trajectory_ignore_forcemove = TRUE
-		forceMove(target)
+		forceMove(target.loc)
 		trajectory_ignore_forcemove = FALSE
 		return FALSE
 	if(!QDELETED(target))

code/modules/projectiles/projectile/bullets/smg.dm

@@ -9,6 +9,40 @@
 	name = ".45 bullet"
 	damage = 30
 
+/obj/item/projectile/bullet/c45_cleaning
+	name = ".45 bullet"
+	damage = 24
+	stamina = 10
+
+/obj/item/projectile/bullet/c45_cleaning/on_hit(atom/target, blocked = FALSE)
+	. = ..()
+	var/turf/T = get_turf(target)
+
+	//section shamelessly copypasta'd from the clean component
+	SEND_SIGNAL(T, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+	for(var/A in T)
+		if(is_cleanable(A))
+			qdel(A)
+		else if(istype(A, /obj/item))
+			var/obj/item/I = A
+			SEND_SIGNAL(I, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+			if(ismob(I.loc))
+				var/mob/M = I.loc
+				M.regenerate_icons()
+		else if(ishuman(A))
+			var/mob/living/carbon/human/cleaned_human = A
+			if(cleaned_human.head)
+				SEND_SIGNAL(cleaned_human.head, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+			if(cleaned_human.wear_suit)
+				SEND_SIGNAL(cleaned_human.wear_suit, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+			else if(cleaned_human.w_uniform)
+				SEND_SIGNAL(cleaned_human.w_uniform, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+			if(cleaned_human.shoes)
+				SEND_SIGNAL(cleaned_human.shoes, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+			SEND_SIGNAL(cleaned_human, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+			cleaned_human.wash_cream()
+			cleaned_human.regenerate_icons()
+
 // 4.6x30mm (Autorifles)
 
 /obj/item/projectile/bullet/c46x30mm
@@ -23,4 +57,4 @@
 /obj/item/projectile/bullet/incendiary/c46x30mm
 	name = "4.6x30mm incendiary bullet"
 	damage = 10
-	fire_stacks = 1
+	fire_stacks = 1

code/modules/projectiles/projectile/energy/nuclear_particle.dm

@@ -0,0 +1,46 @@
+//Nuclear particle projectile - a deadly side effect of fusion
+/obj/item/projectile/energy/nuclear_particle
+	name = "nuclear particle"
+	icon_state = "nuclear_particle"
+	pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
+	damage = 20
+	damage_type = TOX
+	irradiate = 2500 //enough to knockdown and induce vomiting
+	speed = 0.4 
+	hitsound = 'sound/weapons/emitter2.ogg'
+	impact_type = /obj/effect/projectile/impact/xray
+	var/static/list/particle_colors = list(
+		"red" = "#FF0000",
+		"blue" = "#00FF00",
+		"green" = "#0000FF",
+		"yellow" = "#FFFF00",
+		"cyan" = "#00FFFF",
+		"purple" = "#FF00FF"
+	)
+
+/obj/item/projectile/energy/nuclear_particle/Initialize()
+	. = ..()
+	//Random color time!
+	var/our_color = pick(particle_colors)
+	add_atom_colour(particle_colors[our_color], FIXED_COLOUR_PRIORITY)
+	set_light(4, 3, particle_colors[our_color]) //Range of 4, brightness of 3 - Same range as a flashlight
+
+/atom/proc/fire_nuclear_particles(power_ratio) //used by fusion to fire random # of nuclear particles - power ratio determines about how many are fired
+	var/random_particles = rand(3,6)
+	var/particles_to_fire
+	var/particles_fired
+	switch(power_ratio) //multiply random_particles * factor for whatever tier
+		if(0 to FUSION_MID_TIER_THRESHOLD)
+			particles_to_fire = random_particles * FUSION_PARTICLE_FACTOR_LOW
+		if(FUSION_MID_TIER_THRESHOLD to FUSION_HIGH_TIER_THRESHOLD)
+			particles_to_fire = random_particles * FUSION_PARTICLE_FACTOR_MID
+		if(FUSION_HIGH_TIER_THRESHOLD to FUSION_SUPER_TIER_THRESHOLD)
+			particles_to_fire = random_particles * FUSION_PARTICLE_FACTOR_HIGH
+		if(FUSION_SUPER_TIER_THRESHOLD to INFINITY)
+			particles_to_fire = random_particles * FUSION_PARTICLE_FACTOR_SUPER
+	while(particles_to_fire)
+		particles_fired++
+		var/angle = rand(0,360)
+		var/obj/item/projectile/energy/nuclear_particle/P = new /obj/item/projectile/energy/nuclear_particle(src)
+		addtimer(CALLBACK(P, /obj/item/projectile.proc/fire, angle), particles_fired) //multiply particles fired * delay so the particles end up stagnated (once every decisecond)
+		particles_to_fire--

code/modules/uplink/uplink_items.dm

@@ -1293,6 +1293,12 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
 	cost = 40
 	cant_discount = TRUE
 
+/datum/uplink_item/cyber_implants/stealthimplant
+	name = "Stealth Implant"
+	desc = "This one-of-a-kind implant will make you almost invisible if you play your cards right."
+	item = /obj/item/implanter/stealth
+	cost = 8
+
 // Role-specific items
 /datum/uplink_item/role_restricted
 	category = "Role-Restricted"
@@ -1332,6 +1338,22 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
 	surplus = 20
 	restricted_roles = list("Janitor")
 
+/datum/uplink_item/role_restricted/kitchen_gun
+	name = "Kitchen Gun (TM)"
+	desc = "A revolutionary .45 caliber cleaning solution! Say goodbye to daily stains and dirty surfaces with Kitchen Gun (TM)! Just five shots from Kitchen Gun (TM), and it'll sparkle like new! Includes two extra ammunition clips!"
+	cost = 10
+	surplus = 40
+	restricted_roles = list("Cook", "Janitor")
+	item = /obj/item/storage/box/syndie_kit/kitchen_gun
+
+/datum/uplink_item/role_restricted/kitchen_gun_ammo
+	name = "Kitchen Gun (TM) .45 Magazine"
+	desc = "An extra eight bullets for an extra eight uses of Kitchen Gun (TM)!"
+	cost = 1
+	surplus = 0
+	restricted_roles = list("Cook", "Janitor")
+	item = /obj/item/ammo_box/magazine/m45/kitchengun
+
 /datum/uplink_item/role_restricted/explosive_hot_potato
 	name = "Exploding Hot Potato"
 	desc = "A potato rigged with explosives. On activation, a special mechanism is activated that prevents it from being dropped. The only way to get rid of it if you are holding it is to attack someone else with it, causing it to latch to that person instead."