From c2ae767e158b4e415892dde08f9d629c03135201 Mon Sep 17 00:00:00 2001 From: Geeves Date: Wed, 22 May 2024 18:11:22 +0200 Subject: [PATCH] Character Preview Augments (#19196) * Augments such as the Idris Faceplate are now visible in the character preview screen. ![image](https://github.com/Aurorastation/Aurora.3/assets/22774890/2d3ffadf-5754-488f-8b55-da191f6b67ba) --- code/controllers/subsystems/job.dm | 3 +-- code/modules/mob/abstract/new_player/preferences_setup.dm | 5 ++++- html/changelogs/geeves-idris_faceplate.yml | 6 ++++++ 3 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/geeves-idris_faceplate.yml diff --git a/code/controllers/subsystems/job.dm b/code/controllers/subsystems/job.dm index e1555240b44..13255fd87fc 100644 --- a/code/controllers/subsystems/job.dm +++ b/code/controllers/subsystems/job.dm @@ -820,8 +820,7 @@ SUBSYSTEM_DEF(jobs) log_loadout("EA/([H]): Abort: invalid arguments.") return FALSE - var/datum/job/rank = GetJob(H.mind.assigned_role) - + var/datum/job/rank = H.mind ? GetJob(H.mind.assigned_role) : prefs.return_chosen_high_job() switch (rank.title) if ("AI", "Cyborg") log_loadout("EA/([H]): Abort: synthetic.") diff --git a/code/modules/mob/abstract/new_player/preferences_setup.dm b/code/modules/mob/abstract/new_player/preferences_setup.dm index 02d804ab686..d02b822f28b 100644 --- a/code/modules/mob/abstract/new_player/preferences_setup.dm +++ b/code/modules/mob/abstract/new_player/preferences_setup.dm @@ -223,9 +223,12 @@ if((equip_preview_mob & EQUIP_PREVIEW_JOB) && previewJob) previewJob.equip_preview(mannequin, player_alt_titles[previewJob.title], faction) - if(equip_preview_mob & EQUIP_PREVIEW_LOADOUT && leftovers.len) + if((equip_preview_mob & EQUIP_PREVIEW_LOADOUT) && leftovers.len) SSjobs.EquipCustomDeferred(mannequin, src, leftovers, used_slots) + if(equip_preview_mob & EQUIP_PREVIEW_LOADOUT) + SSjobs.EquipAugments(mannequin, src) + if (!SSATOMS_IS_PROBABLY_DONE) SSatoms.CreateAtoms(list(mannequin)) mannequin.regenerate_icons() diff --git a/html/changelogs/geeves-idris_faceplate.yml b/html/changelogs/geeves-idris_faceplate.yml new file mode 100644 index 00000000000..9d0f3bf7a4b --- /dev/null +++ b/html/changelogs/geeves-idris_faceplate.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - rscadd: "Augments such as the Idris Faceplate are now visible in the character preview screen." \ No newline at end of file