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

2020-01-10 02:26:19 +01:00
parent 592422ee70 ee5d6a3d4a
commit 825b4f01c2
178 changed files with 10647 additions and 1134 deletions
@@ -8,6 +8,7 @@
 	reagent_flags = REFILLABLE | DRAINABLE
 	amount_per_transfer_from_this = 5
 	possible_transfer_amounts = list()
+	APTFT_altclick = FALSE
 	volume = 5
 	spillable = FALSE
 	var/wipe_sound