Merge pull request #952 from caelaislinn/master

balances, improvements and tweaks to rust and antiqua. did not do cameras...

code/modules/power/generator_type2.dm

@@ -55,18 +55,16 @@
 			hot_air.temperature = hot_air.temperature - energy_transfer/hot_air_heat_capacity
 			cold_air.temperature = cold_air.temperature + heat/cold_air_heat_capacity
 
-			world << "POWER: [lastgen] W generated at [efficiency*100]% efficiency and sinks sizes [cold_air_heat_capacity], [hot_air_heat_capacity]"
-
 			if(input1.network)
 				input1.network.update = 1
 
 			if(input2.network)
 				input2.network.update = 1
 
-			add_avail(lastgen)
+			add_avail(lastgen/5)
 	// update icon overlays only if displayed level has changed
 
-	var/genlev = max(0, min( round(11*lastgen / 100000), 11))
+	var/genlev = max(0, min( round(11*lastgen / 500000), 11))
 	if(genlev != lastgenlev)
 		lastgenlev = genlev
 		updateicon()

code/modules/power/singularity/emitter.dm

@@ -12,12 +12,15 @@
 	active_power_usage = 300
 
 	var
+		frequency = 1
 		active = 0
 		fire_delay = 100
 		last_shot = 0
 		shot_number = 0
 		state = 0
 		locked = 0
+		energy = 0
+		mega_energy = 0
 
 
 	verb/rotate()

code/modules/power/singularity/particle_accelerator/particle.dm

@@ -7,8 +7,9 @@
 	density = 1
 	var
 		movement_range = 10
-		energy = 10		//energy in eV?
+		energy = 10		//energy in eV
 		mega_energy = 0	//energy in MeV
+		frequency = 1
 		ionizing = 0
 		particle_type
 		additional_particles = 0
@@ -41,13 +42,15 @@
 				var/obj/machinery/rust/particle_catcher/collided_catcher = A
 				if(particle_type && particle_type != "neutron")
 					if(collided_catcher.AddParticles(particle_type, 1 + additional_particles))
-						collided_catcher.AddEnergy(energy,mega_energy)
+						collided_catcher.parent.AddEnergy(energy,mega_energy)
 						del (src)
 			if( istype(A,/obj/machinery/rust/core) )
 				var/obj/machinery/rust/core/collided_core = A
 				if(particle_type && particle_type != "neutron")
 					if(collided_core.AddParticles(particle_type, 1 + additional_particles))
-						collided_core.AddEnergy(energy,mega_energy)
+						var/energy_loss_ratio = abs(collided_core.owned_field.frequency - frequency) / 1e9
+						collided_core.owned_field.mega_energy += mega_energy - mega_energy * energy_loss_ratio
+						collided_core.owned_field.energy += energy - energy * energy_loss_ratio
 						del (src)
 		return
 

code/modules/power/turbine.dm

@@ -111,14 +111,14 @@
 #define TURBGENG 0.8
 
 /obj/machinery/power/turbine/process()
-	if(!compressor.starter)
-		return
 	overlays = null
 	if(stat & BROKEN)
 		return
 	if(!compressor)
 		stat |= BROKEN
 		return
+	if(!compressor.starter)
+		return
 	lastgen = ((compressor.rpm / TURBGENQ)**TURBGENG) *TURBGENQ
 
 	add_avail(lastgen)

code/modules/projectiles/projectile/beams.dm

@@ -6,6 +6,7 @@
 	damage_type = BURN
 	flag = "laser"
 	eyeblur = 4
+	var/frequency = 1
 	var/ID = 0
 	var/main = 0