[pull] master from Aurorastation:master

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(.)

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"

code/modules/reagents/reagent_containers.dm

@@ -314,7 +314,7 @@
 				break
 		if(chugs > 3)
 			if(!(H.species.flags & NO_BREATHE))
-				H.visible_message(SPAN_NOTICE("[src] finishes chugging, exhausted..."), SPAN_NOTICE("You finish chugging, exhausted..."))
+				H.visible_message(SPAN_NOTICE("[H] finishes chugging, exhausted..."), SPAN_NOTICE("You finish chugging, exhausted..."))
 				H.emote("gasp")
 		return
 

html/changelog.html

@@ -35,6 +35,21 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">17 July 2023</h2>
+			<h3 class="author">Doxxmedearly updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Messages for chugging drinks now properly indicate the person doing it.</li>
+			</ul>
+			<h3 class="author">MattAtlas updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes chem dispenser chemical reading saying null/nullu when there&#x27;s no beaker.</li>
+				<li class="bugfix">Condimasters now read chemical amounts.</li>
+				<li class="bugfix">Crusher buttons aren&#x27;t inverted anymore.</li>
+				<li class="bugfix">Fixes some radio types not falling under the &#x27;radio&#x27; setting in tgchat.</li>
+				<li class="bugfix">Augment deploy messages should no longer be wonky.</li>
+				<li class="bugfix">pAI joining may have been fixed.</li>
+			</ul>
+
 			<h2 class="date">15 July 2023</h2>
 			<h3 class="author">Doxxmedearly updated:</h3>
 			<ul class="changes bgimages16">

html/changelogs/.all_changelog.yml

@@ -30012,3 +30012,15 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       to Orion Express Goods Trading.
   TheDanseMacabre:
   - balance: Security no longer has any PEAC fragmentation ammo.
+2023-07-17:
+  Doxxmedearly:
+  - bugfix: Messages for chugging drinks now properly indicate the person doing it.
+  MattAtlas:
+  - 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.

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,

tgui/packages/tgui/interfaces/ChemMaster.tsx

@@ -40,7 +40,7 @@ const ReagentFactory = (props, context) => {
 
   return (
     <Table>
-      {reagents?.length && !data.is_condimaster
+      {reagents?.length
         ? reagents.map((reagent) => (
           <Table.Row key={reagent.name}>
             <Section

tgui/packages/tgui/interfaces/ChemicalDispenser.tsx

@@ -62,12 +62,14 @@ export const ChemicalDispenser = (props, context) => {
         </Section>
         <Section
           title={
-            'Container Display' + data.is_beaker_loaded &&
-            ' (' +
+            'Container Display' +
+            (data.is_beaker_loaded
+              ? ' (' +
               data.beaker_current_volume +
               '/' +
               data.beaker_max_volume +
               'u)'
+              : '')
           }
           buttons={
             data.is_beaker_loaded ? (

tgui/packages/tgui/interfaces/CrusherControl.tsx

@@ -56,12 +56,12 @@ export const PistonManagement = (props, context) => {
         <Button
           content="Open"
           icon="door-closed"
-          onClick={() => act('hatch_close')}
+          onClick={() => act('hatch_open')}
         />
         <Button
           content="Close"
           icon="door-open"
-          onClick={() => act('hatch_open')}
+          onClick={() => act('hatch_close')}
         />
       </LabeledList.Item>
       <LabeledList.Item label="Activate">