Merge pull request #633 from ArchieBeepBoop/fixes2

Spooky meteors now only replace catstrophic instead of -every type- and also fixes two broken autobottler designs

code/modules/events/meteor_wave.dm

@@ -32,8 +32,6 @@
 		determine_wave_type()
 
 /datum/round_event/meteor_wave/proc/determine_wave_type()
-	if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
-		wave_name = "halloween"
 	if(!wave_name)
 		wave_name = pickweight(list(
 			"normal" = 50,
@@ -45,7 +43,10 @@
 		if("threatening")
 			wave_type = GLOB.meteors_threatening
 		if("catastrophic")
-			wave_type = GLOB.meteors_catastrophic
+			if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
+				wave_type = GLOB.meteorsSPOOKY
+			else
+				wave_type = GLOB.meteors_catastrophic
 		if("meaty")
 			wave_type = GLOB.meteorsB
 		if("space dust")

code/modules/research/designs/autobotter_designs.dm

@@ -307,7 +307,7 @@
 	desc = "Allows for the blowing, and bottling of Blooddrop bottles."
 	id = "blooddrop"
 	category = list("Wines")
-	reagents_list = list("champagne" = 30, "co2" = 30, "wine" = 10, "grape_juice" = 30)
+	reagents_list = list("champagne" = 30, "co2" = 30, "wine" = 10, "grapejuice" = 30)
 	build_path = /obj/item/export/bottle/blooddrop
 
 /datum/design/bottle/export/slim_gold
@@ -323,7 +323,7 @@
 	desc = "Allows for the blowing, and bottling of White Bloodmoon bottles."
 	id = "white_bloodmoon"
 	category = list("Wines")
-	reagents_list = list("synthflesh" = 50, "blood" = 50, "gib" = 10)
+	reagents_list = list("synthflesh" = 50, "blood" = 50, "liquidgibs" = 10)
 	build_path = /obj/item/export/bottle/white_bloodmoon
 
 /datum/design/bottle/export/greenroad
@@ -332,4 +332,4 @@
 	id = "greenroad"
 	reagents_list = list("vitfro" = 50, "rum" = 50, "ash" = 10)
 	category = list("Beers")
-	build_path = /obj/item/export/bottle/greenroad
+	build_path = /obj/item/export/bottle/greenroad