Merge pull request #11199 from Detective-Google/pai.pai.pai.png

Lets pAIs hold encryption keys and play music.
2020-02-24 02:23:17 -07:00
parent 5037f28eaf ca29246878
commit 73c03adbbb
7 changed files with 69 additions and 10 deletions
@@ -301,10 +301,7 @@
 /datum/action/item_action/synthswitch/Trigger()
 	if(istype(target, /obj/item/instrument/piano_synth))
 		var/obj/item/instrument/piano_synth/synth = target
-		var/chosen = input("Choose the type of instrument you want to use", "Instrument Selection", "piano") as null|anything in synth.insTypes
-		if(!synth.insTypes[chosen])
-			return
-		return synth.changeInstrument(chosen)
+		return synth.selectInstrument()
 	return ..()

 /datum/action/item_action/vortex_recall
@@ -827,4 +824,4 @@
 	for(var/datum/action/A in M.actions)
 		if(istype(A, action_type))
 			return A
-	return 
+	return