Merge pull request #10412 from Heroman3003/grand-theft-gender

Adds gender TF chemicals + Spontaneous TF pref
This commit is contained in:
Aronai Sieyes
2021-05-30 19:00:16 -04:00
committed by GitHub
10 changed files with 175 additions and 15 deletions
@@ -47,6 +47,58 @@
s.start()
holder.clear_reagents()
///////////////////////////////////////////////////////////////////////////////////
/// TF chemicals
/decl/chemical_reaction/instant/amorphorovir
name = "Amorphorovir"
id = "amorphorovir"
result = "amorphorovir"
required_reagents = list("cryptobiolin" = 30, "biomass" = 30, "hyperzine" = 20)
catalysts = list("phoron" = 5)
result_amount = 1
/decl/chemical_reaction/instant/androrovir
name = "Androrovir"
id = "androrovir"
result = "androrovir"
required_reagents = list("amorphorovir" = 1, "bicaridine" = 20, "iron" = 20, "ethanol" = 20)
result_amount = 1
/decl/chemical_reaction/instant/gynorovir
name = "Gynorovir"
id = "gynorovir"
result = "gynorovir"
required_reagents = list("amorphorovir" = 1, "inaprovaline" = 20, "silicon" = 20, "sugar" = 20)
result_amount = 1
/decl/chemical_reaction/instant/androgynorovir
name = "Androgynorovir"
id = "androgynorovir"
result = "androgynorovir"
required_reagents = list("amorphorovir" = 1, "anti_toxin" = 20, "fluorine" = 20, "tungsten" = 20)
result_amount = 1
/decl/chemical_reaction/instant/androrovir_bootleg
name = "Bootleg Androrovir"
id = "androrovir_bootleg"
result = "androrovir"
required_reagents = list("amorphorovir" = 1, "protein" = 10, "capsaicin" = 10)
result_amount = 1
/decl/chemical_reaction/instant/gynorovir_bootleg
name = "Bootleg Gynorovir"
id = "gynorovir_bootleg"
result = "gynorovir"
required_reagents = list("amorphorovir" = 1, "soymilk" = 10, "sugar" = 10)
result_amount = 1
/decl/chemical_reaction/instant/androgynorovir_bootleg
name = "Bootleg Androgynorovir"
id = "androgynorovir_bootleg"
result = "androgynorovir"
required_reagents = list("amorphorovir" = 1, "cola" = 10, "berryjuice" = 10)
result_amount = 1
///////////////////////////////////////////////////////////////////////////////////
/// Miscellaneous Reactions
@@ -85,7 +137,7 @@
required_reagents = list("water" = 1)
catalysts = list("fluorine" = 10)
result_amount = 1
/decl/chemical_reaction/instant/firefightingfoamqol //Please don't abuse this and make us remove it. Seriously.
name = "Firefighting Foam EZ"
id = "firefighting foam ez"
@@ -49,6 +49,10 @@
name = "vial (hyronalin)"
prefill = list("hyronalin" = 30)
/obj/item/weapon/reagent_containers/glass/beaker/vial/amorphorovir
name = "vial (amorphorovir)"
prefill = list("amorphorovir" = 1)
/obj/item/weapon/reagent_containers/glass/beaker/measuring_cup
name = "measuring cup"
desc = "A measuring cup."
@@ -6,6 +6,8 @@
color = "#13BC5E"
/datum/reagent/advmutationtoxin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(!(M.allow_spontaneous_tf))
return
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.species.name != "Promethean")
@@ -119,3 +121,16 @@
if(nif.stat == NIF_TEMPFAIL)
nif.stat = NIF_INSTALLING
nif.durability = min(nif.durability + removed*0.1, initial(nif.durability))
//Special toxins for solargrubs
/datum/reagent/grubshock
name = "200 V" //in other words a painful shock
id = "shockchem"
description = "A liquid that quickly dissapates to deliver a painful shock."
reagent_state = LIQUID
color = "#E4EC2F"
metabolism = 2.50
var/power = 9
/datum/reagent/grubshock/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
M.take_organ_damage(0, removed * power * 0.2)
+68 -10
View File
@@ -117,16 +117,74 @@
P.absorbed = 0
M.visible_message("<font color='green'><b>Something spills into [M]'s [lowertext(B.name)]!</b></font>")
//Special toxins for solargrubs
////////////////////////// TF Drugs //////////////////////////
/datum/reagent/grubshock
name = "200 V" //in other words a painful shock
id = "shockchem"
description = "A liquid that quickly dissapates to deliver a painful shock."
/datum/reagent/amorphorovir
name = "Amorphorovir"
id = "amorphorovir"
description = "A base medical concoction, capable of rapidly altering genetic and physical structure of the body. Requires extra processing to allow for a targeted transformation."
reagent_state = LIQUID
color = "#E4EC2F"
metabolism = 2.50
var/power = 9
color = "#AAAAAA"
/datum/reagent/grubshock/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
M.take_organ_damage(0, removed * power * 0.2)
/datum/reagent/androrovir
name = "Androrovir"
id = "androrovir"
description = "A medical concoction, capable of rapidly altering genetic and physical structure of the body. This one seems to realign the target's gender to be male."
reagent_state = LIQUID
color = "#00BBFF"
/datum/reagent/androrovir/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(!(M.allow_spontaneous_tf))
return
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(M.reagents.has_reagent("gynorovir") || M.reagents.has_reagent("androgynorovir"))
H.Confuse(1)
else
if(!(H.gender == MALE))
H.set_gender(MALE)
H.change_gender_identity(MALE)
H.visible_message("<span class='notice'>[H] suddenly twitches as some of their features seem to contort and reshape, adjusting... In the end, it seems they are now male.</span>",
"<span class='warning'>Your body suddenly contorts, feeling very different in various ways... By the time the rushing feeling is over it seems you just became male.</span>")
/datum/reagent/gynorovir
name = "Gynorovir"
id = "gynorovir"
description = "A medical concoction, capable of rapidly altering genetic and physical structure of the body. This one seems to realign the target's gender to be female."
reagent_state = LIQUID
color = "#FF00AA"
/datum/reagent/gynorovir/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(!(M.allow_spontaneous_tf))
return
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(M.reagents.has_reagent("androrovir") || M.reagents.has_reagent("androgynorovir"))
H.Confuse(1)
else
if(!(H.gender == FEMALE))
H.set_gender(FEMALE)
H.change_gender_identity(FEMALE)
H.visible_message("<span class='notice'>[H] suddenly twitches as some of their features seem to contort and reshape, adjusting... In the end, it seems they are now female.</span>",
"<span class='warning'>Your body suddenly contorts, feeling very different in various ways... By the time the rushing feeling is over it seems you just became female.</span>")
/datum/reagent/androgynorovir
name = "Androgynorovir"
id = "androgynorovir"
description = "A medical concoction, capable of rapidly altering genetic and physical structure of the body. This one seems to realign the target's gender to be mixed."
reagent_state = LIQUID
color = "#6600FF"
/datum/reagent/androgynorovir/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(!(M.allow_spontaneous_tf))
return
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(M.reagents.has_reagent("gynorovir") || M.reagents.has_reagent("androrovir"))
H.Confuse(1)
else
if(!(H.gender == PLURAL))
H.set_gender(PLURAL)
H.change_gender_identity(PLURAL)
H.visible_message("<span class='notice'>[H] suddenly twitches as some of their features seem to contort and reshape, adjusting... In the end, it seems they are now of mixed gender.</span>",
"<span class='warning'>Your body suddenly contorts, feeling very different in various ways... By the time the rushing feeling is over it seems you just became of mixed gender.</span>")