Merge remote-tracking branch 'upstream/master' into TGUI-3.0

2020-05-30 18:52:02 +03:00
parent a6d7a33669 266707b119
commit 19f215477e
361 changed files with 10271 additions and 3115 deletions
@@ -40,6 +40,7 @@
 		/datum/reagent/pax,
 		/datum/reagent/consumable/laughter,
 		/datum/reagent/concentrated_barbers_aid,
+		/datum/reagent/baldium,
 		/datum/reagent/colorful_reagent,
 		/datum/reagent/peaceborg_confuse,
 		/datum/reagent/peaceborg_tire,