Merge remote-tracking branch 'upstream/master' into familyport

2021-10-28 14:41:46 -04:00
parent c80d65df73 853ff1d8ad
commit 8978ee10fe
387 changed files with 1908 additions and 1658 deletions
@@ -232,7 +232,7 @@
 		return 0

 	var/list/modes = list("Off", "Binary vitals", "Exact vitals", "Tracking beacon")
-	var/switchMode = input("Select a sensor mode:", "Suit Sensor Mode", modes[sensor_mode + 1]) in modes
+	var/switchMode = tgui_input_list(usr, "Select a sensor mode:", "Suit Sensor Mode", modes)
 	if(get_dist(usr, src) > 1)
 		to_chat(usr, "<span class='warning'>You have moved too far away!</span>")
 		return