Merge remote-tracking branch 'citadel/master' into combat_v7

This commit is contained in:
silicons
2021-04-26 14:17:43 -07:00
480 changed files with 310849 additions and 306446 deletions
@@ -453,3 +453,8 @@
/obj/item/reagent_containers/glass/bottle/ichor/green
name = "green potion"
list_reagents = list(/datum/reagent/green_ichor = 1)
/obj/item/reagent_containers/glass/bottle/thermite
name = "thermite bottle"
list_reagents = list(/datum/reagent/thermite = 30)