Merge remote-tracking branch 'upstream/master'

code/modules/examine/descriptions/armor.dm

@@ -43,7 +43,6 @@
 		else
 			return "It's difficult to tell how much it'll influence your speed."
 
-
 /obj/item/clothing/get_description_info()
 	var/armor_stats = description_info + "\
 	<br>"
@@ -70,28 +69,18 @@
 	if(flags & AIRTIGHT)
 		armor_stats += "It is airtight. \n"
 
-	if(min_pressure_protection == 0 && max_pressure_protection >= WARNING_HIGH_PRESSURE)	//0 to 325
-		armor_stats += "Wearing this will protect you from the vacuum of space and from high pressures. \n"
-	else if(min_pressure_protection <= WARNING_LOW_PRESSURE && max_pressure_protection >= WARNING_HIGH_PRESSURE) //50 to 325
-		armor_stats += "Wearing this will protect you from both low and high pressures, but not the vacuum of space. \n"
-	else if(min_pressure_protection == 0)
-		armor_stats += "Wearing this will protect you from the vacuum of space. \n"
-	else if(min_pressure_protection <= WARNING_LOW_PRESSURE) //50 or below
-		armor_stats += "Wearing this will protect you from low pressures, but not the vacuum of space. \n"
-	else if(max_pressure_protection >= WARNING_HIGH_PRESSURE) //325 or higher
-		armor_stats += "Wearing this will protect you from high pressures. \n"
+	if(min_pressure_protection != null)
+		armor_stats += "It is rated for pressures as low as [min_pressure_protection] kPa. \n"
+	if(max_pressure_protection)
+		armor_stats += "It is rated for pressures as high as [max_pressure_protection] kPa. \n"
 
 	if(flags & THICKMATERIAL)	//stops syringes
 		armor_stats += "The material is exceptionally thick. \n"
 
-	if(max_heat_protection_temperature >= FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE && min_cold_protection_temperature <= SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE) //30000 or higher and as low as 2
-		armor_stats += "It provides exceptional protection from extremely high and low temperatures alike. \n"
-	else if(max_heat_protection_temperature >= SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE && min_cold_protection_temperature <= SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE) //5000 or above, but less than 30000
-		armor_stats += "It provides very good protection against hazardous temperatures at both extremes, but may not be sufficient for very high-intensity situations. \n"
-	else if(max_heat_protection_temperature >= FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE)	//30000 or above
-		armor_stats += "It provides exceptional protection from extremely high temperatures. \n"
-	else if(min_cold_protection_temperature <= SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE)	//2 or less
-		armor_stats += "It provides exceptional protection against very low temperatures. \n"
+	if(min_cold_protection_temperature)
+		armor_stats += "It is rated for temperatures as low as [min_cold_protection_temperature] Kelvin. \n"
+	if(max_heat_protection_temperature)
+		armor_stats += "It is rated for temperatures as high as [max_heat_protection_temperature] Kelvin. \n"
 
 	var/list/covers = list()
 	var/list/slots = list()

code/modules/hydroponics/seedtypes/flowers.dm

@@ -65,7 +65,7 @@
 	set_trait(TRAIT_MATURATION,7)
 	set_trait(TRAIT_PRODUCTION,5)
 	set_trait(TRAIT_YIELD,5)
-	set_trait(TRAIT_PRODUCT_ICON,"lavender")
+	set_trait(TRAIT_PRODUCT_ICON,"flower6")
 	set_trait(TRAIT_PRODUCT_COLOUR,"#B57EDC")
 	set_trait(TRAIT_PLANT_COLOUR,"#6B8C5E")
 	set_trait(TRAIT_PLANT_ICON,"flower4")

code/modules/instruments/songs/editor.dm

@@ -191,7 +191,7 @@
 		stop_playing()
 
 	else if(href_list["setlinearfalloff"])
-		var/amount = tgui_input_number(usr, "Set linear sustain duration in seconds", "Linear Sustain Duration")
+		var/amount = tgui_input_number(usr, "Set linear sustain duration in seconds", "Linear Sustain Duration", round_value=FALSE)
 		if(!isnull(amount))
 			set_linear_falloff_duration(round(amount * 10, world.tick_lag))
 

code/modules/nifsoft/nif.dm

@@ -293,7 +293,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
 			notify("Adjoining optic [human.isSynthetic() ? "interface" : "nerve"], please be patient.",TRUE)
 		else
 			notify("You are not an authorized user for this device. Please contact [owner].",TRUE)
-			unimplant()
+			unimplant(human)
 			stat = NIF_TEMPFAIL
 			return FALSE
 

code/modules/tgui_panel/tgui_panel.dm

@@ -48,13 +48,13 @@
 		assets = list(
 			get_asset_datum(/datum/asset/simple/tgui_panel),
 		))
-	window.reinitialize() // Workaround for an early init fail...
 	window.send_asset(get_asset_datum(/datum/asset/simple/namespaced/fontawesome))
 	window.send_asset(get_asset_datum(/datum/asset/simple/namespaced/tgfont))
 	window.send_asset(get_asset_datum(/datum/asset/spritesheet/chat))
 	// Other setup
 	request_telemetry()
 	addtimer(CALLBACK(src, PROC_REF(on_initialize_timed_out)), 5 SECONDS)
+	window.send_message("testTelemetryCommand")
 
 /**
  * private

maps/stellar_delight/stellar_delight1.dmm

@@ -15656,13 +15656,6 @@
 /turf/simulated/floor,
 /area/stellardelight/deck1/explobriefing)
 "Hf" = (
-/obj/machinery/door/airlock/angled_bay/standard/glass{
-	dir = 4;
-	door_color = "#333333";
-	name = "Auxiliary EVA Equipment Room";
-	req_one_access = list(18,19,43);
-	stripe_color = "#5a19a8"
-	},
 /obj/structure/cable/green{
 	color = "#42038a";
 	icon_state = "1-2"
@@ -15671,6 +15664,12 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/disposalpipe/segment,
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/angled_bay/hatch{
+	door_color = "#333333";
+	name = "Auxiliary EVA Equipment";
+	req_one_access = list(18,19,43);
+	stripe_color = "#5a19a8"
+	},
 /turf/simulated/floor,
 /area/stellardelight/deck1/exploequipment)
 "Hg" = (
@@ -17699,6 +17698,15 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/milspec,
 /area/stellardelight/deck1/exploequipment)
+"Lz" = (
+/obj/machinery/door/airlock/angled_bay/standard/glass{
+	door_color = "#333333";
+	name = "Auxiliary EVA Equipment Room";
+	req_one_access = list(18,19,43);
+	stripe_color = "#5a19a8"
+	},
+/turf/simulated/floor,
+/area/maintenance/stellardelight/deck1/exploration)
 "LA" = (
 /obj/structure/cable/pink{
 	icon_state = "1-8"
@@ -31594,7 +31602,7 @@ Ua
 Ua
 Ua
 Ec
-vT
+Lz
 pC
 HG
 LO

tgui/packages/tgui-panel/telemetry.js

@@ -36,6 +36,14 @@ export const telemetryMiddleware = (store) => {
       Byond.sendMessage('telemetry', { connections });
       return;
     }
+    // For whatever reason we didn't get the telemetry, re-request
+    if (type === 'testTelemetryCommand') {
+      setTimeout(() => {
+        if (!telemetry) {
+          Byond.sendMessage('ready');
+        }
+      }, 500);
+    }
     // Keep telemetry up to date
     if (type === 'backend/update') {
       next(action);

tgui/packages/tgui/interfaces/AdminTicketPanel.tsx

@@ -1,4 +1,6 @@
 /* eslint react/no-danger: "off" */
+import { round, toFixed } from 'common/math';
+
 import { useBackend } from '../backend';
 import { Box, Button, LabeledList, Section } from '../components';
 import { Window } from '../layouts';
@@ -58,13 +60,17 @@ export const AdminTicketPanel = (props) => {
             <LabeledList.Item label="State">{State[state]}</LabeledList.Item>
             {State[state] === State.open ? (
               <LabeledList.Item label="Opened At">
-                {opened_at_date} ({Math.round((opened_at / 600) * 10) / 10}{' '}
-                minutes ago.)
+                {opened_at_date +
+                  ' (' +
+                  toFixed(round((opened_at / 600) * 10, 0) / 10, 1) +
+                  ' minutes ago.)'}
               </LabeledList.Item>
             ) : (
               <LabeledList.Item label="Closed At">
-                {closed_at_date} ({Math.round((closed_at / 600) * 10) / 10}{' '}
-                minutes ago.){' '}
+                {closed_at_date +
+                  ' (' +
+                  toFixed(round((closed_at / 600) * 10, 0) / 10, 1) +
+                  ' minutes ago.)'}
                 <Button onClick={() => act('reopen')}>Reopen</Button>
               </LabeledList.Item>
             )}

tgui/packages/tgui/interfaces/BodyScanner.jsx

@@ -1,4 +1,4 @@
-import { round } from 'common/math';
+import { toFixed } from 'common/math';
 
 import { useBackend } from '../backend';
 import {
@@ -195,22 +195,34 @@ const BodyScannerMainOccupant = (props) => {
           {stats[occupant.stat][1]}
         </LabeledList.Item>
         <LabeledList.Item label="Temperature">
-          <AnimatedNumber value={round(occupant.bodyTempC, 0)} />
+          <AnimatedNumber
+            value={occupant.bodyTempC}
+            format={(value) => toFixed(value)}
+          />
           &deg;C,&nbsp;
-          <AnimatedNumber value={round(occupant.bodyTempF, 0)} />
+          <AnimatedNumber
+            value={occupant.bodyTempF}
+            format={(value) => toFixed(value)}
+          />
           &deg;F
         </LabeledList.Item>
         <LabeledList.Item label="Blood Volume">
-          <AnimatedNumber value={round(occupant.blood.volume, 0)} />{' '}
+          <AnimatedNumber
+            value={occupant.blood.volume}
+            format={(value) => toFixed(value)}
+          />
           units&nbsp;(
-          <AnimatedNumber value={round(occupant.blood.percent, 0)} />
+          <AnimatedNumber
+            value={occupant.blood.percent}
+            format={(value) => toFixed(value)}
+          />
           %)
         </LabeledList.Item>
         {/* VOREStation Add */}
         <LabeledList.Item label="Weight">
-          {round(data.occupant.weight) +
+          {toFixed(data.occupant.weight) +
             'lbs, ' +
-            round(data.occupant.weight / 2.20463) +
+            toFixed(data.occupant.weight / 2.20463) +
             'kgs'}
         </LabeledList.Item>
         {/* VOREStation Add End */}
@@ -350,7 +362,7 @@ const BodyScannerMainDamageBar = (props) => {
       mb={!!props.marginBottom && '0.5rem'}
       ranges={damageRange}
     >
-      {round(props.value, 0)}
+      {toFixed(props.value)}
     </ProgressBar>
   );
 };
@@ -387,19 +399,19 @@ const BodyScannerMainOrgansExternal = (props) => {
                   {!!o.bruteLoss && (
                     <Box inline position="relative">
                       <Icon name="bone" />
-                      {round(o.bruteLoss, 0)}&nbsp;
+                      {toFixed(o.bruteLoss)}&nbsp;
                       <Tooltip position="top" content="Brute damage" />
                     </Box>
                   )}
                   {!!o.fireLoss && (
                     <Box inline position="relative">
                       <Icon name="fire" />
-                      {round(o.fireLoss, 0)}
+                      {toFixed(o.fireLoss)}
                       <Tooltip position="top" content="Burn damage" />
                     </Box>
                   )}
                 </Box>
-                <Box inline>{round(o.totalLoss, 0)}</Box>
+                <Box inline>{toFixed(o.totalLoss)}</Box>
               </ProgressBar>
             </Table.Cell>
             <Table.Cell textAlign="right" width="33%">
@@ -460,7 +472,7 @@ const BodyScannerMainOrgansInternal = (props) => {
                 mt={i > 0 && '0.5rem'}
                 ranges={damageRange}
               >
-                {round(o.damage, 0)}
+                {toFixed(o.damage)}
               </ProgressBar>
             </Table.Cell>
             <Table.Cell textAlign="right" width="33%">

tgui/packages/tgui/interfaces/CloningConsole.jsx

@@ -1,4 +1,4 @@
-import { round } from 'common/math';
+import { toFixed } from 'common/math';
 
 import { resolveAsset } from '../assets';
 import { useBackend } from '../backend';
@@ -281,7 +281,7 @@ const CloningConsoleMain = (props) => {
                   }}
                   mt="0.5rem"
                 >
-                  <Box textAlign="center">{round(pod.progress, 0) + '%'}</Box>
+                  <Box textAlign="center">{toFixed(pod.progress) + '%'}</Box>
                 </ProgressBar>
               );
             } else if (pod.status === 'mess') {