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

Jump to bottom

Comments out mutation toxins #133

Merged
merged 3 commits into from
May 1, 2024
Merged

Comments out mutation toxins #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00f7c03
Comments out mutation toxins
xPokee Apr 27, 2024
3700667
missed some things
xPokee Apr 27, 2024
ab99a0e
Merge branch 'master' into furry-toxin-removals
xTrainx Apr 30, 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
4 changes: 2 additions & 2 deletions code/modules/reagents/chemistry/reagents/other_reagents.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@
to_chat(H, span_danger("The pain vanishes suddenly. You feel no different."))


/datum/reagent/mutationtoxin/classic //The one from plasma on green slimes
/*/datum/reagent/mutationtoxin/classic //The one from plasma on green slimes
name = "Mutation Toxin"
description = "A corruptive toxin."
color = "#13BC5E" // rgb: 19, 188, 94
Expand Down Expand Up @@ -923,7 +923,7 @@
H.set_species(species_type)
H.reagents.del_reagent(type)
to_chat(H, span_warning("You've become \a jellyperson!"))

*/

/datum/reagent/mulligan
name = "Mulligan Toxin"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/reagents/chemistry/recipes/others.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@
name = "Mulligan"
id = "mulligan"
results = list(/datum/reagent/mulligan = 1)
required_reagents = list(/datum/reagent/slime_toxin = 1, /datum/reagent/toxin/mutagen = 1)
required_reagents = list(/datum/reagent/mutationtoxin = 1, /datum/reagent/toxin/mutagen = 1)


/datum/chemical_reaction/fermis_plush
Expand Down
8 changes: 4 additions & 4 deletions code/modules/reagents/chemistry/recipes/slime_extracts.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@

//Green

/datum/chemical_reaction/slime/slimemutate
/* /datum/chemical_reaction/slime/slimemutate
name = "Mutation Toxin"
id = /datum/reagent/slime_toxin
results = list(/datum/reagent/slime_toxin = 1)
required_reagents = list(/datum/reagent/toxin/plasma = 1)
required_other = TRUE
required_container = /obj/item/slime_extract/green
required_container = /obj/item/slime_extract/green */

/datum/chemical_reaction/slime/slimehuman
name = "Human Mutation Toxin"
Expand All @@ -66,7 +66,7 @@
required_other = TRUE
required_container = /obj/item/slime_extract/green

/datum/chemical_reaction/slime/slimelizard
/* /datum/chemical_reaction/slime/slimelizard
name = "Lizard Mutation Toxin"
id = /datum/reagent/mutationtoxin/lizard
results = list(/datum/reagent/mutationtoxin/lizard = 1)
Expand All @@ -80,7 +80,7 @@
results = list(/datum/reagent/mutationtoxin/mammal = 1)
required_reagents = list(/datum/reagent/water = 1)
required_other = TRUE
required_container = /obj/item/slime_extract/green
required_container = /obj/item/slime_extract/green */


//Metal
Expand Down
Loading