From f6ed4ec93b5d8b4ce8da20971aea2930362ca15b Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Mon, 19 Oct 2020 23:18:14 -0400
Subject: [PATCH] Merge pull request #9247 from VOREStation/upstream-merge-7734

[MIRROR] 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 27fd388c5f..b121724219 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