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.

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

Already on GitHub? Sign in to your account

Fixes itching powder to no longer be classified as a toxin in the game's code as to avoid throwing beakers of 100u itching powder at someone to cause immediate liver failure #10067

Merged
merged 4 commits into from Oct 24, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/game/objects/items/grenades/chem_grenade.dm
Expand Up @@ -339,7 +339,7 @@
B2.reagents.add_reagent(/datum/reagent/potassium, 10)
B2.reagents.add_reagent(/datum/reagent/phosphorus, 10)
B2.reagents.add_reagent(/datum/reagent/toxin/mutagen, 30)

beakers += B1
beakers += B2

Expand Down Expand Up @@ -558,7 +558,7 @@
B1.reagents.add_reagent(/datum/reagent/water, 50)
B1.reagents.add_reagent(/datum/reagent/toxin/mutetoxin, 50)
B1.reagents.add_reagent(/datum/reagent/toxin/spore, 75)
B1.reagents.add_reagent(/datum/reagent/toxin/itching_powder, 50)
B1.reagents.add_reagent(/datum/reagent/itching_powder, 50)
B2.reagents.add_reagent(/datum/reagent/fluorosurfactant, 150)
B2.reagents.add_reagent(/datum/reagent/toxin/mutagen, 150)
beakers += B1
Expand Down
2 changes: 1 addition & 1 deletion code/modules/cargo/bounties/reagent.dm
Expand Up @@ -140,7 +140,7 @@
/datum/reagent/napalm,\
/datum/reagent/firefighting_foam,\
/datum/reagent/consumable/mayonnaise,\
/datum/reagent/toxin/itching_powder,\
/datum/reagent/itching_powder,\
/datum/reagent/toxin/cyanide,\
/datum/reagent/toxin/heparin,\
/datum/reagent/medicine/pen_acid,\
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/cannabis.dm
Expand Up @@ -72,7 +72,7 @@
/datum/reagent/consumable/capsaicin = 0.15,
/datum/reagent/barbers_aid = 0.15,
/datum/reagent/drug/bath_salts = 0.15,
/datum/reagent/toxin/itching_powder = 0.15,
/datum/reagent/itching_powder = 0.15,
/datum/reagent/drug/crank = 0.15,
/datum/reagent/drug/krokodil = 0.15,
/datum/reagent/toxin/histamine = 0.15,
Expand Down
12 changes: 5 additions & 7 deletions code/modules/reagents/chemistry/reagents/toxin_reagents.dm
Expand Up @@ -485,20 +485,18 @@
toxpwr = 0.5
taste_description = "bad cooking"

/datum/reagent/toxin/itching_powder
/datum/reagent/itching_powder
name = "Itching Powder"
description = "A powder that induces itching upon contact with the skin. Causes the victim to scratch at their itches and has a very low chance to decay into Histamine."
silent_toxin = TRUE
reagent_state = LIQUID
color = "#C8C8C8"
metabolization_rate = 0.4 * REAGENTS_METABOLISM
toxpwr = 0

/datum/reagent/toxin/itching_powder/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
/datum/reagent/itching_powder/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
if(method == TOUCH || method == VAPOR)
M.reagents.add_reagent(/datum/reagent/toxin/itching_powder, reac_volume)
M.reagents.add_reagent(/datum/reagent/itching_powder, reac_volume)

/datum/reagent/toxin/itching_powder/on_mob_life(mob/living/carbon/M)
/datum/reagent/itching_powder/on_mob_life(mob/living/carbon/M)
if(prob(15))
to_chat(M, "You scratch at your head.")
M.adjustBruteLoss(0.2*REM, 0)
Expand All @@ -513,7 +511,7 @@
. = 1
if(prob(3))
M.reagents.add_reagent(/datum/reagent/toxin/histamine,rand(1,3))
M.reagents.remove_reagent(/datum/reagent/toxin/itching_powder,1.2)
M.reagents.remove_reagent(/datum/reagent/itching_powder,1.2)
return
..()

Expand Down
10 changes: 8 additions & 2 deletions code/modules/reagents/chemistry/recipes/others.dm
Expand Up @@ -11,6 +11,12 @@
results = list(/datum/reagent/lube = 4)
required_reagents = list(/datum/reagent/water = 1, /datum/reagent/silicon = 1, /datum/reagent/oxygen = 1)

/datum/chemical_reaction/itching_powder
name = "Itching Powder"
id = /datum/reagent/itching_powder
results = list(/datum/reagent/itching_powder = 3)
required_reagents = list(/datum/reagent/fuel = 1, /datum/reagent/ammonia = 1, /datum/reagent/medicine/charcoal = 1)

/datum/chemical_reaction/spraytan
name = "Spray Tan"
id = /datum/reagent/spraytan
Expand Down Expand Up @@ -552,7 +558,7 @@
/datum/chemical_reaction/monkey/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
if (location) new /mob/living/carbon/monkey(location)

/datum/chemical_reaction/gorilla
name = "gorilla"
id = "gorilla"
Expand Down Expand Up @@ -627,7 +633,7 @@
id = /datum/reagent/pax
results = list(/datum/reagent/pax = 3)
required_reagents = list(/datum/reagent/toxin/mindbreaker = 1, /datum/reagent/medicine/synaptizine = 1, /datum/reagent/water = 1)

/datum/chemical_reaction/liquidelectricity
name = /datum/reagent/consumable/liquidelectricity
id = /datum/reagent/consumable/liquidelectricity
Expand Down
7 changes: 1 addition & 6 deletions code/modules/reagents/chemistry/recipes/toxins.dm
Expand Up @@ -20,11 +20,6 @@
required_reagents = list(/datum/reagent/oil = 1, /datum/reagent/ammonia = 1, /datum/reagent/oxygen = 1)
required_temp = 380

/datum/chemical_reaction/itching_powder
name = "Itching Powder"
id = /datum/reagent/toxin/itching_powder
results = list(/datum/reagent/toxin/itching_powder = 3)
required_reagents = list(/datum/reagent/fuel = 1, /datum/reagent/ammonia = 1, /datum/reagent/medicine/charcoal = 1)

/datum/chemical_reaction/facid
name = "Fluorosulfuric acid"
Expand Down Expand Up @@ -124,5 +119,5 @@
name = "Bone Hurting Juice"
id = /datum/reagent/toxin/bonehurtingjuice
results = list(/datum/reagent/toxin/bonehurtingjuice = 5)
required_reagents = list(/datum/reagent/toxin/mutagen = 1, /datum/reagent/toxin/itching_powder = 3, /datum/reagent/consumable/milk = 1)
required_reagents = list(/datum/reagent/toxin/mutagen = 1, /datum/reagent/itching_powder = 3, /datum/reagent/consumable/milk = 1)
mix_message = "<span class='danger'>The mixture suddenly becomes clear and looks a lot like water. You feel a strong urge to drink it.</span>"