Skip to content

Commit

Permalink
Merge skew mondays second merge skew (#72908)
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Time-Green and Mothblocks committed Jan 23, 2023
1 parent 925a88f commit 4c50e64
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion code/datums/ai/_ai_controller.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions tgui/packages/tgui/interfaces/PersonalCrafting.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -794,7 +794,7 @@ const RecipeContent = ({ item, craftable, busy, mode, diet }, context) => {
))}
</Box>
)}
{item.structures && (
{item.structures && (
<Box>
<GroupTitle title="Structures" />
{item.structures.map((atom_id) => (
Expand Down

0 comments on commit 4c50e64

Please sign in to comment.