Unholy flask is now a bottle, not a beaker (#11273)

* Sorted all the recipes properly + next standard for adding recipes if i see anything that looks odd, i'm gonna punt somoene * Fixes broken list * Random ass 5 ruining the day * The Holy water flask is now, in fact, a bottle * e --------- Co-authored-by: PigeonVerde322 <[email protected]>
BeeStation · Sep 19, 2024 · 5d1b899 · 5d1b899
1 parent 10bd826
commit 5d1b899
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 14 deletions.
diff --git a/code/datums/components/crafting/crafting_lists/drinks.dm b/code/datums/components/crafting/crafting_lists/drinks.dm
@@ -95,8 +95,15 @@
 	)
 	category = CAT_DRINK
 
-//flask of unholy water is a beaker for some reason, I will try making it a bottle and add it here once the antag freeze is over. t. kryson
-//lazy lazy devs not doing their job and letting the code debt getting bigger and bigger IT'S BEEN 7 YEARS FFS
+/datum/crafting_recipe/unholybottle
+	name = "Unholy Water Flask"
+	result = /obj/item/reagent_containers/food/drinks/bottle/unholywater
+	time = 3 SECONDS
+	reqs = list(
+		/obj/item/reagent_containers/food/drinks/bottle/blank = 1,
+		/datum/reagent/fuel/unholywater = 100
+	)
+	category = CAT_DRINK
 
 /datum/crafting_recipe/nothingbottle
 	name = "Nothing Bottle"

diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm
@@ -292,14 +292,6 @@ Striking a noncultist, however, will tear their flesh."}
 		user.Paralyze(100)
 		user.adjust_blindness(30)
 
-/obj/item/reagent_containers/glass/beaker/unholywater
-	name = "flask of unholy water"
-	desc = "Toxic to nonbelievers; reinvigorating to the faithful - this flask may be sipped or thrown."
-	icon = 'icons/obj/drinks.dmi'
-	icon_state = "holyflask"
-	color = "#333333"
-	list_reagents = list(/datum/reagent/fuel/unholywater = 50)
-
 /obj/item/shuttle_curse
 	name = "cursed orb"
 	desc = "You peer within this smokey orb and glimpse terrible fates befalling the escape shuttle."

diff --git a/code/modules/antagonists/cult/cult_structures.dm b/code/modules/antagonists/cult/cult_structures.dm
@@ -97,7 +97,7 @@
 		if("Construct Shell")
 			pickedtype += /obj/structure/constructshell
 		if("Flask of Unholy Water")
-			pickedtype += /obj/item/reagent_containers/glass/beaker/unholywater
+			pickedtype += /obj/item/reagent_containers/food/drinks/bottle/unholywater
 		else
 			return
 	if(src && !QDELETED(src) && anchored && pickedtype && Adjacent(user) && !user.incapacitated() && iscultist(user) && cooldowntime <= world.time)

diff --git a/code/modules/antagonists/heretic/items/eldritch_flask.dm b/code/modules/antagonists/heretic/items/eldritch_flask.dm
@@ -1,5 +1,5 @@
 // An unholy water flask, but for heretics.
-// Heals heretics, hearms non-heretics. Pretty much identical.
+// Heals heretics, harms non-heretics. Pretty much identical.
 /obj/item/reagent_containers/glass/beaker/eldritch
 	name = "flask of eldritch essence"
 	desc = "Toxic to the closed minded, yet refreshing to those with knowledge of the beyond."

diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -198,9 +198,19 @@
 	list_reagents = list(/datum/reagent/water/holywater = 100)
 	foodtype = NONE
 
-/obj/item/reagent_containers/food/drinks/bottle/holywater/hell
+/obj/item/reagent_containers/food/drinks/bottle/unholywater
+	name = "flask of unholy water"
+	desc = "Toxic to nonbelievers, reinvigorating to the faithful."
+	icon_state = "holyflask"
+	list_reagents = list(/datum/reagent/fuel/unholywater = 100)
+	foodtype = NONE
+
+/obj/item/reagent_containers/food/drinks/bottle/hellwater
+	name = "flask of holy water?"
 	desc = "A flask of holy water...it's been sitting in the Necropolis a while though."
+	icon_state = "holyflask"
 	list_reagents = list(/datum/reagent/hellwater = 100)
+	foodtype = NONE
 
 /obj/item/reagent_containers/food/drinks/bottle/vermouth
 	name = "Goldeneye vermouth"

diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
@@ -377,5 +377,5 @@
 			r_pocket = /obj/item/restraints/legcuffs/bola/cult
 			l_pocket = /obj/item/melee/cultblade/dagger
 			glasses =  /obj/item/clothing/glasses/hud/health/night/cultblind
-			backpack_contents = list(/obj/item/reagent_containers/glass/beaker/unholywater = 1, /obj/item/cult_shift = 1, /obj/item/flashlight/flare/culttorch = 1, /obj/item/stack/sheet/runed_metal = 15)
+			backpack_contents = list(/obj/item/reagent_containers/food/drinks/bottle/unholywater = 1, /obj/item/cult_shift = 1, /obj/item/flashlight/flare/culttorch = 1, /obj/item/stack/sheet/runed_metal = 15)
 	. = ..()