Update pandemic.dm

2017-11-24 18:02:51 -05:00
parent 12aa356f10
commit 754490a2d3
1 changed files with 0 additions and 6 deletions
@@ -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