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() . = ..() 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 0000000000000..673267737e48c Binary files /dev/null and b/modular_zubbers/icons/obj/equipment/mining.dmi differ 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 ( - +
- - Name - - - Status - + Name + Vitals - + Position + {!!data.link_allowed && ( + + Tracking + + )} {sensors.map((sensor) => (