From dc68ef2821d7d3b4cab8ae2810a155679e8e8dee Mon Sep 17 00:00:00 2001 From: Meghan-Rossi <56671765+Meghan-Rossi@users.noreply.github.com> Date: Tue, 20 Oct 2020 03:22:55 +0100 Subject: [PATCH 1/2] Fixes a runtime when alien syringes are spawned during map loading (#7734) Fixes a runtime when alien syringes are spawned during map loading --- code/modules/xenoarcheaology/finds/find_spawning.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/xenoarcheaology/finds/find_spawning.dm b/code/modules/xenoarcheaology/finds/find_spawning.dm index 27fd388c5f7..b121724219b 100644 --- a/code/modules/xenoarcheaology/finds/find_spawning.dm +++ b/code/modules/xenoarcheaology/finds/find_spawning.dm @@ -551,7 +551,9 @@ var/obj/item/weapon/reagent_containers/syringe/S = new_item S.volume = 30 - S.reagents.maximum_volume = 30 + //If S hasn't initialized yet, S.reagents will be null. + //However, in that case Initialize will set the maximum volume to the volume for us, so we don't need to do anything. + S.reagents?.maximum_volume = 30 item_type = new_item.name