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

2019-11-15 00:36:50 +01:00
parent 09860d463f 364e267598
commit 6484eea339
447 changed files with 16075 additions and 3073 deletions
--- a/code/modules/unit_tests/spawn_humans.dm
+++ b/code/modules/unit_tests/spawn_humans.dm
@@ -1,7 +1,7 @@
 /datum/unit_test/spawn_humans/Run()
-    var/locs = block(run_loc_bottom_left, run_loc_top_right)
+	var/locs = block(run_loc_bottom_left, run_loc_top_right)

-    for(var/I in 1 to 5)
-        new /mob/living/carbon/human(pick(locs))
+	for(var/I in 1 to 5)
+		new /mob/living/carbon/human(pick(locs))

-    sleep(50)
+	sleep(50)