Skip to content

Commit

Permalink
New Vegas Toxins (#489)
Browse files Browse the repository at this point in the history
* New Vegas Toxins

* linter fix

* fix recipe conflict

* requested changes

* Update toxin_reagents.dm
  • Loading branch information
biotear authored Apr 13, 2024
1 parent deabaf0 commit a39f8c3
Show file tree
Hide file tree
Showing 3 changed files with 99 additions and 2 deletions.
4 changes: 2 additions & 2 deletions code/modules/fallout/obj/food_and_drinks/food.dm
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
name = "cazador meat"
desc = "Meat extracted from the lean hide of cazador wasp."
icon_state = "mothmeat"
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/toxin/carpotoxin = 3)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/toxin/cazador_venom = 3)
filling_color = "#e5b73b"
bitesize = 2
tastes = list("insect guts" = 3, "sweet tangy liquid" = 1) //google says toxin is sweet anyway.
Expand All @@ -142,7 +142,7 @@
desc = "Meat from a radscorpion, still inside its chitin. Going to need pliers for this."
icon = 'icons/fallout/objects/food&drinks/food.dmi'
icon_state = "radscorpion_meat"
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/toxin = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/toxin/radscorp = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
filling_color = "#e5b73b"
bitesize = 4
tastes = list("insect guts" = 3, "sweet tangy liquid" = 2) //google says toxin is sweet anyway.
Expand Down
69 changes: 69 additions & 0 deletions code/modules/reagents/chemistry/reagents/toxin_reagents.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1114,3 +1114,72 @@
if(initial(liber.filterToxins))
liber.filterToxins = TRUE
L.metabolism_efficiency += metab_inibition

/datum/reagent/toxin/radscorp
name = "Radscorpion Venom"
description = "Venom extracted from a radscorpion."
color = "#8C7918" // rgb: 140, 121, 24
taste_description = "sweetness"
taste_mult = 1.2
value = REAGENT_VALUE_COMMON //Encouraging people to mix toxins for reasons beyond harming each other or mixing reagents such as pen acid.
toxpwr = 1.3
ghoulfriendly = TRUE

/datum/reagent/toxin/silversting
name = "Silver Sting"
description = "A poison made from adding silver dust to radscorpion venom."
color = "#F0DE97" // rgb: 240, 222, 151
taste_description = "metallic sweetness"
taste_mult = 1.2
value = REAGENT_VALUE_COMMON //Encouraging people to mix toxins for reasons beyond harming each other or mixing reagents such as pen acid.
toxpwr = 1.5
ghoulfriendly = TRUE

/datum/reagent/toxin/silversting/on_mob_add(mob/living/carbon/human/M)
..()
if(isliving(M))
M.adjustStaminaLoss(90)

/datum/reagent/toxin/bleakvenom
name = "Bleak Venom"
description = "A concentrated and highly toxic poison made from radscorpion and cazador venoms."
color = "#3D2D18" // rgb: 61, 45, 24
taste_description = "bleakness"
taste_mult = 1.5
value = REAGENT_VALUE_COMMON //Encouraging people to mix toxins for reasons beyond harming each other or mixing reagents such as pen acid.
toxpwr = 2.7
ghoulfriendly = TRUE

/datum/reagent/toxin/motherdarkness
name = "Mother Darkness"
description = "A hallucinogenic poison made by mixing radscorpion and cazador venoms with datura tea."
color = "#2E2236" // rgb: 46, 34, 54
taste_description = "numbing bitterness"
taste_mult = 4
value = REAGENT_VALUE_COMMON //Encouraging people to mix toxins for reasons beyond harming each other or mixing reagents such as pen acid.
toxpwr = 1.7
ghoulfriendly = TRUE

/datum/reagent/toxin/motherdarkness/on_mob_add(mob/living/carbon/human/M)
..()
if(isliving(M))
M.adjustStaminaLoss(75)

/datum/reagent/toxin/motherdarkness/on_mob_life(mob/living/carbon/M)
M.blur_eyes(3)
M.hallucination += 5
return ..()

/datum/reagent/toxin/darkdatura
name = "Dark Datura"
description = "A tribal poison made of datuta tea and acetone."
color = "#E3E0DA" // rgb: 227, 224, 218
taste_description = "dirt"
taste_mult = 1.2
value = REAGENT_VALUE_COMMON //Encouraging people to mix toxins for reasons beyond harming each other or mixing reagents such as pen acid.
toxpwr = 1.2
ghoulfriendly = TRUE

/datum/reagent/toxin/darkdatura/on_mob_life(mob/living/carbon/M)
M.blur_eyes(3)
..()
28 changes: 28 additions & 0 deletions code/modules/reagents/chemistry/recipes/toxins.dm
Original file line number Diff line number Diff line change
Expand Up @@ -122,3 +122,31 @@
results = list(/datum/reagent/toxin/spewium = 5)
required_reagents = list (/datum/reagent/toxin/skewium = 1, /datum/reagent/consumable/ethanol/buffalo = 2, /datum/reagent/consumable/ethanol/yellowpulque = 2)
mix_message = "<span class='danger'>The mixture gives off a nauseating odor.</span>"

/datum/chemical_reaction/silversting
name = "Silver Sting"
id = /datum/reagent/toxin/silversting
results = list(/datum/reagent/toxin/silversting = 3)
required_reagents = list (/datum/reagent/toxin/radscorp = 2, /datum/reagent/silver = 1)
mix_message = "<span class='danger'>The mixture shines in the light.</span>"

/datum/chemical_reaction/bleakvenom
name = "Bleak Venom"
id = /datum/reagent/toxin/bleakvenom
results = list(/datum/reagent/toxin/bleakvenom = 6)
required_reagents = list (/datum/reagent/toxin/radscorp = 3, /datum/reagent/toxin/cazador_venom = 3)
mix_message = "<span class='danger'>The mixture hisses and inspires hopelessness.</span>"

/datum/chemical_reaction/motherdarkness
name = "Mother Darkness"
id = /datum/reagent/toxin/motherdarkness
results = list(/datum/reagent/toxin/motherdarkness = 5)
required_reagents = list (/datum/reagent/toxin/radscorp = 4, /datum/reagent/consumable/ethanol/daturatea = 1)
mix_message = "<span class='danger'>The mixture fizzes and bubbles as it darkens.</span>"

/datum/chemical_reaction/darkdatura
name = "Dark Datura"
id = /datum/reagent/toxin/darkdatura
results = list(/datum/reagent/toxin/darkdatura = 10)
required_reagents = list (/datum/reagent/consumable/ethanol/daturatea = 8, /datum/reagent/acetone = 2)
mix_message = "<span class='danger'>The mixture bubbles and gives off noxious fumes.</span>"

0 comments on commit a39f8c3

Please sign in to comment.