Merge branch 'master' into matthiaskrgr/SE

diff --git a/maps/space-elevator.map b/maps/space-elevator.map
index 6f02dd2ae2ea790128370aea27da28b1097ce74c..965f837f63eea680e02fc7114f453fbba29790ca 100644 (file)
--- a/maps/space-elevator.map
+++ b/maps/space-elevator.map
@@ -28865,7 +28865,6 @@ effects_jumppad/jumppadfx1_a
 {
 "classname" "trigger_hurt"
 "message" "was lost in space"
-"dmg" "1000"
 {
 ( -2944 -5376 -1136 ) ( 2944 5376 -1136 ) ( 2944 -5376 -1136 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0
 ( -2944 -5376 -1136 ) ( -2944 -5376 -3696 ) ( -2944 5376 -3696 ) common/trigger 0 64 0 0.25 0.25 134217728 0 0