Merge branch 'master' into spike-loot-differentces

This commit is contained in:
Trilbyspaceclone
2020-06-17 02:36:52 -04:00
committed by GitHub
374 changed files with 44895 additions and 39751 deletions
@@ -39,7 +39,6 @@
. += filling
/obj/item/reagent_containers/glass/bottle/epinephrine
name = "epinephrine bottle"
desc = "A small bottle. Contains epinephrine - used to stabilize patients."
@@ -227,6 +226,13 @@
desc = "A small bottle of atropine."
list_reagents = list(/datum/reagent/medicine/atropine = 30)
/obj/item/reagent_containers/glass/bottle/zeolites
name = "Zeolites bottle"
desc = "A small bottle of lab made Zeolite, which removes radiation from people quickly as well as contamination on items."
list_reagents = list(/datum/reagent/fermi/zeolites = 30)
// Viro bottles
/obj/item/reagent_containers/glass/bottle/romerol
name = "romerol bottle"
desc = "A small bottle of Romerol. The REAL zombie powder."