From 1904080823bc767950de00a07e2fa05079a82881 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Tue, 5 Dec 2017 21:53:52 -0500 Subject: [PATCH] i fucked up - GLOBAL.DEFAULT_VIEW > GLOB.DEFAULT_VIEW --- code/game/mecha/mecha.dm | 2 +- code/game/objects/structures/manned_turret.dm | 2 +- code/modules/admin/verbs/randomverbs.dm | 2 +- code/modules/clothing/spacesuits/flightsuit.dm | 2 +- code/modules/mob/dead/observer/observer.dm | 4 ++-- code/modules/mob/login.dm | 2 +- code/modules/power/singularity/emitter.dm | 2 +- code/modules/projectiles/gun.dm | 2 +- code/modules/projectiles/guns/beam_rifle.dm | 2 +- code/modules/shuttle/navigation_computer.dm | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index a9303cf1952..4ed9934112f 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -970,7 +970,7 @@ setDir(dir_in) if(L && L.client) - L.client.change_view(GLOBAL.DEFAULT_VIEW) + L.client.change_view(GLOB.DEFAULT_VIEW) zoom_mode = 0 ///////////////////////// diff --git a/code/game/objects/structures/manned_turret.dm b/code/game/objects/structures/manned_turret.dm index 9c9b9e8afa7..a23a60b6c34 100644 --- a/code/game/objects/structures/manned_turret.dm +++ b/code/game/objects/structures/manned_turret.dm @@ -37,7 +37,7 @@ buckled_mob.pixel_x = 0 buckled_mob.pixel_y = 0 if(buckled_mob.client) - buckled_mob.client.change_view(GLOBAL.DEFAULT_VIEW) + buckled_mob.client.change_view(GLOB.DEFAULT_VIEW) anchored = FALSE . = ..() STOP_PROCESSING(SSfastprocess, src) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index b30ccecb44e..e7e562f327c 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -655,7 +655,7 @@ Traitors and the like can also be revived with the previous role mostly intact. if(view == world.view) change_view(input("Select view range:", "FUCK YE", 7) in list(1,2,3,4,5,6,7,8,9,10,11,12,13,14,128)) else - change_view(GLOBAL.DEFAULT_VIEW) + change_view(GLOB.DEFAULT_VIEW) log_admin("[key_name(usr)] changed their view range to [view].") //message_admins("\blue [key_name_admin(usr)] changed their view range to [view].") //why? removed by order of XSI diff --git a/code/modules/clothing/spacesuits/flightsuit.dm b/code/modules/clothing/spacesuits/flightsuit.dm index cb20e15d7c5..aaa8e8d9d34 100644 --- a/code/modules/clothing/spacesuits/flightsuit.dm +++ b/code/modules/clothing/spacesuits/flightsuit.dm @@ -1100,7 +1100,7 @@ /obj/item/clothing/head/helmet/space/hardsuit/flightsuit/proc/toggle_zoom(mob/living/user, force_off = FALSE) if(zoom || force_off) - user.client.change_view(GLOBAL.DEFAULT_VIEW) + user.client.change_view(GLOB.DEFAULT_VIEW) to_chat(user, "Disabling smart zooming image enhancement...") zoom = FALSE return FALSE diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index b75ea03a64d..9603478dbd3 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -319,7 +319,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(mind.current.key && copytext(mind.current.key,1,2)!="@") //makes sure we don't accidentally kick any clients to_chat(usr, "Another consciousness is in your body...It is resisting you.") return - client.change_view(GLOBAL.DEFAULT_VIEW) + client.change_view(GLOB.DEFAULT_VIEW) SStgui.on_transfer(src, mind.current) // Transfer NanoUIs. mind.current.key = key return 1 @@ -463,7 +463,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(new_view) client.change_view(Clamp(new_view, 7, max_view)) else - client.change_view(GLOBAL.DEFAULT_VIEW) + client.change_view(GLOB.DEFAULT_VIEW) /mob/dead/observer/verb/add_view_range(input as num) set name = "Add View Range" diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index 795e8f40df3..d99a717afbc 100644 --- a/code/modules/mob/login.dm +++ b/code/modules/mob/login.dm @@ -37,7 +37,7 @@ if(client) client.click_intercept = null - client.change_view(GLOBAL.DEFAULT_VIEW) // Resets the client.view in case it was changed. + client.change_view(GLOB.DEFAULT_VIEW) // Resets the client.view in case it was changed. if(!GLOB.individual_log_list[ckey]) GLOB.individual_log_list[ckey] = logging diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 76f8215e41c..a996657036d 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -335,7 +335,7 @@ buckled_mob.pixel_x = 0 buckled_mob.pixel_y = 0 if(buckled_mob.client) - buckled_mob.client.change_view(GLOBAL.DEFAULT_VIEW) + buckled_mob.client.change_view(GLOB.DEFAULT_VIEW) auto.Remove(buckled_mob) . = ..() diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 11267bee481..366c2704ca0 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -497,7 +497,7 @@ user.client.pixel_x = world.icon_size*_x user.client.pixel_y = world.icon_size*_y else - user.client.change_view(GLOBAL.DEFAULT_VIEW) + user.client.change_view(GLOB.DEFAULT_VIEW) user.client.pixel_x = 0 user.client.pixel_y = 0 return zoomed diff --git a/code/modules/projectiles/guns/beam_rifle.dm b/code/modules/projectiles/guns/beam_rifle.dm index 2491ea0b69d..6d0e2081363 100644 --- a/code/modules/projectiles/guns/beam_rifle.dm +++ b/code/modules/projectiles/guns/beam_rifle.dm @@ -176,7 +176,7 @@ zoom_animating = 0 animate(current_user.client, pixel_x = 0, pixel_y = 0, 0, FALSE, LINEAR_EASING, ANIMATION_END_NOW) zoom_current_view_increase = 0 - current_user.client.change_view(GLOBAL.DEFAULT_VIEW) + current_user.client.change_view(GLOB.DEFAULT_VIEW) zooming_angle = 0 current_zoom_x = 0 current_zoom_y = 0 diff --git a/code/modules/shuttle/navigation_computer.dm b/code/modules/shuttle/navigation_computer.dm index ee500900f44..a5a528985ed 100644 --- a/code/modules/shuttle/navigation_computer.dm +++ b/code/modules/shuttle/navigation_computer.dm @@ -69,7 +69,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.change_view(GLOBAL.DEFAULT_VIEW) + user.client.change_view(GLOB.DEFAULT_VIEW) /obj/machinery/computer/camera_advanced/shuttle_docker/proc/placeLandingSpot() if(!checkLandingSpot())