cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update ship.dm

Browse Source
This commit is contained in:
Novacat
2020-08-31 23:53:59 -04:00
committed by GitHub
parent 6d5c14c448
commit 68f64d3d84
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/overmap/ships/computers/ship.dm
View File

@@ -69,14 +69,11 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov
if(linked) if(linked)
apply_visual(user) apply_visual(user)
user.reset_view(linked) user.reset_view(linked)
<<<<<<< HEAD
user.set_machine(src) user.set_machine(src)
=======
if(isliving(user)) if(isliving(user))
var/mob/living/L = user var/mob/living/L = user
L.looking_elsewhere = 1 L.looking_elsewhere = 1
L.handle_vision() L.handle_vision()
>>>>>>> dbc006f... Stops meson/etc use with overmap consoles (#7591)
user.set_viewsize(world.view + extra_view) user.set_viewsize(world.view + extra_view)
GLOB.moved_event.register(user, src, /obj/machinery/computer/ship/proc/unlook) 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) // TODO GLOB.stat_set_event.register(user, src, /obj/machinery/computer/ship/proc/unlook)