mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-21 02:57:48 +01:00
Refactors some reagent lists into global list
Fixes an oversight with fly amanita from the BAYBOTANY to TGBOTANY change.
This commit is contained in:
@@ -372,7 +372,7 @@
|
||||
/obj/machinery/chem_master/proc/chemical_safety_check(datum/reagents/R)
|
||||
var/all_safe = 1
|
||||
for(var/datum/reagent/A in R.reagent_list)
|
||||
if(!safe_chem_list.Find(A.id))
|
||||
if(!GLOB.safe_chem_list.Find(A.id))
|
||||
all_safe = 0
|
||||
return all_safe
|
||||
|
||||
|
||||
@@ -6,9 +6,21 @@
|
||||
color = "#CF3600" // rgb: 207, 54, 0
|
||||
|
||||
/datum/reagent/toxin/on_mob_life(mob/living/M)
|
||||
M.adjustToxLoss(2)
|
||||
M.adjustToxLoss(2*REAGENTS_EFFECT_MULTIPLIER)
|
||||
..()
|
||||
|
||||
/datum/reagent/amatoxin
|
||||
name = "Amatoxin"
|
||||
id = "amatoxin"
|
||||
description = "A powerful poison derived from certain species of mushroom."
|
||||
reagent_state = LIQUID
|
||||
color = "#792300" // rgb: 121, 35, 0
|
||||
|
||||
/datum/reagent/amatoxin/on_mob_life(mob/living/M)
|
||||
M.adjustToxLoss(3*REAGENTS_EFFECT_MULTIPLIER)
|
||||
..()
|
||||
|
||||
|
||||
/datum/reagent/spider_venom
|
||||
name = "Spider venom"
|
||||
id = "spidertoxin"
|
||||
|
||||
@@ -52,7 +52,7 @@
|
||||
if(safety_hypo && !emagged)
|
||||
var/found_forbidden_reagent = FALSE
|
||||
for(var/datum/reagent/R in reagents.reagent_list)
|
||||
if(!safe_chem_list.Find(R.id))
|
||||
if(!GLOB.safe_chem_list.Find(R.id))
|
||||
reagents.del_reagent(R.id)
|
||||
found_forbidden_reagent = TRUE
|
||||
if(found_forbidden_reagent)
|
||||
|
||||
Reference in New Issue
Block a user