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

More bugs, to be fixed.

Browse Source
This commit is contained in:
Fermi
2019-05-25 03:00:31 +01:00
parent faf6585b69
commit 5e8a20b171
4 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
+3 -2
View File
@@ -1095,7 +1095,8 @@ And as stated earlier, this chem is hard to make, and is punishing on failure. Y
var/creatorName
var/mob/living/creator
pH = 10
OnMobMergeCheck = TRUE //Procs on_mob_add when merging into a human
DoNotSplit = TRUE
//OnMobMergeCheck = TRUE //Procs on_mob_add when merging into a human
/datum/reagent/fermi/enthrall/test
name = "MKUltraTest"
@@ -1448,7 +1449,7 @@ And as stated earlier, this chem is hard to make, and is punishing on failure. Y
N.regen_rate = -0.25//This seems really high
..()
/datum/reagent/fermi/naninte_b_gone/overdose_start(mob/living/carbon/C)
/datum/reagent/fermi/naninte_b_gone/overdose_process(mob/living/carbon/C)
//var/component/nanites/N = M.GetComponent(/datum/component/nanites)
GET_COMPONENT_FROM(N, /datum/component/nanites, C)
if(isnull(N))
modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
+5 -6
View File
@@ -14,7 +14,7 @@
//Called when temperature is above a certain threshold
//....Is this too much?
/datum/chemical_reaction/fermi/proc/FermiExplode(datum/reagents, var/atom/my_atom, volume, temp, pH, Exploding = FALSE) //You can get holder by reagents.holder WHY DID I LEARN THIS NOW???
//var/Svol = volume
message_admins("Fermi explosion at [T], with a temperature of [temp], pH of [pH], Impurity tot of [ImpureTot], containing [my_atom.reagents.reagent_list]")
if (Exploding == TRUE)
return
if(!pH)//Dunno how things got here without a pH.
@@ -55,17 +55,16 @@
new /obj/effect/hotspot(turf)
//volume /= 5
if(!ImpureTot == 0) //If impure, v.small emp
ImpureTot *= volume
empulse(T, volume/10, ImpureTot/10, 1)
if (pH > 10) //if alkaline, small explosion.
var/datum/effect_system/reagents_explosion/e = new()
e.set_up(round((volume/30)*(pH-9)), T, 0, 0)
e.start()
pHmod = 1.5
message_admins("Fermi explosion at [T], with a temperature of [temp], pH of [pH], Impurity tot of [ImpureTot], containing [my_atom.reagents.reagent_list]")
if(!ImpureTot == 0) //If impure, v.small emp
ImpureTot *= volume
empulse(T, volume/10, ImpureTot/10, 1)
my_atom.reagents.clear_reagents()
return