Merge pull request #3822 from Citadel-Station-13/upstream-merge-32379

[MIRROR] Scale fullscreen overlays to the view size
This commit is contained in:
LetterJay
2017-11-09 03:24:57 -06:00
committed by GitHub
3 changed files with 182 additions and 177 deletions
+3
View File
@@ -672,6 +672,9 @@ GLOBAL_LIST(external_rsc_urls)
view = new_size
apply_clickcatcher()
if (isliving(mob))
var/mob/living/M = mob
M.update_damage_hud()
/client/proc/generate_clickcatcher()
if(!void)
+2 -2
View File
@@ -64,7 +64,7 @@
var/mob/camera/aiEye/remote/shuttle_docker/the_eye = eyeobj
user.client.images += the_eye.placement_images
user.client.images += the_eye.placed_images
user.client.view = view_range
user.client.change_view(view_range)
/obj/machinery/computer/camera_advanced/shuttle_docker/remove_eye_control(mob/living/user)
..()
@@ -72,7 +72,7 @@
var/mob/camera/aiEye/remote/shuttle_docker/the_eye = eyeobj
user.client.images -= the_eye.placement_images
user.client.images -= the_eye.placed_images
user.client.view = world.view
user.client.change_view(world.view)
/obj/machinery/computer/camera_advanced/shuttle_docker/proc/placeLandingSpot()
if(!checkLandingSpot())