Увеличина мощность взрывов (#3883)

TauCetiStation · Aug 25, 2019 · fd458cd · fd458cd
1 parent 108413f
commit fd458cd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -230,12 +230,12 @@
 		air_contents.react()
 		pressure = air_contents.return_pressure()
 		var/range = (pressure-TANK_FRAGMENT_PRESSURE)/TANK_FRAGMENT_SCALE
-		range = min(range, MAX_EXPLOSION_RANGE)		// was 8 - - - Changed to a configurable define -- TLE
+		var/effrange = min(range, MAX_EXPLOSION_RANGE)		// was 8 - - - Changed to a configurable define -- TLE
 		var/turf/epicenter = get_turf(loc)
 
 		//world << "<span class='notice'>Exploding Pressure: [pressure] kPa, intensity: [range]</span>"
 
-		explosion(epicenter, round(range*0.25), round(range*0.5), round(range), round(range*1.5))
+		explosion(epicenter, round(CLAMP(range*0.25,effrange*0.25,effrange-2)), round(CLAMP(range*0.5,effrange*0.5,effrange-1)), round(effrange), round(effrange*1.5))
 		qdel(src)
 
 	else if(pressure > TANK_RUPTURE_PRESSURE)

diff --git a/code/modules/research/experiment.dm b/code/modules/research/experiment.dm
@@ -200,7 +200,7 @@
 			var/added_power = max(0, power - saved_power_level)
 			var/already_earned_power = min(saved_power_level, power)
 
-			calculated_research_points = added_power * 1000 + already_earned_power * 200
+			calculated_research_points = added_power * 800 + already_earned_power * 160
 
 			if(power > saved_power_level)
 				RD.files.experiments.saved_best_explosion = power