shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removing slimejelly req from feedback.

Browse Source
This commit is contained in:
Fermi
2019-07-04 23:24:18 +01:00
parent bccd3e42b6
commit ad37ec08b2
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/examine.dm
+7
View File
@@ -304,6 +304,13 @@
msg += "</span>" msg += "</span>"
var/obj/item/organ/vocal_cords/Vc = getorganslot(ORGAN_SLOT_VOICE)
if(Vc)
if (Vc.name == "Velvet chords")
if(user.client?.prefs.lewdchem)
msg += "<span class='velvet'><i>You feel your chords resonate looking at them.</i></span>"
if(!appears_dead) if(!appears_dead)
if(stat == UNCONSCIOUS) if(stat == UNCONSCIOUS)
msg += "[t_He] [t_is]n't responding to anything around [t_him] and seem[p_s()] to be asleep.\n" msg += "[t_He] [t_is]n't responding to anything around [t_him] and seem[p_s()] to be asleep.\n"
code/modules/reagents/chemistry/holder.dm
+3 -1
View File
@@ -494,6 +494,8 @@
//Standard reaction mechanics: //Standard reaction mechanics:
else else
if (C.FermiChem == TRUE)//Just to make sure
return 0
for(var/B in cached_required_reagents) // for(var/B in cached_required_reagents) //
multiplier = min(multiplier, round((get_reagent_amount(B) / cached_required_reagents[B]), 0.01)) multiplier = min(multiplier, round((get_reagent_amount(B) / cached_required_reagents[B]), 0.01))
@@ -810,7 +812,7 @@
if(!isnum(amount) || !amount) if(!isnum(amount) || !amount)
return FALSE return FALSE
if(amount <= 0) if(amount <= 0.00)
return FALSE return FALSE
var/datum/reagent/D = GLOB.chemical_reagents_list[reagent] var/datum/reagent/D = GLOB.chemical_reagents_list[reagent]
modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
+4 -4
View File
@@ -103,7 +103,7 @@
name = "Synthetic-derived growth factor" name = "Synthetic-derived growth factor"
id = "SDGF" id = "SDGF"
results = list("SDGF" = 0.3) results = list("SDGF" = 0.3)
required_reagents = list("stable_plasma" = 0.15, "slimejelly" = 0.15, "uranium" = 0.15, "synthflesh" = 0.15, "blood" = 0.15) required_reagents = list("stable_plasma" = 0.15, "clonexadone" = 0.15, "uranium" = 0.15, "synthflesh" = 0.15)
mix_message = "the reaction gives off a blorble!" mix_message = "the reaction gives off a blorble!"
required_temp = 1 required_temp = 1
//FermiChem vars: //FermiChem vars:
@@ -318,7 +318,7 @@
name = "Hat growth serum" name = "Hat growth serum"
id = "hatmium" id = "hatmium"
results = list("hatmium" = 0.5) results = list("hatmium" = 0.5)
required_reagents = list("whiskey" = 0.1, "nutriment" = 0.3, "cooking_oil" = 0.2, "iron" = 0.1, "gold" = 0.3) required_reagents = list("ethanol" = 0.1, "nutriment" = 0.3, "cooking_oil" = 0.2, "iron" = 0.1, "gold" = 0.3)
//mix_message = "" //mix_message = ""
//FermiChem vars: //FermiChem vars:
OptimalTempMin = 500 OptimalTempMin = 500
@@ -456,8 +456,8 @@
name = "secretcatchem" name = "secretcatchem"
id = "secretcatchem" id = "secretcatchem"
results = list("secretcatchem" = 0.5) results = list("secretcatchem" = 0.5)
required_reagents = list("stable_plasma" = 0.1, "sugar" = 0.1, "cream" = 0.1, "blood" = 0.1, "slimejelly" = 0.1)//Yes this will make a plushie if you don't lucky guess. It'll eat all your reagents too. required_reagents = list("stable_plasma" = 0.1, "sugar" = 0.1, "cream" = 0.1, "clonexadone" = 0.1)//Yes this will make a plushie if you don't lucky guess. It'll eat all your reagents too.
required_catalysts = list("felinidmutationtoxin" = 1) required_catalysts = list("SDGF" = 1)
required_temp = 600 required_temp = 600
mix_message = "the reaction gives off a meow!" mix_message = "the reaction gives off a meow!"
mix_sound = "modular_citadel/sound/voice/merowr.ogg" mix_sound = "modular_citadel/sound/voice/merowr.ogg"