Skip to content

Commit

Permalink
Namefixes Alpha-Amanitin (#36756)
Browse files Browse the repository at this point in the history
* namefixes amanitin

* namefixes amanitin

* amanitin name fix

* amanitin namefix

* namefixes amanitin
  • Loading branch information
Eneocho authored Jul 18, 2024
1 parent 990b434 commit d67b7ac
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion __DEFINES/reagents.dm
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
#define POLYPGELATIN "polypgelatin"
#define COCO "coco"
#define AMATOXIN "amatoxin"
#define AMANATIN "amanatin"
#define AMANITIN "amanitin"
#define PSILOCYBIN "psilocybin"
#define SPRINKLES "sprinkles"
#define SYNDICREAM "syndicream"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/seeds.dm
Original file line number Diff line number Diff line change
Expand Up @@ -921,7 +921,7 @@
plant_dmi = 'icons/obj/hydroponics/angel.dmi'
mutants = null
products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/angel)
chems = list(NUTRIMENT = list(1,50), AMANATIN = list(1,3))
chems = list(NUTRIMENT = list(1,50), AMANITIN = list(1,3))

maturation = 12
yield = 2
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/simple_animal/bees/bees_species.dm
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
PACID = 3,
CYANIDE = 4,
AMATOXIN = 2,
AMANATIN = 3,
AMANITIN = 3,
POISONBERRYJUICE = 2,
CARPOTOXIN = 2,
ZOMBIEPOWDER = 3,
Expand Down
2 changes: 1 addition & 1 deletion code/modules/reagents/Chemistry-Recipes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3911,7 +3911,7 @@
name = "Ironrot"
id = IRONROT
result = IRONROT
required_reagents = list(AMANATIN = 1, RADIUM = 1, IRON = 1)
required_reagents = list(AMANITIN = 1, RADIUM = 1, IRON = 1)
result_amount = 3

/datum/chemical_reaction/aminomicin
Expand Down
8 changes: 4 additions & 4 deletions code/modules/reagents/reagents/reagents_toxin.dm
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
//Poisonous chemicals

/datum/reagent/amanatin
name = "Alpha-Amanatin"
id = AMANATIN
/datum/reagent/amanitin
name = "Alpha-Amanitin"
id = AMANITIN
description = "A deadly poison derived from certain species of Amanita. Sits in the victim's system for a long period of time, then ravages the body."
color = "#792300" //rgb: 121, 35, 0
custom_metabolism = 0.01
var/activated = 0

/datum/reagent/amanatin/on_mob_life(var/mob/living/M)
/datum/reagent/amanitin/on_mob_life(var/mob/living/M)
if(..())
return 1

Expand Down

0 comments on commit d67b7ac

Please sign in to comment.