From 3bde72e29a76edc6d7f4f8c28f80351679a967fe Mon Sep 17 00:00:00 2001
From: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com>
Date: Sun, 28 Apr 2024 22:09:27 -0600
Subject: [PATCH 1/3] Hardlight Wheelchairs no longer drop metal (#1444)

## About The Pull Request

Fixes an infinite metal exploit with the hardlight wheelchair

## Why It's Good For The Game

I promised security I'd fix this yesterday.

## Proof Of Testing

It works

## Changelog

Is going to go upstream
---
 .../modules/clothing/~donator/donator_items.dm             | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_items.dm b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_items.dm
index 4cd4695d2fb6c..2d6f9d4f501af 100644
--- 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()
 	. = ..()

From bb352c719d3d7f656e52e29090f02f74f0539aa1 Mon Sep 17 00:00:00 2001
From: nevimer <foxmail@protonmail.com>
Date: Mon, 29 Apr 2024 00:29:27 -0400
Subject: [PATCH 2/3] tgui hotfix

---
 .../tgui/interfaces/CrewConsoleBubbers.jsx    | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/tgui/packages/tgui/interfaces/CrewConsoleBubbers.jsx b/tgui/packages/tgui/interfaces/CrewConsoleBubbers.jsx
index bd1f5d9a447d4..5f58b74e45b26 100644
--- 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} />

From 754984835155e96772482fdb5f37bc259e431773 Mon Sep 17 00:00:00 2001
From: nevimer <foxmail@protonmail.com>
Date: Mon, 29 Apr 2024 00:38:30 -0400
Subject: [PATCH 3/3] plap restore modular

---
 .../code/modules/mining/equipment/survival_pod.dm |   1 +
 modular_zubbers/icons/obj/equipment/mining.dmi    | Bin 0 -> 304 bytes
 2 files changed, 1 insertion(+)
 create mode 100644 modular_zubbers/icons/obj/equipment/mining.dmi

diff --git a/modular_zubbers/code/modules/mining/equipment/survival_pod.dm b/modular_zubbers/code/modules/mining/equipment/survival_pod.dm
index e605c0022c7a6..880839b1e42c5 100644
--- 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
new file mode 100644
index 0000000000000000000000000000000000000000..673267737e48c8b1009aa5baf2c05d360b3b04fc
GIT binary patch
literal 304
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvxd5LK*8>L*aPTUGg@rLN@B_v4
zb##j>N>dpaRxq%7GB9MmOWh3=Wh@Eu3ubV5b|VeQ$*Bs7C~-+GPA<wUD9OyvV_>M5
z6C74hRQml(aKXo~Pqe&swa%S6AG{&d;G*$^M>^+yG*2=V_4MwrFb*=lZ0w~l=h37i
zlR^}NS6WzZT(HALJ+!miSatIX35}E!M`wmjnK7FyQCoY*ubmCPYz%WXrL$*PJ}v;-
z>*49*7@{#TIYFYzK_J%Q1cPs5u>se7!;?o?To)*XNVJ~6cTu8AN#SDP!-k}$tZMaD
vQx^&e2e9z42Kpu>@Rd4<CKMz}R538*>v2jRSTkz}&`btTS3j3^P6<r_P;qCu

literal 0
HcmV?d00001