From 2e22bc5e46849e0c994b5fd3b78899b66fc2bde3 Mon Sep 17 00:00:00 2001
From: "James B. Pollack" <jamesbradenpollack@gmail.com>
Date: Thu, 18 Aug 2016 14:08:31 -0700
Subject: [PATCH] new coolin

---
 scripts/system/controllers/teleport.js | 46 +++++++++++++++++++-------
 1 file changed, 34 insertions(+), 12 deletions(-)

diff --git a/scripts/system/controllers/teleport.js b/scripts/system/controllers/teleport.js
index 71096d2ed7..1511d1c2fc 100644
--- a/scripts/system/controllers/teleport.js
+++ b/scripts/system/controllers/teleport.js
@@ -294,15 +294,26 @@ function Teleporter() {
                     this.createCancelOverlay();
                 }
             } else {
-                this.deleteCancelOverlay();
-
-                this.rightLineOn(rightPickRay.origin, rightIntersection.intersection, COLORS_TELEPORT_CAN_TELEPORT);
-                if (this.targetOverlay !== null) {
-                    this.updateTargetOverlay(rightIntersection);
+                if (this.inCoolIn === true) {
+                    this.deleteTargetOverlay();
+                    this.rightLineOn(rightPickRay.origin, rightIntersection.intersection, COLORS_TELEPORT_TOO_CLOSE);
+                    if (this.cancelOverlay !== null) {
+                        this.updateCancelOverlay(rightIntersection);
+                    } else {
+                        this.createCancelOverlay();
+                    }
                 } else {
-                    this.createTargetOverlay();
+                    this.deleteCancelOverlay();
+
+                    this.rightLineOn(rightPickRay.origin, rightIntersection.intersection, COLORS_TELEPORT_CAN_TELEPORT);
+                    if (this.targetOverlay !== null) {
+                        this.updateTargetOverlay(rightIntersection);
+                    } else {
+                        this.createTargetOverlay();
+                    }
                 }
 
+
             }
 
         } else {
@@ -346,15 +357,26 @@ function Teleporter() {
                     this.createCancelOverlay();
                 }
             } else {
-                this.deleteCancelOverlay();
-                this.leftLineOn(leftPickRay.origin, leftIntersection.intersection, COLORS_TELEPORT_CAN_TELEPORT);
-
-                if (this.targetOverlay !== null) {
-                    this.updateTargetOverlay(leftIntersection);
+                if (this.inCoolIn === true) {
+                    this.deleteTargetOverlay();
+                    this.leftLineOn(leftPickRay.origin, leftIntersection.intersection, COLORS_TELEPORT_TOO_CLOSE);
+                    if (this.cancelOverlay !== null) {
+                        this.updateCancelOverlay(leftIntersection);
+                    } else {
+                        this.createCancelOverlay();
+                    }
                 } else {
-                    this.createTargetOverlay();
+                    this.deleteCancelOverlay();
+                    this.leftLineOn(leftPickRay.origin, leftIntersection.intersection, COLORS_TELEPORT_CAN_TELEPORT);
+
+                    if (this.targetOverlay !== null) {
+                        this.updateTargetOverlay(leftIntersection);
+                    } else {
+                        this.createTargetOverlay();
+                    }
                 }
 
+
             }