Skip to content

Commit

Permalink
[MIRROR] Removing unsynthesisable reagents from rolling in secret rec…
Browse files Browse the repository at this point in the history
…ipes. (#1612) (#2557)

* Removing unsynthesisable reagents from rolling in secret recipes. (#82186)

## About The Pull Request
Removed Musiver, Godblood, Synaphydramine, Hollow water and unholy water
from rolling in secret recipes. If there is any other reagents that can
appear in secret recipes please tell me, I will add the fix to this PR.
Closes tgstation/tgstation#82140
## Why It's Good For The Game
Some reagents can't be synthesised or gotten by normal means and should
not appear in secret recipes as a required reagent
## Changelog
:cl:
fix: Musiver, Godblood, Synaphydramine, Hollow water and unholy water
will no longer show up in secret recipes
/:cl:

* Removing unsynthesisable reagents from rolling in secret recipes.

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: Sadboysuss <[email protected]>
  • Loading branch information
3 people authored Mar 25, 2024
1 parent 690b86d commit c51ad39
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@
overdose_threshold = 25
ph = 9.1
var/datum/brain_trauma/mild/muscle_weakness/trauma
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE

/datum/reagent/medicine/c2/musiver/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
description = "Reduces drowsiness, hallucinations, and Histamine from body."
color = "#EC536D" // rgb: 236, 83, 109
ph = 5.2
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE

/datum/reagent/medicine/synaphydramine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
Expand Down
6 changes: 3 additions & 3 deletions code/modules/reagents/chemistry/reagents/other_reagents.dm
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@
description = "An ubiquitous chemical substance that is composed of hydrogen and oxygen, but it looks kinda hollow."
color = "#88878777"
taste_description = "emptyiness"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE

/datum/reagent/hydrogen_peroxide
name = "Hydrogen Peroxide"
Expand Down Expand Up @@ -490,7 +490,7 @@
metabolization_rate = 2.5 * REAGENTS_METABOLISM //0.5u/second
penetrates_skin = TOUCH|VAPOR
ph = 6.5
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE

/datum/reagent/fuel/unholywater/on_mob_metabolize(mob/living/affected_mob)
. = ..()
Expand Down Expand Up @@ -559,7 +559,7 @@
name = "Godblood"
description = "Slowly heals all damage types. Has a rather high overdose threshold. Glows with mysterious power."
overdose_threshold = 150
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE

///Used for clownery
/datum/reagent/lube
Expand Down

0 comments on commit c51ad39

Please sign in to comment.