post-Revision

BeeStation · Nov 7, 2023 · 34eafea · 34eafea
1 parent 6c1a4ed
commit 34eafea
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/nsv13/code/modules/overmap/pdsr.dm b/nsv13/code/modules/overmap/pdsr.dm
@@ -173,7 +173,7 @@
 			state = REACTOR_STATE_RUNNING
 
 	if(state == REACTOR_STATE_RUNNING)
-		if(nuc_in >= reaction_injection_rate) //If we are running in nominal conditions...
+		if(nuc_in >= reaction_injection_rate && reaction_injection_rate >= 2.5) //If we are running in nominal conditions...
 			nucleium_input.adjust_moles(GAS_NUCLEIUM, -reaction_injection_rate)
 			//Handle reaction rate adjustments here
 			var/target_reaction_rate = ((0.5 + (1e-03 * (reaction_injection_rate ** 2))) + (current_uptime / 2000)) * 16
@@ -182,7 +182,7 @@
 			reaction_temperature += reaction_rate * 0.35 //Function goes
 			handle_polarity(TRUE)
 
-		else if(nuc_in < reaction_injection_rate) //If we are running without sufficient nucleium...
+		else //If we are running without sufficient nucleium...
 			if(nuc_in <= 0) //...and none at all
 				var/target_reaction_rate = 0
 				var/delta_reaction_rate = target_reaction_rate - reaction_rate
@@ -201,7 +201,7 @@
 				handle_polarity(TRUE)
 
 		if(reaction_rate > 5) //TEMP USE FUNCTIONS
-			reaction_energy_output = (reaction_rate + (reaction_injection_rate / 2)) * (2 - (current_uptime / 20000)) //FUNCTIONS
+			reaction_energy_output = (reaction_rate + (min(nuc_in, reaction_injection_rate) / 2)) * (2 - (current_uptime / 20000)) //FUNCTIONS
 			radiation_pulse(src, reaction_energy_output)
 
 		else

diff --git a/nsv13/code/modules/overmap/weapons/projectiles_fx.dm b/nsv13/code/modules/overmap/weapons/projectiles_fx.dm
@@ -1,5 +1,5 @@
 
-///Special proj for hitting overmap hips only used by NSV projectiles.
+///Special proc for hitting overmap ships only used by NSV projectiles.
 /obj/item/projectile/proc/spec_overmap_hit(obj/structure/overmap/target)
 	return
 

diff --git a/tgui/packages/tgui/interfaces/PDSRMainframe.js b/tgui/packages/tgui/interfaces/PDSRMainframe.js
@@ -127,8 +127,9 @@ export const PDSRMainframe = (props, context) => {
               minValue={0}
               maxValue={25}
               ranges={{
-                bad: [0, 5],
-                average: [20, 25],
+                default: [5, 20],
+                yellow: [2.5, Infinity],
+                bad: [-Infinity, 2.5],
               }}
               step={1}
               stepPixelSize={27}
@@ -159,7 +160,11 @@ export const PDSRMainframe = (props, context) => {
               value={data.r_reaction_rate}
               minValue={0}
               maxValue={25}
-              color="teal" >
+              color={data.r_temp === 0 ? "default" : null}
+              ranges={{
+                bad: [-Infinity, 5],
+                teal: [5, Infinity],
+              }}>
               {data.r_reaction_rate + ' mol/s'}
             </ProgressBar>
             Screen Capacity: