1 files changed, 11 insertions, 3 deletions

diff --git a/src/game/ship.cc b/src/game/ship.cc
index 4ddd118..e46adc1 100644
--- a/src/game/ship.cc
+++ b/src/game/ship.cc
@@ -69,7 +69,11 @@ void Ship::impulse()
 		}
 	
 		entity_eventstate = core::Entity::ImpulseInitiate;
-		entity_timer = 3;
+		if (Game::instance()->g_devel->value()) {
+			entity_timer = 0;
+		} else {
+			entity_timer = 10;
+		}
 		ship_impulsedrive_timer = core::server()->time();
 		entity_dirty = true;
 	}
@@ -79,7 +83,7 @@ void Ship::impulse()
 
 void Ship::jump(std::string const &args)
 {
-	if (!jumpdrive()) {
+	if (!jumpdrive() && !Game::instance()->g_devel->value()) {
 		core::server()->send(owner(), "This ship is not equiped with a hyperspace drive!");
 		return;
 
@@ -124,7 +128,11 @@ void Ship::jump(std::string const &args)
 	}
 
 	entity_eventstate = core::Entity::JumpInitiate;
-	entity_timer = 10;
+	if (Game::instance()->g_devel->value()) {
+		entity_timer = 0;
+	} else {
+		entity_timer = 10;
+	}
 	ship_jumpdrive_timer = core::server()->time();
 	entity_dirty = true;
 }