From ec3fc4441c063dcc1917f585dac1a2a40a77bf41 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 26 Sep 2017 14:02:49 -0500 Subject: [PATCH] Update cinematic.dm --- code/modules/admin/verbs/cinematic.dm | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/code/modules/admin/verbs/cinematic.dm b/code/modules/admin/verbs/cinematic.dm index 58b60277c0..7093ee23ea 100644 --- a/code/modules/admin/verbs/cinematic.dm +++ b/code/modules/admin/verbs/cinematic.dm @@ -1,23 +1,3 @@ -<<<<<<< HEAD -/client/proc/cinematic(cinematic as anything in list("explosion",null)) - 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 - switch(cinematic) - if("explosion") - var/parameter = input(src,"station_missed = ?","Enter Parameter",0) as num - var/override - switch(parameter) - if(1) - override = input(src,"mode = ?","Enter Parameter",null) as anything in list("nuclear emergency","gang war","fake","no override") - if(0) - override = input(src,"mode = ?","Enter Parameter",null) as anything in list("blob","nuclear emergency","AI malfunction","no override") - SSticker.station_explosion_cinematic(parameter,override) - return -======= /client/proc/cinematic() set name = "cinematic" set category = "Fun" @@ -28,5 +8,4 @@ var/datum/cinematic/choice = input(src,"Cinematic","Choose",null) as anything in subtypesof(/datum/cinematic) if(choice) - Cinematic(initial(choice.id),world,null) ->>>>>>> 1304e83... Refactors cinematics. (#30888) + Cinematic(initial(choice.id),world,null)