From cacdf1b198c49744247f5c86638ffe568e63ca4e Mon Sep 17 00:00:00 2001
From: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
Date: Sun, 16 Jul 2023 19:00:27 +0200
Subject: [PATCH] Fix vaccines not merging properly (#21601)

---
 code/modules/reagents/chemistry/reagents/water.dm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/modules/reagents/chemistry/reagents/water.dm b/code/modules/reagents/chemistry/reagents/water.dm
index fafda47c4fc..7c248dbd8b7 100644
--- a/code/modules/reagents/chemistry/reagents/water.dm
+++ b/code/modules/reagents/chemistry/reagents/water.dm
@@ -203,9 +203,9 @@
 				D.cure()
 		M.resistances |= data
 
-/datum/reagent/vaccine/on_merge(list/data)
-	if(istype(data))
-		data |= data.Copy()
+/datum/reagent/vaccine/on_merge(list/incoming_data)
+	if(islist(incoming_data))
+		data |= incoming_data.Copy()
 
 /datum/reagent/fishwater
 	name = "Fish Water"