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

2020-07-23 10:26:03 -07:00
parent 4373e2b452 678a1d0a49
commit ffd44b78ba
291 changed files with 5170 additions and 1010 deletions
@@ -2,7 +2,7 @@
 /datum/round_event_control/stray_cargo
 	name = "Stray Cargo Pod"
 	typepath = /datum/round_event/stray_cargo
-	weight = 20
+	weight = 5
 	max_occurrences = 4
 	earliest_start = 10 MINUTES