Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into quick-fix

2020-01-10 00:09:24 -05:00
parent 48abd31dee b522cfafb8
commit f11cc9bcee
466 changed files with 6219 additions and 6356 deletions
@@ -28,7 +28,7 @@
 "g" = (
 /obj/structure/reagent_dispensers/water_cooler{
 	name = "punch cooler";
-	reagent_id = "bacchus_blessing"
+	reagent_id = /datum/reagent/consumable/ethanol/bacchus_blessing
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood{
@@ -3410,7 +3410,7 @@
 "lq" = (
 /obj/structure/table,
 /obj/item/reagent_containers/glass/beaker{
-	list_reagents = list("sacid" = 50)
+	list_reagents = list(/datum/reagent/toxin/acid = 50)
 	},
 /obj/item/paper/crumpled/bloody/ruins/thederelict/unfinished,
 /obj/item/pen,