diff --git a/sku.0/sys.server/compiled/game/script/menu_info_types.java b/sku.0/sys.server/compiled/game/script/menu_info_types.java
index 358c3dd0f..209eb103c 100755
--- a/sku.0/sys.server/compiled/game/script/menu_info_types.java
+++ b/sku.0/sys.server/compiled/game/script/menu_info_types.java
@@ -135,6 +135,7 @@ public class menu_info_types
 	public static final int ITEM_EQUIP_APPEARANCE      = index++;
 	public static final int ITEM_UNEQUIP_APPEARANCE    = index++;
 	public static final int OPEN_STORYTELLER_RECIPE    = index++;
+	public static final int GOD_TELEPORT			   = index++;
 
 
 	/// do not add any constants between here and SERVER_DIVIDER
diff --git a/sku.0/sys.server/compiled/game/script/player/base/base_player.java b/sku.0/sys.server/compiled/game/script/player/base/base_player.java
index 5a9e4598a..991068d21 100755
--- a/sku.0/sys.server/compiled/game/script/player/base/base_player.java
+++ b/sku.0/sys.server/compiled/game/script/player/base/base_player.java
@@ -12287,4 +12287,13 @@ public class base_player extends script.base_script
         }
         return true;
     }
+    public int OnWaypointWarpRequested(obj_id self, obj_id waypoint) throws InterruptedException {
+        if(!isGod(self)) {
+            return SCRIPT_CONTINUE;
+        }
+        location loc = getWaypointLocation(waypoint);
+        sendSystemMessageTestingOnly(self, "Teleporting you to the location of Waypoint: "+getWaypointName(waypoint)+" ("+waypoint+") at "+loc+"...");
+        warpPlayer(self, loc.area, loc.x, loc.y, loc.z, loc.cell, 0, 0, 0, "noHandler", false);
+        return SCRIPT_CONTINUE;
+    }
 }
diff --git a/sku.0/sys.shared/compiled/game/datatables/command/command_table.tab b/sku.0/sys.shared/compiled/game/datatables/command/command_table.tab
index 096379e69..d599cbd5d 100755
--- a/sku.0/sys.shared/compiled/game/datatables/command/command_table.tab
+++ b/sku.0/sys.shared/compiled/game/datatables/command/command_table.tab
@@ -1906,3 +1906,4 @@ lfw		immediate			toggleLookingForWork																							1	1		0	1
 callforsnowspeeder		normal	callForSnowspeederPickup					callforsnowspeeder	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	0	0	1	0	0	1	1	1	1	1	1	1	1	1	1	1	0	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	other	optional		2	0	0	0	0	0	0	0	MELEE		defaultCooldownGroup	0	0	0		0	0	0
 callforslave1pickup		normal	callForTcgSlave1Pickup					callforslave1pickup	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	0	0	1	0	0	1	1	1	1	1	1	1	1	1	1	1	0	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	other	optional		2	0	0	0	0	0	0	0	MELEE		defaultCooldownGroup	0	0	0		0	0	0
 costume_esb_yoda	commandClicky	normal	costume_esb_yoda	failSpecialAttack			1	costume_esb_yoda	1	0	1	1	1	0	1	1	1	0	0	0	0	0	0	1	0	0	0			0	0	1	1		1	0	0	1	1	1	1	0	1	0	1	1	1	1	0	0	1								0		0	0	0	0		1							other	none		2		costume	0			costume				costume	0	0.25	10				
+admin		immediate	cmdAdmin	failAdmin				admin																				1	1		0	1												1																												gm.cmd		none	0				0			csr	0										
diff --git a/sku.0/sys.shared/compiled/game/datatables/player/radial_menu.tab b/sku.0/sys.shared/compiled/game/datatables/player/radial_menu.tab
index e5149ba6b..a2eea1bb7 100755
--- a/sku.0/sys.shared/compiled/game/datatables/player/radial_menu.tab
+++ b/sku.0/sys.shared/compiled/game/datatables/player/radial_menu.tab
@@ -321,3 +321,4 @@ BIO_LINK	6
 LANDMINE_DISARM	2
 LANDMINE_REVERSE_TRIGGER	2
 REWARD_TRADE_IN	16
+GOD_TELEPORT	16384