Merge pull request #1775 from Markolie/cult

Cult loyalty implant fix, other fixes
This commit is contained in:
Fox-McCloud
2015-08-17 17:12:46 -04:00
8 changed files with 28 additions and 20 deletions
+1 -1
View File
@@ -913,7 +913,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
choice = input("Is this an emergency evacuation or a crew transfer?") in list("Emergency", "Crew Transfer")
if (choice == "Emergency")
var/reason = stripped_input(usr, "Optional: Please enter the reason for calling the shuttle.", "Shuttle Call Reason.","") as text|null
var/reason = input(usr, "Optional: Please enter the reason for calling the shuttle.", "Shuttle Call Reason.","") as text|null
emergency_shuttle.call_evac(reason)
else
emergency_shuttle.call_transfer()