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
@@ -24,7 +24,7 @@
 	var/custom_name

 	if(icon_state == "daki_base")
-		body_choice = input("Pick a body.") in dakimakura_options
+		body_choice = tgui_input_list(user, "Pick a body.", "", dakimakura_options)
 		icon_state = "daki_[body_choice]"
 		custom_name = stripped_input(user, "What's her name?")
 		if(length(custom_name) > MAX_NAME_LEN)