From 4a8e97befcdf471afaebf62d39740d2227b74897 Mon Sep 17 00:00:00 2001 From: Geeves Date: Mon, 17 Jan 2022 17:51:22 +0200 Subject: [PATCH] Job Runtime Fix (#12915) --- code/game/jobs/job/job.dm | 8 ++++---- html/changelogs/geeves-job_runtime_fix.yml | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 html/changelogs/geeves-job_runtime_fix.yml diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index 116d8167906..c07fbfd062b 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -119,8 +119,8 @@ var/datum/faction/F = faction if(!F.is_default) var/new_outfit = F.titles_to_loadout[title] - var/datum/outfit/O = new new_outfit - if(O) + if(ispath(new_outfit)) + var/datum/outfit/O = new new_outfit O.pre_equip(H, TRUE) O.equip(H, TRUE) return @@ -212,12 +212,12 @@ id = /obj/item/card/id back = /obj/item/storage/backpack shoes = /obj/item/clothing/shoes/black - + headset = /obj/item/device/radio/headset bowman = /obj/item/device/radio/headset/alt double_headset = /obj/item/device/radio/headset/alt/double wrist_radio = /obj/item/device/radio/headset/wrist - + tab_pda = /obj/item/modular_computer/handheld/pda/civilian wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian tablet = /obj/item/modular_computer/handheld/preset/civilian diff --git a/html/changelogs/geeves-job_runtime_fix.yml b/html/changelogs/geeves-job_runtime_fix.yml new file mode 100644 index 00000000000..b0b9dc046b6 --- /dev/null +++ b/html/changelogs/geeves-job_runtime_fix.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Fixed a bug where faction overrides caused certain occupations to runtime when creating their outfits." \ No newline at end of file