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

Should be the last fix.

Browse Source
This commit is contained in:
Fermi
2019-05-27 20:52:05 +01:00
parent 79a7b6b45b
commit 5771fd9442
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/friendly/cat.dm
+6 -4
View File
@@ -323,7 +323,7 @@
id = "secretcatchem"
results = list("secretcatchem" = 0.5)
required_reagents = list("stable_plasma" = 0.1, "sugar" = 0.1, "cream" = 0.1, "blood" = 0.1, "slimejelly" = 0.1)
required_catalysts = list("felinidmutationtoxin" = 5)
//required_catalysts = list("water" = 5)
required_temp = 600
mix_message = "the reaction gives off a meow!"
mix_sound = "modular_citadel/sound/voice/merowr.ogg"
@@ -348,8 +348,8 @@
//rand doesn't seem to work with n^-e
//message_admins("randomizing reaction")
OptimalTempMin += rand(-100, 100)
OptimalTempMax += (OptimalpHMin+rand(0, 200))
ExplodeTemp += (OptimalpHMax+rand(0, 200))
OptimalTempMax += (OptimalTempMin+rand(0, 200))
ExplodeTemp += (OptimalTempMaxx+rand(0, 200))
OptimalpHMin += rand(1, 10)
OptimalpHMax += (OptimalpHMin + rand(0, 5))
ReactpHLim += rand(-2, 2)
@@ -361,7 +361,9 @@
PurityMin += (rand(-1, 1)/10)
var/additions = list("aluminum", "silver", "gold", "plasma", "silicon", "bluespace")
//var/chosenA = pick(additions)
required_reagents += list("[pick(additions)]", rand(0.1, 1))
var/cataly = list ("felinidmutationtoxin", "uranium", "bluespace")
required_reagents[pick(additions)] = rand(0.1, 1))
required_catalysts = list("[pick(cataly)]" = rand(0.1, 1))
/datum/chemical_reaction/fermi/secretcatchem/FermiFinish(datum/reagents/holder, var/atom/my_atom)//Strange how this doesn't work but the other does.
message_admins("Someone found the hidden reaction. Amazing!! Please tell Fermis!!")
modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
+8 -8
View File
@@ -428,7 +428,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
to_chat(M, "<span class='notice'>Your body splits away from the cell clone of yourself, leaving you with a drained and hollow feeling inside.</span>")
M.apply_status_effect(/datum/status_effect/chem/SGDF)
if(87 to INFINITY)
M.reagents.remove_reagent(src.id, 1000)//removes SGDF on completion. Has to do it this way because of how i've coded it. If some madlab gets over 1k of SDGF, they can have the clone healing.
M.reagents.remove_reagent(src.id, src.volume)//removes SGDF on completion. Has to do it this way because of how i've coded it. If some madlab gets over 1k of SDGF, they can have the clone healing.
..()
@@ -609,7 +609,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
M.Knockdown(50)
M.Stun(50)
B.throw_at(T2, 8, 1)
M.reagents.remove_reagent(src.id, 1000)
M.reagents.remove_reagent(src.id, src.volume)
return
var/mob/living/carbon/human/H = M
H.genital_override = TRUE
@@ -733,7 +733,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
M.Knockdown(50)
M.Stun(50)
P.throw_at(T2, 8, 1)
M.reagents.remove_reagent(src.id, 1000)
M.reagents.remove_reagent(src.id, src.volume)
return
var/mob/living/carbon/human/H = M
H.genital_override = TRUE
@@ -1507,7 +1507,7 @@ And as stated earlier, this chem is hard to make, and is punishing on failure. Y
if(LAZYLEN(holder.reagent_list) == 1)
return
else
holder.remove_reagent("fermiTest", 1000)//Avoiding recurrsion
holder.remove_reagent("fermiTest", src.volume)//Avoiding recurrsion
message_admins("FermiTest addition!")
var/location = get_turf(holder.my_atom)
if(purity < 0.34 || purity == 1)
@@ -1528,7 +1528,7 @@ And as stated earlier, this chem is hard to make, and is punishing on failure. Y
Ferm.on_reaction(holder, reagent.volume)
for(var/mob/M in viewers(8, location))
to_chat(M, "<span class='danger'>The solution reacts dramatically, with a meow!</span>")
playsound(get_turf(M), 'modular_citadel/sound/voice/merowr.ogg', 50, 1, -1)
playsound(get_turf(M), 'modular_citadel/sound/voice/merowr.ogg', 50, 1)
holder.clear_reagents()
/datum/reagent/fermi/fermiTox
@@ -1570,8 +1570,8 @@ And as stated earlier, this chem is hard to make, and is punishing on failure. Y
var/list/seen = viewers(5, get_turf(holder))
for(var/mob/M in seen)
to_chat(M, "<span class='warning'>The beaker fizzes as the pH changes!</b></span>")
playsound(get_turf(holder), 'sound/FermiChem/bufferadd.ogg', 50, 1, -1)
holder.remove_reagent(src.id, 1000)
playsound(get_turf(holder), 'sound/FermiChem/bufferadd.ogg', 50, 1)
holder.remove_reagent(src.id, src.volume)
..()
/datum/reagent/fermi/fermiBBuffer
@@ -1599,5 +1599,5 @@ And as stated earlier, this chem is hard to make, and is punishing on failure. Y
for(var/mob/M in seen)
to_chat(M, "<span class='warning'>The beaker froths as the pH changes!</b></span>")
playsound(get_turf(holder.my_atom), 'sound/FermiChem/bufferadd.ogg', 50, 1)
holder.remove_reagent(src.id, 1000)
holder.remove_reagent(src.id, src.volume)
..()