From 68f64d3d842f71e2abfe2a59a481a8f9175f09ae Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Mon, 31 Aug 2020 23:53:59 -0400 Subject: [PATCH] Update ship.dm --- code/modules/overmap/ships/computers/ship.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/overmap/ships/computers/ship.dm b/code/modules/overmap/ships/computers/ship.dm index 83d5d610ff8..5c886fb55af 100644 --- a/code/modules/overmap/ships/computers/ship.dm +++ b/code/modules/overmap/ships/computers/ship.dm @@ -69,14 +69,11 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov if(linked) apply_visual(user) user.reset_view(linked) -<<<<<<< HEAD user.set_machine(src) -======= if(isliving(user)) var/mob/living/L = user L.looking_elsewhere = 1 L.handle_vision() ->>>>>>> dbc006f... Stops meson/etc use with overmap consoles (#7591) user.set_viewsize(world.view + extra_view) GLOB.moved_event.register(user, src, /obj/machinery/computer/ship/proc/unlook) // TODO GLOB.stat_set_event.register(user, src, /obj/machinery/computer/ship/proc/unlook)