cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-29 23:17:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

toxins.dm

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/xenoarcheaology/effect_master.dm
+2 -2
View File
@@ -305,7 +305,7 @@
else if(W.reagents.has_reagent(REAGENT_ID_PHORON, 1) || W.reagents.has_reagent(REAGENT_ID_THERMITE, 1))
if(my_effect.trigger == TRIGGER_VOLATILE)
my_effect.ToggleActivate()
else if(W.reagents.has_reagent("toxin", 1) || W.reagents.has_reagent("cyanide", 1) || W.reagents.has_reagent("amatoxin", 1) || W.reagents.has_reagent("neurotoxin", 1))
else if(W.reagents.has_reagent(REAGENT_ID_TOXIN, 1) || W.reagents.has_reagent(REAGENT_ID_CYANIDE, 1) || W.reagents.has_reagent(REAGENT_ID_AMATOXIN, 1) || W.reagents.has_reagent("neurotoxin", 1))
if(my_effect.trigger == TRIGGER_TOXIN)
my_effect.ToggleActivate()
else if(istype(W,/obj/item/melee/baton) && W:status ||\
@@ -330,7 +330,7 @@
var/list/water = list(REAGENT_ID_HYDROGEN, REAGENT_ID_WATER)
var/list/acid = list(REAGENT_ID_SACID, REAGENT_ID_PACID, REAGENT_ID_DIETHYLAMINE)
var/list/volatile = list(REAGENT_ID_PHORON,REAGENT_ID_THERMITE)
var/list/toxic = list("toxin","cyanide","amatoxin","neurotoxin")
var/list/toxic = list(REAGENT_ID_TOXIN,REAGENT_ID_CYANIDE,REAGENT_ID_AMATOXIN,"neurotoxin")
for(var/datum/artifact_effect/my_effect in my_effects)
if(Touching.id in water)
code/modules/xenoarcheaology/finds/special.dm
+1 -1
View File
@@ -8,7 +8,7 @@
/obj/item/reagent_containers/glass/replenishing/Initialize()
. = ..()
START_PROCESSING(SSobj, src)
spawning_id = pick(REAGENT_ID_BLOOD,REAGENT_ID_HOLYWATER,REAGENT_ID_LUBE,"stoxin",REAGENT_ID_ETHANOL,"ice",REAGENT_ID_GLYCEROL,REAGENT_ID_FUEL,REAGENT_ID_CLEANER)
spawning_id = pick(REAGENT_ID_BLOOD,REAGENT_ID_HOLYWATER,REAGENT_ID_LUBE,REAGENT_ID_STOXIN,REAGENT_ID_ETHANOL,"ice",REAGENT_ID_GLYCEROL,REAGENT_ID_FUEL,REAGENT_ID_CLEANER)
/obj/item/reagent_containers/glass/replenishing/process()
reagents.add_reagent(spawning_id, 0.3)