From 6956f034e9eca1e7b66ffaa5b79d5a253e9075ff Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Tue, 17 Jan 2023 13:37:05 -0800
Subject: [PATCH] Bugfix 98 (#4969)

Co-authored-by: silicons <no@you.cat>
---
 code/game/objects/items/devices/gps.dm        |  5 +-
 code/game/objects/items/stacks/stack.dm       |  4 +-
 .../organs/internal/species/alraune.dm        |  5 +-
 tgui/packages/tgui/interfaces/Gps.tsx         | 36 +++++----
 tgui/packages/tgui/interfaces/OvermapHelm.js  | 74 ++++++++++---------
 5 files changed, 68 insertions(+), 56 deletions(-)

diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm
index b4304ce41d4..4663584fe4e 100644
--- a/code/game/objects/items/devices/gps.dm
+++ b/code/game/objects/items/devices/gps.dm
@@ -374,9 +374,10 @@
 			if(sig == our_sig)
 				continue
 			var/atom/A = sig.parent
+			var/turf/T = get_turf(A)
 			others += list(list(
-				"x" = A.x,
-				"y" = A.y,
+				"x" = T.x,
+				"y" = T.y,
 				"level" = l_id,
 				"ref" = ref(sig),
 				"name" = sig.gps_tag
diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index db91b96e31a..45684804e7f 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -240,6 +240,8 @@
 		return FALSE
 	if(mid_delete || other.mid_delete) // bandaid until new inventory code
 		return FALSE
+	if((strict_color_stacking || other.strict_color_stacking) && (color != other.color))
+		return FALSE
 	return other.stacktype == stacktype
 
 /obj/item/stack/proc/use(used)
@@ -287,8 +289,6 @@
 		return 0
 	if (!can_merge(S) && !type_verified)
 		return 0
-	if ((strict_color_stacking || S.strict_color_stacking) && S.color != color)
-		return 0
 
 	if (isnull(tamount))
 		tamount = src.get_amount()
diff --git a/code/modules/organs/internal/species/alraune.dm b/code/modules/organs/internal/species/alraune.dm
index 65e879fa965..3341b4f4caa 100644
--- a/code/modules/organs/internal/species/alraune.dm
+++ b/code/modules/organs/internal/species/alraune.dm
@@ -47,9 +47,8 @@
 	. = ..()
 	create_reagents(usable_volume)
 
-/obj/item/organ/internal/fruitgland/process(delta_time)
-	if(!owner)
-		return
+/obj/item/organ/internal/fruitgland/tick_life(dt)
+	. = ..()
 	var/obj/item/organ/external/parent = owner.get_organ(parent_organ)
 	var/before_gen
 	if(parent && generated_reagents && owner) //Is it in the chest/an organ, has reagents, and is 'activated'
diff --git a/tgui/packages/tgui/interfaces/Gps.tsx b/tgui/packages/tgui/interfaces/Gps.tsx
index 8890ea0e1bd..0c5eca20bef 100644
--- a/tgui/packages/tgui/interfaces/Gps.tsx
+++ b/tgui/packages/tgui/interfaces/Gps.tsx
@@ -146,11 +146,15 @@ export const Gps = (props, context) => {
                       <Table.Cell collapsing>
                         {
                           data.level === signal.level ? (
-                            <Icon
-                              mr={1}
-                              size={1.2}
-                              name="arrow-up"
-                              rotation={Math.round(Math.atan2(signal.x - data.x, signal.y - data.y) * 180 / Math.PI)} />
+                            <>
+                              <Icon
+                                mr={1}
+                                size={1.2}
+                                name="arrow-up"
+                                rotation={Math.round(Math.atan2(signal.x - data.x, signal.y - data.y)
+                                  * 180 / Math.PI)} />
+                              {Math.round(Math.sqrt(Math.pow(signal.x - data.x, 2) + Math.pow(signal.y - data.y, 2)))}m
+                            </>
                           ) : (
                             `FAR`
                           )
@@ -161,7 +165,7 @@ export const Gps = (props, context) => {
                           data.level === signal.level? (
                             `${signal.x}, ${signal.y}`
                           ) : (
-                            `${signal.level}`
+                            `${signal.level} - ${signal.x}, ${signal.y}`
                           )
                         }
                       </Table.Cell>
@@ -191,12 +195,18 @@ export const Gps = (props, context) => {
                       </Table.Cell>
                       <Table.Cell collapsing>
                         {
-                          data.level === signal.level && (
-                            <Icon
-                              mr={1}
-                              size={1.2}
-                              name="arrow-up"
-                              rotation={Math.round(Math.atan2(signal.x - data.x, signal.y - data.y) * 180 / Math.PI)} />
+                          data.level === signal.level ? (
+                            <>
+                              <Icon
+                                mr={1}
+                                size={1.2}
+                                name="arrow-up"
+                                rotation={Math.round(Math.atan2(signal.x - data.x, signal.y - data.y)
+                                  * 180 / Math.PI)} />
+                              {Math.round(Math.sqrt(Math.pow(signal.x - data.x, 2) + Math.pow(signal.y - data.y, 2)))}m
+                            </>
+                          ) : (
+                            `FAR`
                           )
                         }
                       </Table.Cell>
@@ -205,7 +215,7 @@ export const Gps = (props, context) => {
                           data.level === signal.level? (
                             `${signal.x}, ${signal.y}`
                           ) : (
-                            `FAR: ${signal.level}`
+                            `${signal.level} - ${signal.x}, ${signal.y}`
                           )
                         }
                       </Table.Cell>
diff --git a/tgui/packages/tgui/interfaces/OvermapHelm.js b/tgui/packages/tgui/interfaces/OvermapHelm.js
index 53358679f48..1a404426fa1 100644
--- a/tgui/packages/tgui/interfaces/OvermapHelm.js
+++ b/tgui/packages/tgui/interfaces/OvermapHelm.js
@@ -6,7 +6,7 @@ import { OvermapFlightData, OvermapPanControls } from './common/Overmap';
 
 export const OvermapHelm = (props, context) => {
   return (
-    <Window width={565} height={545} resizable>
+    <Window width={560} height={700} scrollable>
       <Window.Content>
         <OvermapHelmContent />
       </Window.Content>
@@ -176,40 +176,42 @@ const OvermapNavComputer = (props, context) => {
   } = data;
 
   return (
-    <Section title="Navigation Data" m={0.3} mt={1}>
-      <LabeledList>
-        <LabeledList.Item label="Location">
-          {sector}
-        </LabeledList.Item>
-        <LabeledList.Item label="Coordinates">
-          {s_x} : {s_y}
-        </LabeledList.Item>
-        <LabeledList.Item label="Scan Data">
-          {sector_info}
-        </LabeledList.Item>
-        <LabeledList.Item label="Status">
-          {landed}
-        </LabeledList.Item>
-      </LabeledList>
-      <Flex mt={1} align="center" justify="center" spacing={1}>
-        <Flex.Item basis="50%">
-          <Button
-            fluid
-            icon="save"
-            onClick={() => act("add", { add: "current" })}>
-            Save Current Position
-          </Button>
-        </Flex.Item>
-        <Flex.Item basis="50%">
-          <Button
-            fluid
-            icon="sticky-note"
-            onClick={() => act("add", { add: "new" })}>
-            Add New Entry
-          </Button>
-        </Flex.Item>
-      </Flex>
-      <Section mt={1} scrollable height="130px">
+    <>
+      <Section title="Navigation Data" m={0.3} mt={1}>
+        <LabeledList>
+          <LabeledList.Item label="Location">
+            {sector}
+          </LabeledList.Item>
+          <LabeledList.Item label="Coordinates">
+            {s_x} : {s_y}
+          </LabeledList.Item>
+          <LabeledList.Item label="Scan Data">
+            {sector_info}
+          </LabeledList.Item>
+          <LabeledList.Item label="Status">
+            {landed}
+          </LabeledList.Item>
+        </LabeledList>
+        <Flex mt={1} align="center" justify="center" spacing={1}>
+          <Flex.Item basis="50%">
+            <Button
+              fluid
+              icon="save"
+              onClick={() => act("add", { add: "current" })}>
+              Save Current Position
+            </Button>
+          </Flex.Item>
+          <Flex.Item basis="50%">
+            <Button
+              fluid
+              icon="sticky-note"
+              onClick={() => act("add", { add: "new" })}>
+              Add New Entry
+            </Button>
+          </Flex.Item>
+        </Flex>
+      </Section>
+      <Section mt={1}>
         <Table>
           <Table.Row header>
             <Table.Cell>Name</Table.Cell>
@@ -236,6 +238,6 @@ const OvermapNavComputer = (props, context) => {
           ))}
         </Table>
       </Section>
-    </Section>
+    </>
   );
 };