Skip to content

Commit

Permalink
Kills Mutation Toxin (#2659)
Browse files Browse the repository at this point in the history 
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Kills mutation toxin. Simple as.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
1. Xenobio content. Ew.
2. I've only seen this used for griefing or accidentally.
3. Admins already have a dedicated species change button if need be.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
del: mutation toxin
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
@GenericDM
GenericDM authored Feb 2, 2024
1 parent 197fb53 commit e19bc3b
Show file tree
Hide file tree
Showing 8 changed files with 3 additions and 258 deletions.
15 changes: 0 additions & 15 deletions code/modules/mob/living/carbon/human/species_types/spider.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,18 +228,3 @@ GLOBAL_LIST_INIT(spider_last, world.file2list("strings/names/spider_last.txt"))
A.forceMove(C)
H.visible_message("<span class='danger'>[H] wraps [A] into a cocoon!</span>")
return

/datum/reagent/mutationtoxin/arachnid
name = "Arachnid Mutation Toxin"
description = "A glowing toxin."
color = "#5EFF3B" //RGB: 94, 255, 59
race = /datum/species/spider
process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs
taste_description = "silk"

/datum/chemical_reaction/mutationtoxin/arachnid
results = list(/datum/reagent/mutationtoxin/arachnid = 1)
required_reagents = list(
/datum/reagent/mutationtoxin/unstable = 1,
/datum/reagent/toxin/heparin = 10
)
1 change: 0 additions & 1 deletion code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -885,7 +885,6 @@
)
if("Shadow")
mob_species = /datum/species/shadow
r_pocket = /obj/item/reagent_containers/pill/shadowtoxin
neck = /obj/item/clothing/accessory/medal/plasma/nobel_science
uniform = /obj/item/clothing/under/color/black
shoes = /obj/item/clothing/shoes/sneakers/black
Expand Down
223 changes: 0 additions & 223 deletions code/modules/reagents/chemistry/reagents/other_reagents.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -505,221 +505,6 @@
..()
return

#define MUT_MSG_IMMEDIATE 1
#define MUT_MSG_EXTENDED 2
#define MUT_MSG_ABOUT2TURN 3

/datum/reagent/mutationtoxin
name = "Stable Mutation Toxin"
description = "A humanizing toxin."
color = "#5EFF3B" //RGB: 94, 255, 59
metabolization_rate = 0.2 //metabolizes to prevent micro-dosage
taste_description = "slime"
var/race = /datum/species/human
var/list/mutationtexts = list( "You don't feel very well." = MUT_MSG_IMMEDIATE,
"Your skin feels a bit abnormal." = MUT_MSG_IMMEDIATE,
"Your limbs begin to take on a different shape." = MUT_MSG_EXTENDED,
"Your appendages begin morphing." = MUT_MSG_EXTENDED,
"You feel as though you're about to change at any moment!" = MUT_MSG_ABOUT2TURN)
var/cycles_to_turn = 20 //the current_cycle threshold / iterations needed before one can transform
process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs

/datum/reagent/mutationtoxin/on_mob_life(mob/living/carbon/human/H)
. = TRUE
if(!istype(H))
return
if(!(H.dna?.species) || !(H.mob_biotypes & MOB_ORGANIC))
return
var/datum/species/mutation = pick(race) //I honestly feel extremely uncomfortable. I do not like the fact that this works.
var/current_species = H.dna.species.type
if(mutation && mutation != current_species)
H.set_species(mutation)
else
to_chat(H, "<span class='danger'>The pain vanishes suddenly. You feel no different.</span>")
H.reagents.del_reagent(type)

if(prob(10))
var/list/pick_ur_fav = list()
var/filter = NONE
if(current_cycle <= (cycles_to_turn*0.3))
filter = MUT_MSG_IMMEDIATE
else if(current_cycle <= (cycles_to_turn*0.8))
filter = MUT_MSG_EXTENDED
else
filter = MUT_MSG_ABOUT2TURN

for(var/i in mutationtexts)
if(mutationtexts[i] == filter)
pick_ur_fav += i
to_chat(H, "<span class='warning'>[pick(pick_ur_fav)]</span>")

if(current_cycle >= cycles_to_turn)
var/datum/species/species_type = race
H.set_species(species_type)
H.reagents.del_reagent(type)
to_chat(H, "<span class='warning'>You've become \a [lowertext(initial(species_type.name))]!</span>")
..()

/datum/reagent/mutationtoxin/classic //The one from plasma on green slimes
name = "Mutation Toxin"
description = "A corruptive toxin."
color = "#13BC5E" // rgb: 19, 188, 94
race = /datum/species/jelly/slime
process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs

/datum/reagent/mutationtoxin/unstable
name = "Unstable Mutation Toxin"
description = "A mostly safe mutation toxin."
color = "#13BC5E" // rgb: 19, 188, 94
race = list(/datum/species/jelly/slime,
/datum/species/human,
/datum/species/lizard,
/datum/species/fly,
/datum/species/moth,
/datum/species/pod,
/datum/species/jelly,
/datum/species/abductor
)
process_flags = ORGANIC | SYNTHETIC

/datum/reagent/mutationtoxin/lizard
name = "Sarathi Mutation Toxin"
description = "A lizarding toxin."
color = "#5EFF3B" //RGB: 94, 255, 59
race = /datum/species/lizard
process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs
taste_description = "dragon's breath but not as cool"

/datum/reagent/mutationtoxin/fly
name = "Fly Mutation Toxin"
description = "An insectifying toxin."
color = "#5EFF3B" //RGB: 94, 255, 59
race = /datum/species/fly
process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs
taste_description = "trash"

/datum/reagent/mutationtoxin/moth
name = "Moth Mutation Toxin"
description = "A glowing toxin."
color = "#5EFF3B" //RGB: 94, 255, 59
race = /datum/species/moth
process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs
taste_description = "clothing"

/datum/reagent/mutationtoxin/pod
name = "Podperson Mutation Toxin"
description = "A vegetalizing toxin."
color = "#5EFF3B" //RGB: 94, 255, 59
race = /datum/species/pod
process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs
taste_description = "flowers"

/datum/reagent/mutationtoxin/jelly
name = "Imperfect Mutation Toxin"
description = "A jellyfying toxin."
color = "#5EFF3B" //RGB: 94, 255, 59
race = /datum/species/jelly
process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs
taste_description = "grandma's gelatin"

/datum/reagent/mutationtoxin/jelly/on_mob_life(mob/living/carbon/human/H)
if(isjellyperson(H))
to_chat(H, "<span class='warning'>Your jelly shifts and morphs, turning you into another subspecies!</span>")
var/species_type = pick(subtypesof(/datum/species/jelly))
H.set_species(species_type)
H.reagents.del_reagent(type)
return TRUE
if(current_cycle >= cycles_to_turn) //overwrite since we want subtypes of jelly
var/datum/species/species_type = pick(subtypesof(race))
H.set_species(species_type)
H.reagents.del_reagent(type)
to_chat(H, "<span class='warning'>You've become \a [initial(species_type.name)]!</span>")
return TRUE
return ..()

/datum/reagent/mutationtoxin/abductor
name = "Abductor Mutation Toxin"
description = "An alien toxin."
color = "#5EFF3B" //RGB: 94, 255, 59
race = /datum/species/abductor
process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs
taste_description = "something out of this world... no, universe!"

/datum/reagent/mutationtoxin/android
name = "Android Mutation Toxin"
description = "A robotic toxin."
color = "#5EFF3B" //RGB: 94, 255, 59
race = /datum/species/android
process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs
taste_description = "circuitry and steel"

/datum/reagent/mutationtoxin/ipc
name = "IPC Mutation Toxin"
description = "An integrated positronic toxin."
color = "#5EFF3B" //RGB: 94, 255, 59
race = /datum/species/ipc
process_flags = ORGANIC | SYNTHETIC

/datum/reagent/mutationtoxin/kepi //crying
name = "Kepori Mutation Toxin"
description = "A feathery toxin."
race = /datum/species/kepori
process_flags = ORGANIC | SYNTHETIC
taste_description = "a familiar white meat"

//BLACKLISTED RACES
/datum/reagent/mutationtoxin/skeleton
name = "Skeleton Mutation Toxin"
description = "A scary toxin."
color = "#5EFF3B" //RGB: 94, 255, 59
race = /datum/species/skeleton
process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs
taste_description = "milk... and lots of it"

/datum/reagent/mutationtoxin/zombie
name = "Zombie Mutation Toxin"
description = "An undead toxin."
color = "#5EFF3B" //RGB: 94, 255, 59
race = /datum/species/zombie //Not the infectious kind. The days of xenobio zombie outbreaks are long past.
process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs
taste_description = "brai...nothing in particular"

/datum/reagent/mutationtoxin/goofzombie
name = "Krokodil Zombie Mutation Toxin"
description = "An undead toxin... kinda..."
color = "#5EFF3B" //RGB: 94, 255, 59
race = /datum/species/human/krokodil_addict //Not the infectious kind. The days of xenobio zombie outbreaks are long past.
process_flags = ORGANIC | SYNTHETIC

/datum/reagent/mutationtoxin/ash
name = "Ash Mutation Toxin"
description = "An ashen toxin."
color = "#5EFF3B" //RGB: 94, 255, 59
race = /datum/species/lizard/ashwalker
process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs
taste_description = "savagery"

//DANGEROUS RACES
/datum/reagent/mutationtoxin/shadow
name = "Shadow Mutation Toxin"
description = "A dark toxin."
color = "#5EFF3B" //RGB: 94, 255, 59
race = /datum/species/shadow
process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs
taste_description = "the night"

/datum/reagent/mutationtoxin/plasma
name = "Plasma Mutation Toxin"
description = "A plasma-based toxin."
color = "#5EFF3B" //RGB: 94, 255, 59
race = /datum/species/plasmaman
process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs
taste_description = "plasma"

#undef MUT_MSG_IMMEDIATE
#undef MUT_MSG_EXTENDED
#undef MUT_MSG_ABOUT2TURN

/datum/reagent/mulligan
name = "Mulligan Toxin"
description = "This toxin will rapidly change the DNA of human beings. Commonly used by Syndicate spies and assassins in need of an emergency ID change."
Expand Down Expand Up @@ -2765,14 +2550,6 @@
if(prob(min(current_cycle/4, 10)))
M.adjustOrganLoss(ORGAN_SLOT_STOMACH,3*REM)

/datum/reagent/mutationtoxin/kobold
name = "Kobold Mutation Toxin"
description = "An ashen toxin. Something about this seems lesser."
color = "#5EFF3B" //RGB: 94, 255, 59
race = /datum/species/lizard/ashwalker/kobold
process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs
taste_description = "short savagery"

/datum/reagent/polar_bear_fur //used for icewine crafting
name = "Polar Bear Fur"
description = "Fur obtained from griding up a polar bears hide"
Expand Down
6 changes: 0 additions & 6 deletions code/modules/reagents/chemistry/recipes/others.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,6 @@
required_reagents = list(/datum/reagent/ammonia = 2, /datum/reagent/nitrogen = 1, /datum/reagent/oxygen = 2)
required_temp = 525

//Technically a mutation toxin
/datum/chemical_reaction/mulligan
results = list(/datum/reagent/mulligan = 1)
required_reagents = list(/datum/reagent/mutationtoxin/jelly = 1, /datum/reagent/toxin/mutagen = 1)


////////////////////////////////// VIROLOGY //////////////////////////////////////////

/datum/chemical_reaction/virus_food
Expand Down
4 changes: 2 additions & 2 deletions code/modules/reagents/chemistry/recipes/slime_extracts.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@

//Green
/datum/chemical_reaction/slime/slimemutate
results = list(/datum/reagent/mutationtoxin/jelly = 1)
results = list(/datum/reagent/consumable/berryjuice = 1) // Removal of mutation toxins. This used to be jellyperson toxin, but is now just jelly.
required_reagents = list(/datum/reagent/toxin/plasma = 1)
required_other = TRUE
required_container = /obj/item/slime_extract/green

/datum/chemical_reaction/slime/unstabletoxin
results = list(/datum/reagent/mutationtoxin/unstable = 1)
results = list(/datum/reagent/toxin/mutagen = 1) // Removal of mutation toxins. This used to be unstable toxin, but is now unstable mutagen.
required_reagents = list(/datum/reagent/uranium/radium = 1)
required_other = TRUE
required_container = /obj/item/slime_extract/green
Expand Down
8 changes: 0 additions & 8 deletions code/modules/reagents/reagent_containers/pill.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,14 +182,6 @@
icon_state = "pill22"
rename_with_volume = TRUE

///////////////////////////////////////// this pill is used only in a legion mob drop
/obj/item/reagent_containers/pill/shadowtoxin
name = "black pill"
desc = "I wouldn't eat this if I were you."
icon_state = "pill9"
color = "#454545"
list_reagents = list(/datum/reagent/mutationtoxin/shadow = 5)

///////////////////////////////////////// Psychologist inventory pills
/obj/item/reagent_containers/pill/happinesspsych
name = "mood stabilizer pill"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/research/experimentor.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@
ejectItem(TRUE)
else if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
visible_message("<span class='danger'>[src]'s chemical chamber has sprung a leak!</span>")
chosenchem = pick(/datum/reagent/mutationtoxin/classic,/datum/reagent/nanomachines,/datum/reagent/toxin/acid)
chosenchem = pick(/datum/reagent/nanomachines,/datum/reagent/toxin/acid)
var/datum/reagents/R = new/datum/reagents(50)
R.my_atom = src
R.add_reagent(chosenchem , 50)
Expand Down
2 changes: 0 additions & 2 deletions code/modules/research/xenobiology/crossbreeding/regenerative.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,8 +265,6 @@ Regenerative extracts:
target.visible_message("<span class='warning'>The [target] suddenly changes color!</span>")
var/mob/living/simple_animal/slime/S = target
S.random_colour()
if(isjellyperson(target))
target.reagents.add_reagent(/datum/reagent/mutationtoxin/jelly,5)
organ_loss += 17


Expand Down

0 comments on commit e19bc3b

Please sign in to comment.