diff --git a/src/gs-entbase/server.src b/src/gs-entbase/server.src
index 375fbef4..9c03331d 100644
--- a/src/gs-entbase/server.src
+++ b/src/gs-entbase/server.src
@@ -42,6 +42,7 @@ server/func_wall.cpp
 server/func_wall_toggle.cpp
 server/func_conveyor.cpp
 server/func_rotating.cpp
+server/func_pendulum.cpp
 server/light.cpp
 server/stubs.cpp
 server/infodecal.cpp
diff --git a/src/gs-entbase/server/func_conveyor.cpp b/src/gs-entbase/server/func_conveyor.cpp
index c88bc2cc..2ac0100f 100644
--- a/src/gs-entbase/server/func_conveyor.cpp
+++ b/src/gs-entbase/server/func_conveyor.cpp
@@ -64,8 +64,8 @@ void func_conveyor::Trigger(void)
 
 void func_conveyor::func_conveyor(void)
 {
-	SetMovementDirection();
 	func_wall::func_wall();
+	SetMovementDirection();
 
 	/* TODO: Apply some effect flag the engine handles? */
 	if (!(spawnflags & SF_CONVEYOR_VISUAL)) {
@@ -76,7 +76,6 @@ void func_conveyor::func_conveyor(void)
 		SetSkin(0);
 	}
 
-	if (m_flSpeed == 0) {
+	if (m_flSpeed == 0)
 		m_flSpeed = 100;
-	}
 }
diff --git a/src/gs-entbase/server/func_pendulum.cpp b/src/gs-entbase/server/func_pendulum.cpp
new file mode 100644
index 00000000..72a6252e
--- /dev/null
+++ b/src/gs-entbase/server/func_pendulum.cpp
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2016-2020 Marco Hladik <marco@icculus.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
+ * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/*QUAKED func_wall_toggle (0 .5 .8) ? FTW_STARTHIDDEN
+"targetname"    Name
+
+Brush that can be hidden and reappear when triggered.
+
+If FTW_STARTHIDDEN is set, it'll start hidden.
+*/
+
+enumflags
+{
+    FUNCPEND_STARTON,
+	FUNCPEND_UNUSED1,
+	FUNCPEND_UNUSED2,
+    FUNCPEND_NONSOLID,
+    FUNCPEND_RETURNONTRIGGER,
+    FUNCPEND_UNUSED3,
+    FUNCPEND_XAXIS,
+    FUNCPEND_YAXIS
+};
+
+class func_pendulum:CBaseTrigger
+{
+	int m_iActive;
+	float m_flProgress;
+	float m_flDampening;
+	float m_flDistance;
+
+	void(void) func_pendulum;
+
+	virtual void(void) customphysics;
+	virtual void(void) Respawn;
+	virtual void(void) Trigger;
+};
+
+void func_pendulum::customphysics(void)
+{
+	if (!m_iActive)
+		return;
+
+	m_flProgress += frametime;
+
+	if (spawnflags & FUNCPEND_XAXIS)
+		angles[2] = sin(m_flProgress);
+	else if (spawnflags & FUNCPEND_YAXIS)
+		angles[1] = sin(m_flProgress);
+
+	angles *= m_flDistance;
+}
+
+void func_pendulum::Trigger(void)
+{
+	m_iActive = 1 - m_iActive;
+
+	if (m_iActive == FALSE && spawnflags & FUNCPEND_RETURNONTRIGGER)
+		angles = [0,0,0];
+}
+
+void func_pendulum::Respawn(void)
+{
+	if (spawnflags & FUNCPEND_STARTON)
+		m_iActive = TRUE;
+
+	if (spawnflags & FUNCPEND_NONSOLID)
+		solid = SOLID_NOT;
+	else
+		solid = SOLID_BSP;
+
+	movetype = MOVETYPE_PUSH;
+	SetModel(m_oldModel);
+	SetOrigin(origin);
+}
+
+void func_pendulum::func_pendulum(void)
+{
+	CBaseTrigger::CBaseTrigger();
+
+	for (int i = 1; i < (tokenize(__fullspawndata) - 1); i += 2) {
+		switch (argv(i)) {
+		case "damp":
+			m_flDampening = stof(argv(i+1));
+			break;
+		case "distance":
+			m_flDistance = stof(argv(i+1));
+			break;
+		default:
+			break;
+		}
+	}
+}