Merge branch 'master' into Reagents_bitflats
This commit is contained in:
Thalpy
@@ -496,7 +496,12 @@
|
||||
|
||||
//Standard reaction mechanics:
|
||||
else
|
||||
if (C.FermiChem == TRUE)//Just to make sure
|
||||
if (C.FermiChem == TRUE)//Just to make sure, should only proc when grenades are combining.
|
||||
if (chem_temp > C.ExplodeTemp) //To allow fermigrenades
|
||||
var/datum/chemical_reaction/fermi/Ferm = selected_reaction
|
||||
fermiIsReacting = FALSE
|
||||
SSblackbox.record_feedback("tally", "fermi_chem", 1, ("[Ferm] explosion"))
|
||||
Ferm.FermiExplode(src, my_atom, volume = total_volume, temp = chem_temp, pH = pH)
|
||||
return 0
|
||||
|
||||
for(var/B in cached_required_reagents) //
|
||||
@@ -749,10 +754,14 @@
|
||||
total_volume = 0
|
||||
for(var/reagent in cached_reagents)
|
||||
var/datum/reagent/R = reagent
|
||||
if(R.volume == 0)
|
||||
del_reagent(R.id)
|
||||
if((R.volume < 0.01) && !fermiIsReacting)
|
||||
del_reagent(R.id)
|
||||
else
|
||||
total_volume += R.volume
|
||||
if(!reagent_list)
|
||||
pH = 7
|
||||
return 0
|
||||
|
||||
/datum/reagents/proc/clear_reagents()
|
||||
|
||||
@@ -77,6 +77,16 @@
|
||||
updateUsrDialog()
|
||||
update_icon()
|
||||
return
|
||||
|
||||
if(beaker)
|
||||
if(istype(I, /obj/item/reagent_containers/dropper))
|
||||
var/obj/item/reagent_containers/dropper/D = I
|
||||
D.afterattack(beaker, user, 1)
|
||||
|
||||
if(istype(I, /obj/item/reagent_containers/syringe))
|
||||
var/obj/item/reagent_containers/syringe/S = I
|
||||
S.afterattack(beaker, user, 1)
|
||||
|
||||
return ..()
|
||||
|
||||
/obj/machinery/chem_heater/on_deconstruction()
|
||||
|
||||
@@ -191,6 +191,13 @@
|
||||
color = "#731008" // rgb: 115, 16, 8
|
||||
taste_description = "ketchup"
|
||||
|
||||
/datum/reagent/consumable/mustard
|
||||
name = "Mustard"
|
||||
id = "mustard"
|
||||
description = "Mustard, mostly used on hotdogs, corndogs and burgers."
|
||||
nutriment_factor = 5 * REAGENTS_METABOLISM
|
||||
color = "#DDED26" // rgb: 221, 237, 38
|
||||
taste_description = "mustard"
|
||||
|
||||
/datum/reagent/consumable/capsaicin
|
||||
name = "Capsaicin Oil"
|
||||
|
||||
@@ -200,22 +200,20 @@
|
||||
pH = 7.5 //God is alkaline
|
||||
|
||||
/datum/reagent/water/holywater/on_mob_metabolize(mob/living/L)
|
||||
..()
|
||||
. = ..()
|
||||
ADD_TRAIT(L, TRAIT_HOLY, id)
|
||||
|
||||
if(is_servant_of_ratvar(L))
|
||||
to_chat(L, "<span class='userdanger'>A fog spreads through your mind, purging the Justiciar's influence!</span>")
|
||||
else if(iscultist(L))
|
||||
to_chat(L, "<span class='userdanger'>A fog spreads through your mind, weakening your connection to the veil and purging Nar-sie's influence</span>")
|
||||
|
||||
/datum/reagent/water/holywater/on_mob_end_metabolize(mob/living/L)
|
||||
REMOVE_TRAIT(L, TRAIT_HOLY, id)
|
||||
..()
|
||||
|
||||
/datum/reagent/water/holywater/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
|
||||
if(is_servant_of_ratvar(M))
|
||||
to_chat(M, "<span class='userdanger'>A fog spreads through your mind, purging the Justiciar's influence!</span>")
|
||||
..()
|
||||
|
||||
/datum/reagent/water/holywater/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
|
||||
if(iscultist(M))
|
||||
to_chat(M, "<span class='userdanger'>A fog spreads through your mind, weakening your connection to the veil and purging Nar-sie's influence</span>")
|
||||
..()
|
||||
if(iscultist(L))
|
||||
for(var/datum/action/innate/cult/blood_magic/BM in L.actions)
|
||||
BM.holy_dispel = FALSE
|
||||
return ..()
|
||||
|
||||
/datum/reagent/water/holywater/on_mob_life(mob/living/carbon/M)
|
||||
if(!data)
|
||||
@@ -224,9 +222,11 @@
|
||||
M.jitteriness = min(M.jitteriness+4,10)
|
||||
if(iscultist(M))
|
||||
for(var/datum/action/innate/cult/blood_magic/BM in M.actions)
|
||||
to_chat(M, "<span class='cultlarge'>Your blood rites falter as holy water scours your body!</span>")
|
||||
for(var/datum/action/innate/cult/blood_spell/BS in BM.spells)
|
||||
qdel(BS)
|
||||
if(!BM.holy_dispel)
|
||||
BM.holy_dispel = TRUE
|
||||
to_chat(M, "<span class='cultlarge'>Your blood rites falter as holy water scours your body!</span>")
|
||||
for(var/datum/action/innate/cult/blood_spell/BS in BM.spells)
|
||||
qdel(BS)
|
||||
if(data >= 25) // 10 units, 45 seconds @ metabolism 0.4 units & tick rate 1.8 sec
|
||||
if(!M.stuttering)
|
||||
M.stuttering = 1
|
||||
@@ -1445,9 +1445,6 @@
|
||||
color = "#FFFFFF" // white
|
||||
random_color_list = list("#FFFFFF") //doesn't actually change appearance at all
|
||||
|
||||
|
||||
|
||||
|
||||
//////////////////////////////////Hydroponics stuff///////////////////////////////
|
||||
|
||||
/datum/reagent/plantnutriment
|
||||
@@ -1489,16 +1486,8 @@
|
||||
tox_prob = 15
|
||||
pH = 1
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// GOON OTHERS
|
||||
|
||||
|
||||
|
||||
/datum/reagent/oil
|
||||
name = "Oil"
|
||||
id = "oil"
|
||||
@@ -1676,7 +1665,7 @@
|
||||
reagent_state = LIQUID
|
||||
color = "#FFFFD6" // very very light yellow
|
||||
taste_description = "alkali" //who put ACID for NaOH ????
|
||||
pH = 13
|
||||
pH = 11.9
|
||||
|
||||
/datum/reagent/drying_agent
|
||||
name = "Drying agent"
|
||||
@@ -2032,6 +2021,13 @@
|
||||
qdel(original_dna)
|
||||
return ..()
|
||||
|
||||
/datum/reagent/mustardgrind
|
||||
name = "Mustardgrind"
|
||||
id = "mustardgrind"
|
||||
description = "A powerd that is mixed with water and enzymes to make mustard."
|
||||
color = "#BCC740" //RGB: 188, 199, 64
|
||||
taste_description = "plant dust"
|
||||
|
||||
/datum/reagent/pax/catnip
|
||||
name = "catnip"
|
||||
id = "catnip"
|
||||
|
||||
@@ -313,25 +313,6 @@
|
||||
. = 1
|
||||
..()
|
||||
|
||||
/datum/reagent/toxin/chloralhydratedelayed //sedates half as quickly and does not cause toxloss. same name/desc so it doesn't give away sleepypens
|
||||
name = "Chloral Hydrate"
|
||||
id = "chloralhydratedelayed"
|
||||
description = "A powerful sedative that induces confusion and drowsiness before putting its target to sleep."
|
||||
reagent_state = SOLID
|
||||
color = "#000067" // rgb: 0, 0, 103
|
||||
toxpwr = 0
|
||||
metabolization_rate = 1 * REAGENTS_METABOLISM
|
||||
|
||||
/datum/reagent/toxin/chloralhydratedelayed/on_mob_life(mob/living/carbon/M)
|
||||
switch(current_cycle)
|
||||
if(10 to 20)
|
||||
M.confused += 1
|
||||
M.drowsyness += 1
|
||||
M.adjustStaminaLoss(7.5)
|
||||
if(20 to INFINITY)
|
||||
M.Sleeping(40, 0)
|
||||
..()
|
||||
|
||||
/datum/reagent/toxin/fakebeer //disguised as normal beer for use by emagged brobots
|
||||
name = "Beer"
|
||||
id = "fakebeer"
|
||||
@@ -389,12 +370,12 @@
|
||||
id = "tirizene"
|
||||
description = "A nonlethal poison that causes extreme fatigue and weakness in its victim."
|
||||
color = "#6E2828"
|
||||
data = 13
|
||||
data = 15
|
||||
toxpwr = 0
|
||||
|
||||
/datum/reagent/toxin/staminatoxin/on_mob_life(mob/living/carbon/M)
|
||||
M.adjustStaminaLoss(REM * data, 0)
|
||||
data = max(data - 1, 3)
|
||||
data = max(data - 1, 5)
|
||||
..()
|
||||
. = 1
|
||||
|
||||
|
||||
@@ -82,6 +82,12 @@
|
||||
required_temp = 374
|
||||
mob_react = FALSE
|
||||
|
||||
/datum/chemical_reaction/mustard
|
||||
name = "Mustard"
|
||||
id = "mustard"
|
||||
results = list("mustard" = 5)
|
||||
required_reagents = list("mustardgrind" = 1, "water" = 10, "enzyme"= 1)
|
||||
|
||||
/datum/chemical_reaction/soapification/on_reaction(datum/reagents/holder, created_volume)
|
||||
var/location = get_turf(holder.my_atom)
|
||||
for(var/i = 1, i <= created_volume, i++)
|
||||
|
||||
Reference in New Issue
Block a user