diff --git a/code/game/objects/items/random_items.dm b/code/game/objects/items/random_items.dm index 8a638a8176a..62f84eff0dd 100644 --- a/code/game/objects/items/random_items.dm +++ b/code/game/objects/items/random_items.dm @@ -61,7 +61,7 @@ // identify_probability = 0 New() ..() - var/global/list/chems_only = list("slimejelly","blood","water","lube","charcoal","toxin","cyanide","morphine","epinephrine","space_drugs","serotrotium","oxygen","copper","nitrogen","hydrogen","potassium","mercury","sulfur","carbon","chlorine","fluorine","sodium","phosphorus","lithium","sugar","sacid","facid","glycerol","radium","mutadone","thermite","mutagen","virusfood","iron","gold","silver","uranium","aluminum","silicon","fuel","cleaner","atrazine","plasma","teporone","cryptobiolin","lexorin","silver_sulfadiazine","salbutamol","perfluorodecalin","omnizine","synaptizine","haloperidol","potass_iodide","pen_acid","mannitol","oculine","styptic_powder","methamphetamine","cryoxadone","clonexadone","spaceacillin","carpotoxin","mindbreaker","fluorosurfactant","foaming_agent","ethanol","ammonia","diethylamine","antihol","pancuronium","lipolicide","condensedcapsaicin","frostoil","amatoxin","psilocybin","enzyme","nothing","salglu_solution","antifreeze","neurotoxin") + var/global/list/chems_only = list("slimejelly","blood","water","lube","charcoal","toxin","cyanide","morphine","epinephrine","space_drugs","serotrotium","oxygen","copper","nitrogen","hydrogen","potassium","mercury","sulfur","carbon","chlorine","fluorine","sodium","phosphorus","lithium","sugar","sacid","facid","glycerol","radium","mutadone","thermite","mutagen","virusfood","iron","gold","silver","uranium","aluminum","silicon","fuel","cleaner","atrazine","plasma","teporone","cryptobiolin","lexorin","silver_sulfadiazine","salbutamol","perfluorodecalin","omnizine","synaptizine","haloperidol","potass_iodide","pen_acid","mannitol","oculine","styptic_powder","methamphetamine","cryoxadone","clonexadone","spaceacillin","carpotoxin","mindbreaker","fluorosurfactant","foaming_agent","ethanol","ammonia","diethylamine","antihol","pancuronium","lipolicide","condensedcapsaicin","frostoil","amanitin","psilocybin","enzyme","nothing","salglu_solution","antifreeze","neurotoxin") var/global/list/rare_chems = list("minttoxin","nanites","xenomicrobes","adminordrazine") var/datum/reagent/R = pick(chems_only + rare_chems) @@ -123,7 +123,7 @@ New() ..() - var/global/list/meds_only = list("charcoal","toxin","cyanide","morphine","epinephrine","space_drugs","serotrotium","mutadone","mutagen","teporone","cryptobiolin","lexorin","silver_sulfadiazine","salbutamol","perfluorodecalin","omnizine","synaptizine","haloperidol","potass_iodide","pen_acid","mannitol","oculine","styptic_powder","methamphetamine","spaceacillin","carpotoxin","mindbreaker","ethanol","ammonia","diethylamine","antihol","pancuronium","lipolicide","condensedcapsaicin","frostoil","amatoxin","psilocybin","nothing","salglu_solution","neurotoxin") + var/global/list/meds_only = list("charcoal","toxin","cyanide","morphine","epinephrine","space_drugs","serotrotium","mutadone","mutagen","teporone","cryptobiolin","lexorin","silver_sulfadiazine","salbutamol","perfluorodecalin","omnizine","synaptizine","haloperidol","potass_iodide","pen_acid","mannitol","oculine","styptic_powder","methamphetamine","spaceacillin","carpotoxin","mindbreaker","ethanol","ammonia","diethylamine","antihol","pancuronium","lipolicide","condensedcapsaicin","frostoil","amanitin","psilocybin","nothing","salglu_solution","neurotoxin") var/global/list/rare_meds = list("nanites","xenomicrobes","minttoxin","adminordrazine","blood") var/i = 1 diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 92990626a0e..27e3b00b489 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -73,6 +73,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM ..() flags |= NOREACT // so it doesn't react until you light it create_reagents(chem_volume) // making the cigarrete a chemical holder with a maximum volume of 15 + reagents.add_reagent("nicotine", 15) /obj/item/clothing/mask/cigarette/Destroy() ..() diff --git a/code/modules/events/tgevents/vent_clog.dm b/code/modules/events/tgevents/vent_clog.dm index ea1145c8723..10b25a37eb8 100755 --- a/code/modules/events/tgevents/vent_clog.dm +++ b/code/modules/events/tgevents/vent_clog.dm @@ -24,7 +24,7 @@ "atrazine","banana","charcoal","space_drugs","methamphetamine","holywater","ethanol","hot_coco","facid", "blood","morphine","fluorine","mutadone","mutagen","hydrocodone","fuel","cryptobiolin", "haloperidol","mindbreaker","nanites","lipolicide","frostoil","salglu_solution","beepskysmash", - "omnizine", "amatoxin", "adminordrazine", "neurotoxin", "synaptizine") + "omnizine", "amanitin", "adminordrazine", "neurotoxin", "synaptizine") var/datum/reagents/R = new/datum/reagents(50) R.my_atom = vent R.add_reagent(pick(gunk), 50) diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index f29a2579a77..30a4f0ebcd2 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -629,7 +629,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/amanitajelly make_food(var/obj/container as obj) var/obj/item/weapon/reagent_containers/food/snacks/amanitajelly/being_cooked = ..(container) - being_cooked.reagents.del_reagent("amatoxin") + being_cooked.reagents.del_reagent("amanitin") return being_cooked /datum/recipe/microwave/meatballsoup diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm index eec48cc8521..a5bd0ecc58b 100644 --- a/code/modules/hydroponics/seed_datums.dm +++ b/code/modules/hydroponics/seed_datums.dm @@ -838,7 +838,7 @@ proc/populate_seed_list() mutants = list("destroyingangel","plastic") packet_icon = "mycelium-amanita" plant_icon = "amanita" - chems = list("nutriment" = list(1), "amatoxin" = list(3,3), "psilocybin" = list(1,25)) + chems = list("nutriment" = list(1), "amanitin" = list(3,3), "psilocybin" = list(1,25)) lifespan = 50 maturation = 10 @@ -854,7 +854,7 @@ proc/populate_seed_list() products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/angel) packet_icon = "mycelium-angel" plant_icon = "angel" - chems = list("nutriment" = list(1,50), "amatoxin" = list(13,3), "psilocybin" = list(1,25)) + chems = list("nutriment" = list(1,50), "amanitin" = list(13,3), "psilocybin" = list(1,25)) maturation = 12 yield = 2 diff --git a/code/modules/organs/organ_internal.dm b/code/modules/organs/organ_internal.dm index 73fe9200227..fda0d31051d 100644 --- a/code/modules/organs/organ_internal.dm +++ b/code/modules/organs/organ_internal.dm @@ -213,7 +213,7 @@ owner.adjustToxLoss(0.1 * process_accuracy) // Can't cope with toxins at all - for(var/toxin in list("toxin", "plasma", "sacid", "facid", "cyanide", "amatoxin", "carpotoxin", "mindbreaker")) + for(var/toxin in list("toxin", "plasma", "sacid", "facid", "cyanide", "amanitin", "carpotoxin", "mindbreaker")) if(owner.reagents.has_reagent(toxin)) owner.adjustToxLoss(0.3 * process_accuracy) diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index ef6f573a79e..1588cbb14f7 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -1464,13 +1464,6 @@ datum reagent_state = SOLID color = "#664B63" // rgb: 102, 75, 99 - nicotine - name = "Nicotine" - id = "nicotine" - description = "A highly addictive stimulant extracted from the tobacco plant." - reagent_state = LIQUID - color = "#181818" // rgb: 24, 24, 24 - ammonia name = "Ammonia" id = "ammonia" @@ -1735,32 +1728,6 @@ datum ..() return - amatoxin - name = "Amanitin" - id = "amatoxin" - description = "A powerful poison derived from certain species of mushroom." - color = "#792300" // rgb: 121, 35, 0 - - on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - if(!data) data = 1 - data++ - ..() - return - - Del() - if(holder) - if (istype(holder.my_atom,/mob/living)) - var/mob/living/M as mob - var/to_remove = 0 - if (holder.has_reagent("charcoal")) - to_remove = min(holder.get_reagent_amount("charcoal"),data) - holder.remove_reagent("charcoal", to_remove, 0) - data -= to_remove - if(M) - M.adjustToxLoss((data-1)*rand(2,4)) - ..() - psilocybin name = "Psilocybin" id = "psilocybin" diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 23996ac4a7a..b0049ffb723 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -1073,7 +1073,7 @@ New() ..() reagents.add_reagent("nutriment", 5) - reagents.add_reagent("amatoxin", 3) + reagents.add_reagent("amanitin", 3) reagents.add_reagent("psilocybin", 1) bitesize = 3 @@ -1408,7 +1408,7 @@ New() ..() reagents.add_reagent("nutriment", 6) - reagents.add_reagent("amatoxin", 6) + reagents.add_reagent("amanitin", 6) reagents.add_reagent("psilocybin", 3) bitesize = 3