Merge branch 'master' into cbrutail/g-23_cant_take_it_anymore

Conflicts:
	maps/g-23.map

diff --git a/maps/red-planet.map b/maps/red-planet.map
index 39f582e9ca9951ee94307700bd2126c1770585f0..06843a1f60e4ea37f0f1e8f46166be5e92931328 100644 (file)
--- a/maps/red-planet.map
+++ b/maps/red-planet.map
@@ -64997,6 +64997,7 @@ exx/trim-vert01
 }
 {
 "classname" "func_plat"
+"lip" "8"
 "speed" "250"
 {
 patchDef2
@@ -65143,6 +65144,7 @@ exx/floor-clang01
 }
 {
 "classname" "func_plat"
+"lip" "8"
 "speed" "250"
 {
 patchDef2
@@ -72837,6 +72839,7 @@ exx/trim-vert01
 }
 {
 "classname" "func_plat"
+"lip" "8"
 "speed" "250"
 {
 patchDef2
@@ -72983,6 +72986,7 @@ exx/floor-clang01
 }
 {
 "classname" "func_plat"
+"lip" "8"
 "speed" "250"
 {
 patchDef2