diff --git a/config/default_map_settings.cfg b/config/default_map_settings.cfg
index ab381f2f..5f28bc1c 100755
--- a/config/default_map_settings.cfg
+++ b/config/default_map_settings.cfg
@@ -66,8 +66,8 @@ mapmodel 1 3 0 0 "barrel" // 34
mapmodel 1 2 0 0 "barrel2" // 35
mapmodel 0 0 0 0 "elektro" // 36
mapmodel 3 1 0 0 "europalette" // 37
-mapmodel 0 0 0 0 "gastank" // 38 Clip this with nothing mapmodels. Use two of them with the size
- // mapmodel 3 5 0 0 "nothing"
+mapmodel 0 0 0 0 "gastank" // 38 Ensure you clip this mapmodel fully using the command
+ // "newent clip 0 3 7 5" in the middle of the model.
mapmodel 2 1 0 0 "gutter_h" // 39
mapmodel 1 2 0 0 "gutter_v" // 40
mapmodel 0 0 0 0 "wrench" // 41
diff --git a/config/docs.cfg b/config/docs.cfg
index 99cf0ec9..5a56c448 100644
--- a/config/docs.cfg
+++ b/config/docs.cfg
@@ -1568,7 +1568,7 @@ docremark [The way this works is slightly strange at first, but allows for very
docident [edittoggle] [switches between map edit mode and normal.];
-docremark [In map edit mode you can select bits of the map by clicking or dragging your crosshair on the floor or ceiling (using the "attack" identifier, normally MOUSE1), then use the identifiers below to modify the selection. While in edit mode, physics and collision don't apply (noclip), and key repeat is ON. Note that if you fly outside the map, cube still renders the world as if you were standing on the floor directly below the camera.];
+docremark [In map edit mode you can select bits of the map by clicking or dragging your crosshair on the floor or ceiling (using the "attack" identifier, normally MOUSE1), then use the identifiers below to modify the selection. While in edit mode, normal physics and collision don't apply (clips), and key repeat is ON. Note that if you fly outside the map, cube still renders the world as if you were standing on the floor directly below the camera.];
docremark [Hotkey E];
@@ -1586,7 +1586,7 @@ docremark [For example 'entproperty 0 2' when executed near a lightsource would
docident [entset] [Edits the closest entity.];
-docargument [type] [the entity type] [light, sound, clip, playerstart, clips, ammobox, grenades, health, armour, akimbo, mapmodel, ladder, ctf-flag, helmet] [0];
+docargument [type] [the entity type] [light, sound, clip, plclip, playerstart, pistol, ammobox, grenades, health, armour, akimbo, mapmodel, ladder, ctf-flag, helmet] [0];
docargument [value1] [see newent 'type'] [] [0];
@@ -1712,7 +1712,7 @@ docargument [dZ] [z-offset] [] [0];
docident [newent] [Adds a new entity];
-docargument [type] [the entity type] [light, sound, clip, playerstart, pistol, ammobox, grenades, health, armour, akimbo, mapmodel, ladder, ctf-flag, helmet] [0];
+docargument [type] [the entity type] [light, sound, clip, plclip, playerstart, pistol, ammobox, grenades, health, armour, akimbo, mapmodel, ladder, ctf-flag, helmet] [0];
docargument [value1] [see newent 'type'] [] [0];
diff --git a/config/menus_edit.cfg b/config/menus_edit.cfg
index 2cdaa8d4..2672ebc1 100644
--- a/config/menus_edit.cfg
+++ b/config/menus_edit.cfg
@@ -57,20 +57,15 @@ menuitem "" -1
menuitem "Ladder entity" "saycommand /newent ladder " [ echo "Ensure that you have placed the ladder mapmodel first (found in the mapmodels menu)..." ]
menuitem "Clip entity" "showmenu Clips" "echo Clips can be used to block off areas that players shouldn't be able to access..."
-
-alias clip01 0
-alias clip02 0
-alias clip03 0
-alias clip04 0
-
newmenu "Clips"
-
-menuitemslider "Elevation from ground: " 0 50 "$clip01" 1 "" "alias clip01 $arg1"
-menuitemslider "Length of clip (X): " 0 50 "$clip02" 1 "" "alias clip02 $arg1"
-menuitemslider "Width of clip (Y): " 0 50 "$clip03" 1 "" "alias clip03 $arg1"
-menuitemslider "Height of clip (Z): " 0 50 "$clip04" 1 "" "alias clip04 $arg1"
+alias _clip00 0; alias _clip01 0; alias _clip02 1; alias _clip03 1; alias _clip04 1 // Give aliases an initial value.
+menuitemslider "Clip type: " 0 1 "$_clip00" 1 [ Clip "Player Clip" ] "alias _clip00 (at [clip plclip] $arg1)"
+menuitemslider "Elevation from ground: " 0 50 "$_clip01" 1 "" "alias _clip01 $arg1"
+menuitemslider "Length of clip (X): " 0 50 "$_clip02" 1 "" "alias _clip02 $arg1"
+menuitemslider "Width of clip (Y): " 0 50 "$_clip03" 1 "" "alias _clip03 $arg1"
+menuitemslider "Height of clip (Z): " 0 50 "$_clip04" 1 "" "alias _clip04 $arg1"
menuitem "" -1
-menuitem "2 [ OK ]" "newent clip $clip01 $clip02 $clip03 $clip04"
+menuitem "2 [ OK ]" "newent $_clip00 $_clip01 $_clip02 $_clip03 $_clip04"
//Pickups menu
newmenu Pickups
@@ -129,10 +124,10 @@ menuitem "Change watercolour" [ showmenu "Water colour" ]
menuitem "Print entity stats" "entstats"
menuitem "Select the next closest entity" "nextclosestent"
menuitemcheckbox "Show mapmodel clippings: " "$showmodelclipping" "showmodelclipping $arg1"
-menuitemslider "Select only these entities: " 0 14 "$_closestenttypestatus" 1 "All Light Playerstart Pistol Ammobox Grenades Health Armour Akimbo Mapmodel Ladder CTF-flag Sound Clip Helmet" "_closestentslider $arg1"
+menuitemslider "Select only these entities: " 0 15 "$_closestenttypestatus" 1 "All Light Playerstart Pistol Ammobox Grenades Health Armour Akimbo Mapmodel Ladder CTF-flag Sound Clip Helmet PlayerClip" "_closestentslider $arg1"
// "closestenttype" slider...
-alias _closestentslider [ closestenttype (at ["" light playerstart pistol ammobox grenades health armour akimbo mapmodel ladder ctf-flag sound clip helmet] $arg1); alias _closestenttypestatus $arg1 ]
+alias _closestentslider [ closestenttype (at ["" light playerstart pistol ammobox grenades health armour akimbo mapmodel ladder ctf-flag sound clip helmet plclip] $arg1); alias _closestenttypestatus $arg1 ]
// Map-message edit/creation menu
alias menumapmsg [ if (= (strcmp (getmapmsg) "Untitled Map by Unknown") 1) [ showmenu "Create a map message" ] [ showmenu "Edit a map message" ] ]
diff --git a/config/scripts.cfg b/config/scripts.cfg
index a96cce90..78970c98 100644
--- a/config/scripts.cfg
+++ b/config/scripts.cfg
@@ -8,7 +8,7 @@ alias editent [
if (strcmp $enttype "mapmodel") [
saycommand "/entset" $enttype (getentattr 1) (getentattr 2) (getentattr 3)
][
- if (> (findlist "light sound clip" $enttype) -1) [
+ if (> (findlist "light sound clip plclip" $enttype) -1) [
saycommand "/entset" $enttype (getentattr 0) (getentattr 1) (getentattr 2) (getentattr 3)
][
saycommand "/entset" $enttype (getentattr ((> (findlist "playerstart ctf-flag" $enttype) -1)))
diff --git a/docs/reference.xml b/docs/reference.xml
index 0fff362c..2fcb3778 100644
--- a/docs/reference.xml
+++ b/docs/reference.xml
@@ -1966,7 +1966,7 @@ Output:
In map edit mode you can select bits of the map by clicking or dragging your crosshair on the floor
or ceiling (using the "attack" identifier, normally MOUSE1), then use the identifiers below to
- modify the selection. While in edit mode, physics and collision don't apply (noclip), and key repeat is ON.
+ modify the selection. While in edit mode, normal physics and collision don't apply (clips), and key repeat is ON.
Note that if you fly outside the map, cube still renders the world as if you were standing on the floor
directly below the camera.
@@ -2146,7 +2146,7 @@ Output:
-
+
@@ -2313,7 +2313,7 @@ Output:
-
+
diff --git a/packages/models/mapmodels/gastank/usage.txt b/packages/models/mapmodels/gastank/usage.txt
deleted file mode 100644
index 8d3975c1..00000000
--- a/packages/models/mapmodels/gastank/usage.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-To clip this off, use the model "nothing" in your cfg
-
-mapmodel 3 5 0 0 "nothing"
-
-and place 2 of them over the model till it clips right.
-
-donīt change
-
-mapmodel 0 0 0 0 "gastank"
-