From 754490a2d36989d198e0111f688e9f7b52467d8f Mon Sep 17 00:00:00 2001 From: deathride58 Date: Fri, 24 Nov 2017 18:02:51 -0500 Subject: [PATCH] Update pandemic.dm --- code/modules/reagents/chemistry/machinery/pandemic.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm index ae0f4a008a..9400d3317f 100644 --- a/code/modules/reagents/chemistry/machinery/pandemic.dm +++ b/code/modules/reagents/chemistry/machinery/pandemic.dm @@ -195,15 +195,9 @@ addtimer(CALLBACK(src, .proc/reset_replicator_cooldown), 50) . = TRUE if("create_vaccine_bottle") -<<<<<<< HEAD - var/index = text2num(params["index"]) - var/datum/disease/D = SSdisease.archive_diseases[get_virus_id_by_index(index)] - var/obj/item/reagent_containers/glass/bottle/B = new(get_turf(src)) -======= var/id = params["index"] var/datum/disease/D = SSdisease.archive_diseases[id] var/obj/item/reagent_containers/glass/bottle/B = new(drop_location()) ->>>>>>> ed12ad4... Updates some item drops to use drop_location() (#32994) B.name = "[D.name] vaccine bottle" B.reagents.add_reagent("vaccine", 15, list(index)) wait = TRUE