From 2b8f976fd2ab403a7662538cb9bd3ed21a5fbdfa Mon Sep 17 00:00:00 2001 From: Tad Hardesty Date: Sat, 5 Sep 2020 02:41:05 -0700 Subject: [PATCH] Make Cinematic verb cancellable (#53411) --- code/modules/admin/verbs/cinematic.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/admin/verbs/cinematic.dm b/code/modules/admin/verbs/cinematic.dm index 455cfaaedd7..bff36bf605a 100644 --- a/code/modules/admin/verbs/cinematic.dm +++ b/code/modules/admin/verbs/cinematic.dm @@ -1,11 +1,11 @@ /client/proc/cinematic() - set name = "cinematic" + set name = "Cinematic" set category = "Fun" set desc = "Shows a cinematic." // Intended for testing but I thought it might be nice for events on the rare occasion Feel free to comment it out if it's not wanted. set hidden = 1 if(!SSticker) return - var/datum/cinematic/choice = input(src,"Cinematic","Choose",null) as anything in sortList(subtypesof(/datum/cinematic), /proc/cmp_typepaths_asc) + var/datum/cinematic/choice = input(src,"Cinematic","Choose",null) as null|anything in sortList(subtypesof(/datum/cinematic), /proc/cmp_typepaths_asc) if(choice) Cinematic(initial(choice.id),world,null)