mirror of
https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git
synced 2025-12-09 16:07:40 +00:00
WELCOME TO PH'S HELL RIDE
This commit is contained in:
@@ -126,10 +126,11 @@
|
|||||||
|
|
||||||
/datum/reagents/proc/remove_all(amount = 1)
|
/datum/reagents/proc/remove_all(amount = 1)
|
||||||
var/list/cached_reagents = reagent_list
|
var/list/cached_reagents = reagent_list
|
||||||
|
if((total_volume - amount) <= 0)//Because this can result in 0, I don't want it to crash.
|
||||||
|
pH = 7
|
||||||
if(total_volume > 0)
|
if(total_volume > 0)
|
||||||
var/part = amount / total_volume
|
var/part = amount / total_volume
|
||||||
for(var/reagent in cached_reagents)
|
for(var/reagent in cached_reagents)
|
||||||
pH = 7
|
|
||||||
var/datum/reagent/R = reagent
|
var/datum/reagent/R = reagent
|
||||||
remove_reagent(R.id, R.volume * part, ignore_pH = TRUE)
|
remove_reagent(R.id, R.volume * part, ignore_pH = TRUE)
|
||||||
|
|
||||||
|
|||||||
@@ -189,10 +189,12 @@
|
|||||||
data["beakerCurrentVolume"] = beakerCurrentVolume
|
data["beakerCurrentVolume"] = beakerCurrentVolume
|
||||||
data["beakerMaxVolume"] = beaker.volume
|
data["beakerMaxVolume"] = beaker.volume
|
||||||
data["beakerTransferAmounts"] = beaker.possible_transfer_amounts
|
data["beakerTransferAmounts"] = beaker.possible_transfer_amounts
|
||||||
|
data["beakerCurrentpH"] = beaker.reagents.pH
|
||||||
else
|
else
|
||||||
data["beakerCurrentVolume"] = null
|
data["beakerCurrentVolume"] = null
|
||||||
data["beakerMaxVolume"] = null
|
data["beakerMaxVolume"] = null
|
||||||
data["beakerTransferAmounts"] = null
|
data["beakerTransferAmounts"] = null
|
||||||
|
data["beakerCurrentpH"] = null
|
||||||
|
|
||||||
var/chemicals[0]
|
var/chemicals[0]
|
||||||
var/recipes[0]
|
var/recipes[0]
|
||||||
|
|||||||
@@ -97,6 +97,7 @@
|
|||||||
data["isBeakerLoaded"] = beaker ? 1 : 0
|
data["isBeakerLoaded"] = beaker ? 1 : 0
|
||||||
|
|
||||||
data["currentTemp"] = beaker ? beaker.reagents.chem_temp : null
|
data["currentTemp"] = beaker ? beaker.reagents.chem_temp : null
|
||||||
|
data["currentpH"] = beaker ? beaker.reagents.pH : null
|
||||||
data["beakerCurrentVolume"] = beaker ? beaker.reagents.total_volume : null
|
data["beakerCurrentVolume"] = beaker ? beaker.reagents.total_volume : null
|
||||||
data["beakerMaxVolume"] = beaker ? beaker.volume : null
|
data["beakerMaxVolume"] = beaker ? beaker.volume : null
|
||||||
|
|
||||||
|
|||||||
@@ -777,6 +777,7 @@
|
|||||||
var/static/regex/custom_words = regex("new trigger|listen to me")
|
var/static/regex/custom_words = regex("new trigger|listen to me")
|
||||||
var/static/regex/custom_words_words = regex("speak|echo|shock|cum|kneel|strip|trance")//What a descriptive name!
|
var/static/regex/custom_words_words = regex("speak|echo|shock|cum|kneel|strip|trance")//What a descriptive name!
|
||||||
var/static/regex/custom_echo = regex("obsess|fills your mind|loop")
|
var/static/regex/custom_echo = regex("obsess|fills your mind|loop")
|
||||||
|
var/static/regex/instill_words = regex("feel|entice|overwhel")
|
||||||
var/static/regex/recognise_words = regex("recognise me|did you miss me?")
|
var/static/regex/recognise_words = regex("recognise me|did you miss me?")
|
||||||
var/static/regex/objective_words = regex("new objective|obey this command|unable to resist|compulsed")
|
var/static/regex/objective_words = regex("new objective|obey this command|unable to resist|compulsed")
|
||||||
var/static/regex/heal_words = regex("live|heal|survive|mend|life|pets never die")
|
var/static/regex/heal_words = regex("live|heal|survive|mend|life|pets never die")
|
||||||
@@ -1313,7 +1314,16 @@
|
|||||||
user.SetStun(0)
|
user.SetStun(0)
|
||||||
H.SetStun(0)
|
H.SetStun(0)
|
||||||
|
|
||||||
|
//INSTILL
|
||||||
|
else if((findtext(message, objective_words)))
|
||||||
|
for(var/V in listeners)
|
||||||
|
var/mob/living/carbon/human/H = V
|
||||||
|
var/datum/status_effect/chem/enthrall/E = H.has_status_effect(/datum/status_effect/chem/enthrall)
|
||||||
|
if(E.phase == 3)
|
||||||
|
var/instill = stripped_input(user, "Instill an emotion in your [(user.lewd?"Your pet":"listener")].", MAX_MESSAGE_LEN)
|
||||||
|
var/customSpan = list("Notice", "Warning", "Hypnophrase", "Love", "Velvet")
|
||||||
|
to_chat(H, "<span class='[customSpan]'><i>[instill]</i></span>")
|
||||||
|
|
||||||
//RECOGNISE
|
//RECOGNISE
|
||||||
else if((findtext(message, recognise_words)))
|
else if((findtext(message, recognise_words)))
|
||||||
for(var/V in listeners)
|
for(var/V in listeners)
|
||||||
|
|||||||
@@ -332,7 +332,7 @@
|
|||||||
if(owner.lewd)
|
if(owner.lewd)
|
||||||
to_chat(owner, "<span class='love'><i>[pick("I belong to [enthrallGender].", "[enthrallGender] knows whats best for me.", "Obedence is pleasure.", "I exist to serve [enthrallGender].", "[enthrallGender] is so dominant, it feels right to obey them.")].</i></span>")
|
to_chat(owner, "<span class='love'><i>[pick("I belong to [enthrallGender].", "[enthrallGender] knows whats best for me.", "Obedence is pleasure.", "I exist to serve [enthrallGender].", "[enthrallGender] is so dominant, it feels right to obey them.")].</i></span>")
|
||||||
if (4) //mindbroken
|
if (4) //mindbroken
|
||||||
if (mental_capacity >= 499 && (owner.getBrainLoss() <=20 || HAS_TRAIT(M, TRAIT_MINDSHIELD)) && !owner.reagents.has_reagent("MKUltra"))
|
if (mental_capacity >= 499 && (owner.getBrainLoss() <=0 || HAS_TRAIT(M, TRAIT_MINDSHIELD)) && !owner.reagents.has_reagent("MKUltra"))
|
||||||
phase = 2
|
phase = 2
|
||||||
mental_capacity = 500
|
mental_capacity = 500
|
||||||
customTriggers = list()
|
customTriggers = list()
|
||||||
@@ -369,8 +369,8 @@
|
|||||||
M.hallucination = max(0, M.hallucination - 5)
|
M.hallucination = max(0, M.hallucination - 5)
|
||||||
M.stuttering = max(0, M.stuttering - 5)
|
M.stuttering = max(0, M.stuttering - 5)
|
||||||
M.jitteriness = max(0, M.jitteriness - 5)
|
M.jitteriness = max(0, M.jitteriness - 5)
|
||||||
if(owner.getBrainLoss() >=50)
|
if(owner.getBrainLoss() >=20)
|
||||||
owner.adjustBrainLoss(-0.1)
|
owner.adjustBrainLoss(-0.2)
|
||||||
if(withdrawal == TRUE)
|
if(withdrawal == TRUE)
|
||||||
SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "EnthMissing1")
|
SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "EnthMissing1")
|
||||||
SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "EnthMissing2")
|
SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "EnthMissing2")
|
||||||
|
|||||||
@@ -250,7 +250,6 @@ Creating a chem with a low purity will make you permanently fall in love with so
|
|||||||
return
|
return
|
||||||
else
|
else
|
||||||
E.enthrallTally += 1
|
E.enthrallTally += 1
|
||||||
M.adjustBrainLoss(0.1)//Honestly this could be removed, in testing it made everyone brain damaged, but on the other hand, we were chugging tons of it.
|
|
||||||
..()
|
..()
|
||||||
|
|
||||||
/datum/reagent/fermi/enthrall/overdose_start(mob/living/carbon/M)//I made it so the creator is set to gain the status for someone random.
|
/datum/reagent/fermi/enthrall/overdose_start(mob/living/carbon/M)//I made it so the creator is set to gain the status for someone random.
|
||||||
|
|||||||
@@ -103,8 +103,9 @@
|
|||||||
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.5, "slimejelly" = 0.5, "uranium" = 0.5, "synthflesh" = 0.5, "blood" = 0.5)
|
required_reagents = list("stable_plasma" = 0.15, "slimejelly" = 0.15, "uranium" = 0.15, "synthflesh" = 0.15, "blood" = 0.15)
|
||||||
mix_message = "the reaction gives off a blorble!"
|
mix_message = "the reaction gives off a blorble!"
|
||||||
|
required_temp = 1
|
||||||
//FermiChem vars:
|
//FermiChem vars:
|
||||||
OptimalTempMin = 600 // Lower area of bell curve for determining heat based rate reactions
|
OptimalTempMin = 600 // Lower area of bell curve for determining heat based rate reactions
|
||||||
OptimalTempMax = 630 // Upper end for above
|
OptimalTempMax = 630 // Upper end for above
|
||||||
@@ -361,7 +362,7 @@
|
|||||||
results = list("nanite_b_gone" = 4)
|
results = list("nanite_b_gone" = 4)
|
||||||
required_reagents = list("synthflesh" = 1, "uranium" = 1, "iron" = 1, "salglu_solution" = 1)
|
required_reagents = list("synthflesh" = 1, "uranium" = 1, "iron" = 1, "salglu_solution" = 1)
|
||||||
mix_message = "the reaction gurgles, encapsulating the reagents in flesh before the emp can be set off."
|
mix_message = "the reaction gurgles, encapsulating the reagents in flesh before the emp can be set off."
|
||||||
required_temp = 499//To force fermireactions before EMP.
|
required_temp = 450//To force fermireactions before EMP.
|
||||||
//FermiChem vars:
|
//FermiChem vars:
|
||||||
OptimalTempMin = 500
|
OptimalTempMin = 500
|
||||||
OptimalTempMax = 600
|
OptimalTempMax = 600
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -34,6 +34,7 @@
|
|||||||
<ui-section label='Contents'>
|
<ui-section label='Contents'>
|
||||||
{{#if data.isBeakerLoaded}}
|
{{#if data.isBeakerLoaded}}
|
||||||
<span>{{Math.round(adata.beakerCurrentVolume)}}/{{data.beakerMaxVolume}} Units</span>
|
<span>{{Math.round(adata.beakerCurrentVolume)}}/{{data.beakerMaxVolume}} Units</span>
|
||||||
|
<span>pH: {{Math.round(adata.beakerCurrentpH*10)/10}}</span>
|
||||||
<br/>
|
<br/>
|
||||||
{{#each adata.beakerContents}}
|
{{#each adata.beakerContents}}
|
||||||
<span class='highlight' intro-outro='fade'>{{Math.fixed(volume, 2)}} units of {{name}}</span><br/>
|
<span class='highlight' intro-outro='fade'>{{Math.fixed(volume, 2)}} units of {{name}}</span><br/>
|
||||||
|
|||||||
@@ -16,6 +16,8 @@
|
|||||||
<ui-section label='Contents'>
|
<ui-section label='Contents'>
|
||||||
{{#if data.isBeakerLoaded}}
|
{{#if data.isBeakerLoaded}}
|
||||||
<span>Temperature: {{Math.round(adata.currentTemp)}} K</span>
|
<span>Temperature: {{Math.round(adata.currentTemp)}} K</span>
|
||||||
|
<br />
|
||||||
|
<span>pH: {{Math.round(adata.currentpH*10)/10}}</span>
|
||||||
<br />
|
<br />
|
||||||
{{#each adata.beakerContents}}
|
{{#each adata.beakerContents}}
|
||||||
<span class='highlight' intro-outro='fade'>{{Math.fixed(volume, 2)}} units of {{name}}</span><br/>
|
<span class='highlight' intro-outro='fade'>{{Math.fixed(volume, 2)}} units of {{name}}</span><br/>
|
||||||
|
|||||||
Reference in New Issue
Block a user