From 81a6233829a3cc8f13c1abcdf3d9644827948ebc Mon Sep 17 00:00:00 2001 From: Razgriz Date: Thu, 21 May 2020 03:35:56 -0700 Subject: [PATCH] Update ai.dm --- code/_onclick/hud/ai.dm | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/code/_onclick/hud/ai.dm b/code/_onclick/hud/ai.dm index 77d4108cb9..b71857a990 100644 --- a/code/_onclick/hud/ai.dm +++ b/code/_onclick/hud/ai.dm @@ -1,30 +1,3 @@ -<<<<<<< HEAD -/obj/screen/ai/multicam - name = "Multicamera Mode" - icon = 'icons/mob/screen_ai.dmi' - icon_state = "multicam" - -/obj/screen/ai/multicam/Click() - if(..()) - return - var/mob/living/silicon/ai/AI = usr - AI.toggle_multicam() - -/obj/screen/ai/add_multicam - name = "New Camera" - icon = 'icons/mob/screen_ai.dmi' - icon_state = "new_cam" - -/obj/screen/ai/add_multicam/Click() - if(..()) - return - var/mob/living/silicon/ai/AI = usr - AI.drop_new_multicam() - -/datum/hud/proc/ai_hud() - adding = list() - other = list() -======= /obj/screen/ai/multicam/Click() if(..()) return @@ -52,7 +25,6 @@ HUD.adding = list() HUD.other = list() ->>>>>>> e791692aea59a96b1b45c20d61974aa10493a7f6 var/obj/screen/using