Updates to tgstation commit 78e471d

code/controllers/subsystem/blackbox.dm

@@ -20,6 +20,7 @@ SUBSYSTEM_DEF(blackbox)
 	record_feedback("amount", "random_seed", Master.random_seed)
 	record_feedback("amount", "dm_version", DM_VERSION)
 	record_feedback("amount", "byond_version", world.byond_version)
+	record_feedback("amount", "byond_build", world.byond_build)
 	. = ..()
 
 //poll population

code/controllers/subsystem/dcs.dm

@@ -2,34 +2,5 @@ SUBSYSTEM_DEF(dcs)
 	name = "Datum Component System"
 	flags = SS_NO_INIT | SS_NO_FIRE
 
-	var/list/comp_lookup = list()	// A signal:list(components) assoc list
-
-/datum/controller/subsystem/dcs/proc/_SendGlobalSignal(sigtype, list/arguments)
-	. = NONE
-	for(var/i in comp_lookup[sigtype])
-		var/datum/component/comp = i
-		if(!comp.enabled)
-			continue
-		var/datum/callback/CB = comp.signal_procs[sigtype]
-		if(!CB)
-			continue // Should we error from this?
-		. |= CB.InvokeAsync(arglist(arguments))
-
-/datum/controller/subsystem/dcs/proc/RegisterSignal(datum/component/comp, sigtype)
-	if(!comp_lookup[sigtype])
-		comp_lookup[sigtype] = list()
-	
-	comp_lookup[sigtype][comp] = TRUE
-
-/datum/controller/subsystem/dcs/proc/UnregisterSignal(datum/component/comp, list/sigtypes)
-	if(!length(sigtypes))
-		sigtypes = list(sigtypes)
-	for(var/sigtype in sigtypes)
-		switch(length(comp_lookup[sigtype]))
-			if(1)
-				comp_lookup -= sigtype
-			if(2 to INFINITY)
-				comp_lookup[sigtype] -= comp
-
 /datum/controller/subsystem/dcs/Recover()
 	comp_lookup = SSdcs.comp_lookup

code/controllers/subsystem/mapping.dm

@@ -49,7 +49,11 @@ SUBSYSTEM_DEF(mapping)
 	if(initialized)
 		return
 	if(config.defaulted)
-		to_chat(world, "<span class='boldannounce'>Unable to load next map config, defaulting to Box Station</span>")
+		var/old_config = config
+		config = global.config.defaultmap
+		if(!config || config.defaulted)
+			to_chat(world, "<span class='boldannounce'>Unable to load next or default map config, defaulting to Box Station</span>")
+			config = old_config
 	loader = new
 	loadWorld()
 	repopulate_sorted_areas()

code/controllers/subsystem/ticker.dm

@@ -392,8 +392,8 @@ SUBSYSTEM_DEF(ticker)
 				captainless=0
 			if(player.mind.assigned_role != player.mind.special_role)
 				SSjob.EquipRank(N, player.mind.assigned_role, 0)
-			if(CONFIG_GET(flag/roundstart_traits))
-				SSquirks.AssignQuirks(player, N.client, TRUE)
+			if(CONFIG_GET(flag/roundstart_traits) && ishuman(N.new_character))
+				SSquirks.AssignQuirks(N.new_character, N.client, TRUE)
 		CHECK_TICK
 	if(captainless)
 		for(var/mob/dead/new_player/N in GLOB.player_list)