cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

more cleanup

Browse Source
This commit is contained in:
Fox-McCloud
2016-07-17 00:44:58 -04:00
parent 7dccd3cedc
commit f0b8d3b097
25 changed files with 24 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Machinery.dm
+2 -2
View File
@@ -19,7 +19,7 @@
var/hackedcheck = 0
var/list/dispensable_reagents = list("hydrogen", "lithium", "carbon", "nitrogen", "oxygen", "fluorine",
"sodium", "aluminum", "silicon", "phosphorus", "sulfur", "chlorine", "potassium", "iron",
"copper", "mercury", "plasma", "radium", "water", "ethanol", "sugar", "tungsten", "iodine", "bromine", "silver")
"copper", "mercury", "plasma", "radium", "water", "ethanol", "sugar", "iodine", "bromine", "silver")
var/list/hacked_reagents = list("toxin")
var/hack_message = "You disable the safety safeguards, enabling the \"Mad Scientist\" mode."
var/unhack_message = "You re-enable the safety safeguards, enabling the \"NT Standard\" mode."
@@ -297,7 +297,7 @@
amount = 5
recharge_delay = 10
dispensable_reagents = list()
var/list/special_reagents = list(list("hydrogen", "oxygen", "silicon", "phosphorus", "sulfur", "carbon", "nitrogen", "tungsten", "water"),
var/list/special_reagents = list(list("hydrogen", "oxygen", "silicon", "phosphorus", "sulfur", "carbon", "nitrogen", "water"),
list("lithium", "sugar", "copper", "mercury", "sodium","iodine","bromine"),
list("ethanol", "chlorine", "potassium", "aluminum","plasma", "radium", "fluorine", "iron", "silver"),
list("oil", "ash", "acetone", "saltpetre", "ammonia", "diethylamine", "fuel"))
code/modules/reagents/newchem/disease.dm
-10
View File
@@ -20,7 +20,6 @@
color = "#535E66" // rgb: 83, 94, 102
/datum/reagent/nanomachines/on_mob_life(mob/living/carbon/M)
if(!M) M = holder.my_atom
if(volume > 1.5)
M.ForceContractDisease(new /datum/disease/transformation/robot(0))
..()
@@ -33,7 +32,6 @@
color = "#535E66" // rgb: 83, 94, 102
/datum/reagent/xenomicrobes/on_mob_life(mob/living/carbon/M)
if(!M) M = holder.my_atom
if(volume > 1.5)
M.ContractDisease(new /datum/disease/transformation/xeno(0))
..()
@@ -45,7 +43,6 @@
color = "#92D17D" // rgb: 146, 209, 125
/datum/reagent/fungalspores/on_mob_life(mob/living/carbon/M)
if(!M) M = holder.my_atom
if(volume > 2.5)
M.ForceContractDisease(new /datum/disease/tuberculosis(0))
..()
@@ -58,7 +55,6 @@
color = "#FA0000" // rgb: 250, 0, 0
/datum/reagent/jagged_crystals/on_mob_life(mob/living/carbon/M)
if(!M) M = holder.my_atom
M.ForceContractDisease(new /datum/disease/berserker(0))
..()
@@ -70,7 +66,6 @@
color = "#1E4600"
/datum/reagent/salmonella/on_mob_life(mob/living/carbon/M)
if(!M) M = holder.my_atom
M.ForceContractDisease(new /datum/disease/food_poisoning(0))
..()
@@ -82,7 +77,6 @@
color = "#FF0000"
/datum/reagent/gibbis/on_mob_life(mob/living/carbon/M)
if(!M) M = holder.my_atom
if(volume > 2.5)
M.ForceContractDisease(new /datum/disease/gbs/curable(0))
..()
@@ -95,7 +89,6 @@
color = "#FFFFFF"
/datum/reagent/prions/on_mob_life(mob/living/carbon/M)
if(!M) M = holder.my_atom
if(volume > 4.5)
M.ForceContractDisease(new /datum/disease/kuru(0))
..()
@@ -108,7 +101,6 @@
color = "#465046"
/datum/reagent/grave_dust/on_mob_life(mob/living/carbon/M)
if(!M) M = holder.my_atom
if(volume > 4.5)
M.ForceContractDisease(new /datum/disease/vampire(0))
..()
@@ -121,7 +113,6 @@
color = "#925D6C"
/datum/reagent/heartworms/on_mob_life(mob/living/carbon/M)
if(!M) M = holder.my_atom
if(volume > 4.5)
if(ishuman(M))
var/mob/living/carbon/human/H = M
@@ -141,7 +132,6 @@
var/blob_point_rate = 3
/datum/reagent/spore/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(holder.has_reagent("atrazine",45))
holder.del_reagent("spore") //apparently this never metabolizes and stays in forever unless you have 45 units of atrazine in you or some stupid thing like that.
if(prob(1))
code/modules/reagents/newchem/drinks.dm
+1 -3
View File
@@ -15,7 +15,6 @@
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/reagent/ginsonic/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.drowsyness = max(0, M.drowsyness-5)
if(prob(25))
M.AdjustParalysis(-1)
@@ -77,7 +76,6 @@
M.adjust_fire_stacks(3)
/datum/reagent/ethanol/dragons_breath/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(M.reagents.has_reagent("milk"))
to_chat(M, "<span class='notice'>The milk stops the burning. Ahhh.</span>")
M.reagents.del_reagent("milk")
@@ -127,7 +125,7 @@
mix_message = "The chemicals mix to create shiny, blue substance."
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/reagent/ethanol/synthanol/on_mob_life(mob/living/M, alien)
/datum/reagent/ethanol/synthanol/on_mob_life(mob/living/M)
if(!M.isSynthetic())
holder.remove_reagent(id, 3.6) //gets removed from organics very fast
if(prob(25))
code/modules/reagents/newchem/drugs.dm
-11
View File
@@ -14,7 +14,6 @@
addiction_chance = 70
/datum/reagent/nicotine/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
var/smoke_message = pick("You feel relaxed.", "You feel calmed.", "You feel less stressed.", "You feel more placid.", "You feel more undivided.")
if(prob(5))
to_chat(M, "<span class='notice'>[smoke_message]</span>")
@@ -75,7 +74,6 @@
addiction_chance = 50
/datum/reagent/crank/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.AdjustParalysis(-2)
M.AdjustStunned(-2)
M.AdjustWeakened(-2)
@@ -161,7 +159,6 @@
/datum/reagent/krokodil/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.jitteriness -= 40
if(prob(25))
M.adjustBrainLoss(1)
@@ -239,7 +236,6 @@
metabolization_rate = 0.6
/datum/reagent/methamphetamine/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(prob(5))
M.emote(pick("twitch_s","blink_r","shiver"))
if(current_cycle >= 25)
@@ -324,7 +320,6 @@
metabolization_rate = 0.6
/datum/reagent/bath_salts/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
var/check = rand(0,100)
if(ishuman(M))
var/mob/living/carbon/human/H = M
@@ -445,7 +440,6 @@
addiction_chance = 30
/datum/reagent/jenkem/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.Dizzy(5)
if(prob(10))
M.emote(pick("twitch_s","drool","moan"))
@@ -467,7 +461,6 @@
color = "#60A584" // rgb: 96, 165, 132
/datum/reagent/aranesp/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.adjustStaminaLoss(-40)
if(prob(90))
M.adjustToxLoss(1)
@@ -492,7 +485,6 @@
/datum/reagent/thc/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.stuttering += rand(0,2)
if(prob(5))
M.emote(pick("laugh","giggle","smile"))
@@ -532,7 +524,6 @@
..()
/datum/reagent/fliptonium/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(current_cycle == 5)
M.SpinAnimation(speed = 11, loops = -1)
if(current_cycle == 10)
@@ -612,7 +603,6 @@
mix_message = "The mixture darkens and appears to partially vaporize into a chilling aerosol."
/datum/reagent/lube/ultra/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
var/high_message = pick("You feel your servos whir!", "You feel like you need to go faster.", "You feel like you were just overclocked!")
if(prob(1))
if(prob(1))
@@ -657,7 +647,6 @@
/datum/reagent/surge/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.druggy = max(M.druggy, 15)
var/high_message = pick("You feel calm.", "You feel collected.", "You feel like you need to relax.")
if(prob(1))
code/modules/reagents/newchem/food.dm
-8
View File
@@ -23,7 +23,6 @@
color = "#F0C814"
/datum/reagent/egg/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(prob(8))
M.emote("fart")
if(prob(3))
@@ -76,7 +75,6 @@
color = "#C8A5DC"
/datum/reagent/corn_syrup/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.reagents.add_reagent("sugar", 1.2)
..()
@@ -97,7 +95,6 @@
color = "#C8A5DC"
/datum/reagent/vhfcs/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.reagents.add_reagent("sugar", 2.4)
..()
@@ -118,8 +115,6 @@
color = "#d3a308"
/datum/reagent/honey/on_mob_life(mob/living/M)
if(!M)
M = holder.my_atom
M.reagents.add_reagent("sugar", 0.4)
if(prob(20))
M.heal_organ_damage(3,1)
@@ -134,7 +129,6 @@
color = "#2E2418"
/datum/reagent/chocolate/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.nutrition += nutriment_factor
M.reagents.add_reagent("sugar", 0.8)
..()
@@ -152,7 +146,6 @@
color = "#21170E"
/datum/reagent/mugwort/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(istype(M, /mob/living/carbon/human) && M.mind)
if(M.mind.special_role == "Wizard")
M.adjustToxLoss(-1*REM)
@@ -318,7 +311,6 @@
color = "#684435"
/datum/reagent/beans/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(prob(10))
M.emote("fart")
..()
code/modules/reagents/newchem/medicine.dm
-27
View File
@@ -25,7 +25,6 @@
..()
/datum/reagent/silver_sulfadiazine/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.adjustFireLoss(-2*REM)
..()
@@ -51,7 +50,6 @@
..()
/datum/reagent/styptic_powder/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.adjustBruteLoss(-2*REM)
..()
@@ -65,8 +63,6 @@
metabolization_rate = 0.15
/datum/reagent/salglu_solution/on_mob_life(mob/living/M)
if(!M)
M = holder.my_atom
if(prob(33))
M.adjustBruteLoss(-2*REM)
M.adjustFireLoss(-2*REM)
@@ -84,7 +80,6 @@
color = "#FFEBEB"
/datum/reagent/synthflesh/reaction_mob(mob/living/M, method=TOUCH, volume, show_message = 1)
if(!M) M = holder.my_atom
if(iscarbon(M))
if(method == TOUCH)
M.adjustBruteLoss(-1.5*volume)
@@ -107,7 +102,6 @@
color = "#000000"
/datum/reagent/charcoal/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.adjustToxLoss(-1.5*REM)
if(prob(50))
for(var/datum/reagent/R in M.reagents.reagent_list)
@@ -169,7 +163,6 @@
addiction_chance = 5
/datum/reagent/omnizine/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.adjustToxLoss(-1*REM)
M.adjustOxyLoss(-1*REM)
M.adjustBruteLoss(-2*REM)
@@ -221,7 +214,6 @@
metabolization_rate = 0.8
/datum/reagent/calomel/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
for(var/datum/reagent/R in M.reagents.reagent_list)
if(R != src)
M.reagents.remove_reagent(R.id,5)
@@ -248,7 +240,6 @@
color = "#B4DCBE"
/datum/reagent/potass_iodide/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(prob(80))
M.radiation = max(0, M.radiation-1)
..()
@@ -269,7 +260,6 @@
color = "#C8A5DC"
/datum/reagent/pen_acid/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
for(var/datum/reagent/R in M.reagents.reagent_list)
if(R != src)
M.reagents.remove_reagent(R.id,4)
@@ -301,7 +291,6 @@
overdose_threshold = 25
/datum/reagent/sal_acid/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(prob(55))
M.adjustBruteLoss(-2*REM)
if(ishuman(M))
@@ -328,7 +317,6 @@
metabolization_rate = 0.2
/datum/reagent/salbutamol/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.adjustOxyLoss(-6*REM)
M.losebreath = max(0, M.losebreath-4)
..()
@@ -352,7 +340,6 @@
addiction_chance = 20
/datum/reagent/perfluorodecalin/on_mob_life(mob/living/carbon/human/M)
if(!M) M = holder.my_atom
M.adjustOxyLoss(-25*REM)
if(volume >= 4)
M.losebreath = max(M.losebreath, 6)
@@ -383,7 +370,6 @@
addiction_chance = 25
/datum/reagent/ephedrine/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.drowsyness = max(0, M.drowsyness-5)
M.AdjustParalysis(-1)
M.AdjustStunned(-1)
@@ -437,7 +423,6 @@
addiction_chance = 10
/datum/reagent/diphenhydramine/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.jitteriness = max(0, M.jitteriness-20)
M.reagents.remove_reagent("histamine",3)
M.reagents.remove_reagent("itching_powder",3)
@@ -469,7 +454,6 @@
shock_reduction = 50
/datum/reagent/morphine/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.jitteriness = max(0, M.jitteriness-25)
switch(current_cycle)
if(1 to 15)
@@ -487,7 +471,6 @@
..()
/datum/reagent/oculine/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(prob(80))
if(ishuman(M))
var/mob/living/carbon/human/H = M
@@ -533,7 +516,6 @@
overdose_threshold = 25
/datum/reagent/atropine/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.dizziness += 1
M.confused = max(M.confused, 5)
if(prob(4))
@@ -569,7 +551,6 @@
overdose_threshold = 20
/datum/reagent/epinephrine/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.drowsyness = max(0, M.drowsyness-5)
if(prob(20))
M.AdjustParalysis(-1)
@@ -663,7 +644,6 @@
..()
/datum/reagent/strange_reagent/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(prob(10))
M.adjustBruteLoss(2*REM)
M.adjustToxLoss(2*REM)
@@ -778,7 +758,6 @@
metabolization_rate = 0.4
/datum/reagent/stimulants/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(volume > 5)
M.adjustOxyLoss(-5*REM)
M.adjustToxLoss(-5*REM)
@@ -801,7 +780,6 @@
..()
/datum/reagent/stimulants/reagent_deleted(mob/living/M)
if(!M) M = holder.my_atom
M.status_flags |= CANSTUN | CANWEAKEN | CANPARALYSE
..()
@@ -840,7 +818,6 @@
color = "#C8A5DC"
/datum/reagent/insulin/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.reagents.remove_reagent("sugar", 5)
..()
@@ -869,7 +846,6 @@
overdose_threshold = 50
/datum/reagent/teporone/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(M.bodytemperature > 310)
M.bodytemperature = max(310, M.bodytemperature - (40 * TEMPERATURE_DAMAGE_COEFFICIENT))
else if(M.bodytemperature < 311)
@@ -893,7 +869,6 @@
color = "#FFDCFF"
/datum/reagent/haloperidol/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.reagents.remove_reagent("crank", 5)
M.reagents.remove_reagent("methamphetamine", 5)
M.reagents.remove_reagent("space_drugs", 5)
@@ -932,7 +907,6 @@
color = "#96DEDE"
/datum/reagent/ether/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.jitteriness = max(M.jitteriness-25,0)
switch(current_cycle)
if(1 to 15)
@@ -982,7 +956,6 @@
T.MakeDry(TURF_WET_LUBE)
/datum/reagent/degreaser/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(prob(50)) //Same effects as coffee, to help purge ill effects like paralysis
M.AdjustParalysis(-1)
M.AdjustStunned(-1)
code/modules/reagents/newchem/newchem_procs.dm
+5 -3
View File
@@ -12,16 +12,18 @@
var/chem_temp = 300
var/list/datum/reagent/addiction_list = new/list()
/datum/reagents/proc/metabolize(mob/M)
/datum/reagents/proc/metabolize(mob/living/M)
if(M)
if(!istype(M, /mob/living)) //Non-living mobs can't metabolize reagents, so don't bother trying (runtime safety check)
return
chem_temp = M.bodytemperature
handle_reactions()
for(var/A in reagent_list)
var/datum/reagent/R = A
if(!istype(R))
continue
if(!R.holder)
continue
if(!M)
M = R.holder.my_atom
if(ishuman(M))
var/mob/living/carbon/human/H = M
//Check if this mob's species is set and can process this type of reagent
code/modules/reagents/newchem/other.dm
-5
View File
@@ -61,7 +61,6 @@ var/list/random_color_list = list("#00aedb","#a200ff","#f47835","#d41243","#d111
color = "#474747"
/datum/reagent/acetone/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.adjustToxLoss(1.5)
..()
@@ -285,8 +284,6 @@ var/list/random_color_list = list("#00aedb","#a200ff","#f47835","#d41243","#d111
mix_message = "The substance makes a little 'toot' noise and starts to smell pretty bad."
/datum/reagent/fartonium/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(prob(66))
M.emote("fart")
@@ -363,8 +360,6 @@ var/list/random_color_list = list("#00aedb","#a200ff","#f47835","#d41243","#d111
to_chat(M, "<span class='notice'>You feel loved!</span>")
/datum/reagent/love/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(M.a_intent == I_HARM)
M.a_intent = I_HELP
code/modules/reagents/newchem/pyro.dm
-3
View File
@@ -37,7 +37,6 @@
min_temp = 424
/datum/reagent/clf3/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.adjust_fire_stacks(4)
M.adjustFireLoss(0.35*M.fire_stacks)
..()
@@ -421,7 +420,6 @@
new /obj/effect/hotspot(turf)
/datum/reagent/phlogiston/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.adjust_fire_stacks(1)
M.IgniteMob()
M.adjustFireLoss(0.2*M.fire_stacks)
@@ -436,7 +434,6 @@
process_flags = ORGANIC | SYNTHETIC
/datum/reagent/napalm/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.adjust_fire_stacks(1)
..()
code/modules/reagents/newchem/toxins.dm
-24
View File
@@ -14,7 +14,6 @@
penetrates_skin = 1
/datum/reagent/polonium/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.apply_effect(8, IRRADIATE, negate_armor = 1)
..()
@@ -37,7 +36,6 @@
M.emote("drool")
/datum/reagent/histamine/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(prob(20))
M.emote(pick("twitch", "grumble", "sneeze", "cough"))
if(prob(10))
@@ -102,7 +100,6 @@
penetrates_skin = 1
/datum/reagent/formaldehyde/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.adjustToxLoss(1*REM)
if(prob(10))
M.reagents.add_reagent("histamine",rand(5,15))
@@ -127,7 +124,6 @@
overdose_threshold = 40
/datum/reagent/venom/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(prob(25))
M.reagents.add_reagent("histamine",rand(5,10))
if(volume < 20)
@@ -206,7 +202,6 @@
penetrates_skin = 1
/datum/reagent/cyanide/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.adjustToxLoss(1.5*REM)
if(prob(5))
M.emote("drool")
@@ -247,7 +242,6 @@
penetrates_skin = 1
/datum/reagent/itching_powder/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(prob(25))
M.emote(pick("twitch", "laugh", "sneeze", "cry"))
if(prob(20))
@@ -282,7 +276,6 @@
mix_sound = 'sound/effects/blobattack.ogg'
/datum/reagent/facid/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.adjustToxLoss(1*REM)
M.adjustFireLoss(1)
..()
@@ -366,7 +359,6 @@
metabolization_rate = 0.4
/datum/reagent/initropidril/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(prob(33))
M.adjustToxLoss(rand(5,25))
if(prob(33))
@@ -406,7 +398,6 @@
metabolization_rate = 0.4
/datum/reagent/concentrated_initro/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(volume >=5)
if(ishuman(M))
var/mob/living/carbon/human/H = M
@@ -422,7 +413,6 @@
metabolization_rate = 0.2
/datum/reagent/pancuronium/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
switch(current_cycle)
if(1 to 5)
if(prob(10))
@@ -455,7 +445,6 @@
metabolization_rate = 0.7
/datum/reagent/sodium_thiopental/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
switch(current_cycle)
if(1)
M.emote("drool")
@@ -483,7 +472,6 @@
penetrates_skin = 1
/datum/reagent/ketamine/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
switch(current_cycle)
if(1 to 5)
if(prob(25))
@@ -517,7 +505,6 @@
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/reagent/sulfonal/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.jitteriness = max(0, M.jitteriness-30)
switch(current_cycle)
if(1 to 10)
@@ -543,7 +530,6 @@
color = "#D9D9D9"
/datum/reagent/amanitin/reagent_deleted(mob/living/M)
if(!M) M = holder.my_atom
M.adjustToxLoss(current_cycle*rand(2,4))
..()
@@ -563,7 +549,6 @@
result_amount = 3
/datum/reagent/lipolicide/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(!M.nutrition)
switch(rand(1,3))
if(1)
@@ -587,7 +572,6 @@
metabolization_rate = 0.05
/datum/reagent/coniine/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.adjustToxLoss(2)
M.losebreath += 5
..()
@@ -602,7 +586,6 @@
penetrates_skin = 1
/datum/reagent/curare/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.adjustToxLoss(1)
M.adjustOxyLoss(1)
switch(current_cycle)
@@ -654,7 +637,6 @@
C.reagents.add_reagent("sarin",4)
/datum/reagent/sarin/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
switch(current_cycle)
if(1 to 15)
M.jitteriness += 20
@@ -708,7 +690,6 @@
color = "#17002D"
/datum/reagent/atrazine/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.adjustToxLoss(2)
..()
@@ -777,7 +758,6 @@
mix_message = "The smell of death wafts up from the solution."
/datum/reagent/capulettium/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
switch(current_cycle)
if(1 to 5)
M.eye_blurry += 10
@@ -808,7 +788,6 @@
mix_message = "The solution begins to slosh about violently by itself."
/datum/reagent/capulettium_plus/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.silent = max(M.silent, 2)
..()
@@ -820,7 +799,6 @@
color = "#00C81E"
/datum/reagent/toxic_slurry/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(prob(10))
M.adjustToxLoss(rand(2.4))
if(prob(7))
@@ -847,7 +825,6 @@
M.UpdateAppearance()
/datum/reagent/glowing_slurry/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.apply_effect(2, IRRADIATE, 0, negate_armor = 1)
if(prob(15))
randmutb(M)
@@ -874,7 +851,6 @@
/datum/reagent/ants/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.adjustBruteLoss(2)
..()
code/modules/reagents/oldchem/reagents/_reagent_base.dm
+1 -1
View File
@@ -63,7 +63,7 @@
src = null
return
/datum/reagent/proc/on_mob_life(mob/living/M, alien)
/datum/reagent/proc/on_mob_life(mob/living/M)
if(!istype(M))
return
if(holder)
code/modules/reagents/oldchem/reagents/drink/reagents_alcohol.dm
+1 -2
View File
@@ -10,7 +10,7 @@
var/dizzy_adj = 3
var/alcohol_perc = 1 //percentage of ethanol in a beverage 0.0 - 1.0
/datum/reagent/ethanol/on_mob_life(mob/living/M, alien)
/datum/reagent/ethanol/on_mob_life(mob/living/M)
M.nutrition += nutriment_factor
M.AdjustDrunk(alcohol_perc)
M.dizziness += dizzy_adj
@@ -88,7 +88,6 @@
//copy paste from LSD... shoot me
/datum/reagent/ethanol/absinthe/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.hallucination += 5
..()
code/modules/reagents/oldchem/reagents/drink/reagents_drink.dm
-6
View File
@@ -56,7 +56,6 @@
color = "#FF8CFF" // rgb: 255, 140, 255
/datum/reagent/drink/doctors_delight/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(M.getToxLoss() && prob(20))
M.adjustToxLoss(-1)
..()
@@ -102,7 +101,6 @@
color = "#863333" // rgb: 175, 175, 0
/datum/reagent/drink/banana/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.nutrition += nutriment_factor
if((istype(M, /mob/living/carbon/human) && M.job in list("Clown") ) || issmall(M))
M.adjustBruteLoss(-1)
@@ -117,7 +115,6 @@
/datum/reagent/drink/nothing/on_mob_life(mob/living/M)
M.nutrition += nutriment_factor
if(istype(M, /mob/living/carbon/human) && M.job in list("Mime"))
if(!M) M = holder.my_atom
M.adjustBruteLoss(-1)
M.adjustFireLoss(-1)
..()
@@ -266,7 +263,6 @@
color = "#664300" // rgb: 102, 67, 0
/datum/reagent/drink/bananahonk/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.nutrition += nutriment_factor
if((istype(M, /mob/living/carbon/human) && M.job in list("Clown") ) || issmall(M))
M.adjustBruteLoss(-1)
@@ -281,10 +277,8 @@
color = "#664300" // rgb: 102, 67, 0
/datum/reagent/drink/silencer/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.nutrition += nutriment_factor
if(istype(M, /mob/living/carbon/human) && M.job in list("Mime"))
if(!M) M = holder.my_atom
M.adjustBruteLoss(-1)
M.adjustFireLoss(-1)
..()
code/modules/reagents/oldchem/reagents/drink/reagents_drink_base.dm
-1
View File
@@ -12,7 +12,6 @@
var/adj_temp_cool = 0
/datum/reagent/drink/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.nutrition += nutriment_factor
if(adj_dizzy)
M.dizziness = max(0, M.dizziness + adj_dizzy)
code/modules/reagents/oldchem/reagents/reagents_admin.dm
-1
View File
@@ -8,7 +8,6 @@
admin_only = 1
/datum/reagent/adminordrazine/on_mob_life(mob/living/carbon/M)
if(!M) M = holder.my_atom ///This can even heal dead people.
M.setCloneLoss(0)
M.setOxyLoss(0)
M.radiation = 0
code/modules/reagents/oldchem/reagents/reagents_drugs.dm
-4
View File
@@ -21,7 +21,6 @@
color = "#808080" // rgb: 128, 128, 128
/datum/reagent/lithium/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(isturf(M.loc) && !istype(M.loc, /turf/space))
if(M.canmove && !M.restrained())
step(M, pick(cardinal))
@@ -38,7 +37,6 @@
metabolization_rate = 0.2 * REAGENTS_METABOLISM
/datum/reagent/hippies_delight/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.druggy = max(M.druggy, 50)
switch(current_cycle)
if(1 to 5)
@@ -67,7 +65,6 @@
color = "#0000D8"
/datum/reagent/lsd/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.druggy = max(M.druggy, 15)
M.hallucination += 10
..()
@@ -82,7 +79,6 @@
addiction_chance = 65
/datum/reagent/space_drugs/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.druggy = max(M.druggy, 15)
if(isturf(M.loc) && !istype(M.loc, /turf/space))
if(M.canmove && !M.restrained())
code/modules/reagents/oldchem/reagents/reagents_flammable.dm
-1
View File
@@ -42,7 +42,6 @@
color = "#7A2B94"
/datum/reagent/plasma/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.adjustToxLoss(1*REM)
if(holder.has_reagent("epinephrine"))
holder.remove_reagent("epinephrine", 2)
code/modules/reagents/oldchem/reagents/reagents_food.dm
-8
View File
@@ -10,8 +10,6 @@
color = "#664330" // rgb: 102, 67, 48
/datum/reagent/nutriment/on_mob_life(mob/living/M)
if(!M)
M = holder.my_atom
if(!(M.mind in ticker.mode.vampires))
if(ishuman(M))
var/mob/living/carbon/human/H = M
@@ -38,7 +36,6 @@
color = "#664330" // rgb: 102, 67, 48
/datum/reagent/protein/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(!(M.mind in ticker.mode.vampires))
if(ishuman(M))
var/mob/living/carbon/human/H = M
@@ -61,7 +58,6 @@
color = "#664330" // rgb: 102, 67, 48
/datum/reagent/plantmatter/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(!(M.mind in ticker.mode.vampires))
if(ishuman(M))
var/mob/living/carbon/human/H = M
@@ -100,7 +96,6 @@
color = "#B31008" // rgb: 179, 16, 8
/datum/reagent/capsaicin/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
switch(current_cycle)
if(1 to 15)
M.bodytemperature += 5 * TEMPERATURE_DAMAGE_COEFFICIENT
@@ -131,7 +126,6 @@
process_flags = ORGANIC | SYNTHETIC
/datum/reagent/frostoil/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
switch(current_cycle)
if(1 to 15)
M.bodytemperature -= 10 * TEMPERATURE_DAMAGE_COEFFICIENT
@@ -217,7 +211,6 @@
color = "#E700E7" // rgb: 231, 0, 231
/datum/reagent/psilocybin/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.druggy = max(M.druggy, 30)
switch(current_cycle)
if(1 to 5)
@@ -249,7 +242,6 @@
/datum/reagent/sprinkles/on_mob_life(mob/living/M)
M.nutrition += nutriment_factor
if(istype(M, /mob/living/carbon/human) && M.job in list("Security Officer", "Head of Security", "Detective", "Warden"))
if(!M) M = holder.my_atom
M.adjustBruteLoss(-1)
M.adjustFireLoss(-1)
..()
code/modules/reagents/oldchem/reagents/reagents_med.dm
-4
View File
@@ -8,7 +8,6 @@
shock_reduction = 200
/datum/reagent/hydrocodone/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.traumatic_shock < 100)
@@ -42,7 +41,6 @@
overdose_threshold = 40
/datum/reagent/synaptizine/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.drowsyness = max(0, M.drowsyness-5)
M.AdjustParalysis(-1)
M.AdjustStunned(-1)
@@ -81,7 +79,6 @@
color = "#C8A5DC" // rgb: 200, 165, 220
/datum/reagent/mitocholide/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(ishuman(M))
var/mob/living/carbon/human/H = M
@@ -105,7 +102,6 @@
color = "#0000C8" // rgb: 200, 165, 220
/datum/reagent/cryoxadone/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(M.bodytemperature < 265)
M.adjustCloneLoss(-4)
M.adjustOxyLoss(-10)
code/modules/reagents/oldchem/reagents/reagents_misc.dm
-2
View File
@@ -152,8 +152,6 @@
color = "#C8A5DC" // rgb: 200, 165, 220
/datum/reagent/iron/on_mob_life(mob/living/M)
if(!M)
M = holder.my_atom
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(!H.species.exotic_blood && !(H.species.flags & NO_BLOOD))
code/modules/reagents/oldchem/reagents/reagents_toxin.dm
+2 -19
View File
@@ -6,7 +6,6 @@
color = "#CF3600" // rgb: 207, 54, 0
/datum/reagent/toxin/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.adjustToxLoss(2)
..()
@@ -18,9 +17,8 @@
color = "#CF3600" // rgb: 207, 54, 0
/datum/reagent/spider_venom/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.adjustToxLoss(1.5)
..()
M.adjustToxLoss(1.5)
..()
/datum/reagent/plasticide
name = "Plasticide"
@@ -30,7 +28,6 @@
color = "#CF3600" // rgb: 207, 54, 0
/datum/reagent/plasticide/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.adjustToxLoss(1.5)
..()
@@ -43,7 +40,6 @@
color = "#CF3600" // rgb: 207, 54, 0
/datum/reagent/minttoxin/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(FAT in M.mutations)
M.gib()
..()
@@ -71,7 +67,6 @@
color = "#13BC5E" // rgb: 19, 188, 94
/datum/reagent/slimetoxin/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(ishuman(M))
var/mob/living/carbon/human/human = M
if(human.species.name != "Shadow")
@@ -104,7 +99,6 @@
penetrates_skin = 1
/datum/reagent/mercury/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(prob(70))
M.adjustBrainLoss(1)
..()
@@ -119,7 +113,6 @@
process_flags = ORGANIC | SYNTHETIC
/datum/reagent/chlorine/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.adjustFireLoss(1)
..()
@@ -133,7 +126,6 @@
process_flags = ORGANIC | SYNTHETIC
/datum/reagent/fluorine/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.adjustFireLoss(1)
M.adjustToxLoss(1*REM)
..()
@@ -148,7 +140,6 @@
penetrates_skin = 1
/datum/reagent/radium/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(M.radiation < 80)
M.apply_effect(4, IRRADIATE, negate_armor = 1)
..()
@@ -180,7 +171,6 @@
/datum/reagent/mutagen/on_mob_life(mob/living/M)
if(!M.dna) return //No robots, AIs, aliens, Ians or other mobs should be affected by this.
if(!M) M = holder.my_atom
M.apply_effect(2*REM, IRRADIATE, negate_armor = 1)
if(prob(4))
randmutb(M)
@@ -195,7 +185,6 @@
color = "#B8B8C0" // rgb: 184, 184, 192
/datum/reagent/uranium/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.apply_effect(2, IRRADIATE, negate_armor = 1)
..()
@@ -215,9 +204,6 @@
metabolization_rate = 0.2
/datum/reagent/lexorin/on_mob_life(mob/living/M)
if(M.stat == 2.0)
return
if(!M) M = holder.my_atom
M.adjustToxLoss(1)
..()
@@ -231,7 +217,6 @@
process_flags = ORGANIC | SYNTHETIC
/datum/reagent/sacid/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.adjustFireLoss(1)
..()
@@ -321,7 +306,6 @@
color = "#003333" // rgb: 0, 51, 51
/datum/reagent/carpotoxin/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
M.adjustToxLoss(2*REM)
..()
@@ -433,7 +417,6 @@
victim.drop_item()
/datum/reagent/condensedcapsaicin/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(prob(5))
M.visible_message("<span class='warning'>[M] [pick("dry heaves!","coughs!","splutters!")]</span>")
..()
code/modules/reagents/oldchem/reagents/reagents_water.dm
-1
View File
@@ -257,7 +257,6 @@
to_chat(M, "Oh god, why did you drink that?")
/datum/reagent/fishwater/on_mob_life(mob/living/M)
if(!M) M = holder.my_atom
if(prob(30)) // Nasty, you drank this stuff? 30% chance of the fakevomit (non-stunning version)
if(prob(50)) // 50/50 chance of green vomit vs normal vomit
M.fakevomit(1)
code/modules/research/xenoarchaeology/chemistry.dm
+5 -116
View File
@@ -1,81 +1,3 @@
//chemistry stuff here so that it can be easily viewed/modified
datum
reagent
tungsten
name = "Tungsten"
id = "tungsten"
description = "A chemical element, and a strong oxidising agent."
reagent_state = SOLID
color = "#808080" // rgb: 128, 128, 128
//todo: make this silvery grey
lithiumsodiumtungstate
name = "Lithium Sodium Tungstate"
id = "lithiumsodiumtungstate"
description = "A reducing agent for geological compounds."
reagent_state = LIQUID
color = "#808080" // rgb: 128, 128, 128
//todo: make this silvery grey
ground_rock
name = "Ground Rock"
id = "ground_rock"
description = "A fine dust made of ground up rock."
reagent_state = SOLID
color = "#C81040" //rgb: 200, 16, 64
//todo: make this brown
density_separated_sample
name = "Density separated sample"
id = "density_separated_sample"
description = "A watery paste used in chemical analysis, there are some chunks floating in it."
reagent_state = LIQUID
color = "#C81040" //rgb: 200, 16, 64
//todo: make this browny-white
analysis_sample
name = "Analysis liquid"
id = "analysis_sample"
description = "A watery paste used in chemical analysis."
reagent_state = LIQUID
color = "#C81040" //rgb: 200, 16, 64
//todo: make this white
chemical_waste
name = "Chemical Waste"
id = "chemical_waste"
description = "A viscous, toxic liquid left over from many chemical processes."
reagent_state = LIQUID
color = "#C81040" //rgb: 200, 16, 64
//todo: make this fluoro/bright green
datum
chemical_reaction
lithiumsodiumtungstate //LiNa2WO4, not the easiest chem to mix
name = "Lithium Sodium Tungstate"
id = "lithiumsodiumtungstate"
result = "lithiumsodiumtungstate"
required_reagents = list("lithium" = 1, "sodium" = 2, "tungsten" = 1, "oxygen" = 4)
result_amount = 8
density_separated_liquid
name = "Density separated sample"
id = "density_separated_sample"
result = "density_separated_sample"
secondary_results = list("chemical_waste" = 1)
required_reagents = list("ground_rock" = 1, "lithiumsodiumtungstate" = 2)
result_amount = 2
analysis_liquid
name = "Analysis sample"
id = "analysis_sample"
result = "analysis_sample"
secondary_results = list("chemical_waste" = 1)
required_reagents = list("density_separated_sample" = 5)
result_amount = 4
min_temp = 375
/obj/item/weapon/reagent_containers/glass/solution_tray
name = "solution tray"
desc = "A small, open-topped glass container for delicate research samples. It sports a re-useable strip for labelling with a pen."
@@ -111,55 +33,22 @@ obj/item/weapon/reagent_containers/glass/solution_tray/attackby(obj/item/weapon/
new /obj/item/weapon/reagent_containers/glass/solution_tray( src )
new /obj/item/weapon/reagent_containers/glass/solution_tray( src )
/obj/item/weapon/reagent_containers/glass/beaker/tungsten
name = "beaker 'tungsten'"
New()
..()
reagents.add_reagent("tungsten",50)
update_icon()
/obj/item/weapon/reagent_containers/glass/beaker/oxygen
name = "beaker 'oxygen'"
New()
..()
reagents.add_reagent("oxygen",50)
update_icon()
list_reagents = list("oxygen" = 50)
/obj/item/weapon/reagent_containers/glass/beaker/sodium
name = "beaker 'sodium'"
New()
..()
reagents.add_reagent("sodium",50)
update_icon()
list_reagents = list("sodium" = 50)
/obj/item/weapon/reagent_containers/glass/beaker/lithium
name = "beaker 'lithium'"
New()
..()
reagents.add_reagent("lithium",50)
update_icon()
list_reagents = list("lithium" = 50)
/obj/item/weapon/reagent_containers/glass/beaker/water
name = "beaker 'water'"
New()
..()
reagents.add_reagent("water",50)
update_icon()
/obj/item/weapon/reagent_containers/glass/beaker/water
name = "beaker 'water'"
New()
..()
reagents.add_reagent("water",50)
update_icon()
list_reagents = list("water" = 50)
/obj/item/weapon/reagent_containers/glass/beaker/fuel
name = "beaker 'fuel'"
New()
..()
reagents.add_reagent("fuel",50)
update_icon()
list_reagents = list("fuel" = 50)
code/modules/research/xenoarchaeology/machinery/coolant.dm
+5 -13
View File
@@ -1,29 +1,21 @@
datum/reagent/coolant
/datum/reagent/coolant
name = "Coolant"
id = "coolant"
description = "Industrial cooling substance."
reagent_state = LIQUID
color = "#C8A5DC" // rgb: 200, 165, 220
datum/chemical_reaction/coolant
name = "Coolant"
id = "coolant"
result = "coolant"
required_reagents = list("tungsten" = 1, "oxygen" = 1, "water" = 1)
result_amount = 3
/obj/structure/reagent_dispensers/coolanttank
name = "coolant tank"
desc = "A tank of industrial coolant"
icon = 'icons/obj/objects.dmi'
icon_state = "coolanttank"
amount_per_transfer_from_this = 10
New()
..()
reagents.add_reagent("coolant",1000)
/obj/structure/reagent_dispensers/coolanttank/New()
..()
reagents.add_reagent("coolant",1000)
/obj/structure/reagent_dispensers/coolanttank/bullet_act(var/obj/item/projectile/Proj)
if(istype(Proj ,/obj/item/projectile/beam)||istype(Proj,/obj/item/projectile/bullet))