diff --git a/code/controllers/subsystems/pai.dm b/code/controllers/subsystems/pai.dm index 77a73d73d51..90bad4d6e9e 100644 --- a/code/controllers/subsystems/pai.dm +++ b/code/controllers/subsystems/pai.dm @@ -24,6 +24,13 @@ pai_software_by_key = SSpai.pai_software_by_key default_pai_software = SSpai.default_pai_software +/datum/controller/subsystem/pai/ui_state(mob/user) + return always_state + +/datum/controller/subsystem/pai/ui_status(mob/user, datum/ui_state/state) + return UI_INTERACTIVE + + /datum/controller/subsystem/pai/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) diff --git a/code/modules/organs/subtypes/augment.dm b/code/modules/organs/subtypes/augment.dm index f0012ad5254..686bf169609 100644 --- a/code/modules/organs/subtypes/augment.dm +++ b/code/modules/organs/subtypes/augment.dm @@ -119,7 +119,8 @@ M.canremove = FALSE M.item_flags |= NOMOVE owner.equip_to_slot(M, aug_slot) - owner.visible_message(SPAN_NOTICE("\The [M] slides out of \the [owner]'s [owner.organs_by_name[parent_organ]]."), SPAN_NOTICE("You deploy \the [M]!")) + var/obj/item/organ/O = owner.organs_by_name[parent_organ] + owner.visible_message(SPAN_NOTICE("\The [M] slides out of \the [owner]'s [O.name]."), SPAN_NOTICE("You deploy \the [M]!")) /obj/item/organ/internal/augment/tool/combitool name = "retractable combitool" diff --git a/html/changelogs/mattatlas-butshewonthaveme.yml b/html/changelogs/mattatlas-butshewonthaveme.yml new file mode 100644 index 00000000000..6caff44bcb6 --- /dev/null +++ b/html/changelogs/mattatlas-butshewonthaveme.yml @@ -0,0 +1,46 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: MattAtlas + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixes chem dispenser chemical reading saying null/nullu when there's no beaker." + - bugfix: "Condimasters now read chemical amounts." + - bugfix: "Crusher buttons aren't inverted anymore." + - bugfix: "Fixes some radio types not falling under the 'radio' setting in tgchat." + - bugfix: "Augment deploy messages should no longer be wonky." + - bugfix: "pAI joining may have been fixed." diff --git a/tgui/packages/tgui-panel/chat/constants.js b/tgui/packages/tgui-panel/chat/constants.js index decc315ac22..39c4a5d473a 100644 --- a/tgui/packages/tgui-panel/chat/constants.js +++ b/tgui/packages/tgui-panel/chat/constants.js @@ -60,7 +60,7 @@ export const MESSAGE_TYPES = [ name: 'Radio', description: 'All departments of radio messages', selector: - '.alert, .minorannounce, .syndradio, .centcomradio, .aiprivradio, .comradio, .secradio, .gangradio, .engradio, .medradio, .sciradio, .suppradio, .servradio, .radio, .deptradio, .binarysay, .newscaster, .resonate, .abductor, .alien, .changeling', + '.alert, .minorannounce, .syndradio, .centradio, .aiprivradio, .comradio, .entradio, .hailradio, .shipradio, .secradio, .engradio, .medradio, .sciradio, .supradio, .srvradio, .radio, .deptradio, .binarysay, .newscaster, .alien, .changeling', }, { type: MESSAGE_TYPE_INFO, diff --git a/tgui/packages/tgui/interfaces/ChemMaster.tsx b/tgui/packages/tgui/interfaces/ChemMaster.tsx index 093db165ad8..2680cc46055 100644 --- a/tgui/packages/tgui/interfaces/ChemMaster.tsx +++ b/tgui/packages/tgui/interfaces/ChemMaster.tsx @@ -40,7 +40,7 @@ const ReagentFactory = (props, context) => { return ( - {reagents?.length && !data.is_condimaster + {reagents?.length ? reagents.map((reagent) => (
{
{