Merge branch 'master' of https://github.com/Ldip999/New-Home

Ldip999 · Apr 29, 2024 · dd4499d · dd4499d
2 parents cf1609a + ee35311
commit dd4499d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 15 deletions.
diff --git a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_items.dm b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_items.dm
@@ -181,6 +181,13 @@
 
 	return ..()
 
+/obj/vehicle/ridden/wheelchair/hardlight/atom_destruction(damage_flag)
+	visible_message(span_notice("[src] flickers and vanishes as the hardlight emitters are interrupted"))
+	qdel(src)
+	return ..()
+
+/obj/vehicle/ridden/wheelchair/hardlight/wrench_act(mob/living/user, obj/item/tool)
+	return
 
 /obj/vehicle/ridden/wheelchair/hardlight/post_unbuckle_mob()
 	. = ..()

diff --git a/modular_zubbers/code/modules/mining/equipment/survival_pod.dm b/modular_zubbers/code/modules/mining/equipment/survival_pod.dm
@@ -3,6 +3,7 @@
 	desc = "A bluespace capsule colored in syndie red and black. It has the letters PLAP written on it."
 	template_id = "shelter_plap"
 	icon_state = "scapsule"
+	icon = 'modular_zubbers/icons/obj/equipment/mining.dmi'
 
 /obj/item/paper/crumpled/plap
 	name = "Guide to your PLAP (Portable Listening Advanced Post)"

diff --git a/modular_zubbers/icons/obj/equipment/mining.dmi b/modular_zubbers/icons/obj/equipment/mining.dmi
diff --git a/tgui/packages/tgui/interfaces/CrewConsoleBubbers.jsx b/tgui/packages/tgui/interfaces/CrewConsoleBubbers.jsx
@@ -88,28 +88,25 @@ export const CrewConsoleBubbers = () => {
   );
 };
 
-const CrewTable = (props, context) => {
-  const { act, data } = useBackend(context);
-  const sensors = sortBy((s) =>
-    s.brutedam + s.burndam + s.toxdam + s.oxydam > 50
-      ? -(s.brutedam + s.burndam + s.toxdam + s.oxydam)
-      : s.ijob,
-  )(data.sensors ?? []);
+const CrewTable = (props) => {
+  const { act, data } = useBackend();
+  const sensors = sortBy(data.sensors ?? [], (s) => s.ijob);
   return (
-    <Table cellpadding="3">
+    <Table>
       <Table.Row>
-        <Table.Cell bold colspan="2">
-          Name
-        </Table.Cell>
-        <Table.Cell bold collapsing textAlign="center">
-          Status
-        </Table.Cell>
+        <Table.Cell bold>Name</Table.Cell>
+        <Table.Cell bold collapsing />
         <Table.Cell bold collapsing textAlign="center">
           Vitals
         </Table.Cell>
-        <Table.Cell bold width="180px" collapsing textAlign="center">
+        <Table.Cell bold textAlign="center">
           Position
         </Table.Cell>
+        {!!data.link_allowed && (
+          <Table.Cell bold collapsing textAlign="center">
+            Tracking
+          </Table.Cell>
+        )}
       </Table.Row>
       {sensors.map((sensor) => (
         <CrewTableEntry sensor_data={sensor} key={sensor.ref} />