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

2021-11-05 10:50:08 -04:00
parent 8978ee10fe 1df1b680a6
commit 9153115566
431 changed files with 1464 additions and 1886 deletions
@@ -232,7 +232,7 @@
 		return 0

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