diff --git a/code/modules/clothing/spacesuits/rig/rig_tgui.dm b/code/modules/clothing/spacesuits/rig/rig_tgui.dm index 5fc1e173800..7f34fe11b84 100644 --- a/code/modules/clothing/spacesuits/rig/rig_tgui.dm +++ b/code/modules/clothing/spacesuits/rig/rig_tgui.dm @@ -98,12 +98,13 @@ if(module.charges && module.charges.len) module_data["charges"] = list() - var/datum/rig_charge/selected = module.charges[module.charge_selected] + var/datum/rig_charge/selected = module.charges["[module.charge_selected]"] + module_data["realchargetype"] = module.charge_selected module_data["chargetype"] = selected ? "[selected.display_name]" : "none" for(var/chargetype in module.charges) var/datum/rig_charge/charge = module.charges[chargetype] - module_data["charges"] += list(list("caption" = "[chargetype] ([charge.charges])", "index" = "[chargetype]")) + module_data["charges"] += list(list("caption" = "[charge.display_name] ([charge.charges])", "index" = "[chargetype]")) module_list += list(module_data) i++ diff --git a/code/modules/overmap/spacetravel.dm b/code/modules/overmap/spacetravel.dm index 658ae729a41..8bae95434ad 100644 --- a/code/modules/overmap/spacetravel.dm +++ b/code/modules/overmap/spacetravel.dm @@ -73,8 +73,9 @@ proc/get_deepspace(x,y) /mob/lost_in_space() return isnull(client) -/mob/living/carbon/human/lost_in_space() - return isnull(client) && !key && stat == DEAD +/mob/living/lost_in_space() + return FALSE + // return isnull(client) && !key && stat == DEAD // Allows bodies that players have ghosted from to be deleted - Ater proc/overmap_spacetravel(var/turf/space/T, var/atom/movable/A) if (!T || !A) diff --git a/code/modules/pda/ai.dm b/code/modules/pda/ai.dm index 9072eef96ee..10a04effb3a 100644 --- a/code/modules/pda/ai.dm +++ b/code/modules/pda/ai.dm @@ -26,7 +26,7 @@ set name = "Use PDA" set src in usr - if(!can_use()) + if(!can_use(usr)) return tgui_interact(usr) diff --git a/code/modules/pda/messenger.dm b/code/modules/pda/messenger.dm index 38360e127a7..a902bec3aa4 100644 --- a/code/modules/pda/messenger.dm +++ b/code/modules/pda/messenger.dm @@ -109,7 +109,7 @@ // Specifically here for the chat message. /datum/data/pda/app/messenger/Topic(href, href_list) - if(!pda.can_use()) + if(!pda.can_use(usr)) return unnotify() @@ -140,7 +140,7 @@ if(last_text && world.time < last_text + 5) return - if(!pda.can_use()) + if(!pda.can_use(usr)) return last_text = world.time diff --git a/code/modules/pda/pda.dm b/code/modules/pda/pda.dm index 3c9b03ce1ed..2c3b3687304 100644 --- a/code/modules/pda/pda.dm +++ b/code/modules/pda/pda.dm @@ -147,16 +147,8 @@ var/global/list/obj/item/device/pda/PDAs = list() log_debug("Invalid switch for PDA, defaulting to old PDA icons. [pdachoice] chosen.") start_program(find_program(/datum/data/pda/app/main_menu)) -/obj/item/device/pda/proc/can_use() - if(!ismob(loc)) - return FALSE - - var/mob/M = loc - if(M.incapacitated(INCAPACITATION_ALL)) - return FALSE - if(src in M.contents) - return TRUE - return FALSE +/obj/item/device/pda/proc/can_use(mob/user) + return (tgui_status(user, GLOB.tgui_inventory_state) == STATUS_INTERACTIVE) /obj/item/device/pda/GetAccess() if(id) @@ -169,7 +161,7 @@ var/global/list/obj/item/device/pda/PDAs = list() /obj/item/device/pda/MouseDrop(obj/over_object as obj, src_location, over_location) var/mob/M = usr - if((!istype(over_object, /obj/screen)) && can_use()) + if((!istype(over_object, /obj/screen)) && can_use(usr)) return attack_self(M) return diff --git a/code/modules/pda/pda_tgui.dm b/code/modules/pda/pda_tgui.dm index 0d70b6db02d..6d57a6c25eb 100644 --- a/code/modules/pda/pda_tgui.dm +++ b/code/modules/pda/pda_tgui.dm @@ -2,11 +2,6 @@ /obj/item/device/pda/tgui_state(mob/user) return GLOB.tgui_inventory_state -/obj/item/device/pda/tgui_status(mob/user, datum/tgui_state/state) - . = ..() - if(!can_use()) - . = min(., STATUS_UPDATE) - /obj/item/device/pda/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) @@ -50,6 +45,7 @@ data["idLink"] = (id ? text("[id.registered_name], [id.assignment]") : "--------") data["useRetro"] = retro_mode + data["touch_silent"] = touch_silent data["cartridge_name"] = cartridge ? cartridge.name : "" data["stationTime"] = stationtime2text() //worldtime2stationtime(world.time) // Aaa which fucking one is canonical there's SO MANY @@ -68,12 +64,6 @@ if(..()) return TRUE - if(!can_use()) - usr.unset_machine() - if(ui) - ui.close() - return FALSE - add_fingerprint(usr) usr.set_machine(src) @@ -113,6 +103,8 @@ id_check(usr, 1) if("Retro") retro_mode = !retro_mode + if("TouchSounds") + touch_silent = !touch_silent if("Ringtone") return set_ringtone() else diff --git a/tgui/packages/tgui/interfaces/CrewManifest.js b/tgui/packages/tgui/interfaces/CrewManifest.js index c4e8688924a..080968d086a 100644 --- a/tgui/packages/tgui/interfaces/CrewManifest.js +++ b/tgui/packages/tgui/interfaces/CrewManifest.js @@ -2,6 +2,7 @@ import { useBackend } from "../backend"; import { Box, Section, Table } from "../components"; import { Window } from "../layouts"; import { COLORS } from "../constants"; +import { decodeHtmlEntities } from "common/string"; /* * Shared by the following templates (and used individually too) @@ -54,7 +55,7 @@ export const CrewManifestContent = (props, context) => { {cat.elems.map(person => ( - {person.name} + {decodeHtmlEntities(person.name)} {person.rank} {person.active} diff --git a/tgui/packages/tgui/interfaces/GeneralRecords.js b/tgui/packages/tgui/interfaces/GeneralRecords.js index 6132a48cf49..0aacdaf7b5d 100644 --- a/tgui/packages/tgui/interfaces/GeneralRecords.js +++ b/tgui/packages/tgui/interfaces/GeneralRecords.js @@ -203,7 +203,7 @@ const GeneralRecordsViewGeneral = (_properties, context) => { ))}
- {general.skills || "No data found."} + {general.skills.split("\n").map(m => {m}) || "No data found."}
{general.comments.length === 0 ? ( diff --git a/tgui/packages/tgui/interfaces/ICAssembly.js b/tgui/packages/tgui/interfaces/ICAssembly.js index bf621880adc..d9dcde72364 100644 --- a/tgui/packages/tgui/interfaces/ICAssembly.js +++ b/tgui/packages/tgui/interfaces/ICAssembly.js @@ -22,8 +22,8 @@ export const ICAssembly = (props, context) => { } = data; return ( - - + +
diff --git a/tgui/packages/tgui/interfaces/MedicalRecords.js b/tgui/packages/tgui/interfaces/MedicalRecords.js index c5da8480b55..7af94c35010 100644 --- a/tgui/packages/tgui/interfaces/MedicalRecords.js +++ b/tgui/packages/tgui/interfaces/MedicalRecords.js @@ -231,7 +231,7 @@ const MedicalRecordsViewGeneral = (_properties, context) => { {general.fields.map((field, i) => ( - {field.value} + {field.value.split("\n").map(m => {m})} {!!field.edit && (
@@ -269,7 +269,7 @@ const RIGSuitModules = (props, context) => { {module.damage >= 2 ? ( -- MODULE DESTROYED -- ) : ( - + Engage: {module.engagecost} Active: {module.activecost} @@ -278,33 +278,33 @@ const RIGSuitModules = (props, context) => { {module.desc} - {module.charges ? ( - -
- - - {capitalize(module.chargetype)} - - {module.charges.map((charge, i) => ( - act("interact_module", { - "module": module.index, - "module_mode": "select_charge_type", - "charge_type": i, - })} /> - )} /> - ))} - -
-
- ) : null}
)} + {module.charges ? ( + +
+ + + {capitalize(module.chargetype)} + + {module.charges.map((charge, i) => ( + +
+
+ ) : null}
))} diff --git a/tgui/packages/tgui/interfaces/SecurityRecords.js b/tgui/packages/tgui/interfaces/SecurityRecords.js index 7a95841cdf0..4cdf09098ad 100644 --- a/tgui/packages/tgui/interfaces/SecurityRecords.js +++ b/tgui/packages/tgui/interfaces/SecurityRecords.js @@ -180,7 +180,7 @@ const SecurityRecordsViewGeneral = (_properties, context) => { {general.fields.map((field, i) => ( - {field.value} + {field.value.split("\n").map(m => {m})} {!!field.edit && (