From 4c50e64fb8a0ac0b3caca8018569d162b04eb7bb Mon Sep 17 00:00:00 2001 From: Time-Green Date: Mon, 23 Jan 2023 14:20:48 +0100 Subject: [PATCH] Merge skew mondays second merge skew (#72908) This #72799 skewed with one of the AI PRs MERGE SKEW MONDAYSSSSS Shit also just shouldnt register signals in a getter Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com> --- code/datums/ai/_ai_controller.dm | 2 +- tgui/packages/tgui/interfaces/PersonalCrafting.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/datums/ai/_ai_controller.dm b/code/datums/ai/_ai_controller.dm index 885beb36e21fc0..b69634665e9bcb 100644 --- a/code/datums/ai/_ai_controller.dm +++ b/code/datums/ai/_ai_controller.dm @@ -110,6 +110,7 @@ multiple modular subtrees with behaviors set_ai_status(AI_STATUS_ON) else set_ai_status(get_setup_mob_ai_status(new_pawn)) + RegisterSignal(pawn, COMSIG_MOB_STATCHANGE, PROC_REF(on_stat_changed)) RegisterSignal(pawn, COMSIG_MOB_LOGIN, PROC_REF(on_sentience_gained)) @@ -123,7 +124,6 @@ multiple modular subtrees with behaviors if(ai_traits & CAN_ACT_WHILE_DEAD) return final_status - RegisterSignal(pawn, COMSIG_MOB_STATCHANGE, PROC_REF(on_stat_changed)) if(mob_pawn.stat == DEAD) final_status = AI_STATUS_OFF diff --git a/tgui/packages/tgui/interfaces/PersonalCrafting.tsx b/tgui/packages/tgui/interfaces/PersonalCrafting.tsx index 52e23302998b1d..c86d5f1bdbfd18 100644 --- a/tgui/packages/tgui/interfaces/PersonalCrafting.tsx +++ b/tgui/packages/tgui/interfaces/PersonalCrafting.tsx @@ -659,7 +659,7 @@ const RecipeContentCompact = ({ item, craftable, busy, mode }, context) => { item.machinery .map((item) => data.atom_data[(item as any) - 1]?.name) .join(', ')} - {item.structures && + {item.structures && ', ' + item.structures .map((item) => data.atom_data[(item as any) - 1]?.name) @@ -794,7 +794,7 @@ const RecipeContent = ({ item, craftable, busy, mode, diet }, context) => { ))} )} - {item.structures && ( + {item.structures && ( {item.structures.map((atom_id) => (