toxins.dm

This commit is contained in:
Kashargul
2024-12-07 01:03:25 +01:00
parent 2bd0f9c14d
commit a12a4d2d5e
92 changed files with 592 additions and 514 deletions
+1 -1
View File
@@ -36,7 +36,7 @@
var/treatment_fire = "tricordrazine"
var/treatment_tox = "tricordrazine"
var/treatment_virus = "spaceacillin"
var/treatment_emag = "toxin"
var/treatment_emag = REAGENT_ID_TOXIN
var/declare_treatment = 0 //When attempting to treat a patient, should it notify everyone wearing medhuds?
// Are we tipped over?
+1 -1
View File
@@ -695,7 +695,7 @@
if(toxins_pp > safe_toxins_max)
var/ratio = (poison/safe_toxins_max) * 10
if(reagents)
reagents.add_reagent("toxin", CLAMP(ratio, MIN_TOXIN_DAMAGE, MAX_TOXIN_DAMAGE))
reagents.add_reagent(REAGENT_ID_TOXIN, CLAMP(ratio, MIN_TOXIN_DAMAGE, MAX_TOXIN_DAMAGE))
breath.adjust_gas(poison_type, -poison/6, update = 0) //update after
throw_alert("tox_in_air", /obj/screen/alert/tox_in_air)
else
@@ -221,7 +221,7 @@
if(toxins_pp > safe_toxins_max)
var/ratio = (poison/safe_toxins_max) * 10
if(H.reagents)
H.reagents.add_reagent("toxin", CLAMP(ratio, MIN_TOXIN_DAMAGE, MAX_TOXIN_DAMAGE))
H.reagents.add_reagent(REAGENT_ID_TOXIN, CLAMP(ratio, MIN_TOXIN_DAMAGE, MAX_TOXIN_DAMAGE))
breath.adjust_gas(poison_type, -poison/6, update = 0) //update after
H.throw_alert("tox_in_air", /obj/screen/alert/tox_in_air)
else
@@ -36,7 +36,7 @@ var/datum/species/shapeshifter/promethean/prometheans
assisted_langs = list(LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX) // Prometheans are weird, let's just assume they can use basically any language.
blood_name = "gelatinous ooze"
blood_reagents = "slimejelly"
blood_reagents = REAGENT_ID_SLIMEJELLY
breath_type = null
poison_type = null
@@ -177,7 +177,7 @@
H.trait_injection_reagents += REAGENT_ID_ANDROROVIR // -> MALE
H.trait_injection_reagents += REAGENT_ID_GYNOROVIR // -> FEMALE
H.trait_injection_reagents += REAGENT_ID_ANDROGYNOROVIR // -> PLURAL
H.trait_injection_reagents += "stoxin" // night night chem
H.trait_injection_reagents += REAGENT_ID_STOXIN // night night chem
H.trait_injection_reagents += REAGENT_ID_RAINBOWTOXIN // Funny flashing lights.
H.trait_injection_reagents += REAGENT_ID_PARALYSISTOXIN // Paralysis!
H.trait_injection_reagents += REAGENT_ID_PAINENZYME // Pain INCREASER
@@ -29,7 +29,7 @@
/obj/item/slime_extract/New()
..()
create_reagents(5)
// reagents.add_reagent("slimejelly", 30)
// reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 30)
/obj/item/slime_extract/grey
name = "grey slime extract"
@@ -359,7 +359,7 @@
/obj/item/reagent_containers/food/snacks/egg/slime/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 4)
reagents.add_reagent("slimejelly", 1)
reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 1)
addtimer(CALLBACK(src, ./proc/Grow), rand(120 SECONDS, 150 SECONDS))
/obj/item/reagent_containers/food/snacks/egg/slime/proc/Grow()
@@ -634,7 +634,7 @@ var/global/list/robot_modules = list(
var/datum/reagents/R = new/datum/reagents(50)
PB.reagents = R
R.my_atom = PB
R.add_reagent("beer2", 50)
R.add_reagent(REAGENT_ID_BEER2, 50)
PB.name = "Auntie Hong's Final Sip"
PB.desc = "A bottle of very special mix of alcohol and poison. Some may argue that there's alcohol to die for, but Auntie Hong took it to next level."
@@ -645,7 +645,7 @@ var/global/list/robot_modules = list(
/obj/item/robot_module/robot/clerical/butler/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
var/obj/item/reagent_containers/food/drinks/bottle/small/beer/PB = locate() in src.emag
if(PB)
PB.reagents.add_reagent("beer2", 2 * amount)
PB.reagents.add_reagent(REAGENT_ID_BEER2, 2 * amount)
/obj/item/robot_module/robot/clerical/general
name = "clerical robot module"
@@ -59,7 +59,7 @@
special_attack_cooldown = 6 SECONDS
ai_holder_type = /datum/ai_holder/simple_mob/intentional/giant_spider_broodmother
poison_per_bite = 2
poison_type = "cyanide"
poison_type = REAGENT_ID_CYANIDE
loot_list = list(/obj/item/royal_spider_egg = 100)
@@ -27,7 +27,7 @@
melee_damage_upper = 25
poison_per_bite = 3
poison_type = "chloralhydrate"
poison_type = REAGENT_ID_CHLORALHYDRATE
movement_cooldown = 2
@@ -39,7 +39,7 @@
poison_chance = 15
poison_per_bite = 3
poison_type = "stimm"
poison_type = REAGENT_ID_STIMM
shock_resist = 0.75
@@ -38,7 +38,7 @@
melee_damage_lower = 10
melee_damage_upper = 10
poison_chance = 30
poison_type = "cryptobiolin"
poison_type = REAGENT_ID_CRYPTOBIOLIN
poison_per_bite = 1
player_msg = "You have an imperfect, but automatic stealth. If you attack something while 'hidden', then \
@@ -38,7 +38,7 @@
melee_damage_lower = 5 // Doesn't do a lot of damage, since the goal is to make more spiders with egg attacks.
melee_damage_upper = 10
poison_per_bite = 5
poison_type = "stoxin"
poison_type = REAGENT_ID_STOXIN
player_msg = "You can spin webs on an adjacent tile, or cocoon an object by clicking on it.<br>\
You can also cocoon a dying or dead entity by clicking on them, and you will gain charges for egg-laying.<br>\
@@ -27,8 +27,8 @@
poison_chance = 20
poison_per_bite = 5
poison_type = "condensedcapsaicin_v"
poison_type = REAGENT_ID_CONDENSEDCAPSAICINV
/mob/living/simple_mob/animal/giant_spider/pepper/Initialize()
adjust_scale(1.1)
return ..()
return ..()
@@ -35,4 +35,4 @@
poison_chance = 30
poison_per_bite = 1
poison_type = "thermite_v"
poison_type = REAGENT_ID_THERMITEV
@@ -40,7 +40,7 @@
poison_chance = 15
poison_per_bite = 3
poison_type = "serotrotium_v"
poison_type = REAGENT_ID_SEROTROTIUMV
// ai_holder_type = /datum/ai_holder/simple_mob/melee/tunneler
@@ -7,8 +7,8 @@
/mob/living/simple_mob/animal/passive/fish/koi/poisonous/Initialize()
. = ..()
create_reagents(60)
reagents.add_reagent("toxin", 45)
reagents.add_reagent("impedrezene", 15)
reagents.add_reagent(REAGENT_ID_TOXIN, 45)
reagents.add_reagent(REAGENT_ID_IMPEDREZENE, 15)
/mob/living/simple_mob/animal/passive/fish/koi/poisonous/Life()
..()
@@ -56,8 +56,8 @@
/mob/living/simple_mob/animal/passive/fish/koi/poisonous/proc/sting(var/mob/living/M)
if(!M.reagents)
return 0
M.reagents.add_reagent("toxin", 2)
M.reagents.add_reagent("impedrezene", 1)
M.reagents.add_reagent(REAGENT_ID_TOXIN, 2)
M.reagents.add_reagent(REAGENT_ID_IMPEDREZENE, 1)
return 1
/mob/living/simple_mob/animal/passive/fish/measelshark
@@ -493,7 +493,7 @@ var/global/list/wounds_being_tended_by_drakes = list()
for(var/obj/item/organ/external/E in H.organs)
if(E.status & ORGAN_BLEEDING)
E.organ_clamp()
H.bloodstr.add_reagent("sifsap", rand(1,2))
H.bloodstr.add_reagent(REAGENT_ID_SIFSAP, rand(1,2))
for(var/datum/wound/W in E.wounds)
W.salve()
W.disinfect()
@@ -49,7 +49,7 @@
var/list/bodypart_targets = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_TORSO,BP_GROIN,BP_HEAD)
var/infest_target = BP_TORSO // The currently chosen bodypart to infest.
var/mob/living/carbon/host // Our humble host.
var/list/produceable_chemicals = list("inaprovaline","anti_toxin","alkysine","bicaridine","tramadol","kelotane","leporazine",REAGENT_ID_IRON,REAGENT_ID_PHORON,"condensedcapsaicin_v","frostoil")
var/list/produceable_chemicals = list("inaprovaline","anti_toxin","alkysine","bicaridine","tramadol","kelotane","leporazine",REAGENT_ID_IRON,REAGENT_ID_PHORON,REAGENT_ID_CONDENSEDCAPSAICINV,"frostoil")
var/randomized_reagent = REAGENT_ID_IRON // The reagent chosen at random to be produced, if there's no one piloting the worm.
var/passive_reagent = "paracetamol" // Reagent passively produced by the leech. Should usually be a painkiller.
@@ -47,7 +47,7 @@
var/poison_chance = 100
var/poison_per_bite = 10
var/poison_type = "expired_medicine"
var/poison_type = REAGENT_ID_EXPIREDMEDICINE
/datum/say_list/disbot
speak = list("ATTEMPTING TO CONTACT A.R.K, ATTEMPT 1e26+3","DIRT SAMPLE COLLECTED, DIRT QUOTA 124871/155 CONFIRMED.")
@@ -8,7 +8,7 @@
color = "#CC23FF"
slime_color = "purple"
coretype = /obj/item/slime_extract/purple
reagent_injected = "toxin"
reagent_injected = REAGENT_ID_TOXIN
description_info = "This slime spreads a toxin when it attacks. A biosuit or other thick armor can protect from the toxic attack."
player_msg = "You <b>inject a harmful toxin</b> when attacking."
@@ -52,7 +52,7 @@
say_list_type = /datum/say_list/oregrub
var/poison_per_bite = 2.5
var/poison_type = "thermite_v" //burn baby burn
var/poison_type = REAGENT_ID_THERMITEV //burn baby burn
var/poison_chance = 50
var/min_ore = 4