Merge branch 'master' into mapsyncs43293845982

code/datums/antagonists/datum_traitor.dm

@@ -301,11 +301,11 @@
 	var/TC_uses = 0
 	var/uplink_true = FALSE
 	var/purchases = ""
-	for(var/datum/component/uplink/H in GLOB.uplinks)
-		if(H.owner && H.owner == owner.key)
-			TC_uses += H.purchase_log.total_spent
-			uplink_true = TRUE
-			purchases += H.purchase_log.generate_render(FALSE)
+	var/datum/uplink_purchase_log/H = GLOB.uplink_purchase_logs_by_key[owner.key]
+	if(H)
+		TC_uses = H.total_spent
+		uplink_true = TRUE
+		purchases += H.generate_render(FALSE)
 
 	var/objectives_text = ""
 	if(objectives.len)//If the traitor had no objectives, don't need to process this.

code/datums/antagonists/nukeop.dm

@@ -303,14 +303,10 @@
 	var/TC_uses = 0
 	for(var/I in members)
 		var/datum/mind/syndicate = I
-		for(var/U in GLOB.uplinks)
-			var/datum/component/uplink/H = U
-			if(H.owner == syndicate.key)
-				TC_uses += H.purchase_log.total_spent
-				if(H.purchase_log)
-					purchases += H.purchase_log.generate_render(show_key = FALSE)
-				else
-					stack_trace("WARNING: Nuke Op uplink with no purchase_log Owner: [H.owner]")
+		var/datum/uplink_purchase_log/H = GLOB.uplink_purchase_logs_by_key[syndicate.key]
+		if(H)
+			TC_uses += H.total_spent
+			purchases += H.generate_render(show_key = FALSE)
 	text += printplayerlist(members)
 	text += "<br>"
 	text += "(Syndicates used [TC_uses] TC) [purchases]"

code/datums/components/squeek.dm

@@ -24,7 +24,8 @@
 	if(use_delay_override)
 		use_delay = use_delay_override
 
-	RegisterSignal(list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_BLOB_ACT, COMSIG_ATOM_HULK_ATTACK, COMSIG_PARENT_ATTACKBY, COMSIG_MOVABLE_CROSSED, COMSIG_MOVABLE_COLLIDE, COMSIG_MOVABLE_IMPACT, COMSIG_ITEM_ATTACK, COMSIG_ITEM_ATTACK_OBJ), .proc/play_squeak)
+	RegisterSignal(list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_BLOB_ACT, COMSIG_ATOM_HULK_ATTACK, COMSIG_PARENT_ATTACKBY, COMSIG_MOVABLE_COLLIDE, COMSIG_MOVABLE_IMPACT, COMSIG_ITEM_ATTACK, COMSIG_ITEM_ATTACK_OBJ), .proc/play_squeak)
+	RegisterSignal(COMSIG_MOVABLE_CROSSED, .proc/play_squeak_turf)
 	RegisterSignal(COMSIG_ITEM_ATTACK_SELF, .proc/use_squeak)
 	RegisterSignal(COMSIG_SHOES_STEP_ACTION, .proc/step_squeak)
 
@@ -42,6 +43,11 @@
 	else
 		steps++
 
+/datum/component/squeak/proc/play_squeak_turf()
+	var/atom/current_parent = parent
+	if(isturf(current_parent.loc))
+		play_squeak()
+
 /datum/component/squeak/proc/use_squeak()
 	if(last_use + use_delay < world.time)
 		last_use = world.time