Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 6 commits into from
Sep 19, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b81c868
Sorted all the recipes properly + next standard for adding recipes
Jul 31, 2024
6b4c73d
Fixes broken list
Jul 31, 2024
c0ec910
Random ass 5 ruining the day
Jul 31, 2024
dc89542
The Holy water flask is now, in fact, a bottle
Jul 31, 2024
8d96416
mergefigs
Sep 15, 2024
b0bf22a
e
Sep 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions code/datums/components/crafting/crafting_lists/drinks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 0 additions & 8 deletions code/modules/antagonists/cult/cult_items.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
2 changes: 1 addition & 1 deletion code/modules/antagonists/cult/cult_structures.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/antagonists/heretic/items/eldritch_flask.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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."
Expand Down
12 changes: 11 additions & 1 deletion code/modules/food_and_drinks/drinks/drinks/bottle.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
. = ..()
Loading